diff --git a/.ci/Arch/Dockerfile b/.ci/Arch/Dockerfile
index 36cf5c4ae..b08e568f3 100644
--- a/.ci/Arch/Dockerfile
+++ b/.ci/Arch/Dockerfile
@@ -8,10 +8,13 @@ RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \
         gtest \
         mariadb-libs \
         ninja \
+        openssl \
         protobuf \
         qt6-base \
+        qt6-declarative \
         qt6-imageformats \
         qt6-multimedia \
+        qt6-shadertools \
         qt6-svg \
         qt6-tools \
         qt6-translations \
diff --git a/.ci/Debian11/Dockerfile b/.ci/Debian11/Dockerfile
deleted file mode 100644
index b994863bf..000000000
--- a/.ci/Debian11/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM debian:11
-
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        build-essential \
-        ccache \
-        clang-format \
-        cmake \
-        file \
-        g++ \
-        git \
-        liblzma-dev \
-        libmariadb-dev-compat \
-        libprotobuf-dev \
-        libqt5multimedia5-plugins \
-        libqt5sql5-mysql \
-        libqt5svg5-dev \
-        libqt5websockets5-dev \
-        ninja-build \
-        protobuf-compiler \
-        qt5-image-formats-plugins \
-        qtmultimedia5-dev \
-        qttools5-dev \
-        qttools5-dev-tools \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
diff --git a/.ci/Debian12/Dockerfile b/.ci/Debian12/Dockerfile
index 202405b84..fc756aac2 100644
--- a/.ci/Debian12/Dockerfile
+++ b/.ci/Debian12/Dockerfile
@@ -15,11 +15,14 @@ RUN apt-get update && \
         libprotobuf-dev \
         libqt6multimedia6 \
         libqt6sql6-mysql \
+        libssl-dev \
         ninja-build \
         protobuf-compiler \
+        qt6-declarative-dev \
         qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-dev \
+        qt6-shadertools-dev \
         qt6-svg-dev \
         qt6-tools-dev \
         qt6-tools-dev-tools \
diff --git a/.ci/Debian13/Dockerfile b/.ci/Debian13/Dockerfile
index d7ab6ac86..bdecb56df 100644
--- a/.ci/Debian13/Dockerfile
+++ b/.ci/Debian13/Dockerfile
@@ -16,11 +16,14 @@ RUN apt-get update && \
         libprotobuf-dev \
         libqt6multimedia6 \
         libqt6sql6-mysql \
+        libssl-dev \
         ninja-build \
         protobuf-compiler \
+        qt6-declarative-dev \
         qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-dev \
+        qt6-shadertools-dev \
         qt6-svg-dev \
         qt6-tools-dev \
         qt6-tools-dev-tools \
diff --git a/.ci/Fedora43/Dockerfile b/.ci/Fedora43/Dockerfile
index 27570cf99..463da5a51 100644
--- a/.ci/Fedora43/Dockerfile
+++ b/.ci/Fedora43/Dockerfile
@@ -7,8 +7,9 @@ RUN dnf install -y \
         git \
         mariadb-devel \
         ninja-build \
+        openssl-devel \
         protobuf-devel \
-        qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
+        qt6-{qtdeclarative,qtmultimedia,qtshadertools,qtsvg,qttools,qtwebsockets}-devel \
         qt6-qtimageformats \
         rpm-build \
         xz-devel \
diff --git a/.ci/Fedora42/Dockerfile b/.ci/Fedora44/Dockerfile
similarity index 67%
rename from .ci/Fedora42/Dockerfile
rename to .ci/Fedora44/Dockerfile
index ee4a856f2..62238e760 100644
--- a/.ci/Fedora42/Dockerfile
+++ b/.ci/Fedora44/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:42
+FROM fedora:44
 
 RUN dnf install -y \
         ccache \
@@ -7,8 +7,9 @@ RUN dnf install -y \
         git \
         mariadb-devel \
         ninja-build \
+        openssl-devel \
         protobuf-devel \
-        qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
+        qt6-{qtdeclarative,qtmultimedia,qtshadertools,qtsvg,qttools,qtwebsockets}-devel \
         qt6-qtimageformats \
         rpm-build \
         xz-devel \
diff --git a/.ci/Servatrice_Debian11/Dockerfile b/.ci/Servatrice_Debian12/Dockerfile
similarity index 73%
rename from .ci/Servatrice_Debian11/Dockerfile
rename to .ci/Servatrice_Debian12/Dockerfile
index fadc9e0e7..321aa7c0f 100644
--- a/.ci/Servatrice_Debian11/Dockerfile
+++ b/.ci/Servatrice_Debian12/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:11
+FROM debian:12
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -11,11 +11,12 @@ RUN apt-get update && \
         git \
         libmariadb-dev-compat \
         libprotobuf-dev \
-        libqt5sql5-mysql \
-        libqt5websockets5-dev \
+        libqt6sql6-mysql \
+        libssl-dev \
         ninja-build \
         protobuf-compiler \
-        qttools5-dev \
-        qttools5-dev-tools \
+        qt6-tools-dev \
+        qt6-tools-dev-tools \
+        qt6-websockets-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
diff --git a/.ci/Ubuntu24.04/Dockerfile b/.ci/Ubuntu24.04/Dockerfile
index 809b2e43a..715997474 100644
--- a/.ci/Ubuntu24.04/Dockerfile
+++ b/.ci/Ubuntu24.04/Dockerfile
@@ -15,11 +15,14 @@ RUN apt-get update && \
         libprotobuf-dev \
         libqt6multimedia6 \
         libqt6sql6-mysql \
+        libssl-dev \
         ninja-build \
         protobuf-compiler \
+        qt6-declarative-dev \
         qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-dev \
+        qt6-shadertools-dev \
         qt6-svg-dev \
         qt6-tools-dev \
         qt6-tools-dev-tools \
diff --git a/.ci/Ubuntu22.04/Dockerfile b/.ci/Ubuntu26.04/Dockerfile
similarity index 76%
rename from .ci/Ubuntu22.04/Dockerfile
rename to .ci/Ubuntu26.04/Dockerfile
index ff2e6e43b..3166b7eb4 100644
--- a/.ci/Ubuntu22.04/Dockerfile
+++ b/.ci/Ubuntu26.04/Dockerfile
@@ -1,13 +1,15 @@
-FROM ubuntu:22.04
+FROM ubuntu:26.04
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         build-essential \
+        ca-certificates \
         ccache \
         clang-format \
         cmake \
         file \
         g++ \
+        gcovr \
         git \
         libgl-dev \
         liblzma-dev \
@@ -15,14 +17,17 @@ RUN apt-get update && \
         libprotobuf-dev \
         libqt6multimedia6 \
         libqt6sql6-mysql \
-        libqt6svg6-dev \
-        libqt6websockets6-dev \
+        libssl-dev \
         ninja-build \
         protobuf-compiler \
+        qt6-declarative-dev \
         qt6-image-formats-plugins \
         qt6-l10n-tools \
         qt6-multimedia-dev \
+        qt6-shadertools-dev \
+        qt6-svg-dev \
         qt6-tools-dev \
         qt6-tools-dev-tools \
+        qt6-websockets-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
diff --git a/.ci/compile.sh b/.ci/compile.sh
index a7c349fb0..606b9d201 100755
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -8,12 +8,17 @@
 # --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
 # --dir <dir> sets the name of the build dir, default is "build"
+# --cmake-generator <generator> sets CMAKE_GENERATOR as used by cmake
 # --target-macos-version <version> sets the min os version - only used for macOS builds
-# uses env: BUILDTYPE MAKE_INSTALL MAKE_PACKAGE PACKAGE_TYPE PACKAGE_SUFFIX MAKE_SERVER MAKE_NO_CLIENT MAKE_TEST USE_CCACHE CCACHE_SIZE BUILD_DIR CMAKE_GENERATOR TARGET_MACOS_VERSION
-# (correspond to args: --debug/--release --install --package <package type> --suffix <suffix> --server --test --ccache <ccache_size> --dir <dir>)
+# 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
+# (correspond to args: --debug/--release --install --package <package type> --suffix <suffix> --server --test --sanitize --coverage --ccache <ccache_size> --dir <dir>)
 # exitcode: 1 for failure, 3 for invalid arguments
 
 # Read arguments
@@ -55,6 +60,14 @@ while [[ $# != 0 ]]; do
       MAKE_TEST=1
       shift
       ;;
+    '--sanitize')
+      MAKE_SANITIZE=1
+      shift
+      ;;
+    '--coverage')
+      MAKE_COVERAGE=1
+      shift
+      ;;
     '--debug')
       BUILDTYPE="Debug"
       shift
@@ -71,6 +84,15 @@ while [[ $# != 0 ]]; do
         shift
       fi
       ;;
+    '--evict-ccache')
+      shift
+      if [[ $# == 0 ]]; then
+        echo "::error file=$0::--evict-ccache expects an argument"
+        exit 3
+      fi
+      CCACHE_EVICTION_AGE=$1
+      shift
+      ;;
     '--vcpkg')
       USE_VCPKG=1
       shift
@@ -84,6 +106,15 @@ while [[ $# != 0 ]]; do
       BUILD_DIR="$1"
       shift
       ;;
+    '--cmake-generator')
+      shift
+      if [[ $# == 0 ]]; then
+        echo "::error file=$0::--cmake-generator expects an argument"
+        exit 3
+      fi
+      export CMAKE_GENERATOR=$1
+      shift
+      ;;
     '--target-macos-version')
       shift
       if [[ $# == 0 ]]; then
@@ -111,6 +142,15 @@ 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
@@ -122,13 +162,27 @@ if [[ $MAKE_SERVER ]]; then
   flags+=("-DWITH_SERVER=1")
 fi
 if [[ $MAKE_NO_CLIENT ]]; then
-  flags+=("-DWITH_CLIENT=0" "-DWITH_ORACLE=0" "-DWITH_DBCONVERTER=0")
+  flags+=("-DWITH_CLIENT=0" "-DWITH_ORACLE=0")
 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
+  # consumes a precompiled header, silently recompiling everything on every run.
+  ccache --set-config sloppiness=pch_defines,time_macros
   if [[ $CCACHE_SIZE ]]; then
     # note, this setting persists after running the script
     ccache --max-size "$CCACHE_SIZE"
@@ -139,6 +193,7 @@ if [[ $PACKAGE_TYPE ]]; then
 fi
 if [[ $USE_VCPKG ]]; then
   flags+=("-DUSE_VCPKG=1")
+  flags+=("-DVCPKG_INSTALL_OPTIONS=--x-abi-tools-use-exact-versions")
 fi
 
 # Add cmake --build flags
@@ -156,6 +211,18 @@ function ccachestatsverbose() {
 
 # Compile
 if [[ $RUNNER_OS == macOS ]]; then
+  # QTDIR is needed for macOS since we actually only use the cached thin Qt binaries instead of the install-qt-action,
+  # which sets a few environment variables
+  if QTDIR=$(find "$GITHUB_WORKSPACE/Qt" -depth -maxdepth 2 -name macos -type d -print -quit); then
+    echo "found QTDIR at $QTDIR"
+  else
+    echo "could not find QTDIR!"
+    exit 2
+  fi
+  # the qtdir is located at Qt/[qtversion]/macos
+  # we use find to get the first subfolder with the name "macos"
+  # this works independent of the qt version as there should be only one version installed on the runner at a time
+  export QTDIR
 
   if [[ $TARGET_MACOS_VERSION ]]; then
     # CMAKE_OSX_DEPLOYMENT_TARGET is a vanilla cmake flag needed to compile to target macOS version
@@ -171,7 +238,11 @@ if [[ $RUNNER_OS == macOS ]]; then
       arch="x64"
     fi
     mkdir -p "$triplets_dir"
-    cp "../vcpkg/triplets/$arch-osx.cmake" "$triplet_file"
+    triplet_source="../vcpkg/triplets/$arch-osx.cmake"
+    if [[ ! -f "$triplet_source" ]]; then
+      triplet_source="../vcpkg/triplets/community/$arch-osx.cmake"
+    fi
+    cp "$triplet_source" "$triplet_file"
     echo "set(VCPKG_CMAKE_SYSTEM_VERSION $TARGET_MACOS_VERSION)" >>"$triplet_file"
     echo "set(VCPKG_OSX_DEPLOYMENT_TARGET $TARGET_MACOS_VERSION)" >>"$triplet_file"
     flags+=("-DVCPKG_OVERLAY_TRIPLETS=$triplets_dir")
@@ -239,14 +310,21 @@ cmake --build . "${buildflags[@]}"
 echo "::endgroup::"
 
 if [[ $USE_CCACHE ]]; then
+  if [[ $CCACHE_EVICTION_AGE ]]; then
+    echo "::group::evict ccache files older than $CCACHE_EVICTION_AGE"
+    ccache --evict-older-than "$CCACHE_EVICTION_AGE"
+    echo "::endgroup::"
+  fi
   echo "::group::Show ccache stats again"
   ccachestatsverbose
   echo "::endgroup::"
+elif [[ $CCACHE_EVICTION_AGE ]]; then
+  echo "::error file=$0::ccache eviction is enabled while ccache is disabled!"
 fi
 
 if [[ $RUNNER_OS == macOS ]]; then
   echo "::group::Inspect Mach-O binaries"
-  for app in cockatrice oracle servatrice dbconverter; do
+  for app in cockatrice oracle servatrice; do
     binary="$GITHUB_WORKSPACE/build/$app/$app.app/Contents/MacOS/$app"
     echo "Inspecting $app..."
     vtool -show-build "$binary"
@@ -259,7 +337,50 @@ fi
 
 if [[ $MAKE_TEST ]]; then
   echo "::group::Run tests"
-  ctest -C "$BUILDTYPE" --output-on-failure
+  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
   echo "::endgroup::"
 fi
 
@@ -280,4 +401,153 @@ if [[ $MAKE_PACKAGE ]]; then
     BUILD_DIR="$BUILD_DIR" .ci/name_build.sh "$PACKAGE_SUFFIX"
     echo "::endgroup::"
   fi
+
+  if [[ $RUNNER_OS == Windows ]]; then
+    echo "::group::Check installer for build-tree artifacts"
+    cd "$BUILD_DIR"
+    package="$(find . -maxdepth 1 -type f -name 'Cockatrice-*.exe' -print -quit)"
+    if [[ ! $package ]]; then
+      echo "::error file=$0::Could not find installer to inspect"
+      exit 1
+    fi
+    seven_zip="$(command -v 7z || true)"
+    if [[ ! $seven_zip ]]; then
+      seven_zip="/c/Program Files/7-Zip/7z.exe"
+    fi
+    if [[ ! -f $seven_zip ]]; then
+      echo "::warning file=$0::7-Zip not found, skipping installer content check"
+    else
+      echo "Inspecting $package"
+      # Fail the build if the installer contains any path left behind by the MSBuild or
+      # Qt AUTOMOC tooling (build-tree artifacts must live in the build dir, not the install)
+      if "$seven_zip" l "$package" |
+        grep -E "_autogen|\.dir[\\/]|\.tlog|(^|[\\/])x64[\\/]|(^|[\\/])\.qt[\\/]|(^|[\\/])\.qsb[\\/]|(^|[\\/])\.lupdate[\\/]|CMakeFiles"; then
+        echo "::error file=$0::Installer contains build-tree artifacts"
+        exit 1
+      fi
+      echo "Installer content is clean"
+
+      # 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"
+        exit 1
+      fi
+      # 7-Zip writes CRLF on Windows, so the \r has to come off before any
+      # whole-line comparison below. Normalize separators to /, and strip the
+      # install-root prefixes an NSIS listing may carry, so the entries can be
+      # compared as exact relative paths. -xF keeps a '.' in a DLL name from
+      # 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
+      # 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.
+      # [$] rather than \$ so the literal dollar is a bracket expression and the
+      # linter does not read these as unexpanded shell variables (SC2016).
+      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)"
+      missing=""
+      checked=0
+      while IFS= read -r entry; do
+        if [[ -z $entry || $entry == \#* ]]; then
+          continue
+        fi
+        checked=$((checked + 1))
+        if ! grep -qxiF "$entry" <<<"$installer_paths"; then
+          missing+=" $entry"
+        fi
+      done <<<"$manifest"
+      if [[ -n $missing ]]; then
+        echo "::error file=$0::Installer is missing required 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)"
+        # Indent with parameter expansion rather than sed 's/^/  /', which the
+        # linter reports as SC2001.
+        echo "--- required ---"
+        echo "${manifest//$'\n'/$'\n  '}"
+        echo "--- first 40 paths 7-Zip lists in the installer ---"
+        listed_head="$(head -40 <<<"$installer_paths")"
+        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
+    fi
+    echo "::endgroup::"
+  fi
 fi
diff --git a/.ci/docker.sh b/.ci/docker.sh
index 911488ecf..412ad6a1d 100644
--- a/.ci/docker.sh
+++ b/.ci/docker.sh
@@ -3,17 +3,34 @@
 # This script is to be used by the ci environment from the project root directory, do not use it from somewhere else.
 
 # Creates or loads docker images to use in compilation, creates RUN function to start compilation on the docker image.
-# <arg> sets the name of the docker image, these correspond to directories in .ci
+#
+# usage: source <script> <name> [--get] [--build] [--save] [--interactive] [--set-cache <location>]
+# <name> sets the name of the docker image, these correspond to directories in .ci
 # --get loads the image from a previously saved image cache, will build if no image is found
 # --build builds the image from the Dockerfile in .ci/$NAME
 # --save stores the image, if an image was loaded it will not be stored
 # --interactive immediately starts the image interactively for debugging
 # --set-cache <location> sets the location to cache the image or for ccache
+#
 # requires: docker
-# uses env: NAME CACHE BUILD GET SAVE INTERACTIVE
+# uses env: NAME IMAGE_SUFFIX 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!
+#
+# usage: RUN [arguments for build script]
+# roughly equivalent to `docker run $IMAGE_NAME bash $BUILD_SCRIPT $@`
+# uses env: CCACHE_DIR IMAGE_NAME RUN_ARGS RUN_OPTS BUILD_SCRIPT
+# exitcode: 3 for invalid arguments, returns the returncode of docker run
 export BUILD_SCRIPT=".ci/compile.sh"
 
 project_name="cockatrice"
@@ -41,12 +58,17 @@ while [[ $# != 0 ]]; do
       shift
       ;;
     '--set-cache')
-      CACHE=$2
+      shift
+      if [[ $# == 0 ]]; then
+        echo "--set-cache expects an argument" >&2
+        exit 3
+      fi
+      CACHE=$1
+      shift
       if ! [[ -d $CACHE ]]; then
         echo "could not find cache path: $CACHE" >&2
         return 3
       fi
-      shift 2
       ;;
     *)
       if [[ ${1:0:1} == - ]]; then
@@ -65,7 +87,7 @@ if ! [[ $NAME ]]; then
   return 3
 fi
 
-export IMAGE_NAME="${project_name,,}_${NAME,,}" # lower case
+export IMAGE_NAME="${project_name,,}_${NAME,,}${IMAGE_SUFFIX:+_${IMAGE_SUFFIX,,}}" # lower case
 
 docker_dir=".ci/$NAME"
 if ! [[ -r $docker_dir/Dockerfile ]]; then
@@ -149,10 +171,11 @@ function RUN ()
       args+=(--mount "type=bind,source=$CCACHE_DIR,target=/.ccache")
       args+=(--env "CCACHE_DIR=/.ccache")
     fi
-    if [[ -n "$CMAKE_GENERATOR" ]]; then
-      args+=(--env "CMAKE_GENERATOR=$CMAKE_GENERATOR")
+    if [[ $GITHUB_OUTPUT ]]; then
+      args+=(--mount "type=bind,source=$GITHUB_OUTPUT,target=/gh_output")
+      args+=(--env "GITHUB_OUTPUT=/gh_output")
     fi
-  # shellcheck disable=2086
+    # shellcheck disable=2086
     docker run "${args[@]}" $RUN_ARGS "$IMAGE_NAME" bash "$BUILD_SCRIPT" $RUN_OPTS "$@"
     return $?
   else
diff --git a/.ci/lint_cpp.sh b/.ci/lint_cpp.sh
index cfb1e1f07..9786a83fc 100755
--- a/.ci/lint_cpp.sh
+++ b/.ci/lint_cpp.sh
@@ -13,17 +13,9 @@ fi
 # Check formatting using format.sh
 echo "Checking your code using format.sh..."
 
-diff="$(./format.sh --diff --cmake --shell --print-version --branch origin/master)"
+./format.sh --color-diff --cmake --shell --print-version --branch origin/master
 err=$?
 
-sep="
-----------
-"
-used_version="${diff%%"$sep"*}"
-diff="${diff#*"$sep"}"
-changes_to_make="${diff%%"$sep"*}"
-files_to_edit="${diff#*"$sep"}"
-
 case $err in
   1)
     cat <<EOM
@@ -36,19 +28,10 @@ case $err in
 ***  Then commit and push those changes to this branch. ***
 ***   Check our CONTRIBUTING.md file for more details.  ***
 ***                                                     ***
-***                    Thank you ❤️                      ***
+***                    Thank you ❤️                     ***
 ***                                                     ***
 ***********************************************************
 
-Used version:
-$used_version
-
-Affected files:
-$files_to_edit
-
-The following changes should be made:
-$changes_to_make
-
 Exiting...
 EOM
     exit 2
@@ -65,9 +48,6 @@ EOM
 ***                                                     ***
 ***********************************************************
 
-Used version:
-$used_version
-
 Exiting...
 EOM
     exit 0
diff --git a/.ci/name_build.sh b/.ci/name_build.sh
index 060f8a68e..85818bbd9 100755
--- a/.ci/name_build.sh
+++ b/.ci/name_build.sh
@@ -2,7 +2,6 @@
 # used by the ci to rename build artifacts
 # renames the file to [original name][SUFFIX].[original extension]
 # where SUFFIX is either available in the environment or as the first arg
-# if MAKE_ZIP is set instead a zip is made
 # expected to be run in the build directory unless BUILD_DIR is set
 # adds output to GITHUB_OUTPUT
 builddir="${BUILD_DIR:=.}"
@@ -22,8 +21,8 @@ set -e
 
 # find file
 found="$(find "$builddir" -maxdepth 1 -type f -name "$findrx" -print -quit)"
-path="${found%/*}" # remove all after last /
-file="${found##*/}" # remove all before last /
+path="${found%/*}"    # remove all including first "/" from right side
+file="${found##*/}"    # remove all including last "/" from left side
 if [[ ! $file ]]; then
   echo "::error file=$0::could not find package"
   exit 1
@@ -35,21 +34,16 @@ if ! cd "$path"; then
 fi
 
 # set filename
-name="${file%.*}" # remove all after last .
-new_name="$name$SUFFIX."
-if [[ $MAKE_ZIP ]]; then
-  filename="${new_name}zip"
-  echo "creating zip '$filename' from '$file'"
-  zip "$filename" "$file"
-else
-  extension="${file##*.}" # remove all before last .
-  filename="$new_name$extension"
-  echo "renaming '$file' to '$filename'"
-  mv "$file" "$filename"
-fi
+name="${file%.*}"    # remove all including first "." from right side
+new_name="$name$SUFFIX"
+extension="${file##*.}"    # remove all including last "." from left side
+filename="$new_name.$extension"
+echo "renaming '$file' to '$filename'"
+mv "$file" "$filename"
 
 cd "$oldpwd"
 relative_path="$path/$filename"
 ls -l "$relative_path"
 echo "path=$relative_path" >>"$GITHUB_OUTPUT"
-echo "name=$filename" >>"$GITHUB_OUTPUT"
+echo "name=$new_name" >>"$GITHUB_OUTPUT"
+echo "fullname=$filename" >>"$GITHUB_OUTPUT"
diff --git a/.ci/prep_release.sh b/.ci/prep_release.sh
index cddf49aa6..7f4f7d961 100755
--- a/.ci/prep_release.sh
+++ b/.ci/prep_release.sh
@@ -89,6 +89,8 @@ else
       echo "'$previous' to '$TAG' ($count commits)"
       # --> is the markdown comment escape sequence, emojis are way better
       generated_list="${generated_list//-->/→}"
+      # Escape & to preserve it from commit message into markdown output
+      generated_list="${generated_list//&/\\&}"
       body="${body//--REPLACE-WITH-GENERATED-LIST--/$generated_list}"
       body="${body//--REPLACE-WITH-COMMIT-COUNT--/$count}"
       body="${body//--REPLACE-WITH-PREVIOUS-RELEASE-TAG--/$previous}"
diff --git a/.ci/release_template.md b/.ci/release_template.md
index 0207662b5..23b475150 100644
--- a/.ci/release_template.md
+++ b/.ci/release_template.md
@@ -10,24 +10,24 @@ Available pre-compiled binaries for installation:
 
   <b>Windows</b>
    • <kbd>Windows 10+</kbd>
-   • <kbd>Windows 7+</kbd>
 
   <b>macOS</b>
-   • <kbd>macOS 15+</kbd> <sub><i>Sequoia</i></sub> <sub>Apple M</sub>
-   • <kbd>macOS 14+</kbd> <sub><i>Sonoma</i></sub> <sub>Apple M</sub>
-   • <kbd>macOS 13+</kbd> <sub><i>Ventura</i></sub> <sub>Intel</sub>
+   • <kbd>macOS 15+</kbd> <sub><i>Sequoia</i></sub>
+   • <kbd>macOS 14+</kbd> <sub><i>Sonoma</i></sub>
+   • <kbd>macOS 13+</kbd> <sub><i>Ventura (x86)</i></sub>
 
   <b>Linux</b>
+   • <kbd>Ubuntu 26.04 LTS</kbd> <sub><i>Resolute Racoon</i></sub>
    • <kbd>Ubuntu 24.04 LTS</kbd> <sub><i>Noble Numbat</i></sub>
-   • <kbd>Ubuntu 22.04 LTS</kbd> <sub><i>Jammy Jellyfish</i></sub>
    • <kbd>Debian 13</kbd> <sub><i>Trixie</i></sub>
    • <kbd>Debian 12</kbd> <sub><i>Bookworm</i></sub>
-   • <kbd>Debian 11</kbd> <sub><i>Bullseye</i></sub>
+   • <kbd>Fedora 44</kbd>
    • <kbd>Fedora 43</kbd>
-   • <kbd>Fedora 42</kbd>
 
-<sub>We are also packaged in <kbd>Arch Linux</kbd>'s <a href="https://archlinux.org/packages/extra/x86_64/cockatrice">official extra repository</a>, courtesy of @FFY00.</sub>
-<sub>General Linux support is available via a <kbd>flatpak</kbd> package at <a href="https://flathub.org/apps/io.github.Cockatrice.cockatrice">Flathub</a>!</sub>
+   <sub>General Linux support is available via a <kbd>flatpak</kbd> package hosted at <a href="https://flathub.org/apps/io.github.Cockatrice.cockatrice">Flathub</a> (x86 & ARM)!</sub>
+   <sub>Thanks to courtesy of @FFY00, the app is also available in <kbd>Arch Linux</kbd>'s <a href="https://archlinux.org/packages/extra/x86_64/cockatrice">official extra repository</a>.</sub>
+
+ <sub>We maintain a <kbd>Docker</kbd> image for "Servatrice" in <a href="https://github.com/Cockatrice/Cockatrice/pkgs/container/servatrice">GHCR</a> (x86 & ARM). You can docker pull it or use our Docker Compose files!</sub>
 </pre>
 
 
@@ -83,7 +83,6 @@ Remove empty headers when done.
 ### Under the Hood
 ### Oracle
 ### Servatrice
-### Webatrice
 
 </details>
 
diff --git a/.ci/resolve_latest_aqt_qt_version.sh b/.ci/resolve_latest_aqt_qt_version.sh
new file mode 100755
index 000000000..066140ac9
--- /dev/null
+++ b/.ci/resolve_latest_aqt_qt_version.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# This script is used to resolve the latest patch version of Qt using aqtinstall.
+# It interprets wildcards to get the latest patch version. E.g. "6.6.*" -> "6.6.3".
+
+# This script is meant to be used by the ci enironment.
+# It uses the runner's GITHUB_OUTPUT env variable.
+
+# Usage example: .ci/resolve_latest_aqt_qt_version.sh "6.6.*"
+
+qt_spec=$1
+if [[ ! $qt_spec ]]; then
+  echo "usage: $0 [version]"
+  exit 2
+fi
+
+# If version is already specific (no wildcard), use it as-is
+if [[ $qt_spec != *"*" ]]; then
+  echo "version $qt_spec is already resolved"
+  echo "version=$qt_spec" >> "$GITHUB_OUTPUT"
+  exit 0
+fi
+
+if ! hash aqt; then
+  echo "aqt could not be found, has aqtinstall been installed?"
+  exit 2
+fi
+
+# Resolve latest patch
+if [[ $RUNNER_OS == macOS ]]; then
+  if ! qt_resolved=$(aqt list-qt mac desktop --spec "$qt_spec" --latest-version); then
+    exit 1
+  fi
+elif [[ $RUNNER_OS == Windows ]]; then
+  if ! qt_resolved=$(aqt list-qt windows desktop --spec "$qt_spec" --latest-version); then
+    exit 1
+  fi
+else
+  echo "aqt command for $RUNNER_OS not defined."
+  exit 1
+fi
+
+echo "resolved $qt_spec to $qt_resolved"
+if [[ ! $qt_resolved ]]; then
+  echo "Error: Could not resolve Qt version for $qt_spec"
+  exit 1
+fi
+
+echo "version=$qt_resolved" >> "$GITHUB_OUTPUT"
diff --git a/.ci/thin_macos_qtlib.sh b/.ci/thin_macos_qtlib.sh
new file mode 100755
index 000000000..6c3cc6720
--- /dev/null
+++ b/.ci/thin_macos_qtlib.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# The macos binaries from aqt are fat (universal), so we thin them to the target architecture to reduce the size of
+# the packages and caches using lipo.
+
+# This script is meant to be used by the ci enironment on macos runners only.
+# It uses the runner's GITHUB_WORKSPACE env variable.
+arch=$(uname -m)
+nproc=$(sysctl -n hw.ncpu)
+
+function thin() {
+  local libfile=$1
+  if [[ $(file -b --mime-type "$libfile") == application/x-mach-binary* ]]; then
+    echo "Processing $libfile"
+    lipo "$libfile" -thin "$arch" -output "$libfile"
+  fi
+  return 0
+}
+export -f thin  # export to allow use in xargs
+export arch
+set -eo pipefail
+
+echo "::group::Thinning Qt libraries to $arch using $nproc cores"
+find "$GITHUB_WORKSPACE/Qt" -type f -print0 | xargs -0 -n1 -P"$nproc" -I{} bash -c "thin '{}'"
+echo "::endgroup::"
diff --git a/.clang-format b/.clang-format
index 1ef3ca6db..1db97481a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,7 +3,9 @@ AccessModifierOffset: -4
 ColumnLimit: 120
 ---
 Language: Cpp
-BreakBeforeBraces: Custom
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortFunctionsOnASingleLine: None
+BinPackParameters: false
 BraceWrapping:
   AfterClass: true
   AfterControlStatement: false
@@ -18,16 +20,14 @@ BraceWrapping:
   SplitEmptyFunction: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
-AllowShortFunctionsOnASingleLine: None
-BinPackParameters: false
-AllowAllParametersOfDeclarationOnNextLine: false
-IndentCaseLabels: true
-PointerAlignment: Right
-SortIncludes: true
+BreakBeforeBraces: Custom
 IncludeBlocks: Regroup
+IndentCaseLabels: true
+InsertBraces: true
+PointerAlignment: Right
+RemoveSemicolon: true
+SortIncludes: true
 StatementAttributeLikeMacros: [emit]
-# requires clang-format 16
-# RemoveSemicolon: true
 ---
 Language: Proto
 AllowShortFunctionsOnASingleLine: None
diff --git a/.codacy.yml b/.codacy.yml
deleted file mode 100644
index f9482da2f..000000000
--- a/.codacy.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-exclude_paths:
-  - '**/translations/*.ts'
-
-# codacy config documentation: https://support.codacy.com/hc/en-us/articles/115002130625-Codacy-Configuration-File
diff --git a/.dockerignore b/.dockerignore
index 2abeb2727..8e0b69332 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,3 @@
-.git/
 build/
 .github/
 .tx/
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index ffde66d7b..589cae1d8 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -209,6 +209,16 @@ nowadays and clean it up for you.
 Lines should be 120 characters or less. Please break up lines that are too long
 into smaller parts, for example at spaces or after opening a brace.
 
+### Documentation Comments ###
+
+Use [Doxygen](https://www.doxygen.nl/) for code documentation:
+
+- **Doc blocks**: Use `/** @brief Description */` (Javadoc-style), not `///`
+- **Member comments**: Use trailing `///<` for inline member documentation
+- **TODOs**: Use `//! \todo Description` (Qt-style), Doxygen collects them into a Todo List
+  (uses [Qt-style comments](https://www.doxygen.nl/manual/docblocks.html) with
+  Doxygen's [\todo command](https://www.doxygen.nl/manual/commands.html#cmdtodo))
+
 ### Memory Management ###
 
 New code should be written using references over pointers and stack allocation
@@ -324,7 +334,7 @@ the tr() call, also you can add an extra string as a hint for translators:
 QString message = tr("Everyone draws %n cards", "english hint for translators", amount);
 ```
 See [Qt's wiki on translations](
-https://doc.qt.io/qt-5/i18n-source-translation.html#handling-plurals)
+https://doc.qt.io/qt-6/i18n-source-translation.html#handling-plurals)
 
 If you're about to propose a change that adds or modifies any translatable
 string in the code, you don't need to take care of adding the new strings to
@@ -461,7 +471,11 @@ revoke the tag by doing the following:
 git push --delete upstream $TAG_NAME
 git tag -d $TAG_NAME
 ```
-You can also do this on GitHub, you'll also want to delete the false release.
+You can also do this on GitHub.
+
+> [!NOTE]
+> If you want to push a new release to replace it immediately with the same
+> name you have to delete the automatically created release first!
 
 In the first lines of [CMakeLists.txt](
 https://github.com/Cockatrice/Cockatrice/blob/master/CMakeLists.txt)
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index c5354332b..02bdc148a 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,9 +1,12 @@
 blank_issues_enabled: false
 contact_links:
   - name: 💬 Discord Community (Get help with server issues, e.g. Login)
-    url: https://discord.gg/3Z9yzmA
+    url: https://discord.com/invite/3Z9yzmA
     about: Need help with using the client? Want to find some games? Try the Discord server!
   - name: 🌐 Translations (Help improve the localization of the app)
     url: https://explore.transifex.com/cockatrice/cockatrice/
     # it is not possible to add a link to the wiki to this description
     about: For more information and guidance check our Translation FAQ on our wiki!
+  - name: 📖 Code Documentation
+    url: https://cockatrice.github.io/docs/
+    about: Helpful source focusing on developers, but there are also references for users!
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 1e278a418..404cac62e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,19 +2,21 @@
 
 version: 2
 updates:
- # # Enable version updates for git submodules
- # Not yet possible to bump only on tags or releases, see:
+ # Enable version updates for git submodules
+ # If SemVer is used, updates will happen to new releases only (not HEAD)
  # https://github.com/dependabot/dependabot-core/issues/1639
  # https://github.com/dependabot/dependabot-core/issues/2192
- # Alternative: Action that updates submodule and can be manually run on demand (workflow_dispatch)
- # - package-ecosystem: "gitsubmodule"
- #   # Look for `.gitmodules` in the `root` directory
- #   directory: "/"
- #   # Check for updates once a month
- #   schedule:
- #     interval: "monthly"
- #   # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
- #   open-pull-requests-limit: 1
+  - package-ecosystem: "gitsubmodule"
+    # Look for `.gitmodules` in the `root` directory
+    directory: "/"
+    ignore:
+      # Ignore updates for vcpkg (Bump to latest tag not working (no SemVer used)
+      - dependency-name: "vcpkg"
+    # Check for updates once a month
+    schedule:
+      interval: "monthly"
+    # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
+    open-pull-requests-limit: 2
 
  # # Enable version updates for Docker
  # Not yet possible to bump from one LTS version to the next and skip others, see:
@@ -37,13 +39,3 @@ updates:
       interval: "weekly"
     # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
     open-pull-requests-limit: 2
-
- # # Enable version updates for npm
- # - package-ecosystem: "npm"
- #   # Look for `package.json` and `lock` files in the `webclient` subdirectory
- #   directory: "/webclient"
- #   # Check the npm registry for updates once a week
- #   schedule:
- #     interval: "weekly"
- #   # Limit the amout of open PR's (default = 5, disabled = 0, security updates are not impacted)
- #   open-pull-requests-limit: 5
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 000000000..75fbc59f1
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,95 @@
+# GitHub Docs on Code Scanning:
+# https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning
+# https://docs.github.com/en/code-security/how-tos/find-and-fix-code-vulnerabilities/manage-your-configuration
+# https://docs.github.com/en/code-security/reference/code-scanning/workflow-configuration-options
+#
+# CodeQL Docs:
+# https://codeql.github.com/docs/
+
+name: CodeQL
+
+permissions:
+  contents: read
+  security-events: write    # needed to post results
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+# Cancel earlier, unfinished runs of this workflow on the same branch
+concurrency:
+  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
+  cancel-in-progress: true
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        # https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/
+        - language: cpp
+          build-mode: manual
+        - language: actions
+          build-mode: none
+
+    steps:
+    - name: "Checkout repository"
+      uses: actions/checkout@v7
+
+    - name: "Initialize CodeQL"
+      uses: github/codeql-action/init@v4
+      with:
+        languages: ${{ matrix.language }}
+        build-mode: ${{ matrix.build-mode }}
+        # https://docs.github.com/en/code-security/reference/code-scanning/codeql/codeql-queries/c-cpp-built-in-queries
+        # https://docs.github.com/en/code-security/reference/code-scanning/codeql/codeql-queries/actions-built-in-queries
+        queries: security-extended
+        dependency-caching: true
+
+    - name: "[C++] Install dependencies"
+      if: matrix.language == 'cpp' && matrix.build-mode == 'manual'
+      shell: bash
+      env:
+        DEBIAN_FRONTEND: noninteractive
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y --no-install-recommends \
+          cmake \
+          g++ \
+          libgl-dev \
+          liblzma-dev \
+          libmariadb-dev-compat \
+          libprotobuf-dev \
+          ninja-build \
+          protobuf-compiler \
+          qt6-declarative-dev \
+          qt6-multimedia-dev \
+          qt6-shadertools-dev \
+          qt6-svg-dev \
+          qt6-tools-dev \
+          qt6-tools-dev-tools \
+          qt6-websockets-dev
+
+# Minimize dependency install
+# Add ccache usage for faster compilation, (install ccache dep, actions/cache step + append DUSE_CCACHE=1 in cmake config, CCACHE env values)
+
+    - name: "[C++] Configure CMake"
+      if: matrix.language == 'cpp' && matrix.build-mode == 'manual'
+      shell: bash
+      run: cmake -S . -B build -G Ninja -DWITH_SERVER=1 -DCMAKE_BUILD_TYPE=Release
+
+    - name: "[C++] Build application"
+      if: matrix.language == 'cpp' && matrix.build-mode == 'manual'
+      shell: bash
+      run: cmake --build build
+
+    - name: "Perform CodeQL Analysis"
+      uses: github/codeql-action/analyze@v4
+      with:
+        category: "/language:${{ matrix.language }}"
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 58b246071..098aabc4f 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -1,10 +1,10 @@
 name: Build Desktop
 
 permissions:
-  contents: write
-  id-token: write
-  attestations: write
-  actions: write # needed for ccache action to be able to delete gha caches
+  actions: write    # needed to delete entries in GHA cache (update ccache)
+  attestations: write    # needed to persist the attestation.
+  contents: write    # needed for e.g. vcpkg dependency graph updates
+  id-token: write    # needed for signing certificate in attestation
 
 on:
   push:
@@ -14,14 +14,12 @@ on:
       - '*/**'    # matches all files not in root
       - '!**.md'
       - '!.github/**'
-      - '!.husky/**'
       - '!.tx/**'
       - '!doc/**'
-      - '!webclient/**'
       - '.github/workflows/desktop-build.yml'
       - 'CMakeLists.txt'
       - 'vcpkg.json'
-      - 'vcpkg'
+      - 'vcpkg'    # needed to match submodule bumps (gitlink)
     tags:
       - '*'
   pull_request:
@@ -29,221 +27,283 @@ on:
       - '*/**'    # matches all files not in root
       - '!**.md'
       - '!.github/**'
-      - '!.husky/**'
       - '!.tx/**'
       - '!doc/**'
-      - '!webclient/**'
       - '.github/workflows/desktop-build.yml'
       - 'CMakeLists.txt'
       - 'vcpkg.json'
-      - 'vcpkg'
+      - 'vcpkg'    # needed to match submodule bumps (gitlink)
 
-# Cancel earlier, unfinished runs of this workflow on the same branch (unless on master)
+# Cancel earlier, unfinished runs of this workflow on the same branch (unless on tag --> release)
 concurrency:
   group: "${{ github.workflow }} @ ${{ github.ref_name }}"
-  cancel-in-progress: ${{ github.ref_name != 'master' }}
+  cancel-in-progress: ${{ github.ref_type != 'tag' }}
 
 jobs:
   configure:
     name: Configure
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim    # https://github.com/actions/runner-images/blob/main/images/ubuntu-slim/ubuntu-slim-Readme.md
     outputs:
-      tag: ${{steps.configure.outputs.tag}}
-      sha: ${{steps.configure.outputs.sha}}
+      tag: ${{ steps.configure.outputs.tag }}
+      sha: ${{ steps.configure.outputs.sha }}
 
-    steps:  
-      - name: Configure
+    steps:
+      - name: "Configure"
+        env:
+          RESOLVED_SHA: ${{ case(github.event_name == 'pull_request', github.event.pull_request.head.sha, github.sha) }}
         id: configure
         shell: bash
         run: |
-          tag_regex='^refs/tags/'
-          if [[ $GITHUB_EVENT_NAME == pull-request ]]; then    # pull request
-            sha="${{github.event.pull_request.head.sha}}"
-          elif [[ $GITHUB_REF =~ $tag_regex ]]; then    # release
-            sha="$GITHUB_SHA"
-            tag="${GITHUB_REF/refs\/tags\//}"
-            echo "tag=$tag" >>"$GITHUB_OUTPUT"
-          else    # push to branch
-            sha="$GITHUB_SHA"
+          if [[ "$GITHUB_REF_TYPE" == 'tag' ]]; then    # release
+            echo "tag=$GITHUB_REF_NAME" >> "$GITHUB_OUTPUT"
           fi
-          echo "sha=$sha" >>"$GITHUB_OUTPUT"
+          echo "sha=$RESOLVED_SHA" >> "$GITHUB_OUTPUT"
 
-      - name: Checkout
+      - name: "Checkout"
         if: steps.configure.outputs.tag != null
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
-          fetch-depth: 0
+          fetch-depth: 0    # fetch all history for all branches and tags
 
-      - name: Prepare release parameters
+      - name: "Prepare release parameters"
         id: prepare
         if: steps.configure.outputs.tag != null
         shell: bash
         env:
-          TAG: ${{steps.configure.outputs.tag}}
+          TAG: ${{ steps.configure.outputs.tag }}
         run: .ci/prep_release.sh
 
-      - name: Create release
+      - name: "Create release"
         if: steps.configure.outputs.tag != null
         id: create_release
         shell: bash
         env:
-          GH_TOKEN: ${{github.token}}
-          tag_name: ${{steps.configure.outputs.tag}}
-          target: ${{steps.configure.outputs.sha}}
-          release_name: ${{steps.prepare.outputs.title}}
-          body_path: ${{steps.prepare.outputs.body_path}}
-          prerelease: ${{steps.prepare.outputs.is_beta}}
+          GH_TOKEN: ${{ github.token }}
+          tag_name: ${{ steps.configure.outputs.tag }}
+          target: ${{ steps.configure.outputs.sha }}
+          release_name: ${{ steps.prepare.outputs.title }}
+          body_path: ${{ steps.prepare.outputs.body_path }}
+          prerelease: ${{ steps.prepare.outputs.is_beta }}
         run: |
-          if [[ $prerelease == yes ]]; then
-            args="--prerelease"
-          fi
-          gh release create "$tag_name" --draft --verify-tag $args \
-              --target "$target" --title "$release_name" \
-              --notes-file "$body_path"
+          args=()
+          [[ $prerelease == yes ]] && args+=(--prerelease)
+
+          gh release create "$tag_name" --verify-tag --draft "${args[@]}" \
+            --target "$target" \
+            --title "$release_name" \
+            --notes-file "$body_path"
 
   build-linux:
     strategy:
       fail-fast: false
       matrix:
-        # These names correspond to the files in ".ci/$distro$version"
+        # The files in ".ci/$distro$version" correspond to the values given here
         include:
           - distro: Arch
-            package: skip    # We are packaged in Arch already
-            allow-failure: yes
 
-          - distro: Debian
-            version: 11
-            package: DEB
+            allow-failure: yes
+            package: skip    # We are packaged in Arch already
 
           - distro: Servatrice_Debian
-            version: 11
+            version: 12
+
             package: DEB
-            test: skip
             server_only: yes
+            test: skip
 
           - distro: Debian
             version: 12
+
             package: DEB
             test: skip    # Running tests on all distros is superfluous
 
           - distro: Debian
             version: 13
-            package: DEB
 
-          - distro: Fedora
-            version: 42
-            package: RPM
-            test: skip    # Running tests on all distros is superfluous
+            package: DEB
 
           - distro: Fedora
             version: 43
+
+            package: RPM
+            test: skip    # Running tests on all distros is superfluous
+
+          - distro: Fedora
+            version: 44
+
             package: RPM
 
           - distro: Ubuntu
-            version: 22.04
+            version: 24.04
+
             package: DEB
             test: skip    # Running tests on all distros is superfluous
 
           - distro: Ubuntu
-            version: 24.04
+            version: 26.04
+
             package: DEB
 
-    name: ${{matrix.distro}} ${{matrix.version}}
+            # 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) || '' }}
     needs: configure
-    runs-on: ubuntu-latest
-    continue-on-error: ${{matrix.allow-failure == 'yes'}}
+    runs-on: ubuntu-latest    # https://github.com/actions/runner-images
+    continue-on-error: ${{ matrix.allow-failure == 'yes' }}
+    timeout-minutes: 70
     env:
-      NAME: ${{matrix.distro}}${{matrix.version}}
-      CACHE: ${{github.workspace}}/.cache/${{matrix.distro}}${{matrix.version}}   # directory for caching docker image and ccache
-      # Cache size over the entire repo is 10Gi:
-      # https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
-      CCACHE_SIZE: 500M
+      CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }}${{ matrix.variant }}    # directory for caching docker image and ccache
+      CCACHE_EVICTION_AGE: 7d
+      CCACHE_SIZE: 600M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
       CMAKE_GENERATOR: 'Ninja'
+      NAME: ${{ matrix.distro }}${{ matrix.version }}
+      IMAGE_SUFFIX: ${{ matrix.variant }}
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6
+      - name: "Checkout"
+        uses: actions/checkout@v7
 
-      - name: Restore compiler cache (ccache)
-        id: ccache_restore
-        uses: actions/cache/restore@v4
-        env:
-          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+      - name: "Restore compiler cache (ccache)"
+        id: restore_ccache
+        uses: actions/cache/restore@v6
         with:
-          path: ${{env.CACHE}}
-          key: ccache-${{matrix.distro}}${{matrix.version}}-${{env.BRANCH_NAME}}
-          restore-keys: ccache-${{matrix.distro}}${{matrix.version}}-
+          key: ccache-${{ matrix.distro }}${{ matrix.version }}${{ matrix.variant }}
+          path: ${{ env.CACHE }}
 
-      - name: Build ${{matrix.distro}} ${{matrix.version}} Docker image
+      - name: "Build ${{ matrix.distro }} ${{ matrix.version }} Docker image"
         shell: bash
         run: source .ci/docker.sh --build
 
-      - name: Build debug and test
+      - name: "Build debug and test"
         if: matrix.test != 'skip'
         shell: bash
         env:
-          CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
+          sanitize: '${{ matrix.sanitize }}'
+          coverage: '${{ matrix.coverage }}'
         run: |
           source .ci/docker.sh
-          RUN --server --debug --test --ccache "$CCACHE_SIZE"
+          args=()
+          [[ $GITHUB_REF == "refs/heads/master" ]] && args+=(--evict-ccache "$CCACHE_EVICTION_AGE")
+          args+=(--ccache "$CCACHE_SIZE")
+          args+=(--cmake-generator "$CMAKE_GENERATOR")
 
-      - name: Build release package
+          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
+
+      - name: "Build release package"
         id: build
         if: matrix.package != 'skip'
         shell: bash
         env:
-          BUILD_DIR: build
-          SUFFIX: '-${{matrix.distro}}${{matrix.version}}'
-          package: '${{matrix.package}}'
-          CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
-          NO_CLIENT: ${{matrix.server_only == 'yes' && '--no-client' || '' }}
+          SUFFIX: '-${{ matrix.distro }}${{ matrix.version }}'
+          package: '${{ matrix.package }}'
+          server_only: '${{ matrix.server_only }}'
         run: |
           source .ci/docker.sh
-          RUN --server --release --package "$package" --dir "$BUILD_DIR" \
-                  --ccache "$CCACHE_SIZE" $NO_CLIENT
-          .ci/name_build.sh
+          args=()
+          [[ $server_only == yes ]] && args+=(--no-client)
+          [[ $GITHUB_REF == "refs/heads/master" ]] && args+=(--evict-ccache "$CCACHE_EVICTION_AGE")
+          args+=(--ccache "$CCACHE_SIZE")
+          args+=(--cmake-generator "$CMAKE_GENERATOR")
+          args+=(--suffix "$SUFFIX")
 
-      - name: Save compiler cache (ccache)
+          RUN --server --release --package "$package" "${args[@]}"
+
+      # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
+      - name: "Delete remote compiler cache (ccache)"
+        if: github.ref == 'refs/heads/master' && steps.restore_ccache.outputs.cache-hit
+        continue-on-error: true
+        env:
+          CACHE_PRIMARY_KEY: ${{ steps.restore_ccache.outputs.cache-primary-key }}
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          if gh cache delete --repo "$GITHUB_REPOSITORY" "$CACHE_PRIMARY_KEY"; then
+            echo "Cache deleted successfully"
+          fi
+
+      - name: "Save updated compiler cache (ccache)"
         if: github.ref == 'refs/heads/master'
-        uses: actions/cache/save@v4
+        uses: actions/cache/save@v6
         with:
-          path: ${{env.CACHE}}
-          key: ${{ steps.ccache_restore.outputs.cache-primary-key }}
+          key: ${{ steps.restore_ccache.outputs.cache-primary-key }}
+          path: ${{ env.CACHE }}
 
-      - name: Upload artifact
+      - name: "Upload artifact"
         id: upload_artifact
         if: matrix.package != 'skip'
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
-          name: ${{matrix.distro}}${{matrix.version}}-package
-          path: ${{steps.build.outputs.path}}
+          archive: false
           if-no-files-found: error
+          path: ${{ steps.build.outputs.path }}
 
-      - name: Upload to release
+      - name: "Upload to release"
         id: upload_release
         if: matrix.package != 'skip' && needs.configure.outputs.tag != null
         shell: bash
         env:
-          GH_TOKEN: ${{github.token}}
-          tag_name: ${{needs.configure.outputs.tag}}
-          asset_path: ${{steps.build.outputs.path}}
-          asset_name: ${{steps.build.outputs.name}}
+          asset_name: ${{ steps.build.outputs.fullname }}
+          asset_path: ${{ steps.build.outputs.path }}
+          GH_TOKEN: ${{ github.token }}
+          tag_name: ${{ needs.configure.outputs.tag }}
         run: gh release upload "$tag_name" "$asset_path#$asset_name"
 
-      - name: Attest binary provenance
+      - name: "Attest binary provenance"
         id: attestation
         if: steps.upload_release.outcome == 'success'
-        uses: actions/attest-build-provenance@v3
+        uses: actions/attest@v4
         with:
-          subject-name: ${{steps.build.outputs.name}}
-          subject-digest: sha256:${{ steps.upload_artifact.outputs.artifact-digest }}
+          show-summary: false
+          subject-path: ${{ steps.build.outputs.path }}
 
-      - name: Verify binary attestation
+      - name: "Verify binary attestation"
         if: steps.attestation.outcome == 'success'
         shell: bash
         env:
-          GH_TOKEN: ${{github.token}}
-        run: gh attestation verify ${{steps.build.outputs.path}} -R Cockatrice/Cockatrice
+          BUILD_PATH: ${{ steps.build.outputs.path }}
+          GH_TOKEN: ${{ github.token }}
+        run: gh attestation verify "$BUILD_PATH" --repo Cockatrice/Cockatrice
 
   build-vcpkg:
     strategy:
@@ -251,176 +311,252 @@ jobs:
       matrix:
         include:
           - os: macOS
-            target: 13
-            runner: macos-15-intel
-            soc: Intel
-            xcode: "16.4"
-            type: Release
+            target: 13    # EOL 2025-09-15
+            runner: macos-15-intel    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md
+                                      # macos-26-intel is very slow and fails in CPack during DMG config if not increasing Finder timeout
+
+            ccache_eviction_age: 7d
+            cmake_generator: Ninja
+            make_package: 1
             override_target: 13
-            make_package: 1
             package_suffix: "-macOS13_Intel"
-            artifact_name: macOS13_Intel-package
-            qt_version: 6.6.*
-            qt_arch: clang_64
-            qt_modules: qtimageformats qtmultimedia qtwebsockets
-            cache_qt: false # qt caches take too much space for macOS (1.1Gi)
-            cmake_generator: Ninja
+            qt_version: 6.11.*
+            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
+            soc: Intel
+            type: Release
             use_ccache: 1
+            xcode: "26.3"
 
           - os: macOS
-            target: 14
-            runner: macos-14
-            soc: Apple
-            xcode: "15.4"
-            type: Release
+            target: 14    # EOL 2026-??
+            runner: macos-26    # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
+
+            ccache_eviction_age: 7d
+            cmake_generator: Ninja
             make_package: 1
+            override_target: 14
             package_suffix: "-macOS14"
-            artifact_name: macOS14-package
-            qt_version: 6.6.*
-            qt_arch: clang_64
-            qt_modules: qtimageformats qtmultimedia qtwebsockets
-            cache_qt: false
-            cmake_generator: Ninja
+            qt_version: 6.11.*
+            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
+            soc: Apple
+            type: Release
             use_ccache: 1
+            xcode: "26.6"
 
           - os: macOS
             target: 15
-            runner: macos-15
-            soc: Apple
-            xcode: "16.4"
-            type: Release
+            runner: macos-26    # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
+
+            ccache_eviction_age: 7d
+            cmake_generator: Ninja
             make_package: 1
+            override_target: 15
             package_suffix: "-macOS15"
-            artifact_name: macOS15-package
-            qt_version: 6.6.*
-            qt_arch: clang_64
-            qt_modules: qtimageformats qtmultimedia qtwebsockets
-            cache_qt: false
-            cmake_generator: Ninja
+            qt_version: 6.11.*
+            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
+            soc: Apple
+            type: Release
             use_ccache: 1
+            xcode: "26.6"
 
           - os: macOS
-            target: 15
-            runner: macos-15
-            soc: Apple
-            xcode: "16.4"
-            type: Debug
-            qt_version: 6.6.*
-            qt_arch: clang_64
-            qt_modules: qtimageformats qtmultimedia qtwebsockets
-            cache_qt: false
-            cmake_generator: Ninja
-            use_ccache: 1
+            target: 26
+            runner: macos-26    # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
 
-          - os: Windows
-            target: 7
-            runner: windows-2022
-            type: Release
-            make_package: 1
-            package_suffix: "-Win7"
-            artifact_name: Windows7-installer
-            qt_version: 5.15.*
-            qt_arch: win64_msvc2019_64
-            cache_qt: true
-            cmake_generator: "Visual Studio 17 2022"
-            cmake_generator_platform: x64
+            ccache_eviction_age: 7d
+            cmake_generator: Ninja
+            qt_version: 6.11.*
+            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
+            soc: Apple
+            type: Debug
+            use_ccache: 1
+            xcode: "26.6"
 
           - os: Windows
             target: 10
-            runner: windows-2022
-            type: Release
+            runner: windows-2025    # https://github.com/actions/runner-images/blob/main/images/windows/Windows2025-VS2026-Readme.md
+
+            cmake_generator: "Visual Studio 18 2026"
+            cmake_generator_platform: x64
             make_package: 1
             package_suffix: "-Win10"
-            artifact_name: Windows10-installer
-            qt_version: 6.6.*
-            qt_arch: win64_msvc2019_64
-            qt_modules: qtimageformats qtmultimedia qtwebsockets
-            cache_qt: true
-            cmake_generator: "Visual Studio 17 2022"
-            cmake_generator_platform: x64
+            qt_version: 6.11.*
+            qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets
+            type: Release
 
-    name: ${{matrix.os}} ${{matrix.target}}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
+    name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
     needs: configure
-    runs-on: ${{matrix.runner}}
+    runs-on: ${{ matrix.runner }}
+    timeout-minutes: 100
+    env:
+      CCACHE_DIR: ${{ github.workspace }}/.cache/
+      CCACHE_SIZE: 600M    # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6
+      - name: "Checkout"
+        uses: actions/checkout@v7
         with:
           submodules: recursive
 
-      - name: Add msbuild to PATH
+      - name: "[Windows] Add msbuild to PATH"
         if: matrix.os == 'Windows'
-        id: add-msbuild
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@v3
         with:
           msbuild-architecture: x64
 
-      # Using jianmingyong/ccache-action to setup ccache without using brew
-      # It tries to download a binary of ccache from GitHub Release and falls back to building from source if it fails
-      - name: Setup ccache
-        if: matrix.use_ccache == 1
-        uses: jianmingyong/ccache-action@v1
-        with:
-          install-type: "binary"
-          ccache-key-prefix: ccache-${{matrix.runner}}-${{matrix.soc}}-${{matrix.type}}
-          max-size: 500M
-          gh-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: "[macOS] Setup ccache"
+        if: matrix.os == 'macOS' && matrix.use_ccache == 1
+        run: brew install ccache
 
-      - name: Install Qt ${{matrix.qt_version}}
+      - name: "[macOS] Restore compiler cache (ccache)"
+        if: matrix.os == 'macOS' && matrix.use_ccache == 1
+        id: restore_ccache
+        uses: actions/cache/restore@v6
+        with:
+          key: ccache-${{ matrix.runner }}_${{ matrix.override_target }}-Xcode${{ matrix.xcode }}
+          path: ${{ env.CCACHE_DIR }}
+
+      - name: "[macOS] Install aqtinstall"
+        if: matrix.os == 'macOS'
+        run: pipx install aqtinstall
+
+      # Resolve given wildcard versions (e.g. Qt 6.6.*) to latest version via aqtinstall to avoid stale caches on new releases
+      - name: "[macOS] Resolve latest Qt from ${{ matrix.qt_version }} input"
+        if: matrix.os == 'macOS'
+        env:
+          QT_VERSION: ${{ matrix.qt_version }}
+        id: resolve_qt_version
+        shell: bash
+        run: .ci/resolve_latest_aqt_qt_version.sh "$QT_VERSION"
+
+      - name: "[macOS] Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }}"
+        if: matrix.os == 'macOS'
+        id: restore_qt
+        uses: actions/cache/restore@v6
+        with:
+          key: Qt-${{ steps.resolve_qt_version.outputs.version }}-macOS-${{ matrix.soc }}-${{ matrix.qt_modules }}-thin
+          path: ${{ github.workspace }}/Qt
+
+      # Using jurplel/install-qt-action to install Qt without using brew
+      # Qt build using vcpkg either just fails or takes too long to build
+      - name: "[macOS] Install fat Qt ${{ matrix.qt_version }}"
+        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
         uses: jurplel/install-qt-action@v4
         with:
-          version: ${{matrix.qt_version}}
-          arch: ${{matrix.qt_arch}}
-          modules: ${{matrix.qt_modules}}
-          cache: ${{matrix.cache_qt}}
+          cache: false
+          # cache-key-prefix: Qt
+          dir: ${{ github.workspace }}    # thinning script depends on this location
+          modules: ${{ matrix.qt_modules }}
+          version: ${{ matrix.qt_version }}
 
-      - name: Setup vcpkg cache
+      - name: "[macOS] Create thin Qt libraries"
+        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
+        run: .ci/thin_macos_qtlib.sh
+
+      - name: "[macOS] Cache thin Qt libraries"
+        if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' && github.ref == 'refs/heads/master'
+        uses: actions/cache/save@v6
+        with:
+          key: ${{ steps.restore_qt.outputs.cache-primary-key }}
+          path: ${{ github.workspace }}/Qt
+
+      - name: "[Windows] Install Qt ${{ matrix.qt_version }}"
+        if: matrix.os == 'Windows'
+        uses: jurplel/install-qt-action@v4
+        with:
+          # Qt 6.11.0 only works with aqtinstall directly from git until aqtinstall 3.4 is released
+          aqtsource: git+https://github.com/miurahr/aqtinstall.git
+          cache: ${{ github.ref == 'refs/heads/master' }}
+          cache-key-prefix: Qt
+          modules: ${{ matrix.qt_modules }}
+          version: ${{ matrix.qt_version }}
+
+      - name: "[Windows] Install NSIS"
+        if: matrix.os == 'Windows'
+        shell: bash
+        run: choco install nsis
+
+      - name: "Setup vcpkg cache"
         id: vcpkg-cache
         uses: TAServers/vcpkg-cache@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      # uses environment variables, see compile.sh for more details
-      - name: Build Cockatrice
+      # Uses environment variables, see compile.sh for more details
+      - name: "Build Cockatrice"
         id: build
         shell: bash
         env:
-          BUILDTYPE: '${{matrix.type}}'
-          MAKE_PACKAGE: '${{matrix.make_package}}'
-          PACKAGE_SUFFIX: '${{matrix.package_suffix}}'
-          CMAKE_GENERATOR: ${{matrix.cmake_generator}}
-          CMAKE_GENERATOR_PLATFORM: ${{matrix.cmake_generator_platform}}
-          USE_CCACHE: ${{matrix.use_ccache}}
-          VCPKG_DISABLE_METRICS: 1
-          VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
-          # macOS-specific environment variables, will be ignored on Windows
+          BUILDTYPE: '${{ matrix.type }}'
+          CCACHE_EVICTION_AGE: ${{ matrix.ccache_eviction_age }}
+          CMAKE_GENERATOR: ${{ matrix.cmake_generator }}
+          CMAKE_GENERATOR_PLATFORM: ${{ matrix.cmake_generator_platform }}
+          DEVELOPER_DIR: '/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer'
+          GITHUB_TOKEN: ${{ github.token }}    # needed for vcpkg dependency graph updates, see VCPKG_FEATURE_FLAGS
           MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
-          DEVELOPER_DIR: '/Applications/Xcode_${{matrix.xcode}}.app/Contents/Developer'
+          MAKE_PACKAGE: '${{ matrix.make_package }}'
+          PACKAGE_SUFFIX: '${{ matrix.package_suffix }}'
           TARGET_MACOS_VERSION: ${{ matrix.override_target }}
+          USE_CCACHE: ${{ matrix.use_ccache }}
+          VCPKG_BINARY_SOURCES: "clear;files,${{ steps.vcpkg-cache.outputs.path }},${{ case(github.ref == 'refs/heads/master', 'readwrite', 'read') }}"
+          VCPKG_DISABLE_METRICS: 1
+          VCPKG_FEATURE_FLAGS: dependencygraph
         run: .ci/compile.sh --server --test --vcpkg
 
-      - name: Sign app bundle
-        if: matrix.os == 'macOS' && matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)
+      # CPack reports a failed makensis run as "Problem running NSIS command"
+      # plus a path to NSISOutput.log, and that log lives only on the runner, so
+      # the actual compile error is otherwise nowhere in the workflow output.
+      # Dump it, or a broken installer script is undiagnosable from CI alone.
+      # shell: bash matters here - the default pwsh resolves `find` to Windows'
+      # text-search find.exe, which errors instead of searching.
+      - name: "Dump NSIS compile log"
+        if: failure() && matrix.os == 'Windows'
+        shell: bash
+        run: find . -name NSISOutput.log -exec cat {} +
+
+      # Delete used cache to emulate a ccache update. See https://github.com/actions/cache/issues/342
+      - name: "[macOS] Delete remote compiler cache (ccache)"
+        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master' && steps.restore_ccache.outputs.cache-hit
+        continue-on-error: true
         env:
+          CACHE_PRIMARY_KEY: ${{ steps.restore_ccache.outputs.cache-primary-key }}
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          if gh cache delete --repo "$GITHUB_REPOSITORY" "$CACHE_PRIMARY_KEY"; then
+            echo "Cache deleted successfully"
+          fi
+
+      - name: "[macOS] Cache updated compiler cache (ccache)"
+        if: matrix.os == 'macOS' && matrix.use_ccache == 1 && github.ref == 'refs/heads/master'
+        uses: actions/cache/save@v6
+        with:
+          key: ${{ steps.restore_ccache.outputs.cache-primary-key }}
+          path: ${{ env.CCACHE_DIR }}
+
+      - name: "[macOS] Sign app bundle"
+        if: matrix.os == 'macOS' && matrix.make_package && needs.configure.outputs.tag != null
+        id: sign_macos
+        env:
+          BUILD_PATH: ${{ steps.build.outputs.path }}
           MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
         run: |
           if [[ -n "$MACOS_CERTIFICATE_NAME" ]]
           then
             security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-            /usr/bin/codesign --sign="$MACOS_CERTIFICATE_NAME" --entitlements=".ci/macos.entitlements" --options=runtime --force --deep --timestamp --verbose ${{steps.build.outputs.path}}
+            /usr/bin/codesign --sign="$MACOS_CERTIFICATE_NAME" --entitlements=".ci/macos.entitlements" --options=runtime --force --deep --timestamp --verbose "$BUILD_PATH"
           fi
 
-      - name: Notarize app bundle
-        if: matrix.os == 'macOS' && matrix.make_package && (github.ref == 'refs/heads/master' || needs.configure.outputs.tag != null)
+      - name: "[macOS] Notarize app bundle"
+        if: matrix.os == 'macOS' && steps.sign_macos.outcome == 'success'
         env:
+          BUILD_PATH: ${{ steps.build.outputs.path }}
           MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
-          MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
           MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
+          MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
         run: |
           if [[ -n "$MACOS_NOTARIZATION_APPLE_ID" ]]
           then
@@ -432,7 +568,7 @@ jobs:
             # Therefore, we create a zip file containing our app bundle, so that we can send it to the
             # notarization service
             echo "Creating temp notarization archive"
-            ditto -c -k --keepParent ${{steps.build.outputs.path}} "notarization.zip"
+            ditto -c -k --keepParent "$BUILD_PATH" "notarization.zip"
 
             # Here we send the notarization request to the Apple's Notarization service, waiting for the result.
             # This typically takes a few seconds inside a CI environment, but it might take more depending on the App
@@ -444,50 +580,52 @@ jobs:
             # Finally, we need to "attach the staple" to our executable, which will allow our app to be
             # validated by macOS even when an internet connection is not available.
             echo "Attach staple"
-            xcrun stapler staple ${{steps.build.outputs.path}}
+            xcrun stapler staple "$BUILD_PATH"
           fi
 
-      - name: Upload artifact
-        id: upload_artifact
+      - name: "Upload artifact"
         if: matrix.make_package
-        uses: actions/upload-artifact@v5
+        id: upload_artifact
+        uses: actions/upload-artifact@v7
         with:
-          name: ${{matrix.artifact_name}}
-          path: ${{steps.build.outputs.path}}
+          archive: false
           if-no-files-found: error
+          path: ${{ steps.build.outputs.path }}
 
-      - name: Upload pdb database
-        if: matrix.os == 'Windows'
-        uses: actions/upload-artifact@v5
+      - name: "[Windows] Upload PDBs (Program Databases)"
+        if: matrix.os == 'Windows' && github.ref_type != 'tag'
+        uses: actions/upload-artifact@v7
         with:
-          name: Windows${{matrix.target}}-debug-pdbs
+          if-no-files-found: error
+          name: ${{ steps.build.outputs.name }}-PDBs
           path: |
             build/cockatrice/Release/*.pdb
+            build/oracle/Release/*.pdb
             build/servatrice/Release/*.pdb
-          if-no-files-found: error
 
-      - name: Upload to release
+      - name: "Upload to release"
+        if: needs.configure.outputs.tag != null && matrix.make_package == '1'
         id: upload_release
-        if: needs.configure.outputs.tag != null
         shell: bash
         env:
-          GH_TOKEN: ${{github.token}}
-          tag_name: ${{needs.configure.outputs.tag}}
-          asset_path: ${{steps.build.outputs.path}}
-          asset_name: ${{steps.build.outputs.name}}
+          asset_name: ${{ steps.build.outputs.fullname }}
+          asset_path: ${{ steps.build.outputs.path }}
+          GH_TOKEN: ${{ github.token }}
+          tag_name: ${{ needs.configure.outputs.tag }}
         run: gh release upload "$tag_name" "$asset_path#$asset_name"
 
-      - name: Attest binary provenance
-        id: attestation
+      - name: "Attest binary provenance"
         if: steps.upload_release.outcome == 'success'
-        uses: actions/attest-build-provenance@v3
+        id: attestation
+        uses: actions/attest@v4
         with:
-          subject-name: ${{steps.build.outputs.name}}
-          subject-digest: sha256:${{ steps.upload_artifact.outputs.artifact-digest }}
+          show-summary: false
+          subject-path: ${{ steps.build.outputs.path }}
 
-      - name: Verify binary attestation
+      - name: "Verify binary attestation"
         if: steps.attestation.outcome == 'success'
         shell: bash
         env:
-          GH_TOKEN: ${{github.token}}
-        run: gh attestation verify ${{steps.build.outputs.path}} -R Cockatrice/Cockatrice
+          BUILD_PATH: ${{ steps.build.outputs.path }}
+          GH_TOKEN: ${{ github.token }}
+        run: gh attestation verify "$BUILD_PATH" --repo Cockatrice/Cockatrice
diff --git a/.github/workflows/desktop-lint.yml b/.github/workflows/desktop-lint.yml
index 433f302a5..93ba79464 100644
--- a/.github/workflows/desktop-lint.yml
+++ b/.github/workflows/desktop-lint.yml
@@ -1,17 +1,18 @@
 name: Code Style (C++) 
 
+permissions:
+  contents: read
+
 on:
-  # push trigger not needed for linting, we do not allow direct pushes to master
+  # Push trigger not needed for linting, we do not allow direct pushes to master
   pull_request:
     paths:
       - '*/**'    # matches all files not in root
       - '!**.md'
       - '!.ci/**'
       - '!.github/**'
-      - '!.husky/**'
       - '!.tx/**'
       - '!doc/**'
-      - '!webclient/**'
       - '.ci/lint_cpp.sh'
       - '.github/workflows/desktop-lint.yml'
       - '.clang-format'
@@ -20,20 +21,23 @@ on:
 
 jobs:
   format:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-slim
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v6
+    - name: "Checkout"
+      uses: actions/checkout@v7
       with:
-        fetch-depth: 20 # should be enough to find merge base
+        fetch-depth: 20    # should be enough to find merge base
 
-    - name: Install dependencies
+    - name: "Install dependencies"
       shell: bash
       run: |
         sudo apt-get update
-        sudo apt-get install -y --no-install-recommends clang-format cmake-format shellcheck
+        sudo apt-get install -y --no-install-recommends \
+          clang-format \
+          cmake-format \
+          shellcheck
 
-    - name: Check code formatting
+    - name: "Check code formatting"
       shell: bash
       run: ./.ci/lint_cpp.sh
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 1846766bf..937386940 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -1,9 +1,11 @@
-name: Build Docker Image
+name: Build Docker
+
+permissions:
+  contents: read    # needed to checkout repo
+  packages: write    # needed for interacting with GHCR
 
 on:
   push:
-    tags:
-      - '*Release*'
     branches:
       - master
   pull_request:
@@ -11,56 +13,185 @@ on:
       - master
     paths:
       - '.github/workflows/docker-release.yml'
+      - '.dockerignore'
       - 'Dockerfile'
+      - 'docker-compose.yml'
+      - 'docker-compose.yml.windows'
+  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)
+concurrency:
+  group: "${{ github.workflow }} @ ${{ inputs.tag || github.ref_name }}"
+  cancel-in-progress: ${{ github.event_name != 'release' && github.event_name != 'workflow_dispatch' }}
+
+env:
+  GHCR_IMAGE: ghcr.io/cockatrice/servatrice
+  OCI_DESCRIPTION: Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games
+  OCI_TITLE: Servatrice
+  OCI_URL: https://cockatrice.github.io/
 
 jobs:
-  docker:
-    name: amd64 & arm64
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
+  # Create one platform-specific image and publish its OCI image manifest per matrix job
+  build:
+    name: "Servatrice (${{ matrix.label }})"
+    if: github.repository_owner == 'Cockatrice'
+    runs-on: ${{ matrix.runner }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - label: x86
+            platform: linux/amd64
+            runner: ubuntu-latest    # https://github.com/actions/runner-images
+
+          - label: arm
+            platform: linux/arm64
+            runner: ubuntu-24.04-arm    # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Arm64-Readme.md, replace with "ubuntu-latest-arm" once available
+
+    env:
+      CACHE_SCOPE: servatrice-${{ matrix.label }}
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Docker metadata
-        id: metadata
-        uses: docker/metadata-action@v5
+      - name: "Checkout"
+        uses: actions/checkout@v7
         with:
-          images: |
-            ghcr.io/cockatrice/servatrice
-          labels: |
-            org.opencontainers.image.title=Servatrice
-            org.opencontainers.image.url=https://cockatrice.github.io/
-            org.opencontainers.image.description=Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games
-          annotations: |
-            org.opencontainers.image.title=Servatrice
-            org.opencontainers.image.url=https://cockatrice.github.io/
-            org.opencontainers.image.description=Server for Cockatrice, a cross-platform virtual tabletop for multiplayer card games  
+          ref: ${{ case(github.event_name == 'workflow_dispatch', format('refs/tags/{0}', inputs.tag), '') }}
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+      - name: "Set up Docker buildx"
+        uses: docker/setup-buildx-action@v4
 
-      - name: Set up Docker buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GitHub Container Registry
-        if: github.ref_type == 'tag'
-        uses: docker/login-action@v3
+      - name: "Login to GitHub Container Registry (GHCR)"
+        if: (github.event_name == 'release' && github.event.release.prerelease == false) || github.event_name == 'workflow_dispatch'
+        id: login
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v6
+      # Don't push for non-publishing triggers
+      - name: "Build image"
+        if: steps.login.outcome != 'success'
+        uses: docker/build-push-action@v7
         with:
+          cache-from: type=gha,scope=${{ env.CACHE_SCOPE }}
+          cache-to: ${{ case(github.ref == 'refs/heads/master', format('type=gha,mode=max,scope={0}', env.CACHE_SCOPE), '') }}
           context: .
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.ref_type == 'tag' }}
-          tags: ${{ steps.metadata.outputs.tags }}
-          labels: ${{ steps.metadata.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          platforms: ${{ matrix.platform }}
+          push: false
+
+      # Add OCI labels and push single-platform image by digest (without tags)
+      - name: "Build image and push by digest"
+        if: steps.login.outcome == 'success'
+        id: build
+        uses: docker/build-push-action@v7
+        with:
+          cache-from: type=gha,scope=${{ env.CACHE_SCOPE }}
+          cache-to: type=gha,mode=max,scope=${{ env.CACHE_SCOPE }}
+          context: .
+          labels: |
+            org.opencontainers.image.description=${{ env.OCI_DESCRIPTION }}
+            org.opencontainers.image.title=${{ env.OCI_TITLE }}
+            org.opencontainers.image.url=${{ env.OCI_URL }}
+          outputs: type=image,name=${{ env.GHCR_IMAGE }},name-canonical=true,push=true,push-by-digest=true
+          platforms: ${{ matrix.platform }}
+          provenance: mode=max    # Do not pass secrets as build arguments with this option
+          sbom: true
+
+      - name: "Export digest"
+        if: steps.login.outcome == 'success'
+        env:
+          DIGEST: ${{ steps.build.outputs.digest }}
+        run: |
+          mkdir -p "$RUNNER_TEMP/digests"
+          touch "$RUNNER_TEMP/digests/${DIGEST#sha256:}"
+
+      - name: "Upload digest"
+        if: steps.login.outcome == 'success'
+        uses: actions/upload-artifact@v7
+        with:
+          if-no-files-found: error
+          name: digest-${{ matrix.label }}
+          path: ${{ runner.temp }}/digests/*
+          retention-days: 1
+
+
+  # Create an OCI image index from the platform-specific image manifests
+  index:
+    name: "Publish multi-platform Servatrice image"
+    if: github.repository_owner == 'Cockatrice' && ((github.event_name == 'release' && github.event.release.prerelease == false) || github.event_name == 'workflow_dispatch')
+    needs: build
+    runs-on: ubuntu-slim    # https://github.com/actions/runner-images/blob/main/images/ubuntu-slim/ubuntu-slim-Readme.md
+
+    steps:
+      - name: "Download digests"
+        uses: actions/download-artifact@v8
+        with:
+          path: ${{ runner.temp }}/digests
+          pattern: digest-*
+          merge-multiple: true
+
+      - name: "Login to GitHub Container Registry (GHCR)"
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ github.token }}
+
+      - name: "Docker metadata"
+        id: metadata
+        uses: docker/metadata-action@v6
+        with:
+          images: ${{ env.GHCR_IMAGE }}
+          flavor: |
+            latest=auto
+          # 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 }}
+
+      # Add OCI annotations to image index and publish tags
+      - name: "Create image index"
+        env:
+          DOCKER_TAGS: ${{ steps.metadata.outputs.tags }}
+        working-directory: ${{ runner.temp }}/digests
+        run: |
+          TAG_ARGS=()
+          while IFS= read -r tag; do
+            TAG_ARGS+=(--tag "$tag")
+          done <<< "$DOCKER_TAGS"
+
+          DIGEST_ARGS=()
+          for digest in *; do
+            DIGEST_ARGS+=("$GHCR_IMAGE@sha256:$digest")
+          done
+
+          docker buildx imagetools create \
+            --prefer-index=true \
+            --annotation "index:org.opencontainers.image.description=$OCI_DESCRIPTION" \
+            --annotation "index:org.opencontainers.image.title=$OCI_TITLE" \
+            --annotation "index:org.opencontainers.image.url=$OCI_URL" \
+            "${TAG_ARGS[@]}" \
+            "${DIGEST_ARGS[@]}"
+
+      - name: "Inspect images"
+        env:
+          GITHUB_TAG: ${{ inputs.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 396ccd62b..91ee14e3e 100644
--- a/.github/workflows/documentation-build.yml
+++ b/.github/workflows/documentation-build.yml
@@ -1,18 +1,26 @@
 name: Generate Docs
 
+permissions:
+  contents: read    # write permission to the destination repo come from 'deploy_key'
+
 on:
-  push:
-    tags:
-      - '*'   # Only re-generate docs when a new tagged version is pushed
   pull_request:
     paths:
       - 'doc/doxygen/**'
       - '.github/workflows/documentation-build.yml'
       - 'Doxyfile'
+  release:
+    types:
+      - published    # publishing of stable releases and pre-releases
   workflow_dispatch:
 
+# Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
+concurrency:
+  group: "${{ github.workflow }} @ ${{ github.ref_name }}"
+  cancel-in-progress: ${{ github.event_name != 'release' }}
+
 env:
-  COCKATRICE_REF: ${{ github.ref_name }}    # Tag name if the commit is tagged, otherwise branch name
+  COCKATRICE_REF: ${{ github.ref_name }}    # tag name if the commit is tagged, otherwise branch name
 
 jobs:
   docs:
@@ -20,20 +28,24 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v6
+      - name: "Checkout"
+        uses: actions/checkout@v7
+        with:
+          submodules: recursive
 
-      - name: Install Graphviz
+      - name: "Install Graphviz"
+        shell: bash
         run: |
           sudo apt-get install -y graphviz
           dot -V
 
-      - name: Install Doxygen
-        uses: ssciwr/doxygen-install@v1
+      - name: "Install Doxygen"
+        uses: ssciwr/doxygen-install@v2
         with:
-          version: "1.14.0"
+          version: "1.18.0"
 
-      - name: Update Doxygen Configuration
+      - name: "Update Doxygen Configuration"
+        shell: bash
         run: |
           git diff Doxyfile
           doxygen -u Doxyfile
@@ -46,16 +58,22 @@ jobs:
             exit 1
           fi
 
-      - name: Generate Documentation
+      - name: "Generate Documentation"
         if: always()
+        shell: bash
         run: doxygen Doxyfile
 
-      - name: Deploy to cockatrice.github.io
-        if: github.event_name != 'pull_request'
+      - name: "Deploy to cockatrice.github.io/docs"
+        if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
         uses: peaceiris/actions-gh-pages@v4
         with:
           deploy_key: ${{ secrets.DOCS_DEPLOY_KEY }}
+          destination_dir: docs    # docs will be available at https://cockatrice.github.io/docs/
           external_repository: Cockatrice/cockatrice.github.io
           publish_branch: master
           publish_dir: ./docs/html
-          destination_dir: docs   # Docs will live under https://cockatrice.github.io/docs/
+
+      - 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 81d6f4e75..da3df1714 100644
--- a/.github/workflows/translations-pull.yml
+++ b/.github/workflows/translations-pull.yml
@@ -1,14 +1,18 @@
 name: Update Translations
 
+permissions:
+  contents: write
+  pull-requests: write
+
 on:
-  workflow_dispatch:
-  schedule:
-    # runs in the middle of each month starting a quarter (UTC) = two weeks after new strings are built
-    - cron: '0 0 15 1,4,7,10 *'
   pull_request:
     paths:
       - '.tx/**'
       - '.github/workflows/translations-pull.yml'
+  schedule:
+    # Runs in the middle of each month starting a quarter (UTC) = two weeks after new strings are built
+    - cron: '0 0 15 1,4,7,10 *'
+  workflow_dispatch:
 
 jobs:
   translations:
@@ -16,58 +20,56 @@ jobs:
     if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
 
     name: Pull languages
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
 
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@v6
+      - name: "Checkout repo"
+        uses: actions/checkout@v7
 
-      - name: Pull translated strings from Transifex
+      - name: "Pull translated strings from Transifex"
+        # Do not run this step for PR's from forks, they don't have access to the secret
+        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false
         uses: transifex/cli-action@v2
         with:
-          # used config file: https://github.com/Cockatrice/Cockatrice/blob/master/.tx/config
-          # https://github.com/transifex/cli#pulling-files-from-transifex
-          token: ${{ secrets.TX_TOKEN }}
+          # Used config file: https://github.com/Cockatrice/Cockatrice/blob/master/.tx/config
+          # Docs: https://github.com/transifex/cli#pulling-files-from-transifex
           args: pull --force --all
+          token: ${{ secrets.TX_TOKEN }}
 
-      - name: Create pull request
+      - name: "Create pull request"
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           add-paths: |
             cockatrice/translations/*.ts
             oracle/translations/*.ts
-            webclient/public/locales/*/translation.json
-          commit-message: Update translation files
-          # author is the owner of the commit
-          author: github-actions <github-actions@github.com>
-          branch: ci-update_translations
-          delete-branch: true
-          title: 'Update translations'
+          author: github-actions <github-actions@github.com>    # owner of the commit
           body: |
             Pulled all translated strings from [Transifex][1].
-            
+
             ---
             *This PR is automatically generated and updated by the workflow at `.github/workflows/translations-pull.yml`. Review [action runs][2].*<br>
             *After merging, all new languages and translations are available in the next build.*
-            
+
             [1]: https://explore.transifex.com/cockatrice/cockatrice/
             [2]: https://github.com/Cockatrice/Cockatrice/actions/workflows/translations-pull.yml?query=branch%3Amaster
+          branch: ci-update_translations
+          commit-message: Update translation files
+          delete-branch: true
+          draft: false
           labels: |
             CI
             Translation
-          draft: false
+          title: 'Update translations'
 
-      - name: PR Status
+      - name: "PR Status"
         if: github.event_name != 'pull_request'
         shell: bash
         env:
-          STATUS: ${{ steps.create_pr.outputs.pull-request-operation }}
+          PR_NUMBER: ${{ steps.create_pr.outputs.pull-request-number }}
+          PR_URL: ${{ steps.create_pr.outputs.pull-request-url }}
+          STATUS: ${{ case(steps.create_pr.outputs.pull-request-operation == 'none', 'unchanged', steps.create_pr.outputs.pull-request-operation) }}
         run: |
-          if [[ "$STATUS" == "none" ]]; then
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY
-          else
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY
-          fi
-          echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY
+          echo "PR #$PR_NUMBER $STATUS!" >> "$GITHUB_STEP_SUMMARY"
+          echo "URL: $PR_URL" >> "$GITHUB_STEP_SUMMARY"
diff --git a/.github/workflows/translations-push.yml b/.github/workflows/translations-push.yml
index d201e7ad8..17645cab2 100644
--- a/.github/workflows/translations-push.yml
+++ b/.github/workflows/translations-push.yml
@@ -1,14 +1,18 @@
 name: Update Translation Source
 
+permissions:
+  contents: write
+  pull-requests: write
+
 on:
-  workflow_dispatch:
-  schedule:
-    # runs at the start of each quarter (UTC)
-    - cron: '0 0 1 1,4,7,10 *'
   pull_request:
     paths:
       - '.ci/update_translation_source_strings.sh'
       - '.github/workflows/translations-push.yml'
+  schedule:
+    # Runs at the start of each quarter (UTC)
+    - cron: '0 0 1 1,4,7,10 *'
+  workflow_dispatch:
 
 jobs:
   translations:
@@ -16,37 +20,38 @@ jobs:
     if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
 
     name: Push strings
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
 
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@v6
+      - name: "Checkout repo"
+        uses: actions/checkout@v7
 
-      - name: Install lupdate
+      - name: "Install lupdate"
         shell: bash
         run: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends qttools5-dev-tools
 
-      - name: Update Cockatrice translation source
+      - name: "Update Cockatrice translation source"
+        env:
+          FILE: cockatrice/cockatrice_en@source.ts
         id: cockatrice
         shell: bash
-        run: |
-          FILE="cockatrice/cockatrice_en@source.ts"
-          export DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')"
-          FILE="$FILE" DIRS="$DIRS" .ci/update_translation_source_strings.sh
+        run: >
+          DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')"
+          .ci/update_translation_source_strings.sh
 
-      - name: Update Oracle translation source
+      - name: "Update Oracle translation source"
         id: oracle
         shell: bash
         env:
-          FILE: 'oracle/oracle_en@source.ts'
           DIRS: 'oracle/src'
+          FILE: 'oracle/oracle_en@source.ts'
         run: .ci/update_translation_source_strings.sh
 
-      - name: Render template
+      - name: "Render template"
         id: template
-        uses: chuhlomin/render-template@v1
+        uses: chuhlomin/render-template/binary@v1
         with:
           template: .ci/update_translation_source_strings_template.md
           vars: |
@@ -54,35 +59,32 @@ jobs:
             oracle_output: ${{ steps.oracle.outputs.output }}
             commit: ${{ github.sha }}
 
-      - name: Create pull request
+      - name: "Create pull request"
         if: github.event_name != 'pull_request'
         id: create_pr
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v8
         with:
           add-paths: |
             cockatrice/cockatrice_en@source.ts
             oracle/oracle_en@source.ts
-          commit-message: Update translation source strings
-          # author is the owner of the commit
-          author: github-actions <github-actions@github.com>
-          branch: ci-update_translation_source
-          delete-branch: true
-          title: 'Update source strings'
+          author: github-actions <github-actions@github.com>    # owner of the commit
           body: ${{ steps.template.outputs.result }}
+          branch: ci-update_translation_source
+          commit-message: Update translation source strings
+          delete-branch: true
+          draft: false
           labels: |
             CI
             Translation
-          draft: false
+          title: 'Update source strings'
 
-      - name: PR Status
+      - name: "PR Status"
         if: github.event_name != 'pull_request'
         shell: bash
         env:
-          STATUS: ${{ steps.create_pr.outputs.pull-request-operation }}
+          PR_NUMBER: ${{ steps.create_pr.outputs.pull-request-number }}
+          PR_URL: ${{ steps.create_pr.outputs.pull-request-url }}
+          STATUS: ${{ case(steps.create_pr.outputs.pull-request-operation == 'none', 'unchanged', steps.create_pr.outputs.pull-request-operation) }}
         run: |
-          if [[ "$STATUS" == "none" ]]; then
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} unchanged!" >> $GITHUB_STEP_SUMMARY
-          else
-            echo "PR #${{ steps.create_pr.outputs.pull-request-number }} $STATUS!" >> $GITHUB_STEP_SUMMARY
-          fi
-          echo "URL: ${{ steps.create_pr.outputs.pull-request-url }}" >> $GITHUB_STEP_SUMMARY
+          echo "PR #$PR_NUMBER $STATUS!" >> "$GITHUB_STEP_SUMMARY"
+          echo "URL: $PR_URL" >> "$GITHUB_STEP_SUMMARY"
diff --git a/.github/workflows/web-build.yml b/.github/workflows/web-build.yml
deleted file mode 100644
index 8d756da02..000000000
--- a/.github/workflows/web-build.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-name: Build Web
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - '.husky/**'
-      - 'webclient/**'
-      - '!**.md'
-      - '.github/workflows/web-build.yml'
-  pull_request:
-    paths:
-      - '.husky/**'
-      - 'webclient/**'
-      - '!**.md'
-      - '.github/workflows/web-build.yml'
-
-jobs:
-  build-web:
-    name: React (Node ${{matrix.node_version}})
-
-    runs-on: ubuntu-latest
-
-    defaults:
-      run:
-        working-directory: webclient
-
-    strategy:
-      fail-fast: false
-      matrix:
-        node_version:
-          - 16
-          - lts/*
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: ${{matrix.node_version}}
-          cache: 'npm'
-          cache-dependency-path: 'webclient/package-lock.json'
-
-      - name: Install dependencies
-        run: npm clean-install
-
-      - name: Build app
-        run: npm run build
-
-      - name: Test app
-        run: npm run test
diff --git a/.github/workflows/web-lint.yml b/.github/workflows/web-lint.yml
deleted file mode 100644
index 8a90325e7..000000000
--- a/.github/workflows/web-lint.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Code Style (TypeScript) 
-
-on:
-  # push trigger not needed for linting, we do not allow direct pushes to master
-  pull_request:
-    paths:
-      - 'webclient/**'
-      - '!**.md'
-      - '.github/workflows/web-lint.yml'
-
-jobs:
-  ESLint:
-    runs-on: ubuntu-latest
-    
-    defaults:
-      run:
-        working-directory: webclient
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v6
-
-    - name: Setup Node.js
-      uses: actions/setup-node@v6
-      with:
-        cache: 'npm'
-        cache-dependency-path: 'webclient/package-lock.json'
-
-    - name: Install ESLint
-      run: npm clean-install --ignore-scripts
-
-    - name: Run ESLint
-      run: npm run lint
diff --git a/.gitignore b/.gitignore
index 33c1ae31d..54939bdcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ mysql.cnf
 .DS_Store
 .idea/
 *.aps
+*.cache
 cmake-build*
 preferences
 compile_commands.json
diff --git a/.gitmodules b/.gitmodules
index a0a57f3d7..732fec7ca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "vcpkg"]
 	path = vcpkg
 	url = https://github.com/microsoft/vcpkg.git
+[submodule "doxygen-awesome-css"]
+	path = doc/doxygen/theme
+	url = https://github.com/jothepro/doxygen-awesome-css.git
diff --git a/.husky/pre-commit b/.husky/pre-commit
deleted file mode 100755
index 369435d6b..000000000
--- a/.husky/pre-commit
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-cd webclient
-npm run translate
-
-git add src/i18n-default.json
diff --git a/.tx/config b/.tx/config
index 9bc5ce950..8174a4dfd 100644
--- a/.tx/config
+++ b/.tx/config
@@ -16,11 +16,3 @@ source_file = oracle/oracle_en@source.ts
 file_filter = oracle/translations/oracle_<lang>.ts
 type = QT
 minimum_perc = 10
-
-[o:cockatrice:p:cockatrice:r:webclient-src-i18n-default-json--master]
-resource_name = Webclient
-source_lang = en
-source_file = webclient/src/i18n-default.json
-file_filter = webclient/public/locales/<lang>/translation.json
-type = KEYVALUEJSON
-minimum_perc = 10
diff --git a/CMakeLists.txt b/CMakeLists.txt
index affc6472d..bee47972c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,25 +5,27 @@
 # This file sets all the variables shared between the projects
 # like the installation path, compilation flags etc..
 
-# cmake 3.16 is required if using qt6
-cmake_minimum_required(VERSION 3.10)
+# 3.16 required for Qt6 and target_precompile_headers()
+cmake_minimum_required(VERSION 3.16)
 
-# Early detect ccache
+# Use compiler cache (ccache)
 option(USE_CCACHE "Cache the build results with ccache" ON)
 # Treat warnings as errors (Debug builds only)
 option(WARNING_AS_ERROR "Treat warnings as errors in debug builds" ON)
 # Check for translation updates
 option(UPDATE_TRANSLATIONS "Update translations on compile" OFF)
-# Compile servatrice
-option(WITH_SERVER "build servatrice" OFF)
-# Compile cockatrice
-option(WITH_CLIENT "build cockatrice" ON)
-# Compile oracle
-option(WITH_ORACLE "build oracle" ON)
-# Compile dbconverter
-option(WITH_DBCONVERTER "build dbconverter" ON)
+# Compile Cockatrice
+option(WITH_CLIENT "Build Cockatrice client" ON)
+# Compile Oracle
+option(WITH_ORACLE "Build Cockatrice card database tool (Oracle)" ON)
+# Compile Servatrice
+option(WITH_SERVER "Build Cockatrice server (Servatrice)" OFF)
 # Compile tests
-option(TEST "build tests" OFF)
+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)
 
@@ -41,13 +43,24 @@ else()
   )
 endif()
 
-if(USE_CCACHE)
+# ccache does not support MSVC and must not auto-engage on Windows
+# (it is installed unintentionally on the Windows CI runner).
+# NOTE: this keys off the target OS, so a mingw/Ninja configuration on Windows
+# also opts out of ccache even though the GNUCXX branch below supports it.
+if(USE_CCACHE AND NOT WIN32)
   find_program(CCACHE_PROGRAM ccache)
   if(CCACHE_PROGRAM)
     # Support Unix Makefiles and Ninja
     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+    # PCH-aware caching, matching .ci/compile.sh: without this ccache refuses
+    # to cache any TU that consumes a precompiled header, so every PCH-backed
+    # target recompiles from scratch on each build.
+    execute_process(COMMAND ${CCACHE_PROGRAM} --set-config sloppiness=pch_defines,time_macros)
     message(STATUS "Found CCache ${CCACHE_PROGRAM}")
   endif()
+elseif(USE_CCACHE AND WIN32)
+  # An explicit opt-in must not disappear silently on Windows.
+  message(STATUS "ccache disabled: not supported for the MSVC toolchain on Windows")
 endif()
 
 if(WIN32 OR USE_VCPKG)
@@ -66,21 +79,22 @@ if(WIN32 OR USE_VCPKG)
   else()
     set(QTDIR
         ""
-        CACHE PATH "Path to Qt (e.g. C:/Qt/5.7/msvc2015_64)"
+        CACHE PATH "Path to Qt (e.g. C:/Qt/6.4.2/msvc2019_64)"
     )
     message(
-      WARNING "QTDIR variable is missing.  Please set this variable to specify path to Qt (e.g. C:/Qt/5.7/msvc2015_64)"
+      WARNING
+        "QTDIR variable is missing.  Please set this variable to specify path to Qt (e.g. C:/Qt/6.4.2/msvc2019_64)"
     )
   endif()
 endif()
 
 # A project name is needed for CPack
 # Version can be overriden by git tags, see cmake/getversion.cmake
-project("Cockatrice" VERSION 2.11.0)
+project("Cockatrice" VERSION 3.1.2)
 
 # Set release name if not provided via env/cmake var
 if(NOT DEFINED GIT_TAG_RELEASENAME)
-  set(GIT_TAG_RELEASENAME "Omenpath")
+  set(GIT_TAG_RELEASENAME "Reality Check")
 endif()
 
 # Use c++20 for all targets
@@ -176,6 +190,7 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
       -Wno-error=delete-non-virtual-dtor
       -Wno-error=sign-compare
       -Wno-error=missing-declarations
+      -Wno-error=sfinae-incomplete # GCC 16+: Qt MOC + protobuf forward decls trigger this
   )
 
   foreach(FLAG ${ADDITIONAL_DEBUG_FLAGS})
@@ -184,6 +199,9 @@ elseif(CMAKE_COMPILER_IS_GNUCXX)
       set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${FLAG}")
     endif()
   endforeach()
+
+  # Reduce compiler I/O by using pipes between stages instead of temp files
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe")
 else()
   # other: osx/llvm, bsd/llvm
   set(CMAKE_CXX_FLAGS_RELEASE "-O2")
@@ -192,8 +210,17 @@ else()
   else()
     set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wextra")
   endif()
+
+  # Reduce compiler I/O by using pipes between stages instead of temp files
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe")
 endif()
 
+# 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")
@@ -239,11 +266,6 @@ if(WIN32)
   find_package(OpenSSL REQUIRED)
   if(OPENSSL_FOUND)
     include_directories(${OPENSSL_INCLUDE_DIRS})
-  else()
-    message(
-      WARNING
-        "Could not find OpenSSL runtime libraries. They are not required for compiling, but needs to be available at runtime."
-    )
   endif()
 endif()
 
@@ -256,7 +278,9 @@ endif()
 set(CPACK_PACKAGE_CONTACT "Zach Halpern <zach@cockatrice.us>")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}")
 set(CPACK_PACKAGE_VENDOR "Cockatrice Development Team")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
+set(CPACK_PACKAGE_DESCRIPTION
+    "Cockatrice is an open-source, multiplatform application for playing tabletop card games over a network. The program's server design prevents users from manipulating the game for unfair advantage. The client also provides a single-player mode, which allows users to brew while offline."
+)
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
@@ -279,11 +303,7 @@ if(UNIX)
     if(CPACK_GENERATOR STREQUAL "RPM")
       set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
       set(CPACK_RPM_MAIN_COMPONENT "cockatrice")
-      if(Qt6_FOUND)
-        set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qttools, qt6-qtsvg, qt6-qtmultimedia, qt6-qtimageformats")
-      elseif(Qt5_FOUND)
-        set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt5-qttools, qt5-qtsvg, qt5-qtmultimedia")
-      endif()
+      set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qtimageformats, qt6-qtmultimedia, qt6-qtsvg, qt6-qttools")
       set(CPACK_RPM_PACKAGE_GROUP "Amusements/Games")
       set(CPACK_RPM_PACKAGE_URL "http://github.com/Cockatrice/Cockatrice")
       # stop directories from making package conflicts
@@ -301,12 +321,8 @@ if(UNIX)
       set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
       set(CPACK_DEBIAN_PACKAGE_SECTION "games")
       set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://github.com/Cockatrice/Cockatrice")
-      if(Qt6_FOUND)
-        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-qpa-plugins, qt6-image-formats-plugins")
-        set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libqt6sql6-mysql") # for connecting servatrice to a mysql db
-      elseif(Qt5_FOUND)
-        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5multimedia5-plugins, libqt5svg5")
-      endif()
+      set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-image-formats-plugins, qt6-qpa-plugins")
+      set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libqt6sql6-mysql") # for connecting servatrice to a mysql db
     endif()
   endif()
 elseif(WIN32)
@@ -320,6 +336,55 @@ 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.
+  #
+  # 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.
+  #
+  # 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)
+    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")
+    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")
+
   # include vcredist into the package; NSIS will take care of running it
   if(VCREDISTRUNTIME_FOUND)
     install(FILES "${VCREDISTRUNTIME_FILE}" DESTINATION ./)
@@ -330,7 +395,12 @@ include(CPack)
 
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_interfaces ${CMAKE_BINARY_DIR}/libcockatrice_interfaces)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_protocol ${CMAKE_BINARY_DIR}/libcockatrice_protocol)
-add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_network ${CMAKE_BINARY_DIR}/libcockatrice_network)
+if(WITH_CLIENT
+   OR WITH_SERVER
+   OR WITH_ORACLE
+)
+  add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_network ${CMAKE_BINARY_DIR}/libcockatrice_network)
+endif()
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_deck_list ${CMAKE_BINARY_DIR}/libcockatrice_deck_list)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_rng ${CMAKE_BINARY_DIR}/libcockatrice_rng)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_card ${CMAKE_BINARY_DIR}/libcockatrice_card)
@@ -356,11 +426,6 @@ if(WITH_ORACLE)
   set(CPACK_INSTALL_CMAKE_PROJECTS "Oracle;Oracle;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
 endif()
 
-if(WITH_DBCONVERTER)
-  add_subdirectory(dbconverter)
-  set(CPACK_INSTALL_CMAKE_PROJECTS "Dbconverter;Dbconverter;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})
-endif()
-
 if(TEST)
   include(CTest)
   add_subdirectory(tests)
diff --git a/Dockerfile b/Dockerfile
index 80f9f69f2..7d3deb5fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,37 +1,49 @@
 # -------- Build Stage --------
-FROM ubuntu:24.04 AS build
+FROM ubuntu:26.04 AS build
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  build-essential \
-  cmake \
-  file \
-  g++ \
-  git \
-  libmariadb-dev-compat \
-  libprotobuf-dev \
-  libqt6sql6-mysql \
-  qt6-websockets-dev \
-  protobuf-compiler \
-  qt6-tools-dev \
-  qt6-tools-dev-tools
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+      build-essential \
+      cmake \
+      ninja-build \
+      file \
+      g++ \
+      git \
+      libmariadb-dev-compat \
+      libprotobuf-dev \
+      libqt6sql6-mysql \
+      libssl-dev \
+      qt6-websockets-dev \
+      protobuf-compiler \
+      qt6-tools-dev \
+      qt6-tools-dev-tools
 
 WORKDIR /src
 COPY . .
-RUN mkdir build && cd build && \
-    cmake .. -DWITH_SERVER=1 -DWITH_CLIENT=0 -DWITH_ORACLE=0 -DWITH_DBCONVERTER=0 && \
-    make -j$(nproc) && \
-    make install
+RUN cmake \
+      -S . \
+      -B build \
+      -G Ninja \
+      -DWITH_CLIENT=0 \
+      -DWITH_ORACLE=0 \
+      -DWITH_SERVER=1 \
+    && cmake --build build \
+    && cmake --install build
 
 
 # -------- Runtime Stage (clean) --------
-FROM ubuntu:24.04
+FROM ubuntu:26.04
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  libprotobuf32t64 \
-  libqt6sql6-mysql \
-  libqt6websockets6 \
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+      libprotobuf32t64 \
+      libqt6sql6-mysql \
+      libqt6websockets6 \
+      libssl3 \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/Doxyfile b/Doxyfile
index d5a3a4b7a..c12ff4a8a 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.14.0
+# Doxyfile 1.18.0
 
 # This file describes the settings to be used by the documentation system
 # Doxygen (www.doxygen.org) for a project.
@@ -11,7 +11,7 @@
 # TAG = value [value, ...]
 # For lists, items can also be appended using:
 # TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
+# Values that contain spaces should be placed between quotes (" ").
 #
 # Note:
 #
@@ -54,7 +54,7 @@ PROJECT_NUMBER         = $(COCKATRICE_REF)
 # for a project that appears at the top of each page and should give viewers a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "A cross-platform virtual tabletop for multiplayer card games"
+PROJECT_BRIEF          = "A virtual tabletop for multiplayer card games"
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
@@ -81,7 +81,7 @@ OUTPUT_DIRECTORY       = docs
 # and will distribute the generated files over these directories. Enabling this
 # option can be useful when feeding Doxygen a huge amount of source files, where
 # putting all generated files in the same directory would otherwise cause
-# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
+# performance problems for the file system. Adjust CREATE_SUBDIRS_LEVEL to
 # control the number of sub-directories.
 # The default value is: NO.
 
@@ -349,7 +349,7 @@ OPTIMIZE_OUTPUT_SLICE  = NO
 #
 # Note see also the list of default file extension mappings.
 
-EXTENSION_MAPPING      =
+EXTENSION_MAPPING      = proto=C++
 
 # If the MARKDOWN_SUPPORT tag is enabled then Doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
@@ -361,6 +361,20 @@ EXTENSION_MAPPING      =
 
 MARKDOWN_SUPPORT       = YES
 
+# If the MARKDOWN_STRICT tag is enabled then Doxygen treats text in comments as
+# Markdown formatted also in cases where Doxygen's native markup format
+# conflicts with that of Markdown. This is only relevant in cases where
+# backticks are used. Doxygen's native markup style allows a single quote to end
+# a text fragment started with a backtick and then treat it as a piece of quoted
+# text, whereas in Markdown such text fragment is treated as verbatim and only
+# ends when a second matching backtick is found. Also, Doxygen's native markup
+# format requires double quotes to be escaped when they appear in a backtick
+# section, whereas this is not needed for Markdown.
+# The default value is: YES.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+MARKDOWN_STRICT        = YES
+
 # When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
 # to that level are automatically included in the table of contents, even if
 # they do not have an id attribute.
@@ -392,8 +406,8 @@ AUTOLINK_SUPPORT       = YES
 
 # This tag specifies a list of words that, when matching the start of a word in
 # the documentation, will suppress auto links generation, if it is enabled via
-# AUTOLINK_SUPPORT. This list does not affect links explicitly created using \#
-# or the \link or commands.
+# AUTOLINK_SUPPORT. This list does not affect links explicitly created using #
+# or the \link or \ref commands.
 # This tag requires that the tag AUTOLINK_SUPPORT is set to YES.
 
 AUTOLINK_IGNORE_WORDS  =
@@ -510,9 +524,9 @@ LOOKUP_CACHE_SIZE      = 0
 # which effectively disables parallel processing. Please report any issues you
 # encounter. Generating dot graphs in parallel is controlled by the
 # DOT_NUM_THREADS setting.
-# Minimum value: 0, maximum value: 32, default value: 1.
+# Minimum value: 0, maximum value: 512, default value: 1.
 
-NUM_PROC_THREADS       = 1
+NUM_PROC_THREADS       = 0
 
 # If the TIMESTAMP tag is set different from NO then each generated page will
 # contain the date or date and time when the page was generated. Setting this to
@@ -779,6 +793,27 @@ GENERATE_BUGLIST       = YES
 
 GENERATE_DEPRECATEDLIST= YES
 
+# The GENERATE_REQUIREMENTS tag can be used to enable (YES) or disable (NO) the
+# requirements page. When enabled, this page is automatically created when at
+# least one comment block with a \requirement command appears in the input.
+# The default value is: YES.
+
+GENERATE_REQUIREMENTS  = YES
+
+# The REQ_TRACEABILITY_INFO tag controls if traceability information is shown on
+# the requirements page (only relevant when using \requirement comment blocks).
+# The setting NO will disable the traceability information altogether. The
+# setting UNSATISFIED_ONLY will show a list of requirements that are missing a
+# satisfies relation (through the command: \satisfies). Similarly the setting
+# UNVERIFIED_ONLY will show a list of requirements that are missing a verifies
+# relation (through the command: \verifies). Setting the tag to YES (the
+# default) will show both lists if applicable.
+# Possible values are: YES, NO, UNSATISFIED_ONLY and UNVERIFIED_ONLY.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_REQUIREMENTS is set to YES.
+
+REQ_TRACEABILITY_INFO  = YES
+
 # The ENABLED_SECTIONS tag can be used to enable conditional documentation
 # sections, marked by \if <section_label> ... \endif and \cond <section_label>
 # ... \endcond blocks.
@@ -820,8 +855,8 @@ SHOW_NAMESPACES        = YES
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # Doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# popen()) the command command input_file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input_file is the name of an input file provided
 # by Doxygen. Whatever the program writes to standard output is used as the file
 # version. For an example see the documentation.
 
@@ -1031,27 +1066,14 @@ 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          = *.cc \
-                         *.cxx \
-                         *.cxxm \
-                         *.cpp \
+FILE_PATTERNS          = *.cpp \
                          *.cppm \
-                         *.ccm \
-                         *.c++ \
-                         *.c++m \
-                         *.ii \
-                         *.ixx \
                          *.ipp \
-                         *.i++ \
                          *.inl \
                          *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.h++ \
-                         *.markdown \
                          *.md \
-                         *.dox
+                         *.dox \
+                         *.proto
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
@@ -1068,9 +1090,10 @@ RECURSIVE              = YES
 
 EXCLUDE                = build/ \
                          cmake/ \
-                         dbconverter/ \
-                         vcpkg/ \
-                         webclient/
+                         cmake-build-debug/ \
+                         doc/doxygen/theme/docs/ \
+                         doc/doxygen/theme/include/ \
+                         vcpkg/
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -1160,7 +1183,7 @@ INPUT_FILTER           =
 # need to set EXTENSION_MAPPING for the extension otherwise the files are not
 # properly processed by Doxygen.
 
-FILTER_PATTERNS        =
+FILTER_PATTERNS        = "*.proto=python doc/doxygen/filters/proto2cpp.py"
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
 # INPUT_FILTER) will also be used to filter the input files that are used for
@@ -1431,7 +1454,9 @@ HTML_STYLESHEET        =
 # documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = doc/doxygen/css/doxygen_style.css
+HTML_EXTRA_STYLESHEET  = doc/doxygen/theme/doxygen-awesome.css \
+                         doc/doxygen/css/hide_nav_sync.css \
+                         doc/doxygen/css/cockatrice_docs_style.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1454,7 +1479,7 @@ HTML_EXTRA_FILES       = doc/doxygen/js/graph_toggle.js
 # The default value is: AUTO_LIGHT.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE        = AUTO_DARK
+HTML_COLORSTYLE        = LIGHT
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
@@ -1604,8 +1629,8 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # a.o. the download links, offline (the HTML help workshop was already many
 # years in maintenance mode). You can download the HTML help workshop from the
 # web archives at Installation executable (see:
-# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
-# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
+# http://web.archive.org/web/20160201063255/https://download.microsoft.com/downl
+# oad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
 # generated by Doxygen into a single compiled HTML file (.chm). Compiled HTML
@@ -1765,7 +1790,7 @@ ECLIPSE_DOC_ID         = org.doxygen.Project
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-DISABLE_INDEX          = YES
+DISABLE_INDEX          = NO
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
 # structure should be generated to display hierarchical information. If the tag
@@ -1884,7 +1909,7 @@ USE_MATHJAX            = NO
 # regards to the different settings, so it is possible that also other MathJax
 # settings have to be changed when switching between the different MathJax
 # versions.
-# Possible values are: MathJax_2 and MathJax_3.
+# Possible values are: MathJax_2, MathJax_3 and MathJax_4.
 # The default value is: MathJax_2.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
@@ -1893,9 +1918,10 @@ MATHJAX_VERSION        = MathJax_2
 # When MathJax is enabled you can set the default output format to be used for
 # the MathJax output. For more details about the output format see MathJax
 # version 2 (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# https://docs.mathjax.org/en/v2.7/output.html), MathJax version 3 (see:
+# https://docs.mathjax.org/en/v3.2/output/index.html) and MathJax version 4
 # (see:
-# http://docs.mathjax.org/en/latest/web/components/output.html).
+# https://docs.mathjax.org/en/v4.0/output/index.htm).
 # Possible values are: HTML-CSS (which is slower, but has the best
 # compatibility. This is the name for Mathjax version 2, for MathJax version 3
 # this will be translated into chtml), NativeMML (i.e. MathML. Only supported
@@ -1908,36 +1934,50 @@ MATHJAX_VERSION        = MathJax_2
 MATHJAX_FORMAT         = HTML-CSS
 
 # When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment. The default value is:
+# output directory using the MATHJAX_RELPATH option. For Mathjax version 2 the
+# destination directory should contain the MathJax.js script. For instance, if
+# the mathjax directory is located at the same level as the HTML output
+# directory, then MATHJAX_RELPATH should be ../mathjax. For Mathjax versions 3
+# and 4 the destination directory should contain the tex-<format>.js script
+# (where <format> is either chtml or svg). The default value points to the
+# MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax. However, it is strongly recommended to install a local
+# copy of MathJax from https://www.mathjax.org before deployment. The default
+# value is:
 # - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
 # - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
+# - in case of MathJax version 4: https://cdn.jsdelivr.net/npm/mathjax@4
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        =
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 # extension names that should be enabled during MathJax rendering. For example
-# for MathJax version 2 (see
-# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
+# for MathJax version 2 (see https://docs.mathjax.org/en/v2.7/tex.html):
 # MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
 # For example for MathJax version 3 (see
-# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# https://docs.mathjax.org/en/v3.2/input/tex/extensions/):
 # MATHJAX_EXTENSIONS = ams
+# For example for MathJax version 4 (see
+# https://docs.mathjax.org/en/v4.0/input/tex/extensions/):
+# MATHJAX_EXTENSIONS = units
+# Note that for Mathjax version 4 quite a few extensions are already
+# automatically loaded. To disable a package in Mathjax version 4 one can use
+# the package name prepended with a minus sign (- like MATHJAX_EXTENSIONS +=
+# -textmacros)
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_EXTENSIONS     =
 
 # The MATHJAX_CODEFILE tag can be used to specify a file with JavaScript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see:
-# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
-# example see the documentation.
+# of code that will be used on startup of the MathJax code. See the Mathjax site
+# for more details:
+# - MathJax version 2 (see:
+# https://docs.mathjax.org/en/v2.7/)
+# - MathJax version 3 (see:
+# https://docs.mathjax.org/en/v3.2/)
+# - MathJax version 4 (see:
+# https://docs.mathjax.org/en/v4.0/) For an example see the documentation.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_CODEFILE       =
@@ -2118,9 +2158,8 @@ EXTRA_PACKAGES         =
 #
 # Note: Only use a user-defined header if you know what you are doing!
 # Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of Doxygen. The following
-# commands have a special meaning inside the header (and footer): For a
-# description of the possible markers and block names see the documentation.
+# default header when upgrading to a newer version of Doxygen. For a description
+# of the possible markers and block names see the documentation.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
@@ -2598,11 +2637,24 @@ HAVE_DOT               = YES
 # processors available in the system. You can set it explicitly to a value
 # larger than 0 to get control over the balance between CPU load and processing
 # speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
+# Minimum value: 0, maximum value: 512, default value: 0.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_NUM_THREADS        = 0
 
+# The DOT_BATCH_SIZE specifies the number of dot graphs Doxygen is allowed to
+# compile in a single invocation of dot. When set to 1 Doxygen will invoke dot
+# for each graph separately, which can cause significant process creation
+# overhead especially on systems with many CPU cores. Together with
+# DOT_NUM_THREADS this setting can be used to optimise the dot processing speed
+# for a particular system. Doxygen will try to give each thread a balanced batch
+# of work. If the total number of graphs to process exceeds DOT_NUM_THREADS *
+# DOT_BATCH_SIZE then additional batches will be created for dot to process.
+# 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_COMMON_ATTR is common attributes for nodes, edges and labels of
 # subgraphs. When you want a differently looking font in the dot files that
 # Doxygen generates you can specify fontname, fontcolor and fontsize attributes.
@@ -2894,6 +2946,58 @@ PLANTUML_INCLUDE_PATH  =
 
 PLANTUMLFILE_DIRS      =
 
+# When using Mermaid diagrams with CLI rendering, the MERMAID_PATH tag should be
+# used to specify the directory where the mmdc (Mermaid CLI) executable can be
+# found. If left blank, CLI-based rendering is disabled. For HTML output,
+# client-side rendering via JavaScript is used by default and does not require
+# mmdc. For LaTeX/PDF output, mmdc is required to pre-generate images. Doxygen
+# will generate a warning when CLI rendering is needed but mmdc is not
+# available.
+
+MERMAID_PATH           =
+
+# When using Mermaid diagrams, the MERMAID_CONFIG_FILE tag can be used to
+# specify a JSON configuration file for the Mermaid CLI tool (mmdc). This file
+# can contain theme settings and other Mermaid configuration options.
+
+MERMAID_CONFIG_FILE    =
+
+# The MERMAID_RENDER_MODE tag selects how Mermaid diagrams are rendered.
+# Possible values are: AUTO (use client-side rendering for HTML and mmdc for
+# LaTeX/PDF and other formats. If MERMAID_PATH is not set, non-HTML diagrams
+# will produce a warning), CLI (use the mmdc tool to pre-generate images
+# (requires Node.js and mermaid-js/mermaid-cli). Works for all output formats)
+# and CLIENT_SIDE (embed mermaid.js in HTML output for client-side rendering.
+# Does not require mmdc but only works for HTML output).
+# The default value is: AUTO.
+
+MERMAID_RENDER_MODE    = AUTO
+
+# The MERMAID_JS_URL tag specifies the URL to load mermaid.js from when using
+# client-side rendering (MERMAID_RENDER_MODE is CLIENT_SIDE or AUTO). The
+# default points to the latest Mermaid v11 release on the jsDelivr CDN.
+#
+# The default CDN URL requires internet access when viewing the generated
+# documentation. For offline use, download mermaid.esm.min.mjs and set this to a
+# relative path, or use MERMAID_RENDER_MODE=CLI to pre-generate images instead.
+# Examples:
+# - Latest v11 (default):
+# https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs
+# - Pinned version:
+# https://cdn.jsdelivr.net/npm/mermaid@11.3.0/dist/mermaid.esm.min.mjs
+# - Local copy: ./mermaid.esm.min.mjs (user must place file in HTML output
+# directory)
+# The default value is:
+# https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs.
+
+MERMAID_JS_URL         = https://cdn.jsdelivr.net/npm/mermaid@11/dist/mermaid.esm.min.mjs
+
+# The MERMAIDFILE_DIRS tag can be used to specify one or more directories that
+# contain Mermaid files that are included in the documentation (see the
+# \mermaidfile command).
+
+MERMAIDFILE_DIRS       =
+
 # The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
 # that will be shown in the graph. If the number of nodes in a graph becomes
 # larger than this value, Doxygen will truncate the graph, which is visualized
@@ -2918,15 +3022,6 @@ DOT_GRAPH_MAX_NODES    = 50
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
-# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
 # If the GENERATE_LEGEND tag is set to YES Doxygen will generate a legend page
 # explaining the meaning of the various boxes and arrows in the dot generated
 # graphs.
diff --git a/README.md b/README.md
index 3e415fa23..f2a170868 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
    <a href="#related-repositories">Related</a> <b>|</b>
    <a href="#community-resources-">Community</a> <b>|</b>
    <a href="#contribute">Contribute</a> <b>|</b>
-   <a href="#build---">Build</a> <b>|</b>
+   <a href="#build--">Build</a> <b>|</b>
    <a href="#run">Run</a>
 </p>
 
@@ -25,7 +25,6 @@
 
 Cockatrice is an open-source, multiplatform application for playing tabletop card games over a network. The program's server design prevents users from manipulating the game for unfair advantage. The client also provides a single-player mode, which allows users to brew while offline.<br><br>
 This project uses <kbd>C++</kbd> and the <kbd>Qt</kbd> libraries.<br>
-First work on a webclient with <kbd>Typescript</kbd> was started as well.<br>
 
 
 # Download [![Cockatrice Eternal Download Count](https://img.shields.io/github/downloads/cockatrice/cockatrice/total.svg)](https://tooomm.github.io/github-release-stats/?username=Cockatrice&repository=Cockatrice&search=0)
@@ -44,24 +43,43 @@ Latest <kbd>beta</kbd> version:
 
 # Related Repositories
 
-- [Magic-Token](https://github.com/Cockatrice/Magic-Token): MtG token data to use in Cockatrice
-- [Magic-Spoiler](https://github.com/Cockatrice/Magic-Spoiler): Script to generate MtG spoiler data from [MTGJSON](https://github.com/mtgjson/mtgjson) to use in Cockatrice
-- [cockatrice.github.io](https://github.com/Cockatrice/cockatrice.github.io): Code of the official webpage of the Cockatrice project
+- [Magic-Token](https://github.com/Cockatrice/Magic-Token): File with MtG token data for use in Cockatrice
+- [Magic-Spoiler](https://github.com/Cockatrice/Magic-Spoiler): Code to generate MtG spoiler data from [MTGJSON](https://github.com/mtgjson/mtgjson) for use in Cockatrice
+- [cockatrice.github.io](https://github.com/Cockatrice/cockatrice.github.io): Code of the official Cockatrice webpage
+- [io.github.Cockatrice.cockatrice](https://github.com/flathub/io.github.Cockatrice.cockatrice): Configuration of our Linux `flatpak` package hosted at [Flathub](https://flathub.org/en/apps/io.github.Cockatrice.cockatrice)
+- [Webatrice](https://github.com/Cockatrice/Webatrice): Web client for Cockatrice servers (TypeScript / React)
 
 
 # Community Resources [![Discord](https://img.shields.io/discord/314987288398659595?label=Discord&logo=discord&logoColor=white)](https://discord.gg/3Z9yzmA)
 
-Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with other projet contributors (`#dev` channel) or fellow users of the app. Come here to talk about the application, features, or just to hang out.
+Join our [Discord community](https://discord.gg/3Z9yzmA) to connect with other project contributors (`#dev` channel) or fellow users of the app. Come here to talk about the application, features, or just to hang out.
 - [Official Website](https://cockatrice.github.io)
 - [Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki)
 - [Official Discord](https://discord.gg/3Z9yzmA)
 - [reddit r/Cockatrice](https://reddit.com/r/cockatrice)
 
->[!IMPORTANT]
->For support regarding specific servers, please contact that server's admin/mods and use their dedicated communication channels rather than contacting the team building the software.
+> [!IMPORTANT]
+> For support regarding specific servers, please contact that server's admin/mods and use their dedicated communication channels rather than contacting the team building the software.
 
 
 # Contribute
+<p>
+   <a href="#code">Code</a> <b>|</b>
+   <a href="#documentation-">Documentation</a> <b>|</b>
+   <a href="#translation-">Translation</a>
+</p>
+
+#### Repository Activity
+![Cockatrice Repo Analytics](https://repobeats.axiom.co/api/embed/c7cec938789a5bbaeb4182a028b4dbb96db8f181.svg "Cockatrice Repo Analytics by Repobeats")
+
+<details>
+<summary><b>Kudos to all our amazing contributors ❤️</b></summary>
+<br>
+   <a href="https://github.com/Cockatrice/Cockatrice/graphs/contributors">
+      <img src="https://contrib.rocks/image?repo=Cockatrice/Cockatrice" />
+   </a><br>
+   <sub><i>Made with <a href="https://contrib.rocks">contrib.rocks</a></i></sub>
+</details>
 
 ### Code
 
@@ -75,25 +93,27 @@ This tag is used for issues that we are looking for somebody to pick up. Often t
 For both tags, we're willing to provide help to contributors in showing them where and how they can make changes, as well as code reviews for submitted changes.<br>
 We'll happily advice on how best to implement a feature, or we can show you where the codebase is doing something similar before you get too far along - put a note on an issue you want to discuss more on!
 
+You can also have a look at our `Todo List` in our [Code Documentation](https://cockatrice.github.io/docs) or search the repo for [`\todo` comments](https://github.com/search?q=repo%3ACockatrice%2FCockatrice%20%5Ctodo&type=code).
+
+### Documentation [![CI Docs](https://github.com/Cockatrice/Cockatrice/actions/workflows/documentation-build.yml/badge.svg?event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/documentation-build.yml?query=event%3Apush)
+
+There are various places where useful information for different needs are maintained:
+- [Official Code Documentation](https://cockatrice.github.io/docs/) 
+- [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.
 
-<details>
-<summary><b>Kudos to our amazing contributors ❤️</b></summary>
-<br>
-   <a href="https://github.com/Cockatrice/Cockatrice/graphs/contributors">
-      <img src="https://contrib.rocks/image?repo=Cockatrice/Cockatrice" />
-   </a><br>
-   <sub><i>Made with <a href="https://contrib.rocks">contrib.rocks</a></i></sub>
-</details>
+### Translation [![Transifex Project](https://img.shields.io/badge/translate-on%20transifex-brightgreen)](https://explore.transifex.com/cockatrice/cockatrice/)
 
-### Translations [![Transifex Project](https://img.shields.io/badge/translate-on%20transifex-brightgreen)](https://explore.transifex.com/cockatrice/cockatrice/)
+Cockatrice uses Transifex to manage translations. You can help us bring <kbd>Cockatrice</kbd> and <kbd>Oracle</kbd> to your language and just adjust single wordings right from within your browser by visiting our [Transifex project page](https://explore.transifex.com/cockatrice/cockatrice/). The [Webatrice](https://github.com/seavor/Webatrice) web client manages its own translations in its repo.<br>
 
-Cockatrice uses Transifex to manage translations. You can help us bring <kbd>Cockatrice</kbd>, <kbd>Oracle</kbd> and <kbd>Webatrice</kbd> to your language and just adjust single wordings right from within your browser by visiting our [Transifex project page](https://explore.transifex.com/cockatrice/cockatrice/).<br>
-
-Check out our [Translator FAQ](https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ) for more information about getting invovled, and join a group of hundreds of others!<br>
+Check out our [Translator FAQ](https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ) for more information about getting involved, and join a group of hundreds of others!<br>
 
 
-# Build [![CI Desktop](https://github.com/Cockatrice/Cockatrice/actions/workflows/desktop-build.yml/badge.svg?branch=master&event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/desktop-build.yml?query=branch%3Amaster+event%3Apush) [![CI Docker](https://github.com/Cockatrice/Cockatrice/actions/workflows/docker-release.yml/badge.svg?branch=master&event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/docker-release.yml?query=branch%3Amaster+event%3Apush) [![CI Web](https://github.com/Cockatrice/Cockatrice/actions/workflows/web-build.yml/badge.svg?branch=master&event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/web-build.yml?query=branch%3Amaster+event%3Apush)
+# Build [![CI Desktop](https://github.com/Cockatrice/Cockatrice/actions/workflows/desktop-build.yml/badge.svg?branch=master&event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/desktop-build.yml?query=branch%3Amaster+event%3Apush) [![CI Docker](https://github.com/Cockatrice/Cockatrice/actions/workflows/docker-release.yml/badge.svg?branch=master&event=push)](https://github.com/Cockatrice/Cockatrice/actions/workflows/docker-release.yml?query=branch%3Amaster+event%3Apush)
 
 Dependencies: *(for minimum versions search our [CMake file](https://github.com/Cockatrice/Cockatrice/blob/master/CMakeLists.txt))*
 - [Qt](https://www.qt.io/developers/)
@@ -124,22 +144,27 @@ You can then
     make package
     ```
 
->[!NOTE]
->Detailed compiling instructions can be found in the Cockatrice wiki at [Compiling Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/Compiling-Cockatrice)
+> [!NOTE]
+> Detailed compiling instructions can be found in the Cockatrice wiki at [Compiling Cockatrice](https://github.com/Cockatrice/Cockatrice/wiki/Compiling-Cockatrice)
 
 <br>
 
 The following flags (with their non-default values) can be passed to `cmake`:
-| Flag | Description |
-| --- | --- |
-| `-DWITH_SERVER=1` | Build <kbd>Servatrice</kbd> server |
-| `-DWITH_CLIENT=0` | Don't build <kbd>Cockatrice</kbd> client |
-| `-DWITH_ORACLE=0` | Don't build <kbd>Oracle</kbd> card database tool |
-| `-DCMAKE_BUILD_TYPE=Debug` | Compile in debug mode<br> Enables extra logging output, debug symbols, and much more verbose compiler warnings |
-| `-DWARNING_AS_ERROR=0` | Don't treat compilation warnings as errors in debug mode |
-| `-DUPDATE_TRANSLATIONS=1` |  Configure `make` to update the translation .ts files for new strings in the source code<br> **Note:** `make clean` will remove the .ts files |
-| `-DTEST=1` | Enable regression tests<br> **Note:** `make test` to run tests, *googletest* will be downloaded if not available |
-| `-DFORCE_USE_QT5=1` | Skip looking for Qt6 before trying to find Qt5 |
+| Flag                       | Description                                                                                                                                   |
+| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
+| `-DWITH_SERVER=1`          | Build <kbd>Servatrice</kbd> server                                                                                                            |
+| `-DWITH_CLIENT=0`          | Don't build <kbd>Cockatrice</kbd> client                                                                                                      |
+| `-DWITH_ORACLE=0`          | Don't build <kbd>Oracle</kbd> card database tool                                                                                              |
+| `-DCMAKE_BUILD_TYPE=Debug` | Compile in debug mode<br> Enables extra logging output, debug symbols, and much more verbose compiler warnings                                |
+| `-DWARNING_AS_ERROR=0`     | Don't treat compilation warnings as errors in debug mode                                                                                      |
+| `-DUPDATE_TRANSLATIONS=1`  |  Configure `make` to update the translation .ts files for new strings in the source code<br> **Note:** `make clean` will remove the .ts files |
+| `-DTEST=1`                 | Enable regression tests<br> **Note:** `make test` to run tests, *googletest* will be downloaded if not available                              |
+
+> [!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/CMakeDMGSetup.script b/cmake/CMakeDMGSetup.script
index fe02eea13..e9a826eb8 100644
--- a/cmake/CMakeDMGSetup.script
+++ b/cmake/CMakeDMGSetup.script
@@ -42,7 +42,6 @@ tell disk image_name
       set position of item "Cockatrice.app" to { 139, 214 }
       set position of item "Oracle.app" to { 139, 414 }
       set position of item "Servatrice.app" to { 139, 614 }
-      set position of item "dbconverter.app" to { 1400, 1400 }
       set position of item "Applications" to { 861, 414 }
     end tell
     update without registering applications
diff --git a/cmake/Coverage.cmake b/cmake/Coverage.cmake
new file mode 100644
index 000000000..0345a2d36
--- /dev/null
+++ b/cmake/Coverage.cmake
@@ -0,0 +1,75 @@
+# 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 769f9b463..2d74aca4d 100644
--- a/cmake/FindQtRuntime.cmake
+++ b/cmake/FindQtRuntime.cmake
@@ -1,14 +1,18 @@
 # Find a compatible Qt version
-# Inputs: WITH_SERVER, WITH_CLIENT, WITH_ORACLE, WITH_DBCONVERTER, FORCE_USE_QT5
+# Inputs: WITH_SERVER, WITH_CLIENT, WITH_ORACLE
 # Optional Input: QT6_DIR -- Hint as to where Qt6 lives on the system
-# Optional Input: QT5_DIR -- Hint as to where Qt5 lives on the system
-# Output: COCKATRICE_QT_VERSION_NAME -- Example values: Qt5, Qt6
+# Output: COCKATRICE_QT_VERSION_NAME -- Example values: Qt6
 # Output: SERVATRICE_QT_MODULES
 # Output: COCKATRICE_QT_MODULES
 # Output: ORACLE_QT_MODULES
-# Output: DBCONVERTER_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)
@@ -16,94 +20,67 @@ endif()
 if(WITH_CLIENT)
   set(_COCKATRICE_NEEDED
       Concurrent
+      Core
       Gui
       Multimedia
       Network
       PrintSupport
+      ShaderTools
       Svg
       WebSockets
       Widgets
       Xml
+      Quick
+      QuickWidgets
   )
 endif()
 if(WITH_ORACLE)
-  set(_ORACLE_NEEDED Concurrent Network Svg Widgets)
-endif()
-if(WITH_DBCONVERTER)
-  set(_DBCONVERTER_NEEDED Network Widgets)
+  set(_ORACLE_NEEDED Concurrent Network Svg Widgets Xml)
 endif()
 if(TEST)
-  set(_TEST_NEEDED Widgets)
+  # 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)
 endif()
 
 set(REQUIRED_QT_COMPONENTS ${REQUIRED_QT_COMPONENTS} ${_SERVATRICE_NEEDED} ${_COCKATRICE_NEEDED} ${_ORACLE_NEEDED}
-                           ${_DBCONVERTER_NEEDED} ${_TEST_NEEDED}
+                           ${_TEST_NEEDED}
 )
 list(REMOVE_DUPLICATES REQUIRED_QT_COMPONENTS)
 
-if(NOT FORCE_USE_QT5)
-  # Linguist is now a component in Qt6 instead of an external package
-  find_package(
-    Qt6 6.2.3
-    COMPONENTS ${REQUIRED_QT_COMPONENTS} Linguist
-    QUIET HINTS ${Qt6_DIR}
-  )
+# Linguist is now a component in Qt6 instead of an external package
+find_package(
+  Qt6 6.4.2
+  COMPONENTS ${REQUIRED_QT_COMPONENTS} Linguist
+  QUIET HINTS ${Qt6_DIR}
+)
+if(NOT Qt6_FOUND)
+  message(FATAL_ERROR "No suitable version of Qt was found")
 endif()
-if(Qt6_FOUND)
-  set(COCKATRICE_QT_VERSION_NAME Qt6)
+set(COCKATRICE_QT_VERSION_NAME Qt6)
 
-  list(FIND Qt6LinguistTools_TARGETS Qt6::lrelease QT6_LRELEASE_INDEX)
-  if(QT6_LRELEASE_INDEX EQUAL -1)
-    message(WARNING "Qt6 lrelease not found.")
-  endif()
-
-  list(FIND Qt6LinguistTools_TARGETS Qt6::lupdate QT6_LUPDATE_INDEX)
-  if(QT6_LUPDATE_INDEX EQUAL -1)
-    message(WARNING "Qt6 lupdate not found.")
-  endif()
-else()
-  find_package(
-    Qt5 5.8.0
-    COMPONENTS ${REQUIRED_QT_COMPONENTS}
-    QUIET HINTS ${Qt5_DIR}
-  )
-  if(Qt5_FOUND)
-    set(COCKATRICE_QT_VERSION_NAME Qt5)
-  else()
-    message(FATAL_ERROR "No suitable version of Qt was found")
-  endif()
-
-  # Qt5 Linguist is in a separate package
-  find_package(Qt5LinguistTools QUIET)
-  if(Qt5LinguistTools_FOUND)
-    if(NOT Qt5_LRELEASE_EXECUTABLE)
-      message(WARNING "Qt5 lrelease not found.")
-    endif()
-    if(NOT Qt5_LUPDATE_EXECUTABLE)
-      message(WARNING "Qt5 lupdate not found.")
-    endif()
-  else()
-    message(WARNING "Linguist Tools not found, cannot handle translations")
-  endif()
+list(FIND Qt6LinguistTools_TARGETS Qt6::lrelease QT6_LRELEASE_INDEX)
+if(QT6_LRELEASE_INDEX EQUAL -1)
+  message(WARNING "Qt6 lrelease not found.")
 endif()
 
-if(Qt5_POSITION_INDEPENDENT_CODE OR Qt6_FOUND)
-  set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+list(FIND Qt6LinguistTools_TARGETS Qt6::lupdate QT6_LUPDATE_INDEX)
+if(QT6_LUPDATE_INDEX EQUAL -1)
+  message(WARNING "Qt6 lupdate not found.")
 endif()
 
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 # Establish Qt Plugins directory & Library directories
 get_target_property(QT_LIBRARY_DIR ${COCKATRICE_QT_VERSION_NAME}::Core LOCATION)
 get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} DIRECTORY)
-if(Qt6_FOUND)
-  get_filename_component(QT_PLUGINS_DIR "${Qt6Core_DIR}/../../../${QT6_INSTALL_PLUGINS}" ABSOLUTE)
-  get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/../../.." ABSOLUTE)
-  if(UNIX AND APPLE)
-    # Mac needs a bit more help finding all necessary components
-    list(APPEND QT_LIBRARY_DIR "/usr/local/lib")
-  endif()
-elseif(Qt5_FOUND)
-  get_filename_component(QT_PLUGINS_DIR "${Qt5Core_DIR}/../../../plugins" ABSOLUTE)
-  get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
+get_filename_component(QT_PLUGINS_DIR "${Qt6Core_DIR}/../../../${QT6_INSTALL_PLUGINS}" ABSOLUTE)
+get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/../../.." ABSOLUTE)
+if(UNIX AND APPLE)
+  # Mac needs a bit more help finding all necessary components
+  list(APPEND QT_LIBRARY_DIR "/usr/local/lib")
 endif()
 message(DEBUG "QT_PLUGINS_DIR = ${QT_PLUGINS_DIR}")
 message(DEBUG "QT_LIBRARY_DIR = ${QT_LIBRARY_DIR}")
@@ -112,7 +89,6 @@ message(DEBUG "QT_LIBRARY_DIR = ${QT_LIBRARY_DIR}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" SERVATRICE_QT_MODULES "${_SERVATRICE_NEEDED}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" COCKATRICE_QT_MODULES "${_COCKATRICE_NEEDED}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" ORACLE_QT_MODULES "${_ORACLE_NEEDED}")
-string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" DB_CONVERTER_QT_MODULES "${_DBCONVERTER_NEEDED}")
 string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" TEST_QT_MODULES "${_TEST_NEEDED}")
 
 # Core-only export (useful for headless libs)
diff --git a/cmake/Info.plist b/cmake/Info.plist
index 614d82509..7f01befcb 100644
--- a/cmake/Info.plist
+++ b/cmake/Info.plist
@@ -1,38 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
+ "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+
+    <!-- ========================= -->
+    <!-- CORE BUNDLE METADATA -->
+    <!-- ========================= -->
+
     <key>CFBundleDevelopmentRegion</key>
     <string>English</string>
+
     <key>CFBundleExecutable</key>
     <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+
     <key>CFBundleGetInfoString</key>
     <string>${MACOSX_BUNDLE_INFO_STRING}</string>
+
     <key>CFBundleIconFile</key>
     <string>${MACOSX_BUNDLE_ICON_FILE}</string>
+
     <key>CFBundleIdentifier</key>
     <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
+
     <key>CFBundleLongVersionString</key>
     <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
+
     <key>CFBundleName</key>
     <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+
     <key>CFBundlePackageType</key>
     <string>APPL</string>
+
     <key>CFBundleShortVersionString</key>
     <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+
     <key>CFBundleSignature</key>
     <string>????</string>
+
     <key>CFBundleVersion</key>
     <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-    <key>CSResourcesFileMapped</key>
-    <true/>
-    <key>LSRequiresCarbon</key>
-    <true/>
+
     <key>NSHumanReadableCopyright</key>
     <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+
     <key>NSHighResolutionCapable</key>
     <true/>
+
+    <!-- ========================= -->
+    <!-- FILE TYPE (.cod) SUPPORT -->
+    <!-- ========================= -->
+
+    <key>UTExportedTypeDeclarations</key>
+    <array>
+        <dict>
+            <key>UTTypeIdentifier</key>
+            <string>org.cockatrice.deck</string>
+
+            <key>UTTypeDescription</key>
+            <string>Cockatrice Deck</string>
+
+            <key>UTTypeConformsTo</key>
+            <array>
+                <string>public.data</string>
+            </array>
+
+            <key>UTTypeTagSpecification</key>
+            <dict>
+                <key>public.filename-extension</key>
+                <array>
+                    <string>cod</string>
+                </array>
+            </dict>
+        </dict>
+    </array>
+
+    <key>CFBundleDocumentTypes</key>
+    <array>
+        <dict>
+            <key>CFBundleTypeName</key>
+            <string>Cockatrice Deck</string>
+
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+
+            <key>LSHandlerRank</key>
+            <string>Default</string>
+
+            <key>LSItemContentTypes</key>
+            <array>
+                <string>org.cockatrice.deck</string>
+            </array>
+        </dict>
+    </array>
+
+    <!-- ========================= -->
+    <!-- URL SCHEME (cockatrice://) -->
+    <!-- ========================= -->
+
+    <key>CFBundleURLTypes</key>
+    <array>
+        <dict>
+            <key>CFBundleURLName</key>
+            <string>Cockatrice URL Scheme</string>
+
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>cockatrice</string>
+            </array>
+        </dict>
+    </array>
+
 </dict>
 </plist>
diff --git a/cmake/NSIS.template.in b/cmake/NSIS.template.in
index fbdde0b86..b6125238f 100644
--- a/cmake/NSIS.template.in
+++ b/cmake/NSIS.template.in
@@ -11,6 +11,23 @@ SetCompressor LZMA
 Var NormalDestDir
 Var PortableDestDir
 Var PortableMode
+Var ReinstallMode
+Var AllowForceClose
+Var GuardDir
+Var OldUninstallString
+Var StaleFindHandle
+Var StaleFindName
+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
@@ -26,14 +43,25 @@ Var PortableMode
 !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Cockatrice.$\r$\n$\r$\nClick Next to continue."
 !define MUI_FINISHPAGE_RUN "$INSTDIR/cockatrice.exe"
 !define MUI_FINISHPAGE_RUN_TEXT "Run 'Cockatrice' now"
+!define MUI_ICON "${NSIS_SOURCE_PATH}\cockatrice\resources\appicon.ico"
 
+!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_WELCOME
+
+!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_LICENSE "${NSIS_SOURCE_PATH}\LICENSE"
+
 Page Custom PortableModePageCreate PortableModePageLeave
 !define MUI_PAGE_CUSTOMFUNCTION_PRE componentsPagePre
 !insertmacro MUI_PAGE_COMPONENTS
+
+!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_DIRECTORY
+
+!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_INSTFILES
+
+!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfReinstall
 !insertmacro MUI_PAGE_FINISH
 
 !insertmacro MUI_UNPAGE_CONFIRM
@@ -43,8 +71,67 @@ 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."
@@ -72,6 +159,8 @@ ${IfNot} ${Errors}
     MessageBox MB_ICONINFORMATION|MB_SETFOREGROUND "\
       /PORTABLE : Install in portable mode$\n\
       /S : Silent install$\n\
+      /R : Silent upgrade$\n\
+      /PID=%pid% : Process to wait for before replacing files (used by the in-app updater)$\n\
       /D=%directory% : Specify destination directory$\n"
     Quit
 ${EndIf}
@@ -89,13 +178,87 @@ ${Else}
     ${EndIf}
 ${EndIf}
 
+ClearErrors
+${GetOptions} $9 "/R" $8
+${IfNot} ${Errors}
+    StrCpy $ReinstallMode 1
+    SetSilent silent
+    SetAutoClose true
+${Else}
+    StrCpy $ReinstallMode 0
+${EndIf}
+
+; /PID= carries the process id of the application that started this installer.
+; The in-app updater launches the installer and only then quits itself, so
+; without it the installer has to guess whether the launching process is still
+; alive by polling powershell.exe for an image name - a guess that can come back
+; "not running" or "could not determine" while the process is very much alive and
+; still has its Qt DLLs mapped. An older client does not pass /PID= and an older
+; installer ignores it, so both sides of the pair have to keep working.
+; Note that /D= must stay the last parameter on the command line, which is why
+; the client puts it last and this one anywhere.
+StrCpy $WaitPid ""
+StrCpy $LauncherExited 0
+ClearErrors
+${GetOptions} $9 "/PID=" $8
+${IfNot} ${Errors}
+    StrCpy $WaitPid $8
+${EndIf}
+
 ${If} $InstDir == ""
     ; User did not use /D to specify a directory,
     ; we need to set a default based on the install mode
     StrCpy $InstDir $0
 ${EndIf}
+
+; --- Detect portable install when using /R (must come BEFORE SetModeDestinationFromInstdir) ---
+${If} $ReinstallMode = 1
+    IfFileExists "$InstDir\portable.dat" 0 not_portable
+        StrCpy $PortableMode 1
+        Goto portable_done
+    not_portable:
+        StrCpy $PortableMode 0
+    portable_done:
+${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
+; launcher is still proven gone here instead of the whole upgrade being cancelled
+; by a check that was only ever a proxy for this one.
+;
+; Then make sure no *other* application instance is still running (and holding
+; file locks) before the previous version is uninstalled. On a silent update
+; (/R /S) the running processes are asked to close gracefully and waited for;
+; Cockatrice itself is never force-killed (data loss, e.g. an unsaved deck) so the
+; update is aborted instead, while the console applications Oracle and Servatrice
+; are force-stopped by PID once the grace period is over. On interactive installs
+; the user is prompted to close them instead.
+; Only needed this early for /R, where AutoUninstallIfNeeded runs below; for
+; 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}
+
 FunctionEnd
 
 Function un.onInit
@@ -104,6 +267,9 @@ ${If} ${NSIS_IS_64_BIT} == 1
     SetRegView 64
 ${EndIf}
 
+; Ensure no application instance is still running before removing files.
+Call un.EnsureAppsNotRunning
+
 FunctionEnd
 
 Function RequireAdmin
@@ -125,8 +291,694 @@ ${Else}
 ${EndIf}
 FunctionEnd
 
+Function SkipIfReinstall
+${If} $ReinstallMode = 1
+    Abort
+${EndIf}
+FunctionEnd
+
+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'
+
+done32:
+
+; --- 64-bit uninstall ---
+${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'
+
+    done64:
+${EndIf}
+
+FunctionEnd
+
+; --- Running instance handling ---
+; Cockatrice, Oracle and Servatrice must not be running while files are
+; replaced or deleted. A still-running process holds locks on its .exe and
+; Qt runtime DLLs, so a silent upgrade could otherwise end up with a mix of
+; old and new Qt DLLs next to the new executable, failing with
+; "The procedure entry point X could not be located in the dynamic link
+; library ...Qt6Network.dll" on the next start.
+;
+; On a silent update (/R /S) matching processes are asked to close gracefully
+; (WM_CLOSE) and waited for up to 60 s. Cockatrice is never force-stopped: it
+; may be holding an unsaved deck or showing a "really leave this game?"
+; confirmation, so if it refuses to close the install is aborted - nothing has
+; been replaced yet, so the update is simply deferred. Oracle and Servatrice
+; are console applications without a main window, so CloseMainWindow() does
+; nothing for them and waiting cannot help; they hold no unsaved user data and
+; are force-stopped by PID once the grace period is over. On interactive
+; installs and uninstalls the user is prompted to close them instead.
+;
+; Processes are matched by image name AND by their executable path living
+; under the guarded directory ($GuardDir, normally $INSTDIR), so unrelated
+; processes that merely share an image name (e.g. the Oracle DB instance
+; "oracle.exe") are never touched.
+
+; usage: set $R2 to the base image name (without extension, e.g. "cockatrice",
+;        as accepted by Get-Process -Name), call this, result in $R0
+;        (1 = running from $GuardDir, 0 = not running, 2 = could not determine)
+Function IsAppRunning
+    ; Every caller has to set $GuardDir; an empty one would make the path check
+    ; below match every process that merely shares the image name, which is the
+    ; opposite of what this guard is for.
+    ${If} $GuardDir == ""
+        StrCpy $R0 2
+        Return
+    ${EndIf}
+    ; Pass the directory to guard to PowerShell via an environment variable so
+    ; it never has to be embedded into the -Command string: apostrophes in a
+    ; path would terminate the command early, and the path in a -like pattern
+    ; would treat [ and ] as wildcard characters.
+    System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_GUARD_DIR", "$GuardDir")'
+    ; Exit the process explicitly so nsExec's pop reflects whether a matching
+    ; process was found: powershell.exe exits 0 whether or not the pipeline
+    ; produced objects. 0 = not running, 1 = running, anything else = could not
+    ; be determined (see IsProcessLookupAvailable).
+    ; A process is only a match when its path is readable and lives under
+    ; $GuardDir. A process we cannot inspect is not one of ours: the updater is
+    ; always started by the application it updates, so it runs in the same user
+    ; session, and an interactive install is elevated and can read the paths of
+    ; the user's own processes. Assuming a match instead would be a hard stop
+    ; rather than a fail-closed guard - an Oracle database instance running as
+    ; SYSTEM has a process named "oracle" whose path raises Access denied, and
+    ; that would make every silent update abort and every interactive install
+    ; loop on the Retry prompt with no way out but Cancel.
+    nsExec::ExecToLog 'powershell -NoProfile -Command "if (Get-Process -Name $\'$R2$\' -ErrorAction SilentlyContinue | Where-Object { try { $$p = $$_.Path; if ($$p) { $$p.StartsWith($$env:COCKATRICE_GUARD_DIR, [StringComparison]::OrdinalIgnoreCase) } else { $$false } } catch { $$false } } | Select-Object -First 1) { exit 1 } else { exit 0 }"'
+    Pop $R0
+    ${If} $R0 == "0"
+        StrCpy $R0 0
+    ${ElseIf} $R0 == "1"
+        StrCpy $R0 1
+    ${Else}
+        ; powershell.exe could not be run at all (nsExec pushes the string
+        ; "error"), or died with an unexpected code. That is "could not
+        ; determine", which has to stay distinguishable from "definitely
+        ; running": a state that can never clear would block the installer
+        ; forever. IsProcessLookupAvailable warns about that case once.
+        StrCpy $R0 2
+    ${EndIf}
+FunctionEnd
+
+; Sets $R0 to 1 if PowerShell can be started at all, 0 if it cannot. The
+; running instance check is built on top of it, so a machine where
+; powershell.exe is missing, blocked by policy or refused by antivirus is
+; reported once instead of being reported as "Cockatrice is running" on every
+; single check.
+Function IsProcessLookupAvailable
+    nsExec::ExecToLog 'powershell -NoProfile -Command "exit 0"'
+    Pop $R0
+    ${If} $R0 == "0"
+        StrCpy $R0 1
+    ${Else}
+        StrCpy $R0 0
+    ${EndIf}
+FunctionEnd
+
+Function CloseMatchingApps
+    ; gracefully ask every matching instance to close (sends WM_CLOSE)
+    ;
+    ; The filter here is deliberately the strict one: a process is only asked to
+    ; close when its path is readable and lives under $GuardDir. Treating a
+    ; process whose path cannot be read (an unrelated oracle.exe / servatrice.exe,
+    ; or one owned by another account running as SYSTEM) as a match would make
+    ; the installer close a third party application, and it runs elevated, so
+    ; CloseMainWindow() would succeed on it.
+    System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_GUARD_DIR", "$GuardDir")'
+    nsExec::ExecToLog 'powershell -NoProfile -Command "Get-Process -Name $\'$R2$\' -ErrorAction SilentlyContinue | Where-Object { try { $$p = $$_.Path; if ($$p) { $$p.StartsWith($$env:COCKATRICE_GUARD_DIR, [StringComparison]::OrdinalIgnoreCase) } else { $$false } } catch { $$false } } | ForEach-Object { $$null = $$_.CloseMainWindow() }"'
+    Pop $R3
+FunctionEnd
+
+Function ForceCloseApps
+    ; stop the matching instances by PID once the grace period is over. Only
+    ; used for the console applications ($AllowForceClose), which have no window
+    ; to close and hold no unsaved user data. Same strict filter as above.
+    System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_GUARD_DIR", "$GuardDir")'
+    nsExec::ExecToLog 'powershell -NoProfile -Command "Get-Process -Name $\'$R2$\' -ErrorAction SilentlyContinue | Where-Object { try { $$p = $$_.Path; if ($$p) { $$p.StartsWith($$env:COCKATRICE_GUARD_DIR, [StringComparison]::OrdinalIgnoreCase) } else { $$false } } catch { $$false } } | ForEach-Object { Stop-Process -Id $$_.Id -Force -ErrorAction SilentlyContinue }"'
+    Pop $R3
+FunctionEnd
+
+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
+    ; HandleUnknownAppState.
+    ${If} $R0 = 0
+        Return
+    ${EndIf}
+    ${If} $R0 = 2
+        Call HandleUnknownAppState
+        Return
+    ${EndIf}
+
+    ${If} ${Silent}
+        ; ask the application to close gracefully (WM_CLOSE), then wait for it to exit
+        DetailPrint "Closing $R1 ..."
+        Call CloseMatchingApps
+        ; wall-clock deadline: each poll has to spawn a fresh powershell.exe, so
+        ; a bare loop counter would not bound the real wait time to 60 s.
+        System::Call 'kernel32::GetTickCount()i.s'
+        Pop $R8
+        ck_wait_loop:
+        Sleep 500
+        Call IsAppRunning
+        ${If} $R0 = 0
+            !insertmacro CockLog "guard $R1: closed gracefully"
+            DetailPrint "$R1 closed."
+            Return
+        ${EndIf}
+        ${If} $R0 = 2
+            Call HandleUnknownAppState
+            Return
+        ${EndIf}
+        System::Call 'kernel32::GetTickCount()i.s'
+        Pop $R9
+        IntOp $R9 $R9 - $R8
+        ${If} $R9 < 60000
+            Goto ck_wait_loop
+        ${EndIf}
+        ; The grace period is over. Cockatrice is never force-stopped: it may be
+        ; showing a "really leave this game?" confirmation or holding an unsaved
+        ; 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."
+            Call AbortInstall
+        ${EndIf}
+        ; 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}
+        ${If} $R0 = 2
+            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."
+        Call AbortInstall
+    ${Else}
+        ck_wait_prompt:
+        MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON1 \
+            "$R1 is still running.$\r$\n$\r$\nPlease close it, then click Retry.$\r$\nClick Cancel to abort." \
+            IDCANCEL ck_abort_install
+        Call IsAppRunning
+        ${If} $R0 = 0
+            Return
+        ${EndIf}
+        ${If} $R0 = 2
+            Call HandleUnknownAppState
+            Return
+        ${EndIf}
+        Goto ck_wait_prompt
+        ck_abort_install:
+        Abort
+    ${EndIf}
+FunctionEnd
+
+; A process lookup came back "could not determine": powershell.exe ran but the
+; answer was not usable, e.g. the process could not be inspected at all. That
+; state is fine to carry on from when the user is at the keyboard - they can
+; close the applications by hand and the stale-runtime check still stands
+; between a failed guard and a mismatched install.
+;
+; It is not fine on a silent upgrade. There the whole point of this guard is to
+; know that nothing holds locks on the files about to be replaced, and this is
+; exactly the state where that is unknown, with no one to click a dialog: the
+; old code returned and let the install carry on into the mixed Qt DLL set that
+; made the next start fail. Cancel the update instead; the next attempt runs
+; with the applications closed and succeeds.
+Function HandleUnknownAppState
+    ${If} $ReinstallMode = 1
+        StrCpy $AbortReason \
+            "The installation was cancelled because it could not determine whether Cockatrice is still running.$\r$\n$\r$\nPlease close Cockatrice, Oracle and Servatrice and run the installer again."
+        Call AbortInstall
+    ${EndIf}
+    DetailPrint "Could not determine whether $R1 is running; close Cockatrice, Oracle and Servatrice manually if the installation reports a problem."
+    ${IfNot} ${Silent}
+        MessageBox MB_OK|MB_ICONEXCLAMATION \
+            "This installer could not determine whether $R1 is still running.$\r$\n$\r$\nPlease close Cockatrice, Oracle and Servatrice manually before continuing."
+    ${EndIf}
+FunctionEnd
+
+Function EnsureAppsNotRunning
+    ; guards the install directory
+    StrCpy $GuardDir $INSTDIR
+    Call GuardAppsNotRunning
+FunctionEnd
+
+; Aborts the installation, showing $AbortReason to the user.
+;
+; Every abort goes through here so the unattended case is handled the same way
+; everywhere: the in-app updater runs this installer silent and detached and
+; never looks at its exit code, so a plain Abort would leave the user with no
+; update and no explanation, while a /S install without /R is unattended - by a
+; package manager, for instance - and a message box there would block forever.
+; 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"
+    ${EndIf}
+    SetErrorLevel 1
+    Abort
+FunctionEnd
+
+; Waits for the application that launched this installer to exit, using the /PID=
+; it passed. Sets $LauncherExited to 1 when that process is provably gone.
+;
+; This is the authority for the one question the rest of the installer can only
+; approximate: is the process that started us still holding its Qt DLLs mapped?
+; A mapped module cannot be deleted, so an answer of "not running" obtained by
+; enumerating process names is what allows the update to write a new payload on
+; top of files it could not remove. Waiting on a real handle has no such gap,
+; needs no powershell.exe, and is unaffected by a process whose path cannot be
+; read - the case the name based check has to treat as "not ours" so it never
+; closes a third party application.
+;
+; Sets $LauncherExited to 0 when no usable /PID= was given, which is the older
+; client that does not pass one; the caller then has no authority available and
+; 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.
+    ${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
+    ${EndIf}
+    DetailPrint "Waiting for the application that started this installer to exit ..."
+    ; 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)'
+    ${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
+
+Function EnsureOldInstallNotRunning
+    ; Guards the directory of a *previous* installation, as recorded in the
+    ; registry. Needed by componentsPagePre, which runs the old uninstaller
+    ; before the directory page, so $INSTDIR is still the default there and not
+    ; the directory the old install lives in. Every uninstaller shipped before
+    ; this change had no running instance guard of its own, so the old one would
+    ; delete files while an instance of the application is still holding them.
+    ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "InstallLocation"
+    ${If} $R3 == ""
+        ; no usable record of where the old install is; $INSTDIR is the default
+        ; install directory at this point, which is where it usually is anyway
+        DetailPrint "Could not read the previous installation directory from the registry; checking $INSTDIR instead."
+        StrCpy $R3 $INSTDIR
+    ${EndIf}
+    StrCpy $GuardDir $R3
+    Call GuardAppsNotRunning
+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
+        ; replacing files it still had mapped - the one outcome this guard exists
+        ; to prevent - and then writing the new payload on top of them. Cancel
+        ; instead. An interactive install can still continue: the user is at the
+        ; keyboard, and refusing outright would leave them with an installer that
+        ; can never complete.
+        ;
+        ; Unless the launcher has already been waited on directly: WaitForLauncherToExit
+        ; needs no powershell.exe, so when it has run, Cockatrice is known to be
+        ; gone and the lookup failing to run costs nothing but the Oracle and
+        ; Servatrice checks. An older client that passes no /PID= leaves no such
+        ; authority, and there the upgrade is cancelled as before.
+        ${If} $LauncherExited != 1
+        ${AndIf} $ReinstallMode = 1
+            StrCpy $AbortReason \
+                "The installation was cancelled because it could not check whether Cockatrice is still running, because powershell.exe could not be started.$\r$\n$\r$\nPlease close Cockatrice, Oracle and Servatrice and run the installer again."
+            Call AbortInstall
+        ${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}
+            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
+    ${EndIf}
+    StrCpy $R1 "cockatrice.exe"
+    StrCpy $R2 "cockatrice"
+    ; a GUI application with unsaved user data: graceful close only
+    StrCpy $AllowForceClose 0
+    Call WaitForAppToClose
+    StrCpy $R1 "oracle.exe"
+    StrCpy $R2 "oracle"
+    StrCpy $AllowForceClose 1
+    Call WaitForAppToClose
+    StrCpy $R1 "servatrice.exe"
+    StrCpy $R2 "servatrice"
+    StrCpy $AllowForceClose 1
+    Call WaitForAppToClose
+FunctionEnd
+
+; Sets $R0 to 1 if $INSTDIR looks like an existing Cockatrice install. Used to
+; guard the stale-runtime-DLL purge so a first-time install into a pre-existing
+; directory with an unrelated "Plugins" folder is never touched, while an
+; install that only ever held e.g. servatrice.exe is still purged.
+Function IsExistingCockatriceInstall
+    StrCpy $R0 0
+    ${If} ${FileExists} "$INSTDIR\cockatrice.exe"
+        StrCpy $R0 1
+    ${EndIf}
+    ${If} ${FileExists} "$INSTDIR\oracle.exe"
+        StrCpy $R0 1
+    ${EndIf}
+    ${If} ${FileExists} "$INSTDIR\servatrice.exe"
+        StrCpy $R0 1
+    ${EndIf}
+    ${If} ${FileExists} "$INSTDIR\uninstall.exe"
+        StrCpy $R0 1
+    ${EndIf}
+    ; A leftover runtime DLL counts as an install as well. A previously failed
+    ; update can leave a directory in which the old uninstaller removed the
+    ; executables and uninstall.exe but silently skipped the DLLs its running
+    ; instance had locked - which is exactly the broken install the purge is
+    ; meant to heal, and without these markers none of the files above would be
+    ; 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.
+    StrCpy $R3 "Qt6*.dll"
+    Call CheckStaleRuntimeMask
+    ${If} ${FileExists} "$INSTDIR\qt.conf"
+        StrCpy $R0 1
+    ${EndIf}
+FunctionEnd
+
+; Sets $R0 to 1 if a runtime file of a previous version is still present after
+; 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.
+Function HasStaleRuntimeFiles
+    StrCpy $R0 0
+    StrCpy $R3 "*.dll"
+    Call CheckStaleRuntimeMask
+    ; 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
+
+; usage: set $R3 to a file mask, call this. Sets $R0 to 1 when $INSTDIR holds a
+; matching file. Returns early once something was found, so $R0 stays 1.
+Function CheckStaleRuntimeMask
+    ${If} $R0 = 1
+        Return
+    ${EndIf}
+    FindFirst $StaleFindHandle $StaleFindName "$INSTDIR\$R3"
+    ${If} $StaleFindHandle != ""
+        !insertmacro CockLog "stale-runtime: '$StaleFindName' matched $R3 in $INSTDIR"
+        StrCpy $R0 1
+        FindClose $StaleFindHandle
+    ${EndIf}
+FunctionEnd
+
+; Uninstaller copies of the same routines (the uninstaller gets its own
+; function set compiled in, it cannot call the installer functions).
+Function un.IsAppRunning
+    ; An unset $GuardDir would match every process that merely shares the image
+    ; name, see IsAppRunning in the installer.
+    ${If} $GuardDir == ""
+        StrCpy $R0 2
+        Return
+    ${EndIf}
+    ; Pass the directory to guard to PowerShell via an environment variable so
+    ; it never has to be embedded into the -Command string: apostrophes in a
+    ; path would terminate the command early, and the path in a -like pattern
+    ; would treat [ and ] as wildcard characters.
+    System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_GUARD_DIR", "$GuardDir")'
+    ; Exit the process explicitly so nsExec's pop reflects whether a matching
+    ; process was found: powershell.exe exits 0 whether or not the pipeline
+    ; produced objects. 0 = not running, 1 = running, anything else = could not
+    ; be determined (see un.IsProcessLookupAvailable).
+    ; Strict match: a readable path under $GuardDir, same as in the installer.
+    nsExec::ExecToLog 'powershell -NoProfile -Command "if (Get-Process -Name $\'$R2$\' -ErrorAction SilentlyContinue | Where-Object { try { $$p = $$_.Path; if ($$p) { $$p.StartsWith($$env:COCKATRICE_GUARD_DIR, [StringComparison]::OrdinalIgnoreCase) } else { $$false } } catch { $$false } } | Select-Object -First 1) { exit 1 } else { exit 0 }"'
+    Pop $R0
+    ${If} $R0 == "0"
+        StrCpy $R0 0
+    ${ElseIf} $R0 == "1"
+        StrCpy $R0 1
+    ${Else}
+        ; powershell.exe could not be run at all (nsExec pushes the string
+        ; "error"), or died with an unexpected code. That is "could not
+        ; determine", which has to stay distinguishable from "definitely
+        ; running": a state that can never clear would block the uninstaller
+        ; forever. un.IsProcessLookupAvailable warns about that case once.
+        StrCpy $R0 2
+    ${EndIf}
+FunctionEnd
+
+Function un.IsProcessLookupAvailable
+    nsExec::ExecToLog 'powershell -NoProfile -Command "exit 0"'
+    Pop $R0
+    ${If} $R0 == "0"
+        StrCpy $R0 1
+    ${Else}
+        StrCpy $R0 0
+    ${EndIf}
+FunctionEnd
+
+Function un.CloseMatchingApps
+    ; gracefully ask every matching instance to close (sends WM_CLOSE)
+    ;
+    ; Strict filter, same as in the installer: never close a process whose path
+    ; cannot be read, it is not necessarily one of ours.
+    System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_GUARD_DIR", "$GuardDir")'
+    nsExec::ExecToLog 'powershell -NoProfile -Command "Get-Process -Name $\'$R2$\' -ErrorAction SilentlyContinue | Where-Object { try { $$p = $$_.Path; if ($$p) { $$p.StartsWith($$env:COCKATRICE_GUARD_DIR, [StringComparison]::OrdinalIgnoreCase) } else { $$false } } catch { $$false } } | ForEach-Object { $$null = $$_.CloseMainWindow() }"'
+    Pop $R3
+FunctionEnd
+
+Function un.ForceCloseApps
+    ; stop the matching instances by PID once the grace period is over, see
+    ; ForceCloseApps in the installer.
+    System::Call 'kernel32::SetEnvironmentVariable(t, t) i ("COCKATRICE_GUARD_DIR", "$GuardDir")'
+    nsExec::ExecToLog 'powershell -NoProfile -Command "Get-Process -Name $\'$R2$\' -ErrorAction SilentlyContinue | Where-Object { try { $$p = $$_.Path; if ($$p) { $$p.StartsWith($$env:COCKATRICE_GUARD_DIR, [StringComparison]::OrdinalIgnoreCase) } else { $$false } } catch { $$false } } | ForEach-Object { Stop-Process -Id $$_.Id -Force -ErrorAction SilentlyContinue }"'
+    Pop $R3
+FunctionEnd
+
+Function un.WaitForAppToClose
+    Call un.IsAppRunning
+    ; Only a definite "running" is worth waiting for, see WaitForAppToClose.
+    ${If} $R0 != 1
+        Return
+    ${EndIf}
+
+    ${If} ${Silent}
+        DetailPrint "Closing $R1 ..."
+        Call un.CloseMatchingApps
+        ; wall-clock deadline: each poll has to spawn a fresh powershell.exe, so
+        ; a bare loop counter would not bound the real wait time to 60 s.
+        System::Call 'kernel32::GetTickCount()i.s'
+        Pop $R8
+        un_ck_wait_loop:
+        Sleep 500
+        Call un.IsAppRunning
+        ${If} $R0 = 0
+            DetailPrint "$R1 closed."
+            Return
+        ${EndIf}
+        ${If} $R0 != 1
+            Return
+        ${EndIf}
+        System::Call 'kernel32::GetTickCount()i.s'
+        Pop $R9
+        IntOp $R9 $R9 - $R8
+        ${If} $R9 < 60000
+            Goto un_ck_wait_loop
+        ${EndIf}
+        ; The grace period is over. Cockatrice is never force-stopped, see
+        ; WaitForAppToClose in the installer. A silent uninstall only reports
+        ; through the log and its exit code: it is also run unattended (the /R
+        ; updater uses it via QuietUninstallString, package managers use it
+        ; directly), and a message box would block there. The installer that ran
+        ; us reports the incomplete result to the user itself.
+        ${If} $AllowForceClose = 0
+            DetailPrint "$R1 is still running after 60 s; aborting so that no data is lost."
+            SetErrorLevel 1
+            Abort
+        ${EndIf}
+        DetailPrint "Force-stopping $R1 ..."
+        Call un.ForceCloseApps
+        Sleep 2000
+        Call un.IsAppRunning
+        ${If} $R0 = 0
+            DetailPrint "$R1 closed."
+            Return
+        ${EndIf}
+        ${If} $R0 != 1
+            Return
+        ${EndIf}
+        DetailPrint "$R1 is still running after 60 s; aborting."
+        SetErrorLevel 1
+        Abort
+    ${Else}
+        un_ck_wait_prompt:
+        MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON1 \
+            "$R1 is still running.$\r$\n$\r$\nPlease close it, then click Retry.$\r$\nClick Cancel to abort." \
+            IDCANCEL un_ck_abort_install
+        Call un.IsAppRunning
+        ${If} $R0 = 0
+            Return
+        ${EndIf}
+        ${If} $R0 != 1
+            Return
+        ${EndIf}
+        Goto un_ck_wait_prompt
+        un_ck_abort_install:
+        Abort
+    ${EndIf}
+FunctionEnd
+
+Function un.EnsureAppsNotRunning
+    ; guards the install directory; the uninstaller only ever has to check this one
+    StrCpy $GuardDir $INSTDIR
+    Call un.GuardAppsNotRunning
+FunctionEnd
+
+Function un.GuardAppsNotRunning
+    Call un.IsProcessLookupAvailable
+    ${If} $R0 = 0
+        ; Same reasoning as in the installer: without PowerShell we cannot tell
+        ; whether a running instance still holds file locks, and refusing to
+        ; uninstall would leave the user with an uninstaller that never
+        ; completes. Warn once and continue.
+        DetailPrint "Could not start powershell.exe; skipping the running instance check. Close Cockatrice, Oracle and Servatrice manually if the uninstall reports a problem."
+        MessageBox MB_OK|MB_ICONEXCLAMATION "This uninstaller 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."
+        Return
+    ${EndIf}
+    StrCpy $R1 "cockatrice.exe"
+    StrCpy $R2 "cockatrice"
+    ; a GUI application with unsaved user data: graceful close only
+    StrCpy $AllowForceClose 0
+    Call un.WaitForAppToClose
+    StrCpy $R1 "oracle.exe"
+    StrCpy $R2 "oracle"
+    StrCpy $AllowForceClose 1
+    Call un.WaitForAppToClose
+    StrCpy $R1 "servatrice.exe"
+    StrCpy $R2 "servatrice"
+    StrCpy $AllowForceClose 1
+    Call un.WaitForAppToClose
+FunctionEnd
 
 Function PortableModePageCreate
+
+${If} $ReinstallMode = 1
+    Abort
+${EndIf}
+
 Call SetModeDestinationFromInstdir ; If the user clicks BACK on the directory page we will remember their mode specific directory
 !insertmacro MUI_HEADER_TEXT "Install Mode" "Choose how you want to install Cockatrice."
 nsDialogs::Create 1018
@@ -158,6 +1010,11 @@ ${EndIf}
 FunctionEnd
 
 Function componentsPagePre
+
+${If} $ReinstallMode = 1
+    Return
+${EndIf}
+
 ${If} $PortableMode = 0
     SetShellVarContext all
 
@@ -167,12 +1024,24 @@ ${If} $PortableMode = 0
     ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "UninstallString"
     StrCmp $R0 "" done32
 
-    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst32
-    Abort
+    ${If} $ReinstallMode = 0
+        MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst32
+        Abort
+    ${Else}
+        Goto uninst32
+    ${EndIf}
 
     uninst32:
+    ; the old uninstaller is run here, before the directory page, and every
+    ; uninstaller predating this change has no guard of its own: make sure no
+    ; instance of the application is still running out of the *old* install
+    ; 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 "$R0"
+    ExecWait "$OldUninstallString _?=$INSTDIR"
 
 	done32:
 
@@ -183,12 +1052,19 @@ ${If} $PortableMode = 0
 	    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "UninstallString"
 	    StrCmp $R0 "" done64
 
-	    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst64
-	    Abort
+	    ${If} $ReinstallMode = 0
+            MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "A previous version of Cockatrice must be uninstalled before installing the new one." IDOK uninst64
+            Abort
+        ${Else}
+            Goto uninst64
+        ${EndIf}
 
 	    uninst64:
+	    StrCpy $OldUninstallString $R0
+	    !insertmacro CockLog "componentsPagePre: old 64-bit uninstall '$OldUninstallString _?=$INSTDIR'"
+	    Call EnsureOldInstallNotRunning
 	    ClearErrors
-	    ExecWait "$R0"
+	    ExecWait "$OldUninstallString _?=$INSTDIR"
 
 		done64:
 	${EndIf}
@@ -203,33 +1079,116 @@ 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.
+;
+; It is skipped on the /R path: .onInit already ran it before
+; AutoUninstallIfNeeded removed the previous installation, so by the time this
+; section starts the old files are gone and a second Abort here would leave the
+; user with the old version uninstalled and the new one not installed at all,
+; which is worse than the locked files being prevented. The leftover runtime
+; files are reported at the end of the purge instead.
+${If} $ReinstallMode = 0
+    Call EnsureAppsNotRunning
+${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\dbconverter.exe"
 	Delete "$INSTDIR\servatrice.exe"
-	Delete "$INSTDIR\Qt*.dll"
-	Delete "$INSTDIR\libmysql.dll"
-	Delete "$INSTDIR\icu*.dll"
-	Delete "$INSTDIR\libeay32.dll"
-	Delete "$INSTDIR\ssleay32.dll"
+	; 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.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.
+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
+; happens to hold some Qt5 DLLs, say) would otherwise turn those files into an
+; abort reason even though the payload is about to overwrite nothing of theirs.
+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\*.*"
+${EndIf}
+
+; 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
+; 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.
+${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
+    ; 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
 ${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"
@@ -255,6 +1214,16 @@ ${If} $PortableMode = 0
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMajor" "@CPACK_PACKAGE_VERSION_MAJOR@"
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "VersionMinor" "@CPACK_PACKAGE_VERSION_MINOR@"
 
+	; --- Register .cod file type ---
+	WriteRegStr HKCR ".cod" "" "Cockatrice"
+	WriteRegStr HKCR "Cockatrice" "" "Cockatrice Deck File"
+	WriteRegStr HKCR "Cockatrice\shell\open\command" "" '"$INSTDIR\cockatrice.exe" "%1"'
+
+	; --- Register custom URI protocol ---
+	WriteRegStr HKCR "cockatrice" "" "URL: Cockatrice Protocol"
+	WriteRegStr HKCR "cockatrice" "URL Protocol" ""
+	WriteRegStr HKCR "cockatrice\shell\open\command" "" '"$INSTDIR\cockatrice.exe" "%1"'
+
 	IfFileExists "$INSTDIR\vc_redist.x86.exe" VcRedist86Exists PastVcRedist86Check
 	VcRedist86Exists:
 		ExecWait '"$INSTDIR\vc_redist.x86.exe" /passive /norestart'
@@ -277,6 +1246,13 @@ ${Else}
     FileWrite $0 "PORTABLE"
     FileClose $0
 ${EndIf}
+
+${If} $ReinstallMode = 1
+    IfFileExists "$INSTDIR\cockatrice.exe" 0 +2
+        Exec '"$INSTDIR\cockatrice.exe"'
+${EndIf}
+
+!insertmacro CockLog "section: application install complete"
 SectionEnd
 
 Section "Start menu item" SecStartMenu
@@ -291,21 +1267,50 @@ SectionEnd
 
 Section "un.Application" UnSecApplication
 	SetShellVarContext all
-	RMDir /r "$INSTDIR\plugins"
-	RMDir /r "$INSTDIR\sounds"
-	RMDir /r "$INSTDIR\themes"
-	RMDir /r "$INSTDIR\translations"
-	Delete "$INSTDIR\*.exe"
-	Delete "$INSTDIR\*.dll"
-	Delete "$INSTDIR\qt.conf"
+	StrCpy $R1 0
+
+	; Record whether this was a portable install before portable.dat 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"
-	Delete "$INSTDIR\servatrice.sql"
-	Delete "$INSTDIR\servatrice.ini.example"
+
+	; Succeeds only when no foreign files remain.
 	RMDir "$INSTDIR"
 
-	RMDir "$SMPROGRAMS\Cockatrice"
+	RMDir /r "$SMPROGRAMS\Cockatrice"
 
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice"
+
+	; Only remove the file/protocol associations if we registered them (i.e. the
+	; install was not portable) and .cod is still owned by Cockatrice, so we don't
+	; clobber a .cod association installed by another application.
+	${If} $R1 == 0
+		ReadRegStr $0 HKCR ".cod" ""
+		${If} $0 == "Cockatrice"
+			DeleteRegKey HKCR ".cod"
+			DeleteRegKey HKCR "Cockatrice"
+			DeleteRegKey HKCR "cockatrice"
+		${EndIf}
+	${EndIf}
 SectionEnd
 
 ; unselected because it is /o
diff --git a/cmake/Sanitizers.cmake b/cmake/Sanitizers.cmake
new file mode 100644
index 000000000..2e5d794de
--- /dev/null
+++ b/cmake/Sanitizers.cmake
@@ -0,0 +1,109 @@
+# 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/SignMacApplications.cmake b/cmake/SignMacApplications.cmake
index b91e53725..c08c30c1e 100644
--- a/cmake/SignMacApplications.cmake
+++ b/cmake/SignMacApplications.cmake
@@ -3,7 +3,7 @@
 string(LENGTH "$ENV{MACOS_CERTIFICATE_NAME}" MACOS_CERTIFICATE_NAME_LEN)
 
 if(APPLE AND MACOS_CERTIFICATE_NAME_LEN GREATER 0)
-  set(APPLICATIONS "cockatrice" "servatrice" "oracle" "dbconverter")
+  set(APPLICATIONS "cockatrice" "servatrice" "oracle")
   foreach(app_name IN LISTS APPLICATIONS)
     set(FULL_APP_PATH "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/${app_name}.app")
 
diff --git a/cmake/getversion.cmake b/cmake/getversion.cmake
index cb27ebd87..b24b520d5 100644
--- a/cmake/getversion.cmake
+++ b/cmake/getversion.cmake
@@ -213,7 +213,8 @@ set(PROJECT_VERSION_FRIENDLY "${PROJECT_VERSION} (${GIT_COMMIT_DATE_FRIENDLY})")
 # Format: <program name>[-ReleaseName]-MAJ.MIN.PATCH[-prerelease_label]
 set(PROJECT_VERSION_FILENAME "${PROJECT_NAME}")
 if(PROJECT_VERSION_RELEASENAME)
-  set(PROJECT_VERSION_FILENAME "${PROJECT_VERSION_FILENAME}-${PROJECT_VERSION_RELEASENAME}")
+  string(REPLACE " " "-" PROJECT_VERSION_RELEASENAME_SAFE "${PROJECT_VERSION_RELEASENAME}")
+  set(PROJECT_VERSION_FILENAME "${PROJECT_VERSION_FILENAME}-${PROJECT_VERSION_RELEASENAME_SAFE}")
 endif()
 set(PROJECT_VERSION_FILENAME "${PROJECT_VERSION_FILENAME}-${PROJECT_VERSION}")
 
diff --git a/cmake/gtest-CMakeLists.txt.in b/cmake/gtest-CMakeLists.txt.in
index 2d71a55e5..2062d7f8c 100644
--- a/cmake/gtest-CMakeLists.txt.in
+++ b/cmake/gtest-CMakeLists.txt.in
@@ -1,15 +1,16 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.10)
 
 project(gtest-download LANGUAGES NONE)
 
 include(ExternalProject)
-ExternalProject_Add(googletest
-  URL https://github.com/google/googletest/archive/release-1.11.0.zip
-  URL_HASH SHA1=9ffb7b5923f4a8fcdabf2f42c6540cce299f44c0
+externalproject_add(
+  googletest
+  URL https://github.com/google/googletest/archive/refs/tags/v1.17.0.zip
+  URL_HASH SHA1=f638fa0e724760e2ba07ff8cfba32cd644e1ce28
   SOURCE_DIR "${CMAKE_BINARY_DIR}/gtest-src"
   BINARY_DIR "${CMAKE_BINARY_DIR}/gtest-build"
   CONFIGURE_COMMAND ""
-  BUILD_COMMAND     ""
-  INSTALL_COMMAND   ""
-  TEST_COMMAND      ""
+  BUILD_COMMAND ""
+  INSTALL_COMMAND ""
+  TEST_COMMAND ""
 )
diff --git a/cmake/pch/qtcore_pch.h b/cmake/pch/qtcore_pch.h
new file mode 100644
index 000000000..176f2939c
--- /dev/null
+++ b/cmake/pch/qtcore_pch.h
@@ -0,0 +1,55 @@
+/** @file qtcore_pch.h
+ *  @brief Precompiled header for all Qt targets (Qt Core only).
+ *
+ * Safe for every target that links Qt Core, including the headless
+ * Servatrice binary. Keep this header free of any widget/gui types.
+ *
+ * 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
new file mode 100644
index 000000000..030bec69c
--- /dev/null
+++ b/cmake/pch/qtwidgets_pch.h
@@ -0,0 +1,59 @@
+/** @file qtwidgets_pch.h
+ *  @brief Precompiled header for GUI targets (Cockatrice client, Oracle).
+ *
+ * Includes the Qt Core precompiled header plus the heavy Gui, Widgets and
+ * Network layers that virtually every client translation unit re-parses.
+ * Do not use on Servatrice (headless, QT_DONT_USE_QTGUI).
+ *
+ * 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 1dbeddc5e..63ce7d1af 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -7,6 +7,7 @@ project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${
 set(cockatrice_SOURCES
     ${VERSION_STRING_CPP}
     # sort by alphabetical order, so that there is no debate about where to add new sources to the list
+    src/client/network/connection_controller/remote_connection_controller.cpp
     src/client/network/update/client/update_downloader.cpp
     src/client/network/interfaces/deck_stats_interface.cpp
     src/client/network/interfaces/tapped_out_interface.cpp
@@ -14,12 +15,18 @@ set(cockatrice_SOURCES
     src/client/network/update/client/client_update_checker.cpp
     src/client/network/update/client/release_channel.cpp
     src/client/network/update/card_spoiler/spoiler_background_updater.cpp
+    src/client/latency_graph_widget.cpp
+    src/client/latency_status_widget.cpp
+    src/client/lag_monitor.cpp
     src/client/sound_engine.cpp
     src/client/settings/cache_settings.cpp
     src/client/settings/card_counter_settings.cpp
     src/client/settings/shortcut_treeview.cpp
     src/client/settings/shortcuts_settings.cpp
+    src/interface/deck_loader/card_node_function.cpp
+    src/interface/deck_loader/deck_file_format.cpp
     src/interface/deck_loader/deck_loader.cpp
+    src/interface/deck_loader/loaded_deck.cpp
     src/interface/widgets/dialogs/dlg_connect.cpp
     src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp
     src/interface/widgets/dialogs/dlg_create_game.cpp
@@ -32,87 +39,112 @@ set(cockatrice_SOURCES
     src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
     src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
     src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
+    src/interface/widgets/dialogs/dlg_invite_to_game.cpp
     src/interface/widgets/dialogs/dlg_load_deck.cpp
     src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp
     src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp
     src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
+    src/interface/widgets/dialogs/dlg_local_game_options.cpp
+    src/interface/widgets/dialogs/dlg_login_prompt.cpp
     src/interface/widgets/dialogs/dlg_manage_sets.cpp
+    src/interface/widgets/dialogs/dlg_my_reports.cpp
     src/interface/widgets/dialogs/dlg_register.cpp
+    src/interface/widgets/dialogs/dlg_report_user.cpp
     src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
+    src/interface/widgets/dialogs/dlg_share_deck.cpp
+    src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp
     src/interface/widgets/dialogs/dlg_settings.cpp
     src/interface/widgets/dialogs/dlg_startup_card_check.cpp
     src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
     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
+    src/interface/widgets/deck_share/share_bar_widget.cpp
     src/filters/deck_filter_string.cpp
     src/filters/filter_builder.cpp
     src/filters/filter_tree_model.cpp
     src/filters/syntax_help.cpp
     src/game/abstract_game.cpp
-    src/game/board/abstract_card_drag_item.cpp
-    src/game/board/abstract_card_item.cpp
-    src/game/board/abstract_counter.cpp
-    src/game/board/arrow_item.cpp
-    src/game/board/arrow_target.cpp
-    src/game/board/card_drag_item.cpp
-    src/game/board/card_item.cpp
+    src/game/arrow_registry.cpp
+    src/game_graphics/board/abstract_card_drag_item.cpp
+    src/game_graphics/board/abstract_card_item.cpp
+    src/game_graphics/board/abstract_counter.cpp
+    src/game/board/arrow_data.cpp
+    src/game_graphics/board/arrow_item.cpp
+    src/game_graphics/board/arrow_target.cpp
+    src/game_graphics/board/card_drag_item.cpp
+    src/game_graphics/board/card_item.cpp
     src/game/board/card_list.cpp
-    src/game/board/counter_general.cpp
-    src/game/board/translate_counter_name.cpp
-    src/game/deckview/deck_view.cpp
-    src/game/deckview/deck_view_container.cpp
-    src/game/deckview/tabbed_deck_view_container.cpp
-    src/game/dialogs/dlg_create_token.cpp
-    src/game/dialogs/dlg_move_top_cards_until.cpp
-    src/game/dialogs/dlg_roll_dice.cpp
+    src/game/board/card_state.cpp
+    src/game_graphics/board/counter_general.cpp
+    src/game/board/counter_state.cpp
+    src/game_graphics/board/translate_counter_name.cpp
+    src/game_graphics/deckview/deck_view.cpp
+    src/game_graphics/deckview/deck_view_container.cpp
+    src/game_graphics/deckview/tabbed_deck_view_container.cpp
+    src/game_graphics/dialogs/dlg_create_token.cpp
+    src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
+    src/game_graphics/dialogs/dlg_roll_dice.cpp
     src/game/game.cpp
     src/game/game_event_handler.cpp
     src/game/game_meta_info.cpp
-    src/game/game_scene.cpp
+    src/game_graphics/game_scene.cpp
     src/game/game_state.cpp
-    src/game/game_view.cpp
-    src/game/hand_counter.cpp
-    src/game/log/message_log_widget.cpp
+    src/game_graphics/game_view.cpp
+    src/game_graphics/hand_counter.cpp
+    src/game_graphics/log/message_log_widget.cpp
     src/game/phase.cpp
-    src/game/phases_toolbar.cpp
-    src/game/player/menu/card_menu.cpp
-    src/game/player/menu/custom_zone_menu.cpp
-    src/game/player/menu/grave_menu.cpp
-    src/game/player/menu/hand_menu.cpp
-    src/game/player/menu/library_menu.cpp
-    src/game/player/menu/move_menu.cpp
-    src/game/player/menu/player_menu.cpp
-    src/game/player/menu/pt_menu.cpp
-    src/game/player/menu/rfg_menu.cpp
-    src/game/player/menu/say_menu.cpp
-    src/game/player/menu/sideboard_menu.cpp
-    src/game/player/menu/utility_menu.cpp
-    src/game/player/player.cpp
+    src/game_graphics/phases_toolbar.cpp
+    src/game_graphics/player/menu/card_menu.cpp
+    src/game_graphics/player/menu/custom_zone_menu.cpp
+    src/game_graphics/player/menu/grave_menu.cpp
+    src/game_graphics/player/menu/hand_menu.cpp
+    src/game_graphics/player/menu/library_menu.cpp
+    src/game_graphics/player/menu/move_menu.cpp
+    src/game_graphics/player/menu/player_menu.cpp
+    src/game_graphics/player/menu/pt_menu.cpp
+    src/game_graphics/player/menu/rfg_menu.cpp
+    src/game_graphics/player/menu/say_menu.cpp
+    src/game_graphics/player/menu/sideboard_menu.cpp
+    src/game_graphics/player/menu/tally_menu.cpp
+    src/game_graphics/player/menu/utility_menu.cpp
+    src/game_graphics/tally/stats_tally.cpp
+    src/game_graphics/tally/subtype_tally.cpp
+    src/game_graphics/tally/tally.cpp
     src/game/player/player_actions.cpp
-    src/game/player/player_area.cpp
+    src/game_graphics/player/player_area.cpp
+    src/game_graphics/player/player_dialogs.cpp
     src/game/player/player_event_handler.cpp
-    src/game/player/player_graphics_item.cpp
+    src/game_graphics/player/player_graphics_item.cpp
     src/game/player/player_info.cpp
-    src/game/player/player_list_widget.cpp
+    src/game_graphics/player/player_list_widget.cpp
+    src/game/player/player_logic.cpp
     src/game/player/player_manager.cpp
-    src/game/player/player_target.cpp
+    src/game_graphics/player/player_target.cpp
     src/game/replay.cpp
-    src/game/zones/card_zone.cpp
-    src/game/zones/hand_zone.cpp
-    src/game/zones/logic/card_zone_logic.cpp
-    src/game/zones/logic/hand_zone_logic.cpp
-    src/game/zones/logic/pile_zone_logic.cpp
-    src/game/zones/logic/stack_zone_logic.cpp
-    src/game/zones/logic/table_zone_logic.cpp
-    src/game/zones/logic/view_zone_logic.cpp
-    src/game/zones/pile_zone.cpp
-    src/game/zones/select_zone.cpp
-    src/game/zones/stack_zone.cpp
-    src/game/zones/table_zone.cpp
-    src/game/zones/view_zone.cpp
-    src/game/zones/view_zone_widget.cpp
+    src/game/zones/card_zone_logic.cpp
+    src/game/zones/hand_zone_logic.cpp
+    src/game/zones/pile_zone_logic.cpp
+    src/game/zones/stack_zone_logic.cpp
+    src/game/zones/table_zone_logic.cpp
+    src/game/zones/view_zone_logic.cpp
+    src/game_graphics/zones/card_zone.cpp
+    src/game_graphics/zones/hand_zone.cpp
+    src/game_graphics/zones/pile_zone.cpp
+    src/game_graphics/zones/select_zone.cpp
+    src/game_graphics/zones/stack_zone.cpp
+    src/game_graphics/zones/table_zone.cpp
+    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
@@ -120,14 +152,33 @@ set(cockatrice_SOURCES
     src/interface/card_picture_loader/card_picture_loader_worker.cpp
     src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
     src/interface/card_picture_loader/card_picture_to_load.cpp
+    src/interface/intents/intent.cpp
+    src/interface/intents/intent.h
+    src/interface/intents/intent_open_local_deck.cpp
+    src/interface/intents/intent_open_local_deck.h
+    src/interface/intents/intent_wait_for_database_load.cpp
+    src/interface/intents/intent_wait_for_database_load.h
     src/interface/layouts/flow_layout.cpp
     src/interface/layouts/overlap_layout.cpp
+    src/interface/widgets/utility/card_completer_delegate.cpp
+    src/interface/widgets/utility/card_completer_styler.cpp
+    src/interface/widgets/utility/completer_utils.cpp
     src/interface/widgets/utility/line_edit_completer.cpp
+    src/interface/widgets/utility/reversed_completer_model.cpp
     src/interface/pixel_map_generator.cpp
+    src/interface/theme_config.cpp
     src/interface/theme_manager.cpp
+    src/interface/palette_editor/color_button.cpp
+    src/interface/palette_editor/palette_generator.cpp
+    src/interface/palette_editor/quick_setup_panel.cpp
+    src/interface/palette_editor/palette_grid_widget.cpp
+    src/interface/palette_editor/palette_editor_dialog.cpp
     src/interface/widgets/cards/additional_info/color_identity_widget.cpp
+    src/interface/widgets/cards/additional_info/deck_color_identity.cpp
     src/interface/widgets/cards/additional_info/mana_cost_widget.cpp
     src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp
+    src/interface/widgets/cards/art_crop_attribution.cpp
+    src/interface/widgets/cards/card_art_utils.cpp
     src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp
     src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp
     src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp
@@ -141,29 +192,59 @@ set(cockatrice_SOURCES
     src/interface/widgets/cards/card_size_widget.cpp
     src/interface/widgets/cards/deck_card_zone_display_widget.cpp
     src/interface/widgets/cards/deck_preview_card_picture_widget.cpp
+    src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
+    src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp
+    src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
+    src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.cpp
     src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
     src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp
-    src/interface/widgets/deck_analytics/mana_base_widget.cpp
-    src/interface/widgets/deck_analytics/mana_curve_widget.cpp
-    src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
+    src/interface/widgets/deck_analytics/resizable_panel.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
+    src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp
+    src/interface/widgets/deck_editor/card_database_view.cpp
     src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp
+    src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
     src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp
     src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp
     src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
     src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp
     src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp
     src/interface/widgets/deck_editor/deck_list_style_proxy.cpp
+    src/interface/widgets/deck_editor/deck_state_manager.cpp
+    src/interface/widgets/deck_editor/deck_zone_dialog.cpp
+    src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp
     src/interface/widgets/general/background_sources.cpp
     src/interface/widgets/general/display/background_plate_widget.cpp
     src/interface/widgets/general/display/banner_widget.cpp
-    src/interface/widgets/general/display/bar_widget.cpp
-    src/interface/widgets/general/display/color_bar.cpp
     src/interface/widgets/general/display/dynamic_font_size_label.cpp
     src/interface/widgets/general/display/dynamic_font_size_push_button.cpp
     src/interface/widgets/general/display/labeled_input.cpp
-    src/interface/widgets/general/display/percent_bar_widget.cpp
     src/interface/widgets/general/display/shadow_background_label.cpp
+    src/interface/widgets/general/display/charts/bars/bar_widget.cpp
+    src/interface/widgets/general/display/charts/bars/color_bar.cpp
+    src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp
+    src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
+    src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp
+    src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
+    src/interface/widgets/general/display/charts/pies/color_pie.cpp
     src/interface/widgets/general/home_styled_button.cpp
+    src/interface/widgets/general/home_tab_button_color.h
     src/interface/widgets/general/home_widget.cpp
     src/interface/widgets/general/layout_containers/flow_widget.cpp
     src/interface/widgets/general/layout_containers/overlap_control_widget.cpp
@@ -174,31 +255,63 @@ set(cockatrice_SOURCES
     src/interface/widgets/printing_selector/printing_selector.cpp
     src/interface/widgets/printing_selector/printing_selector_card_display_widget.cpp
     src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp
+    src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
     src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp
     src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp
     src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp
     src/interface/widgets/printing_selector/set_name_and_collectors_number_display_widget.cpp
+    src/interface/widgets/playmat/playmat_collection_dialog.cpp
+    src/interface/widgets/playmat/playmat_collection_dialog.h
+    src/interface/widgets/playmat/playmat_preview_widget.cpp
+    src/interface/widgets/playmat/playmat_settings_dialog.cpp
     src/interface/widgets/quick_settings/settings_button_widget.cpp
     src/interface/widgets/quick_settings/settings_popup_widget.cpp
     src/interface/widgets/replay/replay_manager.cpp
+    src/interface/widgets/replay/replay_quick_settings_widget.cpp
     src/interface/widgets/replay/replay_timeline_widget.cpp
+    src/interface/widgets/replay/replay_widget.cpp
     src/interface/widgets/server/chat_view/chat_view.cpp
+    src/interface/widgets/server/game_filter_configs.cpp
+    src/interface/widgets/server/game_link.cpp
     src/interface/widgets/server/game_selector.cpp
     src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp
     src/interface/widgets/server/games_model.cpp
     src/interface/widgets/server/handle_public_servers.cpp
     src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp
     src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp
+    src/interface/widgets/server/user/user_avatar_provider.cpp
+    src/interface/widgets/server/user/user_card_art_provider.cpp
+    src/interface/widgets/server/user/user_card_settings_dialog.cpp
     src/interface/widgets/server/user/user_context_menu.cpp
     src/interface/widgets/server/user/user_info_box.cpp
     src/interface/widgets/server/user/user_info_connection.cpp
+    src/interface/widgets/server/user/user_list_dialog.cpp
     src/interface/widgets/server/user/user_list_manager.cpp
+    src/interface/widgets/server/user/user_list_painter.cpp
+    src/interface/widgets/server/user/user_list_panel_widget.cpp
     src/interface/widgets/server/user/user_list_widget.cpp
+    src/interface/widgets/settings_page/abstract_settings_page.cpp
+    src/interface/widgets/settings_page/appearance_settings_page.cpp
+    src/interface/widgets/settings_page/deck_editor_settings_page.cpp
+    src/interface/widgets/settings_page/general_settings_page.cpp
+    src/interface/widgets/settings_page/messages_settings_page.cpp
+    src/interface/widgets/settings_page/settings_search_delegate.cpp
+    src/interface/widgets/settings_page/settings_search_model.cpp
+    src/interface/widgets/settings_page/shortcut_settings_page.cpp
+    src/interface/widgets/settings_page/sound_settings_page.cpp
+    src/interface/widgets/settings_page/storage_settings_page.cpp
+    src/interface/widgets/settings_page/user_interface_settings_page.cpp
     src/interface/widgets/utility/custom_line_edit.cpp
     src/interface/widgets/utility/get_text_with_max.cpp
+    src/interface/widgets/utility/report_utils.cpp
+    src/interface/widgets/utility/report_utils.h
     src/interface/widgets/utility/sequence_edit.cpp
+    src/interface/widgets/utility/visibility_change_listener.cpp
+    src/interface/widgets/utility/visibility_change_listener.h
     src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp
+    src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
+    src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp
@@ -206,6 +319,7 @@ set(cockatrice_SOURCES
     src/interface/widgets/visual_database_display/visual_database_display_widget.cpp
     src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp
     src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp
+    src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
     src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
     src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
     src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp
@@ -215,17 +329,23 @@ set(cockatrice_SOURCES
     src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp
     src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp
     src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
+    src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp
+    src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp
     src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp
+    src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp
     src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp
     src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp
+    src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp
     src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp
     src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp
     src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
     src/interface/window_main.cpp
     src/main.cpp
+    src/single_instance_manager.cpp
     src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
     src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
     src/interface/widgets/tabs/api/archidekt/api_response/archidekt_deck_listing_api_response.cpp
+    src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h
     src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card.cpp
     src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_card_entry.cpp
     src/interface/widgets/tabs/api/archidekt/api_response/card/archidekt_api_response_edition.cpp
@@ -237,6 +357,13 @@ set(cockatrice_SOURCES
     src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_entry_display_widget.cpp
     src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_listings_display_widget.cpp
     src/interface/widgets/tabs/api/archidekt/display/archidekt_deck_preview_image_display_widget.cpp
+    src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.cpp
+    src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.cpp
+    src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_card_result.cpp
+    src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.cpp
+    src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.cpp
+    src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.cpp
+    src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp
     src/interface/widgets/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
     src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
     src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp
@@ -266,12 +393,17 @@ set(cockatrice_SOURCES
     src/interface/widgets/tabs/tab.cpp
     src/interface/widgets/tabs/tab_account.cpp
     src/interface/widgets/tabs/tab_admin.cpp
+    src/interface/widgets/tabs/tab_card_art_rules.cpp
     src/interface/widgets/tabs/tab_deck_editor.cpp
     src/interface/widgets/tabs/tab_deck_storage.cpp
+    src/interface/widgets/tabs/tab_developer.cpp
     src/interface/widgets/tabs/tab_game.cpp
     src/interface/widgets/tabs/tab_home.cpp
     src/interface/widgets/tabs/tab_logs.cpp
     src/interface/widgets/tabs/tab_message.cpp
+    src/interface/widgets/tabs/tab_moderation.cpp
+    src/interface/widgets/tabs/tab_public_decks.cpp
+    src/interface/widgets/tabs/tab_report.cpp
     src/interface/widgets/tabs/tab_replays.cpp
     src/interface/widgets/tabs/tab_room.cpp
     src/interface/widgets/tabs/tab_server.cpp
@@ -282,6 +414,57 @@ set(cockatrice_SOURCES
     src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
     src/interface/key_signals.cpp
     src/interface/logger.cpp
+    src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp
+    src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp
+    src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp
+    src/interface/widgets/onboarding/banner_shader_config.h
+    src/interface/widgets/onboarding/brand_colors.h
+    src/interface/widgets/onboarding/first_run_wizard.cpp
+    src/interface/widgets/onboarding/first_run_wizard.h
+    src/interface/widgets/onboarding/first_run_wizard_page.cpp
+    src/interface/widgets/onboarding/first_run_wizard_page.h
+    src/interface/widgets/onboarding/pages/account_setup_page.cpp
+    src/interface/widgets/onboarding/pages/account_setup_page.h
+    src/interface/widgets/onboarding/pages/card_database_setup_page.cpp
+    src/interface/widgets/onboarding/pages/card_database_setup_page.h
+    src/interface/widgets/onboarding/pages/finish_page.cpp
+    src/interface/widgets/onboarding/pages/finish_page.h
+    src/interface/widgets/onboarding/pages/preferences_setup_page.cpp
+    src/interface/widgets/onboarding/pages/preferences_setup_page.h
+    src/interface/widgets/onboarding/pages/theme_setup_page.cpp
+    src/interface/widgets/onboarding/pages/theme_setup_page.h
+    src/interface/widgets/onboarding/pages/welcome_page.cpp
+    src/interface/widgets/onboarding/pages/welcome_page.h
+    src/interface/widgets/onboarding/shader_banner_widget.cpp
+    src/interface/widgets/onboarding/shader_banner_widget.h
+    src/interface/widgets/onboarding/step_indicator_widget.cpp
+    src/interface/widgets/onboarding/step_indicator_widget.h
+    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
+    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
+    src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
+    src/interface/widgets/utility/compact_push_button.cpp
+    src/interface/widgets/utility/compact_push_button.h
+    src/single_instance_manager.h
+    src/client/url_scheme_event_filter.h
+    src/interface/intents/intent_connect_to_server.cpp
+    src/interface/intents/intent_connect_to_server.h
+    src/interface/intents/intent_disconnect_from_server.cpp
+    src/interface/intents/intent_disconnect_from_server.h
+    src/interface/intents/intent_join_server_game.cpp
+    src/interface/intents/intent_join_server_game.h
+    src/interface/intents/intent_join_server_room.cpp
+    src/interface/intents/intent_join_server_room.h
+    src/interface/intents/intent_login.cpp
+    src/interface/intents/intent_login.h
+    src/interface/intents/intent_open_server_room_by_name.cpp
+    src/interface/intents/intent_open_server_room_by_name.h
+    src/interface/intents/intent_open_shared_deck.cpp
+    src/interface/intents/intent_open_shared_deck.h
+    src/interface/intents/url_parser.cpp
+    src/interface/intents/url_parser.h
+    src/interface/widgets/server/user/user_info_popup.cpp
+    src/interface/widgets/server/user/user_info_popup.h
 )
 
 add_subdirectory(sounds)
@@ -323,11 +506,7 @@ if(APPLE)
   set(cockatrice_SOURCES ${cockatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
 endif(APPLE)
 
-if(Qt6_FOUND)
-  qt6_add_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
-elseif(Qt5_FOUND)
-  qt5_add_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
-endif()
+qt6_add_resources(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES})
 
 # Declare path variables
 set(ICONDIR
@@ -339,71 +518,62 @@ set(DESKTOPDIR
     CACHE STRING "desktop file destination"
 )
 
+set(MIMEDIR
+    share/mime/packages
+    CACHE STRING "mime file destination"
+)
+
 set(COCKATRICE_MAC_QM_INSTALL_DIR "cockatrice.app/Contents/Resources/translations")
 set(COCKATRICE_UNIX_QM_INSTALL_DIR "share/cockatrice/translations")
 set(COCKATRICE_WIN32_QM_INSTALL_DIR "translations")
 
-if(Qt6_FOUND)
-  qt6_add_executable(
-    cockatrice
-    WIN32
-    MACOSX_BUNDLE
-    ${cockatrice_SOURCES}
-    ${cockatrice_RESOURCES_RCC}
-    ${cockatrice_MOC_SRCS}
-    MANUAL_FINALIZATION
-  )
-elseif(Qt5_FOUND)
-  # Qt5 Translations need to be linked at executable creation time
-  if(Qt5LinguistTools_FOUND)
-    if(UPDATE_TRANSLATIONS)
-      qt5_create_translation(cockatrice_QM ${translate_SRCS} ${cockatrice_TS})
-    else()
-      qt5_add_translation(cockatrice_QM ${cockatrice_TS})
-    endif()
-  endif()
-  add_executable(
-    cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_MOC_SRCS} ${cockatrice_QM} ${cockatrice_RESOURCES_RCC}
-                                   ${cockatrice_SOURCES}
-  )
-  if(UNIX)
-    if(APPLE)
-      install(FILES ${cockatrice_QM} DESTINATION ${COCKATRICE_MAC_QM_INSTALL_DIR})
-    else()
-      install(FILES ${cockatrice_QM} DESTINATION ${COCKATRICE_UNIX_QM_INSTALL_DIR})
-    endif()
-  elseif(WIN32)
-    install(FILES ${cockatrice_QM} DESTINATION ${COCKATRICE_WIN32_QM_INSTALL_DIR})
-  endif()
-endif()
+qt6_add_executable(
+  cockatrice
+  WIN32
+  MACOSX_BUNDLE
+  ${cockatrice_SOURCES}
+  ${cockatrice_RESOURCES_RCC}
+  ${cockatrice_MOC_SRCS}
+  MANUAL_FINALIZATION
+)
 
-if(Qt5_FOUND)
-  target_link_libraries(
-    cockatrice
-    libcockatrice_card
-    libcockatrice_deck_list
-    libcockatrice_filters
-    libcockatrice_utility
-    libcockatrice_network
-    libcockatrice_models
-    libcockatrice_rng
-    libcockatrice_settings
-    ${COCKATRICE_QT_MODULES}
-  )
-else()
-  target_link_libraries(
-    cockatrice
-    PUBLIC libcockatrice_card
-           libcockatrice_deck_list
-           libcockatrice_filters
-           libcockatrice_utility
-           libcockatrice_network
-           libcockatrice_models
-           libcockatrice_rng
-           libcockatrice_settings
-           ${COCKATRICE_QT_MODULES}
-  )
-endif()
+target_precompile_headers(cockatrice PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtwidgets_pch.h")
+
+qt6_add_shaders(
+  cockatrice
+  "onboarding_shaders"
+  PREFIX
+  "/onboarding/shaders"
+  BASE
+  "src/interface/widgets/onboarding/shaders"
+  FILES
+  src/interface/widgets/onboarding/shaders/brand_banner.frag
+  src/interface/widgets/onboarding/shaders/brand_plate.frag
+)
+
+qt6_add_resources(
+  cockatrice
+  "onboarding_qml"
+  PREFIX
+  "/onboarding/qml"
+  BASE
+  "src/interface/widgets/onboarding/qml"
+  FILES
+  src/interface/widgets/onboarding/qml/BrandBanner.qml
+)
+
+target_link_libraries(
+  cockatrice
+  PUBLIC libcockatrice_card
+         libcockatrice_deck_list
+         libcockatrice_filters
+         libcockatrice_utility
+         libcockatrice_network
+         libcockatrice_models
+         libcockatrice_rng
+         libcockatrice_settings
+         ${COCKATRICE_QT_MODULES}
+)
 
 if(UNIX)
   if(APPLE)
@@ -423,6 +593,23 @@ if(UNIX)
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.png DESTINATION ${ICONDIR}/hicolor/48x48/apps)
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.svg DESTINATION ${ICONDIR}/hicolor/scalable/apps)
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice.desktop DESTINATION ${DESKTOPDIR})
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice-cod.xml DESTINATION ${MIMEDIR})
+
+    # Refresh the freedesktop databases so the file associations and scheme
+    # handler register without requiring the user to run them manually. The
+    # tools may be missing on minimal systems; that is fine, packaging systems
+    # usually refresh these databases through their own triggers.
+    find_program(UPDATE_MIME_DATABASE update-mime-database)
+    if(UPDATE_MIME_DATABASE)
+      install(CODE "execute_process(COMMAND \"${UPDATE_MIME_DATABASE}\" \"${CMAKE_INSTALL_PREFIX}/share/mime\")")
+    endif()
+
+    find_program(UPDATE_DESKTOP_DATABASE update-desktop-database)
+    if(UPDATE_DESKTOP_DATABASE)
+      install(
+        CODE "execute_process(COMMAND \"${UPDATE_DESKTOP_DATABASE}\" \"${CMAKE_INSTALL_PREFIX}/share/applications\")"
+      )
+    endif()
   endif()
 elseif(WIN32)
   install(TARGETS cockatrice RUNTIME DESTINATION ./)
@@ -433,7 +620,7 @@ if(APPLE)
   set(plugin_dest_dir cockatrice.app/Contents/Plugins)
   set(qtconf_dest_dir cockatrice.app/Contents/Resources)
 
-  # Qt plugins: audio (Qt5), iconengines, imageformats, multimedia (Qt6), platforms, printsupport (Qt5), styles, tls (Qt6)
+  # Qt plugins: audio, iconengines, imageformats, multimedia, platforms, printsupport, styles, tls
   install(
     DIRECTORY "${QT_PLUGINS_DIR}/"
     DESTINATION ${plugin_dest_dir}
@@ -486,20 +673,56 @@ if(WIN32)
   set(qtconf_dest_dir .)
 
   install(
-    DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
+    DIRECTORY "$<TARGET_FILE_DIR:cockatrice>/"
     DESTINATION ./
     FILES_MATCHING
     PATTERN "*.dll"
+    PATTERN "*.pdb" EXCLUDE
+    PATTERN "*.dir*" EXCLUDE
+    PATTERN "*_autogen*" EXCLUDE
+    PATTERN "*.tlog*" EXCLUDE
+    PATTERN "CMakeFiles*" EXCLUDE
+    PATTERN "x64*" EXCLUDE
+    PATTERN ".qt*" EXCLUDE
+    PATTERN ".qsb*" EXCLUDE
+    PATTERN ".lupdate*" EXCLUDE
   )
 
+  # fixup_bundle further down copies only the DLLs it can find in Cockatrice.exe's
+  # 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
+  # Windows package check then fails on a package that is fine to run.
+  # Qt6::ShaderTools is skipped for the same reason.
+  #
+  # Install the runtime of every linked module explicitly. An unused DLL costs a
+  # few hundred kilobytes; a missing one is what stops the client starting after
+  # an update, and it stays invisible until then.
+  foreach(_qt_module IN LISTS COCKATRICE_QT_MODULES)
+    get_target_property(_qt_module_type ${_qt_module} TYPE)
+    if(_qt_module_type STREQUAL "SHARED_LIBRARY")
+      install(FILES "$<TARGET_FILE:${_qt_module}>" DESTINATION ./)
+    endif()
+  endforeach()
+
   install(
     DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/"
     DESTINATION ./
     FILES_MATCHING
     PATTERN "*.ini"
+    PATTERN "CMakeFiles*" EXCLUDE
+    PATTERN "*.dir*" EXCLUDE
+    PATTERN "*_autogen*" EXCLUDE
+    PATTERN "*.tlog*" EXCLUDE
+    PATTERN "*.pdb" EXCLUDE
+    PATTERN "x64*" EXCLUDE
+    PATTERN ".qt*" EXCLUDE
+    PATTERN ".qsb*" EXCLUDE
+    PATTERN ".lupdate*" EXCLUDE
   )
 
-  # Qt plugins: audio (Qt5), iconengines, imageformats, multimedia (Qt6) platforms, printsupport (Qt5), styles, tls (Qt6)
+  # Qt plugins: audio, iconengines, imageformats, multimedia, platforms, printsupport, styles, tls
   install(
     DIRECTORY "${QT_PLUGINS_DIR}/"
     DESTINATION ${plugin_dest_dir}
@@ -521,16 +744,23 @@ if(WIN32)
     PATTERN "styles/qopensslbackend.dll"
     PATTERN "styles/qschannelbackend.dll"
     PATTERN "styles/qwindowsvistastyle.dll"
+    PATTERN "styles/qwindows11style.dll"
+    PATTERN "styles/qmodernwindowsstyle.dll"
+    PATTERN "styles/qmodernwindowsstyled.dll"
     PATTERN "tls/qcertonlybackend.dll"
     PATTERN "tls/qopensslbackend.dll"
     PATTERN "tls/qschannelbackend.dll"
   )
 
+  # The Windows install has no Resources directory: the .qm files go to
+  # ${COCKATRICE_WIN32_QM_INSTALL_DIR} and main.cpp looks for them at
+  # applicationDirPath() + "/translations". The macOS bundle above keeps
+  # Resources/translations, which is correct for it.
   install(
     CODE "
         file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
 Plugins = Plugins
-Translations = Resources/translations
+Translations = translations
 Data = Resources\")
     "
     COMPONENT Runtime
@@ -546,13 +776,9 @@ Data = Resources\")
         "
     COMPONENT Runtime
   )
-
-  if(OPENSSL_FOUND)
-    install(FILES ${OPENSSL_INCLUDE_DIRS} DESTINATION ./)
-  endif()
 endif()
 
-if(Qt6_FOUND AND Qt6LinguistTools_FOUND)
+if(Qt6LinguistTools_FOUND)
   #Qt6 Translations happen after the executable is built up
   if(UPDATE_TRANSLATIONS)
     qt6_add_translations(
@@ -577,8 +803,18 @@ if(Qt6_FOUND AND Qt6LinguistTools_FOUND)
   elseif(WIN32)
     install(FILES ${cockatrice_QM} DESTINATION ${COCKATRICE_WIN32_QM_INSTALL_DIR})
   endif()
+
+  # Qt attaches the .qm files to the default build target only, so building the executable on its own
+  # (CLion, --target cockatrice) leaves it without any translations: nothing is translated and the
+  # language selector stays empty.
+  # Depend on Qt's own lrelease target instead of attaching the .qm custom commands to a second
+  # target: two independent targets owning the same outputs race on MSBuild/Makefiles and are an
+  # error on Xcode. Older Qt versions already add this dependency themselves.
+  foreach(_lrelease_target Cockatrice_lrelease cockatrice_lrelease)
+    if(TARGET ${_lrelease_target})
+      add_dependencies(cockatrice ${_lrelease_target})
+    endif()
+  endforeach()
 endif()
 
-if(Qt6_FOUND)
-  qt6_finalize_target(cockatrice)
-endif()
+qt6_finalize_target(cockatrice)
diff --git a/cockatrice/cockatrice-cod.xml b/cockatrice/cockatrice-cod.xml
new file mode 100644
index 000000000..1a0199433
--- /dev/null
+++ b/cockatrice/cockatrice-cod.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+    <mime-type type="application/x-cockatrice">
+        <comment>Cockatrice Deck File</comment>
+        <glob pattern="*.cod"/>
+    </mime-type>
+</mime-info>
diff --git a/cockatrice/cockatrice.desktop b/cockatrice/cockatrice.desktop
index 092d84ef5..70db9d472 100644
--- a/cockatrice/cockatrice.desktop
+++ b/cockatrice/cockatrice.desktop
@@ -3,6 +3,7 @@
 Version=1.0
 Type=Application
 Name=Cockatrice
-Exec=cockatrice
+Exec=cockatrice %U
 Icon=cockatrice
 Categories=Game;CardGame;
+MimeType=application/x-cockatrice;x-scheme-handler/cockatrice;
diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc
index 99f5bff23..4ec3d2385 100644
--- a/cockatrice/cockatrice.qrc
+++ b/cockatrice/cockatrice.qrc
@@ -2,6 +2,7 @@
     <qresource prefix="/">
         <file>resources/cardback.svg</file>
         <file>resources/cockatrice.svg</file>
+        <file>resources/cockatrice-logo-white.svg</file>
         <file>resources/hand.svg</file>
         <file>resources/hr.jpg</file>
 
@@ -15,18 +16,24 @@
         <file>resources/icons/arrow_top_green.svg</file>
         <file>resources/icons/arrow_up_green.svg</file>
         <file>resources/icons/arrow_undo.svg</file>
+        <file>resources/icons/circle_half_stroke.svg</file>
         <file>resources/icons/clearsearch.svg</file>
         <file>resources/icons/cogwheel.svg</file>
         <file>resources/icons/conceded.svg</file>
         <file>resources/icons/decrement.svg</file>
         <file>resources/icons/delete.svg</file>
+        <file>resources/icons/dragon.svg</file>
         <file>resources/icons/dropdown_collapsed.svg</file>
         <file>resources/icons/dropdown_expanded.svg</file>
+        <file>resources/icons/filter.svg</file>
+        <file>resources/icons/floppy_disk.svg</file>
         <file>resources/icons/forgot_password.svg</file>
+        <file>resources/icons/gear.svg</file>
         <file>resources/icons/increment.svg</file>
         <file>resources/icons/info.svg</file>
         <file>resources/icons/lock.svg</file>
         <file>resources/icons/not_ready_start.svg</file>
+        <file>resources/icons/pen_to_square.svg</file>
         <file>resources/icons/pencil.svg</file>
         <file>resources/icons/pin.svg</file>
         <file>resources/icons/player.svg</file>
@@ -34,10 +41,13 @@
         <file>resources/icons/reload.svg</file>
         <file>resources/icons/remove_row.svg</file>
         <file>resources/icons/rename.svg</file>
+        <file>resources/icons/scale_balanced.svg</file>
         <file>resources/icons/scales.svg</file>
+        <file>resources/icons/scroll.svg</file>
         <file>resources/icons/search.svg</file>
         <file>resources/icons/settings.svg</file>
         <file>resources/icons/share.svg</file>
+        <file>resources/icons/sort_arrow_down.svg</file>
         <file>resources/icons/spectator.svg</file>
         <file>resources/icons/swap.svg</file>
         <file>resources/icons/sync.svg</file>
@@ -46,18 +56,24 @@
         <file>resources/icons/view.svg</file>
 
         <file>resources/icons/mana/B.svg</file>
+        <file>resources/icons/mana/C.svg</file>
         <file>resources/icons/mana/G.svg</file>
         <file>resources/icons/mana/R.svg</file>
         <file>resources/icons/mana/U.svg</file>
         <file>resources/icons/mana/W.svg</file>
 
-        <file>resources/backgrounds/home.png</file>
+        <file>resources/backgrounds/home.jpg</file>
+        <file>resources/backgrounds/home-dark.jpg</file>
+        <file>resources/backgrounds/home-light.jpg</file>
+        <file>resources/backgrounds/card_triplet.svg</file>
+        <file>resources/backgrounds/placeholder_printing_selector.svg</file>
 
         <file>resources/config/general.svg</file>
         <file>resources/config/appearance.svg</file>
         <file>resources/config/interface.svg</file>
         <file>resources/config/messages.svg</file>
         <file>resources/config/deckeditor.svg</file>
+        <file>resources/config/storage.svg</file>
         <file>resources/config/shorcuts.svg</file>
         <file>resources/config/sound.svg</file>
         <file>resources/config/debug.ini</file>
@@ -349,6 +365,8 @@
 
         <file>resources/usericons/pawn_single.svg</file>
         <file>resources/usericons/pawn_double.svg</file>
+        <file>resources/usericons/pawn_dev_single.svg</file>
+        <file>resources/usericons/pawn_dev_double.svg</file>
         <file>resources/usericons/pawn_donator_single.svg</file>
         <file>resources/usericons/pawn_donator_double.svg</file>
         <file>resources/usericons/pawn_judge_single.svg</file>
diff --git a/cockatrice/cockatrice_en@source.ts b/cockatrice/cockatrice_en@source.ts
index 53e6a7a96..426822209 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/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="87"/>
         <source>&amp;Set counter...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12,12 +12,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="199"/>
         <source>Set counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="200"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25,12 +25,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -38,79 +38,130 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="222"/>
         <source>Open in new tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="247"/>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="248"/>
         <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="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="305"/>
         <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="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="321"/>
         <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="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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"/>
         <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="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="359"/>
         <source>Save deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <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"/>
         <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="504"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="545"/>
         <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/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
+        <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>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="283"/>
         <source>Update Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="296"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -118,202 +169,339 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="132"/>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="433"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="433"/>
         <source>Could not create themes directory at &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="509"/>
         <source>Theme settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="510"/>
         <source>Current theme:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="511"/>
         <source>Open themes folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="518"/>
         <source>Home tab background source:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="519"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="520"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="538"/>
         <source>Menu settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="539"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="540"/>
+        <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"/>
         <source>Card rendering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="549"/>
         <source>Display card names on cards having a picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="550"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="544"/>
         <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/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="46"/>
+        <source>Light</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="47"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="517"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="521"/>
+        <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"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="536"/>
+        <source>Style user list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="542"/>
+        <source>Card printings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="546"/>
         <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/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="551"/>
         <source>Scale cards on mouse over</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="552"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="555"/>
+        <source>Card layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="557"/>
         <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/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="558"/>
         <source>Maximum initial height for card view window:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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"/>
         <source> rows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="560"/>
         <source>Maximum expanded height for card view window:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="563"/>
         <source>Card counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="567"/>
         <source>Counter %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="570"/>
         <source>Hand layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="571"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="572"/>
         <source>Enable left justification</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="574"/>
         <source>Table grid layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="575"/>
         <source>Invert vertical coordinate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="576"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="553"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="141"/>
+        <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"/>
+        <source>Open Deck in Deck Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -335,111 +523,111 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="20"/>
         <source>ban &amp;user name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="24"/>
         <source>ban &amp;IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="28"/>
         <source>ban client I&amp;D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="43"/>
         <source>Ban type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="46"/>
         <source>&amp;permanent ban</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="47"/>
         <source>&amp;temporary ban</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="50"/>
         <source>&amp;Days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="56"/>
         <source>&amp;Hours:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="62"/>
         <source>&amp;Minutes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="77"/>
         <source>Duration of the ban</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="80"/>
         <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_widget.cpp" line="102"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="85"/>
         <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_widget.cpp" line="105"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="88"/>
         <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_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="90"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="93"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="112"/>
         <source>Ban user from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="199"/>
         <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_widget.cpp" line="220"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="207"/>
         <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_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="215"/>
         <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_widget.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="224"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -447,152 +635,378 @@ 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="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="266"/>
         <source>Beta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="292"/>
         <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="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="301"/>
         <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="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="335"/>
         <source>No reply received from the file update server.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<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"/>
+        <source>No card selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="66"/>
+        <source>Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="68"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="70"/>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="72"/>
+        <source>Reason</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
         <source>Sets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
         <source>Mana cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
         <source>Card type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="77"/>
         <source>P/T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="79"/>
         <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"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="144"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -623,22 +1037,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="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="371"/>
         <source>View related cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="416"/>
         <source>Add card to deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="429"/>
         <source>Mainboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="435"/>
         <source>Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -646,17 +1060,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="63"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="70"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="76"/>
+        <source>Set:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="78"/>
+        <source>Collector Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="93"/>
         <source>Related cards:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="110"/>
         <source>Unknown card:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -664,132 +1088,150 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="313"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="491"/>
         <source>&amp;All players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="396"/>
         <source>View related cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="443"/>
         <source>Token: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="460"/>
         <source>All tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>&amp;Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="486"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
         <source>&amp;Tap / Untap</source>
         <extracomment>Turn sideways or back again</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="494"/>
+        <source>Skip &amp;untapping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="496"/>
         <source>T&amp;urn Over</source>
         <extracomment>Turn face up/face down</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="505"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="507"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="512"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="515"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="518"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="23"/>
         <source>Card Size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -797,142 +1239,160 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <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>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -940,29 +1400,575 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="149"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="167"/>
+        <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"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="175"/>
+        <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"/>
+        <source>The server is going to be restarted in %n minute(s).
+All running games will be lost.
+Reason for shutdown: %1</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="185"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="223"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="224"/>
+        <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"/>
+        <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="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="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"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="233"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Account activation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="290"/>
+        <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"/>
+        <source>Server Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="319"/>
+        <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"/>
+        <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="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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="385"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="413"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="419"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="427"/>
+        <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"/>
+        <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"/>
+        <source>Success</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="443"/>
+        <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"/>
+        <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"/>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="460"/>
+        <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.
+
+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"/>
+        <source>Reset Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="470"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="518"/>
+        <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"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="526"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>NOT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="560"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="74"/>
+        <source>Card Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation type="unfinished"></translation>
     </message>
@@ -970,47 +1976,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="30"/>
         <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="204"/>
-        <source>Add to Deck</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="140"/>
         <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="260"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="141"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1018,87 +1994,158 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="143"/>
+        <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"/>
         <source>Banner Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="189"/>
         <source>Main Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="190"/>
         <source>Mana Cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="191"/>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <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"/>
         <source>Select Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <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"/>
         <source>Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1003"/>
         <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="602"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1004"/>
         <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="603"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1005"/>
         <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="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1006"/>
         <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="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1007"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1008"/>
         <source>Group by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1009"/>
+        <source>Format:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1012"/>
         <source>Hash:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1014"/>
         <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="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1015"/>
         <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="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1016"/>
         <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="612"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="1017"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1106,17 +2153,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="141"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <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="143"/>
         <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="142"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="144"/>
         <source>Delete selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1124,114 +2171,119 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="159"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="160"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="161"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="162"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="163"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="164"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="159"/>
-        <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="161"/>
-        <source>Edit deck in clipboard</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="166"/>
-        <source>Annotated</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="168"/>
-        <source>Not Annotated</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
-        <source>Save deck to clipboard</source>
+        <source>Share deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="167"/>
-        <source>Annotated (No set info)</source>
+        <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"/>
-        <source>Not Annotated (No set info)</source>
+        <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"/>
+        <source>Annotated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="171"/>
-        <source>&amp;Print deck...</source>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <source>Not Annotated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="173"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
-        <source>&amp;Send deck to online service</source>
+        <source>Save deck to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
-        <source>Create decklist (decklist.org)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
-        <source>Create decklist (decklist.xyz)</source>
+        <source>Annotated (No set info)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
+        <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"/>
+        <source>&amp;Print deck...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
+        <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"/>
+        <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"/>
+        <source>Create decklist (decklist.org)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="184"/>
+        <source>Create decklist (decklist.xyz)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="185"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="186"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="188"/>
         <source>&amp;Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1239,7 +2291,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="51"/>
         <source>Printing Selector</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1247,194 +2299,213 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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"/>
         <source>Update Spoilers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="132"/>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="132"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="138"/>
         <source>Add URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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"/>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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"/>
         <source>Edit URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="380"/>
         <source>Add New URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="382"/>
         <source>Remove URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="312"/>
         <source>Updating...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <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"/>
         <source>Choose path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="368"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="369"/>
         <source>Spoilers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="370"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="371"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="372"/>
         <source>Last Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="373"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="374"/>
         <source>Press the button to manually update without relaunching</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="375"/>
         <source>Do not close settings until manual update is complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="376"/>
         <source>Download card pictures on the fly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="377"/>
         <source>How to add a custom URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="378"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="59"/>
+        <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"/>
+        <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"/>
+        <source>[redo] </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="89"/>
+        <source>[undo] </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="247"/>
         <source>Count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="251"/>
         <source>Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="253"/>
         <source>Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="255"/>
         <source>Provider ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="249"/>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1442,12 +2513,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1455,17 +2526,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="44"/>
         <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="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="47"/>
         <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"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1473,7 +2549,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="47"/>
         <source>Edit tags ...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1481,62 +2557,62 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="103"/>
         <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="103"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="104"/>
         <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="104"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="105"/>
         <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="105"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="106"/>
         <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="106"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="107"/>
         <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="107"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="108"/>
         <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="108"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="109"/>
         <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="109"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="110"/>
         <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="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="143"/>
         <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="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="143"/>
         <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="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="152"/>
         <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="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="152"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1544,98 +2620,216 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="118"/>
         <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="320"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="441"/>
         <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="323"/>
+        <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"/>
         <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="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="457"/>
         <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="332"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="459"/>
         <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="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="461"/>
         <source>Annotated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="466"/>
         <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="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="471"/>
         <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="340"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="476"/>
         <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="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="484"/>
         <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="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="486"/>
         <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="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="501"/>
         <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="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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"/>
         <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="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="554"/>
         <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="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="568"/>
         <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="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="568"/>
         <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="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="576"/>
         <source>Delete failed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="121"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Tags changed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="185"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Added</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="494"/>
+        <source>Removed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1653,94 +2847,122 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="132"/>
         <source>Load deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="133"/>
         <source>Load remote deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="134"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="135"/>
         <source>Load from website...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="136"/>
         <source>Unload deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="137"/>
         <source>Ready to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="138"/>
         <source>Force start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="206"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="208"/>
         <source>Sideboard locked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="278"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="292"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="278"/>
         <source>The selected file could not be loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="292"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="401"/>
         <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/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="403"/>
         <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="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="38"/>
         <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="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="40"/>
         <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="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="42"/>
         <source>Remember and automatically apply choice in the future</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1753,143 +2975,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="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="21"/>
         <source>Known Hosts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="26"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="34"/>
         <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="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>New Host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="47"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="52"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="57"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="62"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="67"/>
         <source>P&amp;assword:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>&amp;Save password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
         <source>A&amp;uto connect</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="76"/>
         <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="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
         <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="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="94"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="284"/>
         <source>Webpage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="104"/>
         <source>Reset Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="108"/>
         <source>Forgot password?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="111"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="135"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="155"/>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="158"/>
         <source>Server Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="171"/>
         <source>Connect to Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Server URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
         <source>Communication Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="306"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="332"/>
         <source>Connection Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="332"/>
         <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="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="347"/>
         <source>Connect Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="347"/>
         <source>The player name can&apos;t be empty.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1982,32 +3204,37 @@ This will kick all non-ready players from the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="107"/>
+        <source>Create game as judge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="119"/>
         <source>Game setup options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="181"/>
         <source>&amp;Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="187"/>
         <source>Create game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="235"/>
         <source>Game information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="325"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="325"/>
         <source>Server error.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2015,97 +3242,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="36"/>
         <source>&amp;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="37"/>
         <source>Token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>C&amp;olor:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>white</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="51"/>
         <source>black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="52"/>
         <source>red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="54"/>
         <source>multicolor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="55"/>
         <source>colorless</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;P/T:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Annotation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="68"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="71"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="86"/>
         <source>Token data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="104"/>
         <source>Show &amp;all tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="106"/>
         <source>Show tokens from this &amp;deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="145"/>
         <source>Choose token from list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="163"/>
         <source>Create token</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2113,53 +3340,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Edit Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <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="51"/>
         <source>Cancel</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="52"/>
         <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="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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"/>
         <source>✖</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="92"/>
         <source>Invalid Input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="92"/>
         <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="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="104"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="104"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2167,39 +3394,44 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="58"/>
         <source>No image chosen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 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"/>
         <source>Browse...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="43"/>
         <source>Change avatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>Open Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="56"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="67"/>
         <source>Invalid image chosen.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2207,17 +3439,17 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2225,38 +3457,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="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="15"/>
         <source>Old password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="27"/>
         <source>New password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="33"/>
         <source>Confirm new password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="56"/>
         <source>Change password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="65"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="68"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="65"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="68"/>
         <source>The new passwords don&apos;t match.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2264,83 +3496,83 @@ 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="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="27"/>
         <source>&amp;Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="33"/>
         <source>C&amp;olor:</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>white</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>blue</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>black</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>red</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>green</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>multicolor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="41"/>
         <source>colorless</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="45"/>
         <source>&amp;P/T:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="51"/>
         <source>&amp;Annotation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="67"/>
         <source>Token data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="93"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Add token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="96"/>
         <source>Remove token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="121"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="152"/>
         <source>Please enter the name of the token:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2374,12 +3606,12 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2417,112 +3649,115 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
-        <source>Hide games that have started</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
+        <source>Hide started games</source>
+        <oldsource>Hide games that have started</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
-        <source>&amp;Creator name:</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
+        <source>&amp;Host name:</source>
+        <oldsource>&amp;Creator name:</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2705,10 +3940,43 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <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="6"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck.cpp" line="8"/>
         <source>Load Deck</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2716,17 +3984,17 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2734,43 +4002,43 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2784,155 +4052,589 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="16"/>
+        <source>Players:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="27"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="30"/>
+        <source>Starting life total:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="41"/>
+        <source>Game setup options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="44"/>
+        <source>Remember settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="63"/>
+        <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/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="18"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
         <source>Number of hits:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
         <source>Auto play hits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
         <source>Put top cards on stack until...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <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/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
         <source>Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
         <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="17"/>
+        <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"/>
         <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="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="66"/>
         <source>&amp;Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="71"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="76"/>
         <source>Player &amp;name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="81"/>
         <source>P&amp;assword:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="87"/>
         <source>Password (again):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="93"/>
         <source>Email:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="98"/>
         <source>Email (again):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="103"/>
         <source>Country:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="106"/>
         <source>Undefined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="318"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
         <source>Real name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="353"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="401"/>
         <source>Register to server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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"/>
+        <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"/>
         <source>Registration Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="512"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="365"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="515"/>
         <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="369"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="519"/>
         <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="373"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="523"/>
         <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>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2940,62 +4642,55 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="476"/>
         <source>Unknown Error loading card database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
-        <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="1875"/>
-        <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="1881"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="496"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3004,21 +4699,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="1887"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="502"/>
         <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="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="506"/>
         <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="1895"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="510"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3027,99 +4722,235 @@ 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="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="529"/>
         <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="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="539"/>
         <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="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="551"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <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"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="563"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="563"/>
         <source>User Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="564"/>
+        <source>Storage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="563"/>
         <source>Card Sources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <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"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="564"/>
         <source>Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="564"/>
         <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="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="10"/>
         <source>Card Update Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="18"/>
         <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="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
         <source>Run in background</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="28"/>
         <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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="29"/>
         <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="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="30"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3145,164 +4976,174 @@ 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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Current release channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="44"/>
         <source>Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="45"/>
         <source>Cancel Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="46"/>
         <source>Open Download Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
         <source>Check for Client Updates</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="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="74"/>
         <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="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="100"/>
         <source>Downloading update: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="117"/>
         <source>Checking for updates...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="132"/>
         <source>Finished checking for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="147"/>
         <source>No Update Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="148"/>
         <source>Cockatrice is up to date!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="149"/>
         <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="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
         <source>Current version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
         <source>Selected release channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="160"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="174"/>
         <source>Update Available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="175"/>
         <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="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="175"/>
         <source>New version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="176"/>
         <source>Released</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="177"/>
         <source>Changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
         <source>Do you want to update now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="179"/>
         <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="171"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="182"/>
         <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="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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"/>
         <source>Update Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="238"/>
         <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="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="246"/>
         <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="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="251"/>
         <source>Installing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="314"/>
         <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="232"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="315"/>
         <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="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="316"/>
         <source>Download location</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3310,21 +5151,153 @@ 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="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="28"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="33"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="45"/>
         <source>Debug Log</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3394,33 +5367,39 @@ You may have to manually download the new version.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="82"/>
         <source>Salt: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -3428,7 +5407,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="31"/>
         <source>Type your filter here</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3436,45 +5415,88 @@ 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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="68"/>
         <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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="68"/>
         <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="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="78"/>
         <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="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="78"/>
         <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="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="455"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="458"/>
         <source>player left the game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="461"/>
         <source>player disconnected from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="465"/>
         <source>reason unknown</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3482,133 +5504,202 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="246"/>
         <source>Please join the appropriate room first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="249"/>
         <source>Wrong password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="252"/>
         <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="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="255"/>
         <source>The game is already full.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="258"/>
         <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="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="261"/>
         <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="239"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="264"/>
         <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="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="267"/>
         <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="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="308"/>
         <source>Join Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="311"/>
         <source>Spectate Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="314"/>
         <source>Game Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <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"/>
+        <source>Join Game as Judge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="340"/>
+        <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"/>
         <source>Join game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
-        <source>Password:</source>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="379"/>
+        <source>The game is full. Join as a spectator instead?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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"/>
         <source>Please join the respective room first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="473"/>
         <source>&amp;Filter games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="474"/>
         <source>C&amp;lear filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="476"/>
         <source>C&amp;reate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="478"/>
         <source>&amp;Join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="479"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="480"/>
         <source>J&amp;oin as spectator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="481"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="502"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="504"/>
         <source>Games</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="58"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation type="unfinished">
@@ -3617,12 +5708,12 @@ You may have to manually download the new version.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="60"/>
         <source>new</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="63"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation type="unfinished">
@@ -3631,83 +5722,83 @@ You may have to manually download the new version.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="164"/>
         <source>password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="167"/>
         <source>buddies only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="155"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="170"/>
         <source>reg. users only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="173"/>
         <source>open decklists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="206"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="211"/>
         <source>can chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="208"/>
         <source>see hands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="213"/>
         <source>can see hands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="218"/>
         <source>not allowed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
         <source>Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
         <source>Age</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
-        <source>Creator</source>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="251"/>
+        <source>Host</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="253"/>
         <source>Type</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="255"/>
         <source>Restrictions</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="259"/>
         <source>Players</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="267"/>
         <source>Spectators</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3715,143 +5806,275 @@ You may have to manually download the new version.</source>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="587"/>
         <source>Reset all paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="280"/>
         <source>All paths have been reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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"/>
         <source>Choose path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
+        <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/dialogs/dlg_settings.cpp" line="363"/>
+        <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"/>
+        <source>Language settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="515"/>
         <source>Language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <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"/>
+        <source>Version settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="543"/>
+        <source>Card database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="558"/>
+        <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"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="578"/>
         <source>Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="527"/>
         <source>How to help with translations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="580"/>
         <source>Decks directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="581"/>
         <source>Filters directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="582"/>
         <source>Replays directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="583"/>
         <source>Pictures directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="584"/>
         <source>Card database:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="585"/>
         <source>Custom database directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="586"/>
         <source>Token database:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="530"/>
         <source>Update channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="531"/>
         <source>Check for client updates on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="544"/>
         <source>Check for card database updates on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="545"/>
         <source>Don&apos;t check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="547"/>
         <source>Prompt for update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="549"/>
         <source>Always update in the background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="550"/>
         <source>Check for card database updates every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="551"/>
         <source> days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="532"/>
         <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/dialogs/dlg_settings.cpp" line="390"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="533"/>
         <source>Automatically run Oracle when running a new version of Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="559"/>
         <source>Show tips on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="556"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3859,47 +6082,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="101"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="103"/>
         <source>&amp;View graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Move graveyard to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="75"/>
         <source>&amp;All players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="110"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="112"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3907,305 +6130,655 @@ You may have to manually download the new version.</source>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</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="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
         <source>Create New Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Browse Decks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="255"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="259"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="262"/>
+        <source>Browse Archidekt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="265"/>
         <source>View Replays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="269"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="284"/>
         <source>Connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="288"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="294"/>
         <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>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4213,665 +6786,321 @@ You may have to manually download the new version.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="184"/>
+        <location filename="src/interface/window_main.cpp" line="191"/>
         <source>Player %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="204"/>
         <source>Load replay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="263"/>
         <source>About Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="265"/>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="266"/>
         <source>Cockatrice Webpage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="266"/>
         <source>Project Manager:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="267"/>
         <source>Past Project Managers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="268"/>
         <source>Developers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="269"/>
         <source>Our Developers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="270"/>
         <source>Help Develop!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="271"/>
         <source>Translators:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="272"/>
         <source>Our Translators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="273"/>
         <source>Help Translate!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="273"/>
         <source>Support:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="274"/>
         <source>Report an Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="275"/>
         <source>Troubleshooting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="276"/>
         <source>F.A.Q.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="1154"/>
+        <location filename="src/interface/window_main.cpp" line="1244"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <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/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <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/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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/interface/window_main.cpp" line="443"/>
-        <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/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <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/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <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/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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/interface/window_main.cpp" line="616"/>
-        <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/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;Connect...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Start &amp;local game...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>&amp;Watch replay...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>&amp;Register to server...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>&amp;Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>&amp;Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="335"/>
         <source>A&amp;ctions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="337"/>
         <source>&amp;Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="340"/>
         <source>C&amp;ard Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="341"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="342"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="343"/>
         <source>Open custom image folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="344"/>
         <source>Open custom sets folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="345"/>
         <source>Add custom sets/cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="346"/>
         <source>Reload card database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="348"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="350"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="351"/>
         <source>&amp;About Cockatrice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="352"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="353"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="354"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="355"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="356"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="357"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="358"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <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"/>
         <source>Show/Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <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"/>
         <source>New Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <location filename="src/interface/window_main.cpp" line="806"/>
         <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="1003"/>
+        <location filename="src/interface/window_main.cpp" line="810"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <location filename="src/interface/window_main.cpp" line="811"/>
         <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="1138"/>
+        <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"/>
         <source>Card database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <location filename="src/interface/window_main.cpp" line="1009"/>
         <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="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="1013"/>
+        <location filename="src/interface/window_main.cpp" line="1045"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="1014"/>
+        <location filename="src/interface/window_main.cpp" line="1047"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="1015"/>
         <source>Open settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="1037"/>
         <source>New sets found</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <location filename="src/interface/window_main.cpp" line="1039"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
@@ -4881,441 +7110,605 @@ Do you want to enable it/them?</source>
         </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="1046"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="1048"/>
         <source>View sets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="1079"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="1080"/>
         <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="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="1100"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="1100"/>
         <source>A card database update is already running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="1155"/>
         <source>Unable to run the card database updater: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="1167"/>
         <source>Card database update running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <location filename="src/interface/window_main.cpp" line="1220"/>
         <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="1296"/>
+        <location filename="src/interface/window_main.cpp" line="1223"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <location filename="src/interface/window_main.cpp" line="1227"/>
         <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="1303"/>
+        <location filename="src/interface/window_main.cpp" line="1230"/>
         <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="1307"/>
+        <location filename="src/interface/window_main.cpp" line="1234"/>
         <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="1312"/>
+        <location filename="src/interface/window_main.cpp" line="1239"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="1244"/>
         <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="1372"/>
-        <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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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"/>
         <source>Load sets/cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1333"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1339"/>
         <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="1435"/>
+        <location filename="src/interface/window_main.cpp" line="1368"/>
         <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="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1371"/>
         <source>Sets/cards failed to import.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="42"/>
         <source> from play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="44"/>
         <source> from their graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="46"/>
         <source> from exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="48"/>
         <source> from their hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="53"/>
         <source>the top card of %1&apos;s library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="55"/>
         <source>the top card of their library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source> from the top of %1&apos;s library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source> from the top of their library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="68"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="70"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="75"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="77"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from %1&apos;s library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from their library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="88"/>
         <source> from sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="90"/>
         <source> from the stack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="92"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="118"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="119"/>
         <source>%1 is not revealing the top card %2 any longer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="126"/>
         <source>%1 can now look at top card %2 at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="127"/>
         <source>%1 no longer can look at top card %2 at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="137"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="148"/>
         <source>%1 has conceded the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="157"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="167"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="171"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="190"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="195"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="208"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="212"/>
         <source>%1 points from their %2 to %3&apos;s %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="218"/>
         <source>%1 points from %2&apos;s %3 to their own %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="224"/>
         <source>%1 points from %2&apos;s %3 to %4&apos;s %5.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="238"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="240"/>
         <source>%1 creates token: %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="251"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="253"/>
         <source>%1 has loaded a deck with %2 sideboard cards (%3).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="263"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="298"/>
         <source>a card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="304"/>
         <source>%1 gives %2 control over %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="318"/>
         <source>%1 puts %2 into play%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
+        <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"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
+        <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"/>
         <source>%1 exiles %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="333"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="336"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="338"/>
         <source>%1 puts %2%3 onto the bottom of their library.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="340"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="344"/>
         <source>%1 puts %2%3 into their library %4 cards from the top.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="347"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="351"/>
+        <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"/>
         <source>%1 plays %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="358"/>
+        <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"/>
         <source>%1 moves %2%3 to custom zone &apos;%4&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="381"/>
         <source>%1 tries to draw from an empty library</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="383"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -5323,12 +7716,12 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="393"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="398"/>
         <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">
@@ -5337,72 +7730,72 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="410"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="413"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="419"/>
         <source>The game has been closed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="424"/>
         <source>The game has started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="429"/>
         <source>You are flooding the game. Please wait a couple of seconds.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="435"/>
         <source>%1 has joined the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="441"/>
         <source>%1 is now watching the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="446"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 has left the game (%2).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="460"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="467"/>
         <source>%1 is not ready to start the game any more.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="476"/>
         <source>%1 shuffles their deck and draws a new hand of %2 card(s).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -5410,28 +7803,28 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="481"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="487"/>
         <source>You are watching a replay of game #%1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="492"/>
         <source>%1 is ready to start the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="518"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="520"/>
         <source>%1 card(s)</source>
         <comment>a card for singular, %1 cards for plural</comment>
         <translation type="unfinished">
@@ -5440,213 +7833,218 @@ Cockatrice will now reload the card database.</source>
         </translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="529"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="534"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="540"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="546"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="560"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="564"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="570"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="577"/>
         <source>%1 reveals %2%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="584"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>reversed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="594"/>
         <source>Heads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="594"/>
         <source>Tails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="595"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="599"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="606"/>
         <source>%1 flips %2 coins. There are %3 heads and %4 tails.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="616"/>
         <source>%1 rolls a %2-sided dice %3 times: %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="643"/>
         <source>%1&apos;s turn.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="649"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="660"/>
+        <source>%1 places %2 %3%4 counter(s) on %5 (now %6).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
             <numerusform></numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="662"/>
+        <source>%1 removes %2 %3%4 counter(s) from %5 (now %6).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
             <numerusform></numerusform>
         </translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="820"/>
+        <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"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="694"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="696"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="715"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="720"/>
         <source>%1 changes the PT of %2 from nothing to %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="723"/>
         <source>%1 changes the PT of %2 from %3 to %4.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="732"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="735"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="753"/>
         <source>%1 taps their permanents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="753"/>
         <source>%1 untaps their permanents.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="756"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="756"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="772"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="776"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="781"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="786"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="801"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="809"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="811"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5654,110 +8052,125 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="275"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="276"/>
         <source>Add New Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="277"/>
         <source>Edit Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="278"/>
         <source>Remove Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="224"/>
         <source>Add message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Edit message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Chat settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Custom alert words</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="259"/>
         <source>In-game message macros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="261"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="262"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="263"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="264"/>
+        <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"/>
         <source>Invert text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="267"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="268"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="269"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="274"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5765,37 +8178,42 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="9"/>
         <source>Move to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
+        <source>T&amp;able</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="79"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5808,47 +8226,47 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5871,65 +8289,197 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<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"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="156"/>
+        <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"/>
+        <source>▶  Edit Palette</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="172"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="173"/>
+        <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>
+        <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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="178"/>
+        <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"/>
+        <source>Editing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="181"/>
+        <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"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="186"/>
+        <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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="187"/>
+        <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"/>
+        <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"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="84"/>
+        <source>Active</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="84"/>
+        <source>Disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="84"/>
+        <source>Inactive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="86"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="87"/>
+        <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"/>
+        <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>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5937,253 +8487,552 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</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="268"/>
-        <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="151"/>
+        <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"/>
+        <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"/>
+        <source>exile</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="99"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="106"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlaymatCollectionDialog</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <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>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you&apos;ll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="101"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="167"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="278"/>
         <source>Preference</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="286"/>
         <source>Pin Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="293"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <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"/>
         <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>
@@ -6196,17 +9045,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6214,124 +9063,140 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="10"/>
         <source>Alphabetical</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="11"/>
         <source>Preference</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="12"/>
         <source>Release Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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"/>
         <source>Descending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="53"/>
         <source>Ascending</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="8"/>
         <source>Power / toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="73"/>
         <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="770"/>
+        <location filename="src/interface/window_main.cpp" line="432"/>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="433"/>
         <source>Hide %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="434"/>
         <source>Hide Others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="435"/>
         <source>Show All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="436"/>
         <source>Preferences...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="437"/>
         <source>Quit %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="438"/>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6339,224 +9204,401 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="105"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="106"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="206"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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"/>
         <source>Overwrite Existing File?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp" line="61"/>
         <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"/>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+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"/>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+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"/>
+        <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="779"/>
+        <location filename="src/interface/window_main.cpp" line="441"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="442"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="443"/>
         <source>Save All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="444"/>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="445"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="446"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="447"/>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="448"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="449"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="450"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="451"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="452"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="453"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="454"/>
         <source>Discard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="455"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="456"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="457"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="458"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="56"/>
+        <source>%1%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="66"/>
+        <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"/>
+        <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"/>
+        <source>Accent:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="69"/>
+        <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"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="72"/>
+        <source>Subtle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Full colour</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <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"/>
+        <source>70%</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="168"/>
+        <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"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="217"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="219"/>
         <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="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Keep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="166"/>
         <source>Time started</source>
         <translation type="unfinished"></translation>
     </message>
     <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="168"/>
         <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>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6564,70 +9606,78 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Rooms</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="51"/>
         <source>Joi&amp;n</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="54"/>
         <source>Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
         <source>Games</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="18"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="43"/>
+        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="45"/>
         <source>Choose an action from the table</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="50"/>
+        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="52"/>
         <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="175"/>
+        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="177"/>
         <source>Invalid key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
+        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="184"/>
         <source>Shortcut already in use by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
+        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="218"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="217"/>
+        <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="219"/>
         <source>Restore default</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6635,81 +9685,117 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</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/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="107"/>
         <source>Do you really want to restore all default shortcuts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="114"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="115"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="125"/>
         <source>Action:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <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"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="131"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="132"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6717,12 +9803,12 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6730,13 +9816,13 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"></translation>
@@ -6763,12 +9849,12 @@ Please check your shortcut settings!</source>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="24"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6776,27 +9862,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="86"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="87"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="88"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="89"/>
         <source>Sound settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="90"/>
         <source>Master volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6804,48 +9890,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="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="104"/>
         <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="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="104"/>
         <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="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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"/>
         <source>Spoilers download failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="114"/>
         <source>No internet connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="121"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="142"/>
         <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="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="142"/>
         <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="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="187"/>
         <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="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="187"/>
         <source>Last change:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6853,45 +9939,204 @@ Please check your shortcut settings!</source>
 <context>
     <name>StableReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="166"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="182"/>
         <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="128"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="190"/>
         <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="176"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="232"/>
         <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="183"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="239"/>
         <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"/>
+        <source>Success</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="188"/>
+        <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"/>
+        <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"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="206"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="240"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <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"/>
+        <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"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="245"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="246"/>
+        <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"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="249"/>
+        <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"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="251"/>
+        <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"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="253"/>
+        <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"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="256"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
+        <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"/>
         <source>Add to Buddy List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
+        <location filename="src/interface/widgets/tabs/tab_account.cpp" line="73"/>
         <source>Add to Ignore List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
+        <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"/>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7009,56 +10254,227 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Advanced Filters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="208"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Deck Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="272"/>
+        <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"/>
+        <source>Asc.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="364"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="367"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
+        <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"/>
+        <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"/>
+        <source>Formats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>Card:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="166"/>
+        <source>Reason:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="193"/>
+        <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"/>
+        <source>Add rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="241"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="242"/>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="106"/>
         <source>Card Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="107"/>
         <source>Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <source>Card Database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="113"/>
         <source>Floating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="116"/>
         <source>Reset layout</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="86"/>
         <source>Deck: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7066,61 +10482,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="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="157"/>
         <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="320"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="335"/>
         <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="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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"/>
         <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="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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"/>
         <source>Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="341"/>
         <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="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="346"/>
         <source>Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="349"/>
         <source>Visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="350"/>
         <source>Floating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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="353"/>
         <source>Reset layout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7128,22 +10532,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="43"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="63"/>
         <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="44"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="64"/>
         <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="45"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="65"/>
         <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="46"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="66"/>
         <source>Sample Hand</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7151,138 +10555,245 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="233"/>
         <source>Local file system</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="168"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="234"/>
         <source>Server deck storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="236"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="239"/>
         <source>Open in deck editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="237"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="238"/>
         <source>Upload deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="240"/>
         <source>Download deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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"/>
         <source>New folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="243"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="244"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="179"/>
+        <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"/>
         <source>Open decks folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="344"/>
         <source>Rename local folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="344"/>
         <source>Rename local file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="347"/>
         <source>New name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="362"/>
         <source>Rename failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="411"/>
         <source>Enter deck name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="411"/>
         <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="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="417"/>
         <source>Unnamed deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="445"/>
         <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="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="484"/>
         <source>Delete local file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="484"/>
         <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="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="649"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="649"/>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="112"/>
         <source>Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7290,20 +10801,277 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="39"/>
         <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="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="83"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="83"/>
         <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>
@@ -7316,32 +11084,32 @@ Please enter a name:</source>
 <context>
     <name>TabEdhRecMain</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="111"/>
         <source>&amp;Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="112"/>
         <source>Top Commanders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="113"/>
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="114"/>
         <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="134"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="115"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -7349,197 +11117,207 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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"/>
         <source>Replay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="295"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="385"/>
         <source>Player List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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"/>
         <source>Card Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="313"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="384"/>
         <source>Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="315"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="388"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
         <source>&amp;Phases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="325"/>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Next &amp;phase</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="330"/>
         <source>Next phase with &amp;action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
         <source>Next &amp;turn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="339"/>
         <source>&amp;Remove all local arrows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
         <source>Game &amp;information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <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"/>
         <source>Un&amp;concede</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="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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"/>
         <source>&amp;Concede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="367"/>
         <source>&amp;Leave 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="365"/>
         <source>C&amp;lose replay</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="371"/>
         <source>&amp;Focus Chat</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="374"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="378"/>
         <source>Selected cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="381"/>
         <source>&amp;View</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="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="392"/>
         <source>Visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="393"/>
         <source>Floating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="396"/>
         <source>Reset layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="580"/>
         <source>Concede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="580"/>
         <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="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="586"/>
         <source>Unconcede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="587"/>
         <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="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="605"/>
         <source>Leave game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="605"/>
         <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="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="719"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="720"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="729"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7547,7 +11325,7 @@ Please enter a name:</source>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7560,152 +11338,152 @@ Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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"/>
         <source>Time;SenderName;SenderIP;Message;TargetID;TargetName</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>Room 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>Game Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
         <source>Chat Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="67"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="77"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="67"/>
         <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="78"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="77"/>
         <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="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="161"/>
         <source>Username: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="165"/>
         <source>IP Address: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
         <source>Game Name: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>GameID: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Message: </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="182"/>
         <source>Main Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
         <source>Game Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
         <source>Private Chat</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="194"/>
         <source>Past X Days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="195"/>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="196"/>
         <source>Last Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="200"/>
         <source>Maximum Results: </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="204"/>
         <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="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="207"/>
         <source>Get User Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="211"/>
         <source>Clear Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="237"/>
         <source>Log Locations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="246"/>
         <source>Date Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="253"/>
         <source>Maximum Results</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="290"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="296"/>
         <source>Message History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="291"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="297"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7713,218 +11491,558 @@ 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="69"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="72"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="70"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="73"/>
         <source>&amp;Leave</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="90"/>
         <source>%1 - Private chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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"/>
         <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="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="189"/>
         <source>Private message from</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="206"/>
         <source>%1 has left the server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="212"/>
         <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="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
         <source>Local file system</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Server replay storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="219"/>
         <source>Watch replay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="215"/>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="338"/>
         <source>New folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="217"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="222"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="218"/>
         <source>Open replays folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="220"/>
         <source>Download replay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="221"/>
         <source>Toggle expiration lock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="223"/>
         <source>Get replay share code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="597"/>
         <source>Look up replay by share code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="302"/>
         <source>Rename local folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="302"/>
         <source>Rename local file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>New name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="320"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="320"/>
         <source>Rename failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="338"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="354"/>
         <source>Delete local file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="354"/>
         <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="490"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="520"/>
         <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="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
         <source>Failed to get code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="570"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="631"/>
         <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="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="576"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="584"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="586"/>
         <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="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="597"/>
         <source>Replay share code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="618"/>
         <source>Replay code found</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="619"/>
         <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="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="624"/>
         <source>Replay code not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="629"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="636"/>
         <source>Unexpected error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="519"/>
         <source>Delete remote replay</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7934,50 +12052,478 @@ The more information you put in, the more specific your results will be.</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="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="180"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="181"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="182"/>
         <source>&amp;Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="183"/>
         <source>&amp;Leave room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="184"/>
         <source>&amp;Clear chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="185"/>
         <source>Chat Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="197"/>
         <source> mentioned you.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="205"/>
         <source>Click to view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="250"/>
         <source>You are flooding the chat. Please wait a couple of seconds.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7985,35 +12531,35 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabServer</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.h" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_server.h" line="81"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="238"/>
         <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="211"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="250"/>
         <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="216"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="268"/>
         <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="221"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="276"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8021,92 +12567,176 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="240"/>
         <source>Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="241"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="242"/>
         <source>EDHRec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="243"/>
+        <source>Archidekt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="244"/>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="245"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="246"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="247"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="248"/>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="249"/>
         <source>Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="250"/>
         <source>Game Replays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="251"/>
         <source>Administration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="252"/>
         <source>Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <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"/>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="331"/>
         <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="999"/>
+        <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"/>
         <source>Click to view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1466"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1515"/>
         <source>Unknown Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1516"/>
         <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.
 
@@ -8114,38 +12744,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="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1521"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1521"/>
         <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="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1525"/>
         <source>Promotion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1526"/>
         <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="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1530"/>
         <source>Warned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1531"/>
         <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="1098"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1546"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation type="unfinished"></translation>
@@ -8153,12 +12783,45 @@ Please refrain from engaging in this activity or further actions may be taken ag
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
         <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>
@@ -8173,6 +12836,65 @@ 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>
@@ -8191,42 +12913,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8234,214 +12956,327 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="453"/>
+        <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"/>
+        <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"/>
+        <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>
+        <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"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="458"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="463"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="65"/>
         <source>User &amp;details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="67"/>
         <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="64"/>
-        <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="65"/>
-        <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="66"/>
-        <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="67"/>
-        <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="68"/>
-        <source>Kick from &amp;game</source>
+        <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"/>
-        <source>Warn user</source>
+        <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"/>
-        <source>View user&apos;s war&amp;n history</source>
+        <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"/>
-        <source>Ban from &amp;server</source>
+        <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"/>
-        <source>View user&apos;s &amp;ban history</source>
+        <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"/>
-        <source>&amp;Promote user to moderator</source>
+        <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>Dem&amp;ote user from moderator</source>
+        <source>Report user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="75"/>
-        <source>Promote user to &amp;judge</source>
+        <source>Warn user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="76"/>
-        <source>Demote user from judge</source>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
         <source>View admin notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <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="89"/>
-        <source>You are being ignored by %1 and can&apos;t see their games.</source>
+        <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"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="93"/>
+        <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"/>
+        <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"/>
         <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="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="129"/>
         <source>%1&apos;s games</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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"/>
         <source>Ban History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="191"/>
         <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="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="209"/>
         <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="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="214"/>
         <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="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="238"/>
+        <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"/>
         <source>Warning History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="218"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="230"/>
         <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="235"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="247"/>
         <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="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="252"/>
         <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="247"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="261"/>
         <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="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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"/>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="279"/>
         <source>Successfully promoted user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="281"/>
         <source>Successfully demoted user.</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="272"/>
-        <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="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"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="663"/>
+        <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"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="286"/>
         <source>Failed to promote user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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="288"/>
         <source>Failed to demote user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="376"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="410"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8449,48 +13284,48 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Moderator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="130"/>
         <source>Registered user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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"/>
         <source>Unregistered user</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8500,58 +13335,70 @@ 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="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="155"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="374"/>
         <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="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="367"/>
         <source>User information updated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <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="172"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="175"/>
         <source>%n Year(s), </source>
         <comment>amount of years (only shown if more than 0)</comment>
         <translation type="unfinished">
@@ -8560,7 +13407,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="175"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="178"/>
         <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">
@@ -8569,345 +13416,838 @@ 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="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="235"/>
         <source>Enter Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="236"/>
         <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="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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"/>
         <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="320"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="352"/>
+        <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"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="356"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="371"/>
         <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="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="388"/>
         <source>Password changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <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="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <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="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="397"/>
         <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="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="412"/>
         <source>Avatar updated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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="415"/>
         <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="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="419"/>
+        <source>An error occured while trying to update your avatar.</source>
+        <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"/>
+        <source>Games</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="519"/>
+        <source>Chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="519"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="524"/>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="524"/>
+        <source>View user profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="528"/>
+        <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"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="543"/>
+        <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"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="547"/>
+        <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"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="552"/>
+        <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"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="556"/>
+        <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"/>
+        <source>Ban</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="569"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="570"/>
+        <source>Warn</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="570"/>
+        <source>Warn user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="571"/>
+        <source>Ban log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="571"/>
+        <source>View ban history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="572"/>
+        <source>Warn log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="572"/>
+        <source>View warning history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="585"/>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="585"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="590"/>
+        <source>− Mod</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="590"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="594"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="594"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="599"/>
+        <source>− Judge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="599"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="603"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="603"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="640"/>
+        <source>Join game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="644"/>
+        <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"/>
+        <source>Loading games…</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="733"/>
+        <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"/>
+        <source>No active games.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="347"/>
         <source>General interface settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="348"/>
         <source>&amp;Double-click cards to play them (instead of single-click)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="349"/>
         <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/dialogs/dlg_settings.cpp" line="944"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="350"/>
         <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/dialogs/dlg_settings.cpp" line="945"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="351"/>
+        <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"/>
         <source>Close card view window when last card is removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="353"/>
         <source>Auto focus search bar when card view window is opened</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="354"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="355"/>
+        <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"/>
+        <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>
+        <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"/>
         <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/dialogs/dlg_settings.cpp" line="949"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="359"/>
+        <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"/>
         <source>Notifications settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="362"/>
         <source>Enable notifications in taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="363"/>
         <source>Notify in the taskbar for game events while you are spectating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="364"/>
         <source>Notify in the taskbar when users in your buddy list connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="366"/>
         <source>Animation settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <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"/>
         <source>&amp;Tap/untap animation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <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"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="375"/>
         <source>Open deck in new tab by default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <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"/>
         <source>Use visual deck storage in game lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="378"/>
         <source>Use selection animation for Visual Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="380"/>
         <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/dialogs/dlg_settings.cpp" line="962"/>
-        <source>do nothing</source>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="382"/>
+        <source>Do nothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
-        <source>ask to convert to .cod</source>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="384"/>
+        <source>Ask to convert to .cod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
-        <source>always convert to .cod</source>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="386"/>
+        <source>Always convert to .cod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="387"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="388"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="389"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <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"/>
         <source>Replay settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="413"/>
         <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="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="965"/>
         <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="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="968"/>
         <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="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="971"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="974"/>
         <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/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="120"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
+        <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"/>
         <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="42"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
         <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="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="55"/>
         <source>Enter filename...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Formats</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8915,7 +14255,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="41"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="47"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8923,19 +14263,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="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="61"/>
         <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="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
         <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="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8943,27 +14283,37 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8971,50 +14321,93 @@ 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="53"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="78"/>
         <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="200"/>
+        <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"/>
+        <source>Visual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="231"/>
         <source>Loading database ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="232"/>
         <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="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="250"/>
+        <source>Table</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="90"/>
+        <source>Group by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Change how cards are divided into categories/groups.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="92"/>
+        <source>Sort by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="93"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="73"/>
         <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="54"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="74"/>
         <source>Sample hand size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9022,46 +14415,25 @@ 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="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="208"/>
+        <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="194"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="209"/>
         <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="195"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="210"/>
         <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>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <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_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <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_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="34"/>
         <source>Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9069,47 +14441,57 @@ 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="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="154"/>
         <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="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="155"/>
         <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="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="156"/>
+        <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"/>
         <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="123"/>
+        <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"/>
         <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="124"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="160"/>
         <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="125"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="161"/>
         <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="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="164"/>
         <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="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="165"/>
         <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="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="166"/>
         <source>Filepath</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9117,7 +14499,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="25"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="24"/>
         <source>Search by filename (or search expression)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9125,22 +14507,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="47"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="39"/>
         <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="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="41"/>
         <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="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="43"/>
         <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="50"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="45"/>
         <source>Sort by Last Loaded</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9148,17 +14530,22 @@ 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="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="173"/>
         <source>Loading database ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="175"/>
         <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="122"/>
+        <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"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9166,46 +14553,71 @@ 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_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="118"/>
         <source>Which warning would you like to send?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="126"/>
         <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_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="128"/>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="131"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="146"/>
         <source>Warn user for misconduct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="153"/>
         <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_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/server/user/user_list_dialog.cpp" line="159"/>
         <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>
@@ -9229,11 +14641,6 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <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="69"/>
-        <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="74"/>
         <source>Default order</source>
@@ -9245,98 +14652,103 @@ 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/dialogs/dlg_manage_sets.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="111"/>
         <source>Enable 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="112"/>
         <source>Disable all sets</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="113"/>
         <source>Enable selected set(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="114"/>
         <source>Disable selected set(s)</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="130"/>
         <source>Deck Editor</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="130"/>
         <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="132"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="131"/>
         <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="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
         <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="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <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="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="162"/>
         <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="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
         <source>Card Art</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <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"/>
         <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="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="141"/>
         <source>Hints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="144"/>
         <source>Note</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="148"/>
         <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="150"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
         <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="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="152"/>
         <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="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="153"/>
         <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="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="192"/>
         <source>Manage sets</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9344,93 +14756,85 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="63"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="242"/>
         <source>Ungrouped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="243"/>
         <source>Group by Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Group by Mana Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Group by Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="252"/>
         <source>Unsorted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="253"/>
         <source>Sort by Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>Sort by Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="256"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="257"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="258"/>
         <source>Sort by Set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="262"/>
         <source>shuffle when closing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="263"/>
         <source>pile view</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>i18n</name>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
-        <source>English</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="258"/>
         <source>Connect on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="259"/>
         <source>Debug to file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9438,1005 +14842,1088 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <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"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/cockatrice/resources/backgrounds/card_triplet.svg b/cockatrice/resources/backgrounds/card_triplet.svg
new file mode 100644
index 000000000..91114d578
--- /dev/null
+++ b/cockatrice/resources/backgrounds/card_triplet.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="250"
+   id="svg13"
+   height="231.66667"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg">
+  <defs
+     id="defs13" />
+  <g
+     transform="matrix(1.705559,0,0,1.705559,-18.310328,-4.2419088)"
+     id="g13">
+    <path
+       d="M 90.069854,3.479957 C 89.356513,1.2235709 86.980392,-0.01102897 84.723451,0.70218215 L 3.4767601,26.377781 C 1.2199188,27.090982 -0.01486587,29.46663 0.69839437,31.723116 L 33.512365,135.52112 c 0.713341,2.25639 3.089462,3.49099 5.346403,2.77777 l 81.246672,-25.6756 c 2.25684,-0.71319 3.49163,-3.08884 2.77837,-5.34533 L 90.074852,3.479957 Z"
+       style="display:none;fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
+       id="path1" />
+    <path
+       d="m 110.61293,7.4983294 c -0.36657,-2.337853 -2.53055,-3.9150142 -4.86886,-3.5484627 L 21.563382,17.14452 c -2.338314,0.366502 -3.915784,2.529976 -3.549207,4.867929 L 34.876507,129.55893 c 0.366577,2.33786 2.530549,3.91502 4.868863,3.54847 l 84.18069,-13.19466 c 2.33831,-0.3665 3.91578,-2.52997 3.5492,-4.86793 L 110.61093,7.4983294 Z"
+       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
+       id="path4" />
+    <path
+       d="m 130.53623,15.555064 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 41.067426 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 V 124.41102 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208344 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
+       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
+       id="path7" />
+    <path
+       d="m 149.43988,26.480639 c 0.38018,-2.335754 -1.1846,-4.508374 -3.52082,-4.88852 L 61.817351,7.9076636 C 59.481136,7.5275576 57.308066,9.0920839 56.927894,11.427736 L 39.439773,118.87426 c -0.380182,2.33576 1.184602,4.50838 3.520816,4.88852 l 84.102711,13.68346 c 2.33622,0.38011 4.50929,-1.18442 4.88946,-3.52007 L 149.43688,26.479639 Z"
+       style="display:inline;fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
+       id="path10" />
+  </g>
+</svg>
diff --git a/cockatrice/resources/backgrounds/home-dark.jpg b/cockatrice/resources/backgrounds/home-dark.jpg
new file mode 100644
index 000000000..53d3406dd
Binary files /dev/null and b/cockatrice/resources/backgrounds/home-dark.jpg differ
diff --git a/cockatrice/resources/backgrounds/home-light.jpg b/cockatrice/resources/backgrounds/home-light.jpg
new file mode 100644
index 000000000..112146e4f
Binary files /dev/null and b/cockatrice/resources/backgrounds/home-light.jpg differ
diff --git a/cockatrice/resources/backgrounds/home.jpg b/cockatrice/resources/backgrounds/home.jpg
new file mode 100644
index 000000000..112146e4f
Binary files /dev/null and b/cockatrice/resources/backgrounds/home.jpg differ
diff --git a/cockatrice/resources/backgrounds/home.png b/cockatrice/resources/backgrounds/home.png
deleted file mode 100644
index 68f48e2c2..000000000
Binary files a/cockatrice/resources/backgrounds/home.png and /dev/null differ
diff --git a/cockatrice/resources/backgrounds/placeholder_printing_selector.svg b/cockatrice/resources/backgrounds/placeholder_printing_selector.svg
new file mode 100644
index 000000000..73a0082ab
--- /dev/null
+++ b/cockatrice/resources/backgrounds/placeholder_printing_selector.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com        License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.-->
+
+<svg
+   version="1.1"
+   width="172.65051"
+   id="svg13"
+   height="213.30714"
+   xml:space="preserve"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"><defs
+     id="defs13" /><g
+     transform="matrix(1.705559,0,0,1.705559,-97.653345,-68.741256)"
+     id="g13"><path
+       d="m 151.48519,45.063813 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 62.016385 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 V 153.91977 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208345 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
+       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
+       id="path7" /><path
+       d="m 154.70135,48.441704 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 65.232545 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 V 157.29767 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208345 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
+       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
+       id="path7-5" /><path
+       d="m 157.98403,51.75453 c 0,-2.366441 -1.89356,-4.259575 -4.26046,-4.259575 H 68.515228 c -2.366905,0 -4.260468,1.893134 -4.260468,4.259575 v 108.85596 c 0,2.36644 1.893563,4.25957 4.260468,4.25957 h 85.208342 c 2.3669,0 4.26046,-1.89313 4.26046,-4.25957 z"
+       style="fill:#c0c0c0;fill-opacity:1;stroke:#989898;stroke-width:1;stroke-opacity:1"
+       id="path7-6" /></g><path
+     d="m 196.24576,207.42361 c 0,0.11213 0,0.22413 0,0.33621 -0.0498,4.54511 -4.18399,7.63329 -8.72909,7.63329 h -12.19086 c -3.29988,0 -5.97713,2.67727 -5.97713,5.97712 0,0.4234 0.0498,0.83433 0.12449,1.23279 0.26149,1.27014 0.80939,2.49046 1.34485,3.72325 0.75959,1.71843 1.50674,3.4244 1.50674,5.22998 0,3.95986 -2.68971,7.55859 -6.64956,7.72046 -0.43583,0.0128 -0.87166,0.025 -1.31995,0.025 -17.60761,0 -31.878,-14.27038 -31.878,-31.878 0,-17.60761 14.28284,-31.878 31.89046,-31.878 17.60762,0 31.87801,14.27039 31.87801,31.878 z m -47.81703,3.98475 c 0,-2.20407 -1.78067,-3.98475 -3.98473,-3.98475 -2.20407,0 -3.98477,1.78068 -3.98477,3.98475 0,2.20406 1.7807,3.98475 3.98477,3.98475 2.20406,0 3.98473,-1.78069 3.98473,-3.98475 z m 0,-11.95426 c 2.20407,0 3.98477,-1.78068 3.98477,-3.98475 0,-2.20407 -1.7807,-3.98475 -3.98477,-3.98475 -2.20405,0 -3.98473,1.78068 -3.98473,3.98475 0,2.20407 1.78068,3.98475 3.98473,3.98475 z m 19.92376,-11.95424 c 0,-2.20408 -1.78068,-3.98477 -3.98473,-3.98477 -2.20407,0 -3.98477,1.78069 -3.98477,3.98477 0,2.20405 1.7807,3.98474 3.98477,3.98474 2.20405,0 3.98473,-1.78069 3.98473,-3.98474 z m 11.95426,11.95424 c 2.20407,0 3.98475,-1.78068 3.98475,-3.98475 0,-2.20407 -1.78068,-3.98475 -3.98475,-3.98475 -2.20406,0 -3.98475,1.78068 -3.98475,3.98475 0,2.20407 1.78069,3.98475 3.98475,3.98475 z"
+     id="path1"
+     style="display:none;fill:#3b3b3b;fill-opacity:1;stroke:#000000;stroke-width:2.53798;stroke-dasharray:none;stroke-opacity:1" /><path
+     d="M 126.20915,54.574783 82.324247,83.8512 c -5.76807,3.845383 -9.435059,10.089163 -10.029703,16.90777 12.348823,2.53716 22.081191,12.26955 24.638191,24.63819 6.838435,-0.59465 13.062395,-4.26163 16.907775,-10.0297 l 29.2566,-43.904722 c 1.32804,-2.001984 2.04162,-4.340923 2.04162,-6.75915 0,-6.719506 -5.45092,-12.170428 -12.17043,-12.170428 -2.3984,0 -4.75718,0.713573 -6.75915,2.041623 z M 88.052677,131.81933 c 0,-12.26953 -9.930593,-22.20012 -22.200138,-22.20012 -12.269532,0 -22.200126,9.93059 -22.200126,22.20012 0,0.77305 0.03966,1.54609 0.118929,2.2993 0.356787,3.46877 -2.021792,7.21505 -5.510393,7.21505 h -0.951431 c -3.508409,0 -6.342895,2.83447 -6.342895,6.3429 0,3.5084 2.834486,6.34289 6.342895,6.34289 h 28.543021 c 12.269545,0 22.200138,-9.93059 22.200138,-22.20014 z"
+     id="path1-2"
+     style="fill:#989898;fill-opacity:1;stroke-width:0.198215" /></svg>
diff --git a/cockatrice/resources/cockatrice-logo-white.svg b/cockatrice/resources/cockatrice-logo-white.svg
new file mode 100644
index 000000000..b3b31077f
--- /dev/null
+++ b/cockatrice/resources/cockatrice-logo-white.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="300"
+   height="300"
+   id="svg2"
+   xmlns="http://www.w3.org/2000/svg">
+  <defs
+     id="defs4" />
+  <g
+     id="g3026"
+     style="stroke:none;stroke-opacity:1;fill:#000000;fill-opacity:1">
+    <path
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.980724;stroke-opacity:1"
+       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/cockatrice/resources/cockatrice.svg b/cockatrice/resources/cockatrice.svg
index d2e22da31..89ba62dcf 100644
--- a/cockatrice/resources/cockatrice.svg
+++ b/cockatrice/resources/cockatrice.svg
@@ -2,20 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
    width="300"
    height="300"
    id="svg2"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="cockatrice.svg">
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns: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"
@@ -25,87 +25,31 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="961"
+     inkscape:window-width="2560"
+     inkscape:window-height="1408"
      id="namedview40"
      showgrid="false"
      inkscape:zoom="1.5733333"
-     inkscape:cx="126.08352"
-     inkscape:cy="197.97347"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
+     inkscape:cx="125.52966"
+     inkscape:cy="197.98729"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
-     inkscape:current-layer="g3026" />
+     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="linearGradient4009">
-      <stop
-         id="stop4011"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4013"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3999">
-      <stop
-         id="stop4001"
-         style="stop-color:#0e5d0c;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4003"
-         style="stop-color:#fbe432;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="151.90253"
-       y1="22.857647"
-       x2="149.76308"
-       y2="362.14203"
-       id="linearGradient4005"
-       xlink:href="#linearGradient3999"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="146.73463"
-       y1="13.08154"
-       x2="146.34395"
-       y2="70.021851"
-       id="linearGradient4015"
-       xlink:href="#linearGradient4009"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter4089">
-      <feFlood
-         flood-opacity="0.5"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood4091" />
-      <feComposite
-         in2="SourceGraphic"
-         operator="in"
-         in="flood"
-         result="composite1"
-         id="feComposite4093" />
-      <feGaussianBlur
-         stdDeviation="8"
-         result="blur"
-         id="feGaussianBlur4095" />
-      <feOffset
-         dx="-10"
-         dy="10"
-         result="offset"
-         id="feOffset4097" />
-      <feComposite
-         in2="offset"
-         operator="over"
-         in="SourceGraphic"
-         result="composite2"
-         id="feComposite4099" />
-    </filter>
     <linearGradient
        id="linearGradient4265-7-8">
       <stop
@@ -126,70 +70,86 @@
        xlink:href="#linearGradient4265-7-8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.98056945,0,0,0.98063364,2.8185026,3.1345497)" />
-    <filter
-       id="filter4089-5"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood4091-5"
-         result="flood"
-         flood-color="rgb(0,0,0)"
-         flood-opacity="0.5" />
-      <feComposite
-         id="feComposite4093-1"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" />
-      <feGaussianBlur
-         id="feGaussianBlur4095-7"
-         result="blur"
-         stdDeviation="8"
-         in="composite" />
-      <feOffset
-         id="feOffset4097-1"
-         result="offset"
-         dy="10"
-         dx="-10" />
-      <feComposite
-         id="feComposite4099-1"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" />
-    </filter>
-    <filter
-       id="filter4089-4"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood4091-3"
-         result="flood"
-         flood-color="rgb(0,0,0)"
-         flood-opacity="0.5" />
-      <feComposite
-         id="feComposite4093-12"
-         result="composite1"
-         operator="in"
-         in2="SourceGraphic"
-         in="flood" />
-      <feGaussianBlur
-         id="feGaussianBlur4095-3"
-         result="blur"
-         stdDeviation="8"
-         in="composite" />
-      <feOffset
-         id="feOffset4097-3"
-         result="offset"
-         dy="10"
-         dx="-10" />
-      <feComposite
-         id="feComposite4099-4"
-         result="composite2"
-         operator="over"
-         in2="offset"
-         in="SourceGraphic" />
-    </filter>
+    <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">
@@ -199,7 +159,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -213,170 +173,60 @@
        inkscape:export-xdpi="91.459999"
        inkscape:export-ydpi="91.459999">
       <path
-         style="fill:url(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0"
-         d="M 145.9375 270.70508 C 144.96853 270.55463 143.84316 270.71753 142.36328 271.16602 C 140.8834 271.6145 139.04978 272.34788 136.66406 273.33398 C 132.23863 275.16314 127.0447 277.44952 125.12305 278.41406 C 123.44338 279.25716 121.5016 280.56385 119.98047 281.78711 C 119.2199 282.39874 118.56505 282.98902 118.09961 283.49023 C 117.63416 283.99145 117.35938 284.40241 117.35938 284.65625 C 117.35938 284.92479 119.36878 285.9662 121.82422 286.96875 C 124.27966 287.97128 126.98578 289.28099 127.83984 289.88086 C 128.4784 290.32938 129.27517 290.59812 130.24805 290.67969 C 131.22092 290.76125 132.37115 290.65664 133.71484 290.36328 C 135.05853 290.06992 136.59666 289.5864 138.34766 288.91016 C 140.09865 288.23391 142.06106 287.36398 144.25586 286.29688 C 146.5026 285.20452 148.75719 284.21215 150.57812 283.49219 C 152.39906 282.77222 153.78666 282.32617 154.30273 282.32617 C 155.26112 282.32617 155.89006 282.05734 156.09961 281.67969 C 156.20439 281.49086 156.20302 281.2751 156.08789 281.05078 C 155.97276 280.82646 155.74354 280.59357 155.38672 280.37305 C 154.95023 280.10327 153.17942 277.96836 151.45117 275.62891 C 150.31921 274.09663 149.42526 272.94156 148.57227 272.13086 C 147.71927 271.32016 146.90647 270.85553 145.9375 270.70508 z "
+         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(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0"
-         d="M 145.9375 270.70508 C 146.90647 270.85553 147.71927 271.32016 148.57227 272.13086 C 149.42526 272.94156 150.31921 274.09663 151.45117 275.62891 C 153.17942 277.96836 154.95023 280.10327 155.38672 280.37305 C 155.74354 280.59357 155.97276 280.82646 156.08789 281.05078 C 156.20302 281.2751 156.20439 281.49086 156.09961 281.67969 C 155.89006 282.05734 155.26112 282.32617 154.30273 282.32617 C 153.78666 282.32617 152.39906 282.77222 150.57812 283.49219 C 148.75719 284.21215 146.5026 285.20452 144.25586 286.29688 C 142.06106 287.36398 140.09865 288.23391 138.34766 288.91016 C 136.59666 289.5864 135.05853 290.06992 133.71484 290.36328 C 132.37115 290.65664 131.22092 290.76125 130.24805 290.67969 C 129.27517 290.59812 128.4784 290.32938 127.83984 289.88086 C 126.98578 289.28099 124.27966 287.97128 121.82422 286.96875 C 119.36878 285.9662 117.35938 284.92479 117.35938 284.65625 C 117.35938 284.40241 117.63416 283.99145 118.09961 283.49023 C 118.56505 282.98902 119.2199 282.39874 119.98047 281.78711 C 121.5016 280.56385 123.44338 279.25716 125.12305 278.41406 C 127.0447 277.44952 132.23863 275.16314 136.66406 273.33398 C 139.04978 272.34788 140.8834 271.6145 142.36328 271.16602 C 143.84316 270.71753 144.96853 270.55463 145.9375 270.70508 z "
+         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(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0"
-         d="M 146.58203 238.53906 L 144.97461 240.75977 C 142.45634 244.24172 140.76536 246.4684 139.18164 248.24414 C 137.59793 250.01988 136.12283 251.3451 134.03711 253.02539 C 131.50523 255.06511 127.15381 258.08849 124.36719 259.74414 C 121.58057 261.3998 117.04019 264.41906 114.27734 266.45312 C 112.07061 268.07779 110.86085 269.02115 110.37109 269.63086 C 110.12622 269.93571 110.06039 270.15715 110.14062 270.33789 C 110.22086 270.51863 110.44727 270.65968 110.7832 270.80273 C 111.44438 271.08427 112.62945 271.22802 114.14844 271.25195 C 115.66742 271.27589 117.51986 271.17882 119.51758 270.98242 C 121.5153 270.78602 123.65849 270.48884 125.75586 270.10938 C 127.85323 269.72991 129.90472 269.26941 131.72266 268.74414 C 133.64431 268.18892 136.19808 267.29331 138.76367 266.29883 C 141.32927 265.30435 143.90597 264.2095 145.87695 263.25586 C 147.93323 262.26096 149.55734 261.41062 150.83594 260.5918 C 152.11453 259.77297 153.04795 258.98739 153.72461 258.11914 C 154.40127 257.25089 154.82181 256.30136 155.07227 255.1582 C 155.32272 254.01504 155.4043 252.67677 155.4043 251.0332 C 155.4043 249.80037 155.27775 248.65206 155.02344 247.58398 C 154.76912 246.51591 154.38648 245.52946 153.875 244.62109 C 153.36352 243.71273 152.72265 242.88261 151.95117 242.12891 C 151.17969 241.37521 150.27651 240.69783 149.24219 240.09375 L 146.58203 238.53906 z "
+         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(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0"
-         d="M 169.59375 3.1191406 L 157.44141 3.1191406 C 157.62702 3.9434004 157.81968 4.739295 157.91406 5.7988281 C 158.046 7.2799717 158.10114 9.0269776 158.10547 11.134766 C 158.11192 14.334109 158.18077 16.393762 158.38477 17.8125 C 158.58876 19.231238 158.92769 20.009626 159.47266 20.646484 C 159.84423 21.080702 160.30984 21.473577 160.76172 21.759766 C 161.2136 22.045955 161.6508 22.224609 161.96484 22.224609 C 162.36067 22.224609 162.75802 22.114716 163.15039 21.904297 C 163.54276 21.693878 163.93054 21.383634 164.31055 20.982422 C 165.07056 20.179997 165.796 19.014256 166.45312 17.566406 C 167.11025 16.118556 167.69867 14.387447 168.18164 12.451172 C 168.66461 10.514897 169.04368 8.3731689 169.28125 6.1054688 L 169.59375 3.1191406 z "
+         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(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0"
-         d="M 297.14258 94.369141 L 297.14258 52.150391 C 297.14258 24.986839 275.27206 3.1191406 248.10352 3.1191406 L 171.27734 3.1191406 L 171.58008 3.5898438 C 172.12133 4.4292645 172.50973 5.2407817 172.73438 6.0996094 C 172.95902 6.9584371 173.01998 7.8642843 172.91211 8.8945312 C 172.80423 9.9247782 172.52663 11.079915 172.07031 12.433594 C 171.614 13.787272 170.97888 15.3408 170.1582 17.169922 C 168.87505 20.029806 167.82617 22.511836 167.82617 22.685547 C 167.82617 22.859252 169.14664 23 170.75977 23 C 171.70972 23 172.5563 22.902073 173.33008 22.683594 C 174.10385 22.465114 174.80492 22.126693 175.45898 21.648438 C 176.11305 21.170182 176.7197 20.552766 177.31055 19.773438 C 177.90139 18.994109 178.47645 18.053338 179.06055 16.931641 C 179.58208 15.930089 180.05872 15.176384 180.4082 14.769531 C 180.58294 14.566105 180.72584 14.449837 180.82617 14.431641 C 180.9265 14.413444 180.9833 14.494143 180.98828 14.685547 C 181.00266 15.236251 180.82891 15.973617 180.50586 16.828125 C 180.18281 17.682633 179.71225 18.654197 179.13086 19.673828 C 177.96809 21.713091 176.36609 23.942867 174.64453 25.810547 C 172.9043 27.698464 171.67025 29.43393 171.90234 29.666016 C 172.13256 29.896232 173.91575 29.724777 175.91406 29.380859 C 177.91237 29.036942 180.12599 28.520409 181.21875 28.0625 C 181.66905 27.873808 182.00257 27.810216 182.21875 27.857422 C 182.43493 27.904628 182.53395 28.062012 182.51758 28.320312 C 182.48484 28.836913 181.98869 29.750738 181.03516 30.962891 C 180.47108 31.680004 179.78624 32.224765 178.83203 32.662109 C 177.87782 33.099454 176.65395 33.431231 175.01758 33.722656 C 172.54055 34.16381 170.6287 34.592417 169.23438 35.097656 C 168.53721 35.350276 167.96951 35.622971 167.52539 35.923828 C 167.08127 36.224685 166.76142 36.555209 166.55859 36.925781 C 166.35577 37.296353 166.27017 37.706205 166.29688 38.167969 C 166.32358 38.629733 166.46254 39.142363 166.70703 39.716797 C 167.19601 40.865664 168.10888 42.261825 169.39844 43.990234 C 170.73093 45.776173 172.06666 48.235092 173.08203 50.609375 C 173.58972 51.796517 174.01719 52.961308 174.32422 54.011719 C 174.63125 55.062129 174.81829 55.998188 174.84375 56.722656 C 174.85692 57.096964 175.16821 57.676779 175.75781 58.441406 C 176.34742 59.206034 177.21493 60.15532 178.33984 61.269531 C 180.58967 63.497954 183.86933 66.385231 188.01367 69.767578 C 192.85188 73.716195 196.63626 77.062853 199.34961 79.789062 C 200.70629 81.152167 201.79507 82.359939 202.61328 83.410156 C 203.43149 84.460374 203.979 85.353465 204.25391 86.085938 C 204.69468 87.260278 204.92846 88.220703 204.77344 88.220703 C 204.6185 88.220703 202.22399 87.158878 199.45117 85.861328 C 197.61809 85.003527 195.88657 84.305269 194.19922 83.757812 C 192.51187 83.210356 190.86734 82.813661 189.20898 82.558594 C 187.55062 82.303527 185.87892 82.189616 184.13281 82.208984 C 182.38671 82.228352 180.56777 82.380401 178.61719 82.65625 C 175.10316 83.153196 172.11249 83.674645 171.97266 83.814453 C 171.71489 84.07223 172.4631 86.518865 173.63672 89.619141 C 174.81034 92.719416 176.40972 96.473667 177.85156 99.34375 C 179.17962 101.98733 179.88703 103.47711 180.10938 104.35547 C 180.22055 104.79465 180.20968 105.0808 180.0957 105.28125 C 179.98173 105.4817 179.76392 105.59658 179.45898 105.69336 C 178.91319 105.86659 178.59852 106.10108 178.47461 106.54102 C 178.3507 106.98095 178.41719 107.62594 178.63281 108.625 C 178.97197 110.1965 179.00635 112.66637 178.83984 114.74219 C 178.75659 115.7801 178.62399 116.72018 178.45312 117.40039 C 178.28226 118.0806 178.07441 118.5 177.8418 118.5 C 177.64978 118.5 177.47421 118.29734 177.34766 117.9707 C 177.2211 117.64406 177.14258 117.1948 177.14258 116.69922 C 177.14258 116.20364 176.6452 114.75334 175.8418 112.81836 C 175.03839 110.88337 173.9299 108.4637 172.71094 106.02344 C 170.83565 102.26928 169.48389 99.803365 167.93359 97.599609 C 166.3833 95.395854 164.63495 93.454095 161.96289 90.744141 C 160.22602 88.98264 158.53288 87.381696 157.20508 86.220703 C 155.87728 85.05971 154.91444 84.337891 154.63672 84.337891 C 154.38422 84.337891 154.20195 84.556883 154.0918 85.068359 C 153.98165 85.579836 153.94358 86.384804 153.98047 87.556641 C 154.05424 89.900315 154.42715 93.713371 155.11719 99.591797 C 155.32983 101.40331 155.40791 102.41439 155.24219 103.0332 C 155.15932 103.34261 155.0153 103.55258 154.79688 103.7168 C 154.57845 103.88102 154.28561 103.99811 153.9043 104.11914 C 153.40967 104.27613 152.84997 104.29013 152.24609 104.16992 C 151.64222 104.04971 150.99251 103.7967 150.31641 103.41992 C 148.96419 102.66636 147.50499 101.41974 146.08594 99.763672 C 145.47158 99.046702 144.73362 98.452489 143.92969 97.994141 C 143.12575 97.535792 142.25525 97.214065 141.375 97.037109 C 140.49475 96.860154 139.60502 96.829824 138.76172 96.957031 C 137.91841 97.084239 137.12279 97.368124 136.42969 97.822266 C 135.88075 98.181937 135.25055 98.913681 134.66016 99.833984 C 134.06977 100.75429 133.51967 101.86339 133.125 102.97461 C 132.74676 104.03958 132.37952 104.89092 131.99414 105.55078 C 131.60876 106.21065 131.20351 106.67968 130.74609 106.97656 C 130.28867 107.27345 129.7799 107.39897 129.18555 107.375 C 128.59119 107.35103 127.91142 107.17771 127.11523 106.875 C 126.1447 106.506 125.29558 106.24661 124.56445 106.10547 C 123.83332 105.96433 123.22054 105.93964 122.72852 106.03906 C 122.23649 106.13849 121.86455 106.36214 121.61133 106.71484 C 121.3581 107.06755 121.22371 107.54927 121.20898 108.16797 C 121.17954 109.40537 121.6261 111.18875 122.54883 113.56641 C 123.47156 115.94407 124.87165 118.91748 126.74414 122.53711 C 127.5611 124.1163 128.22852 126.27124 128.22852 127.32617 C 128.22852 128.00604 128.43005 128.60883 128.875 129.19336 C 129.31995 129.77789 130.00901 130.34327 130.98633 130.94727 C 131.92685 131.52855 132.72548 132.12197 133.38867 132.73242 C 134.05186 133.34288 134.57905 133.97058 134.97266 134.62305 C 135.36626 135.27552 135.62604 135.95283 135.75781 136.66016 C 135.88958 137.36748 135.8938 138.10584 135.77148 138.88086 C 135.6839 139.43582 135.64394 139.9011 135.6875 140.3418 C 135.73106 140.78249 135.85741 141.19811 136.10156 141.6543 C 136.58987 142.56667 137.54847 143.63972 139.25586 145.39258 C 140.29575 146.46017 141.16028 147.4781 141.85156 148.46094 C 142.54284 149.44378 143.06159 150.39069 143.41406 151.31445 C 143.76654 152.23822 143.95115 153.13894 143.97461 154.0293 C 143.99807 154.91966 143.8602 155.80096 143.56445 156.68359 C 143.41175 157.13932 143.31478 157.52058 143.29883 157.87891 C 143.28287 158.23723 143.34767 158.57277 143.51562 158.93555 C 143.85153 159.66109 144.60257 160.49711 145.95703 161.85156 L 149.04688 164.93945 L 149.3125 173.0918 C 149.43875 176.94824 149.53917 179.03069 149.89648 180.54883 C 150.07514 181.3079 150.31906 181.92717 150.66211 182.55469 C 151.00516 183.18221 151.44687 183.81919 152.02539 184.61719 C 153.37053 186.47259 154.80197 187.99023 155.20508 187.99023 C 155.60818 187.99023 158.68443 184.32171 162.04297 179.83789 C 164.85431 176.08462 168.04298 172.2953 171.53711 168.5332 C 175.03124 164.77111 178.83256 161.03719 182.86523 157.39648 C 186.89791 153.75578 191.16285 150.20746 195.58984 146.81836 C 200.01683 143.42926 204.60418 140.19868 209.28125 137.19141 C 212.12854 135.36064 215.60241 133.31886 219.63281 131.09961 C 223.66322 128.88036 228.25133 126.48369 233.33008 123.94336 C 243.48758 118.8627 255.60616 113.20661 269.14844 107.24609 C 279.36896 102.74764 288.30743 98.66087 296.17578 94.867188 C 296.54486 94.689238 296.77818 94.545814 297.14258 94.369141 z "
+         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(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0"
-         d="M 246.15234 297.31055 L 248.10352 297.31055 C 275.27206 297.31055 297.14258 275.4409 297.14258 248.27734 L 297.14258 106.26953 C 295.12773 107.37505 293.91008 108.18691 291.08398 109.64258 C 284.05026 113.26552 273.73846 118.36689 256.33789 126.91016 C 247.04118 131.47464 239.00989 135.58566 231.93359 139.44531 C 224.8573 143.30496 218.73679 146.91361 213.26172 150.4707 C 207.78665 154.0278 202.95592 157.53263 198.46289 161.18945 C 193.96986 164.84627 189.81377 168.65368 185.68359 172.8125 C 183.44872 175.06288 181.4141 177.21518 179.51562 179.35156 C 177.61715 181.48794 175.85483 183.60925 174.16211 185.80078 C 172.46939 187.99231 170.84615 190.25408 169.22852 192.66992 C 167.61088 195.08576 165.99936 197.65554 164.32617 200.46484 C 161.54541 205.13372 158.22605 210.08072 156.94922 211.45703 C 156.16261 212.30493 155.55617 213.24465 155.13281 214.26172 C 154.70945 215.27879 154.46859 216.37225 154.41016 217.52539 C 154.35173 218.67853 154.47503 219.89233 154.7832 221.14844 C 155.09138 222.40454 155.58331 223.70333 156.25977 225.0293 C 157.16484 226.8034 157.61931 227.72077 157.62695 228.13672 C 157.63077 228.34469 157.52278 228.42562 157.30469 228.42773 C 157.0866 228.42985 156.75868 228.35291 156.32031 228.23828 C 155.83688 228.11186 155.3991 228.1243 155.01172 228.25781 C 154.62434 228.39133 154.28689 228.6455 154 228.99805 C 153.42623 229.70315 153.05723 230.80477 152.91211 232.14062 C 152.76699 233.47648 152.84499 235.04611 153.16406 236.68555 C 153.48313 238.32498 154.04448 240.03457 154.86328 241.65039 C 155.78536 243.47004 156.61844 244.84373 157.35156 245.77148 C 158.08468 246.69923 158.71792 247.18082 159.23438 247.21484 C 159.4926 247.23186 159.72106 247.13645 159.91992 246.92969 C 160.11879 246.72293 160.28779 246.40537 160.42383 245.97461 C 160.69591 245.11308 160.83789 243.80382 160.83789 242.04492 C 160.83789 240.47671 160.95315 238.99594 161.18359 237.60742 C 161.41403 236.2189 161.75949 234.92138 162.21875 233.7168 C 162.67801 232.51222 163.25104 231.40116 163.9375 230.38477 C 164.62396 229.36837 165.42389 228.44702 166.33594 227.62305 C 167.23261 226.81295 168.03618 226.19352 168.78711 225.75977 C 169.53804 225.32601 170.23652 225.07869 170.92188 225.01367 C 171.60723 224.94866 172.28051 225.06521 172.98047 225.36133 C 173.68042 225.65745 174.40644 226.1316 175.20117 226.78125 L 177.53125 228.68555 L 173.89453 228.55273 C 173.07806 228.52276 172.3259 228.56391 171.63672 228.67773 C 170.94754 228.79156 170.32137 228.97813 169.75586 229.24219 C 169.19035 229.50624 168.68571 229.84685 168.24023 230.26758 C 167.79476 230.6883 167.40914 231.1896 167.08008 231.77344 C 166.42196 232.9411 165.99159 234.44011 165.77734 236.29883 C 165.56309 238.15755 165.56503 240.37529 165.76562 242.97656 C 166.02819 246.38131 166.40064 249.3245 166.59375 249.51758 C 166.78683 249.71065 169.75215 248.78618 173.18359 247.46289 C 175.28517 246.65244 177.16574 246.04334 178.85547 245.63281 C 180.5452 245.22228 182.04368 245.01107 183.37695 245 C 184.71022 244.98893 185.87992 245.17652 186.91211 245.56445 C 187.9443 245.95239 188.83852 246.5397 189.625 247.32617 C 190.87325 248.57442 191.89453 249.97371 191.89453 250.43359 C 191.89453 250.69763 191.8981 250.89423 191.8418 251.02148 C 191.7855 251.14874 191.67078 251.20578 191.43164 251.18555 C 190.95335 251.14507 189.98262 250.7982 188.01367 250.10352 C 186.79401 249.67319 185.61209 249.35672 184.46875 249.15234 C 183.32541 248.94796 182.22031 248.85686 181.15234 248.87891 C 180.08438 248.90095 179.05406 249.0362 178.06055 249.28516 C 177.06703 249.53411 176.10946 249.89669 175.18945 250.37305 C 174.26944 250.8494 173.3865 251.43834 172.53906 252.14258 C 171.69163 252.84681 170.87932 253.66506 170.10352 254.59766 C 169.32771 255.53026 168.58791 256.57878 167.88281 257.74023 C 167.17771 258.90168 166.50839 260.17757 165.87305 261.56836 C 165.36946 262.67071 164.86779 264.12378 164.41211 265.7168 C 163.95643 267.30981 163.54667 269.04163 163.22266 270.69727 C 162.89865 272.3529 162.66131 273.93243 162.55273 275.22266 C 162.44416 276.51288 162.46367 277.51495 162.6543 278.01172 C 162.82084 278.44571 163.16166 278.8408 163.65039 279.19141 C 164.13912 279.54202 164.77694 279.84715 165.53711 280.09766 C 167.05745 280.59867 169.06954 280.88256 171.37109 280.88281 C 172.8071 280.88296 174.67751 280.56303 177.38867 279.80664 C 180.09983 279.05025 183.65056 277.85729 188.45117 276.11719 C 195.68269 273.49591 204.78633 270.52383 208.67969 269.51172 C 211.38901 268.8074 214.05737 268.25704 216.66016 267.85547 C 219.26294 267.4539 221.79891 267.20042 224.24219 267.08984 C 226.68546 266.97927 229.03678 267.01103 231.26758 267.17969 C 233.49838 267.34835 235.60886 267.6537 237.57422 268.08984 C 239.53958 268.52599 241.35891 269.09328 243.00586 269.78516 C 244.65281 270.47703 246.12873 271.29462 247.4043 272.23047 C 248.67986 273.16632 249.75621 274.2206 250.60742 275.38867 C 251.45864 276.55674 252.08314 277.83803 252.45703 279.22656 C 252.73592 280.2623 252.8022 281.43608 252.67969 282.71289 C 252.55718 283.9897 252.24697 285.36958 251.77148 286.81445 C 251.296 288.25933 250.65503 289.77061 249.875 291.31055 C 249.09497 292.85049 248.17483 294.41846 247.13867 295.98047 C 246.84091 296.42934 246.46868 296.86373 246.15234 297.31055 z "
+         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(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0"
-         d="M 2.8984375 172.30469 L 2.8984375 223.83398 C 3.9098853 222.87927 4.9005021 221.90405 5.984375 221.02148 C 7.6367524 219.67601 9.3737748 218.41455 11.195312 217.23633 C 13.01685 216.05811 14.922357 214.96264 16.914062 213.95117 C 18.905768 212.9397 20.983603 212.01125 23.146484 211.16602 C 25.309366 210.32078 27.557513 209.55841 29.892578 208.87891 C 32.227644 208.1994 34.647993 207.60218 37.15625 207.08789 C 39.664507 206.5736 42.260903 206.14256 44.943359 205.79297 C 46.060249 205.64741 47.029139 205.44007 47.691406 205.22461 C 48.353674 205.00915 48.709736 204.78486 48.597656 204.60352 C 48.373506 204.24081 45.027049 202.31258 41.162109 200.31641 C 38.182984 198.77775 35.24 197.12566 32.341797 195.36914 C 29.443594 193.61262 26.589586 191.74983 23.785156 189.78711 C 20.980726 187.82439 18.227102 185.76272 15.529297 183.60547 C 12.831491 181.44822 10.189658 179.19559 7.6113281 176.85547 C 5.9994905 175.39255 4.4595018 173.83537 2.8984375 172.30469 z "
+         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(#linearGradient3020);fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;stroke-opacity:0"
-         d="M 132.29102 3.1191406 L 51.939453 3.1191406 C 24.770911 3.1191406 2.8984375 24.986839 2.8984375 52.150391 L 2.8984375 73.580078 C 6.9764251 76.949409 11.100092 80.366564 15.068359 83.546875 C 20.635956 88.008946 25.845065 92.074977 29.992188 95.158203 C 32.189182 96.791583 34.233539 98.425179 36.146484 100.09375 C 38.059429 101.76232 39.841354 103.4658 41.513672 105.24219 C 43.18599 107.01857 44.749496 108.86739 46.224609 110.82422 C 47.699723 112.78104 49.086871 114.84675 50.408203 117.05664 C 51.729535 119.26653 52.984339 121.62067 54.195312 124.15625 C 55.406286 126.69183 56.572759 129.40791 57.716797 132.3418 C 58.860834 135.27568 59.982991 138.42721 61.103516 141.83203 C 62.22404 145.23685 63.343941 148.89537 64.484375 152.84375 C 66.730105 160.61886 68.726821 167.09313 70.580078 172.48242 C 72.433335 177.87172 74.142955 182.17666 75.8125 185.60938 C 76.647272 187.32573 77.470841 188.82317 78.298828 190.13086 C 79.126815 191.43855 79.959343 192.55513 80.806641 193.50781 C 81.653938 194.46049 82.517454 195.24907 83.410156 195.90039 C 84.302858 196.55171 85.223298 197.06708 86.1875 197.4707 C 87.14068 197.86971 88.044217 198.10612 88.935547 198.16602 C 89.826876 198.22591 90.706419 198.10867 91.615234 197.80273 C 92.52405 197.4968 93.461159 197.00119 94.466797 196.30273 C 95.472435 195.60427 96.546718 194.70363 97.728516 193.58594 C 99.433943 191.97302 100.88088 190.20744 102.06836 188.29688 C 103.25584 186.38631 104.18496 184.32942 104.85156 182.13086 C 105.51817 179.9323 105.9236 177.59213 106.06641 175.11523 C 106.20921 172.63833 106.089 170.02488 105.70508 167.2793 C 105.43691 165.36154 105.15754 163.6673 104.79102 161.94141 C 104.42449 160.21552 103.97076 158.45923 103.35156 156.41602 C 102.11317 152.32958 100.21402 147.09843 97.039062 138.6875 C 94.056923 130.78743 90.750453 121.35437 89.689453 117.72461 C 89.089106 115.67079 88.591031 113.50342 88.203125 111.30078 C 87.815219 109.09814 87.536682 106.85896 87.373047 104.66602 C 87.209411 102.47307 87.159959 100.32551 87.232422 98.300781 C 87.304885 96.276054 87.499923 94.375729 87.820312 92.677734 C 88.191535 90.710348 88.464593 88.856754 88.640625 87.144531 C 88.816657 85.432308 88.895391 83.861328 88.876953 82.458984 C 88.858516 81.056641 88.743437 79.822905 88.53125 78.785156 C 88.319063 77.747408 88.008733 76.905547 87.603516 76.287109 C 87.196246 75.665535 86.913469 75.105883 86.765625 74.554688 C 86.617781 74.003492 86.605844 73.460562 86.742188 72.873047 C 86.878531 72.285531 87.162128 71.652409 87.607422 70.921875 C 88.052715 70.191341 88.658495 69.363063 89.4375 68.382812 C 90.100965 67.547947 90.606656 66.869669 90.962891 66.263672 C 91.319125 65.657675 91.527024 65.123668 91.597656 64.580078 C 91.668288 64.036489 91.601547 63.483579 91.408203 62.835938 C 91.214859 62.188296 90.894677 61.445497 90.458984 60.527344 L 89.181641 57.835938 L 92.011719 55.501953 C 93.051454 54.644912 93.759265 53.909865 94.207031 53.181641 C 94.654797 52.453416 94.841797 51.732386 94.841797 50.898438 C 94.841797 50.170755 95.052093 49.391168 95.527344 48.498047 C 96.002595 47.604926 96.743614 46.597716 97.804688 45.416016 C 99.926835 43.052615 103.33207 39.988979 108.46094 35.732422 C 110.45264 34.079457 112.24613 32.490598 113.81836 30.996094 C 115.39059 29.50159 116.74029 28.100555 117.83984 26.826172 C 118.93939 25.551789 119.78961 24.402759 120.36328 23.410156 C 120.93695 22.417554 121.23393 21.582757 121.22852 20.933594 C 121.22252 20.219318 121.14632 19.635491 120.97461 19.169922 C 120.8029 18.704353 120.53699 18.357281 120.1543 18.111328 C 119.7716 17.865375 119.27177 17.721443 118.63281 17.666016 C 117.99385 17.610588 117.21395 17.642039 116.27344 17.748047 C 115.29054 17.858834 114.39782 17.881645 113.75 17.828125 C 113.10218 17.774605 112.70117 17.645117 112.70117 17.453125 C 112.70117 17.196887 113.14093 16.736479 113.82812 16.189453 C 114.51532 15.642427 115.44924 15.009453 116.43555 14.408203 C 117.42186 13.806954 118.46006 13.237267 119.35742 12.818359 C 120.25478 12.399452 121.0113 12.130859 121.43164 12.130859 C 122.01006 12.130859 122.65875 12.263644 123.33594 12.501953 C 124.01313 12.740262 124.71955 13.084825 125.4082 13.507812 C 126.7855 14.353788 128.09682 15.514437 128.99609 16.777344 C 129.79855 17.904289 130.58985 18.616298 131.32422 18.943359 C 131.6914 19.10689 132.04555 19.174904 132.37891 19.150391 C 132.71226 19.125877 133.02418 19.009293 133.3125 18.804688 C 133.88915 18.395476 134.36603 17.632657 134.69531 16.550781 C 135.0246 15.468906 135.20693 14.067882 135.19922 12.376953 C 135.19384 11.196972 135.05865 10.020102 134.80664 8.875 C 134.55464 7.7298976 134.18675 6.6156185 133.71289 5.5605469 C 133.32218 4.6906203 132.81719 3.8936572 132.29102 3.1191406 z "
+         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.9807238;stroke-opacity:0"
-         d="M 153.55273 3.1191406 L 142.39844 3.1191406 C 142.82436 3.6707875 143.23944 4.2338187 143.58008 4.8789062 C 144.00733 5.6880274 144.36739 6.569645 144.66016 7.5253906 C 145.24568 9.4368819 145.56201 11.641256 145.60742 14.136719 C 145.65712 16.869966 145.93475 19.109906 146.22461 19.113281 C 146.51449 19.116581 147.96463 17.974463 149.44727 16.576172 C 150.50126 15.582128 151.36171 14.411711 152.02344 13.083984 C 152.68517 11.756258 153.14864 10.270919 153.41211 8.6464844 C 153.67558 7.0220493 153.73844 5.2591713 153.59766 3.375 C 153.59165 3.294561 153.55949 3.2000179 153.55273 3.1191406 z "
+         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.9807238;stroke-opacity:0"
-         d="M 153.55273 3.1191406 C 153.55949 3.2000179 153.59165 3.294561 153.59766 3.375 C 153.73844 5.2591713 153.67558 7.0220493 153.41211 8.6464844 C 153.14864 10.270919 152.68517 11.756258 152.02344 13.083984 C 151.36171 14.411711 150.50126 15.582128 149.44727 16.576172 C 147.96463 17.974463 146.51449 19.116581 146.22461 19.113281 C 145.93475 19.109906 145.65712 16.869966 145.60742 14.136719 C 145.56201 11.641256 145.24568 9.4368819 144.66016 7.5253906 C 144.36739 6.569645 144.00733 5.6880274 143.58008 4.8789062 C 143.23944 4.2338187 142.82436 3.6707875 142.39844 3.1191406 L 132.29102 3.1191406 C 132.81719 3.8936572 133.32218 4.6906203 133.71289 5.5605469 C 134.18675 6.6156185 134.55464 7.7298976 134.80664 8.875 C 135.05865 10.020102 135.19384 11.196972 135.19922 12.376953 C 135.20693 14.067882 135.0246 15.468906 134.69531 16.550781 C 134.36603 17.632657 133.88915 18.395476 133.3125 18.804688 C 133.02418 19.009293 132.71226 19.125877 132.37891 19.150391 C 132.04555 19.174904 131.6914 19.10689 131.32422 18.943359 C 130.58985 18.616298 129.79855 17.904289 128.99609 16.777344 C 128.09682 15.514437 126.7855 14.353788 125.4082 13.507812 C 124.71955 13.084825 124.01313 12.740262 123.33594 12.501953 C 122.65875 12.263644 122.01006 12.130859 121.43164 12.130859 C 121.0113 12.130859 120.25478 12.399452 119.35742 12.818359 C 118.46006 13.237267 117.42186 13.806954 116.43555 14.408203 C 115.44924 15.009453 114.51532 15.642427 113.82812 16.189453 C 113.14093 16.736479 112.70117 17.196887 112.70117 17.453125 C 112.70117 17.645117 113.10218 17.774605 113.75 17.828125 C 114.39782 17.881645 115.29054 17.858834 116.27344 17.748047 C 117.21395 17.642039 117.99385 17.610588 118.63281 17.666016 C 119.27177 17.721443 119.7716 17.865375 120.1543 18.111328 C 120.53699 18.357281 120.8029 18.704353 120.97461 19.169922 C 121.14632 19.635491 121.22252 20.219318 121.22852 20.933594 C 121.23393 21.582757 120.93695 22.417554 120.36328 23.410156 C 119.78961 24.402759 118.93939 25.551789 117.83984 26.826172 C 116.74029 28.100555 115.39059 29.50159 113.81836 30.996094 C 112.24613 32.490598 110.45264 34.079457 108.46094 35.732422 C 103.33207 39.988979 99.926835 43.052615 97.804688 45.416016 C 96.743614 46.597716 96.002595 47.604926 95.527344 48.498047 C 95.052093 49.391168 94.841797 50.170755 94.841797 50.898438 C 94.841797 51.732386 94.654797 52.453416 94.207031 53.181641 C 93.759265 53.909865 93.051454 54.644912 92.011719 55.501953 L 89.181641 57.835938 L 90.458984 60.527344 C 90.894677 61.445497 91.214859 62.188296 91.408203 62.835938 C 91.601547 63.483579 91.668288 64.036489 91.597656 64.580078 C 91.527024 65.123668 91.319125 65.657675 90.962891 66.263672 C 90.606656 66.869669 90.100965 67.547947 89.4375 68.382812 C 88.658495 69.363063 88.052715 70.191341 87.607422 70.921875 C 87.162128 71.652409 86.878531 72.285531 86.742188 72.873047 C 86.605844 73.460562 86.617781 74.003492 86.765625 74.554688 C 86.913469 75.105883 87.196246 75.665535 87.603516 76.287109 C 88.008733 76.905547 88.319063 77.747408 88.53125 78.785156 C 88.743437 79.822905 88.858516 81.056641 88.876953 82.458984 C 88.895391 83.861328 88.816657 85.432308 88.640625 87.144531 C 88.464593 88.856754 88.191535 90.710348 87.820312 92.677734 C 87.499923 94.375729 87.304885 96.276054 87.232422 98.300781 C 87.159959 100.32551 87.209411 102.47307 87.373047 104.66602 C 87.536682 106.85896 87.815219 109.09814 88.203125 111.30078 C 88.591031 113.50342 89.089106 115.67079 89.689453 117.72461 C 90.750453 121.35437 94.056923 130.78743 97.039062 138.6875 C 100.21402 147.09843 102.11317 152.32958 103.35156 156.41602 C 103.97076 158.45923 104.42449 160.21552 104.79102 161.94141 C 105.15754 163.6673 105.43691 165.36154 105.70508 167.2793 C 106.089 170.02488 106.20921 172.63833 106.06641 175.11523 C 105.9236 177.59213 105.51817 179.9323 104.85156 182.13086 C 104.18496 184.32942 103.25584 186.38631 102.06836 188.29688 C 100.88088 190.20744 99.433943 191.97302 97.728516 193.58594 C 96.546718 194.70363 95.472435 195.60427 94.466797 196.30273 C 93.461159 197.00119 92.52405 197.4968 91.615234 197.80273 C 90.706419 198.10867 89.826876 198.22591 88.935547 198.16602 C 88.044217 198.10612 87.14068 197.86971 86.1875 197.4707 C 85.223298 197.06708 84.302858 196.55171 83.410156 195.90039 C 82.517454 195.24907 81.653938 194.46049 80.806641 193.50781 C 79.959343 192.55513 79.126815 191.43855 78.298828 190.13086 C 77.470841 188.82317 76.647272 187.32573 75.8125 185.60938 C 74.142955 182.17666 72.433335 177.87172 70.580078 172.48242 C 68.726821 167.09313 66.730105 160.61886 64.484375 152.84375 C 63.343941 148.89537 62.22404 145.23685 61.103516 141.83203 C 59.982991 138.42721 58.860834 135.27568 57.716797 132.3418 C 56.572759 129.40791 55.406286 126.69183 54.195312 124.15625 C 52.984339 121.62067 51.729535 119.26653 50.408203 117.05664 C 49.086871 114.84675 47.699723 112.78104 46.224609 110.82422 C 44.749496 108.86739 43.18599 107.01857 41.513672 105.24219 C 39.841354 103.4658 38.059429 101.76232 36.146484 100.09375 C 34.233539 98.425179 32.189182 96.791583 29.992188 95.158203 C 25.845065 92.074977 20.635956 88.008946 15.068359 83.546875 C 11.100092 80.366564 6.9764251 76.949409 2.8984375 73.580078 L 2.8984375 172.30469 C 4.4595018 173.83537 5.9994905 175.39255 7.6113281 176.85547 C 10.189658 179.19559 12.831491 181.44822 15.529297 183.60547 C 18.227102 185.76272 20.980726 187.82439 23.785156 189.78711 C 26.589586 191.74983 29.443594 193.61262 32.341797 195.36914 C 35.24 197.12566 38.182984 198.77775 41.162109 200.31641 C 45.027049 202.31258 48.373506 204.24081 48.597656 204.60352 C 48.709736 204.78486 48.353674 205.00915 47.691406 205.22461 C 47.029139 205.44007 46.060249 205.64741 44.943359 205.79297 C 42.260903 206.14256 39.664507 206.5736 37.15625 207.08789 C 34.647993 207.60218 32.227644 208.1994 29.892578 208.87891 C 27.557513 209.55841 25.309366 210.32078 23.146484 211.16602 C 20.983603 212.01125 18.905768 212.9397 16.914062 213.95117 C 14.922357 214.96264 13.01685 216.05811 11.195312 217.23633 C 9.3737748 218.41455 7.6367524 219.67601 5.984375 221.02148 C 4.9005021 221.90405 3.9098853 222.87927 2.8984375 223.83398 L 2.8984375 248.27734 C 2.8984375 275.4409 24.770911 297.31055 51.939453 297.31055 L 246.15234 297.31055 C 246.46868 296.86373 246.84091 296.42934 247.13867 295.98047 C 248.17483 294.41846 249.09497 292.85049 249.875 291.31055 C 250.65503 289.77061 251.296 288.25933 251.77148 286.81445 C 252.24697 285.36958 252.55718 283.9897 252.67969 282.71289 C 252.8022 281.43608 252.73592 280.2623 252.45703 279.22656 C 252.08314 277.83803 251.45864 276.55674 250.60742 275.38867 C 249.75621 274.2206 248.67986 273.16632 247.4043 272.23047 C 246.12873 271.29462 244.65281 270.47703 243.00586 269.78516 C 241.35891 269.09328 239.53958 268.52599 237.57422 268.08984 C 235.60886 267.6537 233.49838 267.34835 231.26758 267.17969 C 229.03678 267.01103 226.68546 266.97927 224.24219 267.08984 C 221.79891 267.20042 219.26294 267.4539 216.66016 267.85547 C 214.05737 268.25704 211.38901 268.8074 208.67969 269.51172 C 204.78633 270.52383 195.68269 273.49591 188.45117 276.11719 C 183.65056 277.85729 180.09983 279.05025 177.38867 279.80664 C 174.67751 280.56303 172.8071 280.88296 171.37109 280.88281 C 169.06954 280.88256 167.05745 280.59867 165.53711 280.09766 C 164.77694 279.84715 164.13912 279.54202 163.65039 279.19141 C 163.16166 278.8408 162.82084 278.44571 162.6543 278.01172 C 162.46367 277.51495 162.44416 276.51288 162.55273 275.22266 C 162.66131 273.93243 162.89865 272.3529 163.22266 270.69727 C 163.54667 269.04163 163.95643 267.30981 164.41211 265.7168 C 164.86779 264.12378 165.36946 262.67071 165.87305 261.56836 C 166.50839 260.17757 167.17771 258.90168 167.88281 257.74023 C 168.58791 256.57878 169.32771 255.53026 170.10352 254.59766 C 170.87932 253.66506 171.69163 252.84681 172.53906 252.14258 C 173.3865 251.43834 174.26944 250.8494 175.18945 250.37305 C 176.10946 249.89669 177.06703 249.53411 178.06055 249.28516 C 179.05406 249.0362 180.08438 248.90095 181.15234 248.87891 C 182.22031 248.85686 183.32541 248.94796 184.46875 249.15234 C 185.61209 249.35672 186.79401 249.67319 188.01367 250.10352 C 189.98262 250.7982 190.95335 251.14507 191.43164 251.18555 C 191.67078 251.20578 191.7855 251.14874 191.8418 251.02148 C 191.8981 250.89423 191.89453 250.69763 191.89453 250.43359 C 191.89453 249.97371 190.87325 248.57442 189.625 247.32617 C 188.83852 246.5397 187.9443 245.95239 186.91211 245.56445 C 185.87992 245.17652 184.71022 244.98893 183.37695 245 C 182.04368 245.01107 180.5452 245.22228 178.85547 245.63281 C 177.16574 246.04334 175.28517 246.65244 173.18359 247.46289 C 169.75215 248.78618 166.78683 249.71065 166.59375 249.51758 C 166.40064 249.3245 166.02819 246.38131 165.76562 242.97656 C 165.56503 240.37529 165.56309 238.15755 165.77734 236.29883 C 165.99159 234.44011 166.42196 232.9411 167.08008 231.77344 C 167.40914 231.1896 167.79476 230.6883 168.24023 230.26758 C 168.68571 229.84685 169.19035 229.50624 169.75586 229.24219 C 170.32137 228.97813 170.94754 228.79156 171.63672 228.67773 C 172.3259 228.56391 173.07806 228.52276 173.89453 228.55273 L 177.53125 228.68555 L 175.20117 226.78125 C 174.40644 226.1316 173.68042 225.65745 172.98047 225.36133 C 172.28051 225.06521 171.60723 224.94866 170.92188 225.01367 C 170.23652 225.07869 169.53804 225.32601 168.78711 225.75977 C 168.03618 226.19352 167.23261 226.81295 166.33594 227.62305 C 165.42389 228.44702 164.62396 229.36837 163.9375 230.38477 C 163.25104 231.40116 162.67801 232.51222 162.21875 233.7168 C 161.75949 234.92138 161.41403 236.2189 161.18359 237.60742 C 160.95315 238.99594 160.83789 240.47671 160.83789 242.04492 C 160.83789 243.80382 160.69591 245.11308 160.42383 245.97461 C 160.28779 246.40537 160.11879 246.72293 159.91992 246.92969 C 159.72106 247.13645 159.4926 247.23186 159.23438 247.21484 C 158.71792 247.18082 158.08468 246.69923 157.35156 245.77148 C 156.61844 244.84373 155.78536 243.47004 154.86328 241.65039 C 154.04448 240.03457 153.48313 238.32498 153.16406 236.68555 C 152.84499 235.04611 152.76699 233.47648 152.91211 232.14062 C 153.05723 230.80477 153.42623 229.70315 154 228.99805 C 154.28689 228.6455 154.62434 228.39133 155.01172 228.25781 C 155.3991 228.1243 155.83688 228.11186 156.32031 228.23828 C 156.75868 228.35291 157.0866 228.42985 157.30469 228.42773 C 157.52278 228.42562 157.63077 228.34469 157.62695 228.13672 C 157.61931 227.72077 157.16484 226.8034 156.25977 225.0293 C 155.58331 223.70333 155.09138 222.40454 154.7832 221.14844 C 154.47503 219.89233 154.35173 218.67853 154.41016 217.52539 C 154.46859 216.37225 154.70945 215.27879 155.13281 214.26172 C 155.55617 213.24465 156.16261 212.30493 156.94922 211.45703 C 158.22605 210.08072 161.54541 205.13372 164.32617 200.46484 C 165.99936 197.65554 167.61088 195.08576 169.22852 192.66992 C 170.84615 190.25408 172.46939 187.99231 174.16211 185.80078 C 175.85483 183.60925 177.61715 181.48794 179.51562 179.35156 C 181.4141 177.21518 183.44872 175.06288 185.68359 172.8125 C 189.81377 168.65368 193.96986 164.84627 198.46289 161.18945 C 202.95592 157.53263 207.78665 154.0278 213.26172 150.4707 C 218.73679 146.91361 224.8573 143.30496 231.93359 139.44531 C 239.00989 135.58566 247.04118 131.47464 256.33789 126.91016 C 273.73846 118.36689 284.05026 113.26552 291.08398 109.64258 C 293.91008 108.18691 295.12773 107.37505 297.14258 106.26953 L 297.14258 94.369141 C 296.77818 94.545814 296.54486 94.689238 296.17578 94.867188 C 288.30743 98.66087 279.36896 102.74764 269.14844 107.24609 C 255.60616 113.20661 243.48758 118.8627 233.33008 123.94336 C 228.25133 126.48369 223.66322 128.88036 219.63281 131.09961 C 215.60241 133.31886 212.12854 135.36064 209.28125 137.19141 C 204.60418 140.19868 200.01683 143.42926 195.58984 146.81836 C 191.16285 150.20746 186.89791 153.75578 182.86523 157.39648 C 178.83256 161.03719 175.03124 164.77111 171.53711 168.5332 C 168.04298 172.2953 164.85431 176.08462 162.04297 179.83789 C 158.68443 184.32171 155.60818 187.99023 155.20508 187.99023 C 154.80197 187.99023 153.37053 186.47259 152.02539 184.61719 C 151.44687 183.81919 151.00516 183.18221 150.66211 182.55469 C 150.31906 181.92717 150.07514 181.3079 149.89648 180.54883 C 149.53917 179.03069 149.43875 176.94824 149.3125 173.0918 L 149.04688 164.93945 L 145.95703 161.85156 C 144.60257 160.49711 143.85153 159.66109 143.51562 158.93555 C 143.34767 158.57277 143.28287 158.23723 143.29883 157.87891 C 143.31478 157.52058 143.41175 157.13932 143.56445 156.68359 C 143.8602 155.80096 143.99807 154.91966 143.97461 154.0293 C 143.95115 153.13894 143.76654 152.23822 143.41406 151.31445 C 143.06159 150.39069 142.54284 149.44378 141.85156 148.46094 C 141.16028 147.4781 140.29575 146.46017 139.25586 145.39258 C 137.54847 143.63972 136.58987 142.56667 136.10156 141.6543 C 135.85741 141.19811 135.73106 140.78249 135.6875 140.3418 C 135.64394 139.9011 135.6839 139.43582 135.77148 138.88086 C 135.8938 138.10584 135.88958 137.36748 135.75781 136.66016 C 135.62604 135.95283 135.36626 135.27552 134.97266 134.62305 C 134.57905 133.97058 134.05186 133.34288 133.38867 132.73242 C 132.72548 132.12197 131.92685 131.52855 130.98633 130.94727 C 130.00901 130.34327 129.31995 129.77789 128.875 129.19336 C 128.43005 128.60883 128.22852 128.00604 128.22852 127.32617 C 128.22852 126.27124 127.5611 124.1163 126.74414 122.53711 C 124.87165 118.91748 123.47156 115.94407 122.54883 113.56641 C 121.6261 111.18875 121.17954 109.40537 121.20898 108.16797 C 121.22371 107.54927 121.3581 107.06755 121.61133 106.71484 C 121.86455 106.36214 122.23649 106.13849 122.72852 106.03906 C 123.22054 105.93964 123.83332 105.96433 124.56445 106.10547 C 125.29558 106.24661 126.1447 106.506 127.11523 106.875 C 127.91142 107.17771 128.59119 107.35103 129.18555 107.375 C 129.7799 107.39897 130.28867 107.27345 130.74609 106.97656 C 131.20351 106.67968 131.60876 106.21065 131.99414 105.55078 C 132.37952 104.89092 132.74676 104.03958 133.125 102.97461 C 133.51967 101.86339 134.06977 100.75429 134.66016 99.833984 C 135.25055 98.913681 135.88075 98.181937 136.42969 97.822266 C 137.12279 97.368124 137.91841 97.084239 138.76172 96.957031 C 139.60502 96.829824 140.49475 96.860154 141.375 97.037109 C 142.25525 97.214065 143.12575 97.535792 143.92969 97.994141 C 144.73362 98.452489 145.47158 99.046702 146.08594 99.763672 C 147.50499 101.41974 148.96419 102.66636 150.31641 103.41992 C 150.99251 103.7967 151.64222 104.04971 152.24609 104.16992 C 152.84997 104.29013 153.40967 104.27613 153.9043 104.11914 C 154.28561 103.99811 154.57845 103.88102 154.79688 103.7168 C 155.0153 103.55258 155.15932 103.34261 155.24219 103.0332 C 155.40791 102.41439 155.32983 101.40331 155.11719 99.591797 C 154.42715 93.713371 154.05424 89.900315 153.98047 87.556641 C 153.94358 86.384804 153.98165 85.579836 154.0918 85.068359 C 154.20195 84.556883 154.38422 84.337891 154.63672 84.337891 C 154.91444 84.337891 155.87728 85.05971 157.20508 86.220703 C 158.53288 87.381696 160.22602 88.98264 161.96289 90.744141 C 164.63495 93.454095 166.3833 95.395854 167.93359 97.599609 C 169.48389 99.803365 170.83565 102.26928 172.71094 106.02344 C 173.9299 108.4637 175.03839 110.88337 175.8418 112.81836 C 176.6452 114.75334 177.14258 116.20364 177.14258 116.69922 C 177.14258 117.1948 177.2211 117.64406 177.34766 117.9707 C 177.47421 118.29734 177.64978 118.5 177.8418 118.5 C 178.07441 118.5 178.28226 118.0806 178.45312 117.40039 C 178.62399 116.72018 178.75659 115.7801 178.83984 114.74219 C 179.00635 112.66637 178.97197 110.1965 178.63281 108.625 C 178.41719 107.62594 178.3507 106.98095 178.47461 106.54102 C 178.59852 106.10108 178.91319 105.86659 179.45898 105.69336 C 179.76392 105.59658 179.98173 105.4817 180.0957 105.28125 C 180.20968 105.0808 180.22055 104.79465 180.10938 104.35547 C 179.88703 103.47711 179.17962 101.98733 177.85156 99.34375 C 176.40972 96.473667 174.81034 92.719416 173.63672 89.619141 C 172.4631 86.518865 171.71489 84.07223 171.97266 83.814453 C 172.11249 83.674645 175.10316 83.153196 178.61719 82.65625 C 180.56777 82.380401 182.38671 82.228352 184.13281 82.208984 C 185.87892 82.189616 187.55062 82.303527 189.20898 82.558594 C 190.86734 82.813661 192.51187 83.210356 194.19922 83.757812 C 195.88657 84.305269 197.61809 85.003527 199.45117 85.861328 C 202.22399 87.158878 204.6185 88.220703 204.77344 88.220703 C 204.92846 88.220703 204.69468 87.260278 204.25391 86.085938 C 203.979 85.353465 203.43149 84.460374 202.61328 83.410156 C 201.79507 82.359939 200.70629 81.152167 199.34961 79.789062 C 196.63626 77.062853 192.85188 73.716195 188.01367 69.767578 C 183.86933 66.385231 180.58967 63.497954 178.33984 61.269531 C 177.21493 60.15532 176.34742 59.206034 175.75781 58.441406 C 175.16821 57.676779 174.85692 57.096964 174.84375 56.722656 C 174.81829 55.998188 174.63125 55.062129 174.32422 54.011719 C 174.01719 52.961308 173.58972 51.796517 173.08203 50.609375 C 172.06666 48.235092 170.73093 45.776173 169.39844 43.990234 C 168.10888 42.261825 167.19601 40.865664 166.70703 39.716797 C 166.46254 39.142363 166.32358 38.629733 166.29688 38.167969 C 166.27017 37.706205 166.35577 37.296353 166.55859 36.925781 C 166.76142 36.555209 167.08127 36.224685 167.52539 35.923828 C 167.96951 35.622971 168.53721 35.350276 169.23438 35.097656 C 170.6287 34.592417 172.54055 34.16381 175.01758 33.722656 C 176.65395 33.431231 177.87782 33.099454 178.83203 32.662109 C 179.78624 32.224765 180.47108 31.680004 181.03516 30.962891 C 181.98869 29.750738 182.48484 28.836913 182.51758 28.320312 C 182.53395 28.062012 182.43493 27.904628 182.21875 27.857422 C 182.00257 27.810216 181.66905 27.873808 181.21875 28.0625 C 180.12599 28.520409 177.91237 29.036942 175.91406 29.380859 C 173.91575 29.724777 172.13256 29.896232 171.90234 29.666016 C 171.67025 29.43393 172.9043 27.698464 174.64453 25.810547 C 176.36609 23.942867 177.96809 21.713091 179.13086 19.673828 C 179.71225 18.654197 180.18281 17.682633 180.50586 16.828125 C 180.82891 15.973617 181.00266 15.236251 180.98828 14.685547 C 180.9833 14.494143 180.9265 14.413444 180.82617 14.431641 C 180.72584 14.449837 180.58294 14.566105 180.4082 14.769531 C 180.05872 15.176384 179.58208 15.930089 179.06055 16.931641 C 178.47645 18.053338 177.90139 18.994109 177.31055 19.773438 C 176.7197 20.552766 176.11305 21.170182 175.45898 21.648438 C 174.80492 22.126693 174.10385 22.465114 173.33008 22.683594 C 172.5563 22.902073 171.70972 23 170.75977 23 C 169.14664 23 167.82617 22.859252 167.82617 22.685547 C 167.82617 22.511836 168.87505 20.029806 170.1582 17.169922 C 170.97888 15.3408 171.614 13.787272 172.07031 12.433594 C 172.52663 11.079915 172.80423 9.9247782 172.91211 8.8945312 C 173.01998 7.8642843 172.95902 6.9584371 172.73438 6.0996094 C 172.50973 5.2407817 172.12133 4.4292645 171.58008 3.5898438 L 171.27734 3.1191406 L 169.59375 3.1191406 L 169.28125 6.1054688 C 169.04368 8.3731689 168.66461 10.514897 168.18164 12.451172 C 167.69867 14.387447 167.11025 16.118556 166.45312 17.566406 C 165.796 19.014256 165.07056 20.179997 164.31055 20.982422 C 163.93054 21.383634 163.54276 21.693878 163.15039 21.904297 C 162.75802 22.114716 162.36067 22.224609 161.96484 22.224609 C 161.6508 22.224609 161.2136 22.045955 160.76172 21.759766 C 160.30984 21.473577 159.84423 21.080702 159.47266 20.646484 C 158.92769 20.009626 158.58876 19.231238 158.38477 17.8125 C 158.18077 16.393762 158.11192 14.334109 158.10547 11.134766 C 158.10114 9.0269776 158.046 7.2799717 157.91406 5.7988281 C 157.81968 4.739295 157.62702 3.9434004 157.44141 3.1191406 L 153.55273 3.1191406 z M 146.58203 238.53906 L 149.24219 240.09375 C 150.27651 240.69783 151.17969 241.37521 151.95117 242.12891 C 152.72265 242.88261 153.36352 243.71273 153.875 244.62109 C 154.38648 245.52946 154.76912 246.51591 155.02344 247.58398 C 155.27775 248.65206 155.4043 249.80037 155.4043 251.0332 C 155.4043 252.67677 155.32272 254.01504 155.07227 255.1582 C 154.82181 256.30136 154.40127 257.25089 153.72461 258.11914 C 153.04795 258.98739 152.11453 259.77297 150.83594 260.5918 C 149.55734 261.41062 147.93323 262.26096 145.87695 263.25586 C 143.90597 264.2095 141.32927 265.30435 138.76367 266.29883 C 136.19808 267.29331 133.64431 268.18892 131.72266 268.74414 C 129.90472 269.26941 127.85323 269.72991 125.75586 270.10938 C 123.65849 270.48884 121.5153 270.78602 119.51758 270.98242 C 117.51986 271.17882 115.66742 271.27589 114.14844 271.25195 C 112.62945 271.22802 111.44438 271.08427 110.7832 270.80273 C 110.44727 270.65968 110.22086 270.51863 110.14062 270.33789 C 110.06039 270.15715 110.12622 269.93571 110.37109 269.63086 C 110.86085 269.02115 112.07061 268.07779 114.27734 266.45312 C 117.04019 264.41906 121.58057 261.3998 124.36719 259.74414 C 127.15381 258.08849 131.50523 255.06511 134.03711 253.02539 C 136.12283 251.3451 137.59793 250.01988 139.18164 248.24414 C 140.76536 246.4684 142.45634 244.24172 144.97461 240.75977 L 146.58203 238.53906 z "
+         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>
-    <g
-       transform="matrix(0.99103064,0,0,0.98943856,1.2668213,1.9022887)"
-       id="layer5"
-       style="display:inline;fill:#ffffff;fill-opacity:1"
-       clip-path="none">
-      <g
-         id="g3342"
-         transform="matrix(1.0090505,0,0,1.0106742,411.46737,-30.548174)"
-         style="fill:#ffffff;fill-opacity:1">
-        <g
-           style="display:none;fill:#ffffff;fill-opacity:1"
-           id="layer1-27"
-           inkscape:label="Button">
-          <path
-             transform="matrix(1.0015936,0,0,1.0000039,-0.00173336,0.71369073)"
-             d="M 300,149.64285 A 149.64285,149.64285 0 0 1 150.35715,299.28571 149.64285,149.64285 0 0 1 0.71429443,149.64285 149.64285,149.64285 0 0 1 150.35715,0 149.64285,149.64285 0 0 1 300,149.64285 Z"
-             sodipodi:ry="149.64285"
-             sodipodi:rx="149.64285"
-             sodipodi:cy="149.64285"
-             sodipodi:cx="150.35715"
-             id="path3221-6"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0;filter:url(#filter4089-5)"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(1.7575395,0,0,2.3083681,-112.20297,-59.060263)"
-             d="M 212.85715,63.57143 A 63.57143,37.142857 0 0 1 149.28572,100.71429 63.57143,37.142857 0 0 1 85.714291,63.57143 63.57143,37.142857 0 0 1 149.28572,26.428574 63.57143,37.142857 0 0 1 212.85715,63.57143 Z"
-             sodipodi:ry="37.142857"
-             sodipodi:rx="63.57143"
-             sodipodi:cy="63.57143"
-             sodipodi:cx="149.28572"
-             id="path4007-1"
-             style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:0"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           style="display:inline;fill:#ffffff;fill-opacity:1"
-           inkscape:label="Schatten"
-           id="layer2-2"
-           transform="translate(-706.77969,-20.338983)">
-          <g
-             id="g3350"
-             transform="translate(-6.9915273,131.5678)"
-             style="fill:#ffffff">
-            <g
-               style="display:none;fill:#ffffff"
-               id="layer1-1"
-               inkscape:label="Button">
-              <path
-                 transform="matrix(1.0015936,0,0,1.0000039,-0.00173336,0.71369073)"
-                 d="M 300,149.64285 A 149.64285,149.64285 0 0 1 150.35715,299.28571 149.64285,149.64285 0 0 1 0.71429443,149.64285 149.64285,149.64285 0 0 1 150.35715,0 149.64285,149.64285 0 0 1 300,149.64285 Z"
-                 sodipodi:ry="149.64285"
-                 sodipodi:rx="149.64285"
-                 sodipodi:cy="149.64285"
-                 sodipodi:cx="150.35715"
-                 id="path3221-9"
-                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0;filter:url(#filter4089-4)"
-                 sodipodi:type="arc" />
-              <path
-                 transform="matrix(1.7575395,0,0,2.3083681,-112.20297,-59.060263)"
-                 d="M 212.85715,63.57143 A 63.57143,37.142857 0 0 1 149.28572,100.71429 63.57143,37.142857 0 0 1 85.714291,63.57143 63.57143,37.142857 0 0 1 149.28572,26.428574 63.57143,37.142857 0 0 1 212.85715,63.57143 Z"
-                 sodipodi:ry="37.142857"
-                 sodipodi:rx="63.57143"
-                 sodipodi:cy="63.57143"
-                 sodipodi:cx="149.28572"
-                 id="path4007-8"
-                 style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:0"
-                 sodipodi:type="arc" />
-            </g>
-            <g
-               style="display:inline;fill:#ffffff"
-               inkscape:label="Schatten"
-               id="layer2-5"
-               transform="translate(-3.8135597,-59.110169)"
-               inkscape:transform-center-x="5.7203391"
-               inkscape:transform-center-y="-59.745764" />
-          </g>
-        </g>
-      </g>
-    </g>
     <path
        inkscape:connector-curvature="0"
-       style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#552200;stroke-width:0.9807238;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 l 0,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 l 0,24.52929 c 0,27.16356 21.8724741,49.03321 49.0410211,49.03321 l 194.265584,0 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 l 0,-12.04688 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 -1.68359,0 -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 l -3.95117,0 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 l -10.10547,0 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 l 1.60742,-2.22071 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"
+       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>
-  <g
-     id="layer1"
-     style="display:none">
-    <path
-       d="m 300,149.64285 a 149.64285,149.64285 0 1 1 -299.28570557,0 149.64285,149.64285 0 1 1 299.28570557,0 z"
-       transform="matrix(1.0015936,0,0,1.0000039,-0.00173336,0.71369073)"
-       id="path3221"
-       style="fill:url(#linearGradient4005);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0;filter:url(#filter4089)" />
-    <path
-       d="m 212.85715,63.57143 a 63.57143,37.142857 0 1 1 -127.142859,0 63.57143,37.142857 0 1 1 127.142859,0 z"
-       transform="matrix(1.7575395,0,0,2.3083681,-112.20297,-59.060263)"
-       id="path4007"
-       style="fill:url(#linearGradient4015);fill-opacity:1;stroke:#000000;stroke-opacity:0" />
-  </g>
-  <g
-     id="layer3"
-     style="display:none">
-    <g
-       transform="matrix(7.6581652,0,0,7.6581652,1681.0722,-1177.5586)"
-       id="layer1-2">
-      <path
-         d="m -148.03125,80.96875 c -6.0579,-0.03504 -11.91131,4.711237 -11.8125,12.84375 l 0.0631,1.151808 c 0.62231,7.603432 4.13029,13.291242 12.93687,13.160692 2.52613,-0.004 5.68576,-0.29706 8.46875,-1.03125 0.35724,2.42974 0.1825,4.6184 0.1875,7.21875 l 1.28125,0 c 0.24505,-3.68777 0.0109,-7.26047 0.1875,-11.1875 l -0.0937,0 c -2.97137,1.06406 -5.15714,3.00998 -9.375,2.90625 -10.48573,-0.17175 -15.74858,-17.5421 -3.84375,-22.28125 4.78342,-1.58919 6.63867,1.44949 8.40625,4.34375 l 7.15625,-6.8125 c -6.03654,5.13181 -3.71384,4.85286 -5.71875,2.84375 -2.29826,-2.126353 -5.09016,-3.140321 -7.84375,-3.15625 z"
-         transform="translate(-53.051416,77.162831)"
-         id="text2395"
-         style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:'Magic:the Gathering';-inkscape-font-specification:'Magic:the Gathering'" />
-    </g>
-  </g>
-  <g
-     transform="matrix(0.99103064,0,0,0.98943856,1.2668213,1.9022887)"
-     id="layer2"
-     style="display:inline" />
 </svg>
diff --git a/cockatrice/resources/config/qtlogging.ini b/cockatrice/resources/config/qtlogging.ini
index 083d7234e..7ac0d9ca4 100644
--- a/cockatrice/resources/config/qtlogging.ini
+++ b/cockatrice/resources/config/qtlogging.ini
@@ -1,6 +1,10 @@
 [Rules]
 # The default log level is info
 *.debug = false
+#*.info = true
+#*.warning = true
+#*.critical = true
+#*.fatal = true
 
 # Uncomment a rule to see debug level logs for that category,
 # or set <category> = false to disable logging
@@ -24,6 +28,8 @@
 #dlg_tip_of_the_day = true
 #dlg_update = true
 
+#general_settings_page = true
+
 #settings_cache = true
 #servers_settings = true
 #shortcuts_settings = true
diff --git a/cockatrice/resources/config/storage.svg b/cockatrice/resources/config/storage.svg
new file mode 100644
index 000000000..de85228dc
--- /dev/null
+++ b/cockatrice/resources/config/storage.svg
@@ -0,0 +1,799 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns: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/"
+   width="62.636364"
+   height="62.090908"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   sodipodi:docname="storage.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"><defs
+     id="defs4"><linearGradient
+       id="linearGradient3169"><stop
+         style="stop-color:#0000ff;stop-opacity:1;"
+         offset="0"
+         id="stop3171" /><stop
+         style="stop-color:#000067;stop-opacity:1;"
+         offset="1"
+         id="stop3173" /></linearGradient><linearGradient
+       id="linearGradient4766"><stop
+         style="stop-color:#784421;stop-opacity:1;"
+         offset="0"
+         id="stop4768" /><stop
+         style="stop-color:#3d2210;stop-opacity:0;"
+         offset="1"
+         id="stop4770" /></linearGradient><linearGradient
+       id="linearGradient4758"><stop
+         style="stop-color:#a05a2c;stop-opacity:1;"
+         offset="0"
+         id="stop4760" /><stop
+         style="stop-color:#3d2210;stop-opacity:1;"
+         offset="1"
+         id="stop4762" /></linearGradient><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" /><inkscape:perspective
+       id="perspective2484"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4758"
+       id="linearGradient4764"
+       x1="466.09601"
+       y1="485.96021"
+       x2="715.14801"
+       y2="485.96021"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4766"
+       id="linearGradient4772"
+       x1="496.548"
+       y1="485.26816"
+       x2="683.31201"
+       y2="485.26816"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3169"
+       id="radialGradient3175"
+       cx="120.07376"
+       cy="56.138123"
+       fx="120.07376"
+       fy="56.138123"
+       r="82.790039"
+       gradientTransform="matrix(1,0,0,0.2116376,0,44.257186)"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6482"
+       id="linearGradient6488"
+       x1="32.18182"
+       y1="3.2835093"
+       x2="32.18182"
+       y2="13.02554"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0281354,0,0,1.0429299,85.21874,131.0326)" /><linearGradient
+       id="linearGradient6482"><stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6484" /><stop
+         style="stop-color:#00ff00;stop-opacity:0;"
+         offset="1"
+         id="stop6486" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6464"
+       id="linearGradient6470"
+       x1="32.090908"
+       y1="1.8181819"
+       x2="31.09091"
+       y2="62.909088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-0.1818182)" /><linearGradient
+       id="linearGradient6464"><stop
+         style="stop-color:#0061ff;stop-opacity:1;"
+         offset="0"
+         id="stop6466" /><stop
+         style="stop-color:#001c4c;stop-opacity:1;"
+         offset="1"
+         id="stop6468" /></linearGradient><linearGradient
+       y2="62.909088"
+       x2="31.09091"
+       y1="1.8181819"
+       x1="32.090908"
+       gradientTransform="translate(86.2151,131.5372)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4477"
+       xlink:href="#linearGradient6464"
+       inkscape:collect="always" /><linearGradient
+       inkscape:collect="always"
+       id="linearGradient2916"><stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop2918" /><stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2920" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       id="linearGradient2902"><stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop2905" /><stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2907" /></linearGradient><linearGradient
+       id="linearGradient2064"><stop
+         id="stop2066"
+         offset="0"
+         style="stop-color:white;stop-opacity:1;" /><stop
+         style="stop-color:#555753;stop-opacity:0.60000002;"
+         offset="0.5"
+         id="stop2070" /><stop
+         id="stop2068"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0;" /></linearGradient><linearGradient
+       id="linearGradient9641"><stop
+         style="stop-color:white;stop-opacity:1"
+         offset="0"
+         id="stop9643" /><stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1"
+         id="stop9645" /></linearGradient><linearGradient
+       id="linearGradient9633"><stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0"
+         id="stop9635" /><stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1"
+         id="stop9639" /></linearGradient><linearGradient
+       id="linearGradient9613"><stop
+         style="stop-color:white;stop-opacity:1"
+         offset="0"
+         id="stop9615" /><stop
+         id="stop9619"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:1;" /><stop
+         style="stop-color:#cccfca;stop-opacity:1"
+         offset="1"
+         id="stop9617" /></linearGradient><linearGradient
+       id="linearGradient8710"><stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop8712" /><stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="1"
+         id="stop8714" /></linearGradient><linearGradient
+       id="linearGradient8631"><stop
+         id="stop8633"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1" /><stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0.2"
+         id="stop8637" /><stop
+         id="stop8635"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:1" /></linearGradient><linearGradient
+       id="linearGradient8625"><stop
+         id="stop8627"
+         offset="0"
+         style="stop-color:white;stop-opacity:1" /><stop
+         id="stop8629"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:1" /></linearGradient><linearGradient
+       id="linearGradient8613"><stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="0"
+         id="stop8615" /><stop
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="1"
+         id="stop8617" /></linearGradient><linearGradient
+       id="linearGradient5740"><stop
+         style="stop-color:#d0d0cb;stop-opacity:1;"
+         offset="0"
+         id="stop5742" /><stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop5744" /></linearGradient><linearGradient
+       id="linearGradient5690"><stop
+         style="stop-color:white;stop-opacity:1;"
+         offset="0"
+         id="stop5692" /><stop
+         style="stop-color:#888a85;stop-opacity:0.59848487"
+         offset="1"
+         id="stop5694" /></linearGradient><linearGradient
+       id="linearGradient2899"><stop
+         id="stop2901"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1" /><stop
+         id="stop2903"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:1" /></linearGradient><linearGradient
+       id="linearGradient3468"><stop
+         style="stop-color:#fdfdfc;stop-opacity:1"
+         offset="0"
+         id="stop3470" /><stop
+         style="stop-color:white;stop-opacity:0.37121212"
+         offset="1"
+         id="stop3472" /></linearGradient><linearGradient
+       id="linearGradient2909"><stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="0"
+         id="stop2911" /><stop
+         id="stop2917"
+         offset="0.5"
+         style="stop-color:white;stop-opacity:1;" /><stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2913" /></linearGradient><linearGradient
+       id="linearGradient2839"><stop
+         style="stop-color:white;stop-opacity:0.25773194;"
+         offset="0"
+         id="stop2841" /><stop
+         id="stop2847"
+         offset="0.5472973"
+         style="stop-color:white;stop-opacity:1;" /><stop
+         style="stop-color:white;stop-opacity:0.24705882;"
+         offset="0.66243607"
+         id="stop2849" /><stop
+         id="stop2851"
+         offset="0.875"
+         style="stop-color:white;stop-opacity:0.83505154;" /><stop
+         style="stop-color:white;stop-opacity:0;"
+         offset="1"
+         id="stop2843" /></linearGradient><linearGradient
+       id="linearGradient2900"><stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2902" /><stop
+         id="stop2908"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" /><stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2904" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3468"
+       id="linearGradient3474"
+       x1="24.748737"
+       y1="35.354588"
+       x2="24.998737"
+       y2="14.997767"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.995556,0,-3.931113)" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2902"
+       id="radialGradient4700"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.095822,0,0,3.101282,-9.53921,-94.5433)"
+       cx="0"
+       cy="17"
+       fx="0"
+       fy="17"
+       r="2" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2902"
+       id="radialGradient4702"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.095822,0,0,3.101282,38.20996,-10.90025)"
+       cx="0"
+       cy="17"
+       fx="0"
+       fy="17"
+       r="2" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2900"
+       id="linearGradient4704"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.047911,0,0,2.067521,1.347566,6.673675)"
+       x1="9.8994951"
+       y1="20"
+       x2="9.8994951"
+       y2="13.979153" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2909"
+       id="linearGradient4711"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.42294,10.5,-14.95703)"
+       x1="15.335379"
+       y1="33.06237"
+       x2="20.329321"
+       y2="36.37693" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2909"
+       id="linearGradient4713"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.42294,-0.875,-15.04578)"
+       x1="15.335379"
+       y1="33.06237"
+       x2="20.329321"
+       y2="36.37693" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2909"
+       id="linearGradient4715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.459833,0,-0.391165,1.370105,40.62503,-13.29892)"
+       x1="15.335379"
+       y1="33.06237"
+       x2="20.329321"
+       y2="36.37693" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5740"
+       id="radialGradient5748"
+       cx="25.251999"
+       cy="16.47991"
+       fx="25.251999"
+       fy="16.47991"
+       r="21.980215"
+       gradientTransform="matrix(1.032991,-0.596398,0.575121,0.99614,-12.23456,11.55448)"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2064"
+       id="linearGradient5790"
+       gradientUnits="userSpaceOnUse"
+       x1="18.048874"
+       y1="25.461344"
+       x2="22.211937"
+       y2="12.143078"
+       gradientTransform="matrix(0.940224,0,0,0.931632,1.331811,1.401537)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8631"
+       id="linearGradient5865"
+       x1="24"
+       y1="36.638382"
+       x2="25.818018"
+       y2="6.8314762"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2839"
+       id="linearGradient7658"
+       gradientUnits="userSpaceOnUse"
+       x1="27.057796"
+       y1="12.669416"
+       x2="32.042896"
+       y2="31.219666" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5690"
+       id="linearGradient8603"
+       x1="20.304037"
+       y1="24.035707"
+       x2="18.498415"
+       y2="40.647167"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8613"
+       id="radialGradient8619"
+       cx="7.5177727"
+       cy="30.573555"
+       fx="7.5177727"
+       fy="30.573555"
+       r="0.53125"
+       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9613"
+       id="radialGradient8623"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.389748,0,0,1.348872,-2.91982,-10.63815)"
+       cx="7.5191436"
+       cy="30.304251"
+       fx="7.5191436"
+       fy="30.304251"
+       r="0.53125" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9633"
+       id="radialGradient8664"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.569487,0,0,1.523325,-4.288627,-15.92107)"
+       cx="7.5336008"
+       cy="30.307562"
+       fx="7.5336008"
+       fy="30.307562"
+       r="0.53125" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8613"
+       id="radialGradient8666"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
+       cx="7.5177727"
+       cy="30.573555"
+       fx="7.5177727"
+       fy="30.573555"
+       r="0.53125" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8625"
+       id="radialGradient8676"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
+       cx="7.4792061"
+       cy="30.36071"
+       fx="7.4792061"
+       fy="30.36071"
+       r="0.53125" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8613"
+       id="radialGradient8678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
+       cx="7.5177727"
+       cy="30.573555"
+       fx="7.5177727"
+       fy="30.573555"
+       r="0.53125" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9641"
+       id="radialGradient8680"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
+       cx="7.4893188"
+       cy="30.337601"
+       fx="7.4893188"
+       fy="30.337601"
+       r="0.53125" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8613"
+       id="radialGradient8682"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.662477,0,0,1.61358,-4.989175,-18.65647)"
+       cx="7.5177727"
+       cy="30.573555"
+       fx="7.5177727"
+       fy="30.573555"
+       r="0.53125" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient8716"
+       x1="40.617188"
+       y1="30.554688"
+       x2="40.710938"
+       y2="30.359375"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient9605"
+       gradientUnits="userSpaceOnUse"
+       x1="40.617188"
+       y1="30.554688"
+       x2="40.710938"
+       y2="30.359375"
+       gradientTransform="matrix(0.602867,-0.797841,0.797841,0.602867,-41.12611,44.62773)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient9649"
+       gradientUnits="userSpaceOnUse"
+       x1="40.617188"
+       y1="30.554688"
+       x2="40.710938"
+       y2="30.359375"
+       gradientTransform="rotate(-30.000012,-5.5813167,76.089146)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8710"
+       id="linearGradient9654"
+       gradientUnits="userSpaceOnUse"
+       x1="40.617188"
+       y1="30.554688"
+       x2="40.710938"
+       y2="30.359375"
+       gradientTransform="matrix(0.707107,0.527555,-0.707107,0.527555,29.0058,-24.09196)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2916"
+       id="linearGradient2973"
+       x1="12.5"
+       y1="43.1875"
+       x2="12.5"
+       y2="34.045513"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2899"
+       id="linearGradient5655"
+       gradientUnits="userSpaceOnUse"
+       x1="53.812813"
+       y1="43.573235"
+       x2="-2.8138931"
+       y2="35.500015"
+       gradientTransform="translate(0,50)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2902"
+       id="linearGradient2992"
+       x1="21.9375"
+       y1="39"
+       x2="21.9375"
+       y2="37.995617"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2902"
+       id="linearGradient2910"
+       x1="22.101398"
+       y1="27.658131"
+       x2="22.971142"
+       y2="20.903238"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,2)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2916"
+       id="linearGradient2922"
+       x1="24.847851"
+       y1="28.908398"
+       x2="24.847851"
+       y2="25.757175"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,2)" /></defs><sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.8830488"
+     inkscape:cx="-3.9945275"
+     inkscape:cy="-14.363301"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1408"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:showpageshadow="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050" /><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" /></cc:Work></rdf:RDF></metadata><g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-86.987816,-132.85536)"><rect
+       style="fill:url(#linearGradient4477);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-opacity:1"
+       id="rect6462"
+       width="61.636364"
+       height="61.090908"
+       x="87.487816"
+       y="133.35536"
+       ry="5.6363635" /><rect
+       style="fill:url(#linearGradient6488);fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="rect6472"
+       width="59.796619"
+       height="13.251164"
+       x="88.407707"
+       y="134.45705"
+       ry="4.7325583" /><g
+       inkscape:label="Livello 1"
+       id="layer1-3"
+       style="display:inline"
+       transform="matrix(1.1537183,0,0,1.1537183,91.003924,136.40297)"><g
+         id="g3519"
+         style="opacity:0.7"
+         transform="matrix(1.030831,0,0,1.151147,-0.73609,-12.57431)"
+         inkscape:export-filename="/home/lapo/Desktop/uhm.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90"><rect
+           transform="scale(-1)"
+           y="-48.024086"
+           x="-9.5392103"
+           height="12.405126"
+           width="8.1916437"
+           id="rect2884"
+           style="opacity:1;fill:url(#radialGradient4700);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /><rect
+           y="35.618961"
+           x="38.209965"
+           height="12.405126"
+           width="8.1916437"
+           id="rect2894"
+           style="opacity:1;fill:url(#radialGradient4702);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /><rect
+           y="35.618961"
+           x="9.5392103"
+           height="12.405126"
+           width="28.670753"
+           id="rect2898"
+           style="opacity:1;fill:url(#linearGradient4704);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></g><g
+         id="g5672"
+         transform="translate(0,-48.99747)"><path
+           sodipodi:nodetypes="ccccccccccccc"
+           id="rect2010"
+           d="M 4.5182287,80.500013 H 43.481768 c 0.564099,0 1.018229,0.45413 1.018229,1.018229 v 2.963543 c 0,1.315584 -0.450231,3.018228 -2.455729,3.018228 L 40.5,87.5 v 1 h -33 v -1 l -1.8567713,1.3e-5 c -1.2712053,0 -2.1432282,-0.884627 -2.1432282,-2.255665 v -3.726106 c 0,-0.564099 0.4541297,-1.018229 1.0182282,-1.018229 z"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5655);fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path
+           transform="translate(0,50)"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2973);stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           d="m 4.59375,31.59375 v 3.729743 c 0,0.599619 0.3756505,1.104854 0.8863276,1.104854 H 42.426407 c 0.512469,0 0.979843,-0.507235 0.979843,-1.016466 V 31.59375 Z"
+           id="path2076"
+           sodipodi:nodetypes="ccccccc" /><g
+           transform="translate(0,50)"
+           style="opacity:0.5"
+           id="g4706"><path
+             style="opacity:0.109524;fill:url(#linearGradient4711);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="m 26.144738,32.088747 c 0,0 -1.502602,5.533939 -3.226175,5.911253 0,0 6.231378,-0.125771 6.231378,-0.125771 1.387072,-0.317461 3.358758,-5.785482 3.358758,-5.785482 z"
+             id="path2907"
+             sodipodi:nodetypes="ccccc"
+             inkscape:export-filename="/home/lapo/Desktop/uhm.png"
+             inkscape:export-xdpi="90"
+             inkscape:export-ydpi="90" /><path
+             inkscape:export-ydpi="90"
+             inkscape:export-xdpi="90"
+             inkscape:export-filename="/home/lapo/Desktop/uhm.png"
+             sodipodi:nodetypes="ccccc"
+             id="path2892"
+             d="m 14.769738,32 c 0,0 -1.502602,5.533939 -3.226175,5.911253 0,0 6.231378,-0.125771 6.231378,-0.125771 C 19.162013,37.468021 21.133699,32 21.133699,32 Z"
+             style="opacity:0.109524;fill:url(#linearGradient4713);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
+             inkscape:export-ydpi="90"
+             inkscape:export-xdpi="90"
+             inkscape:export-filename="/home/lapo/Desktop/uhm.png"
+             sodipodi:nodetypes="ccccc"
+             id="path2896"
+             d="m 34.886139,32 c 0,0 -2.212224,5.328458 -3.108503,5.691761 0,0 2.899969,-0.121101 2.899969,-0.121101 C 35.402697,37.264987 37.8125,32 37.8125,32 Z"
+             style="opacity:0.109524;fill:url(#linearGradient4715);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g></g><path
+         style="fill:url(#radialGradient5748);fill-opacity:1;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 11.693127,10.498788 h 24.572566 c 1.68417,0 2.396517,0.117479 3.040019,2.385005 l 5.074491,17.881119 c 0.501024,1.765471 -1.355848,2.735101 -3.040018,2.735101 H 6.6186312 c -1.868408,0 -3.4893833,-1.181417 -3.0400182,-2.735101 L 8.8290448,12.611497 c 0.5683008,-1.964905 1.1799122,-2.112709 2.8640822,-2.112709 z"
+         id="rect1879"
+         sodipodi:nodetypes="cczzcczzc"
+         inkscape:export-filename="/home/lapo/Desktop/uhm.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90" /><path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="-0.5"
+         inkscape:original="M 11.6875 10.5 C 10.00333 10.5 9.4120513 10.660095 8.84375 12.625 L 3.59375 30.75 C 3.1443849 32.303684 4.7565918 33.500002 6.625 33.5 L 41.34375 33.5 C 43.02792 33.5 44.876024 32.515471 44.375 30.75 L 39.3125 12.875 C 38.668998 10.607474 37.965419 10.5 36.28125 10.5 L 11.6875 10.5 z "
+         style="display:inline;opacity:0.462406;fill:url(#linearGradient7658);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+         id="path5806"
+         d="m 11.6875,11 c -0.826242,0 -1.28475,0.05742 -1.5625,0.242188 -0.2777497,0.184768 -0.5284825,0.580009 -0.8007812,1.521484 l -5.2500001,18.125 c -0.1708248,0.590628 0.021709,1.039316 0.4902344,1.4375 C 5.0329784,32.724356 5.7975106,33.000001 6.625,33 h 34.71875 c 0.744655,0 1.538941,-0.232575 2.03125,-0.609375 0.492309,-0.3768 0.719298,-0.799984 0.519531,-1.503906 l -5.0625,-17.875 C 38.52278,11.922001 38.224454,11.462814 37.910156,11.253906 37.595859,11.044998 37.112699,11 36.28125,11 Z" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8623);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8621"
+         transform="matrix(-2.628602,0,0,1.777765,27.79309,-23.77739)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><path
+         style="fill:none;fill-opacity:1;stroke:url(#linearGradient5790);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 16.110953,12.552805 c -0.573581,0 -1.02837,0.431821 -1.02837,0.989859 l -0.940223,3.230801 c -2.859962,1.276514 -4.6423552,3.099073 -4.6423552,5.123976 0,3.856957 6.4790242,6.987239 14.4853222,6.98724 8.006296,0 14.514705,-3.130284 14.514704,-6.98724 0,-2.039034 -1.835591,-3.875388 -4.730501,-5.153089 l -0.940224,-3.201688 c 0,-0.558038 -0.454788,-0.989859 -1.02837,-0.989859 z"
+         id="path2784"
+         sodipodi:nodetypes="cccssscccc" /><path
+         style="display:inline;fill:none;fill-opacity:1;stroke:url(#linearGradient3474);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 11.6875,11.500005 c -0.803124,0 -1.097168,0.07051 -1.21875,0.155556 -0.121582,0.08504 -0.357707,0.40212 -0.6875,1.306667 l -5.25,18.137786 c -0.1337204,0.366765 -0.054827,0.533865 0.3125,0.84 0.3673267,0.306136 1.066693,0.56 1.78125,0.560001 h 34.71875 c 0.639793,0 1.393345,-0.237954 1.78125,-0.52889 0.387905,-0.290935 0.488311,-0.382809 0.3125,-0.871111 L 38.375,13.242228 c -0.377206,-1.04766 -0.68208,-1.439297 -0.84375,-1.555556 -0.16167,-0.116259 -0.443711,-0.186667 -1.25,-0.186667 z"
+         id="path3394"
+         sodipodi:nodetypes="csccsccsccscc" /><g
+         id="g5657"
+         transform="translate(7,-1)"
+         style="opacity:0.302857"><rect
+           ry="0.74712253"
+           rx="0.75130093"
+           y="35.500008"
+           x="18.499996"
+           height="1.9999924"
+           width="14.000004"
+           id="rect5641"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect
+           y="36"
+           x="19"
+           height="1"
+           width="1"
+           id="rect5645"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect
+           y="36"
+           x="22"
+           height="1"
+           width="1"
+           id="rect5647"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect
+           y="36"
+           x="24"
+           height="1"
+           width="1"
+           id="rect5649"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect
+           y="36"
+           x="26"
+           height="1"
+           width="1"
+           id="rect5651"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect
+           y="36"
+           x="29"
+           height="1"
+           width="2"
+           id="rect5653"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /></g><path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="-0.44194174"
+         inkscape:original="M 16.125 12.5625 C 15.55142 12.5625 15.09375 12.973212 15.09375 13.53125 L 14.15625 16.78125 C 11.296288 18.057765 9.5 19.881347 9.5 21.90625 C 9.5 25.763206 15.993702 28.874999 24 28.875 C 32.006296 28.874999 38.500001 25.763206 38.5 21.90625 C 38.5 19.867215 36.67616 18.027701 33.78125 16.75 L 32.84375 13.53125 C 32.843748 12.973212 32.386082 12.5625 31.8125 12.5625 L 16.125 12.5625 z "
+         style="display:inline;fill:url(#linearGradient5865);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path5857"
+         d="m 16.125,13.003906 c -0.362612,0 -0.589844,0.210942 -0.589844,0.527344 a 0.44198593,0.44198593 0 0 1 -0.01758,0.123047 l -0.9375,3.25 a 0.44198593,0.44198593 0 0 1 -0.24414,0.28125 c -1.389903,0.620369 -2.504368,1.368471 -3.25586,2.177734 -0.751491,0.809263 -1.1386718,1.661199 -1.1386717,2.542969 0,1.680455 1.4530107,3.311153 3.9980467,4.533203 2.545037,1.22205 6.114654,1.99414 10.060547,1.994141 3.945892,-1e-6 7.51551,-0.772091 10.060547,-1.994141 2.545037,-1.22205 3.998047,-2.852748 3.998047,-4.533203 0,-0.887751 -0.391823,-1.747213 -1.154297,-2.5625 -0.762474,-0.815287 -1.893636,-1.568394 -3.300781,-2.189453 a 0.44198593,0.44198593 0 0 1 -0.246094,-0.28125 l -0.9375,-3.21875 a 0.44198593,0.44198593 0 0 1 -0.01758,-0.123047 c -10e-7,-0.316404 -0.22723,-0.527344 -0.589844,-0.527344 z" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:0.0530303;fill-rule:nonzero;stroke:url(#linearGradient8603);stroke-width:2.52015;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8595"
+         transform="matrix(0.449978,0,0,0.349909,16.36363,12.21469)"
+         cx="16.970562"
+         cy="25.107418"
+         rx="7.7781744"
+         ry="4.2868347" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8619);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8611"
+         transform="matrix(1.411772,0,0,0.969697,-3.014767,0.848485)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8664);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.462594;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8660"
+         transform="matrix(-2.628602,0,0,1.777765,60.79309,-23.77739)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8666);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8662"
+         transform="matrix(1.411772,0,0,0.969697,29.98523,0.848485)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8676);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8668"
+         transform="matrix(-2.628602,0,0,1.777765,31.79309,-40.77739)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8678);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8670"
+         transform="matrix(1.411772,0,0,0.969697,0.985233,-16.15152)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8680);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8672"
+         transform="matrix(-2.628602,0,0,1.777765,56.3029,-40.77739)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><ellipse
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient8682);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="path8674"
+         transform="matrix(1.411772,0,0,0.969697,25.49504,-16.15152)"
+         cx="7.625"
+         cy="30.578125"
+         rx="0.53125"
+         ry="0.515625" /><path
+         style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8716);stroke-width:0.3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 40.328109,30.261401 0.874999,0.430332"
+         id="path8700" /><path
+         style="display:inline;opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9605);stroke-width:0.3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 7.330186,30.695906 8.201031,30.257228"
+         id="path9603" /><path
+         style="display:inline;opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9649);stroke-width:0.3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 11.263531,13.446473 0.972937,-0.06482"
+         id="path9647" /><path
+         style="display:inline;opacity:0.4;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9654);stroke-width:0.3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 36.124038,13.147874 0.314427,0.688634"
+         id="path9652" /><rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.12;fill:url(#linearGradient2992);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.681836;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         id="rect2984"
+         width="32.03125"
+         height="1"
+         x="8"
+         y="38" /><path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.12;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2910);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 10.460155,15.082355 6.8513979,27.675762 C 8.2982685,28.375511 10.625,29.167061 10.429825,31.533131 H 37.299883 C 37.869398,29.640915 39.875,28.375 41.34614,28.25 L 37.498106,15.082355 32.350135,12.523347 H 14.318912 Z"
+         id="path1997"
+         sodipodi:nodetypes="ccccccccc" /><path
+         sodipodi:nodetypes="ccccc"
+         id="path2912"
+         d="m 7.9763979,27.050762 c 1.4468706,0.699749 3.1789321,1.433241 3.4256991,3.357369 H 36.857941 C 37.427456,28.515915 38.875,27.5 40.34614,27.375 Z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.834286;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2922);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /></g></g></svg>
diff --git a/cockatrice/resources/countries/cn.svg b/cockatrice/resources/countries/cn.svg
index f510cf049..45b608127 100644
--- a/cockatrice/resources/countries/cn.svg
+++ b/cockatrice/resources/countries/cn.svg
@@ -52,8 +52,7 @@
      id="defs8">
     <polygon
        id="s"
-       points="-301930,415571 0,-513674 301930,415571 -488533,-158734 488533,-158734 "
-       transform="scale(1.94676e-6,1.94676e-6)"
+       points="-0.587785,0.809017 0,-1 0.587785,0.809017 -0.951057,-0.309017 0.951057,-0.309017 "
        style="fill:#ffde00" />
     <clipPath
        clipPathUnits="userSpaceOnUse"
diff --git a/cockatrice/resources/countries/ss.svg b/cockatrice/resources/countries/ss.svg
index 56aff0574..bc5926f3c 100644
--- a/cockatrice/resources/countries/ss.svg
+++ b/cockatrice/resources/countries/ss.svg
@@ -16,6 +16,6 @@
   <rect id="rect10" height="2.88" width="12.8" y="4.278e-9" x="0"/>
   <rect id="rect12" height="2.88" width="12.8" y="3.36" x="0" fill="#da121a"/>
   <polygon id="polygon14" points="0 0 8.6603 5 0 10" fill="#0f47af" transform="scale(.96)"/>
-  <polygon id="polygon16" points="4.1557e5 -3.0193e5 -5.1367e5 0 4.1557e5 3.0193e5 -1.5873e5 -4.8853e5 -1.5873e5 4.8853e5" fill="#fcdd09" transform="matrix(.0000029902 0 0 .0000029902 2.7713 4.8)"/>
+  <polygon id="polygon16" points="4.01394 3.897169 1.23532 4.8 4.01394 5.702831 2.296666 3.3392 2.296666 6.2608" fill="#fcdd09"/>
  </g>
 </svg>
diff --git a/cockatrice/resources/help/deck_search.md b/cockatrice/resources/help/deck_search.md
index 6d58ee590..163137335 100644
--- a/cockatrice/resources/help/deck_search.md
+++ b/cockatrice/resources/help/deck_search.md
@@ -1,11 +1,13 @@
 @page deck_search_syntax_help Deck Search Syntax Help
 
 ## Deck Search Syntax Help
------
+
 The search bar recognizes a set of special commands.<br>
 In this list of examples below, each entry has an explanation and can be clicked to test the query. Note that all
 searches are case insensitive.
+
 <dl>
+
 <dt>Display Name (The deck name, or the filename if the deck name isn't set):</dt>
 <dd>[red deck wins](#red deck wins) <small>(Any deck with a display name containing the words red, deck, and wins)</small></dd>
 <dd>["red deck wins"](#%22red deck wins%22) <small>(Any deck with a display name containing the exact phrase "red deck wins")</small></dd>
@@ -15,15 +17,23 @@ searches are case insensitive.
 <dd>[n:red n:deck n:wins](#n:red n:deck n:wins) <small>(Any deck with a name containing the words red, deck, and wins)</small></dd>
 <dd>[n:"red deck wins"](#n:%22red deck wins%22) <small>(Any deck with a name containing the exact phrase "red deck wins")</small></dd>
 
-<dt><u>F</u>ile Name:</dt>
-<dd>[f:aggro](#f:aggro) <small>(Any deck with a filename containing the word aggro)</small></dd>
-<dd>[f:red f:deck f:wins](#f:red f:deck f:wins) <small>(Any deck with a filename containing the words red, deck, and wins)</small></dd>
-<dd>[f:"red deck wins"](#f:%22red deck wins%22) <small>(Any deck with a filename containing the exact phrase "red deck wins")</small></dd>
+<dt><u>F</u>ile <u>N</u>ame:</dt>
+<dd>[fn:aggro](#fn:aggro) <small>(Any deck with a filename containing the word aggro)</small></dd>
+<dd>[fn:red fn:deck fn:wins](#fn:red fn:deck fn:wins) <small>(Any deck with a filename containing the words red, deck, and wins)</small></dd>
+<dd>[fn:"red deck wins"](#fn:%22red deck wins%22) <small>(Any deck with a filename containing the exact phrase "red deck wins")</small></dd>
 
 <dt>Relative <u>P</u>ath (starting from the deck folder):</dt>
 <dd>[p:aggro](#p:aggro) <small>(Any deck that has "aggro" somewhere in its relative path)</small></dd>
 <dd>[p:edh/](#p:edh/) <small>(Any deck with "edh/" in its relative path, A.K.A. decks in the "edh" folder)</small></dd>
 
+<dt><u>F</u>ormat:</dt>
+<dd>[f:standard](#f:standard) <small>(Any deck with format set to standard)</small></dd>
+
+<dt><u>C</u>omments:</dt>
+<dd>[c:good](#c:good) <small>(Any deck with comments containing the word good)</small></dd>
+<dd>[c:good c:deck](#c:good c:deck) <small>(Any deck with comments containing the words good and deck)</small></dd>
+<dd>[c:"good deck"](#c:%22good deck%22) <small>(Any deck with comments containing the exact phrase "good deck")</small></dd>
+
 <dt>Deck Contents (Uses [card search expressions](#cardSearchSyntaxHelp)):</dt>
 <dd><a href="#[[plains]]">[[plains]]</a> <small>(Any deck that contains at least one card with "plains" in its name)</small></dd>
 <dd><a href="#[[t:legendary]]">[[t:legendary]]</a> <small>(Any deck that contains at least one legendary)</small></dd>
@@ -37,6 +47,6 @@ searches are case insensitive.
 <dd>[t:aggro OR o:control](#t:aggro OR o:control) <small>(Any deck filename that contains either aggro or control)</small></dd>
 
 <dt>Grouping:</dt>
-<dd><a href="#red -([[]]:100 or aggro)">red -([[]]:100 or aggro)</a> <small>(Any deck that has red in its filename but is not 100 cards or has aggro in its filename)</small></dd>
+<dd><a href="#red -([[]]:100 OR aggro)">red -([[]]:100 OR aggro)</a> <small>(Any deck that has red in its filename but is not 100 cards or has aggro in its filename)</small></dd>
 
-</dl>
+</dl>
\ No newline at end of file
diff --git a/cockatrice/resources/help/search.md b/cockatrice/resources/help/search.md
index 3b3f0cc93..fd0a12507 100644
--- a/cockatrice/resources/help/search.md
+++ b/cockatrice/resources/help/search.md
@@ -1,10 +1,12 @@
 @page search_syntax_help Search Syntax Help
 
 ## Search Syntax Help
------
+
 The search bar recognizes a set of special commands similar to some other card databases.<br>
 In this list of examples below, each entry has an explanation and can be clicked to test the query. Note that all searches are case insensitive.
+
 <dl>
+
 <dt>Name:</dt>
 <dd>[birds of paradise](#birds of paradise) <small>(Any card name containing the words birds, of, and paradise)</small></dd>
 <dd>["birds of paradise"](#%22birds of paradise%22) <small>(Any card name containing the exact phrase "birds of paradise")</small></dd>
@@ -49,20 +51,21 @@ In this list of examples below, each entry has an explanation and can be clicked
 
 <dt><u>E</u>dition:</dt>
 <dd>[set:lea](#set:lea) <small>(Cards that appear in Alpha, which has the set code LEA)</small></dd>
-<dd>[e:lea or e:leb](#e:lea or e:leb) <small>(Cards that appear in Alpha or Beta)</small></dd>
+<dd>[e:lea OR e:leb](#e:lea OR e:leb) <small>(Cards that appear in Alpha or Beta)</small></dd>
+<dd>[e&lt;8ED](#e<8ED) <small>(Cards that appear before 8th edition)</small></dd>
 
 <dt>Negate:</dt>
 <dd>[c:wu -c:m](#c:wu -c:m) <small>(Any card that is white or blue, but not multicolored)</small></dd>
 
 <dt>Branching:</dt>
-<dd>[t:sliver or o:changeling](#t:sliver or o:changeling) <small>(Any card that is either a sliver or has changeling)</small></dd>
+<dd>[t:sliver OR o:changeling](#t:sliver OR o:changeling) <small>(Any card that is either a sliver or has changeling)</small></dd>
 
 <dt>Grouping:</dt>
-<dd><a href="#t:angel -(angel or c:w)">t:angel -(angel or c:w)</a> <small>(Any angel that doesn't have angel in its name and isn't white)</small></dd>
+<dd><a href="#t:angel -(angel OR c:w)">t:angel -(angel OR c:w)</a> <small>(Any angel that doesn't have angel in its name and isn't white)</small></dd>
 
 <dt>Regular Expression:</dt>
 <dd>[/^fell/](#/^fell/) <small>(Any card name that begins with "fell")</small></dd>
 <dd>[o:/counter target .* spell/](#o:/counter target .* spell/) <small>(Any card text with "counter target *something* spell")</small></dd>
 <dd>[o:/for each .* and\/or .*/](#o:/for each .* and\/or .*/) <small>(/'s can be escaped with a \)</small></dd>
 
-</dl>
+</dl>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/circle_half_stroke.svg b/cockatrice/resources/icons/circle_half_stroke.svg
new file mode 100644
index 000000000..42e4dbca2
--- /dev/null
+++ b/cockatrice/resources/icons/circle_half_stroke.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M512 320C512 214 426 128 320 128L320 512C426 512 512 426 512 320zM64 320C64 178.6 178.6 64 320 64C461.4 64 576 178.6 576 320C576 461.4 461.4 576 320 576C178.6 576 64 461.4 64 320z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/dragon.svg b/cockatrice/resources/icons/dragon.svg
new file mode 100644
index 000000000..f45af39ef
--- /dev/null
+++ b/cockatrice/resources/icons/dragon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M352 188.5L300.1 175.5C293.6 173.9 288.8 168.4 288.1 161.7C287.4 155 290.9 148.6 296.8 145.6L337.6 125.2L294.3 92.7C288.8 88.6 286.5 81.4 288.7 74.8C290.9 68.2 297.1 64 304 64L464 64C494.2 64 522.7 78.2 540.8 102.4L598.4 179.2C604.6 187.5 608 197.6 608 208C608 234.5 586.5 256 560 256L538.5 256C521.5 256 505.2 249.3 493.2 237.3L479.9 224L447.9 224L447.9 245.5C447.9 270.3 460.7 293.4 481.7 306.6L588.3 373.2C620.4 393.3 639.9 428.4 639.9 466.3C639.9 526.9 590.8 576.1 530.1 576.1L32.3 576C29 576 25.7 575.6 22.7 574.6C13.5 571.8 6 565 2.3 556C1 552.7 .1 549.1 0 545.3C-.2 541.6 .3 538 1.3 534.6C4.1 525.4 10.9 517.9 19.9 514.2C22.9 513 26.1 512.2 29.4 512L433.3 476C441.6 475.3 448 468.3 448 459.9C448 455.6 446.3 451.5 443.3 448.5L398.9 404.1C368.9 374.1 352 333.4 352 291L352 188.5zM512 136.3C512 136.2 512 136.1 512 136C512 135.9 512 135.8 512 135.7L512 136.3zM510.7 143.7L464.3 132.1C464.1 133.4 464 134.7 464 136C464 149.3 474.7 160 488 160C498.6 160 507.5 153.2 510.7 143.7zM130.9 180.5C147.2 166 171.3 164.3 189.4 176.4L320 263.4L320 290.9C320 323.7 328.4 355.7 344 383.9L112 383.9C105.3 383.9 99.3 379.7 97 373.5C94.7 367.3 96.5 360.2 101.6 355.8L171 296.3L18.4 319.8C11.4 320.9 4.5 317.2 1.5 310.8C-1.5 304.4 .1 296.8 5.4 292L130.9 180.5z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/filter.svg b/cockatrice/resources/icons/filter.svg
new file mode 100644
index 000000000..d53d9ba29
--- /dev/null
+++ b/cockatrice/resources/icons/filter.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg fill="#000000" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg"
+     width="800px" height="800px" viewBox="0 0 971.986 971.986"
+     xml:space="preserve">
+<g>
+	<path d="M370.216,459.3c10.2,11.1,15.8,25.6,15.8,40.6v442c0,26.601,32.1,40.101,51.1,21.4l123.3-141.3
+		c16.5-19.8,25.6-29.601,25.6-49.2V500c0-15,5.7-29.5,15.8-40.601L955.615,75.5c26.5-28.8,6.101-75.5-33.1-75.5h-873
+		c-39.2,0-59.7,46.6-33.1,75.5L370.216,459.3z"/>
+</g>
+</svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/floppy_disk.svg b/cockatrice/resources/icons/floppy_disk.svg
new file mode 100644
index 000000000..3c5b5054d
--- /dev/null
+++ b/cockatrice/resources/icons/floppy_disk.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M160 96C124.7 96 96 124.7 96 160L96 480C96 515.3 124.7 544 160 544L480 544C515.3 544 544 515.3 544 480L544 237.3C544 220.3 537.3 204 525.3 192L448 114.7C436 102.7 419.7 96 402.7 96L160 96zM192 192C192 174.3 206.3 160 224 160L384 160C401.7 160 416 174.3 416 192L416 256C416 273.7 401.7 288 384 288L224 288C206.3 288 192 273.7 192 256L192 192zM320 352C355.3 352 384 380.7 384 416C384 451.3 355.3 480 320 480C284.7 480 256 451.3 256 416C256 380.7 284.7 352 320 352z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/gear.svg b/cockatrice/resources/icons/gear.svg
new file mode 100644
index 000000000..fdee3a297
--- /dev/null
+++ b/cockatrice/resources/icons/gear.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M259.1 73.5C262.1 58.7 275.2 48 290.4 48L350.2 48C365.4 48 378.5 58.7 381.5 73.5L396 143.5C410.1 149.5 423.3 157.2 435.3 166.3L503.1 143.8C517.5 139 533.3 145 540.9 158.2L570.8 210C578.4 223.2 575.7 239.8 564.3 249.9L511 297.3C511.9 304.7 512.3 312.3 512.3 320C512.3 327.7 511.8 335.3 511 342.7L564.4 390.2C575.8 400.3 578.4 417 570.9 430.1L541 481.9C533.4 495 517.6 501.1 503.2 496.3L435.4 473.8C423.3 482.9 410.1 490.5 396.1 496.6L381.7 566.5C378.6 581.4 365.5 592 350.4 592L290.6 592C275.4 592 262.3 581.3 259.3 566.5L244.9 496.6C230.8 490.6 217.7 482.9 205.6 473.8L137.5 496.3C123.1 501.1 107.3 495.1 99.7 481.9L69.8 430.1C62.2 416.9 64.9 400.3 76.3 390.2L129.7 342.7C128.8 335.3 128.4 327.7 128.4 320C128.4 312.3 128.9 304.7 129.7 297.3L76.3 249.8C64.9 239.7 62.3 223 69.8 209.9L99.7 158.1C107.3 144.9 123.1 138.9 137.5 143.7L205.3 166.2C217.4 157.1 230.6 149.5 244.6 143.4L259.1 73.5zM320.3 400C364.5 399.8 400.2 363.9 400 319.7C399.8 275.5 363.9 239.8 319.7 240C275.5 240.2 239.8 276.1 240 320.3C240.2 364.5 276.1 400.2 320.3 400z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/mana/C.svg b/cockatrice/resources/icons/mana/C.svg
new file mode 100644
index 000000000..eb09fb872
--- /dev/null
+++ b/cockatrice/resources/icons/mana/C.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="169.33115mm"
+   height="169.59981mm"
+   viewBox="0 0 169.33115 169.59981"
+   version="1.1"
+   id="svg1"
+   inkscape:export-filename="C.svg"
+   inkscape:export-xdpi="96.000015"
+   inkscape:export-ydpi="96.000015"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   sodipodi:docname="colorless.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="0.71535494"
+     inkscape:cx="397.00572"
+     inkscape:cy="536.09751"
+     inkscape:window-width="1853"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:page
+       x="0"
+       y="0"
+       width="169.33115"
+       height="169.59981"
+       id="page2"
+       margin="0"
+       bleed="0" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-20.334425,-63.700102)">
+    <ellipse
+       style="fill:#cccccc;stroke:#000000;stroke-width:0.165333;stroke-linecap:round"
+       id="path1"
+       cx="-30.617094"
+       cy="179.22736"
+       transform="matrix(0.70654605,-0.70766707,0.70654608,0.70766704,0,0)"
+       rx="84.650612"
+       ry="84.65062" />
+    <rect
+       style="fill:none;stroke:#000000;stroke-width:14.5003;stroke-linecap:round;stroke-linejoin:bevel;stroke-dasharray:none"
+       id="rect1"
+       width="84.683701"
+       height="84.683769"
+       x="-221.60611"
+       y="-73.174698"
+       ry="0.084683768"
+       transform="matrix(-0.7073973,-0.70681615,0.7073973,-0.70681615,0,0)" />
+  </g>
+</svg>
diff --git a/cockatrice/resources/icons/pen_to_square.svg b/cockatrice/resources/icons/pen_to_square.svg
new file mode 100644
index 000000000..60ff1d9c4
--- /dev/null
+++ b/cockatrice/resources/icons/pen_to_square.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M535.6 85.7C513.7 63.8 478.3 63.8 456.4 85.7L432 110.1L529.9 208L554.3 183.6C576.2 161.7 576.2 126.3 554.3 104.4L535.6 85.7zM236.4 305.7C230.3 311.8 225.6 319.3 222.9 327.6L193.3 416.4C190.4 425 192.7 434.5 199.1 441C205.5 447.5 215 449.7 223.7 446.8L312.5 417.2C320.7 414.5 328.2 409.8 334.4 403.7L496 241.9L398.1 144L236.4 305.7zM160 128C107 128 64 171 64 224L64 480C64 533 107 576 160 576L416 576C469 576 512 533 512 480L512 384C512 366.3 497.7 352 480 352C462.3 352 448 366.3 448 384L448 480C448 497.7 433.7 512 416 512L160 512C142.3 512 128 497.7 128 480L128 224C128 206.3 142.3 192 160 192L256 192C273.7 192 288 177.7 288 160C288 142.3 273.7 128 256 128L160 128z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/scale_balanced.svg b/cockatrice/resources/icons/scale_balanced.svg
new file mode 100644
index 000000000..fae468d38
--- /dev/null
+++ b/cockatrice/resources/icons/scale_balanced.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M384 96L512 96C529.7 96 544 110.3 544 128C544 145.7 529.7 160 512 160L398.4 160C393.2 185.8 375.5 207.1 352 217.3L352 512L512 512C529.7 512 544 526.3 544 544C544 561.7 529.7 576 512 576L128 576C110.3 576 96 561.7 96 544C96 526.3 110.3 512 128 512L288 512L288 217.3C264.5 207 246.8 185.7 241.6 160L128 160C110.3 160 96 145.7 96 128C96 110.3 110.3 96 128 96L256 96C270.6 76.6 293.8 64 320 64C346.2 64 369.4 76.6 384 96zM439.6 384L584.4 384L512 259.8L439.6 384zM512 480C449.1 480 396.8 446 386 401.1C383.4 390.1 387 378.8 392.7 369L487.9 205.8C492.9 197.2 502.1 192 512 192C521.9 192 531.1 197.3 536.1 205.8L631.3 369C637 378.8 640.6 390.1 638 401.1C627.2 445.9 574.9 480 512 480zM126.8 259.8L54.4 384L199.3 384L126.8 259.8zM.9 401.1C-1.7 390.1 1.9 378.8 7.6 369L102.8 205.8C107.8 197.2 117 192 126.9 192C136.8 192 146 197.3 151 205.8L246.2 369C251.9 378.8 255.5 390.1 252.9 401.1C242.1 445.9 189.8 480 126.9 480C64 480 11.7 446 .9 401.1z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/scroll.svg b/cockatrice/resources/icons/scroll.svg
new file mode 100644
index 000000000..f4828e679
--- /dev/null
+++ b/cockatrice/resources/icons/scroll.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M32 176C32 134.5 63.6 100.4 104 96.4L104 96L384 96C437 96 480 139 480 192L480 368L304 368C264.2 368 232 400.2 232 440L232 500C232 524.3 212.3 544 188 544C163.7 544 144 524.3 144 500L144 272L80 272C53.5 272 32 250.5 32 224L32 176zM268.8 544C275.9 530.9 280 515.9 280 500L280 440C280 426.7 290.7 416 304 416L552 416C565.3 416 576 426.7 576 440L576 464C576 508.2 540.2 544 496 544L268.8 544zM112 144C94.3 144 80 158.3 80 176L80 224L144 224L144 176C144 158.3 129.7 144 112 144z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/icons/sort_arrow_down.svg b/cockatrice/resources/icons/sort_arrow_down.svg
new file mode 100644
index 000000000..adf10f9f0
--- /dev/null
+++ b/cockatrice/resources/icons/sort_arrow_down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640"><!--!Font Awesome Free 7.1.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2026 Fonticons, Inc.--><path d="M278.6 438.6L182.6 534.6C170.1 547.1 149.8 547.1 137.3 534.6L41.3 438.6C28.8 426.1 28.8 405.8 41.3 393.3C53.8 380.8 74.1 380.8 86.6 393.3L128 434.7L128 128C128 110.3 142.3 96 160 96C177.7 96 192 110.3 192 128L192 434.7L233.4 393.3C245.9 380.8 266.2 380.8 278.7 393.3C291.2 405.8 291.2 426.1 278.7 438.6zM352 544C334.3 544 320 529.7 320 512C320 494.3 334.3 480 352 480L384 480C401.7 480 416 494.3 416 512C416 529.7 401.7 544 384 544L352 544zM352 416C334.3 416 320 401.7 320 384C320 366.3 334.3 352 352 352L448 352C465.7 352 480 366.3 480 384C480 401.7 465.7 416 448 416L352 416zM352 288C334.3 288 320 273.7 320 256C320 238.3 334.3 224 352 224L512 224C529.7 224 544 238.3 544 256C544 273.7 529.7 288 512 288L352 288zM352 160C334.3 160 320 145.7 320 128C320 110.3 334.3 96 352 96L576 96C593.7 96 608 110.3 608 128C608 145.7 593.7 160 576 160L352 160z"/></svg>
\ No newline at end of file
diff --git a/cockatrice/resources/usericons/pawn_dev_double.svg b/cockatrice/resources/usericons/pawn_dev_double.svg
new file mode 100644
index 000000000..57ed5c2da
--- /dev/null
+++ b/cockatrice/resources/usericons/pawn_dev_double.svg
@@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+  width="100"
+  height="100"
+  id="svg5322"
+  version="1.1"
+  inkscape:version="1.4.2 (ebf0e940, 2025-05-08)"
+  sodipodi:docname="pawn_dev_double.svg"
+  xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+  xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns="http://www.w3.org/2000/svg"
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns:cc="http://creativecommons.org/ns#"
+  xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+    id="defs3">
+    <inkscape:perspective
+      sodipodi:type="inkscape:persp3d"
+      inkscape:vp_x="0 : 526.18109 : 1"
+      inkscape:vp_y="0 : 1000 : 0"
+      inkscape:vp_z="744.09448 : 526.18109 : 1"
+      inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+      id="perspective5328"/>
+    <inkscape:perspective
+      id="perspective5305"
+      inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+      inkscape:vp_z="1 : 0.5 : 1"
+      inkscape:vp_y="0 : 1000 : 0"
+      inkscape:vp_x="0 : 0.5 : 1"
+      sodipodi:type="inkscape:persp3d"/>
+    <linearGradient
+      id="linearGradient5181">
+      <stop
+        style="stop-color:#0fbb00;stop-opacity:1;"
+        offset="0"
+        id="stop5183"/>
+      <stop
+        style="stop-color:#064400;stop-opacity:1;"
+        offset="1"
+        id="stop5185"/>
+    </linearGradient>
+    <radialGradient
+      inkscape:collect="always"
+      xlink:href="#linearGradient3600-2"
+      id="radialGradient3606-7"
+      cx="324.32715"
+      cy="131.40274"
+      fx="324.32715"
+      fy="131.40274"
+      r="25.501276"
+      gradientUnits="userSpaceOnUse"
+      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"/>
+    <linearGradient
+      id="linearGradient3600-2">
+      <stop
+        style="stop-color:#ffc33d;stop-opacity:1;"
+        offset="0"
+        id="stop3602-4"/>
+      <stop
+        style="stop-color:#e09900;stop-opacity:1;"
+        offset="1"
+        id="stop3604-9"/>
+    </linearGradient>
+    <inkscape:perspective
+      id="perspective5478"
+      inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+      inkscape:vp_z="1 : 0.5 : 1"
+      inkscape:vp_y="0 : 1000 : 0"
+      inkscape:vp_x="0 : 0.5 : 1"
+      sodipodi:type="inkscape:persp3d"/>
+    <linearGradient
+      id="linearGradient5189">
+      <stop
+        style="stop-color:#000ec9;stop-opacity:1;"
+        offset="0"
+        id="stop5191"/>
+      <stop
+        style="stop-color:#000657;stop-opacity:1;"
+        offset="1"
+        id="stop5193"/>
+    </linearGradient>
+    <radialGradient
+      inkscape:collect="always"
+      xlink:href="#linearGradient3600-4"
+      id="radialGradient3606-1"
+      cx="324.32715"
+      cy="131.40274"
+      fx="324.32715"
+      fy="131.40274"
+      r="25.501276"
+      gradientUnits="userSpaceOnUse"
+      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"/>
+    <linearGradient
+      id="linearGradient3600-4">
+      <stop
+        style="stop-color:#ffc33d;stop-opacity:1;"
+        offset="0"
+        id="stop3602-3"/>
+      <stop
+        style="stop-color:#e09900;stop-opacity:1;"
+        offset="1"
+        id="stop3604-5"/>
+    </linearGradient>
+    <inkscape:perspective
+      id="perspective5559"
+      inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+      inkscape:vp_z="1 : 0.5 : 1"
+      inkscape:vp_y="0 : 1000 : 0"
+      inkscape:vp_x="0 : 0.5 : 1"
+      sodipodi:type="inkscape:persp3d"/>
+    <linearGradient
+      inkscape:collect="always"
+      xlink:href="#linearGradient5173"
+      id="linearGradient5179"
+      x1="167.33386"
+      y1="178.83276"
+      x2="244.78181"
+      y2="178.83276"
+      gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+      id="linearGradient5173">
+      <stop
+        style="stop-color:#f50000;stop-opacity:1;"
+        offset="0"
+        id="stop5175"/>
+      <stop
+        style="stop-color:#950000;stop-opacity:1;"
+        offset="1"
+        id="stop5177"/>
+    </linearGradient>
+    <radialGradient
+      inkscape:collect="always"
+      xlink:href="#linearGradient3600"
+      id="radialGradient5169"
+      gradientUnits="userSpaceOnUse"
+      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+      cx="324.32715"
+      cy="131.40274"
+      fx="324.32715"
+      fy="131.40274"
+      r="25.501276"/>
+    <linearGradient
+      id="linearGradient3600">
+      <stop
+        style="stop-color:#ffc13d;stop-opacity:1;"
+        offset="0"
+        id="stop3602"/>
+      <stop
+        style="stop-color:#e09900;stop-opacity:1;"
+        offset="1"
+        id="stop3604"/>
+    </linearGradient>
+    <radialGradient
+      r="25.501276"
+      fy="131.40274"
+      fx="324.32715"
+      cy="131.40274"
+      cx="324.32715"
+      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+      gradientUnits="userSpaceOnUse"
+      id="radialGradient5574"
+      xlink:href="#linearGradient3600"
+      inkscape:collect="always"/>
+    <inkscape:perspective
+      id="perspective5663"
+      inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+      inkscape:vp_z="1 : 0.5 : 1"
+      inkscape:vp_y="0 : 1000 : 0"
+      inkscape:vp_x="0 : 0.5 : 1"
+      sodipodi:type="inkscape:persp3d"/>
+    <radialGradient
+      inkscape:collect="always"
+      xlink:href="#linearGradient3600-7"
+      id="radialGradient3606-8"
+      cx="324.32715"
+      cy="131.40274"
+      fx="324.32715"
+      fy="131.40274"
+      r="25.501276"
+      gradientUnits="userSpaceOnUse"
+      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"/>
+    <linearGradient
+      id="linearGradient3600-7">
+      <stop
+        style="stop-color:#ffc13d;stop-opacity:1;"
+        offset="0"
+        id="stop3602-7"/>
+      <stop
+        style="stop-color:#e09900;stop-opacity:1;"
+        offset="1"
+        id="stop3604-6"/>
+    </linearGradient>
+    <radialGradient
+      inkscape:collect="always"
+      xlink:href="#linearGradient3600-7"
+      id="radialGradient5254"
+      gradientUnits="userSpaceOnUse"
+      gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+      cx="324.32715"
+      cy="131.40274"
+      fx="324.32715"
+      fy="131.40274"
+      r="25.501276"/>
+    <linearGradient
+      inkscape:collect="always"
+      xlink:href="#linearGradient5189-1"
+      id="linearGradient5394"
+      gradientUnits="userSpaceOnUse"
+      x1="385.03503"
+      y1="180.09546"
+      x2="462.48297"
+      y2="180.09546"
+      gradientTransform="matrix(0.96839241,0,0,0.96839241,-360.365,847.52359)"/>
+    <linearGradient
+      id="linearGradient5189-1">
+      <stop
+        style="stop-color:#000ec9;stop-opacity:1;"
+        offset="0"
+        id="stop5191-0"/>
+      <stop
+        style="stop-color:#000657;stop-opacity:1;"
+        offset="1"
+        id="stop5193-4"/>
+    </linearGradient>
+    <linearGradient
+      inkscape:collect="always"
+      xlink:href="#linearGradient5173-1"
+      id="linearGradient5581"
+      gradientUnits="userSpaceOnUse"
+      x1="167.33386"
+      y1="178.83276"
+      x2="244.78181"
+      y2="178.83276"
+      gradientTransform="matrix(0.96839241,0,0,0.96839241,-149.54484,848.74636)"/>
+    <linearGradient
+      id="linearGradient5173-1">
+      <stop
+        style="stop-color:#f50000;stop-opacity:1;"
+        offset="0"
+        id="stop5175-5"/>
+      <stop
+        style="stop-color:#950000;stop-opacity:1;"
+        offset="1"
+        id="stop5177-3"/>
+    </linearGradient>
+    <linearGradient
+      inkscape:collect="always"
+      xlink:href="#linearGradient5181-9"
+      id="linearGradient5782"
+      gradientUnits="userSpaceOnUse"
+      x1="282.50455"
+      y1="181.61069"
+      x2="359.95248"
+      y2="181.61069"
+      gradientTransform="matrix(0.96839241,0,0,0.96839241,-261.07526,846.05625)"/>
+    <linearGradient
+      id="linearGradient5181-9">
+      <stop
+        style="stop-color:#80d600;stop-opacity:1;"
+        offset="0"
+        id="stop5183-3"/>
+      <stop
+        style="stop-color:#80d600;stop-opacity:1;"
+        offset="1"
+        id="stop5185-0"/>
+    </linearGradient>
+    <linearGradient
+      y2="181.61069"
+      x2="359.95248"
+      y1="181.61069"
+      x1="282.50455"
+      gradientTransform="matrix(0.96839241,0,0,0.96839241,-175.71812,893.2775)"
+      gradientUnits="userSpaceOnUse"
+      id="linearGradient5799"
+      xlink:href="#linearGradient5181-9"
+      inkscape:collect="always"/>
+  </defs>
+  <sodipodi:namedview
+    inkscape:document-units="mm"
+    id="base"
+    pagecolor="#ffffff"
+    bordercolor="#666666"
+    borderopacity="1.0"
+    inkscape:pageopacity="0.0"
+    inkscape:pageshadow="2"
+    inkscape:zoom="6.0735294"
+    inkscape:cx="53.757869"
+    inkscape:cy="53.840194"
+    inkscape:current-layer="layer1"
+    showgrid="false"
+    inkscape:window-width="1696"
+    inkscape:window-height="1051"
+    inkscape:window-x="98"
+    inkscape:window-y="1118"
+    inkscape:window-maximized="1"
+    inkscape:showpageshadow="2"
+    inkscape:pagecheckerboard="0"
+    inkscape:deskcolor="#d1d1d1"
+    showguides="true">
+    <sodipodi:guide
+      position="49.829627,61.114263"
+      orientation="1,0"
+      id="guide1"
+      inkscape:locked="false"/>
+  </sodipodi:namedview>
+  <metadata
+    id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+        rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+          rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+    inkscape:label="Layer 1"
+    inkscape:groupmode="layer"
+    id="layer1"
+    transform="translate(0,-952.36218)">
+    <path
+      style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+      d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
+      transform="translate(0,952.36218)"
+      id="left"/>
+    <path
+      style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+      d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
+      id="right"
+      inkscape:connector-curvature="0"/>
+    <path
+      d="m 478.409,116.617 c -0.368,-4.271 -3.181,-7.94 -7.2,-9.403 -4.029,-1.472 -8.539,-0.47 -11.57,2.556 l -62.015,62.011 -68.749,-21.768 -21.768,-68.748 62.016,-62.016 c 3.035,-3.032 4.025,-7.543 2.563,-11.565 -1.477,-4.03 -5.137,-6.837 -9.417,-7.207 -37.663,-3.245 -74.566,10.202 -101.247,36.887 -36.542,36.545 -46.219,89.911 -29.083,135.399 -1.873,1.578 -3.721,3.25 -5.544,5.053 L 19.386,373.152 c -0.073,0.071 -0.145,0.149 -0.224,0.219 -24.345,24.346 -24.345,63.959 0,88.309 24.349,24.344 63.672,24.048 88.013,-0.298 0.105,-0.098 0.201,-0.196 0.297,-0.305 L 301.104,252.456 c 1.765,-1.773 3.404,-3.628 4.949,-5.532 45.5,17.167 98.9,7.513 135.474,-29.056 26.675,-26.687 40.131,-63.593 36.882,-101.251 z M 75.98,435.38 c -8.971,8.969 -23.5,8.963 -32.47,0 -8.967,-8.961 -8.967,-23.502 0,-32.466 8.97,-8.963 23.499,-8.963 32.47,0 8.967,8.964 8.967,23.505 0,32.466 z"
+      id="path1"
+      style="display:inline;fill:#A1A1A1;stroke-width:9.87059588;stroke-dasharray:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+      transform="matrix(0.19145387,0,0,0.19145387,4.0816072,956.99677)"
+      inkscape:label="wrench" />
+  </g>
+</svg>
diff --git a/cockatrice/resources/usericons/pawn_dev_single.svg b/cockatrice/resources/usericons/pawn_dev_single.svg
new file mode 100644
index 000000000..f7c4e7018
--- /dev/null
+++ b/cockatrice/resources/usericons/pawn_dev_single.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+  width="100"
+  height="100"
+  id="svg5322"
+  version="1.1"
+  inkscape:version="1.4.2 (ebf0e940, 2025-05-08)"
+  sodipodi:docname="pawn_dev_single.svg"
+  xml:space="preserve"
+  xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+  xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns="http://www.w3.org/2000/svg"
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns:cc="http://creativecommons.org/ns#"
+  xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
+     id="defs3"><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective5328" /><inkscape:perspective
+       id="perspective5305"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" /><linearGradient
+       id="linearGradient5181"><stop
+         style="stop-color:#0fbb00;stop-opacity:1;"
+         offset="0"
+         id="stop5183" /><stop
+         style="stop-color:#064400;stop-opacity:1;"
+         offset="1"
+         id="stop5185" /></linearGradient><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-2"
+       id="radialGradient3606-7"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
+       id="linearGradient3600-2"><stop
+         style="stop-color:#ffc33d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-4" /><stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-9" /></linearGradient><inkscape:perspective
+       id="perspective5478"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" /><linearGradient
+       id="linearGradient5189"><stop
+         style="stop-color:#000ec9;stop-opacity:1;"
+         offset="0"
+         id="stop5191" /><stop
+         style="stop-color:#000657;stop-opacity:1;"
+         offset="1"
+         id="stop5193" /></linearGradient><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-4"
+       id="radialGradient3606-1"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
+       id="linearGradient3600-4"><stop
+         style="stop-color:#ffc33d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-3" /><stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-5" /></linearGradient><inkscape:perspective
+       id="perspective5559"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5173"
+       id="linearGradient5179"
+       x1="167.33386"
+       y1="178.83276"
+       x2="244.78181"
+       y2="178.83276"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       id="linearGradient5173"><stop
+         style="stop-color:#f50000;stop-opacity:1;"
+         offset="0"
+         id="stop5175" /><stop
+         style="stop-color:#950000;stop-opacity:1;"
+         offset="1"
+         id="stop5177" /></linearGradient><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="radialGradient5169"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276" /><linearGradient
+       id="linearGradient3600"><stop
+         style="stop-color:#ffc13d;stop-opacity:1;"
+         offset="0"
+         id="stop3602" /><stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604" /></linearGradient><radialGradient
+       r="25.501276"
+       fy="131.40274"
+       fx="324.32715"
+       cy="131.40274"
+       cx="324.32715"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5574"
+       xlink:href="#linearGradient3600"
+       inkscape:collect="always" /><inkscape:perspective
+       id="perspective5663"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-7"
+       id="radialGradient3606-8"
+       cx="324.32715"
+       cy="131.40274"
+       fx="324.32715"
+       fy="131.40274"
+       r="25.501276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)" /><linearGradient
+       id="linearGradient3600-7"><stop
+         style="stop-color:#ffc13d;stop-opacity:1;"
+         offset="0"
+         id="stop3602-7" /><stop
+         style="stop-color:#e09900;stop-opacity:1;"
+         offset="1"
+         id="stop3604-6" /></linearGradient><radialGradient
+       r="25.501276"
+       fy="131.40274"
+       fx="324.32715"
+       cy="131.40274"
+       cx="324.32715"
+       gradientTransform="matrix(0.92332021,0.38403097,-0.41592401,1.0000002,78.192026,-120.05314)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5676"
+       xlink:href="#linearGradient3600-7"
+       inkscape:collect="always" /></defs><sodipodi:namedview
+     inkscape:document-units="mm"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.1582091"
+     inkscape:cx="104.64791"
+     inkscape:cy="56.04442"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1027"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showguides="true"><sodipodi:guide
+       position="50.002551,111.99556"
+       orientation="1,0"
+       id="guide3"
+       inkscape:locked="false" /></sodipodi:namedview><metadata
+     id="metadata4"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-952.36218)"
+     style="display:inline">
+    <path
+   style="display:inline;opacity:1;fill-opacity:1;stroke:#000000;stroke-width:2.7822;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d="M 49.84375,1.71875 C 36.719738,1.71875 26.0625,12.375988 26.0625,25.5 c 0,7.477454 3.475825,14.112734 8.875,18.46875 -10.497549,5.974948 -17.018351,18.227376 -20.625,31.6875 -5.2744126,19.6844 15.911513,22.5625 35.53125,22.5625 19.619736,0 40.705577,-3.2516 35.53125,-22.5625 C 81.693381,61.916246 75.224585,49.827177 64.8125,43.9375 70.181573,39.580662 73.59375,32.953205 73.59375,25.5 c 0,-13.124012 -10.625988,-23.78125 -23.75,-23.78125 z"
+   id="left"
+   sodipodi:insensitive="true"
+   transform="translate(0,952.36218)" />
+    <path
+   d="m 478.409,116.617 c -0.368,-4.271 -3.181,-7.94 -7.2,-9.403 -4.029,-1.472 -8.539,-0.47 -11.57,2.556 l -62.015,62.011 -68.749,-21.768 -21.768,-68.748 62.016,-62.016 c 3.035,-3.032 4.025,-7.543 2.563,-11.565 -1.477,-4.03 -5.137,-6.837 -9.417,-7.207 -37.663,-3.245 -74.566,10.202 -101.247,36.887 -36.542,36.545 -46.219,89.911 -29.083,135.399 -1.873,1.578 -3.721,3.25 -5.544,5.053 L 19.386,373.152 c -0.073,0.071 -0.145,0.149 -0.224,0.219 -24.345,24.346 -24.345,63.959 0,88.309 24.349,24.344 63.672,24.048 88.013,-0.298 0.105,-0.098 0.201,-0.196 0.297,-0.305 L 301.104,252.456 c 1.765,-1.773 3.404,-3.628 4.949,-5.532 45.5,17.167 98.9,7.513 135.474,-29.056 26.675,-26.687 40.131,-63.593 36.882,-101.251 z M 75.98,435.38 c -8.971,8.969 -23.5,8.963 -32.47,0 -8.967,-8.961 -8.967,-23.502 0,-32.466 8.97,-8.963 23.499,-8.963 32.47,0 8.967,8.964 8.967,23.505 0,32.466 z"
+   id="path1"
+   style="display:inline;fill:#A1A1A1;stroke-width:9.87059588;stroke-dasharray:none;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+   transform="matrix(0.19145387,0,0,0.19145387,4.0816072,956.99677)"
+   inkscape:label="wrench" /></g></svg>
diff --git a/cockatrice/resources/usericons/pawn_donator_double.svg b/cockatrice/resources/usericons/pawn_donator_double.svg
index f0dba08b2..30b353652 100644
--- a/cockatrice/resources/usericons/pawn_donator_double.svg
+++ b/cockatrice/resources/usericons/pawn_donator_double.svg
@@ -350,11 +350,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="right" />
+       id="left" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="left"
+       id="right"
        inkscape:connector-curvature="0" />
     <path
        style="display:inline;fill:url(#linearGradient3);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.77952756;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
diff --git a/cockatrice/resources/usericons/pawn_judge_double.svg b/cockatrice/resources/usericons/pawn_judge_double.svg
index e929f6490..97c31f73c 100644
--- a/cockatrice/resources/usericons/pawn_judge_double.svg
+++ b/cockatrice/resources/usericons/pawn_judge_double.svg
@@ -321,11 +321,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="right" />
+       id="left" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="left"
+       id="right"
        inkscape:connector-curvature="0" />
     <path
        d="m 46.656521,12.167234 18.055171,18.054184 a 6.6081919,6.6078288 0 0 1 -0.126303,9.352065 6.6804126,6.6800456 0 0 1 -8.233169,1.011048 l -7.944268,7.943843 6.463762,6.445343 a 6.9331851,6.9328042 0 0 1 5.741536,2.022073 l 28.057729,28.092294 a 6.9962797,6.9958953 0 0 1 -9.894222,9.893685 L 50.719018,66.907526 A 7.0595711,7.0591833 0 0 1 49.18433,59.270613 l -5.741527,-5.741238 -7.944298,7.943843 A 6.716523,6.7161541 0 0 1 25.134866,69.832263 L 7.079684,51.778091 a 6.716523,6.7161541 0 0 1 8.39566,-10.345064 L 36.31101,20.59853 a 6.716523,6.7161541 0 0 1 10.345612,-8.431329 z"
diff --git a/cockatrice/resources/usericons/pawn_vip_double.svg b/cockatrice/resources/usericons/pawn_vip_double.svg
index b8c94387b..89cf0026b 100644
--- a/cockatrice/resources/usericons/pawn_vip_double.svg
+++ b/cockatrice/resources/usericons/pawn_vip_double.svg
@@ -340,11 +340,11 @@
        style="fill-opacity:1;stroke:black;stroke-width:2.78220296;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 49.84375 1.71875 C 36.719738 1.71875 26.0625 12.375988 26.0625 25.5 C 26.0625 32.977454 29.538325 39.612734 34.9375 43.96875 C 24.439951 49.943698 17.919149 62.196126 14.3125 75.65625 C 9.0380874 95.34065 30.224013 98.21875 49.84375 98.21875 C 69.463486 98.21875 90.549327 94.96715 85.375 75.65625 C 81.693381 61.916246 75.224585 49.827177 64.8125 43.9375 C 70.181573 39.580662 73.59375 32.953205 73.59375 25.5 C 73.59375 12.375988 62.967762 1.71875 49.84375 1.71875 z "
        transform="translate(0,952.36218)"
-       id="right" />
+       id="left" />
     <path
        style="opacity:1;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.73577702;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 51.28696,1001.834 0,-46.98372 1.434151,0.16768 c 5.155008,0.60274 9.462857,2.72154 12.938257,6.36366 4.74393,4.9715 6.87913,11.35611 6.16464,18.43328 -0.53702,5.31935 -3.09008,10.59498 -6.83833,14.13074 l -1.94072,1.83069 3.04083,2.20427 c 3.58084,2.5957 7.18975,6.4912 9.55296,10.3116 4.89572,7.9144 9.23593,21.4918 8.50487,26.6055 -0.81312,5.6877 -5.43872,9.6977 -13.62216,11.8093 -3.80822,0.9826 -7.68056,1.4713 -14.763321,1.8633 l -4.471177,0.2474 0,-46.9837 z"
-       id="left"
+       id="right"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:type="star"
diff --git a/cockatrice/src/client/lag_monitor.cpp b/cockatrice/src/client/lag_monitor.cpp
new file mode 100644
index 000000000..6b72087ec
--- /dev/null
+++ b/cockatrice/src/client/lag_monitor.cpp
@@ -0,0 +1,66 @@
+#include "lag_monitor.h"
+
+#include <QApplication>
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QEvent>
+#include <QMessageLogger>
+#include <QTimer>
+
+LagMonitor::LagMonitor(QObject *parent) : QObject(parent)
+{
+    qApp->installEventFilter(this);
+
+    timer = new QTimer(this);
+    timer->setInterval(TICK_INTERVAL_MS);
+    connect(timer, &QTimer::timeout, this, &LagMonitor::checkTick);
+    tickClock.start();
+    timer->start();
+}
+
+QList<LagMonitor::StallRecord> LagMonitor::recentStalls() const
+{
+    return stalls;
+}
+
+void LagMonitor::clearStalls()
+{
+    stalls.clear();
+}
+
+bool LagMonitor::eventFilter(QObject *obj, QEvent *event)
+{
+    if (event->type() == QEvent::ApplicationStateChange) {
+        // The transition may span a suspend or an arbitrary unfocused period;
+        // discard the gap so it cannot be mistaken for a stall.
+        tickClock.restart();
+    }
+    return QObject::eventFilter(obj, event);
+}
+
+void LagMonitor::checkTick()
+{
+    recordGap(tickClock.restart());
+}
+
+void LagMonitor::recordGap(qint64 gapMs)
+{
+    if (gapMs <= STALL_THRESHOLD_MS) {
+        return;
+    }
+
+    if (gapMs > MAX_PLAUSIBLE_STALL_MS) {
+        qCDebug(LagMonitorLog, "Ignoring implausible %lld ms gap (likely suspend)", static_cast<long long>(gapMs));
+        return;
+    }
+
+    const StallRecord record{.timestampMsSinceEpoch = QDateTime::currentMSecsSinceEpoch(), .durationMs = gapMs};
+
+    stalls.append(record);
+    while (stalls.size() > MAX_RECORDED_STALLS) {
+        stalls.removeFirst();
+    }
+
+    qCWarning(LagMonitorLog, "Event loop stalled for %lld ms (threshold: %d ms)", static_cast<long long>(gapMs),
+              STALL_THRESHOLD_MS);
+}
diff --git a/cockatrice/src/client/lag_monitor.h b/cockatrice/src/client/lag_monitor.h
new file mode 100644
index 000000000..0bb98c25e
--- /dev/null
+++ b/cockatrice/src/client/lag_monitor.h
@@ -0,0 +1,87 @@
+/**
+ * @file lag_monitor.h
+ * @ingroup Client
+ */
+
+#ifndef LAG_MONITOR_H
+#define LAG_MONITOR_H
+
+#include <QElapsedTimer>
+#include <QList>
+#include <QLoggingCategory>
+#include <QObject>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+inline Q_LOGGING_CATEGORY(LagMonitorLog, "lag_monitor");
+
+class QTimer;
+
+/**
+ * @brief Detects main-thread event loop stalls ("UI freezes") from the inside.
+ *
+ * A timer is expected to fire every TICK_INTERVAL_MS of wall time. When the
+ * observed gap greatly exceeds that interval, some other task blocked the
+ * event loop for roughly the overshooting duration. This is what separates
+ * "my client froze" from "the network is lagging" in user reports.
+ *
+ * Gaps that span an application state change (suspend, minimize, focus
+ * loss) are discarded, and implausibly huge gaps are dropped, so operating
+ * system power events do not fabricate stalls. This handling is load-bearing
+ * on Windows, where the monotonic clock used by Qt counts sleep time.
+ *
+ * Healthy operation costs one timer wakeup per tick and two integer
+ * comparisons. Allocations happen only when a stall is actually recorded.
+ */
+class LagMonitor : public QObject
+{
+    Q_OBJECT
+
+public:
+    struct StallRecord
+    {
+        qint64 timestampMsSinceEpoch = 0; ///< when the stalled period ended
+        qint64 durationMs = 0; ///< approximate length of the freeze; measured tick to tick, so it can exceed the true
+                               ///< stall by up to TICK_INTERVAL_MS
+    };
+
+    static constexpr int TICK_INTERVAL_MS = 500;
+    static constexpr int STALL_THRESHOLD_MS = 2000;
+    static constexpr int MAX_RECORDED_STALLS = 32;
+
+    /// Gaps beyond this are treated as suspend artifacts rather than stalls.
+    static constexpr qint64 MAX_PLAUSIBLE_STALL_MS = 600000;
+
+    explicit LagMonitor(QObject *parent = nullptr);
+
+    /**
+     * @brief Stalls recorded during this session, oldest first.
+     *
+     * Intended consumers are log output and the diagnostics export. The list
+     * holds at most MAX_RECORDED_STALLS entries.
+     */
+    QList<StallRecord> recentStalls() const;
+
+    void clearStalls();
+
+    /**
+     * @brief Feeds a measured tick-to-tick gap through the detection logic.
+     *
+     * Split out of checkTick so threshold, plausibility, and trim behavior
+     * stay unit-testable without real timing.
+     */
+    void recordGap(qint64 gapMs);
+
+protected:
+    bool eventFilter(QObject *obj, QEvent *event) override;
+
+private slots:
+    void checkTick();
+
+private:
+    QTimer *timer;
+    QElapsedTimer tickClock; ///< monotonic clock, so wall clock steps do not fabricate stalls
+    QList<StallRecord> stalls;
+};
+
+#endif
diff --git a/cockatrice/src/client/latency_graph_widget.cpp b/cockatrice/src/client/latency_graph_widget.cpp
new file mode 100644
index 000000000..72df3ce6c
--- /dev/null
+++ b/cockatrice/src/client/latency_graph_widget.cpp
@@ -0,0 +1,55 @@
+/**
+ * @file latency_graph_widget.cpp
+ * @ingroup Client
+ */
+
+#include "latency_graph_widget.h"
+
+#include <QColor>
+#include <QPainter>
+#include <QRectF>
+#include <QtGlobal>
+#include <qnumeric.h>
+
+LatencyGraphWidget::LatencyGraphWidget(QWidget *parent) : QWidget(parent)
+{
+}
+
+void LatencyGraphWidget::setSamples(const QList<int> &samplesMs)
+{
+    samples = samplesMs;
+    update();
+}
+
+void LatencyGraphWidget::paintEvent(QPaintEvent * /* event */)
+{
+    if (samples.isEmpty()) {
+        return;
+    }
+
+    QPainter painter(this);
+
+    // Heights are relative to the window's own worst sample (floored at
+    // MinScaleMs) so the shape of the variance stays readable even when every
+    // value is small.
+    qint64 heightScaleMs = MinScaleMs;
+    for (int sample : samples) {
+        heightScaleMs = qMax(heightScaleMs, static_cast<qint64>(sample));
+    }
+
+    const qreal widthPerBar = static_cast<qreal>(width()) / samples.size();
+    for (int i = 0; i < samples.size(); ++i) {
+        const qreal heightRatio = qBound(0.0, static_cast<double>(samples.at(i)) / heightScaleMs, 1.0);
+        const qreal barHeight = heightRatio * height();
+
+        // Colors follow an absolute quality ramp: a steady good ping stays
+        // green no matter how uniform the window is.
+        const qreal colorRatio = qBound(0.0, static_cast<double>(samples.at(i)) / ColorScaleMs, 1.0);
+        QColor color;
+        color.setHsv(qRound(120.0 * (1.0 - colorRatio)), 255, 255);
+
+        const QRectF bar(static_cast<qreal>(i) * widthPerBar + 1.0, static_cast<qreal>(height()) - barHeight,
+                         qMax(1.0, widthPerBar - 2.0), barHeight);
+        painter.fillRect(bar, color);
+    }
+}
diff --git a/cockatrice/src/client/latency_graph_widget.h b/cockatrice/src/client/latency_graph_widget.h
new file mode 100644
index 000000000..31a7022b2
--- /dev/null
+++ b/cockatrice/src/client/latency_graph_widget.h
@@ -0,0 +1,45 @@
+/**
+ * @file latency_graph_widget.h
+ * @ingroup Client
+ */
+
+#ifndef LATENCY_GRAPH_WIDGET_H
+#define LATENCY_GRAPH_WIDGET_H
+
+#include <QList>
+#include <QWidget>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+/**
+ * @brief Bar graph of recent network round-trip samples.
+ *
+ * Draws one bar per sample, oldest on the left. Bar height is relative to the
+ * window's own scale so the shape of the variance stays readable, while bar
+ * color maps each sample onto an absolute quality ramp (green at rest through
+ * red at ColorScaleMs) so a steady good ping never looks alarming. Size
+ * agnostic: the status bar embeds a small instance while the latency detail
+ * popup shows a large one.
+ */
+class LatencyGraphWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit LatencyGraphWidget(QWidget *parent = nullptr);
+
+    /// Sample in milliseconds that maps to a fully red bar.
+    static constexpr qint64 ColorScaleMs = 500;
+
+    void setSamples(const QList<int> &samplesMs);
+
+protected:
+    void paintEvent(QPaintEvent *event) override;
+
+private:
+    /// Floor of the vertical scale in milliseconds. Keeps small windows readable.
+    static constexpr qint64 MinScaleMs = 100;
+
+    QList<int> samples;
+};
+
+#endif
diff --git a/cockatrice/src/client/latency_status_widget.cpp b/cockatrice/src/client/latency_status_widget.cpp
new file mode 100644
index 000000000..940074581
--- /dev/null
+++ b/cockatrice/src/client/latency_status_widget.cpp
@@ -0,0 +1,115 @@
+/**
+ * @file latency_status_widget.cpp
+ * @ingroup Client
+ */
+
+#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)
+{
+    pingLabel = new QLabel(this);
+    pingLabel->setAccessibleName(tr("Ping"));
+
+    latencyGraph = new LatencyGraphWidget(this);
+    latencyGraph->setFixedSize(90, 14);
+
+    auto *layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(4);
+    layout->addWidget(latencyGraph);
+    layout->addWidget(pingLabel);
+
+    // Clicking anywhere in the area opens the detail view.
+    for (QObject *child : QList<QObject *>{pingLabel, latencyGraph}) {
+        child->installEventFilter(this);
+    }
+    setCursor(Qt::PointingHandCursor);
+
+    hide();
+}
+
+void LatencyStatusWidget::updateData(const LatencyTracker::Stats &stats, const QList<int> &samplesMs)
+{
+    latestSamples = samplesMs;
+    latencyGraph->setSamples(samplesMs);
+    if (popup && popup->isVisible() && detailGraph) {
+        detailGraph->setSamples(samplesMs);
+    }
+
+    if (stats.sampleCount == 0) {
+        hide();
+        return;
+    }
+
+    const QString statsStr = statsText(stats);
+
+    pingLabel->setText(tr("Ping: %1 ms").arg(stats.lastMs));
+    pingLabel->setToolTip(statsStr);
+    pingLabel->setAccessibleDescription(statsStr);
+    if (popup && popup->isVisible() && detailLabel) {
+        detailLabel->setText(statsStr);
+    }
+    show();
+}
+
+bool LatencyStatusWidget::eventFilter(QObject *watched, QEvent *event)
+{
+    if ((watched == pingLabel || watched == latencyGraph) && event->type() == QEvent::MouseButtonPress) {
+        togglePopup();
+        return true;
+    }
+    return QWidget::eventFilter(watched, event);
+}
+
+void LatencyStatusWidget::togglePopup()
+{
+    if (!popup) {
+        popup = new QWidget(this, Qt::Popup | Qt::FramelessWindowHint);
+        auto *layout = new QVBoxLayout(popup);
+        layout->setContentsMargins(8, 8, 8, 8);
+
+        detailLabel = new QLabel(popup);
+        detailLabel->setAccessibleName(tr("Connection latency details"));
+        detailLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
+
+        detailGraph = new LatencyGraphWidget(popup);
+        detailGraph->setFixedSize(280, 80);
+
+        layout->addWidget(detailLabel, 0, Qt::AlignLeft);
+        layout->addWidget(detailGraph, 0, Qt::AlignHCenter);
+    }
+
+    if (popup->isVisible()) {
+        popup->hide();
+        return;
+    }
+
+    // Qt::Popup closes itself on any outside click, so just position and show.
+    if (latestSamples.isEmpty()) {
+        return;
+    }
+    detailGraph->setSamples(latestSamples);
+    detailLabel->setText(pingLabel->toolTip());
+    popup->adjustSize();
+    const QPoint anchor = mapToGlobal(QPoint(width() / 2, 0));
+    popup->move(anchor.x() - popup->width() / 2, anchor.y() - popup->height() - 6);
+    popup->show();
+}
+
+QString LatencyStatusWidget::statsText(const LatencyTracker::Stats &stats) const
+{
+    return tr("Connection quality over the last %n sample(s):", "", stats.sampleCount) + "\n" +
+           tr("Last: %1 ms").arg(stats.lastMs) + "\n" + tr("Median: %1 ms").arg(stats.medianMs) + "\n" +
+           tr("95th percentile: %1 ms").arg(stats.p95Ms) + "\n" + tr("Maximum: %1 ms").arg(stats.maxMs);
+}
diff --git a/cockatrice/src/client/latency_status_widget.h b/cockatrice/src/client/latency_status_widget.h
new file mode 100644
index 000000000..24d6fda4d
--- /dev/null
+++ b/cockatrice/src/client/latency_status_widget.h
@@ -0,0 +1,52 @@
+/**
+ * @file latency_status_widget.h
+ * @ingroup Client
+ */
+
+#ifndef LATENCY_STATUS_WIDGET_H
+#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;
+
+/**
+ * @brief Status bar presentation of server round-trip health.
+ *
+ * Combines the textual "Ping" readout with a small LatencyGraphWidget
+ * sparkline of the rolling sample window. Clicking anywhere in the area opens
+ * a popup with a larger graph and the numeric statistics. It closes on any
+ * outside click. Stays hidden while disconnected or before any samples exist.
+ * Owns all latency display state so MainWindow only needs to forward one
+ * signal here.
+ */
+class LatencyStatusWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit LatencyStatusWidget(QWidget *parent = nullptr);
+
+public slots:
+    void updateData(const LatencyTracker::Stats &stats, const QList<int> &samplesMs);
+
+protected:
+    bool eventFilter(QObject *watched, QEvent *event) override;
+
+private:
+    void togglePopup();
+    QString statsText(const LatencyTracker::Stats &stats) const;
+
+    QLabel *pingLabel = nullptr;
+    LatencyGraphWidget *latencyGraph = nullptr;
+    QWidget *popup = nullptr;
+    LatencyGraphWidget *detailGraph = nullptr;
+    QLabel *detailLabel = nullptr;
+    QList<int> latestSamples;
+};
+
+#endif
diff --git a/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp b/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp
new file mode 100644
index 000000000..7480da27e
--- /dev/null
+++ b/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp
@@ -0,0 +1,611 @@
+#include "remote_connection_controller.h"
+
+#include "../../../interface/pixel_map_generator.h"
+#include "../../settings/cache_settings.h"
+#include "../interface/widgets/dialogs/dlg_connect.h"
+#include "../interface/widgets/dialogs/dlg_forgot_password_challenge.h"
+#include "../interface/widgets/dialogs/dlg_forgot_password_request.h"
+#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)
+{
+    remoteClient = new RemoteClient(nullptr, &SettingsCache::instance());
+
+    clientThread = new QThread(this);
+    remoteClient->moveToThread(clientThread);
+    clientThread->start();
+
+    wireClientSignals();
+}
+
+ConnectionController::~ConnectionController()
+{
+    remoteClient->deleteLater();
+    clientThread->wait();
+}
+
+void ConnectionController::wireClientSignals()
+{
+    connect(remoteClient, &RemoteClient::connectionClosedEventReceived, this,
+            &ConnectionController::onConnectionClosedEvent);
+
+    connect(remoteClient, &RemoteClient::serverShutdownEventReceived, this,
+            &ConnectionController::onServerShutdownEvent);
+
+    connect(remoteClient, &RemoteClient::statusChanged, this, &ConnectionController::onStatusChanged);
+
+    connect(remoteClient, &AbstractClient::pingStatsUpdated, this, &ConnectionController::pingStatsUpdated);
+
+    connect(remoteClient, &RemoteClient::userInfoChanged, this, &ConnectionController::onUserInfoReceived,
+            Qt::BlockingQueuedConnection);
+
+    connect(remoteClient, &RemoteClient::loginError, this,
+            [this](Response::ResponseCode r, QString rs, quint32 et, QList<QString> mf) {
+                onLoginError(static_cast<int>(r), rs, et, mf);
+            });
+
+    connect(remoteClient, &RemoteClient::registerError, this,
+            [this](Response::ResponseCode r, QString rs, quint32 et) { onRegisterError(static_cast<int>(r), rs, et); });
+
+    connect(remoteClient, &RemoteClient::activateError, this, &ConnectionController::onActivateError);
+    connect(remoteClient, &RemoteClient::socketError, this, &ConnectionController::onSocketError);
+    connect(remoteClient, &RemoteClient::serverTimeout, this, &ConnectionController::onServerTimeout);
+
+    connect(remoteClient, &RemoteClient::protocolVersionMismatch, this,
+            &ConnectionController::onProtocolVersionMismatch);
+
+    connect(remoteClient, &RemoteClient::registerAccepted, this, &ConnectionController::onRegisterAccepted);
+
+    connect(remoteClient, &RemoteClient::registerAcceptedNeedsActivate, this,
+            &ConnectionController::onRegisterAcceptedNeedsActivate);
+
+    connect(remoteClient, &RemoteClient::activateAccepted, this, &ConnectionController::onActivateAccepted);
+
+    connect(remoteClient, &RemoteClient::notifyUserAboutUpdate, this, &ConnectionController::onNotifyUserAboutUpdate);
+
+    connect(remoteClient, &RemoteClient::sigForgotPasswordSuccess, this,
+            &ConnectionController::onForgotPasswordSuccess);
+
+    connect(remoteClient, &RemoteClient::sigForgotPasswordError, this, &ConnectionController::onForgotPasswordError);
+
+    connect(remoteClient, &RemoteClient::sigPromptForForgotPasswordReset, this,
+            &ConnectionController::onPromptForgotPasswordReset);
+
+    connect(remoteClient, &RemoteClient::sigPromptForForgotPasswordChallenge, this,
+            &ConnectionController::onPromptForgotPasswordChallenge);
+}
+
+void ConnectionController::connectToServer()
+{
+    dlgConnect = new DlgConnect(dialogParent);
+    connect(dlgConnect, &DlgConnect::sigStartForgotPasswordRequest, this, &ConnectionController::forgotPasswordRequest);
+
+    if (dlgConnect->exec()) {
+        remoteClient->connectToServer(dlgConnect->getHost(), static_cast<unsigned int>(dlgConnect->getPort()),
+                                      dlgConnect->getPlayerName(), dlgConnect->getPassword());
+    }
+}
+
+void ConnectionController::connectToServerDirect(const QString &host,
+                                                 unsigned int port,
+                                                 const QString &playerName,
+                                                 const QString &password)
+{
+    remoteClient->connectToServer(host, port, playerName, password);
+}
+
+void ConnectionController::disconnectFromServer()
+{
+    remoteClient->disconnectFromServer();
+}
+
+void ConnectionController::registerToServer()
+{
+    DlgRegister dlg(dialogParent);
+    if (dlg.exec()) {
+        remoteClient->registerToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()), dlg.getPlayerName(),
+                                       dlg.getPassword(), dlg.getEmail(), dlg.getCountry(), dlg.getRealName());
+    }
+}
+
+void ConnectionController::forgotPasswordRequest()
+{
+    DlgForgotPasswordRequest dlg(dialogParent);
+    if (dlg.exec()) {
+        remoteClient->requestForgotPasswordToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
+                                                    dlg.getPlayerName());
+    }
+}
+
+void ConnectionController::onConnectionClosedEvent(const Event_ConnectionClosed &event)
+{
+    remoteClient->disconnectFromServer();
+
+    QString reasonStr;
+    switch (event.reason()) {
+        case Event_ConnectionClosed::USER_LIMIT_REACHED: {
+            reasonStr = tr("The server has reached its maximum user capacity, please check back later.");
+            break;
+        }
+        case Event_ConnectionClosed::TOO_MANY_CONNECTIONS: {
+            reasonStr = tr("There are too many concurrent connections from your address.");
+            break;
+        }
+        case Event_ConnectionClosed::BANNED: {
+            reasonStr = tr("Banned by moderator");
+            if (event.has_end_time()) {
+                reasonStr.append(
+                    "\n" + tr("Expected end time: %1").arg(QDateTime::fromSecsSinceEpoch(event.end_time()).toString()));
+            } else {
+                reasonStr.append("\n" + tr("This ban lasts indefinitely."));
+            }
+            if (event.has_reason_str()) {
+                reasonStr.append("\n\n" + QString::fromStdString(event.reason_str()));
+            }
+            break;
+        }
+        case Event_ConnectionClosed::SERVER_SHUTDOWN: {
+            reasonStr = tr("Scheduled server shutdown.");
+            break;
+        }
+        case Event_ConnectionClosed::USERNAMEINVALID: {
+            reasonStr = tr("Invalid username.");
+            break;
+        }
+        case Event_ConnectionClosed::LOGGEDINELSEWERE: {
+            reasonStr = tr("You have been logged out due to logging in at another location.");
+            break;
+        }
+        default:
+            reasonStr = QString::fromStdString(event.reason_str());
+    }
+
+    QMessageBox::critical(dialogParent, tr("Connection closed"),
+                          tr("The server has terminated your connection.\nReason: %1").arg(reasonStr));
+}
+
+void ConnectionController::onServerShutdownEvent(const Event_ServerShutdown &event)
+{
+    serverShutdownMessageBox.setInformativeText(tr("The server is going to be restarted in %n minute(s).\nAll running "
+                                                   "games will be lost.\nReason for shutdown: %1",
+                                                   "", event.minutes())
+                                                    .arg(QString::fromStdString(event.reason())));
+    serverShutdownMessageBox.setIconPixmap(themePixmap(QStringLiteral("cockatrice")).scaled(64, 64));
+    serverShutdownMessageBox.setText(tr("Scheduled server shutdown"));
+    serverShutdownMessageBox.setWindowModality(Qt::ApplicationModal);
+    serverShutdownMessageBox.setVisible(true);
+}
+
+void ConnectionController::onStatusChanged(ClientStatus status)
+{
+    // Update the window title first, then let MainWindow handle its own UI
+    // state via the forwarded signal
+    updateWindowTitle();
+    emit statusChanged(status);
+
+    // TabSupervisor::stop() needs calling on disconnect; start() is driven by
+    // onUserInfoReceived → tabSupervisorStartRequested.
+    if (status == StatusDisconnected) {
+        emit tabSupervisorStopRequested();
+    }
+}
+
+void ConnectionController::onUserInfoReceived(const ServerInfo_User &info)
+{
+    emit tabSupervisorStartRequested(info);
+}
+
+void ConnectionController::onLoginError(int r,
+                                        QString reasonStr,
+                                        quint32 endTime,
+                                        const QList<QString> &missingFeatures)
+{
+    switch (static_cast<Response::ResponseCode>(r)) {
+        case Response::RespClientUpdateRequired: {
+            QString formatted = "Missing Features: ";
+            for (int i = 0; i < missingFeatures.size(); ++i) {
+                formatted.append(QString("\n     %1").arg(QChar(0x2022)) + " " + missingFeatures.value(i));
+            }
+
+            QMessageBox msgBox(dialogParent);
+            msgBox.setIcon(QMessageBox::Critical);
+            msgBox.setWindowTitle(tr("Failed Login"));
+            msgBox.setText(tr("Your client seems to be missing features this server requires for connection.") +
+                           "\n\n" + tr("To update your client, go to 'Help -> Check for Client Updates'."));
+            msgBox.setDetailedText(formatted);
+            msgBox.exec();
+            break;
+        }
+
+        case Response::RespWrongPassword: {
+            QMessageBox::critical(dialogParent, tr("Error"),
+                                  tr("Incorrect username or password. "
+                                     "Please check your authentication information and try again."));
+            break;
+        }
+
+        case Response::RespWouldOverwriteOldSession: {
+            QMessageBox::critical(dialogParent, tr("Error"),
+                                  tr("There is already an active session using this user name.\n"
+                                     "Please close that session first and re-login."));
+            break;
+        }
+
+        case Response::RespUserIsBanned: {
+            QString bannedStr =
+                endTime ? tr("You are banned until %1.").arg(QDateTime::fromSecsSinceEpoch(endTime).toString())
+                        : tr("You are banned indefinitely.");
+            if (!reasonStr.isEmpty()) {
+                bannedStr.append("\n\n" + reasonStr);
+            }
+            QMessageBox::critical(dialogParent, tr("Error"), bannedStr);
+            break;
+        }
+
+        case Response::RespUsernameInvalid: {
+            QMessageBox::critical(dialogParent, tr("Error"), extractInvalidUsernameMessage(reasonStr));
+            break;
+        }
+
+        case Response::RespRegistrationRequired: {
+            if (QMessageBox::question(dialogParent, tr("Error"),
+                                      tr("This server requires user registration. Do you want to register now?"),
+                                      QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+                registerToServer();
+            }
+            return; // don't re-prompt connect
+        }
+
+        case Response::RespClientIdRequired: {
+            QMessageBox::critical(dialogParent, tr("Error"),
+                                  tr("This server requires client IDs. Your client is either failing to generate an "
+                                     "ID or you are running a modified client.\n"
+                                     "Please close and reopen your client to try again."));
+            break;
+        }
+
+        case Response::RespContextError: {
+            QMessageBox::critical(dialogParent, tr("Error"),
+                                  tr("An internal error has occurred, please close and reopen Cockatrice before "
+                                     "trying again.\nIf the error persists, ensure you are running the latest "
+                                     "version of the software and if needed contact the software developers."));
+            break;
+        }
+
+        case Response::RespAccountNotActivated: {
+            bool ok = false;
+            QString token =
+                getTextWithMax(dialogParent, tr("Account activation"),
+                               tr("Your account has not been activated yet.\n"
+                                  "You need to provide the activation token received in the activation email."),
+                               QLineEdit::Normal, QString(), &ok);
+
+            if (ok && !token.isEmpty()) {
+                remoteClient->activateToServer(token);
+                return;
+            }
+            remoteClient->disconnectFromServer();
+            return;
+        }
+
+        case Response::RespPasswordChangeRequired: {
+            QMessageBox::information(
+                dialogParent, tr("Password Change Required"),
+                tr("An administrator has reset your password. Please contact your server administrator to obtain "
+                   "your temporary password, then log in and change it via Account -> Change Password."));
+            remoteClient->disconnectFromServer();
+            return;
+        }
+
+        case Response::RespServerFull: {
+            QMessageBox::critical(dialogParent, tr("Server Full"),
+                                  tr("The server has reached its maximum user capacity, please check back later."));
+            break;
+        }
+
+        default: {
+            QMessageBox::critical(dialogParent, tr("Error"),
+                                  tr("Unknown login error: %1").arg(r) +
+                                      tr("\nThis usually means that your client version is out of date, and the server "
+                                         "sent a reply your client doesn't understand."));
+            break;
+        }
+    }
+
+    // Re-open the connect dialog after any handled error
+    connectToServer();
+}
+
+void ConnectionController::onRegisterError(int r, QString reasonStr, quint32 endTime)
+{
+    switch (static_cast<Response::ResponseCode>(r)) {
+        case Response::RespRegistrationDisabled: {
+            QMessageBox::critical(dialogParent, tr("Registration denied"),
+                                  tr("Registration is currently disabled on this server"));
+            break;
+        }
+        case Response::RespUserAlreadyExists: {
+            QMessageBox::critical(dialogParent, tr("Registration denied"),
+                                  tr("There is already an existing account with the same user name."));
+            break;
+        }
+        case Response::RespEmailRequiredToRegister: {
+            QMessageBox::critical(dialogParent, tr("Registration denied"),
+                                  tr("It's mandatory to specify a valid email address when registering."));
+            break;
+        }
+        case Response::RespEmailBlackListed: {
+            if (reasonStr.isEmpty()) {
+                reasonStr =
+                    "The email address provider used during registration has been blocked from use on this server.";
+            }
+            QMessageBox::critical(dialogParent, tr("Registration denied"), reasonStr);
+            break;
+        }
+        case Response::RespTooManyRequests: {
+            QMessageBox::critical(dialogParent, tr("Registration denied"),
+                                  tr("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."));
+            break;
+        }
+        case Response::RespPasswordTooShort: {
+            QMessageBox::critical(dialogParent, tr("Registration denied"), tr("Password too short."));
+            break;
+        }
+        case Response::RespUserIsBanned: {
+            QString bannedStr =
+                endTime ? tr("You are banned until %1.").arg(QDateTime::fromSecsSinceEpoch(endTime).toString())
+                        : tr("You are banned indefinitely.");
+            if (!reasonStr.isEmpty()) {
+                bannedStr.append("\n\n" + reasonStr);
+            }
+            QMessageBox::critical(dialogParent, tr("Error"), bannedStr);
+            break;
+        }
+        case Response::RespUsernameInvalid: {
+            QMessageBox::critical(dialogParent, tr("Error"), extractInvalidUsernameMessage(reasonStr));
+            break;
+        }
+        case Response::RespRegistrationFailed: {
+            QMessageBox::critical(dialogParent, tr("Error"),
+                                  tr("Registration failed for a technical problem on the server."));
+            break;
+        }
+        case Response::RespNotConnected: {
+            QMessageBox::critical(dialogParent, tr("Error"), tr("The connection to the server has been lost."));
+            break;
+        }
+        default: {
+            QMessageBox::critical(dialogParent, tr("Error"),
+                                  tr("Unknown registration error: %1").arg(r) +
+                                      tr("\nThis usually means that your client version is out of date, and the server "
+                                         "sent a reply your client doesn't understand."));
+            break;
+        }
+    }
+
+    registerToServer();
+}
+
+void ConnectionController::onActivateError()
+{
+    QMessageBox::critical(dialogParent, tr("Error"), tr("Account activation failed"));
+    remoteClient->disconnectFromServer();
+    connectToServer();
+}
+
+void ConnectionController::onSocketError(const QString &errorStr)
+{
+    QMessageBox::critical(dialogParent, tr("Error"), tr("Socket error: %1").arg(errorStr));
+    connectToServer();
+}
+
+void ConnectionController::onServerTimeout()
+{
+    QMessageBox::critical(dialogParent, tr("Error"), tr("Server timeout"));
+    connectToServer();
+}
+
+void ConnectionController::onProtocolVersionMismatch(int localVersion, int remoteVersion)
+{
+    if (localVersion > remoteVersion) {
+        QMessageBox::critical(dialogParent, tr("Error"),
+                              tr("You are trying to connect to an obsolete server. Please downgrade your Cockatrice "
+                                 "version or connect to a suitable server.\n"
+                                 "Local version is %1, remote version is %2.")
+                                  .arg(localVersion)
+                                  .arg(remoteVersion));
+    } else {
+        QMessageBox::critical(dialogParent, tr("Error"),
+                              tr("Your Cockatrice client is obsolete. Please update your Cockatrice version.\n"
+                                 "Local version is %1, remote version is %2.")
+                                  .arg(localVersion)
+                                  .arg(remoteVersion));
+    }
+}
+
+void ConnectionController::onRegisterAccepted()
+{
+    QMessageBox::information(dialogParent, tr("Success"), tr("Registration accepted.\nWill now login."));
+}
+
+void ConnectionController::onRegisterAcceptedNeedsActivate()
+{
+    // Server will send activation email; nothing to display here.
+}
+
+void ConnectionController::onActivateAccepted()
+{
+    QMessageBox::information(dialogParent, tr("Success"), tr("Account activation accepted.\nWill now login."));
+}
+
+void ConnectionController::onNotifyUserAboutUpdate()
+{
+    QMessageBox::information(
+        dialogParent, tr("Information"),
+        tr("This server supports additional features that your client doesn't have.\n"
+           "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.\n\n"
+           "To update your client, go to Help -> Check for Updates."));
+}
+
+void ConnectionController::onForgotPasswordSuccess()
+{
+    QMessageBox::information(
+        dialogParent, tr("Reset Password"),
+        tr("Your password has been reset successfully, you can now log in using the new credentials."));
+    SettingsCache::instance().servers().setFPHostName("");
+    SettingsCache::instance().servers().setFPPort("");
+    SettingsCache::instance().servers().setFPPlayerName("");
+}
+
+void ConnectionController::onForgotPasswordError()
+{
+    QMessageBox::warning(
+        dialogParent, tr("Reset Password"),
+        tr("Failed to reset user account password, please contact the server operator to reset your password."));
+    SettingsCache::instance().servers().setFPHostName("");
+    SettingsCache::instance().servers().setFPPort("");
+    SettingsCache::instance().servers().setFPPlayerName("");
+}
+
+void ConnectionController::onPromptForgotPasswordReset()
+{
+    QMessageBox::information(dialogParent, tr("Reset Password"),
+                             tr("Activation request received, please check your email for an activation token."));
+    DlgForgotPasswordReset dlg(dialogParent);
+    if (dlg.exec()) {
+        remoteClient->submitForgotPasswordResetToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
+                                                        dlg.getPlayerName(), dlg.getToken(), dlg.getPassword());
+    }
+}
+
+void ConnectionController::onPromptForgotPasswordChallenge()
+{
+    DlgForgotPasswordChallenge dlg(dialogParent);
+    if (dlg.exec()) {
+        remoteClient->submitForgotPasswordChallengeToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
+                                                            dlg.getPlayerName(), dlg.getEmail());
+    }
+}
+
+void ConnectionController::updateWindowTitle()
+{
+    const QString appName = QStringLiteral("Cockatrice");
+    QString title;
+
+    switch (remoteClient->getStatus()) {
+        case StatusConnecting: {
+            title = appName + " - " + tr("Connecting to %1...").arg(remoteClient->peerName());
+            break;
+        }
+        case StatusRegistering: {
+            title = appName + " - " +
+                    tr("Registering to %1 as %2...").arg(remoteClient->peerName()).arg(remoteClient->getUserName());
+            break;
+        }
+        case StatusDisconnected: {
+            title = appName + " - " + tr("Disconnected");
+            break;
+        }
+        case StatusLoggingIn: {
+            title = appName + " - " + tr("Connected, logging in at %1").arg(remoteClient->peerName());
+            break;
+        }
+        case StatusLoggedIn: {
+            title = remoteClient->getUserName() + "@" + remoteClient->peerName();
+            break;
+        }
+        case StatusRequestingForgotPassword:
+        case StatusSubmitForgotPasswordChallenge:
+        case StatusSubmitForgotPasswordReset:
+            title = appName + " - " +
+                    tr("Requesting forgotten password to %1 as %2...")
+                        .arg(remoteClient->peerName())
+                        .arg(remoteClient->getUserName());
+            break;
+        default:
+            title = appName;
+    }
+
+    emit windowTitleChanged(title);
+}
+
+// static
+QString ConnectionController::extractInvalidUsernameMessage(QString &in)
+{
+    QString out = tr("Invalid username.") + "<br/>";
+    QStringList rules = in.split(QChar('|'));
+
+    if (rules.size() == 7 || rules.size() == 9) {
+        out += tr("Your username must respect these rules:") + "<ul>";
+
+        out += "<li>" + tr("is %1 - %2 characters long").arg(rules.at(0)).arg(rules.at(1)) + "</li>";
+        out += "<li>" + tr("can %1 contain lowercase characters").arg((rules.at(2).toInt() > 0) ? "" : tr("NOT")) +
+               "</li>";
+        out += "<li>" + tr("can %1 contain uppercase characters").arg((rules.at(3).toInt() > 0) ? "" : tr("NOT")) +
+               "</li>";
+        out +=
+            "<li>" + tr("can %1 contain numeric characters").arg((rules.at(4).toInt() > 0) ? "" : tr("NOT")) + "</li>";
+
+        if (rules.at(6).size() > 0) {
+            out += "<li>" + tr("can contain the following punctuation: %1").arg(rules.at(6).toHtmlEscaped()) + "</li>";
+        }
+
+        out += "<li>" +
+               tr("first character can %1 be a punctuation mark").arg((rules.at(5).toInt() > 0) ? "" : tr("NOT")) +
+               "</li>";
+
+        if (rules.size() == 9) {
+            if (rules.at(7).size() > 0) {
+                QString words = rules.at(7).toHtmlEscaped();
+                if (words.startsWith("\n")) {
+                    out += tr("no unacceptable language as specified by these server rules:",
+                              "note that the following lines will not be translated");
+                    for (QString &line : words.split("\n", Qt::SkipEmptyParts)) {
+                        out += "<li>" + line + "</li>";
+                    }
+                } else {
+                    out += "<li>" + tr("can not contain any of the following words: %1").arg(words) + "</li>";
+                }
+            }
+
+            if (rules.at(8).size() > 0) {
+                out += "<li>" +
+                       tr("can not match any of the following expressions: %1").arg(rules.at(8).toHtmlEscaped()) +
+                       "</li>";
+            }
+        }
+
+        out += "</ul>";
+    } else {
+        out += tr("You may only use A-Z, a-z, 0-9, _, ., and - in your username.");
+    }
+
+    return out;
+}
\ No newline at end of file
diff --git a/cockatrice/src/client/network/connection_controller/remote_connection_controller.h b/cockatrice/src/client/network/connection_controller/remote_connection_controller.h
new file mode 100644
index 000000000..d4a832c75
--- /dev/null
+++ b/cockatrice/src/client/network/connection_controller/remote_connection_controller.h
@@ -0,0 +1,107 @@
+#ifndef COCKATRICE_REMOTE_CONNECTION_CONTROLLER_H
+#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>
+
+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.
+ * Encapsulates all connection, authentication, and registration logic so that
+ * MainWindow only needs to react to high-level signals.
+ */
+class ConnectionController : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit ConnectionController(QWidget *dialogParent, QObject *parent = nullptr);
+    ~ConnectionController() override;
+
+    RemoteClient *client() const
+    {
+        return remoteClient;
+    }
+
+    void registerToServer();
+    void forgotPasswordRequest();
+    void connectToServer();
+    void
+    connectToServerDirect(const QString &host, unsigned int port, const QString &playerName, const QString &password);
+    void disconnectFromServer();
+
+    void refreshWindowTitle()
+    {
+        updateWindowTitle();
+    }
+
+signals:
+    void windowTitleChanged(const QString &title);
+
+    void tabSupervisorStartRequested(const ServerInfo_User &info);
+    void tabSupervisorStopRequested();
+
+    // Passes the raw ClientStatus through so MainWindow can drive its own
+    // action enable/disable logic
+    void statusChanged(ClientStatus status);
+
+    // Forwarded from AbstractClient::pingStatsUpdated. See that signal for the
+    // meaning of the parameters.
+    void pingStatsUpdated(const LatencyTracker::Stats &stats, const QList<int> &samplesMs);
+
+private slots:
+    // Slots wired directly to RemoteClient signals
+    void onStatusChanged(ClientStatus status);
+    void onUserInfoReceived(const ServerInfo_User &info);
+    void onLoginError(int r, QString reasonStr, quint32 endTime, const QList<QString> &missingFeatures);
+    void onRegisterAccepted();
+    void onRegisterAcceptedNeedsActivate();
+    void onRegisterError(int r, QString reasonStr, quint32 endTime);
+    void onActivateAccepted();
+    void onActivateError();
+    void onProtocolVersionMismatch(int localVersion, int remoteVersion);
+    void onNotifyUserAboutUpdate();
+    void onConnectionClosedEvent(const Event_ConnectionClosed &event);
+    void onServerShutdownEvent(const Event_ServerShutdown &event);
+    void onSocketError(const QString &errorStr);
+    void onServerTimeout();
+
+    // Forgot-password flow
+    void onForgotPasswordSuccess();
+    void onForgotPasswordError();
+    void onPromptForgotPasswordReset();
+    void onPromptForgotPasswordChallenge();
+
+private:
+    void wireClientSignals();
+    void updateWindowTitle();
+
+    /** Parse the server's pipe-delimited username-rule string into HTML. */
+    static QString extractInvalidUsernameMessage(QString &in);
+
+    RemoteClient *remoteClient{nullptr};
+    QThread *clientThread{nullptr};
+    QWidget *dialogParent{nullptr}; // used as parent for QMessageBox / dialog calls
+
+    // Persistent so it can be updated in-place by onServerShutdownEvent
+    QMessageBox serverShutdownMessageBox;
+
+    // Kept as a member so the forgot-password signal can be wired to it
+    DlgConnect *dlgConnect{nullptr};
+};
+
+#endif // COCKATRICE_REMOTE_CONNECTION_CONTROLLER_H
diff --git a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp b/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
index 6c295beb9..d5cfdbbc9 100644
--- a/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
+++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.cpp
@@ -1,16 +1,28 @@
 #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>
+#include <version_string.h>
 
-DeckStatsInterface::DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent)
-    : QObject(parent), cardDatabase(_cardDatabase)
+DeckStatsInterface::DeckStatsInterface(QObject *parent) : QObject(parent)
 {
     manager = new QNetworkAccessManager(this);
     connect(manager, &QNetworkAccessManager::finished, this, &DeckStatsInterface::queryFinished);
@@ -42,35 +54,36 @@ void DeckStatsInterface::queryFinished(QNetworkReply *reply)
     deleteLater();
 }
 
-void DeckStatsInterface::getAnalyzeRequestData(DeckList *deck, QByteArray *data)
+void DeckStatsInterface::getAnalyzeRequestData(const DeckList &deck, QByteArray &data)
 {
     DeckList deckWithoutTokens;
-    copyDeckWithoutTokens(*deck, deckWithoutTokens);
+    copyDeckWithoutTokens(deck, deckWithoutTokens);
 
     QUrl params;
     QUrlQuery urlQuery;
     urlQuery.addQueryItem("deck", deckWithoutTokens.writeToString_Plain());
-    urlQuery.addQueryItem("decktitle", deck->getName());
+    urlQuery.addQueryItem("decktitle", deck.getName());
     params.setQuery(urlQuery);
-    data->append(params.query(QUrl::EncodeReserved).toUtf8());
+    data.append(params.query(QUrl::EncodeReserved).toUtf8());
 }
 
-void DeckStatsInterface::analyzeDeck(DeckList *deck)
+void DeckStatsInterface::analyzeDeck(const DeckList &deck)
 {
     QByteArray data;
-    getAnalyzeRequestData(deck, &data);
+    getAnalyzeRequestData(deck, data);
 
     QNetworkRequest request(QUrl("https://deckstats.net/index.php"));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
+    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     manager->post(request, data);
 }
 
-void DeckStatsInterface::copyDeckWithoutTokens(DeckList &source, DeckList &destination)
+void DeckStatsInterface::copyDeckWithoutTokens(const DeckList &source, DeckList &destination)
 {
-    auto copyIfNotAToken = [this, &destination](const auto node, const auto card) {
-        CardInfoPtr dbCard = cardDatabase.query()->getCardInfo(card->getName());
-        if (dbCard && !dbCard->getIsToken()) {
+    auto copyIfNotAToken = [&destination](const auto node, const auto card) {
+        CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName());
+        if (dbCard && !dbCard->getIsToken() && node->getName() != DECK_ZONE_MAYBEBOARD) {
             DecklistCardNode *addedCard = destination.addCard(card->getName(), node->getName(), -1);
             addedCard->setNumber(card->getNumber());
         }
diff --git a/cockatrice/src/client/network/interfaces/deck_stats_interface.h b/cockatrice/src/client/network/interfaces/deck_stats_interface.h
index fd1691a8b..e7791075c 100644
--- a/cockatrice/src/client/network/interfaces/deck_stats_interface.h
+++ b/cockatrice/src/client/network/interfaces/deck_stats_interface.h
@@ -1,14 +1,14 @@
 /**
  * @file deck_stats_interface.h
  * @ingroup ApiInterfaces
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DECKSTATS_INTERFACE_H
 #define DECKSTATS_INTERFACE_H
 
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <QObject>
+#include <qtmetamacros.h>
 
 class QByteArray;
 class QNetworkAccessManager;
@@ -21,22 +21,20 @@ class DeckStatsInterface : public QObject
 private:
     QNetworkAccessManager *manager;
 
-    CardDatabase &cardDatabase;
-
     /**
      * Deckstats doesn't recognize token cards, and instead tries to find the
      * closest non-token card instead. So we construct a new deck which has no
      * tokens.
      */
-    void copyDeckWithoutTokens(DeckList &source, DeckList &destination);
+    void copyDeckWithoutTokens(const DeckList &source, DeckList &destination);
 
 private slots:
     void queryFinished(QNetworkReply *reply);
-    void getAnalyzeRequestData(DeckList *deck, QByteArray *data);
+    void getAnalyzeRequestData(const DeckList &deck, QByteArray &data);
 
 public:
-    explicit DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent = nullptr);
-    void analyzeDeck(DeckList *deck);
+    explicit DeckStatsInterface(QObject *parent = nullptr);
+    void analyzeDeck(const DeckList &deck);
 };
 
 #endif
diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
index 4bfeba7b1..30044c2b6 100644
--- a/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
+++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.cpp
@@ -1,16 +1,34 @@
 #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>
+#include <version_string.h>
 
-TappedOutInterface::TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent)
-    : QObject(parent), cardDatabase(_cardDatabase)
+TappedOutInterface::TappedOutInterface(QObject *parent) : QObject(parent)
 {
     manager = new QNetworkAccessManager(this);
     connect(manager, &QNetworkAccessManager::finished, this, &TappedOutInterface::queryFinished);
@@ -66,43 +84,48 @@ void TappedOutInterface::queryFinished(QNetworkReply *reply)
     deleteLater();
 }
 
-void TappedOutInterface::getAnalyzeRequestData(DeckList *deck, QByteArray *data)
+void TappedOutInterface::getAnalyzeRequestData(const DeckList &deck, QByteArray &data)
 {
     DeckList mainboard, sideboard;
-    copyDeckSplitMainAndSide(*deck, mainboard, sideboard);
+    copyDeckSplitMainAndSide(deck, mainboard, sideboard);
 
     QUrl params;
     QUrlQuery urlQuery;
-    urlQuery.addQueryItem("name", deck->getName());
+    urlQuery.addQueryItem("name", deck.getName());
     urlQuery.addQueryItem("mainboard", mainboard.writeToString_Plain(false, true));
     urlQuery.addQueryItem("sideboard", sideboard.writeToString_Plain(false, true));
     params.setQuery(urlQuery);
-    data->append(params.query(QUrl::EncodeReserved).toUtf8());
+    data.append(params.query(QUrl::EncodeReserved).toUtf8());
 }
 
-void TappedOutInterface::analyzeDeck(DeckList *deck)
+void TappedOutInterface::analyzeDeck(const DeckList &deck)
 {
     QByteArray data;
-    getAnalyzeRequestData(deck, &data);
+    getAnalyzeRequestData(deck, data);
 
     QNetworkRequest request(QUrl("https://tappedout.net/mtg-decks/paste/"));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
+    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
+    // we interpret the redirect and open it in the browser instead, do not follow redirects
+    request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::ManualRedirectPolicy);
 
     manager->post(request, data);
 }
 
-void TappedOutInterface::copyDeckSplitMainAndSide(DeckList &source, DeckList &mainboard, DeckList &sideboard)
+void TappedOutInterface::copyDeckSplitMainAndSide(const DeckList &source, DeckList &mainboard, DeckList &sideboard)
 {
-    auto copyMainOrSide = [this, &mainboard, &sideboard](const auto node, const auto card) {
-        CardInfoPtr dbCard = cardDatabase.query()->getCardInfo(card->getName());
-        if (!dbCard || dbCard->getIsToken())
+    auto copyMainOrSide = [&mainboard, &sideboard](const auto node, const auto card) {
+        CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName());
+        if (!dbCard || dbCard->getIsToken() || node->getName() == DECK_ZONE_MAYBEBOARD) {
             return;
+        }
 
         DecklistCardNode *addedCard;
-        if (node->getName() == DECK_ZONE_SIDE)
+        if (node->getName() == DECK_ZONE_SIDE) {
             addedCard = sideboard.addCard(card->getName(), node->getName(), -1);
-        else
+        } else {
             addedCard = mainboard.addCard(card->getName(), node->getName(), -1);
+        }
         addedCard->setNumber(card->getNumber());
     };
 
diff --git a/cockatrice/src/client/network/interfaces/tapped_out_interface.h b/cockatrice/src/client/network/interfaces/tapped_out_interface.h
index 056d7fd9a..615991b07 100644
--- a/cockatrice/src/client/network/interfaces/tapped_out_interface.h
+++ b/cockatrice/src/client/network/interfaces/tapped_out_interface.h
@@ -1,14 +1,15 @@
 /**
  * @file tapped_out_interface.h
  * @ingroup ApiInterfaces
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TAPPEDOUT_INTERFACE_H
 #define TAPPEDOUT_INTERFACE_H
 
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <QLoggingCategory>
+#include <QObject>
+#include <qtmetamacros.h>
 
 inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface");
 
@@ -29,15 +30,14 @@ class TappedOutInterface : public QObject
 private:
     QNetworkAccessManager *manager;
 
-    CardDatabase &cardDatabase;
-    void copyDeckSplitMainAndSide(DeckList &source, DeckList &mainboard, DeckList &sideboard);
+    void copyDeckSplitMainAndSide(const DeckList &source, DeckList &mainboard, DeckList &sideboard);
 private slots:
     void queryFinished(QNetworkReply *reply);
-    void getAnalyzeRequestData(DeckList *deck, QByteArray *data);
+    void getAnalyzeRequestData(const DeckList &deck, QByteArray &data);
 
 public:
-    explicit TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent = nullptr);
-    void analyzeDeck(DeckList *deck);
+    explicit TappedOutInterface(QObject *parent = nullptr);
+    void analyzeDeck(const DeckList &deck);
 };
 
 #endif
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 010b63684..7127b0a29 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,6 +1,7 @@
 #include "deck_link_to_api_transformer.h"
 
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
 
 namespace DeckLinkToApiTransformer
 {
diff --git a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.h b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.h
index 1e2372fd1..bbdd70c97 100644
--- a/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.h
+++ b/cockatrice/src/client/network/parsers/deck_link_to_api_transformer.h
@@ -1,8 +1,8 @@
 /**
  * @file deck_link_to_api_transformer.h
  * @ingroup ApiInterfaces
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DECK_LINK_TO_API_TRANSFORMER_H
 #define DECK_LINK_TO_API_TRANSFORMER_H
diff --git a/cockatrice/src/client/network/parsers/interface_json_deck_parser.h b/cockatrice/src/client/network/parsers/interface_json_deck_parser.h
index 8ac05a84b..87fde4d54 100644
--- a/cockatrice/src/client/network/parsers/interface_json_deck_parser.h
+++ b/cockatrice/src/client/network/parsers/interface_json_deck_parser.h
@@ -1,36 +1,39 @@
 /**
  * @file interface_json_deck_parser.h
  * @ingroup ApiInterfaces
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef INTERFACE_JSON_DECK_PARSER_H
 #define INTERFACE_JSON_DECK_PARSER_H
-#include "../../../interface/deck_loader/deck_loader.h"
+
+#include "../../../interface/deck_loader/card_node_function.h"
 
 #include <QJsonArray>
 #include <QJsonObject>
+#include <libcockatrice/card/import/card_name_normalizer.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 class IJsonDeckParser
 {
 public:
     virtual ~IJsonDeckParser() = default;
 
-    virtual DeckLoader *parse(const QJsonObject &obj) = 0;
+    virtual DeckList parse(const QJsonObject &obj) = 0;
 };
 
 class ArchidektJsonParser : public IJsonDeckParser
 {
 public:
-    DeckLoader *parse(const QJsonObject &obj) override
+    DeckList parse(const QJsonObject &obj) override
     {
-        DeckLoader *loader = new DeckLoader(nullptr);
+        DeckList deckList;
 
         QString deckName = obj.value("name").toString();
         QString deckDescription = obj.value("description").toString();
 
-        loader->getDeckList()->setName(deckName);
-        loader->getDeckList()->setComments(deckDescription);
+        deckList.setName(deckName);
+        deckList.setComments(deckDescription);
 
         QString outputText;
         QTextStream outStream(&outputText);
@@ -47,25 +50,25 @@ public:
             outStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber << '\n';
         }
 
-        loader->getDeckList()->loadFromStream_Plain(outStream, false);
-        DeckLoader::resolveSetNameAndNumberToProviderID(loader->getDeckList());
+        deckList.loadFromStream_Plain(outStream, false, CardNameNormalizer());
+        deckList.forEachCard(CardNodeFunction::ResolveProviderId());
 
-        return loader;
+        return deckList;
     }
 };
 
 class MoxfieldJsonParser : public IJsonDeckParser
 {
 public:
-    DeckLoader *parse(const QJsonObject &obj) override
+    DeckList parse(const QJsonObject &obj) override
     {
-        DeckLoader *loader = new DeckLoader(nullptr);
+        DeckList deckList;
 
         QString deckName = obj.value("name").toString();
         QString deckDescription = obj.value("description").toString();
 
-        loader->getDeckList()->setName(deckName);
-        loader->getDeckList()->setComments(deckDescription);
+        deckList.setName(deckName);
+        deckList.setComments(deckDescription);
 
         QString outputText;
         QTextStream outStream(&outputText);
@@ -94,8 +97,8 @@ public:
             outStream << quantity << ' ' << cardName << " (" << setName << ") " << collectorNumber << '\n';
         }
 
-        loader->getDeckList()->loadFromStream_Plain(outStream, false);
-        DeckLoader::resolveSetNameAndNumberToProviderID(loader->getDeckList());
+        deckList.loadFromStream_Plain(outStream, false, CardNameNormalizer());
+        deckList.forEachCard(CardNodeFunction::ResolveProviderId());
 
         QJsonObject commandersObj = obj.value("commanders").toObject();
         if (!commandersObj.isEmpty()) {
@@ -106,12 +109,12 @@ public:
                 QString collectorNumber = cardData.value("cn").toString();
                 QString providerId = cardData.value("scryfall_id").toString();
 
-                loader->getDeckList()->setBannerCard({commanderName, providerId});
-                loader->getDeckList()->addCard(commanderName, DECK_ZONE_MAIN, -1, setName, collectorNumber, providerId);
+                deckList.setBannerCard({commanderName, providerId});
+                deckList.addCard(commanderName, DECK_ZONE_MAIN, -1, setName, collectorNumber, providerId);
             }
         }
 
-        return loader;
+        return deckList;
     }
 };
 
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 f6f851037..192029b23 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,26 +1,44 @@
 #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 <QtConcurrent>
+#include <QtConcurrentRun>
+#include <QtGlobal>
+#include <functional>
 #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"
 #define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml"
 
 SpoilerBackgroundUpdater::SpoilerBackgroundUpdater(QObject *apParent) : QObject(apParent), cardUpdateProcess(nullptr)
 {
-    isSpoilerDownloadEnabled = SettingsCache::instance().getDownloadSpoilersStatus();
+    isSpoilerDownloadEnabled = SettingsCache::instance().downloads().getDownloadSpoilersStatus();
     if (isSpoilerDownloadEnabled) {
         // Start the process of checking if we're in spoiler season
         // File exists means we're in spoiler season
@@ -39,7 +57,9 @@ void SpoilerBackgroundUpdater::startSpoilerDownloadProcess(QString url, bool sav
 void SpoilerBackgroundUpdater::downloadFromURL(QUrl url, bool saveResults)
 {
     auto *nam = new QNetworkAccessManager(this);
-    QNetworkReply *reply = nam->get(QNetworkRequest(url));
+    auto request = QNetworkRequest(url);
+    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
+    QNetworkReply *reply = nam->get(request);
 
     if (saveResults) {
         // This will write out to the file (used for spoiler.xml)
@@ -72,7 +92,7 @@ void SpoilerBackgroundUpdater::actDownloadFinishedSpoilersFile()
 
 bool SpoilerBackgroundUpdater::deleteSpoilerFile()
 {
-    QString fileName = SettingsCache::instance().getSpoilerCardDatabasePath();
+    QString fileName = SettingsCache::instance().paths().getSpoilerCardDatabasePath();
     QFileInfo fi(fileName);
     QDir fileDir(fi.path());
     QFile file(fileName);
@@ -123,7 +143,7 @@ void SpoilerBackgroundUpdater::actCheckIfSpoilerSeasonEnabled()
 
 bool SpoilerBackgroundUpdater::saveDownloadedFile(QByteArray data)
 {
-    QString fileName = SettingsCache::instance().getSpoilerCardDatabasePath();
+    QString fileName = SettingsCache::instance().paths().getSpoilerCardDatabasePath();
     QFileInfo fi(fileName);
     QDir fileDir(fi.path());
 
@@ -158,7 +178,15 @@ bool SpoilerBackgroundUpdater::saveDownloadedFile(QByteArray data)
 
     // Data written, so reload the card database
     qCInfo(SpoilerBackgroundUpdaterLog) << "Spoiler Service Data Written";
-    const auto reloadOk = QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); });
+    // 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(); }));
 
     // 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 a2feb5ccf..a6c4ed00f 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
@@ -1,8 +1,8 @@
 /**
  * @file spoiler_background_updater.h
  * @ingroup Client
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_SPOILER_DOWNLOADER_H
 #define COCKATRICE_SPOILER_DOWNLOADER_H
@@ -10,7 +10,11 @@
 #include <QByteArray>
 #include <QLoggingCategory>
 #include <QObject>
-#include <QProcess>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QProcess;
+class QUrl;
 
 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 4e6f279c3..16cbd0369 100644
--- a/cockatrice/src/client/network/update/client/client_update_checker.h
+++ b/cockatrice/src/client/network/update/client/client_update_checker.h
@@ -1,14 +1,17 @@
 /**
  * @file client_update_checker.h
  * @ingroup ClientUpdate
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CLIENT_UPDATE_CHECKER_H
 #define CLIENT_UPDATE_CHECKER_H
-#include <QObject>
+#include "release_channel.h"
 
-class Release;
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
 
 /**
  * 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 9edfe7caf..45c503623 100644
--- a/cockatrice/src/client/network/update/client/release_channel.cpp
+++ b/cockatrice/src/client/network/update/client/release_channel.cpp
@@ -2,14 +2,27 @@
 
 #include "version_string.h"
 
+#include <QByteArray>
+#include <QDebug>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QMessageBox>
+#include <QJsonParseError>
+#include <QJsonValue>
+#include <QMap>
+#include <QMessageLogger>
+#include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QNetworkRequest>
 #include <QRegularExpression>
-#include <QSysInfo>
+#include <QRegularExpressionMatch>
+#include <QUrl>
+#include <QVariant>
+#include <QVariantMap>
 #include <QtGlobal>
+#include <optional>
+#include <qnamespace.h>
+#include <qprocessordetection.h>
 
 #if defined(Q_OS_MACOS)
 #include <sys/sysctl.h>
@@ -26,6 +39,29 @@
 
 #define GIT_SHORT_HASH_LEN 7
 
+namespace
+{
+
+#if defined(Q_OS_MACOS) || defined(Q_OS_WIN)
+// QSysInfo::productVersion() is not guaranteed to start with a number, e.g. it returns
+// "Server 2022" on Windows Server. Use the first numeric token as the major host version.
+std::optional<int> getProductVersionMajor()
+{
+    const QString versionString = QSysInfo::productVersion();
+    bool ok = false;
+    static const QRegularExpression firstNumber(R"((\d+))");
+    const auto match = firstNumber.match(versionString);
+    const int version = match.hasMatch() ? match.captured(1).toInt(&ok) : 0;
+    if (!ok) {
+        qCWarning(ReleaseChannelLog) << "Unable to determine OS version from" << versionString;
+        return std::nullopt;
+    }
+    return version;
+}
+#endif
+
+} // namespace
+
 ReleaseChannel::ReleaseChannel() : netMan(new QNetworkAccessManager(this)), response(nullptr), lastRelease(nullptr)
 {
 }
@@ -43,55 +79,93 @@ void ReleaseChannel::checkForUpdates()
     connect(response, &QNetworkReply::finished, this, &ReleaseChannel::releaseListFinished);
 }
 
-// Different release channel checking functions for different operating systems
-bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)
+// Find assets compatible with host platform (Linux is not supported by in-client updater)
+std::optional<int> ReleaseChannel::getTargetVersionForCurrentOS(const QString &fileName)
 {
-#if defined(Q_OS_MACOS)
-    static QRegularExpression version_regex("macOS(\\d+)");
-    auto match = version_regex.match(fileName);
-    if (!match.hasMatch()) {
-        return false;
+#if defined(Q_OS_WIN) && Q_PROCESSOR_WORDSIZE == 4
+    // The published Windows assets are 64-bit only
+    Q_UNUSED(fileName);
+    return std::nullopt;
+#endif
+
+    const QRegularExpression *regex = nullptr;
+
+    // Only platforms shipping updater assets (macOS, Windows) need the host version
+    static const std::optional<int> systemVersion =
+#if defined(Q_OS_MACOS) || defined(Q_OS_WIN)
+        getProductVersionMajor();
+#else
+        std::nullopt;
+#endif
+
+    if (!systemVersion) {
+        return std::nullopt;
     }
 
-    auto getSystemVersion = [] {
+#if defined(Q_OS_MACOS)
+    static const bool isIntel = [] {
         // QSysInfo does not go through translation layers
         // We need to use sysctl to reliably detect the underlying architecture
         char arch[255];
         size_t len = sizeof(arch);
         if (sysctlbyname("machdep.cpu.brand_string", arch, &len, nullptr, 0) == 0) {
-            // Intel mac is only supported on macOS 13 versions
-            if (QString::fromUtf8(arch).contains("Intel")) {
-                return 13;
-            }
+            return QString::fromUtf8(arch).contains("Intel");
         }
+        return false;
+    }();
 
-        return QSysInfo::productVersion().split(".")[0].toInt();
-    };
-
-    // older(smaller) releases are compatible with a newer or the same system version
-    int sys_maj = getSystemVersion();
-    int rel_maj = match.captured(1).toInt();
-    return rel_maj == sys_maj;
+    // Apple (ARM) --> Cockatrice-3.0.0-macOS15.dmg
+    // Apple (x86) --> Cockatrice-3.0.0-macOS15_Intel.dmg
+    static const QRegularExpression macIntelRegex(R"(-macOS(\d+)_Intel\.[^.]+$)",
+                                                  QRegularExpression::CaseInsensitiveOption);
+    static const QRegularExpression macRegex(R"(-macOS(\d+)\.[^.]+$)", QRegularExpression::CaseInsensitiveOption);
+    regex = isIntel ? &macIntelRegex : &macRegex;
 
 #elif defined(Q_OS_WIN)
-#if Q_PROCESSOR_WORDSIZE == 4
-    return fileName.contains("32bit");
-#elif Q_PROCESSOR_WORDSIZE == 8
-    const QString &version = QSysInfo::productVersion();
-    if (version.startsWith("7") || version.startsWith("8")) {
-        return fileName.contains("Win7");
-    } else {
-        return fileName.contains("Win10");
-    }
-#else
+    // Windows (x86) --> Cockatrice-3.0.0-Windows10.exe
+    static const QRegularExpression winRegex(R"(-(?:Win|Windows)(\d+)\.[^.]+$)",
+                                             QRegularExpression::CaseInsensitiveOption);
+    regex = &winRegex;
+
+#else // if the OS doesn't fit one of the above #defines, then it will never match
     Q_UNUSED(fileName);
-    return false;
+    return std::nullopt;
 #endif
 
-#else // If the OS doesn't fit one of the above #defines, then it will never match
-    Q_UNUSED(fileName);
-    return false;
-#endif
+    // Any asset targeting an OS version up to the current host version works
+    auto match = regex->match(fileName);
+    if (!match.hasMatch()) {
+        return std::nullopt;
+    }
+    const int targetVersion = match.captured(1).toInt();
+    if (targetVersion > *systemVersion) {
+        return std::nullopt;
+    }
+    return targetVersion;
+}
+
+// Pick newest targeted version (highest number) amongst all compatible ones
+QString ReleaseChannel::findBestDownloadUrl(const QVariantList &assets)
+{
+    QString bestUrl;
+    int bestVersion = -1;
+    for (const auto &rawAsset : assets) {
+        QVariantMap asset = rawAsset.toMap();
+        QString name = asset["name"].toString();
+        QString url = asset["browser_download_url"].toString();
+        auto version = getTargetVersionForCurrentOS(name);
+        if (!version) {
+            continue;
+        }
+        if (*version > bestVersion) {
+            bestVersion = *version;
+            bestUrl = url;
+        }
+    }
+    if (!bestUrl.isEmpty()) {
+        qCInfo(ReleaseChannelLog) << "Best compatible asset=" << bestUrl;
+    }
+    return bestUrl;
 }
 
 QString StableReleaseChannel::getManualDownloadUrl() const
@@ -129,24 +203,18 @@ void StableReleaseChannel::releaseListFinished()
         return;
     }
 
-    if (!lastRelease)
+    if (!lastRelease) {
         lastRelease = new Release;
+    }
 
     lastRelease->setName(resultMap["name"].toString());
     lastRelease->setDescriptionUrl(resultMap["html_url"].toString());
     lastRelease->setPublishDate(resultMap["published_at"].toDate());
 
     if (resultMap.contains("assets")) {
-        auto rawAssets = resultMap["assets"].toList();
-        for (const auto &rawAsset : rawAssets) {
-            QVariantMap asset = rawAsset.toMap();
-            QString name = asset["name"].toString();
-            QString url = asset["browser_download_url"].toString();
-
-            if (downloadMatchesCurrentOS(name)) {
-                lastRelease->setDownloadUrl(url);
-                break;
-            }
+        auto url = findBestDownloadUrl(resultMap["assets"].toList());
+        if (!url.isEmpty()) {
+            lastRelease->setDownloadUrl(url);
         }
     }
 
@@ -246,8 +314,9 @@ void BetaReleaseChannel::releaseListFinished()
         return;
     }
 
-    if (lastRelease == nullptr)
+    if (lastRelease == nullptr) {
         lastRelease = new Release;
+    }
 
     lastRelease->setCommitHash(resultMap["target_commitish"].toString());
     lastRelease->setPublishDate(resultMap["published_at"].toDate());
@@ -287,21 +356,10 @@ void BetaReleaseChannel::fileListFinished()
     bool needToUpdate = (QString::compare(shortHash, myHash, Qt::CaseInsensitive) != 0);
     bool compatibleVersion = false;
 
-    QStringList resultUrlList{};
-    for (QVariant file : resultList) {
-        QVariantMap map = file.toMap();
-        resultUrlList << map["browser_download_url"].toString();
-    }
-
-    resultUrlList.sort();
-    // iterate in reverse so the first item is the latest os version
-    for (auto url = resultUrlList.rbegin(); url < resultUrlList.rend(); ++url) {
-        if (downloadMatchesCurrentOS(*url)) {
-            compatibleVersion = true;
-            lastRelease->setDownloadUrl(*url);
-            qCInfo(ReleaseChannelLog) << "Found compatible version url=" << *url;
-            break;
-        }
+    QString downloadUrl = findBestDownloadUrl(resultList);
+    if (!downloadUrl.isEmpty()) {
+        compatibleVersion = true;
+        lastRelease->setDownloadUrl(downloadUrl);
     }
 
     emit finishedCheck(needToUpdate, compatibleVersion, lastRelease);
diff --git a/cockatrice/src/client/network/update/client/release_channel.h b/cockatrice/src/client/network/update/client/release_channel.h
index 93e6b985d..183a766ab 100644
--- a/cockatrice/src/client/network/update/client/release_channel.h
+++ b/cockatrice/src/client/network/update/client/release_channel.h
@@ -1,8 +1,8 @@
 /**
  * @file release_channel.h
  * @ingroup ClientUpdate
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef RELEASECHANNEL_H
 #define RELEASECHANNEL_H
@@ -11,7 +11,9 @@
 #include <QLoggingCategory>
 #include <QObject>
 #include <QString>
-#include <QVariantMap>
+#include <QVariantList>
+#include <optional>
+#include <qtmetamacros.h>
 #include <utility>
 
 inline Q_LOGGING_CATEGORY(ReleaseChannelLog, "release_channel");
@@ -96,7 +98,8 @@ protected:
     Release *lastRelease;
 
 protected:
-    static bool downloadMatchesCurrentOS(const QString &fileName);
+    static std::optional<int> getTargetVersionForCurrentOS(const QString &fileName);
+    static QString findBestDownloadUrl(const QVariantList &assets);
     [[nodiscard]] virtual QString getReleaseChannelUrl() const = 0;
 
 public:
diff --git a/cockatrice/src/client/network/update/client/update_downloader.cpp b/cockatrice/src/client/network/update/client/update_downloader.cpp
index c0f3e945c..c86972d60 100644
--- a/cockatrice/src/client/network/update/client/update_downloader.cpp
+++ b/cockatrice/src/client/network/update/client/update_downloader.cpp
@@ -1,6 +1,14 @@
 #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)
 {
@@ -10,8 +18,9 @@ UpdateDownloader::UpdateDownloader(QObject *parent) : QObject(parent), response(
 void UpdateDownloader::beginDownload(QUrl downloadUrl)
 {
     // Save the original URL because we need it for the filename
-    if (originalUrl.isEmpty())
+    if (originalUrl.isEmpty()) {
         originalUrl = downloadUrl;
+    }
 
     response = netMan->get(QNetworkRequest(downloadUrl));
     connect(response, &QNetworkReply::finished, this, &UpdateDownloader::fileFinished);
@@ -21,8 +30,9 @@ void UpdateDownloader::beginDownload(QUrl downloadUrl)
 
 void UpdateDownloader::downloadError(QNetworkReply::NetworkError)
 {
-    if (response == nullptr)
+    if (response == nullptr) {
         return;
+    }
 
     emit error(response->errorString().toUtf8());
 }
diff --git a/cockatrice/src/client/network/update/client/update_downloader.h b/cockatrice/src/client/network/update/client/update_downloader.h
index d70759038..8aeefb22a 100644
--- a/cockatrice/src/client/network/update/client/update_downloader.h
+++ b/cockatrice/src/client/network/update/client/update_downloader.h
@@ -1,14 +1,20 @@
 /**
  * @file update_downloader.h
  * @ingroup ClientUpdate
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_UPDATEDOWNLOADER_H
 #define COCKATRICE_UPDATEDOWNLOADER_H
 
+#include <QNetworkReply>
 #include <QObject>
-#include <QtNetwork>
+#include <QString>
+#include <QUrl>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class QNetworkAccessManager;
 
 class UpdateDownloader : public QObject
 {
diff --git a/cockatrice/src/client/settings/cache_settings.cpp b/cockatrice/src/client/settings/cache_settings.cpp
index 7a518df67..15a41e7e1 100644
--- a/cockatrice/src/client/settings/cache_settings.cpp
+++ b/cockatrice/src/client/settings/cache_settings.cpp
@@ -2,16 +2,45 @@
 
 #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 <QAbstractListModel>
 #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>
 #include <libcockatrice/settings/card_override_settings.h>
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/settings/chat_settings.h>
+#include <libcockatrice/settings/commander_bracket_settings.h>
+#include <libcockatrice/settings/debug_settings.h>
+#include <libcockatrice/settings/deck_editor_settings.h>
+#include <libcockatrice/settings/download_settings.h>
+#include <libcockatrice/settings/game_filters_settings.h>
+#include <libcockatrice/settings/game_settings.h>
+#include <libcockatrice/settings/interface_settings.h>
+#include <libcockatrice/settings/layouts_settings.h>
+#include <libcockatrice/settings/message_settings.h>
+#include <libcockatrice/settings/network_settings.h>
+#include <libcockatrice/settings/paths_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
+#include <libcockatrice/settings/recents_settings.h>
+#include <libcockatrice/settings/servers_settings.h>
+#include <libcockatrice/settings/settings_migration.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 <utility>
 
 Q_GLOBAL_STATIC(SettingsCache, settingsCache)
@@ -23,10 +52,11 @@ SettingsCache &SettingsCache::instance()
 
 QString SettingsCache::getDataPath()
 {
-    if (isPortableBuild)
+    if (isPortableBuild) {
         return qApp->applicationDirPath() + "/data";
-    else
+    } else {
         return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
+    }
 }
 
 QString SettingsCache::getSettingsPath()
@@ -36,10 +66,11 @@ QString SettingsCache::getSettingsPath()
 
 QString SettingsCache::getCachePath() const
 {
-    if (isPortableBuild)
+    if (isPortableBuild) {
         return qApp->applicationDirPath() + "/cache";
-    else
+    } else {
         return QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
+    }
 }
 
 QString SettingsCache::getNetworkCachePath() const
@@ -47,107 +78,15 @@ QString SettingsCache::getNetworkCachePath() const
     return getCachePath() + "/downloaded/";
 }
 
-void SettingsCache::translateLegacySettings()
-{
-    if (isPortableBuild)
-        return;
-
-    // Layouts
-    QFile layoutFile(getSettingsPath() + "layouts/deckLayout.ini");
-    if (layoutFile.exists())
-        if (layoutFile.copy(getSettingsPath() + "layouts.ini"))
-            layoutFile.remove();
-
-    QStringList usedKeys;
-    QSettings legacySetting;
-
-    // Sets
-    legacySetting.beginGroup("sets");
-    QStringList setsGroups = legacySetting.childGroups();
-    for (int i = 0; i < setsGroups.size(); i++) {
-        legacySetting.beginGroup(setsGroups.at(i));
-        cardDatabase()->setEnabled(setsGroups.at(i), legacySetting.value("enabled").toBool());
-        cardDatabase()->setIsKnown(setsGroups.at(i), legacySetting.value("isknown").toBool());
-        cardDatabase()->setSortKey(setsGroups.at(i), legacySetting.value("sortkey").toUInt());
-        legacySetting.endGroup();
-    }
-    QStringList setsKeys = legacySetting.allKeys();
-    for (int i = 0; i < setsKeys.size(); ++i) {
-        usedKeys.append("sets/" + setsKeys.at(i));
-    }
-    legacySetting.endGroup();
-
-    // Servers
-    legacySetting.beginGroup("server");
-    servers().setPreviousHostLogin(legacySetting.value("previoushostlogin").toInt());
-    servers().setPreviousHostList(legacySetting.value("previoushosts").toStringList());
-    servers().setAutoConnect(legacySetting.value("auto_connect").toInt());
-    servers().setFPHostName(legacySetting.value("fphostname").toString());
-    servers().setFPPort(legacySetting.value("fpport").toString());
-    servers().setFPPlayerName(legacySetting.value("fpplayername").toString());
-    usedKeys.append(legacySetting.allKeys());
-    QStringList allKeysServer = legacySetting.allKeys();
-    for (int i = 0; i < allKeysServer.size(); ++i) {
-        usedKeys.append("server/" + allKeysServer.at(i));
-    }
-    legacySetting.endGroup();
-
-    // Messages
-    legacySetting.beginGroup("messages");
-    QStringList allMessages = legacySetting.allKeys();
-    for (int i = 0; i < allMessages.size(); ++i) {
-        if (allMessages.at(i) != "count") {
-            QString temp = allMessages.at(i);
-            int index = temp.remove("msg").toInt();
-            messages().setMessageAt(index, legacySetting.value(allMessages.at(i)).toString());
-        }
-    }
-    messages().setCount(legacySetting.value("count").toInt());
-    QStringList allKeysmessages = legacySetting.allKeys();
-    for (int i = 0; i < allKeysmessages.size(); ++i) {
-        usedKeys.append("messages/" + allKeysmessages.at(i));
-    }
-    legacySetting.endGroup();
-
-    // Game filters
-    legacySetting.beginGroup("filter_games");
-    gameFilters().setGameNameFilter(legacySetting.value("game_name_filter").toString());
-    gameFilters().setHideIgnoredUserGames(legacySetting.value("hide_ignored_user_games").toBool());
-    gameFilters().setMinPlayers(legacySetting.value("min_players").toInt());
-
-    if (legacySetting.value("max_players").toInt() > 1)
-        gameFilters().setMaxPlayers(legacySetting.value("max_players").toInt());
-    else
-        gameFilters().setMaxPlayers(99); // This prevents a bug where no games will show if max was not set before
-
-    QStringList allFilters = legacySetting.allKeys();
-    for (int i = 0; i < allFilters.size(); ++i) {
-        if (allFilters.at(i).startsWith("game_type")) {
-            gameFilters().setGameHashedTypeEnabled(allFilters.at(i), legacySetting.value(allFilters.at(i)).toBool());
-        }
-    }
-    QStringList allKeysfilter_games = legacySetting.allKeys();
-    for (int i = 0; i < allKeysfilter_games.size(); ++i) {
-        usedKeys.append("filter_games/" + allKeysfilter_games.at(i));
-    }
-    legacySetting.endGroup();
-
-    QStringList allLegacyKeys = legacySetting.allKeys();
-    for (int i = 0; i < allLegacyKeys.size(); ++i) {
-        if (usedKeys.contains(allLegacyKeys.at(i)))
-            continue;
-        settings->setValue(allLegacyKeys.at(i), legacySetting.value(allLegacyKeys.at(i)));
-    }
-}
-
 QString SettingsCache::getSafeConfigPath(QString configEntry, QString defaultPath) const
 {
     QString tmp = settings->value(configEntry).toString();
     // if the config settings is empty or refers to a not-existing folder,
     // ensure that the defaut path exists and return it
     if (tmp.isEmpty() || !QDir(tmp).exists()) {
-        if (!QDir().mkpath(defaultPath))
+        if (!QDir().mkpath(defaultPath)) {
             qCInfo(SettingsCacheLog) << "[SettingsCache] Could not create folder:" << defaultPath;
+        }
         tmp = defaultPath;
     }
     return tmp;
@@ -158,8 +97,9 @@ QString SettingsCache::getSafeConfigFilePath(QString configEntry, QString defaul
     QString tmp = settings->value(configEntry).toString();
     // if the config settings is empty or refers to a not-existing file,
     // return the default Path
-    if (!QFile::exists(tmp) || tmp.isEmpty())
+    if (!QFile::exists(tmp) || tmp.isEmpty()) {
         tmp = std::move(defaultPath);
+    }
     return tmp;
 }
 
@@ -167,14 +107,32 @@ SettingsCache::SettingsCache()
 {
     // first, figure out if we are running in portable mode
     isPortableBuild = QFile::exists(qApp->applicationDirPath() + "/portable.dat");
-    if (isPortableBuild)
+    if (isPortableBuild) {
         qCInfo(SettingsCacheLog) << "Portable mode enabled";
-
-    // define a dummy context that will be used where needed
-    QString dummy = QT_TRANSLATE_NOOP("i18n", "English");
+    }
 
     QString settingsPath = getSettingsPath();
+
     settings = new QSettings(settingsPath + "global.ini", QSettings::IniFormat, this);
+
+    // Both migrations below overwrite per-domain files in place, so snapshot the whole settings
+    // folder first: global.ini is preserved as global.ini.old, but pre-existing per-domain files
+    // (and a re-migration after a downgrade) would otherwise have no way back.
+    if (SettingsMigration::isMigrationPending(settingsPath)) {
+        const QString backupPath = SettingsMigration::backupSettingsDirectory(settingsPath);
+        if (!backupPath.isEmpty()) {
+            qCInfo(SettingsCacheLog) << "[SettingsCache] Settings backed up before migration:" << backupPath;
+        }
+    }
+
+    // Migrate from legacy NativeFormat settings to per-class INI files (runs at most once)
+    if (!isPortableBuild) {
+        SettingsMigration::migrateLegacySettings(settingsPath);
+    }
+
+    // Migrate settings from global.ini to per-class INI files (runs at most once)
+    SettingsMigration::migrateSettingsFromGlobalIni(settingsPath);
+
     shortcutsSettings = new ShortcutsSettings(settingsPath, this);
     cardDatabaseSettings = new CardDatabaseSettings(settingsPath, this);
     serversSettings = new ServersSettings(settingsPath, this);
@@ -185,1367 +143,330 @@ SettingsCache::SettingsCache()
     recentsSettings = new RecentsSettings(settingsPath, this);
     cardOverrideSettings = new CardOverrideSettings(settingsPath, this);
     debugSettings = new DebugSettings(settingsPath, this);
-
     cardCounterSettings = new CardCounterSettings(settingsPath, this);
 
-    if (!QFile(settingsPath + "global.ini").exists())
-        translateLegacySettings();
+    tabsSettings = new TabsSettings(settingsPath, this);
+    soundSettings = new SoundSettings(settingsPath, this);
+    gameSettings = new GameSettings(settingsPath, this);
+    chatSettings = new ChatSettings(settingsPath, this);
+    cacheStorageSettings = new CacheStorageSettings(settingsPath, this);
+    updatesSettings = new UpdatesSettings(settingsPath, this);
+    personalSettings = new PersonalSettings(settingsPath, this);
+    cardsDisplaySettings = new CardsDisplaySettings(settingsPath, this);
+    interfaceSettings = new InterfaceSettings(settingsPath, this);
+    deckEditorSettings = new DeckEditorSettings(settingsPath, this);
+    pathsSettings = new PathsSettings(settingsPath, this);
+    visualDeckStorageSettings = new VisualDeckStorageSettings(settingsPath, this);
+    appearanceSettings = new AppearanceSettings(settingsPath, this);
+    networkSettings = new NetworkSettings(settingsPath, this);
+    commanderBracketSettings = new CommanderBracketSettings(settingsPath, this);
+
+    // Forward ICardDatabasePathProvider signal from PathsSettings
+    connect(pathsSettings, &PathsSettings::cardDatabasePathChanged, this,
+            &ICardDatabasePathProvider::cardDatabasePathChanged);
 
     // updates - don't reorder them or their index in the settings won't match
     // append channels one by one, or msvc will add them in the wrong order.
     releaseChannels << new StableReleaseChannel();
     releaseChannels << new BetaReleaseChannel();
 
-    mbDownloadSpoilers = settings->value("personal/downloadspoilers", false).toBool();
+    themeName = appearanceSettings->getThemeName();
 
-    checkUpdatesOnStartup = settings->value("personal/startupUpdateCheck", true).toBool();
-    startupCardUpdateCheckPromptForUpdate =
-        settings->value("personal/startupCardUpdateCheckPromptForUpdate", true).toBool();
-    startupCardUpdateCheckAlwaysUpdate = settings->value("personal/startupCardUpdateCheckAlwaysUpdate", false).toBool();
-    cardUpdateCheckInterval = settings->value("personal/cardUpdateCheckInterval", 7).toInt();
-    lastCardUpdateCheck = settings->value("personal/lastCardUpdateCheck", QDateTime::currentDateTime().date()).toDate();
-    notifyAboutUpdates = settings->value("personal/updatenotification", true).toBool();
-    notifyAboutNewVersion = settings->value("personal/newversionnotification", true).toBool();
-    updateReleaseChannel = settings->value("personal/updatereleasechannel", 0).toInt();
-
-    lang = settings->value("personal/lang").toString();
-    keepalive = settings->value("personal/keepalive", 3).toInt();
-    timeout = settings->value("personal/timeout", 5).toInt();
-
-    // tip of the day settings
-    showTipsOnStartup = settings->value("tipOfDay/showTips", true).toBool();
-    for (const auto &tipNumber : settings->value("tipOfDay/seenTips").toList()) {
-        seenTips.append(tipNumber.toInt());
+    auto definitions = commanderBracketSettings->loadDefinitions();
+    if (definitions.isEmpty()) {
+        definitions = CommanderBracketSettings::defaultDefinitions();
     }
+    commanderBracketSettings->reloadDefinitions(definitions);
 
     loadPaths();
-
-    themeName = settings->value("theme/name").toString();
-
-    homeTabBackgroundSource = settings->value("home/background", "themed").toString();
-    homeTabBackgroundShuffleFrequency = settings->value("home/background/shuffleTimer", 0).toInt();
-
-    tabVisualDeckStorageOpen = settings->value("tabs/visualDeckStorage", true).toBool();
-    tabServerOpen = settings->value("tabs/server", true).toBool();
-    tabAccountOpen = settings->value("tabs/account", true).toBool();
-    tabDeckStorageOpen = settings->value("tabs/deckStorage", true).toBool();
-    tabReplaysOpen = settings->value("tabs/replays", true).toBool();
-    tabAdminOpen = settings->value("tabs/admin", true).toBool();
-    tabLogOpen = settings->value("tabs/log", true).toBool();
-
-    // we only want to reset the cache once, then its up to the user
-    bool updateCache = settings->value("revert/pixmapCacheSize", false).toBool();
-    if (!updateCache) {
-        pixmapCacheSize = PIXMAPCACHE_SIZE_DEFAULT;
-        settings->setValue("personal/pixmapCacheSize", pixmapCacheSize);
-        settings->setValue("personal/picturedownloadhq", false);
-        settings->setValue("revert/pixmapCacheSize", true);
-    } else
-        pixmapCacheSize = settings->value("personal/pixmapCacheSize", PIXMAPCACHE_SIZE_DEFAULT).toInt();
-    // sanity check
-    if (pixmapCacheSize < PIXMAPCACHE_SIZE_MIN || pixmapCacheSize > PIXMAPCACHE_SIZE_MAX)
-        pixmapCacheSize = PIXMAPCACHE_SIZE_DEFAULT;
-
-    networkCacheSize = settings->value("personal/networkCacheSize", NETWORK_CACHE_SIZE_DEFAULT).toInt();
-    redirectCacheTtl = settings->value("personal/redirectCacheTtl", NETWORK_REDIRECT_CACHE_TTL_DEFAULT).toInt();
-
-    picDownload = settings->value("personal/picturedownload", true).toBool();
-    showStatusBar = settings->value("personal/showStatusBar", false).toBool();
-
-    mainWindowGeometry = settings->value("interface/main_window_geometry").toByteArray();
-    tokenDialogGeometry = settings->value("interface/token_dialog_geometry").toByteArray();
-    setsDialogGeometry = settings->value("interface/sets_dialog_geometry").toByteArray();
-    notificationsEnabled = settings->value("interface/notificationsenabled", true).toBool();
-    spectatorNotificationsEnabled = settings->value("interface/specnotificationsenabled", false).toBool();
-    buddyConnectNotificationsEnabled = settings->value("interface/buddyconnectnotificationsenabled", true).toBool();
-    doubleClickToPlay = settings->value("interface/doubleclicktoplay", true).toBool();
-    clickPlaysAllSelected = settings->value("interface/clickPlaysAllSelected", true).toBool();
-    playToStack = settings->value("interface/playtostack", true).toBool();
-    doNotDeleteArrowsInSubPhases = settings->value("interface/doNotDeleteArrowsInSubPhases", true).toBool();
-    startingHandSize = settings->value("interface/startinghandsize", 7).toInt();
-    annotateTokens = settings->value("interface/annotatetokens", false).toBool();
-    tabGameSplitterSizes = settings->value("interface/tabgame_splittersizes").toByteArray();
-    knownMissingFeatures = settings->value("interface/knownmissingfeatures", "").toString();
-    useTearOffMenus = settings->value("interface/usetearoffmenus", true).toBool();
-    cardViewInitialRowsMax = settings->value("interface/cardViewInitialRowsMax", 14).toInt();
-    cardViewExpandedRowsMax = settings->value("interface/cardViewExpandedRowsMax", 20).toInt();
-    closeEmptyCardView = settings->value("interface/closeEmptyCardView", true).toBool();
-    focusCardViewSearchBar = settings->value("interface/focusCardViewSearchBar", true).toBool();
-
-    showShortcuts = settings->value("menu/showshortcuts", true).toBool();
-    displayCardNames = settings->value("cards/displaycardnames", true).toBool();
-    roundCardCorners = settings->value("cards/roundcardcorners", true).toBool();
-    overrideAllCardArtWithPersonalPreference =
-        settings->value("cards/overrideallcardartwithpersonalpreference", false).toBool();
-    bumpSetsWithCardsInDeckToTop = settings->value("cards/bumpsetswithcardsindecktotop", true).toBool();
-    printingSelectorSortOrder = settings->value("cards/printingselectorsortorder", 1).toInt();
-    printingSelectorCardSize = settings->value("cards/printingselectorcardsize", 100).toInt();
-    includeRebalancedCards = settings->value("cards/includerebalancedcards", true).toBool();
-    printingSelectorNavigationButtonsVisible =
-        settings->value("cards/printingselectornavigationbuttonsvisible", true).toBool();
-    deckEditorBannerCardComboBoxVisible =
-        settings->value("interface/deckeditorbannercardcomboboxvisible", true).toBool();
-    deckEditorTagsWidgetVisible = settings->value("interface/deckeditortagswidgetvisible", true).toBool();
-    visualDeckStorageCardSize = settings->value("interface/visualdeckstoragecardsize", 100).toInt();
-    visualDeckStorageSortingOrder = settings->value("interface/visualdeckstoragesortingorder", 0).toInt();
-    visualDeckStorageShowFolders = settings->value("interface/visualdeckstorageshowfolders", true).toBool();
-    visualDeckStorageShowTagFilter = settings->value("interface/visualdeckstorageshowtagfilter", true).toBool();
-    visualDeckStorageDefaultTagsList =
-        settings->value("interface/visualdeckstoragedefaulttagslist", defaultTags).toStringList();
-    visualDeckStorageSearchFolderNames = settings->value("interface/visualdeckstoragesearchfoldernames", true).toBool();
-    visualDeckStorageShowBannerCardComboBox =
-        settings->value("interface/visualdeckstorageshowbannercardcombobox", true).toBool();
-    visualDeckStorageShowTagsOnDeckPreviews =
-        settings->value("interface/visualdeckstorageshowtagsondeckpreviews", true).toBool();
-    visualDeckStorageDrawUnusedColorIdentities =
-        settings->value("interface/visualdeckstoragedrawunusedcoloridentities", true).toBool();
-    visualDeckStorageUnusedColorIdentitiesOpacity =
-        settings->value("interface/visualdeckstorageunusedcoloridentitiesopacity", 15).toInt();
-    visualDeckStorageTooltipType = settings->value("interface/visualdeckstoragetooltiptype", 0).toInt();
-    visualDeckStoragePromptForConversion =
-        settings->value("interface/visualdeckstoragepromptforconversion", true).toBool();
-    visualDeckStorageAlwaysConvert = settings->value("interface/visualdeckstoragealwaysconvert", false).toBool();
-    visualDeckStorageInGame = settings->value("interface/visualdeckstorageingame", true).toBool();
-    visualDeckStorageSelectionAnimation =
-        settings->value("interface/visualdeckstorageselectionanimation", true).toBool();
-    defaultDeckEditorType = settings->value("interface/defaultDeckEditorType", 1).toInt();
-    visualDatabaseDisplayFilterToMostRecentSetsEnabled =
-        settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsenabled", false).toBool();
-    visualDatabaseDisplayFilterToMostRecentSetsAmount =
-        settings->value("interface/visualdatabasedisplayfiltertomostrecentsetsamount", 10).toInt();
-    visualDeckEditorSampleHandSize = settings->value("interface/visualdeckeditorsamplehandsize", 7).toInt();
-    visualDeckEditorCardSize = settings->value("interface/visualdeckeditorcardsize", 100).toInt();
-    visualDatabaseDisplayCardSize = settings->value("interface/visualdatabasedisplaycardsize", 100).toInt();
-    edhrecCardSize = settings->value("interface/edhreccardsize", 100).toInt();
-    archidektPreviewSize = settings->value("interface/archidektpreviewsize", 100).toInt();
-
-    horizontalHand = settings->value("hand/horizontal", true).toBool();
-    invertVerticalCoordinate = settings->value("table/invert_vertical", false).toBool();
-    minPlayersForMultiColumnLayout = settings->value("interface/min_players_multicolumn", 4).toInt();
-    tapAnimation = settings->value("cards/tapanimation", true).toBool();
-    autoRotateSidewaysLayoutCards = settings->value("cards/autorotatesidewayslayoutcards", true).toBool();
-
-    openDeckInNewTab = settings->value("editor/openDeckInNewTab", false).toBool();
-    rewindBufferingMs = settings->value("replay/rewindBufferingMs", 200).toInt();
-    chatMention = settings->value("chat/mention", true).toBool();
-    chatMentionCompleter = settings->value("chat/mentioncompleter", true).toBool();
-    chatMentionForeground = settings->value("chat/mentionforeground", true).toBool();
-    chatHighlightForeground = settings->value("chat/highlightforeground", true).toBool();
-    chatMentionColor = settings->value("chat/mentioncolor", "A6120D").toString();
-    chatHighlightColor = settings->value("chat/highlightcolor", "A6120D").toString();
-
-    zoneViewGroupByIndex = settings->value("zoneview/groupby", 1).toInt();
-    zoneViewSortByIndex = settings->value("zoneview/sortby", 1).toInt();
-    zoneViewPileView = settings->value("zoneview/pileview", true).toBool();
-
-    soundEnabled = settings->value("sound/enabled", false).toBool();
-    soundThemeName = settings->value("sound/theme").toString();
-
-    maxFontSize = settings->value("game/maxfontsize", DEFAULT_FONT_SIZE).toInt();
-
-    ignoreUnregisteredUsers = settings->value("chat/ignore_unregistered", false).toBool();
-    ignoreUnregisteredUserMessages = settings->value("chat/ignore_unregistered_messages", false).toBool();
-
-    scaleCards = settings->value("cards/scaleCards", true).toBool();
-    verticalCardOverlapPercent = settings->value("cards/verticalCardOverlapPercent", 33).toInt();
-    showMessagePopups = settings->value("chat/showmessagepopups", true).toBool();
-    showMentionPopups = settings->value("chat/showmentionpopups", true).toBool();
-    roomHistory = settings->value("chat/roomhistory", true).toBool();
-
-    leftJustified = settings->value("interface/leftjustified", false).toBool();
-
-    masterVolume = settings->value("sound/mastervolume", 100).toInt();
-
-    cardInfoViewMode = settings->value("cards/cardinfoviewmode", 0).toInt();
-    highlightWords = settings->value("personal/highlightWords", QString()).toString();
-    gameDescription = settings->value("game/gamedescription", "").toString();
-    maxPlayers = settings->value("game/maxplayers", 2).toInt();
-    gameTypes = settings->value("game/gametypes", "").toString();
-    onlyBuddies = settings->value("game/onlybuddies", false).toBool();
-    onlyRegistered = settings->value("game/onlyregistered", true).toBool();
-    spectatorsAllowed = settings->value("game/spectatorsallowed", true).toBool();
-    spectatorsNeedPassword = settings->value("game/spectatorsneedpassword", false).toBool();
-    spectatorsCanTalk = settings->value("game/spectatorscantalk", false).toBool();
-    spectatorsCanSeeEverything = settings->value("game/spectatorscanseeeverything", false).toBool();
-    createGameAsSpectator = settings->value("game/creategameasspectator", false).toBool();
-    defaultStartingLifeTotal = settings->value("game/defaultstartinglifetotal", 20).toInt();
-    shareDecklistsOnLoad = settings->value("game/sharedecklistsonload", false).toBool();
-    rememberGameSettings = settings->value("game/remembergamesettings", true).toBool();
-    clientID = settings->value("personal/clientid", CLIENT_INFO_NOT_SET).toString();
-    clientVersion = settings->value("personal/clientversion", CLIENT_INFO_NOT_SET).toString();
-}
-
-void SettingsCache::setUseTearOffMenus(bool _useTearOffMenus)
-{
-    useTearOffMenus = _useTearOffMenus;
-    settings->setValue("interface/usetearoffmenus", useTearOffMenus);
-    emit useTearOffMenusChanged(useTearOffMenus);
-}
-
-void SettingsCache::setCardViewInitialRowsMax(int _cardViewInitialRowsMax)
-{
-    cardViewInitialRowsMax = _cardViewInitialRowsMax;
-    settings->setValue("interface/cardViewInitialRowsMax", cardViewInitialRowsMax);
-}
-
-void SettingsCache::setCardViewExpandedRowsMax(int value)
-{
-    cardViewExpandedRowsMax = value;
-    settings->setValue("interface/cardViewExpandedRowsMax", cardViewExpandedRowsMax);
-}
-
-void SettingsCache::setCloseEmptyCardView(QT_STATE_CHANGED_T value)
-{
-    closeEmptyCardView = value;
-    settings->setValue("interface/closeEmptyCardView", closeEmptyCardView);
-}
-
-void SettingsCache::setFocusCardViewSearchBar(QT_STATE_CHANGED_T value)
-{
-    focusCardViewSearchBar = value;
-    settings->setValue("interface/focusCardViewSearchBar", focusCardViewSearchBar);
-}
-
-void SettingsCache::setKnownMissingFeatures(const QString &_knownMissingFeatures)
-{
-    knownMissingFeatures = _knownMissingFeatures;
-    settings->setValue("interface/knownmissingfeatures", knownMissingFeatures);
-}
-
-void SettingsCache::setCardInfoViewMode(const int _viewMode)
-{
-    cardInfoViewMode = _viewMode;
-    settings->setValue("cards/cardinfoviewmode", cardInfoViewMode);
-}
-
-void SettingsCache::setHighlightWords(const QString &_highlightWords)
-{
-    highlightWords = _highlightWords;
-    settings->setValue("personal/highlightWords", highlightWords);
-}
-
-void SettingsCache::setMasterVolume(int _masterVolume)
-{
-    masterVolume = _masterVolume;
-    settings->setValue("sound/mastervolume", masterVolume);
-    emit masterVolumeChanged(masterVolume);
-}
-
-void SettingsCache::setLeftJustified(const QT_STATE_CHANGED_T _leftJustified)
-{
-    leftJustified = (bool)_leftJustified;
-    settings->setValue("interface/leftjustified", leftJustified);
-    emit handJustificationChanged();
-}
-
-void SettingsCache::setCardScaling(const QT_STATE_CHANGED_T _scaleCards)
-{
-    scaleCards = (bool)_scaleCards;
-    settings->setValue("cards/scaleCards", scaleCards);
-}
-
-void SettingsCache::setStackCardOverlapPercent(const int _verticalCardOverlapPercent)
-{
-    verticalCardOverlapPercent = _verticalCardOverlapPercent;
-    settings->setValue("cards/verticalCardOverlapPercent", verticalCardOverlapPercent);
-}
-
-void SettingsCache::setShowMessagePopups(const QT_STATE_CHANGED_T _showMessagePopups)
-{
-    showMessagePopups = (bool)_showMessagePopups;
-    settings->setValue("chat/showmessagepopups", showMessagePopups);
-}
-
-void SettingsCache::setShowMentionPopups(const QT_STATE_CHANGED_T _showMentionPopus)
-{
-    showMentionPopups = (bool)_showMentionPopus;
-    settings->setValue("chat/showmentionpopups", showMentionPopups);
-}
-
-void SettingsCache::setRoomHistory(const QT_STATE_CHANGED_T _roomHistory)
-{
-    roomHistory = (bool)_roomHistory;
-    settings->setValue("chat/roomhistory", roomHistory);
-}
-
-void SettingsCache::setLang(const QString &_lang)
-{
-    lang = _lang;
-    settings->setValue("personal/lang", lang);
-    emit langChanged();
-}
-
-void SettingsCache::setShowTipsOnStartup(bool _showTipsOnStartup)
-{
-    showTipsOnStartup = _showTipsOnStartup;
-    settings->setValue("tipOfDay/showTips", showTipsOnStartup);
-}
-
-void SettingsCache::setSeenTips(const QList<int> &_seenTips)
-{
-    seenTips = _seenTips;
-    QList<QVariant> storedTipList;
-    for (auto tipNumber : seenTips) {
-        storedTipList.append(tipNumber);
-    }
-    settings->setValue("tipOfDay/seenTips", storedTipList);
-}
-
-void SettingsCache::setDeckPath(const QString &_deckPath)
-{
-    deckPath = _deckPath;
-    settings->setValue("paths/decks", deckPath);
-}
-
-void SettingsCache::setFiltersPath(const QString &_filtersPath)
-{
-    filtersPath = _filtersPath;
-    settings->setValue("paths/filters", filtersPath);
-}
-
-void SettingsCache::setReplaysPath(const QString &_replaysPath)
-{
-    replaysPath = _replaysPath;
-    settings->setValue("paths/replays", replaysPath);
-}
-
-void SettingsCache::setThemesPath(const QString &_themesPath)
-{
-    themesPath = _themesPath;
-    settings->setValue("paths/themes", themesPath);
-    emit themeChanged();
-}
-
-void SettingsCache::setCustomCardDatabasePath(const QString &_customCardDatabasePath)
-{
-    customCardDatabasePath = _customCardDatabasePath;
-    settings->setValue("paths/customsets", customCardDatabasePath);
-    emit cardDatabasePathChanged();
-}
-
-void SettingsCache::setPicsPath(const QString &_picsPath)
-{
-    picsPath = _picsPath;
-    settings->setValue("paths/pics", picsPath);
-    // get a new value for customPicsPath, currently derived from picsPath
-    if (picsPath.endsWith("/")) {
-        customPicsPath = getSafeConfigPath("paths/custompics", picsPath + "CUSTOM/");
-    } else {
-        customPicsPath = getSafeConfigPath("paths/custompics", picsPath + "/CUSTOM/");
-    }
-    emit picsPathChanged();
-}
-
-void SettingsCache::setCardDatabasePath(const QString &_cardDatabasePath)
-{
-    cardDatabasePath = _cardDatabasePath;
-    settings->setValue("paths/carddatabase", cardDatabasePath);
-    emit cardDatabasePathChanged();
-}
-
-void SettingsCache::setSpoilerDatabasePath(const QString &_spoilerDatabasePath)
-{
-    spoilerDatabasePath = _spoilerDatabasePath;
-    settings->setValue("paths/spoilerdatabase", spoilerDatabasePath);
-    emit cardDatabasePathChanged();
-}
-
-void SettingsCache::setTokenDatabasePath(const QString &_tokenDatabasePath)
-{
-    tokenDatabasePath = _tokenDatabasePath;
-    settings->setValue("paths/tokendatabase", tokenDatabasePath);
-    emit cardDatabasePathChanged();
 }
 
 void SettingsCache::setThemeName(const QString &_themeName)
 {
     themeName = _themeName;
-    settings->setValue("theme/name", themeName);
+    appearanceSettings->setThemeName(themeName);
     emit themeChanged();
 }
 
-void SettingsCache::setHomeTabBackgroundSource(const QString &_backgroundSource)
-{
-    homeTabBackgroundSource = _backgroundSource;
-    settings->setValue("home/background", homeTabBackgroundSource);
-    emit homeTabBackgroundSourceChanged();
-}
-
-void SettingsCache::setHomeTabBackgroundShuffleFrequency(int _frequency)
-{
-    homeTabBackgroundShuffleFrequency = _frequency;
-    settings->setValue("home/background/shuffleTimer", homeTabBackgroundShuffleFrequency);
-    emit homeTabBackgroundShuffleFrequencyChanged();
-}
-
-void SettingsCache::setTabVisualDeckStorageOpen(bool value)
-{
-    tabVisualDeckStorageOpen = value;
-    settings->setValue("tabs/visualDeckStorage", tabVisualDeckStorageOpen);
-}
-
-void SettingsCache::setTabServerOpen(bool value)
-{
-    tabServerOpen = value;
-    settings->setValue("tabs/server", tabServerOpen);
-}
-
-void SettingsCache::setTabAccountOpen(bool value)
-{
-    tabAccountOpen = value;
-    settings->setValue("tabs/account", tabAccountOpen);
-}
-
-void SettingsCache::setTabDeckStorageOpen(bool value)
-{
-    tabDeckStorageOpen = value;
-    settings->setValue("tabs/deckStorage", tabDeckStorageOpen);
-}
-
-void SettingsCache::setTabReplaysOpen(bool value)
-{
-    tabReplaysOpen = value;
-    settings->setValue("tabs/replays", tabReplaysOpen);
-}
-
-void SettingsCache::setTabAdminOpen(bool value)
-{
-    tabAdminOpen = value;
-    settings->setValue("tabs/admin", tabAdminOpen);
-}
-
-void SettingsCache::setTabLogOpen(bool value)
-{
-    tabLogOpen = value;
-    settings->setValue("tabs/log", tabLogOpen);
-}
-
-void SettingsCache::setPicDownload(QT_STATE_CHANGED_T _picDownload)
-{
-    picDownload = static_cast<bool>(_picDownload);
-    settings->setValue("personal/picturedownload", picDownload);
-    emit picDownloadChanged();
-}
-
-void SettingsCache::setShowStatusBar(bool value)
-{
-    showStatusBar = value;
-    settings->setValue("personal/showStatusBar", showStatusBar);
-    emit showStatusBarChanged(value);
-}
-
-void SettingsCache::setNotificationsEnabled(QT_STATE_CHANGED_T _notificationsEnabled)
-{
-    notificationsEnabled = static_cast<bool>(_notificationsEnabled);
-    settings->setValue("interface/notificationsenabled", notificationsEnabled);
-}
-
-void SettingsCache::setSpectatorNotificationsEnabled(QT_STATE_CHANGED_T _spectatorNotificationsEnabled)
-{
-    spectatorNotificationsEnabled = static_cast<bool>(_spectatorNotificationsEnabled);
-    settings->setValue("interface/specnotificationsenabled", spectatorNotificationsEnabled);
-}
-
-void SettingsCache::setBuddyConnectNotificationsEnabled(QT_STATE_CHANGED_T _buddyConnectNotificationsEnabled)
-{
-    buddyConnectNotificationsEnabled = static_cast<bool>(_buddyConnectNotificationsEnabled);
-    settings->setValue("interface/buddyconnectnotificationsenabled", buddyConnectNotificationsEnabled);
-}
-
-void SettingsCache::setDoubleClickToPlay(QT_STATE_CHANGED_T _doubleClickToPlay)
-{
-    doubleClickToPlay = static_cast<bool>(_doubleClickToPlay);
-    settings->setValue("interface/doubleclicktoplay", doubleClickToPlay);
-}
-
-void SettingsCache::setClickPlaysAllSelected(QT_STATE_CHANGED_T _clickPlaysAllSelected)
-{
-    clickPlaysAllSelected = static_cast<bool>(_clickPlaysAllSelected);
-    settings->setValue("interface/clickPlaysAllSelected", clickPlaysAllSelected);
-}
-
-void SettingsCache::setPlayToStack(QT_STATE_CHANGED_T _playToStack)
-{
-    playToStack = static_cast<bool>(_playToStack);
-    settings->setValue("interface/playtostack", playToStack);
-}
-
-void SettingsCache::setDoNotDeleteArrowsInSubPhases(QT_STATE_CHANGED_T _doNotDeleteArrowsInSubPhases)
-{
-    doNotDeleteArrowsInSubPhases = static_cast<bool>(_doNotDeleteArrowsInSubPhases);
-    settings->setValue("interface/doNotDeleteArrowsInSubPhases", doNotDeleteArrowsInSubPhases);
-}
-
-void SettingsCache::setStartingHandSize(int _startingHandSize)
-{
-    startingHandSize = _startingHandSize;
-    settings->setValue("interface/startinghandsize", startingHandSize);
-}
-
-void SettingsCache::setAnnotateTokens(QT_STATE_CHANGED_T _annotateTokens)
-{
-    annotateTokens = static_cast<bool>(_annotateTokens);
-    settings->setValue("interface/annotatetokens", annotateTokens);
-}
-
-void SettingsCache::setTabGameSplitterSizes(const QByteArray &_tabGameSplitterSizes)
-{
-    tabGameSplitterSizes = _tabGameSplitterSizes;
-    settings->setValue("interface/tabgame_splittersizes", tabGameSplitterSizes);
-}
-
-void SettingsCache::setShowShortcuts(QT_STATE_CHANGED_T _showShortcuts)
-{
-    showShortcuts = static_cast<bool>(_showShortcuts);
-    settings->setValue("menu/showshortcuts", showShortcuts);
-}
-
-void SettingsCache::setDisplayCardNames(QT_STATE_CHANGED_T _displayCardNames)
-{
-    displayCardNames = static_cast<bool>(_displayCardNames);
-    settings->setValue("cards/displaycardnames", displayCardNames);
-    emit displayCardNamesChanged();
-}
-
-void SettingsCache::setOverrideAllCardArtWithPersonalPreference(QT_STATE_CHANGED_T _overrideAllCardArt)
-{
-    overrideAllCardArtWithPersonalPreference = static_cast<bool>(_overrideAllCardArt);
-    settings->setValue("cards/overrideallcardartwithpersonalpreference", overrideAllCardArtWithPersonalPreference);
-    emit overrideAllCardArtWithPersonalPreferenceChanged(overrideAllCardArtWithPersonalPreference);
-}
-
-void SettingsCache::setBumpSetsWithCardsInDeckToTop(QT_STATE_CHANGED_T _bumpSetsWithCardsInDeckToTop)
-{
-    bumpSetsWithCardsInDeckToTop = static_cast<bool>(_bumpSetsWithCardsInDeckToTop);
-    settings->setValue("cards/bumpsetswithcardsindecktotop", bumpSetsWithCardsInDeckToTop);
-    emit bumpSetsWithCardsInDeckToTopChanged();
-}
-
-void SettingsCache::setPrintingSelectorSortOrder(int _printingSelectorSortOrder)
-{
-    printingSelectorSortOrder = _printingSelectorSortOrder;
-    settings->setValue("cards/printingselectorsortorder", printingSelectorSortOrder);
-    emit printingSelectorSortOrderChanged();
-}
-
-void SettingsCache::setPrintingSelectorCardSize(int _printingSelectorCardSize)
-{
-    printingSelectorCardSize = _printingSelectorCardSize;
-    settings->setValue("cards/printingselectorcardsize", printingSelectorCardSize);
-    emit printingSelectorCardSizeChanged();
-}
-
-void SettingsCache::setIncludeRebalancedCards(bool _includeRebalancedCards)
-{
-    if (includeRebalancedCards == _includeRebalancedCards)
-        return;
-
-    includeRebalancedCards = _includeRebalancedCards;
-    settings->setValue("cards/includerebalancedcards", includeRebalancedCards);
-    emit includeRebalancedCardsChanged(includeRebalancedCards);
-}
-
-void SettingsCache::setPrintingSelectorNavigationButtonsVisible(QT_STATE_CHANGED_T _navigationButtonsVisible)
-{
-    printingSelectorNavigationButtonsVisible = _navigationButtonsVisible;
-    settings->setValue("cards/printingselectornavigationbuttonsvisible", printingSelectorNavigationButtonsVisible);
-    emit printingSelectorNavigationButtonsVisibleChanged();
-}
-
-void SettingsCache::setDeckEditorBannerCardComboBoxVisible(QT_STATE_CHANGED_T _deckEditorBannerCardComboBoxVisible)
-{
-    deckEditorBannerCardComboBoxVisible = _deckEditorBannerCardComboBoxVisible;
-    settings->setValue("interface/deckeditorbannercardcomboboxvisible", deckEditorBannerCardComboBoxVisible);
-    emit deckEditorBannerCardComboBoxVisibleChanged(deckEditorBannerCardComboBoxVisible);
-}
-
-void SettingsCache::setDeckEditorTagsWidgetVisible(QT_STATE_CHANGED_T _deckEditorTagsWidgetVisible)
-{
-    deckEditorTagsWidgetVisible = _deckEditorTagsWidgetVisible;
-    settings->setValue("interface/deckeditortagswidgetvisible", deckEditorTagsWidgetVisible);
-    emit deckEditorTagsWidgetVisibleChanged(deckEditorTagsWidgetVisible);
-}
-
-void SettingsCache::setVisualDeckStorageSortingOrder(int _visualDeckStorageSortingOrder)
-{
-    visualDeckStorageSortingOrder = _visualDeckStorageSortingOrder;
-    settings->setValue("interface/visualdeckstoragesortingorder", visualDeckStorageSortingOrder);
-}
-
-void SettingsCache::setVisualDeckStorageShowFolders(QT_STATE_CHANGED_T value)
-{
-    visualDeckStorageShowFolders = value;
-    settings->setValue("interface/visualdeckstorageshowfolders", visualDeckStorageShowFolders);
-}
-
-void SettingsCache::setVisualDeckStorageShowTagFilter(QT_STATE_CHANGED_T _showTags)
-{
-    visualDeckStorageShowTagFilter = _showTags;
-    settings->setValue("interface/visualdeckstorageshowtagfilter", visualDeckStorageShowTagFilter);
-    emit visualDeckStorageShowTagFilterChanged(visualDeckStorageShowTagFilter);
-}
-
-void SettingsCache::setVisualDeckStorageDefaultTagsList(QStringList _defaultTagsList)
-{
-    visualDeckStorageDefaultTagsList = _defaultTagsList;
-    settings->setValue("interface/visualdeckstoragedefaulttagslist", visualDeckStorageDefaultTagsList);
-    emit visualDeckStorageDefaultTagsListChanged();
-}
-
-void SettingsCache::setVisualDeckStorageSearchFolderNames(QT_STATE_CHANGED_T value)
-{
-    visualDeckStorageSearchFolderNames = value;
-    settings->setValue("interface/visualdeckstoragesearchfoldernames", visualDeckStorageSearchFolderNames);
-}
-
-void SettingsCache::setVisualDeckStorageShowBannerCardComboBox(QT_STATE_CHANGED_T _showBannerCardComboBox)
-{
-    visualDeckStorageShowBannerCardComboBox = _showBannerCardComboBox;
-    settings->setValue("interface/visualdeckstorageshowbannercardcombobox", visualDeckStorageShowBannerCardComboBox);
-    emit visualDeckStorageShowBannerCardComboBoxChanged(visualDeckStorageShowBannerCardComboBox);
-}
-
-void SettingsCache::setVisualDeckStorageShowTagsOnDeckPreviews(QT_STATE_CHANGED_T _showTags)
-{
-    visualDeckStorageShowTagsOnDeckPreviews = _showTags;
-    settings->setValue("interface/visualdeckstorageshowtagsondeckpreviews", visualDeckStorageShowTagsOnDeckPreviews);
-    emit visualDeckStorageShowTagsOnDeckPreviewsChanged(visualDeckStorageShowTagsOnDeckPreviews);
-}
-
-void SettingsCache::setVisualDeckStorageCardSize(int _visualDeckStorageCardSize)
-{
-    visualDeckStorageCardSize = _visualDeckStorageCardSize;
-    settings->setValue("interface/visualdeckstoragecardsize", visualDeckStorageCardSize);
-    emit visualDeckStorageCardSizeChanged();
-}
-
-void SettingsCache::setVisualDeckStorageDrawUnusedColorIdentities(
-    QT_STATE_CHANGED_T _visualDeckStorageDrawUnusedColorIdentities)
-{
-    visualDeckStorageDrawUnusedColorIdentities = _visualDeckStorageDrawUnusedColorIdentities;
-    settings->setValue("interface/visualdeckstoragedrawunusedcoloridentities",
-                       visualDeckStorageDrawUnusedColorIdentities);
-    emit visualDeckStorageDrawUnusedColorIdentitiesChanged(visualDeckStorageDrawUnusedColorIdentities);
-}
-
-void SettingsCache::setVisualDeckStorageUnusedColorIdentitiesOpacity(int _visualDeckStorageUnusedColorIdentitiesOpacity)
-{
-    visualDeckStorageUnusedColorIdentitiesOpacity = _visualDeckStorageUnusedColorIdentitiesOpacity;
-    settings->setValue("interface/visualdeckstorageunusedcoloridentitiesopacity",
-                       visualDeckStorageUnusedColorIdentitiesOpacity);
-    emit visualDeckStorageUnusedColorIdentitiesOpacityChanged(visualDeckStorageUnusedColorIdentitiesOpacity);
-}
-
-void SettingsCache::setVisualDeckStorageTooltipType(int value)
-{
-    visualDeckStorageTooltipType = value;
-    settings->setValue("interface/visualdeckstoragetooltiptype", visualDeckStorageTooltipType);
-}
-
-void SettingsCache::setVisualDeckStoragePromptForConversion(bool _visualDeckStoragePromptForConversion)
-{
-    visualDeckStoragePromptForConversion = _visualDeckStoragePromptForConversion;
-    settings->setValue("interface/visualdeckstoragepromptforconversion", visualDeckStoragePromptForConversion);
-}
-
-void SettingsCache::setVisualDeckStorageAlwaysConvert(bool _visualDeckStorageAlwaysConvert)
-{
-    visualDeckStorageAlwaysConvert = _visualDeckStorageAlwaysConvert;
-    settings->setValue("interface/visualdeckstoragealwaysconvert", visualDeckStorageAlwaysConvert);
-}
-
-void SettingsCache::setVisualDeckStorageInGame(QT_STATE_CHANGED_T value)
-{
-    visualDeckStorageInGame = value;
-    settings->setValue("interface/visualdeckstorageingame", visualDeckStorageInGame);
-    emit visualDeckStorageInGameChanged(visualDeckStorageInGame);
-}
-
-void SettingsCache::setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T value)
-{
-    visualDeckStorageSelectionAnimation = value;
-    settings->setValue("interface/visualdeckstorageselectionanimation", visualDeckStorageSelectionAnimation);
-    emit visualDeckStorageSelectionAnimationChanged(visualDeckStorageSelectionAnimation);
-}
-
-void SettingsCache::setVisualDeckEditorCardSize(int _visualDeckEditorCardSize)
-{
-    visualDeckEditorCardSize = _visualDeckEditorCardSize;
-    settings->setValue("interface/visualdeckeditorcardsize", visualDeckEditorCardSize);
-    emit visualDeckEditorCardSizeChanged();
-}
-
-void SettingsCache::setVisualDatabaseDisplayCardSize(int _visualDatabaseDisplayCardSize)
-{
-    visualDatabaseDisplayCardSize = _visualDatabaseDisplayCardSize;
-    settings->setValue("interface/visualdatabasedisplaycardsize", visualDatabaseDisplayCardSize);
-    emit visualDatabaseDisplayCardSizeChanged();
-}
-
-void SettingsCache::setEDHRecCardSize(int _edhrecCardSize)
-{
-    edhrecCardSize = _edhrecCardSize;
-    settings->setValue("interface/edhreccardsize", edhrecCardSize);
-    emit edhRecCardSizeChanged();
-}
-
-void SettingsCache::setArchidektPreviewCardSize(int _archidektPreviewCardSize)
-{
-    archidektPreviewSize = _archidektPreviewCardSize;
-    settings->setValue("interface/archidektpreviewsize", archidektPreviewSize);
-    emit archidektPreviewSizeChanged();
-}
-
-void SettingsCache::setDefaultDeckEditorType(int value)
-{
-    defaultDeckEditorType = value;
-    settings->setValue("interface/defaultDeckEditorType", defaultDeckEditorType);
-}
-
-void SettingsCache::setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(QT_STATE_CHANGED_T _enabled)
-{
-    visualDatabaseDisplayFilterToMostRecentSetsEnabled = _enabled;
-    settings->setValue("interface/visualdatabasedisplayfiltertomostrecentsetsenabled",
-                       visualDatabaseDisplayFilterToMostRecentSetsEnabled);
-    emit visualDatabaseDisplayFilterToMostRecentSetsEnabledChanged(visualDatabaseDisplayFilterToMostRecentSetsEnabled);
-}
-
-void SettingsCache::setVisualDatabaseDisplayFilterToMostRecentSetsAmount(int _amount)
-{
-    visualDatabaseDisplayFilterToMostRecentSetsAmount = _amount;
-    settings->setValue("interface/visualdatabasedisplayfiltertomostrecentsetsamount",
-                       visualDatabaseDisplayFilterToMostRecentSetsAmount);
-    emit visualDatabaseDisplayFilterToMostRecentSetsAmountChanged(visualDatabaseDisplayFilterToMostRecentSetsAmount);
-}
-
-void SettingsCache::setVisualDeckEditorSampleHandSize(int _amount)
-{
-    visualDeckEditorSampleHandSize = _amount;
-    settings->setValue("interface/visualdeckeditorsamplehandsize", visualDeckEditorSampleHandSize);
-    emit visualDeckEditorSampleHandSizeAmountChanged(visualDeckEditorSampleHandSize);
-}
-
-void SettingsCache::setHorizontalHand(QT_STATE_CHANGED_T _horizontalHand)
-{
-    horizontalHand = static_cast<bool>(_horizontalHand);
-    settings->setValue("hand/horizontal", horizontalHand);
-    emit horizontalHandChanged();
-}
-
-void SettingsCache::setInvertVerticalCoordinate(QT_STATE_CHANGED_T _invertVerticalCoordinate)
-{
-    invertVerticalCoordinate = static_cast<bool>(_invertVerticalCoordinate);
-    settings->setValue("table/invert_vertical", invertVerticalCoordinate);
-    emit invertVerticalCoordinateChanged();
-}
-
-void SettingsCache::setMinPlayersForMultiColumnLayout(int _minPlayersForMultiColumnLayout)
-{
-    minPlayersForMultiColumnLayout = _minPlayersForMultiColumnLayout;
-    settings->setValue("interface/min_players_multicolumn", minPlayersForMultiColumnLayout);
-    emit minPlayersForMultiColumnLayoutChanged();
-}
-
-void SettingsCache::setTapAnimation(QT_STATE_CHANGED_T _tapAnimation)
-{
-    tapAnimation = static_cast<bool>(_tapAnimation);
-    settings->setValue("cards/tapanimation", tapAnimation);
-}
-
-void SettingsCache::setAutoRotateSidewaysLayoutCards(QT_STATE_CHANGED_T _autoRotateSidewaysLayoutCards)
-{
-    autoRotateSidewaysLayoutCards = static_cast<bool>(_autoRotateSidewaysLayoutCards);
-    settings->setValue("cards/autorotatesidewayslayoutcards", autoRotateSidewaysLayoutCards);
-}
-
-void SettingsCache::setOpenDeckInNewTab(QT_STATE_CHANGED_T _openDeckInNewTab)
-{
-    openDeckInNewTab = static_cast<bool>(_openDeckInNewTab);
-    settings->setValue("editor/openDeckInNewTab", openDeckInNewTab);
-}
-
-void SettingsCache::setRewindBufferingMs(int _rewindBufferingMs)
-{
-    rewindBufferingMs = _rewindBufferingMs;
-    settings->setValue("replay/rewindBufferingMs", rewindBufferingMs);
-}
-
-void SettingsCache::setChatMention(QT_STATE_CHANGED_T _chatMention)
-{
-    chatMention = static_cast<bool>(_chatMention);
-    settings->setValue("chat/mention", chatMention);
-}
-
-void SettingsCache::setChatMentionCompleter(const QT_STATE_CHANGED_T _enableMentionCompleter)
-{
-    chatMentionCompleter = (bool)_enableMentionCompleter;
-    settings->setValue("chat/mentioncompleter", chatMentionCompleter);
-    emit chatMentionCompleterChanged();
-}
-
-void SettingsCache::setChatMentionForeground(QT_STATE_CHANGED_T _chatMentionForeground)
-{
-    chatMentionForeground = static_cast<bool>(_chatMentionForeground);
-    settings->setValue("chat/mentionforeground", chatMentionForeground);
-}
-
-void SettingsCache::setChatHighlightForeground(QT_STATE_CHANGED_T _chatHighlightForeground)
-{
-    chatHighlightForeground = static_cast<bool>(_chatHighlightForeground);
-    settings->setValue("chat/highlightforeground", chatHighlightForeground);
-}
-
-void SettingsCache::setChatMentionColor(const QString &_chatMentionColor)
-{
-    chatMentionColor = _chatMentionColor;
-    settings->setValue("chat/mentioncolor", chatMentionColor);
-}
-
-void SettingsCache::setChatHighlightColor(const QString &_chatHighlightColor)
-{
-    chatHighlightColor = _chatHighlightColor;
-    settings->setValue("chat/highlightcolor", chatHighlightColor);
-}
-
-void SettingsCache::setZoneViewGroupByIndex(int _zoneViewGroupByIndex)
-{
-    zoneViewGroupByIndex = _zoneViewGroupByIndex;
-    settings->setValue("zoneview/groupby", zoneViewGroupByIndex);
-}
-
-void SettingsCache::setZoneViewSortByIndex(int _zoneViewSortByIndex)
-{
-    zoneViewSortByIndex = _zoneViewSortByIndex;
-    settings->setValue("zoneview/sortby", zoneViewSortByIndex);
-}
-
-void SettingsCache::setZoneViewPileView(QT_STATE_CHANGED_T _zoneViewPileView)
-{
-    zoneViewPileView = static_cast<bool>(_zoneViewPileView);
-    settings->setValue("zoneview/pileview", zoneViewPileView);
-}
-
-void SettingsCache::setSoundEnabled(QT_STATE_CHANGED_T _soundEnabled)
-{
-    soundEnabled = static_cast<bool>(_soundEnabled);
-    settings->setValue("sound/enabled", soundEnabled);
-    emit soundEnabledChanged();
-}
-
-void SettingsCache::setSoundThemeName(const QString &_soundThemeName)
-{
-    soundThemeName = _soundThemeName;
-    settings->setValue("sound/theme", soundThemeName);
-    emit soundThemeChanged();
-}
-
-void SettingsCache::setIgnoreUnregisteredUsers(QT_STATE_CHANGED_T _ignoreUnregisteredUsers)
-{
-    ignoreUnregisteredUsers = static_cast<bool>(_ignoreUnregisteredUsers);
-    settings->setValue("chat/ignore_unregistered", ignoreUnregisteredUsers);
-}
-
-void SettingsCache::setIgnoreUnregisteredUserMessages(QT_STATE_CHANGED_T _ignoreUnregisteredUserMessages)
-{
-    ignoreUnregisteredUserMessages = static_cast<bool>(_ignoreUnregisteredUserMessages);
-    settings->setValue("chat/ignore_unregistered_messages", ignoreUnregisteredUserMessages);
-}
-
-void SettingsCache::setMainWindowGeometry(const QByteArray &_mainWindowGeometry)
-{
-    mainWindowGeometry = _mainWindowGeometry;
-    settings->setValue("interface/main_window_geometry", mainWindowGeometry);
-}
-
-void SettingsCache::setTokenDialogGeometry(const QByteArray &_tokenDialogGeometry)
-{
-    tokenDialogGeometry = _tokenDialogGeometry;
-    settings->setValue("interface/token_dialog_geometry", tokenDialogGeometry);
-}
-
-void SettingsCache::setSetsDialogGeometry(const QByteArray &_setsDialogGeometry)
-{
-    setsDialogGeometry = _setsDialogGeometry;
-    settings->setValue("interface/sets_dialog_geometry", setsDialogGeometry);
-}
-
-void SettingsCache::setPixmapCacheSize(const int _pixmapCacheSize)
-{
-    pixmapCacheSize = _pixmapCacheSize;
-    settings->setValue("personal/pixmapCacheSize", pixmapCacheSize);
-    emit pixmapCacheSizeChanged(pixmapCacheSize);
-}
-
-void SettingsCache::setNetworkCacheSizeInMB(const int _networkCacheSize)
-{
-    networkCacheSize = _networkCacheSize;
-    settings->setValue("personal/networkCacheSize", networkCacheSize);
-    emit networkCacheSizeChanged(networkCacheSize);
-}
-
-void SettingsCache::setNetworkRedirectCacheTtl(const int _redirectCacheTtl)
-{
-    redirectCacheTtl = _redirectCacheTtl;
-    settings->setValue("personal/redirectCacheSize", redirectCacheTtl);
-    emit redirectCacheTtlChanged(redirectCacheTtl);
-}
-
-void SettingsCache::setClientID(const QString &_clientID)
-{
-    clientID = _clientID;
-    settings->setValue("personal/clientid", clientID);
-}
-
-void SettingsCache::setClientVersion(const QString &_clientVersion)
-{
-    clientVersion = _clientVersion;
-    settings->setValue("personal/clientversion", clientVersion);
-}
-
 QStringList SettingsCache::getCountries() const
 {
-    static QStringList countries = QStringList() << "ad"
-                                                 << "ae"
-                                                 << "af"
-                                                 << "ag"
-                                                 << "ai"
-                                                 << "al"
-                                                 << "am"
-                                                 << "ao"
-                                                 << "aq"
-                                                 << "ar"
-                                                 << "as"
-                                                 << "at"
-                                                 << "au"
-                                                 << "aw"
-                                                 << "ax"
-                                                 << "az"
-                                                 << "ba"
-                                                 << "bb"
-                                                 << "bd"
-                                                 << "be"
-                                                 << "bf"
-                                                 << "bg"
-                                                 << "bh"
-                                                 << "bi"
-                                                 << "bj"
-                                                 << "bl"
-                                                 << "bm"
-                                                 << "bn"
-                                                 << "bo"
-                                                 << "bq"
-                                                 << "br"
-                                                 << "bs"
-                                                 << "bt"
-                                                 << "bv"
-                                                 << "bw"
-                                                 << "by"
-                                                 << "bz"
-                                                 << "ca"
-                                                 << "cc"
-                                                 << "cd"
-                                                 << "cf"
-                                                 << "cg"
-                                                 << "ch"
-                                                 << "ci"
-                                                 << "ck"
-                                                 << "cl"
-                                                 << "cm"
-                                                 << "cn"
-                                                 << "co"
-                                                 << "cr"
-                                                 << "cu"
-                                                 << "cv"
-                                                 << "cw"
-                                                 << "cx"
-                                                 << "cy"
-                                                 << "cz"
-                                                 << "de"
-                                                 << "dj"
-                                                 << "dk"
-                                                 << "dm"
-                                                 << "do"
-                                                 << "dz"
-                                                 << "ec"
-                                                 << "ee"
-                                                 << "eg"
-                                                 << "eh"
-                                                 << "er"
-                                                 << "es"
-                                                 << "et"
-                                                 << "eu"
-                                                 << "fi"
-                                                 << "fj"
-                                                 << "fk"
-                                                 << "fm"
-                                                 << "fo"
-                                                 << "fr"
-                                                 << "ga"
-                                                 << "gb"
-                                                 << "gd"
-                                                 << "ge"
-                                                 << "gf"
-                                                 << "gg"
-                                                 << "gh"
-                                                 << "gi"
-                                                 << "gl"
-                                                 << "gm"
-                                                 << "gn"
-                                                 << "gp"
-                                                 << "gq"
-                                                 << "gr"
-                                                 << "gs"
-                                                 << "gt"
-                                                 << "gu"
-                                                 << "gw"
-                                                 << "gy"
-                                                 << "hk"
-                                                 << "hm"
-                                                 << "hn"
-                                                 << "hr"
-                                                 << "ht"
-                                                 << "hu"
-                                                 << "id"
-                                                 << "ie"
-                                                 << "il"
-                                                 << "im"
-                                                 << "in"
-                                                 << "io"
-                                                 << "iq"
-                                                 << "ir"
-                                                 << "is"
-                                                 << "it"
-                                                 << "je"
-                                                 << "jm"
-                                                 << "jo"
-                                                 << "jp"
-                                                 << "ke"
-                                                 << "kg"
-                                                 << "kh"
-                                                 << "ki"
-                                                 << "km"
-                                                 << "kn"
-                                                 << "kp"
-                                                 << "kr"
-                                                 << "kw"
-                                                 << "ky"
-                                                 << "kz"
-                                                 << "la"
-                                                 << "lb"
-                                                 << "lc"
-                                                 << "li"
-                                                 << "lk"
-                                                 << "lr"
-                                                 << "ls"
-                                                 << "lt"
-                                                 << "lu"
-                                                 << "lv"
-                                                 << "ly"
-                                                 << "ma"
-                                                 << "mc"
-                                                 << "md"
-                                                 << "me"
-                                                 << "mf"
-                                                 << "mg"
-                                                 << "mh"
-                                                 << "mk"
-                                                 << "ml"
-                                                 << "mm"
-                                                 << "mn"
-                                                 << "mo"
-                                                 << "mp"
-                                                 << "mq"
-                                                 << "mr"
-                                                 << "ms"
-                                                 << "mt"
-                                                 << "mu"
-                                                 << "mv"
-                                                 << "mw"
-                                                 << "mx"
-                                                 << "my"
-                                                 << "mz"
-                                                 << "na"
-                                                 << "nc"
-                                                 << "ne"
-                                                 << "nf"
-                                                 << "ng"
-                                                 << "ni"
-                                                 << "nl"
-                                                 << "no"
-                                                 << "np"
-                                                 << "nr"
-                                                 << "nu"
-                                                 << "nz"
-                                                 << "om"
-                                                 << "pa"
-                                                 << "pe"
-                                                 << "pf"
-                                                 << "pg"
-                                                 << "ph"
-                                                 << "pk"
-                                                 << "pl"
-                                                 << "pm"
-                                                 << "pn"
-                                                 << "pr"
-                                                 << "ps"
-                                                 << "pt"
-                                                 << "pw"
-                                                 << "py"
-                                                 << "qa"
-                                                 << "re"
-                                                 << "ro"
-                                                 << "rs"
-                                                 << "ru"
-                                                 << "rw"
-                                                 << "sa"
-                                                 << "sb"
-                                                 << "sc"
-                                                 << "sd"
-                                                 << "se"
-                                                 << "sg"
-                                                 << "sh"
-                                                 << "si"
-                                                 << "sj"
-                                                 << "sk"
-                                                 << "sl"
-                                                 << "sm"
-                                                 << "sn"
-                                                 << "so"
-                                                 << "sr"
-                                                 << "ss"
-                                                 << "st"
-                                                 << "sv"
-                                                 << "sx"
-                                                 << "sy"
-                                                 << "sz"
-                                                 << "tc"
-                                                 << "td"
-                                                 << "tf"
-                                                 << "tg"
-                                                 << "th"
-                                                 << "tj"
-                                                 << "tk"
-                                                 << "tl"
-                                                 << "tm"
-                                                 << "tn"
-                                                 << "to"
-                                                 << "tr"
-                                                 << "tt"
-                                                 << "tv"
-                                                 << "tw"
-                                                 << "tz"
-                                                 << "ua"
-                                                 << "ug"
-                                                 << "um"
-                                                 << "us"
-                                                 << "uy"
-                                                 << "uz"
-                                                 << "va"
-                                                 << "vc"
-                                                 << "ve"
-                                                 << "vg"
-                                                 << "vi"
-                                                 << "vn"
-                                                 << "vu"
-                                                 << "wf"
-                                                 << "ws"
-                                                 << "xk"
-                                                 << "ye"
-                                                 << "yt"
-                                                 << "za"
-                                                 << "zm"
-                                                 << "zw";
+    static const QStringList countries = {
+        "ad", "ae", "af", "ag", "ai", "al", "am", "ao", "aq", "ar", "as", "at", "au", "aw", "ax", "az", "ba", "bb",
+        "bd", "be", "bf", "bg", "bh", "bi", "bj", "bl", "bm", "bn", "bo", "bq", "br", "bs", "bt", "bv", "bw", "by",
+        "bz", "ca", "cc", "cd", "cf", "cg", "ch", "ci", "ck", "cl", "cm", "cn", "co", "cr", "cu", "cv", "cw", "cx",
+        "cy", "cz", "de", "dj", "dk", "dm", "do", "dz", "ec", "ee", "eg", "eh", "er", "es", "et", "eu", "fi", "fj",
+        "fk", "fm", "fo", "fr", "ga", "gb", "gd", "ge", "gf", "gg", "gh", "gi", "gl", "gm", "gn", "gp", "gq", "gr",
+        "gs", "gt", "gu", "gw", "gy", "hk", "hm", "hn", "hr", "ht", "hu", "id", "ie", "il", "im", "in", "io", "iq",
+        "ir", "is", "it", "je", "jm", "jo", "jp", "ke", "kg", "kh", "ki", "km", "kn", "kp", "kr", "kw", "ky", "kz",
+        "la", "lb", "lc", "li", "lk", "lr", "ls", "lt", "lu", "lv", "ly", "ma", "mc", "md", "me", "mf", "mg", "mh",
+        "mk", "ml", "mm", "mn", "mo", "mp", "mq", "mr", "ms", "mt", "mu", "mv", "mw", "mx", "my", "mz", "na", "nc",
+        "ne", "nf", "ng", "ni", "nl", "no", "np", "nr", "nu", "nz", "om", "pa", "pe", "pf", "pg", "ph", "pk", "pl",
+        "pm", "pn", "pr", "ps", "pt", "pw", "py", "qa", "re", "ro", "rs", "ru", "rw", "sa", "sb", "sc", "sd", "se",
+        "sg", "sh", "si", "sj", "sk", "sl", "sm", "sn", "so", "sr", "ss", "st", "sv", "sx", "sy", "sz", "tc", "td",
+        "tf", "tg", "th", "tj", "tk", "tl", "tm", "tn", "to", "tr", "tt", "tv", "tw", "tz", "ua", "ug", "um", "us",
+        "uy", "uz", "va", "vc", "ve", "vg", "vi", "vn", "vu", "wf", "ws", "xk", "ye", "yt", "za", "zm", "zw"};
 
     return countries;
 }
 
-void SettingsCache::setGameDescription(const QString _gameDescription)
-{
-    gameDescription = _gameDescription;
-    settings->setValue("game/gamedescription", gameDescription);
-}
-
-void SettingsCache::setMaxPlayers(const int _maxPlayers)
-{
-    maxPlayers = _maxPlayers;
-    settings->setValue("game/maxplayers", maxPlayers);
-}
-
-void SettingsCache::setGameTypes(const QString _gameTypes)
-{
-    gameTypes = _gameTypes;
-    settings->setValue("game/gametypes", gameTypes);
-}
-
-void SettingsCache::setOnlyBuddies(const bool _onlyBuddies)
-{
-    onlyBuddies = _onlyBuddies;
-    settings->setValue("game/onlybuddies", onlyBuddies);
-}
-
-void SettingsCache::setOnlyRegistered(const bool _onlyRegistered)
-{
-    onlyRegistered = _onlyRegistered;
-    settings->setValue("game/onlyregistered", onlyRegistered);
-}
-
-void SettingsCache::setSpectatorsAllowed(const bool _spectatorsAllowed)
-{
-    spectatorsAllowed = _spectatorsAllowed;
-    settings->setValue("game/spectatorsallowed", spectatorsAllowed);
-}
-
-void SettingsCache::setSpectatorsNeedPassword(const bool _spectatorsNeedPassword)
-{
-    spectatorsNeedPassword = _spectatorsNeedPassword;
-    settings->setValue("game/spectatorsneedpassword", spectatorsNeedPassword);
-}
-
-void SettingsCache::setSpectatorsCanTalk(const bool _spectatorsCanTalk)
-{
-    spectatorsCanTalk = _spectatorsCanTalk;
-    settings->setValue("game/spectatorscantalk", spectatorsCanTalk);
-}
-
-void SettingsCache::setSpectatorsCanSeeEverything(const bool _spectatorsCanSeeEverything)
-{
-    spectatorsCanSeeEverything = _spectatorsCanSeeEverything;
-    settings->setValue("game/spectatorscanseeeverything", spectatorsCanSeeEverything);
-}
-
-void SettingsCache::setCreateGameAsSpectator(const bool _createGameAsSpectator)
-{
-    createGameAsSpectator = _createGameAsSpectator;
-    settings->setValue("game/creategameasspectator", createGameAsSpectator);
-}
-
-void SettingsCache::setDefaultStartingLifeTotal(const int _defaultStartingLifeTotal)
-{
-    defaultStartingLifeTotal = _defaultStartingLifeTotal;
-    settings->setValue("game/defaultstartinglifetotal", defaultStartingLifeTotal);
-}
-
-void SettingsCache::setShareDecklistsOnLoad(const bool _shareDecklistsOnLoad)
-{
-    shareDecklistsOnLoad = _shareDecklistsOnLoad;
-    settings->setValue("game/sharedecklistsonload", shareDecklistsOnLoad);
-}
-
-void SettingsCache::setCheckUpdatesOnStartup(QT_STATE_CHANGED_T value)
-{
-    checkUpdatesOnStartup = static_cast<bool>(value);
-    settings->setValue("personal/startupUpdateCheck", checkUpdatesOnStartup);
-}
-
-void SettingsCache::setStartupCardUpdateCheckPromptForUpdate(bool value)
-{
-    startupCardUpdateCheckPromptForUpdate = value;
-    settings->setValue("personal/startupCardUpdateCheckPromptForUpdate", startupCardUpdateCheckPromptForUpdate);
-}
-
-void SettingsCache::setStartupCardUpdateCheckAlwaysUpdate(bool value)
-{
-    startupCardUpdateCheckAlwaysUpdate = value;
-    settings->setValue("personal/startupCardUpdateCheckAlwaysUpdate", startupCardUpdateCheckAlwaysUpdate);
-}
-
-void SettingsCache::setCardUpdateCheckInterval(int value)
-{
-    cardUpdateCheckInterval = value;
-    settings->setValue("personal/cardUpdateCheckInterval", cardUpdateCheckInterval);
-}
-
-void SettingsCache::setLastCardUpdateCheck(QDate value)
-{
-    lastCardUpdateCheck = value;
-    settings->setValue("personal/lastCardUpdateCheck", lastCardUpdateCheck);
-}
-
-void SettingsCache::setRememberGameSettings(const bool _rememberGameSettings)
-{
-    rememberGameSettings = _rememberGameSettings;
-    settings->setValue("game/remembergamesettings", rememberGameSettings);
-}
-
-void SettingsCache::setNotifyAboutUpdate(QT_STATE_CHANGED_T _notifyaboutupdate)
-{
-    notifyAboutUpdates = static_cast<bool>(_notifyaboutupdate);
-    settings->setValue("personal/updatenotification", notifyAboutUpdates);
-}
-
-void SettingsCache::setNotifyAboutNewVersion(QT_STATE_CHANGED_T _notifyaboutnewversion)
-{
-    notifyAboutNewVersion = static_cast<bool>(_notifyaboutnewversion);
-    settings->setValue("personal/newversionnotification", notifyAboutNewVersion);
-}
-
-void SettingsCache::setDownloadSpoilerStatus(bool _spoilerStatus)
-{
-    mbDownloadSpoilers = _spoilerStatus;
-    settings->setValue("personal/downloadspoilers", mbDownloadSpoilers);
-    emit downloadSpoilerStatusChanged();
-}
-
-void SettingsCache::setUpdateReleaseChannelIndex(int value)
-{
-    updateReleaseChannel = value;
-    settings->setValue("personal/updatereleasechannel", updateReleaseChannel);
-}
-
-void SettingsCache::setMaxFontSize(int _max)
-{
-    maxFontSize = _max;
-    settings->setValue("game/maxfontsize", maxFontSize);
-}
-
-void SettingsCache::setRoundCardCorners(bool _roundCardCorners)
-{
-    if (_roundCardCorners == roundCardCorners)
-        return;
-
-    roundCardCorners = _roundCardCorners;
-    settings->setValue("cards/roundcardcorners", _roundCardCorners);
-    emit roundCardCornersChanged(roundCardCorners);
-}
-
 void SettingsCache::loadPaths()
 {
     QString dataPath = getDataPath();
-    deckPath = getSafeConfigPath("paths/decks", dataPath + "/decks/");
-    filtersPath = getSafeConfigPath("paths/filters", dataPath + "/filters/");
-    replaysPath = getSafeConfigPath("paths/replays", dataPath + "/replays/");
-    themesPath = getSafeConfigPath("paths/themes", dataPath + "/themes/");
-    picsPath = getSafeConfigPath("paths/pics", dataPath + "/pics/");
-    redirectCachePath = getSafeConfigPath("paths/redirects", getCachePath() + "/redirects/");
-    // this has never been exposed as an user-configurable setting
-    if (picsPath.endsWith("/")) {
-        customPicsPath = getSafeConfigPath("paths/custompics", picsPath + "CUSTOM/");
-    } else {
-        customPicsPath = getSafeConfigPath("paths/custompics", picsPath + "/CUSTOM/");
-    }
-    customCardDatabasePath = getSafeConfigPath("paths/customsets", dataPath + "/customsets/");
+    QSettings pathsIni(getSettingsPath() + "paths.ini", QSettings::IniFormat);
 
-    cardDatabasePath = getSafeConfigFilePath("paths/carddatabase", dataPath + "/cards.xml");
-    tokenDatabasePath = getSafeConfigFilePath("paths/tokendatabase", dataPath + "/tokens.xml");
-    spoilerDatabasePath = getSafeConfigFilePath("paths/spoilerdatabase", dataPath + "/spoiler.xml");
+    auto computePath = [&](const QString &key, const QString &defaultPath) -> QString {
+        QString val = pathsIni.value("paths/" + key).toString();
+        if (val.isEmpty() || !QDir(val).exists()) {
+            if (!QDir().mkpath(defaultPath)) {
+                qCInfo(SettingsCacheLog) << "[SettingsCache] Could not create folder:" << defaultPath;
+            }
+            val = defaultPath;
+            pathsIni.setValue("paths/" + key, val);
+        }
+        return val;
+    };
+
+    auto computeFilePath = [&](const QString &key, const QString &defaultPath) -> QString {
+        QString val = pathsIni.value("paths/" + key).toString();
+        if (!QFile::exists(val) || val.isEmpty()) {
+            val = defaultPath;
+            pathsIni.setValue("paths/" + key, val);
+        }
+        return val;
+    };
+
+    computePath("decks", dataPath + "/decks/");
+    computePath("filters", dataPath + "/filters/");
+    computePath("replays", dataPath + "/replays/");
+    computePath("themes", dataPath + "/themes/");
+    computePath("pics", dataPath + "/pics/");
+    computePath("redirects", getCachePath() + "/redirects/");
+
+    // customPicsPath derived from picsPath
+    QString picsPath = pathsIni.value("paths/pics").toString();
+    if (picsPath.endsWith("/")) {
+        computePath("customPics", picsPath + "CUSTOM/");
+    } else {
+        computePath("customPics", picsPath + "/CUSTOM/");
+    }
+
+    computePath("customSets", dataPath + "/customsets/");
+    computeFilePath("cardDatabase", dataPath + "/cards.xml");
+    computeFilePath("tokenDatabase", dataPath + "/tokens.xml");
+    computeFilePath("spoilerDatabase", dataPath + "/spoiler.xml");
 }
 
 void SettingsCache::resetPaths()
 {
-    QStringList databasePaths{customCardDatabasePath, cardDatabasePath, spoilerDatabasePath, tokenDatabasePath};
-    QString picsPath_ = picsPath;
-    settings->remove("paths"); // removes all keys in paths/*
+    QStringList databasePaths{pathsSettings->getCustomCardDatabasePath(), pathsSettings->getCardDatabasePath(),
+                              pathsSettings->getSpoilerCardDatabasePath(), pathsSettings->getTokenDatabasePath()};
+    QString picsPath_ = pathsSettings->getPicsPath();
+
+    QSettings pathsIni(getSettingsPath() + "paths.ini", QSettings::IniFormat);
+    pathsIni.remove("paths");
+
     loadPaths();
-    if (databasePaths !=
-        QStringList{customCardDatabasePath, cardDatabasePath, spoilerDatabasePath, tokenDatabasePath}) {
+
+    if (databasePaths != QStringList{pathsSettings->getCustomCardDatabasePath(), pathsSettings->getCardDatabasePath(),
+                                     pathsSettings->getSpoilerCardDatabasePath(),
+                                     pathsSettings->getTokenDatabasePath()}) {
         emit cardDatabasePathChanged();
     }
-    if (picsPath_ != picsPath) {
-        emit picsPathChanged();
+    if (picsPath_ != pathsSettings->getPicsPath()) {
+        emit pathsSettings->picsPathChanged();
     }
 }
 
+// ICardDatabasePathProvider - delegate to pathsSettings
+QString SettingsCache::getCustomCardDatabasePath() const
+{
+    return pathsSettings->getCustomCardDatabasePath();
+}
+
+QString SettingsCache::getCardDatabasePath() const
+{
+    return pathsSettings->getCardDatabasePath();
+}
+
+QString SettingsCache::getSpoilerCardDatabasePath() const
+{
+    return pathsSettings->getSpoilerCardDatabasePath();
+}
+
+QString SettingsCache::getTokenDatabasePath() const
+{
+    return pathsSettings->getTokenDatabasePath();
+}
+
+// INetworkSettingsProvider - delegate to sub-objects
+int SettingsCache::getKeepAlive() const
+{
+    return networkSettings->getKeepAlive();
+}
+
+int SettingsCache::getTimeOut() const
+{
+    return networkSettings->getTimeOut();
+}
+
+bool SettingsCache::getNotifyAboutUpdates() const
+{
+    return updatesSettings->getNotifyAboutUpdates();
+}
+
+void SettingsCache::setKnownMissingFeatures(const QString &_knownMissingFeatures)
+{
+    networkSettings->setKnownMissingFeatures(_knownMissingFeatures);
+}
+
+QString SettingsCache::getKnownMissingFeatures()
+{
+    return networkSettings->getKnownMissingFeatures();
+}
+
+QString SettingsCache::getClientID()
+{
+    return networkSettings->getClientID();
+}
+
+// Release channels
+ReleaseChannel *SettingsCache::getUpdateReleaseChannel() const
+{
+    return releaseChannels.at(qMax(0, updatesSettings->getUpdateReleaseChannelIndex()));
+}
+
+QList<ReleaseChannel *> SettingsCache::getUpdateReleaseChannels() const
+{
+    return releaseChannels;
+}
+
+int SettingsCache::getUpdateReleaseChannelIndex() const
+{
+    return updatesSettings->getUpdateReleaseChannelIndex();
+}
+
+// Sub-settings accessors
+ShortcutsSettings &SettingsCache::shortcuts() const
+{
+    return *shortcutsSettings;
+}
+
+CardDatabaseSettings &SettingsCache::cardDatabase() const
+{
+    return *cardDatabaseSettings;
+}
+
+ServersSettings &SettingsCache::servers() const
+{
+    return *serversSettings;
+}
+
+MessageSettings &SettingsCache::messages() const
+{
+    return *messageSettings;
+}
+
+GameFiltersSettings &SettingsCache::gameFilters() const
+{
+    return *gameFiltersSettings;
+}
+
+LayoutsSettings &SettingsCache::layouts() const
+{
+    return *layoutsSettings;
+}
+
+DownloadSettings &SettingsCache::downloads() const
+{
+    return *downloadSettings;
+}
+
+RecentsSettings &SettingsCache::recents() const
+{
+    return *recentsSettings;
+}
+
+CardOverrideSettings &SettingsCache::cardOverrides() const
+{
+    return *cardOverrideSettings;
+}
+
+DebugSettings &SettingsCache::debug() const
+{
+    return *debugSettings;
+}
+
 CardCounterSettings &SettingsCache::cardCounters() const
 {
     return *cardCounterSettings;
 }
+
+TabsSettings &SettingsCache::tabs() const
+{
+    return *tabsSettings;
+}
+
+SoundSettings &SettingsCache::sound() const
+{
+    return *soundSettings;
+}
+
+GameSettings &SettingsCache::game() const
+{
+    return *gameSettings;
+}
+
+ChatSettings &SettingsCache::chat() const
+{
+    return *chatSettings;
+}
+
+CacheStorageSettings &SettingsCache::cacheStorage() const
+{
+    return *cacheStorageSettings;
+}
+
+UpdatesSettings &SettingsCache::updates() const
+{
+    return *updatesSettings;
+}
+
+PersonalSettings &SettingsCache::personal() const
+{
+    return *personalSettings;
+}
+
+CardsDisplaySettings &SettingsCache::cardsDisplay() const
+{
+    return *cardsDisplaySettings;
+}
+
+InterfaceSettings &SettingsCache::userInterface() const
+{
+    return *interfaceSettings;
+}
+
+PathsSettings &SettingsCache::paths() const
+{
+    return *pathsSettings;
+}
+
+DeckEditorSettings &SettingsCache::deckEditor() const
+{
+    return *deckEditorSettings;
+}
+
+VisualDeckStorageSettings &SettingsCache::visualDeckStorage() const
+{
+    return *visualDeckStorageSettings;
+}
+
+AppearanceSettings &SettingsCache::appearance() const
+{
+    return *appearanceSettings;
+}
+
+NetworkSettings &SettingsCache::network() const
+{
+    return *networkSettings;
+}
diff --git a/cockatrice/src/client/settings/cache_settings.h b/cockatrice/src/client/settings/cache_settings.h
index df68ce0c4..5f699247d 100644
--- a/cockatrice/src/client/settings/cache_settings.h
+++ b/cockatrice/src/client/settings/cache_settings.h
@@ -1,337 +1,101 @@
 /**
  * @file cache_settings.h
  * @ingroup Settings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef SETTINGSCACHE_H
 #define SETTINGSCACHE_H
 
-#include "shortcuts_settings.h"
-
-#include <QDate>
+#include <QList>
 #include <QLoggingCategory>
-#include <QSize>
+#include <QString>
 #include <QStringList>
 #include <libcockatrice/interfaces/interface_card_database_path_provider.h>
 #include <libcockatrice/interfaces/interface_network_settings_provider.h>
-#include <libcockatrice/settings/card_database_settings.h>
-#include <libcockatrice/settings/card_override_settings.h>
-#include <libcockatrice/settings/debug_settings.h>
-#include <libcockatrice/settings/download_settings.h>
-#include <libcockatrice/settings/game_filters_settings.h>
-#include <libcockatrice/settings/layouts_settings.h>
-#include <libcockatrice/settings/message_settings.h>
-#include <libcockatrice/settings/recents_settings.h>
-#include <libcockatrice/settings/servers_settings.h>
-#include <libcockatrice/utility/macros.h>
+#include <qtmetamacros.h>
 
 inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache");
 
 class ReleaseChannel;
 
-// In MB (Increments of 64)
-#define PIXMAPCACHE_SIZE_DEFAULT 2048
-#define PIXMAPCACHE_SIZE_MIN 64
-#define PIXMAPCACHE_SIZE_MAX 4096
-
-// In MB
-constexpr int NETWORK_CACHE_SIZE_DEFAULT = 1024 * 4; // 4 GB
-constexpr int NETWORK_CACHE_SIZE_MIN = 1;            // 1 MB
-constexpr int NETWORK_CACHE_SIZE_MAX = 1024 * 1024;  // 1 TB
-
-// In Days
-#define NETWORK_REDIRECT_CACHE_TTL_DEFAULT 30
-#define NETWORK_REDIRECT_CACHE_TTL_MIN 1
-#define NETWORK_REDIRECT_CACHE_TTL_MAX 90
-
 #define DEFAULT_LANG_NAME "English"
 #define CLIENT_INFO_NOT_SET "notset"
 
 #define DEFAULT_FONT_SIZE 12
 
-inline QStringList defaultTags = {
-    // Strategies
-    "🏃️ Aggro",
-    "🧙‍️ Control",
-    "⚔️ Midrange",
-    "🌀 Combo",
-    "🪓 Mill",
-    "🔒 Stax",
-    "🗺️ Landfall",
-    "🛡️ Pillowfort",
-    "🌱 Ramp",
-    "⚡ Storm",
-    "💀 Aristocrats",
-    "☠️ Reanimator",
-    "👹 Sacrifice",
-    "🔥 Burn",
-    "🌟 Lifegain",
-    "🔮 Spellslinger",
-    "👥 Tokens",
-    "🎭 Blink",
-    "⏳ Time Manipulation",
-    "🌍 Domain",
-    "💫 Proliferate",
-    "📜 Saga",
-    "🎲 Chaos",
-    "🪄 Auras",
-    "🔫 Pingers",
-
-    // Themes
-    "👑 Monarch",
-    "🚀 Vehicles",
-    "💉 Infect",
-    "🩸 Madness",
-    "🌀 Morph",
-
-    // Card Types
-    "⚔️ Creature",
-    "💎 Artifact",
-    "🌔 Enchantment",
-    "📖 Sorcery",
-    "⚡ Instant",
-    "🌌 Planeswalker",
-    "🌏 Land",
-    "🪄 Aura",
-
-    // Kindred Types
-    "🐉 Kindred",
-    "🧙 Humans",
-    "⚔️ Soldiers",
-    "🛡️ Knights",
-    "🎻 Bards",
-    "🧝 Elves",
-    "🌲 Dryads",
-    "😇 Angels",
-    "🎩 Wizards",
-    "🧛 Vampires",
-    "🦴 Skeletons",
-    "💀 Zombies",
-    "👹 Demons",
-    "👾 Eldrazi",
-    "🐉 Dragons",
-    "🐠 Merfolk",
-    "🦁 Cats",
-    "🐺 Wolves",
-    "🐺 Werewolves",
-    "🦇 Bats",
-    "🐀 Rats",
-    "🦅 Birds",
-    "🦗 Insects",
-    "🍄 Fungus",
-    "🐚 Sea Creatures",
-    "🐗 Boars",
-    "🦊 Foxes",
-    "🦄 Unicorns",
-    "🐘 Elephants",
-    "🐻 Bears",
-    "🦏 Rhinos",
-    "🦂 Scorpions",
-};
-
-class QSettings;
+class CacheStorageSettings;
 class CardCounterSettings;
+class CardDatabaseSettings;
+class CardOverrideSettings;
+class CardsDisplaySettings;
+class ChatSettings;
+class CommanderBracketSettings;
+class DebugSettings;
+class DeckEditorSettings;
+class DownloadSettings;
+class GameFiltersSettings;
+class GameSettings;
+class InterfaceSettings;
+class LayoutsSettings;
+class MessageSettings;
+class PathsSettings;
+class PersonalSettings;
+class RecentsSettings;
+class ServersSettings;
+class ShortcutsSettings;
+class SoundSettings;
+class TabsSettings;
+class UpdatesSettings;
+class VisualDeckStorageSettings;
+class AppearanceSettings;
+class NetworkSettings;
+class QSettings;
 
 class SettingsCache : public ICardDatabasePathProvider, public INetworkSettingsProvider
 {
     Q_OBJECT
 
 signals:
-    void langChanged();
-    void picsPathChanged();
     void themeChanged();
-    void homeTabBackgroundSourceChanged();
-    void homeTabBackgroundShuffleFrequencyChanged();
-    void picDownloadChanged();
-    void showStatusBarChanged(bool state);
-    void displayCardNamesChanged();
-    void overrideAllCardArtWithPersonalPreferenceChanged(bool _overrideAllCardArtWithPersonalPreference);
-    void bumpSetsWithCardsInDeckToTopChanged();
-    void printingSelectorSortOrderChanged();
-    void printingSelectorCardSizeChanged();
-    void includeRebalancedCardsChanged(bool _includeRebalancedCards);
-    void printingSelectorNavigationButtonsVisibleChanged();
-    void deckEditorBannerCardComboBoxVisibleChanged(bool _visible);
-    void deckEditorTagsWidgetVisibleChanged(bool _visible);
-    void visualDeckStorageShowTagFilterChanged(bool _visible);
-    void visualDeckStorageDefaultTagsListChanged();
-    void visualDeckStorageShowBannerCardComboBoxChanged(bool _visible);
-    void visualDeckStorageShowTagsOnDeckPreviewsChanged(bool _visible);
-    void visualDeckStorageCardSizeChanged();
-    void visualDeckStorageDrawUnusedColorIdentitiesChanged(bool _visible);
-    void visualDeckStorageUnusedColorIdentitiesOpacityChanged(bool value);
-    void visualDeckStorageInGameChanged(bool enabled);
-    void visualDeckStorageSelectionAnimationChanged(bool enabled);
-    void visualDatabaseDisplayFilterToMostRecentSetsEnabledChanged(bool enabled);
-    void visualDatabaseDisplayFilterToMostRecentSetsAmountChanged(int amount);
-    void visualDeckEditorSampleHandSizeAmountChanged(int amount);
-    void visualDeckEditorCardSizeChanged();
-    void visualDatabaseDisplayCardSizeChanged();
-    void edhRecCardSizeChanged();
-    void archidektPreviewSizeChanged();
-    void horizontalHandChanged();
-    void handJustificationChanged();
-    void invertVerticalCoordinateChanged();
-    void minPlayersForMultiColumnLayoutChanged();
-    void soundEnabledChanged();
-    void soundThemeChanged();
-    void ignoreUnregisteredUsersChanged();
-    void ignoreUnregisteredUserMessagesChanged();
-    void pixmapCacheSizeChanged(int newSizeInMBs);
-    void networkCacheSizeChanged(int newSizeInMBs);
-    void redirectCacheTtlChanged(int newTtl);
-    void masterVolumeChanged(int value);
-    void chatMentionCompleterChanged();
-    void downloadSpoilerTimeIndexChanged();
-    void downloadSpoilerStatusChanged();
-    void useTearOffMenusChanged(bool state);
-    void roundCardCornersChanged(bool roundCardCorners);
 
 private:
-    QSettings *settings;
-    ShortcutsSettings *shortcutsSettings;
-    CardDatabaseSettings *cardDatabaseSettings;
-    ServersSettings *serversSettings;
-    MessageSettings *messageSettings;
-    GameFiltersSettings *gameFiltersSettings;
-    LayoutsSettings *layoutsSettings;
-    DownloadSettings *downloadSettings;
-    RecentsSettings *recentsSettings;
-    CardOverrideSettings *cardOverrideSettings;
-    DebugSettings *debugSettings;
-    CardCounterSettings *cardCounterSettings;
+    QSettings *settings = nullptr;
+    ShortcutsSettings *shortcutsSettings = nullptr;
+    CardDatabaseSettings *cardDatabaseSettings = nullptr;
+    ServersSettings *serversSettings = nullptr;
+    MessageSettings *messageSettings = nullptr;
+    GameFiltersSettings *gameFiltersSettings = nullptr;
+    LayoutsSettings *layoutsSettings = nullptr;
+    DownloadSettings *downloadSettings = nullptr;
+    RecentsSettings *recentsSettings = nullptr;
+    CardOverrideSettings *cardOverrideSettings = nullptr;
+    DebugSettings *debugSettings = nullptr;
+    CardCounterSettings *cardCounterSettings = nullptr;
+    TabsSettings *tabsSettings = nullptr;
+    SoundSettings *soundSettings = nullptr;
+    GameSettings *gameSettings = nullptr;
+    ChatSettings *chatSettings = nullptr;
+    CacheStorageSettings *cacheStorageSettings = nullptr;
+    UpdatesSettings *updatesSettings = nullptr;
+    PersonalSettings *personalSettings = nullptr;
+    CardsDisplaySettings *cardsDisplaySettings = nullptr;
+    InterfaceSettings *interfaceSettings = nullptr;
+    DeckEditorSettings *deckEditorSettings = nullptr;
+    PathsSettings *pathsSettings = nullptr;
+    VisualDeckStorageSettings *visualDeckStorageSettings = nullptr;
+    AppearanceSettings *appearanceSettings = nullptr;
+    NetworkSettings *networkSettings = nullptr;
+    CommanderBracketSettings *commanderBracketSettings = nullptr;
+
+    QString themeName;
+
+    QList<ReleaseChannel *> releaseChannels;
+    bool isPortableBuild;
 
-    QByteArray mainWindowGeometry;
-    QByteArray tokenDialogGeometry;
-    QByteArray setsDialogGeometry;
-    QString lang;
-    QString deckPath, filtersPath, replaysPath, picsPath, redirectCachePath, customPicsPath, cardDatabasePath,
-        customCardDatabasePath, themesPath, spoilerDatabasePath, tokenDatabasePath, themeName, homeTabBackgroundSource;
-    bool tabVisualDeckStorageOpen, tabServerOpen, tabAccountOpen, tabDeckStorageOpen, tabReplaysOpen, tabAdminOpen,
-        tabLogOpen;
-    bool checkUpdatesOnStartup;
-    bool startupCardUpdateCheckPromptForUpdate;
-    bool startupCardUpdateCheckAlwaysUpdate;
-    bool checkCardUpdatesOnStartup;
-    int cardUpdateCheckInterval;
-    QDate lastCardUpdateCheck;
-    bool notifyAboutUpdates;
-    bool notifyAboutNewVersion;
-    bool showTipsOnStartup;
-    QList<int> seenTips;
-    int homeTabBackgroundShuffleFrequency;
-    bool mbDownloadSpoilers;
-    int updateReleaseChannel;
-    int maxFontSize;
-    bool picDownload;
-    bool notificationsEnabled;
-    bool spectatorNotificationsEnabled;
-    bool buddyConnectNotificationsEnabled;
-    bool doubleClickToPlay;
-    bool clickPlaysAllSelected;
-    bool playToStack;
-    bool doNotDeleteArrowsInSubPhases;
-    int startingHandSize;
-    bool annotateTokens;
-    QByteArray tabGameSplitterSizes;
-    bool showShortcuts;
-    bool displayCardNames;
-    bool overrideAllCardArtWithPersonalPreference;
-    bool bumpSetsWithCardsInDeckToTop;
-    int printingSelectorSortOrder;
-    int printingSelectorCardSize;
-    bool includeRebalancedCards;
-    bool printingSelectorNavigationButtonsVisible;
-    bool deckEditorBannerCardComboBoxVisible;
-    bool deckEditorTagsWidgetVisible;
-    int visualDeckStorageSortingOrder;
-    bool visualDeckStorageShowFolders;
-    bool visualDeckStorageShowBannerCardComboBox;
-    bool visualDeckStorageShowTagsOnDeckPreviews;
-    bool visualDeckStorageShowTagFilter;
-    QStringList visualDeckStorageDefaultTagsList;
-    bool visualDeckStorageSearchFolderNames;
-    int visualDeckStorageCardSize;
-    int visualDeckEditorCardSize;
-    int visualDatabaseDisplayCardSize;
-    int edhrecCardSize;
-    int archidektPreviewSize;
-    bool visualDeckStorageDrawUnusedColorIdentities;
-    int visualDeckStorageUnusedColorIdentitiesOpacity;
-    int visualDeckStorageTooltipType;
-    bool visualDeckStoragePromptForConversion;
-    bool visualDeckStorageAlwaysConvert;
-    bool visualDeckStorageInGame;
-    bool visualDeckStorageSelectionAnimation;
-    int defaultDeckEditorType;
-    bool visualDatabaseDisplayFilterToMostRecentSetsEnabled;
-    int visualDatabaseDisplayFilterToMostRecentSetsAmount;
-    int visualDeckEditorSampleHandSize;
-    bool horizontalHand;
-    bool invertVerticalCoordinate;
-    int minPlayersForMultiColumnLayout;
-    bool tapAnimation;
-    bool autoRotateSidewaysLayoutCards;
-    bool openDeckInNewTab;
-    int rewindBufferingMs;
-    bool chatMention;
-    bool chatMentionCompleter;
-    QString chatMentionColor;
-    QString chatHighlightColor;
-    bool chatMentionForeground;
-    bool chatHighlightForeground;
-    int zoneViewSortByIndex, zoneViewGroupByIndex;
-    bool zoneViewPileView;
-    bool soundEnabled;
-    QString soundThemeName;
-    bool ignoreUnregisteredUsers;
-    bool ignoreUnregisteredUserMessages;
-    QString picUrl;
-    QString picUrlFallback;
-    QString clientID;
-    QString clientVersion;
-    QString knownMissingFeatures;
-    bool useTearOffMenus;
-    int cardViewInitialRowsMax;
-    int cardViewExpandedRowsMax;
-    bool closeEmptyCardView;
-    bool focusCardViewSearchBar;
-    int pixmapCacheSize;
-    int networkCacheSize;
-    int redirectCacheTtl;
-    bool scaleCards;
-    int verticalCardOverlapPercent;
-    bool showMessagePopups;
-    bool showMentionPopups;
-    bool roomHistory;
-    bool leftJustified;
-    int masterVolume;
-    int cardInfoViewMode;
-    QString highlightWords;
-    QString gameDescription;
-    int maxPlayers;
-    QString gameTypes;
-    bool onlyBuddies;
-    bool onlyRegistered;
-    bool spectatorsAllowed;
-    bool spectatorsNeedPassword;
-    bool spectatorsCanTalk;
-    bool spectatorsCanSeeEverything;
-    bool createGameAsSpectator;
-    int defaultStartingLifeTotal;
-    bool shareDecklistsOnLoad;
-    int keepalive;
-    int timeout;
-    void translateLegacySettings();
     [[nodiscard]] QString getSafeConfigPath(QString configEntry, QString defaultPath) const;
     [[nodiscard]] QString getSafeConfigFilePath(QString configEntry, QString defaultPath) const;
     void loadPaths();
-    bool rememberGameSettings;
-    QList<ReleaseChannel *> releaseChannels;
-    bool isPortableBuild;
-    bool roundCardCorners;
-    bool showStatusBar;
 
 public:
     SettingsCache();
@@ -339,769 +103,71 @@ public:
     QString getSettingsPath();
     [[nodiscard]] QString getCachePath() const;
     [[nodiscard]] QString getNetworkCachePath() const;
-    [[nodiscard]] const QByteArray &getMainWindowGeometry() const
-    {
-        return mainWindowGeometry;
-    }
-    [[nodiscard]] const QByteArray &getTokenDialogGeometry() const
-    {
-        return tokenDialogGeometry;
-    }
-    [[nodiscard]] const QByteArray &getSetsDialogGeometry() const
-    {
-        return setsDialogGeometry;
-    }
-    [[nodiscard]] QString getLang() const
-    {
-        return lang;
-    }
-    [[nodiscard]] QString getDeckPath() const
-    {
-        return deckPath;
-    }
-    [[nodiscard]] QString getFiltersPath() const
-    {
-        return filtersPath;
-    }
-    [[nodiscard]] QString getReplaysPath() const
-    {
-        return replaysPath;
-    }
-    [[nodiscard]] QString getThemesPath() const
-    {
-        return themesPath;
-    }
-    [[nodiscard]] QString getPicsPath() const
-    {
-        return picsPath;
-    }
-    [[nodiscard]] QString getRedirectCachePath() const
-    {
-        return redirectCachePath;
-    }
-    [[nodiscard]] QString getCustomPicsPath() const
-    {
-        return customPicsPath;
-    }
-    [[nodiscard]] QString getCustomCardDatabasePath() const override
-    {
-        return customCardDatabasePath;
-    }
-    [[nodiscard]] QString getCardDatabasePath() const override
-    {
-        return cardDatabasePath;
-    }
-    [[nodiscard]] QString getSpoilerCardDatabasePath() const override
-    {
-        return spoilerDatabasePath;
-    }
-    [[nodiscard]] QString getTokenDatabasePath() const override
-    {
-        return tokenDatabasePath;
-    }
+
+    // ICardDatabasePathProvider - delegate to pathsSettings
+    [[nodiscard]] QString getCustomCardDatabasePath() const override;
+    [[nodiscard]] QString getCardDatabasePath() const override;
+    [[nodiscard]] QString getSpoilerCardDatabasePath() const override;
+    [[nodiscard]] QString getTokenDatabasePath() const override;
+
+    // INetworkSettingsProvider - delegate to sub-objects
+    [[nodiscard]] int getKeepAlive() const override;
+    [[nodiscard]] int getTimeOut() const override;
+    [[nodiscard]] bool getNotifyAboutUpdates() const override;
+    void setKnownMissingFeatures(const QString &_knownMissingFeatures) override;
+    [[nodiscard]] QString getKnownMissingFeatures() override;
+    QString getClientID() override;
+
     [[nodiscard]] QString getThemeName() const
     {
         return themeName;
     }
-    [[nodiscard]] QString getHomeTabBackgroundSource() const
-    {
-        return homeTabBackgroundSource;
-    }
-    [[nodiscard]] int getHomeTabBackgroundShuffleFrequency() const
-    {
-        return homeTabBackgroundShuffleFrequency;
-    }
-    [[nodiscard]] bool getTabVisualDeckStorageOpen() const
-    {
-        return tabVisualDeckStorageOpen;
-    }
-    [[nodiscard]] bool getTabServerOpen() const
-    {
-        return tabServerOpen;
-    }
-    [[nodiscard]] bool getTabAccountOpen() const
-    {
-        return tabAccountOpen;
-    }
-    [[nodiscard]] bool getTabDeckStorageOpen() const
-    {
-        return tabDeckStorageOpen;
-    }
-    [[nodiscard]] bool getTabReplaysOpen() const
-    {
-        return tabReplaysOpen;
-    }
-    [[nodiscard]] bool getTabAdminOpen() const
-    {
-        return tabAdminOpen;
-    }
-    [[nodiscard]] bool getTabLogOpen() const
-    {
-        return tabLogOpen;
-    }
-    [[nodiscard]] QString getChatMentionColor() const
-    {
-        return chatMentionColor;
-    }
-    [[nodiscard]] QString getChatHighlightColor() const
-    {
-        return chatHighlightColor;
-    }
-    [[nodiscard]] bool getPicDownload() const
-    {
-        return picDownload;
-    }
-    [[nodiscard]] bool getShowStatusBar() const
-    {
-        return showStatusBar;
-    }
-    [[nodiscard]] bool getNotificationsEnabled() const
-    {
-        return notificationsEnabled;
-    }
-    [[nodiscard]] bool getSpectatorNotificationsEnabled() const
-    {
-        return spectatorNotificationsEnabled;
-    }
-    [[nodiscard]] bool getBuddyConnectNotificationsEnabled() const
-    {
-        return buddyConnectNotificationsEnabled;
-    }
-    [[nodiscard]] bool getCheckUpdatesOnStartup() const
-    {
-        return checkUpdatesOnStartup;
-    }
-    bool getStartupCardUpdateCheckPromptForUpdate()
-    {
-        return startupCardUpdateCheckPromptForUpdate;
-    }
-    bool getStartupCardUpdateCheckAlwaysUpdate()
-    {
-        return startupCardUpdateCheckAlwaysUpdate;
-    }
-    [[nodiscard]] int getCardUpdateCheckInterval() const
-    {
-        return cardUpdateCheckInterval;
-    }
-    [[nodiscard]] QDate getLastCardUpdateCheck() const
-    {
-        return lastCardUpdateCheck;
-    }
-    [[nodiscard]] bool getCardUpdateCheckRequired() const
-    {
-        return getLastCardUpdateCheck().daysTo(QDateTime::currentDateTime().date()) >= getCardUpdateCheckInterval() &&
-               getLastCardUpdateCheck() != QDateTime::currentDateTime().date();
-    }
-    [[nodiscard]] bool getNotifyAboutUpdates() const override
-    {
-        return notifyAboutUpdates;
-    }
-    [[nodiscard]] bool getNotifyAboutNewVersion() const
-    {
-        return notifyAboutNewVersion;
-    }
-    [[nodiscard]] bool getShowTipsOnStartup() const
-    {
-        return showTipsOnStartup;
-    }
-    [[nodiscard]] QList<int> getSeenTips() const
-    {
-        return seenTips;
-    }
-    [[nodiscard]] int getUpdateReleaseChannelIndex() const
-    {
-        return updateReleaseChannel;
-    }
-    [[nodiscard]] ReleaseChannel *getUpdateReleaseChannel() const
-    {
-        return releaseChannels.at(qMax(0, updateReleaseChannel));
-    }
-    [[nodiscard]] QList<ReleaseChannel *> getUpdateReleaseChannels() const
-    {
-        return releaseChannels;
-    }
 
-    [[nodiscard]] bool getDoubleClickToPlay() const
-    {
-        return doubleClickToPlay;
-    }
-    [[nodiscard]] bool getClickPlaysAllSelected() const
-    {
-        return clickPlaysAllSelected;
-    }
-    [[nodiscard]] bool getPlayToStack() const
-    {
-        return playToStack;
-    }
-    [[nodiscard]] bool getDoNotDeleteArrowsInSubPhases() const
-    {
-        return doNotDeleteArrowsInSubPhases;
-    }
-    [[nodiscard]] int getStartingHandSize() const
-    {
-        return startingHandSize;
-    }
-    [[nodiscard]] bool getAnnotateTokens() const
-    {
-        return annotateTokens;
-    }
-    [[nodiscard]] QByteArray getTabGameSplitterSizes() const
-    {
-        return tabGameSplitterSizes;
-    }
-    [[nodiscard]] bool getShowShortcuts() const
-    {
-        return showShortcuts;
-    }
-    [[nodiscard]] bool getDisplayCardNames() const
-    {
-        return displayCardNames;
-    }
-    [[nodiscard]] bool getOverrideAllCardArtWithPersonalPreference() const
-    {
-        return overrideAllCardArtWithPersonalPreference;
-    }
-    [[nodiscard]] bool getBumpSetsWithCardsInDeckToTop() const
-    {
-        return bumpSetsWithCardsInDeckToTop;
-    }
-    [[nodiscard]] int getPrintingSelectorSortOrder() const
-    {
-        return printingSelectorSortOrder;
-    }
-    [[nodiscard]] int getPrintingSelectorCardSize() const
-    {
-        return printingSelectorCardSize;
-    }
-    [[nodiscard]] bool getIncludeRebalancedCards() const
-    {
-        return includeRebalancedCards;
-    }
-    [[nodiscard]] bool getPrintingSelectorNavigationButtonsVisible() const
-    {
-        return printingSelectorNavigationButtonsVisible;
-    }
-    [[nodiscard]] bool getDeckEditorBannerCardComboBoxVisible() const
-    {
-        return deckEditorBannerCardComboBoxVisible;
-    }
-    [[nodiscard]] bool getDeckEditorTagsWidgetVisible() const
-    {
-        return deckEditorTagsWidgetVisible;
-    }
-    [[nodiscard]] int getVisualDeckStorageSortingOrder() const
-    {
-        return visualDeckStorageSortingOrder;
-    }
-    [[nodiscard]] bool getVisualDeckStorageShowFolders() const
-    {
-        return visualDeckStorageShowFolders;
-    }
-    [[nodiscard]] bool getVisualDeckStorageShowTagFilter() const
-    {
-        return visualDeckStorageShowTagFilter;
-    }
-    [[nodiscard]] QStringList getVisualDeckStorageDefaultTagsList() const
-    {
-        return visualDeckStorageDefaultTagsList;
-    }
-    [[nodiscard]] bool getVisualDeckStorageSearchFolderNames() const
-    {
-        return visualDeckStorageSearchFolderNames;
-    }
-    [[nodiscard]] bool getVisualDeckStorageShowBannerCardComboBox() const
-    {
-        return visualDeckStorageShowBannerCardComboBox;
-    }
-    [[nodiscard]] bool getVisualDeckStorageShowTagsOnDeckPreviews() const
-    {
-        return visualDeckStorageShowTagsOnDeckPreviews;
-    }
-    [[nodiscard]] int getVisualDeckStorageCardSize() const
-    {
-        return visualDeckStorageCardSize;
-    }
-    [[nodiscard]] bool getVisualDeckStorageDrawUnusedColorIdentities() const
-    {
-        return visualDeckStorageDrawUnusedColorIdentities;
-    }
-    [[nodiscard]] int getVisualDeckStorageUnusedColorIdentitiesOpacity() const
-    {
-        return visualDeckStorageUnusedColorIdentitiesOpacity;
-    }
-    [[nodiscard]] int getVisualDeckStorageTooltipType() const
-    {
-        return visualDeckStorageTooltipType;
-    }
-    [[nodiscard]] bool getVisualDeckStoragePromptForConversion() const
-    {
-        return visualDeckStoragePromptForConversion;
-    }
-    [[nodiscard]] bool getVisualDeckStorageAlwaysConvert() const
-    {
-        return visualDeckStorageAlwaysConvert;
-    }
-    [[nodiscard]] bool getVisualDeckStorageInGame() const
-    {
-        return visualDeckStorageInGame;
-    }
-    [[nodiscard]] bool getVisualDeckStorageSelectionAnimation() const
-    {
-        return visualDeckStorageSelectionAnimation;
-    }
-    [[nodiscard]] int getVisualDeckEditorCardSize() const
-    {
-        return visualDeckEditorCardSize;
-    }
-    [[nodiscard]] int getVisualDatabaseDisplayCardSize() const
-    {
-        return visualDatabaseDisplayCardSize;
-    }
-    [[nodiscard]] int getEDHRecCardSize() const
-    {
-        return edhrecCardSize;
-    }
-    [[nodiscard]] int getArchidektPreviewSize() const
-    {
-        return archidektPreviewSize;
-    }
-    [[nodiscard]] int getDefaultDeckEditorType() const
-    {
-        return defaultDeckEditorType;
-    }
-    [[nodiscard]] bool getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const
-    {
-        return visualDatabaseDisplayFilterToMostRecentSetsEnabled;
-    }
-    [[nodiscard]] int getVisualDatabaseDisplayFilterToMostRecentSetsAmount() const
-    {
-        return visualDatabaseDisplayFilterToMostRecentSetsAmount;
-    }
-    [[nodiscard]] int getVisualDeckEditorSampleHandSize() const
-    {
-        return visualDeckEditorSampleHandSize;
-    }
-    [[nodiscard]] bool getHorizontalHand() const
-    {
-        return horizontalHand;
-    }
-    [[nodiscard]] bool getInvertVerticalCoordinate() const
-    {
-        return invertVerticalCoordinate;
-    }
-    [[nodiscard]] int getMinPlayersForMultiColumnLayout() const
-    {
-        return minPlayersForMultiColumnLayout;
-    }
-    [[nodiscard]] bool getTapAnimation() const
-    {
-        return tapAnimation;
-    }
-    [[nodiscard]] bool getAutoRotateSidewaysLayoutCards() const
-    {
-        return autoRotateSidewaysLayoutCards;
-    }
-    [[nodiscard]] bool getOpenDeckInNewTab() const
-    {
-        return openDeckInNewTab;
-    }
-    [[nodiscard]] int getRewindBufferingMs() const
-    {
-        return rewindBufferingMs;
-    }
-    [[nodiscard]] bool getChatMention() const
-    {
-        return chatMention;
-    }
-    [[nodiscard]] bool getChatMentionCompleter() const
-    {
-        return chatMentionCompleter;
-    }
-    [[nodiscard]] bool getChatMentionForeground() const
-    {
-        return chatMentionForeground;
-    }
-    [[nodiscard]] bool getChatHighlightForeground() const
-    {
-        return chatHighlightForeground;
-    }
-    /**
-     * Currently selected index for the `Group by X` QComboBox
-     */
-    [[nodiscard]] int getZoneViewGroupByIndex() const
-    {
-        return zoneViewGroupByIndex;
-    }
-    /**
-     * Currently selected index for the `Sort by X` QComboBox
-     */
-    [[nodiscard]] int getZoneViewSortByIndex() const
-    {
-        return zoneViewSortByIndex;
-    }
-    /**
-       Returns if the view should be sorted into pile view.
-       @return zoneViewPileView if the view should be sorted into pile view.
-     */
-    [[nodiscard]] bool getZoneViewPileView() const
-    {
-        return zoneViewPileView;
-    }
-    [[nodiscard]] bool getSoundEnabled() const
-    {
-        return soundEnabled;
-    }
-    [[nodiscard]] QString getSoundThemeName() const
-    {
-        return soundThemeName;
-    }
-    [[nodiscard]] bool getIgnoreUnregisteredUsers() const
-    {
-        return ignoreUnregisteredUsers;
-    }
-    [[nodiscard]] bool getIgnoreUnregisteredUserMessages() const
-    {
-        return ignoreUnregisteredUserMessages;
-    }
-    [[nodiscard]] int getPixmapCacheSize() const
-    {
-        return pixmapCacheSize;
-    }
-    [[nodiscard]] int getNetworkCacheSizeInMB() const
-    {
-        return networkCacheSize;
-    }
-    [[nodiscard]] int getRedirectCacheTtl() const
-    {
-        return redirectCacheTtl;
-    }
-    [[nodiscard]] bool getScaleCards() const
-    {
-        return scaleCards;
-    }
-    [[nodiscard]] int getStackCardOverlapPercent() const
-    {
-        return verticalCardOverlapPercent;
-    }
-    [[nodiscard]] bool getShowMessagePopup() const
-    {
-        return showMessagePopups;
-    }
-    [[nodiscard]] bool getShowMentionPopup() const
-    {
-        return showMentionPopups;
-    }
-    [[nodiscard]] bool getRoomHistory() const
-    {
-        return roomHistory;
-    }
-    [[nodiscard]] bool getLeftJustified() const
-    {
-        return leftJustified;
-    }
-    [[nodiscard]] int getMasterVolume() const
-    {
-        return masterVolume;
-    }
-    [[nodiscard]] int getCardInfoViewMode() const
-    {
-        return cardInfoViewMode;
-    }
+    [[nodiscard]] ReleaseChannel *getUpdateReleaseChannel() const;
+    [[nodiscard]] QList<ReleaseChannel *> getUpdateReleaseChannels() const;
+    [[nodiscard]] int getUpdateReleaseChannelIndex() const;
+
     [[nodiscard]] QStringList getCountries() const;
-    [[nodiscard]] QString getHighlightWords() const
-    {
-        return highlightWords;
-    }
-    [[nodiscard]] QString getGameDescription() const
-    {
-        return gameDescription;
-    }
-    [[nodiscard]] int getMaxPlayers() const
-    {
-        return maxPlayers;
-    }
-    [[nodiscard]] QString getGameTypes() const
-    {
-        return gameTypes;
-    }
-    [[nodiscard]] bool getOnlyBuddies() const
-    {
-        return onlyBuddies;
-    }
-    [[nodiscard]] bool getOnlyRegistered() const
-    {
-        return onlyRegistered;
-    }
-    [[nodiscard]] bool getSpectatorsAllowed() const
-    {
-        return spectatorsAllowed;
-    }
-    [[nodiscard]] bool getSpectatorsNeedPassword() const
-    {
-        return spectatorsNeedPassword;
-    }
-    [[nodiscard]] bool getSpectatorsCanTalk() const
-    {
-        return spectatorsCanTalk;
-    }
-    [[nodiscard]] bool getSpectatorsCanSeeEverything() const
-    {
-        return spectatorsCanSeeEverything;
-    }
-    [[nodiscard]] int getDefaultStartingLifeTotal() const
-    {
-        return defaultStartingLifeTotal;
-    }
-    [[nodiscard]] bool getShareDecklistsOnLoad() const
-    {
-        return shareDecklistsOnLoad;
-    }
-    [[nodiscard]] bool getCreateGameAsSpectator() const
-    {
-        return createGameAsSpectator;
-    }
-    [[nodiscard]] bool getRememberGameSettings() const
-    {
-        return rememberGameSettings;
-    }
-    [[nodiscard]] int getKeepAlive() const override
-    {
-        return keepalive;
-    }
-    [[nodiscard]] int getTimeOut() const override
-    {
-        return timeout;
-    }
-    [[nodiscard]] int getMaxFontSize() const
-    {
-        return maxFontSize;
-    }
-    void setClientID(const QString &clientID);
-    void setClientVersion(const QString &clientVersion);
-    void setKnownMissingFeatures(const QString &_knownMissingFeatures) override;
-    void setUseTearOffMenus(bool _useTearOffMenus);
-    void setCardViewInitialRowsMax(int _cardViewInitialRowsMax);
-    void setCardViewExpandedRowsMax(int value);
-    void setCloseEmptyCardView(QT_STATE_CHANGED_T value);
-    void setFocusCardViewSearchBar(QT_STATE_CHANGED_T value);
-    QString getClientID() override
-    {
-        return clientID;
-    }
-    QString getClientVersion()
-    {
-        return clientVersion;
-    }
-    QString getKnownMissingFeatures() override
-    {
-        return knownMissingFeatures;
-    }
-    bool getUseTearOffMenus()
-    {
-        return useTearOffMenus;
-    }
-    [[nodiscard]] int getCardViewInitialRowsMax() const
-    {
-        return cardViewInitialRowsMax;
-    }
-    [[nodiscard]] int getCardViewExpandedRowsMax() const
-    {
-        return cardViewExpandedRowsMax;
-    }
-    [[nodiscard]] bool getCloseEmptyCardView() const
-    {
-        return closeEmptyCardView;
-    }
-    [[nodiscard]] bool getFocusCardViewSearchBar() const
-    {
-        return focusCardViewSearchBar;
-    }
-    [[nodiscard]] ShortcutsSettings &shortcuts() const
-    {
-        return *shortcutsSettings;
-    }
-    [[nodiscard]] CardDatabaseSettings *cardDatabase() const
-    {
-        return cardDatabaseSettings;
-    }
-    [[nodiscard]] ServersSettings &servers() const
-    {
-        return *serversSettings;
-    }
-    [[nodiscard]] MessageSettings &messages() const
-    {
-        return *messageSettings;
-    }
-    [[nodiscard]] GameFiltersSettings &gameFilters() const
-    {
-        return *gameFiltersSettings;
-    }
-    [[nodiscard]] LayoutsSettings &layouts() const
-    {
-        return *layoutsSettings;
-    }
-    [[nodiscard]] DownloadSettings &downloads() const
-    {
-        return *downloadSettings;
-    }
-    [[nodiscard]] RecentsSettings &recents() const
-    {
-        return *recentsSettings;
-    }
-    [[nodiscard]] CardOverrideSettings &cardOverrides() const
-    {
-        return *cardOverrideSettings;
-    }
-    [[nodiscard]] DebugSettings &debug() const
-    {
-        return *debugSettings;
-    }
+
+    [[nodiscard]] ShortcutsSettings &shortcuts() const;
+    [[nodiscard]] CardDatabaseSettings &cardDatabase() const;
+    [[nodiscard]] ServersSettings &servers() const;
+    [[nodiscard]] MessageSettings &messages() const;
+    [[nodiscard]] GameFiltersSettings &gameFilters() const;
+    [[nodiscard]] LayoutsSettings &layouts() const;
+    [[nodiscard]] DownloadSettings &downloads() const;
+    [[nodiscard]] RecentsSettings &recents() const;
+    [[nodiscard]] CardOverrideSettings &cardOverrides() const;
+    [[nodiscard]] DebugSettings &debug() const;
     [[nodiscard]] CardCounterSettings &cardCounters() const;
+    [[nodiscard]] TabsSettings &tabs() const;
+    [[nodiscard]] SoundSettings &sound() const;
+    [[nodiscard]] GameSettings &game() const;
+    [[nodiscard]] ChatSettings &chat() const;
+    [[nodiscard]] CacheStorageSettings &cacheStorage() const;
+    [[nodiscard]] UpdatesSettings &updates() const;
+    [[nodiscard]] PersonalSettings &personal() const;
+    [[nodiscard]] CardsDisplaySettings &cardsDisplay() const;
+    [[nodiscard]] InterfaceSettings &userInterface() const;
+    [[nodiscard]] DeckEditorSettings &deckEditor() const;
+    [[nodiscard]] PathsSettings &paths() const;
+    [[nodiscard]] VisualDeckStorageSettings &visualDeckStorage() const;
+    [[nodiscard]] AppearanceSettings &appearance() const;
+    [[nodiscard]] NetworkSettings &network() const;
+    [[nodiscard]] CommanderBracketSettings &commanderBrackets() const
+    {
+        return *commanderBracketSettings;
+    }
 
     [[nodiscard]] bool getIsPortableBuild() const
     {
         return isPortableBuild;
     }
-    [[nodiscard]] bool getDownloadSpoilersStatus() const
-    {
-        return mbDownloadSpoilers;
-    }
-    [[nodiscard]] bool getRoundCardCorners() const
-    {
-        return roundCardCorners;
-    }
 
     static SettingsCache &instance();
     void resetPaths();
 
 public slots:
-    void setDownloadSpoilerStatus(bool _spoilerStatus);
-
-    void setMainWindowGeometry(const QByteArray &_mainWindowGeometry);
-    void setTokenDialogGeometry(const QByteArray &_tokenDialog);
-    void setSetsDialogGeometry(const QByteArray &_setsDialog);
-    void setLang(const QString &_lang);
-    void setShowTipsOnStartup(bool _showTipsOnStartup);
-    void setSeenTips(const QList<int> &_seenTips);
-    void setDeckPath(const QString &_deckPath);
-    void setFiltersPath(const QString &_filtersPath);
-    void setReplaysPath(const QString &_replaysPath);
-    void setThemesPath(const QString &_themesPath);
-    void setCustomCardDatabasePath(const QString &_customCardDatabasePath);
-    void setPicsPath(const QString &_picsPath);
-    void setCardDatabasePath(const QString &_cardDatabasePath);
-    void setSpoilerDatabasePath(const QString &_spoilerDatabasePath);
-    void setTokenDatabasePath(const QString &_tokenDatabasePath);
     void setThemeName(const QString &_themeName);
-    void setHomeTabBackgroundSource(const QString &_backgroundSource);
-    void setHomeTabBackgroundShuffleFrequency(int _frequency);
-    void setTabVisualDeckStorageOpen(bool value);
-    void setTabServerOpen(bool value);
-    void setTabAccountOpen(bool value);
-    void setTabDeckStorageOpen(bool value);
-    void setTabReplaysOpen(bool value);
-    void setTabAdminOpen(bool value);
-    void setTabLogOpen(bool value);
-    void setChatMentionColor(const QString &_chatMentionColor);
-    void setChatHighlightColor(const QString &_chatHighlightColor);
-    void setPicDownload(QT_STATE_CHANGED_T _picDownload);
-    void setShowStatusBar(bool value);
-    void setNotificationsEnabled(QT_STATE_CHANGED_T _notificationsEnabled);
-    void setSpectatorNotificationsEnabled(QT_STATE_CHANGED_T _spectatorNotificationsEnabled);
-    void setBuddyConnectNotificationsEnabled(QT_STATE_CHANGED_T _buddyConnectNotificationsEnabled);
-    void setDoubleClickToPlay(QT_STATE_CHANGED_T _doubleClickToPlay);
-    void setClickPlaysAllSelected(QT_STATE_CHANGED_T _clickPlaysAllSelected);
-    void setPlayToStack(QT_STATE_CHANGED_T _playToStack);
-    void setDoNotDeleteArrowsInSubPhases(QT_STATE_CHANGED_T _doNotDeleteArrowsInSubPhases);
-    void setStartingHandSize(int _startingHandSize);
-    void setAnnotateTokens(QT_STATE_CHANGED_T _annotateTokens);
-    void setTabGameSplitterSizes(const QByteArray &_tabGameSplitterSizes);
-    void setShowShortcuts(QT_STATE_CHANGED_T _showShortcuts);
-    void setDisplayCardNames(QT_STATE_CHANGED_T _displayCardNames);
-    void setOverrideAllCardArtWithPersonalPreference(QT_STATE_CHANGED_T _overrideAllCardArt);
-    void setBumpSetsWithCardsInDeckToTop(QT_STATE_CHANGED_T _bumpSetsWithCardsInDeckToTop);
-    void setPrintingSelectorSortOrder(int _printingSelectorSortOrder);
-    void setPrintingSelectorCardSize(int _printingSelectorCardSize);
-    void setIncludeRebalancedCards(bool _includeRebalancedCards);
-    void setPrintingSelectorNavigationButtonsVisible(QT_STATE_CHANGED_T _navigationButtonsVisible);
-    void setDeckEditorBannerCardComboBoxVisible(QT_STATE_CHANGED_T _deckEditorBannerCardComboBoxVisible);
-    void setDeckEditorTagsWidgetVisible(QT_STATE_CHANGED_T _deckEditorTagsWidgetVisible);
-    void setVisualDeckStorageSortingOrder(int _visualDeckStorageSortingOrder);
-    void setVisualDeckStorageShowFolders(QT_STATE_CHANGED_T value);
-    void setVisualDeckStorageShowTagFilter(QT_STATE_CHANGED_T _showTags);
-    void setVisualDeckStorageDefaultTagsList(QStringList _defaultTagsList);
-    void setVisualDeckStorageSearchFolderNames(QT_STATE_CHANGED_T value);
-    void setVisualDeckStorageShowBannerCardComboBox(QT_STATE_CHANGED_T _showBannerCardComboBox);
-    void setVisualDeckStorageShowTagsOnDeckPreviews(QT_STATE_CHANGED_T _showTags);
-    void setVisualDeckStorageCardSize(int _visualDeckStorageCardSize);
-    void setVisualDeckStorageDrawUnusedColorIdentities(QT_STATE_CHANGED_T _visualDeckStorageDrawUnusedColorIdentities);
-    void setVisualDeckStorageUnusedColorIdentitiesOpacity(int _visualDeckStorageUnusedColorIdentitiesOpacity);
-    void setVisualDeckStorageTooltipType(int value);
-    void setVisualDeckStoragePromptForConversion(bool _visualDeckStoragePromptForConversion);
-    void setVisualDeckStorageAlwaysConvert(bool _visualDeckStorageAlwaysConvert);
-    void setVisualDeckStorageInGame(QT_STATE_CHANGED_T value);
-    void setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T value);
-    void setVisualDeckEditorCardSize(int _visualDeckEditorCardSize);
-    void setVisualDatabaseDisplayCardSize(int _visualDatabaseDisplayCardSize);
-    void setEDHRecCardSize(int _EDHRecCardSize);
-    void setArchidektPreviewCardSize(int _archidektPreviewCardSize);
-    void setDefaultDeckEditorType(int value);
-    void setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(QT_STATE_CHANGED_T _enabled);
-    void setVisualDatabaseDisplayFilterToMostRecentSetsAmount(int _amount);
-    void setVisualDeckEditorSampleHandSize(int _amount);
-    void setHorizontalHand(QT_STATE_CHANGED_T _horizontalHand);
-    void setInvertVerticalCoordinate(QT_STATE_CHANGED_T _invertVerticalCoordinate);
-    void setMinPlayersForMultiColumnLayout(int _minPlayersForMultiColumnLayout);
-    void setTapAnimation(QT_STATE_CHANGED_T _tapAnimation);
-    void setAutoRotateSidewaysLayoutCards(QT_STATE_CHANGED_T _autoRotateSidewaysLayoutCards);
-    void setOpenDeckInNewTab(QT_STATE_CHANGED_T _openDeckInNewTab);
-    void setRewindBufferingMs(int _rewindBufferingMs);
-    void setChatMention(QT_STATE_CHANGED_T _chatMention);
-    void setChatMentionCompleter(QT_STATE_CHANGED_T _chatMentionCompleter);
-    void setChatMentionForeground(QT_STATE_CHANGED_T _chatMentionForeground);
-    void setChatHighlightForeground(QT_STATE_CHANGED_T _chatHighlightForeground);
-    void setZoneViewGroupByIndex(const int _zoneViewGroupByIndex);
-    void setZoneViewSortByIndex(const int _zoneViewSortByIndex);
-    void setZoneViewPileView(QT_STATE_CHANGED_T _zoneViewPileView);
-    void setSoundEnabled(QT_STATE_CHANGED_T _soundEnabled);
-    void setSoundThemeName(const QString &_soundThemeName);
-    void setIgnoreUnregisteredUsers(QT_STATE_CHANGED_T _ignoreUnregisteredUsers);
-    void setIgnoreUnregisteredUserMessages(QT_STATE_CHANGED_T _ignoreUnregisteredUserMessages);
-    void setPixmapCacheSize(const int _pixmapCacheSize);
-    void setNetworkCacheSizeInMB(const int _networkCacheSize);
-    void setNetworkRedirectCacheTtl(const int _redirectCacheTtl);
-    void setCardScaling(const QT_STATE_CHANGED_T _scaleCards);
-    void setStackCardOverlapPercent(const int _verticalCardOverlapPercent);
-    void setShowMessagePopups(const QT_STATE_CHANGED_T _showMessagePopups);
-    void setShowMentionPopups(const QT_STATE_CHANGED_T _showMentionPopups);
-    void setRoomHistory(const QT_STATE_CHANGED_T _roomHistory);
-    void setLeftJustified(const QT_STATE_CHANGED_T _leftJustified);
-    void setMasterVolume(const int _masterVolume);
-    void setCardInfoViewMode(const int _viewMode);
-    void setHighlightWords(const QString &_highlightWords);
-    void setGameDescription(const QString _gameDescription);
-    void setMaxPlayers(const int _maxPlayers);
-    void setGameTypes(const QString _gameTypes);
-    void setOnlyBuddies(const bool _onlyBuddies);
-    void setOnlyRegistered(const bool _onlyRegistered);
-    void setSpectatorsAllowed(const bool _spectatorsAllowed);
-    void setSpectatorsNeedPassword(const bool _spectatorsNeedPassword);
-    void setSpectatorsCanTalk(const bool _spectatorsCanTalk);
-    void setSpectatorsCanSeeEverything(const bool _spectatorsCanSeeEverything);
-    void setCreateGameAsSpectator(const bool _createGameAsSpectator);
-    void setDefaultStartingLifeTotal(const int _defaultStartingLifeTotal);
-    void setShareDecklistsOnLoad(const bool _shareDecklistsOnLoad);
-    void setRememberGameSettings(const bool _rememberGameSettings);
-    void setCheckUpdatesOnStartup(QT_STATE_CHANGED_T value);
-    void setStartupCardUpdateCheckPromptForUpdate(bool value);
-    void setStartupCardUpdateCheckAlwaysUpdate(bool value);
-    void setCardUpdateCheckInterval(int value);
-    void setLastCardUpdateCheck(QDate value);
-    void setNotifyAboutUpdate(QT_STATE_CHANGED_T _notifyaboutupdate);
-    void setNotifyAboutNewVersion(QT_STATE_CHANGED_T _notifyaboutnewversion);
-    void setUpdateReleaseChannelIndex(int value);
-    void setMaxFontSize(int _max);
-    void setRoundCardCorners(bool _roundCardCorners);
 };
-
 #endif
diff --git a/cockatrice/src/client/settings/card_counter_settings.cpp b/cockatrice/src/client/settings/card_counter_settings.cpp
index 71ce4cfc6..4bdd581b5 100644
--- a/cockatrice/src/client/settings/card_counter_settings.cpp
+++ b/cockatrice/src/client/settings/card_counter_settings.cpp
@@ -1,20 +1,30 @@
 #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 + "global.ini", "cards", "counters", parent)
+    : SettingsManager(settingsPath + "card_counters.ini", "cards", "counters", parent)
 {
 }
 
 void CardCounterSettings::setColor(int counterId, const QColor &color)
 {
+    QSettings settings = getSettings();
+
     QString key = QString("cards/counters/%1/color").arg(counterId);
 
-    if (settings.value(key).value<QColor>() == color)
+    if (settings.value(key).value<QColor>() == color) {
         return;
+    }
 
     settings.setValue(key, color);
     emit colorChanged(counterId, color);
@@ -36,7 +46,7 @@ QColor CardCounterSettings::color(int counterId) const
         defaultColor = QColor::fromHsv(h, s, v);
     }
 
-    return settings.value(QString("cards/counters/%1/color").arg(counterId), defaultColor).value<QColor>();
+    return getSettings().value(QString("cards/counters/%1/color").arg(counterId), defaultColor).value<QColor>();
 }
 
 QString CardCounterSettings::displayName(int counterId) const
diff --git a/cockatrice/src/client/settings/card_counter_settings.h b/cockatrice/src/client/settings/card_counter_settings.h
index b1d467d67..e5ca0a9bb 100644
--- a/cockatrice/src/client/settings/card_counter_settings.h
+++ b/cockatrice/src/client/settings/card_counter_settings.h
@@ -1,16 +1,18 @@
 /**
  * @file card_counter_settings.h
  * @ingroup GameSettings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 6b329b23d..4a5bafb01 100644
--- a/cockatrice/src/client/settings/shortcut_treeview.cpp
+++ b/cockatrice/src/client/settings/shortcut_treeview.cpp
@@ -3,7 +3,24 @@
 #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)
 {
@@ -150,12 +167,7 @@ void ShortcutTreeView::currentChanged(const QModelIndex &current, const QModelIn
  */
 void ShortcutTreeView::updateSearchString(const QString &searchString)
 {
-#if QT_VERSION > QT_VERSION_CHECK(5, 14, 0)
-    const auto skipEmptyParts = Qt::SkipEmptyParts;
-#else
-    const auto skipEmptyParts = QString::SkipEmptyParts;
-#endif
-    QStringList searchWords = searchString.split(" ", skipEmptyParts);
+    QStringList searchWords = searchString.split(" ", Qt::SkipEmptyParts);
 
     auto escapeRegex = [](const QString &s) { return QRegularExpression::escape(s); };
     std::transform(searchWords.begin(), searchWords.end(), searchWords.begin(), escapeRegex);
diff --git a/cockatrice/src/client/settings/shortcut_treeview.h b/cockatrice/src/client/settings/shortcut_treeview.h
index 8d74a6f1e..53f3fa0ef 100644
--- a/cockatrice/src/client/settings/shortcut_treeview.h
+++ b/cockatrice/src/client/settings/shortcut_treeview.h
@@ -1,15 +1,20 @@
 /**
  * @file shortcut_treeview.h
  * @ingroup CoreSettings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef SHORTCUT_TREEVIEW_H
 #define SHORTCUT_TREEVIEW_H
 
 #include <QSortFilterProxyModel>
-#include <QStandardItemModel>
+#include <QString>
 #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 53c6f6a23..ffb4afcac 100644
--- a/cockatrice/src/client/settings/shortcuts_settings.cpp
+++ b/cockatrice/src/client/settings/shortcuts_settings.cpp
@@ -2,9 +2,13 @@
 
 #include <QDebug>
 #include <QFile>
+#include <QMap>
 #include <QMessageBox>
+#include <QMessageLogger>
+#include <QSettings>
+#include <QSharedPointer>
 #include <QStringList>
-#include <utility>
+#include <QVariant>
 
 ShortcutKey::ShortcutKey(const QString &_name, QList<QKeySequence> _sequence, ShortcutGroup::Groups _group)
     : QList<QKeySequence>(_sequence), name(_name), group(_group)
@@ -64,8 +68,13 @@ ShortcutsSettings::ShortcutsSettings(const QString &settingsPath, QObject *paren
     }
 }
 
-/// PR 5079 changes Textbox/unfocusTextBox to Player/unfocusTextBox and tab_game/aFocusChat to Player/aFocusChat.
-/// A migration is necessary to let players keep their already configured shortcuts.
+/**
+ * @brief Migrates legacy shortcut key names to current naming scheme.
+ *
+ * PR 5079 changed Textbox/unfocusTextBox to Player/unfocusTextBox and
+ * tab_game/aFocusChat to Player/aFocusChat. This migration allows players
+ * to keep their already configured shortcuts.
+ */
 void ShortcutsSettings::migrateShortcuts()
 {
     if (QFile(settingsFilePath).exists()) {
@@ -236,9 +245,7 @@ bool ShortcutsSettings::isValid(const QString &name, const QString &sequences) c
     return findOverlaps(name, sequences).isEmpty();
 }
 
-/**
- * Checks if the shortcut is a shortcut that is active in all windows
- */
+/** @brief Checks if the shortcut is a shortcut that is active in all windows. */
 static bool isAlwaysActiveShortcut(const QString &shortcutName)
 {
     return shortcutName.startsWith("MainWindow") || shortcutName.startsWith("Tabs");
diff --git a/cockatrice/src/client/settings/shortcuts_settings.h b/cockatrice/src/client/settings/shortcuts_settings.h
index 736f0c896..24790a407 100644
--- a/cockatrice/src/client/settings/shortcuts_settings.h
+++ b/cockatrice/src/client/settings/shortcuts_settings.h
@@ -1,16 +1,25 @@
 /**
  * @file shortcuts_settings.h
  * @ingroup CoreSettings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef SHORTCUTSSETTINGS_H
 #define SHORTCUTSSETTINGS_H
 
 #include <QApplication>
+#include <QByteArray>
+#include <QChar>
+#include <QHash>
 #include <QKeySequence>
+#include <QList>
 #include <QLoggingCategory>
-#include <QSettings>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+#include <utility>
 
 inline Q_LOGGING_CATEGORY(ShortcutsSettingsLog, "shortcuts_settings");
 
@@ -223,6 +232,10 @@ private:
         {"TabDeckEditor/aLoadDeck", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load Deck..."),
                                                 parseSequenceString("Ctrl+O"),
                                                 ShortcutGroup::Deck_Editor)},
+        {"TabDeckEditor/aLoadDeckFromWebsite",
+         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load deck from online service..."),
+                     parseSequenceString("Ctrl+Shift+O"),
+                     ShortcutGroup::Deck_Editor)},
         {"TabDeckEditor/aLoadDeckFromClipboard",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load Deck from Clipboard..."),
                      parseSequenceString("Ctrl+Shift+V"),
@@ -283,6 +296,10 @@ private:
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load Deck from Clipboard..."),
                      parseSequenceString("Ctrl+Shift+V"),
                      ShortcutGroup::Game_Lobby)},
+        {"DeckViewContainer/loadFromWebsiteButton",
+         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load from website..."),
+                     parseSequenceString("Ctrl+Shift+O"),
+                     ShortcutGroup::Game_Lobby)},
         {"DeckViewContainer/unloadDeckButton", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Unload Deck"),
                                                            parseSequenceString("Ctrl+Alt+U"),
                                                            ShortcutGroup::Game_Lobby)},
@@ -501,7 +518,7 @@ private:
         {"Player/aUntapAll", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Untap All"),
                                          parseSequenceString("Ctrl+U"),
                                          ShortcutGroup::Playing_Area)},
-        {"Player/aDoesntUntap", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Toggle Untap"),
+        {"Player/aDoesntUntap", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Toggle Skip Untapping"),
                                             parseSequenceString("Alt+U"),
                                             ShortcutGroup::Playing_Area)},
         {"Player/aFlip", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Turn Card Over"),
@@ -513,6 +530,9 @@ private:
         {"Player/aPlay", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Play Card"),
                                      parseSequenceString(""),
                                      ShortcutGroup::Playing_Area)},
+        {"Player/aPlayFacedown", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Play Card, Face Down"),
+                                             parseSequenceString(""),
+                                             ShortcutGroup::Playing_Area)},
         {"Player/aAttach", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Attach Card..."),
                                        parseSequenceString("Ctrl+Alt+A"),
                                        ShortcutGroup::Playing_Area)},
@@ -534,6 +554,9 @@ private:
         {"Player/aSetAnnotation", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Set Annotation..."),
                                               parseSequenceString("Alt+N"),
                                               ShortcutGroup::Playing_Area)},
+        {"Player/aReduceLifeByPower", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Reduce Life by Power"),
+                                                  parseSequenceString("Ctrl+Shift+L"),
+                                                  ShortcutGroup::Playing_Area)},
         {"Player/aSelectAll", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Select All Cards in Zone"),
                                           parseSequenceString("Ctrl+A"),
                                           ShortcutGroup::Playing_Area)},
@@ -560,12 +583,9 @@ private:
         {"Player/aMoveToTopLibrary", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Top of Library"),
                                                  parseSequenceString(""),
                                                  ShortcutGroup::Move_selected)},
-        {"Player/aPlayFacedown", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Battlefield, Face Down"),
-                                             parseSequenceString(""),
-                                             ShortcutGroup::Move_selected)},
-        {"Player/aPlay", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Battlefield"),
-                                     parseSequenceString(""),
-                                     ShortcutGroup::Move_selected)},
+        {"Player/aMoveToTable", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Battlefield"),
+                                            parseSequenceString(""),
+                                            ShortcutGroup::Move_selected)},
         {"Player/aViewHand",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Hand"), parseSequenceString(""), ShortcutGroup::View)},
         {"Player/aViewGraveyard",
@@ -598,11 +618,19 @@ private:
         {"Player/aMoveTopCardsToGraveyard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple)"),
                                                         parseSequenceString("Alt+M"),
                                                         ShortcutGroup::Move_top)},
+        {"Player/aMoveTopCardsToGraveyardFaceDown",
+         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple), Face Down"),
+                     parseSequenceString(""),
+                     ShortcutGroup::Move_top)},
         {"Player/aMoveTopCardToExile",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile"), parseSequenceString(""), ShortcutGroup::Move_top)},
         {"Player/aMoveTopCardsToExile", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple)"),
                                                     parseSequenceString(""),
                                                     ShortcutGroup::Move_top)},
+        {"Player/aMoveTopCardsToExileFaceDown",
+         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple), Face Down"),
+                     parseSequenceString(""),
+                     ShortcutGroup::Move_top)},
         {"Player/aMoveTopCardsUntil", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Stack Until Found"),
                                                   parseSequenceString("Ctrl+Shift+Y"),
                                                   ShortcutGroup::Move_top)},
@@ -620,11 +648,19 @@ private:
         {"Player/aMoveBottomCardsToGrave", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple)"),
                                                        parseSequenceString(""),
                                                        ShortcutGroup::Move_bottom)},
+        {"Player/aMoveBottomCardsToGraveFaceDown",
+         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Graveyard (Multiple), Face Down"),
+                     parseSequenceString(""),
+                     ShortcutGroup::Move_bottom)},
         {"Player/aMoveBottomCardToExile",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile"), parseSequenceString(""), ShortcutGroup::Move_bottom)},
         {"Player/aMoveBottomCardsToExile", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple)"),
                                                        parseSequenceString(""),
                                                        ShortcutGroup::Move_bottom)},
+        {"Player/aMoveBottomCardsToExileFaceDown",
+         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Exile (Multiple), Face Down"),
+                     parseSequenceString(""),
+                     ShortcutGroup::Move_bottom)},
         {"Player/aMoveBottomCardToTop", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Top of Library"),
                                                     parseSequenceString(""),
                                                     ShortcutGroup::Move_bottom)},
@@ -648,6 +684,9 @@ private:
         {"Player/aRollDie", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Roll Dice..."),
                                         parseSequenceString("Ctrl+I"),
                                         ShortcutGroup::Gameplay)},
+        {"Player/aFlipCoin", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Flip Coin"),
+                                         parseSequenceString("Ctrl+Shift+I"),
+                                         ShortcutGroup::Gameplay)},
         {"Player/aShuffle", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Shuffle Library"),
                                         parseSequenceString("Ctrl+S"),
                                         ShortcutGroup::Gameplay)},
@@ -660,6 +699,12 @@ private:
         {"Player/aMulligan", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Mulligan"),
                                          parseSequenceString("Ctrl+M"),
                                          ShortcutGroup::Drawing)},
+        {"Player/aMulliganSame", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Mulligan (Same hand size)"),
+                                             parseSequenceString("Ctrl+Shift+M"),
+                                             ShortcutGroup::Drawing)},
+        {"Player/aMulliganMinusOne", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Mulligan (Hand size - 1)"),
+                                                 parseSequenceString("Ctrl+Shift+Alt+M"),
+                                                 ShortcutGroup::Drawing)},
         {"Player/aDrawCard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Draw a Card"),
                                          parseSequenceString("Ctrl+D"),
                                          ShortcutGroup::Drawing)},
@@ -750,6 +795,10 @@ private:
                                        ShortcutGroup::Tabs)},
         {"Tabs/aTabLogs",
          ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Logs"), parseSequenceString(""), ShortcutGroup::Tabs)},
+        {"Tabs/aTabReport",
+         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Report Queue"), parseSequenceString(""), ShortcutGroup::Tabs)},
+        {"Tabs/aTabModeration",
+         ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Moderation"), parseSequenceString(""), ShortcutGroup::Tabs)},
     };
 };
 
diff --git a/cockatrice/src/client/sound_engine.cpp b/cockatrice/src/client/sound_engine.cpp
index 31cb2a35e..4ac142cf4 100644
--- a/cockatrice/src/client/sound_engine.cpp
+++ b/cockatrice/src/client/sound_engine.cpp
@@ -2,12 +2,18 @@
 
 #include "settings/cache_settings.h"
 
-#include <QDir>
-#include <QMediaPlayer>
-
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+#include <QApplication>
 #include <QAudioOutput>
-#endif
+#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"
 #define TEST_SOUND_FILENAME "player_join"
@@ -15,8 +21,10 @@
 SoundEngine::SoundEngine(QObject *parent) : QObject(parent), audioOutput(nullptr), player(nullptr)
 {
     ensureThemeDirectoryExists();
-    connect(&SettingsCache::instance(), &SettingsCache::soundThemeChanged, this, &SoundEngine::themeChangedSlot);
-    connect(&SettingsCache::instance(), &SettingsCache::soundEnabledChanged, this, &SoundEngine::soundEnabledChanged);
+    connect(&SettingsCache::instance().sound(), &SoundSettings::soundThemeChanged, this,
+            &SoundEngine::themeChangedSlot);
+    connect(&SettingsCache::instance().sound(), &SoundSettings::soundEnabledChanged, this,
+            &SoundEngine::soundEnabledChanged);
 
     soundEnabledChanged();
     themeChangedSlot();
@@ -36,14 +44,12 @@ SoundEngine::~SoundEngine()
 
 void SoundEngine::soundEnabledChanged()
 {
-    if (SettingsCache::instance().getSoundEnabled()) {
+    if (SettingsCache::instance().sound().getSoundEnabled()) {
         qCInfo(SoundEngineLog) << "SoundEngine: enabling sound with" << audioData.size() << "sounds";
         if (!player) {
             player = new QMediaPlayer;
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
             audioOutput = new QAudioOutput(player);
             player->setAudioOutput(audioOutput);
-#endif
         }
     } else {
         qCInfo(SoundEngineLog) << "SoundEngine: disabling sound";
@@ -70,14 +76,9 @@ void SoundEngine::playSound(const QString &fileName)
     }
 
     player->stop();
-    int volumeSliderValue = SettingsCache::instance().getMasterVolume();
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    int volumeSliderValue = SettingsCache::instance().sound().getMasterVolume();
     player->audioOutput()->setVolume(qreal(volumeSliderValue) / 100);
     player->setSource(QUrl::fromLocalFile(audioData[fileName]));
-#else
-    player->setVolume(volumeSliderValue);
-    player->setMedia(QUrl::fromLocalFile(audioData[fileName]));
-#endif
     player->play();
 }
 
@@ -88,10 +89,10 @@ void SoundEngine::testSound()
 
 void SoundEngine::ensureThemeDirectoryExists()
 {
-    if (SettingsCache::instance().getSoundThemeName().isEmpty() ||
-        !getAvailableThemes().contains(SettingsCache::instance().getSoundThemeName())) {
+    if (SettingsCache::instance().sound().getSoundThemeName().isEmpty() ||
+        !getAvailableThemes().contains(SettingsCache::instance().sound().getSoundThemeName())) {
         qCInfo(SoundEngineLog) << "Sounds theme name not set, setting default value";
-        SettingsCache::instance().setSoundThemeName(DEFAULT_THEME_NAME);
+        SettingsCache::instance().sound().setSoundThemeName(DEFAULT_THEME_NAME);
     }
 }
 
@@ -100,16 +101,17 @@ QStringMap &SoundEngine::getAvailableThemes()
     QDir dir;
     availableThemes.clear();
 
-    // load themes from user profile dir
+    // Load themes from user profile dir
 
     dir.setPath(SettingsCache::instance().getDataPath() + "/sounds");
 
     for (const QString &themeName : dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name)) {
-        if (!availableThemes.contains(themeName))
+        if (!availableThemes.contains(themeName)) {
             availableThemes.insert(themeName, dir.absoluteFilePath(themeName));
+        }
     }
 
-    // load themes from cockatrice system dir
+    // Load themes from Cockatrice system dir
     dir.setPath(qApp->applicationDirPath() +
 #ifdef Q_OS_MAC
                 "/../Resources/sounds"
@@ -121,8 +123,9 @@ QStringMap &SoundEngine::getAvailableThemes()
     );
 
     for (const QString &themeName : dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name)) {
-        if (!availableThemes.contains(themeName))
+        if (!availableThemes.contains(themeName)) {
             availableThemes.insert(themeName, dir.absoluteFilePath(themeName));
+        }
     }
 
     return availableThemes;
@@ -130,7 +133,7 @@ QStringMap &SoundEngine::getAvailableThemes()
 
 void SoundEngine::themeChangedSlot()
 {
-    QString themeName = SettingsCache::instance().getSoundThemeName();
+    QString themeName = SettingsCache::instance().sound().getSoundThemeName();
     qCInfo(SoundEngineLog) << "Sound theme changed:" << themeName;
 
     QDir dir = getAvailableThemes().value(themeName);
diff --git a/cockatrice/src/client/sound_engine.h b/cockatrice/src/client/sound_engine.h
index f45cccf7d..8167c71b5 100644
--- a/cockatrice/src/client/sound_engine.h
+++ b/cockatrice/src/client/sound_engine.h
@@ -1,23 +1,23 @@
 /**
  * @file sound_engine.h
  * @ingroup Core
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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/client/url_scheme_event_filter.h b/cockatrice/src/client/url_scheme_event_filter.h
new file mode 100644
index 000000000..9e96502ca
--- /dev/null
+++ b/cockatrice/src/client/url_scheme_event_filter.h
@@ -0,0 +1,69 @@
+#ifndef COCKATRICE_URL_SCHEME_EVENT_FILTER_H
+#define COCKATRICE_URL_SCHEME_EVENT_FILTER_H
+
+#include <QEvent>
+#include <QFileOpenEvent>
+#include <QObject>
+#include <QString>
+#include <QUrl>
+
+/**
+ * @brief Event filter that catches QFileOpenEvent URLs matching a scheme and
+ *        re-emits them as urlReceived().
+ *
+ * On macOS, when the application is registered as a URL scheme handler, the
+ * OS delivers incoming URLs via QFileOpenEvent on the QApplication object.
+ * Install this filter on QApplication to intercept them:
+ *
+ * @code
+ *   UrlSchemeEventFilter filter(QStringList{QStringLiteral("cockatrice")});
+ *   QObject::connect(&filter, &UrlSchemeEventFilter::urlReceived,
+ *                    &mainWindow, &MainWindow::handleUrl);
+ *   app.installEventFilter(&filter);
+ * @endcode
+ *
+ * Note: the strings are compared against QUrl::scheme(), so they must be
+ * written without the "://" suffix (e.g. "cockatrice", not "cockatrice://").
+ */
+class UrlSchemeEventFilter : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit UrlSchemeEventFilter(const QStringList &schemes, QObject *parent = nullptr)
+        : QObject(parent), prefixes(schemes)
+    {
+    }
+
+signals:
+    void urlReceived(const QString &url);
+
+public:
+    bool eventFilter(QObject *watched, QEvent *event) override
+    {
+        if (event->type() == QEvent::FileOpen) {
+            auto *fileEvent = static_cast<QFileOpenEvent *>(event);
+
+            const QUrl url = fileEvent->url();
+
+            for (const auto &prefix : prefixes) {
+                if (url.scheme() == prefix) {
+                    emit urlReceived(url.toString());
+                    return true;
+                }
+            }
+
+            if (url.isLocalFile()) {
+                emit urlReceived(url.toLocalFile());
+                return true;
+            }
+        }
+
+        return QObject::eventFilter(watched, event);
+    }
+
+private:
+    QStringList prefixes;
+};
+
+#endif // COCKATRICE_URL_SCHEME_EVENT_FILTER_H
diff --git a/cockatrice/src/database/interface/settings_card_database_path_provider.h b/cockatrice/src/database/interface/settings_card_database_path_provider.h
new file mode 100644
index 000000000..1c7d02460
--- /dev/null
+++ b/cockatrice/src/database/interface/settings_card_database_path_provider.h
@@ -0,0 +1,41 @@
+#ifndef SETTINGS_CARD_DATABASE_PATH_PROVIDER_H
+#define SETTINGS_CARD_DATABASE_PATH_PROVIDER_H
+
+#include "../../client/settings/cache_settings.h"
+
+#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
+#include <libcockatrice/settings/paths_settings.h>
+
+class SettingsCardDatabasePathProvider : public ICardDatabasePathProvider
+{
+    Q_OBJECT
+
+public:
+    explicit SettingsCardDatabasePathProvider(QObject *parent = nullptr) : ICardDatabasePathProvider(parent)
+    {
+        connect(&SettingsCache::instance().paths(), &PathsSettings::cardDatabasePathChanged, this,
+                &ICardDatabasePathProvider::cardDatabasePathChanged);
+    }
+
+    [[nodiscard]] QString getCardDatabasePath() const override
+    {
+        return SettingsCache::instance().paths().getCardDatabasePath();
+    }
+
+    [[nodiscard]] QString getCustomCardDatabasePath() const override
+    {
+        return SettingsCache::instance().paths().getCustomCardDatabasePath();
+    }
+
+    [[nodiscard]] QString getTokenDatabasePath() const override
+    {
+        return SettingsCache::instance().paths().getTokenDatabasePath();
+    }
+
+    [[nodiscard]] virtual QString getSpoilerCardDatabasePath() const override
+    {
+        return SettingsCache::instance().paths().getSpoilerCardDatabasePath();
+    }
+};
+
+#endif // SETTINGS_CARD_DATABASE_PATH_PROVIDER_H
diff --git a/cockatrice/src/database/interface/settings_card_preference_provider.h b/cockatrice/src/database/interface/settings_card_preference_provider.h
index 6c31b9d6d..1feb2006b 100644
--- a/cockatrice/src/database/interface/settings_card_preference_provider.h
+++ b/cockatrice/src/database/interface/settings_card_preference_provider.h
@@ -3,6 +3,8 @@
 #include "../../client/settings/cache_settings.h"
 
 #include <libcockatrice/interfaces/interface_card_preference_provider.h>
+#include <libcockatrice/settings/card_override_settings.h>
+#include <libcockatrice/settings/cards_display_settings.h>
 
 class SettingsCardPreferenceProvider : public ICardPreferenceProvider
 {
@@ -11,11 +13,6 @@ public:
     {
         return SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName);
     }
-
-    [[nodiscard]] bool getIncludeRebalancedCards() const override
-    {
-        return SettingsCache::instance().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 52b6a38d1..616311750 100644
--- a/cockatrice/src/filters/deck_filter_string.cpp
+++ b/cockatrice/src/filters/deck_filter_string.cpp
@@ -1,9 +1,27 @@
 #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
@@ -13,7 +31,7 @@ QueryPartList <- ComplexQueryPart ( ws ("AND" ws)? ComplexQueryPart)* ws*
 ComplexQueryPart <- SomewhatComplexQueryPart ws "OR" ws ComplexQueryPart / SomewhatComplexQueryPart
 SomewhatComplexQueryPart <- [(] QueryPartList [)] / QueryPart
 
-QueryPart <- NotQuery / DeckContentQuery / DeckNameQuery / FileNameQuery / PathQuery / GenericQuery
+QueryPart <- NotQuery / DeckContentQuery / DeckNameQuery / FileNameQuery / PathQuery / FormatQuery / CommentQuery / GenericQuery
 
 NotQuery <- ('NOT' ws/'-') SomewhatComplexQueryPart
 
@@ -22,14 +40,16 @@ CardSearch <- '[[' CardFilterString ']]'
 CardFilterString <- (!']]'.)*
 
 DeckNameQuery <- ([Dd] 'eck')? [Nn] 'ame'? [:] String
-FileNameQuery <- [Ff] ('ile' 'name'?)? [:] String
+FileNameQuery <- [Ff] ([Nn] / 'ile' ([Nn] 'ame')?) [:] String
 PathQuery <- [Pp] 'ath'? [:] String
+FormatQuery <- [Ff] 'ormat'? [:] String
+CommentQuery <- [Cc] ('omment' 's'?)? [:] String
 
 GenericQuery <- String
 
 NonDoubleQuoteUnlessEscaped <- '\\\"'. / !["].
 NonSingleQuoteUnlessEscaped <- "\\\'". / !['].
-UnescapedStringListPart <- !['":<>=! ].
+UnescapedStringListPart <- !['":<>()=! ].
 SingleApostropheString <- (UnescapedStringListPart+ ws*)* ['] (UnescapedStringListPart+ ws*)*
 
 String <- SingleApostropheString / UnescapedStringListPart+ / ["] <NonDoubleQuoteUnlessEscaped*> ["] / ['] <NonSingleQuoteUnlessEscaped*> [']
@@ -41,6 +61,12 @@ NumericValue <- [0-9]+
 
 static std::once_flag init;
 
+// The peglib parser is a single permanent object, so the rule actions below cannot see
+// per-instance state. The card language that the nested [[card name]] search matches
+// against is passed through this thread-local context, which is live only while a
+// DeckFilterString is being parsed, and copied into the nested FilterString closures.
+thread_local CardSearchLanguage deckSearchLanguageContext;
+
 static void setupParserRules()
 {
     // plumbing
@@ -50,18 +76,14 @@ static void setupParserRules()
 
     search["Start"] = passthru;
     search["QueryPartList"] = [](const peg::SemanticValues &sv) -> DeckFilter {
-        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &info) {
-            auto matchesFilter = [&deck, &info](const std::any &query) {
-                return std::any_cast<DeckFilter>(query)(deck, info);
-            };
+        return [=](const DeckSearchData &data) {
+            auto matchesFilter = [&data](const std::any &query) { return std::any_cast<DeckFilter>(query)(data); };
             return std::all_of(sv.begin(), sv.end(), matchesFilter);
         };
     };
     search["ComplexQueryPart"] = [](const peg::SemanticValues &sv) -> DeckFilter {
-        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &info) {
-            auto matchesFilter = [&deck, &info](const std::any &query) {
-                return std::any_cast<DeckFilter>(query)(deck, info);
-            };
+        return [=](const DeckSearchData &data) {
+            auto matchesFilter = [&data](const std::any &query) { return std::any_cast<DeckFilter>(query)(data); };
             return std::any_of(sv.begin(), sv.end(), matchesFilter);
         };
     };
@@ -69,9 +91,7 @@ static void setupParserRules()
     search["QueryPart"] = passthru;
     search["NotQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
         const auto dependent = std::any_cast<DeckFilter>(sv[0]);
-        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &info) -> bool {
-            return !dependent(deck, info);
-        };
+        return [=](const DeckSearchData &data) -> bool { return !dependent(data); };
     };
 
     search["String"] = [](const peg::SemanticValues &sv) -> QString {
@@ -86,20 +106,27 @@ static void setupParserRules()
         const auto arg = std::any_cast<int>(sv[1]);
         const auto op = std::any_cast<QString>(sv[0]);
 
-        if (op == ">")
+        if (op == ">") {
             return [=](const int s) { return s > arg; };
-        if (op == ">=")
+        }
+        if (op == ">=") {
             return [=](const int s) { return s >= arg; };
-        if (op == "<")
+        }
+        if (op == "<") {
             return [=](const int s) { return s < arg; };
-        if (op == "<=")
+        }
+        if (op == "<=") {
             return [=](const int s) { return s <= arg; };
-        if (op == "=")
+        }
+        if (op == "=") {
             return [=](const int s) { return s == arg; };
-        if (op == ":")
+        }
+        if (op == ":") {
             return [=](const int s) { return s == arg; };
-        if (op == "!=")
+        }
+        if (op == "!=") {
             return [=](const int s) { return s != arg; };
+        }
         return [](int) { return false; };
     };
 
@@ -113,17 +140,18 @@ static void setupParserRules()
 
     // actual functionality
     search["DeckContentQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
-        auto cardFilter = FilterString(std::any_cast<QString>(sv[0]));
+        auto cardFilter = FilterString(std::any_cast<QString>(sv[0]), deckSearchLanguageContext);
         auto numberMatcher = sv.size() > 1 ? std::any_cast<NumberMatcher>(sv[1]) : [](int count) { return count > 0; };
 
-        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) -> bool {
+        return [=](const DeckSearchData &data) -> bool {
             int count = 0;
-            deck->deckLoader->getDeckList()->forEachCard([&](InnerDecklistNode *, const DecklistCardNode *node) {
+            auto cardNodes = data.deck->deckList.getCardNodes();
+            for (auto node : cardNodes) {
                 auto cardInfoPtr = CardDatabaseManager::query()->getCardInfo(node->getName());
                 if (!cardInfoPtr.isNull() && cardFilter.check(cardInfoPtr)) {
                     count += node->getNumber();
                 }
-            });
+            }
             return numberMatcher(count);
         };
     };
@@ -136,41 +164,53 @@ static void setupParserRules()
 
     search["DeckNameQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
         auto name = std::any_cast<QString>(sv[0]);
-        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
-            return deck->deckLoader->getDeckList()->getName().contains(name, Qt::CaseInsensitive);
+        return [=](const DeckSearchData &data) {
+            return data.deck->deckList.getName().contains(name, Qt::CaseInsensitive);
         };
     };
 
     search["FileNameQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
         auto name = std::any_cast<QString>(sv[0]);
-        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
-            auto filename = QFileInfo(deck->filePath).fileName();
+        return [=](const DeckSearchData &data) {
+            auto filename = QFileInfo(data.filePath).fileName();
             return filename.contains(name, Qt::CaseInsensitive);
         };
     };
 
     search["PathQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
         auto name = std::any_cast<QString>(sv[0]);
-        return [=](const DeckPreviewWidget *, const ExtraDeckSearchInfo &info) {
-            return info.relativeFilePath.contains(name, Qt::CaseInsensitive);
+        return [=](const DeckSearchData &data) { return data.relativeFilePath.contains(name, Qt::CaseInsensitive); };
+    };
+
+    search["FormatQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
+        auto format = std::any_cast<QString>(sv[0]);
+        return [=](const DeckSearchData &data) {
+            auto gameFormat = data.deck->deckList.getGameFormat();
+            return QString::compare(format, gameFormat, Qt::CaseInsensitive) == 0;
+        };
+    };
+
+    search["CommentQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
+        auto value = std::any_cast<QString>(sv[0]);
+        return [=](const DeckSearchData &data) {
+            auto comments = data.deck->deckList.getComments();
+            return comments.contains(value, Qt::CaseInsensitive);
         };
     };
 
     search["GenericQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter {
         auto name = std::any_cast<QString>(sv[0]);
-        return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) {
-            return deck->getDisplayName().contains(name, Qt::CaseInsensitive);
-        };
+        return [=](const DeckSearchData &data) { return data.displayName.contains(name, Qt::CaseInsensitive); };
     };
 }
 
 DeckFilterString::DeckFilterString()
 {
-    filter = [](const DeckPreviewWidget *, const ExtraDeckSearchInfo &) { return false; };
+    filter = [](const DeckSearchData &) { return false; };
     _error = "Not initialized";
 }
 
-DeckFilterString::DeckFilterString(const QString &expr)
+DeckFilterString::DeckFilterString(const QString &expr, const CardSearchLanguage &searchLanguage)
 {
     QByteArray ba = expr.simplified().toUtf8();
 
@@ -179,16 +219,18 @@ DeckFilterString::DeckFilterString(const QString &expr)
     _error = QString();
 
     if (ba.isEmpty()) {
-        filter = [](const DeckPreviewWidget *, const ExtraDeckSearchInfo &) { return true; };
+        filter = [](const DeckSearchData &) { return true; };
         return;
     }
 
+    deckSearchLanguageContext = searchLanguage;
+
     search.set_logger([&](size_t /*ln*/, size_t col, const std::string &msg) {
         _error = QString("Error at position %1: %2").arg(col).arg(QString::fromStdString(msg));
     });
 
     if (!search.parse(ba.data(), filter)) {
         qCInfo(DeckFilterStringLog).nospace() << "DeckFilterString error for " << expr << "; " << qPrintable(_error);
-        filter = [](const DeckPreviewWidget *, const ExtraDeckSearchInfo &) { return false; };
+        filter = [](const DeckSearchData &) { return false; };
     }
-}
\ No newline at end of file
+}
diff --git a/cockatrice/src/filters/deck_filter_string.h b/cockatrice/src/filters/deck_filter_string.h
index 1b43d770d..76b891b59 100644
--- a/cockatrice/src/filters/deck_filter_string.h
+++ b/cockatrice/src/filters/deck_filter_string.h
@@ -1,41 +1,46 @@
 /**
  * @file deck_filter_string.h
  * @ingroup DeckStorageWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DECK_FILTER_STRING_H
 #define DECK_FILTER_STRING_H
 
-#include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h"
-
 #include <QLoggingCategory>
 #include <QString>
 #include <functional>
+#include <libcockatrice/card/card_localization.h>
+
+struct CardSearchLanguage;
+struct LoadedDeck;
 
 inline Q_LOGGING_CATEGORY(DeckFilterStringLog, "deck_filter_string");
 
 /**
- * Extra info relevant to filtering that isn't present in the DeckPreviewWidget
+ * The data a deck search expression is evaluated against.
+ *
+ * This is a data view rather than a widget pointer, so the same filter
+ * expression can be evaluated against a model or a live widget.
  */
-struct ExtraDeckSearchInfo
+struct DeckSearchData
 {
-    /**
-     * The relative filepath starting from the deck folder
-     */
-    QString relativeFilePath;
+    const LoadedDeck *deck = nullptr; ///< The loaded deck. Must not be null.
+    QString filePath;                 ///< Absolute path of the deck file.
+    QString displayName;              ///< Deck name, or the file name if the deck has no name.
+    QString relativeFilePath;         ///< File path relative to the deck folder.
 };
 
-typedef std::function<bool(const DeckPreviewWidget *, const ExtraDeckSearchInfo &)> DeckFilter;
+typedef std::function<bool(const DeckSearchData &data)> DeckFilter;
 
 class DeckFilterString
 {
 public:
     DeckFilterString();
-    explicit DeckFilterString(const QString &expr);
-    bool check(const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &info) const
+    explicit DeckFilterString(const QString &expr, const CardSearchLanguage &searchLanguage = {});
+    bool check(const DeckSearchData &data) const
     {
-        return filter(deck, info);
+        return filter(data);
     }
 
     [[nodiscard]] bool valid() const
diff --git a/cockatrice/src/filters/filter_builder.cpp b/cockatrice/src/filters/filter_builder.cpp
index 7178ce95a..6cc893224 100644
--- a/cockatrice/src/filters/filter_builder.cpp
+++ b/cockatrice/src/filters/filter_builder.cpp
@@ -1,25 +1,35 @@
 #include "filter_builder.h"
 
+#include "../interface/pixel_map_generator.h"
 #include "../interface/widgets/utility/custom_line_edit.h"
 
 #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)
 {
     filterCombo = new QComboBox;
     filterCombo->setObjectName("filterCombo");
-    for (int i = 0; i < CardFilter::AttrEnd; i++)
+    for (int i = 0; i < CardFilter::AttrEnd; i++) {
         filterCombo->addItem(CardFilter::attrName(static_cast<CardFilter::Attr>(i)), QVariant(i));
+    }
 
     typeCombo = new QComboBox;
     typeCombo->setObjectName("typeCombo");
-    for (int i = 0; i < CardFilter::TypeEnd; i++)
+    for (int i = 0; i < CardFilter::TypeEnd; i++) {
         typeCombo->addItem(CardFilter::typeName(static_cast<CardFilter::Type>(i)), QVariant(i));
+    }
 
-    QPushButton *ok = new QPushButton(QPixmap("theme:icons/increment"), QString());
+    QPushButton *ok = new QPushButton(themePixmap(QStringLiteral("icons/increment")), QString());
     ok->setObjectName("ok");
     ok->setMaximumSize(20, 20);
 
@@ -53,8 +63,9 @@ FilterBuilder::~FilterBuilder()
 
 void FilterBuilder::destroyFilter()
 {
-    if (fltr)
+    if (fltr) {
         delete fltr;
+    }
 }
 
 static int comboCurrentIntData(const QComboBox *combo)
@@ -67,8 +78,9 @@ void FilterBuilder::emit_add()
     QString txt;
 
     txt = edit->text();
-    if (txt.length() < 1)
+    if (txt.length() < 1) {
         return;
+    }
 
     destroyFilter();
     fltr = new CardFilter(txt, static_cast<CardFilter::Type>(comboCurrentIntData(typeCombo)),
diff --git a/cockatrice/src/filters/filter_builder.h b/cockatrice/src/filters/filter_builder.h
index 74872e3cd..2aa38c992 100644
--- a/cockatrice/src/filters/filter_builder.h
+++ b/cockatrice/src/filters/filter_builder.h
@@ -1,15 +1,15 @@
 /**
  * @file filter_builder.h
  * @ingroup CardDatabaseModelFilters
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef FILTERBUILDER_H
 #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 f0a02ec79..b3bf307f1 100644
--- a/cockatrice/src/filters/filter_tree_model.cpp
+++ b/cockatrice/src/filters/filter_tree_model.cpp
@@ -1,8 +1,15 @@
 #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)
 {
@@ -23,8 +30,9 @@ void FilterTreeModel::proxyBeginInsertRow(const FilterTreeNode *node, int i)
     int idx;
 
     idx = node->index();
-    if (idx >= 0)
+    if (idx >= 0) {
         beginInsertRows(createIndex(idx, 0, (void *)node), i, i);
+    }
 }
 
 void FilterTreeModel::proxyEndInsertRow(const FilterTreeNode *node, int)
@@ -32,8 +40,9 @@ void FilterTreeModel::proxyEndInsertRow(const FilterTreeNode *node, int)
     int idx;
 
     idx = node->index();
-    if (idx >= 0)
+    if (idx >= 0) {
         endInsertRows();
+    }
 }
 
 void FilterTreeModel::proxyBeginRemoveRow(const FilterTreeNode *node, int i)
@@ -41,8 +50,9 @@ void FilterTreeModel::proxyBeginRemoveRow(const FilterTreeNode *node, int i)
     int idx;
 
     idx = node->index();
-    if (idx >= 0)
+    if (idx >= 0) {
         beginRemoveRows(createIndex(idx, 0, (void *)node), i, i);
+    }
 }
 
 void FilterTreeModel::proxyEndRemoveRow(const FilterTreeNode *node, int)
@@ -50,8 +60,9 @@ void FilterTreeModel::proxyEndRemoveRow(const FilterTreeNode *node, int)
     int idx;
 
     idx = node->index();
-    if (idx >= 0)
+    if (idx >= 0) {
         endRemoveRows();
+    }
 }
 
 FilterTreeNode *FilterTreeModel::indexToNode(const QModelIndex &idx) const
@@ -59,12 +70,14 @@ FilterTreeNode *FilterTreeModel::indexToNode(const QModelIndex &idx) const
     void *ip;
     FilterTreeNode *node;
 
-    if (!idx.isValid())
+    if (!idx.isValid()) {
         return fTree;
+    }
 
     ip = idx.internalPointer();
-    if (ip == NULL)
+    if (ip == NULL) {
         return fTree;
+    }
 
     node = static_cast<FilterTreeNode *>(ip);
     return node;
@@ -145,14 +158,16 @@ int FilterTreeModel::rowCount(const QModelIndex &parent) const
     const FilterTreeNode *node;
     int result;
 
-    if (parent.column() > 0)
+    if (parent.column() > 0) {
         return 0;
+    }
 
     node = indexToNode(parent);
-    if (node)
+    if (node) {
         result = node->childCount();
-    else
+    } else {
         result = 0;
+    }
 
     return result;
 }
@@ -166,14 +181,17 @@ QVariant FilterTreeModel::data(const QModelIndex &index, int role) const
 {
     const FilterTreeNode *node;
 
-    if (!index.isValid())
+    if (!index.isValid()) {
         return QVariant();
-    if (index.column() >= columnCount())
+    }
+    if (index.column() >= columnCount()) {
         return QVariant();
+    }
 
     node = indexToNode(index);
-    if (node == NULL)
+    if (node == NULL) {
         return QVariant();
+    }
 
     switch (role) {
         case Qt::FontRole:
@@ -190,10 +208,11 @@ QVariant FilterTreeModel::data(const QModelIndex &index, int role) const
         case Qt::WhatsThisRole:
             return node->text();
         case Qt::CheckStateRole:
-            if (node->isEnabled())
+            if (node->isEnabled()) {
                 return Qt::Checked;
-            else
+            } else {
                 return Qt::Unchecked;
+            }
         default:
             return QVariant();
     }
@@ -205,22 +224,27 @@ bool FilterTreeModel::setData(const QModelIndex &index, const QVariant &value, i
 {
     FilterTreeNode *node;
 
-    if (!index.isValid())
+    if (!index.isValid()) {
         return false;
-    if (index.column() >= columnCount())
+    }
+    if (index.column() >= columnCount()) {
         return false;
-    if (role != Qt::CheckStateRole)
+    }
+    if (role != Qt::CheckStateRole) {
         return false;
+    }
 
     node = indexToNode(index);
-    if (node == NULL || node == fTree)
+    if (node == NULL || node == fTree) {
         return false;
+    }
 
     Qt::CheckState state = static_cast<Qt::CheckState>(value.toInt());
-    if (state == Qt::Checked)
+    if (state == Qt::Checked) {
         node->enable();
-    else
+    } else {
         node->disable();
+    }
 
     emit dataChanged(index, index);
     return true;
@@ -231,16 +255,19 @@ Qt::ItemFlags FilterTreeModel::flags(const QModelIndex &index) const
     const FilterTreeNode *node;
     Qt::ItemFlags result;
 
-    if (!index.isValid())
+    if (!index.isValid()) {
         return Qt::NoItemFlags;
+    }
 
     node = indexToNode(index);
-    if (node == NULL)
+    if (node == NULL) {
         return Qt::NoItemFlags;
+    }
 
     result = Qt::ItemIsEnabled;
-    if (node == fTree)
+    if (node == fTree) {
         return result;
+    }
 
     result |= Qt::ItemIsSelectable;
     result |= Qt::ItemIsUserCheckable;
@@ -252,8 +279,9 @@ QModelIndex FilterTreeModel::nodeIndex(const FilterTreeNode *node, int row, int
 {
     FilterTreeNode *child;
 
-    if (column > 0 || row >= node->childCount())
+    if (column > 0 || row >= node->childCount()) {
         return QModelIndex();
+    }
 
     child = node->nodeAt(row);
     return createIndex(row, column, child);
@@ -263,12 +291,14 @@ QModelIndex FilterTreeModel::index(int row, int column, const QModelIndex &paren
 {
     const FilterTreeNode *node;
 
-    if (!hasIndex(row, column, parent))
+    if (!hasIndex(row, column, parent)) {
         return QModelIndex();
+    }
 
     node = indexToNode(parent);
-    if (node == NULL)
+    if (node == NULL) {
         return QModelIndex();
+    }
 
     return nodeIndex(node, row, column);
 }
@@ -279,18 +309,21 @@ QModelIndex FilterTreeModel::parent(const QModelIndex &ind) const
     FilterTreeNode *parent;
     QModelIndex idx;
 
-    if (!ind.isValid())
+    if (!ind.isValid()) {
         return QModelIndex();
+    }
 
     node = indexToNode(ind);
-    if (node == NULL || node == fTree)
+    if (node == NULL || node == fTree) {
         return QModelIndex();
+    }
 
     parent = node->parent();
     if (parent) {
         int row = parent->index();
-        if (row < 0)
+        if (row < 0) {
             return QModelIndex();
+        }
         idx = createIndex(row, 0, parent);
         return idx;
     }
@@ -304,18 +337,22 @@ bool FilterTreeModel::removeRows(int row, int count, const QModelIndex &parent)
     int i, last;
 
     last = row + count - 1;
-    if (!parent.isValid() || count < 1 || row < 0)
+    if (!parent.isValid() || count < 1 || row < 0) {
         return false;
+    }
 
     node = indexToNode(parent);
-    if (node == NULL || last >= node->childCount())
+    if (node == NULL || last >= node->childCount()) {
         return false;
+    }
 
-    for (i = 0; i < count; i++)
+    for (i = 0; i < count; i++) {
         node->deleteAt(row);
+    }
 
-    if (node != fTree && node->childCount() < 1)
+    if (node != fTree && node->childCount() < 1) {
         return removeRow(parent.row(), parent.parent());
+    }
 
     return true;
 }
diff --git a/cockatrice/src/filters/filter_tree_model.h b/cockatrice/src/filters/filter_tree_model.h
index c6666a838..826fcc941 100644
--- a/cockatrice/src/filters/filter_tree_model.h
+++ b/cockatrice/src/filters/filter_tree_model.h
@@ -1,18 +1,22 @@
 /**
  * @file filter_tree_model.h
  * @ingroup CardDatabaseModelFilters
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef FILTERTREEMODEL_H
 #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 fa5338a41..baf5764d0 100644
--- a/cockatrice/src/filters/syntax_help.cpp
+++ b/cockatrice/src/filters/syntax_help.cpp
@@ -1,8 +1,21 @@
 #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 7e5ef3e0e..52c878691 100644
--- a/cockatrice/src/filters/syntax_help.h
+++ b/cockatrice/src/filters/syntax_help.h
@@ -2,15 +2,16 @@
  * @file syntax_help.h
  * @ingroup CardDatabaseModelFilters
  * @ingroup DeckStorageWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef SEARCH_SYNTAX_HELP_H
 #define SEARCH_SYNTAX_HELP_H
 
-#include <QLineEdit>
 #include <QLoggingCategory>
-#include <QTextBrowser>
+
+class QLineEdit;
+class 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 505cd5fde..efc575eff 100644
--- a/cockatrice/src/game/abstract_game.cpp
+++ b/cockatrice/src/game/abstract_game.cpp
@@ -1,8 +1,20 @@
 #include "abstract_game.h"
 
-#include "player/player.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 "player/player_logic.h"
+#include "player/player_manager.h"
+#include "zones/card_zone_logic.h"
 
-AbstractGame::AbstractGame(TabGame *_tab) : tab(_tab)
+#include <QList>
+#include <QMap>
+
+class AbstractClient;
+
+AbstractGame::AbstractGame(QObject *_parent) : QObject(_parent)
 {
     gameMetaInfo = new GameMetaInfo(this);
     gameEventHandler = new GameEventHandler(this);
@@ -23,13 +35,14 @@ AbstractClient *AbstractGame::getClientForPlayer(int playerId) const
         }
 
         return gameState->getClients().at(playerId);
-    } else if (gameState->getClients().isEmpty())
+    } else if (gameState->getClients().isEmpty()) {
         return nullptr;
-    else
+    } else {
         return gameState->getClients().first();
+    }
 }
 
-void AbstractGame::loadReplay(GameReplay *replay)
+void AbstractGame::loadReplay(const GameReplay *replay)
 {
     gameMetaInfo->setFromProto(replay->game_info());
     gameMetaInfo->setSpectatorsOmniscient(true);
@@ -42,13 +55,15 @@ void AbstractGame::setActiveCard(CardItem *card)
 
 CardItem *AbstractGame::getCard(int playerId, const QString &zoneName, int cardId) const
 {
-    Player *player = playerManager->getPlayer(playerId);
-    if (!player)
+    PlayerLogic *player = playerManager->getPlayer(playerId);
+    if (!player) {
         return nullptr;
+    }
 
     CardZoneLogic *zone = player->getZones().value(zoneName, 0);
-    if (!zone)
+    if (!zone) {
         return nullptr;
+    }
 
     return zone->getCard(cardId);
 }
\ No newline at end of file
diff --git a/cockatrice/src/game/abstract_game.h b/cockatrice/src/game/abstract_game.h
index cb4dbac2a..326af8ac9 100644
--- a/cockatrice/src/game/abstract_game.h
+++ b/cockatrice/src/game/abstract_game.h
@@ -1,41 +1,37 @@
 /**
  * @file abstract_game.h
  * @ingroup GameLogic
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 <libcockatrice/protocol/pb/game_replay.pb.h>
+#include <QString>
+#include <qtmetamacros.h>
 
 class CardItem;
-class TabGame;
+class AbstractClient;
+class GameEventHandler;
+class GameMetaInfo;
+class GameReplay;
+class GameState;
+class PlayerManager;
+
 class AbstractGame : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit AbstractGame(TabGame *tab);
+    explicit AbstractGame(QObject *parent);
 
-    TabGame *tab;
     GameMetaInfo *gameMetaInfo;
     GameState *gameState;
     GameEventHandler *gameEventHandler;
     PlayerManager *playerManager;
     CardItem *activeCard;
 
-    TabGame *getTab() const
-    {
-        return tab;
-    }
-
     GameMetaInfo *getGameMetaInfo()
     {
         return gameMetaInfo;
@@ -60,7 +56,7 @@ public:
 
     AbstractClient *getClientForPlayer(int playerId) const;
 
-    void loadReplay(GameReplay *replay);
+    void loadReplay(const GameReplay *replay);
 
     CardItem *getCard(int playerId, const QString &zoneName, int cardId) const;
 
diff --git a/cockatrice/src/game/arrow_registry.cpp b/cockatrice/src/game/arrow_registry.cpp
new file mode 100644
index 000000000..c05134a75
--- /dev/null
+++ b/cockatrice/src/game/arrow_registry.cpp
@@ -0,0 +1,51 @@
+#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)
+{
+    const ArrowKey key{data->creatorId, data->id};
+
+    if (auto *existing = take(data->creatorId, data->id)) {
+        existing->delArrow();
+    }
+
+    dataStore.insert(key, data);
+    items.insert(key, arrow);
+    byPlayer[data->creatorId].insert(data->id);
+}
+
+ArrowItem *ArrowRegistry::take(int creatorId, int arrowId)
+{
+    const ArrowKey key{creatorId, arrowId};
+    dataStore.remove(key);
+    auto &playerSet = byPlayer[creatorId];
+    playerSet.remove(arrowId);
+    if (playerSet.isEmpty()) {
+        byPlayer.remove(creatorId);
+    }
+    return items.take(key);
+}
+
+ArrowItem *ArrowRegistry::get(int creatorId, int arrowId) const
+{
+    return items.value(ArrowKey{creatorId, arrowId}, nullptr);
+}
+
+bool ArrowRegistry::contains(int creatorId, int arrowId) const
+{
+    return items.contains(ArrowKey{creatorId, arrowId});
+}
+
+QSet<int> ArrowRegistry::idsForPlayer(int playerId) const
+{
+    return byPlayer.value(playerId);
+}
+
+QList<ArrowItem *> ArrowRegistry::all() const
+{
+    return items.values();
+}
\ No newline at end of file
diff --git a/cockatrice/src/game/arrow_registry.h b/cockatrice/src/game/arrow_registry.h
new file mode 100644
index 000000000..ca3b04090
--- /dev/null
+++ b/cockatrice/src/game/arrow_registry.h
@@ -0,0 +1,43 @@
+#ifndef COCKATRICE_ARROW_REGISTRY_H
+#define COCKATRICE_ARROW_REGISTRY_H
+
+#include <QList>
+#include <QMap>
+#include <QSet>
+
+class ArrowItem;
+struct ArrowData;
+template <class T> class QSharedPointer;
+
+struct ArrowKey
+{
+    int creatorId;
+    int arrowId;
+
+    bool operator<(const ArrowKey &other) const
+    {
+        if (creatorId != other.creatorId) {
+            return creatorId < other.creatorId;
+        }
+        return arrowId < other.arrowId;
+    }
+};
+
+class ArrowRegistry
+{
+public:
+    void insert(QSharedPointer<ArrowData> data, ArrowItem *arrow);
+    ArrowItem *take(int creatorId, int arrowId);
+
+    [[nodiscard]] ArrowItem *get(int creatorId, int arrowId) const;
+    [[nodiscard]] bool contains(int creatorId, int arrowId) const;
+    [[nodiscard]] QSet<int> idsForPlayer(int playerId) const;
+    [[nodiscard]] QList<ArrowItem *> all() const;
+
+private:
+    QMap<ArrowKey, QSharedPointer<ArrowData>> dataStore;
+    QMap<ArrowKey, ArrowItem *> items;
+    QMap<int, QSet<int>> byPlayer;
+};
+
+#endif
\ No newline at end of file
diff --git a/cockatrice/src/game/board/abstract_counter.h b/cockatrice/src/game/board/abstract_counter.h
deleted file mode 100644
index ea13cb00f..000000000
--- a/cockatrice/src/game/board/abstract_counter.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * @file abstract_counter.h
- * @ingroup GameGraphicsPlayers
- * @brief TODO: Document this.
- */
-
-#ifndef COUNTER_H
-#define COUNTER_H
-
-#include "../../interface/widgets/menus/tearoff_menu.h"
-
-#include <QGraphicsItem>
-#include <QInputDialog>
-
-class Player;
-class QAction;
-class QKeyEvent;
-class QMenu;
-class QString;
-
-class AbstractCounter : public QObject, public QGraphicsItem
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsItem)
-
-protected:
-    Player *player;
-    int id;
-    QString name;
-    int value;
-    bool useNameForShortcut, hovered;
-
-    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
-    void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
-    void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
-
-private:
-    QAction *aSet, *aDec, *aInc;
-    TearOffMenu *menu;
-    bool dialogSemaphore, deleteAfterDialog;
-    bool shownInCounterArea;
-    bool shortcutActive;
-
-private slots:
-    void refreshShortcuts();
-    void incrementCounter();
-    void setCounter();
-
-public:
-    AbstractCounter(Player *_player,
-                    int _id,
-                    const QString &_name,
-                    bool _shownInCounterArea,
-                    int _value,
-                    bool _useNameForShortcut = false,
-                    QGraphicsItem *parent = nullptr);
-    ~AbstractCounter() override;
-
-    void retranslateUi();
-    void setValue(int _value);
-    void setShortcutsActive();
-    void setShortcutsInactive();
-    void delCounter();
-
-    QMenu *getMenu() const
-    {
-        return menu;
-    }
-
-    int getId() const
-    {
-        return id;
-    }
-    QString getName() const
-    {
-        return name;
-    }
-    bool getShownInCounterArea() const
-    {
-        return shownInCounterArea;
-    }
-    int getValue() const
-    {
-        return value;
-    }
-};
-
-class AbstractCounterDialog : public QInputDialog
-{
-    Q_OBJECT
-public:
-    AbstractCounterDialog(const QString &name, const QString &value, QWidget *parent = nullptr);
-
-protected:
-    bool eventFilter(QObject *obj, QEvent *event) override;
-    void changeValue(int diff);
-};
-
-#endif
diff --git a/cockatrice/src/game/board/arrow_data.cpp b/cockatrice/src/game/board/arrow_data.cpp
new file mode 100644
index 000000000..d5accd16e
--- /dev/null
+++ b/cockatrice/src/game/board/arrow_data.cpp
@@ -0,0 +1,24 @@
+#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;
+    data.creatorId = creatorId;
+    data.isLocalCreator = isLocalCreator;
+    data.id = arrow.id();
+    data.startPlayerId = arrow.start_player_id();
+    data.startZone = QString::fromStdString(arrow.start_zone());
+    data.startCardId = arrow.start_card_id();
+    data.targetPlayerId = arrow.target_player_id();
+    data.color = convertColorToQColor(arrow.arrow_color());
+
+    if (arrow.has_target_zone()) {
+        data.targetZone = QString::fromStdString(arrow.target_zone());
+        data.targetCardId = arrow.target_card_id();
+    }
+
+    return data;
+}
\ No newline at end of file
diff --git a/cockatrice/src/game/board/arrow_data.h b/cockatrice/src/game/board/arrow_data.h
new file mode 100644
index 000000000..00217512f
--- /dev/null
+++ b/cockatrice/src/game/board/arrow_data.h
@@ -0,0 +1,30 @@
+#ifndef COCKATRICE_ARROW_DATA_H
+#define COCKATRICE_ARROW_DATA_H
+
+#include <QColor>
+#include <QString>
+
+class ServerInfo_Arrow;
+
+struct ArrowData
+{
+    int creatorId = -1;
+    bool isLocalCreator = false;
+    int id = -1;
+    int startPlayerId = -1;
+    QString startZone = "";
+    int startCardId = -1;
+    int targetPlayerId = -1;
+    QString targetZone = "";
+    int targetCardId = -1;
+    QColor color = "";
+
+    static ArrowData fromProto(const ServerInfo_Arrow &arrow, int creatorId, bool isLocalCreator);
+
+    bool isPlayerTargeted() const
+    {
+        return targetZone.isEmpty();
+    }
+};
+
+#endif // COCKATRICE_ARROW_DATA_H
diff --git a/cockatrice/src/game/board/arrow_item.cpp b/cockatrice/src/game/board/arrow_item.cpp
deleted file mode 100644
index 1352b3a05..000000000
--- a/cockatrice/src/game/board/arrow_item.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-#define _USE_MATH_DEFINES
-#include "arrow_item.h"
-
-#include "../../client/settings/cache_settings.h"
-#include "../player/player.h"
-#include "../player/player_actions.h"
-#include "../player/player_target.h"
-#include "../zones/card_zone.h"
-#include "card_item.h"
-
-#include <QDebug>
-#include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
-#include <QPainter>
-#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/utility/color.h>
-
-ArrowItem::ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &_color)
-    : QGraphicsItem(), player(_player), id(_id), startItem(_startItem), targetItem(_targetItem), targetLocked(false),
-      color(_color), fullColor(true)
-{
-    setZValue(2000000005);
-
-    if (startItem)
-        startItem->addArrowFrom(this);
-    if (targetItem)
-        targetItem->addArrowTo(this);
-
-    if (startItem && targetItem)
-        updatePath();
-}
-
-ArrowItem::~ArrowItem()
-{
-}
-
-void ArrowItem::delArrow()
-{
-    if (startItem) {
-        startItem->removeArrowFrom(this);
-        startItem = 0;
-    }
-
-    if (targetItem) {
-        targetItem->setBeingPointedAt(false);
-        targetItem->removeArrowTo(this);
-        targetItem = 0;
-    }
-
-    player->removeArrow(this);
-    deleteLater();
-}
-
-void ArrowItem::updatePath()
-{
-    if (!targetItem)
-        return;
-
-    QPointF endPoint = targetItem->mapToScene(
-        QPointF(targetItem->boundingRect().width() / 2, targetItem->boundingRect().height() / 2));
-    updatePath(endPoint);
-}
-
-void ArrowItem::updatePath(const QPointF &endPoint)
-{
-    const double arrowWidth = 15.0;
-    const double headWidth = 40.0;
-    const double headLength =
-        headWidth / qPow(2, 0.5); // aka headWidth / sqrt (2) but this produces a compile error with MSVC++
-    const double phi = 15;
-
-    if (!startItem)
-        return;
-
-    QPointF startPoint =
-        startItem->mapToScene(QPointF(startItem->boundingRect().width() / 2, startItem->boundingRect().height() / 2));
-    QLineF line(startPoint, endPoint);
-    qreal lineLength = line.length();
-
-    prepareGeometryChange();
-    if (lineLength < 30)
-        path = QPainterPath();
-    else {
-        QPointF c(lineLength / 2, qTan(phi * M_PI / 180) * lineLength);
-
-        QPainterPath centerLine;
-        centerLine.moveTo(0, 0);
-        centerLine.quadTo(c, QPointF(lineLength, 0));
-
-        double percentage = 1 - headLength / lineLength;
-        QPointF arrowBodyEndPoint = centerLine.pointAtPercent(percentage);
-        QLineF testLine(arrowBodyEndPoint, centerLine.pointAtPercent(percentage + 0.001));
-        qreal alpha = testLine.angle() - 90;
-        QPointF endPoint1 =
-            arrowBodyEndPoint + arrowWidth / 2 * QPointF(qCos(alpha * M_PI / 180), -qSin(alpha * M_PI / 180));
-        QPointF endPoint2 =
-            arrowBodyEndPoint + arrowWidth / 2 * QPointF(-qCos(alpha * M_PI / 180), qSin(alpha * M_PI / 180));
-        QPointF point1 =
-            endPoint1 + (headWidth - arrowWidth) / 2 * QPointF(qCos(alpha * M_PI / 180), -qSin(alpha * M_PI / 180));
-        QPointF point2 =
-            endPoint2 + (headWidth - arrowWidth) / 2 * QPointF(-qCos(alpha * M_PI / 180), qSin(alpha * M_PI / 180));
-
-        path = QPainterPath(-arrowWidth / 2 * QPointF(qCos((phi - 90) * M_PI / 180), qSin((phi - 90) * M_PI / 180)));
-        path.quadTo(c, endPoint1);
-        path.lineTo(point1);
-        path.lineTo(QPointF(lineLength, 0));
-        path.lineTo(point2);
-        path.lineTo(endPoint2);
-        path.quadTo(c, arrowWidth / 2 * QPointF(qCos((phi - 90) * M_PI / 180), qSin((phi - 90) * M_PI / 180)));
-        path.lineTo(-arrowWidth / 2 * QPointF(qCos((phi - 90) * M_PI / 180), qSin((phi - 90) * M_PI / 180)));
-    }
-
-    setPos(startPoint);
-    setTransform(QTransform().rotate(-line.angle()));
-}
-
-void ArrowItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
-{
-    QColor paintColor(color);
-    if (fullColor)
-        paintColor.setAlpha(200);
-    else
-        paintColor.setAlpha(150);
-    painter->setBrush(paintColor);
-    painter->drawPath(path);
-}
-
-void ArrowItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    if (!player->getPlayerInfo()->getLocal()) {
-        event->ignore();
-        return;
-    }
-
-    QList<QGraphicsItem *> colliding = scene()->items(event->scenePos());
-    for (QGraphicsItem *item : colliding) {
-        if (qgraphicsitem_cast<CardItem *>(item)) {
-            event->ignore();
-            return;
-        }
-    }
-
-    event->accept();
-    if (event->button() == Qt::RightButton) {
-        Command_DeleteArrow cmd;
-        cmd.set_arrow_id(id);
-        player->getPlayerActions()->sendGameCommand(cmd);
-    }
-}
-
-ArrowDragItem::ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase)
-    : ArrowItem(_owner, -1, _startItem, 0, _color), deleteInPhase(_deleteInPhase)
-{
-}
-
-void ArrowDragItem::addChildArrow(ArrowDragItem *childArrow)
-{
-    childArrows.append(childArrow);
-}
-
-void ArrowDragItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    // This ensures that if a mouse move event happens after a call to delArrow(),
-    // the event will be discarded as it would create some stray pointers.
-    if (targetLocked || !startItem)
-        return;
-
-    QPointF endPos = event->scenePos();
-
-    QList<QGraphicsItem *> colliding = scene()->items(endPos);
-    ArrowTarget *cursorItem = 0;
-    qreal cursorItemZ = -1;
-    for (int i = colliding.size() - 1; i >= 0; i--) {
-        if (qgraphicsitem_cast<PlayerTarget *>(colliding.at(i)) || qgraphicsitem_cast<CardItem *>(colliding.at(i))) {
-            if (colliding.at(i)->zValue() > cursorItemZ) {
-                cursorItem = static_cast<ArrowTarget *>(colliding.at(i));
-                cursorItemZ = cursorItem->zValue();
-            }
-        }
-    }
-
-    if ((cursorItem != targetItem) && targetItem) {
-        targetItem->setBeingPointedAt(false);
-        targetItem->removeArrowTo(this);
-    }
-    if (!cursorItem) {
-        fullColor = false;
-        targetItem = 0;
-        updatePath(endPos);
-    } else {
-        if (cursorItem != targetItem) {
-            fullColor = true;
-            if (cursorItem != startItem) {
-                cursorItem->setBeingPointedAt(true);
-                cursorItem->addArrowTo(this);
-            }
-            targetItem = cursorItem;
-        }
-        updatePath();
-    }
-    update();
-
-    for (ArrowDragItem *child : childArrows) {
-        child->mouseMoveEvent(event);
-    }
-}
-
-void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    if (!startItem)
-        return;
-
-    if (targetItem && (targetItem != startItem)) {
-        CardZoneLogic *startZone = static_cast<CardItem *>(startItem)->getZone();
-        // For now, we can safely assume that the start item is always a card.
-        // The target item can be a player as well.
-        CardItem *startCard = qgraphicsitem_cast<CardItem *>(startItem);
-        CardItem *targetCard = qgraphicsitem_cast<CardItem *>(targetItem);
-
-        Command_CreateArrow cmd;
-        cmd.mutable_arrow_color()->CopyFrom(convertQColorToColor(color));
-        cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId());
-        cmd.set_start_zone(startZone->getName().toStdString());
-        cmd.set_start_card_id(startCard->getId());
-
-        if (targetCard) {
-            CardZoneLogic *targetZone = targetCard->getZone();
-            cmd.set_target_player_id(targetZone->getPlayer()->getPlayerInfo()->getId());
-            cmd.set_target_zone(targetZone->getName().toStdString());
-            cmd.set_target_card_id(targetCard->getId());
-        } else { // failed to cast target to card, this means it's a player
-            PlayerTarget *targetPlayer = qgraphicsitem_cast<PlayerTarget *>(targetItem);
-            cmd.set_target_player_id(targetPlayer->getOwner()->getPlayerInfo()->getId());
-        }
-
-        // if the card is in hand then we will move the card to stack or table as part of drawing the arrow
-        if (startZone->getName() == "hand") {
-            startCard->playCard(false);
-            CardInfoPtr ci = startCard->getCard().getCardPtr();
-            bool playToStack = SettingsCache::instance().getPlayToStack();
-            if (ci &&
-                ((!playToStack && ci->getUiAttributes().tableRow == 3) ||
-                 (playToStack && ci->getUiAttributes().tableRow != 0 && startCard->getZone()->getName() != "stack")))
-                cmd.set_start_zone("stack");
-            else
-                cmd.set_start_zone(playToStack ? "stack" : "table");
-        }
-
-        if (deleteInPhase != 0) {
-            cmd.set_delete_in_phase(deleteInPhase);
-        }
-
-        player->getPlayerActions()->sendGameCommand(cmd);
-    }
-    delArrow();
-
-    for (ArrowDragItem *child : childArrows) {
-        child->mouseReleaseEvent(event);
-    }
-}
-
-ArrowAttachItem::ArrowAttachItem(ArrowTarget *_startItem)
-    : ArrowItem(_startItem->getOwner(), -1, _startItem, 0, Qt::green)
-{
-}
-
-void ArrowAttachItem::addChildArrow(ArrowAttachItem *childArrow)
-{
-    childArrows.append(childArrow);
-}
-
-void ArrowAttachItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    if (targetLocked || !startItem)
-        return;
-
-    QPointF endPos = event->scenePos();
-
-    QList<QGraphicsItem *> colliding = scene()->items(endPos);
-    ArrowTarget *cursorItem = 0;
-    qreal cursorItemZ = -1;
-    for (int i = colliding.size() - 1; i >= 0; i--) {
-        if (qgraphicsitem_cast<CardItem *>(colliding.at(i))) {
-            if (colliding.at(i)->zValue() > cursorItemZ) {
-                cursorItem = static_cast<ArrowTarget *>(colliding.at(i));
-                cursorItemZ = cursorItem->zValue();
-            }
-        }
-    }
-
-    if ((cursorItem != targetItem) && targetItem) {
-        targetItem->setBeingPointedAt(false);
-    }
-    if (!cursorItem) {
-        fullColor = false;
-        targetItem = 0;
-        updatePath(endPos);
-    } else {
-        fullColor = true;
-        if (cursorItem != startItem) {
-            cursorItem->setBeingPointedAt(true);
-        }
-        targetItem = cursorItem;
-        updatePath();
-    }
-    update();
-
-    for (ArrowAttachItem *child : childArrows) {
-        child->mouseMoveEvent(event);
-    }
-}
-
-void ArrowAttachItem::attachCards(CardItem *startCard, const CardItem *targetCard)
-{
-    // do nothing if target is already attached to another card or is not in play
-    if (targetCard->getAttachedTo() || targetCard->getZone()->getName() != "table") {
-        return;
-    }
-
-    CardZoneLogic *startZone = startCard->getZone();
-    CardZoneLogic *targetZone = targetCard->getZone();
-
-    // move card onto table first if attaching from some other zone
-    if (startZone->getName() != "table") {
-        player->getPlayerActions()->playCardToTable(startCard, false);
-    }
-
-    Command_AttachCard cmd;
-    cmd.set_start_zone("table");
-    cmd.set_card_id(startCard->getId());
-    cmd.set_target_player_id(targetZone->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_target_zone(targetZone->getName().toStdString());
-    cmd.set_target_card_id(targetCard->getId());
-
-    player->getPlayerActions()->sendGameCommand(cmd);
-}
-
-void ArrowAttachItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    if (!startItem)
-        return;
-
-    // Attaching could move startItem under the current cursor position, causing all children to retarget to it right
-    // before they are processed. Prevent that.
-    for (ArrowAttachItem *child : childArrows) {
-        child->setTargetLocked(true);
-    }
-
-    if (targetItem && (targetItem != startItem)) {
-        auto startCard = qgraphicsitem_cast<CardItem *>(startItem);
-        auto targetCard = qgraphicsitem_cast<CardItem *>(targetItem);
-        if (startCard && targetCard) {
-            attachCards(startCard, targetCard);
-        }
-    }
-
-    delArrow();
-
-    for (ArrowAttachItem *child : childArrows) {
-        child->mouseReleaseEvent(event);
-    }
-}
diff --git a/cockatrice/src/game/board/arrow_item.h b/cockatrice/src/game/board/arrow_item.h
deleted file mode 100644
index cb78ee066..000000000
--- a/cockatrice/src/game/board/arrow_item.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * @file arrow_item.h
- * @ingroup GameGraphics
- * @brief TODO: Document this.
- */
-
-#ifndef ARROWITEM_H
-#define ARROWITEM_H
-
-#include <QGraphicsItem>
-
-class CardItem;
-class QGraphicsSceneMouseEvent;
-class QMenu;
-class Player;
-class ArrowTarget;
-
-class ArrowItem : public QObject, public QGraphicsItem
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsItem)
-private:
-    QPainterPath path;
-    QMenu *menu;
-
-protected:
-    Player *player;
-    int id;
-    ArrowTarget *startItem, *targetItem;
-    bool targetLocked;
-    QColor color;
-    bool fullColor;
-    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
-
-public:
-    ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &color);
-    ~ArrowItem() override;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
-    [[nodiscard]] QRectF boundingRect() const override
-    {
-        return path.boundingRect();
-    }
-    [[nodiscard]] QPainterPath shape() const override
-    {
-        return path;
-    }
-    void updatePath();
-    void updatePath(const QPointF &endPoint);
-
-    [[nodiscard]] int getId() const
-    {
-        return id;
-    }
-    [[nodiscard]] Player *getPlayer() const
-    {
-        return player;
-    }
-    void setStartItem(ArrowTarget *_item)
-    {
-        startItem = _item;
-    }
-    void setTargetItem(ArrowTarget *_item)
-    {
-        targetItem = _item;
-    }
-    [[nodiscard]] ArrowTarget *getStartItem() const
-    {
-        return startItem;
-    }
-    [[nodiscard]] ArrowTarget *getTargetItem() const
-    {
-        return targetItem;
-    }
-    void setTargetLocked(bool _targetLocked)
-    {
-        targetLocked = _targetLocked;
-    }
-    void delArrow();
-};
-
-class ArrowDragItem : public ArrowItem
-{
-    Q_OBJECT
-private:
-    int deleteInPhase;
-    QList<ArrowDragItem *> childArrows;
-
-public:
-    ArrowDragItem(Player *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase);
-    void addChildArrow(ArrowDragItem *childArrow);
-
-protected:
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
-};
-
-class ArrowAttachItem : public ArrowItem
-{
-    Q_OBJECT
-private:
-    QList<ArrowAttachItem *> childArrows;
-
-    void attachCards(CardItem *startCard, const CardItem *targetCard);
-
-public:
-    explicit ArrowAttachItem(ArrowTarget *_startItem);
-    void addChildArrow(ArrowAttachItem *childArrow);
-
-protected:
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
-};
-
-#endif // ARROWITEM_H
diff --git a/cockatrice/src/game/board/arrow_target.cpp b/cockatrice/src/game/board/arrow_target.cpp
deleted file mode 100644
index 2dbd913fa..000000000
--- a/cockatrice/src/game/board/arrow_target.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "arrow_target.h"
-
-#include "../player/player.h"
-#include "arrow_item.h"
-
-ArrowTarget::ArrowTarget(Player *_owner, QGraphicsItem *parent)
-    : AbstractGraphicsItem(parent), owner(_owner), beingPointedAt(false)
-{
-    setFlag(ItemSendsScenePositionChanges);
-}
-
-ArrowTarget::~ArrowTarget()
-{
-    for (int i = 0; i < arrowsFrom.size(); ++i) {
-        arrowsFrom[i]->setStartItem(0);
-        arrowsFrom[i]->delArrow();
-    }
-    for (int i = 0; i < arrowsTo.size(); ++i) {
-        arrowsTo[i]->setTargetItem(0);
-        arrowsTo[i]->delArrow();
-    }
-}
-
-void ArrowTarget::setBeingPointedAt(bool _beingPointedAt)
-{
-    beingPointedAt = _beingPointedAt;
-    update();
-}
-
-QVariant ArrowTarget::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value)
-{
-    if (change == ItemScenePositionHasChanged && scene()) {
-        for (auto *arrow : arrowsFrom)
-            arrow->updatePath();
-
-        for (auto *arrow : arrowsTo)
-            arrow->updatePath();
-    }
-
-    return QGraphicsItem::itemChange(change, value);
-}
diff --git a/cockatrice/src/game/board/arrow_target.h b/cockatrice/src/game/board/arrow_target.h
deleted file mode 100644
index 55f4ef678..000000000
--- a/cockatrice/src/game/board/arrow_target.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * @file arrow_target.h
- * @ingroup GameGraphics
- * @brief TODO: Document this.
- */
-
-#ifndef ARROWTARGET_H
-#define ARROWTARGET_H
-
-#include "../../game_graphics/board/abstract_graphics_item.h"
-
-#include <QList>
-
-class Player;
-class ArrowItem;
-
-class ArrowTarget : public AbstractGraphicsItem
-{
-    Q_OBJECT
-protected:
-    Player *owner;
-
-private:
-    bool beingPointedAt;
-    QList<ArrowItem *> arrowsFrom, arrowsTo;
-
-public:
-    explicit ArrowTarget(Player *_owner, QGraphicsItem *parent = nullptr);
-    ~ArrowTarget() override;
-
-    [[nodiscard]] Player *getOwner() const
-    {
-        return owner;
-    }
-
-    void setBeingPointedAt(bool _beingPointedAt);
-    [[nodiscard]] bool getBeingPointedAt() const
-    {
-        return beingPointedAt;
-    }
-
-    [[nodiscard]] const QList<ArrowItem *> &getArrowsFrom() const
-    {
-        return arrowsFrom;
-    }
-    void addArrowFrom(ArrowItem *arrow)
-    {
-        arrowsFrom.append(arrow);
-    }
-    void removeArrowFrom(ArrowItem *arrow)
-    {
-        arrowsFrom.removeOne(arrow);
-    }
-    [[nodiscard]] const QList<ArrowItem *> &getArrowsTo() const
-    {
-        return arrowsTo;
-    }
-    void addArrowTo(ArrowItem *arrow)
-    {
-        arrowsTo.append(arrow);
-    }
-    void removeArrowTo(ArrowItem *arrow)
-    {
-        arrowsTo.removeOne(arrow);
-    }
-
-protected:
-    QVariant itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) override;
-};
-#endif
diff --git a/cockatrice/src/game/board/card_list.cpp b/cockatrice/src/game/board/card_list.cpp
index c324ca10a..94bae67cd 100644
--- a/cockatrice/src/game/board/card_list.cpp
+++ b/cockatrice/src/game/board/card_list.cpp
@@ -1,9 +1,14 @@
 #include "card_list.h"
 
-#include "card_item.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 07be33b32..b5427df0d 100644
--- a/cockatrice/src/game/board/card_list.h
+++ b/cockatrice/src/game/board/card_list.h
@@ -1,14 +1,16 @@
 /**
  * @file card_list.h
  * @ingroup GameLogicCards
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARDLIST_H
 #define CARDLIST_H
 
 #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
new file mode 100644
index 000000000..3f879a849
--- /dev/null
+++ b/cockatrice/src/game/board/card_state.cpp
@@ -0,0 +1,113 @@
+#include "card_state.h"
+
+#include <QSharedPointer>
+
+void CardState::resetState(bool keepAnnotations)
+{
+    attacking = false;
+    counters.clear();
+    pt.clear();
+    if (!keepAnnotations) {
+        annotation.clear();
+    }
+    attachedTo = nullptr;
+}
+
+void CardState::setZone(CardZoneLogic *_zone)
+{
+    if (zone == _zone) {
+        return;
+    }
+
+    zone = _zone;
+    emit zoneChanged(this, zone);
+    emit stateChanged();
+}
+
+void CardState::setAttacking(bool _attacking)
+{
+    if (attacking == _attacking) {
+        return;
+    }
+    attacking = _attacking;
+    emit attackingChanged(_attacking);
+    emit stateChanged();
+}
+
+void CardState::insertCounter(int id, int value)
+{
+    counters.insert(id, value);
+
+    emit countersChanged(counters);
+    emit stateChanged();
+}
+
+void CardState::setCounter(int id, int value)
+{
+    if (value) {
+        counters[id] = value;
+    } else {
+        counters.remove(id);
+    }
+
+    emit countersChanged(counters);
+    emit stateChanged();
+}
+
+void CardState::clearCounters()
+{
+    counters.clear();
+    emit countersChanged(counters);
+    emit stateChanged();
+}
+
+void CardState::setAnnotation(const QString &_annotation)
+{
+    if (annotation == _annotation) {
+        return;
+    }
+    annotation = _annotation;
+    emit annotationChanged(annotation);
+    emit stateChanged();
+}
+
+void CardState::setPT(const QString &_pt)
+{
+    if (pt == _pt) {
+        return;
+    }
+    pt = _pt;
+    emit ptChanged(pt);
+    emit stateChanged();
+}
+
+void CardState::setDoesntUntap(bool _doesntUntap)
+{
+    if (doesntUntap == _doesntUntap) {
+        return;
+    }
+    doesntUntap = _doesntUntap;
+    emit doesntUntapChanged(_doesntUntap);
+    emit stateChanged();
+}
+
+void CardState::setDestroyOnZoneChange(bool _destroyOnZoneChange)
+{
+    if (destroyOnZoneChange == _destroyOnZoneChange) {
+        return;
+    }
+
+    destroyOnZoneChange = _destroyOnZoneChange;
+    emit destroyOnZoneChangeChanged(_destroyOnZoneChange);
+    emit stateChanged();
+}
+
+void CardState::setAttachedTo(CardItem *_attachedTo)
+{
+    if (attachedTo == _attachedTo) {
+        return;
+    }
+    attachedTo = _attachedTo;
+    emit attachedToChanged(_attachedTo);
+    emit stateChanged();
+}
\ No newline at end of file
diff --git a/cockatrice/src/game/board/card_state.h b/cockatrice/src/game/board/card_state.h
new file mode 100644
index 000000000..ca7aaf927
--- /dev/null
+++ b/cockatrice/src/game/board/card_state.h
@@ -0,0 +1,106 @@
+#ifndef COCKATRICE_CARD_STATE_H
+#define COCKATRICE_CARD_STATE_H
+
+#include <QMap>
+#include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
+
+class CardZoneLogic;
+class CardItem;
+
+class CardState : public QObject
+{
+    Q_OBJECT
+
+private:
+    bool attacking = false;
+    QMap<int, int> counters;
+    QString annotation;
+    QString pt;
+    bool doesntUntap = false;
+    bool destroyOnZoneChange = false;
+
+    CardItem *attachedTo = nullptr;
+    CardZoneLogic *zone = nullptr;
+
+signals:
+    void stateChanged();
+
+    void attackingChanged(bool newValue);
+    void countersChanged(const QMap<int, int> &newCounters);
+    void annotationChanged(const QString &newAnnotation);
+    void ptChanged(const QString &newPt);
+    void doesntUntapChanged(bool newValue);
+    void destroyOnZoneChangeChanged(bool newValue);
+    void attachedToChanged(CardItem *newAttachedTo);
+    void zoneChanged(CardState *changedCard, CardZoneLogic *newZone);
+
+public:
+    explicit CardState(QObject *parent, CardZoneLogic *_zone) : QObject(parent), zone(_zone)
+    {
+    }
+
+    void resetState(bool keepAnnotations);
+
+    CardZoneLogic *getZone() const
+    {
+        return zone;
+    }
+
+    void setZone(CardZoneLogic *_zone);
+
+    bool getAttacking() const
+    {
+        return attacking;
+    }
+    void setAttacking(bool _attacking);
+
+    const QMap<int, int> &getCounters() const
+    {
+        return counters;
+    }
+
+    void insertCounter(int id, int value);
+
+    void setCounter(int id, int value);
+
+    void clearCounters();
+
+    QString getAnnotation() const
+    {
+        return annotation;
+    }
+
+    void setAnnotation(const QString &_annotation);
+
+    QString getPT() const
+    {
+        return pt;
+    }
+
+    void setPT(const QString &_pt);
+
+    bool getDoesntUntap() const
+    {
+        return doesntUntap;
+    }
+
+    void setDoesntUntap(bool _doesntUntap);
+
+    bool getDestroyOnZoneChange() const
+    {
+        return destroyOnZoneChange;
+    }
+
+    void setDestroyOnZoneChange(bool _destroyOnZoneChange);
+
+    CardItem *getAttachedTo() const
+    {
+        return attachedTo;
+    }
+
+    void setAttachedTo(CardItem *_attachedTo);
+};
+
+#endif // COCKATRICE_CARD_STATE_H
diff --git a/cockatrice/src/game/board/counter_state.cpp b/cockatrice/src/game/board/counter_state.cpp
new file mode 100644
index 000000000..5d8c73d5b
--- /dev/null
+++ b/cockatrice/src/game/board/counter_state.cpp
@@ -0,0 +1,26 @@
+#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)
+    : QObject(parent), id(id), name(name), color(color), radius(radius), value(value)
+{
+}
+
+CounterState *CounterState::fromProto(const ServerInfo_Counter &counter, QObject *parent)
+{
+    return new CounterState(counter.id(), QString::fromStdString(counter.name()),
+                            convertColorToQColor(counter.counter_color()), counter.radius(), counter.count(), parent);
+}
+
+void CounterState::setValue(int newValue, bool skipDamageAnimation)
+{
+    if (newValue == value) {
+        return;
+    }
+    int old = value;
+    value = newValue;
+    emit valueChanged(old, newValue, skipDamageAnimation);
+}
\ No newline at end of file
diff --git a/cockatrice/src/game/board/counter_state.h b/cockatrice/src/game/board/counter_state.h
new file mode 100644
index 000000000..8badc6217
--- /dev/null
+++ b/cockatrice/src/game/board/counter_state.h
@@ -0,0 +1,66 @@
+#ifndef COCKATRICE_COUNTER_STATE_H
+#define COCKATRICE_COUNTER_STATE_H
+
+#include <QColor>
+#include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
+
+class ServerInfo_Counter;
+
+class CounterState : public QObject
+{
+    Q_OBJECT
+public:
+    CounterState(int id, const QString &name, const QColor &color, int radius, int value, QObject *parent = nullptr);
+
+    static CounterState *fromProto(const ServerInfo_Counter &counter, QObject *parent = nullptr);
+
+    int getId() const
+    {
+        return id;
+    }
+    QString getName() const
+    {
+        return name;
+    }
+    QColor getColor() const
+    {
+        return color;
+    }
+    int getRadius() const
+    {
+        return radius;
+    }
+    int getValue() const
+    {
+        return value;
+    }
+
+    /**
+     * @brief Set the counter value.
+     * @param newValue The new value.
+     * @param skipDamageAnimation When true, valueChanged is emitted with skipDamageAnimation=true, letting views
+     * suppress damage-related feedback (e.g. battlefield shimmer, life counter flash) for values set during replay
+     * rewinds.
+     */
+    void setValue(int newValue, bool skipDamageAnimation = false);
+
+signals:
+    /**
+     * @brief Emitted whenever the value changes.
+     * @param oldValue The previous value.
+     * @param newValue The new value.
+     * @param skipDamageAnimation True when the change should not trigger damage/life-change feedback in views.
+     */
+    void valueChanged(int oldValue, int newValue, bool skipDamageAnimation);
+
+private:
+    int id;
+    QString name;
+    QColor color;
+    int radius;
+    int value;
+};
+
+#endif // COCKATRICE_COUNTER_STATE_H
diff --git a/cockatrice/src/game/game.cpp b/cockatrice/src/game/game.cpp
index 38477f7f7..7343d052a 100644
--- a/cockatrice/src/game/game.cpp
+++ b/cockatrice/src/game/game.cpp
@@ -1,19 +1,27 @@
 #include "game.h"
 
-#include "../interface/widgets/tabs/tab_game.h"
+#include "game_meta_info.h"
+#include "game_state.h"
+#include "player/player_manager.h"
 
+#include <QList>
+#include <QMap>
+#include <QString>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>
 
-Game::Game(TabGame *_tab,
+class AbstractClient;
+class QObject;
+
+Game::Game(QObject *_parent,
+           bool isLocalGame,
            QList<AbstractClient *> &_clients,
            const Event_GameJoined &event,
            const QMap<int, QString> &_roomGameTypes)
-    : AbstractGame(_tab)
+    : AbstractGame(_parent)
 {
     gameMetaInfo->setFromProto(event.game_info());
     gameMetaInfo->setRoomGameTypes(_roomGameTypes);
-    gameState = new GameState(this, 0, event.host_id(), tab->getTabSupervisor()->getIsLocalGame(), _clients, false,
-                              event.resuming(), -1, false);
+    gameState = new GameState(this, 0, event.host_id(), isLocalGame, _clients, false, event.resuming(), -1, false);
     connect(gameMetaInfo, &GameMetaInfo::startedChanged, gameState, &GameState::onStartedChanged);
     playerManager = new PlayerManager(this, event.player_id(), event.judge(), event.spectator());
     gameMetaInfo->setStarted(false);
diff --git a/cockatrice/src/game/game.h b/cockatrice/src/game/game.h
index 96ebbae4d..6a309cfb2 100644
--- a/cockatrice/src/game/game.h
+++ b/cockatrice/src/game/game.h
@@ -1,22 +1,30 @@
 /**
  * @file game.h
  * @ingroup GameLogic
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_GAME_H
 #define COCKATRICE_GAME_H
 
 #include "abstract_game.h"
 
-#include <QObject>
+#include <qtmetamacros.h>
+
+class AbstractClient;
+class Event_GameJoined;
+class QObject;
+class QString;
+template <class Key, class T> class QMap;
+template <typename T> class QList;
 
 class Game : public AbstractGame
 {
     Q_OBJECT
 
 public:
-    Game(TabGame *tab,
+    Game(QObject *parent,
+         bool isLocalGame,
          QList<AbstractClient *> &_clients,
          const Event_GameJoined &event,
          const QMap<int, QString> &_roomGameTypes);
diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp
index 7bfc4da75..7b08af47c 100644
--- a/cockatrice/src/game/game_event_handler.cpp
+++ b/cockatrice/src/game/game_event_handler.cpp
@@ -1,9 +1,30 @@
 #include "game_event_handler.h"
 
-#include "../interface/widgets/tabs/tab_game.h"
 #include "abstract_game.h"
-#include "log/message_log_widget.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>
@@ -13,7 +34,6 @@
 #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>
@@ -28,6 +48,8 @@
 #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)
 {
@@ -36,8 +58,9 @@ GameEventHandler::GameEventHandler(AbstractGame *_game) : QObject(_game), game(_
 void GameEventHandler::sendGameCommand(PendingCommand *pend, int playerId)
 {
     AbstractClient *client = game->getClientForPlayer(playerId);
-    if (!client)
+    if (!client) {
         return;
+    }
 
     connect(pend, &PendingCommand::finished, this, &GameEventHandler::commandFinished);
     client->sendCommand(pend);
@@ -46,8 +69,9 @@ void GameEventHandler::sendGameCommand(PendingCommand *pend, int playerId)
 void GameEventHandler::sendGameCommand(const google::protobuf::Message &command, int playerId)
 {
     AbstractClient *client = game->getClientForPlayer(playerId);
-    if (!client)
+    if (!client) {
         return;
+    }
 
     PendingCommand *pend = prepareGameCommand(command);
     connect(pend, &PendingCommand::finished, this, &GameEventHandler::commandFinished);
@@ -56,8 +80,9 @@ void GameEventHandler::sendGameCommand(const google::protobuf::Message &command,
 
 void GameEventHandler::commandFinished(const Response &response)
 {
-    if (response.response_code() == Response::RespChatFlood)
+    if (response.response_code() == Response::RespChatFlood) {
         emit gameFlooded();
+    }
 }
 
 PendingCommand *GameEventHandler::prepareGameCommand(const ::google::protobuf::Message &cmd)
@@ -96,7 +121,7 @@ void GameEventHandler::processGameEventContainer(const GameEventContainer &cont,
 
         if (cont.has_forced_by_judge()) {
             auto id = cont.forced_by_judge();
-            Player *judgep = game->getPlayerManager()->getPlayers().value(id, nullptr);
+            PlayerLogic *judgep = game->getPlayerManager()->getPlayers().value(id, nullptr);
             if (judgep) {
                 emit setContextJudgeName(judgep->getPlayerInfo()->getName());
             } else if (game->getPlayerManager()->getSpectators().contains(id)) {
@@ -117,9 +142,11 @@ void GameEventHandler::processGameEventContainer(const GameEventContainer &cont,
                     break;
             }
         } else {
-            if ((game->getGameState()->getClients().size() > 1) && (playerId != -1))
-                if (game->getGameState()->getClients().at(playerId) != client)
+            if ((game->getGameState()->getClients().size() > 1) && (playerId != -1)) {
+                if (game->getGameState()->getClients().at(playerId) != client) {
                     continue;
+                }
+            }
 
             switch (eventType) {
                 case GameEvent::GAME_STATE_CHANGED:
@@ -155,7 +182,7 @@ void GameEventHandler::processGameEventContainer(const GameEventContainer &cont,
                     break;
 
                 default: {
-                    Player *player = game->getPlayerManager()->getPlayers().value(playerId, 0);
+                    PlayerLogic *player = game->getPlayerManager()->getPlayers().value(playerId, 0);
                     if (!player) {
                         qCWarning(GameEventHandlerLog) << "unhandled game event: invalid player id";
                         break;
@@ -208,11 +235,29 @@ void GameEventHandler::handleChatMessageSent(const QString &chatMessage)
     sendGameCommand(cmd);
 }
 
-void GameEventHandler::handleArrowDeletion(int arrowId)
+void GameEventHandler::handleArrowDeletion(int creatorId, int arrowId)
 {
     Command_DeleteArrow cmd;
     cmd.set_arrow_id(arrowId);
-    sendGameCommand(cmd);
+
+    auto preparedCommand = prepareGameCommand(cmd);
+
+    connect(preparedCommand, &PendingCommand::finished, this, [creatorId, arrowId, this](const Response &response) {
+        handleArrowDeletionFinished(response, creatorId, arrowId);
+    });
+
+    sendGameCommand(preparedCommand);
+}
+
+void GameEventHandler::handleArrowDeletionFinished(const Response &response, int creatorId, int arrowId)
+{
+    // The server confirms the arrow no longer exists whether it deleted it itself
+    // (RespOk, followed by an Event_DeleteArrow broadcast) or never had it
+    // (RespNameNotFound). In both cases the local copy has to go. deleteArrow is
+    // a no-op if the arrow was already removed by the event broadcast.
+    if (response.response_code() == Response::RespOk || response.response_code() == Response::RespNameNotFound) {
+        emit arrowDeleted(creatorId, arrowId);
+    }
 }
 
 void GameEventHandler::eventSpectatorSay(const Event_GameSay &event,
@@ -232,8 +277,6 @@ void GameEventHandler::eventSpectatorLeave(const Event_Leave &event,
     emit spectatorLeft(eventPlayerId);
 
     game->getPlayerManager()->removeSpectator(eventPlayerId);
-
-    emitUserEvent();
 }
 
 void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event,
@@ -256,18 +299,25 @@ void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event
                 emit spectatorJoined(prop);
             }
         } else {
-            Player *player = game->getPlayerManager()->getPlayers().value(playerId, 0);
+            PlayerLogic *player = game->getPlayerManager()->getPlayers().value(playerId, 0);
             if (!player) {
                 player = game->getPlayerManager()->addPlayer(playerId, prop.user_info());
                 emit playerJoined(prop);
             }
             player->processPlayerInfo(playerInfo);
+            // Extract playmat from player properties for opponent display
+            if (prop.has_playmat_params()) {
+                player->setPlaymatFromProperties(prop);
+            }
             if (player->getPlayerInfo()->getLocal()) {
                 emit localPlayerDeckSelected(player, playerId, playerInfo);
             } else {
                 if (!game->getGameMetaInfo()->proto().share_decklists_on_load()) {
                     continue;
                 }
+                if (!playerInfo.has_deck_list()) {
+                    continue;
+                }
 
                 opponentDecksToDisplay.append(
                     qMakePair(playerId, qMakePair(playerName, QString::fromStdString(playerInfo.deck_list()))));
@@ -284,8 +334,9 @@ void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event
     if (event.game_started() && !game->getGameMetaInfo()->started()) {
         game->getGameState()->setResuming(!game->getGameState()->isGameStateKnown());
         game->getGameMetaInfo()->setStarted(event.game_started());
-        if (game->getGameState()->isGameStateKnown())
+        if (game->getGameState()->isGameStateKnown()) {
             emit logGameStart();
+        }
         game->getGameState()->setActivePlayer(event.active_player_id());
         game->getGameState()->setCurrentPhase(event.active_phase());
     } else if (!event.game_started() && game->getGameMetaInfo()->started()) {
@@ -304,9 +355,10 @@ void GameEventHandler::processCardAttachmentsForPlayers(const Event_GameStateCha
         const ServerInfo_Player &playerInfo = event.player_list(i);
         const ServerInfo_PlayerProperties &prop = playerInfo.properties();
         if (!prop.spectator()) {
-            Player *player = game->getPlayerManager()->getPlayers().value(prop.player_id(), 0);
-            if (!player)
+            PlayerLogic *player = game->getPlayerManager()->getPlayers().value(prop.player_id(), 0);
+            if (!player) {
                 continue;
+            }
             player->processCardAttachment(playerInfo);
         }
     }
@@ -316,18 +368,25 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties
                                                     int eventPlayerId,
                                                     const GameEventContext &context)
 {
-    Player *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0);
-    if (!player)
+    PlayerLogic *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0);
+    if (!player) {
         return;
+    }
     const ServerInfo_PlayerProperties &prop = event.player_properties();
     emit playerPropertiesChanged(prop, eventPlayerId);
 
+    // Update playmat from player properties
+    if (prop.has_playmat_params()) {
+        player->setPlaymatFromProperties(prop);
+    }
+
     const auto contextType = static_cast<GameEventContext::ContextType>(getPbExtension(context));
     switch (contextType) {
         case GameEventContext::READY_START: {
             bool ready = prop.ready_start();
-            if (player->getPlayerInfo()->getLocal())
+            if (player->getPlayerInfo()->getLocal()) {
                 emit localPlayerReadyStateChanged(player->getPlayerInfo()->getId(), ready);
+            }
             if (ready) {
                 emit logReadyStart(player);
             } else {
@@ -338,9 +397,10 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties
         case GameEventContext::CONCEDE: {
             player->setConceded(true);
 
-            QMapIterator<int, Player *> playerIterator(game->getPlayerManager()->getPlayers());
-            while (playerIterator.hasNext())
+            QMapIterator<int, PlayerLogic *> playerIterator(game->getPlayerManager()->getPlayers());
+            while (playerIterator.hasNext()) {
                 playerIterator.next().value()->updateZones();
+            }
 
             emit logConcede(eventPlayerId);
 
@@ -349,9 +409,10 @@ void GameEventHandler::eventPlayerPropertiesChanged(const Event_PlayerProperties
         case GameEventContext::UNCONCEDE: {
             player->setConceded(false);
 
-            QMapIterator<int, Player *> playerIterator(game->getPlayerManager()->getPlayers());
-            while (playerIterator.hasNext())
+            QMapIterator<int, PlayerLogic *> playerIterator(game->getPlayerManager()->getPlayers());
+            while (playerIterator.hasNext()) {
                 playerIterator.next().value()->updateZones();
+            }
 
             emit logUnconcede(eventPlayerId);
 
@@ -389,20 +450,22 @@ void GameEventHandler::eventJoin(const Event_Join &event, int /*eventPlayerId*/,
     QString playerName = QString::fromStdString(playerInfo.user_info().name());
     emit addPlayerToAutoCompleteList(playerName);
 
-    if (game->getPlayerManager()->getPlayers().contains(playerId))
+    PlayerManager *playerManager = game->getPlayerManager();
+    if (playerManager->getPlayers().contains(playerId) || playerManager->getSpectators().contains(playerId)) {
         return;
+    }
 
     if (playerInfo.spectator()) {
-        game->getPlayerManager()->addSpectator(playerId, playerInfo);
+        playerManager->addSpectator(playerId, playerInfo);
         emit logJoinSpectator(playerName);
         emit spectatorJoined(playerInfo);
     } else {
-        Player *newPlayer = game->getPlayerManager()->addPlayer(playerId, playerInfo.user_info());
+        PlayerLogic *newPlayer = game->getPlayerManager()->addPlayer(playerId, playerInfo.user_info());
         emit logJoinPlayer(newPlayer);
         emit playerJoined(playerInfo);
-    }
 
-    emitUserEvent();
+        emitUserEvent();
+    }
 }
 
 QString GameEventHandler::getLeaveReason(Event_Leave::LeaveReason reason)
@@ -425,23 +488,25 @@ QString GameEventHandler::getLeaveReason(Event_Leave::LeaveReason reason)
 }
 void GameEventHandler::eventLeave(const Event_Leave &event, int eventPlayerId, const GameEventContext & /*context*/)
 {
-    Player *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0);
-    if (!player)
+    PlayerLogic *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0);
+    if (!player) {
         return;
+    }
 
+    player->clear();
     emit playerLeft(eventPlayerId);
 
     emit logLeave(player, getLeaveReason(event.reason()));
 
     game->getPlayerManager()->removePlayer(eventPlayerId);
 
-    player->clear();
     player->deleteLater();
 
     // Rearrange all remaining zones so that attachment relationship updates take place
-    QMapIterator<int, Player *> playerIterator(game->getPlayerManager()->getPlayers());
-    while (playerIterator.hasNext())
+    QMapIterator<int, PlayerLogic *> playerIterator(game->getPlayerManager()->getPlayers());
+    while (playerIterator.hasNext()) {
         playerIterator.next().value()->updateZones();
+    }
 
     emitUserEvent();
 }
@@ -460,9 +525,10 @@ void GameEventHandler::eventReverseTurn(const Event_ReverseTurn &event,
                                         int eventPlayerId,
                                         const GameEventContext & /*context*/)
 {
-    Player *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0);
-    if (!player)
+    PlayerLogic *player = game->getPlayerManager()->getPlayers().value(eventPlayerId, 0);
+    if (!player) {
         return;
+    }
 
     emit logTurnReversed(player, event.reversed());
 }
@@ -490,9 +556,10 @@ void GameEventHandler::eventSetActivePlayer(const Event_SetActivePlayer &event,
                                             const GameEventContext & /*context*/)
 {
     game->getGameState()->setActivePlayer(event.active_player_id());
-    Player *player = game->getPlayerManager()->getPlayer(event.active_player_id());
-    if (!player)
+    PlayerLogic *player = game->getPlayerManager()->getPlayer(event.active_player_id());
+    if (!player) {
         return;
+    }
     emit logActivePlayer(player);
     emitUserEvent();
 }
diff --git a/cockatrice/src/game/game_event_handler.h b/cockatrice/src/game/game_event_handler.h
index 302e7a6ff..30021d295 100644
--- a/cockatrice/src/game/game_event_handler.h
+++ b/cockatrice/src/game/game_event_handler.h
@@ -1,7 +1,15 @@
 /**
  * @file game_event_handler.h
  * @ingroup GameLogic
- * @brief TODO: Document this.
+ * @brief Game-level command sender and event dispatcher.
+ *
+ * GameEventHandler sends commands initiated by the local client to the server
+ * and processes incoming game-wide events. It bridges the networking layer
+ * (protobuf events received via AbstractClient) with the game model and UI
+ * (GameState, PlayerManager, logging, widgets).
+ *
+ * Player-scoped events are forwarded to PlayerEventHandler instances, while
+ * spectator and global game events are handled directly here.
  */
 
 #ifndef COCKATRICE_GAME_EVENT_HANDLER_H
@@ -11,95 +19,329 @@
 
 #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 Response;
+class AbstractGame;
 class GameEventContainer;
 class GameEventContext;
-class GameCommand;
-class GameState;
-class MessageLogWidget;
-class CommandContainer;
-class Event_GameJoined;
+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_GameStart;
 class Event_SetActivePlayer;
 class Event_SetActivePhase;
-class Event_Ping;
 class Event_GameSay;
 class Event_Kicked;
 class Event_ReverseTurn;
-class AbstractGame;
-class PendingCommand;
-class Player;
+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");
 
+/**
+ * @class GameEventHandler
+ * @brief Central dispatcher for game-wide commands and events.
+ *
+ * This class owns no game state itself. Instead, it:
+ * - Sends commands to the server on behalf of local players
+ * - Receives and dispatches server-side game events
+ * - Updates the game model indirectly via Player, GameState, and PlayerManager
+ * - Emits high-level signals for UI updates and logging
+ */
 class GameEventHandler : public QObject
 {
     Q_OBJECT
 
 private:
+    /** Pointer to the owning game instance. */
     AbstractGame *game;
 
 public:
+    /** @name Construction
+     *  Lifecycle and ownership.
+     *  @{
+     */
+
+    /**
+     * @brief Construct a GameEventHandler.
+     *
+     * The handler is owned by the AbstractGame instance and uses it to
+     * access the game state, players, and network clients.
+     *
+     * @param _game Owning game instance (also used as QObject parent).
+     */
     explicit GameEventHandler(AbstractGame *_game);
 
+    /** @} */
+
+    /** @name Outgoing game commands
+     *  Commands initiated locally and sent to the server.
+     *
+     * These methods construct and send protobuf commands corresponding
+     * to user actions in the UI.
+     *  @{
+     */
+
+    /** @brief Request advancing the game to the next turn. */
     void handleNextTurn();
+
+    /** @brief Request reversing the current turn order. */
     void handleReverseTurn();
 
+    /** @brief Concede the game for the currently active local player. */
     void handleActiveLocalPlayerConceded();
-    void handleActiveLocalPlayerUnconceded();
-    void handleActivePhaseChanged(int phase);
-    void handleGameLeft();
-    void handleChatMessageSent(const QString &chatMessage);
-    void handleArrowDeletion(int arrowId);
 
+    /** @brief Undo a previous concede for the active local player. */
+    void handleActiveLocalPlayerUnconceded();
+
+    /**
+     * @brief Set the active phase of the game.
+     *
+     * Typically triggered by the active player selecting a new phase.
+     *
+     * @param phase Phase identifier.
+     */
+    void handleActivePhaseChanged(int phase);
+
+    /** @brief Leave the current game session. */
+    void handleGameLeft();
+
+    /**
+     * @brief Send a chat message to all players and spectators.
+     *
+     * @param chatMessage Message text.
+     */
+    void handleChatMessageSent(const QString &chatMessage);
+
+    /**
+     * @brief Delete an existing arrow.
+     *
+     * @param arrowId Unique identifier of the arrow to delete.
+     */
+    void handleArrowDeletion(int creatorId, int arrowId);
+    void handleArrowDeletionFinished(const Response &response, int creatorId, int arrowId);
+
+    /** @} */
+
+    /** @name Incoming event processing
+     *  Entry points for server-sent events.
+     *  @{
+     */
+
+    /**
+     * @brief Process a container of game events received from the server.
+     *
+     * This is the main dispatch function for incoming game events.
+     * Events are routed to spectator handlers, game-level handlers,
+     * or forwarded to PlayerEventHandler instances as appropriate.
+     *
+     * @param cont Game event container from the server.
+     * @param client Client that received the container.
+     * @param options Processing flags (e.g. silent, replay).
+     */
+    void
+    processGameEventContainer(const GameEventContainer &cont, AbstractClient *client, EventProcessingOptions options);
+
+    /** @} */
+
+    /** @name Command preparation helpers
+     *  Internal helpers for building command containers.
+     *  @{
+     */
+
+    /**
+     * @brief Wrap a single protobuf command in a PendingCommand.
+     *
+     * @param cmd Protobuf command message.
+     * @return Newly allocated PendingCommand (caller takes ownership).
+     */
+    PendingCommand *prepareGameCommand(const ::google::protobuf::Message &cmd);
+
+    /**
+     * @brief Wrap multiple protobuf commands in a single PendingCommand.
+     *
+     * Ownership of the messages in cmdList is transferred to the handler.
+     *
+     * @param cmdList List of protobuf command messages.
+     * @return Newly allocated PendingCommand.
+     */
+    PendingCommand *prepareGameCommand(const QList<const ::google::protobuf::Message *> &cmdList);
+
+    /** @} */
+
+    /** @name Spectator event handlers
+     *  Events originating from spectators.
+     *  @{
+     */
+
+    /**
+     * @brief Handle a spectator chat message.
+     */
     void eventSpectatorSay(const Event_GameSay &event, int eventPlayerId, const GameEventContext &context);
+
+    /**
+     * @brief Handle a spectator leaving the game.
+     */
     void eventSpectatorLeave(const Event_Leave &event, int eventPlayerId, const GameEventContext &context);
 
+    /** @} */
+
+    /** @name Game state event handlers
+     *  Events that affect global game state.
+     *  @{
+     */
+
+    /**
+     * @brief Handle a full game state update from the server.
+     *
+     * Used during game startup, reconnection, and resynchronization.
+     */
     void eventGameStateChanged(const Event_GameStateChanged &event, int eventPlayerId, const GameEventContext &context);
+
+    /**
+     * @brief Update card attachment relationships for all players.
+     *
+     * Called after a game state update to ensure attachments are resolved
+     * consistently across all zones.
+     */
     void processCardAttachmentsForPlayers(const Event_GameStateChanged &event);
+
+    /** @brief Handle a change in game host. */
+    void eventGameHostChanged(const Event_GameHostChanged &event, int eventPlayerId, const GameEventContext &context);
+
+    /** @brief Handle the game being closed by the server. */
+    void eventGameClosed(const Event_GameClosed &event, int eventPlayerId, const GameEventContext &context);
+
+    /** @brief Handle a change of the active player. */
+    void eventSetActivePlayer(const Event_SetActivePlayer &event, int eventPlayerId, const GameEventContext &context);
+
+    /** @brief Handle a change of the active phase. */
+    void eventSetActivePhase(const Event_SetActivePhase &event, int eventPlayerId, const GameEventContext &context);
+
+    /** @brief Handle a turn reversal event. */
+    void eventReverseTurn(const Event_ReverseTurn &event, int eventPlayerId, const GameEventContext &context);
+
+    /** @brief Handle ping / latency updates. */
+    void eventPing(const Event_Ping &event, int eventPlayerId, const GameEventContext &context);
+
+    /** @} */
+
+    /** @name Player lifecycle and property handlers
+     *  Events related to players joining, leaving, or changing state.
+     *  @{
+     */
+
+    /**
+     * @brief Handle updates to a player's properties.
+     *
+     * Includes readiness, concede state, deck selection, sideboard lock,
+     * and connection state changes.
+     */
     void eventPlayerPropertiesChanged(const Event_PlayerPropertiesChanged &event,
                                       int eventPlayerId,
                                       const GameEventContext &context);
+
+    /** @brief Handle a player or spectator joining the game. */
     void eventJoin(const Event_Join &event, int eventPlayerId, const GameEventContext &context);
+
+    /** @brief Handle a player leaving the game. */
     void eventLeave(const Event_Leave &event, int eventPlayerId, const GameEventContext &context);
-    QString getLeaveReason(Event_Leave::LeaveReason reason);
+
+    /** @brief Handle the local player being kicked from the game. */
     void eventKicked(const Event_Kicked &event, int eventPlayerId, const GameEventContext &context);
-    void eventGameHostChanged(const Event_GameHostChanged &event, int eventPlayerId, const GameEventContext &context);
-    void eventGameClosed(const Event_GameClosed &event, int eventPlayerId, const GameEventContext &context);
 
-    void eventSetActivePlayer(const Event_SetActivePlayer &event, int eventPlayerId, const GameEventContext &context);
-    void eventSetActivePhase(const Event_SetActivePhase &event, int eventPlayerId, const GameEventContext &context);
-    void eventPing(const Event_Ping &event, int eventPlayerId, const GameEventContext &context);
-    void eventReverseTurn(const Event_ReverseTurn &event, int eventPlayerId, const GameEventContext & /*context*/);
+    /**
+     * @brief Convert a leave reason enum to a human-readable string.
+     */
+    QString getLeaveReason(Event_Leave::LeaveReason reason);
 
-    void commandFinished(const Response &response);
+    /** @} */
 
-    void
-    processGameEventContainer(const GameEventContainer &cont, AbstractClient *client, EventProcessingOptions options);
-    PendingCommand *prepareGameCommand(const ::google::protobuf::Message &cmd);
-    PendingCommand *prepareGameCommand(const QList<const ::google::protobuf::Message *> &cmdList);
 public slots:
+    /** @name Command dispatch slots
+     *  Low-level command transmission.
+     *  @{
+     */
+
+    /**
+     * @brief Send a prepared PendingCommand.
+     *
+     * @param pend Pending command to send.
+     * @param playerId Player whose client should send the command.
+     */
     void sendGameCommand(PendingCommand *pend, int playerId = -1);
+
+    /**
+     * @brief Send a single protobuf command.
+     *
+     * @param command Protobuf command message.
+     * @param playerId Player whose client should send the command.
+     */
     void sendGameCommand(const ::google::protobuf::Message &command, int playerId = -1);
 
+    /**
+     * @brief Called when a PendingCommand finishes execution.
+     *
+     * Used to detect server-side errors such as chat flood protection.
+     */
+    void commandFinished(const Response &response);
+
+    /** @} */
+
 signals:
+    /** @name Core state signals
+     *  @{
+     */
+
     void emitUserEvent();
+    void containerProcessingStarted(GameEventContext context);
+    void containerProcessingDone();
+    void gameFlooded();
+    void setContextJudgeName(QString judgeName);
+
+    /** @} */
+
+    /** @name Player and spectator signals
+     *  @{
+     */
+
     void addPlayerToAutoCompleteList(QString playerName);
-    void localPlayerDeckSelected(Player *localPlayer, int playerId, ServerInfo_Player playerInfo);
+    void localPlayerDeckSelected(PlayerLogic *localPlayer, int playerId, ServerInfo_Player playerInfo);
     void remotePlayerDeckSelected(QString deckList, int playerId, QString playerName);
     void remotePlayersDecksSelected(QVector<QPair<int, QPair<QString, QString>>> opponentDecks);
     void localPlayerSideboardLocked(int playerId, bool sideboardLocked);
     void localPlayerReadyStateChanged(int playerId, bool ready);
+
+    /** @} */
+
+    /** @name Game flow signals
+     *  @{
+     */
+
     void gameStopped();
     void gameClosed();
     void playerPropertiesChanged(const ServerInfo_PlayerProperties &prop, int playerId);
@@ -108,28 +350,35 @@ signals:
     void playerKicked();
     void spectatorJoined(const ServerInfo_PlayerProperties &spectatorInfo);
     void spectatorLeft(int leavingSpectatorId);
-    void gameFlooded();
-    void containerProcessingStarted(GameEventContext context);
-    void setContextJudgeName(QString judgeName);
-    void containerProcessingDone();
+    void arrowDeleted(int creatorId, int arrowId);
+
+    /** @} */
+
+    /** @name Logging signals
+     *  Signals consumed by MessageLogWidget.
+     *  @{
+     */
+
     void logSpectatorSay(ServerInfo_User userInfo, QString message);
     void logSpectatorLeave(QString name, QString reason);
     void logGameStart();
-    void logReadyStart(Player *player);
-    void logNotReadyStart(Player *player);
-    void logDeckSelect(Player *player, QString deckHash, int sideboardSize);
-    void logSideboardLockSet(Player *player, bool sideboardLocked);
-    void logConnectionStateChanged(Player *player, bool connected);
+    void logReadyStart(PlayerLogic *player);
+    void logNotReadyStart(PlayerLogic *player);
+    void logDeckSelect(PlayerLogic *player, QString deckHash, int sideboardSize);
+    void logSideboardLockSet(PlayerLogic *player, bool sideboardLocked);
+    void logConnectionStateChanged(PlayerLogic *player, bool connected);
     void logJoinSpectator(QString spectatorName);
-    void logJoinPlayer(Player *player);
-    void logLeave(Player *player, QString reason);
+    void logJoinPlayer(PlayerLogic *player);
+    void logLeave(PlayerLogic *player, QString reason);
     void logKicked();
-    void logTurnReversed(Player *player, bool reversed);
+    void logTurnReversed(PlayerLogic *player, bool reversed);
     void logGameClosed();
-    void logActivePlayer(Player *activePlayer);
+    void logActivePlayer(PlayerLogic *activePlayer);
     void logActivePhaseChanged(int activePhase);
     void logConcede(int playerId);
     void logUnconcede(int playerId);
+
+    /** @} */
 };
 
 #endif // COCKATRICE_GAME_EVENT_HANDLER_H
diff --git a/cockatrice/src/game/game_meta_info.h b/cockatrice/src/game/game_meta_info.h
index b5f5bfe4f..ef8f0c08e 100644
--- a/cockatrice/src/game/game_meta_info.h
+++ b/cockatrice/src/game/game_meta_info.h
@@ -1,21 +1,24 @@
 /**
  * @file game_meta_info.h
  * @ingroup GameLogic
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef GAME_META_INFO_H
 #define GAME_META_INFO_H
 
 #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
@@ -87,15 +90,17 @@ public:
 public slots:
     void setStarted(bool s)
     {
-        if (gameInfo_.started() == s)
+        if (gameInfo_.started() == s) {
             return;
+        }
         gameInfo_.set_started(s);
         emit startedChanged(s);
     }
     void setSpectatorsOmniscient(bool v)
     {
-        if (gameInfo_.spectators_omniscient() == v)
+        if (gameInfo_.spectators_omniscient() == v) {
             return;
+        }
         gameInfo_.set_spectators_omniscient(v);
         emit spectatorsOmniscienceChanged(v);
     }
diff --git a/cockatrice/src/game/game_scene.cpp b/cockatrice/src/game/game_scene.cpp
deleted file mode 100644
index 77037cd6e..000000000
--- a/cockatrice/src/game/game_scene.cpp
+++ /dev/null
@@ -1,531 +0,0 @@
-#include "game_scene.h"
-
-#include "../client/settings/cache_settings.h"
-#include "board/card_item.h"
-#include "phases_toolbar.h"
-#include "player/player.h"
-#include "player/player_graphics_item.h"
-#include "zones/view_zone.h"
-#include "zones/view_zone_widget.h"
-
-#include <QBasicTimer>
-#include <QDebug>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsView>
-#include <QSet>
-#include <QtMath>
-#include <numeric>
-
-/**
- * @brief Constructs the GameScene.
- * @param _phasesToolbar Toolbar widget for phases.
- * @param parent Optional parent QObject.
- *
- * Initializes the animation timer, adds the phases toolbar to the scene,
- * and connects to settings changes for multi-column layout.
- * Finally, calls rearrange() to layout players initially.
- */
-GameScene::GameScene(PhasesToolbar *_phasesToolbar, QObject *parent)
-    : QGraphicsScene(parent), phasesToolbar(_phasesToolbar), viewSize(QSize()), playerRotation(0)
-{
-    animationTimer = new QBasicTimer;
-    addItem(phasesToolbar);
-    connect(&SettingsCache::instance(), &SettingsCache::minPlayersForMultiColumnLayoutChanged, this,
-            &GameScene::rearrange);
-
-    rearrange();
-}
-
-GameScene::~GameScene()
-{
-    delete animationTimer;
-
-    // DO NOT call clearViews() here
-    // clearViews calls close() on the zoneViews, which sends signals; sending signals in destructors leads to segfaults
-    // deleteLater() deletes the zoneView without allowing it to send signals
-    for (const auto &zoneView : zoneViews) {
-        zoneView->deleteLater();
-    }
-}
-
-/**
- * @brief Updates localized text in all zone views.
- */
-void GameScene::retranslateUi()
-{
-    for (ZoneViewWidget *view : zoneViews)
-        view->retranslateUi();
-}
-
-/**
- * @brief Adds a player to the scene and stores their graphics item.
- * @param player Player to add.
- *
- * Connects to the player's sizeChanged signal to recompute layout on resize.
- */
-void GameScene::addPlayer(Player *player)
-{
-    qCInfo(GameScenePlayerAdditionRemovalLog) << "GameScene::addPlayer name=" << player->getPlayerInfo()->getName();
-
-    players << player->getGraphicsItem();
-    addItem(player->getGraphicsItem());
-    connect(player->getGraphicsItem(), &PlayerGraphicsItem::sizeChanged, this, &GameScene::rearrange);
-}
-
-/**
- * @brief Removes a player from the scene.
- * @param player Player to remove.
- *
- * Closes any zone views associated with the player and recomputes layout.
- */
-void GameScene::removePlayer(Player *player)
-{
-    qCInfo(GameScenePlayerAdditionRemovalLog) << "GameScene::removePlayer name=" << player->getPlayerInfo()->getName();
-
-    for (ZoneViewWidget *zone : zoneViews) {
-        if (zone->getPlayer() == player) {
-            zone->close();
-        }
-    }
-    players.removeOne(player->getGraphicsItem());
-    removeItem(player->getGraphicsItem());
-    rearrange();
-}
-
-/**
- * @brief Adjusts the global rotation offset for player layout.
- * @param rotationAdjustment Number of positions to rotate.
- *
- * Recomputes player layout after applying rotation.
- */
-void GameScene::adjustPlayerRotation(int rotationAdjustment)
-{
-    playerRotation += rotationAdjustment;
-    rearrange();
-}
-
-/**
- * @brief Recomputes the layout of players and the scene size.
- *
- * Steps:
- * 1. Collect active players who haven't conceded.
- * 2. Rotate player list based on first local player and rotation offset.
- * 3. Determine number of columns.
- * 4. Compute scene size and layout.
- * 5. Update toolbar height and scene rectangle.
- * 6. Adjust columns and player positions to match view size.
- */
-void GameScene::rearrange()
-{
-    int firstPlayerIndex = 0;
-    auto playersPlaying = collectActivePlayers(firstPlayerIndex);
-    playersPlaying = rotatePlayers(playersPlaying, firstPlayerIndex);
-
-    int columns = determineColumnCount(playersPlaying.size());
-    QSizeF sceneSize = computeSceneSizeAndPlayerLayout(playersPlaying, columns);
-
-    phasesToolbar->setHeight(sceneSize.height());
-    setSceneRect(0, 0, sceneSize.width(), sceneSize.height());
-
-    processViewSizeChange(viewSize);
-}
-
-// ---------- View Size ----------
-
-/**
- * @brief Handles view resize and redistributes player positions.
- * @param newSize New view size.
- *
- * Steps:
- * 1. Compute minimum width per column from player items.
- * 2. Determine new scene width respecting aspect ratio.
- * 3. Resize columns and reposition players proportionally.
- */
-void GameScene::processViewSizeChange(const QSize &newSize)
-{
-    viewSize = newSize;
-
-    QList<qreal> minWidthByColumn = calculateMinWidthByColumn();
-    qreal minWidth = std::accumulate(minWidthByColumn.begin(), minWidthByColumn.end(), phasesToolbar->getWidth());
-
-    qreal newWidth = calculateNewSceneWidth(newSize, minWidth);
-    setSceneRect(0, 0, newWidth, sceneRect().height());
-
-    resizeColumnsAndPlayers(minWidthByColumn, newWidth);
-}
-
-// ---------- Player Layout Helpers ----------
-
-/**
- * @brief Collects all active (non-conceded) players.
- * @param firstPlayerIndex Output index of first local player.
- * @return List of active players.
- *
- * Used to determine rotation and layout order.
- */
-QList<Player *> GameScene::collectActivePlayers(int &firstPlayerIndex) const
-{
-    QList<Player *> activePlayers;
-    firstPlayerIndex = 0;
-    bool firstPlayerFound = false;
-
-    for (auto *pgItem : players) {
-        Player *p = pgItem->getPlayer();
-        if (p && !p->getConceded()) {
-            activePlayers.append(p);
-            if (!firstPlayerFound && p->getPlayerInfo()->getLocal()) {
-                firstPlayerIndex = activePlayers.size() - 1;
-                firstPlayerFound = true;
-            }
-        }
-    }
-    return activePlayers;
-}
-
-/**
- * @brief Rotates the list of players for layout.
- * @param players Original list of players.
- * @param firstPlayerIndex Index of first local player.
- * @return Rotated list.
- *
- * Applies rotation offset and ensures the list wraps correctly.
- */
-QList<Player *> GameScene::rotatePlayers(const QList<Player *> &activePlayers, int firstPlayerIndex) const
-{
-    QList<Player *> rotated = activePlayers;
-    if (!rotated.isEmpty()) {
-        int totalRotation = firstPlayerIndex + playerRotation;
-        while (totalRotation < 0)
-            totalRotation += rotated.size();
-        for (int i = 0; i < totalRotation; ++i)
-            rotated.append(rotated.takeFirst());
-    }
-    return rotated;
-}
-
-int GameScene::determineColumnCount(int playerCount)
-{
-    return playerCount < SettingsCache::instance().getMinPlayersForMultiColumnLayout() ? 1 : 2;
-}
-
-/**
- * @brief Computes layout positions and scene size based on players and columns.
- * @param playersPlaying List of active players.
- * @param columns Number of columns to split into.
- * @return Calculated scene size.
- *
- * Logic:
- * - Determine rows per column (rounding up).
- * - Calculate column widths based on widest player item.
- * - Accumulate scene width and height.
- * - Position players in columns with spacing.
- * - Mirror graphics for visual balance.
- */
-QSizeF GameScene::computeSceneSizeAndPlayerLayout(const QList<Player *> &playersPlaying, int columns)
-{
-    playersByColumn.clear();
-
-    int rows = qCeil((qreal)playersPlaying.size() / columns);
-    qreal sceneHeight = 0, sceneWidth = -playerAreaSpacing;
-    QList<int> columnWidth;
-
-    QListIterator<Player *> playersIter(playersPlaying);
-    for (int col = 0; col < columns; ++col) {
-        playersByColumn.append(QList<PlayerGraphicsItem *>());
-        columnWidth.append(0);
-        qreal thisColumnHeight = -playerAreaSpacing;
-        int rowsInColumn = rows - (playersPlaying.size() % columns) * col; // Adjust rows for uneven columns
-
-        for (int j = 0; j < rowsInColumn; ++j) {
-            Player *player = playersIter.next();
-            if (col == 0)
-                playersByColumn[col].prepend(player->getGraphicsItem());
-            else
-                playersByColumn[col].append(player->getGraphicsItem());
-
-            auto *pgItem = player->getGraphicsItem();
-            thisColumnHeight += pgItem->boundingRect().height() + playerAreaSpacing;
-            columnWidth[col] = std::max(columnWidth[col], (int)pgItem->boundingRect().width());
-        }
-
-        sceneHeight = std::max(sceneHeight, thisColumnHeight);
-        sceneWidth += columnWidth[col] + playerAreaSpacing;
-    }
-
-    qreal phasesWidth = phasesToolbar->getWidth();
-    sceneWidth += phasesWidth;
-
-    // Position players horizontally and vertically
-    qreal x = phasesWidth;
-    for (int col = 0; col < columns; ++col) {
-        qreal y = 0;
-        for (int row = 0; row < playersByColumn[col].size(); ++row) {
-            PlayerGraphicsItem *player = playersByColumn[col][row];
-            player->setPos(x, y);
-            player->setMirrored(row != rows - 1); // Mirror all except bottom-most
-            y += player->boundingRect().height() + playerAreaSpacing;
-        }
-        x += columnWidth[col] + playerAreaSpacing;
-    }
-
-    return QSizeF(sceneWidth, sceneHeight);
-}
-
-/**
- * @brief Computes the minimum width for each column based on player minimum widths.
- * @return List of minimum widths per column.
- */
-QList<qreal> GameScene::calculateMinWidthByColumn() const
-{
-    QList<qreal> minWidthByColumn;
-    for (const auto &col : playersByColumn) {
-        qreal maxWidth = 0;
-        for (PlayerGraphicsItem *player : col)
-            maxWidth = std::max(maxWidth, player->getMinimumWidth());
-        minWidthByColumn.append(maxWidth);
-    }
-    return minWidthByColumn;
-}
-
-/**
- * @brief Calculates new scene width considering window aspect ratio.
- * @param newSize View size.
- * @param minWidth Minimum width needed to fit all players.
- * @return Scene width respecting window and content.
- */
-qreal GameScene::calculateNewSceneWidth(const QSize &newSize, qreal minWidth) const
-{
-    qreal newRatio = (qreal)newSize.width() / newSize.height();
-    qreal minRatio = minWidth / sceneRect().height();
-
-    if (minRatio > newRatio) {
-        return minWidth; // Table dominates width
-    } else {
-        return newRatio * sceneRect().height(); // Window ratio dominates
-    }
-}
-
-/**
- * @brief Resizes columns and distributes extra width to players.
- * @param minWidthByColumn Minimum widths per column.
- * @param newWidth Total scene width.
- *
- * Extra width is distributed evenly across columns. Each player item is
- * notified to adjust internal layout for the new column width.
- */
-void GameScene::resizeColumnsAndPlayers(const QList<qreal> &minWidthByColumn, qreal newWidth)
-{
-    qreal minWidth = std::accumulate(minWidthByColumn.begin(), minWidthByColumn.end(), phasesToolbar->getWidth());
-
-    qreal extraWidthPerColumn = (newWidth - minWidth) / playersByColumn.size();
-    qreal newx = phasesToolbar->getWidth();
-
-    for (int col = 0; col < playersByColumn.size(); ++col) {
-        for (PlayerGraphicsItem *player : playersByColumn[col]) {
-            player->processSceneSizeChange(minWidthByColumn[col] + extraWidthPerColumn);
-            player->setPos(newx, player->y());
-        }
-        newx += minWidthByColumn[col] + extraWidthPerColumn;
-    }
-}
-
-// ---------- Hover Handling ----------
-
-void GameScene::updateHover(const QPointF &scenePos)
-{
-    auto itemList = items(scenePos, Qt::IntersectsItemBoundingRect, Qt::DescendingOrder, getViewTransform());
-
-    CardZone *zone = findTopmostZone(itemList);
-    CardItem *topCard = zone ? findTopmostCardInZone(itemList, zone) : nullptr;
-    updateHoveredCard(topCard);
-}
-
-void GameScene::updateHoveredCard(CardItem *newCard)
-{
-    if (hoveredCard && (newCard != hoveredCard))
-        hoveredCard->setHovered(false);
-    if (newCard && (newCard != hoveredCard))
-        newCard->setHovered(true);
-    hoveredCard = newCard;
-}
-
-CardZone *GameScene::findTopmostZone(const QList<QGraphicsItem *> &items)
-{
-    for (QGraphicsItem *item : items)
-        if (auto *zone = qgraphicsitem_cast<CardZone *>(item))
-            return zone;
-    return nullptr;
-}
-
-CardItem *GameScene::findTopmostCardInZone(const QList<QGraphicsItem *> &items, CardZone *zone)
-{
-    CardItem *maxZCard = nullptr;
-    qreal maxZ = -1;
-
-    for (QGraphicsItem *item : items) {
-        CardItem *card = qgraphicsitem_cast<CardItem *>(item);
-        if (!card)
-            continue;
-
-        if (card->getAttachedTo()) {
-            if (card->getAttachedTo()->getZone() != zone->getLogic())
-                continue;
-        } else if (card->getZone() != zone->getLogic())
-            continue;
-
-        if (card->getRealZValue() > maxZ) {
-            maxZ = card->getRealZValue();
-            maxZCard = card;
-        }
-    }
-    return maxZCard;
-}
-
-// ---------- Zone Views ----------
-
-/**
- * @brief Toggles a zone view for a player.
- * @param player Player owning the zone.
- * @param zoneName Name of the zone.
- * @param numberCards Number of cards visible in the view.
- * @param isReversed Whether the zone view is reversed.
- *
- * If an identical view exists, it is closed. Otherwise, a new ZoneViewWidget is created
- * and positioned based on zone type.
- */
-void GameScene::toggleZoneView(Player *player, const QString &zoneName, int numberCards, bool isReversed)
-{
-    for (auto &view : zoneViews) {
-        ZoneViewZone *temp = view->getZone();
-        if (temp->getLogic()->getName() == zoneName && temp->getLogic()->getPlayer() == player &&
-            qobject_cast<ZoneViewZoneLogic *>(temp->getLogic())->getNumberCards() == numberCards) {
-            view->close();
-        }
-    }
-
-    ZoneViewWidget *item =
-        new ZoneViewWidget(player, player->getZones().value(zoneName), numberCards, false, false, {}, isReversed);
-
-    zoneViews.append(item);
-    connect(item, &ZoneViewWidget::closePressed, this, &GameScene::removeZoneView);
-    addItem(item);
-
-    if (zoneName == "grave")
-        item->setPos(360, 100);
-    else if (zoneName == "rfg")
-        item->setPos(380, 120);
-    else
-        item->setPos(340, 80);
-}
-
-/**
- * @brief Adds a revealed zone view (for shown cards).
- * @param player Owning player.
- * @param zone Zone logic.
- * @param cardList List of cards to show.
- * @param withWritePermission Whether edits are allowed.
- */
-void GameScene::addRevealedZoneView(Player *player,
-                                    CardZoneLogic *zone,
-                                    const QList<const ServerInfo_Card *> &cardList,
-                                    bool withWritePermission)
-{
-    ZoneViewWidget *item = new ZoneViewWidget(player, zone, -2, true, withWritePermission, cardList);
-    zoneViews.append(item);
-    connect(item, &ZoneViewWidget::closePressed, this, &GameScene::removeZoneView);
-    addItem(item);
-    item->setPos(600, 80);
-}
-
-/**
- * @brief Removes a zone view widget from the scene.
- * @param item Zone view to remove.
- */
-void GameScene::removeZoneView(ZoneViewWidget *item)
-{
-    zoneViews.removeOne(item);
-    removeItem(item);
-}
-
-/**
- * @brief Closes all zone views.
- */
-void GameScene::clearViews()
-{
-    while (!zoneViews.isEmpty())
-        zoneViews.first()->close();
-}
-
-/**
- * @brief Closes the most recently added zone view.
- */
-void GameScene::closeMostRecentZoneView()
-{
-    if (!zoneViews.isEmpty())
-        zoneViews.last()->close();
-}
-
-// ---------- View Transforms ----------
-
-QTransform GameScene::getViewTransform() const
-{
-    return views().at(0)->transform();
-}
-
-QTransform GameScene::getViewportTransform() const
-{
-    return views().at(0)->viewportTransform();
-}
-
-// ---------- Event Handling ----------
-
-bool GameScene::event(QEvent *event)
-{
-    if (event->type() == QEvent::GraphicsSceneMouseMove)
-        updateHover(static_cast<QGraphicsSceneMouseEvent *>(event)->scenePos());
-
-    return QGraphicsScene::event(event);
-}
-
-void GameScene::timerEvent(QTimerEvent * /*event*/)
-{
-    QMutableSetIterator<CardItem *> i(cardsToAnimate);
-    while (i.hasNext()) {
-        i.next();
-        if (!i.value()->animationEvent())
-            i.remove();
-    }
-    if (cardsToAnimate.isEmpty())
-        animationTimer->stop();
-}
-
-void GameScene::registerAnimationItem(AbstractCardItem *card)
-{
-    cardsToAnimate.insert(static_cast<CardItem *>(card));
-    if (!animationTimer->isActive())
-        animationTimer->start(10, this);
-}
-
-void GameScene::unregisterAnimationItem(AbstractCardItem *card)
-{
-    cardsToAnimate.remove(static_cast<CardItem *>(card));
-    if (cardsToAnimate.isEmpty())
-        animationTimer->stop();
-}
-
-// ---------- Rubber Band ----------
-
-void GameScene::startRubberBand(const QPointF &selectionOrigin)
-{
-    emit sigStartRubberBand(selectionOrigin);
-}
-
-void GameScene::resizeRubberBand(const QPointF &cursorPoint)
-{
-    emit sigResizeRubberBand(cursorPoint);
-}
-
-void GameScene::stopRubberBand()
-{
-    emit sigStopRubberBand();
-}
diff --git a/cockatrice/src/game/game_state.cpp b/cockatrice/src/game/game_state.cpp
index 854878b92..e3bbbec00 100644
--- a/cockatrice/src/game/game_state.cpp
+++ b/cockatrice/src/game/game_state.cpp
@@ -2,6 +2,11 @@
 
 #include "abstract_game.h"
 
+#include <QChar>
+#include <QTimer>
+
+class AbstractClient;
+
 GameState::GameState(AbstractGame *parent,
                      int _secondsElapsed,
                      int _hostId,
@@ -29,13 +34,17 @@ void GameState::incrementGameTime()
 void GameState::setGameTime(int _secondsElapsed)
 {
     secondsElapsed = _secondsElapsed;
+    emit updateTimeElapsedLabel(formatElapsedTime(_secondsElapsed));
+}
+
+QString GameState::formatElapsedTime(int _secondsElapsed)
+{
     int seconds = _secondsElapsed;
     int minutes = seconds / 60;
     seconds -= minutes * 60;
     int hours = minutes / 60;
     minutes -= hours * 60;
 
-    emit updateTimeElapsedLabel(QString::number(hours).rightJustified(2, '0') + ":" +
-                                QString::number(minutes).rightJustified(2, '0') + ":" +
-                                QString::number(seconds).rightJustified(2, '0'));
-}
\ No newline at end of file
+    return QString::number(hours).rightJustified(2, '0') + ":" + QString::number(minutes).rightJustified(2, '0') + ":" +
+           QString::number(seconds).rightJustified(2, '0');
+}
diff --git a/cockatrice/src/game/game_state.h b/cockatrice/src/game/game_state.h
index 54f6d9276..55784fb91 100644
--- a/cockatrice/src/game/game_state.h
+++ b/cockatrice/src/game/game_state.h
@@ -1,18 +1,20 @@
 /**
  * @file game_state.h
  * @ingroup GameLogic
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_GAME_STATE_H
 #define COCKATRICE_GAME_STATE_H
 
-#include <QTimer>
-#include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
 
 class AbstractGame;
-class ServerInfo_PlayerProperties;
-class ServerInfo_User;
+class AbstractClient;
+class QTimer;
 
 class GameState : public QObject
 {
@@ -110,6 +112,11 @@ public:
         return hostId;
     }
 
+    int getSecondsElapsed() const
+    {
+        return secondsElapsed;
+    }
+
 signals:
     void updateTimeElapsedLabel(QString newTime);
     void gameStarted(bool resuming);
@@ -121,6 +128,9 @@ public slots:
     void incrementGameTime();
     void setGameTime(int _secondsElapsed);
 
+public:
+    static QString formatElapsedTime(int _secondsElapsed);
+
 private:
     QTimer *gameTimer;
     int secondsElapsed;
diff --git a/cockatrice/src/game/game_view.cpp b/cockatrice/src/game/game_view.cpp
deleted file mode 100644
index dd5cc70c1..000000000
--- a/cockatrice/src/game/game_view.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "game_view.h"
-
-#include "../client/settings/cache_settings.h"
-#include "game_scene.h"
-
-#include <QAction>
-#include <QResizeEvent>
-#include <QRubberBand>
-
-GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, parent), rubberBand(0)
-{
-    setBackgroundBrush(QBrush(QColor(0, 0, 0)));
-    setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing);
-    setFocusPolicy(Qt::ClickFocus);
-    setViewportUpdateMode(BoundingRectViewportUpdate);
-
-    connect(scene, &GameScene::sceneRectChanged, this, &GameView::updateSceneRect);
-
-    connect(scene, &GameScene::sigStartRubberBand, this, &GameView::startRubberBand);
-    connect(scene, &GameScene::sigResizeRubberBand, this, &GameView::resizeRubberBand);
-    connect(scene, &GameScene::sigStopRubberBand, this, &GameView::stopRubberBand);
-
-    aCloseMostRecentZoneView = new QAction(this);
-
-    connect(aCloseMostRecentZoneView, &QAction::triggered, scene, &GameScene::closeMostRecentZoneView);
-    addAction(aCloseMostRecentZoneView);
-    connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
-            &GameView::refreshShortcuts);
-    refreshShortcuts();
-    rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
-}
-
-void GameView::resizeEvent(QResizeEvent *event)
-{
-    QGraphicsView::resizeEvent(event);
-
-    GameScene *s = dynamic_cast<GameScene *>(scene());
-    if (s)
-        s->processViewSizeChange(event->size());
-
-    updateSceneRect(scene()->sceneRect());
-}
-
-void GameView::updateSceneRect(const QRectF &rect)
-{
-    fitInView(rect, Qt::KeepAspectRatio);
-}
-
-void GameView::startRubberBand(const QPointF &_selectionOrigin)
-{
-    selectionOrigin = _selectionOrigin;
-    rubberBand->setGeometry(QRect(mapFromScene(selectionOrigin), QSize(0, 0)));
-    rubberBand->show();
-}
-
-void GameView::resizeRubberBand(const QPointF &cursorPoint)
-{
-    if (rubberBand)
-        rubberBand->setGeometry(QRect(mapFromScene(selectionOrigin), cursorPoint.toPoint()).normalized());
-}
-
-void GameView::stopRubberBand()
-{
-    rubberBand->hide();
-}
-
-void GameView::refreshShortcuts()
-{
-    aCloseMostRecentZoneView->setShortcuts(
-        SettingsCache::instance().shortcuts().getShortcut("Player/aCloseMostRecentZoneView"));
-}
diff --git a/cockatrice/src/game/game_view.h b/cockatrice/src/game/game_view.h
deleted file mode 100644
index 72df9cd08..000000000
--- a/cockatrice/src/game/game_view.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file game_view.h
- * @ingroup GameGraphics
- * @brief TODO: Document this.
- */
-
-#ifndef GAMEVIEW_H
-#define GAMEVIEW_H
-
-#include <QGraphicsView>
-
-class GameScene;
-class QRubberBand;
-
-class GameView : public QGraphicsView
-{
-    Q_OBJECT
-private:
-    QAction *aCloseMostRecentZoneView;
-    QRubberBand *rubberBand;
-    QPointF selectionOrigin;
-
-protected:
-    void resizeEvent(QResizeEvent *event) override;
-private slots:
-    void startRubberBand(const QPointF &selectionOrigin);
-    void resizeRubberBand(const QPointF &cursorPoint);
-    void stopRubberBand();
-    void refreshShortcuts();
-public slots:
-    void updateSceneRect(const QRectF &rect);
-
-public:
-    explicit GameView(GameScene *scene, QWidget *parent = nullptr);
-};
-
-#endif
diff --git a/cockatrice/src/game/log/message_log_widget.h b/cockatrice/src/game/log/message_log_widget.h
deleted file mode 100644
index 369debd33..000000000
--- a/cockatrice/src/game/log/message_log_widget.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * @file message_log_widget.h
- * @ingroup GameWidgets
- * @brief TODO: Document this.
- */
-
-#ifndef MESSAGELOGWIDGET_H
-#define MESSAGELOGWIDGET_H
-
-#include "../../interface/widgets/server/chat_view/chat_view.h"
-#include "../zones/logic/card_zone_logic.h"
-
-class AbstractGame;
-class CardItem;
-class GameEventContext;
-class Player;
-class PlayerEventHandler;
-
-class MessageLogWidget : public ChatView
-{
-    Q_OBJECT
-private:
-    enum MessageContext
-    {
-        MessageContext_None,
-        MessageContext_MoveCard,
-        MessageContext_Mulligan
-    };
-
-    MessageContext currentContext;
-    QString messagePrefix, messageSuffix;
-
-    static QPair<QString, QString> getFromStr(CardZoneLogic *zone, QString cardName, int position, bool ownerChange);
-
-public:
-    void connectToPlayerEventHandler(PlayerEventHandler *player);
-    MessageLogWidget(TabSupervisor *_tabSupervisor, AbstractGame *_game, QWidget *parent = nullptr);
-
-public slots:
-    void containerProcessingDone();
-    void containerProcessingStarted(const GameEventContext &context);
-    void logAlwaysRevealTopCard(Player *player, CardZoneLogic *zone, bool reveal);
-    void logAlwaysLookAtTopCard(Player *player, CardZoneLogic *zone, bool reveal);
-    void logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName);
-    void logConcede(int playerId);
-    void logUnconcede(int playerId);
-    void logConnectionStateChanged(Player *player, bool connectionState);
-    void logCreateArrow(Player *player,
-                        Player *startPlayer,
-                        QString startCard,
-                        Player *targetPlayer,
-                        QString targetCard,
-                        bool playerTarget);
-    void logCreateToken(Player *player, QString cardName, QString pt, bool faceDown);
-    void logDeckSelect(Player *player, QString deckHash, int sideboardSize);
-    void logDestroyCard(Player *player, QString cardName);
-    void logDrawCards(Player *player, int number, bool deckIsEmpty);
-    void logDumpZone(Player *player, CardZoneLogic *zone, int numberCards, bool isReversed = false);
-    void logFlipCard(Player *player, QString cardName, bool faceDown);
-    void logGameClosed();
-    void logGameStart();
-    void logGameFlooded();
-    void logJoin(Player *player);
-    void logJoinSpectator(QString name);
-    void logKicked();
-    void logLeave(Player *player, QString reason);
-    void logLeaveSpectator(QString name, QString reason);
-    void logNotReadyStart(Player *player);
-    void logMoveCard(Player *player,
-                     CardItem *card,
-                     CardZoneLogic *startZone,
-                     int oldX,
-                     CardZoneLogic *targetZone,
-                     int newX);
-    void logMulligan(Player *player, int number);
-    void logReplayStarted(int gameId);
-    void logReadyStart(Player *player);
-    void logRevealCards(Player *player,
-                        CardZoneLogic *zone,
-                        int cardId,
-                        QString cardName,
-                        Player *otherPlayer,
-                        bool faceDown,
-                        int amount,
-                        bool isLentToAnotherPlayer);
-    void logReverseTurn(Player *player, bool reversed);
-    void logRollDie(Player *player, int sides, const QList<uint> &rolls);
-    void logSay(Player *player, QString message);
-    void logSetActivePhase(int phase);
-    void logSetActivePlayer(Player *player);
-    void logSetAnnotation(Player *player, CardItem *card, QString newAnnotation);
-    void logSetCardCounter(Player *player, QString cardName, int counterId, int value, int oldValue);
-    void logSetCounter(Player *player, QString counterName, int value, int oldValue);
-    void logSetDoesntUntap(Player *player, CardItem *card, bool doesntUntap);
-    void logSetPT(Player *player, CardItem *card, QString newPT);
-    void logSetSideboardLock(Player *player, bool locked);
-    void logSetTapped(Player *player, CardItem *card, bool tapped);
-    void logShuffle(Player *player, CardZoneLogic *zone, int start, int end);
-    void logSpectatorSay(const ServerInfo_User &spectator, QString message);
-    void logUnattachCard(Player *player, QString cardName);
-    void logUndoDraw(Player *player, QString cardName);
-    void setContextJudgeName(QString player);
-    void appendHtmlServerMessage(const QString &html,
-                                 bool optionalIsBold = false,
-                                 QString optionalFontColor = QString()) override;
-};
-
-#endif
diff --git a/cockatrice/src/game/phase.cpp b/cockatrice/src/game/phase.cpp
index 7fb1700a5..f56228279 100644
--- a/cockatrice/src/game/phase.cpp
+++ b/cockatrice/src/game/phase.cpp
@@ -1,5 +1,10 @@
 #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 2e712932f..b4eaa6e46 100644
--- a/cockatrice/src/game/phase.h
+++ b/cockatrice/src/game/phase.h
@@ -1,14 +1,15 @@
 /**
  * @file phase.h
  * @ingroup GameLogic
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef PHASE_H
 #define PHASE_H
 
-#include <QApplication>
+#include <QCoreApplication>
 #include <QString>
+#include <QVector>
 
 class Phase
 {
diff --git a/cockatrice/src/game/player/event_processing_options.h b/cockatrice/src/game/player/event_processing_options.h
index 3e743bdb3..06238d77e 100644
--- a/cockatrice/src/game/player/event_processing_options.h
+++ b/cockatrice/src/game/player/event_processing_options.h
@@ -1,8 +1,8 @@
 /**
  * @file event_processing_options.h
  * @ingroup GameLogicPlayers
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_EVENT_PROCESSING_OPTIONS_H
 #define COCKATRICE_EVENT_PROCESSING_OPTIONS_H
@@ -13,7 +13,8 @@
 enum EventProcessingOption
 {
     SKIP_REVEAL_WINDOW = 0x0001,
-    SKIP_TAP_ANIMATION = 0x0002
+    SKIP_TAP_ANIMATION = 0x0002,
+    SKIP_DAMAGE_ANIMATION = 0x0004
 };
 
 // Wrap it in a QFlags typedef
diff --git a/cockatrice/src/game/player/menu/custom_zone_menu.h b/cockatrice/src/game/player/menu/custom_zone_menu.h
deleted file mode 100644
index 0944029f4..000000000
--- a/cockatrice/src/game/player/menu/custom_zone_menu.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file custom_zone_menu.h
- * @ingroup GameMenusZones
- * @brief TODO: Document this.
- */
-
-#ifndef COCKATRICE_CUSTOM_ZONE_MENU_H
-#define COCKATRICE_CUSTOM_ZONE_MENU_H
-
-#include <QMenu>
-
-class Player;
-class CustomZoneMenu : public QMenu
-{
-    Q_OBJECT
-public:
-    explicit CustomZoneMenu(Player *player);
-    void retranslateUi();
-
-private:
-    Player *player;
-private slots:
-    void clearCustomZonesMenu();
-    void addViewCustomZoneActionToCustomZoneMenu(QString zoneName);
-};
-
-#endif // COCKATRICE_CUSTOM_ZONE_MENU_H
diff --git a/cockatrice/src/game/player/menu/player_menu.cpp b/cockatrice/src/game/player/menu/player_menu.cpp
deleted file mode 100644
index 3016a727f..000000000
--- a/cockatrice/src/game/player/menu/player_menu.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-#include "player_menu.h"
-
-#include "../../../interface/widgets/tabs/tab_game.h"
-#include "../../board/card_item.h"
-#include "../../zones/hand_zone.h"
-#include "../../zones/pile_zone.h"
-#include "../../zones/table_zone.h"
-#include "card_menu.h"
-#include "hand_menu.h"
-
-#include <libcockatrice/protocol/pb/command_reveal_cards.pb.h>
-
-PlayerMenu::PlayerMenu(Player *_player) : player(_player)
-{
-    playerMenu = new TearOffMenu();
-
-    if (player->getPlayerInfo()->getLocalOrJudge()) {
-        handMenu = new HandMenu(player, player->getPlayerActions(), playerMenu);
-        playerMenu->addMenu(handMenu);
-
-        libraryMenu = new LibraryMenu(player, playerMenu);
-        playerMenu->addMenu(libraryMenu);
-    } else {
-        handMenu = nullptr;
-        libraryMenu = nullptr;
-    }
-
-    graveMenu = new GraveyardMenu(player, playerMenu);
-    playerMenu->addMenu(graveMenu);
-
-    rfgMenu = new RfgMenu(player, playerMenu);
-    playerMenu->addMenu(rfgMenu);
-
-    if (player->getPlayerInfo()->getLocalOrJudge()) {
-        sideboardMenu = new SideboardMenu(player, playerMenu);
-        playerMenu->addMenu(sideboardMenu);
-
-        customZonesMenu = new CustomZoneMenu(player);
-        playerMenu->addMenu(customZonesMenu);
-        playerMenu->addSeparator();
-
-        countersMenu = playerMenu->addMenu(QString());
-
-        utilityMenu = new UtilityMenu(player, playerMenu);
-    } else {
-        sideboardMenu = nullptr;
-        customZonesMenu = nullptr;
-        countersMenu = nullptr;
-        utilityMenu = nullptr;
-    }
-
-    if (player->getPlayerInfo()->getLocal()) {
-        sayMenu = new SayMenu(player);
-        playerMenu->addMenu(sayMenu);
-    } else {
-        sayMenu = nullptr;
-    }
-
-    connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
-            &PlayerMenu::refreshShortcuts);
-    refreshShortcuts();
-
-    retranslateUi();
-}
-
-void PlayerMenu::setMenusForGraphicItems()
-{
-    player->getGraphicsItem()->getTableZoneGraphicsItem()->setMenu(playerMenu);
-    player->getGraphicsItem()->getGraveyardZoneGraphicsItem()->setMenu(graveMenu, graveMenu->aViewGraveyard);
-    player->getGraphicsItem()->getRfgZoneGraphicsItem()->setMenu(rfgMenu, rfgMenu->aViewRfg);
-    if (player->getPlayerInfo()->getLocalOrJudge()) {
-        player->getGraphicsItem()->getHandZoneGraphicsItem()->setMenu(handMenu);
-        player->getGraphicsItem()->getDeckZoneGraphicsItem()->setMenu(libraryMenu, libraryMenu->aDrawCard);
-        player->getGraphicsItem()->getSideboardZoneGraphicsItem()->setMenu(sideboardMenu);
-    }
-}
-
-QMenu *PlayerMenu::updateCardMenu(const CardItem *card)
-{
-    if (!card) {
-        emit cardMenuUpdated(nullptr);
-        return nullptr;
-    }
-
-    // If is spectator (as spectators don't need card menus), return
-    // only update the menu if the card is actually selected
-    if ((player->getGame()->getPlayerManager()->isSpectator() && !player->getGame()->getPlayerManager()->isJudge()) ||
-        player->getGame()->getActiveCard() != card) {
-        return nullptr;
-    }
-
-    QMenu *menu = new CardMenu(player, card, shortcutsActive);
-    emit cardMenuUpdated(menu);
-
-    return menu;
-}
-
-void PlayerMenu::retranslateUi()
-{
-    playerMenu->setTitle(tr("Player \"%1\"").arg(player->getPlayerInfo()->getName()));
-
-    if (handMenu) {
-        handMenu->retranslateUi();
-    }
-    if (libraryMenu) {
-        libraryMenu->retranslateUi();
-    }
-
-    graveMenu->retranslateUi();
-    rfgMenu->retranslateUi();
-
-    if (sideboardMenu) {
-        sideboardMenu->retranslateUi();
-    }
-
-    if (countersMenu) {
-        countersMenu->setTitle(tr("&Counters"));
-    }
-
-    if (customZonesMenu) {
-        customZonesMenu->retranslateUi();
-    }
-
-    QMapIterator<int, AbstractCounter *> counterIterator(player->getCounters());
-    while (counterIterator.hasNext()) {
-        counterIterator.next().value()->retranslateUi();
-    }
-
-    if (utilityMenu) {
-        utilityMenu->retranslateUi();
-    }
-
-    if (sayMenu) {
-        sayMenu->setTitle(tr("S&ay"));
-    }
-}
-
-void PlayerMenu::refreshShortcuts()
-{
-    if (shortcutsActive) {
-        // Judges get access to every player's menus but only want shortcuts to be set for their own.
-        if (player->getPlayerInfo()->getLocalOrJudge() && !player->getPlayerInfo()->getLocal()) {
-            setShortcutsInactive();
-        } else {
-            setShortcutsActive();
-        }
-    } else {
-        setShortcutsInactive();
-    }
-}
-
-void PlayerMenu::setShortcutsActive()
-{
-    shortcutsActive = true;
-
-    if (handMenu) {
-        handMenu->setShortcutsActive();
-    }
-    if (libraryMenu) {
-        libraryMenu->setShortcutsActive();
-    }
-    graveMenu->setShortcutsActive();
-    // No shortcuts for RfgMenu yet
-
-    if (sideboardMenu) {
-        sideboardMenu->setShortcutsActive();
-    }
-
-    QMapIterator<int, AbstractCounter *> counterIterator(player->getCounters());
-    while (counterIterator.hasNext()) {
-        counterIterator.next().value()->setShortcutsActive();
-    }
-
-    if (utilityMenu) {
-        utilityMenu->setShortcutsActive();
-    }
-}
-
-void PlayerMenu::setShortcutsInactive()
-{
-    shortcutsActive = false;
-
-    if (handMenu) {
-        handMenu->setShortcutsInactive();
-    }
-    if (libraryMenu) {
-        libraryMenu->setShortcutsInactive();
-    }
-    graveMenu->setShortcutsInactive();
-    // No shortcuts for RfgMenu yet
-
-    if (sideboardMenu) {
-        sideboardMenu->setShortcutsInactive();
-    }
-
-    QMapIterator<int, AbstractCounter *> counterIterator(player->getCounters());
-    while (counterIterator.hasNext()) {
-        counterIterator.next().value()->setShortcutsInactive();
-    }
-
-    if (utilityMenu) {
-        utilityMenu->setShortcutsInactive();
-    }
-}
\ No newline at end of file
diff --git a/cockatrice/src/game/player/menu/player_menu.h b/cockatrice/src/game/player/menu/player_menu.h
deleted file mode 100644
index 882bfedc5..000000000
--- a/cockatrice/src/game/player/menu/player_menu.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * @file player_menu.h
- * @ingroup GameMenusPlayers
- * @brief TODO: Document this.
- */
-
-#ifndef COCKATRICE_PLAYER_MENU_H
-#define COCKATRICE_PLAYER_MENU_H
-
-#include "../../../interface/widgets/menus/tearoff_menu.h"
-#include "../player.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 "utility_menu.h"
-
-#include <QMenu>
-#include <QObject>
-
-class CardItem;
-class PlayerMenu : public QObject
-{
-    Q_OBJECT
-
-signals:
-    void cardMenuUpdated(QMenu *cardMenu);
-
-public slots:
-    void setMenusForGraphicItems();
-
-private slots:
-    void refreshShortcuts();
-
-public:
-    PlayerMenu(Player *player);
-    void retranslateUi();
-
-    QMenu *updateCardMenu(const CardItem *card);
-
-    [[nodiscard]] QMenu *getPlayerMenu() const
-    {
-        return playerMenu;
-    }
-
-    [[nodiscard]] QMenu *getCountersMenu()
-    {
-        return countersMenu;
-    }
-
-    [[nodiscard]] LibraryMenu *getLibraryMenu() const
-    {
-        return libraryMenu;
-    }
-
-    [[nodiscard]] UtilityMenu *getUtilityMenu() const
-    {
-        return utilityMenu;
-    }
-
-    [[nodiscard]] bool getShortcutsActive() const
-    {
-        return shortcutsActive;
-    }
-
-    void setShortcutsActive();
-    void setShortcutsInactive();
-
-private:
-    Player *player;
-    TearOffMenu *playerMenu;
-    QMenu *countersMenu;
-    HandMenu *handMenu;
-    LibraryMenu *libraryMenu;
-    SideboardMenu *sideboardMenu;
-    GraveyardMenu *graveMenu;
-    RfgMenu *rfgMenu;
-    UtilityMenu *utilityMenu;
-    SayMenu *sayMenu;
-    CustomZoneMenu *customZonesMenu;
-
-    bool shortcutsActive;
-
-    void initSayMenu();
-};
-
-#endif // COCKATRICE_PLAYER_MENU_H
diff --git a/cockatrice/src/game/player/menu/pt_menu.cpp b/cockatrice/src/game/player/menu/pt_menu.cpp
deleted file mode 100644
index dae03e07f..000000000
--- a/cockatrice/src/game/player/menu/pt_menu.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-#include "pt_menu.h"
-
-#include "../player.h"
-#include "../player_actions.h"
-
-PtMenu::PtMenu(Player *player) : QMenu(tr("Power / toughness"))
-{
-    PlayerActions *playerActions = player->getPlayerActions();
-
-    aIncP = new QAction(this);
-    connect(aIncP, &QAction::triggered, playerActions, &PlayerActions::actIncP);
-    aDecP = new QAction(this);
-    connect(aDecP, &QAction::triggered, playerActions, &PlayerActions::actDecP);
-    aIncT = new QAction(this);
-    connect(aIncT, &QAction::triggered, playerActions, &PlayerActions::actIncT);
-    aDecT = new QAction(this);
-    connect(aDecT, &QAction::triggered, playerActions, &PlayerActions::actDecT);
-    aIncPT = new QAction(this);
-    connect(aIncPT, &QAction::triggered, playerActions, [playerActions] { playerActions->actIncPT(); });
-    aDecPT = new QAction(this);
-    connect(aDecPT, &QAction::triggered, playerActions, &PlayerActions::actDecPT);
-    aFlowP = new QAction(this);
-    connect(aFlowP, &QAction::triggered, playerActions, &PlayerActions::actFlowP);
-    aFlowT = new QAction(this);
-    connect(aFlowT, &QAction::triggered, playerActions, &PlayerActions::actFlowT);
-    aSetPT = new QAction(this);
-    connect(aSetPT, &QAction::triggered, playerActions, &PlayerActions::actSetPT);
-    aResetPT = new QAction(this);
-    connect(aResetPT, &QAction::triggered, playerActions, &PlayerActions::actResetPT);
-
-    addAction(aIncP);
-    addAction(aDecP);
-    addAction(aFlowP);
-    addSeparator();
-    addAction(aIncT);
-    addAction(aDecT);
-    addAction(aFlowT);
-    addSeparator();
-    addAction(aIncPT);
-    addAction(aDecPT);
-    addSeparator();
-    addAction(aSetPT);
-    addAction(aResetPT);
-
-    setShortcutsActive();
-
-    retranslateUi();
-}
-
-void PtMenu::retranslateUi()
-{
-    aIncP->setText(tr("&Increase power"));
-    aDecP->setText(tr("&Decrease power"));
-    aIncT->setText(tr("I&ncrease toughness"));
-    aDecT->setText(tr("D&ecrease toughness"));
-    aIncPT->setText(tr("In&crease power and toughness"));
-    aDecPT->setText(tr("Dec&rease power and toughness"));
-    aFlowP->setText(tr("Increase power and decrease toughness"));
-    aFlowT->setText(tr("Decrease power and increase toughness"));
-    aSetPT->setText(tr("Set &power and toughness..."));
-    aResetPT->setText(tr("Reset p&ower and toughness"));
-}
-
-void PtMenu::setShortcutsActive()
-{
-    ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
-
-    aIncP->setShortcuts(shortcuts.getShortcut("Player/aIncP"));
-    aDecP->setShortcuts(shortcuts.getShortcut("Player/aDecP"));
-    aIncT->setShortcuts(shortcuts.getShortcut("Player/aIncT"));
-    aDecT->setShortcuts(shortcuts.getShortcut("Player/aDecT"));
-    aIncPT->setShortcuts(shortcuts.getShortcut("Player/aIncPT"));
-    aDecPT->setShortcuts(shortcuts.getShortcut("Player/aDecPT"));
-    aFlowP->setShortcuts(shortcuts.getShortcut("Player/aFlowP"));
-    aFlowT->setShortcuts(shortcuts.getShortcut("Player/aFlowT"));
-    aSetPT->setShortcuts(shortcuts.getShortcut("Player/aSetPT"));
-    aResetPT->setShortcuts(shortcuts.getShortcut("Player/aResetPT"));
-}
\ No newline at end of file
diff --git a/cockatrice/src/game/player/menu/say_menu.cpp b/cockatrice/src/game/player/menu/say_menu.cpp
deleted file mode 100644
index 3c4802aa5..000000000
--- a/cockatrice/src/game/player/menu/say_menu.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "say_menu.h"
-
-#include "../../../client/settings/cache_settings.h"
-#include "../player.h"
-#include "../player_actions.h"
-
-SayMenu::SayMenu(Player *_player) : player(_player)
-{
-    connect(&SettingsCache::instance().messages(), &MessageSettings::messageMacrosChanged, this, &SayMenu::initSayMenu);
-    initSayMenu();
-}
-
-void SayMenu::initSayMenu()
-{
-    clear();
-
-    int count = SettingsCache::instance().messages().getCount();
-    setEnabled(count > 0);
-
-    for (int i = 0; i < count; ++i) {
-        auto *newAction = new QAction(SettingsCache::instance().messages().getMessageAt(i), this);
-        if (i < 10) {
-            newAction->setShortcut(QKeySequence("Ctrl+" + QString::number((i + 1) % 10)));
-        }
-        connect(newAction, &QAction::triggered, player->getPlayerActions(), &PlayerActions::actSayMessage);
-        addAction(newAction);
-    }
-}
\ No newline at end of file
diff --git a/cockatrice/src/game/player/menu/say_menu.h b/cockatrice/src/game/player/menu/say_menu.h
deleted file mode 100644
index 5dbde2277..000000000
--- a/cockatrice/src/game/player/menu/say_menu.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file say_menu.h
- * @ingroup GameMenusPlayers
- * @brief TODO: Document this.
- */
-
-#ifndef COCKATRICE_SAY_MENU_H
-#define COCKATRICE_SAY_MENU_H
-
-#include <QMenu>
-
-class Player;
-class SayMenu : public QMenu
-{
-    Q_OBJECT
-public:
-    explicit SayMenu(Player *player);
-    void initSayMenu();
-
-private:
-    Player *player;
-};
-
-#endif // COCKATRICE_SAY_MENU_H
diff --git a/cockatrice/src/game/player/menu/sideboard_menu.cpp b/cockatrice/src/game/player/menu/sideboard_menu.cpp
deleted file mode 100644
index beaabfcc6..000000000
--- a/cockatrice/src/game/player/menu/sideboard_menu.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "sideboard_menu.h"
-
-#include "../player.h"
-#include "../player_actions.h"
-
-SideboardMenu::SideboardMenu(Player *player, QMenu *playerMenu) : QMenu(playerMenu)
-{
-    aViewSideboard = new QAction(this);
-    connect(aViewSideboard, &QAction::triggered, player->getPlayerActions(), &PlayerActions::actViewSideboard);
-
-    if (player->getPlayerInfo()->getLocalOrJudge()) {
-        addAction(aViewSideboard);
-    }
-
-    retranslateUi();
-}
-
-void SideboardMenu::retranslateUi()
-{
-    setTitle(tr("&Sideboard"));
-    aViewSideboard->setText(tr("&View sideboard"));
-}
-
-void SideboardMenu::setShortcutsActive()
-{
-    ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
-
-    aViewSideboard->setShortcuts(shortcuts.getShortcut("Player/aViewSideboard"));
-}
-
-void SideboardMenu::setShortcutsInactive()
-{
-    aViewSideboard->setShortcut(QKeySequence());
-}
\ No newline at end of file
diff --git a/cockatrice/src/game/player/menu/sideboard_menu.h b/cockatrice/src/game/player/menu/sideboard_menu.h
deleted file mode 100644
index 22d5a2d69..000000000
--- a/cockatrice/src/game/player/menu/sideboard_menu.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @file sideboard_menu.h
- * @ingroup GameMenusZones
- * @brief TODO: Document this.
- */
-
-#ifndef COCKATRICE_SIDEBOARD_MENU_H
-#define COCKATRICE_SIDEBOARD_MENU_H
-
-#include <QMenu>
-
-class Player;
-class SideboardMenu : public QMenu
-{
-    Q_OBJECT
-
-public:
-    explicit SideboardMenu(Player *player, QMenu *playerMenu);
-    void retranslateUi();
-    void setShortcutsActive();
-    void setShortcutsInactive();
-
-private:
-    Player *player;
-
-    QAction *aViewSideboard;
-};
-
-#endif // COCKATRICE_SIDEBOARD_MENU_H
diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp
deleted file mode 100644
index efce40cd7..000000000
--- a/cockatrice/src/game/player/player.cpp
+++ /dev/null
@@ -1,482 +0,0 @@
-#include "player.h"
-
-#include "../../interface/theme_manager.h"
-#include "../../interface/widgets/tabs/tab_game.h"
-#include "../board/arrow_item.h"
-#include "../board/card_item.h"
-#include "../board/card_list.h"
-#include "../board/counter_general.h"
-#include "../game_scene.h"
-#include "../zones/hand_zone.h"
-#include "../zones/pile_zone.h"
-#include "../zones/stack_zone.h"
-#include "../zones/table_zone.h"
-#include "player_actions.h"
-#include "player_target.h"
-
-#include <QDebug>
-#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/color.h>
-
-Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent)
-    : QObject(_parent), game(_parent), playerInfo(new PlayerInfo(info, _id, _local, _judge)),
-      playerEventHandler(new PlayerEventHandler(this)), playerActions(new PlayerActions(this)), active(false),
-      conceded(false), deck(nullptr), zoneId(0), dialogSemaphore(false)
-{
-    initializeZones();
-
-    playerMenu = new PlayerMenu(this);
-    graphicsItem = new PlayerGraphicsItem(this);
-    playerMenu->setMenusForGraphicItems();
-
-    connect(this, &Player::activeChanged, graphicsItem, &PlayerGraphicsItem::onPlayerActiveChanged);
-
-    connect(this, &Player::openDeckEditor, game->getTab(), &TabGame::openDeckEditor);
-
-    forwardActionSignalsToEventHandler();
-}
-
-// Event Handler is the controller i.e. everything hooks up to this to know about player state
-// Player should forward (private) signals to the event handler
-
-void Player::forwardActionSignalsToEventHandler()
-{
-    connect(playerActions, &PlayerActions::logSetTapped, playerEventHandler, &PlayerEventHandler::logSetTapped);
-    connect(playerActions, &PlayerActions::logSetDoesntUntap, playerEventHandler,
-            &PlayerEventHandler::logSetDoesntUntap);
-    connect(playerActions, &PlayerActions::logSetAnnotation, playerEventHandler, &PlayerEventHandler::logSetAnnotation);
-    connect(playerActions, &PlayerActions::logSetPT, playerEventHandler, &PlayerEventHandler::logSetPT);
-}
-
-void Player::initializeZones()
-{
-    addZone(new PileZoneLogic(this, "deck", false, true, false, this));
-    addZone(new PileZoneLogic(this, "grave", false, false, true, this));
-    addZone(new PileZoneLogic(this, "rfg", false, false, true, this));
-    addZone(new PileZoneLogic(this, "sb", false, false, false, this));
-    addZone(new TableZoneLogic(this, "table", true, false, true, this));
-    addZone(new StackZoneLogic(this, "stack", true, false, true, this));
-    bool visibleHand = playerInfo->getLocalOrJudge() ||
-                       (game->getPlayerManager()->isSpectator() && game->getGameMetaInfo()->spectatorsOmniscient());
-    addZone(new HandZoneLogic(this, "hand", false, false, visibleHand, this));
-}
-
-Player::~Player()
-{
-    qCInfo(PlayerLog) << "Player destructor:" << getPlayerInfo()->getName();
-
-    QMapIterator<QString, CardZoneLogic *> i(zones);
-    while (i.hasNext())
-        delete i.next().value();
-    zones.clear();
-
-    delete playerMenu;
-    delete getPlayerInfo()->userInfo;
-}
-
-void Player::clear()
-{
-    clearArrows();
-
-    QMapIterator<QString, CardZoneLogic *> i(zones);
-    while (i.hasNext()) {
-        i.next().value()->clearContents();
-    }
-
-    clearCounters();
-}
-
-void Player::setConceded(bool _conceded)
-{
-    if (conceded != _conceded) {
-        conceded = _conceded;
-
-        getGraphicsItem()->setVisible(!conceded);
-        if (conceded) {
-            clear();
-        }
-        emit concededChanged(getPlayerInfo()->getId(), conceded);
-    }
-}
-
-void Player::setZoneId(int _zoneId)
-{
-    zoneId = _zoneId;
-    graphicsItem->getPlayerArea()->setPlayerZoneId(zoneId);
-}
-
-void Player::processPlayerInfo(const ServerInfo_Player &info)
-{
-    static QSet<QString> builtinZones{/* PileZones */
-                                      "deck", "grave", "rfg", "sb",
-                                      /* TableZone */
-                                      "table",
-                                      /* StackZone */
-                                      "stack",
-                                      /* HandZone */
-                                      "hand"};
-    clearCounters();
-    clearArrows();
-
-    QMutableMapIterator<QString, CardZoneLogic *> zoneIt(zones);
-    while (zoneIt.hasNext()) {
-        zoneIt.next().value()->clearContents();
-
-        if (!builtinZones.contains(zoneIt.key())) {
-            zoneIt.remove();
-        }
-    }
-
-    emit clearCustomZonesMenu();
-
-    const int zoneListSize = info.zone_list_size();
-    for (int i = 0; i < zoneListSize; ++i) {
-        const ServerInfo_Zone &zoneInfo = info.zone_list(i);
-
-        QString zoneName = QString::fromStdString(zoneInfo.name());
-        CardZoneLogic *zone = zones.value(zoneName, 0);
-        if (!zone) {
-            // Create a new CardZone if it doesn't exist
-
-            if (zoneInfo.with_coords()) {
-                // Visibility not currently supported for TableZone
-                zone = addZone(new TableZoneLogic(this, zoneName, true, false, true, this));
-            } else {
-                // Zones without coordinats are always treated as non-shufflable
-                // PileZones, although supporting alternate hand or stack zones
-                // might make sense in some scenarios.
-                bool contentsKnown;
-
-                switch (zoneInfo.type()) {
-                    case ServerInfo_Zone::PrivateZone:
-                        contentsKnown =
-                            playerInfo->getLocalOrJudge() || (game->getPlayerManager()->isSpectator() &&
-                                                              game->getGameMetaInfo()->spectatorsOmniscient());
-                        break;
-
-                    case ServerInfo_Zone::PublicZone:
-                        contentsKnown = true;
-                        break;
-
-                    case ServerInfo_Zone::HiddenZone:
-                        contentsKnown = false;
-                        break;
-                }
-
-                zone = addZone(new PileZoneLogic(this, zoneName, false, /* isShufflable */ false, contentsKnown, this));
-            }
-
-            // Non-builtin zones are hidden by default and can't be interacted
-            // with, except through menus.
-            emit zone->setGraphicsVisibility(false);
-
-            emit addViewCustomZoneActionToCustomZoneMenu(zoneName);
-
-            continue;
-        }
-
-        const int cardListSize = zoneInfo.card_list_size();
-        if (!cardListSize) {
-            for (int j = 0; j < zoneInfo.card_count(); ++j) {
-                zone->addCard(new CardItem(this), false, -1);
-            }
-        } else {
-            for (int j = 0; j < cardListSize; ++j) {
-                const ServerInfo_Card &cardInfo = zoneInfo.card_list(j);
-                auto *card = new CardItem(this);
-                card->processCardInfo(cardInfo);
-                zone->addCard(card, false, cardInfo.x(), cardInfo.y());
-            }
-        }
-        if (zoneInfo.has_always_reveal_top_card()) {
-            zone->setAlwaysRevealTopCard(zoneInfo.always_reveal_top_card());
-        }
-
-        zone->reorganizeCards();
-    }
-
-    const int counterListSize = info.counter_list_size();
-    for (int i = 0; i < counterListSize; ++i) {
-        addCounter(info.counter_list(i));
-    }
-
-    setConceded(info.properties().conceded());
-}
-
-void Player::processCardAttachment(const ServerInfo_Player &info)
-{
-    const int zoneListSize = info.zone_list_size();
-    for (int i = 0; i < zoneListSize; ++i) {
-        const ServerInfo_Zone &zoneInfo = info.zone_list(i);
-        CardZoneLogic *zone = zones.value(QString::fromStdString(zoneInfo.name()), 0);
-        if (!zone) {
-            continue;
-        }
-
-        const int cardListSize = zoneInfo.card_list_size();
-        for (int j = 0; j < cardListSize; ++j) {
-            const ServerInfo_Card &cardInfo = zoneInfo.card_list(j);
-            if (cardInfo.has_attach_player_id()) {
-                CardItem *startCard = zone->getCard(cardInfo.id());
-                CardItem *targetCard =
-                    game->getCard(cardInfo.attach_player_id(), QString::fromStdString(cardInfo.attach_zone()),
-                                  cardInfo.attach_card_id());
-                if (!targetCard) {
-                    continue;
-                }
-
-                startCard->setAttachedTo(targetCard);
-            }
-        }
-    }
-
-    const int arrowListSize = info.arrow_list_size();
-    for (int i = 0; i < arrowListSize; ++i) {
-        addArrow(info.arrow_list(i));
-    }
-}
-
-void Player::addCard(CardItem *card)
-{
-    emit newCardAdded(card);
-}
-
-void Player::deleteCard(CardItem *card)
-{
-    if (card == nullptr) {
-        return;
-    } else if (dialogSemaphore) {
-        cardsToDelete.append(card);
-    } else {
-        card->deleteLater();
-    }
-}
-
-// TODO: Does a player need a DeckLoader?
-void Player::setDeck(DeckLoader &_deck)
-{
-    deck = new DeckLoader(this, _deck.getDeckList());
-
-    emit deckChanged();
-}
-
-AbstractCounter *Player::addCounter(const ServerInfo_Counter &counter)
-{
-    return addCounter(counter.id(), QString::fromStdString(counter.name()),
-                      convertColorToQColor(counter.counter_color()), counter.radius(), counter.count());
-}
-
-AbstractCounter *Player::addCounter(int counterId, const QString &name, QColor color, int radius, int value)
-{
-    if (counters.contains(counterId)) {
-        return nullptr;
-    }
-
-    AbstractCounter *ctr;
-    if (name == "life") {
-        ctr = getGraphicsItem()->getPlayerTarget()->addCounter(counterId, name, value);
-    } else {
-        ctr = new GeneralCounter(this, counterId, name, color, radius, value, true, graphicsItem);
-    }
-    counters.insert(counterId, ctr);
-
-    if (playerMenu->getCountersMenu() && ctr->getMenu()) {
-        playerMenu->getCountersMenu()->addMenu(ctr->getMenu());
-    }
-    if (playerMenu->getShortcutsActive()) {
-        ctr->setShortcutsActive();
-    }
-    emit rearrangeCounters();
-    return ctr;
-}
-
-void Player::delCounter(int counterId)
-{
-    AbstractCounter *ctr = counters.value(counterId, 0);
-    if (!ctr) {
-        return;
-    }
-
-    ctr->delCounter();
-    counters.remove(counterId);
-    emit rearrangeCounters();
-}
-
-void Player::clearCounters()
-{
-    QMapIterator<int, AbstractCounter *> counterIterator(counters);
-    while (counterIterator.hasNext()) {
-        counterIterator.next().value()->delCounter();
-    }
-    counters.clear();
-}
-
-void Player::incrementAllCardCounters()
-{
-    QList<CardItem *> cardsToUpdate;
-
-    auto selectedItems = getGameScene()->selectedItems();
-    if (!selectedItems.isEmpty()) {
-        // If cards are selected, only update those
-        for (const auto &item : selectedItems) {
-            auto *card = static_cast<CardItem *>(item);
-            cardsToUpdate.append(card);
-        }
-    } else {
-        // If no cards selected, update all cards on table
-        const CardList &tableCards = getTableZone()->getCards();
-        cardsToUpdate = tableCards;
-    }
-
-    QList<const ::google::protobuf::Message *> commandList;
-
-    for (const auto *card : cardsToUpdate) {
-        const auto &cardCounters = card->getCounters();
-
-        QMapIterator<int, int> counterIterator(cardCounters);
-        while (counterIterator.hasNext()) {
-            counterIterator.next();
-            int counterId = counterIterator.key();
-            int currentValue = counterIterator.value();
-            if (currentValue >= MAX_COUNTERS_ON_CARD) {
-                continue;
-            }
-
-            auto cmd = std::make_unique<Command_SetCardCounter>();
-            cmd->set_zone(card->getZone()->getName().toStdString());
-            cmd->set_card_id(card->getId());
-            cmd->set_counter_id(counterId);
-            cmd->set_counter_value(currentValue + 1);
-            commandList.append(cmd.release());
-        }
-    }
-
-    if (!commandList.isEmpty()) {
-        playerActions->sendGameCommand(playerActions->prepareGameCommand(commandList));
-    }
-}
-
-ArrowItem *Player::addArrow(const ServerInfo_Arrow &arrow)
-{
-    const QMap<int, Player *> &playerList = game->getPlayerManager()->getPlayers();
-    Player *startPlayer = playerList.value(arrow.start_player_id(), 0);
-    Player *targetPlayer = playerList.value(arrow.target_player_id(), 0);
-    if (!startPlayer || !targetPlayer) {
-        return nullptr;
-    }
-
-    CardZoneLogic *startZone = startPlayer->getZones().value(QString::fromStdString(arrow.start_zone()), 0);
-    CardZoneLogic *targetZone = nullptr;
-    if (arrow.has_target_zone()) {
-        targetZone = targetPlayer->getZones().value(QString::fromStdString(arrow.target_zone()), 0);
-    }
-    if (!startZone || (!targetZone && arrow.has_target_zone())) {
-        return nullptr;
-    }
-
-    CardItem *startCard = startZone->getCard(arrow.start_card_id());
-    CardItem *targetCard = nullptr;
-    if (targetZone) {
-        targetCard = targetZone->getCard(arrow.target_card_id());
-    }
-    if (!startCard || (!targetCard && arrow.has_target_card_id())) {
-        return nullptr;
-    }
-
-    if (targetCard) {
-        return addArrow(arrow.id(), startCard, targetCard, convertColorToQColor(arrow.arrow_color()));
-    } else {
-        return addArrow(arrow.id(), startCard, targetPlayer->getGraphicsItem()->getPlayerTarget(),
-                        convertColorToQColor(arrow.arrow_color()));
-    }
-}
-
-ArrowItem *Player::addArrow(int arrowId, CardItem *startCard, ArrowTarget *targetItem, const QColor &color)
-{
-    auto *arrow = new ArrowItem(this, arrowId, startCard, targetItem, color);
-    arrows.insert(arrowId, arrow);
-
-    getGameScene()->addItem(arrow);
-    return arrow;
-}
-
-void Player::delArrow(int arrowId)
-{
-    ArrowItem *arr = arrows.value(arrowId, 0);
-    if (!arr) {
-        return;
-    }
-    arr->delArrow();
-}
-
-void Player::removeArrow(ArrowItem *arrow)
-{
-    if (arrow->getId() != -1) {
-        arrows.remove(arrow->getId());
-    }
-}
-
-void Player::clearArrows()
-{
-    QMapIterator<int, ArrowItem *> arrowIterator(arrows);
-    while (arrowIterator.hasNext()) {
-        arrowIterator.next().value()->delArrow();
-    }
-    arrows.clear();
-}
-
-bool Player::clearCardsToDelete()
-{
-    if (cardsToDelete.isEmpty()) {
-        return false;
-    }
-
-    for (auto &i : cardsToDelete) {
-        if (i != nullptr) {
-            i->deleteLater();
-        }
-    }
-    cardsToDelete.clear();
-
-    return true;
-}
-
-void Player::setActive(bool _active)
-{
-    active = _active;
-    emit activeChanged(active);
-}
-
-void Player::updateZones()
-{
-    getTableZone()->reorganizeCards();
-}
-
-PlayerGraphicsItem *Player::getGraphicsItem()
-{
-    return graphicsItem;
-}
-
-GameScene *Player::getGameScene()
-{
-    return getGraphicsItem()->getGameScene();
-}
-
-void Player::setGameStarted()
-{
-    if (playerInfo->local) {
-        emit resetTopCardMenuActions();
-    }
-    setConceded(false);
-}
diff --git a/cockatrice/src/game/player/player.h b/cockatrice/src/game/player/player.h
deleted file mode 100644
index 0a4fc9e69..000000000
--- a/cockatrice/src/game/player/player.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/**
- * @file player.h
- * @ingroup GameLogicPlayers
- * @brief TODO: Document this.
- */
-
-#ifndef PLAYER_H
-#define PLAYER_H
-
-#include "../../game_graphics/board/abstract_graphics_item.h"
-#include "../../interface/widgets/menus/tearoff_menu.h"
-#include "../zones/logic/hand_zone_logic.h"
-#include "../zones/logic/pile_zone_logic.h"
-#include "../zones/logic/stack_zone_logic.h"
-#include "../zones/logic/table_zone_logic.h"
-#include "menu/player_menu.h"
-#include "player_area.h"
-#include "player_event_handler.h"
-#include "player_graphics_item.h"
-#include "player_info.h"
-
-#include <QInputDialog>
-#include <QLoggingCategory>
-#include <QMap>
-#include <QTimer>
-#include <libcockatrice/filters/filter_string.h>
-#include <libcockatrice/protocol/pb/card_attributes.pb.h>
-#include <libcockatrice/protocol/pb/game_event.pb.h>
-
-inline Q_LOGGING_CATEGORY(PlayerLog, "player");
-
-namespace google
-{
-namespace protobuf
-{
-class Message;
-}
-} // namespace google
-class AbstractCardItem;
-class AbstractCounter;
-class AbstractGame;
-class ArrowItem;
-class ArrowTarget;
-class CardDatabase;
-class CardZone;
-class CommandContainer;
-class DeckLoader;
-class GameCommand;
-class GameEvent;
-class PlayerInfo;
-class PlayerEventHandler;
-class PlayerActions;
-class PlayerMenu;
-class QAction;
-class QMenu;
-class ServerInfo_Arrow;
-class ServerInfo_Counter;
-class ServerInfo_Player;
-class ServerInfo_User;
-class TabGame;
-
-const int MAX_TOKENS_PER_DIALOG = 99;
-
-class Player : public QObject
-{
-    Q_OBJECT
-
-signals:
-    void openDeckEditor(DeckLoader *deck);
-    void deckChanged();
-    void newCardAdded(AbstractCardItem *card);
-    void rearrangeCounters();
-    void activeChanged(bool active);
-    void concededChanged(int playerId, bool conceded);
-    void clearCustomZonesMenu();
-    void addViewCustomZoneActionToCustomZoneMenu(QString zoneName);
-    void resetTopCardMenuActions();
-
-public slots:
-    void setActive(bool _active);
-
-public:
-    Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent);
-    void forwardActionSignalsToEventHandler();
-    ~Player() override;
-
-    void initializeZones();
-    void updateZones();
-    void clear();
-
-    void processPlayerInfo(const ServerInfo_Player &info);
-    void processCardAttachment(const ServerInfo_Player &info);
-
-    void addCard(CardItem *c);
-    void deleteCard(CardItem *c);
-
-    bool clearCardsToDelete();
-
-    bool getActive() const
-    {
-        return active;
-    }
-
-    AbstractGame *getGame() const
-    {
-        return game;
-    }
-
-    GameScene *getGameScene();
-
-    [[nodiscard]] PlayerGraphicsItem *getGraphicsItem();
-
-    [[nodiscard]] PlayerActions *getPlayerActions() const
-    {
-        return playerActions;
-    }
-
-    [[nodiscard]] PlayerEventHandler *getPlayerEventHandler() const
-    {
-        return playerEventHandler;
-    }
-
-    [[nodiscard]] PlayerInfo *getPlayerInfo() const
-    {
-        return playerInfo;
-    }
-
-    [[nodiscard]] PlayerMenu *getPlayerMenu() const
-    {
-        return playerMenu;
-    }
-
-    void setDeck(DeckLoader &_deck);
-
-    [[nodiscard]] DeckLoader *getDeck() const
-    {
-        return deck;
-    }
-
-    template <typename T> T *addZone(T *zone)
-    {
-        zones.insert(zone->getName(), zone);
-        return zone;
-    }
-
-    CardZoneLogic *getZone(const QString zoneName)
-    {
-        return zones.value(zoneName);
-    }
-
-    const QMap<QString, CardZoneLogic *> &getZones() const
-    {
-        return zones;
-    }
-
-    PileZoneLogic *getDeckZone()
-    {
-        return qobject_cast<PileZoneLogic *>(zones.value("deck"));
-    }
-
-    PileZoneLogic *getGraveZone()
-    {
-        return qobject_cast<PileZoneLogic *>(zones.value("grave"));
-    }
-
-    PileZoneLogic *getRfgZone()
-    {
-        return qobject_cast<PileZoneLogic *>(zones.value("rfg"));
-    }
-
-    PileZoneLogic *getSideboardZone()
-    {
-        return qobject_cast<PileZoneLogic *>(zones.value("sb"));
-    }
-
-    TableZoneLogic *getTableZone()
-    {
-        return qobject_cast<TableZoneLogic *>(zones.value("table"));
-    }
-
-    StackZoneLogic *getStackZone()
-    {
-        return qobject_cast<StackZoneLogic *>(zones.value("stack"));
-    }
-
-    HandZoneLogic *getHandZone()
-    {
-        return qobject_cast<HandZoneLogic *>(zones.value("hand"));
-    }
-
-    AbstractCounter *addCounter(const ServerInfo_Counter &counter);
-    AbstractCounter *addCounter(int counterId, const QString &name, QColor color, int radius, int value);
-    void delCounter(int counterId);
-    void clearCounters();
-    void incrementAllCardCounters();
-
-    QMap<int, AbstractCounter *> getCounters()
-    {
-        return counters;
-    }
-
-    ArrowItem *addArrow(const ServerInfo_Arrow &arrow);
-    ArrowItem *addArrow(int arrowId, CardItem *startCard, ArrowTarget *targetItem, const QColor &color);
-    void delArrow(int arrowId);
-    void removeArrow(ArrowItem *arrow);
-    void clearArrows();
-
-    const QMap<int, ArrowItem *> &getArrows() const
-    {
-        return arrows;
-    }
-
-    void setConceded(bool _conceded);
-    bool getConceded() const
-    {
-        return conceded;
-    }
-
-    void setGameStarted();
-
-    void setDialogSemaphore(const bool _active)
-    {
-        dialogSemaphore = _active;
-    }
-
-    int getZoneId() const
-    {
-        return zoneId;
-    }
-
-    void setZoneId(int _zoneId);
-
-private:
-    AbstractGame *game;
-    PlayerInfo *playerInfo;
-    PlayerEventHandler *playerEventHandler;
-    PlayerActions *playerActions;
-    PlayerMenu *playerMenu;
-    PlayerGraphicsItem *graphicsItem;
-
-    bool active;
-    bool conceded;
-
-    DeckLoader *deck;
-
-    int zoneId;
-    QMap<QString, CardZoneLogic *> zones;
-    QMap<int, AbstractCounter *> counters;
-    QMap<int, ArrowItem *> arrows;
-
-    bool dialogSemaphore;
-    QList<CardItem *> cardsToDelete;
-
-    // void eventConnectionStateChanged(const Event_ConnectionStateChanged &event);
-};
-
-class AnnotationDialog : public QInputDialog
-{
-    Q_OBJECT
-    void keyPressEvent(QKeyEvent *e) override;
-
-public:
-    explicit AnnotationDialog(QWidget *parent = nullptr) : QInputDialog(parent)
-    {
-    }
-};
-
-#endif
diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index 058fdb510..35682ede8 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -1,15 +1,54 @@
 #include "player_actions.h"
 
-#include "../../interface/widgets/tabs/tab_game.h"
-#include "../../interface/widgets/utility/get_text_with_max.h"
-#include "../board/card_item.h"
-#include "../dialogs/dlg_move_top_cards_until.h"
-#include "../dialogs/dlg_roll_dice.h"
-#include "../zones/hand_zone.h"
-#include "../zones/logic/view_zone_logic.h"
-#include "../zones/table_zone.h"
-#include "card_menu_action_type.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/player/card_menu_action_type.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 "../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>
@@ -18,6 +57,7 @@
 #include <libcockatrice/protocol/pb/command_draw_cards.pb.h>
 #include <libcockatrice/protocol/pb/command_flip_card.pb.h>
 #include <libcockatrice/protocol/pb/command_game_say.pb.h>
+#include <libcockatrice/protocol/pb/command_inc_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_move_card.pb.h>
 #include <libcockatrice/protocol/pb/command_mulligan.pb.h>
 #include <libcockatrice/protocol/pb/command_reveal_cards.pb.h>
@@ -26,14 +66,25 @@
 #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/utility/trice_limits.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;
 
-PlayerActions::PlayerActions(Player *_player) : player(_player), lastTokenTableRow(0), movingCardsUntil(false)
+PlayerActions::PlayerActions(PlayerLogic *_player)
+    : QObject(_player), player(_player), lastTokenTableRow(0), movingCardsUntil(false)
 {
+    connect(this, &PlayerActions::requestZoneViewToggle, player, &PlayerLogic::onRequestZoneViewToggle);
+
     moveTopCardTimer = new QTimer(this);
     moveTopCardTimer->setInterval(MOVE_TOP_CARD_UNTIL_INTERVAL);
     moveTopCardTimer->setSingleShot(true);
@@ -61,27 +112,28 @@ void PlayerActions::playCard(CardItem *card, bool faceDown)
     const CardInfo &info = exactCard.getInfo();
 
     int tableRow = info.getUiAttributes().tableRow;
-    bool playToStack = SettingsCache::instance().getPlayToStack();
+    bool playToStack = SettingsCache::instance().userInterface().getPlayToStack();
     QString currentZone = card->getZone()->getName();
-    if (currentZone == "stack" && tableRow == 3) {
-        cmd.set_target_zone("grave");
+    if (!faceDown && currentZone == ZoneNames::STACK && tableRow == 3) {
+        cmd.set_target_zone(ZoneNames::GRAVE);
         cmd.set_x(0);
         cmd.set_y(0);
-    } else if (!faceDown &&
-               ((!playToStack && tableRow == 3) || ((playToStack && tableRow != 0) && currentZone != "stack"))) {
-        cmd.set_target_zone("stack");
+    } else if (!faceDown && ((!playToStack && tableRow == 3) ||
+                             ((playToStack && tableRow != 0) && currentZone != ZoneNames::STACK))) {
+        cmd.set_target_zone(ZoneNames::STACK);
         cmd.set_x(-1);
         cmd.set_y(0);
     } else {
         tableRow = faceDown ? 2 : info.getUiAttributes().tableRow;
-        QPoint gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - tableRow));
+        QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(tableRow));
         cardToMove->set_face_down(faceDown);
         if (!faceDown) {
             cardToMove->set_pt(info.getPowTough().toStdString());
         }
         cardToMove->set_tapped(!faceDown && info.getUiAttributes().cipt);
-        if (tableRow != 3)
-            cmd.set_target_zone("table");
+        if (tableRow != 3) {
+            cmd.set_target_zone(ZoneNames::TABLE);
+        }
         cmd.set_x(gridPoint.x());
         cmd.set_y(gridPoint.y());
     }
@@ -113,18 +165,13 @@ void PlayerActions::playCardToTable(const CardItem *card, bool faceDown)
     const CardInfo &info = exactCard.getInfo();
 
     int tableRow = faceDown ? 2 : info.getUiAttributes().tableRow;
-    // default instant/sorcery cards to the noncreatures row
-    if (tableRow > 2) {
-        tableRow = 1;
-    }
-
-    QPoint gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - tableRow));
+    QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(tableRow));
     cardToMove->set_face_down(faceDown);
     if (!faceDown) {
         cardToMove->set_pt(info.getPowTough().toStdString());
     }
     cardToMove->set_tapped(!faceDown && info.getUiAttributes().cipt);
-    cmd.set_target_zone("table");
+    cmd.set_target_zone(ZoneNames::TABLE);
     cmd.set_x(gridPoint.x());
     cmd.set_y(gridPoint.y());
     sendGameCommand(cmd);
@@ -132,12 +179,12 @@ void PlayerActions::playCardToTable(const CardItem *card, bool faceDown)
 
 void PlayerActions::actViewLibrary()
 {
-    player->getGameScene()->toggleZoneView(player, "deck", -1);
+    emit requestZoneViewToggle(ZoneNames::DECK, -1);
 }
 
 void PlayerActions::actViewHand()
 {
-    player->getGameScene()->toggleZoneView(player, "hand", -1);
+    emit requestZoneViewToggle(ZoneNames::HAND, -1);
 }
 
 /**
@@ -169,71 +216,67 @@ void PlayerActions::actSortHand()
 
     static QList defaultOptions = {CardList::SortByName, CardList::SortByPrinting};
 
-    player->getGraphicsItem()->getHandZoneGraphicsItem()->sortHand(sortOptions + defaultOptions);
+    emit requestSortHand(sortOptions + defaultOptions);
 }
 
-void PlayerActions::actViewTopCards()
+void PlayerActions::actRequestViewTopCardsDialog()
 {
-    int deckSize = player->getDeckZone()->getCards().size();
-    bool ok;
-    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("View top cards of library"),
-                                      tr("Number of cards: (max. %1)").arg(deckSize), defaultNumberTopCards, 1,
-                                      deckSize, 1, &ok);
-    if (ok) {
-        defaultNumberTopCards = number;
-        player->getGameScene()->toggleZoneView(player, "deck", number);
-    }
+    emit requestViewTopCardsDialog(defaultNumberTopCards, player->getDeckZone()->getCards().size());
 }
 
-void PlayerActions::actViewBottomCards()
+void PlayerActions::actViewTopCards(int number)
 {
-    int deckSize = player->getDeckZone()->getCards().size();
-    bool ok;
-    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("View bottom cards of library"),
-                                      tr("Number of cards: (max. %1)").arg(deckSize), defaultNumberBottomCards, 1,
-                                      deckSize, 1, &ok);
-    if (ok) {
-        defaultNumberBottomCards = number;
-        player->getGameScene()->toggleZoneView(player, "deck", number, true);
-    }
+    defaultNumberTopCards = number;
+    emit requestZoneViewToggle(ZoneNames::DECK, number);
 }
 
-void PlayerActions::actAlwaysRevealTopCard()
+void PlayerActions::actRequestViewBottomCardsDialog()
+{
+    emit requestViewBottomCardsDialog(defaultNumberBottomCards, player->getDeckZone()->getCards().size());
+}
+
+void PlayerActions::actViewBottomCards(int number)
+{
+    defaultNumberBottomCards = number;
+    emit requestZoneViewToggle(ZoneNames::DECK, number, true);
+}
+
+void PlayerActions::actAlwaysRevealTopCard(bool alwaysRevealTopCard)
 {
     Command_ChangeZoneProperties cmd;
-    cmd.set_zone_name("deck");
-    cmd.set_always_reveal_top_card(player->getPlayerMenu()->getLibraryMenu()->isAlwaysRevealTopCardChecked());
+    cmd.set_zone_name(ZoneNames::DECK);
+    cmd.set_always_reveal_top_card(alwaysRevealTopCard);
 
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actAlwaysLookAtTopCard()
+void PlayerActions::actAlwaysLookAtTopCard(bool alwaysRevealTopCard)
 {
     Command_ChangeZoneProperties cmd;
-    cmd.set_zone_name("deck");
-    cmd.set_always_look_at_top_card(player->getPlayerMenu()->getLibraryMenu()->isAlwaysLookAtTopCardChecked());
+    cmd.set_zone_name(ZoneNames::DECK);
+    cmd.set_always_look_at_top_card(alwaysRevealTopCard);
 
     sendGameCommand(cmd);
 }
 
 void PlayerActions::actOpenDeckInDeckEditor()
 {
-    emit player->openDeckEditor(player->getDeck());
+    emit player->openDeckEditor({.deckList = player->getDeck()});
 }
 
 void PlayerActions::actViewGraveyard()
 {
-    player->getGameScene()->toggleZoneView(player, "grave", -1);
+    emit requestZoneViewToggle(ZoneNames::GRAVE, -1);
 }
 
 void PlayerActions::actViewRfg()
 {
-    player->getGameScene()->toggleZoneView(player, "rfg", -1);
+    emit requestZoneViewToggle(ZoneNames::EXILE, -1);
 }
 
 void PlayerActions::actViewSideboard()
 {
-    player->getGameScene()->toggleZoneView(player, "sb", -1);
+    emit requestZoneViewToggle(ZoneNames::SIDEBOARD, -1);
 }
 
 void PlayerActions::actShuffle()
@@ -241,18 +284,20 @@ void PlayerActions::actShuffle()
     sendGameCommand(Command_Shuffle());
 }
 
-void PlayerActions::actShuffleTop()
+void PlayerActions::actRequestShuffleTopDialog()
 {
     const int maxCards = player->getDeckZone()->getCards().size();
     if (maxCards == 0) {
         return;
     }
 
-    bool ok;
-    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Shuffle top cards of library"),
-                                      tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberTopCards, 1,
-                                      maxCards, 1, &ok);
-    if (!ok) {
+    emit requestShuffleTopDialog(defaultNumberTopCards, maxCards);
+}
+
+void PlayerActions::actShuffleTop(int number)
+{
+    const int maxCards = player->getDeckZone()->getCards().size();
+    if (maxCards == 0) {
         return;
     }
 
@@ -263,25 +308,27 @@ void PlayerActions::actShuffleTop()
     defaultNumberTopCards = number;
 
     Command_Shuffle cmd;
-    cmd.set_zone_name("deck");
+    cmd.set_zone_name(ZoneNames::DECK);
     cmd.set_start(0);
     cmd.set_end(number - 1); // inclusive, the indexed card at end will be shuffled
 
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actShuffleBottom()
+void PlayerActions::actRequestShuffleBottomDialog()
 {
     const int maxCards = player->getDeckZone()->getCards().size();
     if (maxCards == 0) {
         return;
     }
 
-    bool ok;
-    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Shuffle bottom cards of library"),
-                                      tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberBottomCards, 1,
-                                      maxCards, 1, &ok);
-    if (!ok) {
+    emit requestShuffleBottomDialog(defaultNumberBottomCards, maxCards);
+}
+
+void PlayerActions::actShuffleBottom(int number)
+{
+    const int maxCards = player->getDeckZone()->getCards().size();
+    if (maxCards == 0) {
         return;
     }
 
@@ -292,7 +339,7 @@ void PlayerActions::actShuffleBottom()
     defaultNumberBottomCards = number;
 
     Command_Shuffle cmd;
-    cmd.set_zone_name("deck");
+    cmd.set_zone_name(ZoneNames::DECK);
     cmd.set_start(-number);
     cmd.set_end(-1);
 
@@ -306,47 +353,64 @@ void PlayerActions::actDrawCard()
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actMulligan()
+void PlayerActions::actRequestMulliganDialog()
 {
-    int startSize = SettingsCache::instance().getStartingHandSize();
+    int startSize = SettingsCache::instance().userInterface().getStartingHandSize();
     int handSize = player->getHandZone()->getCards().size();
-    int deckSize = player->getDeckZone()->getCards().size() + handSize; // hand is shuffled back into the deck
-    bool ok;
-    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Draw hand"),
-                                      tr("Number of cards: (max. %1)").arg(deckSize) + '\n' +
-                                          tr("0 and lower are in comparison to current hand size"),
-                                      startSize, -handSize, deckSize, 1, &ok);
-    if (!ok) {
-        return;
-    }
-    Command_Mulligan cmd;
-    if (number < 1) {
-        if (handSize == 0) {
-            return;
-        }
-        cmd.set_number(handSize + number);
-    } else {
-        cmd.set_number(number);
-    }
-    sendGameCommand(cmd);
-    if (startSize != number) {
-        SettingsCache::instance().setStartingHandSize(number);
-    }
+    int deckSize = player->getDeckZone()->getCards().size() + handSize;
+
+    emit requestMulliganDialog(startSize, handSize, deckSize);
 }
 
-void PlayerActions::actDrawCards()
+void PlayerActions::actMulligan(int number)
+{
+    int handSize = player->getHandZone()->getCards().size();
+
+    if (number < 1) {
+        number = handSize + number;
+    }
+
+    doMulligan(number);
+    SettingsCache::instance().userInterface().setStartingHandSize(number);
+}
+
+void PlayerActions::actMulliganSameSize()
+{
+    int handSize = player->getHandZone()->getCards().size();
+    doMulligan(handSize);
+}
+
+void PlayerActions::actMulliganMinusOne()
+{
+    int handSize = player->getHandZone()->getCards().size();
+    int targetSize = qMax(1, handSize - 1);
+    doMulligan(targetSize);
+}
+
+void PlayerActions::doMulligan(int number)
+{
+    if (number < 1) {
+        return;
+    }
+
+    Command_Mulligan cmd;
+    cmd.set_number(number);
+    sendGameCommand(cmd);
+}
+
+void PlayerActions::actRequestDrawCardsDialog()
 {
     int deckSize = player->getDeckZone()->getCards().size();
-    bool ok;
-    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Draw cards"),
-                                      tr("Number of cards: (max. %1)").arg(deckSize), defaultNumberTopCards, 1,
-                                      deckSize, 1, &ok);
-    if (ok) {
-        defaultNumberTopCards = number;
-        Command_DrawCards cmd;
-        cmd.set_number(static_cast<google::protobuf::uint32>(number));
-        sendGameCommand(cmd);
-    }
+
+    emit requestDrawCardsDialog(defaultNumberTopCards, deckSize);
+}
+
+void PlayerActions::actDrawCards(int number)
+{
+    defaultNumberTopCards = number;
+    Command_DrawCards cmd;
+    cmd.set_number(static_cast<google::protobuf::uint32>(number));
+    sendGameCommand(cmd);
 }
 
 void PlayerActions::actUndoDraw()
@@ -356,7 +420,7 @@ void PlayerActions::actUndoDraw()
 
 void PlayerActions::cmdSetTopCard(Command_MoveCard &cmd)
 {
-    cmd.set_start_zone("deck");
+    cmd.set_start_zone(ZoneNames::DECK);
     auto *cardToMove = cmd.mutable_cards_to_move()->add_card();
     cardToMove->set_card_id(0);
     cmd.set_target_player_id(player->getPlayerInfo()->getId());
@@ -366,7 +430,7 @@ void PlayerActions::cmdSetBottomCard(Command_MoveCard &cmd)
 {
     CardZoneLogic *zone = player->getDeckZone();
     int lastCard = zone->getCards().size() - 1;
-    cmd.set_start_zone("deck");
+    cmd.set_start_zone(ZoneNames::DECK);
     auto *cardToMove = cmd.mutable_cards_to_move()->add_card();
     cardToMove->set_card_id(lastCard);
     cmd.set_target_player_id(player->getPlayerInfo()->getId());
@@ -380,7 +444,7 @@ void PlayerActions::actMoveTopCardToGrave()
 
     Command_MoveCard cmd;
     cmdSetTopCard(cmd);
-    cmd.set_target_zone("grave");
+    cmd.set_target_zone(ZoneNames::GRAVE);
     cmd.set_x(0);
     cmd.set_y(0);
 
@@ -395,7 +459,7 @@ void PlayerActions::actMoveTopCardToExile()
 
     Command_MoveCard cmd;
     cmdSetTopCard(cmd);
-    cmd.set_target_zone("rfg");
+    cmd.set_target_zone(ZoneNames::EXILE);
     cmd.set_x(0);
     cmd.set_y(0);
 
@@ -404,88 +468,82 @@ void PlayerActions::actMoveTopCardToExile()
 
 void PlayerActions::actMoveTopCardsToGrave()
 {
-    const int maxCards = player->getDeckZone()->getCards().size();
-    if (maxCards == 0) {
-        return;
-    }
+    actRequestMoveTopCardsToDialog(ZoneNames::GRAVE, tr("grave"), false);
+}
 
-    bool ok;
-    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Move top cards to grave"),
-                                      tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberTopCards, 1,
-                                      maxCards, 1, &ok);
-    if (!ok) {
-        return;
-    } else if (number > maxCards) {
-        number = maxCards;
-    }
-    defaultNumberTopCards = number;
-
-    Command_MoveCard cmd;
-    cmd.set_start_zone("deck");
-    cmd.set_target_player_id(player->getPlayerInfo()->getId());
-    cmd.set_target_zone("grave");
-    cmd.set_x(0);
-    cmd.set_y(0);
-
-    for (int i = number - 1; i >= 0; --i) {
-        cmd.mutable_cards_to_move()->add_card()->set_card_id(i);
-    }
-
-    sendGameCommand(cmd);
+void PlayerActions::actMoveTopCardsToGraveFaceDown()
+{
+    actRequestMoveTopCardsToDialog(ZoneNames::GRAVE, tr("grave"), true);
 }
 
 void PlayerActions::actMoveTopCardsToExile()
+{
+    actRequestMoveTopCardsToDialog(ZoneNames::EXILE, tr("exile"), false);
+}
+
+void PlayerActions::actMoveTopCardsToExileFaceDown()
+{
+    actRequestMoveTopCardsToDialog(ZoneNames::EXILE, tr("exile"), true);
+}
+
+void PlayerActions::actRequestMoveTopCardsToDialog(const QString &targetZone,
+                                                   const QString &zoneDisplayName,
+                                                   bool faceDown)
 {
     const int maxCards = player->getDeckZone()->getCards().size();
     if (maxCards == 0) {
         return;
     }
 
-    bool ok;
-    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Move top cards to exile"),
-                                      tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberTopCards, 1,
-                                      maxCards, 1, &ok);
-    if (!ok) {
+    emit requestMoveTopCardsToDialog(defaultNumberTopCards, maxCards, targetZone, zoneDisplayName, faceDown);
+}
+
+void PlayerActions::moveTopCardsTo(int number, const QString &targetZone, bool faceDown)
+{
+    const int maxCards = player->getDeckZone()->getCards().size();
+    if (maxCards == 0) {
         return;
-    } else if (number > maxCards) {
+    }
+
+    if (number > maxCards) {
         number = maxCards;
     }
     defaultNumberTopCards = number;
 
     Command_MoveCard cmd;
-    cmd.set_start_zone("deck");
+    cmd.set_start_zone(ZoneNames::DECK);
     cmd.set_target_player_id(player->getPlayerInfo()->getId());
-    cmd.set_target_zone("rfg");
+    cmd.set_target_zone(targetZone.toStdString());
     cmd.set_x(0);
     cmd.set_y(0);
 
     for (int i = number - 1; i >= 0; --i) {
-        cmd.mutable_cards_to_move()->add_card()->set_card_id(i);
+        auto card = cmd.mutable_cards_to_move()->add_card();
+        card->set_card_id(i);
+        if (faceDown) {
+            card->set_face_down(true);
+        }
     }
 
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actMoveTopCardsUntil()
+void PlayerActions::actRequestMoveTopCardsUntilDialog()
 {
     stopMoveTopCardsUntil();
 
-    DlgMoveTopCardsUntil dlg(player->getGame()->getTab(), movingCardsUntilExprs, movingCardsUntilNumberOfHits,
-                             movingCardsUntilAutoPlay);
-    if (!dlg.exec()) {
-        return;
-    }
+    emit requestMoveTopCardsUntilDialog(movingCardsUntilOptions);
+}
 
-    auto expr = dlg.getExpr();
-    movingCardsUntilExprs = dlg.getExprs();
-    movingCardsUntilNumberOfHits = dlg.getNumberOfHits();
-    movingCardsUntilAutoPlay = dlg.isAutoPlay();
+void PlayerActions::moveTopCardsUntil(const QString &expr, MoveTopCardsUntilOptions options)
+{
+    movingCardsUntilOptions = options;
 
     if (player->getDeckZone()->getCards().empty()) {
         stopMoveTopCardsUntil();
     } else {
         movingCardsUntilFilter = FilterString(expr);
-        movingCardsUntilCounter = movingCardsUntilNumberOfHits;
+        movingCardsUntilCounter = movingCardsUntilOptions.numberOfHits;
         movingCardsUntil = true;
         actMoveTopCardToPlay();
     }
@@ -497,7 +555,7 @@ void PlayerActions::moveOneCardUntil(CardItem *card)
 
     const bool isMatch = card && movingCardsUntilFilter.check(card->getCard().getCardPtr());
 
-    if (isMatch && movingCardsUntilAutoPlay) {
+    if (isMatch && movingCardsUntilOptions.autoPlay) {
         // Directly calling playCard will deadlock, since we are already in the middle of processing an event.
         // Use QTimer::singleShot to queue up the playCard on the event loop.
         QTimer::singleShot(0, this, [card, this] { playCard(card, false); });
@@ -535,7 +593,7 @@ void PlayerActions::actMoveTopCardToBottom()
 
     Command_MoveCard cmd;
     cmdSetTopCard(cmd);
-    cmd.set_target_zone("deck");
+    cmd.set_target_zone(ZoneNames::DECK);
     cmd.set_x(-1); // bottom of deck
     cmd.set_y(0);
 
@@ -550,7 +608,7 @@ void PlayerActions::actMoveTopCardToPlay()
 
     Command_MoveCard cmd;
     cmdSetTopCard(cmd);
-    cmd.set_target_zone("stack");
+    cmd.set_target_zone(ZoneNames::STACK);
     cmd.set_x(-1);
     cmd.set_y(0);
 
@@ -564,12 +622,12 @@ void PlayerActions::actMoveTopCardToPlayFaceDown()
     }
 
     Command_MoveCard cmd;
-    cmd.set_start_zone("deck");
+    cmd.set_start_zone(ZoneNames::DECK);
     CardToMove *cardToMove = cmd.mutable_cards_to_move()->add_card();
     cardToMove->set_card_id(0);
     cardToMove->set_face_down(true);
     cmd.set_target_player_id(player->getPlayerInfo()->getId());
-    cmd.set_target_zone("table");
+    cmd.set_target_zone(ZoneNames::TABLE);
     cmd.set_x(-1);
     cmd.set_y(0);
 
@@ -584,7 +642,7 @@ void PlayerActions::actMoveBottomCardToGrave()
 
     Command_MoveCard cmd;
     cmdSetBottomCard(cmd);
-    cmd.set_target_zone("grave");
+    cmd.set_target_zone(ZoneNames::GRAVE);
     cmd.set_x(0);
     cmd.set_y(0);
 
@@ -599,7 +657,7 @@ void PlayerActions::actMoveBottomCardToExile()
 
     Command_MoveCard cmd;
     cmdSetBottomCard(cmd);
-    cmd.set_target_zone("rfg");
+    cmd.set_target_zone(ZoneNames::EXILE);
     cmd.set_x(0);
     cmd.set_y(0);
 
@@ -608,63 +666,61 @@ void PlayerActions::actMoveBottomCardToExile()
 
 void PlayerActions::actMoveBottomCardsToGrave()
 {
-    const int maxCards = player->getDeckZone()->getCards().size();
-    if (maxCards == 0) {
-        return;
-    }
+    actRequestMoveBottomCardsToDialog(ZoneNames::GRAVE, tr("grave"), false);
+}
 
-    bool ok;
-    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Move bottom cards to grave"),
-                                      tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberBottomCards, 1,
-                                      maxCards, 1, &ok);
-    if (!ok) {
-        return;
-    } else if (number > maxCards) {
-        number = maxCards;
-    }
-    defaultNumberBottomCards = number;
-
-    Command_MoveCard cmd;
-    cmd.set_start_zone("deck");
-    cmd.set_target_player_id(player->getPlayerInfo()->getId());
-    cmd.set_target_zone("grave");
-    cmd.set_x(0);
-    cmd.set_y(0);
-
-    for (int i = maxCards - number; i < maxCards; ++i) {
-        cmd.mutable_cards_to_move()->add_card()->set_card_id(i);
-    }
-
-    sendGameCommand(cmd);
+void PlayerActions::actMoveBottomCardsToGraveFaceDown()
+{
+    actRequestMoveBottomCardsToDialog(ZoneNames::GRAVE, tr("grave"), true);
 }
 
 void PlayerActions::actMoveBottomCardsToExile()
+{
+    actRequestMoveBottomCardsToDialog(ZoneNames::EXILE, tr("exile"), false);
+}
+
+void PlayerActions::actMoveBottomCardsToExileFaceDown()
+{
+    actRequestMoveBottomCardsToDialog(ZoneNames::EXILE, tr("exile"), true);
+}
+
+void PlayerActions::actRequestMoveBottomCardsToDialog(const QString &targetZone,
+                                                      const QString &zoneDisplayName,
+                                                      bool faceDown)
 {
     const int maxCards = player->getDeckZone()->getCards().size();
     if (maxCards == 0) {
         return;
     }
 
-    bool ok;
-    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Move bottom cards to exile"),
-                                      tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberBottomCards, 1,
-                                      maxCards, 1, &ok);
-    if (!ok) {
+    emit requestMoveBottomCardsToDialog(defaultNumberBottomCards, maxCards, targetZone, zoneDisplayName, faceDown);
+}
+
+void PlayerActions::moveBottomCardsTo(int number, const QString &targetZone, bool faceDown)
+{
+    const int maxCards = player->getDeckZone()->getCards().size();
+    if (maxCards == 0) {
         return;
-    } else if (number > maxCards) {
+    }
+
+    if (number > maxCards) {
         number = maxCards;
     }
     defaultNumberBottomCards = number;
 
     Command_MoveCard cmd;
-    cmd.set_start_zone("deck");
+    cmd.set_start_zone(ZoneNames::DECK);
     cmd.set_target_player_id(player->getPlayerInfo()->getId());
-    cmd.set_target_zone("rfg");
+    cmd.set_target_zone(targetZone.toStdString());
     cmd.set_x(0);
     cmd.set_y(0);
 
     for (int i = maxCards - number; i < maxCards; ++i) {
-        cmd.mutable_cards_to_move()->add_card()->set_card_id(i);
+        auto card = cmd.mutable_cards_to_move()->add_card();
+        card->set_card_id(i);
+        if (faceDown) {
+            card->set_face_down(true);
+        }
     }
 
     sendGameCommand(cmd);
@@ -678,7 +734,7 @@ void PlayerActions::actMoveBottomCardToTop()
 
     Command_MoveCard cmd;
     cmdSetBottomCard(cmd);
-    cmd.set_target_zone("deck");
+    cmd.set_target_zone(ZoneNames::DECK);
     cmd.set_x(0); // top of deck
     cmd.set_y(0);
 
@@ -748,35 +804,39 @@ void PlayerActions::actDrawBottomCard()
 
     Command_MoveCard cmd;
     cmdSetBottomCard(cmd);
-    cmd.set_target_zone("hand");
+    cmd.set_target_zone(ZoneNames::HAND);
     cmd.set_x(0);
     cmd.set_y(0);
 
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actDrawBottomCards()
+void PlayerActions::actRequestDrawBottomCardsDialog()
 {
     const int maxCards = player->getDeckZone()->getCards().size();
     if (maxCards == 0) {
         return;
     }
 
-    bool ok;
-    int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Draw bottom cards"),
-                                      tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberBottomCards, 1,
-                                      maxCards, 1, &ok);
-    if (!ok) {
+    emit requestDrawBottomCardsDialog(defaultNumberBottomCards, maxCards);
+}
+
+void PlayerActions::actDrawBottomCards(int number)
+{
+    const int maxCards = player->getDeckZone()->getCards().size();
+    if (maxCards == 0) {
         return;
-    } else if (number > maxCards) {
+    }
+
+    if (number > maxCards) {
         number = maxCards;
     }
     defaultNumberBottomCards = number;
 
     Command_MoveCard cmd;
-    cmd.set_start_zone("deck");
+    cmd.set_start_zone(ZoneNames::DECK);
     cmd.set_target_player_id(player->getPlayerInfo()->getId());
-    cmd.set_target_zone("hand");
+    cmd.set_target_zone(ZoneNames::HAND);
     cmd.set_x(0);
     cmd.set_y(0);
 
@@ -795,7 +855,7 @@ void PlayerActions::actMoveBottomCardToPlay()
 
     Command_MoveCard cmd;
     cmdSetBottomCard(cmd);
-    cmd.set_target_zone("stack");
+    cmd.set_target_zone(ZoneNames::STACK);
     cmd.set_x(-1);
     cmd.set_y(0);
 
@@ -812,13 +872,13 @@ void PlayerActions::actMoveBottomCardToPlayFaceDown()
     int lastCard = zone->getCards().size() - 1;
 
     Command_MoveCard cmd;
-    cmd.set_start_zone("deck");
+    cmd.set_start_zone(ZoneNames::DECK);
     auto *cardToMove = cmd.mutable_cards_to_move()->add_card();
     cardToMove->set_card_id(lastCard);
     cardToMove->set_face_down(true);
 
     cmd.set_target_player_id(player->getPlayerInfo()->getId());
-    cmd.set_target_zone("table");
+    cmd.set_target_zone(ZoneNames::TABLE);
     cmd.set_x(-1);
     cmd.set_y(0);
 
@@ -828,46 +888,54 @@ void PlayerActions::actMoveBottomCardToPlayFaceDown()
 void PlayerActions::actUntapAll()
 {
     Command_SetCardAttr cmd;
-    cmd.set_zone("table");
+    cmd.set_zone(ZoneNames::TABLE);
     cmd.set_attribute(AttrTapped);
     cmd.set_attr_value("0");
 
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actRollDie()
+void PlayerActions::actRequestRollDieDialog()
 {
-    DlgRollDice dlg(player->getGame()->getTab());
-    if (!dlg.exec()) {
-        return;
-    }
+    emit requestRollDieDialog();
+}
 
+void PlayerActions::actRollDie(int sides, int count)
+{
     Command_RollDie cmd;
-    cmd.set_sides(dlg.getDieSideCount());
-    cmd.set_count(dlg.getDiceToRollCount());
+    cmd.set_sides(sides);
+    cmd.set_count(count);
     sendGameCommand(cmd);
 }
 
-void PlayerActions::actCreateToken()
+void PlayerActions::actFlipCoin()
 {
-    DlgCreateToken dlg(player->getPlayerMenu()->getUtilityMenu()->getPredefinedTokens(), player->getGame()->getTab());
-    if (!dlg.exec()) {
-        return;
-    }
+    Command_RollDie cmd;
+    cmd.set_sides(2);
+    cmd.set_count(1);
+    sendGameCommand(cmd);
+}
 
-    lastTokenInfo = dlg.getTokenInfo();
+void PlayerActions::actRequestCreateTokenDialog(const QStringList &predefinedTokens)
+{
+    emit requestCreateTokenDialog(predefinedTokens);
+}
+
+void PlayerActions::actCreateToken(TokenInfo tokenToCreate)
+{
+    lastTokenInfo = tokenToCreate;
 
     ExactCard correctedCard = CardDatabaseManager::query()->guessCard({lastTokenInfo.name, lastTokenInfo.providerId});
     if (correctedCard) {
         lastTokenInfo.name = correctedCard.getName();
-        lastTokenTableRow = TableZone::clampValidTableRow(2 - correctedCard.getInfo().getUiAttributes().tableRow);
+        int tableRow = lastTokenInfo.faceDown ? 2 : correctedCard.getInfo().getUiAttributes().tableRow;
+        lastTokenTableRow = TableZone::tableRowToGridY(tableRow);
         if (lastTokenInfo.pt.isEmpty()) {
             lastTokenInfo.pt = correctedCard.getInfo().getPowTough();
         }
     }
 
-    player->getPlayerMenu()->getUtilityMenu()->setAndEnableCreateAnotherTokenAction(
-        tr("C&reate another %1 token").arg(lastTokenInfo.name));
+    emit requestEnableAndSetCreateAnotherTokenAction(lastTokenInfo.name);
     actCreateAnotherToken();
 }
 
@@ -878,7 +946,7 @@ void PlayerActions::actCreateAnotherToken()
     }
 
     Command_CreateToken cmd;
-    cmd.set_zone("table");
+    cmd.set_zone(ZoneNames::TABLE);
     cmd.set_card_name(lastTokenInfo.name.toStdString());
     cmd.set_card_provider_id(lastTokenInfo.providerId.toStdString());
     cmd.set_color(lastTokenInfo.color.toStdString());
@@ -898,22 +966,26 @@ void PlayerActions::setLastToken(CardInfoPtr cardInfo)
         return;
     }
 
-    UtilityMenu *utilityMenu = player->getPlayerMenu()->getUtilityMenu();
-    if (utilityMenu == nullptr || !utilityMenu->createAnotherTokenActionExists()) {
+    emit requestSetLastToken(cardInfo);
+}
+
+void PlayerActions::setLastTokenInfo(CardInfoPtr cardInfo)
+{
+    if (cardInfo == nullptr) {
         return;
     }
 
-    lastTokenInfo = {.name = cardInfo->getName(),
-                     .color = cardInfo->getColors().isEmpty() ? QString() : cardInfo->getColors().left(1).toLower(),
-                     .pt = cardInfo->getPowTough(),
-                     .annotation = SettingsCache::instance().getAnnotateTokens() ? cardInfo->getText() : "",
-                     .destroy = true,
-                     .providerId =
-                         SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardInfo->getName())};
+    lastTokenInfo = {
+        .name = cardInfo->getName(),
+        .color = cardInfo->getColors().isEmpty() ? QString() : cardInfo->getColors().left(1).toLower(),
+        .pt = cardInfo->getPowTough(),
+        .annotation = SettingsCache::instance().userInterface().getAnnotateTokens() ? cardInfo->getText() : "",
+        .destroy = true,
+        .providerId = SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardInfo->getName())};
 
-    lastTokenTableRow = TableZone::clampValidTableRow(2 - cardInfo->getUiAttributes().tableRow);
+    lastTokenTableRow = TableZone::tableRowToGridY(cardInfo->getUiAttributes().tableRow);
 
-    utilityMenu->setAndEnableCreateAnotherTokenAction(tr("C&reate another %1 token").arg(lastTokenInfo.name));
+    emit requestEnableAndSetCreateAnotherTokenAction(lastTokenInfo.name);
 }
 
 void PlayerActions::actCreatePredefinedToken()
@@ -932,23 +1004,17 @@ void PlayerActions::actCreatePredefinedToken()
 void PlayerActions::actCreateRelatedCard()
 {
     const CardItem *sourceCard = player->getGame()->getActiveCard();
+
     if (!sourceCard) {
         return;
     }
+
     auto *action = static_cast<QAction *>(sender());
     // If there is a better way of passing a CardRelation through a QAction, please add it here.
     auto relatedCards = sourceCard->getCardInfo().getAllRelatedCards();
-    CardRelation *cardRelation = relatedCards.at(action->data().toInt());
 
-    /*
-     * If we make a token via "Token: TokenName"
-     * then let's allow it to be created via "create another token"
-     */
-    if (createRelatedFromRelation(sourceCard, cardRelation) && cardRelation->getCanCreateAnother()) {
-        ExactCard relatedCard = CardDatabaseManager::query()->getCardFromSameSet(cardRelation->getName(),
-                                                                                 sourceCard->getCard().getPrinting());
-        setLastToken(relatedCard.getCardPtr());
-    }
+    CardRelation *cardRelation = relatedCards.at(action->data().toInt());
+    actRequestCreateRelatedFromRelationDialog(sourceCard, cardRelation);
 }
 
 void PlayerActions::actCreateAllRelatedCards()
@@ -968,7 +1034,9 @@ void PlayerActions::actCreateAllRelatedCards()
 
     if (relatedCards.length() == 1) {
         cardRelation = relatedCards.at(0);
-        if (createRelatedFromRelation(sourceCard, cardRelation)) {
+        lastRelatedCreationSucceeded = false; // reset before emit
+        actRequestCreateRelatedFromRelationDialog(sourceCard, cardRelation);
+        if (lastRelatedCreationSucceeded) {
             ++tokensTypesCreated;
         }
     } else {
@@ -980,21 +1048,25 @@ void PlayerActions::actCreateAllRelatedCards()
             }
         }
         switch (nonExcludedRelatedCards.length()) {
-            case 1: // if nonExcludedRelatedCards == 1
+            case 1:
                 cardRelation = nonExcludedRelatedCards.at(0);
-                if (createRelatedFromRelation(sourceCard, cardRelation)) {
+                lastRelatedCreationSucceeded = false; // reset before emit
+                actRequestCreateRelatedFromRelationDialog(sourceCard, cardRelation);
+                if (lastRelatedCreationSucceeded) {
                     ++tokensTypesCreated;
                 }
                 break;
+
             // If all are marked "Exclude", then treat the situation as if none of them are.
             // We won't accept "garbage in, garbage out", here.
-            case 0: // else if nonExcludedRelatedCards == 0
+            case 0:
                 for (CardRelation *cardRelationAll : relatedCards) {
                     if (!cardRelationAll->getDoesAttach() && !cardRelationAll->getIsVariable()) {
                         dbName = cardRelationAll->getName();
                         bool persistent = cardRelationAll->getIsPersistent();
+                        bool faceDown = cardRelationAll->getIsFaceDown();
                         for (int i = 0; i < cardRelationAll->getDefaultCount(); ++i) {
-                            createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent);
+                            createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent, faceDown);
                         }
                         ++tokensTypesCreated;
                         if (tokensTypesCreated == 1) {
@@ -1003,13 +1075,15 @@ void PlayerActions::actCreateAllRelatedCards()
                     }
                 }
                 break;
-            default: // else
+
+            default:
                 for (CardRelation *cardRelationNotExcluded : nonExcludedRelatedCards) {
                     if (!cardRelationNotExcluded->getDoesAttach() && !cardRelationNotExcluded->getIsVariable()) {
                         dbName = cardRelationNotExcluded->getName();
                         bool persistent = cardRelationNotExcluded->getIsPersistent();
+                        bool faceDown = cardRelationNotExcluded->getIsFaceDown();
                         for (int i = 0; i < cardRelationNotExcluded->getDefaultCount(); ++i) {
-                            createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent);
+                            createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent, faceDown);
                         }
                         ++tokensTypesCreated;
                         if (tokensTypesCreated == 1) {
@@ -1031,47 +1105,89 @@ void PlayerActions::actCreateAllRelatedCards()
     }
 }
 
-bool PlayerActions::createRelatedFromRelation(const CardItem *sourceCard, const CardRelation *cardRelation)
+void PlayerActions::actRequestCreateRelatedFromRelationDialog(const CardItem *sourceCard,
+                                                              const CardRelation *cardRelation)
+{
+    emit requestCreateRelatedFromRelationDialog(sourceCard, cardRelation);
+}
+
+bool PlayerActions::createRelatedFromRelation(const CardItem *sourceCard,
+                                              const CardRelation *cardRelation,
+                                              int variableCount)
 {
     if (sourceCard == nullptr || cardRelation == nullptr) {
         return false;
     }
-    QString dbName = cardRelation->getName();
-    bool persistent = cardRelation->getIsPersistent();
+
+    const QString dbName = cardRelation->getName();
+    const bool persistent = cardRelation->getIsPersistent();
+    const bool faceDown = cardRelation->getIsFaceDown();
+
+    // Variable relations always use DoesNotAttach, regardless of the count the user
+    // entered.
     if (cardRelation->getIsVariable()) {
-        bool ok;
-        player->setDialogSemaphore(true);
-        int count = QInputDialog::getInt(player->getGame()->getTab(), tr("Create tokens"), tr("Number:"),
-                                         cardRelation->getDefaultCount(), 1, MAX_TOKENS_PER_DIALOG, 1, &ok);
-        player->setDialogSemaphore(false);
-        if (!ok) {
+        if (variableCount <= 0) {
             return false;
         }
-        for (int i = 0; i < count; ++i) {
-            createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent);
+        for (int i = 0; i < variableCount; ++i) {
+            createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent, faceDown);
         }
-    } else if (cardRelation->getDefaultCount() > 1) {
-        for (int i = 0; i < cardRelation->getDefaultCount(); ++i) {
-            createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent);
-        }
-    } else {
-        auto attachType = cardRelation->getAttachType();
-
-        // move card onto table first if attaching from some other zone
-        // we only do this for AttachTo because cross-zone TransformInto is already handled server-side
-        if (attachType == CardRelationType::AttachTo && sourceCard->getZone()->getName() != "table") {
-            playCardToTable(sourceCard, false);
-        }
-
-        createCard(sourceCard, dbName, attachType, persistent);
+        return true;
     }
+
+    const int count = cardRelation->getDefaultCount();
+
+    if (count > 1) {
+        for (int i = 0; i < count; ++i) {
+            createCard(sourceCard, dbName, CardRelationType::DoesNotAttach, persistent, faceDown);
+        }
+        return true;
+    }
+
+    CardRelationType attachType;
+    // do not attempt to attach to another player's cards, this causes the card to attempt to attach to the same
+    // cardid on the local player's field instead, which is an entirely different card!
+    if (player->getPlayerInfo()->getLocalOrJudge()) {
+        attachType = cardRelation->getAttachType();
+    } else {
+        attachType = CardRelationType::DoesNotAttach;
+    }
+
+    // move card onto table first if attaching from some other zone
+    // we only do this for AttachTo because cross-zone TransformInto is already handled server-side
+    if (attachType == CardRelationType::AttachTo && sourceCard->getZone()->getName() != ZoneNames::TABLE) {
+        playCardToTable(sourceCard, false);
+    }
+
+    createCard(sourceCard, dbName, attachType, persistent, faceDown);
     return true;
 }
 
+void PlayerActions::onRelatedCardCreated(const CardItem *sourceCard, const CardRelation *cardRelation)
+{
+    if (sourceCard == nullptr || cardRelation == nullptr) {
+        return;
+    }
+
+    /*
+     * If we make a token via "Token: TokenName"
+     * then let's allow it to be created via "create another token"
+     */
+    if (!cardRelation->getCanCreateAnother()) {
+        return;
+    }
+
+    ExactCard relatedCard =
+        CardDatabaseManager::query()->getCardFromSameSet(cardRelation->getName(), sourceCard->getCard().getPrinting());
+
+    setLastToken(relatedCard.getCardPtr());
+}
+
 void PlayerActions::createCard(const CardItem *sourceCard,
                                const QString &dbCardName,
                                CardRelationType attachType,
-                               bool persistent)
+                               bool persistent,
+                               bool faceDown)
 {
     CardInfoPtr cardInfo = CardDatabaseManager::query()->getCardInfo(dbCardName);
 
@@ -1079,13 +1195,11 @@ void PlayerActions::createCard(const CardItem *sourceCard,
         return;
     }
 
-    // get the target token's location
-    // TODO: Define this QPoint into its own function along with the one below
-    QPoint gridPoint = QPoint(-1, TableZone::clampValidTableRow(2 - cardInfo->getUiAttributes().tableRow));
+    QPoint gridPoint = QPoint(-1, TableZone::tableRowToGridY(cardInfo->getUiAttributes().tableRow));
 
     // create the token for the related card
     Command_CreateToken cmd;
-    cmd.set_zone("table");
+    cmd.set_zone(ZoneNames::TABLE);
     cmd.set_card_name(cardInfo->getName().toStdString());
     switch (cardInfo->getColors().size()) {
         case 0:
@@ -1100,7 +1214,7 @@ void PlayerActions::createCard(const CardItem *sourceCard,
     }
 
     cmd.set_pt(cardInfo->getPowTough().toStdString());
-    if (SettingsCache::instance().getAnnotateTokens()) {
+    if (SettingsCache::instance().userInterface().getAnnotateTokens()) {
         cmd.set_annotation(cardInfo->getText().toStdString());
     } else {
         cmd.set_annotation("");
@@ -1108,18 +1222,19 @@ void PlayerActions::createCard(const CardItem *sourceCard,
     cmd.set_destroy_on_zone_change(!persistent);
     cmd.set_x(gridPoint.x());
     cmd.set_y(gridPoint.y());
+    cmd.set_face_down(faceDown);
 
     ExactCard relatedCard =
         CardDatabaseManager::query()->getCardFromSameSet(cardInfo->getName(), sourceCard->getCard().getPrinting());
 
     switch (attachType) {
         case CardRelationType::DoesNotAttach:
-            cmd.set_target_zone("table");
+            cmd.set_target_zone(ZoneNames::TABLE);
             cmd.set_card_provider_id(relatedCard.getPrinting().getUuid().toStdString());
             break;
 
         case CardRelationType::AttachTo:
-            cmd.set_target_zone("table"); // We currently only support creating tokens on the table
+            cmd.set_target_zone(ZoneNames::TABLE); // We currently only support creating tokens on the table
             cmd.set_card_provider_id(relatedCard.getPrinting().getUuid().toStdString());
             cmd.set_target_card_id(sourceCard->getId());
             cmd.set_target_mode(Command_CreateToken::ATTACH_TO);
@@ -1127,7 +1242,7 @@ void PlayerActions::createCard(const CardItem *sourceCard,
 
         case CardRelationType::TransformInto:
             // allow cards to directly transform on stack
-            cmd.set_zone(sourceCard->getZone()->getName() == "stack" ? "stack" : "table");
+            cmd.set_zone(sourceCard->getZone()->getName() == ZoneNames::STACK ? ZoneNames::STACK : ZoneNames::TABLE);
             // Transform card zone changes are handled server-side
             cmd.set_target_zone(sourceCard->getZone()->getName().toStdString());
             cmd.set_target_card_id(sourceCard->getId());
@@ -1147,102 +1262,36 @@ void PlayerActions::actSayMessage()
     sendGameCommand(cmd);
 }
 
-void PlayerActions::setCardAttrHelper(const GameEventContext &context,
-                                      CardItem *card,
-                                      CardAttribute attribute,
-                                      const QString &avalue,
-                                      bool allCards,
-                                      EventProcessingOptions options)
-{
-    if (card == nullptr) {
-        return;
-    }
-
-    bool moveCardContext = context.HasExtension(Context_MoveCard::ext);
-    switch (attribute) {
-        case AttrTapped: {
-            bool tapped = avalue == "1";
-            if (!(!tapped && card->getDoesntUntap() && allCards)) {
-                if (!allCards) {
-                    emit logSetTapped(player, card, tapped);
-                }
-                bool canAnimate = !options.testFlag(SKIP_TAP_ANIMATION) && !moveCardContext;
-                card->setTapped(tapped, canAnimate);
-            }
-            break;
-        }
-        case AttrAttacking: {
-            card->setAttacking(avalue == "1");
-            break;
-        }
-        case AttrFaceDown: {
-            card->setFaceDown(avalue == "1");
-            break;
-        }
-        case AttrColor: {
-            card->setColor(avalue);
-            break;
-        }
-        case AttrAnnotation: {
-            emit logSetAnnotation(player, card, avalue);
-            card->setAnnotation(avalue);
-            break;
-        }
-        case AttrDoesntUntap: {
-            bool value = (avalue == "1");
-            emit logSetDoesntUntap(player, card, value);
-            card->setDoesntUntap(value);
-            break;
-        }
-        case AttrPT: {
-            emit logSetPT(player, card, avalue);
-            card->setPT(avalue);
-            break;
-        }
-    }
-}
-
-void PlayerActions::actMoveCardXCardsFromTop()
+void PlayerActions::actRequestMoveCardXCardsFromTopDialog()
 {
     int deckSize = player->getDeckZone()->getCards().size() + 1; // add the card to move to the deck
-    bool ok;
-    int number =
-        QInputDialog::getInt(player->getGame()->getTab(), tr("Place card X cards from top of library"),
-                             tr("Which position should this card be placed:") + "\n" + tr("(max. %1)").arg(deckSize),
-                             defaultNumberTopCardsToPlaceBelow, 1, deckSize, 1, &ok);
-    number -= 1; // indexes start at 0
 
-    if (!ok) {
-        return;
-    }
+    emit requestMoveCardXCardsFromTopDialog(defaultNumberTopCardsToPlaceBelow, deckSize);
+}
 
+void PlayerActions::actMoveCardXCardsFromTop(QList<CardItem *> selectedCards, int number)
+{
     defaultNumberTopCardsToPlaceBelow = number;
 
-    QList<QGraphicsItem *> sel = player->getGameScene()->selectedItems();
-    if (sel.isEmpty()) {
+    if (selectedCards.isEmpty()) {
         return;
     }
 
-    QList<CardItem *> cardList;
-    while (!sel.isEmpty()) {
-        cardList.append(qgraphicsitem_cast<CardItem *>(sel.takeFirst()));
-    }
-
     QList<const ::google::protobuf::Message *> commandList;
     ListOfCardsToMove idList;
-    for (const auto &i : cardList) {
+    for (const auto &i : selectedCards) {
         idList.add_card()->set_card_id(i->getId());
     }
 
-    int startPlayerId = cardList[0]->getZone()->getPlayer()->getPlayerInfo()->getId();
-    QString startZone = cardList[0]->getZone()->getName();
+    int startPlayerId = selectedCards[0]->getZone()->getPlayer()->getPlayerInfo()->getId();
+    QString startZone = selectedCards[0]->getZone()->getName();
 
     auto *cmd = new Command_MoveCard;
     cmd->set_start_player_id(startPlayerId);
     cmd->set_start_zone(startZone.toStdString());
     cmd->mutable_cards_to_move()->CopyFrom(idList);
     cmd->set_target_player_id(player->getPlayerInfo()->getId());
-    cmd->set_target_zone("deck");
+    cmd->set_target_zone(ZoneNames::DECK);
     cmd->set_x(number);
     cmd->set_y(0);
     commandList.append(cmd);
@@ -1254,15 +1303,14 @@ void PlayerActions::actMoveCardXCardsFromTop()
     }
 }
 
-void PlayerActions::actIncPT(int deltaP, int deltaT)
+void PlayerActions::actIncPT(QList<CardItem *> selectedCards, int deltaP, int deltaT)
 {
     int playerid = player->getPlayerInfo()->getId();
 
     QList<const ::google::protobuf::Message *> commandList;
-    for (const auto &item : player->getGameScene()->selectedItems()) {
-        auto *card = static_cast<CardItem *>(item);
+    for (auto card : selectedCards) {
         QString pt = card->getPT();
-        const auto ptList = parsePT(pt);
+        const auto ptList = CardItem::parsePT(pt);
         QString newpt;
         if (ptList.isEmpty()) {
             newpt = QString::number(deltaP) + (deltaT ? "/" + QString::number(deltaT) : "");
@@ -1288,12 +1336,11 @@ void PlayerActions::actIncPT(int deltaP, int deltaT)
     player->getGame()->getGameEventHandler()->sendGameCommand(prepareGameCommand(commandList), playerid);
 }
 
-void PlayerActions::actResetPT()
+void PlayerActions::actResetPT(QList<CardItem *> selectedCards)
 {
     int playerid = player->getPlayerInfo()->getId();
     QList<const ::google::protobuf::Message *> commandList;
-    for (const auto &item : player->getGameScene()->selectedItems()) {
-        auto *card = static_cast<CardItem *>(item);
+    for (auto card : selectedCards) {
         QString ptString;
         if (!card->getFaceDown()) { // leave the pt empty if the card is face down
             ExactCard ec = card->getCard();
@@ -1322,75 +1369,35 @@ void PlayerActions::actResetPT()
     }
 }
 
-QVariantList PlayerActions::parsePT(const QString &pt)
-{
-    QVariantList ptList = QVariantList();
-    if (!pt.isEmpty()) {
-        int sep = pt.indexOf('/');
-        if (sep == 0) {
-            ptList.append(QVariant(pt.mid(1))); // cut off starting '/' and take full string
-        } else {
-            int start = 0;
-            for (;;) {
-                QString item = pt.mid(start, sep - start);
-                if (item.isEmpty()) {
-                    ptList.append(QVariant(QString()));
-                } else if (item[0] == '+') {
-                    ptList.append(QVariant(item.mid(1).toInt())); // add as int
-                } else if (item[0] == '-') {
-                    ptList.append(QVariant(item.toInt())); // add as int
-                } else {
-                    ptList.append(QVariant(item)); // add as qstring
-                }
-                if (sep == -1) {
-                    break;
-                }
-                start = sep + 1;
-                sep = pt.indexOf('/', start);
-            }
-        }
-    }
-    return ptList;
-}
-
-void PlayerActions::actSetPT()
+void PlayerActions::actRequestSetPTDialog(QList<CardItem *> selectedCards)
 {
     QString oldPT;
-    int playerid = player->getPlayerInfo()->getId();
 
-    auto sel = player->getGameScene()->selectedItems();
-    for (const auto &item : sel) {
-        auto *card = static_cast<CardItem *>(item);
+    for (auto card : selectedCards) {
         if (!card->getPT().isEmpty()) {
             oldPT = card->getPT();
         }
     }
-    bool ok;
-    player->setDialogSemaphore(true);
-    QString pt = getTextWithMax(player->getGame()->getTab(), tr("Change power/toughness"), tr("Change stats to:"),
-                                QLineEdit::Normal, oldPT, &ok);
-    player->setDialogSemaphore(false);
-    if (player->clearCardsToDelete() || !ok) {
-        return;
-    }
 
-    const auto ptList = parsePT(pt);
+    emit requestSetPTDialog(oldPT);
+}
+
+void PlayerActions::actSetPT(QList<CardItem *> selectedCards, const QString &pt)
+{
+    int playerid = player->getPlayerInfo()->getId();
+
+    const auto ptList = CardItem::parsePT(pt);
     bool empty = ptList.isEmpty();
 
     QList<const ::google::protobuf::Message *> commandList;
-    for (const auto &item : sel) {
-        auto *card = static_cast<CardItem *>(item);
+    for (auto card : selectedCards) {
         auto *cmd = new Command_SetCardAttr;
         QString newpt = QString();
         if (!empty) {
-            const auto oldpt = parsePT(card->getPT());
+            const auto oldpt = CardItem::parsePT(card->getPT());
             int ptIter = 0;
             for (const auto &_item : ptList) {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
                 if (_item.typeId() == QMetaType::Type::Int) {
-#else
-                if (_item.type() == QVariant::Int) {
-#endif
                     int oldItem = ptIter < oldpt.size() ? oldpt.at(ptIter).toInt() : 0;
                     newpt += '/' + QString::number(oldItem + _item.toInt());
                 } else {
@@ -1423,44 +1430,69 @@ void PlayerActions::actDrawArrow()
     }
 }
 
-void PlayerActions::actIncP()
+void PlayerActions::actIncP(QList<CardItem *> selectedCards)
 {
-    actIncPT(1, 0);
+    actIncPT(selectedCards, 1, 0);
 }
 
-void PlayerActions::actDecP()
+void PlayerActions::actDecP(QList<CardItem *> selectedCards)
 {
-    actIncPT(-1, 0);
+    actIncPT(selectedCards, -1, 0);
 }
 
-void PlayerActions::actIncT()
+void PlayerActions::actIncT(QList<CardItem *> selectedCards)
 {
-    actIncPT(0, 1);
+    actIncPT(selectedCards, 0, 1);
 }
 
-void PlayerActions::actDecT()
+void PlayerActions::actDecT(QList<CardItem *> selectedCards)
 {
-    actIncPT(0, -1);
+    actIncPT(selectedCards, 0, -1);
 }
 
-void PlayerActions::actIncPT()
+void PlayerActions::actIncPT(QList<CardItem *> selectedCards)
 {
-    actIncPT(1, 1);
+    actIncPT(selectedCards, 1, 1);
 }
 
-void PlayerActions::actDecPT()
+void PlayerActions::actDecPT(QList<CardItem *> selectedCards)
 {
-    actIncPT(-1, -1);
+    actIncPT(selectedCards, -1, -1);
 }
 
-void PlayerActions::actFlowP()
+void PlayerActions::actFlowP(QList<CardItem *> selectedCards)
 {
-    actIncPT(1, -1);
+    actIncPT(selectedCards, 1, -1);
 }
 
-void PlayerActions::actFlowT()
+void PlayerActions::actFlowT(QList<CardItem *> selectedCards)
 {
-    actIncPT(-1, 1);
+    actIncPT(selectedCards, -1, 1);
+}
+
+void PlayerActions::actReduceLifeByPower(QList<CardItem *> selectedCards)
+{
+    // find life counter
+    auto lifeCounter = player->getLifeCounter();
+    if (!lifeCounter) {
+        return;
+    }
+
+    // calculate total power;
+    int total = 0;
+    for (auto card : selectedCards) {
+        QVariantList parsed = CardItem::parsePT(card->getPT());
+        if (!parsed.isEmpty()) {
+            int power = parsed.first().toInt(); // toInt will default to 0 if it's not an int
+            total += qMax(power, 0);
+        }
+    }
+
+    // send cmd
+    Command_IncCounter cmd;
+    cmd.set_counter_id(lifeCounter->getId());
+    cmd.set_delta(-total);
+    sendGameCommand(prepareGameCommand(cmd));
 }
 
 void AnnotationDialog::keyPressEvent(QKeyEvent *event)
@@ -1473,33 +1505,22 @@ void AnnotationDialog::keyPressEvent(QKeyEvent *event)
     QInputDialog::keyPressEvent(event);
 }
 
-void PlayerActions::actSetAnnotation()
+void PlayerActions::actRequestSetAnnotationDialog(QList<CardItem *> selectedCards)
 {
     QString oldAnnotation;
-    auto sel = player->getGameScene()->selectedItems();
-    for (const auto &item : sel) {
-        auto *card = static_cast<CardItem *>(item);
+    for (auto card : selectedCards) {
         if (!card->getAnnotation().isEmpty()) {
             oldAnnotation = card->getAnnotation();
         }
     }
 
-    player->setDialogSemaphore(true);
-    AnnotationDialog *dialog = new AnnotationDialog(player->getGame()->getTab());
-    dialog->setOptions(QInputDialog::UsePlainTextEditForTextInput);
-    dialog->setWindowTitle(tr("Set annotation"));
-    dialog->setLabelText(tr("Please enter the new annotation:"));
-    dialog->setTextValue(oldAnnotation);
-    bool ok = dialog->exec();
-    player->setDialogSemaphore(false);
-    if (player->clearCardsToDelete() || !ok) {
-        return;
-    }
-    QString annotation = dialog->textValue().left(MAX_NAME_LENGTH);
+    emit requestSetAnnotationDialog(oldAnnotation);
+}
 
+void PlayerActions::actSetAnnotation(QList<CardItem *> selectedCards, const QString &annotation)
+{
     QList<const ::google::protobuf::Message *> commandList;
-    for (const auto &item : sel) {
-        auto *card = static_cast<CardItem *>(item);
+    for (auto card : selectedCards) {
         auto *cmd = new Command_SetCardAttr;
         cmd->set_zone(card->getZone()->getName().toStdString());
         cmd->set_card_id(card->getId());
@@ -1520,12 +1541,10 @@ void PlayerActions::actAttach()
     card->drawAttachArrow();
 }
 
-void PlayerActions::actUnattach()
+void PlayerActions::actUnattach(QList<CardItem *> selectedCards)
 {
     QList<const ::google::protobuf::Message *> commandList;
-    for (QGraphicsItem *item : player->getGameScene()->selectedItems()) {
-        auto *card = static_cast<CardItem *>(item);
-
+    for (auto card : selectedCards) {
         if (!card->getAttachedTo()) {
             continue;
         }
@@ -1538,72 +1557,110 @@ void PlayerActions::actUnattach()
     sendGameCommand(prepareGameCommand(commandList));
 }
 
-void PlayerActions::actCardCounterTrigger()
+void PlayerActions::actAddCardCounter(QList<CardItem *> selectedCards, int counterId)
+{
+    offsetCardCounter(selectedCards, counterId, 1);
+}
+
+void PlayerActions::actRemoveCardCounter(QList<CardItem *> selectedCards, int counterId)
+{
+    offsetCardCounter(selectedCards, counterId, -1);
+}
+
+void PlayerActions::offsetCardCounter(QList<CardItem *> selectedCards, int counterId, int offset)
 {
-    auto *action = static_cast<QAction *>(sender());
-    int counterId = action->data().toInt() / 1000;
     QList<const ::google::protobuf::Message *> commandList;
-    switch (action->data().toInt() % 1000) {
-        case 9: { // increment counter
-            for (const auto &item : player->getGameScene()->selectedItems()) {
-                auto *card = static_cast<CardItem *>(item);
-                if (card->getCounters().value(counterId, 0) < MAX_COUNTERS_ON_CARD) {
-                    auto *cmd = new Command_SetCardCounter;
-                    cmd->set_zone(card->getZone()->getName().toStdString());
-                    cmd->set_card_id(card->getId());
-                    cmd->set_counter_id(counterId);
-                    cmd->set_counter_value(card->getCounters().value(counterId, 0) + 1);
-                    commandList.append(cmd);
-                }
-            }
-            break;
-        }
-        case 10: { // decrement counter
-            for (const auto &item : player->getGameScene()->selectedItems()) {
-                auto *card = static_cast<CardItem *>(item);
-                if (card->getCounters().value(counterId, 0)) {
-                    auto *cmd = new Command_SetCardCounter;
-                    cmd->set_zone(card->getZone()->getName().toStdString());
-                    cmd->set_card_id(card->getId());
-                    cmd->set_counter_id(counterId);
-                    cmd->set_counter_value(card->getCounters().value(counterId, 0) - 1);
-                    commandList.append(cmd);
-                }
-            }
-            break;
-        }
-        case 11: { // set counter with dialog
-            bool ok;
-            player->setDialogSemaphore(true);
+    for (auto card : selectedCards) {
+        int oldValue = card->getCounters().value(counterId, 0);
 
-            int oldValue = 0;
-            if (player->getGameScene()->selectedItems().size() == 1) {
-                auto *card = static_cast<CardItem *>(player->getGameScene()->selectedItems().first());
-                oldValue = card->getCounters().value(counterId, 0);
-            }
-            int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Set counters"), tr("Number:"), oldValue,
-                                              0, MAX_COUNTERS_ON_CARD, 1, &ok);
-            player->setDialogSemaphore(false);
-            if (player->clearCardsToDelete() || !ok) {
-                return;
-            }
-
-            for (const auto &item : player->getGameScene()->selectedItems()) {
-                auto *card = static_cast<CardItem *>(item);
-                auto *cmd = new Command_SetCardCounter;
-                cmd->set_zone(card->getZone()->getName().toStdString());
-                cmd->set_card_id(card->getId());
-                cmd->set_counter_id(counterId);
-                cmd->set_counter_value(number);
-                commandList.append(cmd);
-            }
-            break;
+        // Overflow-safe clamp to the server-enforced range [0, MAX_COUNTER_VALUE];
+        // a result differing from oldValue also corrects an out-of-range cached value.
+        // Callers only ever pass offset == ±1 (actAddCardCounter / actRemoveCardCounter).
+        // This client-side clamp is a defense-in-depth UX check, consistent with
+        // actSetCardCounter and actIncrementAllCardCounters; the server remains the
+        // authoritative enforcer of the bounds.
+        int newValue = addClamped(oldValue, offset, 0, MAX_COUNTER_VALUE);
+        if (newValue != oldValue) {
+            auto *cmd = new Command_SetCardCounter;
+            cmd->set_zone(card->getZone()->getName().toStdString());
+            cmd->set_card_id(card->getId());
+            cmd->set_counter_id(counterId);
+            cmd->set_counter_value(newValue);
+            commandList.append(cmd);
         }
-        default:;
     }
+
     sendGameCommand(prepareGameCommand(commandList));
 }
 
+void PlayerActions::actRequestSetCardCounterDialog(QList<CardItem *> selectedCards, int counterId)
+{
+    // If a single card is selected, we show the old value in the dialog. Otherwise, we show "x"
+    QString oldValueForDlg = "x";
+    if (selectedCards.size() == 1) {
+        auto *card = selectedCards.first();
+        oldValueForDlg = QString::number(card->getCounters().value(counterId, 0));
+    }
+
+    emit requestSetCardCounterDialog(counterId, oldValueForDlg);
+}
+
+void PlayerActions::actSetCardCounter(QList<CardItem *> selectedCards, int counterId, const QString &counterValue)
+{
+    QList<const ::google::protobuf::Message *> commandList;
+    for (auto card : selectedCards) {
+        int oldValue = card->getCounters().value(counterId, 0);
+        Expression exp(oldValue);
+        double parsed = exp.parse(counterValue);
+        // Clamp in double precision first to avoid UB, then cast
+        int number = static_cast<int>(qBound(0.0, parsed, static_cast<double>(MAX_COUNTER_VALUE)));
+
+        auto *cmd = new Command_SetCardCounter;
+        cmd->set_zone(card->getZone()->getName().toStdString());
+        cmd->set_card_id(card->getId());
+        cmd->set_counter_id(counterId);
+        cmd->set_counter_value(number);
+        commandList.append(cmd);
+    }
+
+    sendGameCommand(prepareGameCommand(commandList));
+}
+
+void PlayerActions::actIncrementAllCardCounters(QList<CardItem *> cardsToUpdate)
+{
+    if (cardsToUpdate.isEmpty()) {
+        // If no cards selected, update all cards on table
+        cardsToUpdate = static_cast<QList<CardItem *>>(player->getTableZone()->getCards());
+    }
+
+    QList<const ::google::protobuf::Message *> commandList;
+
+    for (const auto *card : cardsToUpdate) {
+        const auto &cardCounters = card->getCounters();
+
+        QMapIterator<int, int> counterIterator(cardCounters);
+        while (counterIterator.hasNext()) {
+            counterIterator.next();
+            int counterId = counterIterator.key();
+            int currentValue = counterIterator.value();
+            if (currentValue >= MAX_COUNTER_VALUE) {
+                continue;
+            }
+
+            auto cmd = std::make_unique<Command_SetCardCounter>();
+            cmd->set_zone(card->getZone()->getName().toStdString());
+            cmd->set_card_id(card->getId());
+            cmd->set_counter_id(counterId);
+            cmd->set_counter_value(currentValue + 1);
+            commandList.append(cmd.release());
+        }
+    }
+
+    if (!commandList.isEmpty()) {
+        sendGameCommand(prepareGameCommand(commandList));
+    }
+}
+
 /**
  * @brief returns true if the zone is a unwritable reveal zone view (eg a card reveal window). Will return false if zone
  * is nullptr.
@@ -1616,14 +1673,8 @@ static bool isUnwritableRevealZone(CardZoneLogic *zone)
     return false;
 }
 
-void PlayerActions::playSelectedCards(const bool faceDown)
+void PlayerActions::playSelectedCards(QList<CardItem *> selectedCards, const bool faceDown)
 {
-    QList<CardItem *> selectedCards;
-    for (const auto &item : player->getGameScene()->selectedItems()) {
-        auto *card = static_cast<CardItem *>(item);
-        selectedCards.append(card);
-    }
-
     // CardIds will get shuffled downwards when cards leave the deck.
     // We need to iterate through the cards in reverse order so cardIds don't get changed out from under us as we play
     // out the cards one-by-one.
@@ -1631,25 +1682,25 @@ void PlayerActions::playSelectedCards(const bool faceDown)
               [](const auto &card1, const auto &card2) { return card1->getId() > card2->getId(); });
 
     for (auto &card : selectedCards) {
-        if (card && !isUnwritableRevealZone(card->getZone()) && card->getZone()->getName() != "table") {
+        if (card && !isUnwritableRevealZone(card->getZone()) && card->getZone()->getName() != ZoneNames::TABLE) {
             playCard(card, faceDown);
         }
     }
 }
 
-void PlayerActions::actPlay()
+void PlayerActions::actPlay(QList<CardItem *> selectedCards)
 {
-    playSelectedCards(false);
+    playSelectedCards(selectedCards, false);
 }
 
-void PlayerActions::actPlayFacedown()
+void PlayerActions::actPlayFacedown(QList<CardItem *> selectedCards)
 {
-    playSelectedCards(true);
+    playSelectedCards(selectedCards, true);
 }
 
-void PlayerActions::actHide()
+void PlayerActions::actHide(QList<CardItem *> selectedCards)
 {
-    for (const auto &item : player->getGameScene()->selectedItems()) {
+    for (const auto &item : selectedCards) {
         auto *card = static_cast<CardItem *>(item);
         if (card && isUnwritableRevealZone(card->getZone())) {
             card->getZone()->removeCard(card);
@@ -1657,7 +1708,7 @@ void PlayerActions::actHide()
     }
 }
 
-void PlayerActions::actReveal(QAction *action)
+void PlayerActions::actReveal(QList<CardItem *> selectedCards, QAction *action)
 {
     const int otherPlayerId = action->data().toInt();
 
@@ -1666,9 +1717,7 @@ void PlayerActions::actReveal(QAction *action)
         cmd.set_player_id(otherPlayerId);
     }
 
-    QList<QGraphicsItem *> sel = player->getGameScene()->selectedItems();
-    while (!sel.isEmpty()) {
-        const auto *card = qgraphicsitem_cast<CardItem *>(sel.takeFirst());
+    for (auto card : selectedCards) {
         if (!cmd.has_zone_name()) {
             cmd.set_zone_name(card->getZone()->getName().toStdString());
         }
@@ -1684,7 +1733,7 @@ void PlayerActions::actRevealHand(int revealToPlayerId)
     if (revealToPlayerId != -1) {
         cmd.set_player_id(revealToPlayerId);
     }
-    cmd.set_zone_name("hand");
+    cmd.set_zone_name(ZoneNames::HAND);
 
     sendGameCommand(cmd);
 }
@@ -1695,7 +1744,7 @@ void PlayerActions::actRevealRandomHandCard(int revealToPlayerId)
     if (revealToPlayerId != -1) {
         cmd.set_player_id(revealToPlayerId);
     }
-    cmd.set_zone_name("hand");
+    cmd.set_zone_name(ZoneNames::HAND);
     cmd.add_card_id(RANDOM_CARD_FROM_ZONE);
 
     sendGameCommand(cmd);
@@ -1707,7 +1756,7 @@ void PlayerActions::actRevealLibrary(int revealToPlayerId)
     if (revealToPlayerId != -1) {
         cmd.set_player_id(revealToPlayerId);
     }
-    cmd.set_zone_name("deck");
+    cmd.set_zone_name(ZoneNames::DECK);
 
     sendGameCommand(cmd);
 }
@@ -1718,7 +1767,7 @@ void PlayerActions::actLendLibrary(int lendToPlayerId)
     if (lendToPlayerId != -1) {
         cmd.set_player_id(lendToPlayerId);
     }
-    cmd.set_zone_name("deck");
+    cmd.set_zone_name(ZoneNames::DECK);
     cmd.set_grant_write_access(true);
 
     sendGameCommand(cmd);
@@ -1731,7 +1780,7 @@ void PlayerActions::actRevealTopCards(int revealToPlayerId, int amount)
         cmd.set_player_id(revealToPlayerId);
     }
 
-    cmd.set_zone_name("deck");
+    cmd.set_zone_name(ZoneNames::DECK);
     cmd.set_top_cards(amount);
     // backward compatibility: servers before #1051 only permits to reveal the first card
     cmd.add_card_id(0);
@@ -1745,24 +1794,19 @@ void PlayerActions::actRevealRandomGraveyardCard(int revealToPlayerId)
     if (revealToPlayerId != -1) {
         cmd.set_player_id(revealToPlayerId);
     }
-    cmd.set_zone_name("grave");
+    cmd.set_zone_name(ZoneNames::GRAVE);
     cmd.add_card_id(RANDOM_CARD_FROM_ZONE);
     sendGameCommand(cmd);
 }
 
-void PlayerActions::cardMenuAction()
+void PlayerActions::cardMenuAction(QList<CardItem *> selectedCards, CardMenuActionType type)
 {
-    auto *a = dynamic_cast<QAction *>(sender());
-    QList<QGraphicsItem *> sel = player->getGameScene()->selectedItems();
-    QList<CardItem *> cardList;
-    while (!sel.isEmpty()) {
-        cardList.append(qgraphicsitem_cast<CardItem *>(sel.takeFirst()));
-    }
+    QList<CardItem *> cardList = selectedCards;
 
     QList<const ::google::protobuf::Message *> commandList;
-    if (a->data().toInt() <= (int)cmClone) {
+    if (type <= cmClone) {
         for (const auto &card : cardList) {
-            switch (static_cast<CardMenuActionType>(a->data().toInt())) {
+            switch (type) {
                 // Leaving both for compatibility with server
                 case cmUntap:
                     // fallthrough
@@ -1808,7 +1852,7 @@ void PlayerActions::cardMenuAction()
                 }
                 case cmClone: {
                     auto *cmd = new Command_CreateToken;
-                    cmd->set_zone("table");
+                    cmd->set_zone(ZoneNames::TABLE);
                     cmd->set_card_name(card->getName().toStdString());
                     cmd->set_card_provider_id(card->getProviderId().toStdString());
                     cmd->set_color(card->getColor().toStdString());
@@ -1830,7 +1874,7 @@ void PlayerActions::cardMenuAction()
             return;
         }
 
-        Player *startPlayer = zone->getPlayer();
+        PlayerLogic *startPlayer = zone->getPlayer();
         if (!startPlayer) {
             return;
         }
@@ -1843,20 +1887,20 @@ void PlayerActions::cardMenuAction()
             idList.add_card()->set_card_id(i->getId());
         }
 
-        switch (static_cast<CardMenuActionType>(a->data().toInt())) {
+        switch (type) {
             case cmMoveToTopLibrary: {
                 auto *cmd = new Command_MoveCard;
                 cmd->set_start_player_id(startPlayerId);
                 cmd->set_start_zone(startZone.toStdString());
                 cmd->mutable_cards_to_move()->CopyFrom(idList);
                 cmd->set_target_player_id(player->getPlayerInfo()->getId());
-                cmd->set_target_zone("deck");
+                cmd->set_target_zone(ZoneNames::DECK);
                 cmd->set_x(0);
                 cmd->set_y(0);
 
                 if (idList.card_size() > 1) {
                     auto *scmd = new Command_Shuffle;
-                    scmd->set_zone_name("deck");
+                    scmd->set_zone_name(ZoneNames::DECK);
                     scmd->set_start(0);
                     scmd->set_end(idList.card_size() - 1); // inclusive, the indexed card at end will be shuffled
                     // Server process events backwards, so...
@@ -1872,13 +1916,13 @@ void PlayerActions::cardMenuAction()
                 cmd->set_start_zone(startZone.toStdString());
                 cmd->mutable_cards_to_move()->CopyFrom(idList);
                 cmd->set_target_player_id(player->getPlayerInfo()->getId());
-                cmd->set_target_zone("deck");
+                cmd->set_target_zone(ZoneNames::DECK);
                 cmd->set_x(-1);
                 cmd->set_y(0);
 
                 if (idList.card_size() > 1) {
                     auto *scmd = new Command_Shuffle;
-                    scmd->set_zone_name("deck");
+                    scmd->set_zone_name(ZoneNames::DECK);
                     scmd->set_start(-idList.card_size());
                     scmd->set_end(-1);
                     // Server process events backwards, so...
@@ -1894,7 +1938,7 @@ void PlayerActions::cardMenuAction()
                 cmd->set_start_zone(startZone.toStdString());
                 cmd->mutable_cards_to_move()->CopyFrom(idList);
                 cmd->set_target_player_id(player->getPlayerInfo()->getId());
-                cmd->set_target_zone("hand");
+                cmd->set_target_zone(ZoneNames::HAND);
                 cmd->set_x(0);
                 cmd->set_y(0);
                 commandList.append(cmd);
@@ -1906,7 +1950,7 @@ void PlayerActions::cardMenuAction()
                 cmd->set_start_zone(startZone.toStdString());
                 cmd->mutable_cards_to_move()->CopyFrom(idList);
                 cmd->set_target_player_id(player->getPlayerInfo()->getId());
-                cmd->set_target_zone("grave");
+                cmd->set_target_zone(ZoneNames::GRAVE);
                 cmd->set_x(0);
                 cmd->set_y(0);
                 commandList.append(cmd);
@@ -1918,12 +1962,40 @@ void PlayerActions::cardMenuAction()
                 cmd->set_start_zone(startZone.toStdString());
                 cmd->mutable_cards_to_move()->CopyFrom(idList);
                 cmd->set_target_player_id(player->getPlayerInfo()->getId());
-                cmd->set_target_zone("rfg");
+                cmd->set_target_zone(ZoneNames::EXILE);
                 cmd->set_x(0);
                 cmd->set_y(0);
                 commandList.append(cmd);
                 break;
             }
+            case cmMoveToTable: {
+                // Each card needs its own command because table row, pt, and cipt vary per card
+                for (const auto &card : cardList) {
+                    auto *cmd = new Command_MoveCard;
+                    cmd->set_start_player_id(startPlayerId);
+                    cmd->set_start_zone(startZone.toStdString());
+                    cmd->set_target_player_id(player->getPlayerInfo()->getId());
+                    cmd->set_target_zone(ZoneNames::TABLE);
+                    cmd->set_x(-1);
+
+                    CardToMove *ctm = cmd->mutable_cards_to_move()->add_card();
+                    ctm->set_card_id(card->getId());
+                    ctm->set_face_down(false);
+
+                    int tableRow = 0;
+                    ExactCard exactCard = card->getCard();
+                    if (exactCard) {
+                        const CardInfo &info = exactCard.getInfo();
+                        tableRow = info.getUiAttributes().tableRow;
+                        ctm->set_pt(info.getPowTough().toStdString());
+                        ctm->set_tapped(info.getUiAttributes().cipt);
+                    }
+
+                    cmd->set_y(TableZone::tableRowToGridY(tableRow));
+                    commandList.append(cmd);
+                }
+                break;
+            }
             default:
                 break;
         }
diff --git a/cockatrice/src/game/player/player_actions.h b/cockatrice/src/game/player/player_actions.h
index e0f86e4fc..8fff81635 100644
--- a/cockatrice/src/game/player/player_actions.h
+++ b/cockatrice/src/game/player/player_actions.h
@@ -2,20 +2,31 @@
  * @file player_actions.h
  *  @ingroup GameLogicActions
  * @ingroup GameLogicPlayers
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_PLAYER_ACTIONS_H
 #define COCKATRICE_PLAYER_ACTIONS_H
-#include "../dialogs/dlg_create_token.h"
-#include "event_processing_options.h"
-#include "player.h"
 
-#include <QMenu>
+#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/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 <QObject>
+#include <QString>
+#include <QStringList>
 #include <libcockatrice/card/relation/card_relation_type.h>
 #include <libcockatrice/filters/filter_string.h>
-#include <libcockatrice/protocol/pb/card_attributes.pb.h>
+#include <qtmetamacros.h>
+
+class CardItem;
+class CardRelation;
+class QAction;
+class QTimer;
+template <typename T> class QList;
 
 namespace google
 {
@@ -25,28 +36,21 @@ class Message;
 }
 } // namespace google
 
-class CardItem;
 class Command_MoveCard;
-class GameEventContext;
 class PendingCommand;
-class Player;
+class PlayerLogic;
+
 class PlayerActions : public QObject
 {
     Q_OBJECT
 
-signals:
-    void logSetTapped(Player *player, CardItem *card, bool tapped);
-    void logSetAnnotation(Player *player, CardItem *card, QString newAnnotation);
-    void logSetDoesntUntap(Player *player, CardItem *card, bool doesntUntap);
-    void logSetPT(Player *player, CardItem *card, QString newPT);
-
 public:
     enum CardsToReveal
     {
         RANDOM_CARD_FROM_ZONE = -2
     };
 
-    explicit PlayerActions(Player *player);
+    explicit PlayerActions(PlayerLogic *player);
 
     void sendGameCommand(PendingCommand *pend);
     void sendGameCommand(const google::protobuf::Message &command);
@@ -54,13 +58,6 @@ public:
     PendingCommand *prepareGameCommand(const ::google::protobuf::Message &cmd);
     PendingCommand *prepareGameCommand(const QList<const ::google::protobuf::Message *> &cmdList);
 
-    void setCardAttrHelper(const GameEventContext &context,
-                           CardItem *card,
-                           CardAttribute attribute,
-                           const QString &avalue,
-                           bool allCards,
-                           EventProcessingOptions options);
-
     void moveOneCardUntil(CardItem *card);
     void stopMoveTopCardsUntil();
 
@@ -69,44 +66,103 @@ public:
         return movingCardsUntil;
     }
 
+signals:
+    void requestViewTopCardsDialog(int defaultNumberTopCards, int deckSize);
+    void requestViewBottomCardsDialog(int defaultNumberBottomCards, int deckSize);
+    void requestShuffleTopDialog(int defaultNumberTopCards, int maxCards);
+    void requestShuffleBottomDialog(int defaultNumberBottomCards, int maxCards);
+    void requestMulliganDialog(int startSize, int handSize, int deckSize);
+    void requestDrawCardsDialog(int defaultNumberTopCards, int deckSize);
+    void requestMoveTopCardsToDialog(int defaultNumberTopCards,
+                                     int maxCards,
+                                     const QString &targetZone,
+                                     const QString &zoneDisplayName,
+                                     bool faceDown);
+    void requestMoveTopCardsUntilDialog(MoveTopCardsUntilOptions options);
+    void requestMoveBottomCardsToDialog(int defaultNumberBottomCards,
+                                        int maxCards,
+                                        const QString &targetZone,
+                                        const QString &zoneDisplayName,
+                                        bool faceDown);
+    void requestDrawBottomCardsDialog(int defaultNumberBottomCards, int maxCards);
+    void requestRollDieDialog();
+    void requestCreateTokenDialog(const QStringList &predefinedTokens);
+    void requestCreateRelatedFromRelationDialog(const CardItem *sourceCard, const CardRelation *cardRelation);
+    void requestMoveCardXCardsFromTopDialog(int defaultNumberTopCardsToPlaceBelow, int deckSize);
+    void requestSetPTDialog(const QString &oldPT);
+    void requestSetAnnotationDialog(const QString &oldAnnotation);
+    void requestSetCardCounterDialog(int counterId, const QString &oldValueForDlg);
+    void requestZoneViewToggle(const QString &zoneName, int numberCards, bool isReversed = false);
+    void requestSortHand(const QList<CardList::SortOption> &options);
+    void requestEnableAndSetCreateAnotherTokenAction(const QString &lastTokenName);
+    void requestSetLastToken(CardInfoPtr lastToken);
+
 public slots:
     void setLastToken(CardInfoPtr cardInfo);
+    void setLastTokenInfo(CardInfoPtr cardInfo);
     void playCard(CardItem *c, bool faceDown);
     void playCardToTable(const CardItem *c, bool faceDown);
 
     void actUntapAll();
-    void actRollDie();
-    void actCreateToken();
+    void actRequestRollDieDialog();
+    void actRollDie(int sides, int count);
+    void actFlipCoin();
+    void actRequestCreateTokenDialog(const QStringList &predefinedTokens);
+    void actCreateToken(TokenInfo tokenToCreate);
     void actCreateAnotherToken();
+    void actRequestCreateRelatedFromRelationDialog(const CardItem *sourceCard, const CardRelation *cardRelation);
+    bool createRelatedFromRelation(const CardItem *sourceCard, const CardRelation *cardRelation, int variableCount);
+    void onRelatedCardCreated(const CardItem *sourceCard, const CardRelation *cardRelation);
+    void setLastRelatedCreationSucceeded(bool succeeded)
+    {
+        lastRelatedCreationSucceeded = succeeded;
+    }
     void actShuffle();
-    void actShuffleTop();
-    void actShuffleBottom();
+    void actRequestShuffleTopDialog();
+    void actShuffleTop(int number);
+    void actRequestShuffleBottomDialog();
+    void actShuffleBottom(int number);
     void actDrawCard();
-    void actDrawCards();
+    void actRequestDrawCardsDialog();
+    void actDrawCards(int number);
     void actUndoDraw();
-    void actMulligan();
+    void actRequestMulliganDialog();
+    void actMulligan(int number);
+    void actMulliganSameSize();
+    void actMulliganMinusOne();
+    void doMulligan(int number);
 
-    void actPlay();
-    void actPlayFacedown();
-    void actHide();
+    void actPlay(QList<CardItem *> selectedCards);
+    void actPlayFacedown(QList<CardItem *> selectedCards);
+    void actHide(QList<CardItem *> selectedCards);
 
     void actMoveTopCardToPlay();
     void actMoveTopCardToPlayFaceDown();
     void actMoveTopCardToGrave();
     void actMoveTopCardToExile();
     void actMoveTopCardsToGrave();
+    void actMoveTopCardsToGraveFaceDown();
     void actMoveTopCardsToExile();
-    void actMoveTopCardsUntil();
+    void actMoveTopCardsToExileFaceDown();
+    void actRequestMoveTopCardsUntilDialog();
+    void moveTopCardsUntil(const QString &expr, MoveTopCardsUntilOptions options);
     void actMoveTopCardToBottom();
+    void actRequestMoveTopCardsToDialog(const QString &targetZone, const QString &zoneDisplayName, bool faceDown);
+    void moveTopCardsTo(int number, const QString &targetZone, bool faceDown);
     void actDrawBottomCard();
-    void actDrawBottomCards();
+    void actRequestDrawBottomCardsDialog();
+    void actDrawBottomCards(int number);
     void actMoveBottomCardToPlay();
     void actMoveBottomCardToPlayFaceDown();
     void actMoveBottomCardToGrave();
     void actMoveBottomCardToExile();
     void actMoveBottomCardsToGrave();
+    void actMoveBottomCardsToGraveFaceDown();
     void actMoveBottomCardsToExile();
+    void actMoveBottomCardsToExileFaceDown();
     void actMoveBottomCardToTop();
+    void actRequestMoveBottomCardsToDialog(const QString &targetZone, const QString &zoneDisplayName, bool faceDown);
+    void moveBottomCardsTo(int number, const QString &targetZone, bool faceDown);
 
     void actSelectAll();
     void actSelectRow();
@@ -114,10 +170,12 @@ public slots:
 
     void actViewLibrary();
     void actViewHand();
-    void actViewTopCards();
-    void actViewBottomCards();
-    void actAlwaysRevealTopCard();
-    void actAlwaysLookAtTopCard();
+    void actRequestViewTopCardsDialog();
+    void actViewTopCards(int number);
+    void actRequestViewBottomCardsDialog();
+    void actViewBottomCards(int number);
+    void actAlwaysRevealTopCard(bool alwaysRevealTopCard);
+    void actAlwaysLookAtTopCard(bool alwaysRevealTopCard);
     void actViewGraveyard();
     void actLendLibrary(int lendToPlayerId);
     void actRevealTopCards(int revealToPlayerId, int amount);
@@ -132,34 +190,44 @@ public slots:
     void actCreateRelatedCard();
     void actCreateAllRelatedCards();
 
-    void actMoveCardXCardsFromTop();
-    void actCardCounterTrigger();
+    void actRequestMoveCardXCardsFromTopDialog();
+    void actMoveCardXCardsFromTop(QList<CardItem *> selectedCards, int number);
+    void actRemoveCardCounter(QList<CardItem *> selectedCards, int counterId);
+    void actAddCardCounter(QList<CardItem *> selectedCards, int counterId);
+    void actRequestSetCardCounterDialog(QList<CardItem *> selectedCards, int counterId);
+    void actSetCardCounter(QList<CardItem *> selectedCards, int counterId, const QString &counterValue);
+    void actIncrementAllCardCounters(QList<CardItem *> cardsToUpdate);
     void actAttach();
-    void actUnattach();
+    void actUnattach(QList<CardItem *> selectedCards);
     void actDrawArrow();
-    void actIncPT(int deltaP, int deltaT);
-    void actResetPT();
-    void actSetPT();
-    void actIncP();
-    void actDecP();
-    void actIncT();
-    void actDecT();
-    void actIncPT();
-    void actDecPT();
-    void actFlowP();
-    void actFlowT();
-    void actSetAnnotation();
-    void actReveal(QAction *action);
+    void actIncPT(QList<CardItem *> selectedCards, int deltaP, int deltaT);
+    void actResetPT(QList<CardItem *> selectedCards);
+    void actRequestSetPTDialog(QList<CardItem *> selectedCards);
+    void actSetPT(QList<CardItem *> selectedCards, const QString &pt);
+    void actIncP(QList<CardItem *> selectedCards);
+    void actDecP(QList<CardItem *> selectedCards);
+    void actIncT(QList<CardItem *> selectedCards);
+    void actDecT(QList<CardItem *> selectedCards);
+    void actIncPT(QList<CardItem *> selectedCards);
+    void actDecPT(QList<CardItem *> selectedCards);
+    void actFlowP(QList<CardItem *> selectedCards);
+    void actFlowT(QList<CardItem *> selectedCards);
+
+    void actReduceLifeByPower(QList<CardItem *> selectedCards);
+
+    void actRequestSetAnnotationDialog(QList<CardItem *> selectedCards);
+    void actSetAnnotation(QList<CardItem *> selectedCards, const QString &annotation);
+    void actReveal(QList<CardItem *> selectedCards, QAction *action);
     void actRevealHand(int revealToPlayerId);
     void actRevealRandomHandCard(int revealToPlayerId);
     void actRevealLibrary(int revealToPlayerId);
 
     void actSortHand();
 
-    void cardMenuAction();
+    void cardMenuAction(QList<CardItem *> selectedCards, CardMenuActionType type);
 
 private:
-    Player *player;
+    PlayerLogic *player;
 
     int defaultNumberTopCards = 1;
     int defaultNumberTopCardsToPlaceBelow = 1;
@@ -171,24 +239,24 @@ private:
 
     bool movingCardsUntil;
     QTimer *moveTopCardTimer;
-    QStringList movingCardsUntilExprs = {};
-    int movingCardsUntilNumberOfHits = 1;
-    bool movingCardsUntilAutoPlay = false;
     FilterString movingCardsUntilFilter;
     int movingCardsUntilCounter = 0;
+    MoveTopCardsUntilOptions movingCardsUntilOptions;
+
+    bool lastRelatedCreationSucceeded = false;
 
     void createCard(const CardItem *sourceCard,
                     const QString &dbCardName,
                     CardRelationType attach = CardRelationType::DoesNotAttach,
-                    bool persistent = false);
-    bool createRelatedFromRelation(const CardItem *sourceCard, const CardRelation *cardRelation);
+                    bool persistent = false,
+                    bool faceDown = false);
 
-    void playSelectedCards(bool faceDown = false);
+    void playSelectedCards(QList<CardItem *> selectedCards, bool faceDown = false);
 
     void cmdSetTopCard(Command_MoveCard &cmd);
     void cmdSetBottomCard(Command_MoveCard &cmd);
 
-    QVariantList parsePT(const QString &pt);
+    void offsetCardCounter(QList<CardItem *> selectedCards, int counterId, int offset);
 };
 
 #endif // COCKATRICE_PLAYER_ACTIONS_H
diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp
index 4cf814d86..18f6573df 100644
--- a/cockatrice/src/game/player/player_event_handler.cpp
+++ b/cockatrice/src/game/player/player_event_handler.cpp
@@ -1,14 +1,32 @@
 #include "player_event_handler.h"
 
-#include "../../interface/widgets/tabs/tab_game.h"
-#include "../board/arrow_item.h"
-#include "../board/card_item.h"
+#include "../../game_graphics/board/card_item.h"
+#include "../../game_graphics/zones/view_zone.h"
+#include "../abstract_game.h"
+#include "../board/arrow_data.h"
 #include "../board/card_list.h"
-#include "../zones/view_zone.h"
-#include "player.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 <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
+#include <QDebug>
+#include <QList>
+#include <QMap>
+#include <QSharedPointer>
+#include <QtGlobal>
+#include <algorithm>
 #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>
@@ -22,6 +40,7 @@
 #include <libcockatrice/protocol/pb/event_draw_cards.pb.h>
 #include <libcockatrice/protocol/pb/event_dump_zone.pb.h>
 #include <libcockatrice/protocol/pb/event_flip_card.pb.h>
+#include <libcockatrice/protocol/pb/event_game_log_notice.pb.h>
 #include <libcockatrice/protocol/pb/event_game_say.pb.h>
 #include <libcockatrice/protocol/pb/event_move_card.pb.h>
 #include <libcockatrice/protocol/pb/event_reveal_cards.pb.h>
@@ -30,9 +49,13 @@
 #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/zone_names.h>
+#include <qlogging.h>
+#include <string>
 
-PlayerEventHandler::PlayerEventHandler(Player *_player) : player(_player)
+PlayerEventHandler::PlayerEventHandler(PlayerLogic *_player) : QObject(_player), player(_player)
 {
+    connect(this, &PlayerEventHandler::requestCardMenuUpdate, player, &PlayerLogic::requestCardMenuUpdate);
 }
 
 void PlayerEventHandler::eventGameSay(const Event_GameSay &event)
@@ -59,7 +82,6 @@ void PlayerEventHandler::eventShuffle(const Event_Shuffle &event)
             // we want to close empty views as well
             if (length == 0 || length > absStart) { // note this assumes views always start at the top of the library
                 view->close();
-                break;
             }
         } else {
             qWarning() << zone->getName() << "of" << player->getPlayerInfo()->getName() << "holds empty zoneview!";
@@ -78,14 +100,7 @@ void PlayerEventHandler::eventShuffle(const Event_Shuffle &event)
 void PlayerEventHandler::eventRollDie(const Event_RollDie &event)
 {
     if (!event.values().empty()) {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
         QList<uint> rolls(event.values().begin(), event.values().end());
-#else
-        QList<uint> rolls;
-        for (const auto &value : event.values()) {
-            rolls.append(value);
-        }
-#endif
         std::sort(rolls.begin(), rolls.end());
         emit logRollDie(player, static_cast<int>(event.sides()), rolls);
     } else if (event.value()) {
@@ -96,25 +111,40 @@ void PlayerEventHandler::eventRollDie(const Event_RollDie &event)
 
 void PlayerEventHandler::eventCreateArrow(const Event_CreateArrow &event)
 {
-    ArrowItem *arrow = player->addArrow(event.arrow_info());
-    if (!arrow) {
-        return;
+    auto data = QSharedPointer<ArrowData>::create(ArrowData::fromProto(
+        event.arrow_info(), player->getPlayerInfo()->getId(), player->getPlayerInfo()->getLocal()));
+
+    const auto &playerList = player->getGame()->getPlayerManager()->getPlayers();
+    PlayerLogic *startPlayer = playerList.value(data->startPlayerId);
+    PlayerLogic *targetPlayer = playerList.value(data->targetPlayerId);
+
+    QString startCardName, targetCardName;
+    if (startPlayer) {
+        if (auto *zone = startPlayer->getZones().value(data->startZone)) {
+            if (auto *card = zone->getCard(data->startCardId)) {
+                startCardName = card->getName();
+            }
+        }
+    }
+    if (!data->isPlayerTargeted() && targetPlayer) {
+        if (auto *zone = targetPlayer->getZones().value(data->targetZone)) {
+            if (auto *card = zone->getCard(data->targetCardId)) {
+                targetCardName = card->getName();
+            }
+        }
     }
 
-    auto *startCard = static_cast<CardItem *>(arrow->getStartItem());
-    auto *targetCard = qgraphicsitem_cast<CardItem *>(arrow->getTargetItem());
-    if (targetCard) {
-        emit logCreateArrow(player, startCard->getOwner(), startCard->getName(), targetCard->getOwner(),
-                            targetCard->getName(), false);
-    } else {
-        emit logCreateArrow(player, startCard->getOwner(), startCard->getName(), arrow->getTargetItem()->getOwner(),
-                            QString(), true);
+    emit player->arrowCreateRequested(data);
+
+    if (startPlayer && targetPlayer && !startCardName.isEmpty() &&
+        (data->isPlayerTargeted() || !targetCardName.isEmpty())) {
+        emit logCreateArrow(player, startPlayer, startCardName, targetPlayer, targetCardName, data->isPlayerTargeted());
     }
 }
 
 void PlayerEventHandler::eventDeleteArrow(const Event_DeleteArrow &event)
 {
-    player->delArrow(event.arrow_id());
+    emit player->arrowDeleted(player->getPlayerInfo()->getId(), event.arrow_id());
 }
 
 void PlayerEventHandler::eventCreateToken(const Event_CreateToken &event)
@@ -156,8 +186,8 @@ void PlayerEventHandler::eventSetCardAttr(const Event_SetCardAttr &event,
     if (!event.has_card_id()) {
         const CardList &cards = zone->getCards();
         for (int i = 0; i < cards.size(); ++i) {
-            player->getPlayerActions()->setCardAttrHelper(context, cards.at(i), event.attribute(),
-                                                          QString::fromStdString(event.attr_value()), true, options);
+            setCardAttrHelper(context, cards.at(i), event.attribute(), QString::fromStdString(event.attr_value()), true,
+                              options);
         }
         if (event.attribute() == AttrTapped) {
             emit logSetTapped(player, nullptr, event.attr_value() == "1");
@@ -168,8 +198,62 @@ void PlayerEventHandler::eventSetCardAttr(const Event_SetCardAttr &event,
             qWarning() << "PlayerEventHandler::eventSetCardAttr: card id=" << event.card_id() << "not found";
             return;
         }
-        player->getPlayerActions()->setCardAttrHelper(context, card, event.attribute(),
-                                                      QString::fromStdString(event.attr_value()), false, options);
+        setCardAttrHelper(context, card, event.attribute(), QString::fromStdString(event.attr_value()), false, options);
+    }
+}
+
+void PlayerEventHandler::setCardAttrHelper(const GameEventContext &context,
+                                           CardItem *card,
+                                           CardAttribute attribute,
+                                           const QString &avalue,
+                                           bool allCards,
+                                           EventProcessingOptions options)
+{
+    if (card == nullptr) {
+        return;
+    }
+
+    bool moveCardContext = context.HasExtension(Context_MoveCard::ext);
+    switch (attribute) {
+        case AttrTapped: {
+            bool tapped = avalue == "1";
+            if (!(!tapped && card->getDoesntUntap() && allCards)) {
+                if (!allCards) {
+                    emit logSetTapped(player, card, tapped);
+                }
+                bool canAnimate = !options.testFlag(SKIP_TAP_ANIMATION) && !moveCardContext;
+                card->setTapped(tapped, canAnimate);
+            }
+            break;
+        }
+        case AttrAttacking: {
+            card->setAttacking(avalue == "1");
+            break;
+        }
+        case AttrFaceDown: {
+            card->setFaceDown(avalue == "1");
+            break;
+        }
+        case AttrColor: {
+            card->setColor(avalue);
+            break;
+        }
+        case AttrAnnotation: {
+            emit logSetAnnotation(player, card, avalue);
+            card->setAnnotation(avalue);
+            break;
+        }
+        case AttrDoesntUntap: {
+            bool value = (avalue == "1");
+            emit logSetDoesntUntap(player, card, value);
+            card->setDoesntUntap(value);
+            break;
+        }
+        case AttrPT: {
+            emit logSetPT(player, card, avalue);
+            card->setPT(avalue);
+            break;
+        }
     }
 }
 
@@ -187,7 +271,7 @@ void PlayerEventHandler::eventSetCardCounter(const Event_SetCardCounter &event)
 
     int oldValue = card->getCounters().value(event.counter_id(), 0);
     card->setCounter(event.counter_id(), event.counter_value());
-    player->getPlayerMenu()->updateCardMenu(card);
+    emit requestCardMenuUpdate(card);
     emit logSetCardCounter(player, card->getName(), event.counter_id(), event.counter_value(), oldValue);
 }
 
@@ -196,14 +280,15 @@ void PlayerEventHandler::eventCreateCounter(const Event_CreateCounter &event)
     player->addCounter(event.counter_info());
 }
 
-void PlayerEventHandler::eventSetCounter(const Event_SetCounter &event)
+void PlayerEventHandler::eventSetCounter(const Event_SetCounter &event, EventProcessingOptions options)
 {
-    AbstractCounter *ctr = player->getCounters().value(event.counter_id(), 0);
+    CounterState *ctr = player->getCounters().value(event.counter_id(), nullptr);
     if (!ctr) {
         return;
     }
     int oldValue = ctr->getValue();
-    ctr->setValue(event.value());
+    const bool skipDamageAnimation = options.testFlag(SKIP_DAMAGE_ANIMATION);
+    ctr->setValue(event.value(), skipDamageAnimation);
     emit logSetCounter(player, ctr->getName(), event.value(), oldValue);
 }
 
@@ -214,7 +299,7 @@ void PlayerEventHandler::eventDelCounter(const Event_DelCounter &event)
 
 void PlayerEventHandler::eventDumpZone(const Event_DumpZone &event)
 {
-    Player *zoneOwner = player->getGame()->getPlayerManager()->getPlayers().value(event.zone_owner_id(), 0);
+    PlayerLogic *zoneOwner = player->getGame()->getPlayerManager()->getPlayers().value(event.zone_owner_id(), 0);
     if (!zoneOwner) {
         return;
     }
@@ -227,13 +312,13 @@ void PlayerEventHandler::eventDumpZone(const Event_DumpZone &event)
 
 void PlayerEventHandler::eventMoveCard(const Event_MoveCard &event, const GameEventContext &context)
 {
-    Player *startPlayer = player->getGame()->getPlayerManager()->getPlayers().value(event.start_player_id());
+    PlayerLogic *startPlayer = player->getGame()->getPlayerManager()->getPlayers().value(event.start_player_id());
     if (!startPlayer) {
         return;
     }
     QString startZoneString = QString::fromStdString(event.start_zone());
     CardZoneLogic *startZone = startPlayer->getZones().value(startZoneString, 0);
-    Player *targetPlayer = player->getGame()->getPlayerManager()->getPlayers().value(event.target_player_id());
+    PlayerLogic *targetPlayer = player->getGame()->getPlayerManager()->getPlayers().value(event.target_player_id());
     if (!targetPlayer) {
         return;
     }
@@ -304,32 +389,11 @@ void PlayerEventHandler::eventMoveCard(const Event_MoveCard &event, const GameEv
 
     targetZone->addCard(card, true, x, y);
 
-    // Look at all arrows from and to the card.
-    // If the card was moved to another zone, delete the arrows, otherwise update them.
-    QMapIterator<int, Player *> playerIterator(player->getGame()->getPlayerManager()->getPlayers());
-    while (playerIterator.hasNext()) {
-        Player *p = playerIterator.next().value();
+    emit cardZoneChanged(card, startZone == targetZone);
+    emit requestCardMenuUpdate(card);
 
-        QList<ArrowItem *> arrowsToDelete;
-        QMapIterator<int, ArrowItem *> arrowIterator(p->getArrows());
-        while (arrowIterator.hasNext()) {
-            ArrowItem *arrow = arrowIterator.next().value();
-            if ((arrow->getStartItem() == card) || (arrow->getTargetItem() == card)) {
-                if (startZone == targetZone) {
-                    arrow->updatePath();
-                } else {
-                    arrowsToDelete.append(arrow);
-                }
-            }
-        }
-        for (auto &i : arrowsToDelete) {
-            i->delArrow();
-        }
-    }
-    player->getPlayerMenu()->updateCardMenu(card);
-
-    if (player->getPlayerActions()->isMovingCardsUntil() && startZoneString == "deck" &&
-        targetZone->getName() == "stack") {
+    if (player->getPlayerActions()->isMovingCardsUntil() && startZoneString == ZoneNames::DECK &&
+        targetZone->getName() == ZoneNames::STACK) {
         player->getPlayerActions()->moveOneCardUntil(card);
     }
 }
@@ -353,7 +417,7 @@ void PlayerEventHandler::eventFlipCard(const Event_FlipCard &event)
 
     emit logFlipCard(player, card->getName(), event.face_down());
     card->setFaceDown(event.face_down());
-    player->getPlayerMenu()->updateCardMenu(card);
+    emit requestCardMenuUpdate(card);
 }
 
 void PlayerEventHandler::eventDestroyCard(const Event_DestroyCard &event)
@@ -381,8 +445,8 @@ void PlayerEventHandler::eventDestroyCard(const Event_DestroyCard &event)
 
 void PlayerEventHandler::eventAttachCard(const Event_AttachCard &event)
 {
-    const QMap<int, Player *> &playerList = player->getGame()->getPlayerManager()->getPlayers();
-    Player *targetPlayer = nullptr;
+    const QMap<int, PlayerLogic *> &playerList = player->getGame()->getPlayerManager()->getPlayers();
+    PlayerLogic *targetPlayer = nullptr;
     CardZoneLogic *targetZone = nullptr;
     CardItem *targetCard = nullptr;
     if (event.has_target_player_id()) {
@@ -422,7 +486,7 @@ void PlayerEventHandler::eventAttachCard(const Event_AttachCard &event)
     } else {
         emit logUnattachCard(player, startCard->getName());
     }
-    player->getPlayerMenu()->updateCardMenu(startCard);
+    emit requestCardMenuUpdate(startCard);
 }
 
 void PlayerEventHandler::eventDrawCards(const Event_DrawCards &event)
@@ -459,7 +523,7 @@ void PlayerEventHandler::eventRevealCards(const Event_RevealCards &event, EventP
     if (!zone) {
         return;
     }
-    Player *otherPlayer = nullptr;
+    PlayerLogic *otherPlayer = nullptr;
     if (event.has_other_player_id()) {
         otherPlayer = player->getGame()->getPlayerManager()->getPlayers().value(event.other_player_id());
         if (!otherPlayer) {
@@ -508,7 +572,7 @@ void PlayerEventHandler::eventRevealCards(const Event_RevealCards &event, EventP
         }
 
         if (!options.testFlag(SKIP_REVEAL_WINDOW) && showZoneView && !cardList.isEmpty()) {
-            player->getGameScene()->addRevealedZoneView(player, zone, cardList, event.grant_write_access());
+            emit player->requestRevealedZoneView(player, zone, cardList, event.grant_write_access());
         }
 
         emit logRevealCards(player, zone, cardId, cardName, otherPlayer, false,
@@ -534,6 +598,18 @@ void PlayerEventHandler::eventChangeZoneProperties(const Event_ChangeZonePropert
     }
 }
 
+void PlayerEventHandler::eventGameLogNotice(const Event_GameLogNotice &event)
+{
+    Event_GameLogNotice::NoticeType type = event.notice_type();
+    switch (type) {
+        case Event_GameLogNotice::UNDO_DRAW_FAILED:
+            emit logUndoDrawFailed(player);
+            break;
+        default:
+            qWarning() << "Received Event_GameLogNotice with unknown noticeType: " << type;
+    }
+}
+
 void PlayerEventHandler::processGameEvent(GameEvent::GameEventType type,
                                           const GameEvent &event,
                                           const GameEventContext &context,
@@ -568,7 +644,7 @@ void PlayerEventHandler::processGameEvent(GameEvent::GameEventType type,
             eventCreateCounter(event.GetExtension(Event_CreateCounter::ext));
             break;
         case GameEvent::SET_COUNTER:
-            eventSetCounter(event.GetExtension(Event_SetCounter::ext));
+            eventSetCounter(event.GetExtension(Event_SetCounter::ext), options);
             break;
         case GameEvent::DEL_COUNTER:
             eventDelCounter(event.GetExtension(Event_DelCounter::ext));
@@ -597,8 +673,11 @@ void PlayerEventHandler::processGameEvent(GameEvent::GameEventType type,
         case GameEvent::CHANGE_ZONE_PROPERTIES:
             eventChangeZoneProperties(event.GetExtension(Event_ChangeZoneProperties::ext));
             break;
+        case GameEvent::GAME_LOG_NOTICE:
+            eventGameLogNotice(event.GetExtension(Event_GameLogNotice::ext));
+            break;
         default: {
             qWarning() << "unhandled game event" << type;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/cockatrice/src/game/player/player_event_handler.h b/cockatrice/src/game/player/player_event_handler.h
index 5d1ddd4b4..88254119b 100644
--- a/cockatrice/src/game/player/player_event_handler.h
+++ b/cockatrice/src/game/player/player_event_handler.h
@@ -1,20 +1,35 @@
 /**
  * @file player_event_handler.h
  * @ingroup GameLogicPlayers
- * @brief TODO: Document this.
+ * @brief Player-scoped game event handler.
+ *
+ * PlayerEventHandler applies game events that affect a single Player’s
+ * board state, zones, cards, counters, arrows, and related UI/log output.
+ *
+ * It is invoked by GameEventHandler after basic routing and validation.
+ * Each instance is bound 1:1 to a Player and must never mutate state
+ * belonging to other players except where explicitly required by events
+ * (e.g. moving cards between players, attaching cards, arrows).
+ *
+ * This class is intentionally stateful and tightly coupled to Player,
+ * PlayerActions, and the board/zones implementation. It performs both
+ * model mutation and UI-side bookkeeping (zone views, arrows, menus).
  */
 
 #ifndef COCKATRICE_PLAYER_EVENT_HANDLER_H
 #define COCKATRICE_PLAYER_EVENT_HANDLER_H
+
 #include "event_processing_options.h"
 
 #include <QObject>
+#include <QString>
 #include <libcockatrice/protocol/pb/game_event.pb.h>
-#include <libcockatrice/protocol/pb/game_event_context.pb.h>
+#include <qtmetamacros.h>
+#include <sys/types.h>
 
 class CardItem;
 class CardZoneLogic;
-class Player;
+class PlayerLogic;
 class Event_AttachCard;
 class Event_ChangeZoneProperties;
 class Event_CreateArrow;
@@ -34,82 +49,236 @@ class Event_SetCardAttr;
 class Event_SetCardCounter;
 class Event_SetCounter;
 class Event_Shuffle;
+class Event_GameLogNotice;
+class GameEventContext;
+enum CardAttribute : int;
+template <typename T> class QList;
+
+/**
+ * @class PlayerEventHandler
+ * @brief Applies player-specific game events and emits corresponding log signals.
+ *
+ * Design notes:
+ * - All event handlers assume events are authoritative and already validated
+ *   by the server.
+ * - Most handlers mutate both logical state (CardItem, CardZoneLogic, counters)
+ *   and visual/UI state (views, arrows, menus).
+ * - Logging signals are emitted *after* or *during* state mutation, depending
+ *   on whether later mutations would invalidate log data.
+ */
 class PlayerEventHandler : public QObject
 {
-
     Q_OBJECT
-signals:
-    void logSay(Player *player, QString message);
-    void logShuffle(Player *player, CardZoneLogic *zone, int start, int end);
-    void logRollDie(Player *player, int sides, const QList<uint> &rolls);
-    void logCreateArrow(Player *player,
-                        Player *startPlayer,
-                        QString startCard,
-                        Player *targetPlayer,
-                        QString targetCard,
-                        bool _playerTarget);
-    void logCreateToken(Player *player, QString cardName, QString pt, bool faceDown);
-    void logDrawCards(Player *player, int number, bool deckIsEmpty);
-    void logUndoDraw(Player *player, QString cardName);
-    void logMoveCard(Player *player,
-                     CardItem *card,
-                     CardZoneLogic *startZone,
-                     int oldX,
-                     CardZoneLogic *targetZone,
-                     int newX);
-    void logFlipCard(Player *player, QString cardName, bool faceDown);
-    void logDestroyCard(Player *player, QString cardName);
-    void logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName);
-    void logUnattachCard(Player *player, QString cardName);
-    void logSetCardCounter(Player *player, QString cardName, int counterId, int value, int oldValue);
-    void logSetTapped(Player *player, CardItem *card, bool tapped);
-    void logSetCounter(Player *player, QString counterName, int value, int oldValue);
-    void logSetDoesntUntap(Player *player, CardItem *card, bool doesntUntap);
-    void logSetPT(Player *player, CardItem *card, QString newPT);
-    void logSetAnnotation(Player *player, CardItem *card, QString newAnnotation);
-    void logDumpZone(Player *player, CardZoneLogic *zone, int numberCards, bool isReversed = false);
-    void logRevealCards(Player *player,
-                        CardZoneLogic *zone,
-                        int cardId,
-                        QString cardName,
-                        Player *otherPlayer,
-                        bool faceDown,
-                        int amount,
-                        bool isLentToAnotherPlayer = false);
-    void logAlwaysRevealTopCard(Player *player, CardZoneLogic *zone, bool reveal);
-    void logAlwaysLookAtTopCard(Player *player, CardZoneLogic *zone, bool reveal);
 
 public:
-    PlayerEventHandler(Player *player);
+    /**
+     * @brief Construct a PlayerEventHandler bound to a Player.
+     * @param player Owning player instance.
+     */
+    explicit PlayerEventHandler(PlayerLogic *player);
 
+    /** @name Event dispatch
+     *  @{
+     */
+
+    /**
+     * @brief Dispatch a generic GameEvent to the appropriate handler.
+     *
+     * This is the single entry point used by GameEventHandler. It extracts
+     * the correct protobuf extension and forwards the event to a typed
+     * handler method.
+     *
+     * @param type Game event type enum.
+     * @param event Generic protobuf container.
+     * @param context Additional context (undo, judge, etc.).
+     * @param options Processing options (UI suppression, reveal behavior).
+     */
     void processGameEvent(GameEvent::GameEventType type,
                           const GameEvent &event,
                           const GameEventContext &context,
                           EventProcessingOptions options);
 
+    /** @} */
+
+    /** @name Chat and randomization events
+     *  @{
+     */
+
+    /// Handle in-game chat messages from this player.
     void eventGameSay(const Event_GameSay &event);
+
+    /// Handle zone shuffle events (typically libraries).
     void eventShuffle(const Event_Shuffle &event);
+
+    /// Handle die roll events.
     void eventRollDie(const Event_RollDie &event);
+
+    /** @} */
+
+    /** @name Arrow and targeting events
+     *  @{
+     */
+
+    /// Create a visual arrow between cards or players.
     void eventCreateArrow(const Event_CreateArrow &event);
+
+    /// Delete an existing arrow.
     void eventDeleteArrow(const Event_DeleteArrow &event);
+
+    /** @} */
+
+    /** @name Token and card creation
+     *  @{
+     */
+
+    /// Create a token card in a target zone.
     void eventCreateToken(const Event_CreateToken &event);
+
+    /** @} */
+
+    /** @name Card attribute and counter updates
+     *  @{
+     */
+
+    /**
+     * @brief Set a card attribute (tapped, PT, annotation, etc.).
+     *
+     * May apply to a single card or all cards in a zone if no card ID
+     * is provided by the event.
+     */
     void
     eventSetCardAttr(const Event_SetCardAttr &event, const GameEventContext &context, EventProcessingOptions options);
+
+    /// Update a counter attached to a card.
     void eventSetCardCounter(const Event_SetCardCounter &event);
+
+    /// Create a player-level counter.
     void eventCreateCounter(const Event_CreateCounter &event);
-    void eventSetCounter(const Event_SetCounter &event);
+
+    /// Set a player-level counter value.
+    void eventSetCounter(const Event_SetCounter &event, EventProcessingOptions options);
+
+    /// Delete a player-level counter.
     void eventDelCounter(const Event_DelCounter &event);
+
+    /** @} */
+
+    /** @name Zone-level operations
+     *  @{
+     */
+
+    /// Log a zone dump (e.g. reveal graveyard/library contents).
     void eventDumpZone(const Event_DumpZone &event);
+
+    /**
+     * @brief Move a card between zones and/or players.
+     *
+     * This is one of the most complex handlers:
+     * - Removes the card from the start zone
+     * - Updates card identity and ownership if needed
+     * - Handles attachments and arrows
+     * - Emits appropriate move or undo-draw logs
+     * - Inserts the card into the target zone
+     */
     void eventMoveCard(const Event_MoveCard &event, const GameEventContext &context);
+
+    /// Flip a card face up or face down.
     void eventFlipCard(const Event_FlipCard &event);
+
+    /// Destroy a card and clean up attachments.
     void eventDestroyCard(const Event_DestroyCard &event);
+
+    /// Attach or detach a card to/from another card.
     void eventAttachCard(const Event_AttachCard &event);
+
+    /** @} */
+
+    /** @name Draw and reveal operations
+     *  @{
+     */
+
+    /// Draw one or more cards from the deck.
     void eventDrawCards(const Event_DrawCards &event);
+
+    /**
+     * @brief Reveal cards from a zone.
+     *
+     * Handles peeking, in-place top-card reveals, full reveal windows,
+     * and write-access granting.
+     */
     void eventRevealCards(const Event_RevealCards &event, EventProcessingOptions options);
+
+    /** @} */
+
+    /** @name Zone configuration
+     *  @{
+     */
+
+    /// Update zone visibility and reveal behavior.
     void eventChangeZoneProperties(const Event_ChangeZoneProperties &event);
 
+    /** @} */
+
+    void eventGameLogNotice(const Event_GameLogNotice &event);
+signals:
+    /** @name Logging signals
+     *  @{
+     */
+    void logSay(PlayerLogic *player, QString message);
+    void logShuffle(PlayerLogic *player, CardZoneLogic *zone, int start, int end);
+    void logRollDie(PlayerLogic *player, int sides, const QList<uint> &rolls);
+    void logCreateArrow(PlayerLogic *player,
+                        PlayerLogic *startPlayer,
+                        QString startCard,
+                        PlayerLogic *targetPlayer,
+                        QString targetCard,
+                        bool _playerTarget);
+    void logCreateToken(PlayerLogic *player, QString cardName, QString pt, bool faceDown);
+    void logDrawCards(PlayerLogic *player, int number, bool deckIsEmpty);
+    void logUndoDraw(PlayerLogic *player, QString cardName);
+    void logUndoDrawFailed(PlayerLogic *player);
+    void logMoveCard(PlayerLogic *player,
+                     CardItem *card,
+                     CardZoneLogic *startZone,
+                     int oldX,
+                     CardZoneLogic *targetZone,
+                     int newX);
+    void logFlipCard(PlayerLogic *player, QString cardName, bool faceDown);
+    void logDestroyCard(PlayerLogic *player, QString cardName);
+    void logAttachCard(PlayerLogic *player, QString cardName, PlayerLogic *targetPlayer, QString targetCardName);
+    void logUnattachCard(PlayerLogic *player, QString cardName);
+    void logSetCardCounter(PlayerLogic *player, QString cardName, int counterId, int value, int oldValue);
+    void logSetTapped(PlayerLogic *player, CardItem *card, bool tapped);
+    void logSetCounter(PlayerLogic *player, QString counterName, int value, int oldValue);
+    void logSetDoesntUntap(PlayerLogic *player, CardItem *card, bool doesntUntap);
+    void logSetPT(PlayerLogic *player, CardItem *card, QString newPT);
+    void logSetAnnotation(PlayerLogic *player, CardItem *card, QString newAnnotation);
+    void logDumpZone(PlayerLogic *player, CardZoneLogic *zone, int numberCards, bool isReversed = false);
+    void logRevealCards(PlayerLogic *player,
+                        CardZoneLogic *zone,
+                        int cardId,
+                        QString cardName,
+                        PlayerLogic *otherPlayer,
+                        bool faceDown,
+                        int amount,
+                        bool isLentToAnotherPlayer = false);
+    void logAlwaysRevealTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal);
+    void logAlwaysLookAtTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal);
+    /** @} */
+
+    void cardZoneChanged(CardItem *card, bool sameZone);
+    void requestCardMenuUpdate(const CardItem *card);
+
 private:
-    Player *player;
+    /** Owning player instance. */
+    PlayerLogic *player;
+
+    void setCardAttrHelper(const GameEventContext &context,
+                           CardItem *card,
+                           CardAttribute attribute,
+                           const QString &avalue,
+                           bool allCards,
+                           EventProcessingOptions options);
 };
 
 #endif // COCKATRICE_PLAYER_EVENT_HANDLER_H
diff --git a/cockatrice/src/game/player/player_graphics_item.cpp b/cockatrice/src/game/player/player_graphics_item.cpp
deleted file mode 100644
index 30648c926..000000000
--- a/cockatrice/src/game/player/player_graphics_item.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-#include "player_graphics_item.h"
-
-#include "../../interface/widgets/tabs/tab_game.h"
-#include "../board/abstract_card_item.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"
-
-PlayerGraphicsItem::PlayerGraphicsItem(Player *_player) : player(_player)
-{
-    connect(&SettingsCache::instance(), &SettingsCache::horizontalHandChanged, this,
-            &PlayerGraphicsItem::rearrangeZones);
-    connect(&SettingsCache::instance(), &SettingsCache::handJustificationChanged, this,
-            &PlayerGraphicsItem::rearrangeZones);
-    connect(player, &Player::rearrangeCounters, this, &PlayerGraphicsItem::rearrangeCounters);
-
-    playerArea = new PlayerArea(this);
-
-    playerTarget = new PlayerTarget(player, playerArea);
-    qreal avatarMargin = (counterAreaWidth + CARD_HEIGHT + 15 - playerTarget->boundingRect().width()) / 2.0;
-    playerTarget->setPos(QPointF(avatarMargin, avatarMargin));
-
-    initializeZones();
-
-    connect(tableZoneGraphicsItem, &TableZone::sizeChanged, this, &PlayerGraphicsItem::updateBoundingRect);
-
-    updateBoundingRect();
-
-    rearrangeZones();
-    retranslateUi();
-}
-
-void PlayerGraphicsItem::retranslateUi()
-{
-    player->getPlayerMenu()->retranslateUi();
-
-    QMapIterator<QString, CardZoneLogic *> zoneIterator(player->getZones());
-    while (zoneIterator.hasNext()) {
-        emit zoneIterator.next().value()->retranslateUi();
-    }
-
-    QMapIterator<int, AbstractCounter *> counterIterator(player->getCounters());
-    while (counterIterator.hasNext()) {
-        counterIterator.next().value()->retranslateUi();
-    }
-}
-
-void PlayerGraphicsItem::onPlayerActiveChanged(bool _active)
-{
-    tableZoneGraphicsItem->setActive(_active);
-}
-
-void PlayerGraphicsItem::initializeZones()
-{
-    deckZoneGraphicsItem = new PileZone(player->getDeckZone(), this);
-    auto base = QPointF(counterAreaWidth + (CARD_HEIGHT - CARD_WIDTH + 15) / 2.0,
-                        10 + playerTarget->boundingRect().height() + 5 - (CARD_HEIGHT - CARD_WIDTH) / 2.0);
-    deckZoneGraphicsItem->setPos(base);
-
-    qreal h = deckZoneGraphicsItem->boundingRect().width() + 5;
-
-    sideboardGraphicsItem = new PileZone(player->getSideboardZone(), this);
-    player->getSideboardZone()->setGraphicsVisibility(false);
-
-    auto *handCounter = new HandCounter(playerArea);
-    handCounter->setPos(base + QPointF(0, h + 10));
-    qreal h2 = handCounter->boundingRect().height();
-
-    graveyardZoneGraphicsItem = new PileZone(player->getGraveZone(), this);
-    graveyardZoneGraphicsItem->setPos(base + QPointF(0, h + h2 + 10));
-
-    rfgZoneGraphicsItem = new PileZone(player->getRfgZone(), this);
-    rfgZoneGraphicsItem->setPos(base + QPointF(0, 2 * h + h2 + 10));
-
-    tableZoneGraphicsItem = new TableZone(player->getTableZone(), this);
-    connect(tableZoneGraphicsItem, &TableZone::sizeChanged, this, &PlayerGraphicsItem::updateBoundingRect);
-
-    stackZoneGraphicsItem =
-        new StackZone(player->getStackZone(), static_cast<int>(tableZoneGraphicsItem->boundingRect().height()), this);
-
-    handZoneGraphicsItem =
-        new HandZone(player->getHandZone(), static_cast<int>(tableZoneGraphicsItem->boundingRect().height()), this);
-
-    connect(handZoneGraphicsItem->getLogic(), &HandZoneLogic::cardCountChanged, handCounter,
-            &HandCounter::updateNumber);
-    connect(handCounter, &HandCounter::showContextMenu, handZoneGraphicsItem, &HandZone::showContextMenu);
-}
-
-QRectF PlayerGraphicsItem::boundingRect() const
-{
-    return bRect;
-}
-
-qreal PlayerGraphicsItem::getMinimumWidth() const
-{
-    qreal result = tableZoneGraphicsItem->getMinimumWidth() + CARD_HEIGHT + 15 + counterAreaWidth +
-                   stackZoneGraphicsItem->boundingRect().width();
-    if (!SettingsCache::instance().getHorizontalHand()) {
-        result += handZoneGraphicsItem->boundingRect().width();
-    }
-    return result;
-}
-
-void PlayerGraphicsItem::paint(QPainter * /*painter*/,
-                               const QStyleOptionGraphicsItem * /*option*/,
-                               QWidget * /*widget*/)
-{
-}
-
-void PlayerGraphicsItem::processSceneSizeChange(int newPlayerWidth)
-{
-    // Extend table (and hand, if horizontal) to accommodate the new player width.
-    qreal tableWidth =
-        newPlayerWidth - CARD_HEIGHT - 15 - counterAreaWidth - stackZoneGraphicsItem->boundingRect().width();
-    if (!SettingsCache::instance().getHorizontalHand()) {
-        tableWidth -= handZoneGraphicsItem->boundingRect().width();
-    }
-
-    tableZoneGraphicsItem->setWidth(tableWidth);
-    handZoneGraphicsItem->setWidth(tableWidth + stackZoneGraphicsItem->boundingRect().width());
-}
-
-void PlayerGraphicsItem::setMirrored(bool _mirrored)
-{
-    if (mirrored != _mirrored) {
-        mirrored = _mirrored;
-        rearrangeZones();
-    }
-}
-
-void PlayerGraphicsItem::rearrangeCounters()
-{
-    qreal marginTop = 80;
-    const qreal padding = 5;
-    qreal ySize = boundingRect().y() + marginTop;
-
-    // Place objects
-    for (const auto &counter : player->getCounters()) {
-        AbstractCounter *ctr = counter;
-
-        if (!ctr->getShownInCounterArea()) {
-            continue;
-        }
-
-        QRectF br = ctr->boundingRect();
-        ctr->setPos((counterAreaWidth - br.width()) / 2, ySize);
-        ySize += br.height() + padding;
-    }
-}
-
-void PlayerGraphicsItem::rearrangeZones()
-{
-    auto base = QPointF(CARD_HEIGHT + counterAreaWidth + 15, 0);
-    if (SettingsCache::instance().getHorizontalHand()) {
-        if (mirrored) {
-            if (player->getHandZone()->contentsKnown()) {
-                player->getPlayerInfo()->setHandVisible(true);
-                handZoneGraphicsItem->setPos(base);
-                base += QPointF(0, handZoneGraphicsItem->boundingRect().height());
-            } else {
-                player->getPlayerInfo()->setHandVisible(false);
-            }
-
-            stackZoneGraphicsItem->setPos(base);
-            base += QPointF(stackZoneGraphicsItem->boundingRect().width(), 0);
-
-            tableZoneGraphicsItem->setPos(base);
-        } else {
-            stackZoneGraphicsItem->setPos(base);
-
-            tableZoneGraphicsItem->setPos(base.x() + stackZoneGraphicsItem->boundingRect().width(), 0);
-            base += QPointF(0, tableZoneGraphicsItem->boundingRect().height());
-
-            if (player->getHandZone()->contentsKnown()) {
-                player->getPlayerInfo()->setHandVisible(true);
-                handZoneGraphicsItem->setPos(base);
-            } else {
-                player->getPlayerInfo()->setHandVisible(false);
-            }
-        }
-        handZoneGraphicsItem->setWidth(tableZoneGraphicsItem->getWidth() +
-                                       stackZoneGraphicsItem->boundingRect().width());
-    } else {
-        player->getPlayerInfo()->setHandVisible(true);
-
-        handZoneGraphicsItem->setPos(base);
-        base += QPointF(handZoneGraphicsItem->boundingRect().width(), 0);
-
-        stackZoneGraphicsItem->setPos(base);
-        base += QPointF(stackZoneGraphicsItem->boundingRect().width(), 0);
-
-        tableZoneGraphicsItem->setPos(base);
-    }
-    handZoneGraphicsItem->setVisible(player->getPlayerInfo()->getHandVisible());
-    handZoneGraphicsItem->updateOrientation();
-    tableZoneGraphicsItem->reorganizeCards();
-    updateBoundingRect();
-    rearrangeCounters();
-}
-
-void PlayerGraphicsItem::updateBoundingRect()
-{
-    prepareGeometryChange();
-    qreal width = CARD_HEIGHT + 15 + counterAreaWidth + stackZoneGraphicsItem->boundingRect().width();
-    if (SettingsCache::instance().getHorizontalHand()) {
-        qreal handHeight =
-            player->getPlayerInfo()->getHandVisible() ? handZoneGraphicsItem->boundingRect().height() : 0;
-        bRect = QRectF(0, 0, width + tableZoneGraphicsItem->boundingRect().width(),
-                       tableZoneGraphicsItem->boundingRect().height() + handHeight);
-    } else {
-        bRect = QRectF(
-            0, 0, width + handZoneGraphicsItem->boundingRect().width() + tableZoneGraphicsItem->boundingRect().width(),
-            tableZoneGraphicsItem->boundingRect().height());
-    }
-    playerArea->setSize(CARD_HEIGHT + counterAreaWidth + 15, bRect.height());
-
-    emit sizeChanged();
-}
\ No newline at end of file
diff --git a/cockatrice/src/game/player/player_info.cpp b/cockatrice/src/game/player/player_info.cpp
index 8507f75eb..aef0d82aa 100644
--- a/cockatrice/src/game/player/player_info.cpp
+++ b/cockatrice/src/game/player/player_info.cpp
@@ -1,7 +1,9 @@
 #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), handVisible(false)
+    : id(_id), local(_local), judge(_judge)
 {
     userInfo = new ServerInfo_User;
     userInfo->CopyFrom(info);
diff --git a/cockatrice/src/game/player/player_info.h b/cockatrice/src/game/player/player_info.h
index 2e9b49d6d..58e877f8e 100644
--- a/cockatrice/src/game/player/player_info.h
+++ b/cockatrice/src/game/player/player_info.h
@@ -1,16 +1,16 @@
 /**
  * @file player_info.h
  * @ingroup GameLogicPlayers
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_PLAYER_INFO_H
 #define COCKATRICE_PLAYER_INFO_H
 
-#include "player_target.h"
-
 #include <QObject>
+#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <qtmetamacros.h>
 
 class PlayerInfo : public QObject
 {
@@ -22,7 +22,6 @@ public:
     int id;
     bool local;
     bool judge;
-    bool handVisible;
 
     int getId() const
     {
@@ -51,16 +50,6 @@ public:
         return judge;
     }
 
-    void setHandVisible(bool _handVisible)
-    {
-        handVisible = _handVisible;
-    }
-
-    bool getHandVisible() const
-    {
-        return handVisible;
-    }
-
     QString getName() const
     {
         return QString::fromStdString(userInfo->name());
diff --git a/cockatrice/src/game/player/player_logic.cpp b/cockatrice/src/game/player/player_logic.cpp
new file mode 100644
index 000000000..b545b7088
--- /dev/null
+++ b/cockatrice/src/game/player/player_logic.cpp
@@ -0,0 +1,364 @@
+#include "player_logic.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 "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 <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)),
+      playerEventHandler(new PlayerEventHandler(this)), playerActions(new PlayerActions(this)), active(false),
+      conceded(false), zoneId(0), dialogSemaphore(false)
+{
+    initializeZones();
+}
+
+void PlayerLogic::initializeZones()
+{
+    addZone(new PileZoneLogic(this, ZoneNames::DECK, false, true, false, this));
+    addZone(new PileZoneLogic(this, ZoneNames::GRAVE, false, false, true, this));
+    addZone(new PileZoneLogic(this, ZoneNames::EXILE, false, false, true, this));
+    addZone(new PileZoneLogic(this, ZoneNames::SIDEBOARD, false, false, false, this));
+    addZone(new TableZoneLogic(this, ZoneNames::TABLE, true, false, true, this));
+    addZone(new StackZoneLogic(this, ZoneNames::STACK, true, false, true, this));
+    bool visibleHand = playerInfo->getLocalOrJudge() ||
+                       (game->getPlayerManager()->isSpectator() && game->getGameMetaInfo()->spectatorsOmniscient());
+    addZone(new HandZoneLogic(this, ZoneNames::HAND, false, false, visibleHand, this));
+}
+
+PlayerLogic::~PlayerLogic()
+{
+    qCInfo(PlayerLog) << "Player destructor:" << getPlayerInfo()->getName();
+
+    QMapIterator<QString, CardZoneLogic *> i(zones);
+    while (i.hasNext()) {
+        delete i.next().value();
+    }
+    zones.clear();
+
+    delete getPlayerInfo()->userInfo;
+}
+
+void PlayerLogic::clear()
+{
+    emit arrowsClearedLocally();
+
+    QMapIterator<QString, CardZoneLogic *> i(zones);
+    while (i.hasNext()) {
+        i.next().value()->clearContents();
+    }
+
+    clearCounters();
+}
+
+void PlayerLogic::setConceded(bool _conceded)
+{
+    if (conceded != _conceded) {
+        conceded = _conceded;
+
+        if (conceded) {
+            clear();
+        }
+        emit concededChanged(getPlayerInfo()->getId(), conceded);
+    }
+}
+
+void PlayerLogic::setZoneId(int _zoneId)
+{
+    if (zoneId != _zoneId) {
+        zoneId = _zoneId;
+        emit zoneIdChanged(zoneId);
+    }
+}
+
+void PlayerLogic::processPlayerInfo(const ServerInfo_Player &info)
+{
+    static QSet<QString> builtinZones{/* PileZones */
+                                      ZoneNames::DECK, ZoneNames::GRAVE, ZoneNames::EXILE, ZoneNames::SIDEBOARD,
+                                      /* TableZone */
+                                      ZoneNames::TABLE,
+                                      /* StackZone */
+                                      ZoneNames::STACK,
+                                      /* HandZone */
+                                      ZoneNames::HAND};
+    clearCounters();
+    emit arrowsClearedLocally();
+
+    QMutableMapIterator<QString, CardZoneLogic *> zoneIt(zones);
+    while (zoneIt.hasNext()) {
+        zoneIt.next().value()->clearContents();
+
+        if (!builtinZones.contains(zoneIt.key())) {
+            zoneIt.remove();
+        }
+    }
+
+    emit clearCustomZonesMenu();
+
+    const int zoneListSize = info.zone_list_size();
+    for (int i = 0; i < zoneListSize; ++i) {
+        const ServerInfo_Zone &zoneInfo = info.zone_list(i);
+
+        QString zoneName = QString::fromStdString(zoneInfo.name());
+        CardZoneLogic *zone = zones.value(zoneName, 0);
+        if (!zone) {
+            // Create a new CardZone if it doesn't exist
+
+            if (zoneInfo.with_coords()) {
+                // Visibility not currently supported for TableZone
+                zone = addZone(new TableZoneLogic(this, zoneName, true, false, true, this));
+            } else {
+                // Zones without coordinats are always treated as non-shufflable
+                // PileZones, although supporting alternate hand or stack zones
+                // might make sense in some scenarios.
+                bool contentsKnown;
+
+                switch (zoneInfo.type()) {
+                    case ServerInfo_Zone::PrivateZone:
+                        contentsKnown =
+                            playerInfo->getLocalOrJudge() || (game->getPlayerManager()->isSpectator() &&
+                                                              game->getGameMetaInfo()->spectatorsOmniscient());
+                        break;
+
+                    case ServerInfo_Zone::PublicZone:
+                        contentsKnown = true;
+                        break;
+
+                    case ServerInfo_Zone::HiddenZone:
+                        contentsKnown = false;
+                        break;
+                }
+
+                zone = addZone(new PileZoneLogic(this, zoneName, false, /* isShufflable */ false, contentsKnown, this));
+            }
+
+            // Non-builtin zones are hidden by default and can't be interacted
+            // with, except through menus.
+            emit zone->setGraphicsVisibility(false);
+
+            emit addViewCustomZoneActionToCustomZoneMenu(zoneName);
+
+            continue;
+        }
+
+        const int cardListSize = zoneInfo.card_list_size();
+        if (!cardListSize) {
+            for (int j = 0; j < zoneInfo.card_count(); ++j) {
+                zone->addCard(new CardItem(this), false, -1);
+            }
+        } else {
+            for (int j = 0; j < cardListSize; ++j) {
+                const ServerInfo_Card &cardInfo = zoneInfo.card_list(j);
+                auto *card = new CardItem(this);
+                card->processCardInfo(cardInfo);
+                // Zones without coordinates (hand, piles, stack) preserve the order
+                // they arrive in on the server in the positions of their cards list.
+                // The x coordinate of such cards is always 0, so inserting at it
+                // would reverse the list on reconnect. Append instead.
+                if (zoneInfo.with_coords()) {
+                    zone->addCard(card, false, cardInfo.x(), cardInfo.y());
+                } else {
+                    zone->addCard(card, false, -1);
+                }
+            }
+        }
+        if (zoneInfo.has_always_reveal_top_card()) {
+            zone->setAlwaysRevealTopCard(zoneInfo.always_reveal_top_card());
+        }
+
+        zone->reorganizeCards();
+    }
+
+    const int counterListSize = info.counter_list_size();
+    for (int i = 0; i < counterListSize; ++i) {
+        addCounter(info.counter_list(i));
+    }
+
+    setConceded(info.properties().conceded());
+}
+
+void PlayerLogic::processCardAttachment(const ServerInfo_Player &info)
+{
+    const int zoneListSize = info.zone_list_size();
+    for (int i = 0; i < zoneListSize; ++i) {
+        const ServerInfo_Zone &zoneInfo = info.zone_list(i);
+        CardZoneLogic *zone = zones.value(QString::fromStdString(zoneInfo.name()), 0);
+        if (!zone) {
+            continue;
+        }
+
+        const int cardListSize = zoneInfo.card_list_size();
+        for (int j = 0; j < cardListSize; ++j) {
+            const ServerInfo_Card &cardInfo = zoneInfo.card_list(j);
+            if (cardInfo.has_attach_player_id()) {
+                CardItem *startCard = zone->getCard(cardInfo.id());
+                CardItem *targetCard =
+                    game->getCard(cardInfo.attach_player_id(), QString::fromStdString(cardInfo.attach_zone()),
+                                  cardInfo.attach_card_id());
+                if (!targetCard) {
+                    continue;
+                }
+
+                startCard->setAttachedTo(targetCard);
+            }
+        }
+    }
+
+    const int arrowListSize = info.arrow_list_size();
+    for (int i = 0; i < arrowListSize; ++i) {
+        emit arrowCreateRequested(QSharedPointer<ArrowData>::create(
+            ArrowData::fromProto(info.arrow_list(i), getPlayerInfo()->getId(), getPlayerInfo()->getLocal())));
+    }
+}
+
+void PlayerLogic::addCard(CardItem *card)
+{
+    emit newCardAdded(card);
+}
+
+void PlayerLogic::deleteCard(CardItem *card)
+{
+    if (card == nullptr) {
+        return;
+    } else if (dialogSemaphore) {
+        cardsToDelete.append(card);
+    } else {
+        card->deleteLater();
+    }
+}
+
+void PlayerLogic::setDeck(const DeckList &_deck)
+{
+    deck = _deck;
+
+    emit deckChanged();
+}
+
+void PlayerLogic::setPlaymatFromProperties(const ServerInfo_PlayerProperties &props)
+{
+    if (props.has_playmat_params() && !props.playmat_params().card_name().empty()) {
+        const auto &pp = props.playmat_params();
+        remotePlaymatCard = {QString::fromStdString(pp.card_name()), QString::fromStdString(pp.card_provider_id())};
+        remotePlaymatParams = {qBound(0.0, pp.margin_pct_l(), 0.95), qBound(0.0, pp.margin_pct_r(), 0.95),
+                               qBound(0.0, pp.vertical_offset(), 1.0), qBound(0.1, pp.zoom(), 4.0)};
+        hasRemotePlaymat = true;
+    } else {
+        remotePlaymatCard = CardRef{};
+        remotePlaymatParams = PlaymatParams{};
+        hasRemotePlaymat = false;
+    }
+    emit playmatChanged();
+}
+
+CounterState *PlayerLogic::addCounter(const ServerInfo_Counter &counter)
+{
+    return addCounter(counter.id(), QString::fromStdString(counter.name()),
+                      convertColorToQColor(counter.counter_color()), counter.radius(), counter.count());
+}
+
+CounterState *PlayerLogic::addCounter(int id, const QString &name, const QColor &color, int radius, int value)
+{
+    if (counters.contains(id)) {
+        return nullptr;
+    }
+    auto *state = new CounterState(id, name, color, radius, value, this);
+    counters.insert(id, state);
+    emit counterAdded(state);
+    return state;
+}
+
+void PlayerLogic::delCounter(int id)
+{
+    auto *state = counters.take(id);
+    if (!state) {
+        return;
+    }
+    emit counterRemoved(id);
+    state->deleteLater();
+}
+
+void PlayerLogic::clearCounters()
+{
+    for (int id : counters.keys()) {
+        emit counterRemoved(id);
+    }
+    qDeleteAll(counters);
+    counters.clear();
+}
+
+CounterState *PlayerLogic::getLifeCounter() const
+{
+    for (auto *s : counters.values()) {
+        if (s->getName() == "life") {
+            return s;
+        }
+    }
+    return nullptr;
+}
+
+bool PlayerLogic::clearCardsToDelete()
+{
+    if (cardsToDelete.isEmpty()) {
+        return false;
+    }
+
+    for (auto &i : cardsToDelete) {
+        if (i != nullptr) {
+            i->deleteLater();
+        }
+    }
+    cardsToDelete.clear();
+
+    return true;
+}
+
+void PlayerLogic::setActive(bool _active)
+{
+    active = _active;
+    emit activeChanged(active);
+}
+void PlayerLogic::onRequestZoneViewToggle(const QString &zoneName, int numberCards, bool isReversed)
+{
+    emit requestZoneViewToggle(this, zoneName, numberCards, isReversed);
+}
+
+void PlayerLogic::updateZones()
+{
+    getTableZone()->reorganizeCards();
+}
+
+void PlayerLogic::setGameStarted()
+{
+    if (playerInfo->local) {
+        emit resetTopCardMenuActions();
+    }
+    setConceded(false);
+}
diff --git a/cockatrice/src/game/player/player_logic.h b/cockatrice/src/game/player/player_logic.h
new file mode 100644
index 000000000..59da7cc32
--- /dev/null
+++ b/cockatrice/src/game/player/player_logic.h
@@ -0,0 +1,272 @@
+/**
+ * @file player.h
+ * @ingroup GameLogicPlayers
+ */
+//! \todo Document this file.
+
+#ifndef PLAYER_H
+#define PLAYER_H
+
+#include "../zones/card_zone_logic.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 <QColor>
+#include <QInputDialog>
+#include <QList>
+#include <QLoggingCategory>
+#include <QMap>
+#include <QObject>
+#include <QString>
+#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");
+class AbstractCardItem;
+class AbstractGame;
+class PlayerInfo;
+class PlayerEventHandler;
+class PlayerActions;
+class ServerInfo_Card;
+class ServerInfo_Counter;
+class ServerInfo_Player;
+class ServerInfo_User;
+
+const int MAX_TOKENS_PER_DIALOG = 99;
+
+class PlayerLogic : public QObject
+{
+    Q_OBJECT
+
+signals:
+    void openDeckEditor(const LoadedDeck &deck);
+    void requestZoneViewToggle(PlayerLogic *player, const QString &zoneName, int numberCards, bool isReversed);
+    void requestRevealedZoneView(PlayerLogic *player,
+                                 CardZoneLogic *zone,
+                                 const QList<const ServerInfo_Card *> &cardList,
+                                 bool withWritePermission);
+    void deckChanged();
+    /** @brief Emitted when the remote playmat (card/params) is updated from player properties. */
+    void playmatChanged();
+    void newCardAdded(AbstractCardItem *card);
+    void requestCardMenuUpdate(const CardItem *card);
+    void counterAdded(CounterState *state);
+    void counterRemoved(int counterId);
+    void rearrangeCounters();
+    void activeChanged(bool active);
+    void zoneIdChanged(int zoneId);
+    void concededChanged(int playerId, bool conceded);
+    void clearCustomZonesMenu();
+    void addViewCustomZoneActionToCustomZoneMenu(QString zoneName);
+    void resetTopCardMenuActions();
+    void arrowCreateRequested(QSharedPointer<ArrowData> data);
+    void arrowDeleteRequested(int creatorId, int arrowId);
+    void arrowDeleted(int creatorId, int arrowId);
+    void arrowsClearedLocally(); // fires on clear() and processPlayerInfo
+
+public slots:
+    void setActive(bool _active);
+    void onRequestZoneViewToggle(const QString &zoneName, int numberCards, bool isReversed);
+
+public:
+    PlayerLogic(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent);
+    ~PlayerLogic() override;
+
+    void initializeZones();
+    void updateZones();
+    void clear();
+
+    void processPlayerInfo(const ServerInfo_Player &info);
+    void processCardAttachment(const ServerInfo_Player &info);
+
+    void addCard(CardItem *c);
+    void deleteCard(CardItem *c);
+
+    bool clearCardsToDelete();
+
+    bool getActive() const
+    {
+        return active;
+    }
+
+    AbstractGame *getGame() const
+    {
+        return game;
+    }
+
+    [[nodiscard]] PlayerActions *getPlayerActions() const
+    {
+        return playerActions;
+    }
+
+    [[nodiscard]] PlayerEventHandler *getPlayerEventHandler() const
+    {
+        return playerEventHandler;
+    }
+
+    [[nodiscard]] PlayerInfo *getPlayerInfo() const
+    {
+        return playerInfo;
+    }
+
+    void setDeck(const DeckList &_deck);
+
+    [[nodiscard]] const DeckList &getDeck() const
+    {
+        return deck;
+    }
+
+    template <typename T> T *addZone(T *zone)
+    {
+        zones.insert(zone->getName(), zone);
+        return zone;
+    }
+
+    CardZoneLogic *getZone(const QString zoneName)
+    {
+        return zones.value(zoneName);
+    }
+
+    const QMap<QString, CardZoneLogic *> &getZones() const
+    {
+        return zones;
+    }
+
+    PileZoneLogic *getDeckZone()
+    {
+        return qobject_cast<PileZoneLogic *>(zones.value(ZoneNames::DECK));
+    }
+
+    PileZoneLogic *getGraveZone()
+    {
+        return qobject_cast<PileZoneLogic *>(zones.value(ZoneNames::GRAVE));
+    }
+
+    PileZoneLogic *getRfgZone()
+    {
+        return qobject_cast<PileZoneLogic *>(zones.value(ZoneNames::EXILE));
+    }
+
+    PileZoneLogic *getSideboardZone()
+    {
+        return qobject_cast<PileZoneLogic *>(zones.value(ZoneNames::SIDEBOARD));
+    }
+
+    TableZoneLogic *getTableZone()
+    {
+        return qobject_cast<TableZoneLogic *>(zones.value(ZoneNames::TABLE));
+    }
+
+    StackZoneLogic *getStackZone()
+    {
+        return qobject_cast<StackZoneLogic *>(zones.value(ZoneNames::STACK));
+    }
+
+    HandZoneLogic *getHandZone()
+    {
+        return qobject_cast<HandZoneLogic *>(zones.value(ZoneNames::HAND));
+    }
+
+    CounterState *addCounter(const ServerInfo_Counter &counter);
+    CounterState *addCounter(int id, const QString &name, const QColor &color, int radius, int value);
+    void delCounter(int counterId);
+    void clearCounters();
+
+    QMap<int, CounterState *> getCounters() const
+    {
+        return counters;
+    }
+
+    /**
+     * Gets the counter that represents the life total.
+     */
+    CounterState *getLifeCounter() const;
+
+    void setConceded(bool _conceded);
+    bool getConceded() const
+    {
+        return conceded;
+    }
+
+    void setGameStarted();
+
+    void setDialogSemaphore(const bool _active)
+    {
+        dialogSemaphore = _active;
+    }
+
+    int getZoneId() const
+    {
+        return zoneId;
+    }
+
+    void setZoneId(int _zoneId);
+
+    void setPlaymatFromProperties(const ServerInfo_PlayerProperties &props);
+    const CardRef &getRemotePlaymatCard() const
+    {
+        return remotePlaymatCard;
+    }
+    const PlaymatParams &getRemotePlaymatParams() const
+    {
+        return remotePlaymatParams;
+    }
+    bool getHasRemotePlaymat() const
+    {
+        return hasRemotePlaymat;
+    }
+
+private:
+    AbstractGame *game;
+    PlayerInfo *playerInfo;
+    PlayerEventHandler *playerEventHandler;
+    PlayerActions *playerActions;
+
+    bool active;
+    bool conceded;
+
+    DeckList deck;
+
+    int zoneId;
+    QMap<QString, CardZoneLogic *> zones;
+    QMap<int, CounterState *> counters;
+
+    bool dialogSemaphore;
+    QList<CardItem *> cardsToDelete;
+
+    // Playmat from player properties (for opponent display)
+    CardRef remotePlaymatCard;
+    PlaymatParams remotePlaymatParams;
+    bool hasRemotePlaymat = false;
+};
+
+class AnnotationDialog : public QInputDialog
+{
+    Q_OBJECT
+    void keyPressEvent(QKeyEvent *e) override;
+
+public:
+    explicit AnnotationDialog(QWidget *parent = nullptr) : QInputDialog(parent)
+    {
+    }
+};
+
+#endif
diff --git a/cockatrice/src/game/player/player_manager.cpp b/cockatrice/src/game/player/player_manager.cpp
index e283d2196..4730805ad 100644
--- a/cockatrice/src/game/player/player_manager.cpp
+++ b/cockatrice/src/game/player/player_manager.cpp
@@ -1,35 +1,44 @@
 #include "player_manager.h"
 
 #include "../abstract_game.h"
-#include "player.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,
                              bool localPlayerIsSpectator)
-    : QObject(_game), game(_game), players(QMap<int, Player *>()), localPlayerId(_localPlayerId),
+    : QObject(_game), game(_game), players(QMap<int, PlayerLogic *>()), localPlayerId(_localPlayerId),
       localPlayerIsJudge(_localPlayerIsJudge), localPlayerIsSpectator(localPlayerIsSpectator)
 {
 }
 
 bool PlayerManager::isMainPlayerConceded() const
 {
-    Player *player = players.value(localPlayerId, nullptr);
+    PlayerLogic *player = players.value(localPlayerId, nullptr);
     return player && player->getConceded();
 }
 
-Player *PlayerManager::getActiveLocalPlayer(int activePlayer) const
+PlayerLogic *PlayerManager::getActiveLocalPlayer(int activePlayer) const
 {
-    Player *active = players.value(activePlayer, 0);
-    if (active)
-        if (active->getPlayerInfo()->getLocal())
+    PlayerLogic *active = players.value(activePlayer, 0);
+    if (active) {
+        if (active->getPlayerInfo()->getLocal()) {
             return active;
+        }
+    }
 
-    QMapIterator<int, Player *> playerIterator(players);
+    QMapIterator<int, PlayerLogic *> playerIterator(players);
     while (playerIterator.hasNext()) {
-        Player *temp = playerIterator.next().value();
-        if (temp->getPlayerInfo()->getLocal())
+        PlayerLogic *temp = playerIterator.next().value();
+        if (temp->getPlayerInfo()->getLocal()) {
             return temp;
+        }
     }
 
     return nullptr;
@@ -40,11 +49,11 @@ bool PlayerManager::isLocalPlayer(int playerId)
     return game->getGameState()->getIsLocalGame() || playerId == localPlayerId;
 }
 
-Player *PlayerManager::addPlayer(int playerId, const ServerInfo_User &info)
+PlayerLogic *PlayerManager::addPlayer(int playerId, const ServerInfo_User &info)
 {
-    auto *newPlayer = new Player(info, playerId, isLocalPlayer(playerId) || game->getGameState()->getIsLocalGame(),
-                                 isJudge(), getGame());
-    connect(newPlayer, &Player::concededChanged, this, &PlayerManager::onPlayerConceded);
+    auto *newPlayer = new PlayerLogic(info, playerId, isLocalPlayer(playerId) || game->getGameState()->getIsLocalGame(),
+                                      isJudge(), getGame());
+    connect(newPlayer, &PlayerLogic::concededChanged, this, &PlayerManager::onPlayerConceded);
     players.insert(playerId, newPlayer);
     emit playerAdded(newPlayer);
     emit playerCountChanged();
@@ -53,7 +62,7 @@ Player *PlayerManager::addPlayer(int playerId, const ServerInfo_User &info)
 
 void PlayerManager::removePlayer(int playerId)
 {
-    Player *player = getPlayer(playerId);
+    PlayerLogic *player = getPlayer(playerId);
     if (!player) {
         return;
     }
@@ -63,14 +72,23 @@ void PlayerManager::removePlayer(int playerId)
     player->deleteLater();
 }
 
-Player *PlayerManager::getPlayer(int playerId) const
+PlayerLogic *PlayerManager::getPlayer(int playerId) const
 {
-    Player *player = players.value(playerId, 0);
-    if (!player)
+    PlayerLogic *player = players.value(playerId, 0);
+    if (!player) {
         return nullptr;
+    }
     return player;
 }
 
+void PlayerManager::clearSpectators()
+{
+    const QList<int> spectatorIds = spectators.keys();
+    for (int spectatorId : spectatorIds) {
+        removeSpectator(spectatorId);
+    }
+}
+
 void PlayerManager::onPlayerConceded(int playerId, bool conceded)
 {
     // Everything else cares about this
diff --git a/cockatrice/src/game/player/player_manager.h b/cockatrice/src/game/player/player_manager.h
index 0f813b3e4..7a9f7645b 100644
--- a/cockatrice/src/game/player/player_manager.h
+++ b/cockatrice/src/game/player/player_manager.h
@@ -1,18 +1,23 @@
 /**
  * @file player_manager.h
  * @ingroup GameLogicPlayers
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 Player;
+class PlayerLogic;
+
 class PlayerManager : public QObject
 {
     Q_OBJECT
@@ -21,7 +26,7 @@ public:
     PlayerManager(AbstractGame *_game, int _localPlayerId, bool _localPlayerIsJudge, bool localPlayerIsSpectator);
 
     AbstractGame *game;
-    QMap<int, Player *> players;
+    QMap<int, PlayerLogic *> players;
     int localPlayerId;
     bool localPlayerIsJudge;
     bool localPlayerIsSpectator;
@@ -42,7 +47,7 @@ public:
         return localPlayerId;
     }
 
-    [[nodiscard]] const QMap<int, Player *> &getPlayers() const
+    [[nodiscard]] const QMap<int, PlayerLogic *> &getPlayers() const
     {
         return players;
     }
@@ -52,14 +57,14 @@ public:
         return players.size();
     }
 
-    [[nodiscard]] Player *getActiveLocalPlayer(int activePlayer) const;
+    [[nodiscard]] PlayerLogic *getActiveLocalPlayer(int activePlayer) const;
     bool isLocalPlayer(int playerId);
 
-    Player *addPlayer(int playerId, const ServerInfo_User &info);
+    PlayerLogic *addPlayer(int playerId, const ServerInfo_User &info);
 
     void removePlayer(int playerId);
 
-    [[nodiscard]] Player *getPlayer(int playerId) const;
+    [[nodiscard]] PlayerLogic *getPlayer(int playerId) const;
 
     void onPlayerConceded(int playerId, bool conceded);
 
@@ -100,14 +105,17 @@ public:
         emit spectatorRemoved(spectatorId, spectatorInfo);
     }
 
+    /** @brief Remove all spectators, emitting the removal signal for each. */
+    void clearSpectators();
+
     [[nodiscard]] AbstractGame *getGame() const
     {
         return game;
     }
 
 signals:
-    void playerAdded(Player *player);
-    void playerRemoved(Player *player);
+    void playerAdded(PlayerLogic *player);
+    void playerRemoved(PlayerLogic *player);
     void activeLocalPlayerConceded();
     void activeLocalPlayerUnconceded();
     void playerConceded(int playerId);
diff --git a/cockatrice/src/game/replay.cpp b/cockatrice/src/game/replay.cpp
index 6886f817a..4ab4a6321 100644
--- a/cockatrice/src/game/replay.cpp
+++ b/cockatrice/src/game/replay.cpp
@@ -1,10 +1,17 @@
 #include "replay.h"
 
-#include "../interface/widgets/tabs/tab_game.h"
+#include "game_meta_info.h"
+#include "game_state.h"
+#include "player/player_manager.h"
 
-Replay::Replay(TabGame *_tab, GameReplay *_replay) : AbstractGame(_tab)
+#include <QList>
+
+class GameReplay;
+class QObject;
+
+Replay::Replay(QObject *_parent, const GameReplay *_replay, bool isLocalGame) : AbstractGame(_parent)
 {
-    gameState = new GameState(this, 0, -1, tab->getTabSupervisor()->getIsLocalGame(), {}, false, false, -1, false);
+    gameState = new GameState(this, 0, -1, isLocalGame, {}, false, false, -1, false);
     connect(gameMetaInfo, &GameMetaInfo::startedChanged, gameState, &GameState::onStartedChanged);
     playerManager = new PlayerManager(this, -1, false, true);
     loadReplay(_replay);
diff --git a/cockatrice/src/game/replay.h b/cockatrice/src/game/replay.h
index 301f47580..cc995dbac 100644
--- a/cockatrice/src/game/replay.h
+++ b/cockatrice/src/game/replay.h
@@ -2,20 +2,25 @@
  * @file replay.h
  * @ingroup GameLogic
  * @ingroup Replay
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_REPLAY_H
 #define COCKATRICE_REPLAY_H
 
 #include "abstract_game.h"
 
+#include <qtmetamacros.h>
+
+class GameReplay;
+class QObject;
+
 class Replay : public AbstractGame
 {
     Q_OBJECT
 
 public:
-    explicit Replay(TabGame *_tab, GameReplay *_replay);
+    explicit Replay(QObject *_parent, const GameReplay *_replay, bool isLocalGame);
 };
 
 #endif // COCKATRICE_REPLAY_H
diff --git a/cockatrice/src/game/zones/card_zone_algorithms.h b/cockatrice/src/game/zones/card_zone_algorithms.h
new file mode 100644
index 000000000..118a7d29d
--- /dev/null
+++ b/cockatrice/src/game/zones/card_zone_algorithms.h
@@ -0,0 +1,45 @@
+#ifndef COCKATRICE_CARD_ZONE_ALGORITHMS_H
+#define COCKATRICE_CARD_ZONE_ALGORITHMS_H
+
+namespace CardZoneAlgorithms
+{
+
+/**
+ * Shared insertion logic for zones where cards become visible on add and follow
+ * the standard pattern: clamp index, insert, clear identity if contents unknown,
+ * reset state, show card.
+ *
+ * Zones with different post-add behavior (signal connections, positional resets,
+ * hidden cards, or coordinate-based placement) should NOT use this — implement
+ * addCardImpl directly instead.
+ *
+ * Template parameters allow testing with lightweight mocks that avoid Qt graphics
+ * dependencies.
+ *
+ * @tparam CardList Must provide: size() -> int, insert(int, CardType*),
+ *                  getContentsKnown() -> bool
+ * @tparam CardType Must provide: setId(int), setCardRef(CardRefType),
+ *                  resetState(bool), setVisible(bool)
+ * @param keepAnnotations Forwarded to card->resetState(). Stack-like zones preserve
+ *                        annotations across zone transitions; hand-like zones clear them.
+ */
+template <typename CardList, typename CardType>
+void addCardToList(CardList &cards, CardType *card, int x, bool keepAnnotations)
+{
+    if (x < 0 || x >= cards.size()) {
+        x = static_cast<int>(cards.size());
+    }
+    cards.insert(x, card);
+
+    if (!cards.getContentsKnown()) {
+        card->setId(-1);
+        card->setCardRef({});
+    }
+
+    card->resetState(keepAnnotations);
+    card->setVisible(true);
+}
+
+} // namespace CardZoneAlgorithms
+
+#endif // COCKATRICE_CARD_ZONE_ALGORITHMS_H
diff --git a/cockatrice/src/game/zones/logic/card_zone_logic.cpp b/cockatrice/src/game/zones/card_zone_logic.cpp
similarity index 85%
rename from cockatrice/src/game/zones/logic/card_zone_logic.cpp
rename to cockatrice/src/game/zones/card_zone_logic.cpp
index bd32eab3e..d997ab9ad 100644
--- a/cockatrice/src/game/zones/logic/card_zone_logic.cpp
+++ b/cockatrice/src/game/zones/card_zone_logic.cpp
@@ -1,15 +1,25 @@
 #include "card_zone_logic.h"
 
-#include "../../board/card_item.h"
-#include "../../player/player.h"
-#include "../../player/player_actions.h"
-#include "../view_zone.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
@@ -19,7 +29,7 @@
  * @param _contentsKnown whether the cards in the zone are known to the client
  * @param parent the parent QObject.
  */
-CardZoneLogic::CardZoneLogic(Player *_player,
+CardZoneLogic::CardZoneLogic(PlayerLogic *_player,
                              const QString &_name,
                              bool _hasCardAttr,
                              bool _isShufflable,
@@ -43,8 +53,10 @@ void CardZoneLogic::addCard(CardItem *card, const bool reorganize, const int x,
 
     for (auto *view : views) {
         if (qobject_cast<ZoneViewZoneLogic *>(view->getLogic())->prepareAddCard(x)) {
-            view->getLogic()->addCard(new CardItem(player, nullptr, card->getCardRef(), card->getId()), reorganize, x,
-                                      y);
+            auto copy = new CardItem(player, nullptr, card->getCardRef(), card->getId());
+            copy->setFaceDown(card->getFaceDown());
+
+            view->getLogic()->addCard(copy, reorganize, x, y);
         }
     }
 
@@ -52,8 +64,9 @@ void CardZoneLogic::addCard(CardItem *card, const bool reorganize, const int x,
     emit cardAdded(card);
     addCardImpl(card, x, y);
 
-    if (reorganize)
+    if (reorganize) {
         emit reorganizeCards();
+    }
 
     emit cardCountChanged();
 }
@@ -63,16 +76,19 @@ CardItem *CardZoneLogic::takeCard(int position, int cardId, bool toNewZone)
     if (position == -1) {
         // position == -1 means either that the zone is indexed by card id
         // or that it doesn't matter which card you take.
-        for (int i = 0; i < cards.size(); ++i)
+        for (int i = 0; i < cards.size(); ++i) {
             if (cards[i]->getId() == cardId) {
                 position = i;
                 break;
             }
-        if (position == -1)
+        }
+        if (position == -1) {
             position = 0;
+        }
     }
-    if (position >= cards.size())
+    if (position >= cards.size()) {
         return nullptr;
+    }
 
     for (auto *view : views) {
         qobject_cast<ZoneViewZoneLogic *>(view->getLogic())->removeCard(position, toNewZone);
@@ -139,8 +155,9 @@ void CardZoneLogic::moveAllToZone()
     cmd.set_target_zone(targetZone.toStdString());
     cmd.set_x(targetX);
 
-    for (int i = 0; i < cards.size(); ++i)
+    for (int i = 0; i < cards.size(); ++i) {
         cmd.mutable_cards_to_move()->add_card()->set_card_id(cards[i]->getId());
+    }
 
     player->getPlayerActions()->sendGameCommand(cmd);
 }
@@ -172,9 +189,9 @@ void CardZoneLogic::clearContents()
 QString CardZoneLogic::getTranslatedName(bool theirOwn, GrammaticalCase gc) const
 {
     QString ownerName = player->getPlayerInfo()->getName();
-    if (name == "hand")
+    if (name == ZoneNames::HAND) {
         return (theirOwn ? tr("their hand", "nominative") : tr("%1's hand", "nominative").arg(ownerName));
-    else if (name == "deck")
+    } else if (name == ZoneNames::DECK) {
         switch (gc) {
             case CaseLookAtZone:
                 return (theirOwn ? tr("their library", "look at zone")
@@ -190,11 +207,11 @@ QString CardZoneLogic::getTranslatedName(bool theirOwn, GrammaticalCase gc) cons
             default:
                 return (theirOwn ? tr("their library", "nominative") : tr("%1's library", "nominative").arg(ownerName));
         }
-    else if (name == "grave")
+    } else if (name == ZoneNames::GRAVE) {
         return (theirOwn ? tr("their graveyard", "nominative") : tr("%1's graveyard", "nominative").arg(ownerName));
-    else if (name == "rfg")
+    } else if (name == ZoneNames::EXILE) {
         return (theirOwn ? tr("their exile", "nominative") : tr("%1's exile", "nominative").arg(ownerName));
-    else if (name == "sb")
+    } else if (name == ZoneNames::SIDEBOARD) {
         switch (gc) {
             case CaseLookAtZone:
                 return (theirOwn ? tr("their sideboard", "look at zone")
@@ -205,7 +222,7 @@ QString CardZoneLogic::getTranslatedName(bool theirOwn, GrammaticalCase gc) cons
             default:
                 break;
         }
-    else {
+    } else {
         return (theirOwn ? tr("their custom zone '%1'", "nominative").arg(name)
                          : tr("%1's custom zone '%2'", "nominative").arg(ownerName).arg(name));
     }
diff --git a/cockatrice/src/game/zones/logic/card_zone_logic.h b/cockatrice/src/game/zones/card_zone_logic.h
similarity index 88%
rename from cockatrice/src/game/zones/logic/card_zone_logic.h
rename to cockatrice/src/game/zones/card_zone_logic.h
index 1aa46effd..2e232b258 100644
--- a/cockatrice/src/game/zones/logic/card_zone_logic.h
+++ b/cockatrice/src/game/zones/card_zone_logic.h
@@ -1,26 +1,27 @@
 /**
  * @file card_zone_logic.h
  * @ingroup GameLogicZones
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_CARD_ZONE_LOGIC_H
 #define COCKATRICE_CARD_ZONE_LOGIC_H
 
-#include "../../../client/translation.h"
-#include "../../board/card_list.h"
+#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 Player;
+class PlayerLogic;
 class ZoneViewZone;
-class QMenu;
-class QAction;
-class QPainter;
-class CardDragItem;
 
 class CardZoneLogic : public QObject
 {
@@ -35,7 +36,7 @@ signals:
     void retranslateUi();
 
 public:
-    explicit CardZoneLogic(Player *_player,
+    explicit CardZoneLogic(PlayerLogic *_player,
                            const QString &_name,
                            bool _hasCardAttr,
                            bool _isShufflable,
@@ -68,7 +69,7 @@ public:
         return name;
     }
     [[nodiscard]] QString getTranslatedName(bool theirOwn, GrammaticalCase gc) const;
-    [[nodiscard]] Player *getPlayer() const
+    [[nodiscard]] PlayerLogic *getPlayer() const
     {
         return player;
     }
@@ -105,7 +106,7 @@ private slots:
     void refreshCardInfos();
 
 protected:
-    Player *player;
+    PlayerLogic *player;
     QString name;
     CardList cards;
     QList<ZoneViewZone *> views;
diff --git a/cockatrice/src/game/zones/hand_zone.cpp b/cockatrice/src/game/zones/hand_zone.cpp
deleted file mode 100644
index cc3b44910..000000000
--- a/cockatrice/src/game/zones/hand_zone.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-#include "hand_zone.h"
-
-#include "../../client/settings/cache_settings.h"
-#include "../../interface/theme_manager.h"
-#include "../board/card_drag_item.h"
-#include "../board/card_item.h"
-#include "../player/player.h"
-#include "../player/player_actions.h"
-
-#include <QPainter>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
-
-HandZone::HandZone(HandZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent)
-    : SelectZone(_logic, parent), zoneHeight(_zoneHeight)
-{
-    connect(themeManager, &ThemeManager::themeChanged, this, &HandZone::updateBg);
-    updateBg();
-    setCacheMode(DeviceCoordinateCache);
-}
-
-void HandZone::updateBg()
-{
-    update();
-}
-
-void HandZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
-                               CardZoneLogic *startZone,
-                               const QPoint &dropPoint)
-{
-    QPoint point = dropPoint + scenePos().toPoint();
-    int x = -1;
-    if (SettingsCache::instance().getHorizontalHand()) {
-        for (x = 0; x < getLogic()->getCards().size(); x++)
-            if (point.x() < static_cast<CardItem *>(getLogic()->getCards().at(x))->scenePos().x())
-                break;
-    } else {
-        for (x = 0; x < getLogic()->getCards().size(); x++)
-            if (point.y() < static_cast<CardItem *>(getLogic()->getCards().at(x))->scenePos().y())
-                break;
-    }
-
-    Command_MoveCard cmd;
-    cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_start_zone(startZone->getName().toStdString());
-    cmd.set_target_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_target_zone(getLogic()->getName().toStdString());
-    cmd.set_x(x);
-    cmd.set_y(-1);
-
-    for (int i = 0; i < dragItems.size(); ++i)
-        cmd.mutable_cards_to_move()->add_card()->set_card_id(dragItems[i]->getId());
-
-    getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd);
-}
-
-QRectF HandZone::boundingRect() const
-{
-    if (SettingsCache::instance().getHorizontalHand())
-        return QRectF(0, 0, width, CARD_HEIGHT + 10);
-    else
-        return QRectF(0, 0, 100, zoneHeight);
-}
-
-void HandZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
-{
-    QBrush brush = themeManager->getExtraBgBrush(ThemeManager::Hand, getLogic()->getPlayer()->getZoneId());
-    painter->fillRect(boundingRect(), brush);
-}
-
-void HandZone::reorganizeCards()
-{
-    if (!getLogic()->getCards().isEmpty()) {
-        const int cardCount = getLogic()->getCards().size();
-        if (SettingsCache::instance().getHorizontalHand()) {
-            bool leftJustified = SettingsCache::instance().getLeftJustified();
-            qreal cardWidth = getLogic()->getCards().at(0)->boundingRect().width();
-            const int xPadding = leftJustified ? cardWidth * 1.4 : 5;
-            qreal totalWidth =
-                leftJustified ? boundingRect().width() - (1 * xPadding) - 5 : boundingRect().width() - 2 * xPadding;
-
-            for (int i = 0; i < cardCount; i++) {
-                CardItem *c = getLogic()->getCards().at(i);
-                // If the total width of the cards is smaller than the available width,
-                // the cards do not need to overlap and are displayed in the center of the area.
-                if (cardWidth * cardCount > totalWidth)
-                    c->setPos(xPadding + ((qreal)i) * (totalWidth - cardWidth) / (cardCount - 1), 5);
-                else {
-                    qreal xPosition =
-                        leftJustified ? xPadding + ((qreal)i) * cardWidth
-                                      : xPadding + ((qreal)i) * cardWidth + (totalWidth - cardCount * cardWidth) / 2;
-                    c->setPos(xPosition, 5);
-                }
-                c->setRealZValue(i);
-            }
-        } else {
-            qreal totalWidth = boundingRect().width();
-            qreal cardWidth = getLogic()->getCards().at(0)->boundingRect().width();
-            qreal xspace = 5;
-            qreal x1 = xspace;
-            qreal x2 = totalWidth - xspace - cardWidth;
-
-            for (int i = 0; i < cardCount; i++) {
-                CardItem *card = getLogic()->getCards().at(i);
-                qreal x = (i % 2) ? x2 : x1;
-                qreal y = divideCardSpaceInZone(i, cardCount, boundingRect().height(),
-                                                getLogic()->getCards().at(0)->boundingRect().height());
-                card->setPos(x, y);
-                card->setRealZValue(i);
-            }
-        }
-    }
-    update();
-}
-
-void HandZone::sortHand(const QList<CardList::SortOption> &options)
-{
-    if (getLogic()->getCards().isEmpty()) {
-        return;
-    }
-
-    getLogic()->sortCards(options);
-    reorganizeCards();
-}
-
-void HandZone::setWidth(qreal _width)
-{
-    if (SettingsCache::instance().getHorizontalHand()) {
-        prepareGeometryChange();
-        width = _width;
-        reorganizeCards();
-    }
-}
-
-void HandZone::updateOrientation()
-{
-    prepareGeometryChange();
-    reorganizeCards();
-}
diff --git a/cockatrice/src/game/zones/logic/hand_zone_logic.cpp b/cockatrice/src/game/zones/hand_zone_logic.cpp
similarity index 53%
rename from cockatrice/src/game/zones/logic/hand_zone_logic.cpp
rename to cockatrice/src/game/zones/hand_zone_logic.cpp
index 292b9f7e3..cea17d031 100644
--- a/cockatrice/src/game/zones/logic/hand_zone_logic.cpp
+++ b/cockatrice/src/game/zones/hand_zone_logic.cpp
@@ -1,8 +1,12 @@
 #include "hand_zone_logic.h"
 
-#include "../../board/card_item.h"
+#include "../../game_graphics/board/card_item.h"
+#include "card_zone_algorithms.h"
 
-HandZoneLogic::HandZoneLogic(Player *_player,
+class PlayerLogic;
+class QObject;
+
+HandZoneLogic::HandZoneLogic(PlayerLogic *_player,
                              const QString &_name,
                              bool _hasCardAttr,
                              bool _isShufflable,
@@ -14,16 +18,5 @@ HandZoneLogic::HandZoneLogic(Player *_player,
 
 void HandZoneLogic::addCardImpl(CardItem *card, int x, int /*y*/)
 {
-    // if x is negative set it to add at end
-    if (x < 0 || x >= cards.size()) {
-        x = cards.size();
-    }
-    cards.insert(x, card);
-
-    if (!cards.getContentsKnown()) {
-        card->setId(-1);
-        card->setCardRef({});
-    }
-    card->resetState();
-    card->setVisible(true);
-}
\ No newline at end of file
+    CardZoneAlgorithms::addCardToList(cards, card, x, false);
+}
diff --git a/cockatrice/src/game/zones/logic/hand_zone_logic.h b/cockatrice/src/game/zones/hand_zone_logic.h
similarity index 78%
rename from cockatrice/src/game/zones/logic/hand_zone_logic.h
rename to cockatrice/src/game/zones/hand_zone_logic.h
index 8f34cc851..c7d63bc0d 100644
--- a/cockatrice/src/game/zones/logic/hand_zone_logic.h
+++ b/cockatrice/src/game/zones/hand_zone_logic.h
@@ -1,18 +1,24 @@
 /**
  * @file hand_zone_logic.h
  * @ingroup GameLogicZones
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_HAND_ZONE_LOGIC_H
 #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
 public:
-    HandZoneLogic(Player *_player,
+    HandZoneLogic(PlayerLogic *_player,
                   const QString &_name,
                   bool _hasCardAttr,
                   bool _isShufflable,
diff --git a/cockatrice/src/game/zones/logic/pile_zone_logic.cpp b/cockatrice/src/game/zones/pile_zone_logic.cpp
similarity index 81%
rename from cockatrice/src/game/zones/logic/pile_zone_logic.cpp
rename to cockatrice/src/game/zones/pile_zone_logic.cpp
index c5ffd5fd5..40af25cc5 100644
--- a/cockatrice/src/game/zones/logic/pile_zone_logic.cpp
+++ b/cockatrice/src/game/zones/pile_zone_logic.cpp
@@ -1,8 +1,12 @@
 #include "pile_zone_logic.h"
 
-#include "../../board/card_item.h"
+#include "../../game_graphics/board/card_item.h"
+#include "../board/card_list.h"
 
-PileZoneLogic::PileZoneLogic(Player *_player,
+class PlayerLogic;
+class QObject;
+
+PileZoneLogic::PileZoneLogic(PlayerLogic *_player,
                              const QString &_name,
                              bool _hasCardAttr,
                              bool _isShufflable,
@@ -25,8 +29,9 @@ void PileZoneLogic::addCardImpl(CardItem *card, int x, int /*y*/)
         card->setCardRef({});
         card->setId(-1);
         // If we obscure a previously revealed card, its name has to be forgotten
-        if (cards.size() > x + 1)
+        if (cards.size() > x + 1) {
             cards.at(x + 1)->setCardRef({});
+        }
     }
     card->setVisible(false);
     card->resetState();
diff --git a/cockatrice/src/game/zones/logic/pile_zone_logic.h b/cockatrice/src/game/zones/pile_zone_logic.h
similarity index 79%
rename from cockatrice/src/game/zones/logic/pile_zone_logic.h
rename to cockatrice/src/game/zones/pile_zone_logic.h
index 498d0d4a2..ed6841b75 100644
--- a/cockatrice/src/game/zones/logic/pile_zone_logic.h
+++ b/cockatrice/src/game/zones/pile_zone_logic.h
@@ -1,13 +1,19 @@
 /**
  * @file pile_zone_logic.h
  * @ingroup GameLogicZones
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_PILE_ZONE_LOGIC_H
 #define COCKATRICE_PILE_ZONE_LOGIC_H
 #include "card_zone_logic.h"
 
+#include <QString>
+#include <qtmetamacros.h>
+
+class PlayerLogic;
+class QObject;
+
 class PileZoneLogic : public CardZoneLogic
 {
 
@@ -17,7 +23,7 @@ signals:
     void callUpdate();
 
 public:
-    PileZoneLogic(Player *_player,
+    PileZoneLogic(PlayerLogic *_player,
                   const QString &_name,
                   bool _hasCardAttr,
                   bool _isShufflable,
diff --git a/cockatrice/src/game/zones/select_zone.cpp b/cockatrice/src/game/zones/select_zone.cpp
deleted file mode 100644
index 719eec148..000000000
--- a/cockatrice/src/game/zones/select_zone.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-#include "select_zone.h"
-
-#include "../../client/settings/cache_settings.h"
-#include "../board/card_item.h"
-#include "../game_scene.h"
-
-#include <QDebug>
-#include <QGraphicsSceneMouseEvent>
-
-qreal divideCardSpaceInZone(qreal index, int cardCount, qreal totalHeight, qreal cardHeight, bool reverse)
-{
-    qreal cardMinOverlap = cardHeight * SettingsCache::instance().getStackCardOverlapPercent() / 100;
-    qreal desiredHeight = cardHeight * cardCount - cardMinOverlap * (cardCount - 1);
-    qreal y;
-    if (desiredHeight > totalHeight) {
-        if (reverse) {
-            y = index / ((totalHeight - cardHeight) / (cardCount - 1));
-        } else {
-            y = index * (totalHeight - cardHeight) / (cardCount - 1);
-        }
-    } else {
-        qreal start = (totalHeight - desiredHeight) / 2;
-        if (reverse) {
-            if (index <= start) {
-                return 0;
-            }
-            y = (index - start) / (cardHeight - cardMinOverlap);
-        } else {
-            y = index * (cardHeight - cardMinOverlap) + start;
-        }
-    }
-    return y;
-}
-
-SelectZone::SelectZone(CardZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_logic, parent)
-{
-}
-
-void SelectZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    if (event->buttons().testFlag(Qt::LeftButton)) {
-        QPointF pos = event->pos();
-        if (pos.x() < 0)
-            pos.setX(0);
-        QRectF br = boundingRect();
-        if (pos.x() > br.width())
-            pos.setX(br.width());
-        if (pos.y() < 0)
-            pos.setY(0);
-        if (pos.y() > br.height())
-            pos.setY(br.height());
-
-        QRectF selectionRect = QRectF(selectionOrigin, pos).normalized();
-        for (auto card : getLogic()->getCards()) {
-            if (card->getAttachedTo() && card->getAttachedTo()->getZone() != getLogic()) {
-                continue;
-            }
-
-            bool inRect = selectionRect.intersects(card->mapRectToParent(card->boundingRect()));
-            if (inRect && !cardsInSelectionRect.contains(card)) {
-                // selection has just expanded to cover the card
-                cardsInSelectionRect.insert(card);
-                card->setSelected(!card->isSelected());
-            } else if (!inRect && cardsInSelectionRect.contains(card)) {
-                // selection has just shrunk to no longer cover the card
-                cardsInSelectionRect.remove(card);
-                card->setSelected(!card->isSelected());
-            }
-        }
-        static_cast<GameScene *>(scene())->resizeRubberBand(
-            deviceTransform(static_cast<GameScene *>(scene())->getViewportTransform()).map(pos));
-        event->accept();
-    }
-}
-
-void SelectZone::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
-    if (event->button() == Qt::LeftButton) {
-        if (!event->modifiers().testFlag(Qt::ControlModifier)) {
-            scene()->clearSelection();
-        }
-
-        selectionOrigin = event->pos();
-        static_cast<GameScene *>(scene())->startRubberBand(event->scenePos());
-        event->accept();
-    } else
-        CardZone::mousePressEvent(event);
-}
-
-void SelectZone::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
-    selectionOrigin = QPoint();
-    cardsInSelectionRect.clear();
-    static_cast<GameScene *>(scene())->stopRubberBand();
-    event->accept();
-}
diff --git a/cockatrice/src/game/zones/select_zone.h b/cockatrice/src/game/zones/select_zone.h
deleted file mode 100644
index d6fd3e10e..000000000
--- a/cockatrice/src/game/zones/select_zone.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @file select_zone.h
- * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
- */
-
-#ifndef SELECTZONE_H
-#define SELECTZONE_H
-
-#include "card_zone.h"
-
-#include <QSet>
-
-/**
- * A CardZone where the cards are laid out, with each card directly interactable by clicking.
- */
-class SelectZone : public CardZone
-{
-    Q_OBJECT
-private:
-    QPointF selectionOrigin;
-    QSet<CardItem *> cardsInSelectionRect;
-
-protected:
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
-    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
-
-public:
-    SelectZone(CardZoneLogic *logic, QGraphicsItem *parent = nullptr);
-};
-
-qreal divideCardSpaceInZone(qreal index, int cardCount, qreal totalHeight, qreal cardHeight, bool reverse = false);
-
-#endif
diff --git a/cockatrice/src/game/zones/stack_zone.cpp b/cockatrice/src/game/zones/stack_zone.cpp
deleted file mode 100644
index 820008b27..000000000
--- a/cockatrice/src/game/zones/stack_zone.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-#include "stack_zone.h"
-
-#include "../../client/settings/cache_settings.h"
-#include "../../interface/theme_manager.h"
-#include "../board/arrow_item.h"
-#include "../board/card_drag_item.h"
-#include "../board/card_item.h"
-#include "../player/player.h"
-#include "../player/player_actions.h"
-#include "logic/stack_zone_logic.h"
-
-#include <QPainter>
-#include <libcockatrice/protocol/pb/command_move_card.pb.h>
-
-StackZone::StackZone(StackZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent)
-    : SelectZone(_logic, parent), zoneHeight(_zoneHeight)
-{
-    connect(themeManager, &ThemeManager::themeChanged, this, &StackZone::updateBg);
-    updateBg();
-    setCacheMode(DeviceCoordinateCache);
-}
-
-void StackZone::updateBg()
-{
-    update();
-}
-
-QRectF StackZone::boundingRect() const
-{
-    return {0, 0, 100, zoneHeight};
-}
-
-void StackZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
-{
-    QBrush brush = themeManager->getExtraBgBrush(ThemeManager::Stack, getLogic()->getPlayer()->getZoneId());
-    painter->fillRect(boundingRect(), brush);
-}
-
-void StackZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
-                                CardZoneLogic *startZone,
-                                const QPoint &dropPoint)
-{
-    if (startZone == nullptr || startZone->getPlayer() == nullptr) {
-        return;
-    }
-
-    Command_MoveCard cmd;
-    cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_start_zone(startZone->getName().toStdString());
-    cmd.set_target_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId());
-    cmd.set_target_zone(getLogic()->getName().toStdString());
-
-    int index = 0;
-
-    if (!getLogic()->getCards().isEmpty()) {
-        const auto cardCount = static_cast<int>(getLogic()->getCards().size());
-        const auto &card = getLogic()->getCards().at(0);
-
-        index = qRound(divideCardSpaceInZone(dropPoint.y(), cardCount, boundingRect().height(),
-                                             card->boundingRect().height(), true));
-
-        // divideCardSpaceInZone is not guaranteed to return a valid index
-        // currently, so clamp it to avoid crashes.
-        index = qBound(0, index, cardCount - 1);
-
-        if (startZone == getLogic()) {
-            const auto &dragItem = dragItems.at(0);
-            const auto &card = getLogic()->getCards().at(index);
-
-            if (card->getId() == dragItem->getId()) {
-                return;
-            }
-        }
-    }
-
-    cmd.set_x(index);
-    cmd.set_y(0);
-
-    for (CardDragItem *item : dragItems) {
-        if (item) {
-            cmd.mutable_cards_to_move()->add_card()->set_card_id(item->getId());
-        }
-    }
-
-    getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd);
-}
-
-void StackZone::reorganizeCards()
-{
-    if (!getLogic()->getCards().isEmpty()) {
-        const auto cardCount = static_cast<int>(getLogic()->getCards().size());
-        qreal totalWidth = boundingRect().width();
-        qreal cardWidth = getLogic()->getCards().at(0)->boundingRect().width();
-        qreal xspace = 5;
-        qreal x1 = xspace;
-        qreal x2 = totalWidth - xspace - cardWidth;
-
-        for (int i = 0; i < cardCount; i++) {
-            CardItem *card = getLogic()->getCards().at(i);
-            qreal x = (i % 2) ? x2 : x1;
-            qreal y = divideCardSpaceInZone(i, cardCount, boundingRect().height(),
-                                            getLogic()->getCards().at(0)->boundingRect().height());
-            card->setPos(x, y);
-            card->setRealZValue(i);
-        }
-    }
-    update();
-}
diff --git a/cockatrice/src/game/zones/logic/stack_zone_logic.cpp b/cockatrice/src/game/zones/stack_zone_logic.cpp
similarity index 53%
rename from cockatrice/src/game/zones/logic/stack_zone_logic.cpp
rename to cockatrice/src/game/zones/stack_zone_logic.cpp
index a477a8025..454274971 100644
--- a/cockatrice/src/game/zones/logic/stack_zone_logic.cpp
+++ b/cockatrice/src/game/zones/stack_zone_logic.cpp
@@ -1,8 +1,12 @@
 #include "stack_zone_logic.h"
 
-#include "../../board/card_item.h"
+#include "../../game_graphics/board/card_item.h"
+#include "card_zone_algorithms.h"
 
-StackZoneLogic::StackZoneLogic(Player *_player,
+class PlayerLogic;
+class QObject;
+
+StackZoneLogic::StackZoneLogic(PlayerLogic *_player,
                                const QString &_name,
                                bool _hasCardAttr,
                                bool _isShufflable,
@@ -14,16 +18,5 @@ StackZoneLogic::StackZoneLogic(Player *_player,
 
 void StackZoneLogic::addCardImpl(CardItem *card, int x, int /*y*/)
 {
-    // if x is negative set it to add at end
-    if (x < 0 || x >= cards.size()) {
-        x = static_cast<int>(cards.size());
-    }
-    cards.insert(x, card);
-
-    if (!cards.getContentsKnown()) {
-        card->setId(-1);
-        card->setCardRef({});
-    }
-    card->resetState(true);
-    card->setVisible(true);
-}
\ No newline at end of file
+    CardZoneAlgorithms::addCardToList(cards, card, x, true);
+}
diff --git a/cockatrice/src/game/zones/logic/stack_zone_logic.h b/cockatrice/src/game/zones/stack_zone_logic.h
similarity index 78%
rename from cockatrice/src/game/zones/logic/stack_zone_logic.h
rename to cockatrice/src/game/zones/stack_zone_logic.h
index 81b9d6969..657d44ecf 100644
--- a/cockatrice/src/game/zones/logic/stack_zone_logic.h
+++ b/cockatrice/src/game/zones/stack_zone_logic.h
@@ -1,18 +1,24 @@
 /**
  * @file stack_zone_logic.h
  * @ingroup GameLogicZones
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_STACK_ZONE_LOGIC_H
 #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
 public:
-    StackZoneLogic(Player *_player,
+    StackZoneLogic(PlayerLogic *_player,
                    const QString &_name,
                    bool _hasCardAttr,
                    bool _isShufflable,
diff --git a/cockatrice/src/game/zones/logic/table_zone_logic.cpp b/cockatrice/src/game/zones/table_zone_logic.cpp
similarity index 79%
rename from cockatrice/src/game/zones/logic/table_zone_logic.cpp
rename to cockatrice/src/game/zones/table_zone_logic.cpp
index 42caf2ec8..07e4a759b 100644
--- a/cockatrice/src/game/zones/logic/table_zone_logic.cpp
+++ b/cockatrice/src/game/zones/table_zone_logic.cpp
@@ -1,8 +1,15 @@
 #include "table_zone_logic.h"
 
-#include "../../board/card_item.h"
+#include "../../game_graphics/board/card_item.h"
+#include "../board/card_list.h"
+#include "libcockatrice/card/card_info.h"
 
-TableZoneLogic::TableZoneLogic(Player *_player,
+#include <QPoint>
+
+class PlayerLogic;
+class QObject;
+
+TableZoneLogic::TableZoneLogic(PlayerLogic *_player,
                                const QString &_name,
                                bool _hasCardAttr,
                                bool _isShufflable,
@@ -29,7 +36,8 @@ CardItem *TableZoneLogic::takeCard(int position, int cardId, bool toNewZone)
 {
     CardItem *result = CardZoneLogic::takeCard(position, cardId);
 
-    if (toNewZone)
+    if (toNewZone) {
         emit contentSizeChanged();
+    }
     return result;
 }
\ No newline at end of file
diff --git a/cockatrice/src/game/zones/logic/table_zone_logic.h b/cockatrice/src/game/zones/table_zone_logic.h
similarity index 86%
rename from cockatrice/src/game/zones/logic/table_zone_logic.h
rename to cockatrice/src/game/zones/table_zone_logic.h
index e173bc637..8078bfd05 100644
--- a/cockatrice/src/game/zones/logic/table_zone_logic.h
+++ b/cockatrice/src/game/zones/table_zone_logic.h
@@ -1,13 +1,19 @@
 /**
  * @file table_zone_logic.h
  * @ingroup GameLogicZones
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_TABLE_ZONE_LOGIC_H
 #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
@@ -16,7 +22,7 @@ signals:
     void toggleTapped();
 
 public:
-    TableZoneLogic(Player *_player,
+    TableZoneLogic(PlayerLogic *_player,
                    const QString &_name,
                    bool _hasCardAttr,
                    bool _isShufflable,
diff --git a/cockatrice/src/game/zones/logic/view_zone_logic.cpp b/cockatrice/src/game/zones/view_zone_logic.cpp
similarity index 90%
rename from cockatrice/src/game/zones/logic/view_zone_logic.cpp
rename to cockatrice/src/game/zones/view_zone_logic.cpp
index 5a4db3163..eb3b7715f 100644
--- a/cockatrice/src/game/zones/logic/view_zone_logic.cpp
+++ b/cockatrice/src/game/zones/view_zone_logic.cpp
@@ -1,7 +1,14 @@
 #include "view_zone_logic.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../../board/card_item.h"
+#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.
@@ -9,7 +16,7 @@
  * @param _revealZone if false, the cards will be face down.
  * @param _writeableRevealZone whether the player can interact with the revealed cards.
  */
-ZoneViewZoneLogic::ZoneViewZoneLogic(Player *_player,
+ZoneViewZoneLogic::ZoneViewZoneLogic(PlayerLogic *_player,
                                      CardZoneLogic *_origZone,
                                      int _numberCards,
                                      bool _revealZone,
@@ -57,7 +64,7 @@ bool ZoneViewZoneLogic::prepareAddCard(int x)
 
     // autoclose check is done both here and in removeCard
 
-    if (cards.isEmpty() && !doInsert && SettingsCache::instance().getCloseEmptyCardView()) {
+    if (cards.isEmpty() && !doInsert && SettingsCache::instance().userInterface().getCloseEmptyCardView()) {
         emit closeView();
     }
 
@@ -144,7 +151,7 @@ void ZoneViewZoneLogic::removeCard(int position, bool toNewZone)
     // card gets dragged within the view.
     // Another autoclose check is done in prepareAddCard so that the view autocloses if the last card was moved to an
     // unrevealed portion of the same zone.
-    if (cards.isEmpty() && SettingsCache::instance().getCloseEmptyCardView() && toNewZone) {
+    if (cards.isEmpty() && SettingsCache::instance().userInterface().getCloseEmptyCardView() && toNewZone) {
         emit closeView();
         return;
     }
@@ -153,6 +160,14 @@ void ZoneViewZoneLogic::removeCard(int position, bool toNewZone)
     reorganizeCards();
 }
 
+void ZoneViewZoneLogic::clearCards()
+{
+    for (auto card : cards) {
+        card->deleteLater();
+    }
+    cards.clear();
+}
+
 void ZoneViewZoneLogic::setWriteableRevealZone(bool _writeableRevealZone)
 {
 
diff --git a/cockatrice/src/game/zones/logic/view_zone_logic.h b/cockatrice/src/game/zones/view_zone_logic.h
similarity index 84%
rename from cockatrice/src/game/zones/logic/view_zone_logic.h
rename to cockatrice/src/game/zones/view_zone_logic.h
index 6bd5ecc8d..6fae301e4 100644
--- a/cockatrice/src/game/zones/logic/view_zone_logic.h
+++ b/cockatrice/src/game/zones/view_zone_logic.h
@@ -1,13 +1,18 @@
 /**
  * @file view_zone_logic.h
  * @ingroup GameLogicZones
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_VIEW_ZONE_LOGIC_H
 #define COCKATRICE_VIEW_ZONE_LOGIC_H
 #include "card_zone_logic.h"
 
+#include <qtmetamacros.h>
+
+class PlayerLogic;
+class QObject;
+
 class ZoneViewZoneLogic : public CardZoneLogic
 {
     Q_OBJECT
@@ -30,7 +35,7 @@ public:
         REMOVE_CARD
     };
 
-    ZoneViewZoneLogic(Player *_player,
+    ZoneViewZoneLogic(PlayerLogic *_player,
                       CardZoneLogic *_origZone,
                       int _numberCards,
                       bool _revealZone,
@@ -41,6 +46,10 @@ public:
     bool prepareAddCard(int x);
     void removeCard(int position, bool toNewZone);
     void updateCardIds(CardAction action);
+
+    /** @brief Removes all cards from the view, without touching anything else. Used in replay rewind */
+    void clearCards();
+
     int getNumberCards() const
     {
         return numberCards;
diff --git a/cockatrice/src/game_graphics/animated_item.h b/cockatrice/src/game_graphics/animated_item.h
new file mode 100644
index 000000000..700e0f62d
--- /dev/null
+++ b/cockatrice/src/game_graphics/animated_item.h
@@ -0,0 +1,26 @@
+#ifndef ANIMATED_ITEM_H
+#define ANIMATED_ITEM_H
+
+/**
+ * @file animated_item.h
+ * @ingroup GameGraphics
+ * @brief Interface for scene items driven by GameScene's shared animation timer.
+ *
+ * Items that want per-tick animation while a single QBasicTimer runs (instead of
+ * owning their own QTimer) implement this interface and register with the scene
+ * via GameScene::registerAnimationItem.
+ */
+
+class IAnimatedItem
+{
+public:
+    virtual ~IAnimatedItem() = default;
+
+    /**
+     * @brief Advances the item's animation by one timer tick.
+     * @return true while the animation is still running, false once it has finished.
+     */
+    virtual bool animationEvent() = 0;
+};
+
+#endif
diff --git a/cockatrice/src/game/board/abstract_card_drag_item.cpp b/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
similarity index 57%
rename from cockatrice/src/game/board/abstract_card_drag_item.cpp
rename to cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
index c961cbcb6..2e18fca2d 100644
--- a/cockatrice/src/game/board/abstract_card_drag_item.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_card_drag_item.cpp
@@ -1,14 +1,22 @@
 #include "abstract_card_drag_item.h"
 
 #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;
 
-static const float CARD_WIDTH_HALF = CARD_WIDTH / 2;
-static const float CARD_HEIGHT_HALF = CARD_HEIGHT / 2;
 const QColor GHOST_MASK = QColor(255, 255, 255, 50);
 
 AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
@@ -18,28 +26,30 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
 {
     if (parentDrag) {
         parentDrag->addChildDrag(this);
-        setZValue(2000000007 + hotSpot.x() * 1000000 + hotSpot.y() * 1000 + 1000);
+        setZValue(ZValues::childDragZValue(hotSpot.x(), hotSpot.y()));
         connect(parentDrag, &QObject::destroyed, this, &AbstractCardDragItem::deleteLater);
     } else {
-        hotSpot = QPointF{qBound(0.0, hotSpot.x(), static_cast<qreal>(CARD_WIDTH - 1)),
-                          qBound(0.0, hotSpot.y(), static_cast<qreal>(CARD_HEIGHT - 1))};
+        hotSpot = QPointF{qBound(0.0, hotSpot.x(), CardDimensions::WIDTH_F - 1),
+                          qBound(0.0, hotSpot.y(), CardDimensions::HEIGHT_F - 1)};
         setCursor(Qt::ClosedHandCursor);
-        setZValue(2000000007);
+        setZValue(ZValues::DRAG_ITEM);
     }
-    if (item->getTapped())
+    if (item->getTapped()) {
         setTransform(QTransform()
-                         .translate(CARD_WIDTH_HALF, CARD_HEIGHT_HALF)
+                         .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F)
                          .rotate(90)
-                         .translate(-CARD_WIDTH_HALF, -CARD_HEIGHT_HALF));
+                         .translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F));
+    }
 
     setCacheMode(DeviceCoordinateCache);
 
-    connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
-        Q_UNUSED(_roundCardCorners);
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::roundCardCornersChanged, this,
+            [this](bool _roundCardCorners) {
+                Q_UNUSED(_roundCardCorners);
 
-        prepareGeometryChange();
-        update();
-    });
+                prepareGeometryChange();
+                update();
+            });
 
     connect(item, &QObject::destroyed, this, &AbstractCardDragItem::deleteLater);
 }
@@ -47,7 +57,8 @@ AbstractCardDragItem::AbstractCardDragItem(AbstractCardItem *_item,
 QPainterPath AbstractCardDragItem::shape() const
 {
     QPainterPath shape;
-    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CARD_WIDTH : 0.0;
+    qreal cardCornerRadius =
+        SettingsCache::instance().cardsDisplay().getRoundCardCorners() ? 0.05 * CardDimensions::WIDTH_F : 0.0;
     shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius);
     return shape;
 }
diff --git a/cockatrice/src/game/board/abstract_card_drag_item.h b/cockatrice/src/game_graphics/board/abstract_card_drag_item.h
similarity index 78%
rename from cockatrice/src/game/board/abstract_card_drag_item.h
rename to cockatrice/src/game_graphics/board/abstract_card_drag_item.h
index 1d741eded..18afdcbb8 100644
--- a/cockatrice/src/game/board/abstract_card_drag_item.h
+++ b/cockatrice/src/game_graphics/board/abstract_card_drag_item.h
@@ -1,17 +1,23 @@
 /**
  * @file abstract_card_drag_item.h
  * @ingroup GameGraphicsCards
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef ABSTRACTCARDDRAGITEM_H
 #define ABSTRACTCARDDRAGITEM_H
 
-#include "abstract_card_item.h"
+#include "../card_dimensions.h"
+#include "graphics_item_type.h"
 
-class QGraphicsScene;
-class CardZone;
-class CardInfo;
+#include <QGraphicsItem>
+#include <QList>
+#include <QObject>
+#include <QPointF>
+#include <QRectF>
+#include <qtmetamacros.h>
+
+class AbstractCardItem;
 
 class AbstractCardDragItem : public QObject, public QGraphicsItem
 {
@@ -34,7 +40,7 @@ public:
     AbstractCardDragItem(AbstractCardItem *_item, const QPointF &_hotSpot, AbstractCardDragItem *parentDrag = 0);
     [[nodiscard]] QRectF boundingRect() const override
     {
-        return QRectF(0, 0, CARD_WIDTH, CARD_HEIGHT);
+        return QRectF(0, 0, CardDimensions::WIDTH_F, CardDimensions::HEIGHT_F);
     }
     [[nodiscard]] QPainterPath shape() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
diff --git a/cockatrice/src/game/board/abstract_card_item.cpp b/cockatrice/src/game_graphics/board/abstract_card_item.cpp
similarity index 69%
rename from cockatrice/src/game/board/abstract_card_item.cpp
rename to cockatrice/src/game_graphics/board/abstract_card_item.cpp
index d5538011d..a79c5873e 100644
--- a/cockatrice/src/game/board/abstract_card_item.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_card_item.cpp
@@ -1,18 +1,46 @@
 #include "abstract_card_item.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "../../interface/card_localization.h"
 #include "../../interface/card_picture_loader/card_picture_loader.h"
+#include "../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>
 
-AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, Player *_owner, int _id)
+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),
       bgColor(Qt::transparent), isHovered(false), realZValue(0)
 {
@@ -20,15 +48,19 @@ AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef
     setFlag(ItemIsSelectable);
     setCacheMode(DeviceCoordinateCache);
 
-    connect(&SettingsCache::instance(), &SettingsCache::displayCardNamesChanged, this, [this] { update(); });
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::displayCardNamesChanged, this,
+            [this] { update(); });
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this,
+            [this] { update(); });
     refreshCardInfo();
 
-    connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
-        Q_UNUSED(_roundCardCorners);
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::roundCardCornersChanged, this,
+            [this](bool _roundCardCorners) {
+                Q_UNUSED(_roundCardCorners);
 
-        prepareGeometryChange();
-        update();
-    });
+                prepareGeometryChange();
+                update();
+            });
 }
 
 AbstractCardItem::~AbstractCardItem()
@@ -38,13 +70,14 @@ AbstractCardItem::~AbstractCardItem()
 
 QRectF AbstractCardItem::boundingRect() const
 {
-    return QRectF(0, 0, CARD_WIDTH, CARD_HEIGHT);
+    return QRectF(0, 0, CardDimensions::WIDTH_F, CardDimensions::HEIGHT_F);
 }
 
 QPainterPath AbstractCardItem::shape() const
 {
     QPainterPath shape;
-    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CARD_WIDTH : 0.0;
+    qreal cardCornerRadius =
+        SettingsCache::instance().cardsDisplay().getRoundCardCorners() ? 0.05 * CardDimensions::WIDTH_F : 0.0;
     shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius);
     return shape;
 }
@@ -84,7 +117,12 @@ const CardInfo &AbstractCardItem::getCardInfo() const
 void AbstractCardItem::setRealZValue(qreal _zValue)
 {
     realZValue = _zValue;
-    setZValue(_zValue);
+    // During hover, zValue is overridden to HOVERED_CARD. Layout operations
+    // like reorganizeCards() call setRealZValue() on all cards including the
+    // hovered one — skip setZValue() here to avoid clobbering the override.
+    if (!isHovered) {
+        setZValue(_zValue);
+    }
 }
 
 QSizeF AbstractCardItem::getTranslatedSize(QPainter *painter) const
@@ -95,7 +133,7 @@ QSizeF AbstractCardItem::getTranslatedSize(QPainter *painter) const
 
 void AbstractCardItem::transformPainter(QPainter *painter, const QSizeF &translatedSize, int angle)
 {
-    const int MAX_FONT_SIZE = SettingsCache::instance().getMaxFontSize();
+    const int MAX_FONT_SIZE = SettingsCache::instance().appearance().getMaxFontSize();
     const int fontSize = std::max(9, MAX_FONT_SIZE);
 
     QRectF totalBoundingRect = painter->combinedTransform().mapRect(boundingRect());
@@ -125,8 +163,9 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS
         // don't even spend time trying to load the picture if our size is too small
         if (translatedSize.width() > 10) {
             CardPictureLoader::getPixmap(translatedPixmap, exactCard, translatedSize.toSize());
-            if (translatedPixmap.isNull())
+            if (translatedPixmap.isNull()) {
                 paintImage = false;
+            }
         } else {
             paintImage = false;
         }
@@ -144,21 +183,21 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS
         painter->drawPath(shape());
     }
 
-    if (translatedPixmap.isNull() || SettingsCache::instance().getDisplayCardNames() || facedown) {
+    if (translatedPixmap.isNull() || SettingsCache::instance().cardsDisplay().getDisplayCardNames() || facedown) {
         painter->save();
         transformPainter(painter, translatedSize, angle);
         painter->setPen(Qt::white);
         painter->setBackground(Qt::black);
         painter->setBackgroundMode(Qt::OpaqueMode);
         QString nameStr;
-        if (facedown)
+        if (facedown) {
             nameStr = "# " + QString::number(id);
-        else {
+        } else {
             QString prefix = "";
             if (SettingsCache::instance().debug().getShowCardId()) {
                 prefix = "#" + QString::number(id) + " ";
             }
-            nameStr = prefix + cardRef.name;
+            nameStr = prefix + CardLocalization::displayName(getCardInfo());
         }
         painter->drawText(QRectF(3 * scaleFactor, 3 * scaleFactor, translatedSize.width() - 6 * scaleFactor,
                                  translatedSize.height() - 6 * scaleFactor),
@@ -180,10 +219,12 @@ void AbstractCardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *
 
     if (isSelected() || isHovered) {
         QPen pen;
-        if (isHovered)
+        if (isHovered) {
             pen.setColor(Qt::yellow);
-        if (isSelected())
+        }
+        if (isSelected()) {
             pen.setColor(Qt::red);
+        }
         pen.setWidth(0); // Cosmetic pen
         painter->setPen(pen);
         painter->drawPath(shape());
@@ -209,15 +250,24 @@ void AbstractCardItem::setCardRef(const CardRef &_cardRef)
 
 void AbstractCardItem::setHovered(bool _hovered)
 {
-    if (isHovered == _hovered)
+    if (isHovered == _hovered) {
         return;
+    }
 
-    if (_hovered)
+    if (_hovered) {
         processHoverEvent();
+    } else {
+        // Mark the hovered card's current scene footprint dirty so overlapped
+        // sibling zones (e.g. StackZone) repaint after the card moves away.
+        if (scene()) {
+            scene()->update(sceneBoundingRect());
+        }
+    }
+
     isHovered = _hovered;
-    setZValue(_hovered ? 2000000004 : realZValue);
-    setScale(_hovered && SettingsCache::instance().getScaleCards() ? 1.1 : 1);
-    setTransformOriginPoint(_hovered ? CARD_WIDTH / 2 : 0, _hovered ? CARD_HEIGHT / 2 : 0);
+    setZValue(_hovered ? ZValues::HOVERED_CARD : realZValue);
+    setScale(_hovered && SettingsCache::instance().cardsDisplay().getScaleCards() ? 1.1 : 1);
+    setTransformOriginPoint(_hovered ? CardDimensions::WIDTH_HALF_F : 0, _hovered ? CardDimensions::HEIGHT_HALF_F : 0);
     update();
 }
 
@@ -264,22 +314,28 @@ void AbstractCardItem::cacheBgColor()
 
 void AbstractCardItem::setTapped(bool _tapped, bool canAnimate)
 {
-    if (tapped == _tapped)
+    if (tapped == _tapped) {
         return;
+    }
 
     tapped = _tapped;
-    if (SettingsCache::instance().getTapAnimation() && canAnimate)
+    if (SettingsCache::instance().cardsDisplay().getTapAnimation() && canAnimate) {
         static_cast<GameScene *>(scene())->registerAnimationItem(this);
-    else {
+    } else {
         tapAngle = tapped ? 90 : 0;
         setTransform(QTransform()
-                         .translate((float)CARD_WIDTH / 2, (float)CARD_HEIGHT / 2)
+                         .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F)
                          .rotate(tapAngle)
-                         .translate((float)-CARD_WIDTH / 2, (float)-CARD_HEIGHT / 2));
+                         .translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F));
         update();
     }
 }
 
+bool AbstractCardItem::animationEvent()
+{
+    return false;
+}
+
 void AbstractCardItem::setFaceDown(bool _facedown)
 {
     facedown = _facedown;
@@ -296,17 +352,19 @@ void AbstractCardItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
         scene()->clearSelection();
         setSelected(true);
     }
-    if (event->button() == Qt::LeftButton)
+    if (event->button() == Qt::LeftButton) {
         setCursor(Qt::ClosedHandCursor);
-    else if (event->button() == Qt::MiddleButton)
+    } else if (event->button() == Qt::MiddleButton) {
         emit showCardInfoPopup(event->screenPos(), cardRef);
+    }
     event->accept();
 }
 
 void AbstractCardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
-    if (event->button() == Qt::MiddleButton)
+    if (event->button() == Qt::MiddleButton) {
         emit deleteCardInfoPopup(cardRef.name);
+    }
 
     // This function ensures the parent function doesn't mess around with our selection.
     event->accept();
@@ -322,6 +380,7 @@ QVariant AbstractCardItem::itemChange(QGraphicsItem::GraphicsItemChange change,
     if (change == ItemSelectedHasChanged) {
         update();
         return value;
-    } else
+    } else {
         return ArrowTarget::itemChange(change, value);
+    }
 }
diff --git a/cockatrice/src/game/board/abstract_card_item.h b/cockatrice/src/game_graphics/board/abstract_card_item.h
similarity index 75%
rename from cockatrice/src/game/board/abstract_card_item.h
rename to cockatrice/src/game_graphics/board/abstract_card_item.h
index dad73dc14..385f9c32f 100644
--- a/cockatrice/src/game/board/abstract_card_item.h
+++ b/cockatrice/src/game_graphics/board/abstract_card_item.h
@@ -1,24 +1,31 @@
 /**
  * @file abstract_card_item.h
  * @ingroup GameGraphicsCards
- * @brief TODO: Document this.
+ * @brief Base class for graphical card items, providing shared rendering, identity, and interaction logic.
  */
 
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H
 
-#include "../../game_graphics/board/graphics_item_type.h"
+#include "../animated_item.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 Player;
+class PlayerLogic;
+class CardInfo;
+class QPainter;
+class QPoint;
 
-const int CARD_WIDTH = 72;
-const int CARD_HEIGHT = 102;
-
-class AbstractCardItem : public ArrowTarget
+class AbstractCardItem : public ArrowTarget, public IAnimatedItem
 {
     Q_OBJECT
 protected:
@@ -46,6 +53,11 @@ signals:
     void deleteCardInfoPopup(QString cardName);
     void sigPixmapUpdated();
     void cardShiftClicked(QString cardName);
+    void rightClicked(AbstractCardItem *card, QPoint screenPos);
+    void playSelected(AbstractCardItem *card);
+    void playSelectedFaceDown(AbstractCardItem *card);
+    void hideSelected(AbstractCardItem *card);
+    void selectionChanged(AbstractCardItem *card, bool selected);
 
 public:
     enum
@@ -58,7 +70,7 @@ public:
     }
     explicit AbstractCardItem(QGraphicsItem *parent = nullptr,
                               const CardRef &cardRef = {},
-                              Player *_owner = nullptr,
+                              PlayerLogic *_owner = nullptr,
                               int _id = -1);
     ~AbstractCardItem() override;
     QRectF boundingRect() const override;
@@ -98,6 +110,10 @@ public:
     }
     void setRealZValue(qreal _zValue);
     void setHovered(bool _hovered);
+    bool getIsHovered() const
+    {
+        return isHovered;
+    }
     QString getColor() const
     {
         return color;
@@ -119,6 +135,9 @@ public:
         emit deleteCardInfoPopup(cardRef.name);
     }
 
+    /** @brief Default: no per-tick animation. Subclasses override to animate. */
+    bool animationEvent() override;
+
 protected:
     void transformPainter(QPainter *painter, const QSizeF &translatedSize, int angle);
     void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
diff --git a/cockatrice/src/game/board/abstract_counter.cpp b/cockatrice/src/game_graphics/board/abstract_counter.cpp
similarity index 52%
rename from cockatrice/src/game/board/abstract_counter.cpp
rename to cockatrice/src/game_graphics/board/abstract_counter.cpp
index 08d19ec8a..8500b9c51 100644
--- a/cockatrice/src/game/board/abstract_counter.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_counter.cpp
@@ -1,39 +1,54 @@
 #include "abstract_counter.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../interface/widgets/tabs/tab_game.h"
-#include "../player/player.h"
-#include "../player/player_actions.h"
-#include "translate_counter_name.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 <QAction>
 #include <QApplication>
+#include <QEvent>
+#include <QFlags>
+#include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
+#include <QGraphicsView>
 #include <QKeyEvent>
-#include <QMenu>
+#include <QKeySequence>
+#include <QList>
+#include <QSharedPointer>
 #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>
 
-AbstractCounter::AbstractCounter(Player *_player,
-                                 int _id,
-                                 const QString &_name,
+class QWidget;
+
+AbstractCounter::AbstractCounter(CounterState *state,
+                                 PlayerLogic *_player,
                                  bool _shownInCounterArea,
-                                 int _value,
                                  bool _useNameForShortcut,
                                  QGraphicsItem *parent)
-    : QGraphicsItem(parent), player(_player), id(_id), name(_name), value(_value),
-      useNameForShortcut(_useNameForShortcut), hovered(false), aDec(nullptr), aInc(nullptr), dialogSemaphore(false),
-      deleteAfterDialog(false), shownInCounterArea(_shownInCounterArea)
+    : QGraphicsItem(parent), player(_player), id(state->getId()), name(state->getName()), value(state->getValue()),
+      color(state->getColor()), radius(state->getRadius()), useNameForShortcut(_useNameForShortcut),
+      shownInCounterArea(_shownInCounterArea)
 {
     setAcceptHoverEvents(true);
 
-    shortcutActive = false;
+    connect(state, &CounterState::valueChanged, this, [this](int oldValue, int newValue, bool skipDamageAnimation) {
+        value = newValue;
+        onValueChanged(oldValue, newValue, skipDamageAnimation);
+        update();
+    });
 
     if (player->getPlayerInfo()->getLocalOrJudge()) {
-        QString displayName = TranslateCounterName::getDisplayName(_name);
-        menu = new TearOffMenu(displayName);
+        menu = new TearOffMenu(TranslateCounterName::getDisplayName(state->getName()));
         aSet = new QAction(this);
         connect(aSet, &QAction::triggered, this, &AbstractCounter::setCounter);
         menu->addAction(aSet);
@@ -41,16 +56,18 @@ AbstractCounter::AbstractCounter(Player *_player,
         for (int i = 10; i >= -10; --i) {
             if (i == 0) {
                 menu->addSeparator();
-            } else {
-                QAction *aIncrement = new QAction(QString(i < 0 ? "%1" : "+%1").arg(i), this);
-                if (i == -1)
-                    aDec = aIncrement;
-                else if (i == 1)
-                    aInc = aIncrement;
-                aIncrement->setData(i);
-                connect(aIncrement, &QAction::triggered, this, &AbstractCounter::incrementCounter);
-                menu->addAction(aIncrement);
+                continue;
             }
+            auto *a = new QAction(QString(i < 0 ? "%1" : "+%1").arg(i), this);
+            if (i == -1) {
+                aDec = a;
+            }
+            if (i == 1) {
+                aInc = a;
+            }
+            a->setData(i);
+            connect(a, &QAction::triggered, this, &AbstractCounter::incrementCounter);
+            menu->addAction(a);
         }
     } else {
         menu = nullptr;
@@ -69,39 +86,35 @@ AbstractCounter::~AbstractCounter()
 
 void AbstractCounter::delCounter()
 {
-    if (dialogSemaphore)
+    if (dialogSemaphore) {
         deleteAfterDialog = true;
-    else
+    } else {
         deleteLater();
+    }
 }
 
 void AbstractCounter::retranslateUi()
 {
-    if (menu) {
+    if (aSet) {
         aSet->setText(tr("&Set counter..."));
     }
 }
 
 void AbstractCounter::setShortcutsActive()
 {
-    if (!menu) {
+    if (!menu || !player->getPlayerInfo()->getLocal()) {
         return;
     }
-    if (!player->getPlayerInfo()->getLocal()) {
-        return;
-    }
-
-    ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
+    ShortcutsSettings &sc = SettingsCache::instance().shortcuts();
+    shortcutActive = true;
     if (name == "life") {
-        shortcutActive = true;
-        aSet->setShortcuts(shortcuts.getShortcut("Player/aSet"));
-        aDec->setShortcuts(shortcuts.getShortcut("Player/aDec"));
-        aInc->setShortcuts(shortcuts.getShortcut("Player/aInc"));
+        aSet->setShortcuts(sc.getShortcut("Player/aSet"));
+        aDec->setShortcuts(sc.getShortcut("Player/aDec"));
+        aInc->setShortcuts(sc.getShortcut("Player/aInc"));
     } else if (useNameForShortcut) {
-        shortcutActive = true;
-        aSet->setShortcuts(shortcuts.getShortcut("Player/aSetCounter_" + name));
-        aDec->setShortcuts(shortcuts.getShortcut("Player/aDecCounter_" + name));
-        aInc->setShortcuts(shortcuts.getShortcut("Player/aIncCounter_" + name));
+        aSet->setShortcuts(sc.getShortcut("Player/aSetCounter_" + name));
+        aDec->setShortcuts(sc.getShortcut("Player/aDecCounter_" + name));
+        aInc->setShortcuts(sc.getShortcut("Player/aIncCounter_" + name));
     }
 }
 
@@ -126,43 +139,32 @@ void AbstractCounter::refreshShortcuts()
     }
 }
 
-void AbstractCounter::setValue(int _value)
-{
-    value = _value;
-    update();
-}
-
 void AbstractCounter::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
-    if (isUnderMouse() && player->getPlayerInfo()->getLocalOrJudge()) {
-        if (event->button() == Qt::MiddleButton || (QApplication::keyboardModifiers() & Qt::ShiftModifier)) {
-            if (menu)
-                menu->exec(event->screenPos());
-            event->accept();
-        } else if (event->button() == Qt::LeftButton) {
-            Command_IncCounter cmd;
-            cmd.set_counter_id(id);
-            cmd.set_delta(1);
-            player->getPlayerActions()->sendGameCommand(cmd);
-            event->accept();
-        } else if (event->button() == Qt::RightButton) {
-            Command_IncCounter cmd;
-            cmd.set_counter_id(id);
-            cmd.set_delta(-1);
-            player->getPlayerActions()->sendGameCommand(cmd);
-            event->accept();
-        }
-    } else
+    if (!isUnderMouse() || !player->getPlayerInfo()->getLocalOrJudge()) {
         event->ignore();
+        return;
+    }
+
+    if (event->button() == Qt::MiddleButton || QApplication::keyboardModifiers() & Qt::ShiftModifier) {
+        if (menu) {
+            menu->exec(event->screenPos());
+        }
+    } else {
+        Command_IncCounter cmd;
+        cmd.set_counter_id(id);
+        cmd.set_delta(event->button() == Qt::LeftButton ? 1 : -1);
+        player->getPlayerActions()->sendGameCommand(cmd);
+    }
+    event->accept();
 }
 
-void AbstractCounter::hoverEnterEvent(QGraphicsSceneHoverEvent * /*event*/)
+void AbstractCounter::hoverEnterEvent(QGraphicsSceneHoverEvent *)
 {
     hovered = true;
     update();
 }
-
-void AbstractCounter::hoverLeaveEvent(QGraphicsSceneHoverEvent * /*event*/)
+void AbstractCounter::hoverLeaveEvent(QGraphicsSceneHoverEvent *)
 {
     hovered = false;
     update();
@@ -170,34 +172,36 @@ void AbstractCounter::hoverLeaveEvent(QGraphicsSceneHoverEvent * /*event*/)
 
 void AbstractCounter::incrementCounter()
 {
-    const int delta = static_cast<QAction *>(sender())->data().toInt();
     Command_IncCounter cmd;
     cmd.set_counter_id(id);
-    cmd.set_delta(delta);
+    cmd.set_delta(static_cast<QAction *>(sender())->data().toInt());
     player->getPlayerActions()->sendGameCommand(cmd);
 }
 
 void AbstractCounter::setCounter()
 {
+    QWidget *parent = nullptr;
+    if (auto *view = scene() ? scene()->views().value(0) : nullptr) {
+        parent = view->window();
+    }
+
     dialogSemaphore = true;
-    AbstractCounterDialog dialog(name, QString::number(value), player->getGame()->getTab());
-    const int ok = dialog.exec();
+    AbstractCounterDialog dlg(name, QString::number(value), parent);
+    const int ok = dlg.exec();
+    dialogSemaphore = false;
 
     if (deleteAfterDialog) {
         deleteLater();
         return;
     }
-    dialogSemaphore = false;
-
-    if (!ok)
+    if (!ok) {
         return;
+    }
 
     Expression exp(value);
-    int newValue = static_cast<int>(exp.parse(dialog.textValue()));
-
     Command_SetCounter cmd;
     cmd.set_counter_id(id);
-    cmd.set_value(newValue);
+    cmd.set_value(static_cast<int>(exp.parse(dlg.textValue())));
     player->getPlayerActions()->sendGameCommand(cmd);
 }
 
@@ -231,8 +235,15 @@ void AbstractCounterDialog::changeValue(int diff)
 {
     bool ok;
     int curValue = textValue().toInt(&ok);
-    if (!ok)
+    if (!ok) {
         return;
+    }
     curValue += diff;
     setTextValue(QString::number(curValue));
 }
+
+void AbstractCounter::onValueChanged(int /*oldValue*/, int /*newValue*/, bool /*skipDamageAnimation*/)
+{
+    // Default: no feedback. Subclasses such as PlayerCounter override this to
+    // flash the counter on meaningful changes (life gain/loss).
+}
diff --git a/cockatrice/src/game_graphics/board/abstract_counter.h b/cockatrice/src/game_graphics/board/abstract_counter.h
new file mode 100644
index 000000000..7ba686a93
--- /dev/null
+++ b/cockatrice/src/game_graphics/board/abstract_counter.h
@@ -0,0 +1,120 @@
+/**
+ * @file abstract_counter.h
+ * @ingroup GameGraphicsPlayers
+ */
+//! \todo Document this file.
+
+#ifndef COUNTER_H
+#define COUNTER_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 QMenu;
+class CounterState;
+class QWidget;
+
+class AbstractCounter : public QObject, public QGraphicsItem, public AbstractPlayerComponent
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsItem)
+
+protected:
+    PlayerLogic *player;
+    int id;
+    QString name;
+    int value;
+    QColor color;
+    int radius;
+    bool hovered = false;
+    bool useNameForShortcut;
+
+    /**
+     * @brief Hook for subclasses that need per-value-change feedback (e.g. life-total flash).
+     *
+     * Called whenever the counter's value changes, before the item repaints.
+     * @param skipDamageAnimation True when damage-related feedback should be suppressed (replay rewinds).
+     */
+    virtual void onValueChanged(int oldValue, int newValue, bool skipDamageAnimation);
+
+    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
+    void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
+    void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
+
+private:
+    QAction *aSet = nullptr, *aDec = nullptr, *aInc = nullptr;
+    TearOffMenu *menu = nullptr;
+    bool dialogSemaphore = false;
+    bool deleteAfterDialog = false;
+    bool shownInCounterArea;
+    bool shortcutActive = false;
+
+private slots:
+    void refreshShortcuts();
+    void incrementCounter();
+    void setCounter();
+
+public:
+    AbstractCounter(CounterState *state,
+                    PlayerLogic *player,
+                    bool shownInCounterArea,
+                    bool useNameForShortcut = false,
+                    QGraphicsItem *parent = nullptr);
+    ~AbstractCounter() override;
+
+    void retranslateUi() override;
+    void setShortcutsActive() override;
+    void setShortcutsInactive() override;
+    void delCounter();
+
+    QMenu *getMenu() const
+    {
+        return menu;
+    }
+    int getId() const
+    {
+        return id;
+    }
+    QString getName() const
+    {
+        return name;
+    }
+    QColor getColor() const
+    {
+        return color;
+    }
+    int getRadius() const
+    {
+        return radius;
+    }
+    int getValue() const
+    {
+        return value;
+    }
+    bool getShownInCounterArea() const
+    {
+        return shownInCounterArea;
+    }
+};
+
+class AbstractCounterDialog : public QInputDialog
+{
+    Q_OBJECT
+public:
+    AbstractCounterDialog(const QString &name, const QString &value, QWidget *parent = nullptr);
+
+protected:
+    bool eventFilter(QObject *obj, QEvent *event) override;
+    void changeValue(int diff);
+};
+
+#endif
diff --git a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp b/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
index 8ced8d5bc..50e80d359 100644
--- a/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
+++ b/cockatrice/src/game_graphics/board/abstract_graphics_item.cpp
@@ -1,6 +1,14 @@
 #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,
@@ -17,34 +25,31 @@ void AbstractGraphicsItem::paintNumberEllipse(int number,
     font.setWeight(QFont::Bold);
 
     QFontMetrics fm(font);
-    double w = 1.3 *
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
-               fm.horizontalAdvance(numStr);
-#else
-               fm.width(numStr);
-#endif
+    double w = 1.3 * fm.horizontalAdvance(numStr);
     double h = fm.height() * 1.3;
-    if (w < h)
+    if (w < h) {
         w = h;
+    }
 
     painter->setPen(QColor(255, 255, 255, 0));
     painter->setBrush(QBrush(QColor(color)));
 
     QRectF textRect;
-    if (position == -1)
+    if (position == -1) {
         textRect = QRectF((boundingRect().width() - w) / 2.0, (boundingRect().height() - h) / 2.0, w, h);
-    else {
+    } else {
         qreal xOffset = 10;
         qreal yOffset = 20;
         qreal spacing = 2;
-        if (position < 2)
+        if (position < 2) {
             textRect = QRectF(count == 1 ? ((boundingRect().width() - w) / 2.0)
                                          : (position % 2 == 0 ? xOffset : (boundingRect().width() - xOffset - w)),
                               yOffset, w, h);
-        else
+        } else {
             textRect = QRectF(count == 3 ? ((boundingRect().width() - w) / 2.0)
                                          : (position % 2 == 0 ? xOffset : (boundingRect().width() - xOffset - w)),
                               yOffset + (spacing + h) * (position / 2), w, h);
+        }
     }
 
     painter->drawEllipse(textRect);
diff --git a/cockatrice/src/game_graphics/board/abstract_graphics_item.h b/cockatrice/src/game_graphics/board/abstract_graphics_item.h
index 93b9bff1b..ebc2a3761 100644
--- a/cockatrice/src/game_graphics/board/abstract_graphics_item.h
+++ b/cockatrice/src/game_graphics/board/abstract_graphics_item.h
@@ -1,13 +1,18 @@
 /**
  * @file abstract_graphics_item.h
  * @ingroup GameGraphics
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef ABSTRACTGRAPHICSITEM_H
 #define ABSTRACTGRAPHICSITEM_H
 
-#include <QGraphicsItem>
+#include <QColor>
+#include <QGraphicsObject>
+#include <qtmetamacros.h>
+
+class QGraphicsItem;
+class QPainter;
 
 /**
  * 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
new file mode 100644
index 000000000..c5a9b9c5e
--- /dev/null
+++ b/cockatrice/src/game_graphics/board/arrow_item.cpp
@@ -0,0 +1,585 @@
+#define _USE_MATH_DEFINES
+#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 "card_item.h"
+#include "libcockatrice/card/printing/exact_card.h"
+#include "libcockatrice/protocol/pb/color.pb.h"
+
+#include <QBrush>
+#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/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
+{
+constexpr qreal kMinStrokeDurationMs = 200.0;
+constexpr qreal kMaxStrokeDurationMs = 450.0;
+constexpr qreal kMsPerPixel = 0.8;
+constexpr qreal kGlowFadeDurationMs = 120.0;
+constexpr qreal kSheenHalfWidth = 14.0;
+
+/// @brief Ease-out cubic, for a natural "slow in / slow out" reveal.
+qreal easeOutCubic(qreal t)
+{
+    const qreal inverse = 1.0 - t;
+    return 1.0 - inverse * inverse * inverse;
+}
+} // namespace
+
+ArrowItem::ArrowItem(QSharedPointer<const ArrowData> _data, ArrowTarget *_startItem, ArrowTarget *_targetItem)
+    : data(std::move(_data)), startItem(_startItem), targetItem(_targetItem)
+{
+    setZValue(ZValues::ARROWS);
+
+    auto doUpdate = [this]() {
+        if (startItem && targetItem) {
+            updatePath();
+        }
+    };
+
+    if (startItem) {
+        connect(startItem, &ArrowTarget::scenePositionChanged, this, doUpdate);
+        connect(startItem, &QObject::destroyed, this, &ArrowItem::onTargetDestroyed);
+    }
+    if (targetItem) {
+        connect(targetItem, &ArrowTarget::scenePositionChanged, this, doUpdate);
+        connect(targetItem, &QObject::destroyed, this, &ArrowItem::onTargetDestroyed);
+    }
+
+    if (startItem && targetItem) {
+        updatePath();
+    }
+}
+
+ArrowItem::~ArrowItem()
+{
+    if (auto *scene = qobject_cast<GameScene *>(this->scene())) {
+        scene->unregisterAnimationItem(this);
+    }
+}
+
+void ArrowItem::onTargetDestroyed()
+{
+    if (data->id == -1) {
+        // Drag and attach arrows are never inserted into the arrow registry and
+        // have no server-side counterpart, so no deletion event can clean them
+        // up. Delete them locally when either endpoint is destroyed.
+        delArrow();
+        return;
+    }
+
+    emit requestDeletion(data->creatorId, data->id);
+}
+
+void ArrowItem::delArrow()
+{
+    if (targetItem) {
+        targetItem->setBeingPointedAt(false);
+    }
+    deleteLater();
+}
+
+void ArrowItem::updatePath()
+{
+    if (!targetItem) {
+        return;
+    }
+
+    QPointF endPoint = targetItem->mapToScene(
+        QPointF(targetItem->boundingRect().width() / 2, targetItem->boundingRect().height() / 2));
+    updatePath(endPoint);
+}
+
+void ArrowItem::updatePath(const QPointF &endPoint)
+{
+    const double arrowWidth = 15.0;
+    const double headWidth = 40.0;
+    const double headLength =
+        headWidth / qPow(2, 0.5); // aka headWidth / sqrt (2) but this produces a compile error with MSVC++
+    const double phi = 15;
+
+    if (!startItem) {
+        return;
+    }
+
+    QPointF startPoint =
+        startItem->mapToScene(QPointF(startItem->boundingRect().width() / 2, startItem->boundingRect().height() / 2));
+    QLineF line(startPoint, endPoint);
+    qreal lineLength = line.length();
+
+    prepareGeometryChange();
+    if (lineLength < 30) {
+        path = QPainterPath();
+        bodyPath = QPainterPath();
+        headPath = QPainterPath();
+        shaftOutlinePath = QPainterPath();
+        centerLine = QPainterPath();
+        headBaseFraction = 1.0;
+    } else {
+        QPointF c(lineLength / 2, qTan(phi * M_PI / 180) * lineLength);
+
+        centerLine = QPainterPath();
+        centerLine.moveTo(0, 0);
+        centerLine.quadTo(c, QPointF(lineLength, 0));
+
+        headBaseFraction = 1 - headLength / lineLength;
+        QPointF arrowBodyEndPoint = centerLine.pointAtPercent(headBaseFraction);
+        QLineF testLine(arrowBodyEndPoint, centerLine.pointAtPercent(headBaseFraction + 0.001));
+        qreal alpha = testLine.angle() - 90;
+        QPointF endPoint1 =
+            arrowBodyEndPoint + arrowWidth / 2 * QPointF(qCos(alpha * M_PI / 180), -qSin(alpha * M_PI / 180));
+        QPointF endPoint2 =
+            arrowBodyEndPoint + arrowWidth / 2 * QPointF(-qCos(alpha * M_PI / 180), qSin(alpha * M_PI / 180));
+        QPointF point1 =
+            endPoint1 + (headWidth - arrowWidth) / 2 * QPointF(qCos(alpha * M_PI / 180), -qSin(alpha * M_PI / 180));
+        QPointF point2 =
+            endPoint2 + (headWidth - arrowWidth) / 2 * QPointF(-qCos(alpha * M_PI / 180), qSin(alpha * M_PI / 180));
+
+        QPointF start1 = -arrowWidth / 2 * QPointF(qCos((phi - 90) * M_PI / 180), qSin((phi - 90) * M_PI / 180));
+        QPointF start2 = arrowWidth / 2 * QPointF(qCos((phi - 90) * M_PI / 180), qSin((phi - 90) * M_PI / 180));
+
+        path = QPainterPath(start1);
+        path.quadTo(c, endPoint1);
+        path.lineTo(point1);
+        path.lineTo(QPointF(lineLength, 0));
+        path.lineTo(point2);
+        path.lineTo(endPoint2);
+        path.quadTo(c, start2);
+        path.lineTo(start1);
+
+        bodyPath = QPainterPath(start1);
+        bodyPath.quadTo(c, endPoint1);
+        bodyPath.lineTo(endPoint2);
+        bodyPath.quadTo(c, start2);
+        bodyPath.lineTo(start1);
+
+        headPath = QPainterPath(endPoint1);
+        headPath.lineTo(point1);
+        headPath.lineTo(QPointF(lineLength, 0));
+        headPath.lineTo(point2);
+        headPath.lineTo(endPoint2);
+
+        shaftOutlinePath = QPainterPath(start1);
+        shaftOutlinePath.quadTo(c, endPoint1);
+        shaftOutlinePath.moveTo(endPoint2);
+        shaftOutlinePath.quadTo(c, start2);
+        shaftOutlinePath.lineTo(start1);
+    }
+
+    setPos(startPoint);
+    setTransform(QTransform().rotate(-line.angle()));
+}
+
+void ArrowItem::startDrawAnimation()
+{
+    if (!SettingsCache::instance().cardsDisplay().getArrowDrawAnimation() || centerLine.isEmpty()) {
+        return;
+    }
+
+    strokeDurationMs = qBound(kMinStrokeDurationMs, centerLine.length() * kMsPerPixel, kMaxStrokeDurationMs);
+    glowFadeDurationMs = kGlowFadeDurationMs;
+    // The clock is started on the first animationEvent() tick so that t=0
+    // corresponds to the first rendered frame. Starting it here would count
+    // the time spent before the item's first paint (event-loop delays, bursts
+    // of arrows created together), making the arrow appear already partway
+    // drawn when it first shows up.
+    animationStarted = false;
+    drawProgress = 0.0;
+    glowAlpha = 1.0;
+    update();
+    if (auto *scene = qobject_cast<GameScene *>(this->scene())) {
+        scene->registerAnimationItem(this);
+    }
+}
+
+bool ArrowItem::animationEvent()
+{
+    if (!animationStarted) {
+        animationClock.start();
+        animationStarted = true;
+    }
+
+    const qint64 elapsed = animationClock.elapsed();
+    if (elapsed >= strokeDurationMs + glowFadeDurationMs) {
+        drawProgress = 1.0;
+        glowAlpha = 0.0;
+        update();
+        return false;
+    }
+
+    if (elapsed < strokeDurationMs) {
+        drawProgress = easeOutCubic(qBound<qreal>(0.0, elapsed / strokeDurationMs, 1.0));
+        glowAlpha = 1.0;
+    } else {
+        drawProgress = 1.0;
+        glowAlpha = 1.0 - (elapsed - strokeDurationMs) / glowFadeDurationMs;
+    }
+    update();
+    return true;
+}
+
+void ArrowItem::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
+{
+    QColor paintColor(data->color);
+    if (fullColor) {
+        paintColor.setAlpha(200);
+    } else {
+        paintColor.setAlpha(150);
+    }
+
+    painter->save();
+    const QPen outlinePen = painter->pen();
+    painter->setBrush(paintColor);
+
+    const auto drawShaft = [this, painter, &outlinePen, paintColor]() {
+        painter->setPen(Qt::NoPen);
+        painter->drawPath(bodyPath);
+        painter->setPen(outlinePen);
+        painter->setBrush(Qt::NoBrush);
+        painter->drawPath(shaftOutlinePath);
+        painter->setBrush(paintColor);
+    };
+
+    if (drawProgress >= 1.0 || path.isEmpty()) {
+        painter->drawPath(path);
+    } else if (drawProgress < headBaseFraction) {
+        // The reveal edge and the sheen share the same arc-length parameterization,
+        // so the stroke stays exactly in sync with the trailing sheen.
+        const qreal revealX = centerLine.pointAtPercent(drawProgress).x();
+        QPainterPath clip;
+        clip.addRect(QRectF(-glowExtent, path.boundingRect().top() - glowExtent, revealX + glowExtent,
+                            path.boundingRect().height() + 2 * glowExtent));
+        painter->setClipPath(clip);
+        drawShaft();
+    } else {
+        // Once the reveal reaches the head base, pop the whole head in with a fade
+        // instead of slicing the triangle into a growing stub.
+        drawShaft();
+        const qreal headFadeIn = (drawProgress - headBaseFraction) / (1.0 - headBaseFraction);
+        painter->setOpacity(headFadeIn);
+        painter->setPen(Qt::NoPen);
+        painter->drawPath(headPath);
+        painter->setPen(outlinePen);
+        painter->setBrush(Qt::NoBrush);
+        painter->drawPath(headPath);
+        painter->setOpacity(1.0);
+        painter->setBrush(paintColor);
+    }
+
+    if (glowAlpha > 0.0 && !centerLine.isEmpty()) {
+        // Sweep a bright band across the arrow. Clipping to the
+        // silhouette keeps it flat against the shaft so it reads as a light reflection.
+        const qreal anticipation = qMin<qreal>(1.0, drawProgress / 0.08);
+        const QPointF sweep = centerLine.pointAtPercent(qMin<qreal>(drawProgress, 1.0));
+        QLinearGradient sheen(sweep.x() - kSheenHalfWidth, 0.0, sweep.x() + kSheenHalfWidth, 0.0);
+        sheen.setColorAt(0.0, QColor(paintColor.red(), paintColor.green(), paintColor.blue(), 0));
+        sheen.setColorAt(0.5, QColor(255, 255, 255, 200));
+        sheen.setColorAt(1.0, QColor(paintColor.red(), paintColor.green(), paintColor.blue(), 0));
+        painter->save();
+        painter->setPen(Qt::NoPen);
+        painter->setClipPath(path);
+        painter->setBrush(sheen);
+        painter->setOpacity(glowAlpha * anticipation);
+        painter->drawRect(QRectF(sweep.x() - kSheenHalfWidth - glowExtent, path.boundingRect().top() - glowExtent,
+                                 (kSheenHalfWidth + glowExtent) * 2.0,
+                                 path.boundingRect().height() + glowExtent * 2.0));
+        painter->restore();
+    }
+    painter->restore();
+}
+
+void ArrowItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (!data->isLocalCreator) {
+        event->ignore();
+        return;
+    }
+
+    for (auto *item : scene()->items(event->scenePos())) {
+        if (qgraphicsitem_cast<CardItem *>(item)) {
+            event->ignore();
+            return;
+        }
+    }
+
+    event->accept();
+    if (event->button() == Qt::RightButton) {
+        emit requestDeletion(data->creatorId, data->id);
+    }
+}
+
+// ArrowDragItem
+
+ArrowDragItem::ArrowDragItem(PlayerLogic *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase)
+    : ArrowItem(QSharedPointer<ArrowData>::create(ArrowData{.creatorId = _owner->getPlayerInfo()->getId(),
+                                                            .isLocalCreator = true,
+                                                            .id = -1,
+                                                            .color = _color}),
+                _startItem,
+                nullptr),
+      player(_owner), deleteInPhase(_deleteInPhase)
+{
+}
+
+void ArrowDragItem::addChildArrow(ArrowDragItem *child)
+{
+    childArrows.append(child);
+}
+
+void ArrowDragItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (targetLocked || !startItem) {
+        return;
+    }
+
+    const QPointF endPos = event->scenePos();
+
+    ArrowTarget *cursorItem = nullptr;
+    qreal cursorItemZ = -1;
+    for (auto *item : scene()->items(endPos)) {
+        ArrowTarget *candidate = nullptr;
+        if (auto *card = qgraphicsitem_cast<CardItem *>(item)) {
+            candidate = card;
+        } else if (auto *pt = qgraphicsitem_cast<PlayerTarget *>(item)) {
+            candidate = pt;
+        }
+
+        if (candidate && candidate->zValue() > cursorItemZ) {
+            cursorItem = candidate;
+            cursorItemZ = candidate->zValue();
+        }
+    }
+
+    if (cursorItem != targetItem) {
+        if (targetItem) {
+            disconnect(positionConnection);
+            targetItem->setBeingPointedAt(false);
+        }
+
+        targetItem = cursorItem;
+        fullColor = (cursorItem != nullptr);
+
+        if (cursorItem && cursorItem != startItem) {
+            cursorItem->setBeingPointedAt(true);
+            positionConnection =
+                connect(cursorItem, &ArrowTarget::scenePositionChanged, this, [this]() { updatePath(); });
+        }
+    }
+
+    targetItem ? updatePath() : updatePath(endPos);
+    update();
+
+    for (auto *child : childArrows) {
+        child->mouseMoveEvent(event);
+    }
+}
+
+void ArrowDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (!startItem) {
+        // The source card was destroyed while the arrow was being drawn.
+        // Clean up the arrow and its children instead of leaking them.
+        delArrow();
+        for (auto *child : childArrows) {
+            child->mouseReleaseEvent(event);
+        }
+        return;
+    }
+
+    if (targetItem && targetItem != startItem) {
+        CardItem *startCard = qgraphicsitem_cast<CardItem *>(startItem);
+        // For now, we can safely assume that the start item is always a card.
+        // The target item can be a player as well.
+        if (!startCard) {
+            delArrow();
+            return;
+        }
+
+        CardZoneLogic *startZone = startCard->getZone();
+
+        Command_CreateArrow cmd;
+        cmd.mutable_arrow_color()->CopyFrom(convertQColorToColor(data->color));
+        cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId());
+        cmd.set_start_zone(startZone->getName().toStdString());
+        cmd.set_start_card_id(startCard->getId());
+
+        if (auto *targetCard = qgraphicsitem_cast<CardItem *>(targetItem)) {
+            CardZoneLogic *targetZone = targetCard->getZone();
+            cmd.set_target_player_id(targetZone->getPlayer()->getPlayerInfo()->getId());
+            cmd.set_target_zone(targetZone->getName().toStdString());
+            cmd.set_target_card_id(targetCard->getId());
+        } else if (auto *targetPlayer = qgraphicsitem_cast<PlayerTarget *>(targetItem)) {
+            cmd.set_target_player_id(targetPlayer->getOwner()->getPlayerInfo()->getId());
+        } else {
+            delArrow();
+            return;
+        }
+
+        // if the card is in hand then we will move the card to stack or table as part of drawing the arrow
+        if (startZone->getName() == ZoneNames::HAND) {
+            startCard->playCard(false);
+            CardInfoPtr ci = startCard->getCard().getCardPtr();
+            bool playToStack = SettingsCache::instance().userInterface().getPlayToStack();
+            if (ci && ((!playToStack && ci->getUiAttributes().tableRow == 3) ||
+                       (playToStack && ci->getUiAttributes().tableRow != 0 &&
+                        startCard->getZone()->getName() != ZoneNames::STACK))) {
+                cmd.set_start_zone(ZoneNames::STACK);
+            } else {
+                cmd.set_start_zone(playToStack ? ZoneNames::STACK : ZoneNames::TABLE);
+            }
+        }
+
+        if (deleteInPhase != 0) {
+            cmd.set_delete_in_phase(deleteInPhase);
+        }
+
+        player->getPlayerActions()->sendGameCommand(cmd);
+    }
+
+    delArrow();
+    for (auto *child : childArrows) {
+        child->mouseReleaseEvent(event);
+    }
+}
+
+// ArrowAttachItem
+ArrowAttachItem::ArrowAttachItem(ArrowTarget *_startItem)
+    : ArrowItem(
+          QSharedPointer<ArrowData>::create(ArrowData{.creatorId = _startItem->getOwner()->getPlayerInfo()->getId(),
+                                                      .isLocalCreator = true,
+                                                      .id = -1,
+                                                      .color = Qt::green}),
+          _startItem,
+          nullptr),
+      player(_startItem->getOwner())
+{
+}
+
+void ArrowAttachItem::addChildArrow(ArrowAttachItem *child)
+{
+    childArrows.append(child);
+}
+
+void ArrowAttachItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (targetLocked || !startItem) {
+        return;
+    }
+
+    const QPointF endPos = event->scenePos();
+
+    ArrowTarget *cursorItem = nullptr;
+    qreal cursorItemZ = -1;
+    for (auto *item : scene()->items(endPos)) {
+        if (auto *card = qgraphicsitem_cast<CardItem *>(item)) {
+            if (card->zValue() > cursorItemZ) {
+                cursorItem = card;
+                cursorItemZ = card->zValue();
+            }
+        }
+    }
+
+    if (cursorItem != targetItem) {
+        if (targetItem) {
+            disconnect(positionConnection);
+            targetItem->setBeingPointedAt(false);
+        }
+
+        targetItem = cursorItem;
+        fullColor = (cursorItem != nullptr);
+
+        if (cursorItem && cursorItem != startItem) {
+            cursorItem->setBeingPointedAt(true);
+            positionConnection =
+                connect(cursorItem, &ArrowTarget::scenePositionChanged, this, [this]() { updatePath(); });
+        }
+    }
+
+    targetItem ? updatePath() : updatePath(endPos);
+    update();
+
+    for (auto *child : childArrows) {
+        child->mouseMoveEvent(event);
+    }
+}
+
+void ArrowAttachItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (!startItem) {
+        // The source card was destroyed while the arrow was being drawn.
+        // Clean up the arrow and its children instead of leaking them.
+        delArrow();
+        for (auto *child : childArrows) {
+            child->mouseReleaseEvent(event);
+        }
+        return;
+    }
+
+    // Attaching could move startItem under the current cursor position, causing all children to retarget to it right
+    // before they are processed. Prevent that.
+    for (auto *child : childArrows) {
+        child->setTargetLocked(true);
+    }
+
+    if (targetItem && targetItem != startItem) {
+        auto *startCard = qgraphicsitem_cast<CardItem *>(startItem);
+        auto *targetCard = qgraphicsitem_cast<CardItem *>(targetItem);
+        if (startCard && targetCard) {
+            attachCards(startCard, targetCard);
+        }
+    }
+
+    delArrow();
+    for (auto *child : childArrows) {
+        child->mouseReleaseEvent(event);
+    }
+}
+
+void ArrowAttachItem::attachCards(CardItem *startCard, const CardItem *targetCard)
+{
+    if (targetCard->getAttachedTo() || targetCard->getZone()->getName() != ZoneNames::TABLE) {
+        return;
+    }
+
+    // move card onto table first if attaching from some other zone
+    if (startCard->getZone()->getName() != ZoneNames::TABLE) {
+        player->getPlayerActions()->playCardToTable(startCard, false);
+    }
+
+    Command_AttachCard cmd;
+    cmd.set_start_zone(ZoneNames::TABLE);
+    cmd.set_card_id(startCard->getId());
+    cmd.set_target_player_id(targetCard->getZone()->getPlayer()->getPlayerInfo()->getId());
+    cmd.set_target_zone(targetCard->getZone()->getName().toStdString());
+    cmd.set_target_card_id(targetCard->getId());
+    player->getPlayerActions()->sendGameCommand(cmd);
+}
\ No newline at end of file
diff --git a/cockatrice/src/game_graphics/board/arrow_item.h b/cockatrice/src/game_graphics/board/arrow_item.h
new file mode 100644
index 000000000..2395165fc
--- /dev/null
+++ b/cockatrice/src/game_graphics/board/arrow_item.h
@@ -0,0 +1,145 @@
+#ifndef ARROWITEM_H
+#define ARROWITEM_H
+
+#include "../../game/board/arrow_data.h"
+#include "../animated_item.h"
+#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 PlayerLogic;
+template <class T> class QSharedPointer;
+
+class ArrowItem : public QObject, public QGraphicsItem, public IAnimatedItem
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsItem)
+signals:
+    void requestDeletion(int creatorId, int id);
+
+private:
+    QPainterPath path;
+    QPainterPath bodyPath;
+    QPainterPath headPath;
+    QPainterPath shaftOutlinePath;
+    QPainterPath centerLine;
+    qreal headBaseFraction = 1.0;
+    QElapsedTimer animationClock;
+    qreal strokeDurationMs = 0;
+    qreal glowFadeDurationMs = 0;
+    qreal drawProgress = 1.0;
+    qreal glowAlpha = 0.0;
+    bool animationStarted = false;
+
+    static constexpr qreal glowExtent = 12.0;
+
+protected:
+    QSharedPointer<const ArrowData> data;
+    QPointer<ArrowTarget> startItem;
+    QPointer<ArrowTarget> targetItem;
+    bool targetLocked = false;
+    bool fullColor = true;
+
+    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
+
+public:
+    enum
+    {
+        Type = typeArrow
+    };
+    [[nodiscard]] int type() const override
+    {
+        return Type;
+    }
+    ArrowItem(QSharedPointer<const ArrowData> _data, ArrowTarget *_startItem, ArrowTarget *_targetItem);
+    ~ArrowItem() override;
+
+    void onTargetDestroyed();
+    void delArrow();
+    void updatePath();
+    void updatePath(const QPointF &endPoint);
+    void startDrawAnimation();
+    bool animationEvent() override;
+
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
+    [[nodiscard]] QRectF boundingRect() const override
+    {
+        return path.boundingRect().adjusted(-glowExtent, -glowExtent, glowExtent, glowExtent);
+    }
+    [[nodiscard]] QPainterPath shape() const override
+    {
+        return path;
+    }
+    [[nodiscard]] int getId() const
+    {
+        return data->id;
+    }
+    [[nodiscard]] int getCreatorId() const
+    {
+        return data->creatorId;
+    }
+    [[nodiscard]] ArrowTarget *getStartItem() const
+    {
+        return startItem;
+    }
+    [[nodiscard]] ArrowTarget *getTargetItem() const
+    {
+        return targetItem;
+    }
+    void setTargetLocked(bool _targetLocked)
+    {
+        targetLocked = _targetLocked;
+    }
+};
+
+class ArrowDragItem : public ArrowItem
+{
+    Q_OBJECT
+private:
+    PlayerLogic *player;
+    int deleteInPhase;
+    QList<ArrowDragItem *> childArrows;
+    QMetaObject::Connection positionConnection;
+
+public:
+    ArrowDragItem(PlayerLogic *_owner, ArrowTarget *_startItem, const QColor &_color, int _deleteInPhase);
+    void addChildArrow(ArrowDragItem *child);
+
+protected:
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+};
+
+class ArrowAttachItem : public ArrowItem
+{
+    Q_OBJECT
+private:
+    PlayerLogic *player;
+    QList<ArrowAttachItem *> childArrows;
+    QMetaObject::Connection positionConnection;
+    void attachCards(CardItem *startCard, const CardItem *targetCard);
+
+public:
+    explicit ArrowAttachItem(ArrowTarget *_startItem);
+    void addChildArrow(ArrowAttachItem *child);
+
+protected:
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+};
+
+#endif
diff --git a/cockatrice/src/game_graphics/board/arrow_target.cpp b/cockatrice/src/game_graphics/board/arrow_target.cpp
new file mode 100644
index 000000000..024479ee6
--- /dev/null
+++ b/cockatrice/src/game_graphics/board/arrow_target.cpp
@@ -0,0 +1,24 @@
+#include "arrow_target.h"
+
+#include <QVariant>
+
+class QGraphicsItem;
+
+ArrowTarget::ArrowTarget(PlayerLogic *_owner, QGraphicsItem *parent) : AbstractGraphicsItem(parent), owner(_owner)
+{
+    setFlag(ItemSendsScenePositionChanges);
+}
+
+void ArrowTarget::setBeingPointedAt(bool _beingPointedAt)
+{
+    beingPointedAt = _beingPointedAt;
+    update();
+}
+
+QVariant ArrowTarget::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    if (change == ItemScenePositionHasChanged) {
+        emit scenePositionChanged();
+    }
+    return AbstractGraphicsItem::itemChange(change, value);
+}
\ No newline at end of file
diff --git a/cockatrice/src/game_graphics/board/arrow_target.h b/cockatrice/src/game_graphics/board/arrow_target.h
new file mode 100644
index 000000000..5c55e0e5d
--- /dev/null
+++ b/cockatrice/src/game_graphics/board/arrow_target.h
@@ -0,0 +1,47 @@
+/**
+ * @file arrow_target.h
+ * @ingroup GameGraphics
+ */
+//! \todo Document this file.
+
+#ifndef ARROWTARGET_H
+#define ARROWTARGET_H
+
+#include "abstract_graphics_item.h"
+
+#include <qtmetamacros.h>
+
+class PlayerLogic;
+class QGraphicsItem;
+
+class ArrowTarget : public AbstractGraphicsItem
+{
+    Q_OBJECT
+protected:
+    PlayerLogic *owner;
+
+private:
+    bool beingPointedAt = false;
+
+signals:
+    void scenePositionChanged();
+
+public:
+    explicit ArrowTarget(PlayerLogic *_owner, QGraphicsItem *parent = nullptr);
+    ~ArrowTarget() override = default;
+
+    [[nodiscard]] PlayerLogic *getOwner() const
+    {
+        return owner;
+    }
+
+    void setBeingPointedAt(bool _beingPointedAt);
+    [[nodiscard]] bool getBeingPointedAt() const
+    {
+        return beingPointedAt;
+    }
+
+protected:
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
+};
+#endif
diff --git a/cockatrice/src/game/board/card_drag_item.cpp b/cockatrice/src/game_graphics/board/card_drag_item.cpp
similarity index 83%
rename from cockatrice/src/game/board/card_drag_item.cpp
rename to cockatrice/src/game_graphics/board/card_drag_item.cpp
index 9eadadeda..265ea759c 100644
--- a/cockatrice/src/game/board/card_drag_item.cpp
+++ b/cockatrice/src/game_graphics/board/card_drag_item.cpp
@@ -6,16 +6,28 @@
 #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,
                            const QPointF &_hotSpot,
-                           bool _faceDown,
+                           bool _forceFaceDown,
                            AbstractCardDragItem *parentDrag)
-    : AbstractCardDragItem(_item, _hotSpot, parentDrag), id(_id), faceDown(_faceDown), occupied(false), currentZone(0)
+    : AbstractCardDragItem(_item, _hotSpot, parentDrag), id(_id), forceFaceDown(_forceFaceDown), occupied(false),
+      currentZone(0)
 {
 }
 
@@ -23,8 +35,9 @@ void CardDragItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
 {
     AbstractCardDragItem::paint(painter, option, widget);
 
-    if (occupied)
+    if (occupied) {
         painter->fillPath(shape(), QColor(200, 0, 0, 100));
+    }
 }
 
 void CardDragItem::updatePosition(const QPointF &cursorScenePos)
@@ -37,16 +50,19 @@ void CardDragItem::updatePosition(const QPointF &cursorScenePos)
     ZoneViewZone *zoneViewZone = 0;
     for (int i = colliding.size() - 1; i >= 0; i--) {
         CardZone *temp = qgraphicsitem_cast<CardZone *>(colliding.at(i));
-        if (!cardZone)
+        if (!cardZone) {
             cardZone = temp;
-        if (!zoneViewZone)
+        }
+        if (!zoneViewZone) {
             zoneViewZone = qobject_cast<ZoneViewZone *>(temp);
+        }
     }
     CardZone *cursorZone = 0;
-    if (zoneViewZone)
+    if (zoneViewZone) {
         cursorZone = zoneViewZone;
-    else if (cardZone)
+    } else if (cardZone) {
         cursorZone = cardZone;
+    }
 
     // Always update the current zone, even if its null, to cancel the drag
     // instead of dropping cards into an non-intuitive location.
@@ -58,8 +74,9 @@ void CardDragItem::updatePosition(const QPointF &cursorScenePos)
         QPointF newPos = cursorScenePos - hotSpot;
 
         if (newPos != pos()) {
-            for (int i = 0; i < childDrags.size(); i++)
+            for (int i = 0; i < childDrags.size(); i++) {
                 childDrags[i]->setPos(newPos + childDrags[i]->getHotSpot());
+            }
             setPos(newPos);
         }
 
@@ -77,23 +94,27 @@ void CardDragItem::updatePosition(const QPointF &cursorScenePos)
     // position.
     TableZone *tableZone = qobject_cast<TableZone *>(cursorZone);
     QPointF closestGridPoint;
-    if (tableZone)
+    if (tableZone) {
         closestGridPoint = tableZone->closestGridPoint(cursorPosInZone);
-    else
+    } else {
         closestGridPoint = cursorPosInZone - hotSpot;
+    }
 
     QPointF newPos = zonePos + closestGridPoint;
 
     if (newPos != pos()) {
-        for (int i = 0; i < childDrags.size(); i++)
+        for (int i = 0; i < childDrags.size(); i++) {
             childDrags[i]->setPos(newPos + childDrags[i]->getHotSpot());
+        }
         setPos(newPos);
 
         bool newOccupied = false;
         TableZone *table = qobject_cast<TableZone *>(cursorZone);
-        if (table)
-            if (table->getCardFromCoords(closestGridPoint))
+        if (table) {
+            if (table->getCardFromCoords(closestGridPoint)) {
                 newOccupied = true;
+            }
+        }
         if (newOccupied != occupied) {
             occupied = newOccupied;
             update();
diff --git a/cockatrice/src/game/board/card_drag_item.h b/cockatrice/src/game_graphics/board/card_drag_item.h
similarity index 78%
rename from cockatrice/src/game/board/card_drag_item.h
rename to cockatrice/src/game_graphics/board/card_drag_item.h
index 257fde150..d5e9a9e83 100644
--- a/cockatrice/src/game/board/card_drag_item.h
+++ b/cockatrice/src/game_graphics/board/card_drag_item.h
@@ -1,22 +1,26 @@
 /**
  * @file card_drag_item.h
  * @ingroup GameGraphicsCards
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARDDRAGITEM_H
 #define CARDDRAGITEM_H
 
 #include "abstract_card_drag_item.h"
 
+#include <QPointF>
+#include <qtmetamacros.h>
+
 class CardItem;
+class CardZone;
 
 class CardDragItem : public AbstractCardDragItem
 {
     Q_OBJECT
 private:
     int id;
-    bool faceDown;
+    bool forceFaceDown;
     bool occupied;
     CardZone *currentZone;
 
@@ -24,15 +28,15 @@ public:
     CardDragItem(CardItem *_item,
                  int _id,
                  const QPointF &_hotSpot,
-                 bool _faceDown,
+                 bool _forceFaceDown,
                  AbstractCardDragItem *parentDrag = 0);
     int getId() const
     {
         return id;
     }
-    bool getFaceDown() const
+    bool isForceFaceDown() const
     {
-        return faceDown;
+        return forceFaceDown;
     }
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
     void updatePosition(const QPointF &cursorScenePos) override;
diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game_graphics/board/card_item.cpp
similarity index 59%
rename from cockatrice/src/game/board/card_item.cpp
rename to cockatrice/src/game_graphics/board/card_item.cpp
index 34c2f9a98..a04d86c15 100644
--- a/cockatrice/src/game/board/card_item.cpp
+++ b/cockatrice/src/game_graphics/board/card_item.cpp
@@ -1,34 +1,66 @@
 #include "card_item.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "../../interface/widgets/tabs/tab_game.h"
+#include "../../game/abstract_game.h"
+#include "../../game/board/card_state.h"
+#include "../../game/game_state.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 "../game_scene.h"
-#include "../phase.h"
-#include "../player/player.h"
-#include "../player/player_actions.h"
-#include "../zones/logic/view_zone_logic.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 <QMenu>
+#include <QMap>
+#include <QMapIterator>
+#include <QObject>
 #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>
 
-CardItem::CardItem(Player *_owner, QGraphicsItem *parent, const CardRef &cardRef, int _cardid, CardZoneLogic *_zone)
-    : AbstractCardItem(parent, cardRef, _owner, _cardid), zone(_zone), attacking(false), destroyOnZoneChange(false),
-      doesntUntap(false), dragItem(nullptr), attachedTo(nullptr)
+struct CardRef;
+
+CardItem::CardItem(PlayerLogic *_owner,
+                   QGraphicsItem *parent,
+                   const CardRef &cardRef,
+                   int _cardid,
+                   CardZoneLogic *_zone)
+    : AbstractCardItem(parent, cardRef, _owner, _cardid), state(new CardState(this, _zone)), dragItem(nullptr)
 {
     owner->addCard(this);
 
     connect(&SettingsCache::instance().cardCounters(), &CardCounterSettings::colorChanged, this, [this](int counterId) {
-        if (counters.contains(counterId))
+        if (state->getCounters().contains(counterId)) {
             update();
+        }
     });
 }
 
@@ -36,7 +68,7 @@ void CardItem::prepareDelete()
 {
     if (owner != nullptr) {
         if (owner->getGame()->getActiveCard() == this) {
-            owner->getPlayerMenu()->updateCardMenu(nullptr);
+            emit owner->requestCardMenuUpdate(nullptr);
             owner->getGame()->setActiveCard(nullptr);
         }
         owner = nullptr;
@@ -47,23 +79,24 @@ void CardItem::prepareDelete()
         attachedCards.first()->setAttachedTo(nullptr);
     }
 
-    if (attachedTo != nullptr) {
-        attachedTo->removeAttachedCard(this);
-        attachedTo = nullptr;
+    if (state->getAttachedTo() != nullptr) {
+        state->getAttachedTo()->removeAttachedCard(this);
+        state->setAttachedTo(nullptr);
     }
 }
 
 void CardItem::deleteLater()
 {
     prepareDelete();
-    if (scene())
+    if (scene()) {
         static_cast<GameScene *>(scene())->unregisterAnimationItem(this);
+    }
     AbstractCardItem::deleteLater();
 }
 
 void CardItem::setZone(CardZoneLogic *_zone)
 {
-    zone = _zone;
+    state->setZone(_zone);
 }
 
 void CardItem::retranslateUi()
@@ -78,23 +111,23 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
     AbstractCardItem::paint(painter, option, widget);
 
     int i = 0;
-    QMapIterator<int, int> counterIterator(counters);
+    QMapIterator<int, int> counterIterator(state->getCounters());
     while (counterIterator.hasNext()) {
         counterIterator.next();
         QColor _color = cardCounterSettings.color(counterIterator.key());
 
-        paintNumberEllipse(counterIterator.value(), 14, _color, i, counters.size(), painter);
+        paintNumberEllipse(counterIterator.value(), 14, _color, i, state->getCounters().size(), painter);
         ++i;
     }
 
     QSizeF translatedSize = getTranslatedSize(painter);
     qreal scaleFactor = translatedSize.width() / boundingRect().width();
 
-    if (!pt.isEmpty()) {
+    if (!state->getPT().isEmpty()) {
         painter->save();
         transformPainter(painter, translatedSize, tapAngle);
 
-        if (!getFaceDown() && pt == exactCard.getInfo().getPowTough()) {
+        if (!getFaceDown() && state->getPT() == exactCard.getInfo().getPowTough()) {
             painter->setPen(Qt::white);
         } else {
             painter->setPen(QColor(255, 150, 0)); // dark orange
@@ -105,11 +138,11 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 
         painter->drawText(QRectF(4 * scaleFactor, 4 * scaleFactor, translatedSize.width() - 10 * scaleFactor,
                                  translatedSize.height() - 8 * scaleFactor),
-                          Qt::AlignRight | Qt::AlignBottom, pt);
+                          Qt::AlignRight | Qt::AlignBottom, state->getPT());
         painter->restore();
     }
 
-    if (!annotation.isEmpty()) {
+    if (!state->getAnnotation().isEmpty()) {
         painter->save();
 
         transformPainter(painter, translatedSize, tapAngle);
@@ -119,7 +152,7 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 
         painter->drawText(QRectF(4 * scaleFactor, 4 * scaleFactor, translatedSize.width() - 8 * scaleFactor,
                                  translatedSize.height() - 8 * scaleFactor),
-                          Qt::AlignCenter | Qt::TextWrapAnywhere, annotation);
+                          Qt::AlignCenter | Qt::TextWrapAnywhere, state->getAnnotation());
         painter->restore();
     }
 
@@ -127,7 +160,7 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
         painter->fillPath(shape(), QBrush(QColor(255, 0, 0, 100)));
     }
 
-    if (doesntUntap) {
+    if (state->getDoesntUntap()) {
         painter->save();
 
         painter->setRenderHint(QPainter::Antialiasing, false);
@@ -146,97 +179,91 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 
 void CardItem::setAttacking(bool _attacking)
 {
-    attacking = _attacking;
+    state->setAttacking(_attacking);
     update();
 }
 
 void CardItem::setCounter(int _id, int _value)
 {
-    if (_value)
-        counters.insert(_id, _value);
-    else
-        counters.remove(_id);
+    state->setCounter(_id, _value);
     update();
 }
 
 void CardItem::setAnnotation(const QString &_annotation)
 {
-    annotation = _annotation;
+    state->setAnnotation(_annotation);
     update();
 }
 
 void CardItem::setDoesntUntap(bool _doesntUntap)
 {
-    doesntUntap = _doesntUntap;
+    state->setDoesntUntap(_doesntUntap);
     update();
 }
 
 void CardItem::setPT(const QString &_pt)
 {
-    pt = _pt;
+    state->setPT(_pt);
     update();
 }
 
 void CardItem::setAttachedTo(CardItem *_attachedTo)
 {
-    if (attachedTo != nullptr) {
-        attachedTo->removeAttachedCard(this);
+    if (state->getAttachedTo() != nullptr) {
+        state->getAttachedTo()->removeAttachedCard(this);
     }
 
     gridPoint.setX(-1);
-    attachedTo = _attachedTo;
-    if (attachedTo != nullptr) {
+    state->setAttachedTo(_attachedTo);
+    if (state->getAttachedTo() != nullptr) {
         // If the zone is being torn down, it might already be null by the time a card tries to un-attach all its
         // attached cards
-        if (attachedTo->zone == nullptr) {
+        if (state->getAttachedTo()->getZone() == nullptr) {
             deleteLater();
         } else {
-            emit attachedTo->zone->cardAdded(this);
-            attachedTo->addAttachedCard(this);
-            if (zone != attachedTo->getZone()) {
-                attachedTo->getZone()->reorganizeCards();
+            emit state->getAttachedTo()->getZone()->cardAdded(this);
+            state->getAttachedTo()->addAttachedCard(this);
+            if (state->getZone() != state->getAttachedTo()->getZone()) {
+                state->getAttachedTo()->getZone()->reorganizeCards();
             }
         }
     } else {
         // If the zone is being torn down, it might already be null by the time a card tries to un-attach all its
         // attached cards
-        if (zone == nullptr) {
+        if (state->getZone() == nullptr) {
             deleteLater();
         } else {
-            emit zone->cardAdded(this);
+            emit state->getZone()->cardAdded(this);
         }
     }
 
-    if (zone != nullptr) {
-        zone->reorganizeCards();
+    if (state->getZone() != nullptr) {
+        state->getZone()->reorganizeCards();
     }
 }
 
+/**
+ * @brief Resets the fields that should be reset after a zone transition
+ */
 void CardItem::resetState(bool keepAnnotations)
 {
-    attacking = false;
-    facedown = false;
-    counters.clear();
-    pt.clear();
-    if (!keepAnnotations) {
-        annotation.clear();
-    }
-    attachedTo = 0;
+    state->resetState(keepAnnotations);
     attachedCards.clear();
     setTapped(false, false);
     setDoesntUntap(false);
-    if (scene())
+    if (scene()) {
         static_cast<GameScene *>(scene())->unregisterAnimationItem(this);
+    }
     update();
 }
 
 void CardItem::processCardInfo(const ServerInfo_Card &_info)
 {
-    counters.clear();
+    state->clearCounters();
     const int counterListSize = _info.counter_list_size();
     for (int i = 0; i < counterListSize; ++i) {
         const ServerInfo_CardCounter &counterInfo = _info.counter_list(i);
-        counters.insert(counterInfo.id(), counterInfo.value());
+        state->insertCounter(counterInfo.id(), counterInfo.value());
     }
 
     setId(_info.id());
@@ -251,10 +278,10 @@ void CardItem::processCardInfo(const ServerInfo_Card &_info)
     setDoesntUntap(_info.doesnt_untap());
 }
 
-CardDragItem *CardItem::createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown)
+CardDragItem *CardItem::createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool forceFaceDown)
 {
     deleteDragItem();
-    dragItem = new CardDragItem(this, _id, _pos, faceDown);
+    dragItem = new CardDragItem(this, _id, _pos, forceFaceDown);
     dragItem->setVisible(false);
     scene()->addItem(dragItem);
     dragItem->updatePosition(_scenePos);
@@ -273,13 +300,14 @@ void CardItem::deleteDragItem()
 
 void CardItem::drawArrow(const QColor &arrowColor)
 {
-    if (owner->getGame()->getPlayerManager()->isSpectator())
+    if (owner->getGame()->getPlayerManager()->isSpectator()) {
         return;
+    }
 
     auto *game = owner->getGame();
-    Player *arrowOwner = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer());
+    PlayerLogic *arrowOwner = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer());
     int phase = 0; // 0 means to not set the phase
-    if (SettingsCache::instance().getDoNotDeleteArrowsInSubPhases()) {
+    if (SettingsCache::instance().userInterface().getDoNotDeleteArrowsInSubPhases()) {
         int currentPhase = game->getGameState()->getCurrentPhase();
         phase = Phases::getLastSubphase(currentPhase) + 1;
     }
@@ -289,10 +317,12 @@ void CardItem::drawArrow(const QColor &arrowColor)
 
     for (const auto &item : scene()->selectedItems()) {
         CardItem *card = qgraphicsitem_cast<CardItem *>(item);
-        if (card == nullptr || card == this)
+        if (card == nullptr || card == this) {
             continue;
-        if (card->getZone() != zone)
+        }
+        if (card->getZone() != state->getZone()) {
             continue;
+        }
 
         ArrowDragItem *childArrow = new ArrowDragItem(arrowOwner, card, arrowColor, phase);
         scene()->addItem(childArrow);
@@ -302,8 +332,9 @@ void CardItem::drawArrow(const QColor &arrowColor)
 
 void CardItem::drawAttachArrow()
 {
-    if (owner->getGame()->getPlayerManager()->isSpectator())
+    if (owner->getGame()->getPlayerManager()->isSpectator()) {
         return;
+    }
 
     auto *arrow = new ArrowAttachItem(this);
     scene()->addItem(arrow);
@@ -311,10 +342,12 @@ void CardItem::drawAttachArrow()
 
     for (const auto &item : scene()->selectedItems()) {
         CardItem *card = qgraphicsitem_cast<CardItem *>(item);
-        if (card == nullptr)
+        if (card == nullptr || card == this) {
             continue;
-        if (card->getZone() != zone)
+        }
+        if (card->getZone() != state->getZone()) {
             continue;
+        }
 
         ArrowAttachItem *childArrow = new ArrowAttachItem(card);
         scene()->addItem(childArrow);
@@ -326,46 +359,53 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     if (event->buttons().testFlag(Qt::RightButton)) {
         if ((event->screenPos() - event->buttonDownScreenPos(Qt::RightButton)).manhattanLength() <
-            2 * QApplication::startDragDistance())
+            2 * QApplication::startDragDistance()) {
             return;
+        }
 
         QColor arrowColor = Qt::red;
-        if (event->modifiers().testFlag(Qt::ControlModifier))
+        if (event->modifiers().testFlag(Qt::ControlModifier)) {
             arrowColor = Qt::yellow;
-        else if (event->modifiers().testFlag(Qt::AltModifier))
+        } else if (event->modifiers().testFlag(Qt::AltModifier)) {
             arrowColor = Qt::blue;
-        else if (event->modifiers().testFlag(Qt::ShiftModifier))
+        } else if (event->modifiers().testFlag(Qt::ShiftModifier)) {
             arrowColor = Qt::green;
+        }
 
         drawArrow(arrowColor);
     } else if (event->buttons().testFlag(Qt::LeftButton)) {
         if ((event->screenPos() - event->buttonDownScreenPos(Qt::LeftButton)).manhattanLength() <
-            2 * QApplication::startDragDistance())
+            2 * QApplication::startDragDistance()) {
             return;
-        if (const ZoneViewZoneLogic *view = qobject_cast<const ZoneViewZoneLogic *>(zone)) {
-            if (view->getRevealZone() && !view->getWriteableRevealZone())
+        }
+        if (const ZoneViewZoneLogic *view = qobject_cast<const ZoneViewZoneLogic *>(state->getZone())) {
+            if (view->getRevealZone() && !view->getWriteableRevealZone()) {
                 return;
-        } else if (!owner->getPlayerInfo()->getLocalOrJudge())
+            }
+        } else if (!owner->getPlayerInfo()->getLocalOrJudge()) {
             return;
+        }
 
         bool forceFaceDown = event->modifiers().testFlag(Qt::ShiftModifier);
 
         // Use the buttonDownPos to align the hot spot with the position when
         // the user originally clicked
-        createDragItem(id, event->buttonDownPos(Qt::LeftButton), event->scenePos(), facedown || forceFaceDown);
+        createDragItem(id, event->buttonDownPos(Qt::LeftButton), event->scenePos(), forceFaceDown);
         dragItem->grabMouse();
 
         int childIndex = 0;
         for (const auto &item : scene()->selectedItems()) {
             CardItem *card = static_cast<CardItem *>(item);
-            if ((card == this) || (card->getZone() != zone))
+            if ((card == this) || (card->getZone() != state->getZone())) {
                 continue;
+            }
             ++childIndex;
             QPointF childPos;
-            if (zone->getHasCardAttr())
+            if (state->getZone()->getHasCardAttr()) {
                 childPos = card->pos() - pos();
-            else
-                childPos = QPointF(childIndex * CARD_WIDTH / 2, 0);
+            } else {
+                childPos = QPointF(childIndex * CardDimensions::WIDTH_HALF_F, 0);
+            }
             CardDragItem *drag =
                 new CardDragItem(card, card->getId(), childPos, card->getFaceDown() || forceFaceDown, dragItem);
             drag->setPos(dragItem->pos() + childPos);
@@ -378,22 +418,57 @@ void CardItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 void CardItem::playCard(bool faceDown)
 {
     // Do nothing if the card belongs to another player
-    if (!owner->getPlayerInfo()->getLocalOrJudge())
+    if (!owner->getPlayerInfo()->getLocalOrJudge()) {
         return;
+    }
 
-    TableZoneLogic *tz = qobject_cast<TableZoneLogic *>(zone);
-    if (tz)
+    TableZoneLogic *tz = qobject_cast<TableZoneLogic *>(state->getZone());
+    if (tz) {
         emit tz->toggleTapped();
-    else {
-        if (SettingsCache::instance().getClickPlaysAllSelected()) {
-            faceDown ? zone->getPlayer()->getPlayerActions()->actPlayFacedown()
-                     : zone->getPlayer()->getPlayerActions()->actPlay();
+    } else {
+        if (SettingsCache::instance().userInterface().getClickPlaysAllSelected()) {
+            if (faceDown) {
+                emit playSelectedFaceDown(this);
+            } else {
+                emit playSelected(this);
+            }
         } else {
-            zone->getPlayer()->getPlayerActions()->playCard(this, faceDown);
+            state->getZone()->getPlayer()->getPlayerActions()->playCard(this, faceDown);
         }
     }
 }
 
+QVariantList CardItem::parsePT(const QString &pt)
+{
+    QVariantList ptList = QVariantList();
+    if (!pt.isEmpty()) {
+        int sep = pt.indexOf('/');
+        if (sep == 0) {
+            ptList.append(QVariant(pt.mid(1))); // cut off starting '/' and take full string
+        } else {
+            int start = 0;
+            for (;;) {
+                QString item = pt.mid(start, sep - start);
+                if (item.isEmpty()) {
+                    ptList.append(QVariant(QString()));
+                } else if (item[0] == '+') {
+                    ptList.append(QVariant(item.mid(1).toInt())); // add as int
+                } else if (item[0] == '-') {
+                    ptList.append(QVariant(item.toInt())); // add as int
+                } else {
+                    ptList.append(QVariant(item)); // add as qstring
+                }
+                if (sep == -1) {
+                    break;
+                }
+                start = sep + 1;
+                sep = pt.indexOf('/', start);
+            }
+        }
+    }
+    return ptList;
+}
+
 /**
  * @brief returns true if the zone is a unwritable reveal zone view (eg a card reveal window). Will return false if zone
  * is nullptr.
@@ -414,11 +489,11 @@ static bool isUnwritableRevealZone(CardZoneLogic *zone)
  */
 void CardItem::handleClickedToPlay(bool shiftHeld)
 {
-    if (isUnwritableRevealZone(zone)) {
-        if (SettingsCache::instance().getClickPlaysAllSelected()) {
-            zone->getPlayer()->getPlayerActions()->actHide();
+    if (isUnwritableRevealZone(state->getZone())) {
+        if (SettingsCache::instance().userInterface().getClickPlaysAllSelected()) {
+            emit hideSelected(this);
         } else {
-            zone->removeCard(this);
+            state->getZone()->removeCard(this);
         }
     } else {
         playCard(shiftHeld);
@@ -427,21 +502,15 @@ void CardItem::handleClickedToPlay(bool shiftHeld)
 
 void CardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
-    if (event->button() == Qt::RightButton) {
-
-        if (owner != nullptr) {
-            owner->getGame()->setActiveCard(this);
-            if (QMenu *cardMenu = owner->getPlayerMenu()->updateCardMenu(this)) {
-                cardMenu->popup(event->screenPos());
-                return;
-            }
-        }
-    } else if ((event->modifiers() != Qt::AltModifier) && (event->button() == Qt::LeftButton) &&
-               (!SettingsCache::instance().getDoubleClickToPlay())) {
+    if (event->button() == Qt::RightButton && owner != nullptr) {
+        emit rightClicked(this, event->screenPos());
+        return;
+    }
+    if ((event->modifiers() != Qt::AltModifier) && (event->button() == Qt::LeftButton) &&
+        (!SettingsCache::instance().userInterface().getDoubleClickToPlay())) {
         handleClickedToPlay(event->modifiers().testFlag(Qt::ShiftModifier));
     }
-
-    if (owner != nullptr) { // cards without owner will be deleted
+    if (owner != nullptr) {
         setCursor(Qt::OpenHandCursor);
     }
     AbstractCardItem::mouseReleaseEvent(event);
@@ -450,7 +519,7 @@ void CardItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 void CardItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 {
     if ((event->modifiers() != Qt::AltModifier) && (event->buttons() == Qt::LeftButton) &&
-        (SettingsCache::instance().getDoubleClickToPlay())) {
+        (SettingsCache::instance().userInterface().getDoubleClickToPlay())) {
         handleClickedToPlay(event->modifiers().testFlag(Qt::ShiftModifier));
     }
     event->accept();
@@ -460,8 +529,9 @@ bool CardItem::animationEvent()
 {
     int rotation = ROTATION_DEGREES_PER_FRAME;
     bool animationIncomplete = true;
-    if (!tapped)
+    if (!tapped) {
         rotation *= -1;
+    }
 
     tapAngle += rotation;
     if (tapped && (tapAngle > 90)) {
@@ -474,9 +544,9 @@ bool CardItem::animationEvent()
     }
 
     setTransform(QTransform()
-                     .translate(CARD_WIDTH_HALF, CARD_HEIGHT_HALF)
+                     .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F)
                      .rotate(tapAngle)
-                     .translate(-CARD_WIDTH_HALF, -CARD_HEIGHT_HALF));
+                     .translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F));
     setHovered(false);
     update();
 
@@ -486,14 +556,14 @@ bool CardItem::animationEvent()
 QVariant CardItem::itemChange(GraphicsItemChange change, const QVariant &value)
 {
     if ((change == ItemSelectedHasChanged) && owner != nullptr) {
-        if (value == true) {
-            owner->getGame()->setActiveCard(this);
-            owner->getPlayerMenu()->updateCardMenu(this);
-        } else if (owner->getGameScene()->selectedItems().isEmpty()) {
+        bool selected = value.toBool();
 
-            owner->getGame()->setActiveCard(nullptr);
-            owner->getPlayerMenu()->updateCardMenu(nullptr);
+        if (selected) {
+            owner->getGame()->setActiveCard(this);
         }
+
+        emit selectionChanged(this, selected);
     }
+
     return AbstractCardItem::itemChange(change, value);
-}
+}
\ No newline at end of file
diff --git a/cockatrice/src/game/board/card_item.h b/cockatrice/src/game_graphics/board/card_item.h
similarity index 59%
rename from cockatrice/src/game/board/card_item.h
rename to cockatrice/src/game_graphics/board/card_item.h
index 86c4fe594..df79ef378 100644
--- a/cockatrice/src/game/board/card_item.h
+++ b/cockatrice/src/game_graphics/board/card_item.h
@@ -1,44 +1,42 @@
 /**
  * @file card_item.h
  * @ingroup GameGraphicsCards
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARDITEM_H
 #define CARDITEM_H
 
-#include "../zones/logic/card_zone_logic.h"
+#include "../../game/board/card_state.h"
 #include "abstract_card_item.h"
+#include "graphics_item_type.h"
 
-#include <libcockatrice/network/server/remote/game/server_card.h>
+#include <QList>
+#include <QPoint>
+#include <QPointF>
+#include <QString>
+#include <QVariantList>
+#include <qtmetamacros.h>
 
-class CardDatabase;
 class CardDragItem;
-class CardZone;
 class ServerInfo_Card;
-class Player;
-class QAction;
+class PlayerLogic;
 class QColor;
+class CardZoneLogic;
+class QGraphicsItem;
+struct CardRef;
+template <class Key, class T> class QMap;
 
-const int MAX_COUNTERS_ON_CARD = 999;
-const float CARD_WIDTH_HALF = CARD_WIDTH / 2;
-const float CARD_HEIGHT_HALF = CARD_HEIGHT / 2;
 const int ROTATION_DEGREES_PER_FRAME = 10;
 
 class CardItem : public AbstractCardItem
 {
     Q_OBJECT
 private:
-    CardZoneLogic *zone;
-    bool attacking;
-    QMap<int, int> counters;
-    QString annotation;
-    QString pt;
-    bool destroyOnZoneChange;
-    bool doesntUntap;
+    CardState *state;
+
     QPoint gridPoint;
     CardDragItem *dragItem;
-    CardItem *attachedTo;
     QList<CardItem *> attachedCards;
 
     void prepareDelete();
@@ -55,16 +53,20 @@ public:
     {
         return Type;
     }
-    explicit CardItem(Player *_owner,
+    explicit CardItem(PlayerLogic *_owner,
                       QGraphicsItem *parent = nullptr,
                       const CardRef &cardRef = {},
                       int _cardid = -1,
                       CardZoneLogic *_zone = nullptr);
 
     void retranslateUi();
+    [[nodiscard]] CardState *getState() const
+    {
+        return state;
+    }
     [[nodiscard]] CardZoneLogic *getZone() const
     {
-        return zone;
+        return state->getZone();
     }
     void setZone(CardZoneLogic *_zone);
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
@@ -80,50 +82,50 @@ public:
     {
         return gridPoint;
     }
-    [[nodiscard]] Player *getOwner() const
+    [[nodiscard]] PlayerLogic *getOwner() const
     {
         return owner;
     }
-    void setOwner(Player *_owner)
+    void setOwner(PlayerLogic *_owner)
     {
         owner = _owner;
     }
     [[nodiscard]] bool getAttacking() const
     {
-        return attacking;
+        return state->getAttacking();
     }
     void setAttacking(bool _attacking);
     [[nodiscard]] const QMap<int, int> &getCounters() const
     {
-        return counters;
+        return state->getCounters();
     }
     void setCounter(int _id, int _value);
     [[nodiscard]] QString getAnnotation() const
     {
-        return annotation;
+        return state->getAnnotation();
     }
     void setAnnotation(const QString &_annotation);
     [[nodiscard]] bool getDoesntUntap() const
     {
-        return doesntUntap;
+        return state->getDoesntUntap();
     }
     void setDoesntUntap(bool _doesntUntap);
     [[nodiscard]] QString getPT() const
     {
-        return pt;
+        return state->getPT();
     }
     void setPT(const QString &_pt);
     [[nodiscard]] bool getDestroyOnZoneChange() const
     {
-        return destroyOnZoneChange;
+        return state->getDestroyOnZoneChange();
     }
     void setDestroyOnZoneChange(bool _destroy)
     {
-        destroyOnZoneChange = _destroy;
+        state->setDestroyOnZoneChange(_destroy);
     }
     [[nodiscard]] CardItem *getAttachedTo() const
     {
-        return attachedTo;
+        return state->getAttachedTo();
     }
     void setAttachedTo(CardItem *_attachedTo);
     void addAttachedCard(CardItem *card)
@@ -141,13 +143,33 @@ public:
     void resetState(bool keepAnnotations = false);
     void processCardInfo(const ServerInfo_Card &_info);
 
-    bool animationEvent();
-    CardDragItem *createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool faceDown);
+    bool animationEvent() override;
+    CardDragItem *createDragItem(int _id, const QPointF &_pos, const QPointF &_scenePos, bool forceFaceDown);
     void deleteDragItem();
     void drawArrow(const QColor &arrowColor);
     void drawAttachArrow();
     void playCard(bool faceDown);
 
+    /**
+     * @brief Parses a string representing a p/t in order to extract the values from it.
+     *
+     * If the string contains '/', the string will be split at the '/' and each side will be parsed separately,
+     * which means the result list will have two elements.
+     *
+     * If '/' is not found, then the entire string is parsed together, which means the result list will
+     * have a single element.
+     *
+     * If either side of the split is empty, there will also only be a single element in the result list.
+     *
+     * This function will attempt to parse each substring as an int first, handling plus and minus prefixes.
+     * If successful, it will put the parsed value into the QVariant as an int.
+     * If failed, it will just put the substring into the QVariant as a QString.
+     *
+     * @param pt The p/t string
+     * @return A QVariantList that can contain one or two elements, where each QVariant can be either int or QString
+     */
+    static QVariantList parsePT(const QString &pt);
+
 protected:
     void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
diff --git a/cockatrice/src/game/board/counter_general.cpp b/cockatrice/src/game_graphics/board/counter_general.cpp
similarity index 65%
rename from cockatrice/src/game/board/counter_general.cpp
rename to cockatrice/src/game_graphics/board/counter_general.cpp
index d68486a1b..4a8bbd6a4 100644
--- a/cockatrice/src/game/board/counter_general.cpp
+++ b/cockatrice/src/game_graphics/board/counter_general.cpp
@@ -1,19 +1,25 @@
 #include "counter_general.h"
 
-#include "../../game_graphics/board/abstract_graphics_item.h"
 #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>
 
-GeneralCounter::GeneralCounter(Player *_player,
-                               int _id,
-                               const QString &_name,
-                               const QColor &_color,
-                               int _radius,
-                               int _value,
-                               bool useNameForShortcut,
-                               QGraphicsItem *parent)
-    : AbstractCounter(_player, _id, _name, true, _value, useNameForShortcut, parent), color(_color), radius(_radius)
+class CounterState;
+class PlayerLogic;
+class QGraphicsItem;
+
+GeneralCounter::GeneralCounter(CounterState *state, PlayerLogic *player, bool useNameForShortcut, QGraphicsItem *parent)
+    : AbstractCounter(state, player, true, useNameForShortcut, parent)
 {
     setCacheMode(DeviceCoordinateCache);
 }
diff --git a/cockatrice/src/game/board/counter_general.h b/cockatrice/src/game_graphics/board/counter_general.h
similarity index 62%
rename from cockatrice/src/game/board/counter_general.h
rename to cockatrice/src/game_graphics/board/counter_general.h
index 3db1d7bb4..2e49f11d7 100644
--- a/cockatrice/src/game/board/counter_general.h
+++ b/cockatrice/src/game_graphics/board/counter_general.h
@@ -1,28 +1,27 @@
 /**
  * @file counter_general.h
  * @ingroup GameGraphicsPlayers
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COUNTER_GENERAL_H
 #define COUNTER_GENERAL_H
 
 #include "abstract_counter.h"
 
+#include <qtmetamacros.h>
+
+class CounterState;
+class PlayerLogic;
+class QGraphicsItem;
+
 class GeneralCounter : public AbstractCounter
 {
     Q_OBJECT
-private:
-    QColor color;
-    int radius;
 
 public:
-    GeneralCounter(Player *_player,
-                   int _id,
-                   const QString &_name,
-                   const QColor &_color,
-                   int _radius,
-                   int _value,
+    GeneralCounter(CounterState *state,
+                   PlayerLogic *player,
                    bool useNameForShortcut = false,
                    QGraphicsItem *parent = nullptr);
     QRectF boundingRect() const override;
diff --git a/cockatrice/src/game_graphics/board/graphics_item_type.h b/cockatrice/src/game_graphics/board/graphics_item_type.h
index c48ae4ed6..afac7881f 100644
--- a/cockatrice/src/game_graphics/board/graphics_item_type.h
+++ b/cockatrice/src/game_graphics/board/graphics_item_type.h
@@ -1,8 +1,8 @@
 /**
  * @file graphics_item_type.h
  * @ingroup GameGraphics
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_GRAPHICS_ITEM_TYPE_H
 #define COCKATRICE_GRAPHICS_ITEM_TYPE_H
@@ -16,7 +16,8 @@ enum GraphicsItemType
     typeZone = QGraphicsItem::UserType + 3,
     typePlayerTarget = QGraphicsItem::UserType + 4,
     typeDeckViewCardContainer = QGraphicsItem::UserType + 5,
-    typeOther = QGraphicsItem::UserType + 6
+    typeOther = QGraphicsItem::UserType + 6,
+    typeArrow = QGraphicsItem::UserType + 7
 };
 
 #endif // COCKATRICE_GRAPHICS_ITEM_TYPE_H
diff --git a/cockatrice/src/game/board/translate_counter_name.cpp b/cockatrice/src/game_graphics/board/translate_counter_name.cpp
similarity index 93%
rename from cockatrice/src/game/board/translate_counter_name.cpp
rename to cockatrice/src/game_graphics/board/translate_counter_name.cpp
index 4f1c97657..3a2a5c7c8 100644
--- a/cockatrice/src/game/board/translate_counter_name.cpp
+++ b/cockatrice/src/game_graphics/board/translate_counter_name.cpp
@@ -1,5 +1,8 @@
 #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/board/translate_counter_name.h b/cockatrice/src/game_graphics/board/translate_counter_name.h
similarity index 85%
rename from cockatrice/src/game/board/translate_counter_name.h
rename to cockatrice/src/game_graphics/board/translate_counter_name.h
index fdb277c11..e7e42e5fc 100644
--- a/cockatrice/src/game/board/translate_counter_name.h
+++ b/cockatrice/src/game_graphics/board/translate_counter_name.h
@@ -1,14 +1,16 @@
 /**
  * @file translate_counter_name.h
  * @ingroup GameGraphicsPlayers
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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/card_dimensions.h b/cockatrice/src/game_graphics/card_dimensions.h
new file mode 100644
index 000000000..c59a01b48
--- /dev/null
+++ b/cockatrice/src/game_graphics/card_dimensions.h
@@ -0,0 +1,29 @@
+#ifndef CARD_DIMENSIONS_H
+#define CARD_DIMENSIONS_H
+
+#include <QtGlobal>
+
+/**
+ * @file card_dimensions.h
+ * @brief Canonical card dimension constants for layout and Z-value calculations.
+ *
+ * These values represent the logical pixel dimensions of a standard card graphic.
+ * They are used throughout the game scene for layout, rendering, and Z-value computation.
+ */
+namespace CardDimensions
+{
+/** @brief Card width in pixels. */
+constexpr int WIDTH = 72;
+/** @brief Card height in pixels. */
+constexpr int HEIGHT = 102;
+
+/** @brief Pre-converted for floating-point contexts (Z-value calculations). */
+constexpr qreal WIDTH_F = static_cast<qreal>(WIDTH);
+constexpr qreal HEIGHT_F = static_cast<qreal>(HEIGHT);
+
+/** @brief Half-dimensions for centering and rotation transforms. */
+constexpr qreal WIDTH_HALF_F = WIDTH_F / 2;
+constexpr qreal HEIGHT_HALF_F = HEIGHT_F / 2;
+} // namespace CardDimensions
+
+#endif // CARD_DIMENSIONS_H
diff --git a/cockatrice/src/game/deckview/deck_view.cpp b/cockatrice/src/game_graphics/deckview/deck_view.cpp
similarity index 78%
rename from cockatrice/src/game/deckview/deck_view.cpp
rename to cockatrice/src/game_graphics/deckview/deck_view.cpp
index edef3fad4..c86bc9925 100644
--- a/cockatrice/src/game/deckview/deck_view.cpp
+++ b/cockatrice/src/game_graphics/deckview/deck_view.cpp
@@ -2,15 +2,47 @@
 
 #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/deck_list/tree/deck_list_card_node.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,
@@ -24,17 +56,21 @@ void DeckViewCardDragItem::updatePosition(const QPointF &cursorScenePos)
     QList<QGraphicsItem *> colliding = scene()->items(cursorScenePos);
 
     DeckViewCardContainer *cursorZone = 0;
-    for (int i = colliding.size() - 1; i >= 0; i--)
-        if ((cursorZone = qgraphicsitem_cast<DeckViewCardContainer *>(colliding.at(i))))
+    for (int i = colliding.size() - 1; i >= 0; i--) {
+        if ((cursorZone = qgraphicsitem_cast<DeckViewCardContainer *>(colliding.at(i)))) {
             break;
-    if (!cursorZone)
+        }
+    }
+    if (!cursorZone) {
         return;
+    }
     currentZone = cursorZone;
 
     QPointF newPos = cursorScenePos;
     if (newPos != pos()) {
-        for (int i = 0; i < childDrags.size(); i++)
+        for (int i = 0; i < childDrags.size(); i++) {
             childDrags[i]->setPos(newPos + childDrags[i]->getHotSpot());
+        }
         setPos(newPos);
     }
 }
@@ -73,11 +109,12 @@ DeckViewCard::DeckViewCard(QGraphicsItem *parent, const CardRef &cardRef, const
 {
     setAcceptHoverEvents(true);
 
-    connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
-        Q_UNUSED(_roundCardCorners);
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::roundCardCornersChanged, this,
+            [this](bool _roundCardCorners) {
+                Q_UNUSED(_roundCardCorners);
 
-        update();
-    });
+                update();
+            });
 }
 
 DeckViewCard::~DeckViewCard()
@@ -95,19 +132,23 @@ void DeckViewCard::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
     pen.setJoinStyle(Qt::MiterJoin);
     pen.setColor(originZone == DECK_ZONE_MAIN ? Qt::green : Qt::red);
     painter->setPen(pen);
-    qreal cardRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * (CARD_WIDTH - 3) : 0.0;
-    painter->drawRoundedRect(QRectF(1.5, 1.5, CARD_WIDTH - 3., CARD_HEIGHT - 3.), cardRadius, cardRadius);
+    qreal cardRadius =
+        SettingsCache::instance().cardsDisplay().getRoundCardCorners() ? 0.05 * (CardDimensions::WIDTH_F - 3) : 0.0;
+    painter->drawRoundedRect(QRectF(1.5, 1.5, CardDimensions::WIDTH_F - 3, CardDimensions::HEIGHT_F - 3), cardRadius,
+                             cardRadius);
     painter->restore();
 }
 
 void DeckViewCard::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     if ((event->screenPos() - event->buttonDownScreenPos(Qt::LeftButton)).manhattanLength() <
-        2 * QApplication::startDragDistance())
+        2 * QApplication::startDragDistance()) {
         return;
+    }
 
-    if (static_cast<DeckViewScene *>(scene())->getLocked())
+    if (static_cast<DeckViewScene *>(scene())->getLocked()) {
         return;
+    }
 
     delete dragItem;
     dragItem = new DeckViewCardDragItem(this, event->pos());
@@ -119,10 +160,11 @@ void DeckViewCard::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     int j = 0;
     for (int i = 0; i < sel.size(); i++) {
         auto *c = static_cast<DeckViewCard *>(sel.at(i));
-        if (c == this)
+        if (c == this) {
             continue;
+        }
         ++j;
-        auto childPos = QPointF(j * CARD_WIDTH / 2, 0);
+        auto childPos = QPointF(j * CardDimensions::WIDTH_HALF_F, 0);
         auto *drag = new DeckViewCardDragItem(c, childPos, dragItem);
         drag->setPos(dragItem->pos() + childPos);
         scene()->addItem(drag);
@@ -132,8 +174,9 @@ void DeckViewCard::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 
 void DeckView::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    if (static_cast<DeckViewScene *>(scene())->getLocked())
+    if (static_cast<DeckViewScene *>(scene())->getLocked()) {
         return;
+    }
 
     if (event->button() == Qt::LeftButton) {
         QList<MoveCard_ToZone> result;
@@ -146,12 +189,13 @@ void DeckView::mouseDoubleClickEvent(QMouseEvent *event)
             m.set_card_name(c->getName().toStdString());
             m.set_start_zone(zone->getName().toStdString());
 
-            if (zone->getName() == DECK_ZONE_MAIN)
+            if (zone->getName() == DECK_ZONE_MAIN) {
                 m.set_target_zone(DECK_ZONE_SIDE);
-            else if (zone->getName() == DECK_ZONE_SIDE)
+            } else if (zone->getName() == DECK_ZONE_SIDE) {
                 m.set_target_zone(DECK_ZONE_MAIN);
-            else // Trying to move from another zone
+            } else { // Trying to move from another zone
                 m.set_target_zone(zone->getName().toStdString());
+            }
 
             result.append(m);
         }
@@ -204,7 +248,7 @@ void DeckViewCardContainer::paint(QPainter *painter, const QStyleOptionGraphicsI
             painter->setPen(QColor(255, 255, 255, 100));
             painter->drawLine(QPointF(0, yUntilNow - paddingY / 2), QPointF(width, yUntilNow - paddingY / 2));
         }
-        qreal thisRowHeight = CARD_HEIGHT * currentRowsAndCols[i].first;
+        qreal thisRowHeight = CardDimensions::HEIGHT_F * currentRowsAndCols[i].first;
         QRectF textRect(0, yUntilNow, totalTextWidth, thisRowHeight);
         yUntilNow += thisRowHeight + paddingY;
 
@@ -231,8 +275,9 @@ QList<QPair<int, int>> DeckViewCardContainer::getRowsAndCols() const
 {
     QList<QPair<int, int>> result;
     QList<QString> cardTypeList = cardsByType.uniqueKeys();
-    for (int i = 0; i < cardTypeList.size(); ++i)
+    for (int i = 0; i < cardTypeList.size(); ++i) {
         result.append(QPair<int, int>(1, cardsByType.count(cardTypeList[i])));
+    }
     return result;
 }
 
@@ -260,9 +305,10 @@ QSizeF DeckViewCardContainer::calculateBoundingRect(const QList<QPair<int, int>>
 
     // Calculate space needed for cards
     for (int i = 0; i < rowsAndCols.size(); ++i) {
-        totalHeight += CARD_HEIGHT * rowsAndCols[i].first + paddingY;
-        if (CARD_WIDTH * rowsAndCols[i].second > totalWidth)
-            totalWidth = CARD_WIDTH * rowsAndCols[i].second;
+        totalHeight += CardDimensions::HEIGHT_F * rowsAndCols[i].first + paddingY;
+        if (CardDimensions::WIDTH_F * rowsAndCols[i].second > totalWidth) {
+            totalWidth = CardDimensions::WIDTH_F * rowsAndCols[i].second;
+        }
     }
 
     return QSizeF(getCardTypeTextWidth() + totalWidth, totalHeight + separatorY + paddingY);
@@ -270,8 +316,9 @@ QSizeF DeckViewCardContainer::calculateBoundingRect(const QList<QPair<int, int>>
 
 bool DeckViewCardContainer::sortCardsByName(DeckViewCard *c1, DeckViewCard *c2)
 {
-    if (c1 && c2)
+    if (c1 && c2) {
         return c1->getName() < c2->getName();
+    }
     return false;
 }
 
@@ -289,9 +336,10 @@ void DeckViewCardContainer::rearrangeItems(const QList<QPair<int, int>> &rowsAnd
         std::sort(row.begin(), row.end(), DeckViewCardContainer::sortCardsByName);
         for (int j = 0; j < row.size(); ++j) {
             DeckViewCard *card = row[j];
-            card->setPos(x + (j % tempCols) * CARD_WIDTH, yUntilNow + (j / tempCols) * CARD_HEIGHT);
+            card->setPos(x + (j % tempCols) * CardDimensions::WIDTH_F,
+                         yUntilNow + (j / tempCols) * CardDimensions::HEIGHT_F);
         }
-        yUntilNow += tempRows * CARD_HEIGHT + paddingY;
+        yUntilNow += tempRows * CardDimensions::HEIGHT_F + paddingY;
     }
 
     prepareGeometryChange();
@@ -320,15 +368,17 @@ DeckViewScene::~DeckViewScene()
 void DeckViewScene::clearContents()
 {
     QMapIterator<QString, DeckViewCardContainer *> i(cardContainers);
-    while (i.hasNext())
+    while (i.hasNext()) {
         delete i.next().value();
+    }
     cardContainers.clear();
 }
 
 void DeckViewScene::setDeck(const DeckList &_deck)
 {
-    if (deck)
+    if (deck) {
         delete deck;
+    }
 
     deck = new DeckList(_deck.writeToString_Native());
     rebuildTree();
@@ -340,13 +390,21 @@ void DeckViewScene::rebuildTree()
 {
     clearContents();
 
-    if (!deck)
+    if (!deck) {
         return;
+    }
 
-    InnerDecklistNode *listRoot = deck->getRoot();
-    for (int i = 0; i < listRoot->size(); i++) {
-        auto *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+    QStringList requiredZones = {DECK_ZONE_MAIN, DECK_ZONE_SIDE};
 
+    for (const QString &zoneName : requiredZones) {
+        if (!cardContainers.contains(zoneName)) {
+            auto *container = new DeckViewCardContainer(zoneName);
+            cardContainers.insert(zoneName, container);
+            addItem(container);
+        }
+    }
+
+    for (auto *currentZone : deck->getZoneNodes()) {
         DeckViewCardContainer *container = cardContainers.value(currentZone->getName(), 0);
         if (!container) {
             container = new DeckViewCardContainer(currentZone->getName());
@@ -354,11 +412,10 @@ void DeckViewScene::rebuildTree()
             addItem(container);
         }
 
-        for (int j = 0; j < currentZone->size(); j++) {
-            auto *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
-            if (!currentCard)
-                continue;
-
+        // Cards in custom zones nested under a board are regular board cards in-game.
+        // They are collected recursively (like every other consumer) and reported with
+        // the top-level board zone as their origin, so that sideboard plans keep working.
+        for (auto *currentCard : deck->getCardNodes({currentZone->getName()})) {
             for (int k = 0; k < currentCard->getNumber(); ++k) {
                 auto *newCard = new DeckViewCard(container, currentCard->toCardRef(), currentZone->getName());
                 container->addCard(newCard);
@@ -374,18 +431,21 @@ void DeckViewScene::applySideboardPlan(const QList<MoveCard_ToZone> &plan)
         const MoveCard_ToZone &m = plan[i];
         DeckViewCardContainer *start = cardContainers.value(QString::fromStdString(m.start_zone()));
         DeckViewCardContainer *target = cardContainers.value(QString::fromStdString(m.target_zone()));
-        if (!start || !target)
+        if (!start || !target) {
             continue;
+        }
 
         DeckViewCard *card = 0;
         const QList<DeckViewCard *> &cardList = start->getCards();
-        for (int j = 0; j < cardList.size(); ++j)
+        for (int j = 0; j < cardList.size(); ++j) {
             if (cardList[j]->getName() == QString::fromStdString(m.card_name())) {
                 card = cardList[j];
                 break;
             }
-        if (!card)
+        }
+        if (!card) {
             continue;
+        }
 
         start->removeCard(card);
         target->addCard(card);
@@ -395,7 +455,7 @@ void DeckViewScene::applySideboardPlan(const QList<MoveCard_ToZone> &plan)
 
 void DeckViewScene::rearrangeItems()
 {
-    const int spacing = CARD_HEIGHT / 3;
+    const int spacing = CardDimensions::HEIGHT / 3;
     QList<DeckViewCardContainer *> contList = cardContainers.values();
 
     // Initialize space requirements
@@ -406,8 +466,9 @@ void DeckViewScene::rearrangeItems()
         rowsAndColsList.append(rowsAndCols);
 
         cardCountList.append(QList<int>());
-        for (int j = 0; j < rowsAndCols.size(); ++j)
+        for (int j = 0; j < rowsAndCols.size(); ++j) {
             cardCountList[i].append(rowsAndCols[j].second);
+        }
     }
 
     qreal totalHeight, totalWidth;
@@ -418,23 +479,27 @@ void DeckViewScene::rearrangeItems()
         for (int i = 0; i < contList.size(); ++i) {
             QSizeF contSize = contList[i]->calculateBoundingRect(rowsAndColsList[i]);
             totalHeight += contSize.height() + spacing;
-            if (contSize.width() > totalWidth)
+            if (contSize.width() > totalWidth) {
                 totalWidth = contSize.width();
+            }
         }
 
         // We're done when the aspect ratio shifts from too high to too low.
-        if (totalWidth / totalHeight <= optimalAspectRatio)
+        if (totalWidth / totalHeight <= optimalAspectRatio) {
             break;
+        }
 
         // Find category with highest column count
         int maxIndex1 = -1, maxIndex2 = -1, maxCols = 0;
-        for (int i = 0; i < rowsAndColsList.size(); ++i)
-            for (int j = 0; j < rowsAndColsList[i].size(); ++j)
+        for (int i = 0; i < rowsAndColsList.size(); ++i) {
+            for (int j = 0; j < rowsAndColsList[i].size(); ++j) {
                 if (rowsAndColsList[i][j].second > maxCols) {
                     maxIndex1 = i;
                     maxIndex2 = j;
                     maxCols = rowsAndColsList[i][j].second;
                 }
+            }
+        }
 
         // Add row to category
         const int maxRows = rowsAndColsList[maxIndex1][maxIndex2].first;
@@ -452,8 +517,9 @@ void DeckViewScene::rearrangeItems()
     }
 
     totalWidth = totalHeight * optimalAspectRatio;
-    for (int i = 0; i < contList.size(); ++i)
+    for (int i = 0; i < contList.size(); ++i) {
         contList[i]->setWidth(totalWidth);
+    }
 
     setSceneRect(QRectF(0, 0, totalWidth, totalHeight));
 }
@@ -471,7 +537,7 @@ QList<MoveCard_ToZone> DeckViewScene::getSideboardPlan() const
     while (containerIterator.hasNext()) {
         DeckViewCardContainer *cont = containerIterator.next().value();
         const QList<DeckViewCard *> cardList = cont->getCards();
-        for (int i = 0; i < cardList.size(); ++i)
+        for (int i = 0; i < cardList.size(); ++i) {
             if (cardList[i]->getOriginZone() != cont->getName()) {
                 MoveCard_ToZone m;
                 m.set_card_name(cardList[i]->getName().toStdString());
@@ -479,6 +545,7 @@ QList<MoveCard_ToZone> DeckViewScene::getSideboardPlan() const
                 m.set_target_zone(cont->getName().toStdString());
                 result.append(m);
             }
+        }
     }
     return result;
 }
diff --git a/cockatrice/src/game/deckview/deck_view.h b/cockatrice/src/game_graphics/deckview/deck_view.h
similarity index 92%
rename from cockatrice/src/game/deckview/deck_view.h
rename to cockatrice/src/game_graphics/deckview/deck_view.h
index 5abc558bd..3b5b4b6f4 100644
--- a/cockatrice/src/game/deckview/deck_view.h
+++ b/cockatrice/src/game_graphics/deckview/deck_view.h
@@ -1,24 +1,37 @@
 /**
  * @file deck_view.h
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DECKVIEW_H
 #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 MoveCardToZone;
+class QObject;
+class QWidget;
+struct CardRef;
 
 class DeckViewCard : public AbstractCardItem
 {
diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game_graphics/deckview/deck_view_container.cpp
similarity index 75%
rename from cockatrice/src/game/deckview/deck_view_container.cpp
rename to cockatrice/src/game_graphics/deckview/deck_view_container.cpp
index cf6ab00b8..c97767ec7 100644
--- a/cockatrice/src/game/deckview/deck_view_container.cpp
+++ b/cockatrice/src/game_graphics/deckview/deck_view_container.cpp
@@ -1,25 +1,52 @@
 #include "deck_view_container.h"
 
 #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 <libcockatrice/card/database/card_database.h>
+#include <QPainter>
+#include <QPen>
+#include <QRect>
+#include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/playmat_resolver.h>
 #include <libcockatrice/protocol/pb/command_deck_select.pb.h>
 #include <libcockatrice/protocol/pb/command_ready_start.pb.h>
+#include <libcockatrice/protocol/pb/command_set_playmat.pb.h>
 #include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>
 #include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_download.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/trice_limits.h>
+#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)
 {
@@ -95,8 +122,11 @@ DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent)
             &DeckViewContainer::refreshShortcuts);
     refreshShortcuts();
 
-    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageInGameChanged, this,
-            &DeckViewContainer::setVisualDeckStorageExists);
+    connect(&SettingsCache::instance().visualDeckStorage(), &VisualDeckStorageSettings::visualDeckStorageInGameChanged,
+            this, &DeckViewContainer::setVisualDeckStorageExists);
+
+    connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::playmatSettingsChanged, this,
+            &DeckViewContainer::onPlaymatSettingsChanged);
 
     switchToDeckSelectView();
 }
@@ -138,7 +168,7 @@ static void setVisibility(QPushButton *button, bool visible)
 
 void DeckViewContainer::switchToDeckSelectView()
 {
-    if (SettingsCache::instance().getVisualDeckStorageInGame()) {
+    if (SettingsCache::instance().visualDeckStorage().getVisualDeckStorageInGame()) {
         deckView->setHidden(true);
 
         tryCreateVisualDeckStorageWidget();
@@ -209,6 +239,7 @@ void DeckViewContainer::refreshShortcuts()
     loadLocalButton->setShortcut(shortcuts.getSingleShortcut("DeckViewContainer/loadLocalButton"));
     loadRemoteButton->setShortcut(shortcuts.getSingleShortcut("DeckViewContainer/loadRemoteButton"));
     loadFromClipboardButton->setShortcut(shortcuts.getSingleShortcut("DeckViewContainer/loadFromClipboardButton"));
+    loadFromWebsiteButton->setShortcut(shortcuts.getSingleShortcut("DeckViewContainer/loadFromWebsiteButton"));
     unloadDeckButton->setShortcut(shortcuts.getSingleShortcut("DeckViewContainer/unloadDeckButton"));
     readyStartButton->setShortcut(shortcuts.getSingleShortcut("DeckViewContainer/readyStartButton"));
     sideboardLockButton->setShortcut(shortcuts.getSingleShortcut("DeckViewContainer/sideboardLockButton"));
@@ -251,30 +282,32 @@ void DeckViewContainer::unloadDeck()
 void DeckViewContainer::loadLocalDeck()
 {
     DlgLoadDeck dialog(this);
-    if (!dialog.exec())
+    if (!dialog.exec()) {
         return;
+    }
 
     loadDeckFromFile(dialog.selectedFiles().at(0));
 }
 
 void DeckViewContainer::loadDeckFromFile(const QString &filePath)
 {
-    DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(filePath);
-    DeckLoader deck(this);
+    DeckFileFormat::Format fmt = DeckFileFormat::getFormatFromName(filePath);
 
-    bool success = deck.loadFromFile(filePath, fmt, true);
+    std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromFile(filePath, fmt, true);
 
-    if (!success) {
+    if (!deckOpt) {
         QMessageBox::critical(this, tr("Error"), tr("The selected file could not be loaded."));
         return;
     }
 
-    loadDeckFromDeckLoader(&deck);
+    loadDeckFromDeckList(deckOpt.value().deckList);
 }
 
-void DeckViewContainer::loadDeckFromDeckLoader(DeckLoader *deck)
+void DeckViewContainer::loadDeckFromDeckList(const DeckList &deck)
 {
-    QString deckString = deck->getDeckList()->writeToString_Native();
+    currentDeck = deck;
+
+    QString deckString = deck.writeToString_Native();
 
     if (deckString.length() > MAX_FILE_LENGTH) {
         QMessageBox::critical(this, tr("Error"), tr("Deck is greater than maximum file size."));
@@ -286,6 +319,52 @@ void DeckViewContainer::loadDeckFromDeckLoader(DeckLoader *deck)
     PendingCommand *pend = parentGame->getGame()->getGameEventHandler()->prepareGameCommand(cmd);
     connect(pend, &PendingCommand::finished, this, &DeckViewContainer::deckSelectFinished);
     parentGame->getGame()->getGameEventHandler()->sendGameCommand(pend, playerId);
+
+    resolveAndSendPlaymat();
+}
+
+void DeckViewContainer::resolveAndSendPlaymat()
+{
+    if (currentDeck.getCardRefList().isEmpty() && currentDeck.getPlaymat().card.isEmpty()) {
+        return;
+    }
+
+    const auto &settings = SettingsCache::instance().userInterface();
+    const auto fallbackBehavior = static_cast<PlaymatFallbackMode>(settings.getPlaymatFallbackBehavior());
+
+    QList<PlaymatInfo> fallbackList = settings.getPlaymatFallbackList();
+
+    // In random mode with 2+ entries, remove the last-resolved mat to avoid repeats.
+    if (fallbackBehavior == PlaymatFallbackModeRandom && fallbackList.size() > 1) {
+        fallbackList.removeAll(lastResolvedPlaymat);
+    }
+
+    const PlaymatInfo resolved =
+        resolvePlaymatForDeck(currentDeck, fallbackList, static_cast<PlaymatMode>(settings.getPlaymatMode()),
+                              fallbackBehavior, playmatRotationIndex);
+
+    lastResolvedPlaymat = resolved;
+
+    Command_SetPlaymat playmatCmd;
+    auto *pp = playmatCmd.mutable_playmat_params();
+    pp->set_card_name(resolved.card.name.toStdString());
+    pp->set_card_provider_id(resolved.card.providerId.toStdString());
+    pp->set_margin_pct_l(resolved.params.marginPctL);
+    pp->set_margin_pct_r(resolved.params.marginPctR);
+    pp->set_vertical_offset(resolved.params.verticalOffset);
+    pp->set_zoom(resolved.params.zoom);
+    PendingCommand *playmatPend = parentGame->getGame()->getGameEventHandler()->prepareGameCommand(playmatCmd);
+    parentGame->getGame()->getGameEventHandler()->sendGameCommand(playmatPend, playerId);
+}
+
+void DeckViewContainer::onPlaymatSettingsChanged()
+{
+    resolveAndSendPlaymat();
+}
+
+void DeckViewContainer::advancePlaymatRotation()
+{
+    playmatRotationIndex++;
 }
 
 void DeckViewContainer::loadRemoteDeck()
@@ -308,8 +387,8 @@ void DeckViewContainer::loadFromClipboard()
         return;
     }
 
-    DeckLoader *deck = dlg.getDeckList();
-    loadDeckFromDeckLoader(deck);
+    DeckList deck = dlg.getDeckList();
+    loadDeckFromDeckList(deck);
 }
 
 void DeckViewContainer::loadFromWebsite()
@@ -320,16 +399,15 @@ void DeckViewContainer::loadFromWebsite()
         return;
     }
 
-    DeckLoader *deck = dlg.getDeck();
-    loadDeckFromDeckLoader(deck);
+    DeckList deck = dlg.getDeck();
+    loadDeckFromDeckList(deck);
 }
 
 void DeckViewContainer::deckSelectFinished(const Response &r)
 {
     const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext);
-    DeckLoader newDeck(this, new DeckList(QString::fromStdString(resp.deck())));
-    CardPictureLoader::cacheCardPixmaps(
-        CardDatabaseManager::query()->getCards(newDeck.getDeckList()->getCardRefList()));
+    DeckList newDeck = DeckList(QString::fromStdString(resp.deck()));
+    CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
     setDeck(newDeck);
     switchToDeckLoadedView();
 }
@@ -366,8 +444,9 @@ void DeckViewContainer::sideboardPlanChanged()
 {
     Command_SetSideboardPlan cmd;
     const QList<MoveCard_ToZone> &newPlan = deckView->getSideboardPlan();
-    for (const auto &i : newPlan)
+    for (const auto &i : newPlan) {
         cmd.add_move_list()->CopyFrom(i);
+    }
     parentGame->getGame()->getGameEventHandler()->sendGameCommand(cmd, playerId);
 }
 
@@ -376,6 +455,10 @@ void DeckViewContainer::sideboardPlanChanged()
  */
 void DeckViewContainer::sendReadyStartCommand(bool ready)
 {
+    if (ready) {
+        resolveAndSendPlaymat();
+    }
+
     Command_ReadyStart cmd;
     cmd.set_ready(ready);
     parentGame->getGame()->getGameEventHandler()->sendGameCommand(cmd, playerId);
@@ -406,12 +489,14 @@ void DeckViewContainer::setSideboardLocked(bool locked)
 {
     sideboardLockButton->setState(!locked);
     deckView->setLocked(readyStartButton->getState() || !sideboardLockButton->getState());
-    if (locked)
+    if (locked) {
         deckView->resetSideboardPlan();
+    }
 }
 
-void DeckViewContainer::setDeck(DeckLoader &deck)
+void DeckViewContainer::setDeck(const DeckList &deck)
 {
-    deckView->setDeck(*deck.getDeckList());
+    currentDeck = deck;
+    deckView->setDeck(deck);
     switchToDeckLoadedView();
 }
\ No newline at end of file
diff --git a/cockatrice/src/game/deckview/deck_view_container.h b/cockatrice/src/game_graphics/deckview/deck_view_container.h
similarity index 76%
rename from cockatrice/src/game/deckview/deck_view_container.h
rename to cockatrice/src/game_graphics/deckview/deck_view_container.h
index 620929789..80b82b6e5 100644
--- a/cockatrice/src/game/deckview/deck_view_container.h
+++ b/cockatrice/src/game_graphics/deckview/deck_view_container.h
@@ -1,20 +1,23 @@
 /**
  * @file deck_view_container.h
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DECK_VIEW_CONTAINER_H
 #define DECK_VIEW_CONTAINER_H
 
-#include "../../interface/deck_loader/deck_loader.h"
+#include "libcockatrice/deck_list/deck_list.h"
+#include "libcockatrice/utility/playmat_params.h"
 
 #include <QPushButton>
+#include <QString>
+#include <QWidget>
+#include <qtmetamacros.h>
 
 class QVBoxLayout;
 class AbstractCardItem;
 class VisualDeckStorageWidget;
-class DeckPreviewWidget;
 class Response;
 class TabGame;
 class DeckView;
@@ -57,6 +60,9 @@ private:
     VisualDeckStorageWidget *visualDeckStorageWidget;
     TabGame *parentGame;
     int playerId;
+    int playmatRotationIndex = 0;    ///< Per-match cursor for round-robin playmat mode.
+    DeckList currentDeck;            ///< Cached deck for live settings re-resolution.
+    PlaymatInfo lastResolvedPlaymat; ///< Tracks last sent playmat to avoid repeats in random mode.
 
     void tryCreateVisualDeckStorageWidget();
     void sendReadyStartCommand(bool ready);
@@ -75,6 +81,7 @@ private slots:
     void sideboardLockButtonClicked();
     void updateSideboardLockButtonText();
     void refreshShortcuts();
+    void onPlaymatSettingsChanged();
 signals:
     void newCardAdded(AbstractCardItem *card);
     void notIdle();
@@ -85,12 +92,14 @@ public:
     void setReadyStart(bool ready);
     void readyAndUpdate();
     void setSideboardLocked(bool locked);
-    void setDeck(DeckLoader &deck);
+    void setDeck(const DeckList &deck);
     void setVisualDeckStorageExists(bool exists);
+    void advancePlaymatRotation();
+    void resolveAndSendPlaymat();
 
 public slots:
     void loadDeckFromFile(const QString &filePath);
-    void loadDeckFromDeckLoader(DeckLoader *deck);
+    void loadDeckFromDeckList(const DeckList &deck);
 };
 
 #endif // DECK_VIEW_CONTAINER_H
diff --git a/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp
similarity index 91%
rename from cockatrice/src/game/deckview/tabbed_deck_view_container.cpp
rename to cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp
index 2ffb214f7..90cbed9a1 100644
--- a/cockatrice/src/game/deckview/tabbed_deck_view_container.cpp
+++ b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.cpp
@@ -1,7 +1,15 @@
 #include "tabbed_deck_view_container.h"
 
-#include "../../interface/widgets/tabs/tab_game.h"
+#include "../board/abstract_card_item.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/deckview/tabbed_deck_view_container.h b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h
similarity index 79%
rename from cockatrice/src/game/deckview/tabbed_deck_view_container.h
rename to cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h
index c34eef1ef..7d73b78a2 100644
--- a/cockatrice/src/game/deckview/tabbed_deck_view_container.h
+++ b/cockatrice/src/game_graphics/deckview/tabbed_deck_view_container.h
@@ -1,14 +1,20 @@
 /**
  * @file tabbed_deck_view_container.h
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TABBED_DECK_VIEW_CONTAINER_H
 #define TABBED_DECK_VIEW_CONTAINER_H
-#include "deck_view_container.h"
-
+#include <QMap>
+#include <QString>
 #include <QTabWidget>
+#include <qtmetamacros.h>
+
+class DeckList;
+class DeckView;
+class DeckViewContainer;
+class TabGame;
 
 class TabbedDeckViewContainer : public QTabWidget
 {
diff --git a/cockatrice/src/game/dialogs/dlg_create_token.cpp b/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp
similarity index 83%
rename from cockatrice/src/game/dialogs/dlg_create_token.cpp
rename to cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp
index 1f6f9b08c..5ce050380 100644
--- a/cockatrice/src/game/dialogs/dlg_create_token.cpp
+++ b/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp
@@ -2,25 +2,41 @@
 
 #include "../../client/settings/cache_settings.h"
 #include "../../interface/widgets/cards/card_info_picture_widget.h"
-#include "../../main.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_querier.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/utility/trice_limits.h>
+#include <libcockatrice/settings/card_override_settings.h>
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/settings/interface_settings.h>
+#include <libcockatrice/settings/layouts_settings.h>
+#include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+
+class QModelIndex;
+class QWidget;
 
 DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent)
     : QDialog(parent), predefinedTokens(_predefinedTokens)
@@ -85,6 +101,17 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
     cardDatabaseDisplayModel = new TokenDisplayModel(this);
     cardDatabaseDisplayModel->setSourceModel(cardDatabaseModel);
 
+    const auto applyCardSearchLanguage = [this]() {
+        const CardsDisplaySettings &cardsDisplay = SettingsCache::instance().cardsDisplay();
+        cardDatabaseDisplayModel->setSearchLanguage(CardSearchLanguage{
+            cardsDisplay.getCardLang(), static_cast<SearchLanguageMode>(cardsDisplay.getCardSearchLanguage())});
+    };
+    applyCardSearchLanguage();
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this,
+            applyCardSearchLanguage);
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardSearchLanguageChanged, this,
+            applyCardSearchLanguage);
+
     chooseTokenFromAllRadioButton = new QRadioButton(tr("Show &all tokens"));
     connect(chooseTokenFromAllRadioButton, &QRadioButton::toggled, this, &DlgCreateToken::actChooseTokenFromAll);
     chooseTokenFromDeckRadioButton = new QRadioButton(tr("Show tokens from this &deck"));
@@ -101,8 +128,9 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
     chooseTokenView->resizeColumnToContents(0);
     chooseTokenView->setWordWrap(true);
 
-    if (!deckHeaderState.isNull())
+    if (!deckHeaderState.isNull()) {
         chooseTokenView->header()->restoreState(deckHeaderState);
+    }
 
     chooseTokenView->header()->setStretchLastSection(false);
     chooseTokenView->header()->hideSection(1);                                         // Sets
@@ -117,11 +145,7 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
         chooseTokenFromDeckRadioButton->setDisabled(true); // No tokens in deck = no need for option
     } else {
         chooseTokenFromDeckRadioButton->setChecked(true);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
         cardDatabaseDisplayModel->setCardNameSet(QSet<QString>(predefinedTokens.begin(), predefinedTokens.end()));
-#else
-        cardDatabaseDisplayModel->setCardNameSet(QSet<QString>::fromList(predefinedTokens));
-#endif
     }
 
     auto *tokenChooseLayout = new QVBoxLayout;
@@ -150,13 +174,13 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
     setWindowTitle(tr("Create token"));
 
     resize(600, 500);
-    restoreGeometry(SettingsCache::instance().getTokenDialogGeometry());
+    restoreGeometry(SettingsCache::instance().layouts().getTokenDialogGeometry());
 }
 
 void DlgCreateToken::closeEvent(QCloseEvent *event)
 {
     event->accept();
-    SettingsCache::instance().setTokenDialogGeometry(saveGeometry());
+    SettingsCache::instance().layouts().setTokenDialogGeometry(saveGeometry());
 }
 
 void DlgCreateToken::faceDownCheckBoxToggled(bool checked)
@@ -189,8 +213,9 @@ void DlgCreateToken::tokenSelectionChanged(const QModelIndex &current, const QMo
         const QChar cardColor = cardInfo->getColorChar();
         colorEdit->setCurrentIndex(colorEdit->findData(cardColor, Qt::UserRole, Qt::MatchFixedString));
         ptEdit->setText(cardInfo->getPowTough());
-        if (SettingsCache::instance().getAnnotateTokens())
+        if (SettingsCache::instance().userInterface().getAnnotateTokens()) {
             annotationEdit->setText(cardInfo->getText());
+        }
     } else {
         nameEdit->setText("");
         colorEdit->setCurrentIndex(colorEdit->findData(QString(), Qt::UserRole, Qt::MatchFixedString));
@@ -223,23 +248,19 @@ void DlgCreateToken::actChooseTokenFromAll(bool checked)
 void DlgCreateToken::actChooseTokenFromDeck(bool checked)
 {
     if (checked) {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
         cardDatabaseDisplayModel->setCardNameSet(QSet<QString>(predefinedTokens.begin(), predefinedTokens.end()));
-#else
-        cardDatabaseDisplayModel->setCardNameSet(QSet<QString>::fromList(predefinedTokens));
-#endif
     }
 }
 
 void DlgCreateToken::actOk()
 {
-    SettingsCache::instance().setTokenDialogGeometry(saveGeometry());
+    SettingsCache::instance().layouts().setTokenDialogGeometry(saveGeometry());
     accept();
 }
 
 void DlgCreateToken::actReject()
 {
-    SettingsCache::instance().setTokenDialogGeometry(saveGeometry());
+    SettingsCache::instance().layouts().setTokenDialogGeometry(saveGeometry());
     reject();
 }
 
diff --git a/cockatrice/src/game/dialogs/dlg_create_token.h b/cockatrice/src/game_graphics/dialogs/dlg_create_token.h
similarity index 91%
rename from cockatrice/src/game/dialogs/dlg_create_token.h
rename to cockatrice/src/game_graphics/dialogs/dlg_create_token.h
index 9a18f1a57..a03a1046b 100644
--- a/cockatrice/src/game/dialogs/dlg_create_token.h
+++ b/cockatrice/src/game_graphics/dialogs/dlg_create_token.h
@@ -1,26 +1,29 @@
 /**
  * @file dlg_create_token.h
  * @ingroup GameDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_CREATETOKEN_H
 #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/dialogs/dlg_move_top_cards_until.cpp b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
similarity index 83%
rename from cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp
rename to cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
index a9db4cef6..b7cd73d79 100644
--- a/cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp
+++ b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
@@ -1,33 +1,41 @@
 #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 <QWidget>
+#include <algorithm>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/filters/filter_string.h>
+#include <qnamespace.h>
 
-DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, QStringList exprs, uint _numberOfHits, bool autoPlay)
-    : QDialog(parent)
+class QWidget;
+
+DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, const MoveTopCardsUntilOptions &options) : QDialog(parent)
 {
     exprLabel = new QLabel(tr("Card name (or search expressions):"));
 
     exprComboBox = new QComboBox(this);
     exprComboBox->setFocus();
     exprComboBox->setEditable(true);
+    exprComboBox->completer()->setCaseSensitivity(Qt::CaseSensitive);
     exprComboBox->setInsertPolicy(QComboBox::InsertAtTop);
-    exprComboBox->insertItems(0, exprs);
+    exprComboBox->insertItems(0, options.exprs);
     exprLabel->setBuddy(exprComboBox);
 
     numberOfHitsLabel = new QLabel(tr("Number of hits:"));
     numberOfHitsEdit = new QSpinBox(this);
     numberOfHitsEdit->setRange(1, 99);
-    numberOfHitsEdit->setValue(_numberOfHits);
+    numberOfHitsEdit->setValue(options.numberOfHits);
     numberOfHitsLabel->setBuddy(numberOfHitsEdit);
 
     auto *grid = new QGridLayout;
@@ -35,7 +43,7 @@ DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, QStringList exprs, u
     grid->addWidget(numberOfHitsEdit, 0, 1);
 
     autoPlayCheckBox = new QCheckBox(tr("Auto play hits"));
-    autoPlayCheckBox->setChecked(autoPlay);
+    autoPlayCheckBox->setChecked(options.autoPlay);
 
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgMoveTopCardsUntil::validateAndAccept);
@@ -118,6 +126,13 @@ QString DlgMoveTopCardsUntil::getExpr() const
     return exprComboBox->currentText();
 }
 
+MoveTopCardsUntilOptions DlgMoveTopCardsUntil::getOptions() const
+{
+    return {.exprs = getExprs(),
+            .numberOfHits = numberOfHitsEdit->text().toInt(),
+            .autoPlay = autoPlayCheckBox->isChecked()};
+}
+
 QStringList DlgMoveTopCardsUntil::getExprs() const
 {
     QStringList exprs;
@@ -125,14 +140,4 @@ QStringList DlgMoveTopCardsUntil::getExprs() const
         exprs.append(exprComboBox->itemText(i));
     }
     return exprs;
-}
-
-uint DlgMoveTopCardsUntil::getNumberOfHits() const
-{
-    return numberOfHitsEdit->text().toUInt();
-}
-
-bool DlgMoveTopCardsUntil::isAutoPlay() const
-{
-    return autoPlayCheckBox->isChecked();
-}
+}
\ No newline at end of file
diff --git a/cockatrice/src/game/dialogs/dlg_move_top_cards_until.h b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
similarity index 55%
rename from cockatrice/src/game/dialogs/dlg_move_top_cards_until.h
rename to cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
index 9a9dc91e7..b9080bcc1 100644
--- a/cockatrice/src/game/dialogs/dlg_move_top_cards_until.h
+++ b/cockatrice/src/game_graphics/dialogs/dlg_move_top_cards_until.h
@@ -1,20 +1,32 @@
 /**
  * @file dlg_move_top_cards_until.h
  * @ingroup GameDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_MOVE_TOP_CARDS_UNTIL_H
 #define DLG_MOVE_TOP_CARDS_UNTIL_H
 
-#include <QCheckBox>
-#include <QComboBox>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QSpinBox>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
 
 class FilterString;
+class QCheckBox;
+class QComboBox;
+class QDialogButtonBox;
+class QLabel;
+class QSpinBox;
+class QWidget;
+
+struct MoveTopCardsUntilOptions
+{
+    QStringList exprs = {};
+    int numberOfHits = 1;
+    bool autoPlay = false;
+};
 
 class DlgMoveTopCardsUntil : public QDialog
 {
@@ -29,15 +41,12 @@ class DlgMoveTopCardsUntil : public QDialog
     void validateAndAccept();
     bool validateMatchExists(const FilterString &filterString);
 
-public:
-    explicit DlgMoveTopCardsUntil(QWidget *parent = nullptr,
-                                  QStringList exprs = QStringList(),
-                                  uint numberOfHits = 1,
-                                  bool autoPlay = false);
-    [[nodiscard]] QString getExpr() const;
     [[nodiscard]] QStringList getExprs() const;
-    [[nodiscard]] uint getNumberOfHits() const;
-    [[nodiscard]] bool isAutoPlay() const;
+
+public:
+    explicit DlgMoveTopCardsUntil(QWidget *parent = nullptr, const MoveTopCardsUntilOptions &options = {});
+    [[nodiscard]] QString getExpr() const;
+    [[nodiscard]] MoveTopCardsUntilOptions getOptions() const;
 };
 
 #endif // DLG_MOVE_TOP_CARDS_UNTIL_H
diff --git a/cockatrice/src/game/dialogs/dlg_roll_dice.cpp b/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp
similarity index 93%
rename from cockatrice/src/game/dialogs/dlg_roll_dice.cpp
rename to cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp
index dfb3d0bc5..b17881211 100644
--- a/cockatrice/src/game/dialogs/dlg_roll_dice.cpp
+++ b/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.cpp
@@ -1,11 +1,14 @@
 #include "dlg_roll_dice.h"
 
 #include <QDialogButtonBox>
+#include <QGridLayout>
 #include <QLabel>
 #include <QSpinBox>
+#include <QString>
 #include <QVBoxLayout>
-#include <QWidget>
-#include <libcockatrice/utility/trice_limits.h>
+#include <libcockatrice/utility/dice_limits.h>
+
+class QWidget;
 
 DlgRollDice::DlgRollDice(QWidget *parent) : QDialog(parent)
 {
diff --git a/cockatrice/src/game/dialogs/dlg_roll_dice.h b/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h
similarity index 80%
rename from cockatrice/src/game/dialogs/dlg_roll_dice.h
rename to cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h
index 69edd0757..4c146a054 100644
--- a/cockatrice/src/game/dialogs/dlg_roll_dice.h
+++ b/cockatrice/src/game_graphics/dialogs/dlg_roll_dice.h
@@ -1,16 +1,20 @@
 /**
  * @file dlg_roll_dice.h
  * @ingroup GameDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_ROLL_DICE_H
 #define DLG_ROLL_DICE_H
 
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QSpinBox>
+#include <qtmetamacros.h>
+#include <sys/types.h>
+
+class QDialogButtonBox;
+class QLabel;
+class QSpinBox;
+class QWidget;
 
 class DlgRollDice : public QDialog
 {
diff --git a/cockatrice/src/game_graphics/game_scene.cpp b/cockatrice/src/game_graphics/game_scene.cpp
new file mode 100644
index 000000000..cc3f9f1d3
--- /dev/null
+++ b/cockatrice/src/game_graphics/game_scene.cpp
@@ -0,0 +1,876 @@
+#include "game_scene.h"
+
+#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 "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.
+ * @param _phasesToolbar Toolbar widget for phases.
+ * @param parent Optional parent QObject.
+ *
+ * Initializes the animation timer, adds the phases toolbar to the scene,
+ * and connects to settings changes for multi-column layout.
+ * Finally, calls rearrange() to layout players initially.
+ */
+GameScene::GameScene(PhasesToolbar *_phasesToolbar, QObject *parent)
+    : QGraphicsScene(parent), phasesToolbar(_phasesToolbar), viewSize(QSize()), playerRotation(0)
+{
+    animationTimer = new QBasicTimer;
+    addItem(phasesToolbar);
+    connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::minPlayersForMultiColumnLayoutChanged, this,
+            &GameScene::rearrange);
+
+    rearrange();
+}
+
+GameScene::~GameScene()
+{
+    // Sever all destroyed->removeAnimatedItem connections before the members below
+    // are destroyed: the base QGraphicsScene destructor destroys the remaining items,
+    // and their destroyed() signals must not reach slots that reference members that
+    // no longer exist. The connection handle overload is used because the string-based
+    // disconnect(nullptr, nullptr, this, nullptr) is invalid (the sender must never be
+    // nullptr) and would otherwise fail to sever these pointer-to-member connections.
+    for (auto it = animationItemConnections.constBegin(); it != animationItemConnections.constEnd(); ++it) {
+        QObject::disconnect(*it);
+    }
+    animationItemConnections.clear();
+
+    delete animationTimer;
+    animationTimer = nullptr;
+
+    // Delete all ArrowItems before QGraphicsScene's base destructor runs.
+    // QGraphicsScene::~QGraphicsScene() destroys items in arbitrary order.
+    // If a PlayerTarget is destroyed before an ArrowItem pointing to it,
+    // ArrowItem::onTargetDestroyed fires and emits on the partially-destroyed
+    // GameScene, causing a segfault.
+    for (auto *item : items()) {
+        if (auto *arrow = qgraphicsitem_cast<ArrowItem *>(item)) {
+            delete arrow;
+        }
+    }
+
+    // DO NOT call clearViews() here
+    // clearViews calls close() on the zoneViews, which sends signals; sending signals in destructors leads to segfaults
+    // deleteLater() deletes the zoneView without allowing it to send signals
+    for (const auto &zoneView : zoneViews) {
+        zoneView->deleteLater();
+    }
+}
+
+/**
+ * @brief Updates localized text in all zone views.
+ */
+void GameScene::retranslateUi()
+{
+    for (ZoneViewWidget *view : zoneViews) {
+        view->retranslateUi();
+    }
+}
+
+QList<CardItem *> GameScene::selectedCards() const
+{
+    QList<CardItem *> selectedCards;
+    for (auto item : selectedItems()) {
+        if (auto card = qgraphicsitem_cast<CardItem *>(item)) {
+            selectedCards.append(card);
+        }
+    }
+
+    return selectedCards;
+}
+
+void GameScene::onCardSelectionChanged(AbstractCardItem *abstractCard, bool selected)
+{
+    CardItem *card = qobject_cast<CardItem *>(abstractCard);
+    if (!card || !card->getOwner()) {
+        return;
+    }
+
+    auto *owner = card->getOwner();
+
+    if (selected) {
+        owner->requestCardMenuUpdate(card);
+        return;
+    }
+
+    if (selectedItems().isEmpty()) {
+        owner->getGame()->setActiveCard(nullptr);
+        owner->requestCardMenuUpdate(nullptr);
+    }
+}
+
+void GameScene::onCardRightClicked(AbstractCardItem *abstractCard, QPoint screenPos)
+{
+    auto *card = qobject_cast<CardItem *>(abstractCard);
+    if (!card) {
+        return;
+    }
+    if (!card->getOwner()) {
+        return;
+    }
+    auto *view = playerViews.value(card->getOwner()->getPlayerInfo()->getId());
+    if (!view) {
+        return;
+    }
+
+    card->getOwner()->getGame()->setActiveCard(card);
+
+    if (auto *menu = view->getPlayerMenu()->updateCardMenu(card)) {
+        menu->popup(screenPos);
+    }
+}
+
+void GameScene::playSelected(AbstractCardItem *card)
+{
+    if (!card) {
+        return;
+    }
+    if (!card->getOwner()) {
+        return;
+    }
+    card->getOwner()->getPlayerActions()->actPlay(selectedCards());
+}
+
+void GameScene::playSelectedFaceDown(AbstractCardItem *card)
+{
+    if (!card) {
+        return;
+    }
+    if (!card->getOwner()) {
+        return;
+    }
+    card->getOwner()->getPlayerActions()->actPlayFacedown(selectedCards());
+}
+
+void GameScene::hideSelected(AbstractCardItem *card)
+{
+    if (!card) {
+        return;
+    }
+    if (!card->getOwner()) {
+        return;
+    }
+    card->getOwner()->getPlayerActions()->actHide(selectedCards());
+}
+
+/**
+ * @brief Adds a player to the scene and stores their graphics item.
+ * @param player Player to add.
+ *
+ * Connects to the player's sizeChanged signal to recompute layout on resize.
+ */
+void GameScene::addPlayer(PlayerLogic *player)
+{
+    qCInfo(GameScenePlayerAdditionRemovalLog) << "GameScene::addPlayer name=" << player->getPlayerInfo()->getName();
+
+    auto *view = new PlayerGraphicsItem(player);
+
+    playerViews.insert(player->getPlayerInfo()->getId(), view);
+    addItem(view);
+    connect(view, &PlayerGraphicsItem::sizeChanged, this, &GameScene::rearrange);
+
+    connect(player, &PlayerLogic::concededChanged, this, [this](int id, bool conceded) {
+        if (conceded) {
+            clearArrowsForPlayer(id);
+        }
+        rearrange();
+    });
+
+    connect(player, &PlayerLogic::requestZoneViewToggle, this, &GameScene::toggleZoneView);
+    connect(player, &PlayerLogic::requestRevealedZoneView, this, &GameScene::addRevealedZoneView);
+    connect(player, &PlayerLogic::arrowDeleted, this, &GameScene::deleteArrow);
+    connect(player, &PlayerLogic::arrowCreateRequested, this, &GameScene::addArrow);
+    connect(player, &PlayerLogic::arrowDeleteRequested, this, &GameScene::requestArrowDeletion);
+    connect(player, &PlayerLogic::arrowsClearedLocally, this,
+            [this, id = player->getPlayerInfo()->getId()]() { clearArrowsForPlayerLocally(id); });
+
+    connect(player->getPlayerEventHandler(), &PlayerEventHandler::cardZoneChanged, this, &GameScene::onCardZoneChanged);
+
+    rearrange();
+}
+
+/**
+ * @brief Removes a player from the scene.
+ * @param player Player to remove.
+ *
+ * Closes any zone views associated with the player and recomputes layout.
+ */
+void GameScene::removePlayer(PlayerLogic *player)
+{
+    qCInfo(GameScenePlayerAdditionRemovalLog) << "GameScene::removePlayer name=" << player->getPlayerInfo()->getName();
+
+    clearArrowsForPlayer(player->getPlayerInfo()->getId());
+
+    // Closing a view removes it from zoneViews synchronously, so iterate over a
+    // copy: otherwise a player with several open views (e.g. library and hand)
+    // only has the first one closed here and the remaining views are left
+    // pointing at a player that is about to be deleted.
+    const QList<ZoneViewWidget *> zoneViewCopy = zoneViews;
+    for (ZoneViewWidget *zone : zoneViewCopy) {
+        if (zone->getPlayer() == player) {
+            zone->close();
+        }
+    }
+    auto *view = playerViews.take(player->getPlayerInfo()->getId());
+    removeItem(view);
+    view->deleteLater();
+    rearrange();
+}
+
+/**
+ * @brief Adjusts the global rotation offset for player layout.
+ * @param rotationAdjustment Number of positions to rotate.
+ *
+ * Recomputes player layout after applying rotation.
+ */
+void GameScene::adjustPlayerRotation(int rotationAdjustment)
+{
+    playerRotation += rotationAdjustment;
+    rearrange();
+}
+
+/**
+ * @brief Recomputes the layout of players and the scene size.
+ *
+ * Steps:
+ * 1. Collect active players who haven't conceded.
+ * 2. Rotate player list based on first local player and rotation offset.
+ * 3. Determine number of columns.
+ * 4. Compute scene size and layout.
+ * 5. Update toolbar height and scene rectangle.
+ * 6. Adjust columns and player positions to match view size.
+ */
+void GameScene::rearrange()
+{
+    if (rearranging) {
+        needsReArrange = true;
+        return;
+    }
+    rearranging = true;
+    do {
+        needsReArrange = false;
+
+        int firstPlayerIndex = 0;
+        auto playersPlaying = collectActivePlayers(firstPlayerIndex);
+        playersPlaying = rotatePlayers(playersPlaying, firstPlayerIndex);
+
+        int columns = determineColumnCount(playersPlaying.size());
+        QSizeF sceneSize = computeSceneSizeAndPlayerLayout(playersPlaying, columns);
+
+        phasesToolbar->setHeight(sceneSize.height());
+        setSceneRect(0, 0, sceneSize.width(), sceneSize.height());
+
+        processViewSizeChange(viewSize);
+    } while (needsReArrange);
+    rearranging = false;
+}
+
+// ---------- View Size ----------
+
+/**
+ * @brief Handles view resize and redistributes player positions.
+ * @param newSize New view size.
+ *
+ * Steps:
+ * 1. Compute minimum width per column from player items.
+ * 2. Determine new scene width respecting aspect ratio.
+ * 3. Resize columns and reposition players proportionally.
+ */
+void GameScene::processViewSizeChange(const QSize &newSize)
+{
+    viewSize = newSize;
+
+    QList<qreal> minWidthByColumn = calculateMinWidthByColumn();
+    qreal minWidth = std::accumulate(minWidthByColumn.begin(), minWidthByColumn.end(), phasesToolbar->getWidth());
+
+    qreal newWidth = calculateNewSceneWidth(newSize, minWidth);
+    setSceneRect(0, 0, newWidth, sceneRect().height());
+
+    resizeColumnsAndPlayers(minWidthByColumn, newWidth);
+}
+
+// ---------- Player Layout Helpers ----------
+
+/**
+ * @brief Collects all active (non-conceded) players.
+ * @param firstPlayerIndex Output index of first local player.
+ * @return List of active players.
+ *
+ * Used to determine rotation and layout order.
+ */
+QList<PlayerLogic *> GameScene::collectActivePlayers(int &firstPlayerIndex) const
+{
+    QList<PlayerLogic *> activePlayers;
+    firstPlayerIndex = 0;
+    bool firstPlayerFound = false;
+
+    for (auto *pgItem : playerViews.values()) {
+        PlayerLogic *p = pgItem->getLogic();
+        if (p && !p->getConceded()) {
+            activePlayers.append(p);
+            if (!firstPlayerFound && p->getPlayerInfo()->getLocal()) {
+                firstPlayerIndex = activePlayers.size() - 1;
+                firstPlayerFound = true;
+            }
+        }
+    }
+    return activePlayers;
+}
+
+/**
+ * @brief Rotates the list of players for layout.
+ * @param players Original list of players.
+ * @param firstPlayerIndex Index of first local player.
+ * @return Rotated list.
+ *
+ * Applies rotation offset and ensures the list wraps correctly.
+ */
+QList<PlayerLogic *> GameScene::rotatePlayers(const QList<PlayerLogic *> &activePlayers, int firstPlayerIndex) const
+{
+    QList<PlayerLogic *> rotated = activePlayers;
+    if (!rotated.isEmpty()) {
+        int totalRotation = firstPlayerIndex + playerRotation;
+        while (totalRotation < 0) {
+            totalRotation += rotated.size();
+        }
+        for (int i = 0; i < totalRotation; ++i) {
+            rotated.append(rotated.takeFirst());
+        }
+    }
+    return rotated;
+}
+
+int GameScene::determineColumnCount(int playerCount)
+{
+    return playerCount < SettingsCache::instance().userInterface().getMinPlayersForMultiColumnLayout() ? 1 : 2;
+}
+
+/**
+ * @brief Computes layout positions and scene size based on players and columns.
+ * @param playersPlaying List of active players.
+ * @param columns Number of columns to split into.
+ * @return Calculated scene size.
+ *
+ * Logic:
+ * - Determine rows per column (rounding up).
+ * - Calculate column widths based on widest player item.
+ * - Accumulate scene width and height.
+ * - Position players in columns with spacing.
+ * - Mirror graphics for visual balance.
+ */
+QSizeF GameScene::computeSceneSizeAndPlayerLayout(const QList<PlayerLogic *> &playersPlaying, int columns)
+{
+    playersByColumn.clear();
+
+    int rows = qCeil((qreal)playersPlaying.size() / columns);
+    qreal sceneHeight = 0, sceneWidth = -playerAreaSpacing;
+    QList<int> columnWidth;
+
+    QListIterator<PlayerLogic *> playersIter(playersPlaying);
+    for (int col = 0; col < columns; ++col) {
+        playersByColumn.append(QList<PlayerGraphicsItem *>());
+        columnWidth.append(0);
+        qreal thisColumnHeight = -playerAreaSpacing;
+        int rowsInColumn = rows - (playersPlaying.size() % columns) * col; // Adjust rows for uneven columns
+
+        for (int j = 0; j < rowsInColumn; ++j) {
+            PlayerLogic *player = playersIter.next();
+            if (col == 0) {
+                playersByColumn[col].prepend(playerViews.value(player->getPlayerInfo()->getId()));
+            } else {
+                playersByColumn[col].append(playerViews.value(player->getPlayerInfo()->getId()));
+            }
+
+            auto *pgItem = playerViews.value(player->getPlayerInfo()->getId());
+            thisColumnHeight += pgItem->boundingRect().height() + playerAreaSpacing;
+            columnWidth[col] = std::max(columnWidth[col], (int)pgItem->boundingRect().width());
+        }
+
+        sceneHeight = std::max(sceneHeight, thisColumnHeight);
+        sceneWidth += columnWidth[col] + playerAreaSpacing;
+    }
+
+    qreal phasesWidth = phasesToolbar->getWidth();
+    sceneWidth += phasesWidth;
+
+    // Position players horizontally and vertically
+    qreal x = phasesWidth;
+    for (int col = 0; col < columns; ++col) {
+        qreal y = 0;
+        for (int row = 0; row < playersByColumn[col].size(); ++row) {
+            PlayerGraphicsItem *player = playersByColumn[col][row];
+            player->setPos(x, y);
+            player->setMirrored(row != rows - 1); // Mirror all except bottom-most
+            y += player->boundingRect().height() + playerAreaSpacing;
+        }
+        x += columnWidth[col] + playerAreaSpacing;
+    }
+
+    return QSizeF(sceneWidth, sceneHeight);
+}
+
+/**
+ * @brief Computes the minimum width for each column based on player minimum widths.
+ * @return List of minimum widths per column.
+ */
+QList<qreal> GameScene::calculateMinWidthByColumn() const
+{
+    QList<qreal> minWidthByColumn;
+    for (const auto &col : playersByColumn) {
+        qreal maxWidth = 0;
+        for (PlayerGraphicsItem *player : col) {
+            maxWidth = std::max(maxWidth, player->getMinimumWidth());
+        }
+        minWidthByColumn.append(maxWidth);
+    }
+    return minWidthByColumn;
+}
+
+/**
+ * @brief Calculates new scene width considering window aspect ratio.
+ * @param newSize View size.
+ * @param minWidth Minimum width needed to fit all players.
+ * @return Scene width respecting window and content.
+ */
+qreal GameScene::calculateNewSceneWidth(const QSize &newSize, qreal minWidth) const
+{
+    qreal newRatio = (qreal)newSize.width() / newSize.height();
+    qreal minRatio = minWidth / sceneRect().height();
+
+    if (minRatio > newRatio) {
+        return minWidth; // Table dominates width
+    } else {
+        return newRatio * sceneRect().height(); // Window ratio dominates
+    }
+}
+
+/**
+ * @brief Resizes columns and distributes extra width to players.
+ * @param minWidthByColumn Minimum widths per column.
+ * @param newWidth Total scene width.
+ *
+ * Extra width is distributed evenly across columns. Each player item is
+ * notified to adjust internal layout for the new column width.
+ */
+void GameScene::resizeColumnsAndPlayers(const QList<qreal> &minWidthByColumn, qreal newWidth)
+{
+    qreal minWidth = std::accumulate(minWidthByColumn.begin(), minWidthByColumn.end(), phasesToolbar->getWidth());
+
+    qreal extraWidthPerColumn = (newWidth - minWidth) / playersByColumn.size();
+    qreal newx = phasesToolbar->getWidth();
+
+    // Snapshot the columns: resizing a player's table can synchronously trigger
+    // GameScene::rearrange (table width -> sizeChanged -> updateBoundingRect ->
+    // sizeChanged -> rearrange), and rearrange rebuilds playersByColumn. Iterating
+    // the live container across that re-entrant call would use invalidated iterators.
+    const QList<QList<PlayerGraphicsItem *>> columns = playersByColumn;
+
+    for (int col = 0; col < columns.size(); ++col) {
+        for (PlayerGraphicsItem *player : columns[col]) {
+            player->processSceneSizeChange(minWidthByColumn[col] + extraWidthPerColumn);
+            player->setPos(newx, player->y());
+        }
+        newx += minWidthByColumn[col] + extraWidthPerColumn;
+    }
+}
+
+void GameScene::addArrow(QSharedPointer<ArrowData> data)
+{
+    auto *startView = playerViews.value(data->startPlayerId);
+    auto *targetView = playerViews.value(data->targetPlayerId);
+    if (!startView || !targetView) {
+        return;
+    }
+
+    PlayerLogic *startLogic = startView->getLogic();
+    auto *startZone = startLogic->getZones().value(data->startZone);
+    if (!startZone) {
+        return;
+    }
+
+    CardItem *startCard = startZone->getCard(data->startCardId);
+    if (!startCard) {
+        return;
+    }
+
+    ArrowTarget *targetItem = nullptr;
+    if (data->isPlayerTargeted()) {
+        targetItem = targetView->getPlayerTarget();
+    } else {
+        auto *zone = targetView->getLogic()->getZones().value(data->targetZone);
+        if (zone) {
+            targetItem = zone->getCard(data->targetCardId);
+        }
+    }
+    if (!targetItem) {
+        return;
+    }
+
+    auto *arrow = new ArrowItem(data, startCard, targetItem);
+    addItem(arrow);
+    arrow->startDrawAnimation();
+    arrowRegistry.insert(data, arrow);
+    connect(arrow, &ArrowItem::requestDeletion, this, &GameScene::requestArrowDeletion);
+}
+
+void GameScene::deleteArrow(int playerId, int arrowId)
+{
+    if (auto *arrow = arrowRegistry.take(playerId, arrowId)) {
+        arrow->delArrow();
+    }
+}
+
+void GameScene::requestArrowDeletion(int playerId, int arrowId)
+{
+    if (arrowRegistry.contains(playerId, arrowId)) {
+        emit arrowDeletionRequested(playerId, arrowId);
+    }
+}
+
+void GameScene::onCardZoneChanged(CardItem *card, bool sameZone)
+{
+    QList<ArrowItem *> toDelete;
+    for (auto *arrow : arrowRegistry.all()) {
+        if (arrow->getStartItem() == card || arrow->getTargetItem() == card) {
+            if (sameZone) {
+                arrow->updatePath();
+            } else {
+                toDelete.append(arrow);
+            }
+        }
+    }
+    for (auto *arrow : toDelete) {
+        deleteArrow(arrow->getCreatorId(), arrow->getId());
+    }
+}
+
+void GameScene::clearArrowsForPlayer(int playerId)
+{
+    for (int arrowId : arrowRegistry.idsForPlayer(playerId)) {
+        emit requestArrowDeletion(playerId, arrowId);
+    }
+}
+
+void GameScene::clearArrowsForPlayerLocally(int playerId)
+{
+    for (int arrowId : arrowRegistry.idsForPlayer(playerId)) {
+        if (auto *arrow = arrowRegistry.take(playerId, arrowId)) {
+            arrow->delArrow();
+        }
+    }
+}
+
+// ---------- Hover Handling ----------
+
+void GameScene::updateHover(const QPointF &scenePos)
+{
+    auto itemList = items(scenePos, Qt::IntersectsItemBoundingRect, Qt::DescendingOrder, getViewTransform());
+
+    CardZone *zone = findTopmostZone(itemList);
+    CardItem *topCard = zone ? findTopmostCardInZone(itemList, zone) : nullptr;
+    updateHoveredCard(topCard);
+}
+
+void GameScene::updateHoveredCard(CardItem *newCard)
+{
+    if (hoveredCard && (newCard != hoveredCard)) {
+        endCardHover(hoveredCard);
+    }
+    if (newCard && (newCard != hoveredCard)) {
+        beginCardHover(newCard);
+    }
+    hoveredCard = newCard;
+}
+
+void GameScene::beginCardHover(CardItem *card)
+{
+    card->setHovered(true);
+    if (auto *zone = SelectZone::findOwningSelectZone(card)) {
+        zone->escapeClipForHover(card);
+    }
+}
+
+void GameScene::endCardHover(CardItem *card)
+{
+    if (auto *zone = SelectZone::findOwningSelectZone(card)) {
+        zone->restoreClipAfterHover(card);
+    }
+    card->setHovered(false);
+}
+
+CardZone *GameScene::findTopmostZone(const QList<QGraphicsItem *> &items)
+{
+    for (QGraphicsItem *item : items) {
+        if (auto *zone = qgraphicsitem_cast<CardZone *>(item)) {
+            return zone;
+        }
+    }
+    return nullptr;
+}
+
+CardItem *GameScene::findTopmostCardInZone(const QList<QGraphicsItem *> &items, CardZone *zone)
+{
+    CardItem *maxZCard = nullptr;
+    qreal maxZ = -1;
+
+    for (QGraphicsItem *item : items) {
+        CardItem *card = qgraphicsitem_cast<CardItem *>(item);
+        if (!card) {
+            continue;
+        }
+
+        if (card->getAttachedTo()) {
+            if (card->getAttachedTo()->getZone() != zone->getLogic()) {
+                continue;
+            }
+        } else if (card->getZone() != zone->getLogic()) {
+            continue;
+        }
+
+        if (card->getRealZValue() > maxZ) {
+            maxZ = card->getRealZValue();
+            maxZCard = card;
+        }
+    }
+    return maxZCard;
+}
+
+// ---------- Zone Views ----------
+
+/**
+ * @brief Toggles a zone view for a player.
+ * @param player Player owning the zone.
+ * @param zoneName Name of the zone.
+ * @param numberCards Number of cards visible in the view.
+ * @param isReversed Whether the zone view is reversed.
+ *
+ * If an identical view exists, it is closed. Otherwise, a new ZoneViewWidget is created
+ * and positioned based on zone type.
+ */
+void GameScene::toggleZoneView(PlayerLogic *player, const QString &zoneName, int numberCards, bool isReversed)
+{
+    // Closing a view removes it from zoneViews synchronously, so iterate over a
+    // copy to make sure every already-open matching view is closed.
+    const QList<ZoneViewWidget *> zoneViewCopy = zoneViews;
+    for (auto *view : zoneViewCopy) {
+        ZoneViewZone *temp = view->getZone();
+        if (temp->getLogic()->getName() == zoneName && temp->getLogic()->getPlayer() == player &&
+            qobject_cast<ZoneViewZoneLogic *>(temp->getLogic())->getNumberCards() == numberCards) {
+            view->close();
+        }
+    }
+
+    ZoneViewWidget *item =
+        new ZoneViewWidget(player, player->getZones().value(zoneName), numberCards, false, false, {}, isReversed);
+
+    zoneViews.append(item);
+    connect(item, &ZoneViewWidget::closePressed, this, &GameScene::removeZoneView);
+    addItem(item);
+
+    if (zoneName == ZoneNames::GRAVE) {
+        item->setPos(360, 100);
+    } else if (zoneName == ZoneNames::EXILE) {
+        item->setPos(380, 120);
+    } else {
+        item->setPos(340, 80);
+    }
+}
+
+/**
+ * @brief Adds a revealed zone view (for shown cards).
+ * @param player Owning player.
+ * @param zone Zone logic.
+ * @param cardList List of cards to show.
+ * @param withWritePermission Whether edits are allowed.
+ */
+void GameScene::addRevealedZoneView(PlayerLogic *player,
+                                    CardZoneLogic *zone,
+                                    const QList<const ServerInfo_Card *> &cardList,
+                                    bool withWritePermission)
+{
+    ZoneViewWidget *item = new ZoneViewWidget(player, zone, -2, true, withWritePermission, cardList);
+    zoneViews.append(item);
+    connect(item, &ZoneViewWidget::closePressed, this, &GameScene::removeZoneView);
+    addItem(item);
+    item->setPos(600, 80);
+}
+
+/**
+ * @brief Removes a zone view widget from the scene.
+ * @param item Zone view to remove.
+ */
+void GameScene::removeZoneView(ZoneViewWidget *item)
+{
+    zoneViews.removeOne(item);
+    removeItem(item);
+}
+
+/**
+ * @brief Closes all zone views.
+ */
+void GameScene::clearViews()
+{
+    while (!zoneViews.isEmpty()) {
+        zoneViews.first()->close();
+    }
+}
+
+void GameScene::emptyActiveViews()
+{
+    for (auto zoneView : zoneViews) {
+        auto logic = qobject_cast<ZoneViewZoneLogic *>(zoneView->getZone()->getLogic());
+        if (!logic->getRevealZone()) {
+            logic->clearCards();
+        }
+    }
+}
+
+/**
+ * @brief Closes the most recently added zone view.
+ */
+void GameScene::closeMostRecentZoneView()
+{
+    if (!zoneViews.isEmpty()) {
+        zoneViews.last()->close();
+    }
+}
+
+// ---------- View Transforms ----------
+
+QTransform GameScene::getViewTransform() const
+{
+    return views().at(0)->transform();
+}
+
+QTransform GameScene::getViewportTransform() const
+{
+    return views().at(0)->viewportTransform();
+}
+
+// ---------- Event Handling ----------
+
+bool GameScene::event(QEvent *event)
+{
+    if (event->type() == QEvent::GraphicsSceneMouseMove) {
+        updateHover(static_cast<QGraphicsSceneMouseEvent *>(event)->scenePos());
+    } else if (event->type() == QEvent::Leave) {
+        updateHoveredCard(nullptr);
+    }
+
+    return QGraphicsScene::event(event);
+}
+
+void GameScene::timerEvent(QTimerEvent * /*event*/)
+{
+    QMutableHashIterator<QObject *, IAnimatedItem *> i(animatedItems);
+    while (i.hasNext()) {
+        i.next();
+        if (!i.value()->animationEvent()) {
+            i.remove();
+        }
+    }
+    if (animatedItems.isEmpty()) {
+        animationTimer->stop();
+    }
+}
+
+void GameScene::registerAnimationItem(IAnimatedItem *item)
+{
+    auto *object = dynamic_cast<QObject *>(item);
+    if (!object) {
+        return;
+    }
+    // Guard against duplicate connections using the connection map, not
+    // animatedItems: the animation timer removes entries from animatedItems when an
+    // animation completes, but the destroyed->removeAnimatedItem connection must
+    // persist until the object is destroyed. Relying on animatedItems here would let
+    // a re-registered item (e.g. a life counter that flashes repeatedly) accumulate
+    // duplicate destroyed connections, the older ones of which would survive teardown.
+    if (!animationItemConnections.contains(object)) {
+        animationItemConnections.insert(object,
+                                        connect(object, &QObject::destroyed, this, &GameScene::removeAnimatedItem));
+    }
+    animatedItems.insert(object, item);
+    if (animationTimer && !animationTimer->isActive()) {
+        animationTimer->start(10, this);
+    }
+}
+
+void GameScene::unregisterAnimationItem(IAnimatedItem *item)
+{
+    animatedItems.remove(dynamic_cast<QObject *>(item));
+    if (animationTimer && animatedItems.isEmpty()) {
+        animationTimer->stop();
+    }
+}
+
+void GameScene::removeAnimatedItem(QObject *item)
+{
+    animatedItems.remove(item);
+    animationItemConnections.remove(item);
+    if (animationTimer && animatedItems.isEmpty()) {
+        animationTimer->stop();
+    }
+}
+
+// ---------- Rubber Band ----------
+
+void GameScene::startRubberBand(const QPointF &selectionOrigin)
+{
+    emit sigStartRubberBand(selectionOrigin);
+}
+
+void GameScene::resizeRubberBand(const QPointF &cursorPoint, int selectedCount)
+{
+    emit sigResizeRubberBand(cursorPoint, selectedCount);
+}
+
+void GameScene::stopRubberBand()
+{
+    emit sigStopRubberBand();
+}
diff --git a/cockatrice/src/game/game_scene.h b/cockatrice/src/game_graphics/game_scene.h
similarity index 52%
rename from cockatrice/src/game/game_scene.h
rename to cockatrice/src/game_graphics/game_scene.h
index 86fa0795a..c7cae1e76 100644
--- a/cockatrice/src/game/game_scene.h
+++ b/cockatrice/src/game_graphics/game_scene.h
@@ -1,18 +1,39 @@
 #ifndef GAMESCENE_H
 #define GAMESCENE_H
 
-#include "zones/logic/card_zone_logic.h"
+#include "../game/arrow_registry.h"
 
 #include <QGraphicsScene>
+#include <QHash>
 #include <QList>
 #include <QLoggingCategory>
+#include <QMap>
+#include <QMetaObject>
+#include <QPointF>
 #include <QPointer>
-#include <QSet>
+#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");
 
-class Player;
+class PlayerLogic;
 class PlayerGraphicsItem;
 class ZoneViewWidget;
 class CardZone;
@@ -21,6 +42,7 @@ class CardItem;
 class ServerInfo_Card;
 class PhasesToolbar;
 class QBasicTimer;
+class QObject;
 
 /**
  * @class GameScene
@@ -41,14 +63,19 @@ private:
     static const int playerAreaSpacing = 5; ///< Space between player areas
 
     PhasesToolbar *phasesToolbar;                       ///< Toolbar showing game phases
-    QList<PlayerGraphicsItem *> players;                ///< All player graphics items
+    QMap<int, PlayerGraphicsItem *> playerViews;        ///< ID lookup for player graphics items
     QList<QList<PlayerGraphicsItem *>> playersByColumn; ///< Players organized by column
+    ArrowRegistry arrowRegistry;                        ///< ID registry for arrow graphics items
     QList<ZoneViewWidget *> zoneViews;                  ///< Active zone view widgets
     QSize viewSize;                                     ///< Current view size
     QPointer<CardItem> hoveredCard;                     ///< Currently hovered card
-    QBasicTimer *animationTimer;                        ///< Timer for card animations
-    QSet<CardItem *> cardsToAnimate;                    ///< Cards currently animating
-    int playerRotation;                                 ///< Rotation offset for player layout
+    QBasicTimer *animationTimer;                        ///< Timer for scene animations
+    QHash<QObject *, IAnimatedItem *> animatedItems;    ///< Items currently animating
+    QHash<QObject *, QMetaObject::Connection>
+        animationItemConnections; ///< destroyed->removeAnimatedItem handles per animated item
+    int playerRotation;           ///< Rotation offset for player layout
+    bool rearranging = false;     ///< Guard against re-entrant rearrange
+    bool needsReArrange = false;  ///< Pending rearrange requested during a pass
 
     /**
      * @brief Updates which card is currently hovered based on scene coordinates.
@@ -56,6 +83,14 @@ private:
      */
     void updateHover(const QPointF &scenePos);
 
+    /**
+     * @brief Activates hover state and escapes the card from its clip container
+     * so hover scaling is visible beyond zone bounds.
+     */
+    void beginCardHover(CardItem *card);
+    /** @brief Deactivates hover state and restores the card to its clip container. */
+    void endCardHover(CardItem *card);
+
 public:
     /**
      * @brief Constructs the GameScene.
@@ -64,23 +99,36 @@ public:
      */
     explicit GameScene(PhasesToolbar *_phasesToolbar, QObject *parent = nullptr);
 
-    /** Destructor, cleans up timer and zone views. */
+    /** @brief Destructor, cleans up timer and zone views. */
     ~GameScene() override;
 
-    /** Updates UI text for all zone views. */
+    /** @brief Updates UI text for all zone views. */
     void retranslateUi();
 
+    /** @brief Gets all selected CardItems. */
+    QList<CardItem *> selectedCards() const;
+
     /**
      * @brief Adds a player to the scene and stores their graphics item.
      * @param player Player to add.
      */
-    void addPlayer(Player *player);
+    void addPlayer(PlayerLogic *player);
 
     /**
      * @brief Removes a player from the scene.
      * @param player Player to remove.
      */
-    void removePlayer(Player *player);
+    void removePlayer(PlayerLogic *player);
+
+    QMap<int, PlayerGraphicsItem *> getPlayers() const
+    {
+        return playerViews;
+    }
+
+    PlayerGraphicsItem *viewForPlayer(int playerId)
+    {
+        return playerViews.value(playerId);
+    }
 
     /**
      * @brief Adjusts the global rotation offset for player layout.
@@ -88,7 +136,7 @@ public:
      */
     void adjustPlayerRotation(int rotationAdjustment);
 
-    /** Recomputes the layout of players and the scene size. */
+    /** @brief Recomputes the layout of players and the scene size. */
     void rearrange();
 
     /**
@@ -102,7 +150,7 @@ public:
      * @param firstPlayerIndex Output index of first local player.
      * @return List of active players.
      */
-    QList<Player *> collectActivePlayers(int &firstPlayerIndex) const;
+    QList<PlayerLogic *> collectActivePlayers(int &firstPlayerIndex) const;
 
     /**
      * @brief Rotates the list of players for layout.
@@ -110,7 +158,7 @@ public:
      * @param firstPlayerIndex Index of first local player.
      * @return Rotated list.
      */
-    QList<Player *> rotatePlayers(const QList<Player *> &players, int firstPlayerIndex) const;
+    QList<PlayerLogic *> rotatePlayers(const QList<PlayerLogic *> &players, int firstPlayerIndex) const;
 
     /**
      * @brief Determines the number of columns to display players in.
@@ -125,7 +173,7 @@ public:
      * @param columns Number of columns to split into.
      * @return Calculated scene size.
      */
-    QSizeF computeSceneSizeAndPlayerLayout(const QList<Player *> &playersPlaying, int columns);
+    QSizeF computeSceneSizeAndPlayerLayout(const QList<PlayerLogic *> &playersPlaying, int columns);
 
     /**
      * @brief Computes the minimum width for each column based on player minimum widths.
@@ -148,56 +196,85 @@ public:
      */
     void resizeColumnsAndPlayers(const QList<qreal> &minWidthByColumn, qreal newWidth);
 
-    /** Finds the topmost card zone under the cursor. */
+    /** @brief Finds the topmost card zone under the cursor. */
     static CardZone *findTopmostZone(const QList<QGraphicsItem *> &items);
 
-    /** Finds the topmost card in a given zone, considering attachments and Z-order. */
+    /** @brief Finds the topmost card in a given zone, considering attachments and Z-order. */
     static CardItem *findTopmostCardInZone(const QList<QGraphicsItem *> &items, CardZone *zone);
 
-    /** Updates hovered card highlighting. */
+    /** @brief Updates hovered card highlighting. */
     void updateHoveredCard(CardItem *newCard);
 
-    /** Registers a card for animation updates. */
-    void registerAnimationItem(AbstractCardItem *card);
+    /**
+     * @brief Registers an item for animation updates with the shared scene timer.
+     *
+     * The item must inherit QObject; it is unregistered automatically when it is
+     * destroyed, so it may be deleted mid-animation without a dangling pointer.
+     */
+    void registerAnimationItem(IAnimatedItem *item);
 
-    /** Unregisters a card from animation updates. */
-    void unregisterAnimationItem(AbstractCardItem *card);
+    /** @brief Unregisters an item from animation updates. */
+    void unregisterAnimationItem(IAnimatedItem *item);
     void startRubberBand(const QPointF &selectionOrigin);
-    void resizeRubberBand(const QPointF &cursorPoint);
+    void resizeRubberBand(const QPointF &cursorPoint, int selectedCount);
     void stopRubberBand();
 
-public slots:
-    /** Toggles a zone view for a player. */
-    void toggleZoneView(Player *player, const QString &zoneName, int numberCards, bool isReversed = false);
+private slots:
+    /** @brief Removes a destroyed item from the animation set. */
+    void removeAnimatedItem(QObject *item);
 
-    /** Adds a revealed zone view (for shown cards). */
-    void addRevealedZoneView(Player *player,
+public slots:
+    void onCardSelectionChanged(AbstractCardItem *card, bool selected);
+    void onCardRightClicked(AbstractCardItem *card, QPoint screenPos);
+    void playSelected(AbstractCardItem *card);
+    void playSelectedFaceDown(AbstractCardItem *card);
+    void hideSelected(AbstractCardItem *card);
+    /** @brief Toggles a zone view for a player. */
+    void toggleZoneView(PlayerLogic *player, const QString &zoneName, int numberCards, bool isReversed = false);
+
+    /** @brief Adds a revealed zone view (for shown cards). */
+    void addRevealedZoneView(PlayerLogic *player,
                              CardZoneLogic *zone,
                              const QList<const ServerInfo_Card *> &cardList,
                              bool withWritePermission);
 
-    /** Removes a zone view widget from the scene. */
+    /** @brief Removes a zone view widget from the scene. */
     void removeZoneView(ZoneViewWidget *item);
 
-    /** Closes all zone views. */
+    /** @brief Closes all zone views. */
     void clearViews();
 
-    /** Closes the most recently added zone view. */
+    /** @brief Empties the contents of all non-reveal zone views. Used for replay rewinding */
+    void emptyActiveViews();
+
+    /** @brief Closes the most recently added zone view. */
     void closeMostRecentZoneView();
     QTransform getViewTransform() const;
     QTransform getViewportTransform() const;
 
+    /// Directly modifies the scene
+    void addArrow(QSharedPointer<ArrowData> data);
+    void deleteArrow(int playerId, int arrowId);
+    void clearArrowsForPlayer(int playerId);
+    void clearArrowsForPlayerLocally(int playerId);
+
+    /// Queues up arrow deletion but doesn't directly modify the scene
+    void requestArrowDeletion(int playerId, int arrowId);
+
+    void onCardZoneChanged(CardItem *card, bool sameZone);
+
 protected:
-    /** Handles hover updates. */
+    /** @brief Handles hover updates. */
     bool event(QEvent *event) override;
 
-    /** Handles animation timer updates. */
+    /** @brief Handles animation timer updates. */
     void timerEvent(QTimerEvent *event) override;
 
 signals:
     void sigStartRubberBand(const QPointF &selectionOrigin);
-    void sigResizeRubberBand(const QPointF &cursorPoint);
+    void sigResizeRubberBand(const QPointF &cursorPoint, int selectedCount);
     void sigStopRubberBand();
+    void arrowDeletionRequested(int creatorId, int arrowId);
 };
 
 #endif
diff --git a/cockatrice/src/game_graphics/game_view.cpp b/cockatrice/src/game_graphics/game_view.cpp
new file mode 100644
index 000000000..1c92d74ae
--- /dev/null
+++ b/cockatrice/src/game_graphics/game_view.cpp
@@ -0,0 +1,325 @@
+#include "game_view.h"
+
+#include "../client/settings/cache_settings.h"
+#include "../client/settings/shortcuts_settings.h"
+#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 <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.
+class SelectionRubberBand : public QRubberBand
+{
+public:
+    using QRubberBand::QRubberBand;
+
+protected:
+    void showEvent(QShowEvent *event) override
+    {
+        QWidget::showEvent(event); // Skip QRubberBand's raise()
+    }
+
+    void changeEvent(QEvent *event) override
+    {
+        if (event->type() == QEvent::ZOrderChange) {
+            return; // Skip QRubberBand's raise() on z-order changes
+        }
+        QRubberBand::changeEvent(event);
+    }
+};
+
+GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, parent), rubberBand(0)
+{
+    setBackgroundBrush(QBrush(QColor(0, 0, 0)));
+    setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing);
+    setViewportUpdateMode(BoundingRectViewportUpdate);
+
+    connect(scene, &GameScene::sceneRectChanged, this, &GameView::updateSceneRect);
+
+    connect(scene, &GameScene::sigStartRubberBand, this, &GameView::startRubberBand);
+    connect(scene, &GameScene::sigResizeRubberBand, this, &GameView::resizeRubberBand);
+    connect(scene, &GameScene::sigStopRubberBand, this, &GameView::stopRubberBand);
+    connect(scene, &QGraphicsScene::selectionChanged, this, [this]() { updateTotalSelectionCount(); });
+    connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::tallyTypeChanged, this,
+            [this] { updateTotalSelectionCount(); });
+
+    setFocusDisabled(SettingsCache::instance().userInterface().getKeepGameChatFocus());
+    connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::keepGameChatFocusChanged, this,
+            &GameView::setFocusDisabled);
+
+    aCloseMostRecentZoneView = new QAction(this);
+
+    connect(aCloseMostRecentZoneView, &QAction::triggered, scene, &GameScene::closeMostRecentZoneView);
+    addAction(aCloseMostRecentZoneView);
+    connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
+            &GameView::refreshShortcuts);
+    refreshShortcuts();
+    rubberBand = new SelectionRubberBand(QRubberBand::Rectangle, this);
+
+    const QString baseProperties = "color: white; "
+                                   "font-family: monospace; "
+                                   "background-color: rgba(0, 0, 0, 160); "
+                                   "border-radius: 3px; "
+                                   "padding: 1px 2px; "
+                                   "white-space: pre;";
+
+    const QString dragCountLabelStyle = baseProperties + "font-size: 14px; font-weight: bold;";
+    const QString totalCountLabelStyle = baseProperties + "font-size: 16px; font-weight: bold;";
+    const QString subtypeTallyLabelStyle = baseProperties + "font-size: 12px;";
+
+    dragCountLabel = new QLabel(this);
+    dragCountLabel->setStyleSheet(dragCountLabelStyle);
+    dragCountLabel->hide();
+    dragCountLabel->raise();
+
+    totalCountLabel = new QLabel(this);
+    totalCountLabel->setStyleSheet(totalCountLabelStyle);
+    totalCountLabel->hide();
+
+    tallyContainer = new QWidget(this);
+    tallyContainer->setStyleSheet(subtypeTallyLabelStyle);
+    tallyLayout = new QGridLayout(tallyContainer);
+    tallyLayout->setContentsMargins(2, 2, 2, 2);
+    tallyLayout->setSpacing(2);
+    tallyContainer->hide();
+}
+
+void GameView::resizeEvent(QResizeEvent *event)
+{
+    QGraphicsView::resizeEvent(event);
+
+    GameScene *s = static_cast<GameScene *>(scene());
+    s->processViewSizeChange(event->size());
+
+    updateSceneRect(scene()->sceneRect());
+    updateTotalSelectionCount(event->size());
+}
+
+void GameView::updateSceneRect(const QRectF &rect)
+{
+    fitInView(rect, Qt::KeepAspectRatio);
+}
+
+void GameView::startRubberBand(const QPointF &_selectionOrigin)
+{
+    if (!rubberBand) {
+        return;
+    }
+
+    selectionOrigin = _selectionOrigin;
+    previousBandRect = QRect();
+    rubberBand->setGeometry(QRect(mapFromScene(selectionOrigin), QSize(0, 0)));
+    rubberBand->show();
+}
+
+void GameView::resizeRubberBand(const QPointF &cursorPoint, int selectedCount)
+{
+    if (!rubberBand) {
+        return;
+    }
+
+    constexpr int kLabelPaddingInPixels = 4;
+
+    QPoint cursor = cursorPoint.toPoint();
+    QRect rect = QRect(mapFromScene(selectionOrigin), cursor).normalized();
+
+    rubberBand->setGeometry(rect);
+    if (viewport()) {
+        // Repaint the union of the previous and current band rects: the vacated
+        // strip of a child widget is not reliably invalidated on all platforms
+        // (notably macOS), leaving stale pixels under the selection.
+        QRect dirty = previousBandRect.isNull() ? rect : previousBandRect.united(rect);
+        dirty.adjust(-1, -1, 1, 1);
+        viewport()->update(dirty);
+        previousBandRect = rect;
+    }
+
+    if (!SettingsCache::instance().userInterface().getShowDragSelectionCount()) {
+        dragCountLabel->hide();
+        return;
+    }
+
+    if (selectedCount > 0) {
+        dragCountLabel->setText(QString::number(selectedCount));
+        dragCountLabel->adjustSize();
+        QSize labelSize = dragCountLabel->size();
+
+        if (rect.width() < labelSize.width() + 2 * kLabelPaddingInPixels ||
+            rect.height() < labelSize.height() + 2 * kLabelPaddingInPixels) {
+            dragCountLabel->hide();
+            return;
+        }
+
+        const int minX = rect.left() + kLabelPaddingInPixels;
+        const int minY = rect.top() + kLabelPaddingInPixels;
+
+        int x = qMax(minX, cursor.x() - labelSize.width() - kLabelPaddingInPixels);
+        int y = qMax(minY, cursor.y() - labelSize.height() - kLabelPaddingInPixels);
+
+        bool isAtTopLeftCorner = (x == minX) && (y == minY);
+        if (isAtTopLeftCorner) {
+            constexpr int kCursorClearanceInPixels = 16;
+            x = qMin(cursor.x() + kCursorClearanceInPixels, rect.right() - labelSize.width() - kLabelPaddingInPixels);
+        }
+
+        dragCountLabel->move(x, y);
+        dragCountLabel->show();
+    } else {
+        dragCountLabel->hide();
+    }
+}
+
+void GameView::stopRubberBand()
+{
+    if (!rubberBand) {
+        return;
+    }
+
+    // Same rationale as resizeRubberBand: repaint the last known band area
+    // since hiding a child widget doesn't reliably invalidate its region.
+    rubberBand->hide();
+    if (viewport() && !previousBandRect.isNull()) {
+        viewport()->update(previousBandRect.adjusted(-1, -1, 1, 1));
+        previousBandRect = QRect();
+    }
+    dragCountLabel->hide();
+}
+
+void GameView::refreshShortcuts()
+{
+    aCloseMostRecentZoneView->setShortcuts(
+        SettingsCache::instance().shortcuts().getShortcut("Player/aCloseMostRecentZoneView"));
+}
+
+void GameView::clearTallyLabels()
+{
+    QtUtils::clearLayoutRec(tallyLayout);
+}
+
+QSize GameView::rebuildTallyLabels(const QList<TallyRow> &entries)
+{
+    clearTallyLabels();
+
+    const QString nameStyle = QStringLiteral("color: white; font-size: 12px; background: transparent;");
+    const QString countStyle =
+        QStringLiteral("color: white; font-size: 14px; font-weight: bold; background: transparent;");
+
+    int totalHeight = 0;
+    int maxNameWidth = 0;
+    int maxCountWidth = 0;
+
+    int row = 0;
+    for (const TallyRow &entry : entries) {
+        auto *nameLabel = new QLabel(entry.name, tallyContainer);
+        nameLabel->setStyleSheet(nameStyle);
+        nameLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+        tallyLayout->addWidget(nameLabel, row, 0);
+
+        auto *countLabel = new QLabel(entry.value, tallyContainer);
+        countLabel->setStyleSheet(countStyle);
+        countLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+        tallyLayout->addWidget(countLabel, row, 1);
+
+        QSize nameSize = nameLabel->sizeHint();
+        QSize countSize = countLabel->sizeHint();
+        maxNameWidth = qMax(maxNameWidth, nameSize.width());
+        maxCountWidth = qMax(maxCountWidth, countSize.width());
+        totalHeight += qMax(nameSize.height(), countSize.height());
+
+        ++row;
+    }
+
+    int spacing = tallyLayout->spacing();
+    int margins = tallyLayout->contentsMargins().left() + tallyLayout->contentsMargins().right();
+    int verticalMargins = tallyLayout->contentsMargins().top() + tallyLayout->contentsMargins().bottom();
+
+    int width = maxNameWidth + spacing + maxCountWidth + margins;
+    int height = totalHeight + (row - 1) * spacing + verticalMargins;
+
+    return QSize(width, height);
+}
+
+void GameView::updateTotalSelectionCount(const QSize &viewSize)
+{
+    constexpr int kMarginInPixels = 10;
+    constexpr int kSpacingBetweenLabels = 4;
+
+    int availableWidth = viewSize.isValid() ? viewSize.width() : viewport()->width();
+    int availableHeight = viewSize.isValid() ? viewSize.height() : viewport()->height();
+
+    int count = scene()->selectedItems().count();
+
+    if (!SettingsCache::instance().userInterface().getShowTotalSelectionCount() || count <= 1) {
+        totalCountLabel->hide();
+    } else {
+        totalCountLabel->setText(QString::number(count));
+        totalCountLabel->adjustSize();
+
+        int x = availableWidth - totalCountLabel->width() - kMarginInPixels;
+        int y = availableHeight - totalCountLabel->height() - kMarginInPixels;
+        totalCountLabel->move(x, y);
+        totalCountLabel->show();
+    }
+
+    TallyType tallyType = Tally::intToType(SettingsCache::instance().userInterface().getTallyType());
+
+    GameScene *gameScene = static_cast<GameScene *>(scene());
+    QList<TallyRow> entries = Tally::compute(gameScene->selectedCards(), tallyType);
+
+    if (entries.isEmpty()) {
+        tallyContainer->hide();
+        cachedTallyRows.clear();
+        return;
+    }
+
+    // Only rebuild labels if entries changed
+    QSize containerSize;
+    if (entries != cachedTallyRows) {
+        cachedTallyRows = entries;
+        containerSize = rebuildTallyLabels(entries);
+        tallyContainer->resize(containerSize);
+    } else {
+        containerSize = tallyContainer->size();
+    }
+
+    int x = availableWidth - containerSize.width() - kMarginInPixels;
+    int y;
+
+    if (totalCountLabel->isVisible()) {
+        y = totalCountLabel->y() - containerSize.height() - kSpacingBetweenLabels;
+    } else {
+        y = availableHeight - containerSize.height() - kMarginInPixels;
+    }
+
+    y = qMax(kMarginInPixels, y);
+
+    tallyContainer->move(x, y);
+    tallyContainer->show();
+}
+
+/**
+ * Disabling focus on the game view will allow chat to maintain the autofocusing behavior of pre 2.10.3,
+ * at the cost of disabling the zone view search bar.
+ */
+void GameView::setFocusDisabled(bool disabled)
+{
+    setFocusPolicy(disabled ? Qt::NoFocus : Qt::ClickFocus);
+}
diff --git a/cockatrice/src/game_graphics/game_view.h b/cockatrice/src/game_graphics/game_view.h
new file mode 100644
index 000000000..e57267734
--- /dev/null
+++ b/cockatrice/src/game_graphics/game_view.h
@@ -0,0 +1,60 @@
+/**
+ * @file game_view.h
+ * @ingroup GameGraphics
+ */
+//! \todo Document this file.
+
+#ifndef GAMEVIEW_H
+#define GAMEVIEW_H
+
+#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
+{
+    Q_OBJECT
+private:
+    QAction *aCloseMostRecentZoneView;
+    QRubberBand *rubberBand;
+    QLabel *dragCountLabel;
+    QLabel *totalCountLabel;
+    QWidget *tallyContainer;
+    QGridLayout *tallyLayout;
+    QPointF selectionOrigin;
+    QRect previousBandRect;          ///< Last rubber-band rect for targeted repaint
+    QList<TallyRow> cachedTallyRows; ///< Cached entries to avoid redundant rebuilds
+
+    QSize rebuildTallyLabels(const QList<TallyRow> &entries);
+    void clearTallyLabels();
+
+protected:
+    void resizeEvent(QResizeEvent *event) override;
+private slots:
+    void startRubberBand(const QPointF &selectionOrigin);
+    void resizeRubberBand(const QPointF &cursorPoint, int selectedCount);
+    void stopRubberBand();
+    void refreshShortcuts();
+    void updateTotalSelectionCount(const QSize &viewSize = QSize());
+    void setFocusDisabled(bool disabled);
+public slots:
+    void updateSceneRect(const QRectF &rect);
+
+public:
+    explicit GameView(GameScene *scene, QWidget *parent = nullptr);
+};
+
+#endif
diff --git a/cockatrice/src/game/hand_counter.cpp b/cockatrice/src/game_graphics/hand_counter.cpp
similarity index 74%
rename from cockatrice/src/game/hand_counter.cpp
rename to cockatrice/src/game_graphics/hand_counter.cpp
index 35989ff38..9320c1295 100644
--- a/cockatrice/src/game/hand_counter.cpp
+++ b/cockatrice/src/game_graphics/hand_counter.cpp
@@ -1,10 +1,22 @@
 #include "hand_counter.h"
 
-#include "zones/card_zone.h"
+#include "../game/board/card_list.h"
+#include "../game/zones/card_zone_logic.h"
+#include "../interface/pixel_map_generator.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)
 {
@@ -32,7 +44,8 @@ void HandCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op
     QSize translatedSize = painter->combinedTransform().mapRect(boundingRect()).size().toSize();
     QPixmap cachedPixmap;
     if (!QPixmapCache::find("handCounter" + QString::number(translatedSize.width()), &cachedPixmap)) {
-        cachedPixmap = QPixmap("theme:hand").scaled(translatedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        cachedPixmap =
+            themePixmap(QStringLiteral("hand")).scaled(translatedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
         QPixmapCache::insert("handCounter" + QString::number(translatedSize.width()), cachedPixmap);
     }
     resetPainterTransform(painter);
diff --git a/cockatrice/src/game/hand_counter.h b/cockatrice/src/game_graphics/hand_counter.h
similarity index 79%
rename from cockatrice/src/game/hand_counter.h
rename to cockatrice/src/game_graphics/hand_counter.h
index 2c0175ecc..c1f5d09d8 100644
--- a/cockatrice/src/game/hand_counter.h
+++ b/cockatrice/src/game_graphics/hand_counter.h
@@ -1,19 +1,19 @@
 /**
  * @file hand_counter.h
  * @ingroup GameGraphicsPlayers
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef HANDCOUNTER_H
 #define HANDCOUNTER_H
 
-#include "../game_graphics/board/abstract_graphics_item.h"
-#include "../game_graphics/board/graphics_item_type.h"
+#include "board/abstract_graphics_item.h"
+#include "board/graphics_item_type.h"
 
-#include <QString>
+#include <qtmetamacros.h>
 
-class QPainter;
-class QPixmap;
+class QGraphicsItem;
+class QPoint;
 
 class HandCounter : public AbstractGraphicsItem
 {
diff --git a/cockatrice/src/game/log/message_log_widget.cpp b/cockatrice/src/game_graphics/log/message_log_widget.cpp
similarity index 81%
rename from cockatrice/src/game/log/message_log_widget.cpp
rename to cockatrice/src/game_graphics/log/message_log_widget.cpp
index 1ff3e32ff..4a9750fca 100644
--- a/cockatrice/src/game/log/message_log_widget.cpp
+++ b/cockatrice/src/game_graphics/log/message_log_widget.cpp
@@ -1,24 +1,40 @@
 #include "message_log_widget.h"
 
+#include "../../client/settings/cache_settings.h"
+#include "../../client/settings/card_counter_settings.h"
 #include "../../client/sound_engine.h"
-#include "../../interface/widgets/tabs/tab_game.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 "../board/card_item.h"
 #include "../board/translate_counter_name.h"
-#include "../phase.h"
-#include "../player/player.h"
+#include "libcockatrice/protocol/pb/game_event_context.pb.h"
 
-#include <../../client/settings/card_counter_settings.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>
 
-static const QString TABLE_ZONE_NAME = "table";
-static const QString GRAVE_ZONE_NAME = "grave";
-static const QString EXILE_ZONE_NAME = "rfg";
-static const QString HAND_ZONE_NAME = "hand";
-static const QString DECK_ZONE_NAME = "deck";
-static const QString SIDEBOARD_ZONE_NAME = "sb";
-static const QString STACK_ZONE_NAME = "stack";
+class QWidget;
+class ServerInfo_User;
+class TabSupervisor;
 
 static QString sanitizeHtml(QString dirty)
 {
@@ -27,7 +43,11 @@ static QString sanitizeHtml(QString dirty)
 
 static QString cardLink(const QString &cardName)
 {
-    return QString("<i><a href=\"card://%1\">%2</a></i>").arg(cardName).arg(cardName);
+    // The href keeps the canonical name so the card popup can resolve it, while the label shows the name
+    // in the configured card language.
+    return QString("<i><a href=\"card://%1\">%2</a></i>")
+        .arg(sanitizeHtml(cardName))
+        .arg(sanitizeHtml(CardLocalization::displayNameFor(cardName)));
 }
 
 QPair<QString, QString>
@@ -37,15 +57,15 @@ MessageLogWidget::getFromStr(CardZoneLogic *zone, QString cardName, int position
     QString fromStr;
     QString zoneName = zone->getName();
 
-    if (zoneName == TABLE_ZONE_NAME) {
+    if (zoneName == ZoneNames::TABLE) {
         fromStr = tr(" from play");
-    } else if (zoneName == GRAVE_ZONE_NAME) {
+    } else if (zoneName == ZoneNames::GRAVE) {
         fromStr = tr(" from their graveyard");
-    } else if (zoneName == EXILE_ZONE_NAME) {
+    } else if (zoneName == ZoneNames::EXILE) {
         fromStr = tr(" from exile");
-    } else if (zoneName == HAND_ZONE_NAME) {
+    } else if (zoneName == ZoneNames::HAND) {
         fromStr = tr(" from their hand");
-    } else if (zoneName == DECK_ZONE_NAME) {
+    } else if (zoneName == ZoneNames::DECK) {
         if (position == 0) {
             if (cardName.isEmpty()) {
                 if (ownerChange) {
@@ -61,7 +81,7 @@ MessageLogWidget::getFromStr(CardZoneLogic *zone, QString cardName, int position
                     fromStr = tr(" from the top of their library");
                 }
             }
-        } else if (position >= zone->getCards().size() - 1) {
+        } else if (position == zone->getCards().size()) {
             if (cardName.isEmpty()) {
                 if (ownerChange) {
                     cardName = tr("the bottom card of %1's library").arg(zone->getPlayer()->getPlayerInfo()->getName());
@@ -83,9 +103,9 @@ MessageLogWidget::getFromStr(CardZoneLogic *zone, QString cardName, int position
                 fromStr = tr(" from their library");
             }
         }
-    } else if (zoneName == SIDEBOARD_ZONE_NAME) {
+    } else if (zoneName == ZoneNames::SIDEBOARD) {
         fromStr = tr(" from sideboard");
-    } else if (zoneName == STACK_ZONE_NAME) {
+    } else if (zoneName == ZoneNames::STACK) {
         fromStr = tr(" from the stack");
     } else {
         fromStr = tr(" from custom zone '%1'").arg(zoneName);
@@ -112,7 +132,7 @@ void MessageLogWidget::containerProcessingStarted(const GameEventContext &contex
     }
 }
 
-void MessageLogWidget::logAlwaysRevealTopCard(Player *player, CardZoneLogic *zone, bool reveal)
+void MessageLogWidget::logAlwaysRevealTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal)
 {
     appendHtmlServerMessage((reveal ? tr("%1 is now keeping the top card %2 revealed.")
                                     : tr("%1 is not revealing the top card %2 any longer."))
@@ -120,7 +140,7 @@ void MessageLogWidget::logAlwaysRevealTopCard(Player *player, CardZoneLogic *zon
                                 .arg(zone->getTranslatedName(true, CaseTopCardsOfZone)));
 }
 
-void MessageLogWidget::logAlwaysLookAtTopCard(Player *player, CardZoneLogic *zone, bool reveal)
+void MessageLogWidget::logAlwaysLookAtTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal)
 {
     appendHtmlServerMessage((reveal ? tr("%1 can now look at top card %2 at any time.")
                                     : tr("%1 no longer can look at top card %2 at any time."))
@@ -128,7 +148,10 @@ void MessageLogWidget::logAlwaysLookAtTopCard(Player *player, CardZoneLogic *zon
                                 .arg(zone->getTranslatedName(true, CaseTopCardsOfZone)));
 }
 
-void MessageLogWidget::logAttachCard(Player *player, QString cardName, Player *targetPlayer, QString targetCardName)
+void MessageLogWidget::logAttachCard(PlayerLogic *player,
+                                     QString cardName,
+                                     PlayerLogic *targetPlayer,
+                                     QString targetCardName)
 {
     appendHtmlServerMessage(tr("%1 attaches %2 to %3's %4.")
                                 .arg(sanitizeHtml(player->getPlayerInfo()->getName()))
@@ -155,7 +178,7 @@ void MessageLogWidget::logUnconcede(int playerId)
         true);
 }
 
-void MessageLogWidget::logConnectionStateChanged(Player *player, bool connectionState)
+void MessageLogWidget::logConnectionStateChanged(PlayerLogic *player, bool connectionState)
 {
     if (connectionState) {
         soundEngine->playSound("player_reconnect");
@@ -168,10 +191,10 @@ void MessageLogWidget::logConnectionStateChanged(Player *player, bool connection
     }
 }
 
-void MessageLogWidget::logCreateArrow(Player *player,
-                                      Player *startPlayer,
+void MessageLogWidget::logCreateArrow(PlayerLogic *player,
+                                      PlayerLogic *startPlayer,
                                       QString startCard,
-                                      Player *targetPlayer,
+                                      PlayerLogic *targetPlayer,
                                       QString targetCard,
                                       bool playerTarget)
 {
@@ -227,7 +250,7 @@ void MessageLogWidget::logCreateArrow(Player *player,
     }
 }
 
-void MessageLogWidget::logCreateToken(Player *player, QString cardName, QString pt, bool faceDown)
+void MessageLogWidget::logCreateToken(PlayerLogic *player, QString cardName, QString pt, bool faceDown)
 {
     if (faceDown) {
         appendHtmlServerMessage(
@@ -240,7 +263,7 @@ void MessageLogWidget::logCreateToken(Player *player, QString cardName, QString
     }
 }
 
-void MessageLogWidget::logDeckSelect(Player *player, QString deckHash, int sideboardSize)
+void MessageLogWidget::logDeckSelect(PlayerLogic *player, QString deckHash, int sideboardSize)
 {
     if (sideboardSize < 0) {
         appendHtmlServerMessage(
@@ -253,13 +276,13 @@ void MessageLogWidget::logDeckSelect(Player *player, QString deckHash, int sideb
     }
 }
 
-void MessageLogWidget::logDestroyCard(Player *player, QString cardName)
+void MessageLogWidget::logDestroyCard(PlayerLogic *player, QString cardName)
 {
     appendHtmlServerMessage(
         tr("%1 destroys %2.").arg(sanitizeHtml(player->getPlayerInfo()->getName())).arg(cardLink(std::move(cardName))));
 }
 
-void MessageLogWidget::logMoveCard(Player *player,
+void MessageLogWidget::logMoveCard(PlayerLogic *player,
                                    CardItem *card,
                                    CardZoneLogic *startZone,
                                    int oldX,
@@ -275,9 +298,9 @@ void MessageLogWidget::logMoveCard(Player *player,
     bool ownerChanged = startZone->getPlayer() != targetZone->getPlayer();
 
     // do not log if moved within the same zone
-    if ((startZoneName == TABLE_ZONE_NAME && targetZoneName == TABLE_ZONE_NAME && !ownerChanged) ||
-        (startZoneName == HAND_ZONE_NAME && targetZoneName == HAND_ZONE_NAME) ||
-        (startZoneName == EXILE_ZONE_NAME && targetZoneName == EXILE_ZONE_NAME)) {
+    if ((startZoneName == ZoneNames::TABLE && targetZoneName == ZoneNames::TABLE && !ownerChanged) ||
+        (startZoneName == ZoneNames::HAND && targetZoneName == ZoneNames::HAND) ||
+        (startZoneName == ZoneNames::EXILE && targetZoneName == ZoneNames::EXILE)) {
         return;
     }
 
@@ -306,20 +329,28 @@ void MessageLogWidget::logMoveCard(Player *player,
 
     QString finalStr;
     std::optional<QString> fourthArg;
-    if (targetZoneName == TABLE_ZONE_NAME) {
+    if (targetZoneName == ZoneNames::TABLE) {
         soundEngine->playSound("play_card");
         if (card->getFaceDown()) {
             finalStr = tr("%1 puts %2 into play%3 face down.");
         } else {
             finalStr = tr("%1 puts %2 into play%3.");
         }
-    } else if (targetZoneName == GRAVE_ZONE_NAME) {
-        finalStr = tr("%1 puts %2%3 into their graveyard.");
-    } else if (targetZoneName == EXILE_ZONE_NAME) {
-        finalStr = tr("%1 exiles %2%3.");
-    } else if (targetZoneName == HAND_ZONE_NAME) {
+    } else if (targetZoneName == ZoneNames::GRAVE) {
+        if (card->getFaceDown()) {
+            finalStr = tr("%1 puts %2%3 into their graveyard face down.");
+        } else {
+            finalStr = tr("%1 puts %2%3 into their graveyard.");
+        }
+    } else if (targetZoneName == ZoneNames::EXILE) {
+        if (card->getFaceDown()) {
+            finalStr = tr("%1 exiles %2%3 face down.");
+        } else {
+            finalStr = tr("%1 exiles %2%3.");
+        }
+    } else if (targetZoneName == ZoneNames::HAND) {
         finalStr = tr("%1 moves %2%3 to their hand.");
-    } else if (targetZoneName == DECK_ZONE_NAME) {
+    } else if (targetZoneName == ZoneNames::DECK) {
         if (newX == -1) {
             finalStr = tr("%1 puts %2%3 into their library.");
         } else if (newX >= targetZone->getCards().size()) {
@@ -331,14 +362,22 @@ void MessageLogWidget::logMoveCard(Player *player,
             fourthArg = QString::number(newX);
             finalStr = tr("%1 puts %2%3 into their library %4 cards from the top.");
         }
-    } else if (targetZoneName == SIDEBOARD_ZONE_NAME) {
+    } else if (targetZoneName == ZoneNames::SIDEBOARD) {
         finalStr = tr("%1 moves %2%3 to sideboard.");
-    } else if (targetZoneName == STACK_ZONE_NAME) {
+    } else if (targetZoneName == ZoneNames::STACK) {
         soundEngine->playSound("play_card");
-        finalStr = tr("%1 plays %2%3.");
+        if (card->getFaceDown()) {
+            finalStr = tr("%1 plays %2%3 face down.");
+        } else {
+            finalStr = tr("%1 plays %2%3.");
+        }
     } else {
         fourthArg = targetZoneName;
-        finalStr = tr("%1 moves %2%3 to custom zone '%4'.");
+        if (card->getFaceDown()) {
+            finalStr = tr("%1 moves %2%3 to custom zone '%4' face down.");
+        } else {
+            finalStr = tr("%1 moves %2%3 to custom zone '%4'.");
+        }
     }
 
     QString message = finalStr.arg(sanitizeHtml(player->getPlayerInfo()->getName()), cardStr, nameFrom.second);
@@ -350,7 +389,7 @@ void MessageLogWidget::logMoveCard(Player *player,
     appendHtmlServerMessage(message);
 }
 
-void MessageLogWidget::logDrawCards(Player *player, int number, bool deckIsEmpty)
+void MessageLogWidget::logDrawCards(PlayerLogic *player, int number, bool deckIsEmpty)
 {
     soundEngine->playSound("draw_card");
     if (currentContext == MessageContext_Mulligan) {
@@ -367,7 +406,7 @@ void MessageLogWidget::logDrawCards(Player *player, int number, bool deckIsEmpty
     }
 }
 
-void MessageLogWidget::logDumpZone(Player *player, CardZoneLogic *zone, int numberCards, bool isReversed)
+void MessageLogWidget::logDumpZone(PlayerLogic *player, CardZoneLogic *zone, int numberCards, bool isReversed)
 {
     if (numberCards == -1) {
         appendHtmlServerMessage(tr("%1 is looking at %2.")
@@ -383,7 +422,7 @@ void MessageLogWidget::logDumpZone(Player *player, CardZoneLogic *zone, int numb
     }
 }
 
-void MessageLogWidget::logFlipCard(Player *player, QString cardName, bool faceDown)
+void MessageLogWidget::logFlipCard(PlayerLogic *player, QString cardName, bool faceDown)
 {
     if (faceDown) {
         appendHtmlServerMessage(
@@ -409,7 +448,7 @@ void MessageLogWidget::logGameFlooded()
     appendMessage(tr("You are flooding the game. Please wait a couple of seconds."));
 }
 
-void MessageLogWidget::logJoin(Player *player)
+void MessageLogWidget::logJoin(PlayerLogic *player)
 {
     soundEngine->playSound("player_join");
     appendHtmlServerMessage(tr("%1 has joined the game.").arg(sanitizeHtml(player->getPlayerInfo()->getName())));
@@ -426,7 +465,7 @@ void MessageLogWidget::logKicked()
     appendHtmlServerMessage(tr("You have been kicked out of the game."), true);
 }
 
-void MessageLogWidget::logLeave(Player *player, QString reason)
+void MessageLogWidget::logLeave(PlayerLogic *player, QString reason)
 {
     soundEngine->playSound("player_leave");
     appendHtmlServerMessage(tr("%1 has left the game (%2).")
@@ -441,13 +480,13 @@ void MessageLogWidget::logLeaveSpectator(QString name, QString reason)
                                 .arg(sanitizeHtml(std::move(name)), sanitizeHtml(std::move(reason))));
 }
 
-void MessageLogWidget::logNotReadyStart(Player *player)
+void MessageLogWidget::logNotReadyStart(PlayerLogic *player)
 {
     appendHtmlServerMessage(
         tr("%1 is not ready to start the game any more.").arg(sanitizeHtml(player->getPlayerInfo()->getName())));
 }
 
-void MessageLogWidget::logMulligan(Player *player, int number)
+void MessageLogWidget::logMulligan(PlayerLogic *player, int number)
 {
     if (!player) {
         return;
@@ -467,16 +506,16 @@ void MessageLogWidget::logReplayStarted(int gameId)
     appendHtmlServerMessage(tr("You are watching a replay of game #%1.").arg(gameId));
 }
 
-void MessageLogWidget::logReadyStart(Player *player)
+void MessageLogWidget::logReadyStart(PlayerLogic *player)
 {
     appendHtmlServerMessage(tr("%1 is ready to start the game.").arg(sanitizeHtml(player->getPlayerInfo()->getName())));
 }
 
-void MessageLogWidget::logRevealCards(Player *player,
+void MessageLogWidget::logRevealCards(PlayerLogic *player,
                                       CardZoneLogic *zone,
                                       int cardId,
                                       QString cardName,
-                                      Player *otherPlayer,
+                                      PlayerLogic *otherPlayer,
                                       bool faceDown,
                                       int amount,
                                       bool isLentToAnotherPlayer)
@@ -559,14 +598,14 @@ void MessageLogWidget::logRevealCards(Player *player,
     }
 }
 
-void MessageLogWidget::logReverseTurn(Player *player, bool reversed)
+void MessageLogWidget::logReverseTurn(PlayerLogic *player, bool reversed)
 {
     appendHtmlServerMessage(tr("%1 reversed turn order, now it's %2.")
                                 .arg(sanitizeHtml(player->getPlayerInfo()->getName()))
                                 .arg(reversed ? tr("reversed") : tr("normal")));
 }
 
-void MessageLogWidget::logRollDie(Player *player, int sides, const QList<uint> &rolls)
+void MessageLogWidget::logRollDie(PlayerLogic *player, int sides, const QList<uint> &rolls)
 {
     if (rolls.length() == 1) {
         const auto roll = rolls.at(0);
@@ -603,7 +642,7 @@ void MessageLogWidget::logRollDie(Player *player, int sides, const QList<uint> &
     soundEngine->playSound("roll_dice");
 }
 
-void MessageLogWidget::logSay(Player *player, QString message)
+void MessageLogWidget::logSay(PlayerLogic *player, QString message)
 {
     appendMessage(std::move(message), {}, *player->getPlayerInfo()->getUserInfo(), true);
 }
@@ -614,17 +653,16 @@ void MessageLogWidget::logSetActivePhase(int phaseNumber)
 
     soundEngine->playSound(phase.soundFileName);
 
-    appendHtml("<font color=\"" + phase.color + "\"><b>" + QDateTime::currentDateTime().toString("[hh:mm:ss] ") +
-               phase.getName() + "</b></font>");
+    appendHtml("<font color=\"" + phase.color + "\"><b>" + getCurrentTime() + phase.getName() + "</b></font>");
 }
 
-void MessageLogWidget::logSetActivePlayer(Player *player)
+void MessageLogWidget::logSetActivePlayer(PlayerLogic *player)
 {
-    appendHtml("<br><font color=\"green\"><b>" + QDateTime::currentDateTime().toString("[hh:mm:ss] ") +
+    appendHtml("<br><font color=\"green\"><b>" + getCurrentTime() +
                QString(tr("%1's turn.")).arg(player->getPlayerInfo()->getName()) + "</b></font><br>");
 }
 
-void MessageLogWidget::logSetAnnotation(Player *player, CardItem *card, QString newAnnotation)
+void MessageLogWidget::logSetAnnotation(PlayerLogic *player, CardItem *card, QString newAnnotation)
 {
     appendHtmlServerMessage(
         QString(tr("%1 sets annotation of %2 to %3."))
@@ -633,25 +671,27 @@ void MessageLogWidget::logSetAnnotation(Player *player, CardItem *card, QString
             .arg(QString("&quot;<font class=\"blue\">%1</font>&quot;").arg(sanitizeHtml(std::move(newAnnotation)))));
 }
 
-void MessageLogWidget::logSetCardCounter(Player *player, QString cardName, int counterId, int value, int oldValue)
+void MessageLogWidget::logSetCardCounter(PlayerLogic *player, QString cardName, int counterId, int value, int oldValue)
 {
     QString finalStr;
     int delta = abs(oldValue - value);
     if (value > oldValue) {
-        finalStr = tr("%1 places %2 \"%3\" counter(s) on %4 (now %5).", "", delta);
+        finalStr = tr("%1 places %2 %3%4 counter(s) on %5 (now %6).", "", delta);
     } else {
-        finalStr = tr("%1 removes %2 \"%3\" counter(s) from %4 (now %5).", "", delta);
+        finalStr = tr("%1 removes %2 %3%4 counter(s) from %5 (now %6).", "", delta);
     }
 
     auto &cardCounterSettings = SettingsCache::instance().cardCounters();
+    QString hex = cardCounterSettings.color(counterId).name();
     appendHtmlServerMessage(finalStr.arg(sanitizeHtml(player->getPlayerInfo()->getName()))
                                 .arg("<font class=\"blue\">" + QString::number(delta) + "</font>")
+                                .arg("<font color=\"" + hex + "\">●</font>")
                                 .arg(cardCounterSettings.displayName(counterId))
                                 .arg(cardLink(std::move(cardName)))
                                 .arg(value));
 }
 
-void MessageLogWidget::logSetCounter(Player *player, QString counterName, int value, int oldValue)
+void MessageLogWidget::logSetCounter(PlayerLogic *player, QString counterName, int value, int oldValue)
 {
     if (counterName == "life") {
         soundEngine->playSound("life_change");
@@ -666,7 +706,7 @@ void MessageLogWidget::logSetCounter(Player *player, QString counterName, int va
                                 .arg(value - oldValue));
 }
 
-void MessageLogWidget::logSetDoesntUntap(Player *player, CardItem *card, bool doesntUntap)
+void MessageLogWidget::logSetDoesntUntap(PlayerLogic *player, CardItem *card, bool doesntUntap)
 {
     QString str;
     if (doesntUntap) {
@@ -677,7 +717,7 @@ void MessageLogWidget::logSetDoesntUntap(Player *player, CardItem *card, bool do
     appendHtmlServerMessage(str.arg(sanitizeHtml(player->getPlayerInfo()->getName())).arg(cardLink(card->getName())));
 }
 
-void MessageLogWidget::logSetPT(Player *player, CardItem *card, QString newPT)
+void MessageLogWidget::logSetPT(PlayerLogic *player, CardItem *card, QString newPT)
 {
     if (currentContext == MessageContext_MoveCard) {
         return;
@@ -704,7 +744,7 @@ void MessageLogWidget::logSetPT(Player *player, CardItem *card, QString newPT)
     }
 }
 
-void MessageLogWidget::logSetSideboardLock(Player *player, bool locked)
+void MessageLogWidget::logSetSideboardLock(PlayerLogic *player, bool locked)
 {
     if (locked) {
         appendHtmlServerMessage(
@@ -715,7 +755,7 @@ void MessageLogWidget::logSetSideboardLock(Player *player, bool locked)
     }
 }
 
-void MessageLogWidget::logSetTapped(Player *player, CardItem *card, bool tapped)
+void MessageLogWidget::logSetTapped(PlayerLogic *player, CardItem *card, bool tapped)
 {
     if (currentContext == MessageContext_MoveCard) {
         return;
@@ -738,7 +778,7 @@ void MessageLogWidget::logSetTapped(Player *player, CardItem *card, bool tapped)
     }
 }
 
-void MessageLogWidget::logShuffle(Player *player, CardZoneLogic *zone, int start, int end)
+void MessageLogWidget::logShuffle(PlayerLogic *player, CardZoneLogic *zone, int start, int end)
 {
     if (currentContext == MessageContext_Mulligan) {
         return;
@@ -775,25 +815,30 @@ void MessageLogWidget::logSpectatorSay(const ServerInfo_User &spectator, QString
     appendMessage(std::move(message), {}, spectator, false);
 }
 
-void MessageLogWidget::logUnattachCard(Player *player, QString cardName)
+void MessageLogWidget::logUnattachCard(PlayerLogic *player, QString cardName)
 {
     appendHtmlServerMessage(tr("%1 unattaches %2.")
                                 .arg(sanitizeHtml(player->getPlayerInfo()->getName()))
                                 .arg(cardLink(std::move(cardName))));
 }
 
-void MessageLogWidget::logUndoDraw(Player *player, QString cardName)
+void MessageLogWidget::logUndoDraw(PlayerLogic *player, QString cardName)
 {
     if (cardName.isEmpty()) {
         appendHtmlServerMessage(tr("%1 undoes their last draw.").arg(sanitizeHtml(player->getPlayerInfo()->getName())));
     } else {
-        appendHtmlServerMessage(
-            tr("%1 undoes their last draw (%2).")
-                .arg(sanitizeHtml(player->getPlayerInfo()->getName()))
-                .arg(QString("<a href=\"card://%1\">%2</a>").arg(sanitizeHtml(cardName)).arg(sanitizeHtml(cardName))));
+        appendHtmlServerMessage(tr("%1 undoes their last draw (%2).")
+                                    .arg(sanitizeHtml(player->getPlayerInfo()->getName()))
+                                    .arg(cardLink(std::move(cardName))));
     }
 }
 
+void MessageLogWidget::logUndoDrawFailed(PlayerLogic *player)
+{
+    appendHtmlServerMessage(
+        tr("%1 failed to undo their last draw.").arg(sanitizeHtml(player->getPlayerInfo()->getName())));
+}
+
 void MessageLogWidget::setContextJudgeName(QString name)
 {
     messagePrefix = QString("<span style=\"color:black\">");
@@ -806,6 +851,14 @@ void MessageLogWidget::appendHtmlServerMessage(const QString &html, bool optiona
     ChatView::appendHtmlServerMessage(messagePrefix + html + messageSuffix, optionalIsBold, optionalFontColor);
 }
 
+QString MessageLogWidget::getCurrentTime() const
+{
+    if (SettingsCache::instance().chat().getUseGameTime()) {
+        return "[" + GameState::formatElapsedTime(game->getGameState()->getSecondsElapsed()) + "] ";
+    }
+    return ChatView::getCurrentTime();
+}
+
 void MessageLogWidget::connectToPlayerEventHandler(PlayerEventHandler *playerEventHandler)
 {
     connect(playerEventHandler, &PlayerEventHandler::logSay, this, &MessageLogWidget::logSay);
@@ -827,6 +880,7 @@ void MessageLogWidget::connectToPlayerEventHandler(PlayerEventHandler *playerEve
     connect(playerEventHandler, &PlayerEventHandler::logDumpZone, this, &MessageLogWidget::logDumpZone);
     connect(playerEventHandler, &PlayerEventHandler::logDrawCards, this, &MessageLogWidget::logDrawCards);
     connect(playerEventHandler, &PlayerEventHandler::logUndoDraw, this, &MessageLogWidget::logUndoDraw);
+    connect(playerEventHandler, &PlayerEventHandler::logUndoDrawFailed, this, &MessageLogWidget::logUndoDrawFailed);
     connect(playerEventHandler, &PlayerEventHandler::logRevealCards, this, &MessageLogWidget::logRevealCards);
     connect(playerEventHandler, &PlayerEventHandler::logAlwaysRevealTopCard, this,
             &MessageLogWidget::logAlwaysRevealTopCard);
diff --git a/cockatrice/src/game_graphics/log/message_log_widget.h b/cockatrice/src/game_graphics/log/message_log_widget.h
new file mode 100644
index 000000000..6800ba8ed
--- /dev/null
+++ b/cockatrice/src/game_graphics/log/message_log_widget.h
@@ -0,0 +1,121 @@
+/**
+ * @file message_log_widget.h
+ * @ingroup GameWidgets
+ */
+//! \todo Document this file.
+
+#ifndef MESSAGELOGWIDGET_H
+#define MESSAGELOGWIDGET_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
+{
+    Q_OBJECT
+private:
+    enum MessageContext
+    {
+        MessageContext_None,
+        MessageContext_MoveCard,
+        MessageContext_Mulligan
+    };
+
+    MessageContext currentContext;
+    QString messagePrefix, messageSuffix;
+
+    static QPair<QString, QString> getFromStr(CardZoneLogic *zone, QString cardName, int position, bool ownerChange);
+
+public:
+    void connectToPlayerEventHandler(PlayerEventHandler *player);
+    MessageLogWidget(TabSupervisor *_tabSupervisor, AbstractGame *_game, QWidget *parent = nullptr);
+
+public slots:
+    void containerProcessingDone();
+    void containerProcessingStarted(const GameEventContext &context);
+    void logAlwaysRevealTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal);
+    void logAlwaysLookAtTopCard(PlayerLogic *player, CardZoneLogic *zone, bool reveal);
+    void logAttachCard(PlayerLogic *player, QString cardName, PlayerLogic *targetPlayer, QString targetCardName);
+    void logConcede(int playerId);
+    void logUnconcede(int playerId);
+    void logConnectionStateChanged(PlayerLogic *player, bool connectionState);
+    void logCreateArrow(PlayerLogic *player,
+                        PlayerLogic *startPlayer,
+                        QString startCard,
+                        PlayerLogic *targetPlayer,
+                        QString targetCard,
+                        bool playerTarget);
+    void logCreateToken(PlayerLogic *player, QString cardName, QString pt, bool faceDown);
+    void logDeckSelect(PlayerLogic *player, QString deckHash, int sideboardSize);
+    void logDestroyCard(PlayerLogic *player, QString cardName);
+    void logDrawCards(PlayerLogic *player, int number, bool deckIsEmpty);
+    void logDumpZone(PlayerLogic *player, CardZoneLogic *zone, int numberCards, bool isReversed = false);
+    void logFlipCard(PlayerLogic *player, QString cardName, bool faceDown);
+    void logGameClosed();
+    void logGameStart();
+    void logGameFlooded();
+    void logJoin(PlayerLogic *player);
+    void logJoinSpectator(QString name);
+    void logKicked();
+    void logLeave(PlayerLogic *player, QString reason);
+    void logLeaveSpectator(QString name, QString reason);
+    void logNotReadyStart(PlayerLogic *player);
+    void logMoveCard(PlayerLogic *player,
+                     CardItem *card,
+                     CardZoneLogic *startZone,
+                     int oldX,
+                     CardZoneLogic *targetZone,
+                     int newX);
+    void logMulligan(PlayerLogic *player, int number);
+    void logReplayStarted(int gameId);
+    void logReadyStart(PlayerLogic *player);
+    void logRevealCards(PlayerLogic *player,
+                        CardZoneLogic *zone,
+                        int cardId,
+                        QString cardName,
+                        PlayerLogic *otherPlayer,
+                        bool faceDown,
+                        int amount,
+                        bool isLentToAnotherPlayer);
+    void logReverseTurn(PlayerLogic *player, bool reversed);
+    void logRollDie(PlayerLogic *player, int sides, const QList<uint> &rolls);
+    void logSay(PlayerLogic *player, QString message);
+    void logSetActivePhase(int phase);
+    void logSetActivePlayer(PlayerLogic *player);
+    void logSetAnnotation(PlayerLogic *player, CardItem *card, QString newAnnotation);
+    void logSetCardCounter(PlayerLogic *player, QString cardName, int counterId, int value, int oldValue);
+    void logSetCounter(PlayerLogic *player, QString counterName, int value, int oldValue);
+    void logSetDoesntUntap(PlayerLogic *player, CardItem *card, bool doesntUntap);
+    void logSetPT(PlayerLogic *player, CardItem *card, QString newPT);
+    void logSetSideboardLock(PlayerLogic *player, bool locked);
+    void logSetTapped(PlayerLogic *player, CardItem *card, bool tapped);
+    void logShuffle(PlayerLogic *player, CardZoneLogic *zone, int start, int end);
+    void logSpectatorSay(const ServerInfo_User &spectator, QString message);
+    void logUnattachCard(PlayerLogic *player, QString cardName);
+    void logUndoDraw(PlayerLogic *player, QString cardName);
+    void logUndoDrawFailed(PlayerLogic *player);
+    void setContextJudgeName(QString player);
+    void appendHtmlServerMessage(const QString &html,
+                                 bool optionalIsBold = false,
+                                 QString optionalFontColor = QString()) override;
+
+private:
+    [[nodiscard]] QString getCurrentTime() const override;
+};
+
+#endif
diff --git a/cockatrice/src/game/phases_toolbar.cpp b/cockatrice/src/game_graphics/phases_toolbar.cpp
similarity index 91%
rename from cockatrice/src/game/phases_toolbar.cpp
rename to cockatrice/src/game_graphics/phases_toolbar.cpp
index 5106e40de..d0a3f74fd 100644
--- a/cockatrice/src/game/phases_toolbar.cpp
+++ b/cockatrice/src/game_graphics/phases_toolbar.cpp
@@ -1,16 +1,26 @@
 #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 <QDebug>
+#include <QColor>
 #include <QPainter>
-#include <QPen>
+#include <QPixmap>
+#include <QRect>
+#include <QRectF>
 #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),
@@ -20,8 +30,9 @@ PhaseButton::PhaseButton(const QString &_name, QGraphicsItem *parent, QAction *_
         activeAnimationTimer = new QTimer(this);
         connect(activeAnimationTimer, &QTimer::timeout, this, &PhaseButton::updateAnimation);
         activeAnimationTimer->setSingleShot(false);
-    } else
+    } else {
         activeAnimationCounter = 9;
+    }
 
     setCacheMode(DeviceCoordinateCache);
 }
@@ -62,8 +73,9 @@ void PhaseButton::setWidth(double _width)
 
 void PhaseButton::setActive(bool _active)
 {
-    if ((active == _active) || !highlightable)
+    if ((active == _active) || !highlightable) {
         return;
+    }
 
     active = _active;
     activeAnimationTimer->start(25);
@@ -71,8 +83,9 @@ void PhaseButton::setActive(bool _active)
 
 void PhaseButton::updateAnimation()
 {
-    if (!highlightable)
+    if (!highlightable) {
         return;
+    }
 
     // the counter ticks up to 10 when active and down to 0 when inactive
     if (active && activeAnimationCounter < 10) {
@@ -98,8 +111,9 @@ void PhaseButton::mouseDoubleClickEvent(QGraphicsSceneMouseEvent * /*event*/)
 
 void PhaseButton::triggerDoubleClickAction()
 {
-    if (doubleClickAction)
+    if (doubleClickAction) {
         doubleClickAction->trigger();
+    }
 }
 
 PhasesToolbar::PhasesToolbar(QGraphicsItem *parent)
@@ -125,8 +139,9 @@ PhasesToolbar::PhasesToolbar(QGraphicsItem *parent)
     buttonList << untapButton << upkeepButton << drawButton << main1Button << combatStartButton << combatAttackersButton
                << combatBlockersButton << combatDamageButton << combatEndButton << main2Button << cleanupButton;
 
-    for (auto &i : buttonList)
+    for (auto &i : buttonList) {
         connect(i, &PhaseButton::clicked, this, &PhasesToolbar::phaseButtonClicked);
+    }
 
     nextTurnButton = new PhaseButton("nextturn", this, nullptr, false);
     connect(nextTurnButton, &PhaseButton::clicked, this, &PhasesToolbar::actNextTurn);
@@ -143,8 +158,9 @@ QRectF PhasesToolbar::boundingRect() const
 
 void PhasesToolbar::retranslateUi()
 {
-    for (int i = 0; i < buttonList.size(); ++i)
+    for (int i = 0; i < buttonList.size(); ++i) {
         buttonList[i]->setToolTip(getLongPhaseName(i));
+    }
 }
 
 QString PhasesToolbar::getLongPhaseName(int phase) const
@@ -186,8 +202,9 @@ const double PhasesToolbar::marginSize = 3;
 
 void PhasesToolbar::rearrangeButtons()
 {
-    for (auto &i : buttonList)
+    for (auto &i : buttonList) {
         i->setWidth(symbolSize);
+    }
     nextTurnButton->setWidth(symbolSize);
 
     double y = marginSize;
@@ -225,11 +242,13 @@ void PhasesToolbar::setHeight(double _height)
 
 void PhasesToolbar::setActivePhase(int phase)
 {
-    if (phase >= buttonList.size())
+    if (phase >= buttonList.size()) {
         return;
+    }
 
-    for (int i = 0; i < buttonList.size(); ++i)
+    for (int i = 0; i < buttonList.size(); ++i) {
         buttonList[i]->setActive(i == phase);
+    }
 }
 
 void PhasesToolbar::triggerPhaseAction(int phase)
@@ -242,8 +261,9 @@ void PhasesToolbar::triggerPhaseAction(int phase)
 void PhasesToolbar::phaseButtonClicked()
 {
     auto *button = qobject_cast<PhaseButton *>(sender());
-    if (button->getActive())
+    if (button->getActive()) {
         button->triggerDoubleClickAction();
+    }
 
     Command_SetActivePhase cmd;
     cmd.set_phase(static_cast<google::protobuf::uint32>(buttonList.indexOf(button)));
@@ -259,7 +279,7 @@ void PhasesToolbar::actNextTurn()
 void PhasesToolbar::actUntapAll()
 {
     Command_SetCardAttr cmd;
-    cmd.set_zone("table");
+    cmd.set_zone(ZoneNames::TABLE);
     cmd.set_attribute(AttrTapped);
     cmd.set_attr_value("0");
 
diff --git a/cockatrice/src/game/phases_toolbar.h b/cockatrice/src/game_graphics/phases_toolbar.h
similarity index 93%
rename from cockatrice/src/game/phases_toolbar.h
rename to cockatrice/src/game_graphics/phases_toolbar.h
index 215a97dd1..376775284 100644
--- a/cockatrice/src/game/phases_toolbar.h
+++ b/cockatrice/src/game_graphics/phases_toolbar.h
@@ -2,17 +2,20 @@
  * @file phases_toolbar.h
  * @ingroup GameGraphics
  * @ingroup GameWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef PHASESTOOLBAR_H
 #define PHASESTOOLBAR_H
 
-#include "../game_graphics/board/abstract_graphics_item.h"
-
-#include <QFrame>
-#include <QGraphicsObject>
+#include <QGraphicsItem>
 #include <QList>
+#include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QAction;
+class QTimer;
 
 namespace google
 {
@@ -21,8 +24,6 @@ namespace protobuf
 class Message;
 }
 } // namespace google
-class Player;
-class GameCommand;
 
 class PhaseButton : public QObject, public QGraphicsItem
 {
diff --git a/cockatrice/src/game/player/card_menu_action_type.h b/cockatrice/src/game_graphics/player/card_menu_action_type.h
similarity index 64%
rename from cockatrice/src/game/player/card_menu_action_type.h
rename to cockatrice/src/game_graphics/player/card_menu_action_type.h
index aec6d6397..4cae22716 100644
--- a/cockatrice/src/game/player/card_menu_action_type.h
+++ b/cockatrice/src/game_graphics/player/card_menu_action_type.h
@@ -1,25 +1,28 @@
 /**
  * @file card_menu_action_type.h
  * @ingroup GameMenusPlayers
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_CARD_MENU_ACTION_TYPE_H
 #define COCKATRICE_CARD_MENU_ACTION_TYPE_H
 
 enum CardMenuActionType
 {
+    // Per-card attribute actions (must be <= cmClone for cardMenuAction() dispatch)
     cmTap,
     cmUntap,
     cmDoesntUntap,
     cmFlip,
     cmPeek,
     cmClone,
+    // Move actions (must be > cmClone for cardMenuAction() dispatch)
     cmMoveToTopLibrary,
     cmMoveToBottomLibrary,
     cmMoveToHand,
     cmMoveToGraveyard,
-    cmMoveToExile
+    cmMoveToExile,
+    cmMoveToTable
 };
 
 #endif // COCKATRICE_CARD_MENU_ACTION_TYPE_H
diff --git a/cockatrice/src/game_graphics/player/menu/abstract_player_component.h b/cockatrice/src/game_graphics/player/menu/abstract_player_component.h
new file mode 100644
index 000000000..ee310c428
--- /dev/null
+++ b/cockatrice/src/game_graphics/player/menu/abstract_player_component.h
@@ -0,0 +1,32 @@
+/**
+ * @file abstract_player_component.h
+ * @ingroup GameMenusPlayers
+ * @brief Polymorphic interface for player-bound UI components managed by PlayerMenu.
+ */
+
+#ifndef COCKATRICE_ABSTRACT_PLAYER_COMPONENT_H
+#define COCKATRICE_ABSTRACT_PLAYER_COMPONENT_H
+
+/**
+ * @brief Interface for player-bound UI components that need shortcut and translation lifecycle management.
+ *
+ * Not a QObject — avoids diamond inheritance with Qt's MOC. Each concrete component
+ * inherits QObject through its Qt base class (QMenu, TearOffMenu, QGraphicsItem, etc.)
+ * and this interface through regular multiple inheritance.
+ */
+class AbstractPlayerComponent
+{
+public:
+    virtual ~AbstractPlayerComponent() = default;
+
+    /** @brief Bind keyboard shortcuts. Called when this player gains focus. */
+    virtual void setShortcutsActive() = 0;
+
+    /** @brief Unbind keyboard shortcuts. Called when this player loses focus. */
+    virtual void setShortcutsInactive() = 0;
+
+    /** @brief Retranslate all user-visible strings. Called on language change. */
+    virtual void retranslateUi() = 0;
+};
+
+#endif // COCKATRICE_ABSTRACT_PLAYER_COMPONENT_H
diff --git a/cockatrice/src/game/player/menu/card_menu.cpp b/cockatrice/src/game_graphics/player/menu/card_menu.cpp
similarity index 61%
rename from cockatrice/src/game/player/menu/card_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/card_menu.cpp
index ddf0a55f3..137ec2ed1 100644
--- a/cockatrice/src/game/player/menu/card_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/card_menu.cpp
@@ -1,88 +1,146 @@
 #include "card_menu.h"
 
+#include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/card_counter_settings.h"
-#include "../../../interface/widgets/tabs/tab_game.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 "../../board/card_item.h"
-#include "../../zones/logic/view_zone_logic.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.h"
-#include "../player_actions.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>
 
-CardMenu::CardMenu(Player *_player, const CardItem *_card, bool _shortcutsActive)
+/**
+ * @brief Creates a circular icon filled with the specified color.
+ */
+static QIcon createCircleIcon(const QColor &color)
+{
+    QPixmap pixmap(32, 32);
+    pixmap.fill(Qt::transparent);
+    QPainter painter(&pixmap);
+    painter.setRenderHint(QPainter::Antialiasing);
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(color);
+    painter.drawEllipse(pixmap.rect());
+
+    return QIcon(pixmap);
+}
+
+template <typename Slot>
+static QAction *makeAction(QObject *parent, Slot &&slot, bool checkable = false, bool checked = false)
+{
+    auto *a = new QAction(parent);
+    a->setCheckable(checkable);
+    if (checkable) {
+        a->setChecked(checked);
+    }
+    QObject::connect(a, &QAction::triggered, parent, std::forward<Slot>(slot));
+    return a;
+}
+
+CardMenu::CardMenu(PlayerGraphicsItem *_player, const CardItem *_card, bool _shortcutsActive)
     : player(_player), card(_card), shortcutsActive(_shortcutsActive)
 {
-    auto playerActions = player->getPlayerActions();
-
-    const QList<Player *> &players = player->getGame()->getPlayerManager()->getPlayers().values();
+    const QList<PlayerLogic *> &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
 
     for (auto playerToAdd : players) {
-        if (playerToAdd == player) {
+        if (playerToAdd == player->getLogic()) {
             continue;
         }
         playersInfo.append(qMakePair(playerToAdd->getPlayerInfo()->getName(), playerToAdd->getPlayerInfo()->getId()));
     }
 
-    connect(player->getGame()->getPlayerManager(), &PlayerManager::playerRemoved, this, &CardMenu::removePlayer);
+    connect(player->getLogic()->getGame()->getPlayerManager(), &PlayerManager::playerRemoved, this,
+            &CardMenu::removePlayer);
 
-    aTap = new QAction(this);
-    aTap->setData(cmTap);
-    connect(aTap, &QAction::triggered, playerActions, &PlayerActions::cardMenuAction);
-    aDoesntUntap = new QAction(this);
-    aDoesntUntap->setData(cmDoesntUntap);
-    connect(aDoesntUntap, &QAction::triggered, playerActions, &PlayerActions::cardMenuAction);
+    auto *actions = player->getLogic()->getPlayerActions();
+    auto *gameScene = player->getGameScene();
+
+    // Single selection resolver used by all lambdas — called at trigger time
+    auto sel = [gameScene]() { return gameScene->selectedCards(); };
+
+    // Unified dispatcher for card menu actions
+    auto invoke = [actions, sel](CardMenuActionType type) {
+        return [actions, sel, type]() { actions->cardMenuAction(sel(), type); };
+    };
+
+    // Actions using invoke (type dispatch, need selection)
+    aTap = makeAction(this, invoke(cmTap));
+    aDoesntUntap = makeAction(this, invoke(cmDoesntUntap), /*checkable=*/true, card && card->getDoesntUntap());
+    aFlip = makeAction(this, invoke(cmFlip));
+    aPeek = makeAction(this, invoke(cmPeek));
+    aClone = makeAction(this, invoke(cmClone));
+
+    // Actions using selection directly
+    aUnattach = makeAction(this, [actions, sel]() { actions->actUnattach(sel()); });
+    aSetAnnotation = makeAction(this, [actions, sel]() { actions->actRequestSetAnnotationDialog(sel()); });
+    aPlay = makeAction(this, [actions, sel]() { actions->actPlay(sel()); });
+    aPlayFacedown = makeAction(this, [actions, sel]() { actions->actPlayFacedown(sel()); });
+    aHide = makeAction(this, [actions, sel]() { actions->actHide(sel()); });
+    aReduceLifeByPower = makeAction(this, [actions, sel]() { actions->actReduceLifeByPower(sel()); });
+
+    // Actions that use activeCard, not selection — direct connection
     aAttach = new QAction(this);
-    connect(aAttach, &QAction::triggered, playerActions, &PlayerActions::actAttach);
-    aUnattach = new QAction(this);
-    connect(aUnattach, &QAction::triggered, playerActions, &PlayerActions::actUnattach);
     aDrawArrow = new QAction(this);
-    connect(aDrawArrow, &QAction::triggered, playerActions, &PlayerActions::actDrawArrow);
-    aSetAnnotation = new QAction(this);
-    connect(aSetAnnotation, &QAction::triggered, playerActions, &PlayerActions::actSetAnnotation);
-    aFlip = new QAction(this);
-    aFlip->setData(cmFlip);
-    connect(aFlip, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction);
-    aPeek = new QAction(this);
-    aPeek->setData(cmPeek);
-    connect(aPeek, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction);
-    aClone = new QAction(this);
-    aClone->setData(cmClone);
-    connect(aClone, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction);
     aSelectAll = new QAction(this);
-    connect(aSelectAll, &QAction::triggered, playerActions, &PlayerActions::actSelectAll);
     aSelectRow = new QAction(this);
-    connect(aSelectRow, &QAction::triggered, playerActions, &PlayerActions::actSelectRow);
     aSelectColumn = new QAction(this);
-    connect(aSelectColumn, &QAction::triggered, playerActions, &PlayerActions::actSelectColumn);
 
-    aPlay = new QAction(this);
-    connect(aPlay, &QAction::triggered, playerActions, &PlayerActions::actPlay);
-    aHide = new QAction(this);
-    connect(aHide, &QAction::triggered, playerActions, &PlayerActions::actHide);
-    aPlayFacedown = new QAction(this);
-    connect(aPlayFacedown, &QAction::triggered, playerActions, &PlayerActions::actPlayFacedown);
+    connect(aAttach, &QAction::triggered, actions, &PlayerActions::actAttach);
+    connect(aDrawArrow, &QAction::triggered, actions, &PlayerActions::actDrawArrow);
+    connect(aSelectAll, &QAction::triggered, actions, &PlayerActions::actSelectAll);
+    connect(aSelectRow, &QAction::triggered, actions, &PlayerActions::actSelectRow);
+    connect(aSelectColumn, &QAction::triggered, actions, &PlayerActions::actSelectColumn);
 
     aRevealToAll = new QAction(this);
 
     mCardCounters = new QMenu;
 
+    // Card counters
     for (int i = 0; i < 6; ++i) {
-        auto *tempAddCounter = new QAction(this);
-        tempAddCounter->setData(9 + i * 1000);
-        auto *tempRemoveCounter = new QAction(this);
-        tempRemoveCounter->setData(10 + i * 1000);
-        auto *tempSetCounter = new QAction(this);
-        tempSetCounter->setData(11 + i * 1000);
-        aAddCounter.append(tempAddCounter);
-        aRemoveCounter.append(tempRemoveCounter);
-        aSetCounter.append(tempSetCounter);
-        connect(tempAddCounter, &QAction::triggered, playerActions, &PlayerActions::actCardCounterTrigger);
-        connect(tempRemoveCounter, &QAction::triggered, playerActions, &PlayerActions::actCardCounterTrigger);
-        connect(tempSetCounter, &QAction::triggered, playerActions, &PlayerActions::actCardCounterTrigger);
+        QColor color = SettingsCache::instance().cardCounters().color(i);
+        QIcon circleIcon = createCircleIcon(color);
+
+        auto *addAction = makeAction(this, [actions, sel, i]() { actions->actAddCardCounter(sel(), i); });
+        addAction->setIcon(circleIcon);
+        aAddCounter.append(addAction);
+
+        auto *removeAction = makeAction(this, [actions, sel, i]() { actions->actRemoveCardCounter(sel(), i); });
+        removeAction->setIcon(circleIcon);
+        aRemoveCounter.append(removeAction);
+
+        auto *setAction = makeAction(this, [actions, sel, i]() { actions->actRequestSetCardCounterDialog(sel(), i); });
+        setAction->setIcon(circleIcon);
+        aSetCounter.append(setAction);
     }
 
     setShortcutsActive();
@@ -94,7 +152,7 @@ CardMenu::CardMenu(Player *_player, const CardItem *_card, bool _shortcutsActive
     }
 
     bool revealedCard = false;
-    bool writeableCard = player->getPlayerInfo()->getLocalOrJudge();
+    bool writeableCard = player->getLogic()->getPlayerInfo()->getLocalOrJudge();
     if (auto *view = qobject_cast<ZoneViewZoneLogic *>(card->getZone())) {
         if (view->getRevealZone()) {
             if (view->getWriteableRevealZone()) {
@@ -107,41 +165,31 @@ CardMenu::CardMenu(Player *_player, const CardItem *_card, bool _shortcutsActive
 
     if (revealedCard) {
         addAction(aHide);
+        addSeparator();
         addAction(aClone);
         addSeparator();
         addAction(aSelectAll);
         addAction(aSelectColumn);
         addRelatedCardView();
-    } else if (writeableCard) {
-
+    } else {
         if (card->getZone()) {
-            if (card->getZone()->getName() == "table") {
-                createTableMenu();
-            } else if (card->getZone()->getName() == "stack") {
-                createStackMenu();
-            } else if (card->getZone()->getName() == "rfg" || card->getZone()->getName() == "grave") {
-                createGraveyardOrExileMenu();
+            if (card->getZone()->getName() == ZoneNames::TABLE) {
+                createTableMenu(writeableCard);
+            } else if (card->getZone()->getName() == ZoneNames::STACK) {
+                createStackMenu(writeableCard);
+            } else if (card->getZone()->getName() == ZoneNames::EXILE ||
+                       card->getZone()->getName() == ZoneNames::GRAVE) {
+                createGraveyardOrExileMenu(writeableCard);
             } else {
-                createHandOrCustomZoneMenu();
+                createHandOrCustomZoneMenu(writeableCard);
             }
         } else {
-            addMenu(new MoveMenu(player));
-        }
-    } else {
-        if (card->getZone() && card->getZone()->getName() != "hand") {
-            addAction(aDrawArrow);
-            addSeparator();
-            addRelatedCardView();
-            addRelatedCardActions();
-            addSeparator();
-            addAction(aClone);
-            addSeparator();
-            addAction(aSelectAll);
+            createZonelessMenu(writeableCard);
         }
     }
 }
 
-void CardMenu::removePlayer(Player *playerToRemove)
+void CardMenu::removePlayer(PlayerLogic *playerToRemove)
 {
     for (auto it = playersInfo.begin(); it != playersInfo.end();) {
         if (it->second == playerToRemove->getPlayerInfo()->getId()) {
@@ -152,22 +200,20 @@ void CardMenu::removePlayer(Player *playerToRemove)
     }
 }
 
-void CardMenu::createTableMenu()
+void CardMenu::createTableMenu(bool canModifyCard)
 {
     // Card is on the battlefield
-    bool canModifyCard = player->getPlayerInfo()->judge || card->getOwner() == player;
-
     if (!canModifyCard) {
-        addRelatedCardView();
-        addRelatedCardActions();
-
-        addSeparator();
         addAction(aDrawArrow);
         addSeparator();
         addAction(aClone);
         addSeparator();
+        addAction(aReduceLifeByPower);
+        addSeparator();
         addAction(aSelectAll);
         addAction(aSelectRow);
+        addRelatedCardView();
+        addRelatedCardActions();
         return;
     }
 
@@ -177,10 +223,9 @@ void CardMenu::createTableMenu()
     if (card->getFaceDown()) {
         addAction(aPeek);
     }
-
-    addRelatedCardView();
-    addRelatedCardActions();
-
+    addSeparator();
+    addAction(aClone);
+    addMenu(new MoveMenu(player));
     addSeparator();
     addAction(aAttach);
     if (card->getAttachedTo()) {
@@ -191,8 +236,7 @@ void CardMenu::createTableMenu()
     addMenu(new PtMenu(player));
     addAction(aSetAnnotation);
     addSeparator();
-    addAction(aClone);
-    addMenu(new MoveMenu(player));
+    addAction(aReduceLifeByPower);
     addSeparator();
     addAction(aSelectAll);
     addAction(aSelectRow);
@@ -209,67 +253,81 @@ void CardMenu::createTableMenu()
     }
     addSeparator();
     addMenu(mCardCounters);
+    addRelatedCardView();
+    addRelatedCardActions();
 }
 
-void CardMenu::createStackMenu()
+void CardMenu::createStackMenu(bool canModifyCard)
 {
-    bool canModifyCard = player->getPlayerInfo()->judge || card->getOwner() == player;
-
     // Card is on the stack
-    if (canModifyCard) {
-        addAction(aAttach);
-        addAction(aDrawArrow);
-        addSeparator();
-        addAction(aClone);
-        addMenu(new MoveMenu(player));
-        addSeparator();
-        addAction(aSelectAll);
-    } else {
+    if (!canModifyCard) {
         addAction(aDrawArrow);
         addSeparator();
         addAction(aClone);
         addSeparator();
         addAction(aSelectAll);
+        addRelatedCardView();
+        addRelatedCardActions();
+        return;
     }
 
+    addAction(aPlay);
+    addAction(aPlayFacedown);
+    addSeparator();
+    addAction(aClone);
+    addMenu(new MoveMenu(player));
+    addSeparator();
+    addAction(aAttach);
+    addAction(aDrawArrow);
+    addSeparator();
+    addAction(aSelectAll);
     addRelatedCardView();
     addRelatedCardActions();
 }
 
-void CardMenu::createGraveyardOrExileMenu()
+void CardMenu::createGraveyardOrExileMenu(bool canModifyCard)
 {
-    bool canModifyCard = player->getPlayerInfo()->judge || card->getOwner() == player;
-
     // Card is in the graveyard or exile
-    if (canModifyCard) {
-        addAction(aPlay);
-        addAction(aPlayFacedown);
-
-        addSeparator();
-        addAction(aClone);
-        addMenu(new MoveMenu(player));
-        addSeparator();
-        addAction(aSelectAll);
-        addAction(aSelectColumn);
-
-        addSeparator();
-        addAction(aAttach);
+    if (!canModifyCard) {
         addAction(aDrawArrow);
-    } else {
+        addSeparator();
         addAction(aClone);
         addSeparator();
         addAction(aSelectAll);
         addAction(aSelectColumn);
-        addSeparator();
-        addAction(aDrawArrow);
+        addRelatedCardView();
+        addRelatedCardActions();
+        return;
     }
 
+    addAction(aPlay);
+    addAction(aPlayFacedown);
+    addSeparator();
+    addAction(aClone);
+    addMenu(new MoveMenu(player));
+    addSeparator();
+    addAction(aAttach);
+    addAction(aDrawArrow);
+    addSeparator();
+    addAction(aSelectAll);
+    addAction(aSelectColumn);
     addRelatedCardView();
     addRelatedCardActions();
 }
 
-void CardMenu::createHandOrCustomZoneMenu()
+void CardMenu::createHandOrCustomZoneMenu(bool canModifyCard)
 {
+    if (!canModifyCard) {
+        addAction(aDrawArrow);
+        addSeparator();
+        addAction(aClone);
+        addSeparator();
+        addAction(aSelectAll);
+        addRelatedCardView();
+        addRelatedCardActions();
+        return;
+    }
+
     // Card is in hand or a custom zone specified by server
     addAction(aPlay);
     addAction(aPlayFacedown);
@@ -278,14 +336,16 @@ void CardMenu::createHandOrCustomZoneMenu()
 
     initContextualPlayersMenu(revealMenu, aRevealToAll);
 
-    connect(revealMenu, &QMenu::triggered, player->getPlayerActions(), &PlayerActions::actReveal);
+    connect(revealMenu, &QMenu::triggered, this, [this](QAction *action) {
+        player->getLogic()->getPlayerActions()->actReveal(player->getGameScene()->selectedCards(), action);
+    });
 
     addSeparator();
     addAction(aClone);
     addMenu(new MoveMenu(player));
 
     // actions that are really wonky when done from deck or sideboard
-    if (card->getZone()->getName() == "hand") {
+    if (card->getZone()->getName() == ZoneNames::HAND) {
         addSeparator();
         addAction(aAttach);
         addAction(aDrawArrow);
@@ -298,11 +358,18 @@ void CardMenu::createHandOrCustomZoneMenu()
     }
 
     addRelatedCardView();
-    if (card->getZone()->getName() == "hand") {
+    if (card->getZone()->getName() == ZoneNames::HAND) {
         addRelatedCardActions();
     }
 }
 
+void CardMenu::createZonelessMenu(bool canModifyCard)
+{
+    if (canModifyCard) {
+        addMenu(new MoveMenu(player));
+    }
+}
+
 /**
  * @brief Populates the menu with an action for each active player.
  *
@@ -356,8 +423,7 @@ void CardMenu::addRelatedCardView()
         QAction *viewCard = viewRelatedCards->addAction(relatedCardName);
         Q_UNUSED(viewCard);
 
-        connect(viewCard, &QAction::triggered, player->getGame(),
-                [this, cardRef] { player->getGame()->getTab()->viewCardInfo(cardRef); });
+        connect(viewCard, &QAction::triggered, this, [this, cardRef] { emit cardInfoRequested(cardRef); });
     }
 }
 
@@ -419,7 +485,8 @@ void CardMenu::addRelatedCardActions()
 
         auto *createRelated = new QAction(text, this);
         createRelated->setData(QVariant(index++));
-        connect(createRelated, &QAction::triggered, player->getPlayerActions(), &PlayerActions::actCreateRelatedCard);
+        connect(createRelated, &QAction::triggered, player->getLogic()->getPlayerActions(),
+                &PlayerActions::actCreateRelatedCard);
         addAction(createRelated);
     }
 
@@ -428,7 +495,7 @@ void CardMenu::addRelatedCardActions()
             createRelatedCards->setShortcuts(
                 SettingsCache::instance().shortcuts().getShortcut("Player/aCreateRelatedTokens"));
         }
-        connect(createRelatedCards, &QAction::triggered, player->getPlayerActions(),
+        connect(createRelatedCards, &QAction::triggered, player->getLogic()->getPlayerActions(),
                 &PlayerActions::actCreateAllRelatedCards);
         addAction(createRelatedCards);
     }
@@ -446,7 +513,7 @@ void CardMenu::retranslateUi()
     aRevealToAll->setText(tr("&All players"));
     //: Turn sideways or back again
     aTap->setText(tr("&Tap / Untap"));
-    aDoesntUntap->setText(tr("Toggle &normal untapping"));
+    aDoesntUntap->setText(tr("Skip &untapping"));
     //: Turn face up/face down
     aFlip->setText(tr("T&urn Over")); // Only the user facing names in client got renamed to "turn over"
     // All code and proto bits are still unchanged (flip) for compatibility reasons
@@ -457,6 +524,7 @@ void CardMenu::retranslateUi()
     aUnattach->setText(tr("Unattac&h"));
     aDrawArrow->setText(tr("&Draw arrow..."));
     aSetAnnotation->setText(tr("&Set annotation..."));
+    aReduceLifeByPower->setText(tr("Reduce life by power"));
 
     mCardCounters->setTitle(tr("Ca&rd counters"));
 
@@ -491,6 +559,7 @@ void CardMenu::setShortcutsActive()
     aUnattach->setShortcuts(shortcuts.getShortcut("Player/aUnattach"));
     aDrawArrow->setShortcuts(shortcuts.getShortcut("Player/aDrawArrow"));
     aSetAnnotation->setShortcuts(shortcuts.getShortcut("Player/aSetAnnotation"));
+    aReduceLifeByPower->setShortcuts(shortcuts.getShortcut("Player/aReduceLifeByPower"));
 
     aSelectAll->setShortcuts(shortcuts.getShortcut("Player/aSelectAll"));
     aSelectRow->setShortcuts(shortcuts.getShortcut("Player/aSelectRow"));
diff --git a/cockatrice/src/game/player/menu/card_menu.h b/cockatrice/src/game_graphics/player/menu/card_menu.h
similarity index 57%
rename from cockatrice/src/game/player/menu/card_menu.h
rename to cockatrice/src/game_graphics/player/menu/card_menu.h
index afe24da62..337d77b3e 100644
--- a/cockatrice/src/game/player/menu/card_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/card_menu.h
@@ -1,27 +1,39 @@
 /**
  * @file card_menu.h
  * @ingroup GameMenusCards
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_CARD_MENU_H
 #define COCKATRICE_CARD_MENU_H
 
+#include <QList>
 #include <QMenu>
+#include <QPair>
+#include <QString>
+#include <qtmetamacros.h>
 
 class CardItem;
-class Player;
+class PlayerGraphicsItem;
+class PlayerLogic;
+class QAction;
+struct CardRef;
+
 class CardMenu : public QMenu
 {
     Q_OBJECT
 
+signals:
+    void cardInfoRequested(const CardRef &cardRef);
+
 public:
-    explicit CardMenu(Player *player, const CardItem *card, bool shortcutsActive);
-    void removePlayer(Player *playerToRemove);
-    void createTableMenu();
-    void createStackMenu();
-    void createGraveyardOrExileMenu();
-    void createHandOrCustomZoneMenu();
+    explicit CardMenu(PlayerGraphicsItem *player, const CardItem *card, bool shortcutsActive);
+    void removePlayer(PlayerLogic *playerToRemove);
+    void createTableMenu(bool canModifyCard);
+    void createStackMenu(bool canModifyCard);
+    void createGraveyardOrExileMenu(bool canModifyCard);
+    void createHandOrCustomZoneMenu(bool canModifyCard);
+    void createZonelessMenu(bool canModifyCard);
 
     QMenu *mCardCounters;
 
@@ -35,11 +47,12 @@ public:
     QAction *aFlip, *aPeek;
     QAction *aAttach, *aUnattach;
     QAction *aSetAnnotation;
+    QAction *aReduceLifeByPower;
 
     QList<QAction *> aAddCounter, aSetCounter, aRemoveCounter;
 
 private:
-    Player *player;
+    PlayerGraphicsItem *player;
     const CardItem *card;
     QList<QPair<QString, int>> playersInfo;
     bool shortcutsActive;
diff --git a/cockatrice/src/game/player/menu/custom_zone_menu.cpp b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
similarity index 57%
rename from cockatrice/src/game/player/menu/custom_zone_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
index b0f3284c9..e16ebc112 100644
--- a/cockatrice/src/game/player/menu/custom_zone_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.cpp
@@ -1,13 +1,20 @@
 #include "custom_zone_menu.h"
 
-#include "../player.h"
+#include "../../../game/player/player_info.h"
+#include "../../game/player/player_logic.h"
+#include "../../game_scene.h"
+#include "../player_graphics_item.h"
 
-CustomZoneMenu::CustomZoneMenu(Player *_player) : player(_player)
+#include <QAction>
+#include <QList>
+#include <QVariant>
+
+CustomZoneMenu::CustomZoneMenu(PlayerGraphicsItem *_player) : player(_player)
 {
     menuAction()->setVisible(false);
 
-    connect(player, &Player::clearCustomZonesMenu, this, &CustomZoneMenu::clearCustomZonesMenu);
-    connect(player, &Player::addViewCustomZoneActionToCustomZoneMenu, this,
+    connect(player->getLogic(), &PlayerLogic::clearCustomZonesMenu, this, &CustomZoneMenu::clearCustomZonesMenu);
+    connect(player->getLogic(), &PlayerLogic::addViewCustomZoneActionToCustomZoneMenu, this,
             &CustomZoneMenu::addViewCustomZoneActionToCustomZoneMenu);
 
     retranslateUi();
@@ -17,7 +24,7 @@ void CustomZoneMenu::retranslateUi()
 {
     setTitle(tr("C&ustom Zones"));
 
-    if (player->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
 
         for (auto aViewZone : actions()) {
             aViewZone->setText(tr("View custom zone '%1'").arg(aViewZone->data().toString()));
@@ -37,5 +44,5 @@ void CustomZoneMenu::addViewCustomZoneActionToCustomZoneMenu(QString zoneName)
     QAction *aViewZone = addAction(tr("View custom zone '%1'").arg(zoneName));
     aViewZone->setData(zoneName);
     connect(aViewZone, &QAction::triggered, this,
-            [zoneName, this]() { player->getGameScene()->toggleZoneView(player, zoneName, -1); });
+            [zoneName, this]() { player->getGameScene()->toggleZoneView(player->getLogic(), zoneName, -1); });
 }
\ No newline at end of file
diff --git a/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h
new file mode 100644
index 000000000..07f5510ca
--- /dev/null
+++ b/cockatrice/src/game_graphics/player/menu/custom_zone_menu.h
@@ -0,0 +1,38 @@
+/**
+ * @file custom_zone_menu.h
+ * @ingroup GameMenusZones
+ */
+//! \todo Document this file.
+
+#ifndef COCKATRICE_CUSTOM_ZONE_MENU_H
+#define COCKATRICE_CUSTOM_ZONE_MENU_H
+
+#include "abstract_player_component.h"
+
+#include <QMenu>
+#include <QString>
+#include <qtmetamacros.h>
+
+class PlayerGraphicsItem;
+
+class CustomZoneMenu : public QMenu, public AbstractPlayerComponent
+{
+    Q_OBJECT
+public:
+    explicit CustomZoneMenu(PlayerGraphicsItem *player);
+    void retranslateUi() override;
+    void setShortcutsActive() override
+    {
+    }
+    void setShortcutsInactive() override
+    {
+    }
+
+private:
+    PlayerGraphicsItem *player;
+private slots:
+    void clearCustomZonesMenu();
+    void addViewCustomZoneActionToCustomZoneMenu(QString zoneName);
+};
+
+#endif // COCKATRICE_CUSTOM_ZONE_MENU_H
diff --git a/cockatrice/src/game/player/menu/grave_menu.cpp b/cockatrice/src/game_graphics/player/menu/grave_menu.cpp
similarity index 65%
rename from cockatrice/src/game/player/menu/grave_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/grave_menu.cpp
index d4faca42b..580d2642e 100644
--- a/cockatrice/src/game/player/menu/grave_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/grave_menu.cpp
@@ -1,20 +1,36 @@
 #include "grave_menu.h"
 
-#include "../../abstract_game.h"
-#include "../player.h"
-#include "../player_actions.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>
 
-GraveyardMenu::GraveyardMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
+class QWidget;
+
+GraveyardMenu::GraveyardMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
     createMoveActions();
     createViewActions();
 
     addAction(aViewGraveyard);
 
-    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
+    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
         mRevealRandomGraveyardCard = addMenu(QString());
         connect(mRevealRandomGraveyardCard, &QMenu::aboutToShow, this,
                 &GraveyardMenu::populateRevealRandomMenuWithActivePlayers);
@@ -35,20 +51,20 @@ GraveyardMenu::GraveyardMenu(Player *_player, QWidget *parent) : TearOffMenu(par
 
 void GraveyardMenu::createMoveActions()
 {
-    auto grave = player->getGraveZone();
+    auto grave = player->getLogic()->getGraveZone();
 
-    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
+    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
         aMoveGraveToTopLibrary = new QAction(this);
-        aMoveGraveToTopLibrary->setData(QList<QVariant>() << "deck" << 0);
+        aMoveGraveToTopLibrary->setData(QList<QVariant>() << ZoneNames::DECK << 0);
 
         aMoveGraveToBottomLibrary = new QAction(this);
-        aMoveGraveToBottomLibrary->setData(QList<QVariant>() << "deck" << -1);
+        aMoveGraveToBottomLibrary->setData(QList<QVariant>() << ZoneNames::DECK << -1);
 
         aMoveGraveToHand = new QAction(this);
-        aMoveGraveToHand->setData(QList<QVariant>() << "hand" << 0);
+        aMoveGraveToHand->setData(QList<QVariant>() << ZoneNames::HAND << 0);
 
         aMoveGraveToRfg = new QAction(this);
-        aMoveGraveToRfg->setData(QList<QVariant>() << "rfg" << 0);
+        aMoveGraveToRfg->setData(QList<QVariant>() << ZoneNames::EXILE << 0);
 
         connect(aMoveGraveToTopLibrary, &QAction::triggered, grave, &PileZoneLogic::moveAllToZone);
         connect(aMoveGraveToBottomLibrary, &QAction::triggered, grave, &PileZoneLogic::moveAllToZone);
@@ -59,7 +75,7 @@ void GraveyardMenu::createMoveActions()
 
 void GraveyardMenu::createViewActions()
 {
-    PlayerActions *playerActions = player->getPlayerActions();
+    PlayerActions *playerActions = player->getLogic()->getPlayerActions();
 
     aViewGraveyard = new QAction(this);
     connect(aViewGraveyard, &QAction::triggered, playerActions, &PlayerActions::actViewGraveyard);
@@ -75,10 +91,11 @@ void GraveyardMenu::populateRevealRandomMenuWithActivePlayers()
 
     mRevealRandomGraveyardCard->addSeparator();
 
-    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
+    const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
     for (auto *other : players) {
-        if (other == player)
+        if (other == player->getLogic()) {
             continue;
+        }
         QAction *a = mRevealRandomGraveyardCard->addAction(other->getPlayerInfo()->getName());
         a->setData(other->getPlayerInfo()->getId());
         connect(a, &QAction::triggered, this, &GraveyardMenu::onRevealRandomTriggered);
@@ -88,7 +105,7 @@ void GraveyardMenu::populateRevealRandomMenuWithActivePlayers()
 void GraveyardMenu::onRevealRandomTriggered()
 {
     if (auto *a = qobject_cast<QAction *>(sender())) {
-        player->getPlayerActions()->actRevealRandomGraveyardCard(a->data().toInt());
+        player->getLogic()->getPlayerActions()->actRevealRandomGraveyardCard(a->data().toInt());
     }
 }
 
@@ -98,7 +115,7 @@ void GraveyardMenu::retranslateUi()
 
     aViewGraveyard->setText(tr("&View graveyard"));
 
-    if (player->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
         moveGraveMenu->setTitle(tr("&Move graveyard to..."));
         aMoveGraveToTopLibrary->setText(tr("&Top of library"));
         aMoveGraveToBottomLibrary->setText(tr("&Bottom of library"));
diff --git a/cockatrice/src/game/player/menu/grave_menu.h b/cockatrice/src/game_graphics/player/menu/grave_menu.h
similarity index 62%
rename from cockatrice/src/game/player/menu/grave_menu.h
rename to cockatrice/src/game_graphics/player/menu/grave_menu.h
index faaf497b6..fa285409f 100644
--- a/cockatrice/src/game/player/menu/grave_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/grave_menu.h
@@ -1,33 +1,37 @@
 /**
  * @file grave_menu.h
  * @ingroup GameMenusZones
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_GRAVE_MENU_H
 #define COCKATRICE_GRAVE_MENU_H
 
 #include "../../../interface/widgets/menus/tearoff_menu.h"
+#include "abstract_player_component.h"
 
-#include <QAction>
-#include <QMenu>
+#include <qtmetamacros.h>
 
-class Player;
-class GraveyardMenu : public TearOffMenu
+class PlayerGraphicsItem;
+class QAction;
+class QMenu;
+class QWidget;
+
+class GraveyardMenu : public TearOffMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
 signals:
     void newPlayerActionCreated(QAction *action);
 
 public:
-    explicit GraveyardMenu(Player *player, QWidget *parent = nullptr);
+    explicit GraveyardMenu(PlayerGraphicsItem *player, QWidget *parent = nullptr);
     void createMoveActions();
     void createViewActions();
     void populateRevealRandomMenuWithActivePlayers();
     void onRevealRandomTriggered();
-    void retranslateUi();
-    void setShortcutsActive();
-    void setShortcutsInactive();
+    void retranslateUi() override;
+    void setShortcutsActive() override;
+    void setShortcutsInactive() override;
 
     QMenu *mRevealRandomGraveyardCard = nullptr;
     QMenu *moveGraveMenu = nullptr;
@@ -39,7 +43,7 @@ public:
     QAction *aMoveGraveToRfg = nullptr;
 
 private:
-    Player *player;
+    PlayerGraphicsItem *player;
 };
 
 #endif // COCKATRICE_GRAVE_MENU_H
diff --git a/cockatrice/src/game/player/menu/hand_menu.cpp b/cockatrice/src/game_graphics/player/menu/hand_menu.cpp
similarity index 70%
rename from cockatrice/src/game/player/menu/hand_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/hand_menu.cpp
index e193d2e4a..141542cb4 100644
--- a/cockatrice/src/game/player/menu/hand_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/hand_menu.cpp
@@ -2,18 +2,35 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../abstract_game.h"
-#include "../../zones/hand_zone.h"
-#include "../player.h"
-#include "../player_actions.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/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>
 
-HandMenu::HandMenu(Player *_player, PlayerActions *actions, QWidget *parent) : TearOffMenu(parent), player(_player)
+class QWidget;
+
+HandMenu::HandMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
-    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
+    auto *actions = player->getLogic()->getPlayerActions();
+
+    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
         aViewHand = new QAction(this);
+
         connect(aViewHand, &QAction::triggered, actions, &PlayerActions::actViewHand);
         addAction(aViewHand);
 
@@ -57,24 +74,34 @@ HandMenu::HandMenu(Player *_player, PlayerActions *actions, QWidget *parent) : T
     addSeparator();
 
     aMulligan = new QAction(this);
-    connect(aMulligan, &QAction::triggered, actions, &PlayerActions::actMulligan);
+    connect(aMulligan, &QAction::triggered, actions, &PlayerActions::actRequestMulliganDialog);
     addAction(aMulligan);
 
+    // Mulligan same size
+    aMulliganSame = new QAction(this);
+    connect(aMulliganSame, &QAction::triggered, actions, &PlayerActions::actMulliganSameSize);
+    addAction(aMulliganSame);
+
+    // Mulligan -1
+    aMulliganMinusOne = new QAction(this);
+    connect(aMulliganMinusOne, &QAction::triggered, actions, &PlayerActions::actMulliganMinusOne);
+    addAction(aMulliganMinusOne);
+
     addSeparator();
 
     mMoveHandMenu = addTearOffMenu(QString());
 
-    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
+    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
         aMoveHandToTopLibrary = new QAction(this);
-        aMoveHandToTopLibrary->setData(QList<QVariant>() << "deck" << 0);
+        aMoveHandToTopLibrary->setData(QList<QVariant>() << ZoneNames::DECK << 0);
         aMoveHandToBottomLibrary = new QAction(this);
-        aMoveHandToBottomLibrary->setData(QList<QVariant>() << "deck" << -1);
+        aMoveHandToBottomLibrary->setData(QList<QVariant>() << ZoneNames::DECK << -1);
         aMoveHandToGrave = new QAction(this);
-        aMoveHandToGrave->setData(QList<QVariant>() << "grave" << 0);
+        aMoveHandToGrave->setData(QList<QVariant>() << ZoneNames::GRAVE << 0);
         aMoveHandToRfg = new QAction(this);
-        aMoveHandToRfg->setData(QList<QVariant>() << "rfg" << 0);
+        aMoveHandToRfg->setData(QList<QVariant>() << ZoneNames::EXILE << 0);
 
-        auto hand = player->getHandZone();
+        auto hand = player->getLogic()->getHandZone();
 
         connect(aMoveHandToTopLibrary, &QAction::triggered, hand, &HandZoneLogic::moveAllToZone);
         connect(aMoveHandToBottomLibrary, &QAction::triggered, hand, &HandZoneLogic::moveAllToZone);
@@ -96,7 +123,7 @@ void HandMenu::retranslateUi()
 {
     setTitle(tr("&Hand"));
 
-    if (player->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
         aViewHand->setText(tr("&View hand"));
 
         mSortHand->setTitle(tr("Sort hand by..."));
@@ -104,7 +131,9 @@ void HandMenu::retranslateUi()
         aSortHandByType->setText(tr("Type"));
         aSortHandByManaValue->setText(tr("Mana Value"));
 
-        aMulligan->setText(tr("Take &mulligan"));
+        aMulligan->setText(tr("Take &mulligan (Choose hand size)"));
+        aMulliganSame->setText(tr("Take mulligan (Same hand size)"));
+        aMulliganMinusOne->setText(tr("Take mulligan (Hand size - 1)"));
 
         mMoveHandMenu->setTitle(tr("&Move hand to..."));
         aMoveHandToTopLibrary->setText(tr("&Top of library"));
@@ -128,6 +157,8 @@ void HandMenu::setShortcutsActive()
     aSortHandByType->setShortcuts(shortcuts.getShortcut("Player/aSortHandByType"));
     aSortHandByManaValue->setShortcuts(shortcuts.getShortcut("Player/aSortHandByManaValue"));
     aMulligan->setShortcuts(shortcuts.getShortcut("Player/aMulligan"));
+    aMulliganSame->setShortcuts(shortcuts.getShortcut("Player/aMulliganSame"));
+    aMulliganMinusOne->setShortcuts(shortcuts.getShortcut("Player/aMulliganMinusOne"));
     aRevealHandToAll->setShortcuts(shortcuts.getShortcut("Player/aRevealHandToAll"));
     aRevealRandomHandCardToAll->setShortcuts(shortcuts.getShortcut("Player/aRevealRandomHandCardToAll"));
 }
@@ -151,10 +182,11 @@ void HandMenu::populateRevealHandMenuWithActivePlayers()
 
     mRevealHand->addSeparator();
 
-    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
+    const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
     for (auto *other : players) {
-        if (other == player)
+        if (other == player->getLogic()) {
             continue;
+        }
         QAction *a = mRevealHand->addAction(other->getPlayerInfo()->getName());
         a->setData(other->getPlayerInfo()->getId());
         connect(a, &QAction::triggered, this, &HandMenu::onRevealHandTriggered);
@@ -169,10 +201,11 @@ void HandMenu::populateRevealRandomHandCardMenuWithActivePlayers()
 
     mRevealRandomHandCard->addSeparator();
 
-    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
+    const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
     for (auto *other : players) {
-        if (other == player)
+        if (other == player->getLogic()) {
             continue;
+        }
         QAction *a = mRevealRandomHandCard->addAction(other->getPlayerInfo()->getName());
         a->setData(other->getPlayerInfo()->getId());
         connect(a, &QAction::triggered, this, &HandMenu::onRevealRandomHandCardTriggered);
@@ -182,19 +215,21 @@ void HandMenu::populateRevealRandomHandCardMenuWithActivePlayers()
 void HandMenu::onRevealHandTriggered()
 {
     auto *action = qobject_cast<QAction *>(sender());
-    if (!action)
+    if (!action) {
         return;
+    }
 
     const int targetId = action->data().toInt();
-    player->getPlayerActions()->actRevealHand(targetId);
+    player->getLogic()->getPlayerActions()->actRevealHand(targetId);
 }
 
 void HandMenu::onRevealRandomHandCardTriggered()
 {
     auto *action = qobject_cast<QAction *>(sender());
-    if (!action)
+    if (!action) {
         return;
+    }
 
     const int targetId = action->data().toInt();
-    player->getPlayerActions()->actRevealRandomHandCard(targetId);
+    player->getLogic()->getPlayerActions()->actRevealRandomHandCard(targetId);
 }
diff --git a/cockatrice/src/game/player/menu/hand_menu.h b/cockatrice/src/game_graphics/player/menu/hand_menu.h
similarity index 70%
rename from cockatrice/src/game/player/menu/hand_menu.h
rename to cockatrice/src/game_graphics/player/menu/hand_menu.h
index 2c776b857..de7726064 100644
--- a/cockatrice/src/game/player/menu/hand_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/hand_menu.h
@@ -1,26 +1,28 @@
 /**
  * @file hand_menu.h
  * @ingroup GameMenusZones
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_HAND_MENU_H
 #define COCKATRICE_HAND_MENU_H
 
 #include "../../../interface/widgets/menus/tearoff_menu.h"
+#include "abstract_player_component.h"
 
-#include <QAction>
-#include <QMenu>
+#include <qtmetamacros.h>
 
-class Player;
-class PlayerActions;
+class PlayerGraphicsItem;
+class QAction;
+class QMenu;
+class QWidget;
 
-class HandMenu : public TearOffMenu
+class HandMenu : public TearOffMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
 
 public:
-    HandMenu(Player *player, PlayerActions *actions, QWidget *parent = nullptr);
+    HandMenu(PlayerGraphicsItem *player, QWidget *parent = nullptr);
 
     QMenu *revealHandMenu() const
     {
@@ -31,9 +33,9 @@ public:
         return mRevealRandomHandCard;
     }
 
-    void retranslateUi();
-    void setShortcutsActive();
-    void setShortcutsInactive();
+    void retranslateUi() override;
+    void setShortcutsActive() override;
+    void setShortcutsInactive() override;
 
 private slots:
     void populateRevealHandMenuWithActivePlayers();
@@ -42,10 +44,12 @@ private slots:
     void onRevealRandomHandCardTriggered();
 
 private:
-    Player *player;
+    PlayerGraphicsItem *player;
 
     QAction *aViewHand = nullptr;
     QAction *aMulligan = nullptr;
+    QAction *aMulliganSame = nullptr;
+    QAction *aMulliganMinusOne = nullptr;
 
     QMenu *mSortHand = nullptr;
     QAction *aSortHandByName = nullptr;
diff --git a/cockatrice/src/game/player/menu/library_menu.cpp b/cockatrice/src/game_graphics/player/menu/library_menu.cpp
similarity index 74%
rename from cockatrice/src/game/player/menu/library_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/library_menu.cpp
index 749439558..aa389006e 100644
--- a/cockatrice/src/game/player/menu/library_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/library_menu.cpp
@@ -2,15 +2,31 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../../interface/widgets/tabs/tab_game.h"
-#include "../../abstract_game.h"
-#include "../player.h"
-#include "../player_actions.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 "../../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>
 
-LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
+class QWidget;
+
+LibraryMenu::LibraryMenu(PlayerGraphicsItem *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {
     createDrawActions();
     createShuffleActions();
@@ -51,8 +67,10 @@ LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent)
     topLibraryMenu->addSeparator();
     topLibraryMenu->addAction(aMoveTopCardToGraveyard);
     topLibraryMenu->addAction(aMoveTopCardsToGraveyard);
+    topLibraryMenu->addAction(aMoveTopCardsToGraveyardFaceDown);
     topLibraryMenu->addAction(aMoveTopCardToExile);
     topLibraryMenu->addAction(aMoveTopCardsToExile);
+    topLibraryMenu->addAction(aMoveTopCardsToExileFaceDown);
     topLibraryMenu->addAction(aMoveTopCardsUntil);
     topLibraryMenu->addSeparator();
     topLibraryMenu->addAction(aShuffleTopCards);
@@ -66,13 +84,15 @@ LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent)
     bottomLibraryMenu->addSeparator();
     bottomLibraryMenu->addAction(aMoveBottomCardToGraveyard);
     bottomLibraryMenu->addAction(aMoveBottomCardsToGraveyard);
+    bottomLibraryMenu->addAction(aMoveBottomCardsToGraveyardFaceDown);
     bottomLibraryMenu->addAction(aMoveBottomCardToExile);
     bottomLibraryMenu->addAction(aMoveBottomCardsToExile);
+    bottomLibraryMenu->addAction(aMoveBottomCardsToExileFaceDown);
     bottomLibraryMenu->addSeparator();
     bottomLibraryMenu->addAction(aShuffleBottomCards);
 
-    connect(player, &Player::resetTopCardMenuActions, this, &LibraryMenu::resetTopCardMenuActions);
-    connect(player, &Player::deckChanged, this, &LibraryMenu::enableOpenInDeckEditorAction);
+    connect(player->getLogic(), &PlayerLogic::resetTopCardMenuActions, this, &LibraryMenu::resetTopCardMenuActions);
+    connect(player->getLogic(), &PlayerLogic::deckChanged, this, &LibraryMenu::enableOpenInDeckEditorAction);
 
     retranslateUi();
 }
@@ -90,41 +110,41 @@ void LibraryMenu::resetTopCardMenuActions()
 
 void LibraryMenu::createDrawActions()
 {
-    PlayerActions *playerActions = player->getPlayerActions();
+    PlayerActions *playerActions = player->getLogic()->getPlayerActions();
 
-    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
+    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
         aDrawCard = new QAction(this);
         connect(aDrawCard, &QAction::triggered, playerActions, &PlayerActions::actDrawCard);
         aDrawCards = new QAction(this);
-        connect(aDrawCards, &QAction::triggered, playerActions, &PlayerActions::actDrawCards);
+        connect(aDrawCards, &QAction::triggered, playerActions, &PlayerActions::actRequestDrawCardsDialog);
         aUndoDraw = new QAction(this);
         connect(aUndoDraw, &QAction::triggered, playerActions, &PlayerActions::actUndoDraw);
         aDrawBottomCard = new QAction(this);
         connect(aDrawBottomCard, &QAction::triggered, playerActions, &PlayerActions::actDrawBottomCard);
         aDrawBottomCards = new QAction(this);
-        connect(aDrawBottomCards, &QAction::triggered, playerActions, &PlayerActions::actDrawBottomCards);
+        connect(aDrawBottomCards, &QAction::triggered, playerActions, &PlayerActions::actRequestDrawBottomCardsDialog);
     }
 }
 
 void LibraryMenu::createShuffleActions()
 {
-    PlayerActions *playerActions = player->getPlayerActions();
+    PlayerActions *playerActions = player->getLogic()->getPlayerActions();
 
-    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
+    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
         aShuffle = new QAction(this);
         connect(aShuffle, &QAction::triggered, playerActions, &PlayerActions::actShuffle);
         aShuffleTopCards = new QAction(this);
-        connect(aShuffleTopCards, &QAction::triggered, playerActions, &PlayerActions::actShuffleTop);
+        connect(aShuffleTopCards, &QAction::triggered, playerActions, &PlayerActions::actRequestShuffleTopDialog);
         aShuffleBottomCards = new QAction(this);
-        connect(aShuffleBottomCards, &QAction::triggered, playerActions, &PlayerActions::actShuffleBottom);
+        connect(aShuffleBottomCards, &QAction::triggered, playerActions, &PlayerActions::actRequestShuffleBottomDialog);
     }
 }
 
 void LibraryMenu::createMoveActions()
 {
-    PlayerActions *playerActions = player->getPlayerActions();
+    PlayerActions *playerActions = player->getLogic()->getPlayerActions();
 
-    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
+    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
         aMoveTopToPlay = new QAction(this);
         connect(aMoveTopToPlay, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardToPlay);
         aMoveTopToPlayFaceDown = new QAction(this);
@@ -136,10 +156,17 @@ void LibraryMenu::createMoveActions()
         connect(aMoveTopCardToExile, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardToExile);
         aMoveTopCardsToGraveyard = new QAction(this);
         connect(aMoveTopCardsToGraveyard, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardsToGrave);
+        aMoveTopCardsToGraveyardFaceDown = new QAction(this);
+        connect(aMoveTopCardsToGraveyardFaceDown, &QAction::triggered, playerActions,
+                &PlayerActions::actMoveTopCardsToGraveFaceDown);
         aMoveTopCardsToExile = new QAction(this);
         connect(aMoveTopCardsToExile, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardsToExile);
+        aMoveTopCardsToExileFaceDown = new QAction(this);
+        connect(aMoveTopCardsToExileFaceDown, &QAction::triggered, playerActions,
+                &PlayerActions::actMoveTopCardsToExileFaceDown);
         aMoveTopCardsUntil = new QAction(this);
-        connect(aMoveTopCardsUntil, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardsUntil);
+        connect(aMoveTopCardsUntil, &QAction::triggered, playerActions,
+                &PlayerActions::actRequestMoveTopCardsUntilDialog);
         aMoveTopCardToBottom = new QAction(this);
         connect(aMoveTopCardToBottom, &QAction::triggered, playerActions, &PlayerActions::actMoveTopCardToBottom);
 
@@ -156,8 +183,14 @@ void LibraryMenu::createMoveActions()
         aMoveBottomCardsToGraveyard = new QAction(this);
         connect(aMoveBottomCardsToGraveyard, &QAction::triggered, playerActions,
                 &PlayerActions::actMoveBottomCardsToGrave);
+        aMoveBottomCardsToGraveyardFaceDown = new QAction(this);
+        connect(aMoveBottomCardsToGraveyardFaceDown, &QAction::triggered, playerActions,
+                &PlayerActions::actMoveBottomCardsToGraveFaceDown);
         aMoveBottomCardsToExile = new QAction(this);
         connect(aMoveBottomCardsToExile, &QAction::triggered, playerActions, &PlayerActions::actMoveBottomCardsToExile);
+        aMoveBottomCardsToExileFaceDown = new QAction(this);
+        connect(aMoveBottomCardsToExileFaceDown, &QAction::triggered, playerActions,
+                &PlayerActions::actMoveBottomCardsToExileFaceDown);
         aMoveBottomCardToTop = new QAction(this);
         connect(aMoveBottomCardToTop, &QAction::triggered, playerActions, &PlayerActions::actMoveBottomCardToTop);
     }
@@ -165,16 +198,16 @@ void LibraryMenu::createMoveActions()
 
 void LibraryMenu::createViewActions()
 {
-    PlayerActions *playerActions = player->getPlayerActions();
+    PlayerActions *playerActions = player->getLogic()->getPlayerActions();
 
-    if (player->getPlayerInfo()->local || player->getPlayerInfo()->judge) {
+    if (player->getLogic()->getPlayerInfo()->local || player->getLogic()->getPlayerInfo()->judge) {
         aViewLibrary = new QAction(this);
         connect(aViewLibrary, &QAction::triggered, playerActions, &PlayerActions::actViewLibrary);
 
         aViewTopCards = new QAction(this);
-        connect(aViewTopCards, &QAction::triggered, playerActions, &PlayerActions::actViewTopCards);
+        connect(aViewTopCards, &QAction::triggered, playerActions, &PlayerActions::actRequestViewTopCardsDialog);
         aViewBottomCards = new QAction(this);
-        connect(aViewBottomCards, &QAction::triggered, playerActions, &PlayerActions::actViewBottomCards);
+        connect(aViewBottomCards, &QAction::triggered, playerActions, &PlayerActions::actRequestViewBottomCardsDialog);
         aAlwaysRevealTopCard = new QAction(this);
         aAlwaysRevealTopCard->setCheckable(true);
         connect(aAlwaysRevealTopCard, &QAction::triggered, playerActions, &PlayerActions::actAlwaysRevealTopCard);
@@ -191,7 +224,7 @@ void LibraryMenu::retranslateUi()
 {
     setTitle(tr("&Library"));
 
-    if (player->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
         aViewLibrary->setText(tr("&View library"));
         aViewTopCards->setText(tr("View &top cards of library..."));
         aViewBottomCards->setText(tr("View bottom cards of library..."));
@@ -216,7 +249,9 @@ void LibraryMenu::retranslateUi()
         aMoveTopCardToGraveyard->setText(tr("Move top card to grave&yard"));
         aMoveTopCardToExile->setText(tr("Move top card to e&xile"));
         aMoveTopCardsToGraveyard->setText(tr("Move top cards to &graveyard..."));
+        aMoveTopCardsToGraveyardFaceDown->setText(tr("Move top cards to graveyard face down..."));
         aMoveTopCardsToExile->setText(tr("Move top cards to &exile..."));
+        aMoveTopCardsToExileFaceDown->setText(tr("Move top cards to exile face down..."));
         aMoveTopCardsUntil->setText(tr("Put top cards on stack &until..."));
         aShuffleTopCards->setText(tr("Shuffle top cards..."));
 
@@ -227,7 +262,9 @@ void LibraryMenu::retranslateUi()
         aMoveBottomCardToGraveyard->setText(tr("Move bottom card to grave&yard"));
         aMoveBottomCardToExile->setText(tr("Move bottom card to e&xile"));
         aMoveBottomCardsToGraveyard->setText(tr("Move bottom cards to &graveyard..."));
+        aMoveBottomCardsToGraveyardFaceDown->setText(tr("Move bottom cards to graveyard face down..."));
         aMoveBottomCardsToExile->setText(tr("Move bottom cards to &exile..."));
+        aMoveBottomCardsToExileFaceDown->setText(tr("Move bottom cards to exile face down..."));
         aMoveBottomCardToTop->setText(tr("Put bottom card on &top"));
         aShuffleBottomCards->setText(tr("Shuffle bottom cards..."));
     }
@@ -243,10 +280,11 @@ void LibraryMenu::populateRevealLibraryMenuWithActivePlayers()
 
     mRevealLibrary->addSeparator();
 
-    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
+    const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
     for (auto *other : players) {
-        if (other == player)
+        if (other == player->getLogic()) {
             continue;
+        }
         QAction *a = mRevealLibrary->addAction(other->getPlayerInfo()->getName());
         a->setData(other->getPlayerInfo()->getId());
         connect(a, &QAction::triggered, this, &LibraryMenu::onRevealLibraryTriggered);
@@ -257,10 +295,11 @@ void LibraryMenu::populateLendLibraryMenuWithActivePlayers()
 {
     mLendLibrary->clear();
 
-    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
+    const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
     for (auto *other : players) {
-        if (other == player)
+        if (other == player->getLogic()) {
             continue;
+        }
         QAction *a = mLendLibrary->addAction(other->getPlayerInfo()->getName());
         a->setData(other->getPlayerInfo()->getId());
         connect(a, &QAction::triggered, this, &LibraryMenu::onLendLibraryTriggered);
@@ -277,10 +316,11 @@ void LibraryMenu::populateRevealTopCardMenuWithActivePlayers()
 
     mRevealTopCard->addSeparator();
 
-    const auto &players = player->getGame()->getPlayerManager()->getPlayers().values();
+    const auto &players = player->getLogic()->getGame()->getPlayerManager()->getPlayers().values();
     for (auto *other : players) {
-        if (other == player)
+        if (other == player->getLogic()) {
             continue;
+        }
         QAction *a = mRevealTopCard->addAction(other->getPlayerInfo()->getName());
         a->setData(other->getPlayerInfo()->getId());
         connect(a, &QAction::triggered, this, &LibraryMenu::onRevealTopCardTriggered);
@@ -290,27 +330,33 @@ void LibraryMenu::populateRevealTopCardMenuWithActivePlayers()
 void LibraryMenu::onRevealLibraryTriggered()
 {
     if (auto *a = qobject_cast<QAction *>(sender())) {
-        player->getPlayerActions()->actRevealLibrary(a->data().toInt());
+        player->getLogic()->getPlayerActions()->actRevealLibrary(a->data().toInt());
     }
 }
 
 void LibraryMenu::onLendLibraryTriggered()
 {
     if (auto *a = qobject_cast<QAction *>(sender())) {
-        player->getPlayerActions()->actLendLibrary(a->data().toInt());
+        player->getLogic()->getPlayerActions()->actLendLibrary(a->data().toInt());
     }
 }
 
 void LibraryMenu::onRevealTopCardTriggered()
 {
+    QWidget *parent = nullptr;
+    if (auto *view = player->scene() ? player->scene()->views().value(0) : nullptr) {
+        parent = view->window();
+    }
     if (auto *a = qobject_cast<QAction *>(sender())) {
-        int deckSize = player->getDeckZone()->getCards().size();
-        bool ok;
-        int number = QInputDialog::getInt(player->getGame()->getTab(), tr("Reveal top cards of library"),
+
+        int deckSize = player->getLogic()->getDeckZone()->getCards().size();
+        bool ok = true;
+        int number = QInputDialog::getInt(parent, tr("Reveal top cards of library"),
                                           tr("Number of cards: (max. %1)").arg(deckSize), defaultNumberTopCards, 1,
                                           deckSize, 1, &ok);
+
         if (ok) {
-            player->getPlayerActions()->actRevealTopCards(a->data().toInt(), number);
+            player->getLogic()->getPlayerActions()->actRevealTopCards(a->data().toInt(), number);
             defaultNumberTopCards = number;
         }
     }
@@ -335,8 +381,10 @@ void LibraryMenu::setShortcutsActive()
     aMoveTopToPlayFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveTopToPlayFaceDown"));
     aMoveTopCardToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardToGraveyard"));
     aMoveTopCardsToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToGraveyard"));
+    aMoveTopCardsToGraveyardFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToGraveyardFaceDown"));
     aMoveTopCardToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardToExile"));
     aMoveTopCardsToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToExile"));
+    aMoveTopCardsToExileFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsToExileFaceDown"));
     aMoveTopCardsUntil->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardsUntil"));
     aMoveTopCardToBottom->setShortcuts(shortcuts.getShortcut("Player/aMoveTopCardToBottom"));
     aDrawBottomCard->setShortcuts(shortcuts.getShortcut("Player/aDrawBottomCard"));
@@ -345,8 +393,10 @@ void LibraryMenu::setShortcutsActive()
     aMoveBottomToPlayFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomToPlayFaceDown"));
     aMoveBottomCardToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardToGrave"));
     aMoveBottomCardsToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToGrave"));
+    aMoveBottomCardsToGraveyardFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToGraveFaceDown"));
     aMoveBottomCardToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardToExile"));
     aMoveBottomCardsToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToExile"));
+    aMoveBottomCardsToExileFaceDown->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardsToExileFaceDown"));
     aMoveBottomCardToTop->setShortcuts(shortcuts.getShortcut("Player/aMoveBottomCardToTop"));
 }
 
@@ -367,8 +417,10 @@ void LibraryMenu::setShortcutsInactive()
     aMoveTopToPlayFaceDown->setShortcut(QKeySequence());
     aMoveTopCardToGraveyard->setShortcut(QKeySequence());
     aMoveTopCardsToGraveyard->setShortcut(QKeySequence());
+    aMoveTopCardsToGraveyardFaceDown->setShortcut(QKeySequence());
     aMoveTopCardToExile->setShortcut(QKeySequence());
     aMoveTopCardsToExile->setShortcut(QKeySequence());
+    aMoveTopCardsToExileFaceDown->setShortcut(QKeySequence());
     aMoveTopCardsUntil->setShortcut(QKeySequence());
     aDrawBottomCard->setShortcut(QKeySequence());
     aDrawBottomCards->setShortcut(QKeySequence());
@@ -376,6 +428,8 @@ void LibraryMenu::setShortcutsInactive()
     aMoveBottomToPlayFaceDown->setShortcut(QKeySequence());
     aMoveBottomCardToGraveyard->setShortcut(QKeySequence());
     aMoveBottomCardsToGraveyard->setShortcut(QKeySequence());
+    aMoveBottomCardsToGraveyardFaceDown->setShortcut(QKeySequence());
     aMoveBottomCardToExile->setShortcut(QKeySequence());
     aMoveBottomCardsToExile->setShortcut(QKeySequence());
+    aMoveBottomCardsToExileFaceDown->setShortcut(QKeySequence());
 }
diff --git a/cockatrice/src/game/player/menu/library_menu.h b/cockatrice/src/game_graphics/player/menu/library_menu.h
similarity index 81%
rename from cockatrice/src/game/player/menu/library_menu.h
rename to cockatrice/src/game_graphics/player/menu/library_menu.h
index 96d4b82b1..72e90d0ba 100644
--- a/cockatrice/src/game/player/menu/library_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/library_menu.h
@@ -1,21 +1,23 @@
 /**
  * @file library_menu.h
  * @ingroup GameMenusZones
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_LIBRARY_MENU_H
 #define COCKATRICE_LIBRARY_MENU_H
 
 #include "../../../interface/widgets/menus/tearoff_menu.h"
+#include "abstract_player_component.h"
 
 #include <QAction>
-#include <QMenu>
+#include <qtmetamacros.h>
 
-class Player;
-class PlayerActions;
+class PlayerGraphicsItem;
+class QMenu;
+class QWidget;
 
-class LibraryMenu : public TearOffMenu
+class LibraryMenu : public TearOffMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
 public slots:
@@ -23,20 +25,20 @@ public slots:
     void resetTopCardMenuActions();
 
 public:
-    LibraryMenu(Player *player, QWidget *parent = nullptr);
+    LibraryMenu(PlayerGraphicsItem *player, QWidget *parent = nullptr);
     void createDrawActions();
     void createShuffleActions();
     void createMoveActions();
     void createViewActions();
-    void retranslateUi();
+    void retranslateUi() override;
     void populateRevealLibraryMenuWithActivePlayers();
     void populateLendLibraryMenuWithActivePlayers();
     void populateRevealTopCardMenuWithActivePlayers();
     void onRevealLibraryTriggered();
     void onLendLibraryTriggered();
     void onRevealTopCardTriggered();
-    void setShortcutsActive();
-    void setShortcutsInactive();
+    void setShortcutsActive() override;
+    void setShortcutsInactive() override;
 
     [[nodiscard]] bool isAlwaysRevealTopCardChecked() const
     {
@@ -88,7 +90,9 @@ public:
     QAction *aMoveTopCardToGraveyard = nullptr;
     QAction *aMoveTopCardToExile = nullptr;
     QAction *aMoveTopCardsToGraveyard = nullptr;
+    QAction *aMoveTopCardsToGraveyardFaceDown = nullptr;
     QAction *aMoveTopCardsToExile = nullptr;
+    QAction *aMoveTopCardsToExileFaceDown = nullptr;
     QAction *aMoveTopCardsUntil = nullptr;
     QAction *aShuffleTopCards = nullptr;
 
@@ -100,13 +104,15 @@ public:
     QAction *aMoveBottomCardToGraveyard = nullptr;
     QAction *aMoveBottomCardToExile = nullptr;
     QAction *aMoveBottomCardsToGraveyard = nullptr;
+    QAction *aMoveBottomCardsToGraveyardFaceDown = nullptr;
     QAction *aMoveBottomCardsToExile = nullptr;
+    QAction *aMoveBottomCardsToExileFaceDown = nullptr;
     QAction *aShuffleBottomCards = nullptr;
 
     int defaultNumberTopCards = 1;
 
 private:
-    Player *player;
+    PlayerGraphicsItem *player;
 };
 
 #endif // COCKATRICE_LIBRARY_MENU_H
diff --git a/cockatrice/src/game/player/menu/move_menu.cpp b/cockatrice/src/game_graphics/player/menu/move_menu.cpp
similarity index 54%
rename from cockatrice/src/game/player/menu/move_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/move_menu.cpp
index d27e16009..2991100ec 100644
--- a/cockatrice/src/game/player/menu/move_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/move_menu.cpp
@@ -1,16 +1,24 @@
 #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.h"
-#include "../player_actions.h"
+#include "../player_graphics_item.h"
 
-MoveMenu::MoveMenu(Player *player) : QMenu(tr("Move to"))
+#include <QAction>
+
+MoveMenu::MoveMenu(PlayerGraphicsItem *player) : QMenu(tr("Move to"))
 {
     aMoveToTopLibrary = new QAction(this);
     aMoveToTopLibrary->setData(cmMoveToTopLibrary);
     aMoveToBottomLibrary = new QAction(this);
     aMoveToBottomLibrary->setData(cmMoveToBottomLibrary);
     aMoveToXfromTopOfLibrary = new QAction(this);
+    aMoveToTable = new QAction(this);
+    aMoveToTable->setData(cmMoveToTable);
     aMoveToGraveyard = new QAction(this);
     aMoveToHand = new QAction(this);
     aMoveToHand->setData(cmMoveToHand);
@@ -18,18 +26,29 @@ MoveMenu::MoveMenu(Player *player) : QMenu(tr("Move to"))
     aMoveToExile = new QAction(this);
     aMoveToExile->setData(cmMoveToExile);
 
-    connect(aMoveToTopLibrary, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction);
-    connect(aMoveToBottomLibrary, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction);
-    connect(aMoveToXfromTopOfLibrary, &QAction::triggered, player->getPlayerActions(),
-            &PlayerActions::actMoveCardXCardsFromTop);
-    connect(aMoveToHand, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction);
-    connect(aMoveToGraveyard, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction);
-    connect(aMoveToExile, &QAction::triggered, player->getPlayerActions(), &PlayerActions::cardMenuAction);
+    auto *actions = player->getLogic()->getPlayerActions();
+
+    auto invoke = [player](CardMenuActionType type) {
+        return [type, player]() {
+            player->getLogic()->getPlayerActions()->cardMenuAction(player->getGameScene()->selectedCards(), type);
+        };
+    };
+
+    connect(aMoveToTopLibrary, &QAction::triggered, actions, invoke(cmMoveToTopLibrary));
+    connect(aMoveToBottomLibrary, &QAction::triggered, actions, invoke(cmMoveToBottomLibrary));
+    connect(aMoveToXfromTopOfLibrary, &QAction::triggered, actions,
+            &PlayerActions::actRequestMoveCardXCardsFromTopDialog);
+    connect(aMoveToTable, &QAction::triggered, actions, invoke(cmMoveToTable));
+    connect(aMoveToHand, &QAction::triggered, actions, invoke(cmMoveToHand));
+    connect(aMoveToGraveyard, &QAction::triggered, actions, invoke(cmMoveToGraveyard));
+    connect(aMoveToExile, &QAction::triggered, actions, invoke(cmMoveToExile));
 
     addAction(aMoveToTopLibrary);
     addAction(aMoveToXfromTopOfLibrary);
     addAction(aMoveToBottomLibrary);
     addSeparator();
+    addAction(aMoveToTable);
+    addSeparator();
     addAction(aMoveToHand);
     addSeparator();
     addAction(aMoveToGraveyard);
@@ -47,6 +66,7 @@ void MoveMenu::setShortcutsActive()
 
     aMoveToTopLibrary->setShortcuts(shortcuts.getShortcut("Player/aMoveToTopLibrary"));
     aMoveToBottomLibrary->setShortcuts(shortcuts.getShortcut("Player/aMoveToBottomLibrary"));
+    aMoveToTable->setShortcuts(shortcuts.getShortcut("Player/aMoveToTable"));
     aMoveToHand->setShortcuts(shortcuts.getShortcut("Player/aMoveToHand"));
     aMoveToGraveyard->setShortcuts(shortcuts.getShortcut("Player/aMoveToGraveyard"));
     aMoveToExile->setShortcuts(shortcuts.getShortcut("Player/aMoveToExile"));
@@ -57,7 +77,8 @@ void MoveMenu::retranslateUi()
     aMoveToTopLibrary->setText(tr("&Top of library in random order"));
     aMoveToXfromTopOfLibrary->setText(tr("X cards from the top of library..."));
     aMoveToBottomLibrary->setText(tr("&Bottom of library in random order"));
+    aMoveToTable->setText(tr("T&able"));
     aMoveToHand->setText(tr("&Hand"));
     aMoveToGraveyard->setText(tr("&Graveyard"));
     aMoveToExile->setText(tr("&Exile"));
-}
\ No newline at end of file
+}
diff --git a/cockatrice/src/game/player/menu/move_menu.h b/cockatrice/src/game_graphics/player/menu/move_menu.h
similarity index 74%
rename from cockatrice/src/game/player/menu/move_menu.h
rename to cockatrice/src/game_graphics/player/menu/move_menu.h
index 5bf657fa4..f1f239abd 100644
--- a/cockatrice/src/game/player/menu/move_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/move_menu.h
@@ -1,20 +1,23 @@
 /**
  * @file move_menu.h
  * @ingroup GameMenusZones
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_MOVE_MENU_H
 #define COCKATRICE_MOVE_MENU_H
 #include <QMenu>
+#include <qtmetamacros.h>
+
+class PlayerGraphicsItem;
+class QAction;
 
-class Player;
 class MoveMenu : public QMenu
 {
     Q_OBJECT
 
 public:
-    explicit MoveMenu(Player *player);
+    explicit MoveMenu(PlayerGraphicsItem *player);
     void setShortcutsActive();
     void retranslateUi();
 
@@ -23,6 +26,7 @@ public:
     QAction *aMoveToBottomLibrary = nullptr;
 
     QAction *aMoveToHand = nullptr;
+    QAction *aMoveToTable = nullptr;
     QAction *aMoveToGraveyard = nullptr;
     QAction *aMoveToExile = nullptr;
 };
diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.cpp b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
new file mode 100644
index 000000000..44b184cfe
--- /dev/null
+++ b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
@@ -0,0 +1,158 @@
+#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 "../../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>
+
+PlayerMenu::PlayerMenu(PlayerGraphicsItem *_player) : QObject(_player), player(_player)
+{
+    connect(player->getLogic(), &PlayerLogic::requestCardMenuUpdate, this, &PlayerMenu::updateCardMenu);
+    connect(this, &PlayerMenu::cardInfoRequested, player, &PlayerGraphicsItem::cardInfoRequested);
+
+    playerMenu = new TearOffMenu();
+
+    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+        handMenu = addManagedMenu<HandMenu>(player, playerMenu);
+        libraryMenu = addManagedMenu<LibraryMenu>(player, playerMenu);
+    } else {
+        handMenu = nullptr;
+        libraryMenu = nullptr;
+    }
+
+    graveMenu = addManagedMenu<GraveyardMenu>(player, playerMenu);
+    rfgMenu = addManagedMenu<RfgMenu>(player, playerMenu);
+
+    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+        sideboardMenu = addManagedMenu<SideboardMenu>(player, playerMenu);
+        customZonesMenu = addManagedMenu<CustomZoneMenu>(player);
+        playerMenu->addSeparator();
+
+        countersMenu = playerMenu->addMenu(QString());
+
+        utilityMenu = createManagedComponent<UtilityMenu>(player, playerMenu);
+    } else {
+        sideboardMenu = nullptr;
+        customZonesMenu = nullptr;
+        countersMenu = nullptr;
+        utilityMenu = nullptr;
+    }
+
+    tallyMenu = addManagedMenu<TallyMenu>();
+
+    if (player->getLogic()->getPlayerInfo()->getLocal()) {
+        sayMenu = addManagedMenu<SayMenu>(player);
+    } else {
+        sayMenu = nullptr;
+    }
+
+    connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
+            &PlayerMenu::refreshShortcuts);
+    refreshShortcuts();
+
+    retranslateUi();
+}
+
+void PlayerMenu::setMenusForGraphicItems()
+{
+    player->getTableZoneGraphicsItem()->setMenu(playerMenu);
+    player->getGraveyardZoneGraphicsItem()->setMenu(graveMenu, graveMenu->aViewGraveyard);
+    player->getRfgZoneGraphicsItem()->setMenu(rfgMenu, rfgMenu->aViewRfg);
+    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+        player->getHandZoneGraphicsItem()->setMenu(handMenu);
+        player->getDeckZoneGraphicsItem()->setMenu(libraryMenu, libraryMenu->aDrawCard);
+        player->getSideboardZoneGraphicsItem()->setMenu(sideboardMenu);
+    }
+}
+
+QMenu *PlayerMenu::updateCardMenu(const CardItem *card)
+{
+    if (!card) {
+        emit cardMenuUpdated(nullptr);
+        return nullptr;
+    }
+
+    // If is spectator (as spectators don't need card menus), return
+    // only update the menu if the card is actually selected
+    if ((player->getLogic()->getGame()->getPlayerManager()->isSpectator() &&
+         !player->getLogic()->getGame()->getPlayerManager()->isJudge()) ||
+        player->getLogic()->getGame()->getActiveCard() != card) {
+        return nullptr;
+    }
+
+    CardMenu *menu = new CardMenu(player, card, shortcutsActive);
+    connect(menu, &CardMenu::cardInfoRequested, this, &PlayerMenu::cardInfoRequested);
+    emit cardMenuUpdated(menu);
+
+    return menu;
+}
+
+void PlayerMenu::retranslateUi()
+{
+    playerMenu->setTitle(tr("Player \"%1\"").arg(player->getLogic()->getPlayerInfo()->getName()));
+
+    for (auto *component : managedComponents) {
+        component->retranslateUi();
+    }
+
+    if (countersMenu) {
+        countersMenu->setTitle(tr("&Counters"));
+    }
+
+    emit retranslateRequested();
+}
+
+void PlayerMenu::refreshShortcuts()
+{
+    if (shortcutsActive) {
+        // Judges get access to every player's menus but only want shortcuts to be set for their own.
+        if (player->getLogic()->getPlayerInfo()->getLocalOrJudge() &&
+            !player->getLogic()->getPlayerInfo()->getLocal()) {
+            setShortcutsInactive();
+        } else {
+            setShortcutsActive();
+        }
+    } else {
+        setShortcutsInactive();
+    }
+}
+
+void PlayerMenu::setShortcutsActive()
+{
+    shortcutsActive = true;
+    for (auto *c : managedComponents) {
+        c->setShortcutsActive();
+    }
+    emit shortcutsActivated();
+}
+
+void PlayerMenu::setShortcutsInactive()
+{
+    shortcutsActive = false;
+    for (auto *c : managedComponents) {
+        c->setShortcutsInactive();
+    }
+    emit shortcutsDeactivated();
+}
\ No newline at end of file
diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.h b/cockatrice/src/game_graphics/player/menu/player_menu.h
new file mode 100644
index 000000000..97dd2fc56
--- /dev/null
+++ b/cockatrice/src/game_graphics/player/menu/player_menu.h
@@ -0,0 +1,124 @@
+/**
+ * @file player_menu.h
+ * @ingroup GameMenusPlayers
+ * @brief Orchestrates lifecycle management for all player-bound UI components.
+ */
+
+#ifndef COCKATRICE_PLAYER_MENU_H
+#define COCKATRICE_PLAYER_MENU_H
+
+#include "../../../interface/widgets/menus/tearoff_menu.h"
+
+#include <QList>
+#include <QObject>
+#include <qtmetamacros.h>
+#include <utility>
+
+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
+
+signals:
+    void cardMenuUpdated(CardMenu *cardMenu);
+    void cardInfoRequested(const CardRef &cardRef);
+    void shortcutsActivated();
+    void shortcutsDeactivated();
+    void retranslateRequested();
+
+public slots:
+    void setMenusForGraphicItems();
+    QMenu *updateCardMenu(const CardItem *card);
+
+private slots:
+    void refreshShortcuts();
+
+public:
+    explicit PlayerMenu(PlayerGraphicsItem *player);
+    /** @brief Retranslate all user-visible strings. Called on language change. */
+    void retranslateUi();
+
+    [[nodiscard]] QMenu *getPlayerMenu() const
+    {
+        return playerMenu;
+    }
+
+    [[nodiscard]] QMenu *getCountersMenu()
+    {
+        return countersMenu;
+    }
+
+    [[nodiscard]] LibraryMenu *getLibraryMenu() const
+    {
+        return libraryMenu;
+    }
+
+    [[nodiscard]] UtilityMenu *getUtilityMenu() const
+    {
+        return utilityMenu;
+    }
+
+    [[nodiscard]] bool getShortcutsActive() const
+    {
+        return shortcutsActive;
+    }
+
+    /** @brief Bind keyboard shortcuts. Called when this player gains focus. */
+    void setShortcutsActive();
+    /** @brief Unbind keyboard shortcuts. Called when this player loses focus. */
+    void setShortcutsInactive();
+
+private:
+    PlayerGraphicsItem *player;
+    TearOffMenu *playerMenu;
+    QMenu *countersMenu;
+    HandMenu *handMenu;
+    LibraryMenu *libraryMenu;
+    SideboardMenu *sideboardMenu;
+    GraveyardMenu *graveMenu;
+    RfgMenu *rfgMenu;
+    UtilityMenu *utilityMenu;
+    TallyMenu *tallyMenu;
+    SayMenu *sayMenu;
+    CustomZoneMenu *customZonesMenu;
+
+    /** @brief Drives AbstractPlayerComponent lifecycle delegation. Counters are iterated separately via
+     * player->getCounters().
+     */
+    QList<AbstractPlayerComponent *> managedComponents;
+    bool shortcutsActive = false;
+
+    /** @brief Creates component, adds it as a submenu of playerMenu, and registers in managedComponents. */
+    template <typename MenuT, typename... Args> MenuT *addManagedMenu(Args &&...args)
+    {
+        auto *menu = new MenuT(std::forward<Args>(args)...);
+        playerMenu->addMenu(menu);
+        managedComponents.append(menu);
+        return menu;
+    }
+
+    /** @brief Creates component and registers in managedComponents, but does NOT add it as a submenu. */
+    template <typename ComponentT, typename... Args> ComponentT *createManagedComponent(Args &&...args)
+    {
+        auto *component = new ComponentT(std::forward<Args>(args)...);
+        managedComponents.append(component);
+        return component;
+    }
+};
+
+#endif // COCKATRICE_PLAYER_MENU_H
diff --git a/cockatrice/src/game_graphics/player/menu/pt_menu.cpp b/cockatrice/src/game_graphics/player/menu/pt_menu.cpp
new file mode 100644
index 000000000..b4f852b43
--- /dev/null
+++ b/cockatrice/src/game_graphics/player/menu/pt_menu.cpp
@@ -0,0 +1,94 @@
+#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();
+
+    aIncP = new QAction(this);
+    connect(aIncP, &QAction::triggered, playerActions,
+            [player, playerActions] { playerActions->actIncP(player->getGameScene()->selectedCards()); });
+    aDecP = new QAction(this);
+    connect(aDecP, &QAction::triggered, playerActions,
+            [player, playerActions] { playerActions->actDecP(player->getGameScene()->selectedCards()); });
+    aIncT = new QAction(this);
+    connect(aIncT, &QAction::triggered, playerActions,
+            [player, playerActions] { playerActions->actIncT(player->getGameScene()->selectedCards()); });
+    aDecT = new QAction(this);
+    connect(aDecT, &QAction::triggered, playerActions,
+            [player, playerActions] { playerActions->actDecT(player->getGameScene()->selectedCards()); });
+    aIncPT = new QAction(this);
+    connect(aIncPT, &QAction::triggered, playerActions,
+            [player, playerActions] { playerActions->actIncPT(player->getGameScene()->selectedCards()); });
+    aDecPT = new QAction(this);
+    connect(aDecPT, &QAction::triggered, playerActions,
+            [player, playerActions] { playerActions->actDecPT(player->getGameScene()->selectedCards()); });
+    aFlowP = new QAction(this);
+    connect(aFlowP, &QAction::triggered, playerActions,
+            [player, playerActions] { playerActions->actFlowP(player->getGameScene()->selectedCards()); });
+    aFlowT = new QAction(this);
+    connect(aFlowT, &QAction::triggered, playerActions,
+            [player, playerActions] { playerActions->actFlowT(player->getGameScene()->selectedCards()); });
+    aSetPT = new QAction(this);
+    connect(aSetPT, &QAction::triggered, playerActions,
+            [player, playerActions] { playerActions->actRequestSetPTDialog(player->getGameScene()->selectedCards()); });
+    aResetPT = new QAction(this);
+    connect(aResetPT, &QAction::triggered, playerActions,
+            [player, playerActions] { playerActions->actResetPT(player->getGameScene()->selectedCards()); });
+
+    addAction(aIncP);
+    addAction(aDecP);
+    addAction(aFlowP);
+    addSeparator();
+    addAction(aIncT);
+    addAction(aDecT);
+    addAction(aFlowT);
+    addSeparator();
+    addAction(aIncPT);
+    addAction(aDecPT);
+    addSeparator();
+    addAction(aSetPT);
+    addAction(aResetPT);
+
+    setShortcutsActive();
+
+    retranslateUi();
+}
+
+void PtMenu::retranslateUi()
+{
+    aIncP->setText(tr("&Increase power"));
+    aDecP->setText(tr("&Decrease power"));
+    aIncT->setText(tr("I&ncrease toughness"));
+    aDecT->setText(tr("D&ecrease toughness"));
+    aIncPT->setText(tr("In&crease power and toughness"));
+    aDecPT->setText(tr("Dec&rease power and toughness"));
+    aFlowP->setText(tr("Increase power and decrease toughness"));
+    aFlowT->setText(tr("Decrease power and increase toughness"));
+    aSetPT->setText(tr("Set &power and toughness..."));
+    aResetPT->setText(tr("Reset p&ower and toughness"));
+}
+
+void PtMenu::setShortcutsActive()
+{
+    ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
+
+    aIncP->setShortcuts(shortcuts.getShortcut("Player/aIncP"));
+    aDecP->setShortcuts(shortcuts.getShortcut("Player/aDecP"));
+    aIncT->setShortcuts(shortcuts.getShortcut("Player/aIncT"));
+    aDecT->setShortcuts(shortcuts.getShortcut("Player/aDecT"));
+    aIncPT->setShortcuts(shortcuts.getShortcut("Player/aIncPT"));
+    aDecPT->setShortcuts(shortcuts.getShortcut("Player/aDecPT"));
+    aFlowP->setShortcuts(shortcuts.getShortcut("Player/aFlowP"));
+    aFlowT->setShortcuts(shortcuts.getShortcut("Player/aFlowT"));
+    aSetPT->setShortcuts(shortcuts.getShortcut("Player/aSetPT"));
+    aResetPT->setShortcuts(shortcuts.getShortcut("Player/aResetPT"));
+}
\ No newline at end of file
diff --git a/cockatrice/src/game/player/menu/pt_menu.h b/cockatrice/src/game_graphics/player/menu/pt_menu.h
similarity index 79%
rename from cockatrice/src/game/player/menu/pt_menu.h
rename to cockatrice/src/game_graphics/player/menu/pt_menu.h
index 44112e54f..aaf17cead 100644
--- a/cockatrice/src/game/player/menu/pt_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/pt_menu.h
@@ -1,21 +1,24 @@
 /**
  * @file pt_menu.h
  * @ingroup GameMenusCards
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_PT_MENU_H
 #define COCKATRICE_PT_MENU_H
 #include <QMenu>
+#include <qtmetamacros.h>
+
+class PlayerGraphicsItem;
+class QAction;
 
-class Player;
 class PtMenu : public QMenu
 {
 
     Q_OBJECT
 
 public:
-    explicit PtMenu(Player *player);
+    explicit PtMenu(PlayerGraphicsItem *player);
     void retranslateUi();
     void setShortcutsActive();
 
diff --git a/cockatrice/src/game/player/menu/rfg_menu.cpp b/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
similarity index 58%
rename from cockatrice/src/game/player/menu/rfg_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
index 25e162581..98514280f 100644
--- a/cockatrice/src/game/player/menu/rfg_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/rfg_menu.cpp
@@ -1,16 +1,29 @@
 #include "rfg_menu.h"
 
-#include "../player.h"
-#include "../player_actions.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"
 
-RfgMenu::RfgMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
+#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();
     createViewActions();
 
     addAction(aViewRfg);
 
-    if (player->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
         addSeparator();
         moveRfgMenu = addTearOffMenu(QString());
         moveRfgMenu->addAction(aMoveRfgToTopLibrary);
@@ -26,17 +39,17 @@ RfgMenu::RfgMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player
 
 void RfgMenu::createMoveActions()
 {
-    if (player->getPlayerInfo()->getLocalOrJudge()) {
-        auto rfg = player->getRfgZone();
+    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+        auto rfg = player->getLogic()->getRfgZone();
 
         aMoveRfgToTopLibrary = new QAction(this);
-        aMoveRfgToTopLibrary->setData(QList<QVariant>() << "deck" << 0);
+        aMoveRfgToTopLibrary->setData(QList<QVariant>() << ZoneNames::DECK << 0);
         aMoveRfgToBottomLibrary = new QAction(this);
-        aMoveRfgToBottomLibrary->setData(QList<QVariant>() << "deck" << -1);
+        aMoveRfgToBottomLibrary->setData(QList<QVariant>() << ZoneNames::DECK << -1);
         aMoveRfgToHand = new QAction(this);
-        aMoveRfgToHand->setData(QList<QVariant>() << "hand" << 0);
+        aMoveRfgToHand->setData(QList<QVariant>() << ZoneNames::HAND << 0);
         aMoveRfgToGrave = new QAction(this);
-        aMoveRfgToGrave->setData(QList<QVariant>() << "grave" << 0);
+        aMoveRfgToGrave->setData(QList<QVariant>() << ZoneNames::GRAVE << 0);
 
         connect(aMoveRfgToTopLibrary, &QAction::triggered, rfg, &PileZoneLogic::moveAllToZone);
         connect(aMoveRfgToBottomLibrary, &QAction::triggered, rfg, &PileZoneLogic::moveAllToZone);
@@ -47,7 +60,7 @@ void RfgMenu::createMoveActions()
 
 void RfgMenu::createViewActions()
 {
-    PlayerActions *playerActions = player->getPlayerActions();
+    PlayerActions *playerActions = player->getLogic()->getPlayerActions();
 
     aViewRfg = new QAction(this);
     connect(aViewRfg, &QAction::triggered, playerActions, &PlayerActions::actViewRfg);
@@ -59,7 +72,7 @@ void RfgMenu::retranslateUi()
 
     aViewRfg->setText(tr("&View exile"));
 
-    if (player->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
         moveRfgMenu->setTitle(tr("&Move exile to..."));
         aMoveRfgToTopLibrary->setText(tr("&Top of library"));
         aMoveRfgToBottomLibrary->setText(tr("&Bottom of library"));
diff --git a/cockatrice/src/game/player/menu/rfg_menu.h b/cockatrice/src/game_graphics/player/menu/rfg_menu.h
similarity index 53%
rename from cockatrice/src/game/player/menu/rfg_menu.h
rename to cockatrice/src/game_graphics/player/menu/rfg_menu.h
index 0b4623d2a..8e1460316 100644
--- a/cockatrice/src/game/player/menu/rfg_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/rfg_menu.h
@@ -1,26 +1,36 @@
 /**
  * @file rfg_menu.h
  * @ingroup GameMenusZones
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_RFG_MENU_H
 #define COCKATRICE_RFG_MENU_H
 
 #include "../../../interface/widgets/menus/tearoff_menu.h"
+#include "abstract_player_component.h"
 
-#include <QAction>
-#include <QMenu>
+#include <qtmetamacros.h>
 
-class Player;
-class RfgMenu : public TearOffMenu
+class PlayerGraphicsItem;
+class QAction;
+class QMenu;
+class QWidget;
+
+class RfgMenu : public TearOffMenu, public AbstractPlayerComponent
 {
     Q_OBJECT
 public:
-    explicit RfgMenu(Player *player, QWidget *parent = nullptr);
+    explicit RfgMenu(PlayerGraphicsItem *player, QWidget *parent = nullptr);
     void createMoveActions();
     void createViewActions();
-    void retranslateUi();
+    void retranslateUi() override;
+    void setShortcutsActive() override
+    {
+    }
+    void setShortcutsInactive() override
+    {
+    }
 
     QMenu *moveRfgMenu = nullptr;
 
@@ -31,7 +41,7 @@ public:
     QAction *aMoveRfgToGrave = nullptr;
 
 private:
-    Player *player;
+    PlayerGraphicsItem *player;
 };
 
 #endif // COCKATRICE_RFG_MENU_H
diff --git a/cockatrice/src/game_graphics/player/menu/say_menu.cpp b/cockatrice/src/game_graphics/player/menu/say_menu.cpp
new file mode 100644
index 000000000..d467c6469
--- /dev/null
+++ b/cockatrice/src/game_graphics/player/menu/say_menu.cpp
@@ -0,0 +1,61 @@
+#include "say_menu.h"
+
+#include "../../../client/settings/cache_settings.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 <QString>
+#include <libcockatrice/settings/message_settings.h>
+
+SayMenu::SayMenu(PlayerGraphicsItem *_player) : player(_player)
+{
+    connect(&SettingsCache::instance().messages(), &MessageSettings::messageMacrosChanged, this, &SayMenu::initSayMenu);
+    initSayMenu();
+    retranslateUi();
+}
+
+void SayMenu::retranslateUi()
+{
+    setTitle(tr("S&ay"));
+}
+
+void SayMenu::setShortcutsActive()
+{
+    shortcutsActive = true;
+
+    const auto menuActions = actions();
+    for (int i = 0; i < menuActions.size() && i < 10; ++i) {
+        menuActions[i]->setShortcut(QKeySequence("Ctrl+" + QString::number((i + 1) % 10)));
+    }
+}
+
+void SayMenu::setShortcutsInactive()
+{
+    shortcutsActive = false;
+
+    for (auto *action : actions()) {
+        action->setShortcut(QKeySequence());
+    }
+}
+
+void SayMenu::initSayMenu()
+{
+    clear();
+
+    int count = SettingsCache::instance().messages().getCount();
+    setEnabled(count > 0);
+
+    for (int i = 0; i < count; ++i) {
+        auto *newAction = new QAction(SettingsCache::instance().messages().getMessageAt(i), this);
+        connect(newAction, &QAction::triggered, player->getLogic()->getPlayerActions(), &PlayerActions::actSayMessage);
+        addAction(newAction);
+    }
+
+    if (shortcutsActive) {
+        setShortcutsActive();
+    }
+}
diff --git a/cockatrice/src/game_graphics/player/menu/say_menu.h b/cockatrice/src/game_graphics/player/menu/say_menu.h
new file mode 100644
index 000000000..72169d18f
--- /dev/null
+++ b/cockatrice/src/game_graphics/player/menu/say_menu.h
@@ -0,0 +1,35 @@
+/**
+ * @file say_menu.h
+ * @ingroup GameMenusPlayers
+ */
+//! \todo Document this file.
+
+#ifndef COCKATRICE_SAY_MENU_H
+#define COCKATRICE_SAY_MENU_H
+
+#include "abstract_player_component.h"
+
+#include <QMenu>
+#include <qtmetamacros.h>
+
+class PlayerGraphicsItem;
+
+class SayMenu : public QMenu, public AbstractPlayerComponent
+{
+    Q_OBJECT
+public:
+    explicit SayMenu(PlayerGraphicsItem *player);
+
+    void retranslateUi() override;
+    void setShortcutsActive() override;
+    void setShortcutsInactive() override;
+
+private slots:
+    void initSayMenu();
+
+private:
+    PlayerGraphicsItem *player;
+    bool shortcutsActive = false;
+};
+
+#endif // COCKATRICE_SAY_MENU_H
diff --git a/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp b/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
new file mode 100644
index 000000000..1eef3604f
--- /dev/null
+++ b/cockatrice/src/game_graphics/player/menu/sideboard_menu.cpp
@@ -0,0 +1,42 @@
+#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);
+    connect(aViewSideboard, &QAction::triggered, player->getLogic()->getPlayerActions(),
+            &PlayerActions::actViewSideboard);
+
+    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+        addAction(aViewSideboard);
+    }
+
+    retranslateUi();
+}
+
+void SideboardMenu::retranslateUi()
+{
+    setTitle(tr("&Sideboard"));
+    aViewSideboard->setText(tr("&View sideboard"));
+}
+
+void SideboardMenu::setShortcutsActive()
+{
+    ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
+
+    aViewSideboard->setShortcuts(shortcuts.getShortcut("Player/aViewSideboard"));
+}
+
+void SideboardMenu::setShortcutsInactive()
+{
+    aViewSideboard->setShortcut(QKeySequence());
+}
\ No newline at end of file
diff --git a/cockatrice/src/game_graphics/player/menu/sideboard_menu.h b/cockatrice/src/game_graphics/player/menu/sideboard_menu.h
new file mode 100644
index 000000000..3e6501c90
--- /dev/null
+++ b/cockatrice/src/game_graphics/player/menu/sideboard_menu.h
@@ -0,0 +1,34 @@
+/**
+ * @file sideboard_menu.h
+ * @ingroup GameMenusZones
+ */
+//! \todo Document this file.
+
+#ifndef COCKATRICE_SIDEBOARD_MENU_H
+#define COCKATRICE_SIDEBOARD_MENU_H
+
+#include "abstract_player_component.h"
+
+#include <QMenu>
+#include <qtmetamacros.h>
+
+class PlayerGraphicsItem;
+class QAction;
+
+class SideboardMenu : public QMenu, public AbstractPlayerComponent
+{
+    Q_OBJECT
+
+public:
+    explicit SideboardMenu(PlayerGraphicsItem *player, QMenu *playerMenu);
+    void retranslateUi() override;
+    void setShortcutsActive() override;
+    void setShortcutsInactive() override;
+
+private:
+    PlayerGraphicsItem *player;
+
+    QAction *aViewSideboard;
+};
+
+#endif // COCKATRICE_SIDEBOARD_MENU_H
diff --git a/cockatrice/src/game_graphics/player/menu/tally_menu.cpp b/cockatrice/src/game_graphics/player/menu/tally_menu.cpp
new file mode 100644
index 000000000..7ae5b36ce
--- /dev/null
+++ b/cockatrice/src/game_graphics/player/menu/tally_menu.cpp
@@ -0,0 +1,63 @@
+#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()
+{
+    actionGroup = new QActionGroup(this);
+    actionGroup->setExclusive(true);
+
+    aTallyNone = createTallyAction(TallyType::None);
+    aTallySubtypes = createTallyAction(TallyType::Subtypes);
+    aTallyTotalPower = createTallyAction(TallyType::TotalPower);
+    aTallyTotalToughness = createTallyAction(TallyType::TotalToughness);
+
+    addAction(aTallyNone);
+    addSeparator();
+    addAction(aTallySubtypes);
+    addAction(aTallyTotalPower);
+    addAction(aTallyTotalToughness);
+
+    retranslateUi();
+}
+
+QAction *TallyMenu::createTallyAction(TallyType tallyType)
+{
+    TallyType currentType = Tally::intToType(SettingsCache::instance().userInterface().getTallyType());
+
+    QAction *action = new QAction(this);
+    action->setCheckable(true);
+    action->setChecked(tallyType == currentType);
+
+    connect(action, &QAction::triggered, &SettingsCache::instance().userInterface(),
+            [tallyType] { SettingsCache::instance().userInterface().setTallyType(static_cast<int>(tallyType)); });
+
+    actionGroup->addAction(action);
+
+    return action;
+}
+
+void TallyMenu::setShortcutsActive()
+{
+    // no-op because we haven't decided if we're adding shortcuts for tally types
+}
+
+void TallyMenu::setShortcutsInactive()
+{
+    // no-op because we haven't decided if we're adding shortcuts for tally types
+}
+
+void TallyMenu::retranslateUi()
+{
+    setTitle(tr("Tally"));
+
+    aTallyNone->setText(tr("None"));
+    aTallySubtypes->setText(tr("Subtypes"));
+    aTallyTotalPower->setText(tr("Total Power"));
+    aTallyTotalToughness->setText(tr("Total Toughness"));
+}
diff --git a/cockatrice/src/game_graphics/player/menu/tally_menu.h b/cockatrice/src/game_graphics/player/menu/tally_menu.h
new file mode 100644
index 000000000..75bd41ac0
--- /dev/null
+++ b/cockatrice/src/game_graphics/player/menu/tally_menu.h
@@ -0,0 +1,35 @@
+#ifndef COCKATRICE_TALLY_MENU_H
+#define COCKATRICE_TALLY_MENU_H
+
+#include "../../../interface/widgets/menus/tearoff_menu.h"
+#include "abstract_player_component.h"
+
+#include <qtmetamacros.h>
+
+class QAction;
+class QActionGroup;
+enum class TallyType;
+
+class TallyMenu : public TearOffMenu, public AbstractPlayerComponent
+{
+    Q_OBJECT
+
+public:
+    TallyMenu();
+
+    void setShortcutsActive() override;
+    void setShortcutsInactive() override;
+    void retranslateUi() override;
+
+private:
+    QActionGroup *actionGroup = nullptr;
+
+    QAction *aTallyNone = nullptr;
+    QAction *aTallySubtypes = nullptr;
+    QAction *aTallyTotalPower = nullptr;
+    QAction *aTallyTotalToughness = nullptr;
+
+    QAction *createTallyAction(TallyType tallyType);
+};
+
+#endif // COCKATRICE_TALLY_MENU_H
diff --git a/cockatrice/src/game/player/menu/utility_menu.cpp b/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
similarity index 54%
rename from cockatrice/src/game/player/menu/utility_menu.cpp
rename to cockatrice/src/game_graphics/player/menu/utility_menu.cpp
index a3117abf8..7c18b3f4c 100644
--- a/cockatrice/src/game/player/menu/utility_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
@@ -1,42 +1,62 @@
 #include "utility_menu.h"
 
-#include "../../../interface/deck_loader/deck_loader.h"
-#include "../player.h"
-#include "../player_actions.h"
-#include "player_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 "../../game_scene.h"
+#include "../player_graphics_item.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/deck_list/deck_list.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>
 
-UtilityMenu::UtilityMenu(Player *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player)
+UtilityMenu::UtilityMenu(PlayerGraphicsItem *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player)
 {
-    PlayerActions *playerActions = player->getPlayerActions();
+    PlayerActions *playerActions = player->getLogic()->getPlayerActions();
+    connect(playerActions, &PlayerActions::requestEnableAndSetCreateAnotherTokenAction, this,
+            &UtilityMenu::setAndEnableCreateAnotherTokenAction);
+    connect(playerActions, &PlayerActions::requestSetLastToken, this, &UtilityMenu::setLastToken);
 
-    if (player->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
         aUntapAll = new QAction(this);
         connect(aUntapAll, &QAction::triggered, playerActions, &PlayerActions::actUntapAll);
 
         aRollDie = new QAction(this);
-        connect(aRollDie, &QAction::triggered, playerActions, &PlayerActions::actRollDie);
+        connect(aRollDie, &QAction::triggered, playerActions, &PlayerActions::actRequestRollDieDialog);
+
+        aFlipCoin = new QAction(this);
+        connect(aFlipCoin, &QAction::triggered, playerActions, &PlayerActions::actFlipCoin);
 
         aCreateToken = new QAction(this);
-        connect(aCreateToken, &QAction::triggered, playerActions, &PlayerActions::actCreateToken);
+        connect(aCreateToken, &QAction::triggered, playerActions, [this]() {
+            player->getLogic()->getPlayerActions()->actRequestCreateTokenDialog(getPredefinedTokens());
+        });
 
         aCreateAnotherToken = new QAction(this);
         connect(aCreateAnotherToken, &QAction::triggered, playerActions, &PlayerActions::actCreateAnotherToken);
         aCreateAnotherToken->setEnabled(false);
 
         aIncrementAllCardCounters = new QAction(this);
-        connect(aIncrementAllCardCounters, &QAction::triggered, player, &Player::incrementAllCardCounters);
+        connect(aIncrementAllCardCounters, &QAction::triggered, playerActions, [this]() {
+            player->getLogic()->getPlayerActions()->actIncrementAllCardCounters(
+                player->getGameScene()->selectedCards());
+        });
 
         createPredefinedTokenMenu = new QMenu(QString());
         createPredefinedTokenMenu->setEnabled(false);
-        connect(player, &Player::deckChanged, this, &UtilityMenu::populatePredefinedTokensMenu);
+        connect(player->getLogic(), &PlayerLogic::deckChanged, this, &UtilityMenu::populatePredefinedTokensMenu);
 
         playerMenu->addAction(aIncrementAllCardCounters);
         playerMenu->addSeparator();
         playerMenu->addAction(aUntapAll);
         playerMenu->addSeparator();
         playerMenu->addAction(aRollDie);
+        playerMenu->addAction(aFlipCoin);
         playerMenu->addSeparator();
         playerMenu->addAction(aCreateToken);
         playerMenu->addAction(aCreateAnotherToken);
@@ -49,6 +69,7 @@ UtilityMenu::UtilityMenu(Player *_player, QMenu *playerMenu) : QMenu(playerMenu)
         aIncrementAllCardCounters = nullptr;
         aUntapAll = nullptr;
         aRollDie = nullptr;
+        aFlipCoin = nullptr;
     }
 
     retranslateUi();
@@ -59,37 +80,46 @@ void UtilityMenu::populatePredefinedTokensMenu()
     clear();
     setEnabled(false);
     predefinedTokens.clear();
-    DeckLoader *_deck = player->getDeck();
+    const DeckList &deckList = player->getLogic()->getDeck();
 
-    if (!_deck) {
+    if (deckList.isEmpty()) {
         return;
     }
 
-    InnerDecklistNode *tokenZone =
-        dynamic_cast<InnerDecklistNode *>(_deck->getDeckList()->getRoot()->findChild(DECK_ZONE_TOKENS));
+    auto tokenCardNodes = deckList.getCardNodes({DECK_ZONE_TOKENS});
 
-    if (tokenZone) {
-        if (!tokenZone->empty())
-            setEnabled(true);
+    if (!tokenCardNodes.isEmpty()) {
+        setEnabled(true);
 
-        for (int i = 0; i < tokenZone->size(); ++i) {
-            const QString tokenName = tokenZone->at(i)->getName();
+        for (int i = 0; i < tokenCardNodes.size(); ++i) {
+            const QString tokenName = tokenCardNodes[i]->getName();
             predefinedTokens.append(tokenName);
             QAction *a = addAction(tokenName);
             if (i < 10) {
                 a->setShortcut(QKeySequence("Alt+" + QString::number((i + 1) % 10)));
             }
-            connect(a, &QAction::triggered, player->getPlayerActions(), &PlayerActions::actCreatePredefinedToken);
+            connect(a, &QAction::triggered, player->getLogic()->getPlayerActions(),
+                    &PlayerActions::actCreatePredefinedToken);
         }
     }
 }
 
+void UtilityMenu::setLastToken(CardInfoPtr lastToken)
+{
+    if (!createAnotherTokenActionExists()) {
+        return;
+    }
+
+    player->getLogic()->getPlayerActions()->setLastTokenInfo(lastToken);
+}
+
 void UtilityMenu::retranslateUi()
 {
-    if (player->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
         aIncrementAllCardCounters->setText(tr("Increment all card counters"));
         aUntapAll->setText(tr("&Untap all permanents"));
         aRollDie->setText(tr("R&oll die..."));
+        aFlipCoin->setText(tr("Flip coin"));
         aCreateToken->setText(tr("&Create token..."));
         aCreateAnotherToken->setText(tr("C&reate another token"));
         createPredefinedTokenMenu->setTitle(tr("Cr&eate predefined token"));
@@ -100,10 +130,11 @@ void UtilityMenu::setShortcutsActive()
 {
     ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
 
-    if (player->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
         aIncrementAllCardCounters->setShortcuts(shortcuts.getShortcut("Player/aIncrementAllCardCounters"));
         aUntapAll->setShortcuts(shortcuts.getShortcut("Player/aUntapAll"));
         aRollDie->setShortcuts(shortcuts.getShortcut("Player/aRollDie"));
+        aFlipCoin->setShortcuts(shortcuts.getShortcut("Player/aFlipCoin"));
         aCreateToken->setShortcuts(shortcuts.getShortcut("Player/aCreateToken"));
         aCreateAnotherToken->setShortcuts(shortcuts.getShortcut("Player/aCreateAnotherToken"));
     }
@@ -111,9 +142,10 @@ void UtilityMenu::setShortcutsActive()
 
 void UtilityMenu::setShortcutsInactive()
 {
-    if (player->getPlayerInfo()->getLocalOrJudge()) {
+    if (player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
         aUntapAll->setShortcut(QKeySequence());
         aRollDie->setShortcut(QKeySequence());
+        aFlipCoin->setShortcut(QKeySequence());
         aCreateToken->setShortcut(QKeySequence());
         aCreateAnotherToken->setShortcut(QKeySequence());
         aIncrementAllCardCounters->setShortcut(QKeySequence());
diff --git a/cockatrice/src/game/player/menu/utility_menu.h b/cockatrice/src/game_graphics/player/menu/utility_menu.h
similarity index 52%
rename from cockatrice/src/game/player/menu/utility_menu.h
rename to cockatrice/src/game_graphics/player/menu/utility_menu.h
index ff57e7252..009e4aca3 100644
--- a/cockatrice/src/game/player/menu/utility_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/utility_menu.h
@@ -1,26 +1,36 @@
 /**
  * @file utility_menu.h
  * @ingroup GameMenusPlayers
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_UTILITY_MENU_H
 #define COCKATRICE_UTILITY_MENU_H
 
-#include <QMenu>
+#include "abstract_player_component.h"
 
-class Player;
-class UtilityMenu : public QMenu
+#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
 public slots:
     void populatePredefinedTokensMenu();
-    void retranslateUi();
-    void setShortcutsActive();
-    void setShortcutsInactive();
+    void setLastToken(CardInfoPtr lastToken);
+    void retranslateUi() override;
+    void setShortcutsActive() override;
+    void setShortcutsInactive() override;
 
 public:
-    explicit UtilityMenu(Player *player, QMenu *playerMenu);
+    explicit UtilityMenu(PlayerGraphicsItem *player, QMenu *playerMenu);
 
     [[nodiscard]] bool createAnotherTokenActionExists() const
     {
@@ -29,7 +39,7 @@ public:
 
     void setAndEnableCreateAnotherTokenAction(QString text)
     {
-        aCreateAnotherToken->setText(text);
+        aCreateAnotherToken->setText(tr("C&reate another %1 token").arg(text));
         aCreateAnotherToken->setEnabled(true);
     }
 
@@ -39,13 +49,13 @@ public:
     }
 
 private:
-    Player *player;
+    PlayerGraphicsItem *player;
     QStringList predefinedTokens;
 
     QMenu *createPredefinedTokenMenu;
 
     QAction *aIncrementAllCardCounters;
-    QAction *aUntapAll, *aRollDie;
+    QAction *aUntapAll, *aRollDie, *aFlipCoin;
     QAction *aCreateToken, *aCreateAnotherToken;
 };
 
diff --git a/cockatrice/src/game/player/player_area.cpp b/cockatrice/src/game_graphics/player/player_area.cpp
similarity index 97%
rename from cockatrice/src/game/player/player_area.cpp
rename to cockatrice/src/game_graphics/player/player_area.cpp
index 86b8c2d1b..2af642eb5 100644
--- a/cockatrice/src/game/player/player_area.cpp
+++ b/cockatrice/src/game_graphics/player/player_area.cpp
@@ -2,6 +2,7 @@
 
 #include "../../interface/theme_manager.h"
 
+#include <QBrush>
 #include <QPainter>
 
 PlayerArea::PlayerArea(QGraphicsItem *parentItem) : QObject(), QGraphicsItem(parentItem)
diff --git a/cockatrice/src/game/player/player_area.h b/cockatrice/src/game_graphics/player/player_area.h
similarity index 83%
rename from cockatrice/src/game/player/player_area.h
rename to cockatrice/src/game_graphics/player/player_area.h
index ec0d23cb6..7370a78be 100644
--- a/cockatrice/src/game/player/player_area.h
+++ b/cockatrice/src/game_graphics/player/player_area.h
@@ -1,14 +1,21 @@
 /**
  * @file player_area.h
  * @ingroup GameGraphicsPlayers
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_PLAYER_AREA_H
 #define COCKATRICE_PLAYER_AREA_H
 
-#include "../../game_graphics/board/graphics_item_type.h"
-#include "QGraphicsItem"
+#include "../board/graphics_item_type.h"
+
+#include <QGraphicsItem>
+#include <QObject>
+#include <QRectF>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class 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
new file mode 100644
index 000000000..74f5de601
--- /dev/null
+++ b/cockatrice/src/game_graphics/player/player_dialogs.cpp
@@ -0,0 +1,308 @@
+#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>
+
+PlayerDialogs::PlayerDialogs(PlayerGraphicsItem *_player, PlayerActions *_playerActions)
+    : QObject(_player), player(_player), playerActions(_playerActions)
+{
+    connect(playerActions, &PlayerActions::requestViewTopCardsDialog, this,
+            &PlayerDialogs::onViewTopCardsDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestViewBottomCardsDialog, this,
+            &PlayerDialogs::onViewBottomCardsDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestShuffleTopDialog, this, &PlayerDialogs::onShuffleTopDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestShuffleBottomDialog, this,
+            &PlayerDialogs::onShuffleBottomDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestMulliganDialog, this, &PlayerDialogs::onMulliganDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestDrawCardsDialog, this, &PlayerDialogs::onDrawCardsDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestMoveTopCardsToDialog, this,
+            &PlayerDialogs::onMoveTopCardsToDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestMoveTopCardsUntilDialog, this,
+            &PlayerDialogs::onMoveTopCardsUntilDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestMoveBottomCardsToDialog, this,
+            &PlayerDialogs::onMoveBottomCardsToDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestDrawBottomCardsDialog, this,
+            &PlayerDialogs::onDrawBottomCardsDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestRollDieDialog, this, &PlayerDialogs::onRollDieDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestCreateTokenDialog, this,
+            &PlayerDialogs::onCreateTokenDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestCreateRelatedFromRelationDialog, this,
+            &PlayerDialogs::onCreateRelatedFromRelationDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestMoveCardXCardsFromTopDialog, this,
+            &PlayerDialogs::onMoveCardXCardsFromTopDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestSetPTDialog, this, &PlayerDialogs::onSetPTDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestSetAnnotationDialog, this,
+            &PlayerDialogs::onSetAnnotationDialogRequested);
+
+    connect(playerActions, &PlayerActions::requestSetCardCounterDialog, this,
+            &PlayerDialogs::onSetCardCounterDialogRequested);
+}
+
+void PlayerDialogs::onViewTopCardsDialogRequested(int defaultNumberTopCards, int deckSize)
+{
+    bool ok;
+    int number = QInputDialog::getInt(dialogParent(), tr("View top cards of library"),
+                                      tr("Number of cards: (max. %1)").arg(deckSize), defaultNumberTopCards, 1,
+                                      deckSize, 1, &ok);
+    if (ok) {
+        playerActions->actViewTopCards(number);
+    }
+}
+
+void PlayerDialogs::onViewBottomCardsDialogRequested(int defaultNumberBottomCards, int deckSize)
+{
+    bool ok;
+    int number = QInputDialog::getInt(dialogParent(), tr("View bottom cards of library"),
+                                      tr("Number of cards: (max. %1)").arg(deckSize), defaultNumberBottomCards, 1,
+                                      deckSize, 1, &ok);
+    if (ok) {
+        playerActions->actViewBottomCards(number);
+    }
+}
+
+void PlayerDialogs::onShuffleTopDialogRequested(int defaultNumberTopCards, int maxCards)
+{
+    bool ok;
+    int number = QInputDialog::getInt(dialogParent(), tr("Shuffle top cards of library"),
+                                      tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberTopCards, 1,
+                                      maxCards, 1, &ok);
+    if (ok) {
+        playerActions->actShuffleTop(number);
+    }
+}
+
+void PlayerDialogs::onShuffleBottomDialogRequested(int defaultNumberBottomCards, int maxCards)
+{
+    bool ok;
+    int number = QInputDialog::getInt(dialogParent(), tr("Shuffle bottom cards of library"),
+                                      tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberBottomCards, 1,
+                                      maxCards, 1, &ok);
+    if (ok) {
+        playerActions->actShuffleBottom(number);
+    }
+}
+
+void PlayerDialogs::onMulliganDialogRequested(int startSize, int handSize, int deckSize)
+{
+    bool ok;
+    int number = QInputDialog::getInt(dialogParent(), tr("Draw hand"),
+                                      tr("Number of cards: (max. %1)").arg(deckSize) + '\n' +
+                                          tr("0 and lower are in comparison to current hand size"),
+                                      startSize, -handSize, deckSize, 1, &ok);
+
+    if (ok) {
+        playerActions->actMulligan(number);
+    }
+}
+
+void PlayerDialogs::onDrawCardsDialogRequested(int defaultNumberTopCards, int deckSize)
+{
+    bool ok;
+    int number = QInputDialog::getInt(dialogParent(), tr("Draw cards"), tr("Number of cards: (max. %1)").arg(deckSize),
+                                      defaultNumberTopCards, 1, deckSize, 1, &ok);
+
+    if (ok) {
+        playerActions->actDrawCards(number);
+    }
+}
+
+void PlayerDialogs::onMoveTopCardsToDialogRequested(int defaultNumberTopCards,
+                                                    int maxCards,
+                                                    const QString &targetZone,
+                                                    const QString &zoneDisplayName,
+                                                    bool faceDown)
+{
+    bool ok;
+    int number = QInputDialog::getInt(dialogParent(), tr("Move top cards to %1").arg(zoneDisplayName),
+                                      tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberTopCards, 1,
+                                      maxCards, 1, &ok);
+    if (ok) {
+        playerActions->moveTopCardsTo(number, targetZone, faceDown);
+    }
+}
+
+void PlayerDialogs::onMoveTopCardsUntilDialogRequested(MoveTopCardsUntilOptions options)
+{
+    DlgMoveTopCardsUntil dlg(dialogParent(), options);
+    if (!dlg.exec()) {
+        return;
+    }
+    playerActions->moveTopCardsUntil(dlg.getExpr(), dlg.getOptions());
+}
+
+void PlayerDialogs::onMoveBottomCardsToDialogRequested(int defaultNumberBottomCards,
+                                                       int maxCards,
+                                                       const QString &targetZone,
+                                                       const QString &zoneDisplayName,
+                                                       bool faceDown)
+{
+    bool ok;
+    int number = QInputDialog::getInt(dialogParent(), tr("Move bottom cards to %1").arg(zoneDisplayName),
+                                      tr("Number of cards: (max. %1)").arg(maxCards), defaultNumberBottomCards, 1,
+                                      maxCards, 1, &ok);
+    if (ok) {
+        playerActions->moveBottomCardsTo(number, targetZone, faceDown);
+    }
+}
+
+void PlayerDialogs::onDrawBottomCardsDialogRequested(int defaultNumberBottomCards, int maxCards)
+{
+    bool ok;
+    int number =
+        QInputDialog::getInt(dialogParent(), tr("Draw bottom cards"), tr("Number of cards: (max. %1)").arg(maxCards),
+                             defaultNumberBottomCards, 1, maxCards, 1, &ok);
+    if (ok) {
+        playerActions->actDrawBottomCards(number);
+    }
+}
+
+void PlayerDialogs::onRollDieDialogRequested()
+{
+    DlgRollDice dlg(dialogParent());
+    if (!dlg.exec()) {
+        return;
+    }
+    playerActions->actRollDie(dlg.getDieSideCount(), dlg.getDiceToRollCount());
+}
+
+void PlayerDialogs::onCreateRelatedFromRelationDialogRequested(const CardItem *sourceCard,
+                                                               const CardRelation *cardRelation)
+{
+    if (sourceCard == nullptr || cardRelation == nullptr) {
+        playerActions->setLastRelatedCreationSucceeded(false);
+        return;
+    }
+
+    int variableCount = cardRelation->getDefaultCount();
+
+    if (cardRelation->getIsVariable()) {
+        bool ok;
+
+        emit requestDialogSemaphore(true);
+
+        variableCount = QInputDialog::getInt(dialogParent(), tr("Create tokens"), tr("Number:"),
+                                             cardRelation->getDefaultCount(), 1, MAX_TOKENS_PER_DIALOG, 1, &ok);
+
+        emit requestDialogSemaphore(false);
+
+        if (!ok) {
+            playerActions->setLastRelatedCreationSucceeded(false); // cancelled
+            return;
+        }
+    }
+
+    const bool succeeded = playerActions->createRelatedFromRelation(sourceCard, cardRelation, variableCount);
+
+    playerActions->setLastRelatedCreationSucceeded(succeeded);
+
+    if (succeeded) {
+        playerActions->onRelatedCardCreated(sourceCard, cardRelation); // only on confirmed success
+    }
+}
+
+void PlayerDialogs::onCreateTokenDialogRequested(const QStringList &predefinedTokens)
+{
+    DlgCreateToken dlg(predefinedTokens, dialogParent());
+    if (!dlg.exec()) {
+        return;
+    }
+
+    playerActions->actCreateToken(dlg.getTokenInfo());
+}
+
+void PlayerDialogs::onMoveCardXCardsFromTopDialogRequested(int defaultNumberTopCardsToPlaceBelow, int deckSize)
+{
+    bool ok;
+    int number =
+        QInputDialog::getInt(dialogParent(), tr("Place card X cards from top of library"),
+                             tr("Which position should this card be placed:") + "\n" + tr("(max. %1)").arg(deckSize),
+                             defaultNumberTopCardsToPlaceBelow, 1, deckSize, 1, &ok);
+    number -= 1; // indexes start at 0
+
+    if (ok) {
+        playerActions->actMoveCardXCardsFromTop(player->getGameScene()->selectedCards(), number);
+    }
+}
+
+void PlayerDialogs::onSetPTDialogRequested(const QString &oldPT)
+{
+    bool ok;
+    auto cards = player->getGameScene()->selectedCards();
+    emit requestDialogSemaphore(true);
+    QString pt = getTextWithMax(dialogParent(), tr("Change power/toughness"), tr("Change stats to:"), QLineEdit::Normal,
+                                oldPT, &ok);
+    emit requestDialogSemaphore(false);
+
+    if (!ok || player->getLogic()->clearCardsToDelete()) {
+        return;
+    }
+
+    playerActions->actSetPT(cards, pt);
+}
+
+void PlayerDialogs::onSetAnnotationDialogRequested(const QString &oldAnnotation)
+{
+    auto cards = player->getGameScene()->selectedCards();
+    emit requestDialogSemaphore(true);
+    AnnotationDialog *dialog = new AnnotationDialog(dialogParent());
+    dialog->setOptions(QInputDialog::UsePlainTextEditForTextInput);
+    dialog->setWindowTitle(tr("Set annotation"));
+    dialog->setLabelText(tr("Please enter the new annotation:"));
+    dialog->setTextValue(oldAnnotation);
+    bool ok = dialog->exec();
+    emit requestDialogSemaphore(false);
+    if (!ok || player->getLogic()->clearCardsToDelete()) {
+        return;
+    }
+    QString annotation = dialog->textValue().left(MAX_NAME_LENGTH);
+    playerActions->actSetAnnotation(cards, annotation);
+}
+
+void PlayerDialogs::onSetCardCounterDialogRequested(int counterId, const QString &oldValueForDlg)
+{
+    auto cards = player->getGameScene()->selectedCards();
+    emit requestDialogSemaphore(true);
+
+    auto &cardCounterSettings = SettingsCache::instance().cardCounters();
+    QString counterName = cardCounterSettings.displayName(counterId);
+
+    AbstractCounterDialog dialog(counterName, oldValueForDlg, dialogParent());
+    int ok = dialog.exec();
+
+    emit requestDialogSemaphore(false);
+    if (!ok || player->getLogic()->clearCardsToDelete()) {
+        return;
+    }
+    playerActions->actSetCardCounter(cards, counterId, dialog.textValue());
+}
\ No newline at end of file
diff --git a/cockatrice/src/game_graphics/player/player_dialogs.h b/cockatrice/src/game_graphics/player/player_dialogs.h
new file mode 100644
index 000000000..86d7282a2
--- /dev/null
+++ b/cockatrice/src/game_graphics/player/player_dialogs.h
@@ -0,0 +1,77 @@
+#ifndef COCKATRICE_PLAYER_DIALOGS_H
+#define COCKATRICE_PLAYER_DIALOGS_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 PlayerDialogs : public QObject
+{
+
+    Q_OBJECT
+
+public:
+    explicit PlayerDialogs(PlayerGraphicsItem *player, PlayerActions *playerActions);
+
+signals:
+    void requestDialogSemaphore(bool active);
+
+public slots:
+    void onViewTopCardsDialogRequested(int defaultNumberTopCards, int deckSize);
+    void onViewBottomCardsDialogRequested(int defaultNumberBottomCards, int deckSize);
+    void onShuffleTopDialogRequested(int defaultNumberTopCards, int maxCards);
+    void onShuffleBottomDialogRequested(int defaultNumberBottomCards, int maxCards);
+    void onMulliganDialogRequested(int startSize, int handSize, int deckSize);
+    void onDrawCardsDialogRequested(int defaultNumberTopCards, int deckSize);
+    void onMoveTopCardsToDialogRequested(int defaultNumberTopCards,
+                                         int maxCards,
+                                         const QString &targetZone,
+                                         const QString &zoneDisplayName,
+                                         bool faceDown);
+    void onMoveTopCardsUntilDialogRequested(MoveTopCardsUntilOptions options);
+    void onMoveBottomCardsToDialogRequested(int defaultNumberBottomCards,
+                                            int maxCards,
+                                            const QString &targetZone,
+                                            const QString &zoneDisplayName,
+                                            bool faceDown);
+    void onDrawBottomCardsDialogRequested(int defaultNumberBottomCards, int maxCards);
+    void onRollDieDialogRequested();
+    void onCreateRelatedFromRelationDialogRequested(const CardItem *sourceCard, const CardRelation *cardRelation);
+    void onCreateTokenDialogRequested(const QStringList &predefinedTokens);
+    void onMoveCardXCardsFromTopDialogRequested(int defaultNumberTopCardsToPlaceBelow, int deckSize);
+    void onSetPTDialogRequested(const QString &oldPT);
+    void onSetAnnotationDialogRequested(const QString &oldAnnotation);
+    void onSetCardCounterDialogRequested(int counterId, const QString &oldValueForDlg);
+
+private:
+    PlayerGraphicsItem *player;
+    PlayerActions *playerActions;
+
+    QWidget *dialogParent() const
+    {
+        if (auto *s = player->scene()) {
+            if (auto *v = s->views().value(0)) {
+                return v->window();
+            }
+        }
+        return nullptr;
+    }
+};
+
+#endif // COCKATRICE_PLAYER_DIALOGS_H
diff --git a/cockatrice/src/game_graphics/player/player_graphics_item.cpp b/cockatrice/src/game_graphics/player/player_graphics_item.cpp
new file mode 100644
index 000000000..419816087
--- /dev/null
+++ b/cockatrice/src/game_graphics/player/player_graphics_item.cpp
@@ -0,0 +1,493 @@
+#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 "../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 <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)
+{
+    connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::horizontalHandChanged, this,
+            &PlayerGraphicsItem::rearrangeZones);
+    connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::handJustificationChanged, this,
+            &PlayerGraphicsItem::rearrangeZones);
+    connect(player, &PlayerLogic::rearrangeCounters, this, &PlayerGraphicsItem::rearrangeCounters);
+    connect(player, &PlayerLogic::activeChanged, this, &PlayerGraphicsItem::onPlayerActiveChanged);
+    connect(player, &PlayerLogic::concededChanged, this, [this](int, bool c) { setVisible(!c); });
+    connect(player, &PlayerLogic::zoneIdChanged, this, [this](int id) { playerArea->setPlayerZoneId(id); });
+
+    connect(player, &PlayerLogic::counterAdded, this, &PlayerGraphicsItem::onCounterAdded);
+    connect(player, &PlayerLogic::counterRemoved, this, &PlayerGraphicsItem::onCounterRemoved);
+    connect(player, &PlayerLogic::deckChanged, this, &PlayerGraphicsItem::updatePlaymat);
+    connect(player, &PlayerLogic::playmatChanged, this, &PlayerGraphicsItem::updatePlaymat);
+    connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::playmatVisibilityChanged, this,
+            [this](int) { updatePlaymat(); });
+
+    playerMenu = new PlayerMenu(this);
+
+    connect(playerMenu, &PlayerMenu::shortcutsActivated, this, [this]() {
+        for (auto *ctr : counterWidgets) {
+            ctr->setShortcutsActive();
+        }
+    });
+    connect(playerMenu, &PlayerMenu::shortcutsDeactivated, this, [this]() {
+        for (auto *ctr : counterWidgets) {
+            ctr->setShortcutsInactive();
+        }
+    });
+    connect(playerMenu, &PlayerMenu::retranslateRequested, this, [this]() {
+        for (auto *ctr : counterWidgets) {
+            ctr->retranslateUi();
+        }
+    });
+
+    playerDialogs = new PlayerDialogs(this, player->getPlayerActions());
+
+    connect(playerDialogs, &PlayerDialogs::requestDialogSemaphore, player, &PlayerLogic::setDialogSemaphore);
+
+    playerArea = new PlayerArea(this);
+
+    playerTarget = new PlayerTarget(player, playerArea);
+    qreal avatarMargin =
+        (counterAreaWidth + CardDimensions::HEIGHT_F + 15 - playerTarget->boundingRect().width()) / 2.0;
+    playerTarget->setPos(QPointF(avatarMargin, avatarMargin));
+
+    initializeZones();
+
+    connect(player, &PlayerLogic::addViewCustomZoneActionToCustomZoneMenu, this,
+            &PlayerGraphicsItem::onCustomZoneAdded);
+
+    playerMenu->setMenusForGraphicItems();
+
+    connect(tableZoneGraphicsItem, &TableZone::sizeChanged, this, &PlayerGraphicsItem::updateBoundingRect);
+
+    connect(this, &PlayerGraphicsItem::playmatChanged, tableZoneGraphicsItem, &TableZone::onPlaymatChanged);
+    connect(this, &PlayerGraphicsItem::playmatChanged, stackZoneGraphicsItem, &StackZone::onPlaymatChanged);
+
+    updateBoundingRect();
+
+    rearrangeZones();
+    retranslateUi();
+}
+
+void PlayerGraphicsItem::retranslateUi()
+{
+    playerMenu->retranslateUi();
+
+    QMapIterator<QString, CardZoneLogic *> zoneIterator(player->getZones());
+    while (zoneIterator.hasNext()) {
+        emit zoneIterator.next().value()->retranslateUi();
+    }
+}
+
+void PlayerGraphicsItem::onPlayerActiveChanged(bool _active)
+{
+    tableZoneGraphicsItem->setActive(_active);
+}
+
+void PlayerGraphicsItem::initializeZones()
+{
+    deckZoneGraphicsItem = new PileZone(player->getDeckZone(), this);
+    auto base = QPointF(counterAreaWidth + (CardDimensions::HEIGHT_F - CardDimensions::WIDTH_F + 15) / 2.0,
+                        10 + playerTarget->boundingRect().height() + 5 -
+                            (CardDimensions::HEIGHT_F - CardDimensions::WIDTH_F) / 2.0);
+    deckZoneGraphicsItem->setPos(base);
+
+    qreal h = deckZoneGraphicsItem->boundingRect().width() + 5;
+
+    sideboardGraphicsItem = new PileZone(player->getSideboardZone(), this);
+    player->getSideboardZone()->setGraphicsVisibility(false);
+
+    auto *handCounter = new HandCounter(playerArea);
+    handCounter->setPos(base + QPointF(0, h + 10));
+    qreal h2 = handCounter->boundingRect().height();
+
+    graveyardZoneGraphicsItem = new PileZone(player->getGraveZone(), this);
+    graveyardZoneGraphicsItem->setPos(base + QPointF(0, h + h2 + 10));
+
+    rfgZoneGraphicsItem = new PileZone(player->getRfgZone(), this);
+    rfgZoneGraphicsItem->setPos(base + QPointF(0, 2 * h + h2 + 10));
+
+    tableZoneGraphicsItem = new TableZone(player->getTableZone(), mirrored, this);
+    connect(this, &PlayerGraphicsItem::mirroredChanged, tableZoneGraphicsItem, &TableZone::setMirrored);
+
+    stackZoneGraphicsItem =
+        new StackZone(player->getStackZone(), static_cast<int>(tableZoneGraphicsItem->boundingRect().height()), this);
+
+    handZoneGraphicsItem =
+        new HandZone(player->getHandZone(), static_cast<int>(tableZoneGraphicsItem->boundingRect().height()), this);
+    connect(player->getPlayerActions(), &PlayerActions::requestSortHand, handZoneGraphicsItem, &HandZone::sortHand);
+
+    connect(handZoneGraphicsItem->getLogic(), &HandZoneLogic::cardCountChanged, handCounter,
+            &HandCounter::updateNumber);
+    connect(handCounter, &HandCounter::showContextMenu, handZoneGraphicsItem, &HandZone::showContextMenu);
+
+    zoneGraphicsItems.insert(player->getDeckZone()->getName(), deckZoneGraphicsItem);
+    zoneGraphicsItems.insert(player->getGraveZone()->getName(), graveyardZoneGraphicsItem);
+    zoneGraphicsItems.insert(player->getRfgZone()->getName(), rfgZoneGraphicsItem);
+    zoneGraphicsItems.insert(player->getSideboardZone()->getName(), sideboardGraphicsItem);
+    zoneGraphicsItems.insert(player->getTableZone()->getName(), tableZoneGraphicsItem);
+    zoneGraphicsItems.insert(player->getStackZone()->getName(), stackZoneGraphicsItem);
+    zoneGraphicsItems.insert(player->getHandZone()->getName(), handZoneGraphicsItem);
+}
+
+void PlayerGraphicsItem::onCustomZoneAdded(QString customZoneName)
+{
+    zoneGraphicsItems.insert(customZoneName, nullptr); // Custom zone view goes here, if we ever implement it.
+}
+
+QRectF PlayerGraphicsItem::boundingRect() const
+{
+    return bRect;
+}
+
+qreal PlayerGraphicsItem::getMinimumWidth() const
+{
+    qreal result = tableZoneGraphicsItem->getMinimumWidth() + CardDimensions::HEIGHT_F + 15 + counterAreaWidth +
+                   stackZoneGraphicsItem->boundingRect().width();
+    if (!SettingsCache::instance().userInterface().getHorizontalHand()) {
+        result += handZoneGraphicsItem->boundingRect().width();
+    }
+    return result;
+}
+
+void PlayerGraphicsItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
+{
+    if (!hasPlaymat || playmatPixmap.isNull()) {
+        return;
+    }
+
+    // Calculate the combined bounding rect of stack + table zones
+    QPointF stackPos = stackZoneGraphicsItem->pos();
+    QPointF tablePos = tableZoneGraphicsItem->pos();
+    QSizeF stackSize = stackZoneGraphicsItem->boundingRect().size();
+    QSizeF tableSize = tableZoneGraphicsItem->boundingRect().size();
+
+    // Combined area: from stack left edge to table right edge
+    double combinedLeft = qMin(stackPos.x(), tablePos.x());
+    double combinedTop = qMin(stackPos.y(), tablePos.y());
+    double combinedRight = qMax(stackPos.x() + stackSize.width(), tablePos.x() + tableSize.width());
+    double combinedBottom = qMax(stackPos.y() + stackSize.height(), tablePos.y() + tableSize.height());
+
+    QRectF combinedArea(combinedLeft, combinedTop, combinedRight - combinedLeft, combinedBottom - combinedTop);
+
+    const QRectF srcRect = PlaymatUtils::computeArtSourceRect(playmatPixmap.size(), playmatParams);
+    const QRectF dstRect = PlaymatUtils::coverFitRect(combinedArea, srcRect.size());
+
+    painter->save();
+    painter->setClipRect(combinedArea);
+    painter->setRenderHint(QPainter::SmoothPixmapTransform, true);
+
+    // Render from a down-scaled copy of the art so the full-resolution source
+    // pixmap is never re-sampled at a tiny device size (also much cheaper than
+    // scaling it on every frame).
+    const QPixmap scaledPixmap = scaledPlaymatFor(srcRect, painter->worldTransform().mapRect(dstRect).size());
+    painter->drawPixmap(dstRect, scaledPixmap, QRectF(scaledPixmap.rect()));
+
+    painter->restore();
+
+    if (!playmatAttribution.isEmpty()) {
+        paintArtAttribution(*painter, combinedArea, playmatAttribution, Qt::AlignRight | Qt::AlignBottom, 0.8);
+    }
+}
+
+QPixmap PlayerGraphicsItem::scaledPlaymatFor(const QRectF &srcRect, const QSizeF &deviceDstSize)
+{
+    // Bucket the render size so the source pixmap is re-scaled at most once per
+    // zoom step instead of once per frame.
+    constexpr int bucketSize = 32;
+    const QSize target = QSize(qMax(1, qRound(deviceDstSize.width() / bucketSize) * bucketSize),
+                               qMax(1, qRound(deviceDstSize.height() / bucketSize) * bucketSize))
+                             .boundedTo(srcRect.toAlignedRect().size());
+
+    if (scaledPlaymatKey != target) {
+        const QPixmap crop = playmatPixmap.copy(srcRect.toAlignedRect());
+        scaledPlaymatPixmap = crop.scaled(target, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        scaledPlaymatKey = target;
+    }
+    return scaledPlaymatPixmap;
+}
+
+void PlayerGraphicsItem::processSceneSizeChange(int newPlayerWidth)
+{
+    // Extend table (and hand, if horizontal) to accommodate the new player width.
+    qreal tableWidth = newPlayerWidth - CardDimensions::HEIGHT_F - 15 - counterAreaWidth -
+                       stackZoneGraphicsItem->boundingRect().width();
+    if (!SettingsCache::instance().userInterface().getHorizontalHand()) {
+        tableWidth -= handZoneGraphicsItem->boundingRect().width();
+    }
+
+    tableZoneGraphicsItem->setWidth(tableWidth);
+    handZoneGraphicsItem->setWidth(tableWidth + stackZoneGraphicsItem->boundingRect().width());
+}
+
+void PlayerGraphicsItem::setMirrored(bool _mirrored)
+{
+    if (mirrored != _mirrored) {
+        mirrored = _mirrored;
+        emit mirroredChanged(mirrored);
+        rearrangeZones();
+    }
+}
+
+void PlayerGraphicsItem::onCounterAdded(CounterState *state)
+{
+    AbstractCounter *widget;
+    if (state->getName() == "life") {
+        widget = playerTarget->addCounter(state);
+        connect(state, &CounterState::valueChanged, this, [this](int oldValue, int newValue, bool skipDamageAnimation) {
+            if (newValue < oldValue && !skipDamageAnimation) {
+                tableZoneGraphicsItem->triggerDamageShimmer();
+            }
+        });
+    } else {
+        widget = new GeneralCounter(state, player, true, this);
+    }
+    counterWidgets.insert(state->getId(), widget);
+
+    if (playerMenu->getCountersMenu() && widget->getMenu()) {
+        playerMenu->getCountersMenu()->addMenu(widget->getMenu());
+    }
+
+    if (playerMenu->getShortcutsActive()) {
+        widget->setShortcutsActive();
+    }
+
+    rearrangeCounters();
+}
+
+void PlayerGraphicsItem::onCounterRemoved(int counterId)
+{
+    auto *widget = counterWidgets.take(counterId);
+    if (!widget) {
+        return;
+    }
+    if (playerMenu->getCountersMenu() && widget->getMenu()) {
+        playerMenu->getCountersMenu()->removeAction(widget->getMenu()->menuAction());
+    }
+    widget->delCounter();
+    rearrangeCounters();
+}
+
+void PlayerGraphicsItem::rearrangeCounters()
+{
+    qreal ySize = boundingRect().y() + 80;
+    constexpr qreal padding = 5;
+    for (auto *ctr : counterWidgets.values()) {
+        if (!ctr->getShownInCounterArea()) {
+            continue;
+        }
+        QRectF br = ctr->boundingRect();
+        ctr->setPos((counterAreaWidth - br.width()) / 2, ySize);
+        ySize += br.height() + padding;
+    }
+}
+
+void PlayerGraphicsItem::rearrangeZones()
+{
+    auto base = QPointF(CardDimensions::HEIGHT_F + counterAreaWidth + 15, 0);
+    if (SettingsCache::instance().userInterface().getHorizontalHand()) {
+        if (mirrored) {
+            if (player->getHandZone()->contentsKnown()) {
+                handVisible = true;
+                handZoneGraphicsItem->setPos(base);
+                base += QPointF(0, handZoneGraphicsItem->boundingRect().height());
+            } else {
+                handVisible = false;
+            }
+
+            stackZoneGraphicsItem->setPos(base);
+            base += QPointF(stackZoneGraphicsItem->boundingRect().width(), 0);
+
+            tableZoneGraphicsItem->setPos(base);
+        } else {
+            stackZoneGraphicsItem->setPos(base);
+
+            tableZoneGraphicsItem->setPos(base.x() + stackZoneGraphicsItem->boundingRect().width(), 0);
+            base += QPointF(0, tableZoneGraphicsItem->boundingRect().height());
+
+            if (player->getHandZone()->contentsKnown()) {
+                handVisible = true;
+                handZoneGraphicsItem->setPos(base);
+            } else {
+                handVisible = false;
+            }
+        }
+        handZoneGraphicsItem->setWidth(tableZoneGraphicsItem->getWidth() +
+                                       stackZoneGraphicsItem->boundingRect().width());
+    } else {
+        handVisible = true;
+
+        handZoneGraphicsItem->setPos(base);
+        base += QPointF(handZoneGraphicsItem->boundingRect().width(), 0);
+
+        stackZoneGraphicsItem->setPos(base);
+        base += QPointF(stackZoneGraphicsItem->boundingRect().width(), 0);
+
+        tableZoneGraphicsItem->setPos(base);
+    }
+    handZoneGraphicsItem->setVisible(handVisible);
+    handZoneGraphicsItem->updateOrientation();
+    tableZoneGraphicsItem->reorganizeCards();
+    updateBoundingRect();
+    rearrangeCounters();
+}
+
+void PlayerGraphicsItem::updateBoundingRect()
+{
+    prepareGeometryChange();
+    qreal width = CardDimensions::HEIGHT_F + 15 + counterAreaWidth + stackZoneGraphicsItem->boundingRect().width();
+    if (SettingsCache::instance().userInterface().getHorizontalHand()) {
+        qreal handHeight = handVisible ? handZoneGraphicsItem->boundingRect().height() : 0;
+        bRect = QRectF(0, 0, width + tableZoneGraphicsItem->boundingRect().width(),
+                       tableZoneGraphicsItem->boundingRect().height() + handHeight);
+    } else {
+        bRect = QRectF(
+            0, 0, width + handZoneGraphicsItem->boundingRect().width() + tableZoneGraphicsItem->boundingRect().width(),
+            tableZoneGraphicsItem->boundingRect().height());
+    }
+    playerArea->setSize(CardDimensions::HEIGHT_F + counterAreaWidth + 15, bRect.height());
+
+    emit sizeChanged();
+}
+
+void PlayerGraphicsItem::updatePlaymat()
+{
+    int visibility = SettingsCache::instance().userInterface().getPlaymatVisibility();
+
+    // "Don't use playmats" — never show
+    if (visibility == PlaymatVisibilityNone) {
+        clearPlaymat();
+        return;
+    }
+
+    // "Show own playmat only" — hide playmats for remote players
+    if (visibility == PlaymatVisibilityOwnOnly && !player->getPlayerInfo()->getLocal()) {
+        clearPlaymat();
+        return;
+    }
+
+    CardRef playmatCard;
+    PlaymatParams params;
+
+    if (player->getHasRemotePlaymat()) {
+        // Prefer the server-confirmed playmat (updated by Command_SetPlaymat).
+        playmatCard = player->getRemotePlaymatCard();
+        params = player->getRemotePlaymatParams();
+    } else if (player->getPlayerInfo()->getLocal()) {
+        // Local player without a server broadcast yet: apply the full
+        // settings-based resolution chain (mode, fallback list, behavior).
+        const auto &settings = SettingsCache::instance().userInterface();
+        const PlaymatInfo resolved = resolvePlaymatForDeck(
+            player->getDeck(), settings.getPlaymatFallbackList(), static_cast<PlaymatMode>(settings.getPlaymatMode()),
+            static_cast<PlaymatFallbackMode>(settings.getPlaymatFallbackBehavior()), 0);
+        playmatCard = resolved.card;
+        params = resolved.params;
+    } else {
+        // Opponent without a server broadcast: use the deck-embedded playmat.
+        const DeckList &deck = player->getDeck();
+        const PlaymatInfo &deckPlaymat = deck.getPlaymat();
+        if (!deckPlaymat.card.isEmpty()) {
+            playmatCard = deckPlaymat.card;
+            params = deckPlaymat.params;
+        }
+    }
+
+    if (playmatCard.isEmpty()) {
+        clearPlaymat();
+        return;
+    }
+
+    playmatParams = params;
+    scaledPlaymatKey = QSize(); // the art crop depends on the params, drop any cached scale
+
+    ExactCard card = CardDatabaseManager::query()->getCard(playmatCard);
+    if (!card) {
+        clearPlaymat();
+        return;
+    }
+
+    playmatAttribution = buildArtAttribution(card);
+
+    QPixmap fullRes;
+    CardPictureLoader::getPixmap(fullRes, card, QSize(745, 1040));
+
+    if (fullRes.isNull()) {
+        disconnect(playmatPixmapConnection);
+        CardInfo *cardInfo = card.getCardPtr().data();
+        if (cardInfo) {
+            playmatPixmapConnection =
+                connect(cardInfo, &CardInfo::pixmapUpdated, this, &PlayerGraphicsItem::onPlaymatPixmapReady);
+        }
+        return;
+    }
+
+    if (!hasPlaymat) {
+        hasPlaymat = true;
+        emit playmatChanged(true);
+    }
+    playmatPixmap = CardArtUtils::rotateSidewaysLayoutArt(fullRes, card);
+    update();
+}
+
+void PlayerGraphicsItem::clearPlaymat()
+{
+    disconnect(playmatPixmapConnection);
+    playmatAttribution.clear();
+    if (hasPlaymat) {
+        hasPlaymat = false;
+        playmatPixmap = QPixmap();
+        scaledPlaymatKey = QSize();
+        emit playmatChanged(false);
+        update();
+    }
+}
+
+void PlayerGraphicsItem::onPlaymatPixmapReady()
+{
+    updatePlaymat();
+}
diff --git a/cockatrice/src/game/player/player_graphics_item.h b/cockatrice/src/game_graphics/player/player_graphics_item.h
similarity index 59%
rename from cockatrice/src/game/player/player_graphics_item.h
rename to cockatrice/src/game_graphics/player/player_graphics_item.h
index cba664dd9..e1ca0a036 100644
--- a/cockatrice/src/game/player/player_graphics_item.h
+++ b/cockatrice/src/game_graphics/player/player_graphics_item.h
@@ -1,22 +1,39 @@
 /**
  * @file player_graphics_item.h
  * @ingroup GameGraphicsPlayers
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_PLAYER_GRAPHICS_ITEM_H
 #define COCKATRICE_PLAYER_GRAPHICS_ITEM_H
+#include "../board/graphics_item_type.h"
 #include "../game_scene.h"
-#include "player.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>
 
 class HandZone;
 class PileZone;
+class PlayerDialogs;
+class PlayerMenu;
 class PlayerTarget;
 class StackZone;
 class TableZone;
-class ZoneViewZone;
+class AbstractCounter;
+class CardZone;
+class CounterState;
+class PlayerArea;
+class PlayerLogic;
+struct CardRef;
 
 class PlayerGraphicsItem : public QGraphicsObject
 {
@@ -34,7 +51,7 @@ public:
 
     static constexpr int counterAreaWidth = 55;
 
-    explicit PlayerGraphicsItem(Player *player);
+    explicit PlayerGraphicsItem(PlayerLogic *player);
     void initializeZones();
 
     [[nodiscard]] QRectF boundingRect() const override;
@@ -54,11 +71,16 @@ public:
         return static_cast<GameScene *>(scene());
     }
 
-    Player *getPlayer() const
+    PlayerLogic *getLogic() const
     {
         return player;
     }
 
+    [[nodiscard]] PlayerMenu *getPlayerMenu() const
+    {
+        return playerMenu;
+    }
+
     PlayerArea *getPlayerArea() const
     {
         return playerArea;
@@ -69,6 +91,11 @@ public:
         return playerTarget;
     }
 
+    CardZone *getZoneGraphicsItem(const QString &name) const
+    {
+        return zoneGraphicsItems.value(name, nullptr);
+    }
+
     [[nodiscard]] PileZone *getDeckZoneGraphicsItem() const
     {
         return deckZoneGraphicsItem;
@@ -102,16 +129,27 @@ public:
 
 public slots:
     void onPlayerActiveChanged(bool _active);
+    void onCustomZoneAdded(QString customZoneName);
+    void onCounterAdded(CounterState *state);
+    void onCounterRemoved(int counterId);
+    void rearrangeCounters();
     void retranslateUi();
 
 signals:
     void sizeChanged();
     void playerCountChanged();
+    void mirroredChanged(bool isMirrored);
+    void cardInfoRequested(const CardRef &cardRef);
+    void playmatChanged(bool hasPlaymat);
 
 private:
-    Player *player;
+    PlayerLogic *player;
+    PlayerMenu *playerMenu;
+    PlayerDialogs *playerDialogs;
     PlayerArea *playerArea;
     PlayerTarget *playerTarget;
+    QMap<int, AbstractCounter *> counterWidgets;
+    QMap<QString, CardZone *> zoneGraphicsItems;
     PileZone *deckZoneGraphicsItem;
     PileZone *sideboardGraphicsItem;
     PileZone *graveyardZoneGraphicsItem;
@@ -121,11 +159,25 @@ private:
     HandZone *handZoneGraphicsItem;
     QRectF bRect;
     bool mirrored;
+    bool handVisible = false;
+
+    QPixmap playmatPixmap;
+    QPixmap scaledPlaymatPixmap; // down-scaled copy of playmatPixmap for the current render size
+    QSize scaledPlaymatKey;      // size bucket scaledPlaymatPixmap was rendered for
+    PlaymatParams playmatParams;
+    QString playmatAttribution;
+    bool hasPlaymat = false;
+    QMetaObject::Connection playmatPixmapConnection;
 
 private slots:
     void updateBoundingRect();
     void rearrangeZones();
-    void rearrangeCounters();
+    void clearPlaymat();
+    void updatePlaymat();
+    void onPlaymatPixmapReady();
+
+private:
+    QPixmap scaledPlaymatFor(const QRectF &srcRect, const QSizeF &deviceDstSize);
 };
 
 #endif // COCKATRICE_PLAYER_GRAPHICS_ITEM_H
diff --git a/cockatrice/src/game/player/player_list_widget.cpp b/cockatrice/src/game_graphics/player/player_list_widget.cpp
similarity index 80%
rename from cockatrice/src/game/player/player_list_widget.cpp
rename to cockatrice/src/game_graphics/player/player_list_widget.cpp
index 9506e0729..7b358010f 100644
--- a/cockatrice/src/game/player/player_list_widget.cpp
+++ b/cockatrice/src/game_graphics/player/player_list_widget.cpp
@@ -2,16 +2,30 @@
 
 #include "../../interface/pixel_map_generator.h"
 #include "../../interface/widgets/server/user/user_context_menu.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 "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "user_level.h"
 
-#include <QHeaderView>
+#include <QBrush>
+#include <QColor>
+#include <QEvent>
+#include <QFlag>
+#include <QList>
+#include <QMapIterator>
+#include <QModelIndex>
 #include <QMouseEvent>
-#include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
+#include <QPalette>
+#include <QPointF>
+#include <QSharedPointer>
+#include <QSize>
+#include <QStringLiteral>
+#include <QVariant>
 #include <libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h>
-#include <libcockatrice/protocol/pb/session_commands.pb.h>
+#include <qnamespace.h>
+
+class QModelIndex;
+class QObject;
+class QPoint;
+class QWidget;
 
 PlayerListItemDelegate::PlayerListItemDelegate(QObject *const parent) : QStyledItemDelegate(parent)
 {
@@ -25,11 +39,7 @@ bool PlayerListItemDelegate::editorEvent(QEvent *event,
     if ((event->type() == QEvent::MouseButtonPress) && index.isValid()) {
         auto *const mouseEvent = static_cast<QMouseEvent *>(event);
         if (mouseEvent->button() == Qt::RightButton) {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
             static_cast<PlayerListWidget *>(parent())->showContextMenu(mouseEvent->globalPosition().toPoint(), index);
-#else
-            static_cast<PlayerListWidget *>(parent())->showContextMenu(mouseEvent->globalPos(), index);
-#endif
             return true;
         }
     }
@@ -43,8 +53,9 @@ PlayerListTWI::PlayerListTWI() : QTreeWidgetItem(Type)
 bool PlayerListTWI::operator<(const QTreeWidgetItem &other) const
 {
     // Sort by spectator/player
-    if (data(1, Qt::UserRole) != other.data(1, Qt::UserRole))
+    if (data(1, Qt::UserRole) != other.data(1, Qt::UserRole)) {
         return data(1, Qt::UserRole).toBool();
+    }
 
     // Sort by player ID
     return data(4, Qt::UserRole + 1).toInt() < other.data(4, Qt::UserRole + 1).toInt();
@@ -56,13 +67,13 @@ PlayerListWidget::PlayerListWidget(TabSupervisor *_tabSupervisor,
                                    QWidget *parent)
     : QTreeWidget(parent), tabSupervisor(_tabSupervisor), client(_client), game(_game), gameStarted(false)
 {
-    readyIcon = QPixmap("theme:icons/ready_start");
-    notReadyIcon = QPixmap("theme:icons/not_ready_start");
-    concededIcon = QPixmap("theme:icons/conceded");
+    readyIcon = themePixmap(QStringLiteral("icons/ready_start"));
+    notReadyIcon = themePixmap(QStringLiteral("icons/not_ready_start"));
+    concededIcon = themePixmap(QStringLiteral("icons/conceded"));
     playerIcon = loadColorAdjustedPixmap("theme:icons/player");
     judgeIcon = loadColorAdjustedPixmap("theme:icons/scales");
     spectatorIcon = loadColorAdjustedPixmap("theme:icons/spectator");
-    lockIcon = QPixmap("theme:icons/lock");
+    lockIcon = themePixmap(QStringLiteral("icons/lock"));
 
     if (tabSupervisor) {
         itemDelegate = new PlayerListItemDelegate(this);
@@ -95,6 +106,11 @@ void PlayerListWidget::retranslateUi()
 
 void PlayerListWidget::addPlayer(const ServerInfo_PlayerProperties &player)
 {
+    if (players.contains(player.player_id())) {
+        updatePlayerProperties(player);
+        return;
+    }
+
     QTreeWidgetItem *newPlayer = new PlayerListTWI;
     players.insert(player.player_id(), newPlayer);
     updatePlayerProperties(player);
@@ -106,12 +122,14 @@ void PlayerListWidget::addPlayer(const ServerInfo_PlayerProperties &player)
 
 void PlayerListWidget::updatePlayerProperties(const ServerInfo_PlayerProperties &prop, int playerId)
 {
-    if (playerId == -1)
+    if (playerId == -1) {
         playerId = prop.player_id();
+    }
 
     QTreeWidgetItem *player = players.value(playerId, 0);
-    if (!player)
+    if (!player) {
         return;
+    }
 
     bool isSpectator = prop.has_spectator() && prop.spectator();
     if (prop.has_judge() || prop.has_spectator()) {
@@ -126,13 +144,16 @@ void PlayerListWidget::updatePlayerProperties(const ServerInfo_PlayerProperties
     }
 
     if (!isSpectator) {
-        if (prop.has_conceded())
+        if (prop.has_conceded()) {
             player->setData(2, Qt::UserRole, prop.conceded());
-        if (prop.has_ready_start())
+        }
+        if (prop.has_ready_start()) {
             player->setData(2, Qt::UserRole + 1, prop.ready_start());
-        if (prop.has_conceded() || prop.has_ready_start())
+        }
+        if (prop.has_conceded() || prop.has_ready_start()) {
             player->setIcon(2, gameStarted ? (prop.conceded() ? concededIcon : QIcon())
                                            : (prop.ready_start() ? readyIcon : notReadyIcon));
+        }
     }
     if (prop.has_user_info()) {
         player->setData(3, Qt::UserRole, prop.user_info().user_level());
@@ -141,34 +162,50 @@ void PlayerListWidget::updatePlayerProperties(const ServerInfo_PlayerProperties
                                QString::fromStdString(prop.user_info().privlevel())));
         player->setText(4, QString::fromStdString(prop.user_info().name()));
         const QString country = QString::fromStdString(prop.user_info().country());
-        if (!country.isEmpty())
+        if (!country.isEmpty()) {
             player->setIcon(4, QIcon(CountryPixmapGenerator::generatePixmap(12, country)));
+        }
         player->setData(4, Qt::UserRole, QString::fromStdString(prop.user_info().name()));
     }
 
-    if (prop.has_player_id())
+    if (prop.has_player_id()) {
         player->setData(4, Qt::UserRole + 1, prop.player_id());
+    }
 
     if (!isSpectator) {
         if (prop.has_deck_hash()) {
             player->setText(5, QString::fromStdString(prop.deck_hash()));
         }
-        if (prop.has_sideboard_locked())
+        if (prop.has_sideboard_locked()) {
             player->setIcon(5, prop.sideboard_locked() ? lockIcon : QIcon());
+        }
     }
-    if (prop.has_ping_seconds())
+    if (prop.has_ping_seconds()) {
         player->setIcon(0, QIcon(PingPixmapGenerator::generatePixmap(12, prop.ping_seconds(), 10)));
+    }
 }
 
 void PlayerListWidget::removePlayer(int playerId)
 {
     QTreeWidgetItem *player = players.value(playerId, 0);
-    if (!player)
+    if (!player) {
         return;
+    }
     players.remove(playerId);
     delete takeTopLevelItem(indexOfTopLevelItem(player));
 }
 
+void PlayerListWidget::clearSpectators()
+{
+    const QList<int> playerIds = players.keys();
+    for (int playerId : playerIds) {
+        QTreeWidgetItem *player = players.value(playerId, 0);
+        if (player && !player->data(1, Qt::UserRole).toBool()) {
+            removePlayer(playerId);
+        }
+    }
+}
+
 void PlayerListWidget::setActivePlayer(int playerId)
 {
     QMapIterator<int, QTreeWidgetItem *> i(players);
@@ -193,13 +230,14 @@ void PlayerListWidget::setGameStarted(bool _gameStarted, bool resuming)
         QTreeWidgetItem *twi = i.next().value();
 
         bool isPlayer = twi->data(1, Qt::UserRole).toBool();
-        if (!isPlayer)
+        if (!isPlayer) {
             continue;
+        }
 
         if (gameStarted) {
-            if (resuming)
+            if (resuming) {
                 twi->setIcon(2, twi->data(2, Qt::UserRole).toBool() ? concededIcon : QIcon());
-            else {
+            } else {
                 twi->setData(2, Qt::UserRole, false);
                 twi->setIcon(2, QIcon());
             }
@@ -211,8 +249,9 @@ void PlayerListWidget::setGameStarted(bool _gameStarted, bool resuming)
 
 void PlayerListWidget::showContextMenu(const QPoint &pos, const QModelIndex &index)
 {
-    if (!userContextMenu)
+    if (!userContextMenu) {
         return;
+    }
 
     const QString &userName = index.sibling(index.row(), 4).data(Qt::UserRole).toString();
     int playerId = index.sibling(index.row(), 4).data(Qt::UserRole + 1).toInt();
diff --git a/cockatrice/src/game/player/player_list_widget.h b/cockatrice/src/game_graphics/player/player_list_widget.h
similarity index 90%
rename from cockatrice/src/game/player/player_list_widget.h
rename to cockatrice/src/game_graphics/player/player_list_widget.h
index 8f1487563..b070fe312 100644
--- a/cockatrice/src/game/player/player_list_widget.h
+++ b/cockatrice/src/game_graphics/player/player_list_widget.h
@@ -1,24 +1,29 @@
 /**
  * @file player_list_widget.h
  * @ingroup GameWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef PLAYERLISTWIDGET_H
 #define PLAYERLISTWIDGET_H
 
-#include "player.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
 {
@@ -66,6 +71,7 @@ public slots:
     void addPlayer(const ServerInfo_PlayerProperties &player);
     void removePlayer(int playerId);
     void updatePlayerProperties(const ServerInfo_PlayerProperties &prop, int playerId = -1);
+    void clearSpectators();
 };
 
 #endif
diff --git a/cockatrice/src/game/player/player_target.cpp b/cockatrice/src/game_graphics/player/player_target.cpp
similarity index 57%
rename from cockatrice/src/game/player/player_target.cpp
rename to cockatrice/src/game_graphics/player/player_target.cpp
index a7a5cc5e7..24734cd42 100644
--- a/cockatrice/src/game/player/player_target.cpp
+++ b/cockatrice/src/game_graphics/player/player_target.cpp
@@ -1,16 +1,46 @@
 #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 "player.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 <QDebug>
+#include <QBrush>
+#include <QColor>
+#include <QFlag>
+#include <QFlags>
+#include <QFont>
+#include <QObject>
 #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>
 
-PlayerCounter::PlayerCounter(Player *_player, int _id, const QString &_name, int _value, QGraphicsItem *parent)
-    : AbstractCounter(_player, _id, _name, false, _value, false, parent)
+class CounterState;
+class QGraphicsItem;
+
+PlayerCounter::PlayerCounter(CounterState *state, PlayerLogic *player, QGraphicsItem *parent)
+    : AbstractCounter(state, player, false, false, parent)
 {
 }
 
@@ -21,17 +51,24 @@ QRectF PlayerCounter::boundingRect() const
 
 void PlayerCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
 {
-    const int radius = 8;
-    const qreal border = 1;
-    QPainterPath path(QPointF(50 - border / 2, border / 2));
-    path.lineTo(radius, border / 2);
-    path.arcTo(border / 2, border / 2, 2 * radius, 2 * radius, 90, 90);
-    path.lineTo(border / 2, 30 - border / 2);
-    path.lineTo(50 - border / 2, 30 - border / 2);
-    path.closeSubpath();
+    const int radius = 15;
+    const qreal border = 1.5;
+    // The box is drawn with a border-wide stroke straddling the path, so the
+    // visible outline spans [inset, inset + border]. Fills that must not cover
+    // the outline (e.g. the life-change flash) use a path inset by `border`.
+    const auto makePath = [](qreal inset) {
+        QPainterPath path(QPointF(50 - inset, inset));
+        path.lineTo(radius, inset);
+        path.arcTo(inset, inset, 2 * radius, 2 * radius, 90, 90);
+        path.lineTo(inset, 30 - inset);
+        path.lineTo(50 - inset, 30 - inset);
+        path.closeSubpath();
+        return path;
+    };
+    QPainterPath path = makePath(border / 2);
 
     QPen pen(QColor(100, 100, 100));
-    pen.setWidth(border);
+    pen.setWidthF(border);
     painter->setPen(pen);
     painter->setBrush(hovered ? QColor(50, 50, 50, 160) : QColor(0, 0, 0, 160));
 
@@ -45,9 +82,56 @@ void PlayerCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*
     painter->setFont(font);
     painter->setPen(Qt::white);
     painter->drawText(translatedRect, Qt::AlignCenter, QString::number(value));
+
+    // Life-change flash: emerald on gain, red on loss, decaying over a few ticks.
+    if (flashAlpha > 0) {
+        painter->save();
+        QColor flashColor = flashDelta > 0 ? QColor(52, 224, 122) : QColor(239, 68, 68);
+        flashColor.setAlphaF(0.45 * flashAlpha);
+        painter->setPen(Qt::NoPen);
+        painter->setBrush(flashColor);
+        painter->setOpacity(0.85);
+        painter->drawPath(makePath(border));
+        painter->restore();
+    }
 }
 
-PlayerTarget::PlayerTarget(Player *_owner, QGraphicsItem *parentItem)
+void PlayerCounter::onValueChanged(int oldValue, int newValue, bool skipDamageAnimation)
+{
+    flashDelta = newValue - oldValue;
+    if (flashDelta == 0) {
+        return;
+    }
+
+    if (!SettingsCache::instance().userInterface().getLifeCounterAnimationsEnabled()) {
+        flashAlpha = 0.0;
+        return;
+    }
+
+    if (skipDamageAnimation) {
+        flashAlpha = 0.0;
+        return;
+    }
+
+    flashAlpha = 1.0;
+    flashClock.start();
+    if (scene()) {
+        static_cast<GameScene *>(scene())->registerAnimationItem(this);
+    }
+}
+
+bool PlayerCounter::animationEvent()
+{
+    flashAlpha = 1.0 - flashClock.elapsed() / flashDurationMs;
+    if (flashAlpha <= 0.0) {
+        flashAlpha = 0.0;
+        return false;
+    }
+    update();
+    return true;
+}
+
+PlayerTarget::PlayerTarget(PlayerLogic *_owner, QGraphicsItem *parentItem)
     : ArrowTarget(_owner, parentItem), playerCounter(nullptr)
 {
     setCacheMode(DeviceCoordinateCache);
@@ -80,8 +164,18 @@ void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*o
     QRectF translatedRect = painter->combinedTransform().mapRect(avatarBoundingRect);
     QSize translatedSize = translatedRect.size().toSize();
     QPixmap cachedPixmap;
+    // The key must cover everything the generated pawn depends on: the rendered
+    // size, the user level, and the pixmap being drawn. fullPixmap.cacheKey() is
+    // 0 for every null pixmap, so the default-pawn branch additionally needs the
+    // pawn's privlevel (lowercased, matching UserLevelPixmapGenerator) and colors
+    // in the key — otherwise two players without a custom avatar (and the same
+    // user level) would share one cached pawn.
     const QString cacheKey = "avatar" + QString::number(translatedSize.width()) + "_" +
-                             QString::number(info->user_level()) + "_" + QString::number(fullPixmap.cacheKey());
+                             QString::number(translatedSize.height()) + "_" + QString::number(info->user_level()) +
+                             "_" + QString::number(fullPixmap.cacheKey()) + "_" +
+                             QString::fromStdString(info->privlevel()).toLower() + "_" +
+                             QString::fromStdString(info->pawn_colors().left_side()) + "_" +
+                             QString::fromStdString(info->pawn_colors().right_side());
     if (!QPixmapCache::find(cacheKey, &cachedPixmap)) {
         cachedPixmap = QPixmap(translatedSize.width(), translatedSize.height());
 
@@ -128,8 +222,9 @@ void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*o
     resetPainterTransform(painter);
 
     QString name = QString::fromStdString(info->name());
-    if (name.size() > 13)
+    if (name.size() > 13) {
         name = name.mid(0, 10) + "...";
+    }
 
     QFont font;
     font.setPixelSize(qMax(qRound(translatedNameRect.height() / 1.5), 9));
@@ -144,22 +239,21 @@ void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*o
     painter->setPen(pen);
     painter->drawRect(boundingRect().adjusted(border / 2, border / 2, -border / 2, -border / 2));
 
-    if (getBeingPointedAt())
+    if (getBeingPointedAt()) {
         painter->fillRect(boundingRect(), QBrush(QColor(255, 0, 0, 100)));
+    }
 }
 
-AbstractCounter *PlayerTarget::addCounter(int _counterId, const QString &_name, int _value)
+AbstractCounter *PlayerTarget::addCounter(CounterState *state)
 {
     if (playerCounter) {
         disconnect(playerCounter, nullptr, this, nullptr);
         playerCounter->delCounter();
     }
-
-    playerCounter = new PlayerCounter(owner, _counterId, _name, _value, this);
+    playerCounter = new PlayerCounter(state, owner, this);
     playerCounter->setPos(boundingRect().width() - playerCounter->boundingRect().width(),
                           boundingRect().height() - playerCounter->boundingRect().height());
     connect(playerCounter, &PlayerCounter::destroyed, this, &PlayerTarget::counterDeleted);
-
     return playerCounter;
 }
 
diff --git a/cockatrice/src/game/player/player_target.h b/cockatrice/src/game_graphics/player/player_target.h
similarity index 51%
rename from cockatrice/src/game/player/player_target.h
rename to cockatrice/src/game_graphics/player/player_target.h
index b60464e12..7780104d2 100644
--- a/cockatrice/src/game/player/player_target.h
+++ b/cockatrice/src/game_graphics/player/player_target.h
@@ -1,27 +1,44 @@
 /**
  * @file player_target.h
  * @ingroup GameGraphicsPlayers
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef PLAYERTARGET_H
 #define PLAYERTARGET_H
 
-#include "../../game_graphics/board/graphics_item_type.h"
+#include "../animated_item.h"
 #include "../board/abstract_counter.h"
 #include "../board/arrow_target.h"
+#include "../board/graphics_item_type.h"
 
+#include <QElapsedTimer>
 #include <QPixmap>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
-class Player;
+class PlayerLogic;
+class CounterState;
+class QGraphicsItem;
 
-class PlayerCounter : public AbstractCounter
+class PlayerCounter : public AbstractCounter, public IAnimatedItem
 {
     Q_OBJECT
+protected:
+    void onValueChanged(int oldValue, int newValue, bool skipDamageAnimation) override;
+
+private:
+    static constexpr qreal flashDurationMs = 450.0;
+
+    QElapsedTimer flashClock;
+    qreal flashAlpha = 0.0;
+    int flashDelta = 0;
+
 public:
-    PlayerCounter(Player *_player, int _id, const QString &_name, int _value, QGraphicsItem *parent = nullptr);
+    PlayerCounter(CounterState *state, PlayerLogic *player, QGraphicsItem *parent);
     QRectF boundingRect() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
+    bool animationEvent() override;
 };
 
 class PlayerTarget : public ArrowTarget
@@ -43,12 +60,12 @@ public:
         return Type;
     }
 
-    explicit PlayerTarget(Player *_player = nullptr, QGraphicsItem *parentItem = nullptr);
+    explicit PlayerTarget(PlayerLogic *_player = nullptr, QGraphicsItem *parentItem = nullptr);
     ~PlayerTarget() override;
     QRectF boundingRect() const override;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
-    AbstractCounter *addCounter(int _counterId, const QString &_name, int _value);
+    AbstractCounter *addCounter(CounterState *state);
 };
 
 #endif
diff --git a/cockatrice/src/game_graphics/tally/stats_tally.cpp b/cockatrice/src/game_graphics/tally/stats_tally.cpp
new file mode 100644
index 000000000..28e280c02
--- /dev/null
+++ b/cockatrice/src/game_graphics/tally/stats_tally.cpp
@@ -0,0 +1,69 @@
+#include "stats_tally.h"
+
+#include "../board/card_item.h"
+
+#include <QCoreApplication>
+#include <QList>
+#include <QSharedPointer>
+#include <QString>
+#include <QVariant>
+#include <QVariantList>
+#include <QtGlobal>
+#include <algorithm>
+
+static int sumPowers(const QList<CardItem *> &cards)
+{
+    // calculate total power;
+    int total = 0;
+    for (auto card : cards) {
+        QVariantList parsed = CardItem::parsePT(card->getPT());
+        if (!parsed.isEmpty()) {
+            int power = parsed.first().toInt(); // toInt will default to 0 if it's not an int
+            total += qMax(power, 0);
+        }
+    }
+    return total;
+}
+
+QList<TallyRow> StatsTally::computeTotalPower(const QList<CardItem *> &cards)
+{
+    // don't bother if none of the cards have pt
+    bool hasPT =
+        std::any_of(cards.cbegin(), cards.cend(), [](const CardItem *card) { return !card->getPT().isEmpty(); });
+    if (!hasPT) {
+        return {};
+    }
+
+    int total = sumPowers(cards);
+
+    QString name = QCoreApplication::translate("StatsTally", "Total Power");
+    return {TallyRow{name, QString::number(total)}};
+}
+
+static int sumToughness(const QList<CardItem *> &cards)
+{
+    int total = 0;
+    for (auto card : cards) {
+        QVariantList parsed = CardItem::parsePT(card->getPT());
+        if (parsed.size() == 2) {
+            int toughness = parsed.at(1).toInt(); // toInt will default to 0 if it's not an int
+            total += qMax(toughness, 0);
+        }
+    }
+    return total;
+}
+
+QList<TallyRow> StatsTally::computeTotalToughness(const QList<CardItem *> &cards)
+{
+    // don't bother if none of the cards have pt
+    bool hasPT =
+        std::any_of(cards.cbegin(), cards.cend(), [](const CardItem *card) { return !card->getPT().isEmpty(); });
+    if (!hasPT) {
+        return {};
+    }
+
+    int total = sumToughness(cards);
+
+    QString name = QCoreApplication::translate("StatsTally", "Total Toughness");
+    return {TallyRow{name, QString::number(total)}};
+}
diff --git a/cockatrice/src/game_graphics/tally/stats_tally.h b/cockatrice/src/game_graphics/tally/stats_tally.h
new file mode 100644
index 000000000..cb0bdf81b
--- /dev/null
+++ b/cockatrice/src/game_graphics/tally/stats_tally.h
@@ -0,0 +1,33 @@
+#ifndef COCKATRICE_STATS_TALLY_H
+#define COCKATRICE_STATS_TALLY_H
+#include "tally.h"
+
+#include <QList>
+
+class CardItem;
+
+/**
+ * @brief Extracts and tallies stats from selected cards.
+ */
+namespace StatsTally
+{
+
+/**
+ * @brief Sums the power of all selected cards
+ *
+ * @param cards The list of selected card items to analyze.
+ * @return A single row containing the total, or an empty list if none of the cards have pt
+ */
+QList<TallyRow> computeTotalPower(const QList<CardItem *> &cards);
+
+/**
+ * @brief Sums the toughness of all selected cards
+ *
+ * @param cards The list of selected card items to analyze.
+ * @return A single row containing the total, or an empty list if none of the cards have pt
+ */
+QList<TallyRow> computeTotalToughness(const QList<CardItem *> &cards);
+
+} // namespace StatsTally
+
+#endif // COCKATRICE_STATS_TALLY_H
diff --git a/cockatrice/src/game_graphics/tally/subtype_tally.cpp b/cockatrice/src/game_graphics/tally/subtype_tally.cpp
new file mode 100644
index 000000000..ccd727405
--- /dev/null
+++ b/cockatrice/src/game_graphics/tally/subtype_tally.cpp
@@ -0,0 +1,86 @@
+#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
+{
+
+/** @brief Extracts subtypes from a single card face's type line. */
+QStringList extractSubtypesFromFace(const QString &faceType)
+{
+    // Card type format: "Creature — Goblin Warrior" or "Legendary Enchantment — Saga"
+    QStringList parts = faceType.split(QStringLiteral(" — "));
+    if (parts.size() > 1) {
+        return parts[1].split(QStringLiteral(" "), Qt::SkipEmptyParts);
+    }
+    return {};
+}
+
+/** @brief A single subtype (e.g., "Goblin", "Warrior") with its occurrence count. */
+struct SubtypeEntry
+{
+    QString name;
+    int count;
+};
+
+} // anonymous namespace
+
+namespace SubtypeTally
+{
+
+QList<TallyRow> countSubtypes(const QList<CardItem *> &cards)
+{
+    QMap<QString, int> subtypeCounts;
+
+    for (CardItem *card : cards) {
+        if (card->getFaceDown() || card->getCard().isEmpty()) {
+            continue;
+        }
+
+        QString cardType = card->getCardInfo().getCardType();
+        // Handle double-faced cards: "Creature — Human // Creature — Werewolf"
+        QStringList cardFaces = cardType.split(QStringLiteral(" // "));
+
+        for (const QString &face : cardFaces) {
+            QStringList subtypes = extractSubtypesFromFace(face);
+            for (const QString &subtype : subtypes) {
+                subtypeCounts[subtype]++;
+            }
+        }
+    }
+
+    QList<SubtypeEntry> entries;
+    for (auto it = subtypeCounts.constBegin(); it != subtypeCounts.constEnd(); ++it) {
+        entries.append({it.key(), it.value()});
+    }
+
+    // Sort by count ascending, then alphabetically (lowest counts at bottom of display)
+    std::sort(entries.begin(), entries.end(), [](const SubtypeEntry &a, const SubtypeEntry &b) {
+        if (a.count != b.count) {
+            return a.count < b.count;
+        }
+        return a.name < b.name;
+    });
+
+    // convert entries into TallyRows
+    QList<TallyRow> rows;
+    rows.reserve(entries.size());
+    std::transform(entries.begin(), entries.end(), std::back_inserter(rows),
+                   [](const SubtypeEntry &e) { return TallyRow{e.name, QString::number(e.count)}; });
+
+    return rows;
+}
+
+} // namespace SubtypeTally
diff --git a/cockatrice/src/game_graphics/tally/subtype_tally.h b/cockatrice/src/game_graphics/tally/subtype_tally.h
new file mode 100644
index 000000000..019a797d4
--- /dev/null
+++ b/cockatrice/src/game_graphics/tally/subtype_tally.h
@@ -0,0 +1,25 @@
+#ifndef COCKATRICE_SUBTYPE_TALLY_H
+#define COCKATRICE_SUBTYPE_TALLY_H
+
+#include "tally.h"
+
+#include <QList>
+
+class CardItem;
+
+/**
+ * @brief Extracts and tallies subtypes from selected cards.
+ */
+namespace SubtypeTally
+{
+/**
+ * @brief Parses card type lines and counts each subtype occurrence.
+ *
+ * Skips face-down cards and cards without type info.
+ * @param cards The list of selected card items to analyze.
+ * @return Entries sorted by count ascending, then alphabetically.
+ */
+QList<TallyRow> countSubtypes(const QList<CardItem *> &cards);
+} // namespace SubtypeTally
+
+#endif
diff --git a/cockatrice/src/game_graphics/tally/tally.cpp b/cockatrice/src/game_graphics/tally/tally.cpp
new file mode 100644
index 000000000..21806ee84
--- /dev/null
+++ b/cockatrice/src/game_graphics/tally/tally.cpp
@@ -0,0 +1,28 @@
+#include "tally.h"
+
+#include "stats_tally.h"
+#include "subtype_tally.h"
+
+TallyType Tally::intToType(int value)
+{
+    if (value < static_cast<int>(TallyType::None) || value > static_cast<int>(TallyType::MaxValue)) {
+        return TallyType::None;
+    }
+
+    return static_cast<TallyType>(value);
+}
+
+QList<TallyRow> Tally::compute(const QList<CardItem *> &cards, const TallyType type)
+{
+    switch (type) {
+        case TallyType::None:
+            return {};
+        case TallyType::Subtypes:
+            return SubtypeTally::countSubtypes(cards);
+        case TallyType::TotalPower:
+            return StatsTally::computeTotalPower(cards);
+        case TallyType::TotalToughness:
+            return StatsTally::computeTotalToughness(cards);
+    }
+    return {};
+}
diff --git a/cockatrice/src/game_graphics/tally/tally.h b/cockatrice/src/game_graphics/tally/tally.h
new file mode 100644
index 000000000..5699758e7
--- /dev/null
+++ b/cockatrice/src/game_graphics/tally/tally.h
@@ -0,0 +1,52 @@
+#ifndef COCKATRICE_TALLY_H
+#define COCKATRICE_TALLY_H
+#include <QList>
+#include <QString>
+
+class CardItem;
+
+/** @brief A single row of the tally output. */
+struct TallyRow
+{
+    QString name;  ///< The row name (displayed on the left)
+    QString value; ///< Value for the row (displayed on the right)
+
+    bool operator==(const TallyRow &) const = default;
+};
+
+/**
+ * The tally type
+ */
+enum class TallyType
+{
+    None,
+    Subtypes,
+    TotalPower,
+    TotalToughness,
+    MaxValue = TotalToughness // sentinel value
+};
+
+namespace Tally
+{
+
+/**
+ * Safely converts an int into the corresponding TallyType.
+ *
+ * @param value The int value
+ * @return The TallyType. Returns TallyType::None if the value is not within range
+ */
+TallyType intToType(int value);
+
+/**
+ * @brief Analyzes the selected cards according to the tally type and builds the resulting tally rows.
+ * This forwards the cards to the code for that tally type.
+ *
+ * @param cards The list of selected card items to analyze.
+ * @param type The type of tally to do
+ * @return Rows sorted in top-to-bottom display order
+ */
+QList<TallyRow> compute(const QList<CardItem *> &cards, TallyType type);
+
+} // namespace Tally
+
+#endif // COCKATRICE_TALLY_H
diff --git a/cockatrice/src/game_graphics/z_value_layer_manager.h b/cockatrice/src/game_graphics/z_value_layer_manager.h
new file mode 100644
index 000000000..d35ab5c1c
--- /dev/null
+++ b/cockatrice/src/game_graphics/z_value_layer_manager.h
@@ -0,0 +1,133 @@
+/**
+ * @file z_value_layer_manager.h
+ * @ingroup GameGraphics
+ * @brief Semantic Z-value layer management for game scene rendering.
+ *
+ * This file provides a structured approach to Z-value allocation in the game scene.
+ * Z-values in Qt determine stacking order - higher values render on top of lower values.
+ *
+ * ## Layer Architecture
+ *
+ * The game scene is organized into three conceptual layers:
+ *
+ * 1. **Zone Layer (0-999)**: Zone backgrounds, containers, and static elements
+ *    - Zone backgrounds (0.5-1.0)
+ *    - Cards within zones (1.0 base + index)
+ *
+ * 2. **Card Layer (1-40,000,000)**: Dynamic card rendering on the table zone
+ *    - Cards use formula: (actualY + CardDimensions::HEIGHT) * 100000 + (actualX + 1) * 100
+ *    - Maximum card Z-value: ~40,000,000 (with 3 rows, actualY <= ~289)
+ *
+ * 3. **Overlay Layer (2,000,000,000+)**: UI elements that must appear above all cards
+ *    - Hovered cards (+1)
+ *    - Arrows (+3)
+ *    - Zone views (+4)
+ *    - Drag items (+5, +6)
+ *    - Top UI elements (+7)
+ *
+ * ## Design Rationale
+ *
+ * The large gap between card Z-values (max ~40M) and overlay base (2B) provides
+ * safety margin for future table zone expansions while ensuring overlays always
+ * render above cards regardless of table position.
+ *
+ * ## Usage
+ *
+ * Prefer using the semantic constants from ZValues namespace:
+ * @code
+ * card->setZValue(ZValues::HOVERED_CARD);
+ * arrow->setZValue(ZValues::ARROWS);
+ * @endcode
+ *
+ * Use validation functions to verify card Z-values during development:
+ * @code
+ * Q_ASSERT(ZValueLayerManager::isValidCardZValue(cardZ));
+ * @endcode
+ */
+
+#ifndef Z_VALUE_LAYER_MANAGER_H
+#define Z_VALUE_LAYER_MANAGER_H
+
+#include <QtGlobal>
+
+/**
+ * @namespace ZValueLayerManager
+ * @brief Utilities for Z-value validation and layer management.
+ */
+namespace ZValueLayerManager
+{
+
+/**
+ * @enum Layer
+ * @brief Semantic layer identifiers for Z-value allocation.
+ *
+ * These represent conceptual rendering layers, not actual Z-values.
+ * Use the corresponding ZValues constants for actual rendering.
+ */
+enum class Layer
+{
+    Zone,   ///< Zone-level elements like backgrounds and containers.
+    Card,   ///< Cards rendered in zones (uses sequential Z-values).
+    Overlay ///< Temporary UI elements like hovered cards and drag items.
+};
+
+/**
+ * @brief Maximum Z-value a card can have on the table zone.
+ *
+ * Based on table zone formula: (actualY + CardDimensions::HEIGHT) * 100000 + (actualX + 1) * 100
+ * With maximum 3 rows and CardDimensions::HEIGHT = 102, actualY <= ~289.
+ * Maximum: (289 + 102) * 100000 + 100 * 100 = 39,110,000
+ *
+ * We use 40,000,000 as a safe upper bound with margin.
+ */
+constexpr qreal CARD_Z_VALUE_MAX = 40000000.0;
+
+/**
+ * @brief Base Z-value for overlay elements.
+ *
+ * Must exceed CARD_Z_VALUE_MAX to ensure overlays render above all cards.
+ * The 50x margin (2B vs 40M) provides safety for future expansion.
+ */
+constexpr qreal OVERLAY_BASE = 2000000000.0;
+
+/**
+ * @brief Validates that a Z-value is within the valid card range.
+ *
+ * Cards should have Z-values between CARD_BASE (1.0) and CARD_Z_VALUE_MAX.
+ * Values outside this range may interfere with overlay rendering.
+ *
+ * @param zValue The Z-value to validate
+ * @return true if the Z-value is valid for a card
+ */
+[[nodiscard]] constexpr bool isValidCardZValue(qreal zValue)
+{
+    return zValue >= 1.0 && zValue <= CARD_Z_VALUE_MAX;
+}
+
+/**
+ * @brief Validates that a Z-value is in the overlay layer.
+ *
+ * Overlay elements should have Z-values at or above OVERLAY_BASE.
+ *
+ * @param zValue The Z-value to validate
+ * @return true if the Z-value is valid for an overlay element
+ */
+[[nodiscard]] constexpr bool isOverlayZValue(qreal zValue)
+{
+    return zValue >= OVERLAY_BASE;
+}
+
+/**
+ * @brief Returns the Z-value for a specific overlay element.
+ *
+ * @param offset Offset from OVERLAY_BASE (0-7 for current elements)
+ * @return The absolute Z-value for the overlay element
+ */
+[[nodiscard]] constexpr qreal overlayZValue(qreal offset)
+{
+    return OVERLAY_BASE + offset;
+}
+
+} // namespace ZValueLayerManager
+
+#endif // Z_VALUE_LAYER_MANAGER_H
diff --git a/cockatrice/src/game_graphics/z_values.h b/cockatrice/src/game_graphics/z_values.h
new file mode 100644
index 000000000..c6e7f2c8a
--- /dev/null
+++ b/cockatrice/src/game_graphics/z_values.h
@@ -0,0 +1,83 @@
+#ifndef Z_VALUES_H
+#define Z_VALUES_H
+
+#include "card_dimensions.h"
+#include "z_value_layer_manager.h"
+
+/**
+ * @file z_values.h
+ * @ingroup GameGraphics
+ * @brief Centralized Z-value constants for rendering layer order.
+ *
+ * Z-values in Qt determine stacking order. Higher values render on top.
+ * These constants define the visual layering hierarchy for the game scene.
+ *
+ * ## Layer Architecture
+ *
+ * See z_value_layer_manager.h for detailed documentation on the three-layer
+ * architecture (Zone, Card, Overlay) and the rationale for Z-value choices.
+ *
+ * ## Quick Reference
+ *
+ * | Layer    | Z-Value Range    | Purpose                           |
+ * |----------|------------------|-----------------------------------|
+ * | Zone     | 0.5 - 1.0        | Zone backgrounds, containers      |
+ * | Card     | 1.0 - 40,000,000 | Cards on table (position-based)   |
+ * | Overlay  | 2,000,000,000+   | UI elements above all cards       |
+ */
+
+namespace ZValues
+{
+
+// Expose base for callers that need it
+constexpr qreal OVERLAY_BASE = ZValueLayerManager::OVERLAY_BASE;
+
+// Overlay layer Z-values for items that should appear above normal cards
+constexpr qreal HOVERED_CARD = ZValueLayerManager::overlayZValue(1.0);
+constexpr qreal ARROWS = ZValueLayerManager::overlayZValue(3.0);
+constexpr qreal ZONE_VIEW_WIDGET = ZValueLayerManager::overlayZValue(4.0);
+constexpr qreal DRAG_ITEM = ZValueLayerManager::overlayZValue(5.0);
+constexpr qreal DRAG_ITEM_CHILD = ZValueLayerManager::overlayZValue(6.0);
+constexpr qreal TOP_UI = ZValueLayerManager::overlayZValue(7.0);
+
+/**
+ * @brief Compute Z-value for child drag items based on hotspot position.
+ *
+ * When dragging multiple cards together, each child card needs a unique Z-value
+ * to prevent Z-fighting (flickering/flashing). The Z-values are derived from
+ * their position when grabbed to conserve original stacking. The formula encodes
+ * 2D coordinates into a single value where X has higher weight, ensuring
+ * deterministic visual stacking.
+ *
+ * @param hotSpotX The X coordinate of the grab position
+ * @param hotSpotY The Y coordinate of the grab position
+ * @return Unique Z-value for the child drag item
+ */
+[[nodiscard]] constexpr qreal childDragZValue(qreal hotSpotX, qreal hotSpotY)
+{
+    return DRAG_ITEM_CHILD + hotSpotX * 1000000 + hotSpotY * 1000 + 1000;
+}
+
+/**
+ * @brief Compute Z-value for cards on the table zone based on position.
+ *
+ * Cards lower on the table (higher Y) render above cards higher up,
+ * and cards to the right (higher X) render above cards to the left.
+ * This creates natural visual stacking for overlapping cards.
+ *
+ * @param x The X coordinate of the card position
+ * @param y The Y coordinate of the card position
+ * @return Z-value for the card's table position
+ */
+[[nodiscard]] constexpr qreal tableCardZValue(qreal x, qreal y)
+{
+    return (y + CardDimensions::HEIGHT_F) * 100000.0 + (x + 1) * 100.0;
+}
+
+// Card layering (general architecture, not command-zone specific)
+constexpr qreal CARD_BASE = 1.0;
+constexpr qreal CARD_MAX = ZValueLayerManager::CARD_Z_VALUE_MAX;
+
+} // namespace ZValues
+
+#endif // Z_VALUES_H
diff --git a/cockatrice/src/game/zones/card_zone.cpp b/cockatrice/src/game_graphics/zones/card_zone.cpp
similarity index 74%
rename from cockatrice/src/game/zones/card_zone.cpp
rename to cockatrice/src/game_graphics/zones/card_zone.cpp
index 0c189cd2b..d09bb588c 100644
--- a/cockatrice/src/game/zones/card_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/card_zone.cpp
@@ -1,10 +1,18 @@
 #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)
@@ -19,25 +27,28 @@ CardZone::CardZone(CardZoneLogic *_logic, QGraphicsItem *parent)
 void CardZone::onCardAdded(CardItem *addedCard)
 {
     addedCard->setParentItem(this);
+    addedCard->setVisible(true);
     addedCard->update();
 }
 
 void CardZone::retranslateUi()
 {
-    for (int i = 0; i < getLogic()->getCards().size(); ++i)
+    for (int i = 0; i < getLogic()->getCards().size(); ++i) {
         getLogic()->getCards()[i]->retranslateUi();
+    }
 }
 
 void CardZone::mouseDoubleClickEvent(QGraphicsSceneMouseEvent * /*event*/)
 {
-    if (doubleClickAction)
+    if (doubleClickAction) {
         doubleClickAction->trigger();
+    }
 }
 
 bool CardZone::showContextMenu(const QPoint &screenPos)
 {
     if (menu) {
-        menu->exec(screenPos);
+        menu->popup(screenPos);
         return true;
     }
     return false;
@@ -46,12 +57,14 @@ bool CardZone::showContextMenu(const QPoint &screenPos)
 void CardZone::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     if (event->button() == Qt::RightButton) {
-        if (showContextMenu(event->screenPos()))
+        if (showContextMenu(event->screenPos())) {
             event->accept();
-        else
+        } else {
             event->ignore();
-    } else
+        }
+    } else {
         event->ignore();
+    }
 }
 
 QPointF CardZone::closestGridPoint(const QPointF &point)
diff --git a/cockatrice/src/game/zones/card_zone.h b/cockatrice/src/game_graphics/zones/card_zone.h
similarity index 68%
rename from cockatrice/src/game/zones/card_zone.h
rename to cockatrice/src/game_graphics/zones/card_zone.h
index 6fe8157e4..def3eee14 100644
--- a/cockatrice/src/game/zones/card_zone.h
+++ b/cockatrice/src/game_graphics/zones/card_zone.h
@@ -1,18 +1,27 @@
 /**
  * @file card_zone.h
  * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
+ * @brief Base graphics item for zones that contain cards.
  */
 
 #ifndef CARDZONE_H
 #define CARDZONE_H
 
-#include "../../game_graphics/board/abstract_graphics_item.h"
-#include "../../game_graphics/board/graphics_item_type.h"
-#include "logic/card_zone_logic.h"
+#include "../board/abstract_graphics_item.h"
+#include "../board/graphics_item_type.h"
 
 #include <QLoggingCategory>
-#include <QString>
+#include <QPointF>
+#include <qtmetamacros.h>
+
+class CardDragItem;
+class CardItem;
+class CardZoneLogic;
+class QAction;
+class QGraphicsItem;
+class QMenu;
+class QPoint;
+template <typename T> class QList;
 
 inline Q_LOGGING_CATEGORY(CardZoneLog, "card_zone");
 
@@ -40,7 +49,13 @@ protected:
     }
 public slots:
     bool showContextMenu(const QPoint &screenPos);
-    void onCardAdded(CardItem *addedCard);
+    /**
+     * @brief Called when a card is added to this zone. Default: reparents card to this item.
+     *
+     * Virtual so subclasses (e.g. SelectZone) can override parenting behavior — the Qt signal
+     * connection in CardZone's constructor dispatches through the vtable.
+     */
+    virtual void onCardAdded(CardItem *addedCard);
 
 public:
     enum
diff --git a/cockatrice/src/game_graphics/zones/hand_zone.cpp b/cockatrice/src/game_graphics/zones/hand_zone.cpp
new file mode 100644
index 000000000..3e527c081
--- /dev/null
+++ b/cockatrice/src/game_graphics/zones/hand_zone.cpp
@@ -0,0 +1,155 @@
+#include "hand_zone.h"
+
+#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)
+{
+    connect(themeManager, &ThemeManager::themeChanged, this, &HandZone::updateBg);
+    updateBg();
+    setCacheMode(DeviceCoordinateCache);
+}
+
+void HandZone::updateBg()
+{
+    update();
+}
+
+void HandZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
+                               CardZoneLogic *startZone,
+                               const QPoint &dropPoint)
+{
+    if (startZone == nullptr || startZone->getPlayer() == nullptr || dragItems.isEmpty()) {
+        return;
+    }
+
+    QPoint point = dropPoint + scenePos().toPoint();
+    int x = -1;
+    if (SettingsCache::instance().userInterface().getHorizontalHand()) {
+        for (x = 0; x < getLogic()->getCards().size(); x++) {
+            if (point.x() < static_cast<CardItem *>(getLogic()->getCards().at(x))->scenePos().x()) {
+                break;
+            }
+        }
+    } else {
+        bool sameZone = startZone == getLogic();
+        x = calcDropIndexFromY(dropPoint.y(), !sameZone);
+    }
+
+    Command_MoveCard cmd;
+    cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId());
+    cmd.set_start_zone(startZone->getName().toStdString());
+    cmd.set_target_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId());
+    cmd.set_target_zone(getLogic()->getName().toStdString());
+    cmd.set_x(x);
+    cmd.set_y(-1);
+
+    for (int i = 0; i < dragItems.size(); ++i) {
+        cmd.mutable_cards_to_move()->add_card()->set_card_id(dragItems[i]->getId());
+    }
+
+    getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd);
+}
+
+QRectF HandZone::boundingRect() const
+{
+    if (SettingsCache::instance().userInterface().getHorizontalHand()) {
+        return QRectF(0, 0, width, CardDimensions::HEIGHT_F + 10);
+    } else {
+        return QRectF(0, 0, CardDimensions::WIDTH_F * 1.5, zoneHeight);
+    }
+}
+
+void HandZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
+{
+    QBrush brush = themeManager->getExtraBgBrush(ThemeManager::Hand, getLogic()->getPlayer()->getZoneId());
+    painter->fillRect(boundingRect(), brush);
+}
+
+void HandZone::reorganizeCards()
+{
+    if (!getLogic()->getCards().isEmpty()) {
+        const int cardCount = getLogic()->getCards().size();
+        if (SettingsCache::instance().userInterface().getHorizontalHand()) {
+            bool leftJustified = SettingsCache::instance().userInterface().getLeftJustified();
+            qreal cardWidth = getLogic()->getCards().at(0)->boundingRect().width();
+            const int xPadding = leftJustified ? cardWidth * 1.4 : 5;
+            qreal totalWidth =
+                leftJustified ? boundingRect().width() - (1 * xPadding) - 5 : boundingRect().width() - 2 * xPadding;
+
+            if (cardCount == 1) {
+                CardItem *c = getLogic()->getCards().at(0);
+                qreal xPosition = leftJustified ? xPadding : xPadding + (totalWidth - cardWidth) / 2;
+                c->setPos(xPosition, 5);
+                c->setRealZValue(0);
+            } else {
+                for (int i = 0; i < cardCount; i++) {
+                    CardItem *c = getLogic()->getCards().at(i);
+                    // If the total width of the cards is smaller than the available width,
+                    // the cards do not need to overlap and are displayed in the center of the area.
+                    if (cardWidth * cardCount > totalWidth) {
+                        c->setPos(xPadding + ((qreal)i) * (totalWidth - cardWidth) / (cardCount - 1), 5);
+                    } else {
+                        qreal xPosition = leftJustified ? xPadding + ((qreal)i) * cardWidth
+                                                        : xPadding + ((qreal)i) * cardWidth +
+                                                              (totalWidth - cardCount * cardWidth) / 2;
+                        c->setPos(xPosition, 5);
+                    }
+                    c->setRealZValue(i);
+                }
+            }
+        } else {
+            // No clip container: hand cards should always be visible to the player.
+            const auto params = buildStackParams();
+            layoutCardsVertically(params);
+        }
+    }
+    update();
+}
+
+void HandZone::sortHand(const QList<CardList::SortOption> &options)
+{
+    if (getLogic()->getCards().isEmpty()) {
+        return;
+    }
+
+    getLogic()->sortCards(options);
+    reorganizeCards();
+}
+
+void HandZone::setWidth(qreal _width)
+{
+    if (SettingsCache::instance().userInterface().getHorizontalHand()) {
+        prepareGeometryChange();
+        width = _width;
+        reorganizeCards();
+    }
+}
+
+void HandZone::updateOrientation()
+{
+    prepareGeometryChange();
+    reorganizeCards();
+}
diff --git a/cockatrice/src/game/zones/hand_zone.h b/cockatrice/src/game_graphics/zones/hand_zone.h
similarity index 72%
rename from cockatrice/src/game/zones/hand_zone.h
rename to cockatrice/src/game_graphics/zones/hand_zone.h
index 25f4148bd..5c91d684d 100644
--- a/cockatrice/src/game/zones/hand_zone.h
+++ b/cockatrice/src/game_graphics/zones/hand_zone.h
@@ -1,20 +1,28 @@
 /**
  * @file hand_zone.h
  * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
+ * @brief Graphical zone for the player's hand, supporting horizontal and vertical layouts.
  */
 
 #ifndef HANDZONE_H
 #define HANDZONE_H
 
-#include "logic/hand_zone_logic.h"
+#include "../../game/board/card_list.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
 private:
-    qreal width, zoneHeight;
+    qreal width = 0.0;
+    qreal zoneHeight;
 private slots:
     void updateBg();
 public slots:
diff --git a/cockatrice/src/game/zones/pile_zone.cpp b/cockatrice/src/game_graphics/zones/pile_zone.cpp
similarity index 57%
rename from cockatrice/src/game/zones/pile_zone.cpp
rename to cockatrice/src/game_graphics/zones/pile_zone.cpp
index 2d1390826..77a87a4af 100644
--- a/cockatrice/src/game/zones/pile_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/pile_zone.cpp
@@ -1,16 +1,33 @@
 #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 "../player/player.h"
-#include "../player/player_actions.h"
-#include "logic/pile_zone_logic.h"
-#include "view_zone.h"
+#include "../card_dimensions.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)
 {
@@ -19,27 +36,29 @@ PileZone::PileZone(PileZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_log
     setCursor(Qt::OpenHandCursor);
 
     setTransform(QTransform()
-                     .translate((float)CARD_WIDTH / 2, (float)CARD_HEIGHT / 2)
+                     .translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F)
                      .rotate(90)
-                     .translate((float)-CARD_WIDTH / 2, (float)-CARD_HEIGHT / 2));
+                     .translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F));
 
-    connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
-        Q_UNUSED(_roundCardCorners);
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::roundCardCornersChanged, this,
+            [this](bool _roundCardCorners) {
+                Q_UNUSED(_roundCardCorners);
 
-        prepareGeometryChange();
-        update();
-    });
+                prepareGeometryChange();
+                update();
+            });
 }
 
 QRectF PileZone::boundingRect() const
 {
-    return QRectF(0, 0, CARD_WIDTH, CARD_HEIGHT);
+    return QRectF(0, 0, CardDimensions::WIDTH_F, CardDimensions::HEIGHT_F);
 }
 
 QPainterPath PileZone::shape() const
 {
     QPainterPath shape;
-    qreal cardCornerRadius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * CARD_WIDTH : 0.0;
+    qreal cardCornerRadius =
+        SettingsCache::instance().cardsDisplay().getRoundCardCorners() ? 0.05 * CardDimensions::WIDTH_F : 0.0;
     shape.addRoundedRect(boundingRect(), cardCornerRadius, cardCornerRadius);
     return shape;
 }
@@ -48,13 +67,14 @@ void PileZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*optio
 {
     painter->drawPath(shape());
 
-    if (!getLogic()->getCards().isEmpty())
+    if (!getLogic()->getCards().isEmpty()) {
         getLogic()->getCards().at(0)->paintPicture(painter, getLogic()->getCards().at(0)->getTranslatedSize(painter),
                                                    90);
+    }
 
-    painter->translate((float)CARD_WIDTH / 2, (float)CARD_HEIGHT / 2);
+    painter->translate(CardDimensions::WIDTH_HALF_F, CardDimensions::HEIGHT_HALF_F);
     painter->rotate(-90);
-    painter->translate((float)-CARD_WIDTH / 2, (float)-CARD_HEIGHT / 2);
+    painter->translate(-CardDimensions::WIDTH_HALF_F, -CardDimensions::HEIGHT_HALF_F);
     paintNumberEllipse(getLogic()->getCards().size(), 28, Qt::white, -1, -1, painter);
 }
 
@@ -68,8 +88,13 @@ void PileZone::handleDropEvent(const QList<CardDragItem *> &dragItems, CardZoneL
     cmd.set_x(0);
     cmd.set_y(0);
 
-    for (int i = 0; i < dragItems.size(); ++i)
-        cmd.mutable_cards_to_move()->add_card()->set_card_id(dragItems[i]->getId());
+    for (int i = 0; i < dragItems.size(); ++i) {
+        auto cardToMove = cmd.mutable_cards_to_move()->add_card();
+        cardToMove->set_card_id(dragItems[i]->getId());
+        if (dragItems[i]->isForceFaceDown()) {
+            cardToMove->set_face_down(true);
+        }
+    }
 
     getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd);
 }
@@ -82,31 +107,35 @@ void PileZone::reorganizeCards()
 void PileZone::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     CardZone::mousePressEvent(event);
-    if (event->isAccepted())
+    if (event->isAccepted()) {
         return;
+    }
 
     if (event->button() == Qt::LeftButton) {
         setCursor(Qt::ClosedHandCursor);
         event->accept();
-    } else
+    } else {
         event->ignore();
+    }
 }
 
 void PileZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     if ((event->screenPos() - event->buttonDownScreenPos(Qt::LeftButton)).manhattanLength() <
-        QApplication::startDragDistance())
+        QApplication::startDragDistance()) {
         return;
+    }
 
-    if (getLogic()->getCards().isEmpty())
+    if (getLogic()->getCards().isEmpty()) {
         return;
+    }
 
-    bool faceDown = event->modifiers().testFlag(Qt::ShiftModifier);
+    bool forceFaceDown = event->modifiers().testFlag(Qt::ShiftModifier);
     bool bottomCard = event->modifiers().testFlag(Qt::ControlModifier);
     CardItem *card = bottomCard ? getLogic()->getCards().last() : getLogic()->getCards().first();
     const int cardid =
         getLogic()->contentsKnown() ? card->getId() : (bottomCard ? getLogic()->getCards().size() - 1 : 0);
-    CardDragItem *drag = card->createDragItem(cardid, event->pos(), event->scenePos(), faceDown);
+    CardDragItem *drag = card->createDragItem(cardid, event->pos(), event->scenePos(), forceFaceDown);
     drag->grabMouse();
     setCursor(Qt::OpenHandCursor);
 }
@@ -118,7 +147,8 @@ void PileZone::mouseReleaseEvent(QGraphicsSceneMouseEvent * /*event*/)
 
 void PileZone::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
 {
-    if (!getLogic()->getCards().isEmpty())
+    if (!getLogic()->getCards().isEmpty()) {
         getLogic()->getCards()[0]->processHoverEvent();
+    }
     QGraphicsItem::hoverEnterEvent(event);
 }
diff --git a/cockatrice/src/game/zones/pile_zone.h b/cockatrice/src/game_graphics/zones/pile_zone.h
similarity index 91%
rename from cockatrice/src/game/zones/pile_zone.h
rename to cockatrice/src/game_graphics/zones/pile_zone.h
index 5bfc50880..b2d8d0cd2 100644
--- a/cockatrice/src/game/zones/pile_zone.h
+++ b/cockatrice/src/game_graphics/zones/pile_zone.h
@@ -1,14 +1,18 @@
 /**
  * @file pile_zone.h
  * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef PILEZONE_H
 #define PILEZONE_H
 
 #include "card_zone.h"
-#include "logic/pile_zone_logic.h"
+
+#include <qtmetamacros.h>
+
+class PileZoneLogic;
+class QGraphicsItem;
 
 /**
  * A CardZone where the cards are in a single pile instead of being laid out.
diff --git a/cockatrice/src/game_graphics/zones/select_zone.cpp b/cockatrice/src/game_graphics/zones/select_zone.cpp
new file mode 100644
index 000000000..d69ec32f5
--- /dev/null
+++ b/cockatrice/src/game_graphics/zones/select_zone.cpp
@@ -0,0 +1,294 @@
+#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)
+{
+    const qreal overlapPercent = SettingsCache::instance().cardsDisplay().getStackCardOverlapPercent();
+    return cardHeight * (100.0 - overlapPercent) / 100.0;
+}
+
+SelectZone::ZoneLayout SelectZone::computeZoneLayout(const StackLayoutParams &params)
+{
+    if (params.cardCount <= 0) {
+        return {0.0, 0.0};
+    }
+    qreal effectiveOffset = params.desiredOffset;
+    if (params.cardCount > 1) {
+        qreal reservedForBottomCard;
+        if (params.allowBottomOverflow) {
+            // Allow the bottom card to partially overflow in tight zones, scaling the
+            // overflow allowance by sqrt(cardCount-1) so offsets decrease smoothly
+            // as cards are added rather than dropping by 1/(n-1) each time.
+            // The 0.75 ratio was tuned experimentally to balance card visibility vs. overflow.
+            constexpr qreal bottomCardZoneRatio = 0.75;
+            const qreal adjustedRatio = bottomCardZoneRatio / qSqrt(static_cast<qreal>(params.cardCount - 1));
+            reservedForBottomCard = qMin(params.cardHeight, params.totalHeight * adjustedRatio);
+        } else {
+            // No overflow: reserve full card height for the bottom card
+            reservedForBottomCard = params.cardHeight;
+        }
+        qreal fitOffset = (params.totalHeight - reservedForBottomCard) / (params.cardCount - 1);
+
+        if (!params.allowBottomOverflow) {
+            // Constrain offset so all card tops remain within zone bounds.
+            // With start=0, last card top at (cardCount-1) * effectiveOffset must be < totalHeight.
+            qreal maxOffsetForTops = params.totalHeight / (params.cardCount - 1);
+            fitOffset = qMin(fitOffset, maxOffsetForTops);
+        }
+
+        // Apply minOffset only if it fits; otherwise compress further to keep all card tops visible.
+        effectiveOffset = qMin(params.desiredOffset, fitOffset);
+        if (fitOffset >= params.minOffset) {
+            effectiveOffset = qMax(params.minOffset, effectiveOffset);
+        }
+    }
+    qreal stackHeight = (params.cardCount - 1) * effectiveOffset + params.cardHeight;
+    qreal start = (stackHeight <= params.totalHeight) ? (params.totalHeight - stackHeight) / 2.0 : 0.0;
+    return {effectiveOffset, start};
+}
+
+SelectZone *SelectZone::findOwningSelectZone(const QGraphicsItem *card)
+{
+    QGraphicsItem *parent = card ? card->parentItem() : nullptr;
+    if (!parent) {
+        return nullptr;
+    }
+    // Card may be direct child of zone (escaped for hover) or child of clip container.
+    if (auto *zone = dynamic_cast<SelectZone *>(parent)) {
+        return zone;
+    }
+    if (auto *zone = dynamic_cast<SelectZone *>(parent->parentItem())) {
+        return zone;
+    }
+    return nullptr;
+}
+
+SelectZone::StackLayoutParams SelectZone::buildStackParams(qreal minOffset) const
+{
+    const auto &cards = getLogic()->getCards();
+    if (cards.isEmpty()) {
+        return {0, boundingRect().height(), 0.0, 0.0, minOffset};
+    }
+    const auto cardCount = static_cast<int>(cards.size());
+    const qreal cardHeight = cards.at(0)->boundingRect().height();
+    const qreal offset = stackingOffset(cardHeight);
+    return {cardCount, boundingRect().height(), cardHeight, offset, minOffset};
+}
+
+int SelectZone::calcDropIndexFromY(qreal dropY, bool allowCountExpand, qreal minOffset) const
+{
+    const auto &cards = getLogic()->getCards();
+    if (cards.isEmpty()) {
+        return 0;
+    }
+    const auto params = buildStackParams(minOffset);
+    auto [effectiveOffset, start] = computeZoneLayout(params);
+    if (effectiveOffset <= 0.0) {
+        return 0;
+    }
+    int max = allowCountExpand ? params.cardCount : params.cardCount - 1;
+    return qBound(0, qRound((dropY - start) / effectiveOffset), max);
+}
+
+void SelectZone::restoreStaleEscapedCards()
+{
+    if (!cardClipContainer) {
+        return;
+    }
+    for (auto *card : getLogic()->getCards()) {
+        // A card parented to the zone (instead of the clip container) should
+        // only occur while it is actively hovered. If hover cleanup was
+        // missed, reparent it back so clipping resumes.
+        if (card && card->parentItem() == this && !card->getIsHovered()) {
+            card->setParentItem(cardClipContainer);
+        }
+    }
+}
+
+void SelectZone::layoutCardsVertically(const StackLayoutParams &params)
+{
+    const auto &cards = getLogic()->getCards();
+    if (cards.isEmpty() || params.cardCount <= 0) {
+        return;
+    }
+    if (params.cardCount > cards.size()) {
+        return;
+    }
+
+    constexpr qreal xspace = 5;
+    const qreal cardWidth = cards.at(0)->boundingRect().width();
+    const qreal totalWidth = boundingRect().width();
+    const qreal x1 = xspace;
+    const qreal x2 = totalWidth - xspace - cardWidth;
+    const qreal xCentered = (totalWidth - cardWidth) / 2.0;
+
+    auto [effectiveOffset, start] = computeZoneLayout(params);
+    for (int i = 0; i < params.cardCount; i++) {
+        CardItem *card = cards.at(i);
+        qreal y = start + i * effectiveOffset;
+        // Center single card; alternate left/right for multiple cards
+        qreal x = (params.cardCount == 1) ? xCentered : ((i % 2) ? x2 : x1);
+        card->setPos(x, y);
+        card->setRealZValue(i);
+    }
+}
+
+SelectZone::SelectZone(CardZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_logic, parent)
+{
+}
+
+SelectZone::~SelectZone()
+{
+    if (cardClipContainer) {
+        // Reparent any hover-escaped cards back to the clip container so Qt's
+        // parent-child tree is consistent for destruction. setParentItem() does
+        // not invalidate getLogic()->getCards() (it modifies the graphics tree,
+        // not the zone's logical card list).
+        for (auto *card : getLogic()->getCards()) {
+            if (card && card->parentItem() == this) {
+                card->setParentItem(cardClipContainer);
+            }
+        }
+    }
+}
+
+void SelectZone::onCardAdded(CardItem *addedCard)
+{
+    if (cardClipContainer && addedCard) {
+        addedCard->setParentItem(cardClipContainer);
+        addedCard->setVisible(true);
+        addedCard->update();
+    } else {
+        CardZone::onCardAdded(addedCard);
+    }
+}
+
+void SelectZone::setupClipContainer(std::optional<qreal> zValue)
+{
+    if (cardClipContainer) {
+        return;
+    }
+
+    setFlag(QGraphicsItem::ItemClipsChildrenToShape, false);
+
+    cardClipContainer = new QGraphicsRectItem(this); // Owned by Qt parent-child tree; deleted with this zone.
+    cardClipContainer->setFlag(QGraphicsItem::ItemClipsChildrenToShape, true);
+    cardClipContainer->setPen(Qt::NoPen);
+    cardClipContainer->setBrush(Qt::NoBrush);
+    cardClipContainer->setRect(boundingRect());
+    if (zValue.has_value()) {
+        cardClipContainer->setZValue(*zValue);
+    }
+}
+
+void SelectZone::escapeClipForHover(QGraphicsItem *card)
+{
+    // Reparent from clip container to zone so the hover-scaled card is visible
+    // beyond clip bounds. Coordinates are identical because the clip container
+    // is at (0,0) with no transform relative to this zone.
+    if (cardClipContainer && card && card->parentItem() == cardClipContainer) {
+        card->setParentItem(this);
+        cardClipContainer->update();
+    }
+}
+
+void SelectZone::restoreClipAfterHover(QGraphicsItem *card)
+{
+    // Restore card to clip container. If card's parent is not this zone,
+    // a zone transition already reparented it via onCardAdded — skip.
+    if (cardClipContainer && card && card->parentItem() == this) {
+        card->setParentItem(cardClipContainer);
+    }
+}
+
+void SelectZone::updateClipRect()
+{
+    if (cardClipContainer) {
+        cardClipContainer->setRect(boundingRect());
+    }
+}
+
+void SelectZone::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (event->buttons().testFlag(Qt::LeftButton)) {
+        QPointF pos = event->pos();
+        if (pos.x() < 0) {
+            pos.setX(0);
+        }
+        QRectF br = boundingRect();
+        if (pos.x() > br.width()) {
+            pos.setX(br.width());
+        }
+        if (pos.y() < 0) {
+            pos.setY(0);
+        }
+        if (pos.y() > br.height()) {
+            pos.setY(br.height());
+        }
+
+        QRectF selectionRect = QRectF(selectionOrigin, pos).normalized();
+        for (auto card : getLogic()->getCards()) {
+            if (card->getAttachedTo() && card->getAttachedTo()->getZone() != getLogic()) {
+                continue;
+            }
+
+            bool inRect = selectionRect.intersects(card->mapRectToItem(this, card->boundingRect()));
+            if (inRect && !cardsInSelectionRect.contains(card)) {
+                // selection has just expanded to cover the card
+                cardsInSelectionRect.insert(card);
+                card->setSelected(!card->isSelected());
+            } else if (!inRect && cardsInSelectionRect.contains(card)) {
+                // selection has just shrunk to no longer cover the card
+                cardsInSelectionRect.remove(card);
+                card->setSelected(!card->isSelected());
+            }
+        }
+        static_cast<GameScene *>(scene())->resizeRubberBand(
+            deviceTransform(static_cast<GameScene *>(scene())->getViewportTransform()).map(pos),
+            cardsInSelectionRect.size());
+        event->accept();
+    }
+}
+
+void SelectZone::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton) {
+        if (!event->modifiers().testFlag(Qt::ControlModifier)) {
+            scene()->clearSelection();
+        }
+
+        selectionOrigin = event->pos();
+        static_cast<GameScene *>(scene())->startRubberBand(event->scenePos());
+        event->accept();
+    } else {
+        CardZone::mousePressEvent(event);
+    }
+}
+
+void SelectZone::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    selectionOrigin = QPoint();
+    cardsInSelectionRect.clear();
+    static_cast<GameScene *>(scene())->stopRubberBand();
+    event->accept();
+}
diff --git a/cockatrice/src/game_graphics/zones/select_zone.h b/cockatrice/src/game_graphics/zones/select_zone.h
new file mode 100644
index 000000000..8a56949e3
--- /dev/null
+++ b/cockatrice/src/game_graphics/zones/select_zone.h
@@ -0,0 +1,158 @@
+/**
+ * @file select_zone.h
+ * @ingroup GameGraphicsZones
+ * @brief Base class for zones where cards are laid out and individually interactable.
+ */
+
+#ifndef SELECTZONE_H
+#define SELECTZONE_H
+
+#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.
+ */
+class SelectZone : public CardZone
+{
+    Q_OBJECT
+public:
+    /**
+     * @brief Finds the SelectZone that owns a card, regardless of whether the card is parented
+     * to the zone directly or to its clip container. Returns nullptr if not in a SelectZone.
+     */
+    static SelectZone *findOwningSelectZone(const QGraphicsItem *card);
+
+    SelectZone(CardZoneLogic *logic, QGraphicsItem *parent = nullptr);
+    ~SelectZone() override;
+    void onCardAdded(CardItem *addedCard) override;
+
+    /**
+     * @brief Temporarily reparents a card from the clip container to this zone so hover scaling is visible beyond clip
+     * bounds. Safe no-op if no clip container exists. Coordinates are preserved (clip container is at (0,0) with no
+     * transform).
+     */
+    void escapeClipForHover(QGraphicsItem *card);
+    /**
+     * @brief Restores a hover-escaped card back to the clip container. Guards against zone transitions that already
+     * reparented the card.
+     */
+    void restoreClipAfterHover(QGraphicsItem *card);
+
+private:
+    QPointF selectionOrigin;
+    QSet<CardItem *> cardsInSelectionRect;
+    /**
+     * @brief Invisible clipping parent for cards; owned by Qt parent-child tree (parented to this zone).
+     * Created by setupClipContainer(); null when no clip container is active.
+     */
+    QGraphicsRectItem *cardClipContainer = nullptr;
+
+protected:
+    // -- Layout computation --
+
+    /** @brief Parameters describing a vertical card stack's geometry. */
+    struct StackLayoutParams
+    {
+        int cardCount;         ///< Number of cards in the stack
+        qreal totalHeight;     ///< Available height for the stack (zone height)
+        qreal cardHeight;      ///< Height of a single card
+        qreal desiredOffset;   ///< Preferred vertical offset between card tops
+        qreal minOffset = 0.0; ///< Minimum offset to preserve (0 allows full compression)
+        /**
+         * @brief When false (default), reserves full cardHeight for the bottom card, ensuring
+         * all cards remain within zone bounds. When true, allows the bottom card to
+         * partially overflow using sqrt-scaled allowance. Use with setupClipContainer()
+         * for zones too short to fit a full card.
+         */
+        bool allowBottomOverflow = false;
+    };
+
+    /** @brief Result of computing a vertical stack layout. */
+    struct ZoneLayout
+    {
+        qreal effectiveOffset; ///< Actual offset between card tops (may be compressed)
+        qreal start;           ///< Y coordinate of the first card's top edge
+    };
+
+    /** @brief Minimum visible pixels of each card's top edge when stacking compresses offsets in tight zones. */
+    static constexpr qreal MIN_CARD_VISIBLE = 10.0;
+
+    /**
+     * @brief Computes layout for a vertical card stack (effective offset and start position).
+     *
+     * Three regimes:
+     *  1. Minimized zone (totalHeight < card height with minOffset > 0): offsets compress
+     *     so each card retains at least minOffset visible pixels of its top edge.
+     *  2. Normal zone with allowBottomOverflow=false (default): the bottom card is
+     *     guaranteed to fit within the zone boundary. Offsets compress as needed.
+     *  3. Normal zone with allowBottomOverflow=true: the bottom card may partially
+     *     overflow. The overflow allowance is scaled by sqrt(cardCount-1) so that
+     *     adding one card shifts existing cards smoothly.
+     *
+     * When the stack fits with room to spare, it is centered vertically.
+     */
+    static ZoneLayout computeZoneLayout(const StackLayoutParams &params);
+
+    /** @brief Builds StackLayoutParams from the current card list and zone geometry. */
+    StackLayoutParams buildStackParams(qreal minOffset = 0.0) const;
+
+    /**
+     * @brief Computes the card index at a given y-coordinate within the zone's vertical layout.
+     * Returns 0 if the zone has no cards or the offset is zero.
+     *
+     * @param dropY The y-coordinate that the card was dropped at
+     * @param allowCountExpand If false, clamps the index at the number of cards minus 1
+     * @param minOffset Minimum offset to preserve
+     */
+    int calcDropIndexFromY(qreal dropY, bool allowCountExpand, qreal minOffset = 0.0) const;
+
+    /**
+     * @brief Positions cards vertically with alternating left/right x-offsets.
+     *
+     * Cards alternate between left and right margins (5px padding from zone edges):
+     * even-indexed cards at left, odd-indexed at right.
+     * Cards are assigned ascending z-values.
+     *
+     * @param params Stack layout geometry parameters (use allowBottomOverflow to control overflow)
+     */
+    void layoutCardsVertically(const StackLayoutParams &params);
+
+    // -- Clip container --
+    // The clip container mechanism is available for future zones that need visual clipping
+    // (e.g., zones too short to fit a full card). To enable: call setupClipContainer() in the
+    // zone's constructor, and set allowBottomOverflow=true in layout params.
+
+    /**
+     * @brief Restores any cards that were hover-escaped but whose hover state was not properly cleaned up.
+     * Call at the start of reorganizeCards() in zones that use a clip container.
+     */
+    void restoreStaleEscapedCards();
+
+    /**
+     * @brief Creates a clip container child item that clips card overflow to zone bounds.
+     * Cards entering this zone are reparented to this container by the onCardAdded override.
+     * Disables zone-level child clipping; clipping is delegated to the container.
+     * @param zValue Optional z-value for the clip container (e.g. ZValues::CARD_BASE)
+     */
+    void setupClipContainer(std::optional<qreal> zValue = std::nullopt);
+
+    /** @brief Updates the clip container rect to match this zone's current boundingRect(). */
+    void updateClipRect();
+
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
+    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
+};
+
+#endif
diff --git a/cockatrice/src/game_graphics/zones/stack_zone.cpp b/cockatrice/src/game_graphics/zones/stack_zone.cpp
new file mode 100644
index 000000000..de1ff8ba9
--- /dev/null
+++ b/cockatrice/src/game_graphics/zones/stack_zone.cpp
@@ -0,0 +1,121 @@
+#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)
+{
+    connect(themeManager, &ThemeManager::themeChanged, this, &StackZone::updateBg);
+    updateBg();
+    setCacheMode(DeviceCoordinateCache);
+}
+
+void StackZone::updateBg()
+{
+    update();
+}
+
+QRectF StackZone::boundingRect() const
+{
+    return {0, 0, CardDimensions::WIDTH_F * 1.5, zoneHeight};
+}
+
+void StackZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
+{
+    if (playmatActive) {
+        // Subtle overlay to distinguish stack zone from table zone (slightly darker)
+        painter->fillRect(boundingRect(), QColor(0, 0, 0, 80));
+    } else {
+        QBrush brush = themeManager->getExtraBgBrush(ThemeManager::Stack, getLogic()->getPlayer()->getZoneId());
+        painter->fillRect(boundingRect(), brush);
+    }
+}
+
+void StackZone::onPlaymatChanged(bool active)
+{
+    playmatActive = active;
+    // See TableZone::onPlaymatChanged for the rationale. Translucent overlay
+    // over a dynamic playmat should not be held in the device cache.
+    setCacheMode(active ? QGraphicsItem::NoCache : QGraphicsItem::DeviceCoordinateCache);
+    update();
+}
+
+void StackZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
+                                CardZoneLogic *startZone,
+                                const QPoint &dropPoint)
+{
+    if (startZone == nullptr || startZone->getPlayer() == nullptr || dragItems.isEmpty()) {
+        return;
+    }
+
+    bool sameZone = startZone == getLogic();
+    int index = calcDropIndexFromY(dropPoint.y(), !sameZone, MIN_CARD_VISIBLE);
+    if (sameZone) {
+        // Same-zone no-op: don't move a card onto itself
+        const auto &cards = getLogic()->getCards();
+        if (!cards.isEmpty() && cards.at(index)->getId() == dragItems.at(0)->getId()) {
+            return;
+        }
+    }
+
+    Command_MoveCard cmd;
+    cmd.set_start_player_id(startZone->getPlayer()->getPlayerInfo()->getId());
+    cmd.set_start_zone(startZone->getName().toStdString());
+    cmd.set_target_player_id(getLogic()->getPlayer()->getPlayerInfo()->getId());
+    cmd.set_target_zone(getLogic()->getName().toStdString());
+    cmd.set_x(index);
+    cmd.set_y(0);
+
+    for (const CardDragItem *item : dragItems) {
+        if (item) {
+            auto *cardToMove = cmd.mutable_cards_to_move()->add_card();
+            cardToMove->set_card_id(item->getId());
+            if (item->isForceFaceDown()) {
+                cardToMove->set_face_down(true);
+            }
+        }
+    }
+
+    getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd);
+}
+
+void StackZone::setHeight(qreal newHeight)
+{
+    if (qFuzzyCompare(1.0 + zoneHeight, 1.0 + newHeight)) {
+        return;
+    }
+    prepareGeometryChange();
+    zoneHeight = newHeight;
+    reorganizeCards();
+    update();
+}
+
+void StackZone::reorganizeCards()
+{
+    if (!getLogic()->getCards().isEmpty()) {
+        const auto params = buildStackParams(MIN_CARD_VISIBLE);
+        layoutCardsVertically(params);
+    }
+    update();
+}
diff --git a/cockatrice/src/game/zones/stack_zone.h b/cockatrice/src/game_graphics/zones/stack_zone.h
similarity index 62%
rename from cockatrice/src/game/zones/stack_zone.h
rename to cockatrice/src/game_graphics/zones/stack_zone.h
index 7c98f5128..5dea481b6 100644
--- a/cockatrice/src/game/zones/stack_zone.h
+++ b/cockatrice/src/game_graphics/zones/stack_zone.h
@@ -1,25 +1,36 @@
 /**
  * @file stack_zone.h
  * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
+ * @brief Graphical zone for the stack, displaying cards in a vertical pile.
  */
 
 #ifndef STACKZONE_H
 #define STACKZONE_H
 
-#include "logic/stack_zone_logic.h"
 #include "select_zone.h"
 
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class QGraphicsItem;
+class StackZoneLogic;
+
 class StackZone : public SelectZone
 {
     Q_OBJECT
 private:
     qreal zoneHeight;
+    bool playmatActive = false;
 private slots:
     void updateBg();
 
+public slots:
+    void onPlaymatChanged(bool active);
+
 public:
     StackZone(StackZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent);
+    /** @brief Resizes the stack zone height, e.g. when sharing vertical space with the command zone. */
+    void setHeight(qreal newHeight);
     void
     handleDropEvent(const QList<CardDragItem *> &dragItems, CardZoneLogic *startZone, const QPoint &dropPoint) override;
     QRectF boundingRect() const override;
diff --git a/cockatrice/src/game/zones/table_zone.cpp b/cockatrice/src/game_graphics/zones/table_zone.cpp
similarity index 66%
rename from cockatrice/src/game/zones/table_zone.cpp
rename to cockatrice/src/game_graphics/zones/table_zone.cpp
index c76514350..b704b79e0 100644
--- a/cockatrice/src/game/zones/table_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/table_zone.cpp
@@ -1,36 +1,68 @@
 #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/arrow_item.h"
+#include "../board/abstract_card_item.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
-#include "../player/player.h"
-#include "../player/player_actions.h"
-#include "logic/table_zone_logic.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);
 const QColor TableZone::GRADIENT_COLOR = QColor(255, 255, 255, 150);
 const QColor TableZone::GRADIENT_COLORLESS = QColor(255, 255, 255, 0);
 
-TableZone::TableZone(TableZoneLogic *_logic, QGraphicsItem *parent) : SelectZone(_logic, parent), active(false)
+TableZone::TableZone(TableZoneLogic *_logic, bool _mirrored, QGraphicsItem *parent)
+    : SelectZone(_logic, parent), active(false), mirrored(_mirrored)
 {
     connect(_logic, &TableZoneLogic::contentSizeChanged, this, &TableZone::resizeToContents);
     connect(_logic, &TableZoneLogic::toggleTapped, this, &TableZone::toggleTapped);
     connect(themeManager, &ThemeManager::themeChanged, this, &TableZone::updateBg);
-    connect(&SettingsCache::instance(), &SettingsCache::invertVerticalCoordinateChanged, this,
+    connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::invertVerticalCoordinateChanged, this,
             &TableZone::reorganizeCards);
 
     updateBg();
 
-    height = MARGIN_TOP + MARGIN_BOTTOM + TABLEROWS * CARD_HEIGHT + (TABLEROWS - 1) * PADDING_Y;
+    height = MARGIN_TOP + MARGIN_BOTTOM + TABLEROWS * CardDimensions::HEIGHT + (TABLEROWS - 1) * PADDING_Y;
     width = MIN_WIDTH;
     currentMinimumWidth = width;
 
@@ -43,35 +75,87 @@ void TableZone::updateBg()
     update();
 }
 
+void TableZone::triggerDamageShimmer()
+{
+    if (!SettingsCache::instance().userInterface().getBattlefieldFlashEnabled()) {
+        damageShimmerAlpha = 0.0;
+        return;
+    }
+
+    damageShimmerAlpha = 1.0;
+    shimmerClock.start();
+    if (scene()) {
+        static_cast<GameScene *>(scene())->registerAnimationItem(this);
+    }
+}
+
+bool TableZone::animationEvent()
+{
+    damageShimmerAlpha = 1.0 - shimmerClock.elapsed() / shimmerDurationMs;
+    if (damageShimmerAlpha <= 0.0) {
+        damageShimmerAlpha = 0.0;
+        return false;
+    }
+    update();
+    return true;
+}
+
 QRectF TableZone::boundingRect() const
 {
     return QRectF(0, 0, width, height);
 }
 
+void TableZone::setMirrored(bool isMirrored)
+{
+    mirrored = isMirrored;
+    update();
+}
+
 bool TableZone::isInverted() const
 {
-    return ((getLogic()->getPlayer()->getGraphicsItem()->getMirrored() &&
-             !SettingsCache::instance().getInvertVerticalCoordinate()) ||
-            (!getLogic()->getPlayer()->getGraphicsItem()->getMirrored() &&
-             SettingsCache::instance().getInvertVerticalCoordinate()));
+    return ((mirrored && !SettingsCache::instance().userInterface().getInvertVerticalCoordinate()) ||
+            (!mirrored && SettingsCache::instance().userInterface().getInvertVerticalCoordinate()));
 }
 
 void TableZone::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/)
 {
-    QBrush brush = themeManager->getExtraBgBrush(ThemeManager::Table, getLogic()->getPlayer()->getZoneId());
-    painter->fillRect(boundingRect(), brush);
+    if (playmatActive) {
+        // Subtle overlay to distinguish table zone from stack zone
+        painter->fillRect(boundingRect(), QColor(0, 0, 0, 60));
+    } else {
+        QBrush brush = themeManager->getExtraBgBrush(ThemeManager::Table, getLogic()->getPlayer()->getZoneId());
+        painter->fillRect(boundingRect(), brush);
+    }
 
     if (active) {
         paintZoneOutline(painter);
     } else {
         // inactive player gets a darker table zone with a semi transparent black mask
-        // this means if the user provides a custom background it will fade
+        // this means if the user provides a custom background or playmat it will fade
         painter->fillRect(boundingRect(), FADE_MASK);
     }
 
+    // Decaying crimson wash from taking damage.
+    if (damageShimmerAlpha > 0.0) {
+        QColor shimmerColor(239, 68, 68);
+        shimmerColor.setAlphaF(0.22 * damageShimmerAlpha);
+        painter->fillRect(boundingRect(), shimmerColor);
+    }
+
     paintLandDivider(painter);
 }
 
+void TableZone::onPlaymatChanged(bool active)
+{
+    playmatActive = active;
+    // While a playmat is shown the zone paints a translucent overlay over the
+    // dynamic playmat behind it. Keep it out of the device cache so the cached
+    // pixels are never stale relative to the playmat (and to avoid compositing
+    // artifacts of cached translucent content on some platforms).
+    setCacheMode(active ? QGraphicsItem::NoCache : QGraphicsItem::DeviceCoordinateCache);
+    update();
+}
+
 /**
    Render a soft outline around the edge of the TableZone.
 
@@ -105,9 +189,10 @@ void TableZone::paintLandDivider(QPainter *painter)
 {
     // Place the line 2 grid heights down then back it off just enough to allow
     // some space between a 3-card stack and the land area.
-    qreal separatorY = MARGIN_TOP + 2 * (CARD_HEIGHT + PADDING_Y) - STACKED_CARD_OFFSET_Y / 2;
-    if (isInverted())
+    qreal separatorY = MARGIN_TOP + 2 * (CardDimensions::HEIGHT + PADDING_Y) - STACKED_CARD_OFFSET_Y / 2;
+    if (isInverted()) {
         separatorY = height - separatorY;
+    }
     painter->setPen(QColor(255, 255, 255, 40));
     painter->drawLine(QPointF(0, separatorY), QPointF(width, separatorY));
 }
@@ -134,8 +219,10 @@ void TableZone::handleDropEventByGrid(const QList<CardDragItem *> &dragItems,
     for (const auto &item : dragItems) {
         CardToMove *ctm = cmd.mutable_cards_to_move()->add_card();
         ctm->set_card_id(item->getId());
-        ctm->set_face_down(item->getFaceDown());
-        if (startZone->getName() != getLogic()->getName() && !item->getFaceDown()) {
+        if (item->isForceFaceDown()) {
+            ctm->set_face_down(true);
+        }
+        if (startZone->getName() != getLogic()->getName() && !item->isForceFaceDown()) {
             const auto &card = item->getItem()->getCard();
             if (card) {
                 ctm->set_pt(card.getInfo().getPowTough().toStdString());
@@ -153,8 +240,9 @@ void TableZone::reorganizeCards()
 
     for (int i = 0; i < getLogic()->getCards().size(); ++i) {
         QPoint gridPoint = getLogic()->getCards()[i]->getGridPos();
-        if (gridPoint.x() == -1)
+        if (gridPoint.x() == -1) {
             continue;
+        }
 
         QPointF mapPoint = mapFromGrid(gridPoint);
         qreal x = mapPoint.x();
@@ -163,11 +251,12 @@ void TableZone::reorganizeCards()
         int numberAttachedCards = getLogic()->getCards()[i]->getAttachedCards().size();
         qreal actualX = x + numberAttachedCards * STACKED_CARD_OFFSET_X;
         qreal actualY = y;
-        if (numberAttachedCards)
+        if (numberAttachedCards) {
             actualY += 15;
+        }
 
         getLogic()->getCards()[i]->setPos(actualX, actualY);
-        getLogic()->getCards()[i]->setRealZValue((actualY + CARD_HEIGHT) * 100000 + (actualX + 1) * 100);
+        getLogic()->getCards()[i]->setRealZValue(ZValues::tableCardZValue(actualX, actualY));
 
         QListIterator<CardItem *> attachedCardIterator(getLogic()->getCards()[i]->getAttachedCards());
         int j = 0;
@@ -177,7 +266,7 @@ void TableZone::reorganizeCards()
             qreal childX = actualX - j * STACKED_CARD_OFFSET_X;
             qreal childY = y + 5;
             attachedCard->setPos(childX, childY);
-            attachedCard->setRealZValue((childY + CARD_HEIGHT) * 100000 + (childX + 1) * 100);
+            attachedCard->setRealZValue(ZValues::tableCardZValue(childX, childY));
         }
     }
 
@@ -192,7 +281,7 @@ void TableZone::toggleTapped()
 
     auto isCardOnTable = [](const QGraphicsItem *item) {
         if (auto card = qgraphicsitem_cast<const CardItem *>(item)) {
-            return card->getZone()->getName() == "table";
+            return card->getZone()->getName() == ZoneNames::TABLE;
         }
         return false;
     };
@@ -223,16 +312,19 @@ void TableZone::resizeToContents()
     int xMax = 0;
 
     // Find rightmost card position, which includes the left margin amount.
-    for (int i = 0; i < getLogic()->getCards().size(); ++i)
-        if (getLogic()->getCards()[i]->pos().x() > xMax)
+    for (int i = 0; i < getLogic()->getCards().size(); ++i) {
+        if (getLogic()->getCards()[i]->pos().x() > xMax) {
             xMax = (int)getLogic()->getCards()[i]->pos().x();
+        }
+    }
 
     // Minimum width is the rightmost card position plus enough room for
     // another card with padding, then margin.
-    currentMinimumWidth = xMax + (2 * CARD_WIDTH) + PADDING_X + MARGIN_RIGHT;
+    currentMinimumWidth = xMax + (2 * CardDimensions::WIDTH) + PADDING_X + MARGIN_RIGHT;
 
-    if (currentMinimumWidth < MIN_WIDTH)
+    if (currentMinimumWidth < MIN_WIDTH) {
         currentMinimumWidth = MIN_WIDTH;
+    }
 
     if (currentMinimumWidth != width) {
         prepareGeometryChange();
@@ -243,9 +335,11 @@ void TableZone::resizeToContents()
 
 CardItem *TableZone::getCardFromGrid(const QPoint &gridPoint) const
 {
-    for (int i = 0; i < getLogic()->getCards().size(); i++)
-        if (getLogic()->getCards().at(i)->getGridPoint() == gridPoint)
+    for (int i = 0; i < getLogic()->getCards().size(); i++) {
+        if (getLogic()->getCards().at(i)->getGridPoint() == gridPoint) {
             return getLogic()->getCards().at(i);
+        }
+    }
     return 0;
 }
 
@@ -262,8 +356,9 @@ void TableZone::computeCardStackWidths()
     QMap<int, int> cardStackCount;
     for (int i = 0; i < getLogic()->getCards().size(); ++i) {
         const QPoint &gridPoint = getLogic()->getCards()[i]->getGridPos();
-        if (gridPoint.x() == -1)
+        if (gridPoint.x() == -1) {
             continue;
+        }
 
         const int key = getCardStackMapKey(gridPoint.x() / 3, gridPoint.y());
         cardStackCount.insert(key, cardStackCount.value(key, 0) + 1);
@@ -273,16 +368,18 @@ void TableZone::computeCardStackWidths()
     cardStackWidth.clear();
     for (int i = 0; i < getLogic()->getCards().size(); ++i) {
         const QPoint &gridPoint = getLogic()->getCards()[i]->getGridPos();
-        if (gridPoint.x() == -1)
+        if (gridPoint.x() == -1) {
             continue;
+        }
 
         const int key = getCardStackMapKey(gridPoint.x() / 3, gridPoint.y());
         const int stackCount = cardStackCount.value(key, 0);
-        if (stackCount == 1)
-            cardStackWidth.insert(key, CARD_WIDTH + getLogic()->getCards()[i]->getAttachedCards().size() *
-                                                        STACKED_CARD_OFFSET_X);
-        else
-            cardStackWidth.insert(key, CARD_WIDTH + (stackCount - 1) * STACKED_CARD_OFFSET_X);
+        if (stackCount == 1) {
+            cardStackWidth.insert(key, CardDimensions::WIDTH + getLogic()->getCards()[i]->getAttachedCards().size() *
+                                                                   STACKED_CARD_OFFSET_X);
+        } else {
+            cardStackWidth.insert(key, CardDimensions::WIDTH + (stackCount - 1) * STACKED_CARD_OFFSET_X);
+        }
     }
 }
 
@@ -296,18 +393,20 @@ QPointF TableZone::mapFromGrid(QPoint gridPoint) const
     // Add in width of card stack plus padding for each column
     for (int i = 0; i < gridPoint.x() / 3; ++i) {
         const int key = getCardStackMapKey(i, gridPoint.y());
-        x += cardStackWidth.value(key, CARD_WIDTH) + PADDING_X;
+        x += cardStackWidth.value(key, CardDimensions::WIDTH) + PADDING_X;
     }
 
-    if (isInverted())
+    if (isInverted()) {
         gridPoint.setY(TABLEROWS - 1 - gridPoint.y());
+    }
 
     // Start with margin plus stacked card offset
     y = MARGIN_TOP + (gridPoint.x() % 3) * STACKED_CARD_OFFSET_Y;
 
     // Add in card size and padding for each row
-    for (int i = 0; i < gridPoint.y(); ++i)
-        y += CARD_HEIGHT + PADDING_Y;
+    for (int i = 0; i < gridPoint.y(); ++i) {
+        y += CardDimensions::HEIGHT + PADDING_Y;
+    }
 
     return QPointF(x, y);
 }
@@ -321,13 +420,14 @@ QPoint TableZone::mapToGrid(const QPointF &mapPoint) const
     int y = mapPoint.y() - MARGIN_TOP;
 
     // Below calculation effectively rounds to the nearest grid point.
-    const int gridPointHeight = CARD_HEIGHT + PADDING_Y;
+    const int gridPointHeight = CardDimensions::HEIGHT + PADDING_Y;
     int gridPointY = (y + PADDING_Y / 2) / gridPointHeight;
 
     gridPointY = clampValidTableRow(gridPointY);
 
-    if (isInverted())
+    if (isInverted()) {
         gridPointY = TABLEROWS - 1 - gridPointY;
+    }
 
     // Calculating the x-coordinate of the grid space requires adding up the
     // widths of each card stack along the row.
@@ -337,7 +437,7 @@ QPoint TableZone::mapToGrid(const QPointF &mapPoint) const
 
     // Maximum value is a card width from the right margin, referenced to the
     // grid area.
-    const int xMax = width - MARGIN_LEFT - MARGIN_RIGHT - CARD_WIDTH;
+    const int xMax = width - MARGIN_LEFT - MARGIN_RIGHT - CardDimensions::WIDTH;
 
     int xStack = 0;
     int xNextStack = 0;
@@ -345,7 +445,7 @@ QPoint TableZone::mapToGrid(const QPointF &mapPoint) const
     while ((xNextStack <= x) && (xNextStack <= xMax)) {
         xStack = xNextStack;
         const int key = getCardStackMapKey(nextStackCol, gridPointY);
-        xNextStack += cardStackWidth.value(key, CARD_WIDTH) + PADDING_X;
+        xNextStack += cardStackWidth.value(key, CardDimensions::WIDTH) + PADDING_X;
         nextStackCol++;
     }
     int stackCol = qMax(nextStackCol - 1, 0);
@@ -363,18 +463,30 @@ QPointF TableZone::closestGridPoint(const QPointF &point)
 {
     QPoint gridPoint = mapToGrid(point);
     gridPoint.setX((gridPoint.x() / 3) * 3);
-    if (getCardFromGrid(gridPoint))
+    if (getCardFromGrid(gridPoint)) {
         gridPoint.setX(gridPoint.x() + 1);
-    if (getCardFromGrid(gridPoint))
+    }
+    if (getCardFromGrid(gridPoint)) {
         gridPoint.setX(gridPoint.x() + 1);
+    }
     return mapFromGrid(gridPoint);
 }
 
 int TableZone::clampValidTableRow(const int row)
 {
-    if (row < 0)
+    if (row < 0) {
         return 0;
-    if (row >= TABLEROWS)
+    }
+    if (row >= TABLEROWS) {
         return TABLEROWS - 1;
+    }
     return row;
 }
+
+int TableZone::tableRowToGridY(int tableRow)
+{
+    if (tableRow > 2) {
+        tableRow = 1;
+    }
+    return clampValidTableRow(2 - tableRow);
+}
diff --git a/cockatrice/src/game/zones/table_zone.h b/cockatrice/src/game_graphics/zones/table_zone.h
similarity index 65%
rename from cockatrice/src/game/zones/table_zone.h
rename to cockatrice/src/game_graphics/zones/table_zone.h
index 3b353e76c..ccd1d8e81 100644
--- a/cockatrice/src/game/zones/table_zone.h
+++ b/cockatrice/src/game_graphics/zones/table_zone.h
@@ -1,24 +1,40 @@
 /**
  * @file table_zone.h
  * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TABLEZONE_H
 #define TABLEZONE_H
 
-#include "../board/abstract_card_item.h"
-#include "logic/table_zone_logic.h"
+#include "../animated_item.h"
+#include "../card_dimensions.h"
 #include "select_zone.h"
 
-/*
- * TableZone is the grid based rect where CardItems may be placed.
- * It is the main play zone and can be customized with background images.
+#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.
  *
- * TODO: Refactor methods to make more readable, extract some logic to
- * private methods (Im looking at you TableZone::reorganizeCards())
+ * It is the main play zone and can be customized with background images.
  */
-class TableZone : public SelectZone
+//! \todo Refactor methods to make more readable, extract logic to private methods (especially reorganizeCards()).
+class TableZone : public SelectZone, public IAnimatedItem
 {
     Q_OBJECT
 
@@ -41,12 +57,12 @@ private:
     /*
     Minimum width of the table zone including margins.
     */
-    static const int MIN_WIDTH = MARGIN_LEFT + (5 * CARD_WIDTH) + MARGIN_RIGHT;
+    static const int MIN_WIDTH = MARGIN_LEFT + (5 * CardDimensions::WIDTH) + MARGIN_RIGHT;
 
     /*
     Offset sizes when cards are stacked on each other in the grid
     */
-    static const int STACKED_CARD_OFFSET_X = CARD_WIDTH / 3;
+    static const int STACKED_CARD_OFFSET_X = CardDimensions::WIDTH / 3;
     static const int STACKED_CARD_OFFSET_Y = PADDING_Y / 3;
 
     /*
@@ -83,6 +99,8 @@ private:
        If this TableZone is currently active
      */
     bool active = false;
+    bool mirrored = false;
+    bool playmatActive = false;
 
     [[nodiscard]] bool isInverted() const;
 
@@ -92,11 +110,15 @@ private slots:
      */
     void updateBg();
 
+public slots:
+    void onPlaymatChanged(bool active);
+
 public slots:
     /**
        Reorganizes CardItems in the TableZone
      */
     void reorganizeCards() override;
+    void setMirrored(bool isMirrored);
 
 public:
     /**
@@ -105,7 +127,7 @@ public:
        @param _p the Player
        @param parent defaults to null
      */
-    explicit TableZone(TableZoneLogic *_logic, QGraphicsItem *parent = nullptr);
+    explicit TableZone(TableZoneLogic *_logic, bool mirrored, QGraphicsItem *parent = nullptr);
 
     /**
        @return a QRectF of the TableZone bounding box.
@@ -120,6 +142,16 @@ public:
      */
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override;
 
+    /**
+       Flashes the table surface after a player loses life.
+
+       Wired up through the life counter so the battlefield glows when life drops.
+     */
+    void triggerDamageShimmer();
+
+    /** @brief Decays the damage shimmer by one timer tick. */
+    bool animationEvent() override;
+
     /**
        Toggles the selected items as tapped.
      */
@@ -151,6 +183,13 @@ public:
 
     static int clampValidTableRow(const int row);
 
+    /**
+     * Converts a card's logical table row (0=creatures, 1=noncreatures, 2=lands)
+     * to the corresponding grid Y coordinate. Cards with tableRow > 2 (e.g.,
+     * instants/sorceries) default to the noncreatures row.
+     */
+    static int tableRowToGridY(int tableRow);
+
     /**
        Resizes the TableZone in case CardItems are within or
        outside of the TableZone constraints.
@@ -163,8 +202,17 @@ public:
     }
     void setWidth(qreal _width)
     {
+        // The width is stored as an int; truncate to match the previous implicit conversion.
+        const int newWidth = static_cast<int>(_width);
+        if (width == newWidth) {
+            return;
+        }
         prepareGeometryChange();
-        width = _width;
+        width = newWidth;
+        // The parent player item's boundingRect (which clips the playmat painting) is
+        // derived from this zone's size. Without this signal the playmat is cut off at
+        // the stale boundingRect edge whenever the scene is resized wider.
+        emit sizeChanged();
     }
     [[nodiscard]] qreal getWidth() const
     {
@@ -177,6 +225,11 @@ public:
     }
 
 private:
+    static constexpr qreal shimmerDurationMs = 450.0;
+
+    QElapsedTimer shimmerClock;
+    qreal damageShimmerAlpha = 0.0;
+
     void paintZoneOutline(QPainter *painter);
     void paintLandDivider(QPainter *painter);
 
diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game_graphics/zones/view_zone.cpp
similarity index 78%
rename from cockatrice/src/game/zones/view_zone.cpp
rename to cockatrice/src/game_graphics/zones/view_zone.cpp
index 4ae25989e..a2aa124dc 100644
--- a/cockatrice/src/game/zones/view_zone.cpp
+++ b/cockatrice/src/game_graphics/zones/view_zone.cpp
@@ -1,21 +1,40 @@
 #include "view_zone.h"
 
+#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 "../player/player.h"
-#include "../player/player_actions.h"
-#include "logic/view_zone_logic.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 <QGraphicsSceneWheelEvent>
+#include <QMessageLogger>
+#include <QObject>
 #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>
 #include <libcockatrice/protocol/pb/response_dump_zone.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <string>
+
+class QGraphicsItem;
 
 /**
  * @param parent the parent QGraphicsWidget containing the reveal zone
@@ -73,7 +92,10 @@ void ZoneViewZone::initializeCards(const QList<const ServerInfo_Card *> &cardLis
         for (int i = 0; i < cardList.size(); ++i) {
             auto card = cardList[i];
             CardRef cardRef = {QString::fromStdString(card->name()), QString::fromStdString(card->provider_id())};
-            getLogic()->addCard(new CardItem(getLogic()->getPlayer(), this, cardRef, card->id()), false, i);
+            auto copy = new CardItem(getLogic()->getPlayer(), this, cardRef, card->id());
+            copy->setFaceDown(card->face_down());
+
+            getLogic()->addCard(copy, false, i);
         }
         reorganizeCards();
     } else if (!qobject_cast<ZoneViewZoneLogic *>(getLogic())->getOriginalZone()->contentsKnown()) {
@@ -91,8 +113,10 @@ void ZoneViewZone::initializeCards(const QList<const ServerInfo_Card *> &cardLis
         int number = numberCards == -1 ? c.size() : (numberCards < c.size() ? numberCards : c.size());
         for (int i = 0; i < number; i++) {
             CardItem *card = c.at(i);
-            getLogic()->addCard(new CardItem(getLogic()->getPlayer(), this, card->getCardRef(), card->getId()), false,
-                                i);
+            auto copy = new CardItem(getLogic()->getPlayer(), this, card->getCardRef(), card->getId());
+            copy->setFaceDown(card->getFaceDown());
+
+            getLogic()->addCard(copy, false, i);
         }
         reorganizeCards();
     }
@@ -107,12 +131,15 @@ void ZoneViewZone::zoneDumpReceived(const Response &r)
         auto cardName = QString::fromStdString(cardInfo.name());
         auto cardProviderId = QString::fromStdString(cardInfo.provider_id());
         auto card = new CardItem(getLogic()->getPlayer(), this, {cardName, cardProviderId}, cardInfo.id(), getLogic());
+        card->setFaceDown(cardInfo.face_down());
         getLogic()->rawInsertCard(card, i);
     }
 
     qobject_cast<ZoneViewZoneLogic *>(getLogic())->updateCardIds(ZoneViewZoneLogic::INITIALIZE);
     reorganizeCards();
-    emit getLogic()->cardCountChanged();
+    // clang-format off
+    emit getLogic()->cardCountChanged(); // emit keyword causes spurious spacing around ->
+    // clang-format on
 }
 
 // Because of boundingRect(), this function must not be called before the zone was added to a scene.
@@ -160,8 +187,8 @@ void ZoneViewZone::reorganizeCards()
     // determine bounding rect
     qreal aleft = 0;
     qreal atop = 0;
-    qreal awidth = gridSize.cols * CARD_WIDTH + (CARD_WIDTH / 2) + HORIZONTAL_PADDING;
-    qreal aheight = (gridSize.rows * CARD_HEIGHT) / 3 + CARD_HEIGHT * 1.3;
+    qreal awidth = gridSize.cols * CardDimensions::WIDTH_F + CardDimensions::WIDTH_HALF_F + HORIZONTAL_PADDING;
+    qreal aheight = (gridSize.rows * CardDimensions::HEIGHT_F) / 3 + CardDimensions::HEIGHT_F * 1.3;
     optimumRect = QRectF(aleft, atop, awidth, aheight);
 
     updateGeometry();
@@ -195,17 +222,17 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca
             QString columnProp = extractor(c);
 
             if (i) { // if not the first card
-                if (columnProp == lastColumnProp)
+                if (columnProp == lastColumnProp) {
                     row++; // add below current card
-                else {     // if no match then move card to next column
+                } else {   // if no match then move card to next column
                     col++;
                     row = 0;
                 }
             }
 
             lastColumnProp = columnProp;
-            qreal x = col * CARD_WIDTH;
-            qreal y = row * CARD_HEIGHT / 3;
+            qreal x = col * CardDimensions::WIDTH_F;
+            qreal y = row * CardDimensions::HEIGHT_F / 3;
             c->setPos(HORIZONTAL_PADDING + x, VERTICAL_PADDING + y);
             c->setRealZValue(i);
             longestRow = qMax(row, longestRow);
@@ -225,15 +252,16 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca
             cols = qCeil((double)cardCount / minRows);
         }
 
-        if (cols < 2)
+        if (cols < 2) {
             cols = 2;
+        }
 
         qCDebug(ViewZoneLog) << "reorganizeCards: rows=" << rows << "cols=" << cols;
 
         for (int i = 0; i < cardCount; i++) {
             CardItem *c = cards.at(i);
-            qreal x = (i / rows) * CARD_WIDTH;
-            qreal y = (i % rows) * CARD_HEIGHT / 3;
+            qreal x = (i / rows) * CardDimensions::WIDTH_F;
+            qreal y = (i % rows) * CardDimensions::HEIGHT_F / 3;
             c->setPos(HORIZONTAL_PADDING + x, VERTICAL_PADDING + y);
             c->setRealZValue(i);
         }
@@ -244,7 +272,10 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca
 
 void ZoneViewZone::setFilterString(const QString &_filterString)
 {
-    filterString = FilterString(_filterString);
+    const CardsDisplaySettings &cardsDisplay = SettingsCache::instance().cardsDisplay();
+    filterString = FilterString(
+        _filterString, CardSearchLanguage{cardsDisplay.getCardLang(),
+                                          static_cast<SearchLanguageMode>(cardsDisplay.getCardSearchLanguage())});
     reorganizeCards();
 }
 
@@ -279,8 +310,13 @@ void ZoneViewZone::handleDropEvent(const QList<CardDragItem *> &dragItems,
     cmd.set_y(0);
     cmd.set_is_reversed(qobject_cast<ZoneViewZoneLogic *>(getLogic())->getIsReversed());
 
-    for (int i = 0; i < dragItems.size(); ++i)
-        cmd.mutable_cards_to_move()->add_card()->set_card_id(dragItems[i]->getId());
+    for (int i = 0; i < dragItems.size(); ++i) {
+        auto cardToMove = cmd.mutable_cards_to_move()->add_card();
+        cardToMove->set_card_id(dragItems[i]->getId());
+        if (dragItems[i]->isForceFaceDown()) {
+            cardToMove->set_face_down(true);
+        }
+    }
 
     getLogic()->getPlayer()->getPlayerActions()->sendGameCommand(cmd);
 }
diff --git a/cockatrice/src/game/zones/view_zone.h b/cockatrice/src/game_graphics/zones/view_zone.h
similarity index 85%
rename from cockatrice/src/game/zones/view_zone.h
rename to cockatrice/src/game_graphics/zones/view_zone.h
index 81279c72e..4032da760 100644
--- a/cockatrice/src/game/zones/view_zone.h
+++ b/cockatrice/src/game_graphics/zones/view_zone.h
@@ -1,23 +1,35 @@
 /**
  * @file view_zone.h
  * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef ZONEVIEWERZONE_H
 #define ZONEVIEWERZONE_H
 
-#include "logic/view_zone_logic.h"
+#include "../../game/board/card_list.h"
 #include "select_zone.h"
 
 #include <QGraphicsLayoutItem>
+#include <QList>
 #include <QLoggingCategory>
+#include <QRectF>
+#include <QSizeF>
+#include <QString>
 #include <libcockatrice/filters/filter_string.h>
-#include <libcockatrice/protocol/pb/commands.pb.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;
 
 inline Q_LOGGING_CATEGORY(ViewZoneLog, "view_zone");
 
-class ZoneViewWidget;
 class Response;
 class ServerInfo_Card;
 class QGraphicsSceneWheelEvent;
diff --git a/cockatrice/src/game/zones/view_zone_widget.cpp b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
similarity index 58%
rename from cockatrice/src/game/zones/view_zone_widget.cpp
rename to cockatrice/src/game_graphics/zones/view_zone_widget.cpp
index 91abb4663..49d9955e0 100644
--- a/cockatrice/src/game/zones/view_zone_widget.cpp
+++ b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp
@@ -1,23 +1,65 @@
 #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 "../board/card_item.h"
-#include "../game_scene.h"
-#include "../player/player.h"
-#include "../player/player_actions.h"
+#include "../card_dimensions.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 <QLabel>
-#include <QPainter>
+#include <QGraphicsSceneResizeEvent>
+#include <QGraphicsView>
+#include <QIcon>
+#include <QObject>
+#include <QRect>
 #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 kMinVisibleWidth = 100.0;
+} // namespace
 
 /**
  * @param _player the player the cards were revealed to.
@@ -28,7 +70,7 @@
  * @param _revealZone if false, the cards will be face down.
  * @param _writeableRevealZone whether the player can interact with the revealed cards.
  */
-ZoneViewWidget::ZoneViewWidget(Player *_player,
+ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player,
                                CardZoneLogic *_origZone,
                                int numberCards,
                                bool _revealZone,
@@ -39,7 +81,7 @@ ZoneViewWidget::ZoneViewWidget(Player *_player,
 {
     setAcceptHoverEvents(true);
     setAttribute(Qt::WA_DeleteOnClose);
-    setZValue(2000000006);
+    setZValue(ZValues::ZONE_VIEW_WIDGET);
     setFlag(ItemIgnoresTransformations);
 
     QGraphicsLinearLayout *vbox = new QGraphicsLinearLayout(Qt::Vertical);
@@ -52,33 +94,38 @@ ZoneViewWidget::ZoneViewWidget(Player *_player,
         searchEdit.setPlaceholderText(tr("Search by card name (or search expressions)"));
         searchEdit.setClearButtonEnabled(true);
         searchEdit.addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition);
-        auto help = searchEdit.addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition);
+        auto help = searchEdit.addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition);
 
         connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(&searchEdit); });
 
-        if (SettingsCache::instance().getFocusCardViewSearchBar()) {
+        if (SettingsCache::instance().userInterface().getFocusCardViewSearchBar()) {
             this->setActive(true);
             searchEdit.setFocus();
         }
 
         QGraphicsProxyWidget *searchEditProxy = new QGraphicsProxyWidget;
         searchEditProxy->setWidget(&searchEdit);
-        searchEditProxy->setZValue(2000000007);
+        searchEditProxy->setZValue(ZValues::DRAG_ITEM);
         vbox->addItem(searchEditProxy);
 
+        // hide search bar if chat autofocus setting is enabled, since typing into it will no longer work anyway
+        searchEditProxy->setVisible(!SettingsCache::instance().userInterface().getKeepGameChatFocus());
+        connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::keepGameChatFocusChanged,
+                searchEditProxy, [searchEditProxy](bool keepFocus) { searchEditProxy->setVisible(!keepFocus); });
+
         // top row
         QGraphicsLinearLayout *hTopRow = new QGraphicsLinearLayout(Qt::Horizontal);
 
         // groupBy options
         QGraphicsProxyWidget *groupBySelectorProxy = new QGraphicsProxyWidget;
         groupBySelectorProxy->setWidget(&groupBySelector);
-        groupBySelectorProxy->setZValue(2000000008);
+        groupBySelectorProxy->setZValue(ZValues::TOP_UI);
         hTopRow->addItem(groupBySelectorProxy);
 
         // sortBy options
         QGraphicsProxyWidget *sortBySelectorProxy = new QGraphicsProxyWidget;
         sortBySelectorProxy->setWidget(&sortBySelector);
-        sortBySelectorProxy->setZValue(2000000007);
+        sortBySelectorProxy->setZValue(ZValues::DRAG_ITEM);
         hTopRow->addItem(sortBySelectorProxy);
 
         vbox->addItem(hTopRow);
@@ -144,15 +191,21 @@ ZoneViewWidget::ZoneViewWidget(Player *_player,
         connect(&sortBySelector, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
                 &ZoneViewWidget::processSortBy);
         connect(&pileViewCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &ZoneViewWidget::processSetPileView);
-        groupBySelector.setCurrentIndex(SettingsCache::instance().getZoneViewGroupByIndex());
-        sortBySelector.setCurrentIndex(SettingsCache::instance().getZoneViewSortByIndex());
-        pileViewCheckBox.setChecked(SettingsCache::instance().getZoneViewPileView());
+        groupBySelector.setCurrentIndex(SettingsCache::instance().userInterface().getZoneViewGroupByIndex());
+        sortBySelector.setCurrentIndex(SettingsCache::instance().userInterface().getZoneViewSortByIndex());
+        pileViewCheckBox.setChecked(SettingsCache::instance().userInterface().getZoneViewPileView());
 
         if (CardList::NoSort == static_cast<CardList::SortOption>(groupBySelector.currentData().toInt())) {
             pileViewCheckBox.setEnabled(false);
         }
 
         connect(&searchEdit, &QLineEdit::textChanged, zone, &ZoneViewZone::setFilterString);
+
+        const auto applyCardSearchLanguage = [this] { zone->setFilterString(searchEdit.text()); };
+        connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this,
+                applyCardSearchLanguage);
+        connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardSearchLanguageChanged, this,
+                applyCardSearchLanguage);
     }
 
     setLayout(vbox);
@@ -176,7 +229,7 @@ ZoneViewWidget::ZoneViewWidget(Player *_player,
 void ZoneViewWidget::processGroupBy(int index)
 {
     auto option = static_cast<CardList::SortOption>(groupBySelector.itemData(index).toInt());
-    SettingsCache::instance().setZoneViewGroupByIndex(index);
+    SettingsCache::instance().userInterface().setZoneViewGroupByIndex(index);
     zone->setGroupBy(option);
 
     // disable pile view checkbox if we're not grouping by anything
@@ -200,13 +253,13 @@ void ZoneViewWidget::processSortBy(int index)
         return;
     }
 
-    SettingsCache::instance().setZoneViewSortByIndex(index);
+    SettingsCache::instance().userInterface().setZoneViewSortByIndex(index);
     zone->setSortBy(option);
 }
 
 void ZoneViewWidget::processSetPileView(QT_STATE_CHANGED_T value)
 {
-    SettingsCache::instance().setZoneViewPileView(value);
+    SettingsCache::instance().userInterface().setZoneViewPileView(value);
     zone->setPileView(value);
 }
 
@@ -241,33 +294,197 @@ void ZoneViewWidget::retranslateUi()
     pileViewCheckBox.setText(tr("pile view"));
 }
 
-void ZoneViewWidget::moveEvent(QGraphicsSceneMoveEvent * /* event */)
+void ZoneViewWidget::stopWindowDrag()
 {
-    if (!scene())
+    if (!draggingWindow) {
         return;
-
-    int titleBarHeight = 24;
-
-    QPointF scenePos = pos();
-
-    if (scenePos.x() < 0) {
-        scenePos.setX(0);
-    } else {
-        qreal maxw = scene()->sceneRect().width() - 100;
-        if (scenePos.x() > maxw)
-            scenePos.setX(maxw);
     }
 
-    if (scenePos.y() < titleBarHeight) {
-        scenePos.setY(titleBarHeight);
-    } else {
-        qreal maxh = scene()->sceneRect().height() - titleBarHeight;
-        if (scenePos.y() > maxh)
-            scenePos.setY(maxh);
+    draggingWindow = false;
+    ungrabMouse();
+}
+
+void ZoneViewWidget::startWindowDrag(QGraphicsSceneMouseEvent *event)
+{
+    draggingWindow = true;
+    dragStartItemPos = pos();
+    dragStartScreenPos = event->screenPos();
+    dragView = findDragView(event->widget());
+
+    // need to grab mouse to receive events and not miss initial movement
+    grabMouse();
+}
+
+QRectF ZoneViewWidget::closeButtonRect(QWidget *styleWidget) const
+{
+    const QRectF frameRectF = windowFrameRect();
+
+    // 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));
+
+    if (styleWidget) {
+        QStyleOptionTitleBar opt;
+        opt.initFrom(styleWidget);
+        opt.rect = titleBarRect;
+        opt.text = windowTitle();
+        opt.icon = styleWidget->windowIcon();
+        opt.titleBarFlags = Qt::Window | Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint;
+
+        opt.subControls = QStyle::SC_TitleBarCloseButton;
+        opt.activeSubControls = QStyle::SC_TitleBarCloseButton;
+        opt.titleBarState = styleWidget->isActiveWindow() ? Qt::WindowActive : Qt::WindowNoState;
+
+        if (styleWidget->isActiveWindow()) {
+            opt.state |= QStyle::State_Active;
+        }
+
+        QRect r = styleWidget->style()->subControlRect(QStyle::CC_TitleBar, &opt, QStyle::SC_TitleBarCloseButton,
+                                                       styleWidget);
+
+        if (r.isValid() && !r.isEmpty()) {
+            // Translate from local-titlebar coords → frame coords
+            r.translate(frameRectF.topLeft().toPoint());
+            return QRectF(r);
+        }
     }
 
-    if (scenePos != pos())
-        setPos(scenePos);
+    // Fallback: frame-relative top-right
+    return QRectF(frameRectF.right() - tbh, frameRectF.top(), tbh, tbh);
+}
+
+QGraphicsView *ZoneViewWidget::findDragView(QWidget *eventWidget) const
+{
+    QWidget *current = eventWidget;
+    while (current) {
+        if (auto *view = qobject_cast<QGraphicsView *>(current)) {
+            return view;
+        }
+        current = current->parentWidget();
+    }
+
+    if (scene() && !scene()->views().isEmpty()) {
+        return scene()->views().constFirst();
+    }
+
+    return nullptr;
+}
+
+QPointF ZoneViewWidget::calcDraggedWindowPos(const QPoint &screenPos,
+                                             const QPointF &scenePos,
+                                             const QPointF &buttonDownScenePos) const
+{
+    if (dragView && dragView->viewport()) {
+        const QPoint vpStart = dragView->viewport()->mapFromGlobal(dragStartScreenPos);
+        const QPoint vpNow = dragView->viewport()->mapFromGlobal(screenPos);
+        const QPointF sceneStart = dragView->mapToScene(vpStart);
+        const QPointF sceneNow = dragView->mapToScene(vpNow);
+        return dragStartItemPos + (sceneNow - sceneStart);
+    }
+
+    return dragStartItemPos + (scenePos - buttonDownScenePos);
+}
+
+bool ZoneViewWidget::windowFrameEvent(QEvent *event)
+{
+    if (event->type() == QEvent::UngrabMouse) {
+        stopWindowDrag();
+        return QGraphicsWidget::windowFrameEvent(event);
+    }
+
+    auto *me = dynamic_cast<QGraphicsSceneMouseEvent *>(event);
+    if (!me) {
+        return QGraphicsWidget::windowFrameEvent(event);
+    }
+
+    switch (event->type()) {
+        case QEvent::GraphicsSceneMousePress:
+            if (me->button() == Qt::LeftButton && windowFrameSectionAt(me->pos()) == Qt::TitleBarArea) {
+                // avoid drag on close button
+                if (closeButtonRect(me->widget()).contains(me->pos())) {
+                    me->accept();
+                    close();
+                    return true;
+                }
+
+                startWindowDrag(me);
+                me->accept();
+                return true;
+            }
+            break;
+
+        case QEvent::GraphicsSceneMouseMove:
+            if (draggingWindow) {
+                if (!(me->buttons() & Qt::LeftButton)) {
+                    stopWindowDrag();
+                } else {
+                    setPos(
+                        calcDraggedWindowPos(me->screenPos(), me->scenePos(), me->buttonDownScenePos(Qt::LeftButton)));
+                }
+                me->accept();
+                return true;
+            }
+            break;
+
+        case QEvent::GraphicsSceneMouseRelease:
+            if (draggingWindow && me->button() == Qt::LeftButton) {
+                stopWindowDrag();
+                me->accept();
+                return true;
+            }
+            break;
+
+        default:
+            break;
+    }
+
+    return QGraphicsWidget::windowFrameEvent(event);
+}
+
+void ZoneViewWidget::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    // move if the scene routes moves while dragging
+    if (draggingWindow && (event->buttons() & Qt::LeftButton)) {
+        setPos(calcDraggedWindowPos(event->screenPos(), event->scenePos(), event->buttonDownScenePos(Qt::LeftButton)));
+        event->accept();
+        return;
+    }
+
+    QGraphicsWidget::mouseMoveEvent(event);
+}
+
+void ZoneViewWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    if (draggingWindow && event->button() == Qt::LeftButton) {
+        stopWindowDrag();
+        event->accept();
+        return;
+    }
+
+    QGraphicsWidget::mouseReleaseEvent(event);
+}
+
+QVariant ZoneViewWidget::itemChange(GraphicsItemChange change, const QVariant &value)
+{
+    if (change == QGraphicsItem::ItemPositionChange && scene()) {
+        // Keep grab area in main view
+        const QRectF sceneRect = scene()->sceneRect();
+        const QPointF requestedPos = value.toPointF();
+        QPointF desiredPos = requestedPos;
+
+        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);
+
+        desiredPos.setX(qBound(minX, desiredPos.x(), maxX));
+        desiredPos.setY(qBound(minY, desiredPos.y(), maxY));
+        return desiredPos;
+    }
+
+    return QGraphicsWidget::itemChange(change, value);
 }
 
 void ZoneViewWidget::resizeEvent(QGraphicsSceneResizeEvent *event)
@@ -291,7 +508,7 @@ void ZoneViewWidget::resizeScrollbar(const qreal newZoneHeight)
  */
 static qreal rowsToHeight(int rows)
 {
-    const qreal cardsHeight = (rows + 1) * (CARD_HEIGHT / 3);
+    const qreal cardsHeight = (rows + 1) * (CardDimensions::HEIGHT_F / 3);
     return cardsHeight + 5; // +5 padding to make the cutoff look nicer
 }
 
@@ -301,7 +518,7 @@ static qreal rowsToHeight(int rows)
  **/
 static qreal calcMaxInitialHeight()
 {
-    return rowsToHeight(SettingsCache::instance().getCardViewInitialRowsMax());
+    return rowsToHeight(SettingsCache::instance().userInterface().getCardViewInitialRowsMax());
 }
 
 /**
@@ -339,8 +556,9 @@ void ZoneViewWidget::resizeToZoneContents(bool forceInitialHeight)
 
     zone->setGeometry(QRectF(0, -scrollBar->value(), zoneContainer->size().width(), totalZoneHeight));
 
-    if (layout())
+    if (layout()) {
         layout()->invalidate();
+    }
 }
 
 void ZoneViewWidget::handleScrollBarChange(int value)
@@ -350,11 +568,13 @@ void ZoneViewWidget::handleScrollBarChange(int value)
 
 void ZoneViewWidget::closeEvent(QCloseEvent *event)
 {
+    stopWindowDrag();
     disconnect(zone, &ZoneViewZone::closed, this, 0);
     // manually call zone->close in order to remove it from the origZones views
     zone->close();
-    if (shuffleCheckBox.isChecked())
+    if (shuffleCheckBox.isChecked()) {
         player->getPlayerActions()->sendGameCommand(Command_Shuffle());
+    }
     zoneDeleted();
     event->accept();
 }
@@ -368,8 +588,9 @@ void ZoneViewWidget::zoneDeleted()
 void ZoneViewWidget::initStyleOption(QStyleOption *option) const
 {
     QStyleOptionTitleBar *titleBar = qstyleoption_cast<QStyleOptionTitleBar *>(option);
-    if (titleBar)
-        titleBar->icon = QPixmap("theme:cockatrice");
+    if (titleBar) {
+        titleBar->icon = themePixmap(QStringLiteral("cockatrice"));
+    }
 }
 
 /**
@@ -379,7 +600,7 @@ void ZoneViewWidget::initStyleOption(QStyleOption *option) const
 void ZoneViewWidget::expandWindow()
 {
     qreal maxInitialHeight = calcMaxInitialHeight();
-    qreal maxExpandedHeight = rowsToHeight(SettingsCache::instance().getCardViewExpandedRowsMax());
+    qreal maxExpandedHeight = rowsToHeight(SettingsCache::instance().userInterface().getCardViewExpandedRowsMax());
     qreal height = rect().height() - extraHeight - 10;
     qreal maxHeight = maximumHeight() - extraHeight - 10;
 
@@ -406,4 +627,4 @@ void ZoneViewWidget::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
     if (event->pos().y() <= 0) {
         expandWindow();
     }
-}
\ No newline at end of file
+}
diff --git a/cockatrice/src/game/zones/view_zone_widget.h b/cockatrice/src/game_graphics/zones/view_zone_widget.h
similarity index 55%
rename from cockatrice/src/game/zones/view_zone_widget.h
rename to cockatrice/src/game_graphics/zones/view_zone_widget.h
index 272ff5560..9fe022b27 100644
--- a/cockatrice/src/game/zones/view_zone_widget.h
+++ b/cockatrice/src/game_graphics/zones/view_zone_widget.h
@@ -1,33 +1,39 @@
 /**
  * @file view_zone_widget.h
  * @ingroup GameGraphicsZones
- * @brief TODO: Document this.
  */
-
+//! \todo Document this file.
 #ifndef ZONEVIEWWIDGET_H
 #define ZONEVIEWWIDGET_H
 
-#include "logic/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 Player;
-class CardDatabase;
+class PlayerLogic;
 class QScrollBar;
-class GameScene;
 class ServerInfo_Card;
 class QGraphicsSceneMouseEvent;
 class QGraphicsSceneWheelEvent;
-class QStyleOption;
+class QGraphicsView;
+class QWidget;
+class CardZoneLogic;
 
 class ScrollableGraphicsProxyWidget : public QGraphicsProxyWidget
 {
@@ -52,7 +58,6 @@ private:
     ZoneViewZone *zone;
     QGraphicsWidget *zoneContainer;
 
-    QPushButton *closeButton;
     QScrollBar *scrollBar;
     ScrollableGraphicsProxyWidget *scrollBarProxy;
 
@@ -64,7 +69,34 @@ private:
 
     bool canBeShuffled;
     int extraHeight;
-    Player *player;
+    PlayerLogic *player;
+
+    bool draggingWindow = false;
+    QPoint dragStartScreenPos;
+    QPointF dragStartItemPos;
+    QPointer<QGraphicsView> dragView;
+
+    void stopWindowDrag();
+    void startWindowDrag(QGraphicsSceneMouseEvent *event);
+    QRectF closeButtonRect(QWidget *styleWidget) const;
+    /**
+     * @brief Resolves the QGraphicsView to use for drag coordinate mapping
+     *
+     * @param eventWidget QWidget that originated the mouse event
+     * @return The resolved QGraphicsView
+     */
+    QGraphicsView *findDragView(QWidget *eventWidget) const;
+    /**
+     * @brief Calculates the desired widget position while dragging
+     *
+     * @param screenPos Global screen coordinates of the current mouse position
+     * @param scenePos Scene coordinates of the current mouse position
+     * @param buttonDownScenePos Scene coordinates of the initial mouse press position
+     *
+     * @return The new widget position in scene coordinates
+     */
+    QPointF
+    calcDraggedWindowPos(const QPoint &screenPos, const QPointF &scenePos, const QPointF &buttonDownScenePos) const;
 
     void resizeScrollbar(qreal newZoneHeight);
 signals:
@@ -76,12 +108,11 @@ private slots:
     void resizeToZoneContents(bool forceInitialHeight = false);
     void handleScrollBarChange(int value);
     void zoneDeleted();
-    void moveEvent(QGraphicsSceneMoveEvent * /* event */) override;
     void resizeEvent(QGraphicsSceneResizeEvent * /* event */) override;
     void expandWindow();
 
 public:
-    ZoneViewWidget(Player *_player,
+    ZoneViewWidget(PlayerLogic *_player,
                    CardZoneLogic *_origZone,
                    int numberCards = 0,
                    bool _revealZone = false,
@@ -92,7 +123,7 @@ public:
     {
         return zone;
     }
-    Player *getPlayer() const
+    PlayerLogic *getPlayer() const
     {
         return player;
     }
@@ -101,6 +132,10 @@ public:
 protected:
     void closeEvent(QCloseEvent *event) override;
     void initStyleOption(QStyleOption *option) const override;
+    bool windowFrameEvent(QEvent *event) override;
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
     void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
 };
 
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
new file mode 100644
index 000000000..721fdd6c8
--- /dev/null
+++ b/cockatrice/src/interface/card_database_update/card_database_update_status_bar.cpp
@@ -0,0 +1,117 @@
+#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
new file mode 100644
index 000000000..6db3bd225
--- /dev/null
+++ b/cockatrice/src/interface/card_database_update/card_database_update_status_bar.h
@@ -0,0 +1,68 @@
+#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
new file mode 100644
index 000000000..1f8e500d0
--- /dev/null
+++ b/cockatrice/src/interface/card_database_update/card_update_progress.cpp
@@ -0,0 +1,59 @@
+#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
new file mode 100644
index 000000000..743f32209
--- /dev/null
+++ b/cockatrice/src/interface/card_database_update/card_update_progress.h
@@ -0,0 +1,42 @@
+#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
new file mode 100644
index 000000000..39cbd7700
--- /dev/null
+++ b/cockatrice/src/interface/card_localization.h
@@ -0,0 +1,80 @@
+#ifndef COCKATRICE_CARD_LOCALIZATION_H
+#define COCKATRICE_CARD_LOCALIZATION_H
+
+#include "../client/settings/cache_settings.h"
+
+#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
+{
+/**
+ * @brief The language code selected for localized card text and images.
+ */
+inline QString displayLang()
+{
+    return SettingsCache::instance().cardsDisplay().getCardLang();
+}
+
+/**
+ * @brief Card name in the configured display language, falling back to English.
+ * @param card The card to display.
+ * @return The localized name, or an empty string for a null card.
+ */
+inline QString displayName(const CardInfoPtr &card)
+{
+    return card.isNull() ? QString() : card->getLocalizedName(displayLang());
+}
+
+/**
+ * @brief Card rules text in the configured display language, falling back to English.
+ * @param card The card to display.
+ * @return The localized text, or an empty string for a null card.
+ */
+inline QString displayText(const CardInfoPtr &card)
+{
+    return card.isNull() ? QString() : card->getLocalizedText(displayLang());
+}
+
+/**
+ * @brief Card name in the configured display language, falling back to English.
+ * @param card The card to display.
+ */
+inline QString displayName(const CardInfo &card)
+{
+    return card.getLocalizedName(displayLang());
+}
+
+/**
+ * @brief Card rules text in the configured display language, falling back to English.
+ * @param card The card to display.
+ */
+inline QString displayText(const CardInfo &card)
+{
+    return card.getLocalizedText(displayLang());
+}
+
+/**
+ * @brief Looks a card up by its canonical name and returns its name in the configured display language.
+ *
+ * Use this where only the canonical name is known, such as the game log or [card] chat tags. Callers that
+ * already hold a resolved card and need to keep the canonical name around (as a link target, say) should
+ * use displayName() directly instead.
+ *
+ * @param cardName The canonical card name.
+ * @return The localized name, or cardName unchanged when the card is unknown to the database.
+ */
+inline QString displayNameFor(const QString &cardName)
+{
+    if (cardName.isEmpty()) {
+        return cardName;
+    }
+    const QString localizedName = displayName(CardDatabaseManager::query()->getCardInfo(cardName));
+    return localizedName.isEmpty() ? cardName : localizedName;
+}
+} // namespace CardLocalization
+
+#endif // COCKATRICE_CARD_LOCALIZATION_H
\ No newline at end of file
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 06a0476c9..4f77c7096 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp
@@ -1,34 +1,68 @@
 #include "card_picture_loader.h"
 
 #include "../../client/settings/cache_settings.h"
+#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 <QBuffer>
+#include <QChar>
+#include <QColor>
+#include <QDateTime>
 #include <QDebug>
-#include <QDirIterator>
+#include <QDir>
+#include <QFile>
 #include <QFileInfo>
+#include <QImage>
+#include <QLatin1Char>
+#include <QList>
 #include <QMainWindow>
-#include <QMovie>
-#include <QNetworkRequest>
-#include <QPainter>
+#include <QMessageLogger>
+#include <QMetaObject>
+#include <QMetaType>
+#include <QPixmap>
 #include <QPixmapCache>
 #include <QScreen>
+#include <QSharedPointer>
+#include <QSize>
 #include <QStatusBar>
+#include <QString>
+#include <QStringLiteral>
 #include <QThread>
-#include <algorithm>
-#include <utility>
+#include <QWidget>
+#include <QtGlobal>
+#include <compare>
+#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>
 
 // never cache more than 300 cards at once for a single deck
 #define CACHED_CARD_PER_DECK_MAX 300
 
+// wait at least this long before retrying a card whose picture failed to load
+static constexpr int RETRY_FAILED_CARDS_SECS = 300;
+
 CardPictureLoader::CardPictureLoader() : QObject(nullptr)
 {
     worker = new CardPictureLoaderWorker;
-    connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this, &CardPictureLoader::picsPathChanged);
-    connect(&SettingsCache::instance(), &SettingsCache::picDownloadChanged, this,
+    connect(&SettingsCache::instance().paths(), &PathsSettings::picsPathChanged, this,
+            &CardPictureLoader::picsPathChanged);
+    connect(&SettingsCache::instance().downloads(), &DownloadSettings::picDownloadChanged, this,
             &CardPictureLoader::picDownloadChanged);
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this,
+            &CardPictureLoader::cardLangChanged);
 
+    qRegisterMetaType<ExactCard>("ExactCard");
     connect(worker, &CardPictureLoaderWorker::imageLoaded, this, &CardPictureLoader::imageLoaded);
+    connect(worker, &CardPictureLoaderWorker::networkCacheCleared, this, &CardPictureLoader::networkCacheCleared);
 
     statusBar = new CardPictureLoaderStatusBar(nullptr);
     QMainWindow *mainWindow = qobject_cast<QMainWindow *>(QApplication::activeWindow());
@@ -44,7 +78,18 @@ CardPictureLoader::CardPictureLoader() : QObject(nullptr)
 
 CardPictureLoader::~CardPictureLoader()
 {
-    worker->deleteLater();
+    if (worker) {
+        // Capture the thread first: shutdownThread() blocks until the worker has been freed by the
+        // finished() -> deleteLater chain, after which the worker pointer must not be dereferenced.
+        QThread *pictureLoaderThread = worker->workerThread();
+        const bool stopped = worker->shutdownThread();
+        worker = nullptr;
+        // Deleting a QThread that is still running is undefined behaviour, so only free it once the
+        // bounded wait in shutdownThread() confirmed that it stopped.
+        if (stopped) {
+            delete pictureLoaderThread;
+        }
+    }
 }
 
 void CardPictureLoader::getCardBackPixmap(QPixmap &pixmap, QSize size)
@@ -52,7 +97,7 @@ void CardPictureLoader::getCardBackPixmap(QPixmap &pixmap, QSize size)
     QString backCacheKey = "_trice_card_back_" + QString::number(size.width()) + "x" + QString::number(size.height());
     if (!QPixmapCache::find(backCacheKey, &pixmap)) {
         qCDebug(CardPictureLoaderLog) << "PictureLoader: cache miss for" << backCacheKey;
-        QPixmap tmpPixmap("theme:cardback");
+        QPixmap tmpPixmap = themePixmap(QStringLiteral("cardback"));
 
         if (tmpPixmap.isNull()) {
             qCWarning(CardPictureLoaderLog) << "Failed to load 'theme:cardback'! Using fallback pixmap.";
@@ -73,7 +118,7 @@ void CardPictureLoader::getCardBackLoadingInProgressPixmap(QPixmap &pixmap, QSiz
         "_trice_card_back_inprogress_" + QString::number(size.width()) + "x" + QString::number(size.height());
     if (!QPixmapCache::find(backCacheKey, &pixmap)) {
         qCDebug(CardPictureLoaderCardBackCacheFailLog) << "PictureLoader: cache miss for" << backCacheKey;
-        QPixmap tmpPixmap("theme:cardback");
+        QPixmap tmpPixmap = themePixmap(QStringLiteral("cardback"));
 
         if (tmpPixmap.isNull()) {
             qCWarning(CardPictureLoaderLog) << "Failed to load 'theme:cardback' for in-progress state! Using fallback.";
@@ -95,7 +140,7 @@ void CardPictureLoader::getCardBackLoadingFailedPixmap(QPixmap &pixmap, QSize si
         "_trice_card_back_failed_" + QString::number(size.width()) + "x" + QString::number(size.height());
     if (!QPixmapCache::find(backCacheKey, &pixmap)) {
         qCDebug(CardPictureLoaderCardBackCacheFailLog) << "PictureLoader: cache miss for" << backCacheKey;
-        QPixmap tmpPixmap("theme:cardback");
+        QPixmap tmpPixmap = themePixmap(QStringLiteral("cardback"));
 
         if (tmpPixmap.isNull()) {
             qCWarning(CardPictureLoaderLog) << "Failed to load 'theme:cardback' for failed state! Using fallback.";
@@ -128,7 +173,15 @@ void CardPictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize
     QPixmap bigPixmap;
     if (QPixmapCache::find(key, &bigPixmap)) {
         if (bigPixmap.isNull()) {
-            qCDebug(CardPictureLoaderLog) << "Cached pixmap for key" << key << "is NULL!";
+            // Leave the pixmap null so callers fall back to a solid color
+            // instead of showing the card back.
+            QDateTime failedAtTime = getInstance().failedAt.value(key);
+            if (!failedAtTime.isValid() ||
+                failedAtTime.addSecs(RETRY_FAILED_CARDS_SECS) < QDateTime::currentDateTime()) {
+                getInstance().failedAt.remove(key);
+                QPixmapCache::remove(key);
+                getInstance().worker->enqueueImageLoad(card);
+            }
             return;
         }
 
@@ -149,31 +202,285 @@ void CardPictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize
 
 void CardPictureLoader::imageLoaded(const ExactCard &card, const QImage &image)
 {
+    QPixmap finalPixmap;
+
     if (image.isNull()) {
+        getInstance().failedAt.insert(card.getPixmapCacheKey(), QDateTime::currentDateTime());
         qCDebug(CardPictureLoaderLog) << "Caching NULL pixmap for" << card.getName();
-        QPixmapCache::insert(card.getPixmapCacheKey(), QPixmap());
     } else {
+        getInstance().failedAt.remove(card.getPixmapCacheKey());
         if (card.getInfo().getUiAttributes().upsideDownArt) {
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0))
             QImage mirrorImage = image.flipped(Qt::Horizontal | Qt::Vertical);
 #else
             QImage mirrorImage = image.mirrored(true, true);
 #endif
-            QPixmapCache::insert(card.getPixmapCacheKey(), QPixmap::fromImage(mirrorImage));
+            finalPixmap = QPixmap::fromImage(mirrorImage);
         } else {
-            QPixmapCache::insert(card.getPixmapCacheKey(), QPixmap::fromImage(image));
+            finalPixmap = QPixmap::fromImage(image);
         }
     }
 
+    QPixmapCache::insert(card.getPixmapCacheKey(), finalPixmap);
+
+    if (static_cast<CardPictureLoaderCacheMethod::CacheMethod>(
+            SettingsCache::instance().cacheStorage().getCardPictureLoaderCacheMethod()) ==
+        CardPictureLoaderCacheMethod::CacheMethod::FILESYSTEM_CACHE) {
+        saveCardImageToLocalStorage(card, finalPixmap);
+    }
+
     // imageLoaded should only be reached if the exactCard isn't already in cache.
     // (plus there's a deduplication mechanism in CardPictureLoaderWorker)
     // It should be safe to connect the CardInfo here without worrying about redundant connections.
-    connect(card.getCardPtr().data(), &QObject::destroyed, this,
-            [cacheKey = card.getPixmapCacheKey()] { QPixmapCache::remove(cacheKey); });
+    connect(card.getCardPtr().data(), &QObject::destroyed, this, [cacheKey = card.getPixmapCacheKey()] {
+        QPixmapCache::remove(cacheKey);
+        getInstance().failedAt.remove(cacheKey);
+    });
 
     card.emitPixmapUpdated();
 }
 
+void CardPictureLoader::deleteAllLocalOverrides(const ExactCard &card)
+{
+    const QString picsRoot = SettingsCache::instance().paths().getPicsPath();
+    if (picsRoot.isEmpty() || !card) {
+        return;
+    }
+
+    QDir baseDir(picsRoot);
+    if (!baseDir.cd("downloadedPics")) {
+        return;
+    }
+
+    const QString name = card.getInfo().getCorrectedName();
+
+    QString set, collector, uuid;
+    auto printing = card.getPrinting();
+    if (printing.getSet()) {
+        set = printing.getSet()->getCorrectedShortName();
+        collector = printing.getProperty("num");
+        uuid = printing.getUuid();
+    }
+
+    for (const auto &scheme : CardPictureLoaderLocalSchemes::exportSchemes()) {
+        QString rel = CardPictureLoaderLocalSchemes::expandPattern(scheme.pattern, name, set, collector, uuid);
+
+        if (rel.isEmpty()) {
+            continue;
+        }
+
+        rel += ".png";
+        rel = QDir::cleanPath(rel);
+
+        QString fullPath = baseDir.filePath(rel);
+
+        if (QFile::exists(fullPath)) {
+            QFile::remove(fullPath);
+        }
+    }
+}
+
+void CardPictureLoader::saveCardImageToLocalStorage(const ExactCard &card,
+                                                    const QPixmap &pixmap,
+                                                    const bool allowOverwrite)
+{
+    if (pixmap.isNull() || !card) {
+        return;
+    }
+
+    const QString picsRoot = SettingsCache::instance().paths().getPicsPath();
+    CardPictureLoaderLocalSchemes::NamingScheme scheme = static_cast<CardPictureLoaderLocalSchemes::NamingScheme>(
+        SettingsCache::instance().cacheStorage().getLocalCardImageStorageNamingScheme());
+
+    QString pattern;
+
+    for (const auto &s : CardPictureLoaderLocalSchemes::exportSchemes()) {
+        if (s.id == scheme) {
+            pattern = s.pattern;
+            break;
+        }
+    }
+
+    if (picsRoot.isEmpty() || pattern.isEmpty()) {
+        return;
+    }
+
+    // Base directory: <picsPath>/downloadedPics
+    QDir baseDir(picsRoot);
+    if (!baseDir.exists("downloadedPics")) {
+        baseDir.mkpath("downloadedPics");
+    }
+    baseDir.cd("downloadedPics");
+
+    // Collect card metadata
+    const QString cardName = card.getInfo().getCorrectedName();
+
+    QString setName;
+    QString collectorNumber;
+    QString uuid;
+
+    PrintingInfo printing = card.getPrinting();
+    if (printing.getSet()) {
+        setName = printing.getSet()->getCorrectedShortName();
+        collectorNumber = printing.getProperty("num");
+        uuid = printing.getUuid();
+    }
+
+    // Build path from scheme
+    QString relativePath =
+        CardPictureLoaderLocalSchemes::expandPattern(pattern, cardName, setName, collectorNumber, uuid);
+
+    if (relativePath.isEmpty()) {
+        return;
+    }
+
+    // append extension
+    relativePath += ".png";
+
+    // Normalize slashes
+    relativePath = QDir::cleanPath(relativePath);
+
+    QFileInfo outInfo(baseDir.filePath(relativePath));
+
+    // Automatic cache writes (FILESYSTEM_CACHE) must never clobber an explicit user override.
+    // Only the explicit override paths pass allowOverwrite == true.
+    if (!allowOverwrite && outInfo.exists()) {
+        return;
+    }
+
+    QDir outDir = outInfo.dir();
+
+    // Ensure directory exists
+    if (!outDir.exists()) {
+        if (!baseDir.mkpath(outDir.path())) {
+            qCWarning(CardPictureLoaderLog) << "Failed to create directory for downloaded card image:" << outDir.path();
+            return;
+        }
+    }
+
+    // Save image
+    QImage image = pixmap.toImage();
+    if (!image.save(outInfo.absoluteFilePath(), "PNG")) {
+        qCWarning(CardPictureLoaderLog) << "Failed to save card image to" << outInfo.absoluteFilePath();
+    }
+}
+
+void CardPictureLoader::installPrintingOverrideOnLoad(const ExactCard &originalCard, const ExactCard &overrideCard)
+{
+    // Overriding a card with itself is the reset case, not a real override: every code path below
+    // would re-enter itself through emitPixmapUpdated(). Reject it outright.
+    if (originalCard == overrideCard) {
+        return;
+    }
+
+    CardInfoPtr cardPtr = overrideCard.getCardPtr();
+    if (!cardPtr) {
+        return;
+    }
+
+    // Heap-allocate so the lambda can capture it before the connection is made
+    auto *connectionHandle = new QMetaObject::Connection;
+
+    *connectionHandle =
+        connect(cardPtr.data(), &CardInfo::pixmapUpdated, cardPtr.data(),
+                [originalCard, overrideCard, connectionHandle, this](const PrintingInfo &printing) {
+                    // All printings share the same CardInfo, so ignore updates triggered by any
+                    // other printing (e.g., the original card re-loading from disk).
+                    if (printing != overrideCard.getPrinting()) {
+                        return;
+                    }
+
+                    QPixmap pixmap;
+                    if (QPixmapCache::find(overrideCard.getPixmapCacheKey(), &pixmap) && !pixmap.isNull()) {
+                        // The override art has resolved — persist it and reflect it immediately.
+                        // Retire the connection before emitting so the refresh can't re-enter.
+                        saveCardImageToLocalStorage(originalCard, pixmap, /*allowOverwrite=*/true);
+
+                        QObject::disconnect(*connectionHandle);
+                        delete connectionHandle;
+
+                        QPixmapCache::clear();
+                        originalCard.emitPixmapUpdated();
+                        return;
+                    }
+
+                    // The art could not be resolved. Keep the connection armed so a late resolution
+                    // still lands, and surface a visible refusal instead of a silent no-op. An
+                    // override already on disk is left untouched and simply re-displayed.
+                    QPixmapCache::clear();
+                    if (!hasLocalOverrides(originalCard)) {
+                        QPixmap refusedPixmap;
+                        getCardBackLoadingFailedPixmap(refusedPixmap, QSize(480, 672));
+                        QPixmapCache::insert(originalCard.getPixmapCacheKey(), refusedPixmap);
+                    }
+                    originalCard.emitPixmapUpdated();
+                });
+
+    // Now enqueue; if the image is already loading (deduplicated in the worker),
+    // the signal will still fire when it completes
+    CardPictureLoader::getInstance().worker->enqueueImageLoad(overrideCard);
+}
+
+void CardPictureLoader::installPrintingOverride(const ExactCard &originalCard, const ExactCard &overrideCard)
+{
+    // Same guard as installPrintingOverrideOnLoad: self-override is the reset case.
+    if (originalCard == overrideCard) {
+        return;
+    }
+
+    QPixmap pixmap;
+    const QString key = overrideCard.getPixmapCacheKey();
+
+    if (QPixmapCache::find(key, &pixmap) && !pixmap.isNull()) {
+        // Already cached — save immediately; the caller refreshes the card.
+        saveCardImageToLocalStorage(originalCard, pixmap, /*allowOverwrite=*/true);
+        return;
+    }
+
+    // Cache miss or previously failed load — enqueue load and wait for the signal.
+    installPrintingOverrideOnLoad(originalCard, overrideCard);
+}
+
+bool CardPictureLoader::hasLocalOverrides(const ExactCard &card)
+{
+    const QString picsRoot = SettingsCache::instance().paths().getPicsPath();
+    if (picsRoot.isEmpty() || !card) {
+        return false;
+    }
+
+    QDir baseDir(picsRoot);
+    if (!baseDir.cd("downloadedPics")) {
+        return false;
+    }
+
+    const QString name = card.getInfo().getCorrectedName();
+
+    QString set, collector, uuid;
+    const PrintingInfo printing = card.getPrinting();
+    if (printing.getSet()) {
+        set = printing.getSet()->getCorrectedShortName();
+        collector = printing.getProperty("num");
+        uuid = printing.getUuid();
+    }
+
+    for (const auto &scheme : CardPictureLoaderLocalSchemes::exportSchemes()) {
+        QString rel = CardPictureLoaderLocalSchemes::expandPattern(scheme.pattern, name, set, collector, uuid);
+
+        if (rel.isEmpty()) {
+            continue;
+        }
+
+        rel += ".png";
+        rel = QDir::cleanPath(rel);
+
+        if (QFile::exists(baseDir.filePath(rel))) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 void CardPictureLoader::clearPixmapCache()
 {
     QPixmapCache::clear();
@@ -181,7 +488,17 @@ void CardPictureLoader::clearPixmapCache()
 
 void CardPictureLoader::clearNetworkCache()
 {
-    getInstance().worker->clearNetworkCache();
+    // During teardown the worker is released before this singleton, so a queued clear may still
+    // arrive with no worker left to run it.
+    CardPictureLoaderWorker *worker = getInstance().worker;
+    if (!worker) {
+        return;
+    }
+    // The disk cache and redirect cache are owned by the worker thread, so the clear has to run
+    // there. Invoke it asynchronously to keep the GUI responsive while the worker may be walking
+    // the user's picture directories or recursively deleting the cache directory; callers that
+    // need to know when it is done can listen for networkCacheCleared().
+    QMetaObject::invokeMethod(worker, &CardPictureLoaderWorker::clearNetworkCache, Qt::QueuedConnection);
 }
 
 void CardPictureLoader::cacheCardPixmaps(const QList<ExactCard> &cards)
@@ -213,30 +530,11 @@ void CardPictureLoader::picsPathChanged()
     QPixmapCache::clear();
 }
 
-bool CardPictureLoader::hasCustomArt()
+void CardPictureLoader::cardLangChanged()
 {
-    auto picsPath = SettingsCache::instance().getPicsPath();
-    QDirIterator it(picsPath, QDir::Dirs | QDir::NoDotAndDotDot);
-
-    // Check if there is at least one non-directory file in the pics path, other
-    // than in the "downloadedPics" subdirectory.
-    while (it.hasNext()) {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 3, 0))
-        QFileInfo dir(it.nextFileInfo());
-#else
-        // nextFileInfo() is only available in Qt 6.3+, for previous versions, we build
-        // the QFileInfo from a QString which requires more system calls.
-        QFileInfo dir(it.next());
-#endif
-
-        if (it.fileName() == "downloadedPics")
-            continue;
-
-        QDirIterator subIt(it.filePath(), QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-        if (subIt.hasNext()) {
-            return true;
-        }
-    }
-
-    return false;
+    // Localized images are fetched via a different URL, but the in-memory
+    // pixmap cache is keyed by card name/uuid, so drop everything cached
+    // (including failure timestamps) to force a reload in the new language.
+    QPixmapCache::clear();
+    failedAt.clear();
 }
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 4000fd99a..c6d91570b 100644
--- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h
@@ -1,10 +1,20 @@
 #ifndef CARD_PICTURE_LOADER_H
 #define CARD_PICTURE_LOADER_H
 
-#include "card_picture_loader_status_bar.h"
-#include "card_picture_loader_worker.h"
-
+#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");
@@ -56,6 +66,7 @@ private:
 
     CardPictureLoaderWorker *worker;       ///< Worker thread for async image loading
     CardPictureLoaderStatusBar *statusBar; ///< Status bar widget showing load progress
+    QHash<QString, QDateTime> failedAt;    ///< Timestamp of the last failed load attempt per pixmap cache key
 
 public:
     /**
@@ -94,10 +105,17 @@ public:
     static void cacheCardPixmaps(const QList<ExactCard> &cards);
 
     /**
-     * @brief Check if the user has custom card art in the picsPath directory.
-     * @return True if any custom art exists.
+     * @brief Check if a local override image already exists for the card.
+     * @param card The card to check.
+     * @return True if the card has at least one locally stored override image.
      */
-    static bool hasCustomArt();
+    static bool hasLocalOverrides(const ExactCard &card);
+
+    /**
+     * @brief Removes all locally stored override images for the card.
+     * @param card The card to remove the override images of.
+     */
+    static void deleteAllLocalOverrides(const ExactCard &card);
 
     /**
      * @brief Clears the in-memory QPixmap cache for all cards.
@@ -107,6 +125,9 @@ public:
 public slots:
     /**
      * @brief Clears the network disk cache of the worker.
+     *
+     * The clear runs on the worker thread, so this returns before it has completed; connect to
+     * networkCacheCleared() to act once it is done.
      */
     static void clearNetworkCache();
 
@@ -117,6 +138,13 @@ public slots:
      * @param image Loaded QImage.
      */
     void imageLoaded(const ExactCard &card, const QImage &image);
+    void saveCardImageToLocalStorage(const ExactCard &card, const QPixmap &pixmap, bool allowOverwrite = false);
+    void installPrintingOverride(const ExactCard &originalCard, const ExactCard &overrideCard);
+    void installPrintingOverrideOnLoad(const ExactCard &originalCard, const ExactCard &overrideCard);
+
+signals:
+    /** @brief Emitted after the worker has finished clearing the network and redirect caches. */
+    void networkCacheCleared();
 
 private slots:
     /**
@@ -130,6 +158,12 @@ private slots:
      * Clears the QPixmap cache to reload images.
      */
     void picsPathChanged();
+
+    /**
+     * @brief Triggered when the card language setting changes.
+     * Clears the in-memory picture caches so images reload in the new language.
+     */
+    void cardLangChanged();
 };
 
 #endif
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_cache_method.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_cache_method.h
new file mode 100644
index 000000000..54977e249
--- /dev/null
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_cache_method.h
@@ -0,0 +1,31 @@
+#ifndef COCKATRICE_CARD_PICTURE_LOADER_CACHE_METHOD_H
+#define COCKATRICE_CARD_PICTURE_LOADER_CACHE_METHOD_H
+#include <QCoreApplication>
+#include <QList>
+#include <QString>
+
+namespace CardPictureLoaderCacheMethod
+{
+enum class CacheMethod
+{
+    NETWORK_CACHE,
+    FILESYSTEM_CACHE
+};
+
+struct CacheMethodInfo
+{
+    CacheMethod id;
+    QString displayName;
+};
+
+static inline const QList<CacheMethodInfo> methods()
+{
+    static QList<CacheMethodInfo> all = {
+        {CacheMethod::NETWORK_CACHE, QCoreApplication::translate("CardPictureLoaderCacheMethod", "Network Cache")},
+        {CacheMethod::FILESYSTEM_CACHE, QCoreApplication::translate("CardPictureLoaderCacheMethod", "Filesystem")},
+    };
+    return all;
+}
+} // namespace CardPictureLoaderCacheMethod
+
+#endif // COCKATRICE_CARD_PICTURE_LOADER_CACHE_METHOD_H
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 dd00e6e1d..1437e23f4 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
@@ -1,20 +1,32 @@
 #include "card_picture_loader_local.h"
 
 #include "../../client/settings/cache_settings.h"
-#include "card_picture_to_load.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 <QDebug>
+#include <QDir>
 #include <QDirIterator>
-#include <QMovie>
-#include <libcockatrice/card/database/card_database_manager.h>
+#include <QFileInfo>
+#include <QImageReader>
+#include <QList>
+#include <QMessageLogger>
+#include <QSharedPointer>
+#include <QStringList>
+#include <QTimer>
+#include <libcockatrice/settings/paths_settings.h>
 
 static constexpr int REFRESH_INTERVAL_MS = 10 * 1000;
 
 CardPictureLoaderLocal::CardPictureLoaderLocal(QObject *parent)
-    : QObject(parent), picsPath(SettingsCache::instance().getPicsPath()),
-      customPicsPath(SettingsCache::instance().getCustomPicsPath())
+    : QObject(parent), picsPath(SettingsCache::instance().paths().getPicsPath()),
+      customPicsPath(SettingsCache::instance().paths().getCustomPicsPath())
 {
     // Hook up signals to settings
-    connect(&SettingsCache::instance(), &SettingsCache::picsPathChanged, this,
+    connect(&SettingsCache::instance().paths(), &PathsSettings::picsPathChanged, this,
             &CardPictureLoaderLocal::picsPathChanged);
 
     refreshIndex();
@@ -77,26 +89,8 @@ QImage CardPictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
     imgReader.setDecideFormatFromContent(true);
 
     // Most-to-least specific, these will fall through in order.
-    QStringList nameVariants;
-
-    // cardName_providerId
-    if (!providerId.isEmpty()) {
-        nameVariants << QString("%1-%2").arg(correctedCardName, providerId)
-                     << QString("%1_%2").arg(correctedCardName, providerId);
-    }
-    // cardName_setName_collectorNumber & setName-collectorNumber-cardName
-    if (!setName.isEmpty() && !collectorNumber.isEmpty()) {
-        nameVariants << QString("%1_%2_%3").arg(correctedCardName, setName, collectorNumber)
-                     << QString("%1-%2-%3").arg(setName, collectorNumber, correctedCardName);
-    }
-    // cardName_setName
-    if (!setName.isEmpty()) {
-        nameVariants << QString("%1_%2").arg(correctedCardName, setName)
-                     << QString("%1-%2").arg(setName, correctedCardName);
-    }
-
-    // cardName
-    nameVariants << correctedCardName;
+    QStringList nameVariants =
+        CardPictureLoaderLocalSchemes::generateImportVariants(correctedCardName, setName, collectorNumber, providerId);
 
     for (const QString &nameVariant : nameVariants) {
         if (nameVariant.isEmpty()) {
@@ -110,10 +104,14 @@ QImage CardPictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
             candidatePaths << picsPath + "/downloadedPics/" + setName + "/" + nameVariant;
         }
 
+        // Non-set-folder export schemes (e.g., Name_Set_Collector) write straight into
+        // downloadedPics/; check there as a fallback so local overrides round-trip.
+        candidatePaths << picsPath + "/downloadedPics/" + nameVariant;
+
         for (const QString &path : candidatePaths) {
             QFileInfo fileInfo(path);
             QDir dir = fileInfo.dir();
-            QString baseName = fileInfo.fileName();
+            QString baseName = fileInfo.completeBaseName();
 
             if (!dir.exists()) {
                 continue;
@@ -121,7 +119,8 @@ QImage CardPictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
 
             QStringList files = dir.entryList(QDir::Files);
             for (const QString &file : files) {
-                if (!file.startsWith(baseName)) {
+                QFileInfo fi(file);
+                if (fi.completeBaseName() != baseName) {
                     continue;
                 }
 
@@ -144,6 +143,6 @@ QImage CardPictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName,
 
 void CardPictureLoaderLocal::picsPathChanged()
 {
-    picsPath = SettingsCache::instance().getPicsPath();
-    customPicsPath = SettingsCache::instance().getCustomPicsPath();
+    picsPath = SettingsCache::instance().paths().getPicsPath();
+    customPicsPath = SettingsCache::instance().paths().getCustomPicsPath();
 }
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 44163d1db..009897acc 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,8 +1,15 @@
 #ifndef PICTURE_LOADER_LOCAL_H
 #define PICTURE_LOADER_LOCAL_H
 
-#include <QTimer>
-#include <libcockatrice/card/printing/exact_card.h>
+#include <QImage>
+#include <QLoggingCategory>
+#include <QMultiHash>
+#include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
+
+class ExactCard;
+class QTimer;
 
 inline Q_LOGGING_CATEGORY(CardPictureLoaderLocalLog, "card_picture_loader.local");
 
diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local_schemes.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local_schemes.h
new file mode 100644
index 000000000..d51d646e6
--- /dev/null
+++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local_schemes.h
@@ -0,0 +1,116 @@
+#ifndef COCKATRICE_CARD_PICTURE_LOADER_LOCAL_SCHEMES_H
+#define COCKATRICE_CARD_PICTURE_LOADER_LOCAL_SCHEMES_H
+
+#include <QList>
+#include <QRegularExpression>
+#include <QString>
+#include <QStringList>
+
+namespace CardPictureLoaderLocalSchemes
+{
+
+enum class NamingScheme
+{
+    NameOnly,
+    Name_Set,
+    Name_Set_Collector,
+    Set_Collector_Name,
+    Name_ProviderId,
+    Set_Folder_Name_ProviderId,
+    Set_Folder_Name_Set_Collector
+};
+
+struct NamingSchemeInfo
+{
+    NamingScheme id;
+    QString displayName;
+    QString pattern;
+};
+
+inline const QList<NamingSchemeInfo> &importSchemes()
+{
+    static QList<NamingSchemeInfo> list = {
+        {NamingScheme::Name_ProviderId, "Card Name + Provider ID", "{name}_{providerId}"},
+        {NamingScheme::Name_Set_Collector, "Card Name + Set + Collector", "{name}_{set}_{collector}"},
+        {NamingScheme::Set_Collector_Name, "Set + Collector + Card Name", "{set}_{collector}_{name}"},
+        {NamingScheme::Name_Set, "Card Name + Set", "{name}_{set}"},
+        {NamingScheme::NameOnly, "Card Name", "{name}"},
+    };
+    return list;
+}
+
+inline const QList<NamingSchemeInfo> &exportSchemes()
+{
+    static QList<NamingSchemeInfo> list = {
+        {NamingScheme::Set_Folder_Name_ProviderId, "Set Folder / Name + Provider ID", "{set}/{name}_{providerId}"},
+        {NamingScheme::Set_Folder_Name_Set_Collector, "Set Folder / Name + Set Name + Collector",
+         "{set}/{name}_{set}_{collector}"},
+        {NamingScheme::Name_ProviderId, "Card Name + Provider ID", "{name}_{providerId}"},
+        {NamingScheme::Name_Set_Collector, "Card Name + Set + Collector", "{name}_{set}_{collector}"},
+        {NamingScheme::Set_Collector_Name, "Set + Collector + Card Name", "{set}_{collector}_{name}"},
+    };
+    return list;
+}
+
+inline QString expandPattern(const QString &pattern,
+                             const QString &name,
+                             const QString &set,
+                             const QString &collector,
+                             const QString &providerId)
+{
+    QString result = pattern;
+
+    auto replaceIfPresent = [&](const QString &token, const QString &value) -> bool {
+        if (!result.contains(token)) {
+            return true;
+        }
+
+        if (value.isEmpty()) {
+            return false;
+        }
+
+        result.replace(token, value);
+        return true;
+    };
+
+    if (!replaceIfPresent("{name}", name)) {
+        return {};
+    }
+    if (!replaceIfPresent("{set}", set)) {
+        return {};
+    }
+    if (!replaceIfPresent("{collector}", collector)) {
+        return {};
+    }
+    if (!replaceIfPresent("{providerId}", providerId)) {
+        return {};
+    }
+
+    return result;
+}
+
+inline QStringList
+generateImportVariants(const QString &name, const QString &set, const QString &collector, const QString &providerId)
+{
+    QStringList variants;
+    const QStringList separators = {"_", "-"};
+
+    for (const auto &scheme : importSchemes()) {
+        for (const QString &sep : separators) {
+
+            QString pattern = scheme.pattern;
+            pattern.replace("_", sep);
+
+            QString v = expandPattern(pattern, name, set, collector, providerId);
+            if (!v.isEmpty()) {
+                variants << v;
+            }
+        }
+    }
+
+    return variants;
+}
+
+} // namespace CardPictureLoaderLocalSchemes
+
+#endif // COCKATRICE_CARD_PICTURE_LOADER_LOCAL_SCHEMES_H
\ No newline at end of file
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 d1895af06..98364e3cb 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,5 +1,11 @@
 #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 c9a272b68..58051cc1e 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,11 +1,16 @@
 #ifndef PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H
 #define PICTURE_LOADER_REQUEST_STATUS_DISPLAY_WIDGET_H
 
-#include <QHBoxLayout>
+#include <QDateTime>
 #include <QLabel>
-#include <QUrl>
+#include <QSharedPointer>
+#include <QString>
 #include <QWidget>
-#include <libcockatrice/card/printing/exact_card.h>
+#include <qtmetamacros.h>
+
+class ExactCard;
+class QHBoxLayout;
+class QUrl;
 
 /**
  * @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 9e7e645bd..3b26c8033 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,7 +1,19 @@
 #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 7f1f509db..2ba386c42 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,12 +1,16 @@
 #ifndef PICTURE_LOADER_STATUS_BAR_H
 #define PICTURE_LOADER_STATUS_BAR_H
 
-#include "../../interface/widgets/quick_settings/settings_button_widget.h"
-#include "card_picture_loader_worker_work.h"
-
-#include <QHBoxLayout>
-#include <QProgressBar>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class ExactCard;
+class QHBoxLayout;
+class QProgressBar;
+class QTimer;
+class QUrl;
+class SettingsButtonWidget;
 
 /**
  * @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 30c979cb5..150b4c544 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
@@ -1,41 +1,75 @@
 #include "card_picture_loader_worker.h"
 
 #include "../../client/settings/cache_settings.h"
+#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 <QDirIterator>
-#include <QMovie>
+#include <QAbstractNetworkCache>
+#include <QByteArray>
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QDebug>
+#include <QImage>
+#include <QMessageLogger>
+#include <QMetaObject>
+#include <QMetaType>
+#include <QNetworkAccessManager>
+#include <QNetworkCacheMetaData>
 #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>
 
-static constexpr int MAX_REQUESTS_PER_SEC = 10;
+static constexpr int MAX_REQUESTS_PER_SEC = DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT;
+static constexpr int MIN_HOST_QUOTA = DownloadSettings::MIN_HOST_REQUEST_LIMIT;
+static constexpr qint64 QUOTA_RECOVER_MS = 60000;       ///< Idle time before a reduced quota starts recovering
+static constexpr int DISPATCH_INTERVAL_MS = 100;        ///< Pacing between individual network requests
+static constexpr qint64 QUOTA_RESET_INTERVAL_MS = 1000; ///< Interval at which the request quota resets
+static constexpr int THREAD_SHUTDOWN_WAIT_MS = 5000;    ///< Bounded wait for the worker thread to stop at exit
 
 CardPictureLoaderWorker::CardPictureLoaderWorker()
-    : QObject(nullptr), picDownload(SettingsCache::instance().getPicDownload()), requestQuota(MAX_REQUESTS_PER_SEC)
+    : QObject(nullptr), picDownload(SettingsCache::instance().downloads().getPicDownload()),
+      hostRequestLimits(SettingsCache::instance().downloads().getHostRequestLimits())
 {
     networkManager = new QNetworkAccessManager(this);
     // We need a timeout to ensure requests don't hang indefinitely in case of
     // cache corruption, see related Qt bug: https://bugreports.qt.io/browse/QTBUG-111397
     // Use Qt's default timeout (30s, as of 2023-02-22)
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
     networkManager->setTransferTimeout();
-#endif
     cache = new QNetworkDiskCache(this);
     cache->setCacheDirectory(SettingsCache::instance().getNetworkCachePath());
     cache->setMaximumCacheSize(1024L * 1024L *
-                               static_cast<qint64>(SettingsCache::instance().getNetworkCacheSizeInMB()));
-    // Note: the settings is in MB, but QNetworkDiskCache uses bytes
-    connect(&SettingsCache::instance(), &SettingsCache::networkCacheSizeChanged, this,
-            [this](int newSizeInMB) { cache->setMaximumCacheSize(1024L * 1024L * static_cast<qint64>(newSizeInMB)); });
+                               static_cast<qint64>(SettingsCache::instance().cacheStorage().getNetworkCacheSizeInMB()));
+
+    connect(&SettingsCache::instance().cacheStorage(), &CacheStorageSettings::networkCacheSizeChanged, cache,
+            [this](int newSizeInMB) {
+                if (cache) {
+                    cache->setMaximumCacheSize(1024L * 1024L * static_cast<qint64>(newSizeInMB));
+                }
+            });
+
     networkManager->setCache(cache);
+
     // Use a ManualRedirectPolicy since we keep track of redirects in picDownloadFinished
     // We can't use NoLessSafeRedirectPolicy because it is not applied with AlwaysCache
     networkManager->setRedirectPolicy(QNetworkRequest::ManualRedirectPolicy);
 
-    cacheFilePath = SettingsCache::instance().getRedirectCachePath() + REDIRECT_CACHE_FILENAME;
+    cacheFilePath = SettingsCache::instance().paths().getRedirectCachePath() + REDIRECT_CACHE_FILENAME;
     loadRedirectCache();
     cleanStaleEntries();
 
@@ -45,20 +79,59 @@ CardPictureLoaderWorker::CardPictureLoaderWorker()
     localLoader = new CardPictureLoaderLocal(this);
 
     pictureLoaderThread = new QThread;
+    // The worker object frees itself once its thread finishes, so no event loop is left
+    // running and the QThread is never destroyed while still executing.
+    connect(pictureLoaderThread, &QThread::finished, this, &QObject::deleteLater);
     pictureLoaderThread->start(QThread::LowPriority);
     moveToThread(pictureLoaderThread);
 
+    // QTimer value members are not QObject children, so moveToThread on the worker doesn't move
+    // them. They must live in the worker's thread to be started from the slot code that runs there.
+    requestTimer.moveToThread(pictureLoaderThread);
+    dispatchTimer.moveToThread(pictureLoaderThread);
+
     connect(this, &CardPictureLoaderWorker::imageLoadEnqueued, this, &CardPictureLoaderWorker::handleImageLoadEnqueued);
 
     connect(&requestTimer, &QTimer::timeout, this, &CardPictureLoaderWorker::resetRequestQuota);
-    requestTimer.setInterval(1000);
-    requestTimer.start();
+    requestTimer.setInterval(static_cast<int>(QUOTA_RESET_INTERVAL_MS));
+
+    connect(&dispatchTimer, &QTimer::timeout, this, &CardPictureLoaderWorker::dispatchQueuedRequest);
+    dispatchTimer.setInterval(DISPATCH_INTERVAL_MS);
+
+    connect(&SettingsCache::instance().downloads(), &DownloadSettings::hostRequestLimitsChanged, this,
+            [this] { hostRequestLimits = SettingsCache::instance().downloads().getHostRequestLimits(); });
 }
 
 CardPictureLoaderWorker::~CardPictureLoaderWorker()
 {
     saveRedirectCache();
-    pictureLoaderThread->deleteLater();
+}
+
+bool CardPictureLoaderWorker::shutdownThread()
+{
+    // The finished() -> deleteLater chain (wired in the constructor) frees this worker as soon as
+    // its event loop exits, so nothing - not even a member read - may run once wait() returns.
+    // QThread::quit() and QThread::wait() are thread-safe and may be called from the owning thread.
+    QThread *thread = pictureLoaderThread;
+    if (!thread) {
+        return true;
+    }
+    thread->quit();
+    // Only an unbounded wait() would guarantee the thread stops, but this runs from a function-local
+    // static destructor after main() has returned, with no UI left to interrupt a worker stuck in a
+    // slow slot or on a stalled filesystem. Bound the wait and leave such a thread to the OS rather
+    // than hanging the process forever.
+    if (!thread->wait(THREAD_SHUTDOWN_WAIT_MS)) {
+        qCWarning(CardPictureLoaderWorkerLog) << "Picture loader worker thread did not stop within"
+                                              << THREAD_SHUTDOWN_WAIT_MS << "ms; leaving it to be torn down by the OS";
+        return false;
+    }
+    return true;
+}
+
+QThread *CardPictureLoaderWorker::workerThread() const
+{
+    return pictureLoaderThread;
 }
 
 void CardPictureLoaderWorker::queueRequest(const QUrl &url, CardPictureLoaderWorkerWork *worker)
@@ -66,14 +139,20 @@ void CardPictureLoaderWorker::queueRequest(const QUrl &url, CardPictureLoaderWor
     QUrl cachedRedirect = getCachedRedirect(url);
     if (!cachedRedirect.isEmpty()) {
         queueRequest(cachedRedirect, worker);
-    } else if (cache->metaData(url).isValid()) {
-        // If we hit a cached url, we get to make the request for free, since it won't contribute towards the rate-limit
-        makeRequest(url, worker);
-    } else {
-        requestLoadQueue.append(qMakePair(url, worker));
-        emit imageRequestQueued(url, worker->cardToDownload.getCard(), worker->cardToDownload.getSetName());
-        processQueuedRequests();
+        return;
     }
+    if (static_cast<CardPictureLoaderCacheMethod::CacheMethod>(
+            SettingsCache::instance().cacheStorage().getCardPictureLoaderCacheMethod()) ==
+            CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE &&
+        cache->metaData(url).isValid()) {
+        // A request that will be served from the disk cache never touches the network and therefore
+        // doesn't use up any of the rate limit, so it gets to skip the queue.
+        makeRequest(url, worker);
+        return;
+    }
+    requestLoadQueue.append(qMakePair(url, worker));
+    emit imageRequestQueued(url, worker->cardToDownload.getCard(), worker->cardToDownload.getSetName());
+    processQueuedRequests();
 }
 
 QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPictureLoaderWorkerWork *worker)
@@ -81,46 +160,282 @@ QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPicture
     // Check for cached redirects
     QUrl cachedRedirect = getCachedRedirect(url);
     if (!cachedRedirect.isEmpty()) {
+        // The status bar still needs to reclaim this URL's widget even when we hand the request back
+        // for a deferred retry instead of dispatching it onto the network.
         emit imageRequestSucceeded(url);
+        // The redirect target is a different host, which may itself be in 429 backoff; hand the
+        // entry back to its worker so it waits the backoff out instead of dispatching straight
+        // onto the backed-off host.
+        if (CardPictureLoaderWorkerWork::rateLimiter().isRateLimited(cachedRedirect.host(),
+                                                                     QDateTime::currentDateTime())) {
+            worker->scheduleDeferredRetry(cachedRedirect.host());
+            return nullptr;
+        }
         return makeRequest(cachedRedirect, worker);
     }
 
     QNetworkRequest req(url);
-    if (!picDownload) {
-        req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysCache);
-    }
+    req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
+    req.setRawHeader("Accept", "image/avif,image/webp,image/apng,image/,/*;q=0.8");
+
+    // Cached entries are served straight from the disk cache even when picture downloads are
+    // enabled: re-fetching an already-cached image would burn the rate limit for nothing. Only a
+    // genuine cache miss goes to the network, and only when downloads are enabled.
+    bool useNetworkCache = !requestTouchesNetwork(url);
+
+    req.setAttribute(QNetworkRequest::CacheLoadControlAttribute,
+                     useNetworkCache ? QNetworkRequest::AlwaysCache : QNetworkRequest::AlwaysNetwork);
 
     QNetworkReply *reply = networkManager->get(req);
 
-    // Connect reply handling
-    connect(reply, &QNetworkReply::finished, worker, [reply, worker] { worker->handleNetworkReply(reply); });
+    // Track in-flight replies per host so the unlocked fast path can bound how many requests it
+    // issues at once, instead of creating replies that time out before Qt opens a connection.
+    const QString host = url.host();
+    hostInFlight.insert(host, hostInFlight.value(host) + 1);
+
+    // Release the in-flight slot when the reply is destroyed, not when it emits `finished`, and use
+    // the worker (not the work object) as the context object: a reply can go away without ever
+    // finishing (aborted, or a work object deleted while a reply is still pending), and a connection
+    // bound to that work object's lifetime would then never run, permanently shrinking the fast
+    // path's concurrency until it wedges. This way the slot is released exactly once.
+    connect(reply, &QObject::destroyed, this,
+            [this, host] { hostInFlight.insert(host, qMax(0, hostInFlight.value(host) - 1)); });
+
+    // Connect reply handling; the work object is the context so its handler dies with it.
+    connect(reply, &QNetworkReply::finished, worker, [worker, reply] { worker->handleNetworkReply(reply); });
 
     return reply;
 }
 
 void CardPictureLoaderWorker::resetRequestQuota()
 {
-    requestQuota = MAX_REQUESTS_PER_SEC;
-    processQueuedRequests();
+    QDateTime now = QDateTime::currentDateTime();
+    for (auto it = hostRequestQuota.begin(); it != hostRequestQuota.end();) {
+        if (!hostLast429.contains(it.key()) || now.msecsTo(hostLast429.value(it.key())) < -QUOTA_RECOVER_MS) {
+            if (hostAllowanceCeiling(it.key()) == DownloadSettings::UNLIMITED_HOST_QUOTA) {
+                // A developer-unlocked host that fell back after a 429 recovers towards the default
+                // allowance; once it gets there it becomes unlocked (fast-path) again.
+                if (it.value() + 1 >= DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT) {
+                    it = hostRequestQuota.erase(it);
+                    continue;
+                }
+                it.value() += 1;
+            } else {
+                // Recover towards the host's effective allowance ceiling, which may be
+                // lowered by the user's per-host request limits.
+                it.value() = qMin(hostAllowanceCeiling(it.key()), it.value() + 1);
+            }
+        }
+        ++it;
+    }
+
+    // Forget the per-second allowances; each host's allowance is re-seeded lazily from its
+    // reduced sustained quota the first time it is dispatched in the new second, so a host that
+    // enters the queue mid-second no longer falls through to a fresh full quota.
+    hostQuotaRemaining.clear();
+
+    updateTimerState();
 }
 
 void CardPictureLoaderWorker::processQueuedRequests()
 {
-    while (requestQuota > 0 && processSingleRequest()) {
-        --requestQuota;
+    // QTimer must be started from the thread it lives in; if this public slot is ever reached from
+    // another thread, replay it on the worker's event loop instead of letting start() fail silently.
+    if (thread() != QThread::currentThread()) {
+        QMetaObject::invokeMethod(this, &CardPictureLoaderWorker::processQueuedRequests, Qt::QueuedConnection);
+        return;
+    }
+    updateTimerState();
+}
+
+void CardPictureLoaderWorker::dispatchQueuedRequest()
+{
+    if (requestLoadQueue.isEmpty()) {
+        // All queued requests have been dispatched; stop the pacing timers.
+        updateTimerState();
+        return;
+    }
+
+    QDateTime now = QDateTime::currentDateTime();
+    bool dispatched = false;
+    // Set while an unlocked host still has queued work blocked only by the in-flight cap; the
+    // timer must keep running so it gets another try as soon as a slot frees. A host blocked by
+    // its 429 backoff instead waits for the next quota-reset tick to restart the dispatcher.
+    bool unlockedCapped = false;
+
+    // Unlocked hosts (developer cap UNLIMITED_HOST_QUOTA) skip the pacing and the per-host
+    // allowance: dispatch their queued requests back-to-back, bounded by their 429 backoff and the
+    // per-host in-flight cap so a large burst can't queue replies that time out before Qt opens a
+    // connection for them.
+    for (int i = 0; i < requestLoadQueue.size();) {
+        const auto &request = requestLoadQueue.at(i);
+        // Dispatch decisions must key on the host the request will actually go to, not the URL that
+        // merely redirects to it: a redirect learned after this URL was queued would otherwise
+        // bypass the in-flight cap and drain the whole queue onto the target host unchecked.
+        const QUrl resolvedUrl = resolveCachedRedirect(request.first);
+        const QString host = resolvedUrl.host();
+        if (isUnlockedHost(host)) {
+            if (CardPictureLoaderWorkerWork::rateLimiter().isRateLimited(host, now)) {
+                ++i;
+                continue;
+            }
+            if (hostInFlight.value(host) < MAX_IN_FLIGHT_PER_HOST) {
+                makeRequest(resolvedUrl, request.second);
+                requestLoadQueue.removeAt(i);
+                dispatched = true;
+                continue;
+            }
+            unlockedCapped = true;
+        }
+        ++i;
+    }
+
+    if (requestLoadQueue.isEmpty()) {
+        dispatchTimer.stop();
+        requestTimer.stop();
+        return;
+    }
+
+    if (processSingleRequest()) {
+        dispatched = true;
+    }
+
+    // Keep the timer running while there is progress to make or unlocked work waiting on a free
+    // in-flight slot; otherwise no host has allowance left this second, so wait for the quota reset.
+    if (!dispatched && !unlockedCapped) {
+        dispatchTimer.stop();
+    }
+}
+
+void CardPictureLoaderWorker::updateTimerState()
+{
+    // Never restart an active timer: that would reset the pacing countdown and a burst of enqueues
+    // could keep starving the dispatcher, so only (re)start a timer that has actually stopped.
+    if (requestLoadQueue.isEmpty()) {
+        dispatchTimer.stop();
+        // Forget per-second allowances once nothing is pending: a stale zero would otherwise delay
+        // the next single request by a full quota-reset interval.
+        hostQuotaRemaining.clear();
+    } else if (!dispatchTimer.isActive()) {
+        dispatchTimer.start();
+    }
+
+    // The quota timer resets allowances every second and is also the only thing that heals a host
+    // after a 429 (see resetRequestQuota). It must keep ticking while work is queued or a host is
+    // still recovering below the ceiling, and only winds down once no host needs recovery anymore.
+    // Keeping it alive during such idle periods lets reduced quotas recover as intended.
+    bool hostRecovering = false;
+    for (auto it = hostRequestQuota.cbegin(); it != hostRequestQuota.cend(); ++it) {
+        if (it.value() < MAX_REQUESTS_PER_SEC) {
+            hostRecovering = true;
+            break;
+        }
+    }
+
+    if (!requestLoadQueue.isEmpty() || hostRecovering) {
+        if (!requestTimer.isActive()) {
+            requestTimer.start();
+        }
+    } else if (requestTimer.isActive()) {
+        requestTimer.stop();
     }
 }
 
 bool CardPictureLoaderWorker::processSingleRequest()
 {
-    if (!requestLoadQueue.isEmpty()) {
-        auto request = requestLoadQueue.takeFirst();
-        makeRequest(request.first, request.second);
-        return true;
+    QDateTime now = QDateTime::currentDateTime();
+    for (int i = 0; i < requestLoadQueue.size(); ++i) {
+        // Copy the entry: takeAt(i) below erases within the list this reference points into.
+        const auto request = requestLoadQueue.at(i);
+        // Resolve cached redirects so the rate-limit and allowance arithmetic keys on the host the
+        // request will actually hit (see resolveCachedRedirect).
+        const QUrl resolvedUrl = resolveCachedRedirect(request.first);
+        const QString host = resolvedUrl.host();
+        // Don't dispatch requests to a host that is currently in its 429 backoff; hand the entry
+        // back to its worker so it can wait the backoff out or fall through to another source,
+        // instead of leaving it parked in the queue with no reply pending. Only applies to
+        // requests that will actually touch the network: one that will be served from the disk
+        // cache costs nothing and shouldn't wait out the 429.
+        if (requestTouchesNetwork(request.first) &&
+            CardPictureLoaderWorkerWork::rateLimiter().isRateLimited(host, now)) {
+            // The queued URL is usually a cached-redirect target whose host differs from
+            // cardToDownload.getCurrentUrl(), so scheduleDeferredRetry() (which waits out the
+            // blocked host's deadline) is used instead of startNextPicDownload() looping on the
+            // original host.
+            auto entry = requestLoadQueue.takeAt(i);
+            if (host != entry.first.host()) {
+                // A cached redirect target is what is blocked, which the work object would not
+                // discover from its own URL; wait out that specific host (with jitter) instead.
+                entry.second->scheduleDeferredRetry(host);
+            } else {
+                entry.second->startNextPicDownload();
+            }
+            return true;
+        }
+        // Unlocked hosts are handled by dispatchQueuedRequest's fast path, bounded by the in-flight
+        // cap; they must not fall through to the per-host allowance arithmetic below.
+        if (isUnlockedHost(host)) {
+            continue;
+        }
+        int ceiling = hostAllowanceCeiling(host);
+        if (ceiling == DownloadSettings::UNLIMITED_HOST_QUOTA) {
+            // A 429 dropped this unlocked host out of the fast path and installed a concrete
+            // allowance; pace it against that allowance until the recovery loop unlocks it again.
+            ceiling = hostRequestQuota.value(host, DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT);
+        }
+        // Seed the allowance lazily so a host that enters the queue mid-second gets its reduced
+        // per-host allowance, clamped against the ceiling so a lowered user cap applies from this
+        // second onward.
+        if (!hostQuotaRemaining.contains(host)) {
+            hostQuotaRemaining.insert(host, qMin(ceiling, hostRequestQuota.value(host, ceiling)));
+        }
+        int allowance = hostQuotaRemaining.value(host);
+        if (allowance > 0) {
+            hostQuotaRemaining.insert(host, allowance - 1);
+            auto entry = requestLoadQueue.takeAt(i);
+            makeRequest(resolvedUrl, entry.second);
+            return true;
+        }
     }
     return false;
 }
 
+bool CardPictureLoaderWorker::requestTouchesNetwork(const QUrl &url) const
+{
+    bool useNetworkCache = static_cast<CardPictureLoaderCacheMethod::CacheMethod>(
+                               SettingsCache::instance().cacheStorage().getCardPictureLoaderCacheMethod()) ==
+                               CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE &&
+                           (cache->metaData(url).isValid() || !picDownload);
+    return !useNetworkCache;
+}
+
+int CardPictureLoaderWorker::hostAllowanceCeiling(const QString &host) const
+{
+    const int devCap = DownloadSettings::getDeveloperHostCaps().value(host, MAX_REQUESTS_PER_SEC);
+    if (devCap == DownloadSettings::UNLIMITED_HOST_QUOTA && !hostRequestLimits.contains(host)) {
+        return DownloadSettings::UNLIMITED_HOST_QUOTA;
+    }
+    const int requested = hostRequestLimits.value(host, devCap);
+    return SettingsCache::instance().downloads().clampHostRequestLimit(host, requested);
+}
+
+bool CardPictureLoaderWorker::isUnlockedHost(const QString &host) const
+{
+    return hostAllowanceCeiling(host) == DownloadSettings::UNLIMITED_HOST_QUOTA && !hostRequestQuota.contains(host);
+}
+
+void CardPictureLoaderWorker::onHostRateLimited(const QString &host)
+{
+    const int ceiling = hostAllowanceCeiling(host);
+    // An unlocked host has no per-host allowance to halve. Install one instead so it drops out of
+    // the unlocked fast path and is paced like a throttled host; the recovery loop in
+    // resetRequestQuota() then walks it back up and unlocks it again.
+    const int base =
+        ceiling == DownloadSettings::UNLIMITED_HOST_QUOTA ? DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT : ceiling;
+    hostRequestQuota.insert(host, qMax(MIN_HOST_QUOTA, hostRequestQuota.value(host, base) / 2));
+    hostLast429.insert(host, QDateTime::currentDateTime());
+}
+
 void CardPictureLoaderWorker::enqueueImageLoad(const ExactCard &card)
 {
     // Send call through a connection to ensure the handling is run on the pictureLoader thread
@@ -175,6 +490,22 @@ QUrl CardPictureLoaderWorker::getCachedRedirect(const QUrl &originalUrl) const
     return {};
 }
 
+QUrl CardPictureLoaderWorker::resolveCachedRedirect(const QUrl &url) const
+{
+    // Follow the whole cached-redirect chain so dispatch keys on the host that is really hit. The
+    // depth bound keeps a corrupt or self-referencing cache entry from spinning us forever.
+    QUrl resolved = url;
+    int depth = 0;
+    while (depth++ < MAX_REDIRECT_CHAIN_DEPTH) {
+        QUrl target = getCachedRedirect(resolved);
+        if (target.isEmpty() || target == resolved) {
+            break;
+        }
+        resolved = target;
+    }
+    return resolved;
+}
+
 void CardPictureLoaderWorker::loadRedirectCache()
 {
     QSettings settings(cacheFilePath, QSettings::IniFormat);
@@ -215,7 +546,7 @@ void CardPictureLoaderWorker::cleanStaleEntries()
 
     auto it = redirectCache.begin();
     while (it != redirectCache.end()) {
-        if (it.value().second.addDays(SettingsCache::instance().getRedirectCacheTtl()) < now) {
+        if (it.value().second.addDays(SettingsCache::instance().cacheStorage().getRedirectCacheTtl()) < now) {
             it = redirectCache.erase(it); // Remove stale entry
         } else {
             ++it;
@@ -227,4 +558,5 @@ void CardPictureLoaderWorker::clearNetworkCache()
 {
     networkManager->cache()->clear();
     redirectCache.clear();
+    emit networkCacheCleared();
 }
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 f927abde6..4b42c6e59 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,19 +1,25 @@
 #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 <QHash>
 #include <QLoggingCategory>
-#include <QMutex>
-#include <QNetworkAccessManager>
-#include <QNetworkDiskCache>
 #include <QObject>
+#include <QPair>
 #include <QQueue>
+#include <QSet>
+#include <QString>
 #include <QTimer>
-#include <libcockatrice/card/card_info.h>
-#include <libcockatrice/card/database/card_database.h>
+#include <QUrl>
+#include <qtmetamacros.h>
+
+class CardPictureLoaderLocal;
+class ExactCard;
+class QDateTime;
+class QImage;
+class QNetworkAccessManager;
+class QNetworkDiskCache;
+class QNetworkReply;
+class QThread;
 
 #define REDIRECT_HEADER_NAME "redirects"
 #define REDIRECT_ORIGINAL_URL "original"
@@ -66,10 +72,43 @@ public:
      */
     void queueRequest(const QUrl &url, CardPictureLoaderWorkerWork *worker);
 
-    /** @brief Clears the network cache and redirect cache. */
-    void clearNetworkCache();
+    /**
+     * @brief Handles a server returning HTTP 429 by reducing that host's request quota.
+     * @param host The host that returned 429
+     */
+    void onHostRateLimited(const QString &host);
+
+    /**
+     * @brief Stops the worker thread and reports whether it stopped.
+     *
+     * Called from the owning thread (CardPictureLoader) on its way out. QThread::quit() posts an
+     * exit request to the worker's event loop and QThread::wait() blocks (bounded) until the loop
+     * has returned and the thread finished. Only QThread members are touched here, so this method
+     * is safe to call from the owning thread. The worker object itself is freed by the finished()
+     * -> deleteLater chain (see the constructor); the QThread object is deleted afterwards by the
+     * owner (CardPictureLoader::~CardPictureLoader), not by this method.
+     *
+     * @return true if the thread stopped within the timeout, false if it is still running (in
+     *         which case the owner must not delete the QThread).
+     */
+    [[nodiscard]] bool shutdownThread();
+
+    /**
+     * @brief Returns the worker's QThread.
+     * @return The worker thread
+     *
+     * Only meaningful while the worker object is alive; capture it before calling shutdownThread().
+     */
+    QThread *workerThread() const;
 
 public slots:
+    /**
+     * @brief Clears the network cache and redirect cache.
+     *
+     * Runs on the worker thread; invoke it via a queued call when coming from another thread,
+     * since both caches are owned by the worker thread.
+     */
+    void clearNetworkCache();
     /**
      * @brief Makes a network request for the given URL using the specified worker.
      * @param url URL to load
@@ -78,9 +117,12 @@ public slots:
      */
     QNetworkReply *makeRequest(const QUrl &url, CardPictureLoaderWorkerWork *workThread);
 
-    /** @brief Processes all queued requests respecting the request quota. */
+    /** @brief Ensures the pacing and quota-reset timers reflect the current queue and recovery state. */
     void processQueuedRequests();
 
+    /** @brief Chooses a request from the queue and starts it, respecting the quota and pacing. */
+    void dispatchQueuedRequest();
+
     /**
      * @brief Processes a single queued request.
      * @return true if a request was processed, false if queue is empty.
@@ -110,15 +152,56 @@ private:
     bool picDownload;                                  ///< Whether downloading images from network is enabled
     QQueue<QPair<QUrl, CardPictureLoaderWorkerWork *>> requestLoadQueue; ///< Queue of pending network requests
 
-    int requestQuota;    ///< Remaining requests allowed per second
-    QTimer requestTimer; ///< Timer to reset the request quota
+    QTimer requestTimer;                    ///< Timer to reset the request quota
+    QTimer dispatchTimer;                   ///< Timer pacing individual network requests
+    QHash<QString, int> hostRequestQuota;   ///< Sustained per-host request allowance
+    QHash<QString, int> hostRequestLimits;  ///< User-set per-host request allowances
+    QHash<QString, int> hostQuotaRemaining; ///< Per-host allowance left in the current second
+    QHash<QString, QDateTime> hostLast429;  ///< When each host was last rate limited
+    QHash<QString, int> hostInFlight;       ///< Network replies currently in flight, per host
+
+    /** @brief Maximum concurrent in-flight network replies per host. */
+    static constexpr int MAX_IN_FLIGHT_PER_HOST = 6;
+
+    /** @brief Bound on how many cached-redirect hops dispatch resolution will follow. */
+    static constexpr int MAX_REDIRECT_CHAIN_DEPTH = 10;
 
     CardPictureLoaderLocal *localLoader; ///< Loader for local images
     QSet<QString> currentlyLoading;      ///< Deduplication: contains pixmapCacheKey currently being loaded
 
+    /**
+     * @brief Effective per-host allowance ceiling for a host.
+     * @param host The host to look up
+     * @return The allowance ceiling in requests/second, or DownloadSettings::UNLIMITED_HOST_QUOTA
+     *         when the developer unlocked the host and no user limit is set for it.
+     */
+    [[nodiscard]] int hostAllowanceCeiling(const QString &host) const;
+
+    /**
+     * @brief Whether a host may skip dispatch pacing and per-host allowance entirely.
+     *
+     * A host is unlocked while it has no user limit and no reduced allowance installed by a 429.
+     * A 429 drops it out of the fast path until resetRequestQuota() walks the allowance back up.
+     */
+    [[nodiscard]] bool isUnlockedHost(const QString &host) const;
+
     /** @brief Returns cached redirect URL for the given original URL, if available. */
     [[nodiscard]] QUrl getCachedRedirect(const QUrl &originalUrl) const;
 
+    /** @brief Whether a request for this URL would actually touch the network, rather than being served from the disk
+     * cache. */
+    [[nodiscard]] bool requestTouchesNetwork(const QUrl &url) const;
+
+    /**
+     * @brief Follows the cached-redirect chain to the URL that will actually be requested.
+     * @param url The URL to resolve
+     * @return The final URL after chasing cached redirects, or @p url itself if none lead elsewhere
+     *
+     * Dispatch decisions (unlocked-host fast path, 429 backoff, in-flight cap) must key on the host
+     * a request really goes to, not the URL that merely redirects to it.
+     */
+    [[nodiscard]] QUrl resolveCachedRedirect(const QUrl &url) const;
+
     /** @brief Loads redirect cache from disk. */
     void loadRedirectCache();
 
@@ -128,6 +211,9 @@ private:
     /** @brief Removes stale redirect entries older than TTL. */
     void cleanStaleEntries();
 
+    /** @brief Starts or stops the pacing and quota-reset timers to match the queue and recovery state. */
+    void updateTimerState();
+
 private slots:
     /** @brief Resets the request quota for rate-limiting. */
     void resetRequestQuota();
@@ -147,6 +233,9 @@ signals:
 
     /** @brief Emitted when a network request successfully completes. */
     void imageRequestSucceeded(const QUrl &url);
+
+    /** @brief Emitted after clearNetworkCache() has finished clearing both caches. */
+    void networkCacheCleared();
 };
 
 #endif // PICTURE_LOADER_WORKER_H
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 d5aac645e..92524384a 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,21 +2,50 @@
 
 #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 <QDirIterator>
+#include <QByteArray>
+#include <QCryptographicHash>
+#include <QDateTime>
+#include <QDebug>
+#include <QImageReader>
+#include <QList>
 #include <QLoggingCategory>
+#include <QMessageLogger>
 #include <QMovie>
 #include <QNetworkReply>
-#include <QThread>
-#include <QThreadPool>
+#include <QNetworkRequest>
+#include <QRandomGenerator>
+#include <QSharedPointer>
+#include <QStringList>
+#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 = {"db0c48db407a907c16ade38de048a441"};
+static const QStringList MD5_BLACKLIST = {
+    "db0c48db407a907c16ade38de048a441", // Old card back hash. Keep around just in case
+    "fbc7d763c08771c260b39e2115414eeb"  // Current card back hash
+};
 
-CardPictureLoaderWorkerWork::CardPictureLoaderWorkerWork(const CardPictureLoaderWorker *worker, const ExactCard &toLoad)
-    : QObject(nullptr), cardToDownload(CardPictureToLoad(toLoad)),
-      picDownload(SettingsCache::instance().getPicDownload())
+const ServerRateLimiter &CardPictureLoaderWorkerWork::rateLimiter()
+{
+    return s_rateLimiter;
+}
+
+CardPictureLoaderWorkerWork::CardPictureLoaderWorkerWork(CardPictureLoaderWorker *worker, const ExactCard &toLoad)
+    : QObject(worker), cardToDownload(CardPictureToLoad(toLoad)),
+      picDownload(SettingsCache::instance().downloads().getPicDownload())
 {
     // Hook up signals to the orchestrator
     connect(this, &CardPictureLoaderWorkerWork::requestImageDownload, worker, &CardPictureLoaderWorker::queueRequest);
@@ -26,19 +55,48 @@ CardPictureLoaderWorkerWork::CardPictureLoaderWorkerWork(const CardPictureLoader
     connect(this, &CardPictureLoaderWorkerWork::imageLoaded, worker, &CardPictureLoaderWorker::handleImageLoaded);
     connect(this, &CardPictureLoaderWorkerWork::requestSucceeded, worker,
             &CardPictureLoaderWorker::imageRequestSucceeded);
+    connect(this, &CardPictureLoaderWorkerWork::rateLimited, worker, &CardPictureLoaderWorker::onHostRateLimited);
 
     // Hook up signals to settings
-    connect(&SettingsCache::instance(), SIGNAL(picDownloadChanged()), this, SLOT(picDownloadChanged()));
+    connect(&SettingsCache::instance().downloads(), SIGNAL(picDownloadChanged()), this, SLOT(picDownloadChanged()));
 
     startNextPicDownload();
 }
 
 void CardPictureLoaderWorkerWork::startNextPicDownload()
 {
+    QDateTime now = QDateTime::currentDateTime();
+    while (!cardToDownload.getCurrentUrl().isEmpty() &&
+           s_rateLimiter.isRateLimited(QUrl(cardToDownload.getCurrentUrl()).host(), now)) {
+        QString host = QUrl(cardToDownload.getCurrentUrl()).host();
+        if (s_rateLimiter.rounds(host) == 1) {
+            // First 429 round for this server: wait out the backoff and give it
+            // one more chance instead of immediately falling through to a worse
+            // source. A second 429 makes us fall through instead.
+            qCDebug(CardPictureLoaderWorkerWorkLog).nospace()
+                << "PictureLoader: [card: " << cardToDownload.getCard().getInfo().getCorrectedName()
+                << " set: " << cardToDownload.getSetName() << "]: Waiting out backoff for " << host << " to retry "
+                << cardToDownload.getCurrentUrl();
+            scheduleDeferredRetry();
+            return;
+        }
+
+        // The server has already 429'd us at least twice, so further retries are
+        // unlikely to succeed: move on to the other configured sources.
+        qCDebug(CardPictureLoaderWorkerWorkLog).nospace()
+            << "PictureLoader: [card: " << cardToDownload.getCard().getInfo().getCorrectedName()
+            << " set: " << cardToDownload.getSetName() << "]: Skipping rate-limited URL "
+            << cardToDownload.getCurrentUrl() << " (server " << host << " still rate limiting)";
+        if (!cardToDownload.nextUrl() && !cardToDownload.nextSet()) {
+            scheduleDeferredRetry();
+            return;
+        }
+    }
+
     QString picUrl = cardToDownload.getCurrentUrl();
 
     if (picUrl.isEmpty()) {
-        picDownloadFailed();
+        scheduleDeferredRetry();
     } else {
         QUrl url(picUrl);
         qCDebug(CardPictureLoaderWorkerWorkLog).nospace()
@@ -70,16 +128,22 @@ void CardPictureLoaderWorkerWork::picDownloadFailed()
 void CardPictureLoaderWorkerWork::handleNetworkReply(QNetworkReply *reply)
 {
     QVariant redirectTarget = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
+    bool redirectFailure = false;
     if (redirectTarget.isValid()) {
         QUrl url = reply->request().url();
         QUrl redirectUrl = redirectTarget.toUrl();
         if (redirectUrl.isRelative()) {
             redirectUrl = url.resolved(redirectUrl);
         }
-        emit urlRedirected(url, redirectUrl);
+        if (url == redirectUrl) {
+            qCWarning(CardPictureLoaderWorkerWorkLog) << "recursive redirect detected!";
+            redirectFailure = true;
+        } else {
+            emit urlRedirected(url, redirectUrl);
+        }
     }
 
-    if (reply->error()) {
+    if (redirectFailure || reply->error()) {
         handleFailedReply(reply);
     } else {
         handleSuccessfulReply(reply);
@@ -98,7 +162,41 @@ static bool imageIsBlackListed(const QByteArray &picData)
 void CardPictureLoaderWorkerWork::handleFailedReply(const QNetworkReply *reply)
 {
     if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 429) {
-        qCWarning(CardPictureLoaderWorkerWorkLog) << "Too many requests.";
+        QString host = reply->url().host();
+        QDateTime now = QDateTime::currentDateTime();
+
+        qint64 retryAfterMs = 0;
+        const QByteArray retryAfterHeader = reply->rawHeader("Retry-After");
+        if (!retryAfterHeader.isEmpty()) {
+            bool ok = false;
+            int seconds = retryAfterHeader.toInt(&ok);
+            if (ok && seconds > 0) {
+                retryAfterMs = static_cast<qint64>(seconds) * 1000;
+            } else {
+                QDateTime retryAfterDate =
+                    QDateTime::fromString(QString::fromLatin1(retryAfterHeader), Qt::RFC2822Date);
+                if (retryAfterDate.isValid()) {
+                    retryAfterMs = qMax<qint64>(0, now.msecsTo(retryAfterDate));
+                }
+            }
+        }
+
+        QDateTime backoffUntil = s_rateLimiter.on429(host, now, retryAfterMs);
+        emit rateLimited(host);
+
+        if (s_rateLimiter.rounds(host) == 1) {
+            qCWarning(CardPictureLoaderWorkerWorkLog).nospace()
+                << "PictureLoader: [card: " << cardToDownload.getCard().getName()
+                << " set: " << cardToDownload.getSetName() << "]: Too many requests from " << host
+                << ", backing off until " << backoffUntil.toString(Qt::ISODate) << ", retrying the same url";
+            scheduleDeferredRetry(host);
+        } else {
+            qCWarning(CardPictureLoaderWorkerWorkLog).nospace()
+                << "PictureLoader: [card: " << cardToDownload.getCard().getName()
+                << " set: " << cardToDownload.getSetName() << "]: Too many requests from " << host
+                << ", retry already attempted, falling through to other sources";
+            picDownloadFailed();
+        }
     } else {
         bool isFromCache = reply->attribute(QNetworkRequest::SourceIsFromCacheAttribute).toBool();
 
@@ -139,6 +237,9 @@ void CardPictureLoaderWorkerWork::handleSuccessfulReply(QNetworkReply *reply)
         return;
     }
 
+    // A non-redirect successful response means the server is not rate limiting us anymore.
+    s_rateLimiter.onSuccess(reply->url().host());
+
     // peek is used to keep the data in the buffer for use by QImageReader
     const QByteArray &picData = reply->peek(reply->size());
 
@@ -193,6 +294,44 @@ QImage CardPictureLoaderWorkerWork::tryLoadImageFromReply(QNetworkReply *reply)
     return imgReader.read();
 }
 
+void CardPictureLoaderWorkerWork::scheduleDeferredRetry(const QString &preferredHost)
+{
+    QDateTime now = QDateTime::currentDateTime();
+
+    // Prefer waiting on the server that is actually blocking the request: callers hand in the
+    // rate-limited host when it differs from the current URL (e.g. a cached redirect target still
+    // in backoff), otherwise fall back to the current URL's server so we retry the same source.
+    QString waitHost = preferredHost.isEmpty() ? QUrl(cardToDownload.getCurrentUrl()).host() : preferredHost;
+    QDateTime backoffUntil = s_rateLimiter.deadline(waitHost);
+    if (!s_rateLimiter.isRateLimited(waitHost, now)) {
+        backoffUntil = s_rateLimiter.earliestDeadline(now);
+    }
+
+    if (!backoffUntil.isValid()) {
+        qCWarning(CardPictureLoaderWorkerWorkLog).nospace()
+            << "PictureLoader: [card: " << cardToDownload.getCard().getInfo().getCorrectedName()
+            << " set: " << cardToDownload.getSetName() << "]: All URLs exhausted, no servers in backoff: BAILING OUT";
+        concludeImageLoad(QImage());
+        return;
+    }
+
+    qint64 waitMs = qMax<qint64>(0, now.msecsTo(backoffUntil));
+    // Add some jitter to desynchronize concurrent retries and avoid a thundering herd.
+    waitMs += QRandomGenerator::global()->bounded(5000);
+
+    qCDebug(CardPictureLoaderWorkerWorkLog).nospace()
+        << "PictureLoader: [card: " << cardToDownload.getCard().getInfo().getCorrectedName()
+        << " set: " << cardToDownload.getSetName() << "]: All URLs exhausted, scheduling deferred retry in " << waitMs
+        << "ms";
+
+    QTimer::singleShot(waitMs, this, [this] {
+        s_rateLimiter.clearExpired(QDateTime::currentDateTime());
+
+        cardToDownload.resetIndices();
+        startNextPicDownload();
+    });
+}
+
 void CardPictureLoaderWorkerWork::concludeImageLoad(const QImage &image)
 {
     emit imageLoaded(cardToDownload.getCard(), image);
@@ -201,5 +340,5 @@ void CardPictureLoaderWorkerWork::concludeImageLoad(const QImage &image)
 
 void CardPictureLoaderWorkerWork::picDownloadChanged()
 {
-    picDownload = SettingsCache::instance().getPicDownload();
+    picDownload = SettingsCache::instance().downloads().getPicDownload();
 }
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 cdffc1dff..c3dbcc6e8 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,15 +1,18 @@
 #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 <QLoggingCategory>
-#include <QMutex>
-#include <QNetworkAccessManager>
 #include <QObject>
-#include <QThread>
-#include <libcockatrice/card/database/card_database.h>
+#include <QString>
+#include <qtmetamacros.h>
+
+class ExactCard;
+class QNetworkReply;
+class QUrl;
+class ServerRateLimiter;
 
 inline Q_LOGGING_CATEGORY(CardPictureLoaderWorkerWorkLog, "card_picture_loader.worker");
 
@@ -33,13 +36,36 @@ class CardPictureLoaderWorkerWork : public QObject
 public:
     /**
      * @brief Constructs a worker for downloading a specific card image.
-     * @param worker The orchestrating CardPictureLoaderWorker
+     * @param worker The orchestrating CardPictureLoaderWorker; the work object becomes its child so
+     *               it is destroyed with the worker even if it never reaches concludeImageLoad().
      * @param toLoad The ExactCard to download
      */
-    explicit CardPictureLoaderWorkerWork(const CardPictureLoaderWorker *worker, const ExactCard &toLoad);
+    explicit CardPictureLoaderWorkerWork(CardPictureLoaderWorker *worker, const ExactCard &toLoad);
 
     CardPictureToLoad cardToDownload; ///< The card and associated URLs to try downloading
 
+    /** @brief Shared per-server 429 backoff state. */
+    static const ServerRateLimiter &rateLimiter();
+
+    /**
+     * @brief Starts downloading the next URL for this card.
+     *
+     * Skips URLs whose server is currently in 429 backoff, either waiting the
+     * backoff out or falling through to the other configured sources.
+     */
+    void startNextPicDownload();
+
+    /**
+     * @brief Schedules a deferred retry after the relevant server backoff expires.
+     * @param preferredHost The server that is actually blocking the request, or an empty
+     *                      string to use the current URL's server
+     *
+     * Waits on the blocking server's backoff deadline, otherwise on the earliest active
+     * backoff. If no servers are in backoff, concludes with failure. Otherwise resets the
+     * CardPictureToLoad indices and retries after the backoff period.
+     */
+    void scheduleDeferredRetry(const QString &preferredHost = {});
+
 public slots:
     /**
      * @brief Handles a finished network reply for the card image.
@@ -50,8 +76,7 @@ public slots:
 private:
     bool picDownload; ///< Whether network downloading is enabled
 
-    /** @brief Starts downloading the next URL for this card. */
-    void startNextPicDownload();
+    static ServerRateLimiter s_rateLimiter; ///< Shared per-server 429 backoff state
 
     /** @brief Called when all URLs have been exhausted or download failed. */
     void picDownloadFailed();
@@ -100,6 +125,9 @@ signals:
     /** @brief Emitted when a URL has been redirected. */
     void urlRedirected(const QUrl &originalUrl, const QUrl &redirectUrl);
 
+    /** @brief Emitted when a server returned HTTP 429. */
+    void rateLimited(const QString &host);
+
     /** @brief Emitted when a cached URL is invalid and must be removed. */
     void cachedUrlInvalidated(const QUrl &url);
 };
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 d72226aab..e35c417c8 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,35 @@
 #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>
+#include <libcockatrice/settings/download_settings.h>
 
 CardPictureToLoad::CardPictureToLoad(const ExactCard &_card)
     : card(_card), urlTemplates(SettingsCache::instance().downloads().getAllURLs())
 {
     if (card) {
         sortedSets = extractSetsSorted(card);
-        // The first time called, nextSet will also populate the Urls for the first set.
-        nextSet();
+        currentSetIndex = 0;
+        currentSet = sortedSets.first();
+        populateSetUrls();
     }
 }
 
@@ -34,7 +47,7 @@ QList<CardSetPtr> CardPictureToLoad::extractSetsSorted(const ExactCard &card)
     std::sort(sortedSets.begin(), sortedSets.end(), SetPriorityComparator());
 
     // If the user hasn't disabled arts other than their personal preference...
-    if (!SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) {
+    if (!SettingsCache::instance().cardsDisplay().getOverrideAllCardArtWithPersonalPreference()) {
         // If the pixmapCacheKey corresponds to a specific set, we have to try to load it first.
         qsizetype setIndex = sortedSets.indexOf(card.getPrinting().getSet());
         if (setIndex > 0) { // we don't need to move the set if it's already first
@@ -53,18 +66,19 @@ QList<CardSetPtr> CardPictureToLoad::extractSetsSorted(const ExactCard &card)
  * PrintingInfo for the set is returned.
  *
  * This method only exists to maintain existing behavior.
- * TODO: check if going through all sets is still necessary after the ExactCard refactor.
  *
  * @param card The card to look in
  * @param setName The set's short name
  * @return A PrintingInfo, or a default-constructed PrintingInfo if the set name is not in the CardInfo.
  */
+//! \todo Check if going through all sets is still necessary after the ExactCard refactor.
 static PrintingInfo findPrintingForSet(const ExactCard &card, const QString &setName)
 {
     SetToPrintingsMap setsToPrintings = card.getInfo().getSets();
 
-    if (!setsToPrintings.contains(setName))
+    if (!setsToPrintings.contains(setName)) {
         return PrintingInfo();
+    }
 
     for (const auto &printing : setsToPrintings[setName]) {
         if (printing.getUuid() == card.getPrinting().getUuid()) {
@@ -98,15 +112,19 @@ void CardPictureToLoad::populateSetUrls()
         }
     }
 
-    /* Call nextUrl to make sure currentUrl is up-to-date
-       but we don't need the result here. */
-    (void)nextUrl();
+    currentUrlIndex = 0;
+    if (!currentSetUrls.isEmpty()) {
+        currentUrl = currentSetUrls.first();
+    } else {
+        currentUrl = QString();
+    }
 }
 
 bool CardPictureToLoad::nextSet()
 {
-    if (!sortedSets.isEmpty()) {
-        currentSet = sortedSets.takeFirst();
+    currentSetIndex++;
+    if (currentSetIndex < sortedSets.size()) {
+        currentSet = sortedSets.at(currentSetIndex);
         populateSetUrls();
         return true;
     }
@@ -116,8 +134,9 @@ bool CardPictureToLoad::nextSet()
 
 bool CardPictureToLoad::nextUrl()
 {
-    if (!currentSetUrls.isEmpty()) {
-        currentUrl = currentSetUrls.takeFirst();
+    currentUrlIndex++;
+    if (currentUrlIndex < currentSetUrls.size()) {
+        currentUrl = currentSetUrls.at(currentUrlIndex);
         return true;
     }
     currentUrl = QString();
@@ -133,6 +152,28 @@ QString CardPictureToLoad::getSetName() const
     }
 }
 
+QString CardPictureToLoad::peekNextUrl() const
+{
+    int nextIndex = currentUrlIndex + 1;
+    if (nextIndex < currentSetUrls.size()) {
+        return currentSetUrls.at(nextIndex);
+    }
+    return QString();
+}
+
+void CardPictureToLoad::resetIndices()
+{
+    currentSetIndex = 0;
+    if (!sortedSets.isEmpty()) {
+        currentSet = sortedSets.first();
+        populateSetUrls();
+    } else {
+        currentSet = {};
+        currentSetUrls.clear();
+        currentUrl = QString();
+    }
+}
+
 static int parse(const QString &urlTemplate,
                  const QString &propType,
                  const QString &cardName,
@@ -251,8 +292,15 @@ QString CardPictureToLoad::transformUrl(const QString &urlTemplate) const
     }
 
     // language setting
-    transformMap["!sflang!"] = QString(QCoreApplication::translate(
-        "PictureLoader", "en", "code for scryfall's language property, not available for all languages"));
+    const QString cardLang = SettingsCache::instance().cardsDisplay().getCardLang();
+    transformMap["!sflang!"] = cardLang;
+
+    // The localized printing's own id is unknown, so Scryfall must resolve it by
+    // its translated name (see populateSetUrls); expose that name for the
+    // `/cards/named` template.
+    if (cardLang != "en") {
+        transformMap["!localizedName!"] = card.getInfo().getLocalizedName(cardLang);
+    }
 
     QString transformedUrl = urlTemplate;
     for (const QString &prop : transformMap.keys()) {
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 b57e57644..fe56dc4c6 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,6 +1,12 @@
 #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");
@@ -25,6 +31,8 @@ private:
     QList<QString> currentSetUrls; ///< URLs for the current set being attempted
     QString currentUrl;            ///< Currently active URL to download
     CardSetPtr currentSet;         ///< Currently active set
+    int currentSetIndex = 0;       ///< Current position in sortedSets
+    int currentUrlIndex = 0;       ///< Current position in currentSetUrls
 
 public:
     /**
@@ -56,6 +64,9 @@ public:
     /** @return The short name of the current set, or empty string if no set. */
     [[nodiscard]] QString getSetName() const;
 
+    /** @return The next URL in the current set's list without advancing, or empty if at end. */
+    [[nodiscard]] QString peekNextUrl() const;
+
     /**
      * @brief Transforms a URL template into a concrete URL for this card/set.
      * @param urlTemplate The URL template to transform
@@ -88,6 +99,14 @@ public:
      */
     void populateSetUrls();
 
+    /**
+     * @brief Resets iteration indices to the beginning.
+     *
+     * Restarts URL/set iteration from the first set and first URL.
+     * Used for deferred retry after server backoff expires.
+     */
+    void resetIndices();
+
     /**
      * @brief Extract all sets from the card and sort them by priority.
      * @param card The card to extract sets from
diff --git a/cockatrice/src/interface/deck_loader/card_node_function.cpp b/cockatrice/src/interface/deck_loader/card_node_function.cpp
new file mode 100644
index 000000000..8d59a6c15
--- /dev/null
+++ b/cockatrice/src/interface/deck_loader/card_node_function.cpp
@@ -0,0 +1,48 @@
+#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>
+
+void CardNodeFunction::SetProviderIdToPreferred::operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
+{
+    Q_UNUSED(node);
+    PrintingInfo preferredPrinting = CardDatabaseManager::query()->getPreferredPrinting(card->getName());
+    CardSetPtr preferredSet = preferredPrinting.getSet();
+    if (!preferredSet) {
+        return;
+    }
+
+    card->setCardProviderId(preferredPrinting.getUuid());
+    card->setCardCollectorNumber(preferredPrinting.getProperty("num"));
+    card->setCardSetShortName(preferredSet->getShortName());
+}
+
+void CardNodeFunction::ClearPrintingData::operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
+{
+    Q_UNUSED(node);
+    card->setCardSetShortName(nullptr);
+    card->setCardCollectorNumber(nullptr);
+    card->setCardProviderId(nullptr);
+}
+
+void CardNodeFunction::ResolveProviderId::operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
+{
+    Q_UNUSED(node);
+    // Retrieve the providerId based on setName and collectorNumber
+    QString providerId =
+        CardDatabaseManager::getInstance()
+            ->query()
+            ->getSpecificPrinting(card->getName(), card->getCardSetShortName(), card->getCardCollectorNumber())
+            .getUuid();
+
+    // Set the providerId on the card
+    card->setCardProviderId(providerId);
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/deck_loader/card_node_function.h b/cockatrice/src/interface/deck_loader/card_node_function.h
new file mode 100644
index 000000000..398dc0c0e
--- /dev/null
+++ b/cockatrice/src/interface/deck_loader/card_node_function.h
@@ -0,0 +1,39 @@
+#ifndef COCKATRICE_DECK_FUNCTION_H
+#define COCKATRICE_DECK_FUNCTION_H
+
+class DecklistCardNode;
+class InnerDecklistNode;
+
+/**
+ * Functions to be used with DeckList::forEachCard
+ */
+namespace CardNodeFunction
+{
+
+/**
+ * @brief Sets the providerId of the card to the preferred printing.
+ */
+struct SetProviderIdToPreferred
+{
+    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const;
+};
+
+/**
+ * @brief Clears all fields on the card related to the printing
+ */
+struct ClearPrintingData
+{
+    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const;
+};
+
+/**
+ * @brief Sets the providerId of the card based on its set name and collector number.
+ */
+struct ResolveProviderId
+{
+    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const;
+};
+
+} // namespace CardNodeFunction
+
+#endif // COCKATRICE_DECK_FUNCTION_H
diff --git a/cockatrice/src/interface/deck_loader/deck_file_format.cpp b/cockatrice/src/interface/deck_loader/deck_file_format.cpp
new file mode 100644
index 000000000..ba5a44e4c
--- /dev/null
+++ b/cockatrice/src/interface/deck_loader/deck_file_format.cpp
@@ -0,0 +1,11 @@
+#include "deck_file_format.h"
+
+#include <qnamespace.h>
+
+DeckFileFormat::Format DeckFileFormat::getFormatFromName(const QString &fileName)
+{
+    if (fileName.endsWith(".cod", Qt::CaseInsensitive)) {
+        return Cockatrice;
+    }
+    return PlainText;
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/deck_loader/deck_file_format.h b/cockatrice/src/interface/deck_loader/deck_file_format.h
new file mode 100644
index 000000000..3a25797ec
--- /dev/null
+++ b/cockatrice/src/interface/deck_loader/deck_file_format.h
@@ -0,0 +1,36 @@
+#ifndef COCKATRICE_DECK_FILE_FORMAT_H
+#define COCKATRICE_DECK_FILE_FORMAT_H
+#include <QString>
+
+namespace DeckFileFormat
+{
+
+/**
+ * The deck file formats that Cockatrice supports.
+ */
+enum Format
+{
+    /**
+     * Plaintext deck files, a format that is intended to be widely supported among different programs.
+     * This format does not support Cockatrice specific features such as banner cards or tags.
+     */
+    PlainText,
+
+    /**
+     * This is Cockatrice's native deck file format, and supports deck metadata such as banner cards and tags.
+     * Stored as .cod files.
+     */
+    Cockatrice
+};
+
+/**
+ * Determines what deck file format the given filename corresponds to.
+ *
+ * @param fileName The filename
+ * @return The deck format
+ */
+Format getFormatFromName(const QString &fileName);
+
+} // namespace DeckFileFormat
+
+#endif // COCKATRICE_DECK_FILE_FORMAT_H
diff --git a/cockatrice/src/interface/deck_loader/deck_loader.cpp b/cockatrice/src/interface/deck_loader/deck_loader.cpp
index eea906a97..d413a6c04 100644
--- a/cockatrice/src/interface/deck_loader/deck_loader.cpp
+++ b/cockatrice/src/interface/deck_loader/deck_loader.cpp
@@ -1,58 +1,84 @@
 #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 <QFutureWatcher>
+#include <QFont>
+#include <QFuture>
+#include <QIODevice>
+#include <QList>
+#include <QMap>
+#include <QMessageLogger>
+#include <QMultiMap>
 #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 <libcockatrice/card/database/card_database.h>
+#include <functional>
 #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"};
 
 const QStringList DeckLoader::FILE_NAME_FILTERS = {
     tr("Common deck formats (%1)").arg(ACCEPTED_FILE_EXTENSIONS.join(" ")), tr("All files (*.*)")};
 
-DeckLoader::DeckLoader(QObject *parent) : QObject(parent), deckList(new DeckList())
+DeckLoader::DeckLoader(QObject *parent) : QObject(parent)
 {
 }
 
-DeckLoader::DeckLoader(QObject *parent, DeckList *_deckList) : QObject(parent), deckList(_deckList)
-{
-}
-
-bool DeckLoader::loadFromFile(const QString &fileName, FileFormat fmt, bool userRequest)
+std::optional<LoadedDeck>
+DeckLoader::loadFromFile(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest)
 {
     QFile file(fileName);
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        return false;
+        qCWarning(DeckLoaderLog) << "File does not exist:" << fileName;
+        return std::nullopt;
     }
 
     bool result = false;
+    DeckList deckList;
     switch (fmt) {
-        case PlainTextFormat:
-            result = deckList->loadFromFile_Plain(&file);
+        case DeckFileFormat::PlainText:
+            result = deckList.loadFromFile_Plain(&file, CardNameNormalizer());
             break;
-        case CockatriceFormat: {
-            result = deckList->loadFromFile_Native(&file);
-            qCInfo(DeckLoaderLog) << "Loaded from" << fileName << "-" << result;
+        case DeckFileFormat::Cockatrice: {
+            result = deckList.loadFromFile_Native(&file);
             if (!result) {
-                qCInfo(DeckLoaderLog) << "Retrying as plain format";
+                qCInfo(DeckLoaderLog) << "Failed to load " << fileName
+                                      << "as Cockatrice format; retrying as plain format";
                 file.seek(0);
-                result = deckList->loadFromFile_Plain(&file);
-                fmt = PlainTextFormat;
+                result = deckList.loadFromFile_Plain(&file, CardNameNormalizer());
+                fmt = DeckFileFormat::PlainText;
             }
             break;
         }
@@ -61,119 +87,140 @@ bool DeckLoader::loadFromFile(const QString &fileName, FileFormat fmt, bool user
             break;
     }
 
-    if (result) {
-        lastLoadInfo = {
-            .fileName = fileName,
-            .fileFormat = fmt,
-        };
-        if (userRequest) {
-            updateLastLoadedTimestamp(fileName, fmt);
-        }
-
-        emit deckLoaded();
+    if (!result) {
+        qCWarning(DeckLoaderLog) << "Failed to load " << fileName << "as" << fmt;
+        return std::nullopt;
     }
 
-    qCInfo(DeckLoaderLog) << "Deck was loaded -" << result;
-    return result;
-}
+    LoadedDeck::LoadInfo lastLoadInfo = {
+        .fileName = fileName,
+        .fileFormat = fmt,
+    };
+    LoadedDeck loadedDeck = {deckList, lastLoadInfo};
 
-bool DeckLoader::loadFromFileAsync(const QString &fileName, FileFormat fmt, bool userRequest)
-{
-    auto *watcher = new QFutureWatcher<bool>(this);
-
-    connect(watcher, &QFutureWatcher<bool>::finished, this, [this, watcher, fileName, fmt, userRequest]() {
-        const bool result = watcher->result();
-        watcher->deleteLater();
-
-        if (result) {
-            lastLoadInfo = {
-                .fileName = fileName,
-                .fileFormat = fmt,
-            };
-            if (userRequest) {
-                updateLastLoadedTimestamp(fileName, fmt);
-            }
-            emit deckLoaded();
-        }
-
-        emit loadFinished(result);
-    });
-
-    QFuture<bool> future = QtConcurrent::run([=, this]() {
-        QFile file(fileName);
-        if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            return false;
-        }
-
-        switch (fmt) {
-            case PlainTextFormat:
-                return deckList->loadFromFile_Plain(&file);
-            case CockatriceFormat: {
-                bool result = false;
-                result = deckList->loadFromFile_Native(&file);
-                if (!result) {
-                    file.seek(0);
-                    return deckList->loadFromFile_Plain(&file);
-                }
-                return result;
-            }
-            default:
-                return false;
-                break;
-        }
-    });
-
-    watcher->setFuture(future);
-    return true; // Return immediately to indicate the async task was started
-}
-
-bool DeckLoader::loadFromRemote(const QString &nativeString, int remoteDeckId)
-{
-    bool result = deckList->loadFromString_Native(nativeString);
-    if (result) {
-        lastLoadInfo = {
-            .remoteDeckId = remoteDeckId,
-        };
-
-        emit deckLoaded();
+    if (userRequest) {
+        updateLastLoadedTimestamp(loadedDeck);
     }
-    return result;
+
+    qCDebug(DeckLoaderLog) << "Loaded deck" << fileName << "with userRequest:" << userRequest;
+
+    return loadedDeck;
 }
 
-bool DeckLoader::saveToFile(const QString &fileName, FileFormat fmt)
+void DeckLoader::loadFromFileAsync(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest)
 {
-    QFile file(fileName);
-    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+    QFuture<void> future = QtConcurrent::run([=, this] {
+        std::optional<LoadedDeck> deckOpt = loadFromFile(fileName, fmt, userRequest);
+        if (deckOpt) {
+            loadedDeck = deckOpt.value();
+        }
+        emit loadFinished(deckOpt.has_value());
+    });
+}
+
+bool DeckLoader::reload()
+{
+    QString lastFileName = loadedDeck.lastLoadInfo.fileName;
+    if (lastFileName.isEmpty()) {
+        return false;
+    }
+    std::optional<LoadedDeck> deck = loadFromFile(lastFileName, loadedDeck.lastLoadInfo.fileFormat, false);
+
+    if (!deck) {
         return false;
     }
 
-    bool result = false;
-    switch (fmt) {
-        case PlainTextFormat:
-            result = deckList->saveToFile_Plain(&file);
-            break;
-        case CockatriceFormat:
-            result = deckList->saveToFile_Native(&file);
-            qCInfo(DeckLoaderLog) << "Saving to " << fileName << "-" << result;
-            break;
-    }
-
-    if (result) {
-        lastLoadInfo = {
-            .fileName = fileName,
-            .fileFormat = fmt,
-        };
-        qCInfo(DeckLoaderLog) << "Deck was saved -" << result;
-    }
-
-    file.flush();
-    file.close();
-
-    return result;
+    loadedDeck = *deck;
+    return true;
 }
 
-bool DeckLoader::updateLastLoadedTimestamp(const QString &fileName, FileFormat fmt)
+std::optional<LoadedDeck> DeckLoader::loadFromRemote(const QString &nativeString, int remoteDeckId)
 {
+    DeckList deckList;
+    bool success = deckList.loadFromString_Native(nativeString);
+
+    if (!success) {
+        qCWarning(DeckLoaderLog) << "Failed to load remote deck with id" << remoteDeckId << ":" << nativeString;
+        return std::nullopt;
+    }
+
+    LoadedDeck::LoadInfo lastLoadInfo = {.remoteDeckId = remoteDeckId};
+    LoadedDeck loadedDeck = {deckList, lastLoadInfo};
+
+    qCDebug(DeckLoaderLog) << "Loaded remote deck with id" << remoteDeckId;
+
+    return loadedDeck;
+}
+
+std::optional<LoadedDeck::LoadInfo>
+DeckLoader::saveToFile(const DeckList &deck, const QString &fileName, DeckFileFormat::Format fmt)
+{
+    // Use QSaveFile so that a failed write (e.g. a full disk) leaves the existing deck untouched
+    // instead of truncating it to a 0-byte file. The target is only replaced once every byte has
+    // been flushed successfully in commit().
+    QSaveFile file(fileName);
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        qCWarning(DeckLoaderLog) << "Could not create or open file:" << fileName;
+        return std::nullopt;
+    }
+
+    bool success = false;
+    switch (fmt) {
+        case DeckFileFormat::PlainText:
+            success = deck.saveToFile_Plain(&file);
+            break;
+        case DeckFileFormat::Cockatrice:
+            success = deck.saveToFile_Native(&file);
+            break;
+    }
+
+    if (!success) {
+        file.cancelWriting();
+        qCWarning(DeckLoaderLog) << "Failed to serialize deck for file:" << fileName;
+        return std::nullopt;
+    }
+
+    if (!file.commit()) {
+        qCWarning(DeckLoaderLog) << "Failed to save deck to " << fileName << ":" << file.errorString();
+        return std::nullopt;
+    }
+
+    qCInfo(DeckLoaderLog) << "Saved deck to " << fileName << "with format" << fmt;
+
+    LoadedDeck::LoadInfo lastLoadInfo = {fileName, fmt};
+    return lastLoadInfo;
+}
+
+bool DeckLoader::saveToFile(const LoadedDeck &deck)
+{
+    auto opt = saveToFile(deck.deckList, deck.lastLoadInfo.fileName, deck.lastLoadInfo.fileFormat);
+    return opt.has_value();
+}
+
+bool DeckLoader::saveToNewFile(LoadedDeck &deck, const QString &fileName, DeckFileFormat::Format fmt)
+{
+    std::optional<LoadedDeck::LoadInfo> infoOpt = saveToFile(deck.deckList, fileName, fmt);
+
+    if (infoOpt) {
+        deck.lastLoadInfo = infoOpt.value();
+    }
+
+    return infoOpt.has_value();
+}
+
+/**
+ * @brief Updates the lastLoadedTimestamp field in the file corresponding to the deck, without changing the
+ * FileModificationTime of the file.
+ */
+bool DeckLoader::updateLastLoadedTimestamp(LoadedDeck &deck)
+{
+    // text format doesn't support lastLoadedTimestamp, so there's no point in proceeding
+    if (deck.lastLoadInfo.fileFormat != DeckFileFormat::Cockatrice) {
+        return false;
+    }
+
+    QString fileName = deck.lastLoadInfo.fileName;
+
     QFileInfo fileInfo(fileName);
     if (!fileInfo.exists()) {
         qCWarning(DeckLoaderLog) << "File does not exist:" << fileName;
@@ -182,50 +229,44 @@ bool DeckLoader::updateLastLoadedTimestamp(const QString &fileName, FileFormat f
 
     QDateTime originalTimestamp = fileInfo.lastModified();
 
-    // Open the file for writing
-    QFile file(fileName);
+    // Use QSaveFile so that a failed write (e.g. a full disk) cannot truncate an existing deck to a
+    // 0-byte file while merely bumping its timestamp.
+    QSaveFile file(fileName);
     if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
         qCWarning(DeckLoaderLog) << "Failed to open file for writing:" << fileName;
         return false;
     }
 
-    bool result = false;
-
     // Perform file modifications
-    switch (fmt) {
-        case PlainTextFormat:
-            result = deckList->saveToFile_Plain(&file);
-            break;
-        case CockatriceFormat:
-            deckList->setLastLoadedTimestamp(QDateTime::currentDateTime().toString());
-            result = deckList->saveToFile_Native(&file);
-            break;
+    deck.deckList.setLastLoadedTimestamp(QDateTime::currentDateTime().toString());
+
+    if (!deck.deckList.saveToFile_Native(&file)) {
+        file.cancelWriting();
+        qCWarning(DeckLoaderLog) << "Failed to serialize deck for file:" << fileName;
+        return false;
     }
 
-    file.close(); // Close the file to ensure changes are flushed
-
-    if (result) {
-        lastLoadInfo = {
-            .fileName = fileName,
-            .fileFormat = fmt,
-        };
-
-        // Re-open the file and set the original timestamp
-        if (!file.open(QIODevice::ReadWrite)) {
-            qCWarning(DeckLoaderLog) << "Failed to re-open file to set timestamp:" << fileName;
-            return false;
-        }
-
-        if (!file.setFileTime(originalTimestamp, QFileDevice::FileModificationTime)) {
-            qCWarning(DeckLoaderLog) << "Failed to set modification time for file:" << fileName;
-            file.close();
-            return false;
-        }
-
-        file.close();
+    if (!file.commit()) {
+        qCWarning(DeckLoaderLog) << "Failed to update timestamp for file:" << fileName << ":" << file.errorString();
+        return false;
     }
 
-    return result;
+    // Re-open the file and restore the original timestamp, so that updating the lastLoadedTimestamp
+    // does not change the file's modification time.
+    QFile timestampFile(fileName);
+    if (!timestampFile.open(QIODevice::ReadWrite)) {
+        qCWarning(DeckLoaderLog) << "Failed to re-open file to set timestamp:" << fileName;
+        return false;
+    }
+
+    if (!timestampFile.setFileTime(originalTimestamp, QFileDevice::FileModificationTime)) {
+        qCWarning(DeckLoaderLog) << "Failed to set modification time for file:" << fileName;
+        timestampFile.close();
+        return false;
+    }
+
+    timestampFile.close();
+    return true;
 }
 
 static QString getDomainForWebsite(DeckLoader::DecklistWebsite website)
@@ -269,39 +310,35 @@ static QString toDecklistExportString(const DecklistCardNode *card)
     return cardString;
 }
 
+/**
+ * Converts all cards in the list to their decklist export string and joins them into one string
+ */
+static QString toDecklistExportString(const QList<const DecklistCardNode *> &cardNodes)
+{
+    QString result;
+
+    for (auto cardNode : cardNodes) {
+        result += toDecklistExportString(cardNode);
+    }
+
+    return result;
+}
+
 /**
  * Export deck to decklist function, called to format the deck in a way to be sent to a server
  *
  * @param deckList The decklist to export
  * @param website The website we're sending the deck to
  */
-QString DeckLoader::exportDeckToDecklist(const DeckList *deckList, DecklistWebsite website)
+QString DeckLoader::exportDeckToDecklist(const DeckList &deckList, DecklistWebsite website)
 {
     // Add the base url
     QString deckString = "https://" + getDomainForWebsite(website) + "/?";
-    // Create two strings to pass to function
-    QString mainBoardCards, sideBoardCards;
 
-    // Set up the function to call
-    auto formatDeckListForExport = [&mainBoardCards, &sideBoardCards](const auto *node, const auto *card) {
-        // Get the card name
-        CardInfoPtr dbCard = CardDatabaseManager::query()->getCardInfo(card->getName());
-        if (!dbCard || dbCard->getIsToken()) {
-            // If it's a token, we don't care about the card.
-            return;
-        }
+    // export all cards in zone
+    QString mainBoardCards = toDecklistExportString(deckList.getCardNodes({DECK_ZONE_MAIN}));
+    QString sideBoardCards = toDecklistExportString(deckList.getCardNodes({DECK_ZONE_SIDE}));
 
-        // Check if it's a sideboard card.
-        if (node->getName() == DECK_ZONE_SIDE) {
-            sideBoardCards += toDecklistExportString(card);
-        } else {
-            // If it's a mainboard card, do the same thing, but for the mainboard card string
-            mainBoardCards += toDecklistExportString(card);
-        }
-    };
-
-    // call our struct function for each card in the deck
-    deckList->forEachCard(formatDeckListForExport);
     // Remove the extra return at the end of the last cards
     mainBoardCards.chop(3);
     sideBoardCards.chop(3);
@@ -316,113 +353,7 @@ QString DeckLoader::exportDeckToDecklist(const DeckList *deckList, DecklistWebsi
     return deckString;
 }
 
-// This struct is here to support the forEachCard function call, defined in decklist.
-// It requires a function to be called for each card, and it will set the providerId to the preferred printing.
-struct SetProviderIdToPreferred
-{
-    // Main operator for struct, allowing the foreachcard to work.
-    SetProviderIdToPreferred()
-    {
-    }
-
-    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
-    {
-        Q_UNUSED(node);
-        PrintingInfo preferredPrinting = CardDatabaseManager::query()->getPreferredPrinting(card->getName());
-        QString providerId = preferredPrinting.getUuid();
-        QString setShortName = preferredPrinting.getSet()->getShortName();
-        QString collectorNumber = preferredPrinting.getProperty("num");
-
-        card->setCardProviderId(providerId);
-        card->setCardCollectorNumber(collectorNumber);
-        card->setCardSetShortName(setShortName);
-    }
-};
-
-/**
- * This function iterates through each card in the decklist and sets the providerId
- * on each card based on its set name and collector number.
- *
- * @param deckList The decklist to modify
- */
-void DeckLoader::setProviderIdToPreferredPrinting(const DeckList *deckList)
-{
-    // Set up the struct to call.
-    SetProviderIdToPreferred setProviderIdToPreferred;
-
-    // Call the forEachCard method for each card in the deck
-    deckList->forEachCard(setProviderIdToPreferred);
-}
-
-/**
- * Sets the providerId on each card in the decklist based on its set name and collector number.
- *
- * @param deckList The decklist to modify
- */
-void DeckLoader::resolveSetNameAndNumberToProviderID(const DeckList *deckList)
-{
-    auto setProviderId = [](const auto node, const auto card) {
-        Q_UNUSED(node);
-        // Retrieve the providerId based on setName and collectorNumber
-        QString providerId =
-            CardDatabaseManager::getInstance()
-                ->query()
-                ->getSpecificPrinting(card->getName(), card->getCardSetShortName(), card->getCardCollectorNumber())
-                .getUuid();
-
-        // Set the providerId on the card
-        card->setCardProviderId(providerId);
-    };
-
-    deckList->forEachCard(setProviderId);
-}
-
-// This struct is here to support the forEachCard function call, defined in decklist.
-// It requires a function to be called for each card, and it will set the providerId.
-struct ClearSetNameNumberAndProviderId
-{
-    // Main operator for struct, allowing the foreachcard to work.
-    ClearSetNameNumberAndProviderId()
-    {
-    }
-
-    void operator()(const InnerDecklistNode *node, DecklistCardNode *card) const
-    {
-        Q_UNUSED(node);
-        // Set the providerId on the card
-        card->setCardSetShortName(nullptr);
-        card->setCardCollectorNumber(nullptr);
-        card->setCardProviderId(nullptr);
-    }
-};
-
-/**
- * Clears the set name and numbers on each card in the decklist.
- *
- * @param deckList The decklist to modify
- */
-void DeckLoader::clearSetNamesAndNumbers(const DeckList *deckList)
-{
-    auto clearSetNameAndNumber = [](const auto node, auto card) {
-        Q_UNUSED(node)
-        // Set the providerId on the card
-        card->setCardSetShortName(nullptr);
-        card->setCardCollectorNumber(nullptr);
-        card->setCardProviderId(nullptr);
-    };
-
-    deckList->forEachCard(clearSetNameAndNumber);
-}
-
-DeckLoader::FileFormat DeckLoader::getFormatFromName(const QString &fileName)
-{
-    if (fileName.endsWith(".cod", Qt::CaseInsensitive)) {
-        return CockatriceFormat;
-    }
-    return PlainTextFormat;
-}
-
-void DeckLoader::saveToClipboard(const DeckList *deckList, bool addComments, bool addSetNameAndNumber)
+void DeckLoader::saveToClipboard(const DeckList &deckList, bool addComments, bool addSetNameAndNumber)
 {
     QString buffer;
     QTextStream stream(&buffer);
@@ -432,7 +363,7 @@ void DeckLoader::saveToClipboard(const DeckList *deckList, bool addComments, boo
 }
 
 bool DeckLoader::saveToStream_Plain(QTextStream &out,
-                                    const DeckList *deckList,
+                                    const DeckList &deckList,
                                     bool addComments,
                                     bool addSetNameAndNumber)
 {
@@ -441,9 +372,7 @@ bool DeckLoader::saveToStream_Plain(QTextStream &out,
     }
 
     // loop zones
-    for (int i = 0; i < deckList->getRoot()->size(); i++) {
-        const auto *zoneNode = dynamic_cast<InnerDecklistNode *>(deckList->getRoot()->at(i));
-
+    for (auto zoneNode : deckList.getZoneNodes()) {
         saveToStream_DeckZone(out, zoneNode, addComments, addSetNameAndNumber);
 
         // end of zone
@@ -453,14 +382,14 @@ bool DeckLoader::saveToStream_Plain(QTextStream &out,
     return true;
 }
 
-void DeckLoader::saveToStream_DeckHeader(QTextStream &out, const DeckList *deckList)
+void DeckLoader::saveToStream_DeckHeader(QTextStream &out, const DeckList &deckList)
 {
-    if (!deckList->getName().isEmpty()) {
-        out << "// " << deckList->getName() << "\n\n";
+    if (!deckList.getName().isEmpty()) {
+        out << "// " << deckList.getName() << "\n\n";
     }
 
-    if (!deckList->getComments().isEmpty()) {
-        QStringList commentRows = deckList->getComments().split(QRegularExpression("\n|\r\n|\r"));
+    if (!deckList.getComments().isEmpty()) {
+        QStringList commentRows = deckList.getComments().split(QRegularExpression("\n|\r\n|\r"));
         for (const QString &row : commentRows) {
             out << "// " << row << "\n";
         }
@@ -471,15 +400,32 @@ void DeckLoader::saveToStream_DeckHeader(QTextStream &out, const DeckList *deckL
 void DeckLoader::saveToStream_DeckZone(QTextStream &out,
                                        const InnerDecklistNode *zoneNode,
                                        bool addComments,
-                                       bool addSetNameAndNumber)
+                                       bool addSetNameAndNumber,
+                                       const QString &boardZoneName)
 {
+    // Nested sub-zones keep their owning board's identity: the top-level call
+    // passes no board, so the zone's own name is used; recursive calls carry the
+    // owning board down so the sideboard marker survives sub-zone nesting.
+    const QString owningBoardZoneName = boardZoneName.isEmpty() ? zoneNode->getName() : boardZoneName;
+
     // group cards by card type and count the subtotals
     QMultiMap<QString, DecklistCardNode *> cardsByType;
     QMap<QString, int> cardTotalByType;
     int cardTotal = 0;
+    QList<const InnerDecklistNode *> subZones;
 
     for (int j = 0; j < zoneNode->size(); j++) {
         auto *card = dynamic_cast<DecklistCardNode *>(zoneNode->at(j));
+        if (!card) {
+            // Cards collected in nested sub-zones are exported by recursion so
+            // they don't end up invisible in the plain text output. They are
+            // deferred until after this zone's own header and cards so they read
+            // as part of this zone's block.
+            if (auto *subZone = dynamic_cast<const InnerDecklistNode *>(zoneNode->at(j))) {
+                subZones.append(subZone);
+            }
+            continue;
+        }
 
         CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(card->getName());
         QString cardType = info ? info->getMainCardType() : "unknown";
@@ -507,25 +453,30 @@ void DeckLoader::saveToStream_DeckZone(QTextStream &out,
 
         QList<DecklistCardNode *> cards = cardsByType.values(cardType);
 
-        saveToStream_DeckZoneCards(out, zoneNode, cards, addComments, addSetNameAndNumber);
+        saveToStream_DeckZoneCards(out, cards, addComments, addSetNameAndNumber, owningBoardZoneName);
 
         if (addComments) {
             out << "\n";
         }
     }
+
+    // Nested sub-zones come last, after the parent's own header and cards.
+    for (const auto *subZone : subZones) {
+        saveToStream_DeckZone(out, subZone, addComments, addSetNameAndNumber, owningBoardZoneName);
+    }
 }
 
 void DeckLoader::saveToStream_DeckZoneCards(QTextStream &out,
-                                            const InnerDecklistNode *zoneNode,
                                             QList<DecklistCardNode *> cards,
                                             bool addComments,
-                                            bool addSetNameAndNumber)
+                                            bool addSetNameAndNumber,
+                                            const QString &boardZoneName)
 {
     // QMultiMap sorts values in reverse order
     for (int i = cards.size() - 1; i >= 0; --i) {
         DecklistCardNode *card = cards[i];
 
-        if (zoneNode->getName() == DECK_ZONE_SIDE && addComments) {
+        if (boardZoneName == DECK_ZONE_SIDE && addComments) {
             out << "SB: ";
         }
 
@@ -537,8 +488,7 @@ void DeckLoader::saveToStream_DeckZoneCards(QTextStream &out,
         }
         if (addSetNameAndNumber) {
             if (!card->getCardSetShortName().isNull() && !card->getCardSetShortName().isEmpty()) {
-                out << " "
-                    << "(" << card->getCardSetShortName() << ")";
+                out << " " << "(" << card->getCardSetShortName() << ")";
             }
             if (!card->getCardCollectorNumber().isNull()) {
                 out << " " << card->getCardCollectorNumber();
@@ -548,83 +498,85 @@ void DeckLoader::saveToStream_DeckZoneCards(QTextStream &out,
     }
 }
 
-bool DeckLoader::convertToCockatriceFormat(QString fileName)
+bool DeckLoader::convertToCockatriceFormat(LoadedDeck &deck)
 {
+    QString fileName = deck.lastLoadInfo.fileName;
+    if (fileName.isEmpty()) {
+        return false;
+    }
+
+    // Determine the format before touching any file, so an already-converted or
+    // unsupported deck never truncates or deletes anything.
+    switch (DeckFileFormat::getFormatFromName(fileName)) {
+        case DeckFileFormat::PlainText:
+            break;
+        case DeckFileFormat::Cockatrice:
+            qCInfo(DeckLoaderLog) << "File is already in Cockatrice format. No conversion needed.";
+            return true;
+        default:
+            qCWarning(DeckLoaderLog) << "Unsupported file format for conversion:" << fileName;
+            return false;
+    }
+
     // Change the file extension to .cod
     QFileInfo fileInfo(fileName);
     QString newFileName = QDir::toNativeSeparators(fileInfo.path() + "/" + fileInfo.completeBaseName() + ".cod");
 
-    // Open the new file for writing
-    QFile file(newFileName);
+    // Use QSaveFile so a failed write (e.g. a full disk) cannot leave a 0-byte .cod
+    // behind and then delete the original deck.
+    QSaveFile file(newFileName);
     if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
         qCWarning(DeckLoaderLog) << "Failed to open file for writing:" << newFileName;
         return false;
     }
 
-    bool result = false;
-
-    // Perform file modifications based on the detected format
-    switch (getFormatFromName(fileName)) {
-        case PlainTextFormat:
-            // Save in Cockatrice's native format
-            result = deckList->saveToFile_Native(&file);
-            break;
-        case CockatriceFormat:
-            qCInfo(DeckLoaderLog) << "File is already in Cockatrice format. No conversion needed.";
-            result = true;
-            break;
-        default:
-            qCWarning(DeckLoaderLog) << "Unsupported file format for conversion:" << fileName;
-            result = false;
-            break;
+    if (!deck.deckList.saveToFile_Native(&file)) {
+        file.cancelWriting();
+        qCWarning(DeckLoaderLog) << "Failed to serialize deck for file:" << newFileName;
+        return false;
     }
 
-    file.close();
-
-    // Delete the old file if conversion was successful
-    if (result) {
-        if (!QFile::remove(fileName)) {
-            qCWarning(DeckLoaderLog) << "Failed to delete original file:" << fileName;
-        } else {
-            qCInfo(DeckLoaderLog) << "Original file deleted successfully:" << fileName;
-        }
-        lastLoadInfo = {
-            .fileName = newFileName,
-            .fileFormat = CockatriceFormat,
-        };
+    if (!file.commit()) {
+        qCWarning(DeckLoaderLog) << "Failed to convert deck to " << newFileName << ":" << file.errorString();
+        return false;
     }
 
-    return result;
+    // Conversion succeeded: delete the original file.
+    if (!QFile::remove(fileName)) {
+        qCWarning(DeckLoaderLog) << "Failed to delete original file:" << fileName;
+    } else {
+        qCInfo(DeckLoaderLog) << "Original file deleted successfully:" << fileName;
+    }
+    deck.lastLoadInfo = {
+        .fileName = newFileName,
+        .fileFormat = DeckFileFormat::Cockatrice,
+    };
+
+    return true;
 }
 
-QString DeckLoader::getCardZoneFromName(const QString &cardName, QString currentZoneName)
+void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode *node)
 {
-    CardInfoPtr card = CardDatabaseManager::query()->getCardInfo(cardName);
-
-    if (card && card->getIsToken()) {
-        return DECK_ZONE_TOKENS;
+    if (!node || node->isEmpty()) {
+        return;
     }
 
-    return currentZoneName;
-}
-
-QString DeckLoader::getCompleteCardName(const QString &cardName)
-{
-    if (CardDatabaseManager::getInstance()) {
-        ExactCard temp = CardDatabaseManager::query()->guessCard({cardName});
-        if (temp) {
-            return temp.getName();
-        }
-    }
-
-    return cardName;
-}
-
-void DeckLoader::printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node)
-{
     const int totalColumns = 2;
 
-    if (node->height() == 1) {
+    // Dispatch children by type instead of trusting a whole-node height: a deck
+    // node may hold direct cards and nested zones side by side (custom zones),
+    // and an empty node would previously crash on at(0).
+    QVector<const AbstractDecklistCardNode *> cards;
+    QVector<const InnerDecklistNode *> subZones;
+    for (int i = 0; i < node->size(); i++) {
+        if (auto *card = dynamic_cast<const AbstractDecklistCardNode *>(node->at(i))) {
+            cards.append(card);
+        } else if (auto *zone = dynamic_cast<const InnerDecklistNode *>(node->at(i))) {
+            subZones.append(zone);
+        }
+    }
+
+    if (!cards.isEmpty()) {
         QTextBlockFormat blockFormat;
         QTextCharFormat charFormat;
         charFormat.setFontPointSize(11);
@@ -635,9 +587,9 @@ void DeckLoader::printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node)
         tableFormat.setCellPadding(0);
         tableFormat.setCellSpacing(0);
         tableFormat.setBorder(0);
-        QTextTable *table = cursor->insertTable(node->size() + 1, totalColumns, tableFormat);
-        for (int i = 0; i < node->size(); i++) {
-            auto *card = dynamic_cast<AbstractDecklistCardNode *>(node->at(i));
+        QTextTable *table = cursor->insertTable(cards.size() + 1, totalColumns, tableFormat);
+        for (int i = 0; i < cards.size(); i++) {
+            const AbstractDecklistCardNode *card = cards[i];
 
             QTextCharFormat cellCharFormat;
             cellCharFormat.setFontPointSize(9);
@@ -652,7 +604,13 @@ void DeckLoader::printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node)
             cellCursor = cell.firstCursorPosition();
             cellCursor.insertText(card->getName());
         }
-    } else if (node->height() == 2) {
+    }
+
+    for (const InnerDecklistNode *subZone : subZones) {
+        if (subZone->isEmpty()) {
+            continue;
+        }
+
         QTextBlockFormat blockFormat;
         QTextCharFormat charFormat;
         charFormat.setFontPointSize(14);
@@ -671,16 +629,14 @@ void DeckLoader::printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node)
         tableFormat.setColumnWidthConstraints(constraints);
 
         QTextTable *table = cursor->insertTable(1, totalColumns, tableFormat);
-        for (int i = 0; i < node->size(); i++) {
-            QTextCursor cellCursor = table->cellAt(0, (i * totalColumns) / node->size()).lastCursorPosition();
-            printDeckListNode(&cellCursor, dynamic_cast<InnerDecklistNode *>(node->at(i)));
-        }
+        QTextCursor cellCursor = table->cellAt(0, 0).firstCursorPosition();
+        printDeckListNode(&cellCursor, subZone);
     }
 
     cursor->movePosition(QTextCursor::End);
 }
 
-void DeckLoader::printDeckList(QPrinter *printer, const DeckList *deckList)
+void DeckLoader::printDeckList(QPrinter *printer, const DeckList &deckList)
 {
     QTextDocument doc;
 
@@ -696,19 +652,18 @@ void DeckLoader::printDeckList(QPrinter *printer, const DeckList *deckList)
     headerCharFormat.setFontWeight(QFont::Bold);
 
     cursor.insertBlock(headerBlockFormat, headerCharFormat);
-    cursor.insertText(deckList->getName());
+    cursor.insertText(deckList.getName());
 
     headerCharFormat.setFontPointSize(12);
     cursor.insertBlock(headerBlockFormat, headerCharFormat);
-    cursor.insertText(deckList->getComments());
+    cursor.insertText(deckList.getComments());
     cursor.insertBlock(headerBlockFormat, headerCharFormat);
 
-    for (int i = 0; i < deckList->getRoot()->size(); i++) {
+    for (auto zoneNode : deckList.getZoneNodes()) {
         cursor.insertHtml("<br><img src=theme:hr.jpg>");
-        // cursor.insertHtml("<hr>");
         cursor.insertBlock(headerBlockFormat, headerCharFormat);
 
-        printDeckListNode(&cursor, dynamic_cast<InnerDecklistNode *>(deckList->getRoot()->at(i)));
+        printDeckListNode(&cursor, zoneNode);
     }
 
     doc.print(printer);
diff --git a/cockatrice/src/interface/deck_loader/deck_loader.h b/cockatrice/src/interface/deck_loader/deck_loader.h
index 00136e6bb..16402b14b 100644
--- a/cockatrice/src/interface/deck_loader/deck_loader.h
+++ b/cockatrice/src/interface/deck_loader/deck_loader.h
@@ -1,48 +1,39 @@
 /**
  * @file deck_loader.h
  * @ingroup ImportExport
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DECK_LOADER_H
 #define DECK_LOADER_H
 
+#include "deck_file_format.h"
+#include "loaded_deck.h"
+
 #include <QLoggingCategory>
-#include <QPrinter>
-#include <QTextCursor>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <optional>
+#include <qtmetamacros.h>
 
-inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader")
+class DeckList;
+class DecklistCardNode;
+class InnerDecklistNode;
+class QPrinter;
+class QTextCursor;
+class QTextStream;
+template <typename T> class QList;
 
-    class DeckLoader : public QObject
+inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader");
+
+class DeckLoader : public QObject
 {
     Q_OBJECT
 signals:
-    void deckLoaded();
     void loadFinished(bool success);
 
 public:
-    enum FileFormat
-    {
-        PlainTextFormat,
-        CockatriceFormat
-    };
-
-    /**
-     * @brief Information about where the deck was loaded from.
-     *
-     * For local decks, the remoteDeckId field will always be -1.
-     * For remote decks, fileName will be empty and fileFormat will always be CockatriceFormat
-     */
-    struct LoadInfo
-    {
-        static constexpr int NON_REMOTE_ID = -1;
-
-        QString fileName = "";
-        FileFormat fileFormat = CockatriceFormat;
-        int remoteDeckId = NON_REMOTE_ID;
-    };
-
     /**
      * Supported file extensions for decklist files
      */
@@ -60,47 +51,85 @@ public:
     };
 
 private:
-    DeckList *deckList;
-    LoadInfo lastLoadInfo;
+    LoadedDeck loadedDeck;
 
 public:
     DeckLoader(QObject *parent);
-    DeckLoader(QObject *parent, DeckList *_deckList);
     DeckLoader(const DeckLoader &) = delete;
     DeckLoader &operator=(const DeckLoader &) = delete;
 
-    const LoadInfo &getLastLoadInfo() const
-    {
-        return lastLoadInfo;
-    }
-
-    void setLastLoadInfo(const LoadInfo &info)
-    {
-        lastLoadInfo = info;
-    }
-
     [[nodiscard]] bool hasNotBeenLoaded() const
     {
-        return lastLoadInfo.fileName.isEmpty() && lastLoadInfo.remoteDeckId == LoadInfo::NON_REMOTE_ID;
+        return loadedDeck.lastLoadInfo.isEmpty();
     }
 
-    static void clearSetNamesAndNumbers(const DeckList *deckList);
-    static FileFormat getFormatFromName(const QString &fileName);
+    /**
+     * @brief Asynchronously loads a deck from a local file into this DeckLoader.
+     * The `loadFinished` signal will be emitted when the load finishes.
+     * Once the loading finishes, the deck can be accessed with `getDeck`
+     * @param fileName The file to load
+     * @param fmt The format of the file to load
+     * @param userRequest Whether the load was manually requested by the user, instead of being done in the background.
+     */
+    void loadFromFileAsync(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest);
 
-    bool loadFromFile(const QString &fileName, FileFormat fmt, bool userRequest = false);
-    bool loadFromFileAsync(const QString &fileName, FileFormat fmt, bool userRequest);
-    bool loadFromRemote(const QString &nativeString, int remoteDeckId);
-    bool saveToFile(const QString &fileName, FileFormat fmt);
-    bool updateLastLoadedTimestamp(const QString &fileName, FileFormat fmt);
+    /**
+     * @brief Loads the file that the lastLoadInfo currently points to into this instance.
+     * No-ops if the lastLoadInfo is missing the required info or the load fails.
+     * @return Whether the loaded succeeded.
+     */
+    bool reload();
 
-    static QString exportDeckToDecklist(const DeckList *deckList, DecklistWebsite website);
+    /**
+     * @brief Loads a deck from a local file.
+     * @param fileName The file to load
+     * @param fmt The format of the file to load
+     * @param userRequest Whether the load was manually requested by the user, instead of being done in the background.
+     * @return An optional containing the LoadedDeck, or empty if the load failed.
+     */
+    static std::optional<LoadedDeck>
+    loadFromFile(const QString &fileName, DeckFileFormat::Format fmt, bool userRequest = false);
 
-    static void setProviderIdToPreferredPrinting(const DeckList *deckList);
-    static void resolveSetNameAndNumberToProviderID(const DeckList *deckList);
+    /**
+     * @brief Loads a deck from the response of a remote deck request
+     * @param nativeString The deck string, in cod format
+     * @param remoteDeckId The remote deck id
+     * @return An optional containing the LoadedDeck, or empty if the load failed.
+     */
+    static std::optional<LoadedDeck> loadFromRemote(const QString &nativeString, int remoteDeckId);
 
-    static void saveToClipboard(const DeckList *deckList, bool addComments = true, bool addSetNameAndNumber = true);
+    /**
+     * @brief Saves a DeckList to a local file.
+     * @param deck The DeckList
+     * @param fileName The file to write to
+     * @param fmt The deck file format to use
+     * @return An optional containing the LoadInfo for the new file, or empty if the save failed.
+     */
+    static std::optional<LoadedDeck::LoadInfo>
+    saveToFile(const DeckList &deck, const QString &fileName, DeckFileFormat::Format fmt);
+
+    /**
+     * @brief Saves a LoadedDeck to a local file.
+     * Uses the lastLoadInfo in the LoadedDeck to determine where to save to.
+     * @param deck The LoadedDeck to save. Should have valid lastLoadInfo.
+     * @return Whether the save succeeded.
+     */
+    static bool saveToFile(const LoadedDeck &deck);
+
+    /**
+     * @brief Saves a LoadedDeck to a new local file.
+     * @param deck The LoadedDeck to save. Will update the lastLoadInfo.
+     * @param fileName The file to write to
+     * @param fmt The deck file format to use
+     * @return Whether the save succeeded.
+     */
+    static bool saveToNewFile(LoadedDeck &deck, const QString &fileName, DeckFileFormat::Format fmt);
+
+    static QString exportDeckToDecklist(const DeckList &deckList, DecklistWebsite website);
+
+    static void saveToClipboard(const DeckList &deckList, bool addComments = true, bool addSetNameAndNumber = true);
     static bool saveToStream_Plain(QTextStream &out,
-                                   const DeckList *deckList,
+                                   const DeckList &deckList,
                                    bool addComments = true,
                                    bool addSetNameAndNumber = true);
 
@@ -109,31 +138,44 @@ public:
      * @param printer The printer to render the decklist to.
      * @param deckList
      */
-    static void printDeckList(QPrinter *printer, const DeckList *deckList);
+    static void printDeckList(QPrinter *printer, const DeckList &deckList);
 
-    bool convertToCockatriceFormat(QString fileName);
+    /**
+     * Converts the given deck's file to the Cockatrice file format.
+     * Uses the lastLoadInfo in the LoadedDeck to determine the current name of the file and where to save to.
+     * @param deck The deck to convert. Should have valid lastLoadInfo. Will update the lastLoadInfo.
+     * @return Whether the conversion succeeded.
+     */
+    static bool convertToCockatriceFormat(LoadedDeck &deck);
 
-    DeckList *getDeckList()
+    LoadedDeck &getDeck()
     {
-        return deckList;
+        return loadedDeck;
+    }
+    const LoadedDeck &getDeck() const
+    {
+        return loadedDeck;
+    }
+    void setDeck(const LoadedDeck &deck)
+    {
+        loadedDeck = deck;
     }
 
 private:
-    static void printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node);
-    static void saveToStream_DeckHeader(QTextStream &out, const DeckList *deckList);
+    static bool updateLastLoadedTimestamp(LoadedDeck &deck);
+    static void printDeckListNode(QTextCursor *cursor, const InnerDecklistNode *node);
+    static void saveToStream_DeckHeader(QTextStream &out, const DeckList &deckList);
 
     static void saveToStream_DeckZone(QTextStream &out,
                                       const InnerDecklistNode *zoneNode,
                                       bool addComments = true,
-                                      bool addSetNameAndNumber = true);
+                                      bool addSetNameAndNumber = true,
+                                      const QString &boardZoneName = QString());
     static void saveToStream_DeckZoneCards(QTextStream &out,
-                                           const InnerDecklistNode *zoneNode,
                                            QList<DecklistCardNode *> cards,
                                            bool addComments = true,
-                                           bool addSetNameAndNumber = true);
-
-    [[nodiscard]] static QString getCardZoneFromName(const QString &cardName, QString currentZoneName);
-    [[nodiscard]] static QString getCompleteCardName(const QString &cardName);
+                                           bool addSetNameAndNumber = true,
+                                           const QString &boardZoneName = QString());
 };
 
 #endif
diff --git a/cockatrice/src/interface/deck_loader/loaded_deck.cpp b/cockatrice/src/interface/deck_loader/loaded_deck.cpp
new file mode 100644
index 000000000..633545718
--- /dev/null
+++ b/cockatrice/src/interface/deck_loader/loaded_deck.cpp
@@ -0,0 +1,11 @@
+#include "loaded_deck.h"
+
+bool LoadedDeck::LoadInfo::isEmpty() const
+{
+    return fileName.isEmpty() && remoteDeckId == NON_REMOTE_ID;
+}
+
+bool LoadedDeck::isEmpty() const
+{
+    return deckList.isEmpty() && lastLoadInfo.isEmpty();
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/deck_loader/loaded_deck.h b/cockatrice/src/interface/deck_loader/loaded_deck.h
new file mode 100644
index 000000000..e07cd0db6
--- /dev/null
+++ b/cockatrice/src/interface/deck_loader/loaded_deck.h
@@ -0,0 +1,39 @@
+#ifndef COCKATRICE_LOADED_DECK_H
+#define COCKATRICE_LOADED_DECK_H
+
+#include "deck_file_format.h"
+#include "libcockatrice/deck_list/deck_list.h"
+
+#include <QString>
+
+/**
+ * @brief Represents a deck that was loaded from somewhere.
+ * Contains the DeckList itself, as well as info about where it was loaded from.
+ */
+struct LoadedDeck
+{
+
+    /**
+     * @brief Information about where the deck was loaded from.
+     *
+     * For local decks, the remoteDeckId field will always be -1.
+     * For remote decks, fileName will be empty and fileFormat will always be CockatriceFormat
+     */
+    struct LoadInfo
+    {
+        static constexpr int NON_REMOTE_ID = -1;
+
+        QString fileName = "";
+        DeckFileFormat::Format fileFormat = DeckFileFormat::Cockatrice;
+        int remoteDeckId = NON_REMOTE_ID;
+
+        bool isEmpty() const;
+    };
+
+    DeckList deckList;          ///< The decklist itself
+    LoadInfo lastLoadInfo = {}; ///< info about where the deck was loaded from
+
+    bool isEmpty() const;
+};
+
+#endif // COCKATRICE_LOADED_DECK_H
diff --git a/cockatrice/src/interface/intents/contexts/context_connect_to_server.h b/cockatrice/src/interface/intents/contexts/context_connect_to_server.h
new file mode 100644
index 000000000..c7c40b261
--- /dev/null
+++ b/cockatrice/src/interface/intents/contexts/context_connect_to_server.h
@@ -0,0 +1,14 @@
+#ifndef COCKATRICE_CONTEXT_CONNECT_TO_SERVER_H
+#define COCKATRICE_CONTEXT_CONNECT_TO_SERVER_H
+
+#include <QString>
+
+struct ContextConnectToServer
+{
+    QString hostname;
+    QString port;
+    QString username;
+    QString password;
+};
+
+#endif // COCKATRICE_CONTEXT_CONNECT_TO_SERVER_H
diff --git a/cockatrice/src/interface/intents/contexts/context_join_game.h b/cockatrice/src/interface/intents/contexts/context_join_game.h
new file mode 100644
index 000000000..2e5a88ea2
--- /dev/null
+++ b/cockatrice/src/interface/intents/contexts/context_join_game.h
@@ -0,0 +1,12 @@
+#ifndef COCKATRICE_CONTEXT_JOIN_GAME_H
+#define COCKATRICE_CONTEXT_JOIN_GAME_H
+#include "context_join_room.h"
+
+struct ContextJoinGame
+{
+    ContextJoinRoom roomContext;
+    int gameId;
+    bool asSpectator = false;
+};
+
+#endif // COCKATRICE_CONTEXT_JOIN_GAME_H
diff --git a/cockatrice/src/interface/intents/contexts/context_join_room.h b/cockatrice/src/interface/intents/contexts/context_join_room.h
new file mode 100644
index 000000000..23ae05e81
--- /dev/null
+++ b/cockatrice/src/interface/intents/contexts/context_join_room.h
@@ -0,0 +1,14 @@
+#ifndef COCKATRICE_CONTEXT_JOIN_ROOM_H
+#define COCKATRICE_CONTEXT_JOIN_ROOM_H
+
+#include "context_connect_to_server.h"
+
+#include <QString>
+
+struct ContextJoinRoom
+{
+    ContextConnectToServer serverContext;
+    int roomId;
+};
+
+#endif // COCKATRICE_CONTEXT_JOIN_ROOM_H
diff --git a/cockatrice/src/interface/intents/contexts/context_open_deck.h b/cockatrice/src/interface/intents/contexts/context_open_deck.h
new file mode 100644
index 000000000..03dca088e
--- /dev/null
+++ b/cockatrice/src/interface/intents/contexts/context_open_deck.h
@@ -0,0 +1,14 @@
+#ifndef COCKATRICE_CONTEXT_OPEN_DECK_H
+#define COCKATRICE_CONTEXT_OPEN_DECK_H
+
+#include "context_connect_to_server.h"
+
+#include <QString>
+
+struct ContextOpenDeck
+{
+    ContextConnectToServer serverContext;
+    QString shareToken;
+};
+
+#endif // COCKATRICE_CONTEXT_OPEN_DECK_H
diff --git a/cockatrice/src/interface/intents/intent.cpp b/cockatrice/src/interface/intents/intent.cpp
new file mode 100644
index 000000000..db0d13b2c
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent.cpp
@@ -0,0 +1,58 @@
+#include "intent.h"
+
+Intent::Intent(QObject *parent) : QObject(parent)
+{
+    // An intent is done as soon as it reports success, failure, or cancellation.
+    // Deleting it also tears down its dependency chain and disconnects any signal wiring.
+    connect(this, &Intent::finished, this, &QObject::deleteLater);
+    connect(this, &Intent::failed, this, &QObject::deleteLater);
+    connect(this, &Intent::cancelled, this, &QObject::deleteLater);
+}
+
+Intent::~Intent() = default;
+
+void Intent::execute()
+{
+    if (checkPrecondition()) {
+        onPreconditionSatisfied();
+    } else {
+        onPreconditionNotSatisfied();
+    }
+}
+
+void Intent::runDependency(Intent *dependency)
+{
+    dependency->setParent(this);
+    connect(dependency, &Intent::finished, this, [this]() {
+        // Re-check after dependency finishes
+        this->execute();
+    });
+    connect(dependency, &Intent::failed, this, &Intent::failed);
+    connect(dependency, &Intent::cancelled, this, &Intent::cancelled);
+
+    dependency->execute();
+}
+
+void Intent::emitFinished()
+{
+    if (!completed) {
+        completed = true;
+        emit finished();
+    }
+}
+
+void Intent::emitFailed(const QString &reason)
+{
+    if (!completed) {
+        completed = true;
+        emit failed(reason);
+    }
+}
+
+void Intent::emitCancelled()
+{
+    if (!completed) {
+        completed = true;
+        emit cancelled();
+    }
+}
diff --git a/cockatrice/src/interface/intents/intent.h b/cockatrice/src/interface/intents/intent.h
new file mode 100644
index 000000000..ad8d4b5af
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent.h
@@ -0,0 +1,41 @@
+#ifndef COCKATRICE_INTENT_H
+#define COCKATRICE_INTENT_H
+
+#include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
+
+class Intent : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit Intent(QObject *parent = nullptr);
+    ~Intent() override;
+
+    void execute();
+
+signals:
+    void finished();
+    void failed(QString reason);
+    void cancelled();
+
+protected:
+    // --- Subclasses must implement these ---
+    virtual bool checkPrecondition() const = 0;
+    virtual void onPreconditionSatisfied() = 0;
+    virtual void onPreconditionNotSatisfied() = 0;
+
+    // Helper to chain another intent
+    void runDependency(Intent *dependency);
+
+    // Emit the outcome exactly once; ignore late signals after the intent is done.
+    void emitFinished();
+    void emitFailed(const QString &reason);
+    void emitCancelled();
+
+private:
+    bool completed = false;
+};
+
+#endif // COCKATRICE_INTENT_H
diff --git a/cockatrice/src/interface/intents/intent_connect_to_server.cpp b/cockatrice/src/interface/intents/intent_connect_to_server.cpp
new file mode 100644
index 000000000..42ddc97cc
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_connect_to_server.cpp
@@ -0,0 +1,52 @@
+#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)
+{
+}
+
+bool IntentConnectToServer::checkPrecondition() const
+{
+    return remoteClient->getStatus() == ClientStatus::StatusDisconnected;
+}
+
+void IntentConnectToServer::onPreconditionSatisfied()
+{
+    remoteClient->connectToServer(context->hostname, context->port.toUInt(), context->username, context->password);
+    connect(remoteClient, &RemoteClient::statusChanged, this, &IntentConnectToServer::onStatusChanged);
+    connect(remoteClient, &RemoteClient::socketError, this, &IntentConnectToServer::onSocketError);
+    connect(
+        remoteClient, &RemoteClient::loginError, this,
+        [this](Response::ResponseCode, const QString &reason, quint32, const QList<QString> &) { emitFailed(reason); });
+
+    QTimer::singleShot(15000, this, [this]() {
+        emitFailed(tr("Timed out while connecting to %1:%2").arg(context->hostname, context->port));
+    });
+}
+
+void IntentConnectToServer::onPreconditionNotSatisfied()
+{
+    runDependency(new IntentDisconnectFromServer(remoteClient));
+}
+
+void IntentConnectToServer::onStatusChanged(ClientStatus status)
+{
+    if (status == ClientStatus::StatusLoggedIn) {
+        emitFinished();
+    }
+}
+
+void IntentConnectToServer::onSocketError(const QString &errorString)
+{
+    emitFailed(tr("Failed to connect to %1:%2: %3").arg(context->hostname, context->port, errorString));
+}
diff --git a/cockatrice/src/interface/intents/intent_connect_to_server.h b/cockatrice/src/interface/intents/intent_connect_to_server.h
new file mode 100644
index 000000000..50d7f088b
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_connect_to_server.h
@@ -0,0 +1,34 @@
+#ifndef COCKATRICE_INTENT_CONNECT_TO_SERVER_H
+#define COCKATRICE_INTENT_CONNECT_TO_SERVER_H
+
+#include "abstract_client.h"
+#include "intent.h"
+
+#include <QString>
+#include <qtmetamacros.h>
+
+class RemoteClient;
+struct ContextConnectToServer;
+
+class IntentConnectToServer : public Intent
+{
+    Q_OBJECT
+
+public:
+    IntentConnectToServer(RemoteClient *_remoteClient, ContextConnectToServer *_context);
+
+protected:
+    bool checkPrecondition() const override;
+    void onPreconditionSatisfied() override;
+    void onPreconditionNotSatisfied() override;
+
+private:
+    RemoteClient *remoteClient;
+    ContextConnectToServer *context;
+
+private slots:
+    void onStatusChanged(ClientStatus status);
+    void onSocketError(const QString &errorString);
+};
+
+#endif // COCKATRICE_INTENT_CONNECT_TO_SERVER_H
diff --git a/cockatrice/src/interface/intents/intent_disconnect_from_server.cpp b/cockatrice/src/interface/intents/intent_disconnect_from_server.cpp
new file mode 100644
index 000000000..e865c4a2b
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_disconnect_from_server.cpp
@@ -0,0 +1,31 @@
+#include "intent_disconnect_from_server.h"
+
+#include "remote_client.h"
+
+IntentDisconnectFromServer::IntentDisconnectFromServer(RemoteClient *_remoteClient)
+    : Intent(), remoteClient(_remoteClient)
+{
+}
+
+bool IntentDisconnectFromServer::checkPrecondition() const
+{
+    return remoteClient->getStatus() == ClientStatus::StatusDisconnected;
+}
+
+void IntentDisconnectFromServer::onPreconditionSatisfied()
+{
+    emitFinished();
+}
+
+void IntentDisconnectFromServer::onPreconditionNotSatisfied()
+{
+    connect(remoteClient, &RemoteClient::statusChanged, this, &IntentDisconnectFromServer::onStatusChanged);
+    remoteClient->disconnectFromServer();
+}
+
+void IntentDisconnectFromServer::onStatusChanged(ClientStatus status)
+{
+    if (status == ClientStatus::StatusDisconnected) {
+        emitFinished();
+    }
+}
diff --git a/cockatrice/src/interface/intents/intent_disconnect_from_server.h b/cockatrice/src/interface/intents/intent_disconnect_from_server.h
new file mode 100644
index 000000000..5425e973b
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_disconnect_from_server.h
@@ -0,0 +1,30 @@
+#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;
+
+class IntentDisconnectFromServer : public Intent
+{
+    Q_OBJECT
+
+public:
+    IntentDisconnectFromServer(RemoteClient *_remoteClient);
+
+protected:
+    bool checkPrecondition() const override;
+    void onPreconditionSatisfied() override;
+    void onPreconditionNotSatisfied() override;
+
+private:
+    RemoteClient *remoteClient;
+
+private slots:
+    void onStatusChanged(ClientStatus status);
+};
+
+#endif // COCKATRICE_INTENT_DISCONNECT_FROM_SERVER_H
diff --git a/cockatrice/src/interface/intents/intent_join_server_game.cpp b/cockatrice/src/interface/intents/intent_join_server_game.cpp
new file mode 100644
index 000000000..52e02b276
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_join_server_game.cpp
@@ -0,0 +1,86 @@
+#include "intent_join_server_game.h"
+
+#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,
+                                           std::unique_ptr<ContextJoinGame> _context)
+    : Intent(), tabSupervisor(_tabSupervisor), remoteClient(_remoteClient), context(_context.release())
+{
+}
+
+bool IntentJoinServerGame::checkPrecondition() const
+{
+    if (remoteClient->getStatus() != ClientStatus::StatusLoggedIn) {
+        return false;
+    }
+    // serverName()/serverPort() reflect the server the client was configured
+    // to connect to, which may differ from the actual TCP peer (e.g. when
+    // connecting through a proxy), so compare those configured values. A link
+    // naming the same host on another port is a different server and must not
+    // reuse the session there.
+    if (remoteClient->serverName().compare(context->roomContext.serverContext.hostname, Qt::CaseInsensitive) != 0) {
+        return false;
+    }
+    if (QString::number(remoteClient->serverPort()) != context->roomContext.serverContext.port) {
+        return false;
+    }
+
+    if (!tabSupervisor->getRoomTabs().contains(context->roomContext.roomId)) {
+        return false;
+    }
+
+    return true;
+}
+
+void IntentJoinServerGame::onPreconditionSatisfied()
+{
+    TabRoom *room = tabSupervisor->getRoomTabs().value(context->roomContext.roomId);
+    if (!tryJoinGame(room)) {
+        waitForGame(room);
+    }
+}
+
+void IntentJoinServerGame::onPreconditionNotSatisfied()
+{
+    runDependency(new IntentJoinServerRoom(tabSupervisor, remoteClient, &context->roomContext));
+}
+
+bool IntentJoinServerGame::tryJoinGame(TabRoom *room)
+{
+    if (!room) {
+        return false;
+    }
+
+    if (room->getGameSelector()->joinGameById(context->gameId, context->asSpectator)) {
+        emitFinished();
+        return true;
+    }
+
+    return false;
+}
+
+void IntentJoinServerGame::waitForGame(TabRoom *room)
+{
+    connect(room, &TabRoom::gameListUpdated, this, [this]() {
+        TabRoom *updatedRoom = tabSupervisor->getRoomTabs().value(context->roomContext.roomId);
+        if (updatedRoom) {
+            tryJoinGame(updatedRoom);
+        }
+    });
+
+    QTimer::singleShot(15000, this, [this]() { emitFailed(tr("Game %1 not found in the room").arg(context->gameId)); });
+}
diff --git a/cockatrice/src/interface/intents/intent_join_server_game.h b/cockatrice/src/interface/intents/intent_join_server_game.h
new file mode 100644
index 000000000..5abb31fc5
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_join_server_game.h
@@ -0,0 +1,38 @@
+#ifndef COCKATRICE_INTENT_JOIN_SERVER_GAME_H
+#define COCKATRICE_INTENT_JOIN_SERVER_GAME_H
+
+#include "contexts/context_join_game.h"
+#include "intent.h"
+
+#include <QScopedPointer>
+#include <memory>
+#include <qtmetamacros.h>
+
+class TabRoom;
+class TabSupervisor;
+class RemoteClient;
+
+class IntentJoinServerGame : public Intent
+{
+    Q_OBJECT
+
+public:
+    IntentJoinServerGame(TabSupervisor *_tabSupervisor,
+                         RemoteClient *_remoteClient,
+                         std::unique_ptr<ContextJoinGame> _context);
+
+protected:
+    bool checkPrecondition() const override;
+    void onPreconditionSatisfied() override;
+    void onPreconditionNotSatisfied() override;
+
+private:
+    bool tryJoinGame(TabRoom *room);
+    void waitForGame(TabRoom *room);
+
+    TabSupervisor *tabSupervisor;
+    RemoteClient *remoteClient;
+    QScopedPointer<ContextJoinGame> context;
+};
+
+#endif // COCKATRICE_INTENT_JOIN_SERVER_GAME_H
diff --git a/cockatrice/src/interface/intents/intent_join_server_room.cpp b/cockatrice/src/interface/intents/intent_join_server_room.cpp
new file mode 100644
index 000000000..24349cadf
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_join_server_room.cpp
@@ -0,0 +1,81 @@
+#include "intent_join_server_room.h"
+
+#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>
+
+IntentJoinServerRoom::IntentJoinServerRoom(TabSupervisor *_tabSupervisor,
+                                           RemoteClient *_remoteClient,
+                                           ContextJoinRoom *_context)
+    : Intent(), tabSupervisor(_tabSupervisor), remoteClient(_remoteClient), context(_context)
+{
+}
+
+bool IntentJoinServerRoom::checkPrecondition() const
+{
+    if (remoteClient->getStatus() != ClientStatus::StatusLoggedIn) {
+        return false;
+    }
+    // peerPort() reflects the actual TCP peer, which may differ from the
+    // configured server port (e.g. when connecting through a proxy), so only
+    // the hostname is compared here.
+    if (remoteClient->peerName() != context->serverContext.hostname) {
+        return false;
+    }
+    if (QString::number(remoteClient->peerPort()) != context->serverContext.port) {
+        return false;
+    }
+
+    return true;
+}
+
+void IntentJoinServerRoom::onPreconditionSatisfied()
+{
+    if (tabSupervisor->getRoomTabs().contains(context->roomId)) {
+        tabSupervisor->setCurrentWidget(tabSupervisor->getRoomTabs().value(context->roomId));
+        emitFinished();
+        return;
+    }
+
+    TabServer *tabServer = tabSupervisor->getTabServer();
+    if (!tabServer) {
+        tabSupervisor->openTabServer();
+        tabServer = tabSupervisor->getTabServer();
+    }
+    if (!tabServer) {
+        emitFailed(tr("No server tab available"));
+        return;
+    }
+
+    const int roomId = context->roomId;
+    tabServer->joinRoom(roomId, true);
+    connect(tabServer, &TabServer::roomJoined, this, [this, roomId](const ServerInfo_Room &info, bool) {
+        if (info.room_id() == roomId) {
+            emitFinished();
+        }
+    });
+    connect(tabServer, &TabServer::roomJoinFailed, this, [this, roomId](int failedRoomId) {
+        if (failedRoomId == roomId) {
+            emitFailed(tr("Failed to join the server room %1").arg(roomId));
+        }
+    });
+
+    QTimer::singleShot(15000, this,
+                       [this, roomId]() { emitFailed(tr("Timed out while joining the server room %1").arg(roomId)); });
+}
+
+void IntentJoinServerRoom::onPreconditionNotSatisfied()
+{
+    runDependency(new IntentConnectToServer(remoteClient, &context->serverContext));
+}
diff --git a/cockatrice/src/interface/intents/intent_join_server_room.h b/cockatrice/src/interface/intents/intent_join_server_room.h
new file mode 100644
index 000000000..b4febae7b
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_join_server_room.h
@@ -0,0 +1,30 @@
+#ifndef COCKATRICE_INTENT_JOIN_SERVER_ROOM_H
+#define COCKATRICE_INTENT_JOIN_SERVER_ROOM_H
+
+#include "intent.h"
+
+#include <qtmetamacros.h>
+
+class TabSupervisor;
+class RemoteClient;
+struct ContextJoinRoom;
+
+class IntentJoinServerRoom : public Intent
+{
+    Q_OBJECT
+
+public:
+    IntentJoinServerRoom(TabSupervisor *_tabSupervisor, RemoteClient *_remoteClient, ContextJoinRoom *_context);
+
+protected:
+    bool checkPrecondition() const override;
+    void onPreconditionSatisfied() override;
+    void onPreconditionNotSatisfied() override;
+
+private:
+    TabSupervisor *tabSupervisor;
+    RemoteClient *remoteClient;
+    ContextJoinRoom *context;
+};
+
+#endif // COCKATRICE_INTENT_JOIN_SERVER_ROOM_H
diff --git a/cockatrice/src/interface/intents/intent_login.cpp b/cockatrice/src/interface/intents/intent_login.cpp
new file mode 100644
index 000000000..0d8390015
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_login.cpp
@@ -0,0 +1,83 @@
+#include "intent_login.h"
+
+#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)
+    : Intent(), context(_context), promptForMissingCredentials(_promptForMissingCredentials)
+{
+}
+
+bool IntentGetLoginCredentials::checkPrecondition() const
+{
+    ServersSettings &servers = SettingsCache::instance().servers();
+    return servers.hasLoginData(context->hostname, context->port);
+}
+
+void IntentGetLoginCredentials::onPreconditionSatisfied()
+{
+    ServersSettings &servers = SettingsCache::instance().servers();
+    const int index = servers.findServerIndex(context->hostname, context->port);
+
+    if (index >= 0) {
+        context->username = servers.getValue(QString("username%1").arg(index), "server", "server_details").toString();
+        context->password = servers.getValue(QString("password%1").arg(index), "server", "server_details").toString();
+        emitFinished();
+    } else {
+        emitFailed(tr("No saved credentials for this server"));
+    }
+}
+
+void IntentGetLoginCredentials::onPreconditionNotSatisfied()
+{
+    // MainWindow::applyStartupDestination runs this intent on every launch for
+    // users whose startup tab is Server / Server Room; keep that path quiet, as
+    // it was before the link-driven sign-in dialog existed.
+    if (!promptForMissingCredentials) {
+        emitFailed(tr("No saved credentials for this server"));
+        return;
+    }
+
+    // No credentials saved for the target server: ask the user for them. They
+    // opt into saving them so later links to the same server connect directly.
+    const QString serverText = context->hostname + ":" + context->port;
+    DlgLoginPrompt dialog(serverText);
+    // ApplicationModal: the dialog has no parent (the intent is not a widget),
+    // so WindowModal would not actually block any other window.
+    dialog.setWindowModality(Qt::ApplicationModal);
+
+    if (dialog.exec() != QDialog::Accepted) {
+        emitCancelled();
+        return;
+    }
+
+    context->username = dialog.username();
+    context->password = dialog.password();
+
+    if (dialog.savePassword() && !context->username.isEmpty()) {
+        ServersSettings &servers = SettingsCache::instance().servers();
+        // The host may already be saved under a friendly name (e.g. a public-server
+        // list entry) with no credentials; reuse that name instead of overwriting
+        // it with the raw hostname when addNewServer updates the entry in place.
+        QString saveName = context->hostname;
+        const int existingIndex = servers.findServerIndex(context->hostname, context->port);
+        if (existingIndex >= 0) {
+            saveName =
+                servers.getValue(QString("saveName%1").arg(existingIndex), "server", "server_details").toString();
+            if (saveName.isEmpty()) {
+                saveName = context->hostname;
+            }
+        }
+        servers.addNewServer(saveName, context->hostname, context->port, context->username, context->password, true);
+    }
+
+    emitFinished();
+}
diff --git a/cockatrice/src/interface/intents/intent_login.h b/cockatrice/src/interface/intents/intent_login.h
new file mode 100644
index 000000000..a805f1d75
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_login.h
@@ -0,0 +1,30 @@
+#ifndef COCKATRICE_INTENT_LOGIN_H
+#define COCKATRICE_INTENT_LOGIN_H
+
+#include "intent.h"
+
+#include <qtmetamacros.h>
+
+struct ContextConnectToServer;
+
+class IntentGetLoginCredentials : public Intent
+{
+    Q_OBJECT
+
+public:
+    // When promptForMissingCredentials is false (the default) a server without
+    // saved credentials fails silently; only intent chains from cockatrice://
+    // links opt into the interactive sign-in dialog.
+    explicit IntentGetLoginCredentials(ContextConnectToServer *_context, bool _promptForMissingCredentials = false);
+
+protected:
+    bool checkPrecondition() const override;
+    void onPreconditionSatisfied() override;
+    void onPreconditionNotSatisfied() override;
+
+private:
+    ContextConnectToServer *context;
+    bool promptForMissingCredentials;
+};
+
+#endif // COCKATRICE_INTENT_LOGIN_H
diff --git a/cockatrice/src/interface/intents/intent_open_local_deck.cpp b/cockatrice/src/interface/intents/intent_open_local_deck.cpp
new file mode 100644
index 000000000..5b673d106
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_open_local_deck.cpp
@@ -0,0 +1,38 @@
+#include "intent_open_local_deck.h"
+
+#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)
+{
+}
+
+bool IntentOpenLocalDeck::checkPrecondition() const
+{
+    return CardDatabaseManager::getInstance()->getLoadStatus() == LoadStatus::Ok;
+}
+
+void IntentOpenLocalDeck::onPreconditionSatisfied()
+{
+    std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromFile(file, DeckFileFormat::getFormatFromName(file), true);
+    if (deckOpt) {
+        tabSupervisor->openDeckInNewTab(deckOpt.value());
+        emitFinished();
+    } else {
+        emitFailed(tr("Unable to load deck file %1").arg(file));
+    }
+}
+
+void IntentOpenLocalDeck::onPreconditionNotSatisfied()
+{
+    runDependency(new IntentWaitForDatabaseLoad);
+}
diff --git a/cockatrice/src/interface/intents/intent_open_local_deck.h b/cockatrice/src/interface/intents/intent_open_local_deck.h
new file mode 100644
index 000000000..0338e9384
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_open_local_deck.h
@@ -0,0 +1,28 @@
+#ifndef COCKATRICE_INTENT_OPEN_LOCAL_DECK_H
+#define COCKATRICE_INTENT_OPEN_LOCAL_DECK_H
+
+#include "intent.h"
+
+#include <QString>
+#include <qtmetamacros.h>
+
+class TabSupervisor;
+
+class IntentOpenLocalDeck : public Intent
+{
+    Q_OBJECT
+
+public:
+    IntentOpenLocalDeck(TabSupervisor *_tabSupervisor, const QString &_file);
+
+protected:
+    bool checkPrecondition() const override;
+    void onPreconditionSatisfied() override;
+    void onPreconditionNotSatisfied() override;
+
+private:
+    TabSupervisor *tabSupervisor;
+    QString file;
+};
+
+#endif // COCKATRICE_INTENT_OPEN_LOCAL_DECK_H
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
new file mode 100644
index 000000000..63aef004b
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_open_server_room_by_name.cpp
@@ -0,0 +1,192 @@
+#include "intent_open_server_room_by_name.h"
+
+#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,
+                                                       const QString &_roomName)
+    : Intent(), tabSupervisor(_tabSupervisor), remoteClient(_remoteClient), context(_context.release()),
+      roomName(_roomName)
+{
+    checkTimer.setInterval(250);
+    connect(&checkTimer, &QTimer::timeout, this, [this]() {
+        if (selectOpenRoom()) {
+            checkTimer.stop();
+        }
+    });
+}
+
+bool IntentOpenServerRoomByName::checkPrecondition() const
+{
+    if (remoteClient->getStatus() != ClientStatus::StatusLoggedIn) {
+        return false;
+    }
+    // peerPort() reflects the actual TCP peer, which may differ from the
+    // configured server port (e.g. when connecting through a proxy), so only
+    // the hostname is compared here.
+    if (remoteClient->peerName() != context->serverContext.hostname) {
+        return false;
+    }
+    if (QString::number(remoteClient->peerPort()) != context->serverContext.port) {
+        return false;
+    }
+
+    return true;
+}
+
+void IntentOpenServerRoomByName::onPreconditionSatisfied()
+{
+    if (listening) {
+        return;
+    }
+    listening = true;
+
+    if (selectOpenRoom()) {
+        return;
+    }
+
+    // The room selector is the component that requests the room list, so the
+    // server tab must exist for the room to be resolved by name.
+    if (!tabSupervisor->getTabServer()) {
+        tabSupervisor->openTabServer();
+    }
+    if (!tabSupervisor->getTabServer()) {
+        emitFailed(tr("No server tab available"));
+        return;
+    }
+
+    connect(remoteClient, &RemoteClient::listRoomsEventReceived, this, &IntentOpenServerRoomByName::processListRooms);
+    connect(remoteClient, &RemoteClient::statusChanged, this, &IntentOpenServerRoomByName::onClientStatusChanged);
+
+    // The room tab may be opened by our own join, by the room selector's auto-join, or by a
+    // join that was already in flight. Poll until it shows up.
+    checkTimer.start();
+
+    // While no join has been sent yet, keep the room list fresh: the list may have been
+    // requested before we subscribed to it, or a response may have been dropped during a
+    // busy login burst. A stale list would otherwise leave the room unresolved forever.
+    connect(&refreshTimer, &QTimer::timeout, this, [this]() {
+        if (!joinPending) {
+            remoteClient->sendCommand(remoteClient->prepareSessionCommand(Command_ListRooms()));
+        }
+    });
+    refreshTimer.setInterval(5000);
+    refreshTimer.start();
+
+    // Last-resort failure for "the room genuinely is not in a fresh list". This must NOT
+    // fire while a join is in flight: a loaded server may take longer than that to answer
+    // during a login burst, and killing the intent early would leave the connection
+    // registered in the room with no tab to display it and every later join attempt
+    // would then be rejected with RespContextError.
+    QTimer::singleShot(20000, this, [this]() {
+        if (!joinPending) {
+            emitFailed(tr("Timed out while looking for the server room %1").arg(roomName));
+        }
+    });
+}
+
+void IntentOpenServerRoomByName::onPreconditionNotSatisfied()
+{
+    runDependency(new IntentConnectToServer(remoteClient, &context->serverContext));
+}
+
+void IntentOpenServerRoomByName::onClientStatusChanged(ClientStatus status)
+{
+    if (status != ClientStatus::StatusLoggedIn) {
+        emitFailed(tr("Disconnected while looking for the server room %1").arg(roomName));
+    }
+}
+
+bool IntentOpenServerRoomByName::selectOpenRoom()
+{
+    const auto &roomTabs = tabSupervisor->getRoomTabs();
+    for (auto i = roomTabs.cbegin(), end = roomTabs.cend(); i != end; ++i) {
+        TabRoom *room = i.value();
+        if (room->getRoomName() == roomName) {
+            tabSupervisor->setCurrentWidget(room);
+            emitFinished();
+            return true;
+        }
+    }
+    return false;
+}
+
+void IntentOpenServerRoomByName::processListRooms(const Event_ListRooms &event)
+{
+    if (selectOpenRoom()) {
+        return;
+    }
+
+    for (int i = 0; i < event.room_list_size(); ++i) {
+        const ServerInfo_Room &room = event.room_list(i);
+        if (room.has_name() && QString::fromStdString(room.name()) == roomName) {
+            openRoom(room);
+            return;
+        }
+    }
+}
+
+void IntentOpenServerRoomByName::openRoom(const ServerInfo_Room &roomInfo)
+{
+    if (joinPending) {
+        return;
+    }
+    joinPending = true;
+
+    // Rooms flagged auto_join are joined by the room selector automatically. Sending our own
+    // Command_JoinRoom on top of that would be answered with RespContextError.
+    if (roomInfo.has_auto_join() && roomInfo.auto_join()) {
+        return;
+    }
+
+    Command_JoinRoom cmd;
+    cmd.set_room_id(roomInfo.room_id());
+    PendingCommand *pend = remoteClient->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this,
+            [this](const Response &r, const CommandContainer &, const QVariant &) { handleJoinResponse(r); });
+    remoteClient->sendCommand(pend);
+}
+
+void IntentOpenServerRoomByName::handleJoinResponse(const Response &response)
+{
+    switch (response.response_code()) {
+        case Response::RespOk: {
+            const Response_JoinRoom &resp = response.GetExtension(Response_JoinRoom::ext);
+            if (!tabSupervisor->getRoomTabs().contains(resp.room_info().room_id())) {
+                tabSupervisor->addRoomTab(resp.room_info(), true);
+            }
+            emitFinished();
+            return;
+        }
+        case Response::RespNameNotFound:
+            emitFailed(tr("Failed to join the server room %1: it doesn't exist on the server.").arg(roomName));
+            return;
+        case Response::RespUserLevelTooLow:
+            emitFailed(tr("You do not have the required permission to join the server room %1.").arg(roomName));
+            return;
+        case Response::RespContextError:
+            // The room was already joined by someone else (e.g. the room selector's
+            // auto-join). It will show up in the room tabs shortly, so keep waiting.
+            return;
+        default:
+            emitFailed(tr("Failed to join the server room %1 due to an unknown error.").arg(roomName));
+            return;
+    }
+}
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
new file mode 100644
index 000000000..e163796fc
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_open_server_room_by_name.h
@@ -0,0 +1,63 @@
+#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 <QScopedPointer>
+#include <QString>
+#include <QTimer>
+#include <memory>
+#include <qtmetamacros.h>
+
+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.
+ *
+ * Room ids are assigned by the server per session, so the room is resolved by name from the
+ * room list once the client is logged in. If the room is already open it is simply selected.
+ *
+ * The join itself is sent directly through the client instead of `TabServer::joinRoom`, so a
+ * failed join only fails the intent silently instead of popping a modal error box during
+ * startup. Success is routed to `TabSupervisor::addRoomTab`, the same tab-creation machinery
+ * the normal join flow uses.
+ */
+class IntentOpenServerRoomByName : public Intent
+{
+    Q_OBJECT
+
+public:
+    IntentOpenServerRoomByName(TabSupervisor *_tabSupervisor,
+                               RemoteClient *_remoteClient,
+                               std::unique_ptr<ContextJoinRoom> _context,
+                               const QString &_roomName);
+
+protected:
+    bool checkPrecondition() const override;
+    void onPreconditionSatisfied() override;
+    void onPreconditionNotSatisfied() override;
+
+private:
+    void processListRooms(const Event_ListRooms &event);
+    void openRoom(const ServerInfo_Room &roomInfo);
+    void handleJoinResponse(const Response &response);
+    void onClientStatusChanged(ClientStatus status);
+    bool selectOpenRoom();
+
+    TabSupervisor *tabSupervisor;
+    RemoteClient *remoteClient;
+    QScopedPointer<ContextJoinRoom> context;
+    QString roomName;
+    bool listening = false;
+    bool joinPending = false;
+    QTimer checkTimer;
+    QTimer refreshTimer;
+};
+
+#endif // COCKATRICE_INTENT_OPEN_SERVER_ROOM_BY_NAME_H
diff --git a/cockatrice/src/interface/intents/intent_open_shared_deck.cpp b/cockatrice/src/interface/intents/intent_open_shared_deck.cpp
new file mode 100644
index 000000000..8abad3d88
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_open_shared_deck.cpp
@@ -0,0 +1,219 @@
+#include "intent_open_shared_deck.h"
+
+#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/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>
+#include <libcockatrice/protocol/pb/response_deck_share_download.pb.h>
+#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,
+                                           const CardDatabaseQuerier *_querier,
+                                           std::unique_ptr<ContextOpenDeck> _context)
+    : Intent(), tabSupervisor(_tabSupervisor), remoteClient(_remoteClient), querier(_querier),
+      context(_context.release())
+{
+    downloadTimer = new QTimer(this);
+    downloadTimer->setSingleShot(true);
+    downloadTimer->setInterval(15000);
+    connect(downloadTimer, &QTimer::timeout, this, &IntentOpenSharedDeck::onDownloadTimeout);
+}
+
+bool IntentOpenSharedDeck::checkPrecondition() const
+{
+    if (remoteClient->getStatus() != ClientStatus::StatusLoggedIn) {
+        return false;
+    }
+    // serverName()/serverPort() reflect the server the client was configured
+    // to connect to, which may differ from the actual TCP peer (e.g. when
+    // connecting through a proxy), so compare those configured values. The
+    // share token must be resolved against the host the link named — a link to
+    // the same host on another port is a different server.
+    if (remoteClient->serverName().compare(context->serverContext.hostname, Qt::CaseInsensitive) != 0) {
+        return false;
+    }
+    return QString::number(remoteClient->serverPort()) == context->serverContext.port;
+}
+
+void IntentOpenSharedDeck::onPreconditionSatisfied()
+{
+    // Resolve the share token to its items first; a share can contain more than
+    // one deck, and each item is downloaded by id. Time the round trip like the
+    // downloads, so a silent server cannot hang the chain forever.
+    listPhase = true;
+    downloadTimer->start();
+
+    Command_DeckShareList cmd;
+    cmd.set_token(context->shareToken.toStdString());
+
+    PendingCommand *pend = AbstractClient::prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &IntentOpenSharedDeck::listShareFinished);
+    remoteClient->sendCommand(pend);
+}
+
+void IntentOpenSharedDeck::onPreconditionNotSatisfied()
+{
+    runDependency(new IntentConnectToServer(remoteClient, &context->serverContext));
+}
+
+void IntentOpenSharedDeck::listShareFinished(const Response &response, const CommandContainer & /* commandContainer */)
+{
+    downloadTimer->stop();
+    listPhase = false;
+
+    if (response.response_code() != Response::RespOk) {
+        emitFailed(tr("The shared deck could not be found or has expired"));
+        return;
+    }
+
+    const Response_DeckShareList &resp = response.GetExtension(Response_DeckShareList::ext);
+    if (resp.items_size() == 0) {
+        emitFailed(tr("The shared deck is empty"));
+        return;
+    }
+
+    QList<ServerInfo_DeckShareItem> items;
+    items.reserve(resp.items_size());
+    for (const ServerInfo_DeckShareItem &item : resp.items()) {
+        items.append(item);
+        itemNames.insert(item.id(), QString::fromStdString(item.name()));
+    }
+
+    const QString serverText = context->serverContext.hostname + ":" + context->serverContext.port;
+
+    // Ask the user which decks to open before downloading anything.
+    previewDialog = new DlgSharedDecksPreview(tabSupervisor, querier, QString::fromStdString(resp.name()),
+                                              resp.expires_at(), serverText, items);
+    connect(previewDialog, &DlgSharedDecksPreview::openRequested, this, &IntentOpenSharedDeck::startDownloads);
+    connect(previewDialog, &DlgSharedDecksPreview::cancelled, this, &IntentOpenSharedDeck::emitCancelled);
+    connect(previewDialog, &DlgSharedDecksPreview::cancelled, previewDialog, &QWidget::deleteLater);
+    previewDialog->show();
+    previewDialog->raise();
+    previewDialog->activateWindow();
+}
+
+void IntentOpenSharedDeck::startDownloads(const QList<int> &itemIds)
+{
+    pendingItemIds = itemIds;
+    totalItems = itemIds.size();
+    completedItems = 0;
+    loadedDecks.clear();
+    downloadNextItem();
+}
+
+void IntentOpenSharedDeck::downloadNextItem()
+{
+    if (pendingItemIds.isEmpty()) {
+        finishAll();
+        return;
+    }
+
+    currentItemId = pendingItemIds.takeFirst();
+    downloadTimer->start();
+
+    Command_DeckShareDownload cmd;
+    cmd.set_token(context->shareToken.toStdString());
+    cmd.set_item_id(currentItemId);
+
+    PendingCommand *pend = AbstractClient::prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &IntentOpenSharedDeck::downloadShareFinished);
+    remoteClient->sendCommand(pend);
+}
+
+void IntentOpenSharedDeck::downloadShareFinished(const Response &response,
+                                                 const CommandContainer & /* commandContainer */)
+{
+    downloadTimer->stop();
+
+    QString failureReason;
+    if (response.response_code() != Response::RespOk) {
+        failureReason = tr("Failed to download the shared deck");
+    } else {
+        const Response_DeckShareDownload &resp = response.GetExtension(Response_DeckShareDownload::ext);
+        const QString deckString = QString::fromStdString(resp.deck());
+        if (deckString.isEmpty()) {
+            failureReason = tr("The shared deck is empty");
+        } else {
+            std::optional<LoadedDeck> deckOpt =
+                DeckLoader::loadFromRemote(deckString, LoadedDeck::LoadInfo::NON_REMOTE_ID);
+            if (!deckOpt) {
+                failureReason = tr("The shared deck could not be loaded");
+            } else {
+                loadedDecks.append(deckOpt.value());
+                ++completedItems;
+                previewDialog->setDownloadProgress(completedItems, totalItems,
+                                                   itemNames.value(currentItemId, tr("Unknown deck")));
+                downloadNextItem();
+                return;
+            }
+        }
+    }
+
+    onItemFailure(failureReason);
+}
+
+void IntentOpenSharedDeck::onItemFailure(const QString &reason)
+{
+    downloadTimer->stop();
+
+    if (loadedDecks.isEmpty()) {
+        previewDialog->deleteLater();
+        emitFailed(reason);
+        return;
+    }
+
+    const int downloadedCount = loadedDecks.size();
+    const QMessageBox::StandardButton answer = QMessageBox::question(
+        previewDialog, tr("Open shared decks"),
+        tr("Could not download the deck \"%1\".\n\n%n deck(s) were already downloaded. Open them?", "", downloadedCount)
+            .arg(itemNames.value(currentItemId, tr("Unknown deck"))),
+        QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+
+    if (answer == QMessageBox::Yes) {
+        finishAll();
+    } else {
+        previewDialog->deleteLater();
+        emitCancelled();
+    }
+}
+
+void IntentOpenSharedDeck::onDownloadTimeout()
+{
+    // The list phase has no preview dialog yet to report progress into; fail the
+    // whole intent instead of letting the shared deck hang in limbo.
+    if (listPhase) {
+        emitFailed(tr("Timed out while loading the shared deck"));
+        return;
+    }
+    onItemFailure(tr("Timed out while downloading the shared deck"));
+}
+
+void IntentOpenSharedDeck::finishAll()
+{
+    previewDialog->deleteLater();
+    for (const LoadedDeck &deck : loadedDecks) {
+        tabSupervisor->openDeckInNewTab(deck);
+    }
+    emitFinished();
+}
diff --git a/cockatrice/src/interface/intents/intent_open_shared_deck.h b/cockatrice/src/interface/intents/intent_open_shared_deck.h
new file mode 100644
index 000000000..afce2370f
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_open_shared_deck.h
@@ -0,0 +1,64 @@
+#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 <QList>
+#include <QMap>
+#include <QScopedPointer>
+#include <QString>
+#include <memory>
+#include <qtmetamacros.h>
+
+class TabSupervisor;
+class CardDatabaseQuerier;
+class DlgSharedDecksPreview;
+class QTimer;
+class CommandContainer;
+class RemoteClient;
+class Response;
+
+class IntentOpenSharedDeck : public Intent
+{
+    Q_OBJECT
+
+public:
+    IntentOpenSharedDeck(TabSupervisor *_tabSupervisor,
+                         RemoteClient *_remoteClient,
+                         const CardDatabaseQuerier *_querier,
+                         std::unique_ptr<ContextOpenDeck> _context);
+
+protected:
+    bool checkPrecondition() const override;
+    void onPreconditionSatisfied() override;
+    void onPreconditionNotSatisfied() override;
+
+private slots:
+    void listShareFinished(const Response &response, const CommandContainer &commandContainer);
+    void downloadShareFinished(const Response &response, const CommandContainer &commandContainer);
+    void onDownloadTimeout();
+
+private:
+    void startDownloads(const QList<int> &itemIds);
+    void downloadNextItem();
+    void onItemFailure(const QString &reason);
+    void finishAll();
+
+    TabSupervisor *tabSupervisor;
+    RemoteClient *remoteClient;
+    const CardDatabaseQuerier *querier;
+    QScopedPointer<ContextOpenDeck> context;
+    DlgSharedDecksPreview *previewDialog = nullptr;
+    QTimer *downloadTimer;
+    QMap<int, QString> itemNames;
+    QList<int> pendingItemIds;
+    QList<LoadedDeck> loadedDecks;
+    bool listPhase = true;
+    int currentItemId = 0;
+    int totalItems = 0;
+    int completedItems = 0;
+};
+
+#endif // COCKATRICE_INTENT_OPEN_SHARED_DECK_H
diff --git a/cockatrice/src/interface/intents/intent_wait_for_database_load.cpp b/cockatrice/src/interface/intents/intent_wait_for_database_load.cpp
new file mode 100644
index 000000000..7a7da90a4
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_wait_for_database_load.cpp
@@ -0,0 +1,22 @@
+#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
+{
+    return CardDatabaseManager::getInstance()->getLoadStatus() == LoadStatus::Ok;
+}
+
+void IntentWaitForDatabaseLoad::onPreconditionSatisfied()
+{
+    emitFinished();
+}
+
+void IntentWaitForDatabaseLoad::onPreconditionNotSatisfied()
+{
+    connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this,
+            [this]() { emitFinished(); });
+}
diff --git a/cockatrice/src/interface/intents/intent_wait_for_database_load.h b/cockatrice/src/interface/intents/intent_wait_for_database_load.h
new file mode 100644
index 000000000..715918f04
--- /dev/null
+++ b/cockatrice/src/interface/intents/intent_wait_for_database_load.h
@@ -0,0 +1,18 @@
+#ifndef COCKATRICE_INTENT_WAIT_FOR_DATABASE_LOAD_H
+#define COCKATRICE_INTENT_WAIT_FOR_DATABASE_LOAD_H
+
+#include "intent.h"
+
+#include <qtmetamacros.h>
+
+class IntentWaitForDatabaseLoad : public Intent
+{
+    Q_OBJECT
+
+protected:
+    bool checkPrecondition() const override;
+    void onPreconditionSatisfied() override;
+    void onPreconditionNotSatisfied() override;
+};
+
+#endif // COCKATRICE_INTENT_WAIT_FOR_DATABASE_LOAD_H
diff --git a/cockatrice/src/interface/intents/url_parser.cpp b/cockatrice/src/interface/intents/url_parser.cpp
new file mode 100644
index 000000000..966fd1213
--- /dev/null
+++ b/cockatrice/src/interface/intents/url_parser.cpp
@@ -0,0 +1,450 @@
+#include "url_parser.h"
+
+#include "../../client/settings/cache_settings.h"
+#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");
+
+IntentUrlParser::IntentUrlParser(QObject *parent, MainWindow *_mainWindow) : QObject(parent), mainWindow(_mainWindow)
+{
+}
+
+void IntentUrlParser::handle(const QString &urlStr)
+{
+    QUrl url(urlStr);
+
+    if (url.scheme() != "cockatrice") {
+        return;
+    }
+
+    const QString action = url.host();
+    QUrlQuery query(url);
+
+    qCDebug(UrlParserLog) << "Parsing intent URL, action:" << action;
+
+    PendingIntentChain chain;
+    Intent *firstIntent = nullptr;
+    if (action == "joingame") {
+        firstIntent = createJoinGameIntent(query, chain);
+    } else if (action == "opendeck") {
+        firstIntent = createOpenDeckIntent(query, chain);
+    } else {
+        qWarning() << "Unknown intent:" << action;
+    }
+
+    if (firstIntent == nullptr) {
+        // The link was invalid or the user declined the confirm: nothing runs.
+        // Report the idle state when no other chain is queued so that a startup
+        // launch (which skipped its own connection for this URL) falls back to it.
+        if (!chainRunning && pendingChains.isEmpty()) {
+            emit urlChainFinished(mainWindow->getRemoteClient()->getStatus() == StatusLoggedIn);
+        }
+        return;
+    }
+
+    pendingChains.append(chain);
+    startNextChain();
+}
+
+Intent *IntentUrlParser::createJoinGameIntent(const QUrlQuery &query, PendingIntentChain &chain)
+{
+    auto showError = [this](const QString &message) { QMessageBox::warning(mainWindow, tr("Open game"), message); };
+
+    auto ctx = std::make_unique<ContextJoinGame>();
+
+    ctx->roomContext.serverContext.hostname = query.queryItemValue("hostname");
+    ctx->roomContext.serverContext.port = query.queryItemValue("port");
+
+    if (ctx->roomContext.serverContext.hostname.isEmpty()) {
+        showError(tr("Missing or empty hostname in the game link"));
+        return nullptr;
+    }
+
+    bool ok = false;
+    ctx->roomContext.serverContext.port.toUShort(&ok);
+    if (!ok) {
+        showError(tr("Invalid or missing port in the game link"));
+        return nullptr;
+    }
+
+    ctx->roomContext.roomId = query.queryItemValue("roomid").toInt(&ok);
+
+    if (!ok) {
+        showError(tr("Invalid or missing room id in the game link"));
+        return nullptr;
+    }
+
+    ok = false;
+    ctx->gameId = query.queryItemValue("gameid").toInt(&ok);
+
+    if (!ok) {
+        showError(tr("Invalid or missing game id in the game link"));
+        return nullptr;
+    }
+
+    const QString gameDescription = query.queryItemValue("game", QUrl::FullyDecoded);
+    const QString message = generateJoinGameMessage(*ctx, gameDescription);
+
+    const QMessageBox::StandardButton answer = QMessageBox::question(
+        mainWindow, tr("Join game"), message, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+    if (answer != QMessageBox::Yes) {
+        return nullptr;
+    }
+
+    RemoteClient *client = mainWindow->getRemoteClient();
+    ContextConnectToServer *serverContext = &ctx->roomContext.serverContext;
+
+    // The join game intent owns the context and the credential lookup; once the
+    // chain finishes (or fails) it deletes the whole tree.
+    auto joinGameIntent = new IntentJoinServerGame(mainWindow->getTabSupervisor(), client, std::move(ctx));
+    joinGameIntent->setParent(this);
+    chain.intents.append(joinGameIntent);
+    connect(joinGameIntent, &Intent::failed, this, [showError](const QString &reason) { showError(reason); });
+
+    Intent *firstIntent = joinGameIntent;
+    if (!isConnectedTo(serverContext->hostname, serverContext->port)) {
+        auto getLoginCredentialsIntent =
+            new IntentGetLoginCredentials(serverContext, /*promptForMissingCredentials=*/true);
+        getLoginCredentialsIntent->setParent(joinGameIntent);
+        chain.intents.insert(0, getLoginCredentialsIntent);
+
+        connect(getLoginCredentialsIntent, &Intent::finished, joinGameIntent, &Intent::execute);
+        connect(getLoginCredentialsIntent, &Intent::failed, joinGameIntent, &Intent::failed);
+        connect(getLoginCredentialsIntent, &Intent::cancelled, joinGameIntent, &Intent::cancelled);
+        firstIntent = getLoginCredentialsIntent;
+    }
+
+    return firstIntent;
+}
+
+QString IntentUrlParser::generateJoinGameMessage(const ContextJoinGame &context, const QString &gameDescription)
+{
+    const QString hostname = context.roomContext.serverContext.hostname;
+    const QString port = context.roomContext.serverContext.port;
+    const int roomId = context.roomContext.roomId;
+    const int gameId = context.gameId;
+    const QString server = QStringLiteral("%1:%2").arg(hostname, port);
+
+    // Prefer the room name over the raw numeric id: it means something to the
+    // user. The name is only known when we are already connected to the same
+    // server and sitting in that room — otherwise fall back to a plain prompt.
+    AbstractClient *client = mainWindow->getTabSupervisor()->getClient();
+    const bool sameServer = client != nullptr && client->getStatus() == StatusLoggedIn &&
+                            hostname.compare(client->serverName(), Qt::CaseInsensitive) == 0 &&
+                            QString::number(client->serverPort()) == port;
+    TabRoom *roomTab = sameServer ? mainWindow->getTabSupervisor()->getRoomTabs().value(roomId) : nullptr;
+
+    const QString gameIdStr = QString::number(gameId);
+    // Links built by newer clients embed the game description ("game" item);
+    // restate it in the confirm so it matches what the chat anchor showed.
+    // Unknown query items are ignored, so old links without it keep working.
+    // The multi-arg .arg() overloads replace in a single pass, so a description
+    // containing "%…" cannot corrupt later placeholders.
+    // FullyDecoded undoes every %XX escape and must match the chat anchor's
+    // decode mode, so a description containing "%" reads identically in both.
+    if (gameDescription.isEmpty()) {
+        return roomTab ? tr("Join game #%1 in \"%2\" on %3?").arg(gameIdStr, roomTab->getRoomName(), server)
+                       : tr("Join game #%1 on %2?").arg(gameIdStr, server);
+    }
+
+    return roomTab ? tr("Join game \"%1\" (#%2) in \"%3\" on %4?")
+                         .arg(gameDescription, gameIdStr, roomTab->getRoomName(), server)
+                   : tr("Join game \"%1\" (#%2) on %3?").arg(gameDescription, gameIdStr, server);
+}
+
+Intent *IntentUrlParser::createOpenDeckIntent(const QUrlQuery &query, PendingIntentChain &chain)
+{
+    auto showError = [this](const QString &message) {
+        QMessageBox::warning(mainWindow, tr("Open shared deck"), message);
+    };
+
+    auto ctx = std::make_unique<ContextOpenDeck>();
+
+    ctx->serverContext.hostname = query.queryItemValue("hostname");
+    ctx->serverContext.port = query.queryItemValue("port");
+    ctx->shareToken = query.queryItemValue("share");
+
+    qCDebug(UrlParserLog) << "Open-deck intent: host" << ctx->serverContext.hostname << "port"
+                          << ctx->serverContext.port << "token length" << ctx->shareToken.length();
+
+    if (ctx->serverContext.hostname.isEmpty()) {
+        showError(tr("Missing or empty hostname in the share link"));
+        return nullptr;
+    }
+
+    bool ok = false;
+    const quint16 port = ctx->serverContext.port.toUShort(&ok);
+    if (!ok || port == 0) {
+        showError(tr("Invalid or missing port in the share link"));
+        return nullptr;
+    }
+
+    if (ctx->shareToken.isEmpty()) {
+        showError(tr("Missing or empty share value in the share link"));
+        return nullptr;
+    }
+
+    RemoteClient *client = mainWindow->getRemoteClient();
+
+    // The open deck download needs a connection to the link's server. Ask before
+    // taking the session anywhere it isn't already, naming the host we would
+    // connect to. Remember the link's target when it moves us away from a live
+    // session so a failed or cancelled chain can restore the session it left.
+    // The hostname is link-supplied and percent-decoded, so escape it: QMessageBox
+    // renders AutoText, and markup in a hostname would otherwise flip the whole
+    // prompt to rich text and let a link pad the message the user is shown.
+    const bool alreadyConnected = isConnectedTo(ctx->serverContext.hostname, ctx->serverContext.port);
+    if (!alreadyConnected) {
+        const QString target =
+            QStringLiteral("%1:%2").arg(ctx->serverContext.hostname.toHtmlEscaped(), ctx->serverContext.port);
+
+        if (client->getStatus() == StatusLoggedIn) {
+            const QString current =
+                QStringLiteral("%1:%2").arg(client->serverName(), QString::number(client->serverPort()));
+            const QMessageBox::StandardButton answer = QMessageBox::question(
+                mainWindow, tr("Open shared deck"),
+                tr("Opening this share link connects you to %1 instead of %2.\n\nContinue?").arg(target, current),
+                QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+            if (answer != QMessageBox::Yes) {
+                return nullptr;
+            }
+            chain.migrationTargetHost = ctx->serverContext.hostname;
+            chain.migrationTargetPort = ctx->serverContext.port;
+            chain.pendingRestore = true;
+        } else {
+            // Fresh connection is harmless to wander away from, but a server the
+            // client has never been configured for deserves a harder warning (no
+            // by default) so a stray link cannot silently steer the client there.
+            const bool knownHost = SettingsCache::instance().servers().findHostIndex(ctx->serverContext.hostname) >= 0;
+            const QMessageBox::StandardButton answer =
+                knownHost
+                    ? QMessageBox::question(mainWindow, tr("Open shared deck"),
+                                            tr("Opening this share link connects you to %1.\n\nContinue?").arg(target))
+                    : QMessageBox::warning(mainWindow, tr("Open shared deck"),
+                                           tr("Opening this share link connects you to %1, a server you have "
+                                              "never connected to before.\n\nContinue?")
+                                               .arg(target),
+                                           QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+            if (answer != QMessageBox::Yes) {
+                return nullptr;
+            }
+        }
+    }
+
+    ContextConnectToServer *serverContext = &ctx->serverContext;
+
+    // The open deck intent owns the context and the credential lookup; once
+    // the chain finishes (or fails) it deletes the whole tree.
+    auto openDeckIntent =
+        new IntentOpenSharedDeck(mainWindow->getTabSupervisor(), client, CardDatabaseManager::query(), std::move(ctx));
+    openDeckIntent->setParent(this);
+    chain.intents.append(openDeckIntent);
+    connect(openDeckIntent, &Intent::failed, this, [showError](const QString &reason) { showError(reason); });
+
+    Intent *firstIntent = openDeckIntent;
+    if (!isConnectedTo(serverContext->hostname, serverContext->port)) {
+        auto getLoginCredentialsIntent =
+            new IntentGetLoginCredentials(serverContext, /*promptForMissingCredentials=*/true);
+        getLoginCredentialsIntent->setParent(openDeckIntent);
+        chain.intents.insert(0, getLoginCredentialsIntent);
+
+        connect(getLoginCredentialsIntent, &Intent::finished, openDeckIntent, &Intent::execute);
+        connect(getLoginCredentialsIntent, &Intent::failed, openDeckIntent, &Intent::failed);
+        connect(getLoginCredentialsIntent, &Intent::cancelled, openDeckIntent, &Intent::cancelled);
+        firstIntent = getLoginCredentialsIntent;
+    }
+
+    return firstIntent;
+}
+
+bool IntentUrlParser::isConnectedTo(const QString &hostname, const QString &port) const
+{
+    // serverName() reflects the server the client was configured to connect to,
+    // which may differ from the actual TCP peer (e.g. when connecting through a
+    // proxy), so compare the configured host and port — exactly what a link
+    // names. A link to the same host on another port is a different server and
+    // must not silently reuse an existing session there.
+    RemoteClient *client = mainWindow->getRemoteClient();
+    return client->getStatus() == StatusLoggedIn && client->serverName().compare(hostname, Qt::CaseInsensitive) == 0 &&
+           QString::number(client->serverPort()) == port;
+}
+
+void IntentUrlParser::startNextChain()
+{
+    if (chainRunning || pendingChains.isEmpty()) {
+        return;
+    }
+    chainRunning = true;
+
+    PendingIntentChain &chain = pendingChains.first();
+    if (chain.intents.isEmpty()) {
+        pendingChains.removeFirst();
+        chainRunning = false;
+        startNextChain();
+        return;
+    }
+
+    // Snapshot the session this chain moves away from now that it actually
+    // runs. Chains are parsed while earlier ones are still queued, so a capture
+    // at parse time would follow whichever server the chain before it settled
+    // on, not the one the user is really on when this link is handled.
+    if (chain.pendingRestore) {
+        RemoteClient *client = mainWindow->getRemoteClient();
+        chain.previousServerHost = client->serverName();
+        chain.previousServerPort = QString::number(client->serverPort());
+    }
+
+    // Only the last intent completes the chain; its terminal signal ends the
+    // whole run. Cancellation of an intermediate intent (e.g. declined login
+    // prompt) is forwarded onto the last intent in the chain builders above.
+    Intent *finalIntent = chain.intents.last();
+    connect(finalIntent, &Intent::finished, this, [this]() { chainEnded(true); });
+    connect(finalIntent, &Intent::failed, this, [this]() { chainEnded(false); });
+    connect(finalIntent, &Intent::cancelled, this, [this]() { chainEnded(false); });
+    // Backstop: if the final intent is destroyed without emitting a terminal
+    // signal (e.g. a network error dropped it while running), end the chain so
+    // later links are not queued and dropped for the rest of the session.
+    chainBackstopConnection = connect(finalIntent, &QObject::destroyed, this, &IntentUrlParser::onChainIntentDestroyed);
+
+    chain.intents.first()->execute();
+}
+
+void IntentUrlParser::chainEnded(bool chainSucceeded)
+{
+    chainRunning = false;
+    QObject::disconnect(chainBackstopConnection);
+
+    const PendingIntentChain chain = pendingChains.takeFirst();
+
+    // Only a failed or cancelled chain restores the session the link migrated
+    // away from; a successful one leaves the user where they are.
+    if (chain.pendingRestore && !chainSucceeded) {
+        restorePreviousServer(chain);
+    }
+
+    startNextChain();
+
+    // Only report the terminal state once the queue has fully drained, so a
+    // queued follow-up link keeps the startup fallback out of the picture.
+    if (!chainRunning && pendingChains.isEmpty()) {
+        emit urlChainFinished(mainWindow->getRemoteClient()->getStatus() == StatusLoggedIn);
+    }
+}
+
+void IntentUrlParser::onChainIntentDestroyed()
+{
+    if (!chainRunning) {
+        return;
+    }
+    qCWarning(UrlParserLog) << "Share-link intent destroyed without a terminal signal; ending its chain";
+    chainEnded(false);
+}
+
+void IntentUrlParser::restorePreviousServer(const PendingIntentChain &chain)
+{
+    if (chain.previousServerHost.isEmpty()) {
+        return;
+    }
+
+    RemoteClient *client = mainWindow->getRemoteClient();
+    const ClientStatus status = client->getStatus();
+
+    // A failed/cancelled chain can fire while the client is still settling the
+    // in-flight connection attempt (wrong password, connect timeout). Only
+    // decide once the client has settled into logged-in or disconnected;
+    // deciding mid-connect would strand the user offline from their previous
+    // server.
+    if (status == StatusDisconnected || status == StatusLoggedIn) {
+        restoreToPreviousServer(chain);
+        return;
+    }
+    auto waitConnection = std::make_shared<QMetaObject::Connection>();
+    *waitConnection = connect(client, &RemoteClient::statusChanged, this, [this, chain, client, waitConnection]() {
+        const ClientStatus settled = client->getStatus();
+        if (settled == StatusDisconnected || settled == StatusLoggedIn) {
+            QObject::disconnect(*waitConnection);
+            restoreToPreviousServer(chain);
+        }
+    });
+}
+
+void IntentUrlParser::restoreToPreviousServer(const PendingIntentChain &chain)
+{
+    RemoteClient *client = mainWindow->getRemoteClient();
+
+    // Back on the previous server already → nothing to undo.
+    if (client->serverName().compare(chain.previousServerHost, Qt::CaseInsensitive) == 0 &&
+        QString::number(client->serverPort()) == chain.previousServerPort) {
+        return;
+    }
+
+    // When logged in somewhere, only intervene if that somewhere is the server
+    // the link moved us to; if the user went elsewhere on their own, leave them.
+    if (client->getStatus() == StatusLoggedIn) {
+        const bool onMigrationTarget =
+            client->serverName().compare(chain.migrationTargetHost, Qt::CaseInsensitive) == 0 &&
+            QString::number(client->serverPort()) == chain.migrationTargetPort;
+        if (!onMigrationTarget) {
+            return;
+        }
+
+        ServersSettings &servers = SettingsCache::instance().servers();
+        const int index = servers.findServerIndex(chain.previousServerHost, chain.previousServerPort);
+        if (index >= 0 && servers.hasLoginData(chain.previousServerHost, chain.previousServerPort)) {
+            const QString username =
+                servers.getValue(QString("username%1").arg(index), "server", "server_details").toString();
+            const QString password =
+                servers.getValue(QString("password%1").arg(index), "server", "server_details").toString();
+            client->connectToServer(chain.previousServerHost, chain.previousServerPort.toUInt(), username, password);
+            return;
+        }
+        client->disconnectFromServer();
+        return;
+    }
+
+    if (client->getStatus() != StatusDisconnected) {
+        return;
+    }
+
+    // The link's connection attempt failed: reconnect to the previous server
+    // when credentials are saved, otherwise stay offline.
+    ServersSettings &servers = SettingsCache::instance().servers();
+    const int index = servers.findServerIndex(chain.previousServerHost, chain.previousServerPort);
+    if (index >= 0 && servers.hasLoginData(chain.previousServerHost, chain.previousServerPort)) {
+        const QString username =
+            servers.getValue(QString("username%1").arg(index), "server", "server_details").toString();
+        const QString password =
+            servers.getValue(QString("password%1").arg(index), "server", "server_details").toString();
+        client->connectToServer(chain.previousServerHost, chain.previousServerPort.toUInt(), username, password);
+    }
+}
diff --git a/cockatrice/src/interface/intents/url_parser.h b/cockatrice/src/interface/intents/url_parser.h
new file mode 100644
index 000000000..9b8594275
--- /dev/null
+++ b/cockatrice/src/interface/intents/url_parser.h
@@ -0,0 +1,78 @@
+#ifndef COCKATRICE_URL_PARSER_H
+#define COCKATRICE_URL_PARSER_H
+
+#include <QList>
+#include <QMetaObject>
+#include <QObject>
+#include <QString>
+#include <QUrlQuery>
+#include <qtmetamacros.h>
+
+class Intent;
+class MainWindow;
+struct ContextJoinGame;
+
+/**
+ * @brief One queued intent chain with the session-migration bookkeeping for it.
+ *
+ * The restore fields are per-chain on purpose: chains are parsed while earlier
+ * ones are still queued, so parser-wide state would let one chain's failure
+ * consume the restore data another chain recorded.
+ */
+struct PendingIntentChain
+{
+    QList<Intent *> intents;
+
+    // Snapshot of the session in place when this chain started running, so a
+    // queued chain follows whichever server the chain before it settled on.
+    QString previousServerHost;
+    QString previousServerPort;
+
+    // Recorded at parse time when the user confirmed migrating away from a live
+    // session to the host/port named by the link.
+    QString migrationTargetHost;
+    QString migrationTargetPort;
+    bool pendingRestore = false;
+};
+
+/**
+ * @brief Parses cockatrice:// links and runs them as serialized intent chains.
+ *
+ * Links are parsed by action (joingame/opendeck) and translated into an intent
+ * chain. Chains are queued and run one at a time: a document can hand multiple
+ * links to the window while an earlier chain still connects, and running two
+ * connect chains concurrently tears the connection down. urlChainFinished is
+ * emitted once the queue has fully drained.
+ */
+class IntentUrlParser : public QObject
+{
+    Q_OBJECT
+
+public:
+    IntentUrlParser(QObject *parent, MainWindow *mainWindow);
+    void handle(const QString &urlStr);
+
+signals:
+    /** @brief Emitted when the last queued chain ended; carries whether the client is logged in. */
+    void urlChainFinished(bool connected);
+
+private:
+    Intent *createJoinGameIntent(const QUrlQuery &query, PendingIntentChain &chain);
+    Intent *createOpenDeckIntent(const QUrlQuery &query, PendingIntentChain &chain);
+    QString generateJoinGameMessage(const ContextJoinGame &context, const QString &gameDescription);
+    [[nodiscard]] bool isConnectedTo(const QString &hostname, const QString &port) const;
+    void startNextChain();
+    void chainEnded(bool chainSucceeded);
+    void onChainIntentDestroyed();
+    void restorePreviousServer(const PendingIntentChain &chain);
+    void restoreToPreviousServer(const PendingIntentChain &chain);
+
+    MainWindow *mainWindow;
+    QList<PendingIntentChain> pendingChains;
+    bool chainRunning = false;
+    // Disconnects the destroyed-signal backstop once a chain ends, so an old
+    // intent's deferred deletion cannot end the chain that runs after it.
+    QMetaObject::Connection chainBackstopConnection;
+};
+
+#endif // COCKATRICE_URL_PARSER_H
diff --git a/cockatrice/src/interface/key_signals.cpp b/cockatrice/src/interface/key_signals.cpp
index b4a38fad5..4c3074139 100644
--- a/cockatrice/src/interface/key_signals.cpp
+++ b/cockatrice/src/interface/key_signals.cpp
@@ -1,34 +1,41 @@
 #include "key_signals.h"
 
+#include <QEvent>
+#include <QFlags>
 #include <QKeyEvent>
+#include <qnamespace.h>
 
 bool KeySignals::eventFilter(QObject * /*object*/, QEvent *event)
 {
     QKeyEvent *kevent;
 
-    if (event->type() != QEvent::KeyPress)
+    if (event->type() != QEvent::KeyPress) {
         return false;
+    }
 
     kevent = static_cast<QKeyEvent *>(event);
     switch (kevent->key()) {
         case Qt::Key_Return:
         case Qt::Key_Enter:
-            if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier))
+            if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier)) {
                 emit onCtrlAltEnter();
-            else if (kevent->modifiers() & Qt::ControlModifier)
+            } else if (kevent->modifiers() & Qt::ControlModifier) {
                 emit onCtrlEnter();
-            else
+            } else {
                 emit onEnter();
+            }
 
             break;
         case Qt::Key_Right:
-            if (kevent->modifiers() & Qt::ShiftModifier)
+            if (kevent->modifiers() & Qt::ShiftModifier) {
                 emit onShiftRight();
+            }
 
             break;
         case Qt::Key_Left:
-            if (kevent->modifiers() & Qt::ShiftModifier)
+            if (kevent->modifiers() & Qt::ShiftModifier) {
                 emit onShiftLeft();
+            }
 
             break;
         case Qt::Key_Delete:
@@ -37,33 +44,39 @@ bool KeySignals::eventFilter(QObject * /*object*/, QEvent *event)
 
             break;
         case Qt::Key_Minus:
-            if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier))
+            if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier)) {
                 emit onCtrlAltMinus();
+            }
 
             break;
         case Qt::Key_Equal:
-            if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier))
+            if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier)) {
                 emit onCtrlAltEqual();
+            }
 
             break;
         case Qt::Key_BracketLeft:
-            if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier))
+            if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier)) {
                 emit onCtrlAltLBracket();
+            }
 
             break;
         case Qt::Key_BracketRight:
-            if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier))
+            if (kevent->modifiers().testFlag(Qt::AltModifier) && kevent->modifiers().testFlag(Qt::ControlModifier)) {
                 emit onCtrlAltRBracket();
+            }
 
             break;
         case Qt::Key_S:
-            if (kevent->modifiers() & Qt::ShiftModifier)
+            if (kevent->modifiers() & Qt::ShiftModifier) {
                 emit onShiftS();
+            }
 
             break;
         case Qt::Key_C:
-            if (kevent->modifiers() & Qt::ControlModifier)
+            if (kevent->modifiers() & Qt::ControlModifier) {
                 emit onCtrlC();
+            }
 
             break;
         default:
diff --git a/cockatrice/src/interface/key_signals.h b/cockatrice/src/interface/key_signals.h
index 3404dca9e..dbe147ad8 100644
--- a/cockatrice/src/interface/key_signals.h
+++ b/cockatrice/src/interface/key_signals.h
@@ -2,14 +2,14 @@
  * @file key_signals.h
  * @ingroup Core
  * @ingroup UI
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 f7ebbfb79..ba5e492e3 100644
--- a/cockatrice/src/interface/layouts/flow_layout.cpp
+++ b/cockatrice/src/interface/layouts/flow_layout.cpp
@@ -1,38 +1,43 @@
 /**
  * @file flow_layout.cpp
- * @brief Implementation of the FlowLayout class, a custom layout for dynamically organizing widgets
- * in rows within the constraints of available width or parent scroll areas.
+ * @brief Implementation of FlowLayout — a QLayout that wraps child widgets into rows
+ *        (Qt::Horizontal flow) or columns (Qt::Vertical flow).
+ *
+ * Design contract (following Qt layout conventions):
+ *   - setGeometry()  places children inside the given rect. Nothing else.
+ *   - sizeHint()     reports the unconstrained preferred size (all items in one line).
+ *   - minimumSize()  reports the minimum size (largest single item).
+ *   - heightForWidth() reports the height needed for a given width (horizontal flow only).
+ *
+ * The layout never calls setFixedSize() or adjustSize() on its parent widget;
+ * that is the responsibility of the parent widget / scroll area.
  */
 
 #include "flow_layout.h"
 
-#include "../widgets/general/layout_containers/flow_widget.h"
-
 #include <QDebug>
 #include <QLayoutItem>
-#include <QScrollArea>
+#include <QMessageLogger>
+#include <QMetaObject>
+#include <QObject>
+#include <QPoint>
+#include <QRect>
+#include <QSizePolicy>
 #include <QStyle>
+#include <QWidget>
+#include <QWidgetItem>
+#include <QtGlobal>
 
-/**
- * @brief Constructs a FlowLayout instance with the specified parent widget, margin, and spacing values.
- * @param parent The parent widget for this layout.
- * @param margin The layout margin.
- * @param hSpacing The horizontal spacing between items.
- * @param vSpacing The vertical spacing between items.
- */
 FlowLayout::FlowLayout(QWidget *parent,
-                       const Qt::Orientation _flowDirection,
+                       const Qt::Orientation flowDirection,
                        const int margin,
                        const int hSpacing,
                        const int vSpacing)
-    : QLayout(parent), flowDirection(_flowDirection), horizontalMargin(hSpacing), verticalMargin(vSpacing)
+    : QLayout(parent), flowDirection(flowDirection), horizontalMargin(hSpacing), verticalMargin(vSpacing)
 {
     setContentsMargins(margin, margin, margin, margin);
 }
 
-/**
- * @brief Destructor for FlowLayout, which cleans up all items in the layout.
- */
 FlowLayout::~FlowLayout()
 {
     QLayoutItem *item;
@@ -42,499 +47,353 @@ FlowLayout::~FlowLayout()
 }
 
 /**
- * @brief Indicates the layout's support for expansion in both horizontal and vertical directions.
- * @return The orientations (Qt::Horizontal | Qt::Vertical) this layout can expand to fill.
+ * @brief Reports which axis the layout can expand along.
+ *
+ * A horizontally-flowing layout expands horizontally (and wraps vertically,
+ * but that is governed by heightForWidth, not by this flag).
+ * A vertically-flowing layout expands vertically.
  */
 Qt::Orientations FlowLayout::expandingDirections() const
 {
-    return Qt::Horizontal | Qt::Vertical;
+    return (flowDirection == Qt::Horizontal) ? Qt::Horizontal : Qt::Vertical;
 }
 
 /**
- * @brief Indicates that this layout's height depends on its width.
- * @return True, as the layout adjusts its height to fit the specified width.
+ * @brief Height-for-width is only meaningful for horizontal (wrapping) flow.
  */
 bool FlowLayout::hasHeightForWidth() const
 {
-    return true;
+    return flowDirection == Qt::Horizontal;
 }
 
 /**
- * @brief Calculates the required height to display all items within the specified width.
- * @param width The available width for arranging items.
- * @return The total height needed to fit all items in rows constrained by the specified width.
+ * @brief Returns the height required to display all items within @p width.
+ *
+ * Only valid for horizontal flow; returns -1 otherwise so Qt ignores it.
+ * Spacing is counted once between adjacent items, never before the first
+ * or after the last.
  */
 int FlowLayout::heightForWidth(const int width) const
 {
-    if (flowDirection == Qt::Vertical) {
-        int height = 0;
-        int rowWidth = 0;
-        int rowHeight = 0;
-
-        for (const QLayoutItem *item : items) {
-            if (item == nullptr || item->isEmpty()) {
-                continue;
-            }
-
-            int itemWidth = item->sizeHint().width() + horizontalSpacing();
-            if (rowWidth + itemWidth > width) {
-                height += rowHeight + verticalSpacing();
-                rowWidth = itemWidth;
-                rowHeight = item->sizeHint().height();
-            } else {
-                rowWidth += itemWidth;
-                rowHeight = qMax(rowHeight, item->sizeHint().height());
-            }
-        }
-        height += rowHeight; // Add height of the last row
-        return height;
-    } else {
-        int width = 0;
-        int colWidth = 0;
-        int colHeight = 0;
-
-        for (const QLayoutItem *item : items) {
-            if (item == nullptr || item->isEmpty()) {
-                continue;
-            }
-
-            int itemHeight = item->sizeHint().height();
-            if (colHeight + itemHeight > width) {
-                width += colWidth;
-                colHeight = itemHeight;
-                colWidth = item->sizeHint().width();
-            } else {
-                colHeight += itemHeight;
-                colWidth = qMax(colWidth, item->sizeHint().width());
-            }
-        }
-        width += colWidth; // Add width of the last column
-        return width;
+    if (flowDirection != Qt::Horizontal) {
+        return -1;
     }
-}
 
-/**
- * @brief Arranges layout items in rows within the specified rectangle bounds.
- * @param rect The area within which to position layout items.
- */
-void FlowLayout::setGeometry(const QRect &rect)
-{
-    QLayout::setGeometry(rect); // Sets the geometry of the layout based on the given rectangle.
+    int totalHeight = 0;
+    int rowUsedWidth = 0;
+    int rowHeight = 0;
 
-    if (flowDirection == Qt::Horizontal) {
-        // If we have a parent scroll area, we're clamped to that, else we use our own rectangle.
-        const int availableWidth = getParentScrollAreaWidth() == 0 ? rect.width() : getParentScrollAreaWidth();
-
-        const int totalHeight = layoutAllRows(rect.x(), rect.y(), availableWidth);
-
-        if (QWidget *parentWidgetPtr = parentWidget()) {
-            parentWidgetPtr->setFixedSize(availableWidth, totalHeight);
-        }
-    } else {
-        const int availableHeight = qMax(rect.height(), getParentScrollAreaHeight());
-
-        const int totalWidth = layoutAllColumns(rect.x(), rect.y(), availableHeight);
-
-        if (QWidget *parentWidgetPtr = parentWidget()) {
-            parentWidgetPtr->setFixedSize(totalWidth, availableHeight);
-        }
-    }
-}
-
-/**
- * @brief Lays out items into rows according to the available width, starting from a given origin.
- *        Each row is arranged within `availableWidth`, wrapping to a new row as necessary.
- * @param originX The x-coordinate for the layout start position.
- * @param originY The y-coordinate for the layout start position.
- * @param availableWidth The width within which each row is constrained.
- * @return The total height after arranging all rows.
- */
-int FlowLayout::layoutAllRows(const int originX, const int originY, const int availableWidth)
-{
-    QVector<QLayoutItem *> rowItems; // Holds items for the current row
-    int currentXPosition = originX;  // Tracks the x-coordinate while placing items
-    int currentYPosition = originY;  // Tracks the y-coordinate, moving down after each row
-
-    int rowHeight = 0; // Tracks the maximum height of items in the current row
-
-    for (QLayoutItem *item : items) {
-        if (item == nullptr || item->isEmpty()) {
+    for (const QLayoutItem *item : items) {
+        if (!item || item->isEmpty()) {
             continue;
         }
 
-        QSize itemSize = item->sizeHint();                      // The suggested size for the current item
-        int itemWidth = itemSize.width() + horizontalSpacing(); // Item width plus spacing
+        const QSize itemSize = item->sizeHint();
+        // Spacing is only inserted between items, not before the first.
+        const int spaceX = (rowUsedWidth > 0) ? horizontalSpacing() : 0;
 
-        // Check if the current item fits in the remaining width of the current row
-        if (currentXPosition + itemWidth > availableWidth) {
-            // If not, layout the current row and start a new row
-            layoutSingleRow(rowItems, originX, currentYPosition);
-            rowItems.clear();                                  // Reset the list for the new row
-            currentXPosition = originX;                        // Reset x-position to the row's start
-            currentYPosition += rowHeight + verticalSpacing(); // Move y-position down to the next row
-            rowHeight = 0;                                     // Reset row height for the new row
+        if (rowUsedWidth > 0 && rowUsedWidth + spaceX + itemSize.width() > width) {
+            // This item overflows the current row — commit the row and start a new one.
+            totalHeight += rowHeight + verticalSpacing();
+            rowUsedWidth = itemSize.width();
+            rowHeight = itemSize.height();
+        } else {
+            rowUsedWidth += spaceX + itemSize.width();
+            rowHeight = qMax(rowHeight, itemSize.height());
+        }
+    }
+
+    return totalHeight + rowHeight; // Include the final (possibly only) row.
+}
+
+/**
+ * @brief Places all children within @p rect.
+ *
+ * This is the only method that may move/resize children.  It does NOT resize
+ * the parent widget; that would break Qt's layout protocol.
+ */
+void FlowLayout::setGeometry(const QRect &rect)
+{
+    QLayout::setGeometry(rect);
+
+    if (flowDirection == Qt::Horizontal) {
+        layoutAllRows(rect.x(), rect.y(), rect.width());
+    } else {
+        layoutAllColumns(rect.x(), rect.y(), rect.height());
+    }
+}
+
+QSize FlowLayout::sizeHint() const
+{
+    return (flowDirection == Qt::Horizontal) ? calculateSizeHintHorizontal() : calculateSizeHintVertical();
+}
+
+QSize FlowLayout::minimumSize() const
+{
+    return (flowDirection == Qt::Horizontal) ? calculateMinimumSizeHorizontal() : calculateMinimumSizeVertical();
+}
+
+// ─── Row layout (horizontal flow) ────────────────────────────────────────────
+
+/**
+ * @brief Places all items into wrapping rows within @p availableWidth.
+ * @return The y-coordinate of the bottom edge of the last row.
+ */
+int FlowLayout::layoutAllRows(const int originX, const int originY, const int availableWidth)
+{
+    QVector<QLayoutItem *> rowItems;
+    int rowUsedWidth = 0; // Width consumed by items already in the current row.
+    int currentY = originY;
+    int rowHeight = 0;
+
+    for (QLayoutItem *item : items) {
+        if (!item || item->isEmpty()) {
+            continue;
+        }
+
+        const QSize itemSize = item->sizeHint();
+        // No leading space for the first item in a row.
+        const int spaceX = rowItems.isEmpty() ? 0 : horizontalSpacing();
+
+        if (!rowItems.isEmpty() && rowUsedWidth + spaceX + itemSize.width() > availableWidth) {
+            // Current item does not fit — flush the current row, begin a new one.
+            layoutSingleRow(rowItems, originX, currentY, availableWidth);
+            rowItems.clear();
+            currentY += rowHeight + verticalSpacing();
+            rowUsedWidth = 0;
+            rowHeight = 0;
         }
 
         // Add the item to the current row
         rowItems.append(item);
-        rowHeight = qMax(rowHeight, itemSize.height());      // Update the row's height to the tallest item
-        currentXPosition += itemWidth + horizontalSpacing(); // Move x-position for the next item
+        // `rowItems.size() > 1` is equivalent to "this is not the first item in the row"
+        // because we just appended above.
+        rowUsedWidth += (rowItems.size() > 1 ? horizontalSpacing() : 0) + itemSize.width();
+        rowHeight = qMax(rowHeight, itemSize.height());
     }
 
-    // Layout the final row if there are any remaining items
-    layoutSingleRow(rowItems, originX, currentYPosition);
-
-    // Return the total height used, including the last row's height
-    return currentYPosition + rowHeight;
+    layoutSingleRow(rowItems, originX, currentY, availableWidth); // Flush the final row.
+    return currentY + rowHeight;
 }
 
 /**
- * @brief Arranges a single row of items within specified x and y starting positions.
- * @param rowItems A list of items to be arranged in the row.
- * @param x The starting x-coordinate for the row.
- * @param y The starting y-coordinate for the row.
+ * @brief Sets the geometry for every item in @p rowItems, starting at (@p x, @p y).
+ *
+ * Items whose horizontal size policy includes the Expand or MinimumExpanding flag
+ * share the leftover row width proportionally (like QHBoxLayout stretch), so that
+ * e.g. a QLineEdit can fill remaining space while fixed-size buttons stay compact.
+ *
+ * Items without an expanding policy are placed at their sizeHint, clamped to maximumSize.
  */
-void FlowLayout::layoutSingleRow(const QVector<QLayoutItem *> &rowItems, int x, const int y)
+void FlowLayout::layoutSingleRow(const QVector<QLayoutItem *> &rowItems, int x, const int y, const int availableWidth)
 {
+    if (rowItems.isEmpty()) {
+        return;
+    }
+
+    // ── Pass 1: measure fixed width and count expanding items ────────────────
+    int fixedWidth = 0;
+    int expandingCount = 0;
+    int spacingTotal = (rowItems.size() - 1) * horizontalSpacing();
+
     for (QLayoutItem *item : rowItems) {
-        if (item == nullptr || item->isEmpty()) {
+        if (!item || item->isEmpty()) {
             continue;
         }
 
-        // Get the maximum allowed size for the item
-        QSize itemMaxSize = item->widget()->maximumSize();
-        // Constrain the item's width and height to its size hint or maximum size
-        const int itemWidth = qMin(item->sizeHint().width(), itemMaxSize.width());
-        const int itemHeight = qMin(item->sizeHint().height(), itemMaxSize.height());
-        // Set the item's geometry based on the computed size and position
+        QWidget *widget = item->widget();
+        const QSizePolicy::Policy hPolicy = widget ? widget->sizePolicy().horizontalPolicy() : QSizePolicy::Fixed;
+
+        if (hPolicy & QSizePolicy::ExpandFlag) {
+            ++expandingCount;
+        } else {
+            const int maxW = widget ? widget->maximumWidth() : QWIDGETSIZE_MAX;
+            fixedWidth += qMin(item->sizeHint().width(), maxW);
+        }
+    }
+
+    // Extra pixels to share among expanding items (never negative).
+    const int extra = qMax(0, availableWidth - spacingTotal - fixedWidth);
+    const int expandingShare = (expandingCount > 0) ? extra / expandingCount : 0;
+
+    // ── Pass 2: place items ──────────────────────────────────────────────────
+    for (QLayoutItem *item : rowItems) {
+        if (!item || item->isEmpty()) {
+            continue;
+        }
+
+        QWidget *widget = item->widget();
+        if (!widget) {
+            continue;
+        }
+
+        const QSizePolicy::Policy hPolicy = widget->sizePolicy().horizontalPolicy();
+        const QSize maxSize = widget->maximumSize();
+        const bool expands = hPolicy & QSizePolicy::ExpandFlag;
+
+        const int itemWidth =
+            expands ? qMin(expandingShare, maxSize.width()) : qMin(item->sizeHint().width(), maxSize.width());
+        const int itemHeight = qMin(item->sizeHint().height(), maxSize.height());
+
         item->setGeometry(QRect(QPoint(x, y), QSize(itemWidth, itemHeight)));
-        // Move the x-position to the right, leaving space for horizontal spacing
         x += itemWidth + horizontalSpacing();
     }
 }
 
+// ─── Column layout (vertical flow) ───────────────────────────────────────────
+
 /**
- * @brief Lays out items into columns according to the available height, starting from a given origin.
- *        Each column is arranged within `availableHeight`, wrapping to a new column as necessary.
- * @param originX The x-coordinate for the layout start position.
- * @param originY The y-coordinate for the layout start position.
- * @param availableHeight The height within which each column is constrained.
- * @return The total width after arranging all columns.
+ * @brief Places all items into wrapping columns within @p availableHeight.
+ * @return The x-coordinate of the right edge of the last column.
  */
 int FlowLayout::layoutAllColumns(const int originX, const int originY, const int availableHeight)
 {
-    QVector<QLayoutItem *> colItems; // Holds items for the current column
-    int currentXPosition = originX;  // Tracks the x-coordinate while placing items
-    int currentYPosition = originY;  // Tracks the y-coordinate, resetting for each new column
-
-    int colWidth = 0; // Tracks the maximum width of items in the current column
+    QVector<QLayoutItem *> colItems;
+    int colUsedHeight = 0; // Height consumed by items already in the current column.
+    int currentX = originX;
+    int colWidth = 0;
 
     for (QLayoutItem *item : items) {
-        if (item == nullptr || item->isEmpty()) {
+        if (!item || item->isEmpty()) {
             continue;
         }
 
-        QSize itemSize = item->sizeHint(); // The suggested size for the current item
+        const QSize itemSize = item->sizeHint();
+        // No leading space for the first item in a column.
+        const int spaceY = colItems.isEmpty() ? 0 : verticalSpacing();
 
-        // Check if the current item fits in the remaining height of the current column
-        if (currentYPosition + itemSize.height() > availableHeight) {
-            // If not, layout the current column and start a new column
-            layoutSingleColumn(colItems, currentXPosition, originY);
-            colItems.clear();             // Reset the list for the new column
-            currentYPosition = originY;   // Reset y-position to the column's start
-            currentXPosition += colWidth; // Move x-position to the next column
-            colWidth = 0;                 // Reset column width for the new column
+        if (!colItems.isEmpty() && colUsedHeight + spaceY + itemSize.height() > availableHeight) {
+            // Current item does not fit — flush the current column, begin a new one.
+            layoutSingleColumn(colItems, currentX, originY);
+            colItems.clear();
+            currentX += colWidth + horizontalSpacing();
+            colUsedHeight = 0;
+            colWidth = 0;
         }
 
-        // Add the item to the current column
         colItems.append(item);
-        colWidth = qMax(colWidth, itemSize.width()); // Update the column's width to the widest item
-        currentYPosition += itemSize.height();       // Move y-position for the next item
+        colUsedHeight += (colItems.size() > 1 ? verticalSpacing() : 0) + itemSize.height();
+        colWidth = qMax(colWidth, itemSize.width());
     }
 
-    // Layout the final column if there are any remaining items
-    layoutSingleColumn(colItems, currentXPosition, originY);
-
-    // Return the total width used, including the last column's width
-    return currentXPosition + colWidth;
+    layoutSingleColumn(colItems, currentX, originY); // Flush the final column.
+    return currentX + colWidth;
 }
 
 /**
- * @brief Arranges a single column of items within specified x and y starting positions.
- * @param colItems A list of items to be arranged in the column.
- * @param x The starting x-coordinate for the column.
- * @param y The starting y-coordinate for the column.
+ * @brief Sets the geometry for every item in @p colItems, starting at (@p x, @p y).
+ *
+ * Each item is placed at its sizeHint, clamped to its maximumSize.
  */
 void FlowLayout::layoutSingleColumn(const QVector<QLayoutItem *> &colItems, const int x, int y)
 {
     for (QLayoutItem *item : colItems) {
-        if (item == nullptr) {
-            qCDebug(FlowLayoutLog) << "Item is null.";
+        if (!item || item->isEmpty()) {
+            qCDebug(FlowLayoutLog) << "Skipping null or empty item in column.";
             continue;
         }
 
-        if (item->isEmpty()) {
-            qCDebug(FlowLayoutLog) << "Skipping empty item.";
-            continue;
-        }
-
-        // Debugging: Print the item's widget class name and size hint
         QWidget *widget = item->widget();
-        if (widget) {
-            qCDebug(FlowLayoutLog) << "Widget class:" << widget->metaObject()->className();
-            qCDebug(FlowLayoutLog) << "Widget size hint:" << widget->sizeHint();
-            qCDebug(FlowLayoutLog) << "Widget maximum size:" << widget->maximumSize();
-            qCDebug(FlowLayoutLog) << "Widget minimum size:" << widget->minimumSize();
-
-            // Debugging: Print child widgets
-            const QObjectList &children = widget->children();
-            qCDebug(FlowLayoutLog) << "Child widgets:";
-            for (QObject *child : children) {
-                if (QWidget *childWidget = qobject_cast<QWidget *>(child)) {
-                    qCDebug(FlowLayoutLog) << "  - Child widget class:" << childWidget->metaObject()->className();
-                    qCDebug(FlowLayoutLog) << "    Size hint:" << childWidget->sizeHint();
-                    qCDebug(FlowLayoutLog) << "    Maximum size:" << childWidget->maximumSize();
-                }
-            }
-        } else {
-            qCDebug(FlowLayoutLog) << "Item does not have a widget.";
+        if (!widget) {
+            qCDebug(FlowLayoutLog) << "Item has no widget; skipping.";
+            continue;
         }
 
-        // Get the maximum allowed size for the item
-        QSize itemMaxSize = widget->maximumSize();
-        // Constrain the item's width and height to its size hint or maximum size
-        const int itemWidth = qMin(item->sizeHint().width(), itemMaxSize.width());
-        const int itemHeight = qMin(item->sizeHint().height(), itemMaxSize.height());
-        // Debugging: Print the computed geometry
-        qCDebug(FlowLayoutLog) << "Computed geometry: x=" << x << ", y=" << y << ", width=" << itemWidth
-                               << ", height=" << itemHeight;
+        qCDebug(FlowLayoutLog) << "Widget:" << widget->metaObject()->className() << "sizeHint:" << widget->sizeHint()
+                               << "maximumSize:" << widget->maximumSize() << "minimumSize:" << widget->minimumSize();
+
+        const QSize maxSize = widget->maximumSize();
+        const int itemWidth = qMin(item->sizeHint().width(), maxSize.width());
+        const int itemHeight = qMin(item->sizeHint().height(), maxSize.height());
+
+        qCDebug(FlowLayoutLog) << "Placing at x=" << x << "y=" << y << "w=" << itemWidth << "h=" << itemHeight;
 
         // Set the item's geometry based on the computed size and position
         item->setGeometry(QRect(QPoint(x, y), QSize(itemWidth, itemHeight)));
-
-        // Move the y-position down by the item's height to place the next item below
-        y += itemHeight;
+        y += itemHeight + verticalSpacing();
     }
 }
 
 /**
- * @brief Calculates the preferred size of the layout based on the flow direction.
- * @return A QSize representing the ideal dimensions of the layout.
- */
-QSize FlowLayout::sizeHint() const
-{
-    if (flowDirection == Qt::Horizontal) {
-        return calculateSizeHintHorizontal();
-    } else {
-        return calculateSizeHintVertical();
-    }
-}
-
-/**
- * @brief Calculates the minimum size required by the layout based on the flow direction.
- * @return A QSize representing the minimum required dimensions.
- */
-QSize FlowLayout::minimumSize() const
-{
-    if (flowDirection == Qt::Horizontal) {
-        return calculateMinimumSizeHorizontal();
-    } else {
-        return calculateMinimumSizeVertical();
-    }
-}
-
-/**
- * @brief Calculates the size hint for horizontal flow direction.
- * @return A QSize representing the preferred dimensions.
+ * @brief Preferred size for horizontal flow: all items in a single row (unconstrained).
+ *
+ * The actual displayed height is determined by heightForWidth() once Qt knows the
+ * real available width.
  */
 QSize FlowLayout::calculateSizeHintHorizontal() const
 {
-    int maxWidth = 0;     // Tracks the maximum width needed
-    int totalHeight = 0;  // Tracks the total height across all rows
-    int rowHeight = 0;    // Tracks the height of the current row
-    int currentWidth = 0; // Tracks the current row's width
-
-    const int availableWidth = getParentScrollAreaWidth() == 0 ? parentWidget()->width() : getParentScrollAreaWidth();
-
-    qCDebug(FlowLayoutLog) << "Calculating horizontal size hint. Available width:" << availableWidth;
+    int totalWidth = 0;
+    int maxHeight = 0;
 
     for (const QLayoutItem *item : items) {
         if (!item || item->isEmpty()) {
-            qCDebug(FlowLayoutLog) << "Skipping empty item.";
             continue;
         }
-
-        QSize itemSize = item->sizeHint();
-        int itemWidth = itemSize.width() + horizontalSpacing();
-        qCDebug(FlowLayoutLog) << "Processing item. Size:" << itemSize << "Width with spacing:" << itemWidth;
-
-        if (currentWidth + itemWidth > availableWidth) {
-            qCDebug(FlowLayoutLog) << "Row overflow. Current width:" << currentWidth << "Row height:" << rowHeight;
-            maxWidth = qMax(maxWidth, currentWidth);
-            totalHeight += rowHeight + verticalSpacing();
-            qCDebug(FlowLayoutLog) << "Updated total height:" << totalHeight << "Max width so far:" << maxWidth;
-
-            currentWidth = 0;
-            rowHeight = 0;
+        const QSize s = item->sizeHint();
+        if (totalWidth > 0) {
+            totalWidth += horizontalSpacing();
         }
-
-        currentWidth += itemWidth;
-        rowHeight = qMax(rowHeight, itemSize.height());
-        qCDebug(FlowLayoutLog) << "Updated current width:" << currentWidth << "Updated row height:" << rowHeight;
+        totalWidth += s.width();
+        maxHeight = qMax(maxHeight, s.height());
     }
-
-    // Account for the final row
-    maxWidth = qMax(maxWidth, currentWidth);
-    totalHeight += rowHeight;
-    qCDebug(FlowLayoutLog) << "Final total height:" << totalHeight << "Final max width:" << maxWidth;
-
-    return QSize(maxWidth, totalHeight);
+    return QSize(totalWidth, maxHeight);
 }
 
 /**
- * @brief Calculates the minimum size for horizontal flow direction.
- * @return A QSize representing the minimum required dimensions.
+ * @brief Minimum size for horizontal flow: the largest single item.
+ *
+ * This guarantees we can always display at least one item per row.
  */
 QSize FlowLayout::calculateMinimumSizeHorizontal() const
 {
-    int maxWidth = 0;     // Tracks the maximum width of a row
-    int totalHeight = 0;  // Tracks the total height across all rows
-    int rowHeight = 0;    // Tracks the height of the current row
-    int currentWidth = 0; // Tracks the current row's width
+    QSize size(0, 0);
+    for (const QLayoutItem *item : items) {
+        if (!item || item->isEmpty()) {
+            qCDebug(FlowLayoutLog) << "Skipping empty item.";
+            continue;
+        }
+        size = size.expandedTo(item->minimumSize());
+    }
+    return size;
+}
 
-    const int availableWidth = getParentScrollAreaWidth() == 0 ? parentWidget()->width() : getParentScrollAreaWidth();
-
-    qCDebug(FlowLayoutLog) << "Calculating horizontal minimum size. Available width:" << availableWidth;
+/**
+ * @brief Preferred size for vertical flow: all items in a single column (unconstrained).
+ */
+QSize FlowLayout::calculateSizeHintVertical() const
+{
+    int maxWidth = 0;
+    int totalHeight = 0;
 
     for (const QLayoutItem *item : items) {
         if (!item || item->isEmpty()) {
             qCDebug(FlowLayoutLog) << "Skipping empty item.";
             continue;
         }
-
-        QSize itemMinSize = item->minimumSize();
-        int itemWidth = itemMinSize.width() + horizontalSpacing();
-        qCDebug(FlowLayoutLog) << "Processing item. Minimum size:" << itemMinSize << "Width with spacing:" << itemWidth;
-
-        if (currentWidth + itemWidth > availableWidth) {
-            qCDebug(FlowLayoutLog) << "Row overflow. Current width:" << currentWidth << "Row height:" << rowHeight;
-            maxWidth = qMax(maxWidth, currentWidth);
-            totalHeight += rowHeight + verticalSpacing();
-            qCDebug(FlowLayoutLog) << "Updated total height:" << totalHeight << "Max width so far:" << maxWidth;
-
-            currentWidth = 0;
-            rowHeight = 0;
+        const QSize s = item->sizeHint();
+        if (totalHeight > 0) {
+            totalHeight += verticalSpacing();
         }
-
-        currentWidth += itemWidth;
-        rowHeight = qMax(rowHeight, itemMinSize.height());
-        qCDebug(FlowLayoutLog) << "Updated current width:" << currentWidth << "Updated row height:" << rowHeight;
+        totalHeight += s.height();
+        maxWidth = qMax(maxWidth, s.width());
     }
-
-    // Account for the final row
-    maxWidth = qMax(maxWidth, currentWidth);
-    totalHeight += rowHeight;
-    qCDebug(FlowLayoutLog) << "Final total height:" << totalHeight << "Final max width:" << maxWidth;
-
     return QSize(maxWidth, totalHeight);
 }
 
 /**
- * @brief Calculates the size hint for vertical flow direction.
- * @return A QSize representing the preferred dimensions.
- */
-QSize FlowLayout::calculateSizeHintVertical() const
-{
-    int totalWidth = 0;
-    int maxHeight = 0;
-    int colWidth = 0;
-    int currentHeight = 0;
-
-    const int availableHeight = qMax(parentWidget()->height(), getParentScrollAreaHeight());
-
-    qCDebug(FlowLayoutLog) << "Calculating vertical size hint. Available height:" << availableHeight;
-
-    for (const QLayoutItem *item : items) {
-        if (!item || item->isEmpty()) {
-            qCDebug(FlowLayoutLog) << "Skipping empty item.";
-            continue;
-        }
-
-        QSize itemSize = item->sizeHint();
-        qCDebug(FlowLayoutLog) << "Processing item. Size:" << itemSize;
-
-        if (currentHeight + itemSize.height() > availableHeight) {
-            qCDebug(FlowLayoutLog) << "Column overflow. Current height:" << currentHeight
-                                   << "Column width:" << colWidth;
-            totalWidth += colWidth + horizontalSpacing();
-            maxHeight = qMax(maxHeight, currentHeight);
-            qCDebug(FlowLayoutLog) << "Updated total width:" << totalWidth << "Max height so far:" << maxHeight;
-
-            currentHeight = 0;
-            colWidth = 0;
-        }
-
-        currentHeight += itemSize.height() + verticalSpacing();
-        colWidth = qMax(colWidth, itemSize.width());
-        qCDebug(FlowLayoutLog) << "Updated current height:" << currentHeight << "Updated column width:" << colWidth;
-    }
-
-    // Account for the final column
-    totalWidth += colWidth;
-    maxHeight = qMax(maxHeight, currentHeight);
-    qCDebug(FlowLayoutLog) << "Final total width:" << totalWidth << "Final max height:" << maxHeight;
-
-    return QSize(totalWidth, maxHeight);
-}
-
-/**
- * @brief Calculates the minimum size for vertical flow direction.
- * @return A QSize representing the minimum required dimensions.
+ * @brief Minimum size for vertical flow: the largest single item.
  */
 QSize FlowLayout::calculateMinimumSizeVertical() const
 {
-    int totalWidth = 0;    // Tracks the total width across all columns
-    int maxHeight = 0;     // Tracks the maximum height of a column
-    int colWidth = 0;      // Tracks the width of the current column
-    int currentHeight = 0; // Tracks the current column's height
-
-    const int availableHeight = qMax(parentWidget()->height(), getParentScrollAreaHeight());
-
-    qCDebug(FlowLayoutLog) << "Calculating vertical minimum size. Available height:" << availableHeight;
-
+    QSize size(0, 0);
     for (const QLayoutItem *item : items) {
         if (!item || item->isEmpty()) {
             qCDebug(FlowLayoutLog) << "Skipping empty item.";
             continue;
         }
-
-        QSize itemMinSize = item->minimumSize();
-        int itemHeight = itemMinSize.height() + verticalSpacing();
-        qCDebug(FlowLayoutLog) << "Processing item. Minimum size:" << itemMinSize
-                               << "Height with spacing:" << itemHeight;
-
-        if (currentHeight + itemHeight > availableHeight) {
-            qCDebug(FlowLayoutLog) << "Column overflow. Current height:" << currentHeight
-                                   << "Column width:" << colWidth;
-            totalWidth += colWidth + horizontalSpacing();
-            maxHeight = qMax(maxHeight, currentHeight);
-            qCDebug(FlowLayoutLog) << "Updated total width:" << totalWidth << "Max height so far:" << maxHeight;
-
-            currentHeight = 0;
-            colWidth = 0;
-        }
-
-        currentHeight += itemHeight;
-        colWidth = qMax(colWidth, itemMinSize.width());
-        qCDebug(FlowLayoutLog) << "Updated current height:" << currentHeight << "Updated column width:" << colWidth;
+        size = size.expandedTo(item->minimumSize());
     }
-
-    // Account for the final column
-    totalWidth += colWidth;
-    maxHeight = qMax(maxHeight, currentHeight);
-    qCDebug(FlowLayoutLog) << "Final total width:" << totalWidth << "Final max height:" << maxHeight;
-
-    return QSize(totalWidth, maxHeight);
+    return size;
 }
 
 /**
@@ -543,7 +402,7 @@ QSize FlowLayout::calculateMinimumSizeVertical() const
  */
 void FlowLayout::addItem(QLayoutItem *item)
 {
-    if (item != nullptr) {
+    if (item) {
         items.append(item);
     }
 }
@@ -551,11 +410,8 @@ void FlowLayout::addItem(QLayoutItem *item)
 void FlowLayout::insertWidgetAtIndex(QWidget *toInsert, int index)
 {
     addChildWidget(toInsert);
-
-    // We don't want to fail on an index that violates the bounds, so we just clamp it.
-    int boundedIndex = qBound(0, index, qMax(0, static_cast<int>(items.size())));
-    items.insert(boundedIndex, new QWidgetItem(toInsert));
-
+    const int bounded = qBound(0, index, static_cast<int>(items.size()));
+    items.insert(bounded, new QWidgetItem(toInsert));
     invalidate();
 }
 
@@ -613,52 +469,13 @@ int FlowLayout::verticalSpacing() const
  */
 int FlowLayout::smartSpacing(const QStyle::PixelMetric pm) const
 {
-    QObject *parent = this->parent();
-
-    if (!parent) {
+    QObject *p = parent();
+    if (!p) {
         return -1;
     }
-
-    if (parent->isWidgetType()) {
-        const auto *pw = dynamic_cast<QWidget *>(parent);
+    if (p->isWidgetType()) {
+        const auto *pw = static_cast<QWidget *>(p);
         return pw->style()->pixelMetric(pm, nullptr, pw);
     }
-
-    return dynamic_cast<QLayout *>(parent)->spacing();
-}
-
-/**
- * @brief Gets the width of the parent scroll area, if any.
- * @return The width of the scroll area's viewport, or 0 if not found.
- */
-int FlowLayout::getParentScrollAreaWidth() const
-{
-    QWidget *parent = parentWidget();
-
-    while (parent) {
-        if (const auto *scrollArea = qobject_cast<QScrollArea *>(parent)) {
-            return scrollArea->viewport()->width();
-        }
-        parent = parent->parentWidget();
-    }
-
-    return 0;
-}
-
-/**
- * @brief Gets the height of the parent scroll area, if any.
- * @return The height of the scroll area's viewport, or 0 if not found.
- */
-int FlowLayout::getParentScrollAreaHeight() const
-{
-    QWidget *parent = parentWidget();
-
-    while (parent) {
-        if (const auto *scrollArea = qobject_cast<QScrollArea *>(parent)) {
-            return scrollArea->viewport()->height();
-        }
-        parent = parent->parentWidget();
-    }
-
-    return 0;
-}
+    return static_cast<QLayout *>(p)->spacing();
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/layouts/flow_layout.h b/cockatrice/src/interface/layouts/flow_layout.h
index cf109d260..a6e015e3e 100644
--- a/cockatrice/src/interface/layouts/flow_layout.h
+++ b/cockatrice/src/interface/layouts/flow_layout.h
@@ -1,8 +1,10 @@
 /**
  * @file flow_layout.h
  * @ingroup UI
- * @brief TODO: Document this.
+ * @brief A QLayout subclass that arranges child widgets in wrapping rows (horizontal flow)
+ *        or wrapping columns (vertical flow).
  */
+//! \todo Document this file.
 
 #ifndef FLOW_LAYOUT_H
 #define FLOW_LAYOUT_H
@@ -10,8 +12,14 @@
 #include <QLayout>
 #include <QList>
 #include <QLoggingCategory>
-#include <QWidget>
-#include <qstyle.h>
+#include <QSize>
+#include <QStyle>
+#include <QVector>
+#include <qlogging.h>
+#include <qnamespace.h>
+
+class QLayoutItem;
+class QWidget;
 
 inline Q_LOGGING_CATEGORY(FlowLayoutLog, "flow_layout", QtInfoMsg);
 
@@ -19,42 +27,55 @@ class FlowLayout : public QLayout
 {
 public:
     explicit FlowLayout(QWidget *parent = nullptr);
-    FlowLayout(QWidget *parent, Qt::Orientation _flowDirection, int margin = 0, int hSpacing = 0, int vSpacing = 0);
+    FlowLayout(QWidget *parent, Qt::Orientation flowDirection, int margin = 0, int hSpacing = 0, int vSpacing = 0);
     ~FlowLayout() override;
+
     void insertWidgetAtIndex(QWidget *toInsert, int index);
 
-    [[nodiscard]] QSize calculateMinimumSizeHorizontal() const;
-    [[nodiscard]] QSize calculateSizeHintVertical() const;
-    [[nodiscard]] QSize calculateMinimumSizeVertical() const;
+    // QLayout interface
     void addItem(QLayoutItem *item) override;
     [[nodiscard]] int count() const override;
     [[nodiscard]] QLayoutItem *itemAt(int index) const override;
     QLayoutItem *takeAt(int index) override;
-    [[nodiscard]] int horizontalSpacing() const;
+    void setGeometry(const QRect &rect) override;
 
+    // Size negotiation
     [[nodiscard]] Qt::Orientations expandingDirections() const override;
     [[nodiscard]] bool hasHeightForWidth() const override;
     [[nodiscard]] int heightForWidth(int width) const override;
-    [[nodiscard]] int verticalSpacing() const;
-    [[nodiscard]] int doLayout(const QRect &rect, bool testOnly) const;
-    [[nodiscard]] int smartSpacing(QStyle::PixelMetric pm) const;
-    [[nodiscard]] int getParentScrollAreaWidth() const;
-    [[nodiscard]] int getParentScrollAreaHeight() const;
-
-    void setGeometry(const QRect &rect) override;
-    virtual int layoutAllRows(int originX, int originY, int availableWidth);
-    virtual void layoutSingleRow(const QVector<QLayoutItem *> &rowItems, int x, int y);
-    int layoutAllColumns(int originX, int originY, int availableHeight);
-    void layoutSingleColumn(const QVector<QLayoutItem *> &colItems, int x, int y);
     [[nodiscard]] QSize sizeHint() const override;
     [[nodiscard]] QSize minimumSize() const override;
-    [[nodiscard]] QSize calculateSizeHintHorizontal() const;
+
+    // Spacing helpers
+    void setHorizontalMargin(int margin)
+    {
+        horizontalMargin = margin;
+    }
+    [[nodiscard]] int horizontalSpacing() const;
+    void setVerticalMargin(int margin)
+    {
+        verticalMargin = margin;
+    }
+    [[nodiscard]] int verticalSpacing() const;
+    [[nodiscard]] int smartSpacing(QStyle::PixelMetric pm) const;
+
+    // Layout passes (virtual so subclasses can override placement logic)
+    virtual int layoutAllRows(int originX, int originY, int availableWidth);
+    virtual void layoutSingleRow(const QVector<QLayoutItem *> &rowItems, int x, int y, int availableWidth);
+    int layoutAllColumns(int originX, int originY, int availableHeight);
+    void layoutSingleColumn(const QVector<QLayoutItem *> &colItems, int x, int y);
 
 protected:
-    QList<QLayoutItem *> items; // List to store layout items
+    // Size-hint helpers split by direction
+    [[nodiscard]] QSize calculateSizeHintHorizontal() const;
+    [[nodiscard]] QSize calculateMinimumSizeHorizontal() const;
+    [[nodiscard]] QSize calculateSizeHintVertical() const;
+    [[nodiscard]] QSize calculateMinimumSizeVertical() const;
+
+    QList<QLayoutItem *> items;
     Qt::Orientation flowDirection;
-    int horizontalMargin;
-    int verticalMargin;
+    int horizontalMargin; ///< Horizontal spacing between items (-1 = use style default)
+    int verticalMargin;   ///< Vertical spacing between items  (-1 = use style default)
 };
 
 #endif // FLOW_LAYOUT_H
\ No newline at end of file
diff --git a/cockatrice/src/interface/layouts/overlap_layout.cpp b/cockatrice/src/interface/layouts/overlap_layout.cpp
index 9bf5e8468..2b4da9138 100644
--- a/cockatrice/src/interface/layouts/overlap_layout.cpp
+++ b/cockatrice/src/interface/layouts/overlap_layout.cpp
@@ -1,7 +1,15 @@
 #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
@@ -223,7 +231,7 @@ void OverlapLayout::setGeometry(const QRect &rect)
         const int yPos = rect.top() + currentRow * (maxItemHeight - overlapOffsetHeight);
         item->setGeometry(QRect(xPos, yPos, maxItemWidth, maxItemHeight));
 
-        // TODO: Figure this out properly or maybe adjust size hint to account for this?
+        //! \todo Figure this out properly or maybe adjust size hint to account for this.
         // Update row and column indices based on the layout direction.
         if (overlapDirection == Qt::Horizontal) {
             currentColumn++;
diff --git a/cockatrice/src/interface/layouts/overlap_layout.h b/cockatrice/src/interface/layouts/overlap_layout.h
index 5844fca41..32c74c18a 100644
--- a/cockatrice/src/interface/layouts/overlap_layout.h
+++ b/cockatrice/src/interface/layouts/overlap_layout.h
@@ -1,8 +1,8 @@
 /**
  * @file overlap_layout.h
  * @ingroup UI
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef OVERLAP_LAYOUT_H
 #define OVERLAP_LAYOUT_H
@@ -10,7 +10,11 @@
 #include <QLayout>
 #include <QList>
 #include <QLoggingCategory>
-#include <QWidget>
+#include <QSize>
+#include <qnamespace.h>
+
+class QLayoutItem;
+class QWidget;
 
 inline Q_LOGGING_CATEGORY(OverlapLayoutLog, "overlap_layout");
 
diff --git a/cockatrice/src/interface/logger.cpp b/cockatrice/src/interface/logger.cpp
index 37e07acec..87fdcbd8c 100644
--- a/cockatrice/src/interface/logger.cpp
+++ b/cockatrice/src/interface/logger.cpp
@@ -5,9 +5,16 @@
 #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"
@@ -57,31 +64,21 @@ void Logger::openLogfileSession()
         return;
     }
     fileStream.setDevice(&fileHandle);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     fileStream << "Log session started at " << QDateTime::currentDateTime().toString() << Qt::endl;
     fileStream << getClientVersion() << Qt::endl;
     fileStream << getSystemArchitecture() << Qt::endl;
     fileStream << getClientInstallInfo() << Qt::endl;
-#else
-    fileStream << "Log session started at " << QDateTime::currentDateTime().toString() << endl;
-    fileStream << getClientVersion() << endl;
-    fileStream << getSystemArchitecture() << endl;
-    fileStream << getClientInstallInfo() << endl;
-#endif
     logToFileEnabled = true;
 }
 
 void Logger::closeLogfileSession()
 {
-    if (!logToFileEnabled)
+    if (!logToFileEnabled) {
         return;
+    }
 
     logToFileEnabled = false;
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     fileStream << "Log session closed at " << QDateTime::currentDateTime().toString() << Qt::endl;
-#else
-    fileStream << "Log session closed at " << QDateTime::currentDateTime().toString() << endl;
-#endif
     fileHandle.close();
 }
 
@@ -103,11 +100,7 @@ void Logger::internalLog(const QString &message)
     std::cerr << message.toStdString() << std::endl; // Print to stdout
 
     if (logToFileEnabled) {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
         fileStream << message << Qt::endl; // Print to fileStream
-#else
-        fileStream << message << endl; // Print to fileStream
-#endif
     }
 }
 
diff --git a/cockatrice/src/interface/logger.h b/cockatrice/src/interface/logger.h
index 59244e226..2287da804 100644
--- a/cockatrice/src/interface/logger.h
+++ b/cockatrice/src/interface/logger.h
@@ -1,17 +1,22 @@
 /**
  * @file logger.h
  * @ingroup Core
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef LOGGER_H
 #define LOGGER_H
 
 #include <QFile>
+#include <QList>
 #include <QMutex>
+#include <QObject>
 #include <QString>
 #include <QTextStream>
-#include <QVector>
+#include <qlogging.h>
+#include <qprocessordetection.h>
+#include <qtmetamacros.h>
+#include <string>
 
 #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
new file mode 100644
index 000000000..a7db23d31
--- /dev/null
+++ b/cockatrice/src/interface/palette_editor/color_button.cpp
@@ -0,0 +1,84 @@
+#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)
+{
+    setFixedSize(52, 24);
+    setCursor(Qt::PointingHandCursor);
+    setToolTip(tr("Click to pick a color"));
+    connect(this, &QToolButton::clicked, this, &ColorButton::pickColor);
+}
+
+void ColorButton::setColor(const QColor &c)
+{
+    if (color == c) {
+        return;
+    }
+    color = c;
+    updateSwatch();
+    emit colorChanged(c);
+}
+
+void ColorButton::pickColor()
+{
+    QColor chosen = QColorDialog::getColor(color, this, tr("Pick colour"), QColorDialog::ShowAlphaChannel);
+    if (chosen.isValid()) {
+        setColor(chosen);
+    }
+}
+
+void ColorButton::updateSwatch()
+{
+    QPixmap pixmap(size() * devicePixelRatioF());
+    pixmap.setDevicePixelRatio(devicePixelRatioF());
+    pixmap.fill(Qt::transparent);
+    QPainter painter(&pixmap);
+    painter.setRenderHint(QPainter::Antialiasing);
+
+    // Checkerboard for alpha
+    const int cellSize = 4;
+    for (int y = 0; y < height(); y += cellSize) {
+        for (int x = 0; x < width(); x += cellSize) {
+            painter.fillRect(x, y, cellSize, cellSize,
+                             ((x / cellSize + y / cellSize) % 2) ? QColor(180, 180, 180) : Qt::white);
+        }
+    }
+
+    // Color fill
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(color);
+    painter.drawRoundedRect(QRectF(0.5, 0.5, width() - 1, height() - 1), 3, 3);
+
+    // Border
+    QColor border = palette().color(QPalette::Shadow);
+    border.setAlpha(180);
+    painter.setPen(QPen(border, 1));
+    painter.setBrush(Qt::NoBrush);
+    painter.drawRoundedRect(QRectF(0.5, 0.5, width() - 1, height() - 1), 3, 3);
+
+    // Hex label — black or white for contrast
+    int luma = 0.299 * color.red() + 0.587 * color.green() + 0.114 * color.blue();
+    painter.setPen((luma > 128 && color.alpha() > 80) ? QColor(0, 0, 0, 180) : QColor(255, 255, 255, 200));
+    QFont f = font();
+    f.setPixelSize(8);
+    painter.setFont(f);
+    painter.drawText(rect(), Qt::AlignCenter, color.name().toUpper());
+
+    setIcon(QIcon(pixmap));
+    setIconSize(size());
+    setText({});
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/palette_editor/color_button.h b/cockatrice/src/interface/palette_editor/color_button.h
new file mode 100644
index 000000000..f9991ec6b
--- /dev/null
+++ b/cockatrice/src/interface/palette_editor/color_button.h
@@ -0,0 +1,33 @@
+#ifndef COCKATRICE_COLOR_BUTTON_H
+#define COCKATRICE_COLOR_BUTTON_H
+
+#include <QColor>
+#include <QToolButton>
+#include <qtmetamacros.h>
+
+class QWidget;
+
+class ColorButton : public QToolButton
+{
+    Q_OBJECT
+public:
+    explicit ColorButton(QWidget *parent = nullptr);
+
+    QColor getColor() const
+    {
+        return color;
+    }
+    void setColor(const QColor &c);
+
+signals:
+    void colorChanged(const QColor &color);
+
+private slots:
+    void pickColor();
+
+private:
+    void updateSwatch();
+    QColor color;
+};
+
+#endif // COCKATRICE_COLOR_BUTTON_H
\ No newline at end of file
diff --git a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp b/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
new file mode 100644
index 000000000..20e16614a
--- /dev/null
+++ b/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp
@@ -0,0 +1,387 @@
+#include "palette_editor_dialog.h"
+
+#include "../theme_config.h"
+#include "../theme_manager.h"
+#include "palette_generator.h"
+#include "palette_grid_widget.h"
+#include "quick_setup_panel.h"
+
+#include <QApplication>
+#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)
+{
+    setMinimumSize(740, 220);
+    setupUi();
+
+    // Resolve a writable directory for saving. Built-in (Default / Fusion) and
+    // other read-only theme directories must be customised in the user-writable
+    // themes directory; otherwise the write would fail or be lost on upgrade.
+    saveDir = ThemeManager::writableThemeDir(themeName);
+
+    // Load both scheme configs upfront so switching is instant
+    loadSchemes();
+
+    loadedScheme = themeManager->isDarkMode(themeDirPath) ? "Dark" : "Light";
+
+    schemeComboBox->blockSignals(true);
+    schemeComboBox->setCurrentText(loadedScheme);
+    schemeComboBox->blockSignals(false);
+
+    paletteGrid->blockSignals(true);
+    paletteGrid->loadPalette(workingConfig[loadedScheme]);
+    paletteGrid->blockSignals(false);
+    seedAccentFromScheme(loadedScheme);
+
+    retranslateUi();
+}
+
+void PaletteEditorDialog::setupUi()
+{
+    auto *root = new QVBoxLayout(this);
+    root->setSpacing(0);
+    root->setContentsMargins(0, 0, 0, 0);
+
+    // Header
+    header = new QWidget;
+    header->setAutoFillBackground(true);
+    {
+        QPalette hp = header->palette();
+        hp.setColor(QPalette::Window, qApp->palette().color(QPalette::Window).darker(108));
+        header->setPalette(hp);
+    }
+    auto *headerLayout = new QHBoxLayout(header);
+    headerLayout->setContentsMargins(12, 8, 12, 8);
+
+    titleLabel = new QLabel(this);
+    titleLabel->setTextFormat(Qt::RichText);
+
+    editingLabel = new QLabel(this);
+
+    schemeComboBox = new QComboBox;
+    schemeComboBox->addItems({"Light", "Dark"});
+    schemeComboBox->setFixedWidth(90);
+
+    headerLayout->addWidget(titleLabel);
+    headerLayout->addStretch();
+    headerLayout->addWidget(editingLabel);
+    headerLayout->addWidget(schemeComboBox);
+    root->addWidget(header);
+
+    auto makeSeparator = [&]() {
+        auto *sep = new QFrame;
+        sep->setFrameShape(QFrame::HLine);
+        sep->setFrameShadow(QFrame::Plain);
+        sep->setFixedHeight(1);
+        return sep;
+    };
+
+    root->addWidget(makeSeparator());
+
+    // Quick Setup panel
+    quickSetupPanel = new QuickSetupPanel;
+    quickSetupPanel->setAutoFillBackground(true);
+
+    QPalette sp = quickSetupPanel->palette();
+    sp.setColor(QPalette::Window, qApp->palette().color(QPalette::Window).darker(102));
+    quickSetupPanel->setPalette(sp);
+
+    root->addWidget(quickSetupPanel);
+    root->addWidget(makeSeparator());
+
+    // Toggle button — acts as a section header for the advanced area
+    paletteGridToggleButton = new QPushButton(this);
+    paletteGridToggleButton->setCheckable(true);
+    paletteGridToggleButton->setChecked(false);
+    paletteGridToggleButton->setFlat(true);
+    paletteGridToggleButton->setStyleSheet("QPushButton { text-align: left; padding: 5px 12px; font-weight: bold; }"
+                                           "QPushButton:checked { }");
+    root->addWidget(paletteGridToggleButton);
+
+    // Separator + grid start hidden; revealed by the toggle
+    paletteGridSeparator = makeSeparator();
+    paletteGridSeparator->setVisible(false);
+    root->addWidget(paletteGridSeparator);
+
+    paletteGrid = new PaletteGridWidget;
+    paletteGrid->setVisible(false);
+    root->addWidget(paletteGrid, 1);
+
+    // Footer
+    root->addWidget(makeSeparator());
+    footer = new QWidget;
+    footer->setAutoFillBackground(true);
+    {
+        QPalette fp = footer->palette();
+        fp.setColor(QPalette::Window, qApp->palette().color(QPalette::Window).darker(104));
+        footer->setPalette(fp);
+    }
+    auto *footerLayout = new QHBoxLayout(footer);
+    footerLayout->setContentsMargins(12, 8, 12, 8);
+
+    revertButton = new QPushButton(this);
+
+    buttonBox = new QDialogButtonBox;
+    resetBtn = buttonBox->addButton(tr("Reset"), QDialogButtonBox::ResetRole);
+    saveBtn = buttonBox->addButton(tr("Save"), QDialogButtonBox::AcceptRole);
+    closeBtn = buttonBox->addButton(QDialogButtonBox::Close);
+
+    footerLayout->addWidget(revertButton);
+    footerLayout->addStretch();
+    footerLayout->addWidget(buttonBox);
+    root->addWidget(footer);
+
+    // Connections
+    connect(schemeComboBox, &QComboBox::currentTextChanged, this, &PaletteEditorDialog::onSchemeChanged);
+    autoApplyTimer = new QTimer(this);
+    autoApplyTimer->setSingleShot(true);
+    autoApplyTimer->setInterval(150);
+    connect(autoApplyTimer, &QTimer::timeout, this, &PaletteEditorDialog::onApply);
+    connect(quickSetupPanel, &QuickSetupPanel::valueChanged, this, &PaletteEditorDialog::onGenerateFromAccent);
+    connect(paletteGrid, &PaletteGridWidget::paletteChanged, this, [this] { autoApplyTimer->start(); });
+    connect(revertButton, &QPushButton::clicked, this, &PaletteEditorDialog::onRevertToDefault);
+    connect(resetBtn, &QPushButton::clicked, this, &PaletteEditorDialog::onReset);
+    connect(saveBtn, &QPushButton::clicked, this, &PaletteEditorDialog::onSave);
+    connect(closeBtn, &QPushButton::clicked, this, &QDialog::reject);
+
+    connect(paletteGridToggleButton, &QPushButton::toggled, this, [this](bool open) {
+        paletteGridToggleButton->setText(open ? tr("▼  Edit Palette") : tr("▶  Edit Palette"));
+        paletteGridSeparator->setVisible(open);
+        paletteGrid->setVisible(open);
+
+        if (open) {
+            setMinimumHeight(680);
+            resize(width(), 680);
+        } else {
+            setMinimumHeight(220);
+            adjustSize(); // shrinks to fit just the visible content
+        }
+    });
+}
+
+void PaletteEditorDialog::retranslateUi()
+{
+    setWindowTitle(tr("Palette Editor — %1").arg(themeName));
+    titleLabel->setText(tr("<b>Palette Editor</b> &nbsp;·&nbsp; %1").arg(themeName));
+
+    revertButton->setToolTip(
+        tr("Delete this scheme's custom palette and revert to the theme default (or the application palette)"));
+
+    schemeComboBox->setToolTip(tr("Switch between the light and dark palette files"));
+    editingLabel->setText(tr("Editing:"));
+    paletteGridToggleButton->setText(tr("▶  Edit Palette"));
+    paletteGridToggleButton->setToolTip(tr("Show or hide the per-role colour grid for manual tweaks"));
+    revertButton->setText(tr("↺  Revert to theme default"));
+
+    resetBtn->setText(tr("Reset"));
+    saveBtn->setText(tr("Save"));
+    resetBtn->setToolTip(tr("Discard unsaved edits and restore the last saved palette"));
+    saveBtn->setToolTip(tr("Write palette-%1.toml and reload the theme").arg(loadedScheme.toLower()));
+
+    if (saveDir.isEmpty() || !ThemeManager::isDirReallyWritable(saveDir)) {
+        saveBtn->setEnabled(false);
+        saveBtn->setToolTip(tr("Cannot save: this theme has no writable directory"));
+    }
+}
+
+void PaletteEditorDialog::loadSchemes()
+{
+    const QStringList schemes = {"Light", "Dark"};
+    for (const QString &scheme : schemes) {
+        PaletteConfig cfg = PaletteConfig::fromScheme(themeDirPath, scheme);
+
+        if (!cfg.hasPalette()) {
+            cfg = ThemeManager::loadDefaultPaletteConfig(themeDirPath, themeName, scheme);
+        }
+
+        if (!cfg.hasPalette()) {
+            const QPalette appPal = qApp->palette();
+            for (auto group : {QPalette::Active, QPalette::Disabled, QPalette::Inactive}) {
+                for (int i = 0; i < QPalette::NColorRoles; ++i) {
+                    auto role = static_cast<QPalette::ColorRole>(i);
+                    if (role != QPalette::NoRole) {
+                        cfg.colors[group][role] = appPal.color(group, role);
+                    }
+                }
+            }
+        }
+        savedConfig[scheme] = cfg;
+        workingConfig[scheme] = cfg;
+    }
+}
+
+void PaletteEditorDialog::seedAccentFromScheme(const QString &scheme)
+{
+    QColor seed = workingConfig.value(scheme).colors.value(QPalette::Active).value(QPalette::Highlight);
+    if (seed.isValid()) {
+        quickSetupPanel->setAccentColor(seed);
+    }
+}
+
+void PaletteEditorDialog::onSchemeChanged(const QString &scheme)
+{
+    // Snapshot unsaved edits for the scheme we're leaving
+    if (!loadedScheme.isEmpty()) {
+        workingConfig[loadedScheme] = paletteGrid->currentPaletteConfig();
+    }
+
+    loadedScheme = scheme;
+    paletteGrid->loadPalette(workingConfig.value(scheme));
+    seedAccentFromScheme(scheme);
+}
+
+void PaletteEditorDialog::onGenerateFromAccent(const QColor &accent, int intensity)
+{
+    PaletteConfig cfg = PaletteGenerator::fromAccent(accent, intensity, loadedScheme);
+    workingConfig[loadedScheme] = cfg;
+    paletteGrid->loadPalette(cfg);
+}
+
+void PaletteEditorDialog::onApply()
+{
+    themeManager->previewPalette(paletteGrid->currentPaletteConfig(), loadedScheme);
+}
+
+void PaletteEditorDialog::onSave()
+{
+    if (loadedScheme.isEmpty()) {
+        return;
+    }
+
+    // Snapshot the currently displayed scheme so unsaved edits are not lost.
+    workingConfig[loadedScheme] = paletteGrid->currentPaletteConfig();
+
+    // Persist every scheme that changed, not just the one on screen. Each scheme
+    // has its own file, so edits to the non-active scheme would otherwise be
+    // silently discarded when the dialog closes.
+    //
+    // Save the loaded scheme last so commitPalette's global colour-scheme
+    // update (ThemeConfig::colorScheme) points at the active scheme.
+    for (auto it = workingConfig.begin(); it != workingConfig.end(); ++it) {
+        if (it.key() == loadedScheme) {
+            continue;
+        }
+        if (it.value() == savedConfig.value(it.key())) {
+            continue;
+        }
+        if (!ThemeManager::commitPalette(saveDir, it.key(), it.value())) {
+            QMessageBox::warning(this, tr("Save failed"),
+                                 tr("Could not write %1 to:\n%2").arg(PaletteConfig::fileName(it.key()), saveDir));
+            return;
+        }
+    }
+
+    // Commit the active scheme last so the global colour scheme matches.
+    if (workingConfig[loadedScheme] != savedConfig.value(loadedScheme)) {
+        if (!ThemeManager::commitPalette(saveDir, loadedScheme, workingConfig[loadedScheme])) {
+            QMessageBox::warning(this, tr("Save failed"),
+                                 tr("Could not write %1 to:\n%2").arg(PaletteConfig::fileName(loadedScheme), saveDir));
+            return;
+        }
+    } else {
+        // No palette change but scheme may have switched -- still update global config.
+        ThemeConfig globalCfg = ThemeConfig::fromThemeDir(saveDir);
+        globalCfg.colorScheme = loadedScheme;
+        globalCfg.save(saveDir);
+    }
+
+    // Keep the saved snapshot in sync so Reset behaves correctly afterwards.
+    for (auto it = workingConfig.begin(); it != workingConfig.end(); ++it) {
+        savedConfig[it.key()] = it.value();
+    }
+
+    themeManager->reloadCurrentTheme();
+    accept();
+}
+
+void PaletteEditorDialog::onReset()
+{
+    workingConfig[loadedScheme] = savedConfig[loadedScheme];
+    paletteGrid->loadPalette(savedConfig[loadedScheme]);
+    seedAccentFromScheme(loadedScheme);
+}
+
+void PaletteEditorDialog::onRevertToDefault()
+{
+    // Delete this scheme's custom palette file so the theme falls back to its
+    // default (or, when it ships none, the application palette).
+    // Note: shipped defaults use palette-default-<scheme>.toml so this only
+    // removes user-written custom palette files; the theme author's defaults
+    // are left untouched.
+    QFile::remove(QDir(saveDir).absoluteFilePath(PaletteConfig::fileName(loadedScheme)));
+
+    // Reload the live theme so the revert takes effect immediately.
+    themeManager->reloadCurrentTheme();
+
+    // Reflect the resolved palette (theme default, else current app palette) in
+    // the editor so it no longer shows the deleted custom colours.
+    PaletteConfig def = ThemeManager::loadDefaultPaletteConfig(themeDirPath, themeName, loadedScheme);
+    if (!def.hasPalette()) {
+        const QPalette appPal = qApp->palette();
+        for (auto group : {QPalette::Active, QPalette::Disabled, QPalette::Inactive}) {
+            for (int i = 0; i < QPalette::NColorRoles; ++i) {
+                auto role = static_cast<QPalette::ColorRole>(i);
+                if (role != QPalette::NoRole) {
+                    def.colors[group][role] = appPal.color(group, role);
+                }
+            }
+        }
+    }
+
+    savedConfig[loadedScheme] = def;
+    workingConfig[loadedScheme] = def;
+    paletteGrid->loadPalette(def);
+    seedAccentFromScheme(loadedScheme);
+}
+
+void PaletteEditorDialog::changeEvent(QEvent *e)
+{
+    if (e->type() == QEvent::PaletteChange) {
+        QTimer::singleShot(0, this, &PaletteEditorDialog::refreshChromePalettes);
+    }
+
+    QDialog::changeEvent(e);
+}
+
+void PaletteEditorDialog::refreshChromePalettes()
+{
+    const QPalette base = qApp->palette();
+
+    if (header) {
+        QPalette hp = header->palette();
+        hp.setColor(QPalette::Window, base.color(QPalette::Window).darker(108));
+        header->setPalette(hp);
+        header->update();
+    }
+    if (footer) {
+        QPalette fp = footer->palette();
+        fp.setColor(QPalette::Window, base.color(QPalette::Window).darker(104));
+        footer->setPalette(fp);
+        footer->update();
+    }
+    if (quickSetupPanel) {
+        QPalette sp = quickSetupPanel->palette();
+        sp.setColor(QPalette::Window, base.color(QPalette::Window).darker(102));
+        quickSetupPanel->setPalette(sp);
+        quickSetupPanel->update();
+    }
+}
diff --git a/cockatrice/src/interface/palette_editor/palette_editor_dialog.h b/cockatrice/src/interface/palette_editor/palette_editor_dialog.h
new file mode 100644
index 000000000..e29a70cb0
--- /dev/null
+++ b/cockatrice/src/interface/palette_editor/palette_editor_dialog.h
@@ -0,0 +1,77 @@
+#ifndef COCKATRICE_PALETTE_EDITOR_DIALOG_H
+#define COCKATRICE_PALETTE_EDITOR_DIALOG_H
+
+#include "../theme_config.h"
+
+#include <QColor>
+#include <QDialog>
+#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
+{
+    Q_OBJECT
+public:
+    explicit PaletteEditorDialog(const QString &themeDirPath, const QString &themeName, QWidget *parent = nullptr);
+    void loadSchemes();
+
+private slots:
+    void onSave();
+    void onApply();
+    void onReset();
+    void onRevertToDefault();
+    void onSchemeChanged(const QString &scheme);
+    void onGenerateFromAccent(const QColor &accent, int intensity);
+
+private:
+    void setupUi();
+    void retranslateUi();
+    void refreshChromePalettes();
+    void loadScheme(const QString &scheme); // snapshot current, switch, load
+    void seedAccentFromScheme(const QString &scheme);
+
+    // Sub-widgets
+    QWidget *header;
+    QLabel *titleLabel;
+    QLabel *editingLabel;
+    QuickSetupPanel *quickSetupPanel = nullptr;
+    PaletteGridWidget *paletteGrid = nullptr;
+    QPushButton *paletteGridToggleButton = nullptr;
+    QFrame *paletteGridSeparator = nullptr;
+    QWidget *footer;
+    QComboBox *schemeComboBox = nullptr;
+    QDialogButtonBox *buttonBox = nullptr;
+    QPushButton *resetBtn = nullptr;
+    QPushButton *saveBtn = nullptr;
+    QPushButton *closeBtn = nullptr;
+    QPushButton *revertButton = nullptr;
+
+    // State
+    QString themeDirPath;
+    QString themeName;
+    QString loadedScheme;
+    // Directory writes are directed to; may differ from themeDirPath when the
+    // latter is read-only (e.g. a built-in / system theme directory).
+    QString saveDir;
+
+    QMap<QString, PaletteConfig> workingConfig;
+    QMap<QString, PaletteConfig> savedConfig;
+
+    QTimer *autoApplyTimer = nullptr;
+
+protected:
+    void changeEvent(QEvent *e) override;
+};
+
+#endif // COCKATRICE_PALETTE_EDITOR_DIALOG_H
\ No newline at end of file
diff --git a/cockatrice/src/interface/palette_editor/palette_generator.cpp b/cockatrice/src/interface/palette_editor/palette_generator.cpp
new file mode 100644
index 000000000..c98dcbe03
--- /dev/null
+++ b/cockatrice/src/interface/palette_editor/palette_generator.cpp
@@ -0,0 +1,218 @@
+#include "palette_generator.h"
+
+#include "../theme_config.h"
+
+#include <QColor>
+#include <QMap>
+#include <QPalette>
+#include <QtGlobal>
+#include <qnamespace.h>
+#include <qnumeric.h>
+
+// ════════════════════════════════════════════════════════════════════════════
+//  PaletteGenerator::fromAccent
+//
+//  Three intensity bands:
+//    0–30   Subtle   — Highlight / links / BrightText take on the hue;
+//                      backgrounds stay neutral grey.
+//    30–70  Accented — Button, ToolTipBase, AlternateBase, shading tint in;
+//                      backgrounds get a faint hue wash.
+//    70–100 Chromatic— Window and Base pick up real saturation; the whole
+//                      application reads as that colour, text stays readable.
+//
+//  Key principles:
+//  • Quadratic saturation curve: low end feels truly subtle, top is vivid.
+//  • Each role has its own saturation ceiling; buttons always pop above window.
+//  • Base stays near-white / near-black regardless of intensity for legibility.
+//  • Button text contrast is computed from the real button color, not assumed.
+//  • Tooltip blends from classic yellow to hue-tinted above intensity ~25.
+//  • 3D shading ladder (Light→Shadow) carries the same hue for coherence.
+//  • Disabled: text → mid-gray, backgrounds → match Window.
+//  • Inactive Highlight fades to a near-bg tone so it doesn't compete.
+// ════════════════════════════════════════════════════════════════════════════
+
+namespace PaletteGenerator
+{
+
+PaletteConfig fromAccent(const QColor &accent, int intensity, const QString &scheme)
+{
+    PaletteConfig cfg;
+    const bool dark = scheme.compare("Dark", Qt::CaseInsensitive) == 0;
+    const double t = intensity / 100.0; // 0.0 – 1.0
+
+    int h = accent.hslHue();
+    const bool achromatic = (h < 0);
+    if (achromatic) {
+        h = 0;
+    }
+
+    // Saturation budgets
+    // Quadratic ease-in means the subtle end is genuinely subtle and the
+    // full end is bold without being garish.
+    auto sat = [&](double maxSat) -> int {
+        if (achromatic) {
+            return 0;
+        }
+        return qRound(maxSat * t * t);
+    };
+
+    const int satWindow = sat(dark ? 80.0 : 90.0);
+    const int satBase = sat(dark ? 25.0 : 20.0); // text areas stay near-white/black
+    const int satAlt = sat(dark ? 90.0 : 100.0);
+    const int satButton = sat(dark ? 120.0 : 130.0); // buttons pop above the bg
+    const int satTooltip = sat(dark ? 90.0 : 80.0);
+    const int satHighlight = achromatic ? 0 : qRound(accent.hslSaturation() * (0.45 + 0.55 * t));
+    const int satShadeHi = sat(dark ? 60.0 : 50.0); // Light / Midlight
+    const int satShadeLo = sat(dark ? 90.0 : 70.0); // Mid / Dark
+
+    // Per-role lightness
+    // Nudge lightness slightly as saturation rises to compensate for the
+    // Helmholtz-Kohlrausch effect (saturated colors look lighter/heavier).
+    const int winL = dark ? (28 + qRound(t * 8)) : (242 - qRound(t * 6));
+    const int baseL = dark ? (43 + qRound(t * 6)) : 252;
+    const int altL = dark ? (36 + qRound(t * 9)) : (234 - qRound(t * 5));
+    const int btnL = dark ? (56 + qRound(t * 10)) : (230 - qRound(t * 10));
+    const int tipL = dark ? (52 + qRound(t * 8)) : (248 - qRound(t * 6));
+
+    // Highlight color
+    QColor hl;
+    if (achromatic) {
+        hl = dark ? QColor(105, 105, 105) : QColor(95, 95, 95);
+    } else if (dark) {
+        int L = qBound(105, accent.lightness() + qRound(45.0 * (1.0 - t)), 215);
+        hl = QColor::fromHsl(h, qMin(255, satHighlight), L);
+    } else {
+        int L = qBound(50, accent.lightness() - qRound(25.0 * t), 180);
+        hl = QColor::fromHsl(h, qMin(255, satHighlight), L);
+    }
+    const double hlLuma = 0.299 * hl.red() + 0.587 * hl.green() + 0.114 * hl.blue();
+    const QColor hlText = (hlLuma > 135) ? Qt::black : Qt::white;
+
+    // Local helpers
+    using CR = QPalette::ColorRole;
+    using CG = QPalette::ColorGroup;
+
+    auto hsl = [&](int lightness, int s) -> QColor {
+        return QColor::fromHsl(h, qBound(0, s, 255), qBound(0, lightness, 255));
+    };
+
+    auto textOn = [](const QColor &bg) -> QColor {
+        double luma = 0.299 * bg.red() + 0.587 * bg.green() + 0.114 * bg.blue();
+        return (luma > 135) ? Qt::black : Qt::white;
+    };
+
+    auto set3 = [&](CR role, QColor active, QColor disabled, QColor inactive) {
+        cfg.colors[CG::Active][role] = active;
+        cfg.colors[CG::Disabled][role] = disabled;
+        cfg.colors[CG::Inactive][role] = inactive;
+    };
+
+    auto setAll = [&](CR role, QColor c) { set3(role, c, c, c); };
+
+    // Tooltip: blend classic yellow → hue-tinted above t≈0.20
+    QColor bg_tip;
+    if (achromatic || t < 0.20) {
+        bg_tip = QColor(255, 255, 220);
+    } else {
+        QColor tinted = hsl(tipL, satTooltip);
+        double blend = qMin(1.0, (t - 0.20) / 0.55);
+        QColor yellow(255, 255, 220);
+        bg_tip = QColor(qRound(yellow.red() * (1.0 - blend) + tinted.red() * blend),
+                        qRound(yellow.green() * (1.0 - blend) + tinted.green() * blend),
+                        qRound(yellow.blue() * (1.0 - blend) + tinted.blue() * blend));
+    }
+
+    // Backgrounds
+    const QColor bg_win = hsl(winL, satWindow);
+    const QColor bg_base = hsl(baseL, satBase);
+    const QColor bg_alt = hsl(altL, satAlt);
+    const QColor bg_btn = hsl(btnL, satButton);
+
+    set3(CR::Window, bg_win, bg_win, bg_win);
+    set3(CR::Base, bg_base, bg_win, bg_base);
+    set3(CR::AlternateBase, bg_alt, bg_alt, bg_alt);
+    set3(CR::Button, bg_btn, bg_win, bg_btn);
+    set3(CR::ToolTipBase, bg_tip, bg_tip, bg_tip);
+
+    // Foreground text
+    const QColor winText = dark ? Qt::white : Qt::black;
+    const QColor disText = dark ? QColor(157, 157, 157) : QColor(120, 120, 120);
+    const QColor disBtnText = dark ? QColor(120, 120, 120) : QColor(150, 150, 150);
+
+    set3(CR::WindowText, winText, disText, winText);
+    set3(CR::Text, winText, disText, winText);
+    set3(CR::ButtonText, textOn(bg_btn), disBtnText, textOn(bg_btn));
+    setAll(CR::ToolTipText, textOn(bg_tip));
+
+    const QColor phAlpha = dark ? QColor(255, 255, 255, 110) : QColor(0, 0, 0, 110);
+    const QColor phDis = dark ? QColor(255, 255, 255, 70) : QColor(0, 0, 0, 70);
+    set3(CR::PlaceholderText, phAlpha, phDis, phAlpha);
+
+    // Highlight / selection
+    const QColor inactiveHl = hsl(winL + (dark ? 14 : -10), satWindow);
+    cfg.colors[CG::Active][CR::Highlight] = hl;
+    cfg.colors[CG::Disabled][CR::Highlight] = inactiveHl;
+    cfg.colors[CG::Inactive][CR::Highlight] = inactiveHl;
+    cfg.colors[CG::Active][CR::HighlightedText] = hlText;
+    cfg.colors[CG::Disabled][CR::HighlightedText] = disText;
+    cfg.colors[CG::Inactive][CR::HighlightedText] = dark ? Qt::white : Qt::black;
+
+    // Accent: same primary hue as Highlight, so palettes derived from a
+    // QuickSetup accent always carry a matching Accent role.
+#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+    set3(CR::Accent, hl, disText, hl);
+#endif
+
+    // Application role colors: Strong tracks the primary accent, while Soft is
+    // the lightened, desaturated companion used for button-gradient highlights.
+    cfg.appColors[AppColor::AccentStrong] = hl;
+    cfg.appColors[AppColor::AccentSoft] = hsl(accent.lightness() + 60, qRound(accent.hslSaturation() * 70 / 100.0));
+
+    // BrightText
+    QColor bright;
+    if (achromatic) {
+        bright = dark ? Qt::white : Qt::black;
+    } else if (dark) {
+        bright = QColor::fromHsl(h, qMin(255, satHighlight + 25), qMin(235, hl.lightness() + 50));
+    } else {
+        bright = Qt::white;
+    }
+    setAll(CR::BrightText, bright);
+
+    // Links
+    QColor link, linkV;
+    if (achromatic) {
+        link = dark ? QColor(100, 200, 255) : QColor(0, 0, 210);
+        linkV = dark ? QColor(200, 100, 255) : QColor(128, 0, 180);
+    } else if (dark) {
+        link = QColor::fromHsl(h, qMin(255, satHighlight), qMin(230, hl.lightness() + 75));
+        linkV = QColor::fromHsl((h + 30) % 360, qMin(255, satHighlight), qMin(215, hl.lightness() + 55));
+    } else {
+        link = QColor::fromHsl(h, qMin(255, satHighlight), qMax(40, hl.lightness() - 75));
+        linkV = QColor::fromHsl((h + 30) % 360, qMin(255, satHighlight), qMax(30, hl.lightness() - 95));
+    }
+    set3(CR::Link, link, dark ? QColor(48, 140, 198) : QColor(0, 0, 255), link);
+    set3(CR::LinkVisited, linkV, dark ? QColor(180, 80, 255) : QColor(255, 0, 255), linkV);
+
+    // 3D / frame shading
+    if (dark) {
+        setAll(CR::Light, hsl(115, qMin(255, satShadeHi)));
+        setAll(CR::Midlight, hsl(82, qMin(255, satShadeHi)));
+        setAll(CR::Mid, hsl(37, satShadeLo));
+        setAll(CR::Dark, hsl(22, satShadeLo));
+        setAll(CR::Shadow, Qt::black);
+    } else {
+        setAll(CR::Light, Qt::white);
+        setAll(CR::Midlight, hsl(226, qMin(255, satShadeHi)));
+        setAll(CR::Mid, hsl(158, satShadeLo));
+        setAll(CR::Dark, hsl(148, satShadeLo));
+        // Shadow stays neutral — tinting it makes the UI look bruised
+        cfg.colors[CG::Active][CR::Shadow] = QColor(105, 105, 105);
+        cfg.colors[CG::Disabled][CR::Shadow] = Qt::black;
+        cfg.colors[CG::Inactive][CR::Shadow] = QColor(105, 105, 105);
+    }
+
+    return cfg;
+}
+
+} // namespace PaletteGenerator
\ No newline at end of file
diff --git a/cockatrice/src/interface/palette_editor/palette_generator.h b/cockatrice/src/interface/palette_editor/palette_generator.h
new file mode 100644
index 000000000..0cec9b5c3
--- /dev/null
+++ b/cockatrice/src/interface/palette_editor/palette_generator.h
@@ -0,0 +1,16 @@
+#ifndef COCKATRICE_PALETTE_GENERATOR_H
+#define COCKATRICE_PALETTE_GENERATOR_H
+
+#include "../theme_config.h"
+
+#include <QColor>
+#include <QString>
+
+// All QPalette roles are derived from a single accent color and an
+// intensity value (0-100).  See the .cpp for the full band breakdown.
+namespace PaletteGenerator
+{
+PaletteConfig fromAccent(const QColor &accent, int intensity, const QString &scheme);
+} // namespace PaletteGenerator
+
+#endif // COCKATRICE_PALETTE_GENERATOR_H
\ No newline at end of file
diff --git a/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp b/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp
new file mode 100644
index 000000000..de069bc80
--- /dev/null
+++ b/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp
@@ -0,0 +1,255 @@
+#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()
+{
+    QList<QPalette::ColorRole> roles;
+    for (int i = 0; i < QPalette::NColorRoles; ++i) {
+        auto r = static_cast<QPalette::ColorRole>(i);
+        if (r != QPalette::NoRole) {
+            roles << r;
+        }
+    }
+    return roles;
+}
+
+static const QList<QPalette::ColorGroup> ALL_GROUPS = {QPalette::Active, QPalette::Disabled, QPalette::Inactive};
+
+static const QMap<QPalette::ColorRole, const char *> ROLE_DESCRIPTIONS = {
+    {QPalette::Window, QT_TR_NOOP("Main window / dialog background")},
+    {QPalette::WindowText, QT_TR_NOOP("Text drawn on Window")},
+    {QPalette::Base, QT_TR_NOOP("Background for text input widgets")},
+    {QPalette::Text, QT_TR_NOOP("Text in input widgets")},
+    {QPalette::Button, QT_TR_NOOP("Button background")},
+    {QPalette::ButtonText, QT_TR_NOOP("Button label text")},
+    {QPalette::BrightText, QT_TR_NOOP("High-contrast text (e.g. checked items)")},
+    {QPalette::Highlight, QT_TR_NOOP("Selection / focus highlight")},
+    {QPalette::HighlightedText, QT_TR_NOOP("Text on top of Highlight")},
+    {QPalette::Link, QT_TR_NOOP("Unvisited hyperlink")},
+    {QPalette::LinkVisited, QT_TR_NOOP("Visited hyperlink")},
+    {QPalette::AlternateBase, QT_TR_NOOP("Alternating row background in views")},
+    {QPalette::ToolTipBase, QT_TR_NOOP("Tooltip background")},
+    {QPalette::ToolTipText, QT_TR_NOOP("Tooltip text")},
+    {QPalette::PlaceholderText, QT_TR_NOOP("Placeholder / hint text in inputs")},
+    {QPalette::Light, QT_TR_NOOP("Lighter than Button (3-D highlight)")},
+    {QPalette::Midlight, QT_TR_NOOP("Between Button and Light")},
+    {QPalette::Mid, QT_TR_NOOP("Between Button and Dark")},
+    {QPalette::Dark, QT_TR_NOOP("Darker than Button (3-D shadow)")},
+    {QPalette::Shadow, QT_TR_NOOP("Very dark shadow colour")},
+};
+
+static const QMap<AppColor::Role, const char *> APP_ROLE_DESCRIPTIONS = {
+    {AppColor::AccentStrong, QT_TR_NOOP("Vivid primary accent (e.g. home-tab button gradient start)")},
+    {AppColor::AccentSoft, QT_TR_NOOP("Lightened, desaturated accent (e.g. home-tab button gradient end)")},
+};
+
+PaletteGridWidget::PaletteGridWidget(QWidget *parent) : QWidget(parent)
+{
+    scroll = new QScrollArea(this);
+    scroll->setWidgetResizable(true);
+    scroll->setFrameShape(QFrame::NoFrame);
+
+    gridHost = new QWidget;
+    buildGrid(gridHost);
+    refreshChromePalettes();
+    scroll->setWidget(gridHost);
+
+    layout = new QVBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->addWidget(scroll);
+}
+
+void PaletteGridWidget::buildGrid(QWidget *host)
+{
+    QMetaEnum roleEnum = QMetaEnum::fromType<QPalette::ColorRole>();
+
+    auto *grid = new QGridLayout(host);
+    grid->setSpacing(3);
+    grid->setContentsMargins(12, 8, 12, 8);
+    grid->setColumnStretch(0, 1);
+    grid->setColumnStretch(1, 0);
+    grid->setColumnStretch(2, 0);
+    grid->setColumnStretch(3, 0);
+
+    // Column headers
+    const QStringList groupHeaders = {tr("Active"), tr("Disabled"), tr("Inactive")};
+    const QStringList groupTips = {
+        tr("Normal interactive state"),
+        tr("Widget is disabled / not interactive"),
+        tr("Window is in background / unfocused"),
+    };
+    for (int col = 0; col < 3; ++col) {
+        auto *label = new QLabel(groupHeaders[col], host);
+        label->setAlignment(Qt::AlignCenter);
+        label->setToolTip(groupTips[col]);
+        QFont f = label->font();
+        f.setBold(true);
+        label->setFont(f);
+        label->setAutoFillBackground(true);
+        label->setContentsMargins(4, 4, 4, 4);
+        grid->addWidget(label, 0, col + 1);
+        headerLabels.push_back(label);
+    }
+
+    // Role rows
+    const auto roles = allRoles();
+    for (int row = 0; row < roles.size(); ++row) {
+        auto role = roles[row];
+        const char *name = roleEnum.valueToKey(role);
+
+        // Alternating row shade
+        if (row % 2 == 0) {
+            for (int col = 0; col < 4; ++col) {
+                auto *shade = new QWidget(host);
+                shade->setAutoFillBackground(true);
+                grid->addWidget(shade, row + 1, col);
+                rowShadeWidgets.push_back(shade);
+            }
+        }
+
+        auto *label = new QLabel(QString(name), host);
+        label->setToolTip(ROLE_DESCRIPTIONS.value(role, {}));
+        label->setContentsMargins(4, 2, 8, 2);
+        grid->addWidget(label, row + 1, 0);
+
+        for (int col = 0; col < 3; ++col) {
+            auto group = ALL_GROUPS[col];
+            auto *btn = new ColorButton(host);
+            connect(btn, &ColorButton::colorChanged, this, [this] { emit paletteChanged(); });
+            colorButtons[group][role] = btn;
+            grid->addWidget(btn, row + 1, col + 1, Qt::AlignHCenter | Qt::AlignVCenter);
+        }
+    }
+
+    // Application color section: one ColorButton per role below the role grid.
+    // These are not tied to a color group, so a single button spans the row.
+    QMetaEnum appEnum = QMetaEnum::fromType<AppColor::Role>();
+
+    const int appHeaderRow = roles.size() + 1;
+
+    auto *appHeader = new QLabel(tr("App colors"), host);
+    appHeader->setToolTip(tr("Application-specific colors layered on top of the Qt palette"));
+    QFont appHeaderFont = appHeader->font();
+    appHeaderFont.setBold(true);
+    appHeader->setFont(appHeaderFont);
+    appHeader->setAutoFillBackground(true);
+    appHeader->setContentsMargins(4, 4, 4, 4);
+    grid->addWidget(appHeader, appHeaderRow, 0, 1, 4);
+    headerLabels.append(appHeader);
+
+    for (int i = 0; i < appEnum.keyCount(); ++i) {
+        auto role = static_cast<AppColor::Role>(appEnum.value(i));
+        const int row = appHeaderRow + 1 + i;
+
+        if (i % 2 == 0) {
+            for (int col = 0; col < 4; ++col) {
+                auto *shade = new QWidget(host);
+                shade->setAutoFillBackground(true);
+                grid->addWidget(shade, row, col);
+                rowShadeWidgets.push_back(shade);
+            }
+        }
+
+        auto *label = new QLabel(QString(appEnum.valueToKey(role)), host);
+        label->setToolTip(APP_ROLE_DESCRIPTIONS.value(role, {}));
+        label->setContentsMargins(4, 2, 8, 2);
+        grid->addWidget(label, row, 0);
+
+        auto *btn = new ColorButton(host);
+        connect(btn, &ColorButton::colorChanged, this, [this] { emit paletteChanged(); });
+        appColorButtons[role] = btn;
+        grid->addWidget(btn, row, 1, Qt::AlignHCenter | Qt::AlignVCenter);
+    }
+}
+
+void PaletteGridWidget::changeEvent(QEvent *e)
+{
+    if (e->type() == QEvent::PaletteChange) {
+        QTimer::singleShot(0, this, &PaletteGridWidget::refreshChromePalettes);
+    }
+
+    QWidget::changeEvent(e);
+}
+
+void PaletteGridWidget::refreshChromePalettes()
+{
+    const QPalette base = qApp->palette();
+    const QColor alt = base.color(QPalette::AlternateBase);
+
+    // Header labels
+    for (auto *label : headerLabels) {
+        QPalette lp = label->palette();
+        lp.setColor(QPalette::Window, alt);
+        label->setPalette(lp);
+        label->update();
+    }
+
+    // Alternating row backgrounds
+    for (auto *shade : rowShadeWidgets) {
+        QPalette sp = shade->palette();
+        sp.setColor(QPalette::Window, alt);
+        shade->setPalette(sp);
+        shade->update();
+    }
+}
+
+void PaletteGridWidget::loadPalette(const PaletteConfig &cfg)
+{
+    for (auto group : ALL_GROUPS) {
+        for (auto role : allRoles()) {
+            QColor color = cfg.colors.value(group).value(role);
+            if (!color.isValid()) {
+                color = qApp->palette().color(group, role);
+            }
+            colorButtons[group][role]->setColor(color);
+        }
+    }
+
+    QMetaEnum appEnum = QMetaEnum::fromType<AppColor::Role>();
+    for (int i = 0; i < appEnum.keyCount(); ++i) {
+        auto role = static_cast<AppColor::Role>(appEnum.value(i));
+        QColor color = cfg.appColors.value(role);
+        if (!color.isValid()) {
+            color = themeManager->appColor(role);
+        }
+        appColorButtons[role]->setColor(color);
+    }
+}
+
+PaletteConfig PaletteGridWidget::currentPaletteConfig() const
+{
+    PaletteConfig cfg;
+    for (auto group : ALL_GROUPS) {
+        for (auto role : allRoles()) {
+            cfg.colors[group][role] = colorButtons[group][role]->getColor();
+        }
+    }
+
+    QMetaEnum appEnum = QMetaEnum::fromType<AppColor::Role>();
+    for (int i = 0; i < appEnum.keyCount(); ++i) {
+        auto role = static_cast<AppColor::Role>(appEnum.value(i));
+        cfg.appColors[role] = appColorButtons[role]->getColor();
+    }
+
+    return cfg;
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/palette_editor/palette_grid_widget.h b/cockatrice/src/interface/palette_editor/palette_grid_widget.h
new file mode 100644
index 000000000..f1ff41ec2
--- /dev/null
+++ b/cockatrice/src/interface/palette_editor/palette_grid_widget.h
@@ -0,0 +1,46 @@
+#ifndef COCKATRICE_PALETTE_GRID_WIDGET_H
+#define COCKATRICE_PALETTE_GRID_WIDGET_H
+
+#include "../theme_config.h"
+
+#include <QList>
+#include <QMap>
+#include <QPalette>
+#include <QVector>
+#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
+{
+    Q_OBJECT
+public:
+    explicit PaletteGridWidget(QWidget *parent = nullptr);
+
+    void loadPalette(const PaletteConfig &cfg);
+    PaletteConfig currentPaletteConfig() const;
+
+signals:
+    void paletteChanged();
+
+private:
+    void buildGrid(QWidget *host);
+    void changeEvent(QEvent *e);
+    void refreshChromePalettes();
+
+    QMap<QPalette::ColorGroup, QMap<QPalette::ColorRole, ColorButton *>> colorButtons;
+    QMap<AppColor::Role, ColorButton *> appColorButtons;
+    QScrollArea *scroll;
+    QWidget *gridHost;
+    QVBoxLayout *layout;
+    QVector<QLabel *> headerLabels;
+    QVector<QWidget *> rowShadeWidgets;
+};
+
+#endif // COCKATRICE_PALETTE_GRID_WIDGET_H
\ No newline at end of file
diff --git a/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp b/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp
new file mode 100644
index 000000000..04f98dcc3
--- /dev/null
+++ b/cockatrice/src/interface/palette_editor/quick_setup_panel.cpp
@@ -0,0 +1,101 @@
+#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)
+{
+    layout = new QHBoxLayout(this);
+    layout->setContentsMargins(12, 8, 12, 8);
+    layout->setSpacing(10);
+
+    heading = new QLabel(this);
+    heading->setTextFormat(Qt::RichText);
+
+    accentLabel = new QLabel(this);
+    accentButton = new ColorButton(this);
+    accentButton->setColor(QColor(20, 140, 60));
+
+    intensityLabel = new QLabel(this);
+
+    labelLow = new QLabel(this);
+    labelHigh = new QLabel(this);
+    QFont small = labelLow->font();
+    small.setPointSizeF(small.pointSizeF() * 0.82);
+    labelLow->setFont(small);
+    labelHigh->setFont(small);
+    QPalette dimmed = labelLow->palette();
+    dimmed.setColor(QPalette::WindowText, qApp->palette().color(QPalette::Mid));
+    labelLow->setPalette(dimmed);
+    labelHigh->setPalette(dimmed);
+
+    intensitySlider = new QSlider(Qt::Horizontal, this);
+    intensitySlider->setRange(0, 100);
+    intensitySlider->setValue(70);
+    intensitySlider->setFixedWidth(160);
+
+    intensityPercentageLabel = new QLabel(this);
+    intensityPercentageLabel->setFixedWidth(34);
+    intensityPercentageLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+
+    layout->addWidget(heading);
+    layout->addSpacing(6);
+    layout->addWidget(accentLabel);
+    layout->addWidget(accentButton);
+    layout->addSpacing(12);
+    layout->addWidget(intensityLabel);
+    layout->addWidget(labelLow);
+    layout->addWidget(intensitySlider);
+    layout->addWidget(labelHigh);
+    layout->addWidget(intensityPercentageLabel);
+    layout->addStretch();
+
+    connect(intensitySlider, &QSlider::valueChanged, this, [this](int v) {
+        intensityPercentageLabel->setText(tr("%1%").arg(v));
+        emit valueChanged(accentButton->getColor(), v);
+    });
+    connect(accentButton, &ColorButton::colorChanged, this,
+            [this](const QColor &c) { emit valueChanged(c, intensitySlider->value()); });
+    retranslateUi();
+}
+
+void QuickSetupPanel::retranslateUi()
+{
+    heading->setText(tr("<b>Quick Setup</b>"));
+    heading->setToolTip(tr("Generate all palette roles automatically from a single accent colour"));
+    accentLabel->setText(tr("Accent:"));
+    accentButton->setToolTip(tr("Primary hue. Used directly for highlights and links.\n"
+                                "At high intensity it also tints buttons and backgrounds."));
+    intensityLabel->setText(tr("Intensity:"));
+    labelLow->setText(tr("Subtle"));
+    labelHigh->setText(tr("Full colour"));
+    intensitySlider->setToolTip(tr("0–30  Subtle tint — only highlights and links change hue\n"
+                                   "30–70  Accented — buttons, tooltips, and borders join in\n"
+                                   "70–100 Full colour — backgrounds, everything"));
+    intensityPercentageLabel->setText(tr("70%"));
+}
+
+QColor QuickSetupPanel::accentColor() const
+{
+    return accentButton->getColor();
+}
+
+int QuickSetupPanel::intensity() const
+{
+    return intensitySlider->value();
+}
+
+void QuickSetupPanel::setAccentColor(const QColor &c)
+{
+    accentButton->blockSignals(true);
+    accentButton->setColor(c);
+    accentButton->blockSignals(false);
+}
diff --git a/cockatrice/src/interface/palette_editor/quick_setup_panel.h b/cockatrice/src/interface/palette_editor/quick_setup_panel.h
new file mode 100644
index 000000000..ea402086f
--- /dev/null
+++ b/cockatrice/src/interface/palette_editor/quick_setup_panel.h
@@ -0,0 +1,92 @@
+#ifndef COCKATRICE_QUICK_SETUP_PANEL_H
+#define COCKATRICE_QUICK_SETUP_PANEL_H
+
+#include <QColor>
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class QHBoxLayout;
+class QLabel;
+class QSlider;
+class ColorButton;
+
+/**
+ * @class QuickSetupPanel
+ * @brief Provides a compact "Quick Setup" interface for generating theme palettes.
+ *
+ * The panel contains:
+ * - an accent color picker,
+ * - an intensity slider.
+ *
+ * Whenever either value changes the panel emits valueChanged() with
+ * the current accent colour and intensity, which the parent dialog
+ * uses to auto-apply the generated palette.
+ *
+ * Typically used together with PaletteGenerator::fromAccent()
+ * to quickly generate color schemes from a chosen accent color.
+ */
+class QuickSetupPanel : public QWidget
+{
+    Q_OBJECT
+
+public:
+    /**
+     * @brief Constructs the quick setup panel.
+     *
+     * @param parent Optional parent widget.
+     */
+    explicit QuickSetupPanel(QWidget *parent = nullptr);
+
+    /**
+     * @brief Retranslates all user-visible strings.
+     *
+     * Intended to be called when the application language changes.
+     */
+    void retranslateUi();
+
+    /**
+     * @brief Returns the currently selected accent color.
+     *
+     * @return The selected accent color.
+     */
+    QColor accentColor() const;
+
+    /**
+     * @brief Returns the current intensity slider value.
+     *
+     * @return The selected intensity value.
+     */
+    int intensity() const;
+
+    /**
+     * @brief Updates the displayed accent color.
+     *
+     * Used by the parent dialog when switching schemes to keep
+     * the color swatch synchronized with the active palette.
+     *
+     * @param c The new accent color.
+     */
+    void setAccentColor(const QColor &c);
+
+signals:
+    /**
+     * @brief Emitted whenever the accent colour or intensity changes.
+     *
+     * The parent dialog consumes this to auto-apply the generated palette
+     * without requiring an explicit Generate click.
+     */
+    void valueChanged(QColor accent, int intensity);
+
+private:
+    QHBoxLayout *layout;
+    QLabel *heading;
+    QLabel *accentLabel;
+    ColorButton *accentButton;
+    QLabel *intensityLabel;
+    QLabel *labelLow;
+    QLabel *labelHigh;
+    QSlider *intensitySlider;
+    QLabel *intensityPercentageLabel;
+};
+
+#endif // COCKATRICE_QUICK_SETUP_PANEL_H
diff --git a/cockatrice/src/interface/pixel_map_generator.cpp b/cockatrice/src/interface/pixel_map_generator.cpp
index 382fff317..2f5c4b6dd 100644
--- a/cockatrice/src/interface/pixel_map_generator.cpp
+++ b/cockatrice/src/interface/pixel_map_generator.cpp
@@ -1,12 +1,37 @@
 #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";
@@ -14,6 +39,32 @@
 #define DEFAULT_COLOR_MODERATOR_RIGHT "#000000";
 #define DEFAULT_COLOR_ADMIN "#ff2701";
 
+/**
+ * Clamps an svg render size so that rendering does not exceed a multiple of the requested size.
+ *
+ * Rendering at the full native size of an svg just to scale it down afterwards wastes memory,
+ * and canvases with extreme coordinates can exceed Qt's rasterizer coordinate limit which makes
+ * Qt silently drop shapes from the rendered image.
+ *
+ * @param renderSize The size the svg would be rendered at.
+ * @param requestedSize The size that was actually requested.
+ *
+ * @return A size with the aspect ratio of renderSize whose longest side is at most four times
+ * the longest side of requestedSize.
+ */
+static QSize capRenderSize(const QSize &renderSize, const QSize &requestedSize)
+{
+    const int longestRequestedSide = qMax(requestedSize.width(), requestedSize.height());
+    if (longestRequestedSide <= 0) {
+        return renderSize;
+    }
+
+    const int longestRenderSide = qMax(renderSize.width(), renderSize.height());
+    const qreal scale = qMin<qreal>(1.0, static_cast<qreal>(longestRequestedSide * 4) / longestRenderSide);
+    return QSize(qMax(1, static_cast<int>(renderSize.width() * scale)),
+                 qMax(1, static_cast<int>(renderSize.height() * scale)));
+}
+
 /**
  * Loads in an svg from file and scales it without affecting image quality.
  *
@@ -35,6 +86,9 @@ static QPixmap loadSvg(const QString &svgPath, const QSize &size, bool expandOnl
     // If expandOnly, make sure the pixmap is at least as large as the svg, so that we don't lose any detail.
     // QIcon.pixmap(size) will automatically scale down the image, but it won't scale it up.
     QSize pixmapSize = expandOnly ? svgRenderer.defaultSize().expandedTo(size) : size;
+    if (expandOnly) {
+        pixmapSize = capRenderSize(pixmapSize, size);
+    }
     QPixmap pix(pixmapSize);
     pix.fill(Qt::transparent);
 
@@ -52,7 +106,13 @@ static QPixmap loadSvg(const QString &svgPath, const QSize &size, bool expandOnl
 /**
  * Try to load path image from non-SVG formats, otherwise fall back to SVG.
  * This is to allow custom themes to support non-SVG format type overrides, since SVG requires custom loading.
- * @param path The path to the file, with no file extension. File formats will be automatically detected.
+ *
+ * The path may already carry the resolved file extension (e.g. via
+ * ThemeManager::assetPath); such paths are loaded directly. Otherwise a
+ * format-agnostic lookup probes png, jpg and finally svg.
+ *
+ * @param path The path to the file, with no file extension unless the caller
+ * already resolved it. File formats will be automatically detected.
  * @param size The desired size of the pixmap.
  * @param expandOnly If true, then keep the size of the initial pixmap to at least the size (Only relevant if SVG).
  *
@@ -60,6 +120,19 @@ static QPixmap loadSvg(const QString &svgPath, const QSize &size, bool expandOnl
  */
 static QPixmap tryLoadImage(const QString &path, const QSize &size, bool expandOnly = false)
 {
+    if (path.endsWith(QLatin1String(".svg"), Qt::CaseInsensitive)) {
+        return loadSvg(path, size, expandOnly);
+    }
+    if (path.endsWith(QLatin1String(".png"), Qt::CaseInsensitive) ||
+        path.endsWith(QLatin1String(".jpg"), Qt::CaseInsensitive) ||
+        path.endsWith(QLatin1String(".jpeg"), Qt::CaseInsensitive)) {
+        QPixmap pix(path);
+        if (!pix.isNull()) {
+            return pix.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        }
+        return {};
+    }
+
     const auto formats = {"png", "jpg"};
 
     QPixmap returnPixmap;
@@ -77,10 +150,12 @@ QMap<QString, QPixmap> PhasePixmapGenerator::pmCache;
 QPixmap PhasePixmapGenerator::generatePixmap(int height, QString name)
 {
     QString key = name + QString::number(height);
-    if (pmCache.contains(key))
+    if (pmCache.contains(key)) {
         return pmCache.value(key);
+    }
 
-    QPixmap pixmap = tryLoadImage("theme:phases/" + name, QSize(height, height));
+    QPixmap pixmap = tryLoadImage(QStringLiteral("theme:") + themeManager->assetPath(QStringLiteral("phases/") + name),
+                                  QSize(height, height));
 
     pmCache.insert(key, pixmap);
     return pixmap;
@@ -95,19 +170,22 @@ QPixmap CounterPixmapGenerator::generatePixmap(int height, QString name, bool hi
         name = "general";
     }
 
-    if (highlight)
+    if (highlight) {
         name.append("_highlight");
+    }
     QString key = name + QString::number(height);
-    if (pmCache.contains(key))
+    if (pmCache.contains(key)) {
         return pmCache.value(key);
+    }
 
     QPixmap pixmap = tryLoadImage("theme:counters/" + name, QSize(height, height));
 
     // fall back to colorless counter if the name can't be found
     if (pixmap.isNull()) {
         name = "general";
-        if (highlight)
+        if (highlight) {
             name.append("_highlight");
+        }
         pixmap = tryLoadImage("theme:counters/" + name, QSize(height, height));
     }
 
@@ -118,17 +196,19 @@ QPixmap CounterPixmapGenerator::generatePixmap(int height, QString name, bool hi
 QPixmap PingPixmapGenerator::generatePixmap(int size, int value, int max)
 {
     int key = size * 1000000 + max * 1000 + value;
-    if (pmCache.contains(key))
+    if (pmCache.contains(key)) {
         return pmCache.value(key);
+    }
 
     QPixmap pixmap(size, size);
     pixmap.fill(Qt::transparent);
     QPainter painter(&pixmap);
     QColor color;
-    if ((max == -1) || (value == -1))
+    if ((max == -1) || (value == -1)) {
         color = Qt::black;
-    else
+    } else {
         color.setHsv(120 * (1.0 - ((double)value / max)), 255, 255);
+    }
 
     QRadialGradient g(QPointF((double)pixmap.width() / 2, (double)pixmap.height() / 2),
                       qMin(pixmap.width(), pixmap.height()) / 2.0);
@@ -145,11 +225,13 @@ QMap<int, QPixmap> PingPixmapGenerator::pmCache;
 
 QPixmap CountryPixmapGenerator::generatePixmap(int height, const QString &countryCode)
 {
-    if (countryCode.size() != 2)
+    if (countryCode.size() != 2) {
         return QPixmap();
+    }
     QString key = countryCode + QString::number(height);
-    if (pmCache.contains(key))
+    if (pmCache.contains(key)) {
         return pmCache.value(key);
+    }
 
     int width = height * 2;
     QPixmap pixmap = tryLoadImage("theme:countries/" + countryCode.toLower(), QSize(width, height), true);
@@ -239,7 +321,9 @@ static QIcon loadAndColorSvg(const QString &iconPath,
 
     QSvgRenderer svgRenderer(doc.toByteArray());
 
-    QPixmap pix(svgRenderer.defaultSize().expandedTo(QSize(minSize, minSize)));
+    const QSize pixmapSize =
+        capRenderSize(svgRenderer.defaultSize().expandedTo(QSize(minSize, minSize)), QSize(minSize, minSize));
+    QPixmap pix(pixmapSize);
     pix.fill(Qt::transparent);
 
     QPainter pixPainter(&pix);
@@ -299,6 +383,10 @@ static QString getIconType(const bool isBuddy, const UserLevelFlags &userLevelFl
         return "pawn_judge";
     }
 
+    if (userLevelFlags.testFlag(ServerInfo_User::IsDeveloper)) {
+        return "pawn_dev";
+    }
+
     if (!privLevel.isEmpty() && privLevel.toLower() != "none") {
         return QString("pawn_%1").arg(privLevel.toLower());
     }
@@ -352,10 +440,12 @@ QPixmap LockPixmapGenerator::generatePixmap(int height)
 {
 
     int key = height;
-    if (pmCache.contains(key))
+    if (pmCache.contains(key)) {
         return pmCache.value(key);
+    }
 
-    QPixmap pixmap = tryLoadImage("theme:icons/lock", QSize(height, height), true);
+    QPixmap pixmap = tryLoadImage(QStringLiteral("theme:") + themeManager->assetPath(QStringLiteral("icons/lock")),
+                                  QSize(height, height), true);
     pmCache.insert(key, pixmap);
     return pixmap;
 }
@@ -365,11 +455,13 @@ QMap<int, QPixmap> LockPixmapGenerator::pmCache;
 QPixmap DropdownIconPixmapGenerator::generatePixmap(int height, bool expanded)
 {
     QString key = QString::number(expanded) + ":" + QString::number(height);
-    if (pmCache.contains(key))
+    if (pmCache.contains(key)) {
         return pmCache.value(key);
+    }
 
     QString name = expanded ? "dropdown_expanded" : "dropdown_collapsed";
-    QPixmap pixmap = tryLoadImage("theme:icons/" + name, QSize(height, height), true);
+    QPixmap pixmap = tryLoadImage(QStringLiteral("theme:") + themeManager->assetPath(QStringLiteral("icons/") + name),
+                                  QSize(height, height), true);
 
     pmCache.insert(key, pixmap);
     return pixmap;
@@ -377,8 +469,66 @@ QPixmap DropdownIconPixmapGenerator::generatePixmap(int height, bool expanded)
 
 QMap<QString, QPixmap> DropdownIconPixmapGenerator::pmCache;
 
+namespace
+{
+/// Longest side mana symbols are rendered at before being scaled to their final size.
+constexpr int MASTER_ICON_SIZE = 128;
+
+QString manaSymbolCacheKey(const QString &symbol, const QSize &size)
+{
+    return symbol + QLatin1Char('|') + QString::number(size.width()) + QLatin1Char('x') +
+           QString::number(size.height());
+}
+} // namespace
+
+const QPixmap &ManaSymbolPixmapGenerator::masterIcon(const QString &symbol)
+{
+    auto it = masterCache.constFind(symbol);
+    if (it != masterCache.constEnd()) {
+        return it.value();
+    }
+
+    QImageReader reader("theme:icons/mana/" + symbol);
+    QSize sourceSize = reader.size();
+    if (!sourceSize.isEmpty()) {
+        sourceSize.scale(QSize(MASTER_ICON_SIZE, MASTER_ICON_SIZE), Qt::KeepAspectRatio);
+        reader.setScaledSize(sourceSize);
+    }
+    const QPixmap rendered = QPixmap::fromImageReader(&reader);
+
+    return masterCache.insert(symbol, rendered).value();
+}
+
+QPixmap ManaSymbolPixmapGenerator::generatePixmap(const QString &symbol, const QSize &size)
+{
+    const QString key = manaSymbolCacheKey(symbol, size);
+    auto it = scaledCache.constFind(key);
+    if (it != scaledCache.constEnd()) {
+        return it.value();
+    }
+
+    const QPixmap &icon = masterIcon(symbol);
+    if (icon.isNull()) {
+        return {};
+    }
+
+    QPixmap scaled = icon.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    scaledCache.insert(key, scaled);
+    return scaled;
+}
+
+QHash<QString, QPixmap> ManaSymbolPixmapGenerator::masterCache;
+QHash<QString, QPixmap> ManaSymbolPixmapGenerator::scaledCache;
+
 QPixmap loadColorAdjustedPixmap(const QString &name)
 {
+    // Prefer an authored scheme-qualified variant when one exists for this asset.
+    const QString variant = themeManager->schemeVariantPath(QStringView(name).mid(QStringLiteral("theme:").size()));
+    if (!variant.isEmpty()) {
+        return QPixmap(QStringLiteral("theme:") + variant);
+    }
+
+    // Legacy fallback: runtime-invert for dark mode when no authored variant.
     if (qApp->palette().windowText().color().lightness() > 200) {
         QImage img(name);
         img.invertPixels();
@@ -389,3 +539,21 @@ QPixmap loadColorAdjustedPixmap(const QString &name)
         return QPixmap(name);
     }
 }
+
+QPixmap themePixmap(QStringView prefix)
+{
+    const QString resolved = themeManager->assetPath(prefix);
+    return QPixmap(QStringLiteral("theme:") + resolved);
+}
+
+void clearPixmapGeneratorCaches()
+{
+    PhasePixmapGenerator::clear();
+    CounterPixmapGenerator::clear();
+    PingPixmapGenerator::clear();
+    CountryPixmapGenerator::clear();
+    UserLevelPixmapGenerator::clear();
+    LockPixmapGenerator::clear();
+    DropdownIconPixmapGenerator::clear();
+    ManaSymbolPixmapGenerator::clear();
+}
diff --git a/cockatrice/src/interface/pixel_map_generator.h b/cockatrice/src/interface/pixel_map_generator.h
index 61d771c79..7c01bb332 100644
--- a/cockatrice/src/interface/pixel_map_generator.h
+++ b/cockatrice/src/interface/pixel_map_generator.h
@@ -1,17 +1,25 @@
 /**
  * @file pixel_map_generator.h
  * @ingroup UI
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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");
 
@@ -124,6 +132,45 @@ public:
     }
 };
 
+class ManaSymbolPixmapGenerator
+{
+private:
+    static QHash<QString, QPixmap> masterCache;
+    static QHash<QString, QPixmap> scaledCache;
+
+    /**
+     * @brief Renders \a symbol once at a fixed moderate size, so repeated scalings never
+     * re-rasterize the source file (SVG sources can be very expensive to rasterize).
+     */
+    static const QPixmap &masterIcon(const QString &symbol);
+
+public:
+    /**
+     * @brief Returns a smooth-scaled rendering of the given mana symbol icon.
+     *
+     * Results are shared between all callers via a process-wide cache keyed by symbol
+     * and size, so scaling work is done once per distinct combination instead of once
+     * per widget creation or resize.
+     */
+    static QPixmap generatePixmap(const QString &symbol, const QSize &size);
+    static void clear()
+    {
+        masterCache.clear();
+        scaledCache.clear();
+    }
+};
+
 QPixmap loadColorAdjustedPixmap(const QString &name);
 
+// Loads a "theme:" asset (with no file extension in prefix), preferring the
+// scheme-qualified variant (prefix-dark / prefix-light, resolved via
+// ThemeManager::assetPath) and falling back to the plain asset. Callers load
+// the returned path directly. Use for scheme-sensitive pixmaps like
+// backgrounds, the card back, and the app logo.
+QPixmap themePixmap(QStringView prefix);
+
+// Clears every PixmapGenerator's static cache so scheme variants are
+// re-resolved when the active theme or color scheme changes.
+void clearPixmapGeneratorCaches();
+
 #endif
diff --git a/cockatrice/src/interface/theme_config.cpp b/cockatrice/src/interface/theme_config.cpp
new file mode 100644
index 000000000..652e322c8
--- /dev/null
+++ b/cockatrice/src/interface/theme_config.cpp
@@ -0,0 +1,307 @@
+#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
+{
+    return colorScheme.isEmpty() && styleName.isEmpty();
+}
+
+QString ThemeConfig::toIni() const
+{
+    QString out;
+    out += "[Appearance]\n";
+    out += QString("ColorScheme = %1\n").arg(colorScheme.isEmpty() ? "System" : colorScheme);
+    out += "\n[Style]\n";
+    out += QString("Name = %1\n").arg(styleName.isEmpty() ? "System" : styleName);
+    return out;
+}
+
+ThemeConfig ThemeConfig::fromThemeDir(const QString &themeDirPath)
+{
+    ThemeConfig cfg;
+
+    if (themeDirPath.isEmpty()) {
+        return cfg;
+    }
+
+    QFile f(QDir(themeDirPath).absoluteFilePath("theme.cfg"));
+    if (!f.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        return cfg;
+    }
+
+    QString currentSection;
+
+    QTextStream in(&f);
+
+    while (!in.atEnd()) {
+        QString line = in.readLine().trimmed();
+
+        if (line.isEmpty() || line.startsWith('#') || line.startsWith(';')) {
+            continue;
+        }
+
+        if (line.startsWith('[') && line.endsWith(']')) {
+            currentSection = line.mid(1, line.length() - 2).trimmed();
+            continue;
+        }
+
+        int eq = line.indexOf('=');
+        if (eq < 0) {
+            continue;
+        }
+
+        QString key = line.left(eq).trimmed();
+        QString value = line.mid(eq + 1).trimmed();
+
+        if (currentSection.compare("Appearance", Qt::CaseInsensitive) == 0) {
+            if (key.compare("ColorScheme", Qt::CaseInsensitive) == 0) {
+                cfg.colorScheme = value;
+            }
+        } else if (currentSection.compare("Style", Qt::CaseInsensitive) == 0) {
+            if (key.compare("Name", Qt::CaseInsensitive) == 0) {
+                cfg.styleName = value;
+            }
+        }
+    }
+
+    return cfg;
+}
+
+bool ThemeConfig::save(const QString &themeDirPath) const
+{
+    if (themeDirPath.isEmpty()) {
+        return false;
+    }
+
+    QDir dir(themeDirPath);
+
+    if (!dir.exists()) {
+        dir.mkpath(".");
+    }
+
+    QFile f(dir.absoluteFilePath("theme.cfg"));
+    if (!f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
+        return false;
+    }
+
+    QTextStream out(&f);
+    out << toIni();
+
+    return true;
+}
+
+bool PaletteConfig::hasPalette() const
+{
+    return !colors.isEmpty() || !appColors.isEmpty();
+}
+
+QString PaletteConfig::toToml() const
+{
+    QMetaEnum roleEnum = QMetaEnum::fromType<QPalette::ColorRole>();
+
+    QString out;
+
+    static const QList<QPair<QPalette::ColorGroup, QString>> groups = {
+        {QPalette::Active, "Palette"},
+        {QPalette::Disabled, "Palette.Disabled"},
+        {QPalette::Inactive, "Palette.Inactive"},
+    };
+
+    for (const auto &[group, sectionName] : groups) {
+        if (!colors.contains(group)) {
+            continue;
+        }
+
+        out += QString("[%1]\n").arg(sectionName);
+
+        const auto &roleMap = colors[group];
+
+        for (auto it = roleMap.cbegin(); it != roleMap.cend(); ++it) {
+            const char *roleName = roleEnum.valueToKey(it.key());
+
+            if (!roleName) {
+                continue;
+            }
+
+            out += QString("%1 = %2\n").arg(QString(roleName), -20).arg(it.value().name(QColor::HexArgb));
+        }
+
+        out += "\n";
+    }
+
+    if (!appColors.isEmpty()) {
+        QMetaEnum appEnum = QMetaEnum::fromType<AppColor::Role>();
+
+        out += "[AppColors]\n";
+
+        for (auto it = appColors.cbegin(); it != appColors.cend(); ++it) {
+            const char *roleName = appEnum.valueToKey(it.key());
+
+            if (!roleName) {
+                continue;
+            }
+
+            out += QString("%1 = %2\n").arg(QString(roleName), -20).arg(it.value().name(QColor::HexArgb));
+        }
+
+        out += "\n";
+    }
+
+    return out;
+}
+
+QString PaletteConfig::fileName(const QString &colorScheme)
+{
+    return colorScheme.compare("Dark", Qt::CaseInsensitive) == 0 ? "palette-dark.toml" : "palette-light.toml";
+}
+
+PaletteConfig PaletteConfig::fromFile(const QString &filePath)
+{
+    PaletteConfig cfg;
+
+    QFile f(filePath);
+
+    if (!f.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        return cfg;
+    }
+
+    QMetaEnum roleEnum = QMetaEnum::fromType<QPalette::ColorRole>();
+    QMetaEnum appEnum = QMetaEnum::fromType<AppColor::Role>();
+
+    QString currentSection;
+    QPalette::ColorGroup currentGroup = QPalette::Active;
+
+    QTextStream in(&f);
+
+    while (!in.atEnd()) {
+        QString line = in.readLine().trimmed();
+
+        if (line.isEmpty() || line.startsWith('#') || line.startsWith(';')) {
+            continue;
+        }
+
+        if (line.startsWith('[') && line.endsWith(']')) {
+            currentSection = line.mid(1, line.length() - 2).trimmed();
+
+            if (currentSection.startsWith("Palette", Qt::CaseInsensitive)) {
+                int dot = currentSection.indexOf('.');
+
+                QString groupStr = (dot >= 0) ? currentSection.mid(dot + 1) : "Active";
+
+                if (groupStr.compare("Disabled", Qt::CaseInsensitive) == 0) {
+                    currentGroup = QPalette::Disabled;
+                } else if (groupStr.compare("Inactive", Qt::CaseInsensitive) == 0) {
+                    currentGroup = QPalette::Inactive;
+                } else {
+                    currentGroup = QPalette::Active;
+                }
+            }
+
+            continue;
+        }
+
+        int eq = line.indexOf('=');
+
+        if (eq < 0) {
+            continue;
+        }
+
+        QString key = line.left(eq).trimmed();
+        QString value = line.mid(eq + 1).trimmed();
+
+        // Strip inline comments if preceded by whitespace
+        for (int i = 1; i < value.size(); ++i) {
+            if (value[i] == '#' && value[i - 1].isSpace()) {
+                value = value.left(i).trimmed();
+                break;
+            }
+        }
+
+        QColor color(value);
+
+        if (!color.isValid()) {
+            continue;
+        }
+
+        if (currentSection.compare("AppColors", Qt::CaseInsensitive) == 0) {
+            if (key.startsWith("AppColor::")) {
+                key = key.mid(10);
+            }
+
+            int appRoleInt = appEnum.keyToValue(key.toUtf8().constData());
+
+            if (appRoleInt >= 0) {
+                cfg.appColors[static_cast<AppColor::Role>(appRoleInt)] = color;
+            }
+
+            continue;
+        }
+
+        if (!currentSection.startsWith("Palette", Qt::CaseInsensitive)) {
+            continue;
+        }
+
+        if (key.startsWith("QPalette::")) {
+            key = key.mid(10);
+        }
+
+        int roleInt = roleEnum.keyToValue(key.toUtf8().constData());
+
+        if (roleInt < 0) {
+            continue;
+        }
+
+        cfg.colors[currentGroup][static_cast<QPalette::ColorRole>(roleInt)] = color;
+    }
+
+    return cfg;
+}
+
+PaletteConfig PaletteConfig::fromScheme(const QString &themeDirPath, const QString &colorScheme)
+{
+    if (themeDirPath.isEmpty()) {
+        return {};
+    }
+
+    return fromFile(QDir(themeDirPath).absoluteFilePath(fileName(colorScheme)));
+}
+
+PaletteConfig PaletteConfig::fromDefault(const QString &themeDirPath, const QString &colorScheme)
+{
+    if (themeDirPath.isEmpty()) {
+        return {};
+    }
+
+    QDir dir(themeDirPath);
+
+    bool wantDark = colorScheme.compare("Dark", Qt::CaseInsensitive) == 0;
+
+    // Only the default file matching the requested scheme is used. Falling back
+    // to the opposite scheme's default would silently apply dark colours to a
+    // "Light" scheme (or vice versa). Callers already fall back to the OS /
+    // application palette when no default palette is available.
+    return fromFile(dir.absoluteFilePath(wantDark ? "palette-default-dark.toml" : "palette-default-light.toml"));
+}
+
+QPalette PaletteConfig::apply(QPalette base) const
+{
+    for (auto git = colors.cbegin(); git != colors.cend(); ++git) {
+        for (auto rit = git.value().cbegin(); rit != git.value().cend(); ++rit) {
+            base.setColor(git.key(), rit.key(), rit.value());
+        }
+    }
+
+    return base;
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/theme_config.h b/cockatrice/src/interface/theme_config.h
new file mode 100644
index 000000000..8b91613f5
--- /dev/null
+++ b/cockatrice/src/interface/theme_config.h
@@ -0,0 +1,63 @@
+#ifndef COCKATRICE_THEME_CONFIG_H
+#define COCKATRICE_THEME_CONFIG_H
+
+#include <QColor>
+#include <QMap>
+#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
+// and editable from the palette editor, so theme authors can control colors
+// beyond what Qt's palette can express.
+namespace AppColor
+{
+Q_NAMESPACE
+enum Role
+{
+    AccentStrong,
+    AccentSoft,
+};
+Q_ENUM_NS(Role)
+} // namespace AppColor
+
+struct ThemeConfig
+{
+    QString colorScheme;
+    QString styleName;
+
+    bool isEmpty() const;
+    QString toIni() const;
+
+    static ThemeConfig fromThemeDir(const QString &themeDirPath);
+    bool save(const QString &themeDirPath) const;
+};
+
+struct PaletteConfig
+{
+    QMap<QPalette::ColorGroup, QMap<QPalette::ColorRole, QColor>> colors;
+    QMap<AppColor::Role, QColor> appColors;
+
+    bool operator==(const PaletteConfig &rhs) const
+    {
+        return colors == rhs.colors && appColors == rhs.appColors;
+    }
+    bool operator!=(const PaletteConfig &rhs) const
+    {
+        return !(*this == rhs);
+    }
+    bool hasPalette() const;
+    QString toToml() const;
+
+    static QString fileName(const QString &colorScheme);
+
+    static PaletteConfig fromFile(const QString &filePath);
+    static PaletteConfig fromScheme(const QString &themeDirPath, const QString &colorScheme);
+    static PaletteConfig fromDefault(const QString &themeDirPath, const QString &colorScheme);
+
+    QPalette apply(QPalette base) const;
+};
+
+#endif // COCKATRICE_THEME_CONFIG_H
\ No newline at end of file
diff --git a/cockatrice/src/interface/theme_manager.cpp b/cockatrice/src/interface/theme_manager.cpp
index ec52a0f6e..9a96b3e45 100644
--- a/cockatrice/src/interface/theme_manager.cpp
+++ b/cockatrice/src/interface/theme_manager.cpp
@@ -1,15 +1,45 @@
 #include "theme_manager.h"
 
 #include "../../client/settings/cache_settings.h"
+#include "pixel_map_generator.h"
+#include "theme_config.h"
 
 #include <QApplication>
+#include <QChar>
 #include <QColor>
 #include <QDebug>
-#include <QLibraryInfo>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QFlags>
+#include <QGuiApplication>
+#include <QIODevice>
+#include <QLatin1Char>
+#include <QList>
+#include <QMap>
+#include <QMessageLogger>
+#include <QMetaEnum>
+#include <QPalette>
+#include <QPixmap>
 #include <QPixmapCache>
-#include <QStandardPaths>
+#include <QSharedPointer>
+#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 NONE_THEME_NAME "Default"
+#define SYSTEM_THEME_NAME "System"
+#define LEGACY_SYSTEM_THEME_NAME "Default"
+#define FUSION_THEME_NAME "Fusion"
 #define STYLE_CSS_NAME "style.css"
 #define HANDZONE_BG_NAME "handzone"
 #define PLAYERZONE_BG_NAME "playerzone"
@@ -21,20 +51,284 @@ static const QColor PLAYERZONE_BG_DEFAULT = QColor(200, 200, 200);
 static const QColor STACKZONE_BG_DEFAULT = QColor(113, 43, 43);
 static const QStringList DEFAULT_RESOURCE_PATHS = {":/resources"};
 
+struct PaletteColorInfo
+{
+    QPalette::ColorGroup group;
+    QPalette::ColorRole role;
+    QColor color;
+};
+
+[[maybe_unused]] static inline QList<PaletteColorInfo> queryAllPaletteColors(const QPalette &palette = qApp->palette())
+{
+    QList<PaletteColorInfo> colors;
+
+    // Iterate through relevant color groups (Active, Disabled, Inactive)
+    const QList<QPalette::ColorGroup> groups = {QPalette::Active, QPalette::Disabled, QPalette::Inactive};
+
+    for (auto group : groups) {
+        // Iterate through all color roles (excluding NoRole and NColorRoles)
+        for (int r = 0; r < QPalette::NColorRoles; ++r) {
+            auto role = static_cast<QPalette::ColorRole>(r);
+            if (role == QPalette::NoRole) {
+                continue;
+            }
+
+            PaletteColorInfo info;
+            info.group = group;
+            info.role = role;
+            info.color = palette.color(group, role);
+            colors.append(info);
+        }
+    }
+
+    return colors;
+}
+
+// Pretty print version
+[[maybe_unused]] static inline void printPaletteColors(const QPalette &palette = qApp->palette())
+{
+    QMetaEnum groupEnum = QMetaEnum::fromType<QPalette::ColorGroup>();
+    QMetaEnum roleEnum = QMetaEnum::fromType<QPalette::ColorRole>();
+
+    const QList<QPalette::ColorGroup> groups = {QPalette::Active, QPalette::Disabled, QPalette::Inactive};
+
+    for (auto group : groups) {
+        qInfo() << "\n===========" << groupEnum.valueToKey(group) << "===========";
+
+        for (int r = 0; r < QPalette::NColorRoles; ++r) {
+            auto role = static_cast<QPalette::ColorRole>(r);
+            if (role == QPalette::NoRole) {
+                continue;
+            }
+
+            QColor color = palette.color(group, role);
+            qInfo().nospace() << qPrintable(QString("%1").arg(roleEnum.valueToKey(role), -20)) << " : "
+                              << qPrintable(color.name(QColor::HexArgb)) << " (RGBA: " << color.red() << ", "
+                              << color.green() << ", " << color.blue() << ", " << color.alpha() << ")";
+        }
+    }
+}
+
+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
+    // 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;
+}
+
 ThemeManager::ThemeManager(QObject *parent) : QObject(parent)
 {
+    defaultStyleName = usableDefaultStyle(qApp->style()->objectName());
+    // Capture the untouched application palette before any theme is applied.
+    defaultPalette = qApp->palette();
     ensureThemeDirectoryExists();
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
+    connect(QGuiApplication::styleHints(), &QStyleHints::colorSchemeChanged, this, [this] {
+        // Reload so scheme-qualified assets and palettes follow the OS, but do
+        // NOT recapture defaultPalette: qApp->palette() already carries the
+        // currently-applied theme palette at this point, so recapturing it
+        // would contaminate the base for every later theme switch.
+        themeChangedSlot();
+    });
+#endif
     connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this, &ThemeManager::themeChangedSlot);
     themeChangedSlot();
 }
 
+// Copy every file of sourceDir into targetDir without ever overwriting an
+// existing file, recursing into subdirectories (zones/, backgrounds/, ...).
+// Returns false as soon as an entry could not be copied, leaving the source
+// untouched so the caller can retry later.
+static bool mergeDirWithoutOverwrite(const QString &sourceDir, const QString &targetDir)
+{
+    const QDir target(targetDir);
+    bool merged = true;
+
+    const QDir::Filters filters = QDir::AllEntries | QDir::NoDotAndDotDot | QDir::Hidden;
+    for (const QFileInfo &entry : QDir(sourceDir).entryInfoList(filters)) {
+        const QString targetEntry = target.absoluteFilePath(entry.fileName());
+        if (entry.isDir()) {
+            if (!QDir().mkpath(targetEntry) || !mergeDirWithoutOverwrite(entry.absoluteFilePath(), targetEntry)) {
+                merged = false;
+            }
+        } else if (!target.exists(entry.fileName()) && !QFile::copy(entry.absoluteFilePath(), targetEntry)) {
+            qCWarning(ThemeManagerLog) << "Could not migrate theme file:" << entry.absoluteFilePath();
+            merged = false;
+        }
+    }
+
+    return merged;
+}
+
+void ThemeManager::migrateLegacyThemeDir(const QString &themesPath, const QString &currentThemeName)
+{
+    const QString legacyPath = QDir(themesPath).absoluteFilePath(LEGACY_SYSTEM_THEME_NAME);
+    if (!QDir(legacyPath).exists()) {
+        return;
+    }
+
+    // Only the renamed theme's own directory is migrated. A user sitting on a
+    // different theme may well have hand-made a "Default" folder of their own,
+    // and silently folding it into "System" would be rude. The check accepts
+    // both the pre-rename name and the post-rename one, since a user who
+    // already ran the rename keeps their settings on "System" while their
+    // customised directory is still called "Default".
+    if (currentThemeName != LEGACY_SYSTEM_THEME_NAME && currentThemeName != SYSTEM_THEME_NAME) {
+        return;
+    }
+
+    const QString targetPath = QDir(themesPath).absoluteFilePath(SYSTEM_THEME_NAME);
+    if (!QDir(targetPath).exists() && QDir().rename(legacyPath, targetPath)) {
+        qCInfo(ThemeManagerLog) << "Migrated customised theme directory" << LEGACY_SYSTEM_THEME_NAME << "to"
+                                << SYSTEM_THEME_NAME;
+        return;
+    }
+
+    // The rename is only possible when the target does not exist yet. When it
+    // does (a partial earlier upgrade, or a user who re-customised the theme
+    // after the rename), fall back to merging so nothing is lost: existing
+    // "System" files win, legacy files only fill gaps. Because every legacy
+    // file either already exists at the target or is copied there, removing
+    // the legacy directory afterwards cannot drop user data.
+    if (!mergeDirWithoutOverwrite(legacyPath, targetPath)) {
+        qCWarning(ThemeManagerLog) << "Could not fully migrate theme directory" << legacyPath << "; keeping it for a"
+                                   << "later retry";
+        return;
+    }
+    if (!QDir(legacyPath).removeRecursively()) {
+        qCWarning(ThemeManagerLog) << "Migrated theme directory but could not remove the legacy one:" << legacyPath;
+        return;
+    }
+    qCInfo(ThemeManagerLog) << "Merged customised theme directory" << LEGACY_SYSTEM_THEME_NAME << "into"
+                            << SYSTEM_THEME_NAME;
+}
+
 void ThemeManager::ensureThemeDirectoryExists()
 {
-    if (SettingsCache::instance().getThemeName().isEmpty() ||
-        !getAvailableThemes().contains(SettingsCache::instance().getThemeName())) {
-        qCInfo(ThemeManagerLog) << "Theme name not set, setting default value";
-        SettingsCache::instance().setThemeName(NONE_THEME_NAME);
+    auto &settings = SettingsCache::instance();
+
+    // Carry the user's theme customisations (zone graphics, stylesheets,
+    // palettes, theme.cfg) across before the stored name is rewritten.
+    migrateLegacyThemeDir(settings.paths().getThemesPath(), settings.getThemeName());
+
+    // Migrate the old "Default" theme name to "System"
+    if (settings.getThemeName() == LEGACY_SYSTEM_THEME_NAME) {
+        settings.setThemeName(SYSTEM_THEME_NAME);
     }
+
+    if (settings.getThemeName().isEmpty() || !getAvailableThemes().contains(settings.getThemeName())) {
+        qCInfo(ThemeManagerLog) << "Theme name not set, setting default value";
+        settings.setThemeName(FUSION_THEME_NAME);
+    }
+}
+
+bool ThemeManager::isDarkMode(const QString &themeDirPath) const
+{
+    ThemeConfig themeConfig = ThemeConfig::fromThemeDir(themeDirPath);
+    if (themeConfig.colorScheme.compare("Dark", Qt::CaseInsensitive) == 0) {
+        return true;
+    } else if (themeConfig.colorScheme.compare("Light", Qt::CaseInsensitive) == 0) {
+        return false;
+    } else {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+        bool osDark = (QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark);
+#else
+        bool osDark = false;
+#endif
+        return osDark;
+    }
+}
+
+QString ThemeManager::schemeVariantPath(QStringView prefix) const
+{
+    static const QStringList formats = {QStringLiteral(".png"), QStringLiteral(".jpg"), QStringLiteral(".jpeg"),
+                                        QStringLiteral(".svg")};
+    const QString scheme = isDarkMode(currentThemePath) ? QStringLiteral("dark") : QStringLiteral("light");
+    const QString variantStem = prefix.toString() + QLatin1Char('-') + scheme;
+
+    for (const QString &format : formats) {
+        if (QFileInfo::exists(QStringLiteral("theme:") + variantStem + format)) {
+            return variantStem + format;
+        }
+    }
+    return QString();
+}
+
+QString ThemeManager::assetPath(QStringView prefix) const
+{
+    // Probe order mirrors tryLoadImage: a theme may override the default SVG
+    // with a raster of the same stem, so raster wins over SVG within a stem.
+    static const QStringList formats = {QStringLiteral(".png"), QStringLiteral(".jpg"), QStringLiteral(".jpeg"),
+                                        QStringLiteral(".svg")};
+
+    auto findExisting = [](const QString &stem) {
+        for (const QString &format : formats) {
+            if (QFileInfo::exists(QStringLiteral("theme:") + stem + format)) {
+                return stem + format;
+            }
+        }
+        return QString();
+    };
+
+    // Prefer the scheme-qualified variant when it exists, else the plain
+    // asset as the super fallback. Both return the resolved path including
+    // its file extension so callers can load it directly.
+    const QString variant = schemeVariantPath(prefix);
+    if (!variant.isEmpty()) {
+        return variant;
+    }
+    const QString resolvedPlain = findExisting(prefix.toString());
+    return resolvedPlain.isEmpty() ? prefix.toString() : resolvedPlain;
+}
+
+// Probe whether a directory is truly writable by trying to create and remove a
+// temporary file. QFileInfo::isWritable() on a directory is unreliable (notably
+// on Windows where UAC VirtualStore can make a system dir appear writable).
+bool ThemeManager::isDirReallyWritable(const QString &dirPath)
+{
+    const QString probe = QDir(dirPath).absoluteFilePath(".cockatrice_write_test");
+    QFile f(probe);
+    if (!f.open(QIODevice::WriteOnly)) {
+        return false;
+    }
+    f.close();
+    f.remove();
+    return true;
+}
+
+QString ThemeManager::writableThemeDir(const QString &themeName)
+{
+    // All theme writes go to the user themes directory regardless of whether
+    // the resolved (system) theme directory happens to be writable. Even when a
+    // write would succeed in-place, routing it to the user directory keeps the
+    // install intact and guarantees changes survive upgrades.
+    const QString dirPath = QDir(SettingsCache::instance().paths().getThemesPath()).absoluteFilePath(themeName);
+    if (!QDir().mkpath(dirPath)) {
+        qWarning() << "Failed to create theme save directory:" << dirPath;
+    }
+    return dirPath;
+}
+
+// System (read-only) themes location, relative to the application binary.
+static QString systemThemesBasePath()
+{
+    QString base = qApp->applicationDirPath();
+#ifdef Q_OS_MAC
+    base += "/../Resources/themes";
+#elif defined(Q_OS_WIN)
+    base += "/themes";
+#else // linux
+    base += "/../share/cockatrice/themes";
+#endif
+    return base;
 }
 
 QStringMap &ThemeManager::getAvailableThemes()
@@ -42,11 +336,11 @@ QStringMap &ThemeManager::getAvailableThemes()
     QDir dir;
     availableThemes.clear();
 
-    // add default value
-    availableThemes.insert(NONE_THEME_NAME, QString());
-
     // load themes from user profile dir
-    dir.setPath(SettingsCache::instance().getThemesPath());
+    dir.setPath(SettingsCache::instance().paths().getThemesPath());
+
+    availableThemes.insert(SYSTEM_THEME_NAME, dir.absoluteFilePath("System"));
+    availableThemes.insert(FUSION_THEME_NAME, dir.absoluteFilePath("Fusion"));
 
     for (QString themeName : dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name)) {
         if (!availableThemes.contains(themeName)) {
@@ -54,16 +348,8 @@ QStringMap &ThemeManager::getAvailableThemes()
         }
     }
 
-    // load themes from cockatrice system dir
-    dir.setPath(qApp->applicationDirPath() +
-#ifdef Q_OS_MAC
-                "/../Resources/themes"
-#elif defined(Q_OS_WIN)
-                "/themes"
-#else // linux
-                "/../share/cockatrice/themes"
-#endif
-    );
+    // Load themes from Cockatrice system dir
+    dir.setPath(systemThemesBasePath());
 
     for (QString themeName : dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name)) {
         if (!availableThemes.contains(themeName)) {
@@ -77,7 +363,7 @@ QStringMap &ThemeManager::getAvailableThemes()
 QBrush ThemeManager::loadBrush(QString fileName, QColor fallbackColor)
 {
     QBrush brush;
-    QPixmap tmp = QPixmap("theme:zones/" + fileName);
+    QPixmap tmp = QPixmap("theme:" + assetPath(QStringLiteral("zones/") + fileName));
     if (tmp.isNull()) {
         brush.setColor(fallbackColor);
         brush.setStyle(Qt::SolidPattern);
@@ -91,7 +377,7 @@ QBrush ThemeManager::loadBrush(QString fileName, QColor fallbackColor)
 QBrush ThemeManager::loadExtraBrush(QString fileName, QBrush &fallbackBrush)
 {
     QBrush brush;
-    QPixmap tmp = QPixmap("theme:zones/" + fileName);
+    QPixmap tmp = QPixmap("theme:" + assetPath(QStringLiteral("zones/") + fileName));
 
     if (tmp.isNull()) {
         brush = fallbackBrush;
@@ -102,46 +388,288 @@ QBrush ThemeManager::loadExtraBrush(QString fileName, QBrush &fallbackBrush)
     return brush;
 }
 
+ThemeConfig ThemeManager::loadGlobalConfig(const QString &themeDirPath)
+{
+    return ThemeConfig::fromThemeDir(themeDirPath);
+}
+
+bool ThemeManager::saveGlobalConfig(const QString &themeDirPath, const ThemeConfig &cfg)
+{
+    return cfg.save(themeDirPath);
+}
+
+PaletteConfig ThemeManager::loadPaletteConfig(const QString &themeDirPath, const QString &colorScheme)
+{
+    if (themeDirPath.isEmpty()) {
+        return {};
+    }
+    return PaletteConfig::fromScheme(themeDirPath, colorScheme);
+}
+
+bool ThemeManager::savePaletteConfig(const QString &themeDirPath, const QString &colorScheme, const PaletteConfig &cfg)
+{
+    if (themeDirPath.isEmpty()) {
+        return false;
+    }
+
+    QDir dir(themeDirPath);
+    if (!dir.exists()) {
+        dir.mkpath(".");
+    }
+
+    QFile f(dir.absoluteFilePath(PaletteConfig::fileName(colorScheme)));
+    if (!f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
+        return false;
+    }
+
+    QTextStream(&f) << cfg.toToml();
+    return true;
+}
+
+PaletteConfig ThemeManager::loadDefaultPaletteConfig(const QString &themeDirPath,
+                                                     const QString &themeName,
+                                                     const QString &colorScheme)
+{
+    PaletteConfig cfg = PaletteConfig::fromDefault(themeDirPath, colorScheme);
+    if (!cfg.hasPalette()) {
+        // The shipped default may live in the system theme directory rather
+        // than the resolved (user) theme directory, so built-in themes still
+        // get their curated defaults.
+        cfg = PaletteConfig::fromDefault(QDir(systemThemesBasePath()).absoluteFilePath(themeName), colorScheme);
+    }
+    return cfg;
+}
+
+bool ThemeManager::commitPalette(const QString &themeDirPath, const QString &colorScheme, const PaletteConfig &cfg)
+{
+    if (!savePaletteConfig(themeDirPath, colorScheme, cfg)) {
+        return false;
+    }
+
+    ThemeConfig globalCfg = ThemeConfig::fromThemeDir(themeDirPath);
+    globalCfg.colorScheme = colorScheme;
+    globalCfg.save(themeDirPath);
+
+    return true;
+}
+
+void ThemeManager::setColorScheme(const QString &scheme)
+{
+    const QString dirPath = writableThemeDir(SettingsCache::instance().getThemeName());
+    ThemeConfig cfg = ThemeConfig::fromThemeDir(dirPath);
+
+    cfg.colorScheme = scheme;
+
+    cfg.save(dirPath);
+    reloadCurrentTheme();
+}
+
+void ThemeManager::setStyleName(const QString &styleName)
+{
+    const QString dirPath = writableThemeDir(SettingsCache::instance().getThemeName());
+    ThemeConfig cfg = ThemeConfig::fromThemeDir(dirPath);
+
+    cfg.styleName = styleName;
+
+    cfg.save(dirPath);
+    reloadCurrentTheme();
+}
+
+void ThemeManager::reloadCurrentTheme()
+{
+    themeChangedSlot();
+}
+
+void ThemeManager::previewPalette(const PaletteConfig &cfg, const QString &scheme)
+{
+    const QString themeName = SettingsCache::instance().getThemeName();
+    const QString dirPath = getAvailableThemes().value(themeName);
+    const ThemeConfig themeCfg = ThemeConfig::fromThemeDir(dirPath);
+    applyStyleAndPalette(themeName, themeCfg, cfg, scheme);
+}
+
+void ThemeManager::applyStyleAndPalette(const QString &themeName,
+                                        const ThemeConfig &themeCfg,
+                                        const PaletteConfig &palCfg,
+                                        const QString &activeScheme)
+{
+#if (QT_VERSION < QT_VERSION_CHECK(6, 5, 0))
+    Q_UNUSED(activeScheme)
+#endif
+    QString styleName = themeCfg.styleName;
+    if (styleName.isEmpty() || styleName.compare("System", Qt::CaseInsensitive) == 0) {
+        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);
+        }
+    }
+
+    QStyle *style = QStyleFactory::create(styleName);
+    if (!style) {
+        style = QStyleFactory::create(usableDefaultStyle(defaultStyleName));
+    }
+
+    // Base palette
+    QPalette base;
+    if (styleName.compare("Fusion", Qt::CaseInsensitive) == 0) {
+        base = style->standardPalette();
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
+        if (activeScheme == "Dark") {
+            base.setColor(QPalette::AlternateBase, QColor(53, 53, 53));
+        }
+#endif
+    } else {
+        // Use the pristine startup palette rather than qApp->palette(): the
+        // latter may already carry a previously-applied custom (e.g. dark)
+        // palette, which would otherwise persist when switching to a scheme
+        // that supplies no palette of its own.
+        base = defaultPalette;
+    }
+
+    // Overlay custom palette colours
+    if (palCfg.hasPalette()) {
+        base = palCfg.apply(base);
+    }
+
+    // Palette BEFORE style — setStyle() triggers a synchronous repolish of all
+    // widgets immediately. If the palette isn't set yet at that point, every
+    // widget gets polished against the stale colours, requiring a second apply
+    // to fully resolve. Setting palette first means setStyle's repolish cascade
+    // already sees the correct colours.
+    qApp->setPalette(base);
+    qApp->setStyle(style);
+
+    currentAppColors = palCfg.appColors;
+
+    // Force every widget to re-polish and repaint immediately rather than
+    // waiting for natural expose events, which produces a patchwork of old
+    // and new colours during a live preview.
+    // Note: we do NOT call widget->setPalette(base) here — qApp->setPalette()
+    // already propagates to all widgets that haven't explicitly overridden their
+    // palette (WA_SetPalette not set). Calling it unconditionally would clobber
+    // intentional per-widget palette customisations across the whole app.
+    for (QWidget *widget : qApp->allWidgets()) {
+        style->unpolish(widget);
+        style->polish(widget);
+        widget->update();
+    }
+
+    emit paletteChanged();
+}
+
+QColor ThemeManager::appColor(AppColor::Role role) const
+{
+    const auto it = currentAppColors.constFind(role);
+    if (it != currentAppColors.constEnd()) {
+        return it.value();
+    }
+
+    // QPalette::Accent was introduced in Qt 6.6 and several shipped palettes
+    // set it to a value barely distinguishable from Window, so it is not a
+    // reliable accent source. The selection highlight is the stable accent
+    // (Accent defaults to Highlight when unset), and deriving from it
+    // unconditionally keeps every Qt version rendering identically.
+    const QColor accent = qApp->palette().color(QPalette::Active, QPalette::Highlight);
+
+    if (role == AppColor::AccentSoft) {
+        constexpr int SOFT_SATURATION_PERCENT = 70;
+        constexpr int SOFT_LIGHTNESS_OFFSET = 60;
+
+        // Light end of the gradient: same hue, softened and lightened
+        return QColor::fromHsl(qMax(0, accent.hslHue()),
+                               qBound(0, qRound(accent.hslSaturation() * SOFT_SATURATION_PERCENT / 100.0), 255),
+                               qBound(0, accent.lightness() + SOFT_LIGHTNESS_OFFSET, 255));
+    }
+
+    return accent;
+}
+
 void ThemeManager::themeChangedSlot()
 {
     QString themeName = SettingsCache::instance().getThemeName();
-    qCInfo(ThemeManagerLog) << "Theme changed:" << themeName;
-
     QString dirPath = getAvailableThemes().value(themeName);
-    QDir dir = dirPath;
+    currentThemePath = dirPath;
+    QDir dir(dirPath);
 
-    // css
-    if (!dirPath.isEmpty() && dir.exists(STYLE_CSS_NAME)) {
-        qApp->setStyleSheet("file:///" + dir.absoluteFilePath(STYLE_CSS_NAME));
+    // CSS — prefer the scheme-qualified stylesheet (style-dark.css /
+    // style-light.css) when present, else the plain style.css as fallback.
+    if (!dirPath.isEmpty()) {
+        const QString scheme = isDarkMode(dirPath) ? QStringLiteral("dark") : QStringLiteral("light");
+        const QString schemeCss = QFileInfo(QStringLiteral(STYLE_CSS_NAME)).completeBaseName() + QLatin1Char('-') +
+                                  scheme + QStringLiteral(".css");
+        if (dir.exists(schemeCss)) {
+            qApp->setStyleSheet("file:///" + dir.absoluteFilePath(schemeCss));
+        } else if (dir.exists(STYLE_CSS_NAME)) {
+            qApp->setStyleSheet("file:///" + dir.absoluteFilePath(STYLE_CSS_NAME));
+        } else {
+            qApp->setStyleSheet("");
+        }
     } else {
         qApp->setStyleSheet("");
     }
 
-    if (dirPath.isEmpty()) {
-        // set default values
-        QDir::setSearchPaths("theme", DEFAULT_RESOURCE_PATHS);
-        brushes[Role::Hand] = HANDZONE_BG_DEFAULT;
-        brushes[Role::Table] = TABLEZONE_BG_DEFAULT;
-        brushes[Role::Player] = PLAYERZONE_BG_DEFAULT;
-        brushes[Role::Stack] = STACKZONE_BG_DEFAULT;
-    } else {
-        // resources
-        QStringList resources;
-        resources << dir.absolutePath() << DEFAULT_RESOURCE_PATHS;
-        QDir::setSearchPaths("theme", resources);
+    // load theme.cfg for style + scheme preference
+    ThemeConfig themeCfg = ThemeConfig::fromThemeDir(dirPath);
 
-        // zones bg
-        dir.cd("zones");
-        brushes[Role::Hand] = loadBrush(HANDZONE_BG_NAME, HANDZONE_BG_DEFAULT);
-        brushes[Role::Table] = loadBrush(TABLEZONE_BG_NAME, TABLEZONE_BG_DEFAULT);
-        brushes[Role::Player] = loadBrush(PLAYERZONE_BG_NAME, PLAYERZONE_BG_DEFAULT);
-        brushes[Role::Stack] = loadBrush(STACKZONE_BG_NAME, STACKZONE_BG_DEFAULT);
+    // Resolve active scheme:
+    // theme.cfg says Dark/Light → use that
+    // theme.cfg says System or is absent → follow the OS
+    QString activeScheme = isDarkMode(dirPath) ? "Dark" : "Light";
+
+    // ── Load palette: custom first, then theme default ────────────────────
+    PaletteConfig palette = PaletteConfig::fromScheme(dirPath, activeScheme);
+    const PaletteConfig themeDefault = ThemeManager::loadDefaultPaletteConfig(dirPath, themeName, activeScheme);
+    if (palette.hasPalette()) {
+        // A custom palette written before [AppColors] existed carries no app
+        // colors; merge the theme's shipped defaults so the identity colors
+        // survive (hasPalette() counts an app-colors-only file as a palette,
+        // so those are kept wholesale and never reach here empty).
+        for (auto it = themeDefault.appColors.cbegin(); it != themeDefault.appColors.cend(); ++it) {
+            if (!palette.appColors.contains(it.key())) {
+                palette.appColors.insert(it.key(), it.value());
+            }
+        }
+    } else {
+        palette = themeDefault;
     }
+
+    applyStyleAndPalette(themeName, themeCfg, palette, activeScheme);
+
+    QStringList resources;
+    if (!dirPath.isEmpty()) {
+        resources << dir.absolutePath();
+    }
+
+    // When the resolved dir is a user copy (e.g. user/<theme>), also
+    // include the system theme dir as a fallback so shipped assets like
+    // zones/*.png and style.css still resolve for themes that ship only
+    // those files (e.g. Leather, Plasma, Fabric, VelvetMarble).
+    const QString sysPath = QDir(systemThemesBasePath()).absoluteFilePath(themeName);
+    if (sysPath != dirPath && QDir(sysPath).exists()) {
+        resources << sysPath;
+    }
+
+    resources << DEFAULT_RESOURCE_PATHS;
+
+    QDir::setSearchPaths("theme", resources);
+
+    brushes[Role::Hand] = loadBrush(HANDZONE_BG_NAME, HANDZONE_BG_DEFAULT);
+
+    brushes[Role::Table] = loadBrush(TABLEZONE_BG_NAME, TABLEZONE_BG_DEFAULT);
+
+    brushes[Role::Player] = loadBrush(PLAYERZONE_BG_NAME, PLAYERZONE_BG_DEFAULT);
+
+    brushes[Role::Stack] = loadBrush(STACKZONE_BG_NAME, STACKZONE_BG_DEFAULT);
     for (auto &brushCache : brushesCache) {
         brushCache.clear();
     }
 
     QPixmapCache::clear();
+    clearPixmapGeneratorCaches();
 
     emit themeChanged();
 }
@@ -163,6 +691,7 @@ static QString roleBgName(ThemeManager::Role role)
 
         default:
             Q_ASSERT(false);
+            return {};
     }
 }
 
diff --git a/cockatrice/src/interface/theme_manager.h b/cockatrice/src/interface/theme_manager.h
index 594ede2bf..c1ab65685 100644
--- a/cockatrice/src/interface/theme_manager.h
+++ b/cockatrice/src/interface/theme_manager.h
@@ -1,28 +1,30 @@
 /**
  * @file theme_manager.h
  * @ingroup CoreSettings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef THEMEMANAGER_H
 #define THEMEMANAGER_H
 
+#include "theme_config.h"
+
 #include <QBrush>
-#include <QDir>
+#include <QColor>
 #include <QLoggingCategory>
 #include <QMap>
 #include <QObject>
-#include <QPixmap>
+#include <QPalette>
 #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
@@ -40,8 +42,15 @@ public:
     };
 
 private:
+    QString defaultStyleName;
+    // Pristine application palette captured at startup, before any custom theme
+    // palette is applied. Used as the base when a theme supplies no palette, so
+    // switching away from a custom palette restores the original colours.
+    QPalette defaultPalette;
+    QString currentThemePath;
     std::array<QBrush, Role::MaxRole + 1> brushes;
     QStringMap availableThemes;
+    QMap<AppColor::Role, QColor> currentAppColors;
     /*
       Internal cache for multiple backgrounds
     */
@@ -51,9 +60,82 @@ protected:
     void ensureThemeDirectoryExists();
     QBrush loadBrush(QString fileName, QColor fallbackColor);
     QBrush loadExtraBrush(QString fileName, QBrush &fallbackBrush);
+    void applyStyleAndPalette(const QString &themeName,
+                              const ThemeConfig &themeCfg,
+                              const PaletteConfig &palCfg,
+                              const QString &activeScheme);
 
 public:
+    // Resolves the directory to write theme changes to for the given theme
+    // name. The resolved theme dir (user or system) is used when writable;
+    // read-only system themes fall back to the user themes directory, creating
+    // it if needed, so customisations never get lost on upgrade.
+    static QString writableThemeDir(const QString &themeName);
+    // Carries a user profile's customised "Default" theme directory over to the
+    // "System" directory the theme was renamed to, so zone graphics,
+    // stylesheets, palettes and theme.cfg survive the rename. Renames the
+    // directory when "System" does not exist yet, otherwise merges file by
+    // file without overwriting what "System" already has. No-op unless the
+    // active theme is one of the two names, so a hand-made "Default" folder of
+    // a user on another theme is left alone.
+    static void migrateLegacyThemeDir(const QString &themesPath, const QString &currentThemeName);
+    // Probe whether a directory is truly writable by trying to create and remove
+    // a temporary file. QFileInfo::isWritable() on a directory is unreliable
+    // (notably on Windows where UAC VirtualStore can make a system dir appear
+    // writable).
+    static bool isDirReallyWritable(const QString &dirPath);
+    // Explicit color scheme of the theme: theme.cfg's ColorScheme setting
+    // (Dark/Light), falling back to the OS color scheme when it is "System".
+    bool isDarkMode(const QString &themeDirPath) const;
+    // The resolved scheme of the currently active theme.
+    bool isDarkModeActive() const
+    {
+        return isDarkMode(currentThemePath);
+    }
     QStringMap &getAvailableThemes();
+    // Returns the path to the currently active theme directory (empty = default)
+    QString getCurrentThemePath() const
+    {
+        return currentThemePath;
+    }
+    // Load the global theme settings (style + color scheme preference)
+    static ThemeConfig loadGlobalConfig(const QString &themeDirPath);
+    static bool saveGlobalConfig(const QString &themeDirPath, const ThemeConfig &cfg);
+
+    // Load/save per-scheme palette colors
+    static PaletteConfig loadPaletteConfig(const QString &themeDirPath, const QString &colorScheme);
+    static bool savePaletteConfig(const QString &themeDirPath, const QString &colorScheme, const PaletteConfig &cfg);
+    // Resolve prefix to a scheme-qualified "theme:" path. Existence is probed
+    // internally across the formats themes may ship (.png/.jpg/.svg), so
+    // callers load the returned path directly. Prefers "<prefix>-<dark|light>"
+    // when a file exists at that stem, otherwise the plain "<prefix>" as the
+    // super fallback. The resolved scheme covers explicit light/dark as well
+    // as OS-resolved "system". Returns the path with its file extension when a
+    // match is found; unqualified assets keep working unchanged.
+    QString assetPath(QStringView prefix) const;
+    // Like assetPath, but resolves only the scheme-qualified variant
+    // ("<prefix>-<dark|light>.<ext>") and returns an empty string when no
+    // variant exists — it never falls back to the plain "<prefix>" asset.
+    // Callers that must distinguish "no authored variant" (e.g. to keep a
+    // legacy runtime fallback alive) should use this instead of assetPath.
+    QString schemeVariantPath(QStringView prefix) const;
+    // Load the theme's shipped default palette, falling back to the system
+    // theme directory when it is absent from the resolved (user) directory.
+    static PaletteConfig
+    loadDefaultPaletteConfig(const QString &themeDirPath, const QString &themeName, const QString &colorScheme);
+    /** @brief Writes cfg to disk as the theme's palette-<scheme>.toml and updates the
+     *         theme's stored colour scheme to match. Shared by PaletteEditorDialog::onSave
+     *         and FirstRunWizard's theme step so the two "generate + keep" paths can't drift. */
+    static bool commitPalette(const QString &themeDirPath, const QString &colorScheme, const PaletteConfig &cfg);
+    void setColorScheme(const QString &scheme);
+    void setStyleName(const QString &styleName);
+
+    void reloadCurrentTheme();
+    void previewPalette(const PaletteConfig &cfg, const QString &scheme);
+
+    // Resolves an application color role: the theme's stored [AppColors] value
+    // when present, otherwise a palette-accent-derived fallback.
+    QColor appColor(AppColor::Role role) const;
 
     QBrush &getBgBrush(Role zone);
     QBrush getExtraBgBrush(Role zone, int zoneId = 0);
@@ -61,6 +143,7 @@ protected slots:
     void themeChangedSlot();
 signals:
     void themeChanged();
+    void paletteChanged();
 };
 
 extern ThemeManager *themeManager;
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 e8beae61e..ef7fb0e0e 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,37 +1,27 @@
 #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 <QLabel>
+#include <QLayoutItem>
+#include <QList>
+#include <QObject>
 #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, CardInfoPtr _card) : QWidget(parent), card(_card)
-{
-    layout = new QHBoxLayout(this);
-    layout->setSpacing(5); // Small spacing between icons
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->setAlignment(Qt::AlignCenter); // Ensure icons are centered
-    setLayout(layout);
-
-    // Define the full WUBRG set (White, Blue, Black, Red, Green)
-    QString fullColorIdentity = "WUBRG";
-
-    if (card) {
-        manaCost = card->getColors();                       // Get mana cost string
-        QStringList symbols = parseColorIdentity(manaCost); // Parse mana cost string
-
-        populateManaSymbolWidgets();
-    }
-    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageDrawUnusedColorIdentitiesChanged, this,
-            &ColorIdentityWidget::toggleUnusedVisibility);
-}
-
-ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, QString _manaCost)
-    : QWidget(parent), card(nullptr), manaCost(_manaCost)
+ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, const QString &_colorIdentity)
+    : QWidget(parent), colorIdentity(_colorIdentity)
 {
     layout = new QHBoxLayout(this);
     layout->setSpacing(5); // Small spacing between icons
@@ -41,17 +31,32 @@ ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, QString _manaCost)
 
     populateManaSymbolWidgets();
 
-    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageDrawUnusedColorIdentitiesChanged, this,
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDeckStorageDrawUnusedColorIdentitiesChanged, this,
             &ColorIdentityWidget::toggleUnusedVisibility);
 }
 
+ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, const CardInfoPtr &card)
+    : ColorIdentityWidget(parent, card->getColors())
+{
+}
+
 void ColorIdentityWidget::populateManaSymbolWidgets()
 {
     // Define the full WUBRG set (White, Blue, Black, Red, Green)
     QString fullColorIdentity = "WUBRG";
-    QStringList symbols = parseColorIdentity(manaCost); // Parse mana cost string
+    QStringList symbols = parseColorIdentity(colorIdentity); // Parse mana cost string
 
-    if (SettingsCache::instance().getVisualDeckStorageDrawUnusedColorIdentities()) {
+    // clear old layout
+    QtUtils::clearLayoutRec(layout);
+
+    // The freshly created symbols haven't been sized yet, so force the next resize pass
+    // to apply the symbol size again.
+    lastIconSize = -1;
+    lastWidth = -1;
+
+    // populate mana symbols
+    if (SettingsCache::instance().visualDeckStorage().getVisualDeckStorageDrawUnusedColorIdentities()) {
         for (const QString symbol : fullColorIdentity) {
             auto *manaSymbol = new ManaSymbolWidget(this, symbol, symbols.contains(symbol));
             layout->addWidget(manaSymbol);
@@ -64,45 +69,65 @@ void ColorIdentityWidget::populateManaSymbolWidgets()
     }
 }
 
+void ColorIdentityWidget::setColorIdentity(const QString &_colorIdentity)
+{
+    if (colorIdentity == _colorIdentity) {
+        return;
+    }
+
+    colorIdentity = _colorIdentity;
+    populateManaSymbolWidgets();
+}
+
 void ColorIdentityWidget::toggleUnusedVisibility()
 {
-    if (layout != nullptr) {
-        QLayoutItem *item;
-        while ((item = layout->takeAt(0)) != nullptr) {
-            item->widget()->deleteLater(); // Delete the widget
-            delete item;                   // Delete the layout item
-        }
-    }
     populateManaSymbolWidgets();
 }
 
 void ColorIdentityWidget::resizeEvent(QResizeEvent *event)
 {
     QWidget::resizeEvent(event);
-    QList<ManaSymbolWidget *> manaSymbols = findChildren<ManaSymbolWidget *>();
 
-    if (!manaSymbols.isEmpty()) {
-        int totalWidth = event->size().width();
-        int totalHeight = totalWidth / 6; // Set height to 1/4 of the width
-        setFixedHeight(totalHeight);
+    const int totalWidth = event->size().width();
+    if (totalWidth == lastWidth && lastIconSize != -1) {
+        return;
+    }
+    lastWidth = totalWidth;
 
-        int spacing = layout->spacing();
-        int count = manaSymbols.size();
-        int availableWidth = totalWidth - (spacing * (count - 1));
-        int iconSize = qMin(availableWidth / count, totalHeight); // Ensure icons fit within the new height
+    const int totalHeight = qMax(0, totalWidth / 6); // Set height to 1/4 of the width
+    setFixedHeight(totalHeight);
 
-        for (ManaSymbolWidget *manaSymbol : manaSymbols) {
-            manaSymbol->setFixedSize(iconSize, iconSize);
+    const int count = layout->count();
+    if (count == 0) {
+        return;
+    }
+
+    const int spacing = layout->spacing();
+    const int availableWidth = totalWidth - (spacing * (count - 1));
+    const int iconSize = qMin(availableWidth / count, totalHeight); // Ensure icons fit within the new height
+
+    if (iconSize <= 0) {
+        lastIconSize = iconSize;
+        return;
+    }
+    if (iconSize == lastIconSize) {
+        return;
+    }
+    lastIconSize = iconSize;
+
+    for (int i = 0; i < count; ++i) {
+        if (auto *w = qobject_cast<ManaSymbolWidget *>(layout->itemAt(i)->widget())) {
+            w->setFixedSize(iconSize, iconSize);
         }
     }
 }
 
-QStringList ColorIdentityWidget::parseColorIdentity(const QString &cmc)
+QStringList ColorIdentityWidget::parseColorIdentity(const QString &manaString)
 {
     QStringList symbols;
 
     // Handle split costs (e.g., "3U // 4UU")
-    QStringList splitCosts = cmc.split(" // ");
+    QStringList splitCosts = manaString.split(" // ");
     for (const QString &part : splitCosts) {
         QRegularExpression regex(R"(\{([^}]+)\}|(\d+)|([WUBRGCSPX]))");
         QRegularExpressionMatchIterator matches = regex.globalMatch(part);
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 60d69af06..3caf1a964 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
@@ -1,34 +1,41 @@
 /**
  * @file color_identity_widget.h
  * @ingroup CardExtraInfoWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COLOR_IDENTITY_WIDGET_H
 #define COLOR_IDENTITY_WIDGET_H
 
-#include <QHBoxLayout>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
+#include <qtmetamacros.h>
+
+class QHBoxLayout;
 
 class ColorIdentityWidget : public QWidget
 {
     Q_OBJECT
 public:
-    explicit ColorIdentityWidget(QWidget *parent, CardInfoPtr card);
-    explicit ColorIdentityWidget(QWidget *parent, QString manaCost);
+    explicit ColorIdentityWidget(QWidget *parent, const QString &_colorIdentity = "");
+    explicit ColorIdentityWidget(QWidget *parent, const CardInfoPtr &card);
+
     void populateManaSymbolWidgets();
 
-    QStringList parseColorIdentity(const QString &manaString);
+    static QStringList parseColorIdentity(const QString &manaString);
 
 public slots:
+    void setColorIdentity(const QString &_colorIdentity);
     void resizeEvent(QResizeEvent *event) override;
     void toggleUnusedVisibility();
 
 private:
-    CardInfoPtr card;
-    QString manaCost;
+    QString colorIdentity;
     QHBoxLayout *layout;
+    int lastIconSize = -1; ///< The symbol size last applied, to skip redundant resize passes.
+    int lastWidth = -1;    ///< The width last processed, to skip redundant resize passes.
 };
 
 #endif // COLOR_IDENTITY_WIDGET_H
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
new file mode 100644
index 000000000..13c185a79
--- /dev/null
+++ b/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.cpp
@@ -0,0 +1,42 @@
+#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>
+
+QString getDeckColorIdentity(const DeckList &deck, const CardDatabaseQuerier *db)
+{
+    const QStringList cardList = deck.getCardList({DECK_ZONE_MAIN, DECK_ZONE_SIDE});
+    if (cardList.isEmpty()) {
+        return {};
+    }
+
+    QSet<QChar> colorSet; // A set to collect unique color symbols (e.g., W, U, B, R, G)
+
+    for (const QString &cardName : cardList) {
+        CardInfoPtr currentCard = db->getCardInfo(cardName);
+        if (currentCard) {
+            const QString colors = currentCard->getColors(); // returns something like "WUB"
+            for (const QChar &color : colors) {
+                colorSet.insert(color);
+            }
+        }
+    }
+
+    // Ensure the color identity is in WUBRG order
+    QString colorIdentity;
+    const QString wubrgOrder = "WUBRG";
+    for (const QChar &color : wubrgOrder) {
+        if (colorSet.contains(color)) {
+            colorIdentity.append(color);
+        }
+    }
+
+    return colorIdentity;
+}
diff --git a/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.h b/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.h
new file mode 100644
index 000000000..04294cb1c
--- /dev/null
+++ b/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.h
@@ -0,0 +1,20 @@
+#ifndef COCKATRICE_DECK_COLOR_IDENTITY_H
+#define COCKATRICE_DECK_COLOR_IDENTITY_H
+
+#include <QString>
+
+class CardDatabaseQuerier;
+class DeckList;
+
+/**
+ * @brief Computes the color identity of a deck (e.g. "WUBRG") from the color
+ *        symbols of all cards in the main deck and sideboard, ordered WUBRG.
+ *
+ * Shared as a free function so the deck storage previews and the deck share
+ * dialog compute identities identically.
+ *
+ * @param db Card database used to look up card color symbols.
+ */
+QString getDeckColorIdentity(const DeckList &deck, const CardDatabaseQuerier *db);
+
+#endif // COCKATRICE_DECK_COLOR_IDENTITY_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 fcbb69c2e..7da97f88c 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,12 +1,16 @@
 #include "mana_cost_widget.h"
 
+#include "libcockatrice/card/card_info.h"
 #include "mana_symbol_widget.h"
 
 #include <QHBoxLayout>
-#include <QLabel>
+#include <QList>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QRegularExpressionMatchIterator>
 #include <QResizeEvent>
 #include <QSize>
-#include <qregularexpression.h>
+#include <QtGlobal>
 
 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 26a186c59..a181f1148 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
@@ -1,15 +1,19 @@
 /**
  * @file mana_cost_widget.h
  * @ingroup CardExtraInfoWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef MANA_COST_WIDGET_H
 #define MANA_COST_WIDGET_H
 
-#include <QHBoxLayout>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
+#include <qtmetamacros.h>
+
+class QHBoxLayout;
 
 class ManaCostWidget : public QWidget
 {
@@ -17,7 +21,7 @@ class ManaCostWidget : public QWidget
 public:
     explicit ManaCostWidget(QWidget *parent, CardInfoPtr card);
 
-    QStringList parseManaCost(const QString &manaString);
+    static QStringList parseManaCost(const QString &manaString);
 public slots:
     void resizeEvent(QResizeEvent *event) override;
 
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 07cc382ad..80dc11852 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
@@ -1,14 +1,23 @@
 #include "mana_symbol_widget.h"
 
 #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(_symbol), isActive(_isActive), mayBeToggled(_mayBeToggled)
+    : QLabel(parent), symbol(std::move(_symbol)), isActive(_isActive), mayBeToggled(_mayBeToggled)
 {
-    loadManaIcon();
-    setPixmap(manaIcon.scaled(50, 50, Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    setPixmap(ManaSymbolPixmapGenerator::generatePixmap(symbol, QSize(50, 50)));
     setMaximumWidth(50);
 
     // Initialize opacity effect
@@ -16,7 +25,8 @@ ManaSymbolWidget::ManaSymbolWidget(QWidget *parent, QString _symbol, bool _isAct
     setGraphicsEffect(opacityEffect);
     updateOpacity();
 
-    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageUnusedColorIdentitiesOpacityChanged, this,
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDeckStorageUnusedColorIdentitiesOpacityChanged, this,
             &ManaSymbolWidget::updateOpacity);
 }
 
@@ -42,7 +52,11 @@ void ManaSymbolWidget::updateOpacity()
         opacity = isActive ? 1.0 : 0.5;
     } else {
         // It's just for display, they can do whatever they want.
-        opacity = isActive ? 1.0 : SettingsCache::instance().getVisualDeckStorageUnusedColorIdentitiesOpacity() / 100.0;
+        opacity =
+            isActive
+                ? 1.0
+                : SettingsCache::instance().visualDeckStorage().getVisualDeckStorageUnusedColorIdentitiesOpacity() /
+                      100.0;
     }
     opacityEffect->setOpacity(opacity);
 }
@@ -58,16 +72,13 @@ void ManaSymbolWidget::mousePressEvent(QMouseEvent *event)
 void ManaSymbolWidget::resizeEvent(QResizeEvent *event)
 {
     QLabel::resizeEvent(event);
-    setPixmap(manaIcon.scaled(event->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
-}
+    const QSize newSize = event->size();
 
-void ManaSymbolWidget::loadManaIcon()
-{
-    QString filename = "theme:icons/mana/";
-
-    if (symbol == "W" || symbol == "U" || symbol == "B" || symbol == "R" || symbol == "G") {
-        filename += symbol;
+    // Skip the rescale when the size didn't actually change: layout passes resize these
+    // widgets repeatedly with identical sizes.
+    if (newSize.isEmpty() || pixmap().size() == newSize) {
+        return;
     }
 
-    manaIcon = QPixmap(filename);
+    setPixmap(ManaSymbolPixmapGenerator::generatePixmap(symbol, newSize));
 }
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 8d2c6813f..8dad15785 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
@@ -1,14 +1,19 @@
 /**
  * @file mana_symbol_widget.h
  * @ingroup CardExtraInfoWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef MANA_SYMBOL_WIDGET_H
 #define MANA_SYMBOL_WIDGET_H
 
-#include <QGraphicsOpacityEffect>
+#include <QChar>
 #include <QLabel>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QGraphicsOpacityEffect;
+class QWidget;
 
 class ManaSymbolWidget : public QLabel
 {
@@ -33,8 +38,6 @@ public:
         return symbol[0];
     }
 
-    void loadManaIcon();
-
 public slots:
     void resizeEvent(QResizeEvent *event) override;
     void mousePressEvent(QMouseEvent *event) override;
@@ -44,7 +47,6 @@ signals:
 
 private:
     QString symbol;
-    QPixmap manaIcon;
     bool isActive;
     bool mayBeToggled;
     QGraphicsOpacityEffect *opacityEffect;
diff --git a/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp b/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp
new file mode 100644
index 000000000..c4b347047
--- /dev/null
+++ b/cockatrice/src/interface/widgets/cards/art_crop_attribution.cpp
@@ -0,0 +1,70 @@
+#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)
+{
+    const QString artist = card.getPrinting().getArtist();
+    if (artist.isEmpty()) {
+        return QString();
+    }
+    return QObject::tr("Art: %1").arg(artist);
+}
+
+QRectF paintArtAttribution(QPainter &painter,
+                           const QRectF &rect,
+                           const QString &attribution,
+                           Qt::Alignment anchor,
+                           qreal scale)
+{
+    if (attribution.isEmpty()) {
+        return QRectF();
+    }
+
+    painter.save();
+
+    QFont font = painter.font();
+    font.setPointSizeF(qMax(6.0, font.pointSizeF() * scale));
+    painter.setFont(font);
+
+    const QFontMetrics fm(font);
+    const qreal maxTextWidth = rect.width() * 0.45;
+    const QString elided = fm.elidedText(attribution, Qt::ElideRight, qMax(qreal(80.0) * scale, maxTextWidth));
+
+    const qreal pad = 6.0 * scale;
+    QRectF captionRect(QPointF(0, 0), QSizeF(fm.horizontalAdvance(elided) + pad * 2.0, fm.height() + pad * 2.0));
+    const qreal margin = 4.0 * scale;
+    if (anchor.testFlag(Qt::AlignLeft)) {
+        captionRect.moveLeft(rect.left() + margin);
+    } else {
+        captionRect.moveRight(rect.right() - margin);
+    }
+    if (anchor.testFlag(Qt::AlignTop)) {
+        captionRect.moveTop(rect.top() + margin);
+    } else {
+        captionRect.moveBottom(rect.bottom() - margin);
+    }
+
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(QColor(0, 0, 0, 120));
+    painter.drawRoundedRect(captionRect, 4, 4);
+
+    painter.setPen(QColor(255, 255, 255, 220));
+    painter.drawText(captionRect, Qt::AlignCenter, elided);
+
+    painter.restore();
+
+    return captionRect;
+}
diff --git a/cockatrice/src/interface/widgets/cards/art_crop_attribution.h b/cockatrice/src/interface/widgets/cards/art_crop_attribution.h
new file mode 100644
index 000000000..b4acbef26
--- /dev/null
+++ b/cockatrice/src/interface/widgets/cards/art_crop_attribution.h
@@ -0,0 +1,42 @@
+#ifndef COCKATRICE_ART_CROP_ATTRIBUTION_H
+#define COCKATRICE_ART_CROP_ATTRIBUTION_H
+
+#include <QtGlobal>
+#include <qnamespace.h>
+
+class ExactCard;
+class QPainter;
+class QRectF;
+class QString;
+
+/**
+ * @brief Builds an attribution caption for a cropped card art display.
+ *
+ * When a card image's art region is shown cropped (an "art crop"), the artist
+ * should be credited in the same interface. Returns an empty string when the
+ * database has no artist data for the card.
+ *
+ * @param card The card whose art is being displayed.
+ * @return Caption such as "Art: John Avon", or empty.
+ */
+QString buildArtAttribution(const ExactCard &card);
+
+/**
+ * @brief Paints an attribution caption in a corner of a rect.
+ *
+ * Draws a subtle semi-transparent pill containing the caption, elided to fit.
+ *
+ * @param painter Painter to draw with.
+ * @param rect The area (e.g. the cropped art region) the caption belongs to.
+ * @param attribution Caption text (see buildArtAttribution()).
+ * @param anchor Corner of @p rect to pin the pill to (default bottom-right).
+ * @param scale Size multiplier for the pill (e.g. 0.8 for a smaller pill).
+ * @return The rect the pill was drawn in, or an empty rect if @p attribution is empty.
+ */
+QRectF paintArtAttribution(QPainter &painter,
+                           const QRectF &rect,
+                           const QString &attribution,
+                           Qt::Alignment anchor = Qt::AlignRight | Qt::AlignBottom,
+                           qreal scale = 1.0);
+
+#endif // COCKATRICE_ART_CROP_ATTRIBUTION_H
diff --git a/cockatrice/src/interface/widgets/cards/card_art_utils.cpp b/cockatrice/src/interface/widgets/cards/card_art_utils.cpp
new file mode 100644
index 000000000..ebf79282e
--- /dev/null
+++ b/cockatrice/src/interface/widgets/cards/card_art_utils.cpp
@@ -0,0 +1,21 @@
+#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
+{
+QPixmap rotateSidewaysLayoutArt(const QPixmap &art, const ExactCard &card)
+{
+    if (!card.getInfo().getUiAttributes().landscapeOrientation) {
+        return art;
+    }
+
+    QTransform transform;
+    transform.rotate(90);
+    return art.transformed(transform, Qt::SmoothTransformation);
+}
+} // namespace CardArtUtils
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/cards/card_art_utils.h b/cockatrice/src/interface/widgets/cards/card_art_utils.h
new file mode 100644
index 000000000..5c331a12c
--- /dev/null
+++ b/cockatrice/src/interface/widgets/cards/card_art_utils.h
@@ -0,0 +1,25 @@
+#ifndef CARD_ART_UTILS_H
+#define CARD_ART_UTILS_H
+
+#include <QPixmap>
+
+class ExactCard;
+
+namespace CardArtUtils
+{
+/**
+ * @brief Rotates a card's art upright when its layout shows sideways.
+ *
+ * Sideways-layout cards (planes, sieges/battles, split cards) store their
+ * landscape artwork rotated 90° inside a portrait frame. Art-crop displays,
+ * playmat art, and the card-info picture must show such art upright before
+ * sampling or painting. Portrait cards are returned unchanged.
+ *
+ * @param art The card pixmap to orient.
+ * @param card The card describing the art orientation.
+ * @return @p art rotated 90° clockwise for sideways-layout cards, else @p art.
+ */
+QPixmap rotateSidewaysLayoutArt(const QPixmap &art, const ExactCard &card);
+} // namespace CardArtUtils
+
+#endif // CARD_ART_UTILS_H
\ No newline at end of file
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 cb83768f4..b15ac5d23 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,11 +1,33 @@
 #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 <QResizeEvent>
+#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 <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,
@@ -30,6 +52,7 @@ CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
     layout->addWidget(banner);
 
     CardGroupDisplayWidget::updateCardDisplays();
+    updateCardCount();
 
     connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::onCardAddition);
     if (selectionModel) {
@@ -37,6 +60,32 @@ CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
                 &CardGroupDisplayWidget::onSelectionChanged);
     }
     connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval);
+    connect(deckListModel, &QAbstractItemModel::dataChanged, this, &CardGroupDisplayWidget::onDataChanged);
+    connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::updateCardCount);
+    connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::updateCardCount);
+    connect(deckListModel, &QAbstractItemModel::dataChanged, this, &CardGroupDisplayWidget::updateCardCount);
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::visualDeckEditorShowCardCountsChanged,
+            this, &CardGroupDisplayWidget::updateCardCount);
+
+    cardSizeWidget->enableCtrlScrollResize(this);
+}
+
+// Just here so it can get overwritten in subclasses.
+void CardGroupDisplayWidget::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+}
+
+// =====================================================================================================================
+//                                                    User Interaction
+// =====================================================================================================================
+
+void CardGroupDisplayWidget::mousePressEvent(QMouseEvent *event)
+{
+    QWidget::mousePressEvent(event);
+    if (selectionModel) {
+        selectionModel->clearSelection();
+    }
 }
 
 void CardGroupDisplayWidget::onSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected)
@@ -53,8 +102,11 @@ void CardGroupDisplayWidget::onSelectionChanged(const QItemSelection &selected,
 
             auto it = indexToWidgetMap.find(QPersistentModelIndex(idx));
             if (it != indexToWidgetMap.end()) {
-                if (auto displayWidget = qobject_cast<CardInfoPictureWithTextOverlayWidget *>(it.value())) {
-                    displayWidget->setHighlighted(true);
+                // Highlight all copies of this card
+                for (auto widget : it.value()) {
+                    if (auto displayWidget = qobject_cast<CardInfoPictureWithTextOverlayWidget *>(widget)) {
+                        displayWidget->setHighlighted(true);
+                    }
                 }
             }
         }
@@ -63,46 +115,71 @@ void CardGroupDisplayWidget::onSelectionChanged(const QItemSelection &selected,
     for (auto &range : deselected) {
         for (int row = range.top(); row <= range.bottom(); ++row) {
             QModelIndex idx = range.model()->index(row, 0, range.parent());
-            if (proxyModel)
+            if (proxyModel) {
                 idx = proxyModel->mapToSource(idx);
+            }
 
             auto it = indexToWidgetMap.find(QPersistentModelIndex(idx));
             if (it != indexToWidgetMap.end()) {
-                if (auto displayWidget = qobject_cast<CardInfoPictureWithTextOverlayWidget *>(it.value())) {
-                    displayWidget->setHighlighted(false);
+                // Un-highlight all copies of this card
+                for (auto widget : it.value()) {
+                    if (auto displayWidget = qobject_cast<CardInfoPictureWithTextOverlayWidget *>(widget)) {
+                        displayWidget->setHighlighted(false);
+                    }
                 }
             }
         }
     }
 }
 
-void CardGroupDisplayWidget::clearAllDisplayWidgets()
+void CardGroupDisplayWidget::refreshSelectionForIndex(const QPersistentModelIndex &persistent)
 {
-    for (auto idx : indexToWidgetMap.keys()) {
-        auto displayWidget = indexToWidgetMap.value(idx);
-        removeFromLayout(displayWidget);
-        indexToWidgetMap.remove(idx);
-        delete displayWidget;
+    if (!selectionModel || !indexToWidgetMap.contains(persistent)) {
+        return;
+    }
+
+    // Convert persistent index to regular index for selection check
+    QModelIndex idx = QModelIndex(persistent);
+
+    // Check if this index is selected
+    // We need to check against the selection model's model (which might be a proxy)
+    bool isSelected = false;
+    if (auto proxyModel = qobject_cast<QAbstractProxyModel *>(selectionModel->model())) {
+        // Map source index to proxy
+        QModelIndex proxyIdx = proxyModel->mapFromSource(idx);
+        isSelected = selectionModel->isSelected(proxyIdx);
+    } else {
+        isSelected = selectionModel->isSelected(idx);
+    }
+
+    // Apply selection state to all widgets for this index
+    for (auto widget : indexToWidgetMap[persistent]) {
+        if (auto displayWidget = qobject_cast<CardInfoPictureWithTextOverlayWidget *>(widget)) {
+            displayWidget->setHighlighted(isSelected);
+        }
     }
 }
 
+// =====================================================================================================================
+//                                             Display Widget Management
+// =====================================================================================================================
+
 QWidget *CardGroupDisplayWidget::constructWidgetForIndex(QPersistentModelIndex index)
 {
-    if (indexToWidgetMap.contains(index)) {
-        return indexToWidgetMap[index];
-    }
-    auto cardName = deckListModel->data(index.sibling(index.row(), 1), Qt::EditRole).toString();
-    auto cardProviderId = deckListModel->data(index.sibling(index.row(), 4), Qt::EditRole).toString();
+    auto cardName = index.sibling(index.row(), DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+    auto cardProviderId =
+        index.sibling(index.row(), DeckListModelColumns::CARD_PROVIDER_ID).data(Qt::EditRole).toString();
 
     auto widget = new CardInfoPictureWithTextOverlayWidget(getLayoutParent(), true);
     widget->setScaleFactor(cardSizeWidget->getSlider()->value());
     widget->setCard(CardDatabaseManager::query()->getCard({cardName, cardProviderId}));
 
-    connect(widget, &CardInfoPictureWithTextOverlayWidget::imageClicked, this, &CardGroupDisplayWidget::onClick);
-    connect(widget, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &CardGroupDisplayWidget::onHover);
+    connect(widget, &CardInfoPictureWithTextOverlayWidget::cardClicked, this, &CardGroupDisplayWidget::cardClicked);
+    connect(widget, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &CardGroupDisplayWidget::cardHovered);
     connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, widget, &CardInfoPictureWidget::setScaleFactor);
 
-    indexToWidgetMap.insert(index, widget);
+    indexToWidgetMap[index].append(widget);
+
     return widget;
 }
 
@@ -114,7 +191,7 @@ void CardGroupDisplayWidget::updateCardDisplays()
 
     // This doesn't really matter since overwrite the whole lessThan function to just compare dynamically anyway.
     proxy.setSortRole(Qt::EditRole);
-    proxy.sort(1, Qt::AscendingOrder);
+    proxy.sort(DeckListModelColumns::CARD_NAME, Qt::AscendingOrder);
 
     // 1. trackedIndex is a source index → map it to proxy space
     QModelIndex proxyParent = proxy.mapFromSource(trackedIndex);
@@ -127,12 +204,37 @@ void CardGroupDisplayWidget::updateCardDisplays()
         QModelIndex sourceIndex = proxy.mapToSource(proxyIndex);
 
         // 4. persist the source index
-        QPersistentModelIndex persistent(sourceIndex);
+        addCardWidgets(QPersistentModelIndex(sourceIndex));
+    }
+}
 
+void CardGroupDisplayWidget::addCardWidgets(const QPersistentModelIndex &persistent)
+{
+    // Get the card amount
+    int cardAmount = persistent.sibling(persistent.row(), DeckListModelColumns::CARD_AMOUNT).data(Qt::EditRole).toInt();
+
+    // Create multiple widgets for the card count
+    for (int copy = 0; copy < cardAmount; ++copy) {
         addToLayout(constructWidgetForIndex(persistent));
     }
 }
 
+void CardGroupDisplayWidget::clearAllDisplayWidgets()
+{
+    auto it = indexToWidgetMap.begin();
+    while (it != indexToWidgetMap.end()) {
+        for (auto displayWidget : it.value()) {
+            removeFromLayout(displayWidget);
+            delete displayWidget;
+        }
+        it = indexToWidgetMap.erase(it);
+    }
+}
+
+// =====================================================================================================================
+//                                           DeckListModel Signal Responses
+// =====================================================================================================================
+
 void CardGroupDisplayWidget::onCardAddition(const QModelIndex &parent, int first, int last)
 {
     if (!trackedIndex.isValid()) {
@@ -147,7 +249,13 @@ void CardGroupDisplayWidget::onCardAddition(const QModelIndex &parent, int first
             // Persist the index
             QPersistentModelIndex persistent(child);
 
-            insertIntoLayout(constructWidgetForIndex(persistent), row);
+            // Get the card amount for the newly added card
+            int cardAmount = child.sibling(child.row(), DeckListModelColumns::CARD_AMOUNT).data(Qt::EditRole).toInt();
+
+            // Insert multiple copies
+            for (int copy = 0; copy < cardAmount; ++copy) {
+                insertIntoLayout(constructWidgetForIndex(persistent), row);
+            }
         }
     }
 }
@@ -156,18 +264,111 @@ void CardGroupDisplayWidget::onCardRemoval(const QModelIndex &parent, int first,
 {
     Q_UNUSED(first);
     Q_UNUSED(last);
-    if (parent == trackedIndex) {
-        for (const QPersistentModelIndex &idx : indexToWidgetMap.keys()) {
-            if (!idx.isValid()) {
-                removeFromLayout(indexToWidgetMap.value(idx));
-                indexToWidgetMap.value(idx)->deleteLater();
-                indexToWidgetMap.remove(idx);
+
+    if (parent != trackedIndex) {
+        return;
+    }
+
+    // Use iterator so we can remove while iterating
+    auto it = indexToWidgetMap.begin();
+    while (it != indexToWidgetMap.end()) {
+        const QPersistentModelIndex &idx = it.key();
+        bool shouldRemove = !idx.isValid() || it.value().isEmpty();
+
+        if (shouldRemove) {
+            // Clean up widgets
+            for (auto widget : it.value()) {
+                removeFromLayout(widget);
+                widget->deleteLater();
+            }
+
+            // Erase and advance iterator
+            it = indexToWidgetMap.erase(it);
+        } else {
+            ++it;
+        }
+    }
+
+    if (!trackedIndex.isValid()) {
+        emit cleanupRequested(this);
+    }
+}
+
+void CardGroupDisplayWidget::onDataChanged(const QModelIndex &topLeft,
+                                           const QModelIndex &bottomRight,
+                                           const QVector<int> &roles)
+{
+    if (topLeft.parent() != trackedIndex && bottomRight.parent() != trackedIndex) {
+        return;
+    }
+
+    // Check if CARD_AMOUNT column changed
+    bool amountChanged = (topLeft.column() <= DeckListModelColumns::CARD_AMOUNT &&
+                          bottomRight.column() >= DeckListModelColumns::CARD_AMOUNT) ||
+                         roles.isEmpty() || roles.contains(Qt::EditRole);
+
+    if (!amountChanged) {
+        return;
+    }
+
+    // For each affected row, adjust widget count
+    for (int row = topLeft.row(); row <= bottomRight.row(); ++row) {
+        QModelIndex idx = deckListModel->index(row, 0, trackedIndex);
+
+        if (!idx.isValid()) {
+            continue;
+        }
+
+        QPersistentModelIndex persistent(idx);
+        int newAmount = idx.sibling(idx.row(), DeckListModelColumns::CARD_AMOUNT).data(Qt::EditRole).toInt();
+
+        // Get current widget count
+        int currentWidgetCount = indexToWidgetMap.contains(persistent) ? indexToWidgetMap.value(persistent).count() : 0;
+
+        if (newAmount == currentWidgetCount) {
+            // Still refresh selection even if count didn't change
+            refreshSelectionForIndex(persistent);
+            continue;
+        }
+
+        if (newAmount < currentWidgetCount) {
+            // Remove excess widgets
+            int toRemove = currentWidgetCount - newAmount;
+
+            for (int i = 0; i < toRemove; ++i) {
+                if (!indexToWidgetMap[persistent].isEmpty()) {
+                    QWidget *widget = indexToWidgetMap[persistent].takeLast();
+                    removeFromLayout(widget);
+                    widget->deleteLater();
+                }
+            }
+
+            // If all widgets removed, clean up the map entry
+            if (indexToWidgetMap[persistent].isEmpty()) {
+                indexToWidgetMap.remove(persistent);
+            }
+        } else {
+            int toAdd = newAmount - currentWidgetCount;
+            int insertBase = 0;
+
+            // Count widgets belonging to rows before this one
+            for (int r = 0; r < row; ++r) {
+                QModelIndex prevIdx = deckListModel->index(r, 0, trackedIndex);
+                QPersistentModelIndex prevPersistent(prevIdx);
+
+                if (indexToWidgetMap.contains(prevPersistent)) {
+                    insertBase += indexToWidgetMap.value(prevPersistent).size();
+                }
+            }
+
+            // Insert after existing copies of this card
+            for (int i = 0; i < toAdd; ++i) {
+                insertIntoLayout(constructWidgetForIndex(persistent), insertBase + currentWidgetCount + i);
             }
         }
 
-        if (!trackedIndex.isValid()) {
-            emit cleanupRequested(this);
-        }
+        // Always refresh selection state after modifying widgets
+        refreshSelectionForIndex(persistent);
     }
 }
 
@@ -179,25 +380,20 @@ void CardGroupDisplayWidget::onActiveSortCriteriaChanged(QStringList _activeSort
     updateCardDisplays();
 }
 
-void CardGroupDisplayWidget::mousePressEvent(QMouseEvent *event)
+void CardGroupDisplayWidget::updateCardCount()
 {
-    QWidget::mousePressEvent(event);
-    if (selectionModel) {
-        selectionModel->clearSelection();
+    if (!banner || !deckListModel || !trackedIndex.isValid()) {
+        return;
     }
-}
 
-void CardGroupDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card)
-{
-    emit cardClicked(event, card);
+    QString text = cardGroupCategory;
+    if (SettingsCache::instance().cardsDisplay().getVisualDeckEditorShowCardCounts()) {
+        int total = 0;
+        for (int i = 0; i < deckListModel->rowCount(trackedIndex); ++i) {
+            total +=
+                deckListModel->index(i, DeckListModelColumns::CARD_AMOUNT, trackedIndex).data(Qt::EditRole).toInt();
+        }
+        text += QStringLiteral(" (%1)").arg(total);
+    }
+    banner->setText(text);
 }
-
-void CardGroupDisplayWidget::onHover(const ExactCard &card)
-{
-    emit cardHovered(card);
-}
-
-void CardGroupDisplayWidget::resizeEvent(QResizeEvent *event)
-{
-    QWidget::resizeEvent(event);
-}
\ No newline at end of file
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 73c43abbc..f4a555766 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
@@ -1,21 +1,30 @@
 /**
  * @file card_group_display_widget.h
  * @ingroup DeckEditorCardGroupWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARD_GROUP_DISPLAY_WIDGET_H
 #define CARD_GROUP_DISPLAY_WIDGET_H
 
-#include "../../general/display/banner_widget.h"
-#include "../card_info_picture_with_text_overlay_widget.h"
-#include "../card_size_widget.h"
-
-#include <QItemSelectionModel>
-#include <QLabel>
+#include <QList>
+#include <QMap>
+#include <QMouseEvent>
+#include <QPersistentModelIndex>
+#include <QString>
+#include <QStringList>
 #include <QVBoxLayout>
+#include <QVector>
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qtmetamacros.h>
+
+class BannerWidget;
+class CardSizeWidget;
+class DeckListModel;
+class ExactCard;
+class QItemSelection;
+class QItemSelectionModel;
+class QModelIndex;
 
 class CardGroupDisplayWidget : public QWidget
 {
@@ -33,12 +42,14 @@ public:
                            int bannerOpacity,
                            CardSizeWidget *cardSizeWidget);
     void onSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+    void refreshSelectionForIndex(const QPersistentModelIndex &persistent);
     void clearAllDisplayWidgets();
+    void addCardWidgets(const QPersistentModelIndex &persistent);
 
     DeckListModel *deckListModel;
     QItemSelectionModel *selectionModel;
     QPersistentModelIndex trackedIndex;
-    QHash<QPersistentModelIndex, QWidget *> indexToWidgetMap;
+    QMap<QPersistentModelIndex, QList<QWidget *>> indexToWidgetMap;
     QString zoneName;
     QString cardGroupCategory;
     QString activeGroupCriteria;
@@ -47,17 +58,17 @@ public:
 
 public slots:
     void mousePressEvent(QMouseEvent *event) override;
-    void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card);
-    void onHover(const ExactCard &card);
     virtual QWidget *constructWidgetForIndex(QPersistentModelIndex index);
     virtual void updateCardDisplays();
     virtual void onCardAddition(const QModelIndex &parent, int first, int last);
     virtual void onCardRemoval(const QModelIndex &parent, int first, int last);
+    void onDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles);
     void onActiveSortCriteriaChanged(QStringList activeSortCriteria);
+    void updateCardCount();
     void resizeEvent(QResizeEvent *event) override;
 
 signals:
-    void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card);
+    void cardClicked(QMouseEvent *event, const ExactCard &card);
     void cardHovered(const ExactCard &card);
     void cleanupRequested(CardGroupDisplayWidget *cardGroupDisplayWidget);
 
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 e52242c7b..3256e0ca8 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,10 +1,20 @@
 #include "flat_card_group_display_widget.h"
 
-#include <QResizeEvent>
-#include <libcockatrice/card/database/card_database_manager.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 <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,
@@ -31,13 +41,17 @@ FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent,
 
     layout->addWidget(flowWidget);
 
+    // Clear all existing widgets
     for (const QPersistentModelIndex &idx : indexToWidgetMap.keys()) {
-        FlatCardGroupDisplayWidget::removeFromLayout(indexToWidgetMap.value(idx));
-        indexToWidgetMap.value(idx)->deleteLater();
+        for (auto widget : indexToWidgetMap.value(idx)) {
+            FlatCardGroupDisplayWidget::removeFromLayout(widget);
+            widget->deleteLater();
+        }
         indexToWidgetMap.remove(idx);
     }
 
     FlatCardGroupDisplayWidget::updateCardDisplays();
+
     disconnect(deckListModel, &QAbstractItemModel::rowsInserted, this, &CardGroupDisplayWidget::onCardAddition);
     disconnect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &CardGroupDisplayWidget::onCardRemoval);
 
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 e07152b34..d13dcddb5 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
@@ -1,8 +1,8 @@
 /**
  * @file flat_card_group_display_widget.h
  * @ingroup DeckEditorCardGroupWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef FLAT_CARD_GROUP_DISPLAY_WIDGET_H
 #define FLAT_CARD_GROUP_DISPLAY_WIDGET_H
@@ -10,6 +10,16 @@
 #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 27741a79c..6e923cdbe 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,8 +1,20 @@
 #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 <libcockatrice/card/database/card_database_manager.h>
+#include <QSlider>
+#include <QVBoxLayout>
+#include <QWidget>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qnamespace.h>
+
+class QItemSelectionModel;
 
 OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent,
                                                                    DeckListModel *_deckListModel,
@@ -30,9 +42,12 @@ OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *pare
 
     layout->addWidget(overlapWidget);
 
+    // Clear all existing widgets
     for (const QPersistentModelIndex &idx : indexToWidgetMap.keys()) {
-        OverlappedCardGroupDisplayWidget::removeFromLayout(indexToWidgetMap.value(idx));
-        indexToWidgetMap.value(idx)->deleteLater();
+        for (auto widget : indexToWidgetMap.value(idx)) {
+            OverlappedCardGroupDisplayWidget::removeFromLayout(widget);
+            widget->deleteLater();
+        }
         indexToWidgetMap.remove(idx);
     }
 
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 288e46129..76be3069f 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
@@ -1,8 +1,8 @@
 /**
  * @file overlapped_card_group_display_widget.h
  * @ingroup DeckEditorCardGroupWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef OVERLAPPED_CARD_GROUP_DISPLAY_WIDGET_H
 #define OVERLAPPED_CARD_GROUP_DISPLAY_WIDGET_H
@@ -10,6 +10,16 @@
 #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 819bc57d0..7ec2ee38e 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
@@ -1,16 +1,27 @@
 #include "card_info_display_widget.h"
 
-#include "../../../game/board/card_item.h"
+#include "../../../game_graphics/board/abstract_card_item.h"
+#include "../../../game_graphics/card_dimensions.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 <QApplication>
+#include <QGuiApplication>
+#include <QObject>
+#include <QRect>
 #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((qreal)CARD_HEIGHT / (qreal)CARD_WIDTH)
+    : QFrame(parent, flags), aspectRatio(CardDimensions::HEIGHT_F / CardDimensions::WIDTH_F)
 {
     setContentsMargins(3, 3, 3, 3);
     pic = new CardInfoPictureWidget();
@@ -27,7 +38,7 @@ CardInfoDisplayWidget::CardInfoDisplayWidget(const CardRef &cardRef, QWidget *pa
     layout->addWidget(text, 0, Qt::AlignCenter);
     setLayout(layout);
 
-    setFrameStyle(QFrame::Panel | QFrame::Raised);
+    setFrameStyle(static_cast<int>(QFrame::Panel) | QFrame::Raised);
 
     int pixmapHeight = QGuiApplication::primaryScreen()->geometry().height() / 3;
     int pixmapWidth = static_cast<int>(pixmapHeight / aspectRatio);
@@ -43,11 +54,13 @@ CardInfoDisplayWidget::CardInfoDisplayWidget(const CardRef &cardRef, QWidget *pa
 
 void CardInfoDisplayWidget::setCard(const ExactCard &card)
 {
-    if (exactCard)
+    if (exactCard) {
         disconnect(exactCard.getCardPtr().data(), nullptr, this, nullptr);
+    }
     exactCard = card;
-    if (exactCard)
+    if (exactCard) {
         connect(exactCard.getCardPtr().data(), &QObject::destroyed, this, &CardInfoDisplayWidget::clear);
+    }
 
     text->setCard(exactCard);
     pic->setCard(exactCard);
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 d44c4c205..65965a63e 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_display_widget.h
@@ -1,21 +1,23 @@
 /**
  * @file card_info_display_widget.h
  * @ingroup CardWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARDINFOWIDGET_H
 #define CARDINFOWIDGET_H
 
-#include <QComboBox>
 #include <QFrame>
-#include <QStringList>
+#include <QtGlobal>
 #include <libcockatrice/card/printing/exact_card.h>
-#include <libcockatrice/utility/card_ref.h>
+#include <qnamespace.h>
+#include <qtmetamacros.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 21bee8f54..0f66eb209 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
@@ -1,15 +1,27 @@
 #include "card_info_frame_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../game/board/card_item.h"
-#include "card_info_display_widget.h"
+#include "../../../game_graphics/board/abstract_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 <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)
@@ -60,7 +72,7 @@ CardInfoFrameWidget::CardInfoFrameWidget(QWidget *parent)
     tab3Layout->addWidget(splitter);
     tab3->setLayout(tab3Layout);
 
-    setViewMode(SettingsCache::instance().getCardInfoViewMode());
+    setViewMode(SettingsCache::instance().cardsDisplay().getCardInfoViewMode());
 }
 
 void CardInfoFrameWidget::retranslateUi()
@@ -127,7 +139,7 @@ void CardInfoFrameWidget::setViewMode(int mode)
 
     refreshLayout();
 
-    SettingsCache::instance().setCardInfoViewMode(mode);
+    SettingsCache::instance().cardsDisplay().setCardInfoViewMode(mode);
 }
 
 static bool hasTransformation(const CardInfo &info)
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 11b991e87..1f8143785 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.h
@@ -1,22 +1,25 @@
 /**
  * @file card_info_frame_widget.h
  * @ingroup CardWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARDFRAME_H
 #define CARDFRAME_H
 
-#include <QPushButton>
+#include <QString>
 #include <QTabWidget>
 #include <libcockatrice/card/printing/exact_card.h>
-#include <libcockatrice/utility/card_ref.h>
+#include <qtmetamacros.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 451104d17..5ec4c8a25 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,6 +1,12 @@
 #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)
@@ -8,7 +14,7 @@ CardInfoPictureArtCropWidget::CardInfoPictureArtCropWidget(QWidget *parent)
     hide();
 }
 
-QPixmap CardInfoPictureArtCropWidget::getProcessedBackground(const QSize &targetSize)
+QPixmap CardInfoPictureArtCropWidget::getBackground()
 {
     // Load the full-resolution card image, not a pre-scaled one
     QPixmap fullResPixmap;
@@ -17,10 +23,8 @@ QPixmap CardInfoPictureArtCropWidget::getProcessedBackground(const QSize &target
     } else {
         CardPictureLoader::getCardBackPixmap(fullResPixmap, QSize(745, 1040));
     }
-
-    // Fail-safe if loading failed
     if (fullResPixmap.isNull()) {
-        return QPixmap(targetSize);
+        return QPixmap(); // return null qpixmap
     }
 
     const QSize sz = fullResPixmap.size();
@@ -33,9 +37,7 @@ QPixmap CardInfoPictureArtCropWidget::getProcessedBackground(const QSize &target
 
     foilRect = foilRect.intersected(fullResPixmap.rect()); // always clamp to source bounds
 
-    // Crop first, then scale for best quality
+    // return full resolution image crop
     QPixmap cropped = fullResPixmap.copy(foilRect);
-    QPixmap scaled = cropped.scaled(targetSize, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
-
-    return scaled;
+    return cropped;
 }
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 aed951cc6..540b0c2fa 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
@@ -1,14 +1,19 @@
 /**
  * @file card_info_picture_art_crop_widget.h
  * @ingroup CardWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARD_INFO_PICTURE_ART_CROP_WIDGET_H
 #define CARD_INFO_PICTURE_ART_CROP_WIDGET_H
 
 #include "card_info_picture_widget.h"
 
+#include <QPixmap>
+#include <qtmetamacros.h>
+
+class QWidget;
+
 class CardInfoPictureArtCropWidget : public CardInfoPictureWidget
 {
     Q_OBJECT
@@ -16,8 +21,8 @@ class CardInfoPictureArtCropWidget : public CardInfoPictureWidget
 public:
     explicit CardInfoPictureArtCropWidget(QWidget *parent = nullptr);
 
-    // Returns a processed (cropped & scaled) version of the pixmap
-    QPixmap getProcessedBackground(const QSize &targetSize);
+    // Returns a cropped version of the pixmap
+    QPixmap getBackground();
 };
 
 #endif // CARD_INFO_PICTURE_ART_CROP_WIDGET_H
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 185bb20d1..ba10d4a0f 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,9 +2,17 @@
 
 #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.
@@ -17,11 +25,12 @@ CardInfoPictureEnlargedWidget::CardInfoPictureEnlargedWidget(QWidget *parent) :
     setWindowFlags(Qt::ToolTip); // Keeps this widget on top of everything
     setAttribute(Qt::WA_TranslucentBackground);
 
-    connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
-        Q_UNUSED(_roundCardCorners);
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::roundCardCornersChanged, this,
+            [this](bool _roundCardCorners) {
+                Q_UNUSED(_roundCardCorners);
 
-        update();
-    });
+                update();
+            });
 }
 
 /**
@@ -50,12 +59,29 @@ void CardInfoPictureEnlargedWidget::loadPixmap(const QSize &size)
  * @param size The desired size for the pixmap.
  *
  * Sets the widget's pixmap to the card image and resizes the widget to match the specified size. Triggers a repaint.
+ *
+ * When the image is not yet cached, the pixmap is cleared (instead of showing a stale previous card) and the widget
+ * refreshes automatically once the card image finishes loading.
  */
 void CardInfoPictureEnlargedWidget::setCardPixmap(const ExactCard &_card, const QSize size)
 {
+    if (card.getCardPtr()) {
+        disconnect(card.getCardPtr().data(), nullptr, this, nullptr);
+    }
+
     card = _card;
+
+    // Clear any previous card's art so we never paint a stale pixmap while the new image loads
+    enlargedPixmap = QPixmap();
     loadPixmap(size);
 
+    if (card.getCardPtr()) {
+        connect(card.getCardPtr().data(), &CardInfo::pixmapUpdated, this, [this]() {
+            loadPixmap(this->size());
+            update();
+        });
+    }
+
     setFixedSize(size); // Set the widget size to the enlarged size
 
     update(); // Trigger a repaint
@@ -99,7 +125,8 @@ void CardInfoPictureEnlargedWidget::paintEvent(QPaintEvent *event)
     QPoint topLeft{(width() - scaledLogicalSize.width()) / 2, (height() - scaledLogicalSize.height()) / 2};
 
     // Rounded corner radius based on logical width
-    qreal radius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * scaledLogicalSize.width() : 0.0;
+    qreal radius =
+        SettingsCache::instance().cardsDisplay().getRoundCardCorners() ? 0.05 * scaledLogicalSize.width() : 0.0;
 
     QStylePainter painter(this);
     // Fill the background with transparent color to ensure rounded corners are rendered properly
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 10eb32940..f5ead2a18 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
@@ -2,14 +2,18 @@
  * @file card_info_picture_enlarged_widget.h
  * @ingroup CardWigets
  * @ingroup DeckEditorWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 fc1b9ebe2..3c1e1b77f 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp
@@ -1,19 +1,59 @@
 #include "card_info_picture_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../game/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 <utility>
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <qlogging.h>
+#include <qnamespace.h>
+
+static constexpr qreal MTG_CARD_ASPECT_RATIO = 1.396;
+// static constexpr qreal YUGIOH_CARD_ASPECT_RATIO = 1.457;
+static constexpr qreal ASPECT_RATIO = MTG_CARD_ASPECT_RATIO;
+
+static constexpr int BASE_WIDTH = 200;
+static constexpr int BASE_HEIGHT = 200;
+
+static constexpr int ENLARGED_PIXMAP_OFFSET = 10;
+
+static constexpr int HOVER_ACTIVATE_THRESHOLD_MS = 500;
+static constexpr int ANIMATION_OFFSET = 10; // Adjust this for how much the widget moves up
 
 /**
  * @class CardInfoPictureWidget
@@ -34,15 +74,11 @@
 CardInfoPictureWidget::CardInfoPictureWidget(QWidget *parent, const bool _hoverToZoomEnabled, const bool _raiseOnEnter)
     : QWidget(parent), pixmapDirty(true), hoverToZoomEnabled(_hoverToZoomEnabled), raiseOnEnter(_raiseOnEnter)
 {
-    setMinimumHeight(baseHeight);
+    setMinimumHeight(BASE_HEIGHT);
     if (hoverToZoomEnabled) {
         setMouseTracking(true);
     }
 
-    enlargedPixmapWidget = new CardInfoPictureEnlargedWidget(this->window());
-    enlargedPixmapWidget->hide();
-    connect(this, &QObject::destroyed, enlargedPixmapWidget, &CardInfoPictureEnlargedWidget::deleteLater);
-
     hoverTimer = new QTimer(this);
     hoverTimer->setSingleShot(true);
     connect(hoverTimer, &QTimer::timeout, this, &CardInfoPictureWidget::showEnlargedPixmap);
@@ -51,18 +87,21 @@ CardInfoPictureWidget::CardInfoPictureWidget(QWidget *parent, const bool _hoverT
     originalPos = this->pos();
 
     // Create the animation
-    animation = new QPropertyAnimation(this, "pos");
+    animation = new QPropertyAnimation(this, "pos", this);
     animation->setDuration(200); // 200ms animation duration
     animation->setEasingCurve(QEasingCurve::OutQuad);
 
     animation->setStartValue(originalPos);
-    animation->setEndValue(originalPos - QPoint(0, animationOffset));
+    animation->setEndValue(originalPos - QPoint(0, ANIMATION_OFFSET));
 
-    connect(&SettingsCache::instance(), &SettingsCache::roundCardCornersChanged, this, [this](bool _roundCardCorners) {
-        Q_UNUSED(_roundCardCorners);
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::roundCardCornersChanged, this,
+            [this](bool _roundCardCorners) {
+                Q_UNUSED(_roundCardCorners);
 
-        update();
-    });
+                update();
+            });
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this,
+            &CardInfoPictureWidget::updatePixmap);
 }
 
 /**
@@ -123,8 +162,8 @@ void CardInfoPictureWidget::resizeEvent(QResizeEvent *event)
  */
 void CardInfoPictureWidget::setScaleFactor(const int scale)
 {
-    const int newWidth = baseWidth * scale / 100;
-    const int newHeight = static_cast<int>(newWidth * aspectRatio);
+    const int newWidth = BASE_WIDTH * scale / 100;
+    const int newHeight = static_cast<int>(newWidth * ASPECT_RATIO);
 
     scaleFactor = scale;
 
@@ -182,13 +221,8 @@ void CardInfoPictureWidget::paintEvent(QPaintEvent *event)
     }
 
     QPixmap transformedPixmap = resizedPixmap; // Default pixmap
-    if (SettingsCache::instance().getAutoRotateSidewaysLayoutCards()) {
-        if (exactCard.getInfo().getUiAttributes().landscapeOrientation) {
-            // Rotate pixmap 90 degrees to the left
-            QTransform transform;
-            transform.rotate(90);
-            transformedPixmap = resizedPixmap.transformed(transform, Qt::SmoothTransformation);
-        }
+    if (SettingsCache::instance().cardsDisplay().getAutoRotateSidewaysLayoutCards()) {
+        transformedPixmap = CardArtUtils::rotateSidewaysLayoutArt(resizedPixmap, exactCard);
     }
 
     // Handle DPI scaling
@@ -212,7 +246,9 @@ void CardInfoPictureWidget::paintEvent(QPaintEvent *event)
 
     // Compute rounded corner radius
     // Ensure consistent rounding
-    qreal radius = SettingsCache::instance().getRoundCardCorners() ? 0.05 * static_cast<qreal>(targetRect.width()) : 0.;
+    qreal radius = SettingsCache::instance().cardsDisplay().getRoundCardCorners()
+                       ? 0.05 * static_cast<qreal>(targetRect.width())
+                       : 0.;
 
     // Draw the pixmap with rounded corners
     QStylePainter painter(this);
@@ -230,25 +266,21 @@ void CardInfoPictureWidget::paintEvent(QPaintEvent *event)
  */
 QSize CardInfoPictureWidget::sizeHint() const
 {
-    return {static_cast<int>(baseWidth * scaleFactor / 100.0),
-            static_cast<int>(baseWidth * scaleFactor / 100.0 * aspectRatio)};
+    return {static_cast<int>(BASE_WIDTH * scaleFactor / 100.0),
+            static_cast<int>(BASE_WIDTH * scaleFactor / 100.0 * ASPECT_RATIO)};
 }
 
 /**
  * @brief Starts the hover timer to show the enlarged pixmap on hover.
  * @param event The enter event.
  */
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 void CardInfoPictureWidget::enterEvent(QEnterEvent *event)
-#else
-void CardInfoPictureWidget::enterEvent(QEvent *event)
-#endif
 {
     QWidget::enterEvent(event); // Call the base class implementation
 
     // If hover-to-zoom is enabled, start the hover timer
     if (hoverToZoomEnabled) {
-        hoverTimer->start(hoverActivateThresholdInMs);
+        hoverTimer->start(HOVER_ACTIVATE_THRESHOLD_MS);
     }
 
     // Emit signal indicating a card is being hovered on
@@ -260,7 +292,7 @@ void CardInfoPictureWidget::enterEvent(QEvent *event)
         } else {
             originalPos = this->pos(); // Update the baseline position
             animation->setStartValue(originalPos);
-            animation->setEndValue(originalPos - QPoint(0, animationOffset));
+            animation->setEndValue(originalPos - QPoint(0, ANIMATION_OFFSET));
         }
         animation->setDirection(QAbstractAnimation::Forward);
         animation->start();
@@ -277,7 +309,7 @@ void CardInfoPictureWidget::leaveEvent(QEvent *event)
 
     if (hoverToZoomEnabled) {
         hoverTimer->stop();
-        enlargedPixmapWidget->hide();
+        destroyEnlargedPixmapWidget();
     }
 
     if (raiseOnEnter) {
@@ -294,7 +326,7 @@ void CardInfoPictureWidget::moveEvent(QMoveEvent *event)
     QWidget::moveEvent(event);
 
     hoverTimer->stop();
-    enlargedPixmapWidget->hide();
+    destroyEnlargedPixmapWidget();
 
     if (animation->state() == QAbstractAnimation::Running) {
         return;
@@ -310,20 +342,20 @@ void CardInfoPictureWidget::mouseMoveEvent(QMouseEvent *event)
 {
     QWidget::mouseMoveEvent(event);
 
-    if (hoverToZoomEnabled && enlargedPixmapWidget->isVisible()) {
+    if (hoverToZoomEnabled && enlargedPixmapWidget && enlargedPixmapWidget->isVisible()) {
         const QPoint cursorPos = QCursor::pos();
         const QRect screenGeometry = QGuiApplication::screenAt(cursorPos)->geometry();
         const QSize widgetSize = enlargedPixmapWidget->size();
 
-        int newX = cursorPos.x() + enlargedPixmapOffset;
-        int newY = cursorPos.y() + enlargedPixmapOffset;
+        int newX = cursorPos.x() + ENLARGED_PIXMAP_OFFSET;
+        int newY = cursorPos.y() + ENLARGED_PIXMAP_OFFSET;
 
         // Adjust if out of bounds
         if (newX + widgetSize.width() > screenGeometry.right()) {
-            newX = cursorPos.x() - widgetSize.width() - enlargedPixmapOffset;
+            newX = cursorPos.x() - widgetSize.width() - ENLARGED_PIXMAP_OFFSET;
         }
         if (newY + widgetSize.height() > screenGeometry.bottom()) {
-            newY = cursorPos.y() - widgetSize.height() - enlargedPixmapOffset;
+            newY = cursorPos.y() - widgetSize.height() - ENLARGED_PIXMAP_OFFSET;
         }
 
         enlargedPixmapWidget->move(newX, newY);
@@ -335,16 +367,14 @@ void CardInfoPictureWidget::mousePressEvent(QMouseEvent *event)
     QWidget::mousePressEvent(event);
     if (event->button() == Qt::RightButton) {
         createRightClickMenu()->popup(QCursor::pos());
-    } else {
-        emit cardClicked();
     }
 
-    emit cardClicked();
+    emit cardClicked(event, exactCard);
 }
 
 void CardInfoPictureWidget::hideEvent(QHideEvent *event)
 {
-    enlargedPixmapWidget->hide();
+    destroyEnlargedPixmapWidget();
     QWidget::hideEvent(event);
 }
 
@@ -425,13 +455,13 @@ QMenu *CardInfoPictureWidget::createAddToOpenDeckMenu()
         QAction *addCard = addCardMenu->addAction(tr("Mainboard"));
         connect(addCard, &QAction::triggered, this, [this, deckEditorTab] {
             deckEditorTab->updateCard(exactCard);
-            deckEditorTab->actAddCard(exactCard);
+            deckEditorTab->addCard(exactCard, DECK_ZONE_MAIN);
         });
 
         QAction *addCardSideboard = addCardMenu->addAction(tr("Sideboard"));
         connect(addCardSideboard, &QAction::triggered, this, [this, deckEditorTab] {
             deckEditorTab->updateCard(exactCard);
-            deckEditorTab->actAddCardToSideboard(exactCard);
+            deckEditorTab->addCard(exactCard, DECK_ZONE_SIDE);
         });
     }
 
@@ -444,31 +474,45 @@ QMenu *CardInfoPictureWidget::createAddToOpenDeckMenu()
  * If card information is available, the enlarged pixmap is loaded, positioned near the cursor,
  * and displayed.
  */
-void CardInfoPictureWidget::showEnlargedPixmap() const
+void CardInfoPictureWidget::showEnlargedPixmap()
 {
     if (!exactCard) {
         return;
     }
 
-    const QSize enlargedSize(static_cast<int>(size().width() * 2), static_cast<int>(size().width() * aspectRatio * 2));
+    // Lazy creation of the enlarged widget
+    if (!enlargedPixmapWidget) {
+        enlargedPixmapWidget = new CardInfoPictureEnlargedWidget(const_cast<CardInfoPictureWidget *>(this)->window());
+        enlargedPixmapWidget->hide();
+        connect(this, &QObject::destroyed, enlargedPixmapWidget, &CardInfoPictureEnlargedWidget::deleteLater);
+    }
+
+    const QSize enlargedSize(static_cast<int>(size().width() * 2), static_cast<int>(size().width() * ASPECT_RATIO * 2));
     enlargedPixmapWidget->setCardPixmap(exactCard, enlargedSize);
 
     const QPoint cursorPos = QCursor::pos();
     const QRect screenGeometry = QGuiApplication::screenAt(cursorPos)->geometry();
     const QSize widgetSize = enlargedPixmapWidget->size();
 
-    int newX = cursorPos.x() + enlargedPixmapOffset;
-    int newY = cursorPos.y() + enlargedPixmapOffset;
+    int newX = cursorPos.x() + ENLARGED_PIXMAP_OFFSET;
+    int newY = cursorPos.y() + ENLARGED_PIXMAP_OFFSET;
 
-    // Adjust if out of bounds
     if (newX + widgetSize.width() > screenGeometry.right()) {
-        newX = cursorPos.x() - widgetSize.width() - enlargedPixmapOffset;
+        newX = cursorPos.x() - widgetSize.width() - ENLARGED_PIXMAP_OFFSET;
     }
     if (newY + widgetSize.height() > screenGeometry.bottom()) {
-        newY = cursorPos.y() - widgetSize.height() - enlargedPixmapOffset;
+        newY = cursorPos.y() - widgetSize.height() - ENLARGED_PIXMAP_OFFSET;
     }
 
     enlargedPixmapWidget->move(newX, newY);
 
     enlargedPixmapWidget->show();
 }
+
+void CardInfoPictureWidget::destroyEnlargedPixmapWidget()
+{
+    if (enlargedPixmapWidget) {
+        enlargedPixmapWidget->deleteLater();
+        enlargedPixmapWidget = nullptr;
+    }
+}
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 980d700f6..8d2d63736 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.h
@@ -1,21 +1,26 @@
 /**
  * @file card_info_picture_widget.h
  * @ingroup CardWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARD_INFO_PICTURE_H
 #define CARD_INFO_PICTURE_H
 
-#include "card_info_picture_enlarged_widget.h"
-
-#include <QPropertyAnimation>
+#include <QLoggingCategory>
+#include <QMouseEvent>
+#include <QPixmap>
+#include <QPoint>
 #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
@@ -43,16 +48,12 @@ signals:
     void hoveredOnCard(const ExactCard &hoveredCard);
     void cardScaleFactorChanged(int _scale);
     void cardChanged(const ExactCard &card);
-    void cardClicked();
+    void cardClicked(QMouseEvent *event, const ExactCard &card);
 
 protected:
     void resizeEvent(QResizeEvent *event) override;
     void paintEvent(QPaintEvent *) override;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    void enterEvent(QEnterEvent *event) override; // Qt6 signature
-#else
-    void enterEvent(QEvent *event) override; // Qt5 signature
-#endif
+    void enterEvent(QEnterEvent *event) override;
     void leaveEvent(QEvent *event) override;
     void moveEvent(QMoveEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;
@@ -63,27 +64,22 @@ protected:
     {
         return resizedPixmap;
     }
-    void showEnlargedPixmap() const;
+    void showEnlargedPixmap();
+    void destroyEnlargedPixmapWidget();
 
 private:
     ExactCard exactCard;
-    qreal magicTheGatheringCardAspectRatio = 1.396;
-    qreal yuGiOhCardAspectRatio = 1.457;
-    qreal aspectRatio = magicTheGatheringCardAspectRatio;
-    int baseWidth = 200;
-    int baseHeight = 200;
     double scaleFactor = 100;
     QPixmap resizedPixmap;
     bool pixmapDirty;
     bool hoverToZoomEnabled;
     bool raiseOnEnter;
-    int hoverActivateThresholdInMs = 500;
+
     CardInfoPictureEnlargedWidget *enlargedPixmapWidget = nullptr;
-    int enlargedPixmapOffset = 10;
+
     QTimer *hoverTimer;
     QPropertyAnimation *animation;
-    QPoint originalPos;             // Store the original position
-    const int animationOffset = 10; // Adjust this for how much the widget moves up
+    QPoint originalPos; // Store the original position
 
     QMenu *createRightClickMenu();
     QMenu *createViewRelatedCardsMenu();
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 2f0aeccfd..04fe9ab69 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,8 +1,24 @@
 #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.
@@ -93,7 +109,7 @@ void CardInfoPictureWithTextOverlayWidget::setHighlighted(bool _highlighted)
 
 void CardInfoPictureWithTextOverlayWidget::mousePressEvent(QMouseEvent *event)
 {
-    emit imageClicked(event, this);
+    emit cardClicked(event, getCard());
 }
 
 /**
@@ -133,12 +149,14 @@ void CardInfoPictureWithTextOverlayWidget::paintEvent(QPaintEvent *event)
         path.addRoundedRect(glowRect, radius, radius);
 
         // Soft outer glow
-        QColor glowColor(0, 150, 255, 80); // subtle blu
+        QColor glowColor = palette().color(QPalette::Highlight);
+        glowColor.setAlpha(80);
         painter.setPen(QPen(glowColor, 6));
         painter.drawPath(path);
 
         // Thin inner border for crispness
-        QColor borderColor(0, 150, 255, 200);
+        QColor borderColor = palette().color(QPalette::Highlight);
+        borderColor.setAlpha(200);
         painter.setPen(QPen(borderColor, 2));
         painter.drawRoundedRect(pixmapRect, radius, radius);
 
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 eed827292..6c547dc13 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
@@ -2,8 +2,8 @@
  * @file card_info_picture_with_text_overlay_widget.h
  * @ingroup CardWidgets
  * @ingroup DeckStorageWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARD_PICTURE_WITH_TEXT_OVERLAY_H
 #define CARD_PICTURE_WITH_TEXT_OVERLAY_H
@@ -11,8 +11,14 @@
 #include "card_info_picture_widget.h"
 
 #include <QColor>
-#include <QSize>
+#include <QString>
 #include <QTextOption>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class QPainter;
+class QRect;
+class QWidget;
 
 class CardInfoPictureWithTextOverlayWidget : public CardInfoPictureWidget
 {
@@ -35,8 +41,6 @@ public:
     void setHighlighted(bool _highlighted);
 
     [[nodiscard]] QSize sizeHint() const override;
-signals:
-    void imageClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
 
 protected:
     void paintEvent(QPaintEvent *event) override;
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 456e1533a..fa6cde311 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp
@@ -1,16 +1,28 @@
 #include "card_info_text_widget.h"
 
-#include "../../../game/board/card_item.h"
+#include "../../../client/settings/cache_settings.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), info(nullptr)
+CardInfoTextWidget::CardInfoTextWidget(QWidget *parent) : QFrame(parent)
 {
     propsLabel = new QLabel;
     propsLabel->setOpenExternalLinks(false);
@@ -39,6 +51,12 @@ CardInfoTextWidget::CardInfoTextWidget(QWidget *parent) : QFrame(parent), info(n
     grid->setRowStretch(1, 1);
 
     retranslateUi();
+
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this, [this] {
+        if (currentCard) {
+            setCard(currentCard);
+        }
+    });
 }
 
 void CardInfoTextWidget::setTexts(const QString &propsText, const QString &textText)
@@ -60,9 +78,9 @@ void CardInfoTextWidget::setCard(const ExactCard &exactCard)
 
     QString text = "<table width=\"100%\" border=0 cellspacing=0 cellpadding=0>";
     text += QString("<tr><td>%1</td><td width=\"5\"></td><td>%2</td></tr>")
-                .arg(tr("Name:"), card->getName().toHtmlEscaped());
+                .arg(tr("Name:"), CardLocalization::displayName(card).toHtmlEscaped());
 
-    if (exactCard.getPrinting() != PrintingInfo()) {
+    if (!exactCard.getPrinting().isEmpty()) {
         QString setShort = exactCard.getPrinting().getSet()->getShortName().toHtmlEscaped();
         QString cardNum = exactCard.getPrinting().getProperty("num").toHtmlEscaped();
 
@@ -73,8 +91,9 @@ void CardInfoTextWidget::setCard(const ExactCard &exactCard)
 
     QStringList cardProps = card->getProperties();
     for (const QString &key : cardProps) {
-        if (key.contains("-"))
+        if (key.contains("-")) {
             continue;
+        }
         QString keyText = Mtg::getNicePropertyName(key).toHtmlEscaped() + ":";
         text +=
             QString("<tr><td>%1</td><td></td><td>%2</td></tr>").arg(keyText, card->getProperty(key).toHtmlEscaped());
@@ -93,7 +112,8 @@ void CardInfoTextWidget::setCard(const ExactCard &exactCard)
     }
 
     text += "</table>";
-    setTexts(text, card->getText());
+    setTexts(text, CardLocalization::displayText(card));
+    currentCard = exactCard;
 }
 
 void CardInfoTextWidget::setInvalidCardName(const QString &cardName)
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 95b588882..8223093fe 100644
--- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h
@@ -1,8 +1,8 @@
 /**
  * @file card_info_text_widget.h
  * @ingroup CardWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARDINFOTEXT_H
 #define CARDINFOTEXT_H
@@ -10,10 +10,13 @@
 #include "libcockatrice/card/printing/exact_card.h"
 
 #include <QFrame>
-#include <libcockatrice/card/card_info.h>
+#include <QString>
+#include <qtmetamacros.h>
+
 class QLabel;
 class QScrollArea;
 class QTextEdit;
+class QWidget;
 
 class CardInfoTextWidget : public QFrame
 {
@@ -23,7 +26,7 @@ private:
     QLabel *propsLabel;
     QScrollArea *propsScroll;
     QTextEdit *textLabel;
-    CardInfoPtr info;
+    ExactCard currentCard; ///< Last card set, re-rendered when the card language changes.
     void setTexts(const QString &propsText, const QString &textText);
 
 public:
diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
index 14e45743d..ab1840591 100644
--- a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
+++ b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp
@@ -1,7 +1,19 @@
 #include "card_size_widget.h"
 
-#include "../printing_selector/printing_selector.h"
-#include "../visual_deck_storage/visual_deck_storage_widget.h"
+#include "../general/layout_containers/flow_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
@@ -58,3 +70,39 @@ QSlider *CardSizeWidget::getSlider() const
 {
     return cardSizeSlider;
 }
+
+void CardSizeWidget::enableCtrlScrollResize(QWidget *host)
+{
+    host->installEventFilter(this);
+
+    const auto scrollAreas = host->findChildren<QScrollArea *>();
+    for (QScrollArea *scrollArea : scrollAreas) {
+        if (QWidget *content = scrollArea->widget()) {
+            content->installEventFilter(this);
+        }
+    }
+}
+
+bool CardSizeWidget::eventFilter(QObject *watched, QEvent *event)
+{
+    if (event->type() == QEvent::Wheel && adjustSliderForWheel(static_cast<QWheelEvent *>(event))) {
+        return true;
+    }
+    return QWidget::eventFilter(watched, event);
+}
+
+bool CardSizeWidget::adjustSliderForWheel(QWheelEvent *event)
+{
+    if (!(event->modifiers() & Qt::ControlModifier)) {
+        return false;
+    }
+
+    const int angleDelta = event->angleDelta().y();
+    if (angleDelta == 0) {
+        return false;
+    }
+
+    const int wheelSteps = angleDelta > 0 ? qMax(1, angleDelta / 120) : qMin(-1, angleDelta / 120);
+    cardSizeSlider->setValue(cardSizeSlider->value() + wheelSteps * CARD_SIZE_WHEEL_STEP);
+    return true;
+}
diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.h b/cockatrice/src/interface/widgets/cards/card_size_widget.h
index 638c263ea..7de97a5e9 100644
--- a/cockatrice/src/interface/widgets/cards/card_size_widget.h
+++ b/cockatrice/src/interface/widgets/cards/card_size_widget.h
@@ -3,19 +3,21 @@
  * @ingroup CardWidgets
  * @ingroup DeckEditorWidgets
  * @ingroup DeckStorageWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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
 {
@@ -25,6 +27,18 @@ public:
     explicit CardSizeWidget(QWidget *parent, FlowWidget *flowWidget = nullptr, int defaultValue = 100);
     [[nodiscard]] QSlider *getSlider() const;
 
+    /**
+     * @brief Resizes the cards when the user Ctrl + scrolls over @p host or any of its descendants.
+     *
+     * Installs this widget as an event filter on the given host widget. If the host contains a
+     * scroll area the filter is also installed on the scroll area's content widget, so the resize
+     * intercepts the wheel event before the scroll area would scroll the view.
+     */
+    void enableCtrlScrollResize(QWidget *host);
+
+protected:
+    bool eventFilter(QObject *watched, QEvent *event) override;
+
 private slots:
     void updateCardSizeSetting(int newValue);
 
@@ -44,6 +58,10 @@ private:
     QSlider *cardSizeSlider;
     QTimer debounceTimer; // Debounce timer
     int pendingValue;     // Stores the latest slider value
+
+    bool adjustSliderForWheel(QWheelEvent *event);
+
+    static constexpr int CARD_SIZE_WHEEL_STEP = 10; ///< Slider step applied per Ctrl + scroll notch.
 };
 
 #endif // CARD_SIZE_WIDGET_H
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 132964f13..911e35285 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,10 +1,38 @@
 #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 <QResizeEvent>
+#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 <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qnamespace.h>
+
+class CardSizeWidget;
+class QMouseEvent;
 
 DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
                                                      DeckListModel *_deckListModel,
@@ -22,6 +50,7 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
       displayType(_displayType), bannerOpacity(bannerOpacity), subBannerOpacity(subBannerOpacity),
       cardSizeWidget(_cardSizeWidget)
 {
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
@@ -36,6 +65,7 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
     banner->setBuddy(cardGroupContainer);
 
     displayCards();
+    updateZoneCardCount();
 
     connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &DeckCardZoneDisplayWidget::onCategoryAddition);
     if (selectionModel) {
@@ -43,6 +73,20 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
                 &DeckCardZoneDisplayWidget::onSelectionChanged);
     }
     connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &DeckCardZoneDisplayWidget::onCategoryRemoval);
+    connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &DeckCardZoneDisplayWidget::updateZoneCardCount);
+    connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &DeckCardZoneDisplayWidget::updateZoneCardCount);
+    connect(deckListModel, &QAbstractItemModel::dataChanged, this, &DeckCardZoneDisplayWidget::updateZoneCardCount);
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::visualDeckEditorShowCardCountsChanged,
+            this, &DeckCardZoneDisplayWidget::updateZoneCardCount);
+}
+
+// =====================================================================================================================
+//                                                    User Interaction
+// =====================================================================================================================
+
+void DeckCardZoneDisplayWidget::onHover(const ExactCard &card)
+{
+    emit cardHovered(card);
 }
 
 void DeckCardZoneDisplayWidget::onSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected)
@@ -68,30 +112,29 @@ void DeckCardZoneDisplayWidget::onSelectionChanged(const QItemSelection &selecte
     }
 }
 
-void DeckCardZoneDisplayWidget::cleanupInvalidCardGroup(CardGroupDisplayWidget *displayWidget)
-{
-    cardGroupLayout->removeWidget(displayWidget);
-    displayWidget->setParent(nullptr);
-    for (auto idx : indexToWidgetMap.keys()) {
-        if (!idx.isValid()) {
-            indexToWidgetMap.remove(idx);
-        }
-    }
-    delete displayWidget;
-}
+// =====================================================================================================================
+//                                             Display Widget Management
+// =====================================================================================================================
 
 void DeckCardZoneDisplayWidget::constructAppropriateWidget(QPersistentModelIndex index)
 {
-    auto categoryName = deckListModel->data(index.sibling(index.row(), 1), Qt::EditRole).toString();
     if (indexToWidgetMap.contains(index)) {
         return;
     }
+
+    auto categoryName = index.sibling(index.row(), DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+    // Cards in a custom zone belong to that zone, not the board zone, so that
+    // increment/decrement/swap actions target the custom zone.
+    const bool isCustomZone = index.data(DeckRoles::IsCustomZoneRole).toBool();
+    const QString effectiveZoneName = isCustomZone ? categoryName : zoneName;
+    const auto routeCardClick = [this, effectiveZoneName](QMouseEvent *event, const ExactCard &card) {
+        emit cardClicked(event, card, effectiveZoneName);
+    };
     if (displayType == DisplayType::Overlap) {
         auto *displayWidget = new OverlappedCardGroupDisplayWidget(
-            cardGroupContainer, deckListModel, selectionModel, index, zoneName, categoryName, activeGroupCriteria,
-            activeSortCriteria, subBannerOpacity, cardSizeWidget);
-        connect(displayWidget, &OverlappedCardGroupDisplayWidget::cardClicked, this,
-                &DeckCardZoneDisplayWidget::onClick);
+            cardGroupContainer, deckListModel, selectionModel, index, effectiveZoneName, categoryName,
+            activeGroupCriteria, activeSortCriteria, subBannerOpacity, cardSizeWidget);
+        connect(displayWidget, &OverlappedCardGroupDisplayWidget::cardClicked, this, routeCardClick);
         connect(displayWidget, &OverlappedCardGroupDisplayWidget::cardHovered, this,
                 &DeckCardZoneDisplayWidget::onHover);
         connect(displayWidget, &CardGroupDisplayWidget::cleanupRequested, this,
@@ -102,9 +145,9 @@ void DeckCardZoneDisplayWidget::constructAppropriateWidget(QPersistentModelIndex
         indexToWidgetMap.insert(index, displayWidget);
     } else if (displayType == DisplayType::Flat) {
         auto *displayWidget = new FlatCardGroupDisplayWidget(cardGroupContainer, deckListModel, selectionModel, index,
-                                                             zoneName, categoryName, activeGroupCriteria,
+                                                             effectiveZoneName, categoryName, activeGroupCriteria,
                                                              activeSortCriteria, subBannerOpacity, cardSizeWidget);
-        connect(displayWidget, &FlatCardGroupDisplayWidget::cardClicked, this, &DeckCardZoneDisplayWidget::onClick);
+        connect(displayWidget, &FlatCardGroupDisplayWidget::cardClicked, this, routeCardClick);
         connect(displayWidget, &FlatCardGroupDisplayWidget::cardHovered, this, &DeckCardZoneDisplayWidget::onHover);
         connect(displayWidget, &CardGroupDisplayWidget::cleanupRequested, this,
                 &DeckCardZoneDisplayWidget::cleanupInvalidCardGroup);
@@ -117,28 +160,61 @@ void DeckCardZoneDisplayWidget::constructAppropriateWidget(QPersistentModelIndex
 
 void DeckCardZoneDisplayWidget::displayCards()
 {
-    QSortFilterProxyModel proxy;
-    proxy.setSourceModel(deckListModel);
-    proxy.setSortRole(Qt::EditRole);
-    proxy.sort(1, Qt::AscendingOrder);
+    if (!trackedIndex.isValid()) {
+        return;
+    }
 
-    // 1. trackedIndex is a source index → map it to proxy space
-    QModelIndex proxyParent = proxy.mapFromSource(trackedIndex);
-
-    // 2. iterate children under the proxy parent
-    for (int i = 0; i < proxy.rowCount(proxyParent); ++i) {
-        QModelIndex proxyIndex = proxy.index(i, 0, proxyParent);
-
-        // 3. map back to source
-        QModelIndex sourceIndex = proxy.mapToSource(proxyIndex);
-
-        // 4. persist the source index
-        QPersistentModelIndex persistent(sourceIndex);
+    // Iterate the direct children of the tracked zone, keeping the tree view's row
+    // order (criteria groups first, then custom zones, both in the model's sort order).
+    QList<QPersistentModelIndex> rows;
+    for (int i = 0; i < deckListModel->rowCount(trackedIndex); ++i) {
+        rows.append(QPersistentModelIndex(deckListModel->index(i, 0, trackedIndex)));
+    }
 
+    for (const QPersistentModelIndex &persistent : rows) {
         constructAppropriateWidget(persistent);
     }
 }
 
+void DeckCardZoneDisplayWidget::refreshDisplayType(const DisplayType &_displayType)
+{
+    displayType = _displayType;
+    QLayoutItem *item;
+    while ((item = cardGroupLayout->takeAt(0)) != nullptr) {
+        if (item->widget()) {
+            item->widget()->deleteLater();
+        } else if (item->layout()) {
+            item->layout()->deleteLater();
+        }
+        delete item;
+    }
+
+    indexToWidgetMap.clear();
+
+    // We gotta wait for all the deleteLater's to finish so we fire after the next event cycle
+
+    auto timer = new QTimer(this);
+    timer->setSingleShot(true);
+    connect(timer, &QTimer::timeout, this, [this]() { displayCards(); });
+    timer->start();
+}
+
+void DeckCardZoneDisplayWidget::cleanupInvalidCardGroup(CardGroupDisplayWidget *displayWidget)
+{
+    cardGroupLayout->removeWidget(displayWidget);
+    displayWidget->setParent(nullptr);
+    for (auto idx : indexToWidgetMap.keys()) {
+        if (!idx.isValid()) {
+            indexToWidgetMap.remove(idx);
+        }
+    }
+    delete displayWidget;
+}
+
+// =====================================================================================================================
+//                                           DeckListModel Signal Responses
+// =====================================================================================================================
+
 void DeckCardZoneDisplayWidget::onCategoryAddition(const QModelIndex &parent, int first, int last)
 {
     if (!trackedIndex.isValid()) {
@@ -171,48 +247,6 @@ void DeckCardZoneDisplayWidget::onCategoryRemoval(const QModelIndex &parent, int
     }
 }
 
-void DeckCardZoneDisplayWidget::resizeEvent(QResizeEvent *event)
-{
-    QWidget::resizeEvent(event);
-    for (QObject *child : layout->children()) {
-        QWidget *widget = qobject_cast<QWidget *>(child);
-        if (widget) {
-            widget->setMaximumWidth(width());
-        }
-    }
-}
-void DeckCardZoneDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card)
-{
-    emit cardClicked(event, card, zoneName);
-}
-void DeckCardZoneDisplayWidget::onHover(const ExactCard &card)
-{
-    emit cardHovered(card);
-}
-
-void DeckCardZoneDisplayWidget::refreshDisplayType(const DisplayType &_displayType)
-{
-    displayType = _displayType;
-    QLayoutItem *item;
-    while ((item = cardGroupLayout->takeAt(0)) != nullptr) {
-        if (item->widget()) {
-            item->widget()->deleteLater();
-        } else if (item->layout()) {
-            item->layout()->deleteLater();
-        }
-        delete item;
-    }
-
-    indexToWidgetMap.clear();
-
-    // We gotta wait for all the deleteLater's to finish so we fire after the next event cycle
-
-    auto timer = new QTimer(this);
-    timer->setSingleShot(true);
-    connect(timer, &QTimer::timeout, this, [this]() { displayCards(); });
-    timer->start();
-}
-
 void DeckCardZoneDisplayWidget::onActiveGroupCriteriaChanged(QString _activeGroupCriteria)
 {
     activeGroupCriteria = _activeGroupCriteria;
@@ -229,10 +263,13 @@ QList<QString> DeckCardZoneDisplayWidget::getGroupCriteriaValueList()
 {
     QList<QString> groupCriteriaValues;
 
-    QList<ExactCard> cardsInZone = deckListModel->getCardsForZone(zoneName);
+    QList<const DecklistCardNode *> nodes = deckListModel->getCardNodesForZone(zoneName);
 
-    for (const ExactCard &cardInZone : cardsInZone) {
-        groupCriteriaValues.append(cardInZone.getInfo().getProperty(activeGroupCriteria));
+    for (auto node : nodes) {
+        CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(node->getName());
+        if (info) {
+            groupCriteriaValues.append(info->getProperty(activeGroupCriteria));
+        }
     }
 
     groupCriteriaValues.removeDuplicates();
@@ -240,3 +277,21 @@ QList<QString> DeckCardZoneDisplayWidget::getGroupCriteriaValueList()
 
     return groupCriteriaValues;
 }
+
+void DeckCardZoneDisplayWidget::updateZoneCardCount()
+{
+    if (!banner || !deckListModel) {
+        return;
+    }
+
+    QString text = zoneName;
+    if (SettingsCache::instance().cardsDisplay().getVisualDeckEditorShowCardCounts()) {
+        int total = 0;
+        const auto cardNodes = deckListModel->getCardNodesForZone(zoneName);
+        for (const auto *node : cardNodes) {
+            total += node->getNumber();
+        }
+        text += QStringLiteral(" (%1)").arg(total);
+    }
+    banner->setText(text);
+}
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 d5603017c..b7dc3ed3e 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
@@ -1,22 +1,33 @@
 /**
  * @file deck_card_zone_display_widget.h
  * @ingroup DeckEditorWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 <QVBoxLayout>
+#include <QHash>
+#include <QList>
+#include <QMouseEvent>
+#include <QPersistentModelIndex>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qtmetamacros.h>
+
+class BannerWidget;
+class CardGroupDisplayWidget;
+class CardSizeWidget;
+class DeckListModel;
+class ExactCard;
+class OverlapWidget;
+class QItemSelection;
+class QItemSelectionModel;
+class QModelIndex;
+class QVBoxLayout;
 
 class DeckCardZoneDisplayWidget : public QWidget
 {
@@ -40,10 +51,8 @@ public:
     QPersistentModelIndex trackedIndex;
     QString zoneName;
     void addCardsToOverlapWidget();
-    void resizeEvent(QResizeEvent *event) override;
 
 public slots:
-    void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card);
     void onHover(const ExactCard &card);
     void cleanupInvalidCardGroup(CardGroupDisplayWidget *displayWidget);
     void constructAppropriateWidget(QPersistentModelIndex index);
@@ -54,9 +63,10 @@ public slots:
     QList<QString> getGroupCriteriaValueList();
     void onCategoryAddition(const QModelIndex &parent, int first, int last);
     void onCategoryRemoval(const QModelIndex &parent, int first, int last);
+    void updateZoneCardCount();
 
 signals:
-    void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *card, QString zoneName);
+    void cardClicked(QMouseEvent *event, const ExactCard &card, const QString &zoneName);
     void cardHovered(const ExactCard &card);
     void activeSortCriteriaChanged(QStringList activeSortCriteria);
     void requestCleanup(DeckCardZoneDisplayWidget *displayWidget);
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 486b3302d..186c55755 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,13 +1,14 @@
 #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 <QPainterPath>
-#include <QStylePainter>
+#include <QTimer>
+#include <libcockatrice/settings/visual_deck_storage_settings.h>
+
+class QWidget;
 
 /**
  * @brief Constructs a CardPictureWithTextOverlay widget.
@@ -17,7 +18,6 @@
  * @param outlineColor The color of the outline around the text.
  * @param fontSize The font size of the overlay text.
  * @param alignment The alignment of the text within the overlay.
- * @param _deckLoader The Deck Loader holding the Deck associated with this preview.
  *
  * Sets the widget's size policy and default border style.
  */
@@ -27,27 +27,38 @@ DeckPreviewCardPictureWidget::DeckPreviewCardPictureWidget(QWidget *parent,
                                                            const QColor &textColor,
                                                            const QColor &outlineColor,
                                                            const int fontSize,
-                                                           const Qt::Alignment alignment)
+                                                           const Qt::Alignment alignment,
+                                                           const bool _emitClickImmediately)
     : CardInfoPictureWithTextOverlayWidget(parent,
                                            hoverToZoomEnabled,
                                            raiseOnEnter,
                                            textColor,
                                            outlineColor,
                                            fontSize,
-                                           alignment)
+                                           alignment),
+      emitClickImmediately(_emitClickImmediately)
 {
     singleClickTimer = new QTimer(this);
     singleClickTimer->setSingleShot(true);
-    connect(singleClickTimer, &QTimer::timeout, this, [this]() { emit imageClicked(lastMouseEvent, this); });
-    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageSelectionAnimationChanged, this,
+    connect(singleClickTimer, &QTimer::timeout, this, [this]() {
+        emit imageClicked(lastMouseEvent, this);
+        emit imageSingleClicked();
+    });
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDeckStorageSelectionAnimationChanged, this,
             &CardInfoPictureWidget::setRaiseOnEnterEnabled);
 }
 
 void DeckPreviewCardPictureWidget::mousePressEvent(QMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton) {
-        lastMouseEvent = event;
-        singleClickTimer->start(QApplication::doubleClickInterval());
+        if (emitClickImmediately) {
+            emit imageClicked(event, this);
+            emit imageSingleClicked();
+        } else {
+            lastMouseEvent = event;
+            singleClickTimer->start(QApplication::doubleClickInterval());
+        }
     } else {
         emit imageClicked(event, this);
         event->accept();
@@ -57,7 +68,14 @@ void DeckPreviewCardPictureWidget::mousePressEvent(QMouseEvent *event)
 void DeckPreviewCardPictureWidget::mouseDoubleClickEvent(QMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton) {
-        singleClickTimer->stop(); // Prevent single-click logic
-        emit imageDoubleClicked(lastMouseEvent, this);
+        if (emitClickImmediately) {
+            // Do not report a second single click for the second press of the
+            // double-click; the consumer maps the double-click to select+open.
+            lastMouseEvent = event;
+            emit imageDoubleClicked(event, this);
+        } else {
+            singleClickTimer->stop(); // Prevent single-click logic
+            emit imageDoubleClicked(lastMouseEvent, this);
+        }
     }
 }
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 acb67a49a..9643c7364 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
@@ -2,8 +2,8 @@
  * @file deck_preview_card_picture_widget.h
  * @ingroup CardWidgets
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DECK_PREVIEW_CARD_PICTURE_WIDGET_H
 #define DECK_PREVIEW_CARD_PICTURE_WIDGET_H
@@ -11,30 +11,50 @@
 #include "card_info_picture_with_text_overlay_widget.h"
 
 #include <QColor>
-#include <QSize>
-#include <QTextOption>
-#include <QTimer>
+#include <QMouseEvent>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class QTimer;
+class QWidget;
 
 class DeckPreviewCardPictureWidget final : public CardInfoPictureWithTextOverlayWidget
 {
     Q_OBJECT
 
 public:
+    /**
+     * @brief Constructs a DeckPreviewCardPictureWidget.
+     * @param parent The parent widget.
+     * @param hoverToZoomEnabled If this widget will spawn a larger widget when hovered over.
+     * @param raiseOnEnter If the widget raises its border when the mouse enters.
+     * @param textColor The color of the overlay text.
+     * @param outlineColor The color of the outline around the text.
+     * @param fontSize The font size of the overlay text.
+     * @param alignment The alignment of the text within the overlay.
+     * @param emitClickImmediately If true, a left click is reported immediately on click
+     *        instead of after the double-click interval. Use this for selection surfaces
+     *        where reacting to a double-click (select-and-open) would needlessly delay the
+     *        single-click feedback. The double-click signal is still emitted.
+     */
     explicit DeckPreviewCardPictureWidget(QWidget *parent,
                                           bool hoverToZoomEnabled = false,
                                           bool raiseOnEnter = false,
                                           const QColor &textColor = Qt::white,
                                           const QColor &outlineColor = Qt::black,
                                           int fontSize = 12,
-                                          Qt::Alignment alignment = Qt::AlignCenter);
+                                          Qt::Alignment alignment = Qt::AlignCenter,
+                                          bool _emitClickImmediately = false);
 
 signals:
     void imageClicked(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
+    void imageSingleClicked();
     void imageDoubleClicked(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
 
 private:
     QTimer *singleClickTimer;
     QMouseEvent *lastMouseEvent = nullptr; // Store the last mouse event
+    bool emitClickImmediately;
 
 protected:
     void mousePressEvent(QMouseEvent *event) override;
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
new file mode 100644
index 000000000..730043d95
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp
@@ -0,0 +1,57 @@
+#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)
+{
+    layout = new QVBoxLayout(this);
+
+    bannerAndSettingsContainer = new QWidget(this);
+
+    bannerAndSettingsLayout = new QHBoxLayout(bannerAndSettingsContainer);
+    bannerAndSettingsContainer->setLayout(bannerAndSettingsLayout);
+    bannerWidget = new BannerWidget(this, "Analytics Widget", Qt::Vertical, 100);
+    bannerWidget->setMaximumHeight(100);
+
+    bannerAndSettingsLayout->addWidget(bannerWidget, 1);
+
+    // config button
+    configureButton = new QPushButton(this);
+    configureButton->setIcon(themePixmap(QStringLiteral("icons/cogwheel")));
+    configureButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+    connect(configureButton, &QPushButton::clicked, this, &AbstractAnalyticsPanelWidget::applyConfigFromDialog);
+    bannerAndSettingsLayout->addWidget(configureButton, 0);
+
+    layout->addWidget(bannerAndSettingsContainer);
+
+    connect(analyzer, &DeckListStatisticsAnalyzer::statsUpdated, this, &AbstractAnalyticsPanelWidget::updateDisplay);
+}
+
+bool AbstractAnalyticsPanelWidget::applyConfigFromDialog()
+{
+    QDialog *dlg = createConfigDialog(this);
+    if (!dlg) {
+        return false;
+    }
+
+    bool ok = dlg->exec() == QDialog::Accepted;
+    if (ok) {
+        // dialog must expose its final config as JSON
+        auto newCfg = extractConfigFromDialog(dlg);
+        loadConfig(newCfg);
+        updateDisplay();
+    }
+    dlg->deleteLater();
+    return ok;
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..c1afb78d0
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.h
@@ -0,0 +1,65 @@
+#ifndef COCKATRICE_DECK_ANALYTICS_WIDGET_BASE_H
+#define COCKATRICE_DECK_ANALYTICS_WIDGET_BASE_H
+
+#include "../general/display/banner_widget.h"
+
+#include <QJsonObject>
+#include <QString>
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class DeckListStatisticsAnalyzer;
+class QDialog;
+class QHBoxLayout;
+class QPushButton;
+class QVBoxLayout;
+
+class AbstractAnalyticsPanelWidget : public QWidget
+{
+    Q_OBJECT
+public slots:
+    virtual void updateDisplay() = 0;
+    // Widgets must return a config dialog
+    virtual QDialog *createConfigDialog(QWidget *parent) = 0;
+
+public:
+    explicit AbstractAnalyticsPanelWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer);
+
+    void setDisplayTitle(const QString &title)
+    {
+        displayTitle = title;
+        if (bannerWidget) {
+            bannerWidget->setText(displayTitle);
+        }
+    }
+
+    QString displayTitleText() const
+    {
+        return displayTitle;
+    }
+
+    virtual QJsonObject saveConfig() const
+    {
+        return {};
+    }
+    virtual void loadConfig(const QJsonObject &)
+    {
+    }
+
+    // Unified helper to run config dialog and update widget
+    bool applyConfigFromDialog();
+
+    // Dialog → JSON must be supplied by each subclass
+    virtual QJsonObject extractConfigFromDialog(QDialog *dlg) const = 0;
+
+protected:
+    DeckListStatisticsAnalyzer *analyzer;
+    QVBoxLayout *layout;
+    QWidget *bannerAndSettingsContainer;
+    QHBoxLayout *bannerAndSettingsLayout;
+    QString displayTitle;
+    BannerWidget *bannerWidget;
+    QPushButton *configureButton;
+};
+
+#endif // COCKATRICE_DECK_ANALYTICS_WIDGET_BASE_H
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
new file mode 100644
index 000000000..f1ed5767c
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp
@@ -0,0 +1,35 @@
+#include "add_analytics_panel_dialog.h"
+
+#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"));
+
+    layout = new QVBoxLayout(this);
+
+    typeCombo = new QComboBox(this);
+
+    // Populate using descriptors
+    const auto widgets = AnalyticsPanelWidgetFactory::instance().availableWidgets();
+
+    for (const auto &desc : widgets) {
+        // Show translated title to user
+        typeCombo->addItem(desc.title, desc.type);
+    }
+
+    layout->addWidget(typeCombo);
+
+    buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+
+    layout->addWidget(buttons);
+
+    connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
+}
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
new file mode 100644
index 000000000..f70c1d8f5
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/add_analytics_panel_dialog.h
@@ -0,0 +1,32 @@
+
+#ifndef COCKATRICE_ADD_ANALYTICS_PANEL_DIALOG_H
+#define COCKATRICE_ADD_ANALYTICS_PANEL_DIALOG_H
+
+#include <QComboBox>
+#include <QDialog>
+#include <QString>
+#include <QVariant>
+#include <qtmetamacros.h>
+
+class QDialogButtonBox;
+class QVBoxLayout;
+class QWidget;
+
+class AddAnalyticsPanelDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit AddAnalyticsPanelDialog(QWidget *parent);
+
+    QString selectedType() const
+    {
+        return typeCombo->currentData().toString();
+    }
+
+private:
+    QVBoxLayout *layout;
+    QComboBox *typeCombo;
+    QDialogButtonBox *buttons;
+};
+
+#endif // COCKATRICE_ADD_ANALYTICS_PANEL_DIALOG_H
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
new file mode 100644
index 000000000..79dda527d
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.cpp
@@ -0,0 +1,36 @@
+#include "analytics_panel_widget_factory.h"
+
+#include "abstract_analytics_panel_widget.h"
+
+#include <QSharedPointer>
+
+AnalyticsPanelWidgetFactory &AnalyticsPanelWidgetFactory::instance()
+{
+    static AnalyticsPanelWidgetFactory f;
+    return f;
+}
+
+void AnalyticsPanelWidgetFactory::registerWidget(const Descriptor &desc)
+{
+    widgets.insert(desc.type, desc);
+}
+
+AbstractAnalyticsPanelWidget *
+AnalyticsPanelWidgetFactory::create(const QString &type, QWidget *parent, DeckListStatisticsAnalyzer *analyzer) const
+{
+    auto it = widgets.find(type);
+    if (it == widgets.end()) {
+        return nullptr;
+    }
+
+    auto w = it->creator(parent, analyzer);
+
+    w->setDisplayTitle(it->title);
+
+    return w;
+}
+
+QList<AnalyticsPanelWidgetFactory::Descriptor> AnalyticsPanelWidgetFactory::availableWidgets() const
+{
+    return widgets.values();
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..598498980
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_factory.h
@@ -0,0 +1,44 @@
+#ifndef COCKATRICE_DECK_ANALYTICS_WIDGET_FACTORY_H
+#define COCKATRICE_DECK_ANALYTICS_WIDGET_FACTORY_H
+
+#include <QList>
+#include <QMap>
+#include <QString>
+#include <QWidget>
+#include <functional>
+
+class AbstractAnalyticsPanelWidget;
+class DeckListStatisticsAnalyzer;
+
+class AnalyticsPanelWidgetFactory
+{
+public:
+    using Creator = std::function<AbstractAnalyticsPanelWidget *(QWidget *, DeckListStatisticsAnalyzer *)>;
+
+    struct Descriptor
+    {
+        QString type;  // stable ID ("manaProdDevotion")
+        QString title; // translated, user-facing
+        Creator creator;
+    };
+
+    static AnalyticsPanelWidgetFactory &instance();
+
+    // NEW: richer registration
+    void registerWidget(const Descriptor &desc);
+
+    AbstractAnalyticsPanelWidget *
+    create(const QString &type, QWidget *parent, DeckListStatisticsAnalyzer *analyzer) const;
+
+    // NEW: expose widgets to UI
+    QList<Descriptor> availableWidgets() const;
+
+private:
+    AnalyticsPanelWidgetFactory() = default; // Ensure private constructor
+    AnalyticsPanelWidgetFactory(const AnalyticsPanelWidgetFactory &) = delete;
+    AnalyticsPanelWidgetFactory &operator=(const AnalyticsPanelWidgetFactory &) = delete;
+
+    QMap<QString, Descriptor> widgets;
+};
+
+#endif
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.cpp b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.cpp
new file mode 100644
index 000000000..d4129a3d0
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.cpp
@@ -0,0 +1 @@
+#include "analytics_panel_widget_registrar.h"
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
new file mode 100644
index 000000000..99a6daf5d
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analytics_panel_widget_registrar.h
@@ -0,0 +1,19 @@
+#ifndef COCKATRICE_DECK_ANALYTICS_WIDGET_REGISTRAR_H
+#define COCKATRICE_DECK_ANALYTICS_WIDGET_REGISTRAR_H
+
+#include "analytics_panel_widget_factory.h"
+
+#include <QString>
+
+class AnalyticsPanelWidgetRegistrar
+{
+public:
+    AnalyticsPanelWidgetRegistrar(const QString &type,
+                                  const QString &title,
+                                  AnalyticsPanelWidgetFactory::Creator creator)
+    {
+        AnalyticsPanelWidgetFactory::instance().registerWidget({type, title, creator});
+    }
+};
+
+#endif // COCKATRICE_DECK_ANALYTICS_WIDGET_REGISTRAR_H
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
new file mode 100644
index 000000000..1c61116e3
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.cpp
@@ -0,0 +1,31 @@
+#include "draw_probability_config.h"
+
+#include <QJsonValue>
+#include <QJsonValueRef>
+
+QJsonObject DrawProbabilityConfig::toJson() const
+{
+    QJsonObject o;
+    o["criteria"] = criteria;
+    o["atLeast"] = atLeast;
+    o["quantity"] = quantity;
+    o["drawn"] = drawn;
+    return o;
+}
+DrawProbabilityConfig DrawProbabilityConfig::fromJson(const QJsonObject &o)
+{
+    DrawProbabilityConfig cfg;
+    if (o.contains("criteria")) {
+        cfg.criteria = o["criteria"].toString();
+    }
+    if (o.contains("atLeast")) {
+        cfg.atLeast = o["atLeast"].toBool(true);
+    }
+    if (o.contains("quantity")) {
+        cfg.quantity = o["quantity"].toInt(1);
+    }
+    if (o.contains("drawn")) {
+        cfg.drawn = o["drawn"].toInt(7);
+    }
+    return cfg;
+}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.h b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.h
new file mode 100644
index 000000000..bbe61a68e
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config.h
@@ -0,0 +1,19 @@
+#ifndef COCKATRICE_DRAW_PROBABILITY_CONFIG_H
+#define COCKATRICE_DRAW_PROBABILITY_CONFIG_H
+
+#include <QJsonObject>
+#include <QString>
+
+struct DrawProbabilityConfig
+{
+    QString criteria = "name"; // name, type, subtype, cmc
+    bool atLeast = true;       // true = at least, false = exactly
+    int quantity = 1;          // N
+    int drawn = 7;             // M
+
+    QJsonObject toJson() const;
+
+    static DrawProbabilityConfig fromJson(const QJsonObject &o);
+};
+
+#endif
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
new file mode 100644
index 000000000..28fd4c841
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp
@@ -0,0 +1,96 @@
+#include "draw_probability_config_dialog.h"
+
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QFormLayout>
+#include <QLabel>
+#include <QSpinBox>
+#include <QString>
+#include <QVariant>
+
+class QWidget;
+
+DrawProbabilityConfigDialog::DrawProbabilityConfigDialog(QWidget *parent) : QDialog(parent)
+{
+    form = new QFormLayout(this);
+
+    // Criteria
+    labelCriteria = new QLabel(this);
+    criteria = new QComboBox(this);
+    criteria->addItem(QString(), "name");
+    criteria->addItem(QString(), "type");
+    criteria->addItem(QString(), "subtype");
+    criteria->addItem(QString(), "cmc");
+    form->addRow(labelCriteria, criteria);
+
+    // Exactness
+    labelExactness = new QLabel(this);
+    exactness = new QComboBox(this);
+    exactness->addItem(QString(), true);
+    exactness->addItem(QString(), false);
+    form->addRow(labelExactness, exactness);
+
+    // Quantity
+    labelQuantity = new QLabel(this);
+    quantity = new QSpinBox(this);
+    quantity->setRange(1, 60);
+    form->addRow(labelQuantity, quantity);
+
+    // Drawn
+    labelDrawn = new QLabel(this);
+    drawn = new QSpinBox(this);
+    drawn->setRange(1, 60);
+    drawn->setValue(7);
+    form->addRow(labelDrawn, drawn);
+
+    // Button box
+    auto *bb = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    form->addWidget(bb);
+
+    connect(bb, &QDialogButtonBox::accepted, this, &DrawProbabilityConfigDialog::accept);
+    connect(bb, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+    retranslateUi();
+}
+
+void DrawProbabilityConfigDialog::retranslateUi()
+{
+    setWindowTitle(tr("Draw Probability Settings"));
+
+    labelCriteria->setText(tr("Criteria:"));
+    criteria->setItemText(0, tr("Card Name"));
+    criteria->setItemText(1, tr("Type"));
+    criteria->setItemText(2, tr("Subtype"));
+    criteria->setItemText(3, tr("Mana Value"));
+
+    labelExactness->setText(tr("Exactness:"));
+    exactness->setItemText(0, tr("At least"));
+    exactness->setItemText(1, tr("Exactly"));
+
+    labelQuantity->setText(tr("Quantity (N):"));
+    labelDrawn->setText(tr("Cards drawn (M):"));
+
+    // i18n-friendly suffixes
+    quantity->setSuffix(tr(" cards"));
+    drawn->setSuffix(tr(" cards"));
+}
+
+void DrawProbabilityConfigDialog::setFromConfig(const DrawProbabilityConfig &_config)
+{
+    cfg = _config;
+
+    criteria->setCurrentIndex(criteria->findData(_config.criteria));
+    exactness->setCurrentIndex(exactness->findData(_config.atLeast));
+    quantity->setValue(_config.quantity);
+    drawn->setValue(_config.drawn);
+}
+
+void DrawProbabilityConfigDialog::accept()
+{
+    cfg.criteria = criteria->currentData().toString();
+    cfg.atLeast = exactness->currentData().toBool();
+    cfg.quantity = quantity->value();
+    cfg.drawn = drawn->value();
+
+    QDialog::accept();
+}
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
new file mode 100644
index 000000000..3553db75d
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include "draw_probability_config.h"
+
+#include <QDialog>
+#include <qtmetamacros.h>
+
+class QComboBox;
+class QSpinBox;
+class QLabel;
+class QFormLayout;
+class QWidget;
+
+class DrawProbabilityConfigDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit DrawProbabilityConfigDialog(QWidget *parent = nullptr);
+
+    void retranslateUi();
+
+    void setFromConfig(const DrawProbabilityConfig &_config);
+    DrawProbabilityConfig result() const
+    {
+        return cfg;
+    }
+
+protected:
+    void accept() override;
+
+private:
+    DrawProbabilityConfig cfg;
+
+    QFormLayout *form;
+
+    // Widgets
+    QComboBox *criteria;
+    QComboBox *exactness;
+    QSpinBox *quantity;
+    QSpinBox *drawn;
+
+    QLabel *labelCriteria;
+    QLabel *labelExactness;
+    QLabel *labelQuantity;
+    QLabel *labelDrawn;
+};
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
new file mode 100644
index 000000000..90d9f58ef
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp
@@ -0,0 +1,255 @@
+#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 <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 <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)
+{
+    controls = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff);
+    controls->setSpacing(4, 4);
+
+    labelPrefix = new QLabel(this);
+    controls->addWidget(labelPrefix);
+
+    criteriaCombo = new QComboBox(this);
+    // Give these things item-data so we can translate the actual user-facing strings
+    criteriaCombo->addItem(QString(), "name");
+    criteriaCombo->addItem(QString(), "type");
+    criteriaCombo->addItem(QString(), "subtype");
+    criteriaCombo->addItem(QString(), "cmc");
+    controls->addWidget(criteriaCombo);
+
+    exactnessCombo = new QComboBox(this);
+    exactnessCombo->addItem(QString(), true);  // At least
+    exactnessCombo->addItem(QString(), false); // Exactly
+    controls->addWidget(exactnessCombo);
+
+    quantitySpin = new QSpinBox(this);
+    quantitySpin->setRange(1, 60);
+    controls->addWidget(quantitySpin);
+
+    labelMiddle = new QLabel(this);
+    controls->addWidget(labelMiddle);
+
+    drawnSpin = new QSpinBox(this);
+    drawnSpin->setRange(1, 60);
+    drawnSpin->setValue(7);
+    controls->addWidget(drawnSpin);
+
+    labelSuffix = new QLabel(this);
+    controls->addWidget(labelSuffix);
+
+    labelPrefix->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    labelMiddle->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    labelSuffix->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    layout->addWidget(controls);
+
+    // Table
+    resultTable = new QTableWidget(this);
+    resultTable->setColumnCount(3);
+    resultTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+    resultTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
+    layout->addWidget(resultTable);
+
+    // Connections
+    connect(criteriaCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this] {
+        config.criteria = criteriaCombo->currentData().toString();
+        updateDisplay();
+    });
+
+    connect(exactnessCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this] {
+        config.atLeast = exactnessCombo->currentData().toBool();
+        updateDisplay();
+    });
+
+    connect(quantitySpin, QOverload<int>::of(&QSpinBox::valueChanged), this, [this](int v) {
+        config.quantity = v;
+        updateDisplay();
+    });
+
+    connect(drawnSpin, QOverload<int>::of(&QSpinBox::valueChanged), this, [this](int v) {
+        config.drawn = v;
+        updateDisplay();
+    });
+
+    retranslateUi();
+    applyConfigToToolbar();
+    updateFilterOptions();
+}
+
+void DrawProbabilityWidget::retranslateUi()
+{
+    bannerWidget->setText(tr("Draw Probability"));
+
+    labelPrefix->setText(tr("Probability of drawing"));
+
+    criteriaCombo->setItemText(0, tr("Card Name"));
+    criteriaCombo->setItemText(1, tr("Type"));
+    criteriaCombo->setItemText(2, tr("Subtype"));
+    criteriaCombo->setItemText(3, tr("Mana Value"));
+
+    exactnessCombo->setItemText(0, tr("At least"));
+    exactnessCombo->setItemText(1, tr("Exactly"));
+
+    labelMiddle->setText(tr("card(s) having drawn at least"));
+    labelSuffix->setText(tr("cards"));
+
+    resultTable->setHorizontalHeaderLabels({tr("Category"), tr("Qty"), tr("Odds (%)")});
+}
+
+QDialog *DrawProbabilityWidget::createConfigDialog(QWidget *parent)
+{
+    auto *dlg = new DrawProbabilityConfigDialog(parent);
+    dlg->setFromConfig(config);
+    return dlg;
+}
+
+QJsonObject DrawProbabilityWidget::extractConfigFromDialog(QDialog *dlg) const
+{
+    auto *dp = qobject_cast<DrawProbabilityConfigDialog *>(dlg);
+    return dp ? dp->result().toJson() : QJsonObject{};
+}
+
+void DrawProbabilityWidget::applyConfigToToolbar()
+{
+    auto setComboByData = [](QComboBox *combo, const QVariant &value) {
+        int idx = combo->findData(value);
+        if (idx >= 0) {
+            combo->setCurrentIndex(idx);
+        }
+    };
+
+    setComboByData(criteriaCombo, config.criteria);
+    setComboByData(exactnessCombo, config.atLeast);
+
+    quantitySpin->setValue(config.quantity);
+    drawnSpin->setValue(config.drawn);
+}
+
+void DrawProbabilityWidget::updateDisplay()
+{
+    updateFilterOptions();
+}
+
+void DrawProbabilityWidget::loadConfig(const QJsonObject &cfg)
+{
+    config = DrawProbabilityConfig::fromJson(cfg);
+    applyConfigToToolbar();
+    updateFilterOptions();
+}
+
+void DrawProbabilityWidget::updateFilterOptions()
+{
+    if (!analyzer->getModel()->getDeckList()) {
+        return;
+    }
+
+    const QString criteria = config.criteria;
+    const bool atLeast = config.atLeast;
+    const int quantity = config.quantity;
+    const int drawn = config.drawn;
+
+    QMap<QString, int> categoryCounts;
+    int totalDeckCards = 0;
+
+    const auto nodes = analyzer->getModel()->getCardNodes();
+    for (auto *node : nodes) {
+        CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(node->getName());
+        if (!info) {
+            continue;
+        }
+
+        totalDeckCards += node->getNumber();
+
+        QStringList categories;
+        if (criteria == "name") {
+            categories << info->getName();
+        } else if (criteria == "type") {
+            categories = info->getMainCardType().split(' ', Qt::SkipEmptyParts);
+        } else if (criteria == "subtype") {
+            categories = info->getCardType().split(' ', Qt::SkipEmptyParts);
+        } else if (criteria == "cmc") {
+            categories << QString::number(info->getCmc().toInt());
+        }
+
+        for (const QString &cat : categories) {
+            categoryCounts[cat] += node->getNumber();
+        }
+    }
+
+    resultTable->setRowCount(categoryCounts.size());
+
+    int row = 0;
+    for (auto it = categoryCounts.cbegin(); it != categoryCounts.cend(); ++it, ++row) {
+        const QString &cat = it.key();
+        const int copies = it.value();
+
+        double probability = 0.0;
+        if (atLeast) {
+            for (int k = quantity; k <= drawn && k <= copies; ++k) {
+                probability += hypergeometricProbability(totalDeckCards, copies, drawn, k);
+            }
+        } else {
+            probability = hypergeometricProbability(totalDeckCards, copies, drawn, quantity);
+        }
+
+        resultTable->setItem(row, 0, new QTableWidgetItem(cat));
+        resultTable->setItem(row, 1, new QTableWidgetItem(QString::number(copies)));
+        resultTable->setItem(row, 2, new QTableWidgetItem(QString::number(probability * 100.0, 'f', 2)));
+    }
+}
+
+double DrawProbabilityWidget::hypergeometricProbability(int N, int K, int n, int k)
+{
+    if (k < 0 || k > n || K > N || n > N) {
+        return 0.0;
+    }
+
+    double logP = 0.0;
+    for (int i = 1; i <= k; ++i) {
+        logP += qLn(double(K - k + i) / i);
+    }
+    for (int i = 1; i <= n - k; ++i) {
+        logP += qLn(double(N - K - (n - k) + i) / i);
+    }
+    for (int i = 1; i <= n; ++i) {
+        logP -= qLn(double(N - n + i) / i);
+    }
+
+    return qExp(logP);
+}
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
new file mode 100644
index 000000000..7c7bdb50a
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.h
@@ -0,0 +1,58 @@
+#ifndef COCKATRICE_DRAW_PROBABILITY_WIDGET_H
+#define COCKATRICE_DRAW_PROBABILITY_WIDGET_H
+
+#include "../../abstract_analytics_panel_widget.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;
+
+class DrawProbabilityWidget : public AbstractAnalyticsPanelWidget
+{
+    Q_OBJECT
+public:
+    DrawProbabilityWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer);
+
+    QDialog *createConfigDialog(QWidget *parent) override;
+    QJsonObject extractConfigFromDialog(QDialog *dlg) const override;
+    void applyConfigToToolbar();
+
+public slots:
+    void updateDisplay() override;
+    void loadConfig(const QJsonObject &cfg) override;
+    void retranslateUi();
+
+private slots:
+    void updateFilterOptions();
+
+private:
+    DrawProbabilityConfig config;
+
+    FlowWidget *controls;
+    QLabel *labelPrefix;
+    QLabel *labelMiddle;
+    QLabel *labelSuffix;
+    QLineEdit *cardNameEdit;
+    QComboBox *criteriaCombo;  // Card Name / Type / Subtype / Mana Value
+    QComboBox *filterCombo;    // The actual value
+    QComboBox *exactnessCombo; // At least / Exactly
+    QSpinBox *quantitySpin;    // N
+    QSpinBox *drawnSpin;       // M
+
+    QSpinBox *manaValueSpin;
+
+    QTableWidget *resultTable;
+
+    double hypergeometricProbability(int N, int K, int n, int k);
+    double calculateProbability(int totalCards, int copies, int drawn, bool atLeast);
+};
+
+#endif // COCKATRICE_DRAW_PROBABILITY_WIDGET_H
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
new file mode 100644
index 000000000..41ebdec1e
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.cpp
@@ -0,0 +1,36 @@
+#include "mana_base_config.h"
+
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+
+QJsonObject ManaBaseConfig::toJson() const
+{
+    QJsonObject jsonObject;
+    QJsonArray jsonArray;
+    jsonObject["displayType"] = displayType;
+    for (auto &filter : filters) {
+        jsonArray.append(filter);
+    }
+    jsonObject["filters"] = jsonArray;
+    return jsonObject;
+}
+
+ManaBaseConfig ManaBaseConfig::fromJson(const QJsonObject &o)
+
+{
+    ManaBaseConfig config;
+
+    if (o.contains("displayType")) {
+        config.displayType = o["displayType"].toString();
+    }
+
+    if (o.contains("filters")) {
+        config.filters.clear();
+        for (auto v : o["filters"].toArray()) {
+            config.filters << v.toString();
+        }
+    }
+
+    return config;
+}
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
new file mode 100644
index 000000000..5fd45af62
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config.h
@@ -0,0 +1,20 @@
+
+#ifndef COCKATRICE_MANA_BASE_CONFIG_H
+#define COCKATRICE_MANA_BASE_CONFIG_H
+
+#include <QJsonObject>
+#include <QList>
+#include <QString>
+#include <QStringList>
+
+struct ManaBaseConfig
+{
+    QString displayType; // "pie" or "bar" or "combinedBar"
+    QStringList filters; // which colors to show, empty = all
+
+    QJsonObject toJson() const;
+
+    static ManaBaseConfig fromJson(const QJsonObject &o);
+};
+
+#endif // COCKATRICE_MANA_BASE_CONFIG_H
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
new file mode 100644
index 000000000..32b54c485
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp
@@ -0,0 +1,81 @@
+#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,
+                                           QWidget *parent)
+    : QDialog(parent), config(initial)
+{
+    layout = new QVBoxLayout(this);
+
+    displayTypeLabel = new QLabel(this);
+    layout->addWidget(displayTypeLabel);
+
+    displayType = new QComboBox(this);
+    layout->addWidget(displayType);
+
+    filterLabel = new QLabel(this);
+    layout->addWidget(filterLabel);
+
+    filterList = new QListWidget(this);
+    filterList->setSelectionMode(QAbstractItemView::MultiSelection);
+    layout->addWidget(filterList);
+
+    QStringList colors = analyzer->getManaBase().keys();
+    colors.sort();
+    filterList->addItems(colors);
+
+    // select initial filters
+    for (int i = 0; i < filterList->count(); ++i) {
+        if (config.filters.contains(filterList->item(i)->text())) {
+            filterList->item(i)->setSelected(true);
+        }
+    }
+
+    buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    layout->addWidget(buttons);
+
+    connect(buttons, &QDialogButtonBox::accepted, this, &ManaBaseConfigDialog::accept);
+    connect(buttons, &QDialogButtonBox::rejected, this, &ManaBaseConfigDialog::reject);
+
+    retranslateUi();
+}
+
+void ManaBaseConfigDialog::retranslateUi()
+{
+    setWindowTitle(tr("Mana Base Configuration"));
+
+    displayTypeLabel->setText(tr("Display type:"));
+
+    displayType->clear();
+    displayType->addItems({tr("pie"), tr("bar"), tr("combinedBar")});
+
+    filterLabel->setText(tr("Filter Colors (optional):"));
+
+    buttons->button(QDialogButtonBox::Ok)->setText(tr("OK"));
+    buttons->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
+}
+
+void ManaBaseConfigDialog::accept()
+{
+    config.displayType = displayType->currentText();
+    config.filters.clear();
+    for (auto *item : filterList->selectedItems()) {
+        config.filters << item->text();
+    }
+    QDialog::accept();
+}
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
new file mode 100644
index 000000000..b0ae77076
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.h
@@ -0,0 +1,44 @@
+
+#ifndef COCKATRICE_MANA_BASE_ADD_DIALOG_H
+#define COCKATRICE_MANA_BASE_ADD_DIALOG_H
+
+#include "mana_base_config.h"
+
+#include <QDialog>
+#include <QList>
+#include <QString>
+#include <qtmetamacros.h>
+
+class DeckListStatisticsAnalyzer;
+class QComboBox;
+class QDialogButtonBox;
+class QLabel;
+class QListWidget;
+class QVBoxLayout;
+class QWidget;
+
+class ManaBaseConfigDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    ManaBaseConfigDialog(DeckListStatisticsAnalyzer *analyzer, ManaBaseConfig initial = {}, QWidget *parent = nullptr);
+    void retranslateUi();
+
+    void accept() override;
+
+    ManaBaseConfig result() const
+    {
+        return config;
+    }
+
+private:
+    ManaBaseConfig config;
+    QVBoxLayout *layout;
+    QLabel *displayTypeLabel;
+    QComboBox *displayType;
+    QLabel *filterLabel;
+    QListWidget *filterList;
+    QDialogButtonBox *buttons;
+};
+
+#endif // COCKATRICE_MANA_BASE_ADD_DIALOG_H
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
new file mode 100644
index 000000000..fc7914b94
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp
@@ -0,0 +1,133 @@
+#include "mana_base_widget.h"
+
+#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 <libcockatrice/utility/color.h>
+#include <qnamespace.h>
+#include <utility>
+
+namespace
+{
+
+AnalyticsPanelWidgetRegistrar registerManaBase{
+    "manaBase", ManaBaseWidget::tr("Mana Base"),
+    [](QWidget *parent, DeckListStatisticsAnalyzer *analyzer) { return new ManaBaseWidget(parent, analyzer); }};
+
+} // anonymous namespace
+
+ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer, ManaBaseConfig cfg)
+    : AbstractAnalyticsPanelWidget(parent, analyzer), config(std::move(cfg))
+{
+    barContainer = new QWidget(this);
+    barLayout = new QHBoxLayout(barContainer);
+    layout->addWidget(barContainer);
+
+    updateDisplay();
+}
+
+void ManaBaseWidget::updateDisplay()
+{
+    // Clear previous widgets
+    while (QLayoutItem *item = barLayout->takeAt(0)) {
+        if (item->widget()) {
+            item->widget()->deleteLater();
+        }
+        delete item;
+    }
+
+    auto &pipCount = analyzer->getProductionPipCount();
+    auto &cardCount = analyzer->getProductionCardCount();
+
+    QHash<QString, int> manaMap;
+    for (auto key : pipCount.keys()) {
+        manaMap[key] = pipCount[key];
+    }
+
+    // Apply filters
+    if (!config.filters.isEmpty()) {
+        QHash<QString, int> filtered;
+        for (auto f : config.filters) {
+            if (manaMap.contains(f)) {
+                filtered[f] = manaMap[f];
+            }
+        }
+        manaMap = filtered;
+    }
+
+    // Determine maximum for bar charts
+    int highest = 1;
+    for (auto val : manaMap) {
+        highest = std::max(highest, val);
+    }
+
+    // Convert to QMap for ColorBar / ColorPie (sorted)
+    QMap<QString, int> mapSorted;
+    for (auto it = manaMap.begin(); it != manaMap.end(); ++it) {
+        mapSorted.insert(it.key(), it.value());
+    }
+
+    // Choose display mode
+    if (config.displayType == "bar") {
+        const QList<QPair<QString, int>> sortedColors = GameSpecificColors::MTG::sortManaMapWUBRGCFirst(mapSorted);
+        static const QHash<QString, QColor> colorMap = {
+            {"W", QColor(248, 231, 185)}, {"U", QColor(14, 104, 171)}, {"B", QColor(21, 11, 0)},
+            {"R", QColor(211, 32, 42)},   {"G", QColor(0, 115, 62)},   {"C", QColor(150, 150, 150)},
+        };
+
+        for (const auto &[color, count] : sortedColors) {
+            QString label = QString("%1 %2 (%3)").arg(color).arg(count).arg(cardCount.value(color));
+
+            BarWidget *bar = new BarWidget(label, count, highest, colorMap.value(color, Qt::gray), this);
+
+            barLayout->addWidget(bar);
+        }
+    } else if (config.displayType == "combinedBar") {
+        ColorBar *cb = new ColorBar(mapSorted, this);
+        cb->setMinimumHeight(30);
+        barLayout->addWidget(cb);
+    } else if (config.displayType == "pie") {
+        ColorPie *pie = new ColorPie(mapSorted, this);
+        pie->setMinimumSize(200, 200);
+        barLayout->addWidget(pie);
+    }
+
+    update();
+}
+QSize ManaBaseWidget::sizeHint() const
+{
+    return QSize(800, 150);
+}
+
+QDialog *ManaBaseWidget::createConfigDialog(QWidget *parent)
+{
+    ManaBaseConfigDialog *dlg = new ManaBaseConfigDialog(analyzer, config, parent);
+    return dlg;
+}
+
+QJsonObject ManaBaseWidget::extractConfigFromDialog(QDialog *dlg) const
+{
+    auto *mc = qobject_cast<ManaBaseConfigDialog *>(dlg);
+    if (!mc) {
+        return {};
+    }
+    return mc->result().toJson();
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..7ec5ecefe
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.h
@@ -0,0 +1,52 @@
+/**
+ * @file mana_base_widget.h
+ * @ingroup DeckEditorAnalyticsWidgets
+ */
+//! \todo Document this file.
+
+#ifndef MANA_BASE_WIDGET_H
+#define MANA_BASE_WIDGET_H
+
+#include "../../abstract_analytics_panel_widget.h"
+#include "mana_base_config.h"
+
+#include <QJsonObject>
+#include <QList>
+#include <QString>
+#include <qtmetamacros.h>
+
+class DeckListStatisticsAnalyzer;
+class QHBoxLayout;
+class QWidget;
+
+class ManaBaseWidget : public AbstractAnalyticsPanelWidget
+{
+    Q_OBJECT
+
+public slots:
+    QSize sizeHint() const override;
+    void updateDisplay() override;
+    QDialog *createConfigDialog(QWidget *parent) override;
+
+public:
+    ManaBaseWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer, ManaBaseConfig cfg = {});
+
+    QJsonObject saveConfig() const override
+    {
+        return config.toJson();
+    }
+    void loadConfig(const QJsonObject &o) override
+    {
+        config = ManaBaseConfig::fromJson(o);
+        updateDisplay();
+    }
+
+    QJsonObject extractConfigFromDialog(QDialog *dlg) const override;
+
+private:
+    ManaBaseConfig config;
+    QWidget *barContainer;
+    QHBoxLayout *barLayout;
+};
+
+#endif // MANA_BASE_WIDGET_H
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
new file mode 100644
index 000000000..7e15058a4
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.cpp
@@ -0,0 +1,133 @@
+#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>
+
+constexpr int MIN_ROW_HEIGHT = 100; // Minimum readable height per row
+
+ManaCurveCategoryWidget::ManaCurveCategoryWidget(QWidget *parent) : QWidget(parent)
+{
+    layout = new QVBoxLayout(this);
+    layout->setSpacing(4);
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+}
+
+// Same as minimum for now
+QSize ManaCurveCategoryWidget::sizeHint() const
+{
+    if (layout->isEmpty()) {
+        return QSize(0, 0);
+    }
+
+    // Calculate exact height needed for all rows
+    int rowCount = layout->count();
+
+    int totalHeight = rowCount * MIN_ROW_HEIGHT;
+    totalHeight += (rowCount - 1) * layout->spacing();
+
+    return QSize(0, totalHeight);
+}
+
+QSize ManaCurveCategoryWidget::minimumSizeHint() const
+{
+    if (layout->isEmpty()) {
+        return QSize(0, 0);
+    }
+
+    // Calculate actual minimum based on number of rows
+    int rowCount = layout->count();
+
+    int totalHeight = rowCount * MIN_ROW_HEIGHT;
+    totalHeight += (rowCount - 1) * layout->spacing();
+
+    return QSize(0, totalHeight);
+}
+
+void ManaCurveCategoryWidget::updateDisplay(int minCmc,
+                                            int maxCmc,
+                                            int highest,
+                                            QHash<QString, QHash<int, int>> qCategoryCounts,
+                                            QHash<QString, QHash<int, QStringList>> qCategoryCards,
+                                            const ManaCurveConfig &config)
+{
+    // Clear previous content
+    QtUtils::clearLayoutRec(layout);
+
+    if (!config.showCategoryRows) {
+        return; // nothing to show
+    }
+
+    // Collect categories
+    QStringList categories = qCategoryCounts.keys();
+
+    // Apply filters
+    if (!config.filters.isEmpty()) {
+        QStringList filtered;
+        for (const QString &cat : categories) {
+            if (config.filters.contains(cat)) {
+                filtered.append(cat);
+            }
+        }
+        categories = filtered;
+    }
+
+    std::sort(categories.begin(), categories.end());
+
+    for (const QString &cat : categories) {
+        QWidget *row = new QWidget(this);
+        row->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+        row->setFixedHeight(MIN_ROW_HEIGHT);
+
+        QHBoxLayout *rowLayout = new QHBoxLayout(row);
+        rowLayout->setContentsMargins(0, 0, 0, 0);
+        rowLayout->setSpacing(4);
+
+        QLabel *categoryLabel = new QLabel(cat, row);
+        categoryLabel->setFixedWidth(80);
+        rowLayout->addWidget(categoryLabel);
+
+        QVector<BarData> catBars;
+        const auto cmcCounts = qCategoryCounts.value(cat);
+        const auto cmcCards = qCategoryCards.value(cat);
+
+        for (int cmc = minCmc; cmc <= maxCmc; ++cmc) {
+            int val = cmcCounts.value(cmc, 0);
+            QStringList cards = cmcCards.value(cmc);
+
+            QVector<BarSegment> segments;
+            if (val > 0) {
+                segments.push_back({cat, val, cards, GameSpecificColors::MTG::colorHelper(cat)});
+            }
+
+            catBars.push_back({QString::number(cmc), segments});
+        }
+
+        auto *catChart = new BarChartWidget(row);
+        catChart->setHighest(highest);
+        catChart->setBars(catBars);
+        catChart->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+        rowLayout->addWidget(catChart);
+        layout->addWidget(row);
+    }
+
+    // Update geometry after adding all widgets
+    updateGeometry();
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..1794d5cab
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_category_widget.h
@@ -0,0 +1,34 @@
+#ifndef COCKATRICE_MANA_CURVE_CATEGORY_WIDGET_H
+#define COCKATRICE_MANA_CURVE_CATEGORY_WIDGET_H
+
+#include <QStringList>
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class QString;
+class QVBoxLayout;
+struct ManaCurveConfig;
+template <typename Key, typename T> class QHash;
+
+class ManaCurveCategoryWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ManaCurveCategoryWidget(QWidget *parent);
+    void updateDisplay(int minCmc,
+                       int maxCmc,
+                       int highest,
+                       QHash<QString, QHash<int, int>> qCategoryCounts,
+                       QHash<QString, QHash<int, QStringList>> qCategoryCards,
+                       const ManaCurveConfig &config);
+
+public slots:
+    QSize sizeHint() const override;
+    QSize minimumSizeHint() const override;
+
+private:
+    QVBoxLayout *layout;
+};
+
+#endif // COCKATRICE_MANA_CURVE_CATEGORY_WIDGET_H
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
new file mode 100644
index 000000000..190642ad9
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.cpp
@@ -0,0 +1,45 @@
+#include "mana_curve_config.h"
+
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+
+QJsonObject ManaCurveConfig::toJson() const
+{
+    QJsonObject jsonObject;
+    jsonObject["groupBy"] = groupBy;
+    QJsonArray jsonArray;
+    for (auto &filter : filters) {
+        jsonArray.append(filter);
+    }
+    jsonObject["filters"] = jsonArray;
+    jsonObject["showMain"] = showMain;
+    jsonObject["showCategoryRows"] = showCategoryRows;
+    return jsonObject;
+}
+
+ManaCurveConfig ManaCurveConfig::fromJson(const QJsonObject &o)
+{
+    ManaCurveConfig config;
+
+    if (o.contains("groupBy")) {
+        config.groupBy = o["groupBy"].toString();
+    }
+
+    if (o.contains("filters")) {
+        config.filters.clear();
+        for (auto v : o["filters"].toArray()) {
+            config.filters << v.toString();
+        }
+    }
+
+    if (o.contains("showMain")) {
+        config.showMain = o["showMain"].toBool(true);
+    }
+
+    if (o.contains("showCategoryRows")) {
+        config.showCategoryRows = o["showCategoryRows"].toBool(true);
+    }
+
+    return config;
+}
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
new file mode 100644
index 000000000..28224db03
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config.h
@@ -0,0 +1,22 @@
+
+#ifndef COCKATRICE_MANA_CURVE_CONFIG_H
+#define COCKATRICE_MANA_CURVE_CONFIG_H
+
+#include <QJsonObject>
+#include <QList>
+#include <QString>
+#include <QStringList>
+
+struct ManaCurveConfig
+{
+    QString groupBy = "type"; // "type", "color", "subtype", etc.
+    QStringList filters;      // empty = all
+    bool showMain = true;
+    bool showCategoryRows = true;
+
+    QJsonObject toJson() const;
+
+    static ManaCurveConfig fromJson(const QJsonObject &o);
+};
+
+#endif // COCKATRICE_MANA_CURVE_CONFIG_H
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
new file mode 100644
index 000000000..c5498ff3e
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp
@@ -0,0 +1,103 @@
+#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)
+{
+    auto *lay = new QVBoxLayout(this);
+
+    labelGroupBy = new QLabel(this);
+    lay->addWidget(labelGroupBy);
+
+    groupBy = new QComboBox(this);
+    lay->addWidget(groupBy);
+
+    labelFilters = new QLabel(this);
+    lay->addWidget(labelFilters);
+
+    filterList = new QListWidget(this);
+    filterList->setSelectionMode(QAbstractItemView::MultiSelection);
+    lay->addWidget(filterList);
+
+    showMain = new QCheckBox(this);
+    showMain->setChecked(true);
+    lay->addWidget(showMain);
+
+    showCatRows = new QCheckBox(this);
+    showCatRows->setChecked(true);
+    lay->addWidget(showCatRows);
+
+    buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    lay->addWidget(buttons);
+    connect(buttons, &QDialogButtonBox::accepted, this, &ManaCurveConfigDialog::accept);
+    connect(buttons, &QDialogButtonBox::rejected, this, &ManaCurveConfigDialog::reject);
+
+    // populate dynamic data
+    QStringList cats = analyzer->getManaCurveByType().keys();
+    cats.append(analyzer->getManaCurveByColor().keys());
+    cats.removeDuplicates();
+    cats.sort();
+    filterList->addItems(cats);
+
+    groupBy->addItems({"type", "color", "subtype", "power", "toughness"});
+
+    retranslateUi();
+}
+
+void ManaCurveConfigDialog::retranslateUi()
+{
+    labelGroupBy->setText(tr("Group By:"));
+    groupBy->setItemText(0, tr("type"));
+    groupBy->setItemText(1, tr("color"));
+    groupBy->setItemText(2, tr("subtype"));
+    groupBy->setItemText(3, tr("power"));
+    groupBy->setItemText(4, tr("toughness"));
+
+    labelFilters->setText(tr("Filters (optional):"));
+
+    showMain->setText(tr("Show main bar row"));
+    showCatRows->setText(tr("Show per-category rows"));
+}
+
+void ManaCurveConfigDialog::setFromConfig(const ManaCurveConfig &cfg)
+{
+    groupBy->setCurrentText(cfg.groupBy);
+    // restore filters
+    for (int i = 0; i < filterList->count(); ++i) {
+        filterList->item(i)->setSelected(cfg.filters.contains(filterList->item(i)->text()));
+    }
+
+    showMain->setChecked(cfg.showMain);
+    showCatRows->setChecked(cfg.showCategoryRows);
+}
+
+void ManaCurveConfigDialog::accept()
+{
+    cfg.groupBy = groupBy->currentText();
+
+    cfg.filters.clear();
+    for (auto *item : filterList->selectedItems()) {
+        cfg.filters << item->text();
+    }
+
+    cfg.showMain = showMain->isChecked();
+    cfg.showCategoryRows = showCatRows->isChecked();
+
+    QDialog::accept();
+}
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
new file mode 100644
index 000000000..47ce1b8c2
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.h
@@ -0,0 +1,46 @@
+#ifndef COCKATRICE_MANA_CURVE_ADD_DIALOG_H
+#define COCKATRICE_MANA_CURVE_ADD_DIALOG_H
+
+#include "mana_curve_config.h"
+
+#include <QDialog>
+#include <qtmetamacros.h>
+
+class QListWidget;
+class QCheckBox;
+class QComboBox;
+class DeckListStatisticsAnalyzer;
+class QDialogButtonBox;
+class QLabel;
+class QWidget;
+
+class ManaCurveConfigDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit ManaCurveConfigDialog(DeckListStatisticsAnalyzer *analyzer, QWidget *parent = nullptr);
+    void retranslateUi();
+    void setFromConfig(const ManaCurveConfig &cfg);
+
+    ManaCurveConfig result() const
+    {
+        return cfg;
+    }
+
+private:
+    ManaCurveConfig cfg;
+    DeckListStatisticsAnalyzer *analyzer;
+
+    QLabel *labelGroupBy;
+    QComboBox *groupBy;
+    QLabel *labelFilters;
+    QListWidget *filterList;
+    QDialogButtonBox *buttons;
+    QCheckBox *showMain;
+    QCheckBox *showCatRows;
+
+private slots:
+    void accept() override;
+};
+
+#endif // COCKATRICE_MANA_CURVE_ADD_DIALOG_H
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
new file mode 100644
index 000000000..f1d9ea8c7
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.cpp
@@ -0,0 +1,88 @@
+#include "mana_curve_total_widget.h"
+
+#include "../../../general/display/charts/bars/bar_chart_widget.h"
+#include "libcockatrice/utility/color.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)
+{
+    layout = new QHBoxLayout(this);
+
+    label = new QLabel(this);
+    label->setFixedWidth(80);
+    layout->addWidget(label);
+
+    barChart = new BarChartWidget(this);
+    layout->addWidget(barChart, 1);
+
+    setMinimumHeight(200);
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+}
+
+QSize ManaCurveTotalWidget::sizeHint() const
+{
+    return {0, 280};
+}
+
+QSize ManaCurveTotalWidget::minimumSizeHint() const
+{
+    return {0, 200};
+}
+
+void ManaCurveTotalWidget::updateDisplay(const QString &categoryName,
+                                         int minCmc,
+                                         int maxCmc,
+                                         int highest,
+                                         const QMap<int, QMap<QString, int>> &cmcMap,
+                                         const QMap<QString, QMap<int, QStringList>> &cardsMap,
+                                         const ManaCurveConfig &config)
+{
+    QVector<BarData> mainBars;
+    mainBars.reserve(maxCmc - minCmc + 1);
+
+    for (int cmc = minCmc; cmc <= maxCmc; ++cmc) {
+        QVector<BarSegment> segments;
+
+        const auto cmcIt = cmcMap.constFind(cmc);
+        if (cmcIt != cmcMap.cend()) {
+            for (auto it = cmcIt->cbegin(); it != cmcIt->cend(); ++it) {
+                const QString &category = it.key();
+
+                if (!config.filters.isEmpty() && !config.filters.contains(category)) {
+                    continue;
+                }
+
+                const int value = it.value();
+
+                QStringList cards;
+                const auto catIt = cardsMap.constFind(category);
+                if (catIt != cardsMap.cend()) {
+                    cards = catIt->value(cmc);
+                }
+
+                segments.push_back({category, value, cards, GameSpecificColors::MTG::colorHelper(category)});
+            }
+        }
+
+        std::sort(segments.begin(), segments.end(),
+                  [](const BarSegment &a, const BarSegment &b) { return a.category < b.category; });
+
+        mainBars.push_back({QString::number(cmc), segments});
+    }
+
+    label->setText(categoryName);
+
+    barChart->setHighest(highest);
+    barChart->setBars(mainBars);
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..0eaecec96
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_total_widget.h
@@ -0,0 +1,36 @@
+#ifndef COCKATRICE_MANA_CURVE_TOTAL_WIDGET_H
+#define COCKATRICE_MANA_CURVE_TOTAL_WIDGET_H
+#include <QString>
+#include <QStringList>
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class BarChartWidget;
+class QHBoxLayout;
+class QLabel;
+struct ManaCurveConfig;
+template <class Key, class T> class QMap;
+
+class ManaCurveTotalWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ManaCurveTotalWidget(QWidget *parent);
+    QSize sizeHint() const;
+    QSize minimumSizeHint() const;
+    void updateDisplay(const QString &categoryName,
+                       int minCmc,
+                       int maxCmc,
+                       int highest,
+                       const QMap<int, QMap<QString, int>> &cmcMap,
+                       const QMap<QString, QMap<int, QStringList>> &cardsMap,
+                       const ManaCurveConfig &config);
+
+private:
+    QHBoxLayout *layout;
+    QLabel *label;
+    BarChartWidget *barChart;
+};
+
+#endif // COCKATRICE_MANA_CURVE_TOTAL_WIDGET_H
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
new file mode 100644
index 000000000..6d93bde54
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp
@@ -0,0 +1,155 @@
+#include "mana_curve_widget.h"
+
+#include "../../abstract_analytics_panel_widget.h"
+#include "../../analytics_panel_widget_registrar.h"
+#include "../../deck_list_statistics_analyzer.h"
+#include "mana_curve_category_widget.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;
+
+namespace
+{
+
+AnalyticsPanelWidgetRegistrar registerManaCurve{
+    "manaCurve", ManaCurveWidget::tr("Mana Curve"),
+    [](QWidget *parent, DeckListStatisticsAnalyzer *analyzer) { return new ManaCurveWidget(parent, analyzer); }};
+
+} // anonymous namespace
+
+ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer, ManaCurveConfig cfg)
+    : AbstractAnalyticsPanelWidget(parent, analyzer), config(cfg)
+{
+    setLayout(layout);
+
+    totalWidget = new ManaCurveTotalWidget(this);
+    totalWidget->setHidden(true);
+    layout->addWidget(totalWidget);
+
+    categoryWidget = new ManaCurveCategoryWidget(this);
+    categoryWidget->setHidden(true);
+    layout->addWidget(categoryWidget);
+
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+    connect(analyzer, &DeckListStatisticsAnalyzer::statsUpdated, this, &ManaCurveWidget::updateDisplay);
+
+    updateDisplay();
+}
+
+QDialog *ManaCurveWidget::createConfigDialog(QWidget *parent)
+{
+    auto *dlg = new ManaCurveConfigDialog(analyzer, parent);
+    dlg->setFromConfig(config);
+    return dlg;
+}
+
+QJsonObject ManaCurveWidget::extractConfigFromDialog(QDialog *dlg) const
+{
+    auto *mc = qobject_cast<ManaCurveConfigDialog *>(dlg);
+    return mc ? mc->result().toJson() : QJsonObject{};
+}
+
+static void buildMapsByCategory(const QHash<QString, QHash<int, int>> &categoryCounts,
+                                const QHash<QString, QHash<int, QStringList>> &categoryCards,
+                                QMap<int, QMap<QString, int>> &outCmcMap,
+                                QMap<QString, QMap<int, QStringList>> &outCardsMap)
+{
+    outCmcMap.clear();
+    outCardsMap.clear();
+
+    for (auto catIt = categoryCounts.cbegin(); catIt != categoryCounts.cend(); ++catIt) {
+        const QString &category = catIt.key();
+        const auto &countsByCmc = catIt.value();
+
+        for (auto it = countsByCmc.cbegin(); it != countsByCmc.cend(); ++it) {
+            outCmcMap[it.key()][category] = it.value();
+        }
+    }
+
+    for (auto catIt = categoryCards.cbegin(); catIt != categoryCards.cend(); ++catIt) {
+        const QString &category = catIt.key();
+        const auto &cardsByCmc = catIt.value();
+
+        for (auto it = cardsByCmc.cbegin(); it != cardsByCmc.cend(); ++it) {
+            outCardsMap[category][it.key()] = it.value();
+        }
+    }
+}
+
+static void findGlobalCmcRange(const QHash<QString, QHash<int, int>> &categoryCounts, int &minCmc, int &maxCmc)
+{
+    minCmc = 0;
+    maxCmc = 0;
+
+    for (const auto &countsByCmc : categoryCounts) {
+        for (auto it = countsByCmc.cbegin(); it != countsByCmc.cend(); ++it) {
+            maxCmc = qMax(maxCmc, it.key());
+        }
+    }
+}
+
+void ManaCurveWidget::updateDisplay()
+{
+    QHash<QString, QHash<int, int>> categoryCounts;
+    QHash<QString, QHash<int, QStringList>> categoryCards;
+
+    if (config.groupBy == "color") {
+        categoryCounts = analyzer->getManaCurveByColor();
+        categoryCards = analyzer->getManaCurveCardsByColor();
+    } else if (config.groupBy == "subtype") {
+        categoryCounts = analyzer->getManaCurveBySubtype();
+        categoryCards = analyzer->getManaCurveCardsBySubtype();
+    } else if (config.groupBy == "power") {
+        categoryCounts = analyzer->getManaCurveByPower();
+        categoryCards = analyzer->getManaCurveCardsByPower();
+    } else {
+        categoryCounts = analyzer->getManaCurveByType();
+        categoryCards = analyzer->getManaCurveCardsByType();
+    }
+
+    QMap<int, QMap<QString, int>> cmcMap;
+    QMap<QString, QMap<int, QStringList>> cardsMap;
+    buildMapsByCategory(categoryCounts, categoryCards, cmcMap, cardsMap);
+
+    int minCmc = 0;
+    int maxCmc = 0;
+    findGlobalCmcRange(categoryCounts, minCmc, maxCmc);
+
+    int highest = 1;
+    for (int cmc = minCmc; cmc <= maxCmc; ++cmc) {
+        int sum = 0;
+
+        const auto cmcIt = cmcMap.constFind(cmc);
+        if (cmcIt != cmcMap.cend()) {
+            for (auto it = cmcIt->cbegin(); it != cmcIt->cend(); ++it) {
+                if (!config.filters.isEmpty() && !config.filters.contains(it.key())) {
+                    continue;
+                }
+
+                sum += it.value();
+            }
+        }
+
+        highest = qMax(highest, sum);
+    }
+
+    totalWidget->updateDisplay(config.groupBy, minCmc, maxCmc, highest, cmcMap, cardsMap, config);
+
+    totalWidget->setVisible(config.showMain);
+
+    categoryWidget->updateDisplay(minCmc, maxCmc, highest, categoryCounts, categoryCards, config);
+
+    categoryWidget->setVisible(config.showCategoryRows);
+}
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
new file mode 100644
index 000000000..14c445717
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.h
@@ -0,0 +1,53 @@
+/**
+ * @file mana_curve_widget.h
+ * @ingroup DeckEditorAnalyticsWidgets
+ */
+//! \todo Document this file.
+
+#ifndef MANA_CURVE_WIDGET_H
+#define MANA_CURVE_WIDGET_H
+
+#include "../../abstract_analytics_panel_widget.h"
+#include "mana_curve_config.h"
+
+#include <QJsonObject>
+#include <QList>
+#include <QString>
+#include <qtmetamacros.h>
+
+class DeckListStatisticsAnalyzer;
+class ManaCurveCategoryWidget;
+class ManaCurveTotalWidget;
+class QWidget;
+
+class ManaCurveWidget : public AbstractAnalyticsPanelWidget
+{
+    Q_OBJECT
+
+public slots:
+    // QSize sizeHint() const override;
+    void updateDisplay() override;
+    QDialog *createConfigDialog(QWidget *parent) override;
+
+public:
+    ManaCurveWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer, ManaCurveConfig cfg = {});
+
+    QJsonObject saveConfig() const override
+    {
+        return config.toJson();
+    }
+    void loadConfig(const QJsonObject &o) override
+    {
+        config = ManaCurveConfig::fromJson(o);
+        updateDisplay();
+    }
+
+    QJsonObject extractConfigFromDialog(QDialog *dlg) const override;
+
+private:
+    ManaCurveConfig config;
+    ManaCurveTotalWidget *totalWidget;
+    ManaCurveCategoryWidget *categoryWidget;
+};
+
+#endif // MANA_CURVE_WIDGET_H
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
new file mode 100644
index 000000000..7a6f0b51a
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.cpp
@@ -0,0 +1,35 @@
+#include "mana_devotion_config.h"
+
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+
+QJsonObject ManaDevotionConfig::toJson() const
+{
+    QJsonObject jsonObject;
+    QJsonArray jsonArray;
+    jsonObject["displayType"] = displayType;
+    for (auto &filter : filters) {
+        jsonArray.append(filter);
+    }
+    jsonObject["filters"] = jsonArray;
+    return jsonObject;
+}
+
+ManaDevotionConfig ManaDevotionConfig::fromJson(const QJsonObject &o)
+{
+    ManaDevotionConfig config;
+
+    if (o.contains("displayType")) {
+        config.displayType = o["displayType"].toString();
+    }
+
+    if (o.contains("filters")) {
+        config.filters.clear();
+        for (auto v : o["filters"].toArray()) {
+            config.filters << v.toString();
+        }
+    }
+
+    return config;
+}
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
new file mode 100644
index 000000000..480b2151c
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config.h
@@ -0,0 +1,19 @@
+#ifndef COCKATRICE_MANA_DEVOTION_CONFIG_H
+#define COCKATRICE_MANA_DEVOTION_CONFIG_H
+
+#include <QJsonObject>
+#include <QList>
+#include <QString>
+#include <QStringList>
+
+struct ManaDevotionConfig
+{
+    QString displayType; // "pie" or "bar" or "combinedBar"
+    QStringList filters; // which colors to show, empty = all
+
+    QJsonObject toJson() const;
+
+    static ManaDevotionConfig fromJson(const QJsonObject &o);
+};
+
+#endif // COCKATRICE_MANA_DEVOTION_CONFIG_H
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
new file mode 100644
index 000000000..0d70fc24d
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp
@@ -0,0 +1,77 @@
+#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)
+    : QDialog(parent), config(initial)
+{
+    layout = new QVBoxLayout(this);
+
+    labelDisplayType = new QLabel(this);
+    layout->addWidget(labelDisplayType);
+
+    displayType = new QComboBox(this);
+    layout->addWidget(displayType);
+
+    labelFilters = new QLabel(this);
+    layout->addWidget(labelFilters);
+
+    filterList = new QListWidget(this);
+    filterList->setSelectionMode(QAbstractItemView::MultiSelection);
+
+    QStringList colors = analyzer->getDevotionPipCount().keys();
+    colors.sort();
+    filterList->addItems(colors);
+    layout->addWidget(filterList);
+
+    // select initial filters
+    for (int i = 0; i < filterList->count(); ++i) {
+        if (config.filters.contains(filterList->item(i)->text())) {
+            filterList->item(i)->setSelected(true);
+        }
+    }
+
+    buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    layout->addWidget(buttons);
+    connect(buttons, &QDialogButtonBox::accepted, this, &ManaDevotionConfigDialog::accept);
+    connect(buttons, &QDialogButtonBox::rejected, this, &ManaDevotionConfigDialog::reject);
+
+    // populate combo box items
+    displayType->addItems({"pie", "bar", "combinedBar"});
+
+    retranslateUi();
+}
+
+void ManaDevotionConfigDialog::retranslateUi()
+{
+    labelDisplayType->setText(tr("Display type:"));
+    displayType->setItemText(0, tr("pie"));
+    displayType->setItemText(1, tr("bar"));
+    displayType->setItemText(2, tr("combinedBar"));
+
+    labelFilters->setText(tr("Filter Colors (optional):"));
+}
+
+void ManaDevotionConfigDialog::accept()
+{
+    config.displayType = displayType->currentText();
+    config.filters.clear();
+    for (auto *item : filterList->selectedItems()) {
+        config.filters << item->text();
+    }
+    QDialog::accept();
+}
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
new file mode 100644
index 000000000..9c37ec5ad
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.h
@@ -0,0 +1,46 @@
+
+#ifndef COCKATRICE_MANA_DEVOTION_ADD_DIALOG_H
+#define COCKATRICE_MANA_DEVOTION_ADD_DIALOG_H
+
+#include "mana_devotion_config.h"
+
+#include <QDialog>
+#include <QList>
+#include <QString>
+#include <qtmetamacros.h>
+
+class DeckListStatisticsAnalyzer;
+class QComboBox;
+class QDialogButtonBox;
+class QLabel;
+class QListWidget;
+class QVBoxLayout;
+class QWidget;
+
+class ManaDevotionConfigDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    ManaDevotionConfigDialog(DeckListStatisticsAnalyzer *analyzer,
+                             ManaDevotionConfig initial = {},
+                             QWidget *parent = nullptr);
+    void retranslateUi();
+
+    void accept() override;
+
+    ManaDevotionConfig result() const
+    {
+        return config;
+    }
+
+private:
+    ManaDevotionConfig config;
+    QVBoxLayout *layout;
+    QLabel *labelDisplayType;
+    QComboBox *displayType;
+    QLabel *labelFilters;
+    QListWidget *filterList;
+    QDialogButtonBox *buttons;
+};
+
+#endif // COCKATRICE_MANA_DEVOTION_ADD_DIALOG_H
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
new file mode 100644
index 000000000..7e1f0c211
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp
@@ -0,0 +1,137 @@
+#include "mana_devotion_widget.h"
+
+#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>
+
+namespace
+{
+
+AnalyticsPanelWidgetRegistrar registerManaDevotion{
+    "manaDevotion", ManaDevotionWidget::tr("Mana Devotion"),
+    [](QWidget *parent, DeckListStatisticsAnalyzer *analyzer) { return new ManaDevotionWidget(parent, analyzer); }};
+
+} // anonymous namespace
+
+ManaDevotionWidget::ManaDevotionWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer, ManaDevotionConfig cfg)
+    : AbstractAnalyticsPanelWidget(parent, analyzer), config(std::move(cfg))
+{
+    barContainer = new QWidget(this);
+    barLayout = new QHBoxLayout(barContainer);
+    barContainer->setLayout(barLayout);
+    layout->addWidget(barContainer);
+
+    updateDisplay();
+}
+
+void ManaDevotionWidget::updateDisplay()
+{
+    // Clear previous widgets
+    while (QLayoutItem *item = barLayout->takeAt(0)) {
+        if (item->widget()) {
+            item->widget()->deleteLater();
+        }
+        delete item;
+    }
+
+    auto &pipCount = analyzer->getDevotionPipCount();
+    auto &cardCount = analyzer->getDevotionCardCount();
+
+    // Convert keys to single QChar form
+    QHash<QChar, int> devoMap;
+    for (auto key : pipCount.keys()) {
+        devoMap[key[0]] = pipCount[key];
+    }
+
+    // Apply filters
+    if (!config.filters.isEmpty()) {
+        QHash<QChar, int> filtered;
+        for (auto f : config.filters) {
+            if (devoMap.contains(f[0])) {
+                filtered[f[0]] = devoMap[f[0]];
+            }
+        }
+        devoMap = filtered;
+    }
+
+    // Determine maximum for bar charts
+    int highest = 1;
+    for (auto val : devoMap) {
+        highest = std::max(highest, val);
+    }
+
+    // Convert to QMap<QString,int> for ColorBar / ColorPie
+    QMap<QString, int> mapSorted;
+    for (auto it = devoMap.begin(); it != devoMap.end(); ++it) {
+        mapSorted.insert(QString(it.key()), it.value());
+    }
+
+    // Color map
+    QHash<QChar, QColor> colors = {{'W', QColor(248, 231, 185)}, {'U', QColor(14, 104, 171)},
+                                   {'B', QColor(21, 11, 0)},     {'R', QColor(211, 32, 42)},
+                                   {'G', QColor(0, 115, 62)},    {'C', QColor(150, 150, 150)}};
+
+    // Choose display mode
+    if (config.displayType == "bar") {
+        // One BarWidget per devotion color
+        for (auto c : devoMap.keys()) {
+            QString label = QString("%1 %2 (%3)").arg(c).arg(devoMap[c]).arg(cardCount.value(QString(c)));
+
+            BarWidget *bar = new BarWidget(label, devoMap[c], highest, colors.value(c, Qt::gray), this);
+
+            barLayout->addWidget(bar);
+        }
+    } else if (config.displayType == "combinedBar") {
+        // Stacked devotion bar
+        ColorBar *cb = new ColorBar(mapSorted, this);
+        cb->setMinimumHeight(30);
+        barLayout->addWidget(cb);
+    } else if (config.displayType == "pie") {
+        // Devotion pie chart
+        ColorPie *pie = new ColorPie(mapSorted, this);
+        pie->setMinimumSize(200, 200);
+        barLayout->addWidget(pie);
+    }
+
+    update();
+}
+
+QDialog *ManaDevotionWidget::createConfigDialog(QWidget *parent)
+{
+    ManaDevotionConfigDialog *dlg = new ManaDevotionConfigDialog(analyzer, config, parent);
+    return dlg;
+}
+
+QJsonObject ManaDevotionWidget::extractConfigFromDialog(QDialog *dlg) const
+{
+    auto *mc = qobject_cast<ManaDevotionConfigDialog *>(dlg);
+    if (!mc) {
+        return {};
+    }
+    return mc->result().toJson();
+}
+
+QSize ManaDevotionWidget::sizeHint() const
+{
+    return QSize(800, 150);
+}
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
new file mode 100644
index 000000000..2b0182c1e
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.h
@@ -0,0 +1,51 @@
+/**
+ * @file mana_devotion_widget.h
+ * @ingroup DeckEditorAnalyticsWidgets
+ */
+//! \todo Document this file.
+
+#ifndef MANA_DEVOTION_WIDGET_H
+#define MANA_DEVOTION_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;
+
+class ManaDevotionWidget : public AbstractAnalyticsPanelWidget
+{
+    Q_OBJECT
+
+public slots:
+    QSize sizeHint() const override;
+    void updateDisplay() override;
+    QDialog *createConfigDialog(QWidget *parent) override;
+
+public:
+    ManaDevotionWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer, ManaDevotionConfig cfg = {});
+
+    QJsonObject saveConfig() const override
+    {
+        return config.toJson();
+    }
+    void loadConfig(const QJsonObject &o) override
+    {
+        config = ManaDevotionConfig::fromJson(o);
+        updateDisplay();
+    }
+
+    QJsonObject extractConfigFromDialog(QDialog *dlg) const override;
+
+private:
+    ManaDevotionConfig config;
+    QWidget *barContainer;
+    QHBoxLayout *barLayout;
+};
+
+#endif // MANA_DEVOTION_WIDGET_H
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
new file mode 100644
index 000000000..ab321661e
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.cpp
@@ -0,0 +1,41 @@
+#include "mana_distribution_config.h"
+
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+
+QJsonObject ManaDistributionConfig::toJson() const
+{
+    QJsonObject o;
+    o["displayType"] = displayType;
+
+    QJsonArray jsonArray;
+    for (auto &s : filters) {
+        jsonArray.append(s);
+    }
+    o["filters"] = jsonArray;
+
+    o["showColorRows"] = showColorRows;
+    return o;
+}
+
+ManaDistributionConfig ManaDistributionConfig::fromJson(const QJsonObject &o)
+{
+    ManaDistributionConfig config;
+    if (o.contains("displayType")) {
+        config.displayType = o["displayType"].toString();
+    }
+
+    if (o.contains("filters")) {
+        config.filters.clear();
+        for (auto v : o["filters"].toArray()) {
+            config.filters << v.toString();
+        }
+    }
+
+    if (o.contains("showColorRows")) {
+        config.showColorRows = o["showColorRows"].toBool(true);
+    }
+
+    return config;
+}
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
new file mode 100644
index 000000000..012b0f4a7
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config.h
@@ -0,0 +1,20 @@
+#ifndef COCKATRICE_MANA_DISTRIBUTION_CONFIG_H
+#define COCKATRICE_MANA_DISTRIBUTION_CONFIG_H
+
+#include <QJsonObject>
+#include <QList>
+#include <QString>
+#include <QStringList>
+
+struct ManaDistributionConfig
+{
+    QString displayType = "pie"; // "pie" or "bar"
+    QStringList filters;         // empty = all colors
+    bool showColorRows = true;
+
+    QJsonObject toJson() const;
+
+    static ManaDistributionConfig fromJson(const QJsonObject &o);
+};
+
+#endif // COCKATRICE_MANA_DISTRIBUTION_CONFIG_H
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
new file mode 100644
index 000000000..24b71bae0
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp
@@ -0,0 +1,92 @@
+#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)
+    : QDialog(parent), analyzer(analyzer)
+{
+    auto *lay = new QVBoxLayout(this);
+
+    // Labels
+    labelDisplayType = new QLabel(this);
+    lay->addWidget(labelDisplayType);
+
+    displayType = new QComboBox(this);
+    lay->addWidget(displayType);
+
+    labelFilters = new QLabel(this);
+    lay->addWidget(labelFilters);
+
+    filterList = new QListWidget(this);
+    filterList->setSelectionMode(QAbstractItemView::MultiSelection);
+    filterList->addItems(kColors); // dynamic/fixed, no translation needed
+    lay->addWidget(filterList);
+
+    showColorRows = new QCheckBox(this);
+    showColorRows->setChecked(true);
+    lay->addWidget(showColorRows);
+
+    buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    lay->addWidget(buttons);
+    connect(buttons, &QDialogButtonBox::accepted, this, &ManaDistributionConfigDialog::accept);
+    connect(buttons, &QDialogButtonBox::rejected, this, &ManaDistributionConfigDialog::reject);
+
+    displayType->addItems({"pie", "bar"}); // combo items
+
+    retranslateUi();
+}
+
+void ManaDistributionConfigDialog::retranslateUi()
+{
+    labelDisplayType->setText(tr("Top display type:"));
+    displayType->setItemText(0, tr("pie"));
+    displayType->setItemText(1, tr("bar"));
+
+    labelFilters->setText(tr("Colors:"));
+
+    showColorRows->setText(tr("Show per-color rows"));
+
+    // QDialogButtonBox buttons are automatically translated
+}
+
+void ManaDistributionConfigDialog::setFromConfig(const ManaDistributionConfig &cfgIn)
+{
+    cfg = cfgIn;
+
+    displayType->setCurrentText(cfg.displayType);
+
+    for (int i = 0; i < filterList->count(); ++i) {
+        filterList->item(i)->setSelected(cfg.filters.contains(filterList->item(i)->text()));
+    }
+
+    showColorRows->setChecked(cfg.showColorRows);
+}
+
+void ManaDistributionConfigDialog::accept()
+{
+    cfg.displayType = displayType->currentText();
+
+    // Filters
+    cfg.filters.clear();
+    for (auto *item : filterList->selectedItems()) {
+        cfg.filters << item->text();
+    }
+
+    cfg.showColorRows = showColorRows->isChecked();
+
+    QDialog::accept();
+}
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
new file mode 100644
index 000000000..3d21b6bee
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.h
@@ -0,0 +1,46 @@
+#ifndef COCKATRICE_MANA_DISTRIBUTION_ADD_DIALOG_H
+#define COCKATRICE_MANA_DISTRIBUTION_ADD_DIALOG_H
+
+#include "mana_distribution_config.h"
+
+#include <QDialog>
+#include <qtmetamacros.h>
+
+class QComboBox;
+class QListWidget;
+class QCheckBox;
+class DeckListStatisticsAnalyzer;
+class QDialogButtonBox;
+class QLabel;
+class QWidget;
+
+class ManaDistributionConfigDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit ManaDistributionConfigDialog(DeckListStatisticsAnalyzer *analyzer, QWidget *parent = nullptr);
+    void retranslateUi();
+
+    void setFromConfig(const ManaDistributionConfig &cfg);
+    const ManaDistributionConfig &config() const
+    {
+        return cfg;
+    }
+
+public slots:
+    void accept() override;
+
+private:
+    DeckListStatisticsAnalyzer *analyzer;
+
+    QLabel *labelDisplayType;
+    QComboBox *displayType;
+    QLabel *labelFilters;
+    QListWidget *filterList;
+    QCheckBox *showColorRows;
+    QDialogButtonBox *buttons;
+
+    ManaDistributionConfig cfg;
+};
+
+#endif // COCKATRICE_MANA_DISTRIBUTION_ADD_DIALOG_H
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
new file mode 100644
index 000000000..4faa105e6
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp
@@ -0,0 +1,52 @@
+#include "mana_distribution_single_display_widget.h"
+
+#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)
+{
+    auto layout = new QVBoxLayout(this);
+    layout->setAlignment(Qt::AlignHCenter);
+
+    symbolLabel = new ManaSymbolWidget(this, colorSymbol, true, false);
+    symbolLabel->setFixedSize(40, 40);
+
+    devotionBar = new QProgressBar(this);
+    devotionBar->setRange(0, 100);
+    devotionBar->setTextVisible(false);
+
+    devotionLabel = new QLabel(this);
+    devotionLabel->setAlignment(Qt::AlignCenter);
+
+    productionBar = new QProgressBar(this);
+    productionBar->setRange(0, 100);
+    productionBar->setTextVisible(false);
+
+    productionLabel = new QLabel(this);
+    productionLabel->setAlignment(Qt::AlignCenter);
+
+    layout->addWidget(symbolLabel);
+    layout->addWidget(devotionBar);
+    layout->addWidget(devotionLabel);
+    layout->addWidget(productionBar);
+    layout->addWidget(productionLabel);
+
+    setLayout(layout);
+}
+
+void ManaDistributionSingleDisplayWidget::setDevotion(int pips, int cards, int percent)
+{
+    devotionBar->setValue(percent);
+    devotionLabel->setText(QString(tr("%1 pips (%2 cards)")).arg(pips).arg(cards));
+}
+
+void ManaDistributionSingleDisplayWidget::setProduction(int pips, int cards, int percent)
+{
+    productionBar->setValue(percent);
+    productionLabel->setText(QString(tr("%1 mana (%2 cards)")).arg(pips).arg(cards));
+}
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
new file mode 100644
index 000000000..2fd3efb2d
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.h
@@ -0,0 +1,30 @@
+#ifndef COCKATRICE_MANA_DISTRIBUTION_SINGLE_DISPLAY_WIDGET_H
+#define COCKATRICE_MANA_DISTRIBUTION_SINGLE_DISPLAY_WIDGET_H
+
+#include <QString>
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class QLabel;
+class QProgressBar;
+
+class ManaDistributionSingleDisplayWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit ManaDistributionSingleDisplayWidget(const QString &colorSymbol, QWidget *parent = nullptr);
+
+    void setDevotion(int pips, int cards, int percent);
+    void setProduction(int pips, int cards, int percent);
+
+private:
+    QLabel *symbolLabel;
+
+    QProgressBar *devotionBar;
+    QLabel *devotionLabel;
+
+    QProgressBar *productionBar;
+    QLabel *productionLabel;
+};
+
+#endif // COCKATRICE_MANA_DISTRIBUTION_SINGLE_DISPLAY_WIDGET_H
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
new file mode 100644
index 000000000..5543c64df
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp
@@ -0,0 +1,138 @@
+#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 <QVBoxLayout>
+#include <QWidget>
+
+namespace
+{
+AnalyticsPanelWidgetRegistrar registerManaDistribution{
+    "manaProdDevotion", ManaDistributionWidget::tr("Mana Production + Devotion"),
+    [](QWidget *parent, DeckListStatisticsAnalyzer *analyzer) { return new ManaDistributionWidget(parent, analyzer); }};
+
+} // anonymous namespace
+
+static const QStringList kColors = {"W", "U", "B", "R", "G", "C"};
+
+ManaDistributionWidget::ManaDistributionWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer)
+    : AbstractAnalyticsPanelWidget(parent, analyzer)
+{
+    container = new QWidget(this);
+    containerLayout = new QVBoxLayout(container);
+
+    devotionBarTop = new ColorBar({}, this);
+    devotionPieTop = new ColorPie({}, this);
+    productionBarTop = new ColorBar({}, this);
+    productionPieTop = new ColorPie({}, this);
+
+    containerLayout->addWidget(devotionBarTop);
+    containerLayout->addWidget(devotionPieTop);
+    containerLayout->addWidget(productionBarTop);
+    containerLayout->addWidget(productionPieTop);
+
+    devotionPieTop->hide();
+    productionPieTop->hide();
+
+    row = new QHBoxLayout();
+    containerLayout->addLayout(row);
+
+    for (const QString &c : kColors) {
+        auto *w = new ManaDistributionSingleDisplayWidget(c, this);
+        row->addWidget(w);
+        rows[c] = w;
+    }
+
+    layout->addWidget(container);
+}
+
+void ManaDistributionWidget::updateDisplay()
+{
+    const auto &devPips = analyzer->getDevotionPipCount();
+    const auto &devCards = analyzer->getDevotionCardCount();
+    const auto &prodPips = analyzer->getProductionPipCount();
+    const auto &prodCards = analyzer->getProductionCardCount();
+
+    QStringList filtered = config.filters.isEmpty() ? kColors : config.filters;
+
+    QMap<QString, int> devMap, prodMap;
+    for (const QString &c : filtered) {
+        devMap[c] = devPips.value(c, 0);
+        prodMap[c] = prodPips.value(c, 0);
+    }
+
+    bool showPie = (config.displayType == "pie");
+
+    devotionBarTop->setVisible(!showPie);
+    productionBarTop->setVisible(!showPie);
+
+    devotionPieTop->setVisible(showPie);
+    productionPieTop->setVisible(showPie);
+
+    if (showPie) {
+        devotionPieTop->setColors(devMap);
+        productionPieTop->setColors(prodMap);
+    } else {
+        devotionBarTop->setColors(devMap);
+        productionBarTop->setColors(prodMap);
+    }
+
+    for (const QString &c : kColors) {
+        auto *w = rows.value(c);
+
+        if (!w) {
+            continue;
+        }
+
+        bool visible = config.showColorRows && filtered.contains(c);
+        w->setVisible(visible);
+        if (!visible) {
+            continue;
+        }
+
+        int dp = devPips.value(c, 0);
+        int dc = devCards.value(c, 0);
+        int pp = prodPips.value(c, 0);
+        int pc = prodCards.value(c, 0);
+
+        // Compute percentages
+        int totalDev = 0;
+        int totalProd = 0;
+        for (const QString &cc : filtered) {
+            totalDev += devPips.value(cc, 0);
+            totalProd += prodPips.value(cc, 0);
+        }
+
+        int devPct = (totalDev > 0) ? int(100.0 * dp / totalDev) : 0;
+        int prodPct = (totalProd > 0) ? int(100.0 * pp / totalProd) : 0;
+
+        w->setDevotion(dp, dc, devPct);
+        w->setProduction(pp, pc, prodPct);
+    }
+}
+
+QDialog *ManaDistributionWidget::createConfigDialog(QWidget *parent)
+{
+    auto *dlg = new ManaDistributionConfigDialog(analyzer, parent);
+    dlg->setWindowTitle(tr("Mana Distribution Settings"));
+    dlg->setFromConfig(config);
+
+    connect(dlg, &QDialog::accepted, [this, dlg]() {
+        config = dlg->config();
+        updateDisplay();
+    });
+
+    return dlg;
+}
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
new file mode 100644
index 000000000..6230e0201
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.h
@@ -0,0 +1,49 @@
+#ifndef COCKATRICE_MANA_DISTRIBUTION_WIDGET_H
+#define COCKATRICE_MANA_DISTRIBUTION_WIDGET_H
+
+#include "../../abstract_analytics_panel_widget.h"
+#include "mana_distribution_config.h"
+
+#include <QJsonObject>
+#include <QMap>
+#include <QString>
+#include <qtmetamacros.h>
+
+class ColorBar;
+class ColorPie;
+class DeckListStatisticsAnalyzer;
+class ManaDistributionSingleDisplayWidget;
+class QHBoxLayout;
+class QVBoxLayout;
+class QWidget;
+
+class ManaDistributionWidget : public AbstractAnalyticsPanelWidget
+{
+    Q_OBJECT
+public:
+    explicit ManaDistributionWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer);
+
+    void updateDisplay() override;
+    QDialog *createConfigDialog(QWidget *parent) override;
+    QJsonObject extractConfigFromDialog(QDialog *) const override
+    {
+        return {};
+    }
+
+private:
+    ManaDistributionConfig config;
+
+    QWidget *container;
+    QVBoxLayout *containerLayout;
+
+    QVBoxLayout *topLayout;
+    ColorBar *devotionBarTop;
+    ColorPie *devotionPieTop;
+    ColorBar *productionBarTop;
+    ColorPie *productionPieTop;
+
+    QHBoxLayout *row;
+    QMap<QString, ManaDistributionSingleDisplayWidget *> rows;
+};
+
+#endif // COCKATRICE_MANA_DISTRIBUTION_WIDGET_H
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 45393bb5d..9f6257930 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.cpp
@@ -1,35 +1,317 @@
 #include "deck_analytics_widget.h"
 
-DeckAnalyticsWidget::DeckAnalyticsWidget(QWidget *parent, DeckListModel *_deckListModel)
-    : QWidget(parent), deckListModel(_deckListModel)
-{
-    mainLayout = new QVBoxLayout();
-    setLayout(mainLayout);
+#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"
+#include "analyzer_modules/mana_base/mana_base_config.h"
+#include "analyzer_modules/mana_curve/mana_curve_config.h"
+#include "analyzer_modules/mana_devotion/mana_devotion_config.h"
+#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)
+{
+    layout = new QVBoxLayout(this);
+
+    // Controls
+    controlContainer = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff);
+    controlContainer->setSpacing(4, 4);
+    addButton = new QPushButton(this);
+    removeButton = new QPushButton(this);
+    saveButton = new QPushButton(this);
+    loadButton = new QPushButton(this);
+    includeSideboardCheckBox = new QCheckBox(this);
+    includeSideboardCheckBox->setChecked(false);
+
+    controlContainer->addWidget(addButton);
+    controlContainer->addWidget(removeButton);
+    controlContainer->addWidget(saveButton);
+    controlContainer->addWidget(loadButton);
+    controlContainer->addWidget(includeSideboardCheckBox);
+
+    layout->addWidget(controlContainer);
+
+    connect(addButton, &QPushButton::clicked, this, &DeckAnalyticsWidget::onAddPanel);
+    connect(removeButton, &QPushButton::clicked, this, &DeckAnalyticsWidget::onRemoveSelected);
+    connect(saveButton, &QPushButton::clicked, this, &DeckAnalyticsWidget::saveLayout);
+    connect(loadButton, &QPushButton::clicked, this, &DeckAnalyticsWidget::loadLayout);
+    connect(includeSideboardCheckBox, &QCheckBox::clicked, this, &DeckAnalyticsWidget::includeSideboardChanged);
+
+    // Scroll area and container
     scrollArea = new QScrollArea(this);
-    scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-    scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     scrollArea->setWidgetResizable(true);
-    mainLayout->addWidget(scrollArea);
+    scrollArea->setFrameShape(QFrame::NoFrame);
 
-    container = new QWidget(scrollArea);
-    containerLayout = new QVBoxLayout(container);
-    container->setLayout(containerLayout);
-    scrollArea->setWidget(container);
+    panelContainer = new QWidget(scrollArea);
+    panelLayout = new QVBoxLayout(panelContainer);
+    panelLayout->setSpacing(8);
+    panelLayout->setContentsMargins(4, 4, 4, 4);
+    panelLayout->addStretch(1); // push panels up
 
-    deckListStatisticsAnalyzer = new DeckListStatisticsAnalyzer(this, deckListModel);
+    scrollArea->setWidget(panelContainer);
+    layout->addWidget(scrollArea);
 
-    manaCurveWidget = new ManaCurveWidget(this, deckListStatisticsAnalyzer);
-    containerLayout->addWidget(manaCurveWidget);
+    loadLayout();
 
-    manaDevotionWidget = new ManaDevotionWidget(this, deckListStatisticsAnalyzer);
-    containerLayout->addWidget(manaDevotionWidget);
-
-    manaBaseWidget = new ManaBaseWidget(this, deckListStatisticsAnalyzer);
-    containerLayout->addWidget(manaBaseWidget);
+    retranslateUi();
 }
 
-void DeckAnalyticsWidget::refreshDisplays()
+void DeckAnalyticsWidget::retranslateUi()
 {
-    deckListStatisticsAnalyzer->update();
+    addButton->setText(tr("Add Panel"));
+    removeButton->setText(tr("Remove Panel"));
+    saveButton->setText(tr("Save Layout"));
+    loadButton->setText(tr("Load Layout"));
+    includeSideboardCheckBox->setText(tr("Include Sideboard"));
 }
+
+void DeckAnalyticsWidget::includeSideboardChanged(bool checked)
+{
+    statsAnalyzer->getConfig().includeSideboard = checked;
+    updateDisplays();
+}
+
+void DeckAnalyticsWidget::updateDisplays()
+{
+    statsAnalyzer->analyze();
+}
+
+void DeckAnalyticsWidget::onAddPanel()
+{
+    AddAnalyticsPanelDialog dlg(this);
+    if (dlg.exec() != QDialog::Accepted) {
+        return;
+    }
+
+    QString selection = dlg.selectedType();
+    if (selection.isEmpty()) {
+        return;
+    }
+
+    AbstractAnalyticsPanelWidget *analyticsWidget =
+        AnalyticsPanelWidgetFactory::instance().create(selection, this, statsAnalyzer);
+    if (!analyticsWidget) {
+        return;
+    }
+
+    if (!analyticsWidget->applyConfigFromDialog()) {
+        analyticsWidget->deleteLater();
+        return;
+    }
+
+    addPanelInstance(selection, analyticsWidget, analyticsWidget->saveConfig());
+}
+
+void DeckAnalyticsWidget::addPanelInstance(const QString &typeId,
+                                           AbstractAnalyticsPanelWidget *panel,
+                                           const QJsonObject &cfg)
+{
+    panel->loadConfig(cfg);
+    panel->updateDisplay();
+
+    auto *resPanel = new ResizablePanel(typeId, panel, panelContainer);
+    panelWrappers.push_back(resPanel);
+
+    panelLayout->insertWidget(panelLayout->count() - 1, resPanel);
+
+    // Event filter for selection
+    resPanel->installEventFilter(this);
+    panel->installEventFilter(this);
+
+    // Connect drag-drop signals
+    connect(resPanel, &ResizablePanel::dropRequested, this, &DeckAnalyticsWidget::onPanelDropped);
+}
+
+void DeckAnalyticsWidget::onRemoveSelected()
+{
+    int idx = indexOfSelectedWrapper();
+    if (idx < 0) {
+        return;
+    }
+
+    ResizablePanel *panel = panelWrappers.takeAt(idx);
+    selectWrapper(nullptr);
+
+    panel->deleteLater();
+}
+
+void DeckAnalyticsWidget::saveLayout()
+{
+    QJsonArray arr;
+
+    for (auto *wrapper : panelWrappers) {
+        QJsonObject entry;
+        entry["type"] = wrapper->getTypeId();
+        entry["config"] = wrapper->panel->saveConfig();
+        entry["height"] = wrapper->getCurrentHeight();
+        arr.append(entry);
+    }
+
+    QSettings s;
+    s.setValue("deckAnalytics/layout", QString::fromUtf8(QJsonDocument(arr).toJson(QJsonDocument::Compact)));
+}
+
+void DeckAnalyticsWidget::loadLayout()
+{
+    if (!loadLayoutInternal()) {
+        addDefaultPanels();
+    }
+}
+
+void DeckAnalyticsWidget::addDefaultPanels()
+{
+    struct DefaultPanel
+    {
+        QString type;
+        QJsonObject cfg;
+    };
+
+    // Prepare configs
+    QJsonObject manaCurveCfg = ManaCurveConfig{}.toJson();
+    QJsonObject manaBaseCfg = ManaBaseConfig{"combinedBar", {}}.toJson();
+    QJsonObject manaDevotionCfg = ManaDevotionConfig{"combinedBar", {}}.toJson();
+    QVector<DefaultPanel> defaults = {
+        {"manaCurve", manaCurveCfg}, {"manaBase", manaBaseCfg}, {"manaDevotion", manaDevotionCfg}};
+
+    for (auto &d : defaults) {
+        AbstractAnalyticsPanelWidget *w = AnalyticsPanelWidgetFactory::instance().create(d.type, this, statsAnalyzer);
+        if (!w) {
+            continue;
+        }
+
+        w->loadConfig(d.cfg);
+        addPanelInstance(d.type, w, d.cfg);
+    }
+}
+
+bool DeckAnalyticsWidget::loadLayoutInternal()
+{
+    QSettings s;
+    QString layoutData = s.value("deckAnalytics/layout").toString();
+    if (layoutData.isEmpty()) {
+        return false;
+    }
+
+    QJsonDocument doc = QJsonDocument::fromJson(layoutData.toUtf8());
+    if (!doc.isArray()) {
+        return false;
+    }
+
+    clearPanels();
+
+    for (auto v : doc.array()) {
+        if (!v.isObject()) {
+            continue;
+        }
+        QJsonObject o = v.toObject();
+        QString type = o["type"].toString();
+        QJsonObject cfg = o["config"].toObject();
+
+        AbstractAnalyticsPanelWidget *w = AnalyticsPanelWidgetFactory::instance().create(type, this, statsAnalyzer);
+        if (!w) {
+            continue;
+        }
+
+        addPanelInstance(type, w, cfg);
+
+        // Restore height AFTER adding the panel
+        if (o.contains("height")) {
+            panelWrappers.last()->setHeightFromSaved(o["height"].toInt());
+        }
+    }
+
+    return true;
+}
+
+void DeckAnalyticsWidget::clearPanels()
+{
+    selectWrapper(nullptr);
+    while (!panelWrappers.isEmpty()) {
+        ResizablePanel *p = panelWrappers.takeLast();
+        p->deleteLater();
+    }
+}
+
+bool DeckAnalyticsWidget::eventFilter(QObject *obj, QEvent *event)
+{
+    if (event->type() == QEvent::MouseButtonPress) {
+        for (auto *p : panelWrappers) {
+            if (obj == p || obj == p->panel) {
+                selectWrapper(p);
+                break;
+            }
+        }
+    }
+    return QWidget::eventFilter(obj, event);
+}
+
+void DeckAnalyticsWidget::selectWrapper(ResizablePanel *w)
+{
+    // Same wrapper
+    if (selectedWrapper == w) {
+        return;
+    }
+    // Deselect the old one
+    if (selectedWrapper) {
+        selectedWrapper->setSelected(false);
+    }
+    // Set current
+    selectedWrapper = w;
+    // Finally, select new
+    if (selectedWrapper) {
+        selectedWrapper->setSelected(true);
+    }
+}
+
+int DeckAnalyticsWidget::indexOfSelectedWrapper() const
+{
+    if (!selectedWrapper) {
+        return -1;
+    }
+    return panelWrappers.indexOf(selectedWrapper);
+}
+
+void DeckAnalyticsWidget::onPanelDropped(ResizablePanel *dragged, ResizablePanel *target, bool insertBefore)
+{
+    int draggedIdx = panelWrappers.indexOf(dragged);
+    int targetIdx = panelWrappers.indexOf(target);
+
+    if (draggedIdx == -1 || targetIdx == -1 || draggedIdx == targetIdx) {
+        return;
+    }
+
+    // Remove dragged panel from list and layout
+    panelWrappers.removeAt(draggedIdx);
+    panelLayout->removeWidget(dragged);
+
+    // Adjust target index if needed
+    if (draggedIdx < targetIdx) {
+        targetIdx--;
+    }
+
+    // Calculate insertion position
+    int insertIdx = insertBefore ? targetIdx : targetIdx + 1;
+
+    // Insert back into list and layout
+    panelWrappers.insert(insertIdx, dragged);
+    panelLayout->insertWidget(insertIdx, dragged);
+
+    // Clear selection
+    selectWrapper(nullptr);
+}
\ No newline at end of file
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 524362aed..f1e071ff6 100644
--- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
+++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h
@@ -1,44 +1,78 @@
 /**
  * @file deck_analytics_widget.h
  * @ingroup DeckEditorAnalyticsWidgets
- * @brief TODO: Document this.
+ * @brief Main analytics widget container with resizable panels for deck statistics.
  */
 
 #ifndef DECK_ANALYTICS_WIDGET_H
 #define DECK_ANALYTICS_WIDGET_H
 
-#include "mana_base_widget.h"
-#include "mana_curve_widget.h"
-#include "mana_devotion_widget.h"
-
-#include <QHBoxLayout>
-#include <QScrollArea>
+#include <QJsonObject>
+#include <QList>
+#include <QString>
+#include <QVector>
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#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
 {
     Q_OBJECT
 
+public slots:
+    void updateDisplays();
+
 public:
-    explicit DeckAnalyticsWidget(QWidget *parent, DeckListModel *deckListModel);
-    void setDeckList(const DeckList &_deckListModel);
-    std::map<int, int> analyzeManaCurve();
-    void refreshDisplays();
+    explicit DeckAnalyticsWidget(QWidget *parent, DeckListStatisticsAnalyzer *analyzer);
+    void retranslateUi();
+    void includeSideboardChanged(bool checked);
+
+private slots:
+    void onAddPanel();
+    void onRemoveSelected();
+    void onPanelDropped(ResizablePanel *dragged, ResizablePanel *target, bool insertBefore);
+    void saveLayout();
+    void loadLayout();
+    void addDefaultPanels();
+    bool loadLayoutInternal();
+    void clearPanels();
+
+protected:
+    bool eventFilter(QObject *obj, QEvent *event) override;
+    void selectWrapper(ResizablePanel *panel);
+    int indexOfSelectedWrapper() const;
 
 private:
-    DeckListModel *deckListModel;
-    DeckListStatisticsAnalyzer *deckListStatisticsAnalyzer;
-    QVBoxLayout *mainLayout;
+    void addPanelInstance(const QString &typeId, AbstractAnalyticsPanelWidget *panel, const QJsonObject &cfg = {});
 
-    QWidget *container;
-    QVBoxLayout *containerLayout;
+    QVBoxLayout *layout;
+    FlowWidget *controlContainer;
+
+    QPushButton *addButton;
+    QPushButton *removeButton;
+    QPushButton *saveButton;
+    QPushButton *loadButton;
+
+    QCheckBox *includeSideboardCheckBox;
 
     QScrollArea *scrollArea;
+    QWidget *panelContainer;
+    QVBoxLayout *panelLayout;
 
-    ManaCurveWidget *manaCurveWidget;
-    ManaDevotionWidget *manaDevotionWidget;
-    ManaBaseWidget *manaBaseWidget;
+    QVector<ResizablePanel *> panelWrappers;
+    ResizablePanel *selectedWrapper = nullptr;
+
+    DeckListStatisticsAnalyzer *statsAnalyzer;
+    LayoutInspector *insp = nullptr;
 };
 
 #endif // DECK_ANALYTICS_WIDGET_H
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 a5ddf37a1..c2f70759e 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,51 +1,123 @@
 #include "deck_list_statistics_analyzer.h"
 
 #include "deck_list_model.h"
-#include "deck_list_statistics_analyzer.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 <QChar>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QSharedPointer>
+#include <QStringLiteral>
+#include <initializer_list>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <utility>
 
 DeckListStatisticsAnalyzer::DeckListStatisticsAnalyzer(QObject *parent,
                                                        DeckListModel *_model,
-                                                       DeckListStatisticsAnalyzerConfig cfg)
-    : QObject(parent), model(_model), config(cfg)
+                                                       DeckListStatisticsAnalyzerConfig _config)
+    : QObject(parent), model(_model), config(_config)
 {
-    connect(model, &DeckListModel::dataChanged, this, &DeckListStatisticsAnalyzer::update);
+    connect(model, &DeckListModel::cardsChanged, this, &DeckListStatisticsAnalyzer::analyze);
 }
 
-void DeckListStatisticsAnalyzer::update()
+void DeckListStatisticsAnalyzer::analyze()
 {
-    manaBaseMap.clear();
-    manaCurveMap.clear();
-    manaDevotionMap.clear();
+    clearData();
 
-    auto nodes = model->getDeckList()->getCardNodes();
+    QList<const DecklistCardNode *> nodes;
 
-    for (auto *node : nodes) {
+    if (config.includeSideboard) {
+        nodes = model->getCardNodes();
+    } else {
+        nodes = model->getCardNodesForZone(DECK_ZONE_MAIN);
+    }
+
+    for (auto node : nodes) {
         CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(node->getName());
-        if (!info)
+        if (!info) {
             continue;
+        }
 
-        for (int i = 0; i < node->getNumber(); ++i) {
-            // ---- Mana curve ----
-            if (config.computeManaCurve) {
-                manaCurveMap[info->getCmc().toInt()]++;
+        const int amount = node->getNumber();
+        QStringList copiesOfName;
+        for (int i = 0; i < amount; i++) {
+            copiesOfName.append(node->getName());
+        }
+
+        // Convert once
+        const int cmc = info->getCmc().toInt();
+        QStringList types = info->getMainCardType().split(' ');
+        QStringList subtypes = info->getCardType().split('-').last().split(" ");
+        QString colors = info->getColors();
+        int power = info->getPowTough().split("/").first().toInt();
+        int toughness = info->getPowTough().split("/").last().toInt();
+
+        // For each copy of card
+        // ---------------- Mana Curve ----------------
+        if (config.computeManaCurve) {
+            manaCurveMap[cmc] += amount;
+        }
+
+        // per-type curve
+        for (auto &t : types) {
+            manaCurveByType[t][cmc] += amount;
+            manaCurveCardsByType[t][cmc] << copiesOfName;
+        }
+
+        // Per-subtype curve
+        for (auto &st : subtypes) {
+            manaCurveBySubtype[st][cmc] += amount;
+            manaCurveCardsBySubtype[st][cmc] << copiesOfName;
+        }
+
+        // per-color curve
+        for (auto &c : colors) {
+            manaCurveByColor[c][cmc] += amount;
+            manaCurveCardsByColor[c][cmc] << copiesOfName;
+        }
+
+        // Power/toughness
+        manaCurveByPower[QString::number(power)][cmc] += amount;
+        manaCurveCardsByPower[QString::number(power)][cmc] << copiesOfName;
+        manaCurveByToughness[QString::number(toughness)][cmc] += amount;
+        manaCurveCardsByToughness[QString::number(toughness)][cmc] << copiesOfName;
+
+        // ========== Category Counts ===========
+        for (auto &t : types) {
+            typeCount[t] += amount;
+        }
+        for (auto &st : subtypes) {
+            subtypeCount[st] += amount;
+        }
+        for (auto &c : colors) {
+            colorCount[c] += amount;
+        }
+        manaValueCount[cmc] += amount;
+
+        // ---------------- Mana Base ----------------
+        if (config.computeManaBase) {
+            auto prod = determineManaProduction(info->getText());
+            for (auto it = prod.begin(); it != prod.end(); ++it) {
+                if (it.value() > 0) {
+                    productionPipCount[it.key()] += it.value() * amount;
+                    productionCardCount[it.key()] += amount;
+                }
+                manaBaseMap[it.key()] += it.value() * amount;
             }
+        }
 
-            // ---- Mana base ----
-            if (config.computeManaBase) {
-                auto mana = determineManaProduction(info->getText());
-                for (auto it = mana.begin(); it != mana.end(); ++it)
-                    manaBaseMap[it.key()] += it.value();
-            }
-
-            // ---- Devotion ----
-            if (config.computeDevotion) {
-                auto devo = countManaSymbols(info->getManaCost());
-                for (auto &d : devo)
-                    manaDevotionMap[d.first] += d.second;
+        // ---------------- Devotion ----------------
+        if (config.computeDevotion) {
+            auto devo = countManaSymbols(info->getManaCost());
+            for (auto &d : devo) {
+                if (d.second > 0) {
+                    devotionPipCount[QString(d.first)] += d.second * amount;
+                    devotionCardCount[QString(d.first)] += amount;
+                }
+                manaDevotionMap[d.first] += d.second * amount;
             }
         }
     }
@@ -118,3 +190,59 @@ std::unordered_map<char, int> DeckListStatisticsAnalyzer::countManaSymbols(const
 
     return manaCounts;
 }
+
+// Hypergeometric probability: P(X=k)
+double DeckListStatisticsAnalyzer::hypergeometric(int N, int K, int n, int k)
+{
+    if (k < 0 || k > n || K > N) {
+        return 0.0;
+    }
+
+    auto choose = [](int n, int r) -> double {
+        if (r > n) {
+            return 0.0;
+        }
+        if (r == 0 || r == n) {
+            return 1.0;
+        }
+        double res = 1.0;
+        for (int i = 1; i <= r; ++i) {
+            res *= (n - r + i);
+            res /= i;
+        }
+        return res;
+    };
+
+    return choose(K, k) * choose(N - K, n - k) / choose(N, n);
+}
+
+void DeckListStatisticsAnalyzer::clearData()
+{
+    manaBaseMap.clear();
+    manaCurveMap.clear();
+    manaDevotionMap.clear();
+
+    devotionPipCount.clear();
+    devotionCardCount.clear();
+
+    productionPipCount.clear();
+    productionCardCount.clear();
+
+    manaCurveByType.clear();
+    manaCurveBySubtype.clear();
+    manaCurveByColor.clear();
+    manaCurveByPower.clear();
+    manaCurveByToughness.clear();
+
+    manaCurveCardsByType.clear();
+    manaCurveCardsBySubtype.clear();
+    manaCurveCardsByColor.clear();
+    manaCurveCardsByPower.clear();
+    manaCurveCardsByToughness.clear();
+
+    typeCount.clear();
+    subtypeCount.clear();
+    colorCount.clear();
+    rarityCount.clear();
+    manaValueCount.clear();
+}
\ No newline at end of file
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 8fa033971..c3643d65f 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,10 +1,12 @@
 #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;
@@ -14,6 +16,10 @@ struct DeckListStatisticsAnalyzerConfig
     bool computeManaBase = true;
     bool computeManaCurve = true;
     bool computeDevotion = true;
+    bool computeCategories = true;
+    bool computeCurveBreakdowns = true;
+    bool computeProbabilities = true;
+    bool includeSideboard = false;
 };
 
 class DeckListStatisticsAnalyzer : public QObject
@@ -23,9 +29,9 @@ class DeckListStatisticsAnalyzer : public QObject
 public:
     explicit DeckListStatisticsAnalyzer(QObject *parent,
                                         DeckListModel *model,
-                                        DeckListStatisticsAnalyzerConfig cfg = DeckListStatisticsAnalyzerConfig());
+                                        DeckListStatisticsAnalyzerConfig _config = DeckListStatisticsAnalyzerConfig());
 
-    void update();
+    void analyze();
 
     [[nodiscard]] const QHash<QString, int> &getManaBase() const
     {
@@ -40,6 +46,101 @@ public:
         return manaDevotionMap;
     }
 
+    const QHash<QString, int> &getDevotionPipCount() const
+    {
+        return devotionPipCount;
+    }
+    const QHash<QString, int> &getDevotionCardCount() const
+    {
+        return devotionCardCount;
+    }
+
+    const QHash<QString, int> &getProductionPipCount() const
+    {
+        return productionPipCount;
+    }
+    const QHash<QString, int> &getProductionCardCount() const
+    {
+        return productionCardCount;
+    }
+
+    const QHash<QString, int> &getTypeCount() const
+    {
+        return typeCount;
+    }
+    const QHash<QString, int> &getSubtypeCount() const
+    {
+        return subtypeCount;
+    }
+    const QHash<QString, int> &getColorCount() const
+    {
+        return colorCount;
+    }
+    const QHash<QString, int> &getRarityCount() const
+    {
+        return rarityCount;
+    }
+    const QHash<int, int> &getManaValueCount() const
+    {
+        return manaValueCount;
+    }
+
+    const QHash<QString, QHash<int, int>> &getManaCurveByType() const
+    {
+        return manaCurveByType;
+    }
+    const QHash<QString, QHash<int, int>> &getManaCurveBySubtype() const
+    {
+        return manaCurveBySubtype;
+    }
+    const QHash<QString, QHash<int, int>> &getManaCurveByColor() const
+    {
+        return manaCurveByColor;
+    }
+    const QHash<QString, QHash<int, int>> &getManaCurveByPower() const
+    {
+        return manaCurveByPower;
+    }
+    const QHash<QString, QHash<int, int>> &getManaCurveByToughness() const
+    {
+        return manaCurveByToughness;
+    }
+
+    const QHash<QString, QHash<int, QStringList>> &getManaCurveCardsByType() const
+    {
+        return manaCurveCardsByType;
+    }
+
+    const QHash<QString, QHash<int, QStringList>> &getManaCurveCardsBySubtype() const
+    {
+        return manaCurveCardsBySubtype;
+    }
+
+    const QHash<QString, QHash<int, QStringList>> &getManaCurveCardsByColor() const
+    {
+        return manaCurveCardsByColor;
+    }
+
+    const QHash<QString, QHash<int, QStringList>> &getManaCurveCardsByPower() const
+    {
+        return manaCurveCardsByPower;
+    }
+
+    const QHash<QString, QHash<int, QStringList>> &getManaCurveCardsByToughness() const
+    {
+        return manaCurveCardsByToughness;
+    }
+
+    DeckListModel *getModel() const
+    {
+        return model;
+    }
+
+    DeckListStatisticsAnalyzerConfig &getConfig()
+    {
+        return config;
+    }
+
 signals:
     void statsUpdated();
 
@@ -47,14 +148,42 @@ private:
     DeckListModel *model;
     DeckListStatisticsAnalyzerConfig config;
 
-    // Internal result containers
     QHash<QString, int> manaBaseMap;
     std::unordered_map<int, int> manaCurveMap;
     std::unordered_map<char, int> manaDevotionMap;
 
-    // Internal helper functions
+    QHash<QString, int> devotionPipCount;  // W/U/B/R/G total symbols
+    QHash<QString, int> devotionCardCount; // how many cards provide devotion
+
+    QHash<QString, int> productionPipCount;  // mana produced by cards
+    QHash<QString, int> productionCardCount; // number of producers
+
+    QHash<QString, int> typeCount;
+    QHash<QString, int> subtypeCount;
+    QHash<QString, int> colorCount;
+    QHash<QString, int> rarityCount;
+    QHash<int, int> manaValueCount;
+
+    QHash<QString, QHash<int, int>> manaCurveByType;
+    QHash<QString, QHash<int, int>> manaCurveBySubtype;
+    QHash<QString, QHash<int, int>> manaCurveByColor;
+    QHash<QString, QHash<int, int>> manaCurveByPower;
+    QHash<QString, QHash<int, int>> manaCurveByToughness;
+
+    QHash<QString, QHash<int, QStringList>> manaCurveCardsByType;
+    QHash<QString, QHash<int, QStringList>> manaCurveCardsBySubtype;
+    QHash<QString, QHash<int, QStringList>> manaCurveCardsByColor;
+    QHash<QString, QHash<int, QStringList>> manaCurveCardsByPower;
+    QHash<QString, QHash<int, QStringList>> manaCurveCardsByToughness;
+
+    // Not storing card info — only numeric results.
+    QHash<QString, QHash<int, QHash<int, double>>> probabilityExact;
+    QHash<QString, QHash<int, QHash<int, double>>> probabilityAtLeast;
+
     QHash<QString, int> determineManaProduction(const QString &);
     std::unordered_map<char, int> countManaSymbols(const QString &);
+    double hypergeometric(int N, int K, int n, int k);
+    void clearData();
 };
 
 #endif // COCKATRICE_DECK_LIST_STATISTICS_ANALYZER_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp
deleted file mode 100644
index 2e530db0b..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "mana_base_widget.h"
-
-#include "../../deck_loader/deck_loader.h"
-#include "../general/display/banner_widget.h"
-#include "../general/display/bar_widget.h"
-
-#include <QHash>
-#include <QRegularExpression>
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_list.h>
-
-ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListStatisticsAnalyzer *_deckStatAnalyzer)
-    : QWidget(parent), deckStatAnalyzer(_deckStatAnalyzer)
-{
-    layout = new QVBoxLayout(this);
-    setLayout(layout);
-
-    bannerWidget = new BannerWidget(this, tr("Mana Base"), Qt::Vertical, 100);
-    bannerWidget->setMaximumHeight(100);
-    layout->addWidget(bannerWidget);
-
-    barContainer = new QWidget(this);
-    barLayout = new QHBoxLayout(barContainer);
-    layout->addWidget(barContainer);
-
-    connect(deckStatAnalyzer, &DeckListStatisticsAnalyzer::statsUpdated, this, &ManaBaseWidget::updateDisplay);
-
-    retranslateUi();
-}
-
-void ManaBaseWidget::retranslateUi()
-{
-    bannerWidget->setText(tr("Mana Base"));
-}
-
-void ManaBaseWidget::updateDisplay()
-{
-    // Clear the layout first
-    QLayoutItem *item;
-    while ((item = barLayout->takeAt(0)) != nullptr) {
-        item->widget()->deleteLater();
-        delete item;
-    }
-
-    auto manaBaseMap = deckStatAnalyzer->getManaBase();
-
-    int highestEntry = 0;
-    for (auto entry : manaBaseMap) {
-        if (entry > highestEntry) {
-            highestEntry = entry;
-        }
-    }
-
-    // Define color mapping for mana types
-    QHash<QString, QColor> manaColors;
-    manaColors.insert("W", QColor(248, 231, 185));
-    manaColors.insert("U", QColor(14, 104, 171));
-    manaColors.insert("B", QColor(21, 11, 0));
-    manaColors.insert("R", QColor(211, 32, 42));
-    manaColors.insert("G", QColor(0, 115, 62));
-    manaColors.insert("C", QColor(150, 150, 150));
-
-    for (auto manaColor : manaBaseMap.keys()) {
-        QColor barColor = manaColors.value(manaColor, Qt::gray);
-        BarWidget *barWidget = new BarWidget(QString(manaColor), manaBaseMap[manaColor], highestEntry, barColor, this);
-        barLayout->addWidget(barWidget);
-    }
-
-    update();
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h
deleted file mode 100644
index 079449353..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @file mana_base_widget.h
- * @ingroup DeckEditorAnalyticsWidgets
- * @brief TODO: Document this.
- */
-
-#ifndef MANA_BASE_WIDGET_H
-#define MANA_BASE_WIDGET_H
-
-#include "../general/display/banner_widget.h"
-#include "deck_list_statistics_analyzer.h"
-
-#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 QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit ManaBaseWidget(QWidget *parent, DeckListStatisticsAnalyzer *deckStatAnalyzer);
-    void updateDisplay();
-
-public slots:
-    void retranslateUi();
-
-private:
-    DeckListStatisticsAnalyzer *deckStatAnalyzer;
-    BannerWidget *bannerWidget;
-    QVBoxLayout *layout;
-    QWidget *barContainer;
-    QHBoxLayout *barLayout;
-};
-
-#endif // MANA_BASE_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp
deleted file mode 100644
index c094eb590..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "mana_curve_widget.h"
-
-#include "../../../main.h"
-#include "../../deck_loader/deck_loader.h"
-#include "../general/display/banner_widget.h"
-#include "../general/display/bar_widget.h"
-
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <unordered_map>
-
-ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListStatisticsAnalyzer *_deckStatAnalyzer)
-    : QWidget(parent), deckStatAnalyzer(_deckStatAnalyzer)
-{
-    layout = new QVBoxLayout(this);
-    setLayout(layout);
-
-    bannerWidget = new BannerWidget(this, tr("Mana Curve"), Qt::Vertical, 100);
-    bannerWidget->setMaximumHeight(100);
-    layout->addWidget(bannerWidget);
-
-    barContainer = new QWidget(this);
-    barLayout = new QHBoxLayout(barContainer);
-    layout->addWidget(barContainer);
-
-    connect(deckStatAnalyzer, &DeckListStatisticsAnalyzer::statsUpdated, this, &ManaCurveWidget::updateDisplay);
-
-    retranslateUi();
-}
-
-void ManaCurveWidget::retranslateUi()
-{
-    bannerWidget->setText(tr("Mana Curve"));
-}
-
-void ManaCurveWidget::updateDisplay()
-{
-    // Clear the layout first
-    if (barLayout != nullptr) {
-        QLayoutItem *item;
-        while ((item = barLayout->takeAt(0)) != nullptr) {
-            item->widget()->deleteLater();
-            delete item;
-        }
-    }
-
-    auto manaCurveMap = deckStatAnalyzer->getManaCurve();
-
-    int highestEntry = 0;
-    for (const auto &entry : manaCurveMap) {
-        if (entry.second > highestEntry) {
-            highestEntry = entry.second;
-        }
-    }
-
-    // Convert unordered_map to ordered map to ensure sorting by CMC
-    std::map<int, int> sortedManaCurve(manaCurveMap.begin(), manaCurveMap.end());
-
-    // Add new widgets to the layout in sorted order
-    for (const auto &entry : sortedManaCurve) {
-        BarWidget *barWidget =
-            new BarWidget(QString::number(entry.first), entry.second, highestEntry, QColor(122, 122, 122), this);
-        barLayout->addWidget(barWidget);
-    }
-
-    update(); // Update the widget display
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h
deleted file mode 100644
index fad1fb0f8..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file mana_curve_widget.h
- * @ingroup DeckEditorAnalyticsWidgets
- * @brief TODO: Document this.
- */
-
-#ifndef MANA_CURVE_WIDGET_H
-#define MANA_CURVE_WIDGET_H
-
-#include "../general/display/banner_widget.h"
-#include "deck_list_statistics_analyzer.h"
-
-#include <QHBoxLayout>
-#include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <unordered_map>
-
-class ManaCurveWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit ManaCurveWidget(QWidget *parent, DeckListStatisticsAnalyzer *deckStatAnalyzer);
-    void updateDisplay();
-
-public slots:
-    void retranslateUi();
-
-private:
-    DeckListStatisticsAnalyzer *deckStatAnalyzer;
-    QVBoxLayout *layout;
-    BannerWidget *bannerWidget;
-    QWidget *barContainer;
-    QHBoxLayout *barLayout;
-};
-
-#endif // MANA_CURVE_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
deleted file mode 100644
index 476bb8077..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "mana_devotion_widget.h"
-
-#include "../../deck_loader/deck_loader.h"
-#include "../general/display/banner_widget.h"
-#include "../general/display/bar_widget.h"
-
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <regex>
-#include <unordered_map>
-
-ManaDevotionWidget::ManaDevotionWidget(QWidget *parent, DeckListStatisticsAnalyzer *_deckStatAnalyzer)
-    : QWidget(parent), deckStatAnalyzer(_deckStatAnalyzer)
-{
-    layout = new QVBoxLayout(this);
-    setLayout(layout);
-
-    bannerWidget = new BannerWidget(this, tr("Mana Devotion"), Qt::Vertical, 100);
-    bannerWidget->setMaximumHeight(100);
-    layout->addWidget(bannerWidget);
-
-    barLayout = new QHBoxLayout();
-    layout->addLayout(barLayout);
-
-    connect(deckStatAnalyzer, &DeckListStatisticsAnalyzer::statsUpdated, this, &ManaDevotionWidget::updateDisplay);
-
-    retranslateUi();
-}
-
-void ManaDevotionWidget::retranslateUi()
-{
-    bannerWidget->setText(tr("Mana Devotion"));
-}
-
-void ManaDevotionWidget::updateDisplay()
-{
-    // Clear the layout first
-    QLayoutItem *item;
-    while ((item = barLayout->takeAt(0)) != nullptr) {
-        item->widget()->deleteLater();
-        delete item;
-    }
-
-    auto manaDevotionMap = deckStatAnalyzer->getDevotion();
-
-    int highestEntry = 0;
-    for (auto entry : manaDevotionMap) {
-        if (highestEntry < entry.second) {
-            highestEntry = entry.second;
-        }
-    }
-
-    // Define color mapping for devotion bars
-    std::unordered_map<char, QColor> manaColors = {{'W', QColor(248, 231, 185)}, {'U', QColor(14, 104, 171)},
-                                                   {'B', QColor(21, 11, 0)},     {'R', QColor(211, 32, 42)},
-                                                   {'G', QColor(0, 115, 62)},    {'C', QColor(150, 150, 150)}};
-
-    for (auto entry : manaDevotionMap) {
-        QColor barColor = manaColors.count(entry.first) ? manaColors[entry.first] : Qt::gray;
-        BarWidget *barWidget = new BarWidget(QString(entry.first), entry.second, highestEntry, barColor, this);
-        barLayout->addWidget(barWidget);
-    }
-
-    update(); // Update the widget display
-}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h
deleted file mode 100644
index ff2e86159..000000000
--- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @file mana_devotion_widget.h
- * @ingroup DeckEditorAnalyticsWidgets
- * @brief TODO: Document this.
- */
-
-#ifndef MANA_DEVOTION_WIDGET_H
-#define MANA_DEVOTION_WIDGET_H
-
-#include "../general/display/banner_widget.h"
-#include "deck_list_statistics_analyzer.h"
-
-#include <QHBoxLayout>
-#include <QWidget>
-#include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <utility>
-
-class ManaDevotionWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit ManaDevotionWidget(QWidget *parent, DeckListStatisticsAnalyzer *deckStatAnalyzer);
-    void updateDisplay();
-
-public slots:
-    void retranslateUi();
-
-private:
-    DeckListStatisticsAnalyzer *deckStatAnalyzer;
-    BannerWidget *bannerWidget;
-    QVBoxLayout *layout;
-    QHBoxLayout *barLayout;
-};
-
-#endif // MANA_DEVOTION_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
new file mode 100644
index 000000000..f46679406
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.cpp
@@ -0,0 +1,375 @@
+#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)
+{
+    setAcceptDrops(true);
+
+    auto *mainLayout = new QVBoxLayout(this);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
+    mainLayout->setSpacing(0);
+
+    // Frame for selection highlight
+    frame = new QFrame(this);
+    frame->setFrameShape(QFrame::Box);
+    frame->setLineWidth(2);
+
+    auto *frameLayout = new QVBoxLayout(frame);
+    frameLayout->setContentsMargins(0, 0, 0, 0);
+    frameLayout->setSpacing(0);
+
+    // Add the analytics panel
+    frameLayout->addWidget(analyticsPanel);
+
+    dropIndicator = new QFrame(frame);
+    dropIndicator->setFixedHeight(3);
+    dropIndicator->hide();  // hidden by default
+    dropIndicator->raise(); // make sure it's above children
+
+    selectionOverlay = new QFrame(frame);
+    selectionOverlay->hide();  // hidden by default
+    selectionOverlay->raise(); // make sure it is above children
+    selectionOverlay->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+    // Bottom bar with drag button and resize handle
+    auto *bottomBar = new QWidget(frame);
+    auto *bottomLayout = new QHBoxLayout(bottomBar);
+    bottomLayout->setContentsMargins(0, 0, 0, 0);
+    bottomLayout->setSpacing(0);
+
+    // Drag button on the left
+    dragButton = new QPushButton("☰", bottomBar);
+    dragButton->setFixedSize(40, 8);
+    dragButton->setCursor(Qt::OpenHandCursor);
+    bottomLayout->addWidget(dragButton);
+
+    // Resize handle fills the rest
+    resizeHandle = new QWidget(bottomBar);
+    resizeHandle->setFixedHeight(8);
+    resizeHandle->setCursor(Qt::SizeVerCursor);
+    bottomLayout->addWidget(resizeHandle, 1);
+
+    frameLayout->addWidget(bottomBar);
+
+    mainLayout->addWidget(frame);
+
+    const QPalette &pal = QApplication::palette();
+    QColor mid = pal.color(QPalette::Mid);
+    QColor dark = pal.color(QPalette::Dark);
+    QColor midLight = pal.color(QPalette::Midlight);
+    QColor shadow = pal.color(QPalette::Shadow);
+    QColor placeholderText = pal.color(QPalette::PlaceholderText);
+
+    frame->setStyleSheet("QFrame { border: none; }");
+
+    dropIndicator->setStyleSheet("QFrame { background-color: #3daee9; }");
+
+    selectionOverlay->setStyleSheet("QFrame { background-color: rgba(61,174,233,50); }");
+
+    dragButton->setStyleSheet(QString("QPushButton { "
+                                      "background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 %1, stop:1 %2); "
+                                      "border: none; color: %3; font-size: 10px; }"
+                                      "QPushButton:hover { background: %4; }")
+                                  .arg(mid.name(), dark.name(), placeholderText.name(), midLight.name()));
+
+    resizeHandle->setStyleSheet(QString("QWidget { background: qlineargradient(x1:0, y1:0, x2:0, y2:1, "
+                                        "stop:0 %1, stop:1 %2); }")
+                                    .arg(dark.name(), shadow.name()));
+
+    // Set size policy
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+
+    // Calculate initial height - use panel's size hint if available
+    int panelHint = analyticsPanel->sizeHint().height();
+    int panelMin = analyticsPanel->minimumSizeHint().height();
+
+    // Start with the larger of panel's hint and panel's minimum hint
+    currentHeight = qMax(panelHint + 8, panelMin + 8);
+    updateSizeConstraints();
+
+    // Install event filters
+    dragButton->installEventFilter(this);
+    resizeHandle->installEventFilter(this);
+
+    // Timer for auto-scroll during drag
+    autoScrollTimer = new QTimer(this);
+    autoScrollTimer->setInterval(50);
+    connect(autoScrollTimer, &QTimer::timeout, this, &ResizablePanel::performAutoScroll);
+}
+
+void ResizablePanel::setSelected(bool selected)
+{
+    if (selected) {
+        selectionOverlay->setGeometry(0, 0, width(), height());
+        selectionOverlay->show();
+    } else {
+        selectionOverlay->hide();
+    }
+}
+
+void ResizablePanel::setHeightFromSaved(int h)
+{
+    if (h > 0) {
+        currentHeight = qMax(h, getMinimumAllowedHeight());
+        updateSizeConstraints();
+    }
+}
+
+int ResizablePanel::getCurrentHeight() const
+{
+    return currentHeight;
+}
+
+QSize ResizablePanel::sizeHint() const
+{
+    return QSize(width(), currentHeight);
+}
+
+QSize ResizablePanel::minimumSizeHint() const
+{
+    return QSize(0, getMinimumAllowedHeight());
+}
+
+// =====================================================================================================================
+//                                                      Event Handling
+// =====================================================================================================================
+
+bool ResizablePanel::eventFilter(QObject *obj, QEvent *event)
+{
+    if (obj == dragButton) {
+        if (event->type() == QEvent::MouseButtonPress) {
+            auto *mouseEvent = static_cast<QMouseEvent *>(event);
+            if (mouseEvent->button() == Qt::LeftButton) {
+                dragStartPos = mouseEvent->globalPosition().toPoint();
+                isDraggingPanel = false;
+                dragButton->setCursor(Qt::ClosedHandCursor);
+            }
+            return false;
+        } else if (event->type() == QEvent::MouseMove) {
+            auto *mouseEvent = static_cast<QMouseEvent *>(event);
+            if (mouseEvent->buttons() & Qt::LeftButton) {
+                QPoint currentPos = mouseEvent->globalPosition().toPoint();
+                int distance = (currentPos - dragStartPos).manhattanLength();
+                if (distance >= 5 && !isDraggingPanel) {
+                    isDraggingPanel = true;
+                    startDrag();
+                    return true;
+                }
+            }
+            return false;
+        } else if (event->type() == QEvent::MouseButtonRelease) {
+            dragButton->setCursor(Qt::OpenHandCursor);
+            isDraggingPanel = false;
+            return false;
+        }
+    }
+
+    if (obj == resizeHandle) {
+        if (event->type() == QEvent::MouseButtonPress) {
+            auto *mouseEvent = static_cast<QMouseEvent *>(event);
+            resizeStartY = mouseEvent->globalPosition().y();
+            isResizing = true;
+            resizeStartHeight = currentHeight;
+            resizeHandle->grabMouse();
+            return true;
+        } else if (event->type() == QEvent::MouseMove && isResizing) {
+            auto *mouseEvent = static_cast<QMouseEvent *>(event);
+            int deltaY = mouseEvent->globalPosition().y() - resizeStartY;
+            int newHeight = resizeStartHeight + deltaY;
+
+            int minAllowed = getMinimumAllowedHeight();
+            newHeight = qMax(newHeight, minAllowed);
+
+            currentHeight = newHeight;
+            updateSizeConstraints();
+
+            return true;
+        } else if (event->type() == QEvent::MouseButtonRelease) {
+            isResizing = false;
+            resizeHandle->releaseMouse();
+            return true;
+        }
+    }
+
+    return QWidget::eventFilter(obj, event);
+}
+
+void ResizablePanel::dragEnterEvent(QDragEnterEvent *event)
+{
+    if (event->mimeData()->hasFormat("application/x-resizablepanel")) {
+        event->acceptProposedAction();
+        showDropIndicator(event->position().y());
+    }
+}
+
+void ResizablePanel::dragMoveEvent(QDragMoveEvent *event)
+{
+    if (event->mimeData()->hasFormat("application/x-resizablepanel")) {
+        event->acceptProposedAction();
+        showDropIndicator(event->position().y());
+        lastDragPos = mapToGlobal(event->position().toPoint());
+
+        if (!autoScrollTimer->isActive()) {
+            autoScrollTimer->start();
+        }
+    }
+}
+
+void ResizablePanel::dragLeaveEvent(QDragLeaveEvent *event)
+{
+    Q_UNUSED(event);
+    hideDropIndicator();
+    autoScrollTimer->stop();
+}
+
+void ResizablePanel::dropEvent(QDropEvent *event)
+{
+    hideDropIndicator();
+    autoScrollTimer->stop();
+
+    if (event->mimeData()->hasFormat("application/x-resizablepanel")) {
+        QByteArray data = event->mimeData()->data("application/x-resizablepanel");
+        quintptr ptr = *reinterpret_cast<const quintptr *>(data.constData());
+        ResizablePanel *draggedPanel = reinterpret_cast<ResizablePanel *>(ptr);
+
+        if (draggedPanel && draggedPanel != this) {
+            bool insertBefore = (event->position().y() < height() / 2);
+            emit dropRequested(draggedPanel, this, insertBefore);
+            event->acceptProposedAction();
+        }
+    }
+}
+
+void ResizablePanel::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+
+    if (selectionOverlay->isVisible()) {
+        selectionOverlay->setGeometry(0, 0, width(), height());
+    }
+
+    if (dropIndicator->isVisible()) {
+        dropIndicator->setGeometry(0, dropIndicator->y(), width(), dropIndicator->height());
+    }
+}
+
+// =====================================================================================================================
+//                                                      Private Helpers
+// =====================================================================================================================
+
+int ResizablePanel::getMinimumAllowedHeight() const
+{
+    QSize panelMin = panel->minimumSizeHint();
+    int panelMinHeight = (panelMin.isValid() && panelMin.height() > 0) ? panelMin.height() : 100;
+    return panelMinHeight + 8;
+}
+
+void ResizablePanel::updateSizeConstraints()
+{
+    setMinimumHeight(currentHeight);
+    setMaximumHeight(currentHeight);
+    updateGeometry();
+}
+
+void ResizablePanel::startDrag()
+{
+    QDrag *drag = new QDrag(this);
+    QMimeData *mimeData = new QMimeData;
+
+    quintptr ptr = reinterpret_cast<quintptr>(this);
+    QByteArray data(reinterpret_cast<const char *>(&ptr), sizeof(ptr));
+    mimeData->setData("application/x-resizablepanel", data);
+
+    drag->setMimeData(mimeData);
+
+    QPixmap pixmap(width(), 40);
+    pixmap.fill(QColor(58, 58, 58, 200));
+    drag->setPixmap(pixmap);
+    drag->setHotSpot(QPoint(width() / 2, 20));
+
+    emit dragStarted(this);
+
+    autoScrollTimer->start();
+
+    Qt::DropAction result = drag->exec(Qt::MoveAction);
+    Q_UNUSED(result);
+
+    autoScrollTimer->stop();
+    dragButton->setCursor(Qt::OpenHandCursor);
+    isDraggingPanel = false;
+}
+
+void ResizablePanel::performAutoScroll()
+{
+    QScrollArea *scrollArea = QtUtils::findParentOfType<QScrollArea>(this);
+
+    if (!scrollArea) {
+        return;
+    }
+
+    QScrollBar *scrollBar = scrollArea->verticalScrollBar();
+    if (!scrollBar) {
+        return;
+    }
+
+    QRect scrollRect = scrollArea->viewport()->rect();
+    QPoint scrollTopLeft = scrollArea->viewport()->mapToGlobal(scrollRect.topLeft());
+    QRect globalScrollRect(scrollTopLeft, scrollRect.size());
+
+    const int scrollMargin = 50;
+    int scrollSpeed = 0;
+
+    if (lastDragPos.y() < globalScrollRect.top() + scrollMargin) {
+        scrollSpeed = -15;
+    } else if (lastDragPos.y() > globalScrollRect.bottom() - scrollMargin) {
+        scrollSpeed = 15;
+    }
+
+    if (scrollSpeed != 0) {
+        int newValue = scrollBar->value() + scrollSpeed;
+        newValue = qBound(scrollBar->minimum(), newValue, scrollBar->maximum());
+        scrollBar->setValue(newValue);
+    }
+}
+
+void ResizablePanel::showDropIndicator(double y)
+{
+    bool before = (y < height() / 2);
+    dropIndicator->setGeometry(0, before ? 0 : height() - 3, width(), 3);
+    dropIndicator->show();
+}
+
+void ResizablePanel::hideDropIndicator()
+{
+    dropIndicator->hide();
+}
diff --git a/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.h b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.h
new file mode 100644
index 000000000..809703847
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_analytics/resizable_panel.h
@@ -0,0 +1,75 @@
+#ifndef COCKATRICE_RESIZABLE_PANEL_H
+#define COCKATRICE_RESIZABLE_PANEL_H
+
+#include <QPoint>
+#include <QString>
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class AbstractAnalyticsPanelWidget;
+class QFrame;
+class QPushButton;
+class QTimer;
+
+class ResizablePanel : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit ResizablePanel(const QString &typeId,
+                            AbstractAnalyticsPanelWidget *analyticsPanel,
+                            QWidget *parent = nullptr);
+
+    void setSelected(bool selected);
+    void setHeightFromSaved(int h);
+    int getCurrentHeight() const;
+
+    QSize sizeHint() const override;
+    QSize minimumSizeHint() const override;
+
+    QString getTypeId() const
+    {
+        return typeId;
+    }
+
+    AbstractAnalyticsPanelWidget *panel;
+
+signals:
+    void dragStarted(ResizablePanel *panel);
+    void dropRequested(ResizablePanel *dragged, ResizablePanel *target, bool insertBefore);
+
+protected:
+    bool eventFilter(QObject *obj, QEvent *event) override;
+    void dragEnterEvent(QDragEnterEvent *event) override;
+    void dragMoveEvent(QDragMoveEvent *event) override;
+    void dragLeaveEvent(QDragLeaveEvent *event) override;
+    void dropEvent(QDropEvent *event) override;
+    void resizeEvent(QResizeEvent *event) override;
+
+private:
+    int getMinimumAllowedHeight() const;
+    void updateSizeConstraints();
+    void startDrag();
+    void performAutoScroll();
+    void showDropIndicator(double y);
+    void hideDropIndicator();
+
+    QString typeId;
+
+    QFrame *frame;
+    QFrame *selectionOverlay;
+    QFrame *dropIndicator;
+    QPushButton *dragButton;
+    QWidget *resizeHandle;
+
+    int currentHeight;
+    bool isResizing = false;
+    bool isDraggingPanel = false;
+    double resizeStartY = 0;
+    int resizeStartHeight = 0;
+
+    QPoint dragStartPos;
+    QPoint lastDragPos;
+    QTimer *autoScrollTimer;
+};
+
+#endif // COCKATRICE_RESIZABLE_PANEL_H
diff --git a/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp b/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp
new file mode 100644
index 000000000..e8f6398f7
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp
@@ -0,0 +1,237 @@
+#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)
+{
+    return (cardInfo.getCardType().contains("Legendary", Qt::CaseInsensitive) &&
+            cardInfo.getCardType().contains("Creature", Qt::CaseInsensitive)) ||
+           cardInfo.getText().contains("can be your commander", Qt::CaseInsensitive);
+}
+
+CardDatabaseView::CardDatabaseView(QWidget *parent, CardDatabaseDisplayModel *model)
+    : QTreeView(parent), databaseDisplayModel(model)
+{
+    // set up object
+    setUniformRowHeights(true);
+    setRootIsDecorated(false);
+    setAlternatingRowColors(true);
+    setSortingEnabled(true);
+    sortByColumn(0, Qt::AscendingOrder);
+    QTreeView::setModel(databaseDisplayModel);
+    setContextMenuPolicy(Qt::CustomContextMenu);
+
+    connect(databaseDisplayModel, &CardDatabaseDisplayModel::modelDirty, this,
+            &CardDatabaseView::resetSelectionIfEmpty);
+
+    connect(this, &QTreeView::customContextMenuRequested, this, &CardDatabaseView::openCustomMenu);
+    connect(selectionModel(), &QItemSelectionModel::currentRowChanged, this, &CardDatabaseView::updateCard);
+    connect(this, &QTreeView::doubleClicked, this, &CardDatabaseView::actDoubleClick);
+
+    // layout settings
+    QByteArray dbHeaderState = SettingsCache::instance().layouts().getDeckEditorDbHeaderState();
+    if (dbHeaderState.isNull()) {
+        // first run
+        setColumnWidth(0, 200);
+    } else {
+        header()->restoreState(dbHeaderState);
+    }
+    connect(header(), &QHeaderView::geometriesChanged, this, &CardDatabaseView::saveDbHeaderState);
+
+    // create key filters
+    searchKeySignals.setObjectName("searchKeySignals");
+    connect(&searchKeySignals, &KeySignals::onEnter, this, [this] { addCard(DECK_ZONE_MAIN); });
+    connect(&searchKeySignals, &KeySignals::onCtrlAltEqual, this, [this] { addCard(DECK_ZONE_MAIN); });
+    connect(&searchKeySignals, &KeySignals::onCtrlAltRBracket, this, [this] { addCard(DECK_ZONE_SIDE); });
+    connect(&searchKeySignals, &KeySignals::onCtrlAltMinus, this, [this] { decrementCard(DECK_ZONE_MAIN); });
+    connect(&searchKeySignals, &KeySignals::onCtrlAltLBracket, this, [this] { decrementCard(DECK_ZONE_SIDE); });
+    connect(&searchKeySignals, &KeySignals::onCtrlAltEnter, this, [this] { addCard(DECK_ZONE_SIDE); });
+    connect(&searchKeySignals, &KeySignals::onCtrlEnter, this, [this] { addCard(DECK_ZONE_SIDE); });
+    connect(&searchKeySignals, &KeySignals::onCtrlC, this, &CardDatabaseView::copyDatabaseCellContents);
+}
+
+QString CardDatabaseView::currentCardName() const
+{
+    const QModelIndex currentIndex = selectionModel()->currentIndex();
+    if (!currentIndex.isValid()) {
+        return {};
+    }
+
+    return currentIndex.siblingAtColumn(CardDatabaseModel::NameColumn).data().toString();
+}
+
+void CardDatabaseView::actDoubleClick()
+{
+    if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
+        addCard(DECK_ZONE_SIDE);
+    } else {
+        addCard(DECK_ZONE_MAIN);
+    }
+}
+
+void CardDatabaseView::addCard(const QString &zoneName)
+{
+    emit cardAdded(currentCardName(), zoneName);
+}
+
+void CardDatabaseView::decrementCard(const QString &zoneName)
+{
+    emit cardDecremented(currentCardName(), zoneName);
+}
+
+void CardDatabaseView::setZoneMenuProvider(const std::function<QList<QPair<QString, QStringList>>()> &provider,
+                                           const std::function<QString()> &newZoneHandler)
+{
+    zoneMenuProvider = provider;
+    this->newZoneHandler = newZoneHandler;
+}
+
+void CardDatabaseView::updateCard(const QModelIndex &current, const QModelIndex & /*previous*/)
+{
+    if (!current.isValid()) {
+        return;
+    }
+
+    const QString cardName = current.siblingAtColumn(CardDatabaseModel::NameColumn).data().toString();
+
+    if (!current.model()->hasChildren(current.siblingAtColumn(CardDatabaseModel::NameColumn))) {
+        emit cardChanged(cardName);
+    }
+}
+
+void CardDatabaseView::resetSelectionIfEmpty()
+{
+    QModelIndexList sel = selectionModel()->selectedRows();
+    if (sel.isEmpty() && databaseDisplayModel->rowCount() > 0) {
+        selectionModel()->setCurrentIndex(databaseDisplayModel->index(0, 0),
+                                          QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
+    }
+}
+
+void CardDatabaseView::copyDatabaseCellContents() const
+{
+    auto _data = selectionModel()->currentIndex().data();
+    QApplication::clipboard()->setText(_data.toString());
+}
+
+void CardDatabaseView::saveDbHeaderState()
+{
+    SettingsCache::instance().layouts().setDeckEditorDbHeaderState(header()->saveState());
+}
+
+void CardDatabaseView::openCustomMenu(QPoint point)
+{
+    CardInfoPtr card = CardDatabaseManager::query()->getCardInfo(currentCardName());
+
+    if (!card) {
+        return;
+    }
+
+    QMenu menu;
+    // add to deck and sideboard options
+    QAction *addToDeck = menu.addAction(tr("Add to Deck"));
+    QAction *addToSideboard = menu.addAction(tr("Add to Sideboard"));
+    QAction *selectPrinting = menu.addAction(tr("Select Printing"));
+
+    connect(addToDeck, &QAction::triggered, this, [this, card] { emit cardAdded(card->getName(), DECK_ZONE_MAIN); });
+    connect(addToSideboard, &QAction::triggered, this,
+            [this, card] { emit cardAdded(card->getName(), DECK_ZONE_SIDE); });
+    connect(selectPrinting, &QAction::triggered, this, &CardDatabaseView::selectPrintingClicked);
+
+    if (zoneMenuProvider) {
+        QMenu *addToZoneMenu = menu.addMenu(tr("Add to Zone"));
+        const auto zoneBoards = zoneMenuProvider();
+        for (const QString &boardName : InnerDecklistNode::boardZoneNames()) {
+            // Boards with zones nest their children so no two menu entries
+            // share a visible name: "Maindeck ▸ { Maindeck (whole board), … }".
+            const QStringList customZones = [&zoneBoards, boardName] {
+                for (const auto &zoneBoard : zoneBoards) {
+                    if (zoneBoard.first == boardName) {
+                        return zoneBoard.second;
+                    }
+                }
+                return QStringList();
+            }();
+            if (customZones.isEmpty()) {
+                QAction *action = addToZoneMenu->addAction(InnerDecklistNode::visibleNameFromName(boardName));
+                connect(action, &QAction::triggered, this,
+                        [this, card, boardName] { emit cardAdded(card->getName(), boardName); });
+            } else {
+                QMenu *boardSubmenu = addToZoneMenu->addMenu(InnerDecklistNode::visibleNameFromName(boardName));
+                QAction *wholeBoardAction = boardSubmenu->addAction(InnerDecklistNode::visibleNameFromName(boardName));
+                connect(wholeBoardAction, &QAction::triggered, this,
+                        [this, card, boardName] { emit cardAdded(card->getName(), boardName); });
+                for (const QString &zoneName : customZones) {
+                    QAction *action = boardSubmenu->addAction(zoneName);
+                    connect(action, &QAction::triggered, this,
+                            [this, card, zoneName] { emit cardAdded(card->getName(), zoneName); });
+                }
+            }
+        }
+
+        if (newZoneHandler) {
+            addToZoneMenu->addSeparator();
+
+            QAction *newZoneAction = addToZoneMenu->addAction(tr("Create &new zone..."));
+            connect(newZoneAction, &QAction::triggered, this, [this, card] {
+                const QString zoneName = newZoneHandler();
+                if (!zoneName.isEmpty()) {
+                    emit cardAdded(card->getName(), zoneName);
+                }
+            });
+        }
+    }
+
+    if (canBeCommander(*card)) {
+        QAction *edhRecCommander = menu.addAction(tr("Show on EDHRec (Commander)"));
+        connect(edhRecCommander, &QAction::triggered, this, [this, card] { emit edhrecClicked(card, true); });
+    }
+    QAction *edhRecCard = menu.addAction(tr("Show on EDHRec (Card)"));
+    connect(edhRecCard, &QAction::triggered, this, [this, card] { emit edhrecClicked(card, false); });
+
+    // filling out the related cards submenu
+    auto *relatedMenu = new QMenu(tr("Show Related cards"));
+    menu.addMenu(relatedMenu);
+    auto relatedCards = card->getAllRelatedCards();
+    if (relatedCards.isEmpty()) {
+        relatedMenu->setDisabled(true);
+    } else {
+        for (const CardRelation *rel : relatedCards) {
+            const QString &relatedCardName = rel->getName();
+            QAction *relatedCard = relatedMenu->addAction(relatedCardName);
+            connect(relatedCard, &QAction::triggered, this,
+                    [this, relatedCardName] { emit relatedCardClicked(relatedCardName); });
+        }
+    }
+
+    menu.exec(mapToGlobal(point));
+}
diff --git a/cockatrice/src/interface/widgets/deck_editor/card_database_view.h b/cockatrice/src/interface/widgets/deck_editor/card_database_view.h
new file mode 100644
index 000000000..c095c544d
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_editor/card_database_view.h
@@ -0,0 +1,85 @@
+#ifndef COCKATRICE_CARD_DATABASE_VIEW_H
+#define COCKATRICE_CARD_DATABASE_VIEW_H
+
+#include "../../key_signals.h"
+
+#include <QPair>
+#include <QString>
+#include <QStringList>
+#include <QTreeView>
+#include <functional>
+#include <libcockatrice/card/card_info.h>
+#include <qtmetamacros.h>
+
+class CardDatabaseDisplayModel;
+class QModelIndex;
+class QPoint;
+class QWidget;
+template <typename T> class QList;
+
+/**
+ * @brief The card database table.
+ */
+class CardDatabaseView : public QTreeView
+{
+    Q_OBJECT
+
+    KeySignals searchKeySignals;
+    CardDatabaseDisplayModel *databaseDisplayModel;
+
+    /// Provides the custom zones available in the current deck, grouped by board zone.
+    /// The list contains (board zone name, custom zone names) pairs for every board.
+    std::function<QList<QPair<QString, QStringList>>()> zoneMenuProvider;
+    /// Handler invoked when the user picks "New zone..." from the add-to-zone menu.
+    /// Returns the name of the created zone, or an empty string if creation was cancelled.
+    std::function<QString()> newZoneHandler;
+
+public:
+    explicit CardDatabaseView(QWidget *parent, CardDatabaseDisplayModel *model);
+
+    QString currentCardName() const;
+
+    /**
+     * @brief Get the KeySignals that are connected to this view.
+     * You can install the KeySignals as an eventFilter to capture keyboard shortcuts for adding and decrementing cards.
+     */
+    KeySignals *getKeySignals()
+    {
+        return &searchKeySignals;
+    }
+
+    /**
+     * @brief Sets the provider used to populate the "Add to zone" submenu of the context menu.
+     * If no provider is set, the submenu is not shown.
+     *
+     * @param provider Returns the custom zones of the current deck, grouped by board zone
+     * @param newZoneHandler Creates a new custom zone and returns its name, or an empty string
+     *                       if creation was cancelled. The menu entry is hidden when not provided.
+     */
+    void setZoneMenuProvider(const std::function<QList<QPair<QString, QStringList>>()> &provider,
+                             const std::function<QString()> &newZoneHandler);
+
+signals:
+    void cardChanged(const QString &cardName);
+
+    void cardAdded(const QString &cardName, const QString &zoneName);
+    void cardDecremented(const QString &cardName, const QString &zoneName);
+
+    void edhrecClicked(const CardInfoPtr &cardInfo, bool isCommander);
+    void selectPrintingClicked();
+    void relatedCardClicked(const QString &relatedCard);
+
+private slots:
+    void actDoubleClick();
+
+    void addCard(const QString &zoneName);
+    void decrementCard(const QString &zoneName);
+    void updateCard(const QModelIndex &current, const QModelIndex &);
+
+    void resetSelectionIfEmpty();
+    void copyDatabaseCellContents() const;
+    void saveDbHeaderState();
+    void openCustomMenu(QPoint point);
+};
+
+#endif // COCKATRICE_CARD_DATABASE_VIEW_H
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
new file mode 100644
index 000000000..57ae6eadd
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp
@@ -0,0 +1,98 @@
+#include "deck_editor_card_database_dock_widget.h"
+
+#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>
+
+DeckEditorCardDatabaseDockWidget::DeckEditorCardDatabaseDockWidget(AbstractTabDeckEditor *parent) : QDockWidget(parent)
+{
+    setObjectName("databaseDisplayDock");
+    setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+    setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
+
+    createDatabaseDisplayDock(parent);
+
+    retranslateUi();
+}
+
+void DeckEditorCardDatabaseDockWidget::createDatabaseDisplayDock(AbstractTabDeckEditor *deckEditor)
+{
+    databaseDisplayWidget = new DeckEditorDatabaseDisplayWidget(this, deckEditor->databaseModel);
+
+    databaseDisplayWidget->getDatabaseView()->setZoneMenuProvider(
+        [deckEditor]() -> QList<QPair<QString, QStringList>> {
+            QList<QPair<QString, QStringList>> result;
+            auto *deckListModel = deckEditor->deckStateManager->getModel();
+            for (const QString &boardName : InnerDecklistNode::boardZoneNames()) {
+                result.append({boardName, deckListModel->getCustomZoneNames(boardName)});
+            }
+            return result;
+        },
+        [this, deckEditor]() -> QString {
+            QString boardName;
+            const QString zoneName =
+                DeckZoneDialog::promptForNewZone(this, {}, &boardName, [deckEditor](const QString &candidate) {
+                    return deckEditor->deckStateManager->validateNewZoneName(candidate);
+                });
+            if (!zoneName.isEmpty()) {
+                deckEditor->deckStateManager->createCustomZone(boardName, zoneName);
+            }
+            return zoneName;
+        });
+
+    auto *frame = new QVBoxLayout;
+    frame->setObjectName("databaseDisplayFrame");
+    frame->addWidget(databaseDisplayWidget);
+
+    auto *dockContents = new QWidget();
+    dockContents->setObjectName("databaseDisplayDockContents");
+    dockContents->setLayout(frame);
+    setWidget(dockContents);
+
+    installEventFilter(deckEditor);
+
+    // connect signals
+    connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::cardChanged, deckEditor,
+            &AbstractTabDeckEditor::updateCard);
+    connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::cardAdded, deckEditor,
+            &AbstractTabDeckEditor::addCard);
+    connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::cardDecremented, deckEditor,
+            &AbstractTabDeckEditor::decrementCard);
+    connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::edhrecRequested, deckEditor,
+            &AbstractTabDeckEditor::openEdhrecTab);
+    connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::printingSelectorRequested, deckEditor,
+            &AbstractTabDeckEditor::showPrintingSelector);
+    connect(databaseDisplayWidget, &DeckEditorDatabaseDisplayWidget::cardInfoRequested, deckEditor,
+            &AbstractTabDeckEditor::updateCardInfo);
+}
+
+void DeckEditorCardDatabaseDockWidget::retranslateUi()
+{
+    setWindowTitle(tr("Card Database"));
+}
+
+void DeckEditorCardDatabaseDockWidget::setFilterTree(FilterTree *filterTree)
+{
+    databaseDisplayWidget->setFilterTree(filterTree);
+}
+
+void DeckEditorCardDatabaseDockWidget::clearAllDatabaseFilters()
+{
+    databaseDisplayWidget->clearAllDatabaseFilters();
+}
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
new file mode 100644
index 000000000..b73843bc7
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.h
@@ -0,0 +1,28 @@
+#ifndef COCKATRICE_DECK_EDITOR_CARD_DATABASE_DOCK_WIDGET_H
+#define COCKATRICE_DECK_EDITOR_CARD_DATABASE_DOCK_WIDGET_H
+
+#include <QDockWidget>
+#include <qtmetamacros.h>
+
+class AbstractTabDeckEditor;
+class DeckEditorDatabaseDisplayWidget;
+class FilterTree;
+
+class DeckEditorCardDatabaseDockWidget : public QDockWidget
+{
+public:
+    explicit DeckEditorCardDatabaseDockWidget(AbstractTabDeckEditor *parent);
+
+    DeckEditorDatabaseDisplayWidget *databaseDisplayWidget;
+
+    void setFilterTree(FilterTree *filterTree);
+
+public slots:
+    void retranslateUi();
+    void clearAllDatabaseFilters();
+
+private:
+    void createDatabaseDisplayDock(AbstractTabDeckEditor *deckEditor);
+};
+
+#endif // COCKATRICE_DECK_EDITOR_CARD_DATABASE_DOCK_WIDGET_H
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 3f12636a8..1b920ea1d 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,8 +1,14 @@
 #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)
@@ -31,7 +37,6 @@ void DeckEditorCardInfoDockWidget::createCardInfoDock()
     setWidget(cardInfoDockContents);
 
     installEventFilter(deckEditor);
-    connect(this, &QDockWidget::topLevelChanged, deckEditor, &AbstractTabDeckEditor::dockTopLevelChanged);
 }
 
 void DeckEditorCardInfoDockWidget::updateCard(const ExactCard &_card)
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 086ca2ca4..2f204306d 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,12 +8,13 @@
 #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 b4b27e48a..7ed398535 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,29 +2,35 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../filters/syntax_help.h"
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../../../interface/widgets/tabs/tab_supervisor.h"
+#include "../../key_signals.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 <QClipboard>
-#include <QHeaderView>
-#include <QMenu>
+#include <QAction>
+#include <QHBoxLayout>
+#include <QIcon>
+#include <QLineEdit>
+#include <QStringLiteral>
 #include <QToolButton>
-#include <QTreeView>
+#include <QVBoxLayout>
+#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>
 
-static bool canBeCommander(const CardInfo &cardInfo)
-{
-    return (cardInfo.getCardType().contains("Legendary", Qt::CaseInsensitive) &&
-            cardInfo.getCardType().contains("Creature", Qt::CaseInsensitive)) ||
-           cardInfo.getText().contains("can be your commander", Qt::CaseInsensitive);
-}
+class FilterTree;
 
-DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(AbstractTabDeckEditor *parent)
-    : QWidget(parent), deckEditor(parent)
+DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent, CardDatabaseModel *databaseModel)
+    : QWidget(parent)
 {
-    setObjectName("centralWidget");
+    setObjectName("databaseDisplayWidget");
 
     centralFrame = new QVBoxLayout(this);
     centralFrame->setObjectName("centralFrame");
@@ -35,72 +41,55 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(AbstractTabDeck
     searchEdit->setPlaceholderText(tr("Search by card name (or search expressions)"));
     searchEdit->setClearButtonEnabled(true);
     searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition);
-    auto help = searchEdit->addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition);
-    searchEdit->installEventFilter(&searchKeySignals);
+    auto help = searchEdit->addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition);
 
     setFocusProxy(searchEdit);
     setFocusPolicy(Qt::ClickFocus);
 
-    searchKeySignals.setObjectName("searchKeySignals");
-    connect(searchEdit, &SearchLineEdit::textChanged, this, &DeckEditorDatabaseDisplayWidget::updateSearch);
-    connect(&searchKeySignals, &KeySignals::onEnter, this, &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck);
-    connect(&searchKeySignals, &KeySignals::onCtrlAltEqual, this,
-            &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck);
-    connect(&searchKeySignals, &KeySignals::onCtrlAltRBracket, this,
-            &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard);
-    connect(&searchKeySignals, &KeySignals::onCtrlAltMinus, this,
-            &DeckEditorDatabaseDisplayWidget::actDecrementCardFromMainDeck);
-    connect(&searchKeySignals, &KeySignals::onCtrlAltLBracket, this,
-            &DeckEditorDatabaseDisplayWidget::actDecrementCardFromSideboard);
-    connect(&searchKeySignals, &KeySignals::onCtrlAltEnter, this,
-            &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard);
-    connect(&searchKeySignals, &KeySignals::onCtrlEnter, this, &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard);
-    connect(&searchKeySignals, &KeySignals::onCtrlC, this, &DeckEditorDatabaseDisplayWidget::copyDatabaseCellContents);
     connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(searchEdit); });
 
-    databaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), true, this);
-    databaseModel->setObjectName("databaseModel");
     databaseDisplayModel = new CardDatabaseDisplayModel(this);
     databaseDisplayModel->setObjectName("databaseDisplayModel");
     databaseDisplayModel->setSourceModel(databaseModel);
     databaseDisplayModel->setFilterKeyColumn(0);
 
-    databaseView = new QTreeView(this);
+    const auto applyCardSearchLanguage = [this]() {
+        const CardsDisplaySettings &cardsDisplay = SettingsCache::instance().cardsDisplay();
+        databaseDisplayModel->setSearchLanguage(CardSearchLanguage{
+            cardsDisplay.getCardLang(), static_cast<SearchLanguageMode>(cardsDisplay.getCardSearchLanguage())});
+    };
+    applyCardSearchLanguage();
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this,
+            applyCardSearchLanguage);
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardSearchLanguageChanged, this,
+            applyCardSearchLanguage);
+
+    databaseView = new CardDatabaseView(this, databaseDisplayModel);
     databaseView->setObjectName("databaseView");
     databaseView->setFocusProxy(searchEdit);
-    databaseView->setUniformRowHeights(true);
-    databaseView->setRootIsDecorated(false);
-    databaseView->setAlternatingRowColors(true);
-    databaseView->setSortingEnabled(true);
-    databaseView->sortByColumn(0, Qt::AscendingOrder);
-    databaseView->setModel(databaseDisplayModel);
-    databaseView->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(databaseView, &QTreeView::customContextMenuRequested, this,
-            &DeckEditorDatabaseDisplayWidget::databaseCustomMenu);
-    connect(databaseView->selectionModel(), &QItemSelectionModel::currentRowChanged, this,
-            &DeckEditorDatabaseDisplayWidget::updateCard);
-    connect(databaseView, &QTreeView::doubleClicked, this, &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck);
-
-    QByteArray dbHeaderState = SettingsCache::instance().layouts().getDeckEditorDbHeaderState();
-    if (dbHeaderState.isNull()) {
-        // first run
-        databaseView->setColumnWidth(0, 200);
-    } else {
-        databaseView->header()->restoreState(dbHeaderState);
-    }
-    connect(databaseView->header(), &QHeaderView::geometriesChanged, this,
-            &DeckEditorDatabaseDisplayWidget::saveDbHeaderState);
 
     searchEdit->setTreeView(databaseView);
+    searchEdit->installEventFilter(databaseView->getKeySignals());
+
+    connect(searchEdit, &SearchLineEdit::textChanged, databaseDisplayModel, &CardDatabaseDisplayModel::setStringFilter);
+    connect(databaseView, &CardDatabaseView::cardAdded, this, &DeckEditorDatabaseDisplayWidget::addCard);
+    connect(databaseView, &CardDatabaseView::cardDecremented, this, &DeckEditorDatabaseDisplayWidget::decrementCard);
+    connect(databaseView, &CardDatabaseView::cardChanged, this, &DeckEditorDatabaseDisplayWidget::updateCard);
+
+    connect(databaseView, &CardDatabaseView::edhrecClicked, this, &DeckEditorDatabaseDisplayWidget::edhrecRequested);
+    connect(databaseView, &CardDatabaseView::selectPrintingClicked, this,
+            &DeckEditorDatabaseDisplayWidget::printingSelectorRequested);
+    connect(databaseView, &CardDatabaseView::relatedCardClicked, this,
+            &DeckEditorDatabaseDisplayWidget::onRelatedCardClicked);
 
     aAddCard = new QAction(QString(), this);
-    aAddCard->setIcon(QPixmap("theme:icons/arrow_right_green"));
+    aAddCard->setIcon(themePixmap(QStringLiteral("icons/arrow_right_green")));
     connect(aAddCard, &QAction::triggered, this, &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck);
     auto *tbAddCard = new QToolButton(this);
     tbAddCard->setDefaultAction(aAddCard);
 
     aAddCardToSideboard = new QAction(QString(), this);
-    aAddCardToSideboard->setIcon(QPixmap("theme:icons/arrow_right_blue"));
+    aAddCardToSideboard->setIcon(themePixmap(QStringLiteral("icons/arrow_right_blue")));
     connect(aAddCardToSideboard, &QAction::triggered, this, &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard);
     auto *tbAddCardToSideboard = new QToolButton(this);
     tbAddCardToSideboard->setDefaultAction(aAddCardToSideboard);
@@ -117,120 +106,39 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(AbstractTabDeck
     retranslateUi();
 }
 
-void DeckEditorDatabaseDisplayWidget::updateSearch(const QString &search)
-{
-    databaseDisplayModel->setStringFilter(search);
-    QModelIndexList sel = databaseView->selectionModel()->selectedRows();
-    if (sel.isEmpty() && databaseDisplayModel->rowCount())
-        databaseView->selectionModel()->setCurrentIndex(databaseDisplayModel->index(0, 0),
-                                                        QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
-}
-
 void DeckEditorDatabaseDisplayWidget::clearAllDatabaseFilters()
 {
     databaseDisplayModel->clearFilterAll();
     searchEdit->setText("");
 }
 
-void DeckEditorDatabaseDisplayWidget::updateCard(const QModelIndex &current, const QModelIndex & /*previous*/)
-{
-    const QString cardName = current.sibling(current.row(), 0).data().toString();
-
-    if (!current.isValid()) {
-        return;
-    }
-
-    if (!current.model()->hasChildren(current.sibling(current.row(), 0))) {
-        emit cardChanged(CardDatabaseManager::query()->getPreferredCard(cardName));
-    }
-}
-
 void DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck()
 {
-    emit addCardToMainDeck(currentCard());
+    addCard(databaseView->currentCardName(), DECK_ZONE_MAIN);
 }
 
 void DeckEditorDatabaseDisplayWidget::actAddCardToSideboard()
 {
-    emit addCardToSideboard(currentCard());
+    addCard(databaseView->currentCardName(), DECK_ZONE_SIDE);
 }
 
-void DeckEditorDatabaseDisplayWidget::actDecrementCardFromMainDeck()
+void DeckEditorDatabaseDisplayWidget::addCard(const QString &cardName, const QString &zoneName)
 {
-    emit decrementCardFromMainDeck(currentCard());
+    highlightAllSearchEdit();
+    ExactCard exactCard = CardDatabaseManager::query()->getPreferredCard(cardName);
+    emit cardAdded(exactCard, zoneName);
 }
 
-void DeckEditorDatabaseDisplayWidget::actDecrementCardFromSideboard()
+void DeckEditorDatabaseDisplayWidget::decrementCard(const QString &cardName, const QString &zoneName)
 {
-    emit decrementCardFromSideboard(currentCard());
+    ExactCard exactCard = CardDatabaseManager::query()->getPreferredCard(cardName);
+    emit cardDecremented(exactCard, zoneName);
 }
 
-ExactCard DeckEditorDatabaseDisplayWidget::currentCard() const
+void DeckEditorDatabaseDisplayWidget::updateCard(const QString &cardName)
 {
-    const QModelIndex currentIndex = databaseView->selectionModel()->currentIndex();
-    if (!currentIndex.isValid()) {
-        return {};
-    }
-
-    const QString cardName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
-
-    return CardDatabaseManager::query()->getPreferredCard(cardName);
-}
-
-void DeckEditorDatabaseDisplayWidget::databaseCustomMenu(QPoint point)
-{
-    QMenu menu;
-    ExactCard card = currentCard();
-
-    if (card) {
-        // add to deck and sideboard options
-        QAction *addToDeck, *addToSideboard, *selectPrinting, *edhRecCommander, *edhRecCard;
-        addToDeck = menu.addAction(tr("Add to Deck"));
-        addToSideboard = menu.addAction(tr("Add to Sideboard"));
-        if (!SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) {
-            selectPrinting = menu.addAction(tr("Select Printing"));
-            connect(selectPrinting, &QAction::triggered, this, [this, card] { deckEditor->showPrintingSelector(); });
-        }
-        if (canBeCommander(card.getInfo())) {
-            edhRecCommander = menu.addAction(tr("Show on EDHRec (Commander)"));
-            connect(edhRecCommander, &QAction::triggered, this,
-                    [this, card] { deckEditor->getTabSupervisor()->addEdhrecTab(card.getCardPtr(), true); });
-        }
-        edhRecCard = menu.addAction(tr("Show on EDHRec (Card)"));
-
-        connect(addToDeck, &QAction::triggered, this, &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck);
-        connect(addToSideboard, &QAction::triggered, this, &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard);
-        connect(edhRecCard, &QAction::triggered, this,
-                [this, card] { deckEditor->getTabSupervisor()->addEdhrecTab(card.getCardPtr()); });
-
-        // filling out the related cards submenu
-        auto *relatedMenu = new QMenu(tr("Show Related cards"));
-        menu.addMenu(relatedMenu);
-        auto relatedCards = card.getInfo().getAllRelatedCards();
-        if (relatedCards.isEmpty()) {
-            relatedMenu->setDisabled(true);
-        } else {
-            for (const CardRelation *rel : relatedCards) {
-                const QString &relatedCardName = rel->getName();
-                QAction *relatedCard = relatedMenu->addAction(relatedCardName);
-                connect(
-                    relatedCard, &QAction::triggered, deckEditor->cardInfoDockWidget->cardInfo,
-                    [this, relatedCardName] { deckEditor->cardInfoDockWidget->cardInfo->setCard(relatedCardName); });
-            }
-        }
-        menu.exec(databaseView->mapToGlobal(point));
-    }
-}
-
-void DeckEditorDatabaseDisplayWidget::copyDatabaseCellContents()
-{
-    auto _data = databaseView->selectionModel()->currentIndex().data();
-    QApplication::clipboard()->setText(_data.toString());
-}
-
-void DeckEditorDatabaseDisplayWidget::saveDbHeaderState()
-{
-    SettingsCache::instance().layouts().setDeckEditorDbHeaderState(databaseView->header()->saveState());
+    ExactCard exactCard = CardDatabaseManager::query()->getPreferredCard(cardName);
+    emit cardChanged(exactCard);
 }
 
 void DeckEditorDatabaseDisplayWidget::setFilterTree(FilterTree *filterTree)
@@ -242,4 +150,15 @@ void DeckEditorDatabaseDisplayWidget::retranslateUi()
 {
     aAddCard->setText(tr("Add card to &maindeck"));
     aAddCardToSideboard->setText(tr("Add card to &sideboard"));
+}
+
+void DeckEditorDatabaseDisplayWidget::highlightAllSearchEdit()
+{
+    searchEdit->setSelection(0, searchEdit->text().length());
+}
+
+void DeckEditorDatabaseDisplayWidget::onRelatedCardClicked(const QString &relatedCard)
+{
+    ExactCard exactCard = CardDatabaseManager::query()->guessCard({relatedCard});
+    emit cardInfoRequested(exactCard);
 }
\ No newline at end of file
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 593be7825..e9edec125 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,63 +8,69 @@
 #ifndef DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
 #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../../key_signals.h"
-#include "../utility/custom_line_edit.h"
+#include "libcockatrice/card/card_info.h"
 
-#include <QHBoxLayout>
+#include <QString>
 #include <QWidget>
-#include <libcockatrice/models/database/card_database_display_model.h>
-#include <libcockatrice/models/database/card_database_model.h>
+#include <qtmetamacros.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
 {
 
     Q_OBJECT
 public:
-    explicit DeckEditorDatabaseDisplayWidget(AbstractTabDeckEditor *parent);
-    AbstractTabDeckEditor *deckEditor;
-    SearchLineEdit *searchEdit;
-    CardDatabaseModel *databaseModel;
-    CardDatabaseDisplayModel *databaseDisplayModel;
+    explicit DeckEditorDatabaseDisplayWidget(QWidget *parent, CardDatabaseModel *databaseModel);
 
-    QTreeView *getDatabaseView()
+    CardDatabaseView *getDatabaseView() const
     {
         return databaseView;
     }
 
 public slots:
-    ExactCard currentCard() const;
     void setFilterTree(FilterTree *filterTree);
     void clearAllDatabaseFilters();
-    void updateSearch(const QString &search);
-    void updateCard(const QModelIndex &current, const QModelIndex &);
+
     void actAddCardToMainDeck();
     void actAddCardToSideboard();
-    void actDecrementCardFromMainDeck();
-    void actDecrementCardFromSideboard();
-    void databaseCustomMenu(QPoint point);
-    void copyDatabaseCellContents();
+
+    void addCard(const QString &cardName, const QString &zoneName);
+    void decrementCard(const QString &cardName, const QString &zoneName);
+    void updateCard(const QString &cardName);
 
 signals:
-    void addCardToMainDeck(const ExactCard &card);
-    void addCardToSideboard(const ExactCard &card);
-    void decrementCardFromMainDeck(const ExactCard &card);
-    void decrementCardFromSideboard(const ExactCard &card);
+    void cardAdded(const ExactCard &card, const QString &zoneName);
+    void cardDecremented(const ExactCard &card, const QString &zoneName);
     void cardChanged(const ExactCard &_card);
 
+    void edhrecRequested(const CardInfoPtr &cardInfo, bool isCommander);
+    void printingSelectorRequested();
+    void cardInfoRequested(const ExactCard &card);
+
 private:
-    KeySignals searchKeySignals;
-    QTreeView *databaseView;
+    CardDatabaseDisplayModel *databaseDisplayModel;
+    CardDatabaseView *databaseView;
     QHBoxLayout *searchLayout;
+    SearchLineEdit *searchEdit;
     QAction *aAddCard, *aAddCardToSideboard;
     QVBoxLayout *centralFrame;
     QWidget *centralWidget;
 
+    void highlightAllSearchEdit();
+
 private slots:
     void retranslateUi();
-    void saveDbHeaderState();
+
+    void onRelatedCardClicked(const QString &relatedCard);
 };
 
 #endif // DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H
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 075b73216..37dd57459 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
@@ -1,17 +1,76 @@
 #include "deck_editor_deck_dock_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/deck_loader.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 "../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/utility/trice_limits.h>
+#include <libcockatrice/deck_list/deck_list_node_tree.h>
+#include <libcockatrice/settings/deck_editor_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)
 {
@@ -38,7 +97,7 @@ static int findRestoreIndex(const CardRef &wanted, const QComboBox *combo)
 }
 
 DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent)
-    : QDockWidget(parent), deckEditor(parent)
+    : QDockWidget(parent), deckEditor(parent), deckStateManager(parent->deckStateManager)
 {
     setObjectName("deckDock");
 
@@ -46,25 +105,26 @@ DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent
     setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetMovable);
 
     installEventFilter(deckEditor);
-    connect(this, &DeckEditorDeckDockWidget::topLevelChanged, deckEditor, &AbstractTabDeckEditor::dockTopLevelChanged);
     createDeckDock();
 }
 
 void DeckEditorDeckDockWidget::createDeckDock()
 {
-    deckModel = new DeckListModel(this);
-    deckModel->setObjectName("deckModel");
-    connect(deckModel, &DeckListModel::deckHashChanged, this, &DeckEditorDeckDockWidget::updateHash);
-
-    deckLoader = new DeckLoader(this, deckModel->getDeckList());
+    connect(getModel(), &DeckListModel::deckHashChanged, this, &DeckEditorDeckDockWidget::updateHash);
 
     proxy = new DeckListStyleProxy(this);
-    proxy->setSourceModel(deckModel);
+    proxy->setSourceModel(getModel());
 
-    historyManagerWidget = new DeckListHistoryManagerWidget(deckModel, proxy, deckEditor->getHistoryManager(), this);
+    historyManagerWidget = new DeckListHistoryManagerWidget(deckStateManager, proxy, this);
     connect(historyManagerWidget, &DeckListHistoryManagerWidget::requestDisplayWidgetSync, this,
             &DeckEditorDeckDockWidget::syncDisplayWidgetsToModel);
 
+    connect(deckStateManager, &DeckStateManager::focusIndexChanged, this, &DeckEditorDeckDockWidget::setSelectedIndex);
+    connect(deckStateManager, &DeckStateManager::deckReplaced, this,
+            &DeckEditorDeckDockWidget::syncDisplayWidgetsToModel);
+    connect(deckStateManager, &DeckStateManager::deckReplaced, this,
+            &DeckEditorDeckDockWidget::applyActiveGroupCriteria);
+
     deckView = new QTreeView();
     deckView->setObjectName("deckView");
     deckView->setModel(proxy);
@@ -76,14 +136,14 @@ void DeckEditorDeckDockWidget::createDeckDock()
     deckView->setSelectionMode(QAbstractItemView::ExtendedSelection);
     connect(deckView->selectionModel(), &QItemSelectionModel::currentRowChanged, this,
             &DeckEditorDeckDockWidget::updateCard);
-    connect(deckView, &QTreeView::doubleClicked, this, &DeckEditorDeckDockWidget::actSwapCard);
+    connect(deckView, &QTreeView::doubleClicked, this, &DeckEditorDeckDockWidget::actSwapSelection);
     deckView->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(deckView, &QTreeView::customContextMenuRequested, this, &DeckEditorDeckDockWidget::decklistCustomMenu);
-    connect(&deckViewKeySignals, &KeySignals::onShiftS, this, &DeckEditorDeckDockWidget::actSwapCard);
-    connect(&deckViewKeySignals, &KeySignals::onEnter, this, &DeckEditorDeckDockWidget::actIncrement);
-    connect(&deckViewKeySignals, &KeySignals::onCtrlAltEqual, this, &DeckEditorDeckDockWidget::actIncrement);
+    connect(&deckViewKeySignals, &KeySignals::onShiftS, this, &DeckEditorDeckDockWidget::actSwapSelection);
+    connect(&deckViewKeySignals, &KeySignals::onEnter, this, &DeckEditorDeckDockWidget::actIncrementSelection);
+    connect(&deckViewKeySignals, &KeySignals::onCtrlAltEqual, this, &DeckEditorDeckDockWidget::actIncrementSelection);
     connect(&deckViewKeySignals, &KeySignals::onCtrlAltMinus, this, &DeckEditorDeckDockWidget::actDecrementSelection);
-    connect(&deckViewKeySignals, &KeySignals::onShiftRight, this, &DeckEditorDeckDockWidget::actIncrement);
+    connect(&deckViewKeySignals, &KeySignals::onShiftRight, this, &DeckEditorDeckDockWidget::actIncrementSelection);
     connect(&deckViewKeySignals, &KeySignals::onShiftLeft, this, &DeckEditorDeckDockWidget::actDecrementSelection);
     connect(&deckViewKeySignals, &KeySignals::onDelete, this, &DeckEditorDeckDockWidget::actRemoveCard);
 
@@ -97,7 +157,7 @@ void DeckEditorDeckDockWidget::createDeckDock()
     nameDebounceTimer = new QTimer(this);
     nameDebounceTimer->setSingleShot(true);
     nameDebounceTimer->setInterval(300); // debounce duration in ms
-    connect(nameDebounceTimer, &QTimer::timeout, this, [this]() { updateName(nameEdit->text()); });
+    connect(nameDebounceTimer, &QTimer::timeout, this, &DeckEditorDeckDockWidget::writeName);
 
     connect(nameEdit, &LineEditUnfocusable::textChanged, this, [this]() {
         nameDebounceTimer->start(); // restart debounce timer
@@ -107,23 +167,31 @@ void DeckEditorDeckDockWidget::createDeckDock()
 
     showBannerCardCheckBox = new QCheckBox();
     showBannerCardCheckBox->setObjectName("showBannerCardCheckBox");
-    showBannerCardCheckBox->setChecked(SettingsCache::instance().getDeckEditorBannerCardComboBoxVisible());
-    connect(showBannerCardCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setDeckEditorBannerCardComboBoxVisible);
-    connect(&SettingsCache::instance(), &SettingsCache::deckEditorBannerCardComboBoxVisibleChanged, this,
+    showBannerCardCheckBox->setChecked(SettingsCache::instance().deckEditor().getBannerCardComboBoxVisible());
+    connect(showBannerCardCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().deckEditor(),
+            &DeckEditorSettings::setBannerCardComboBoxVisible);
+    connect(&SettingsCache::instance().deckEditor(), &DeckEditorSettings::bannerCardComboBoxVisibleChanged, this,
             &DeckEditorDeckDockWidget::updateShowBannerCardComboBox);
 
     showTagsWidgetCheckBox = new QCheckBox();
     showTagsWidgetCheckBox->setObjectName("showTagsWidgetCheckBox");
-    showTagsWidgetCheckBox->setChecked(SettingsCache::instance().getDeckEditorTagsWidgetVisible());
-    connect(showTagsWidgetCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setDeckEditorTagsWidgetVisible);
-    connect(&SettingsCache::instance(), &SettingsCache::deckEditorTagsWidgetVisibleChanged, this,
+    showTagsWidgetCheckBox->setChecked(SettingsCache::instance().deckEditor().getTagsWidgetVisible());
+    connect(showTagsWidgetCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().deckEditor(),
+            &DeckEditorSettings::setTagsWidgetVisible);
+    connect(&SettingsCache::instance().deckEditor(), &DeckEditorSettings::tagsWidgetVisibleChanged, this,
             &DeckEditorDeckDockWidget::updateShowTagsWidget);
 
     quickSettingsWidget->addSettingsWidget(showBannerCardCheckBox);
     quickSettingsWidget->addSettingsWidget(showTagsWidgetCheckBox);
 
+    formatLabel = new QLabel(this);
+
+    formatComboBox = new QComboBox(this);
+    formatComboBox->addItem(tr("Loading Database..."));
+    formatComboBox->setEnabled(false); // Disable until loaded
+
+    commanderBracketWidget = new CommanderBracketWidget(this);
+
     commentsLabel = new QLabel();
     commentsLabel->setObjectName("commentsLabel");
     commentsEdit = new QTextEdit;
@@ -135,7 +203,7 @@ void DeckEditorDeckDockWidget::createDeckDock()
     commentsDebounceTimer = new QTimer(this);
     commentsDebounceTimer->setSingleShot(true);
     commentsDebounceTimer->setInterval(400); // longer debounce for multi-line
-    connect(commentsDebounceTimer, &QTimer::timeout, this, [this]() { updateComments(); });
+    connect(commentsDebounceTimer, &QTimer::timeout, this, &DeckEditorDeckDockWidget::writeComments);
 
     connect(commentsEdit, &QTextEdit::textChanged, this, [this]() {
         commentsDebounceTimer->start(); // restart debounce timer
@@ -144,18 +212,23 @@ void DeckEditorDeckDockWidget::createDeckDock()
     bannerCardLabel = new QLabel();
     bannerCardLabel->setObjectName("bannerCardLabel");
     bannerCardLabel->setText(tr("Banner Card"));
-    bannerCardLabel->setHidden(!SettingsCache::instance().getDeckEditorBannerCardComboBoxVisible());
+    bannerCardLabel->setHidden(!SettingsCache::instance().deckEditor().getBannerCardComboBoxVisible());
     bannerCardComboBox = new QComboBox(this);
-    connect(deckModel, &DeckListModel::dataChanged, this, [this]() {
+    connect(getModel(), &DeckListModel::cardNodesChanged, this, [this]() {
         // Delay the update to avoid race conditions
         QTimer::singleShot(100, this, &DeckEditorDeckDockWidget::updateBannerCardComboBox);
     });
-    connect(bannerCardComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
-            &DeckEditorDeckDockWidget::setBannerCard);
-    bannerCardComboBox->setHidden(!SettingsCache::instance().getDeckEditorBannerCardComboBoxVisible());
+    connect(getModel(), &DeckListModel::cardAddedAt, this, &DeckEditorDeckDockWidget::recursiveExpand);
+    connect(getModel(), &DeckListModel::modelReset, this, &DeckEditorDeckDockWidget::expandAll);
 
-    deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this, deckModel->getDeckList());
-    deckTagsDisplayWidget->setHidden(!SettingsCache::instance().getDeckEditorTagsWidgetVisible());
+    connect(bannerCardComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &DeckEditorDeckDockWidget::writeBannerCard);
+    bannerCardComboBox->setHidden(!SettingsCache::instance().deckEditor().getBannerCardComboBoxVisible());
+
+    deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this, {});
+    deckTagsDisplayWidget->setHidden(!SettingsCache::instance().deckEditor().getTagsWidgetVisible());
+    connect(deckTagsDisplayWidget, &DeckPreviewDeckTagsDisplayWidget::tagsChanged, deckStateManager,
+            &DeckStateManager::setTags);
 
     activeGroupCriteriaLabel = new QLabel(this);
 
@@ -163,35 +236,30 @@ void DeckEditorDeckDockWidget::createDeckDock()
     activeGroupCriteriaComboBox->addItem(tr("Main Type"), DeckListModelGroupCriteria::MAIN_TYPE);
     activeGroupCriteriaComboBox->addItem(tr("Mana Cost"), DeckListModelGroupCriteria::MANA_COST);
     activeGroupCriteriaComboBox->addItem(tr("Colors"), DeckListModelGroupCriteria::COLOR);
-    connect(activeGroupCriteriaComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), [this]() {
-        deckModel->setActiveGroupCriteria(static_cast<DeckListModelGroupCriteria::Type>(
-            activeGroupCriteriaComboBox->currentData(Qt::UserRole).toInt()));
-        deckModel->sort(deckView->header()->sortIndicatorSection(), deckView->header()->sortIndicatorOrder());
-        deckView->expandAll();
-        deckView->expandAll();
-    });
+    connect(activeGroupCriteriaComboBox, qOverload<int>(&QComboBox::currentIndexChanged), this,
+            &DeckEditorDeckDockWidget::applyActiveGroupCriteria);
 
     aIncrement = new QAction(QString(), this);
-    aIncrement->setIcon(QPixmap("theme:icons/increment"));
-    connect(aIncrement, &QAction::triggered, this, &DeckEditorDeckDockWidget::actIncrement);
+    aIncrement->setIcon(themePixmap(QStringLiteral("icons/increment")));
+    connect(aIncrement, &QAction::triggered, this, &DeckEditorDeckDockWidget::actIncrementSelection);
     auto *tbIncrement = new QToolButton(this);
     tbIncrement->setDefaultAction(aIncrement);
 
     aDecrement = new QAction(QString(), this);
-    aDecrement->setIcon(QPixmap("theme:icons/decrement"));
+    aDecrement->setIcon(themePixmap(QStringLiteral("icons/decrement")));
     connect(aDecrement, &QAction::triggered, this, &DeckEditorDeckDockWidget::actDecrementSelection);
     auto *tbDecrement = new QToolButton(this);
     tbDecrement->setDefaultAction(aDecrement);
 
     aRemoveCard = new QAction(QString(), this);
-    aRemoveCard->setIcon(QPixmap("theme:icons/remove_row"));
+    aRemoveCard->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
     connect(aRemoveCard, &QAction::triggered, this, &DeckEditorDeckDockWidget::actRemoveCard);
     auto *tbRemoveCard = new QToolButton(this);
     tbRemoveCard->setDefaultAction(aRemoveCard);
 
     aSwapCard = new QAction(QString(), this);
-    aSwapCard->setIcon(QPixmap("theme:icons/swap"));
-    connect(aSwapCard, &QAction::triggered, this, &DeckEditorDeckDockWidget::actSwapCard);
+    aSwapCard->setIcon(themePixmap(QStringLiteral("icons/swap")));
+    connect(aSwapCard, &QAction::triggered, this, &DeckEditorDeckDockWidget::actSwapSelection);
     auto *tbSwapCard = new QToolButton(this);
     tbSwapCard->setDefaultAction(aSwapCard);
 
@@ -206,13 +274,26 @@ void DeckEditorDeckDockWidget::createDeckDock()
     upperLayout->addWidget(commentsLabel, 1, 0);
     upperLayout->addWidget(commentsEdit, 1, 1);
 
-    upperLayout->addWidget(bannerCardLabel, 2, 0);
-    upperLayout->addWidget(bannerCardComboBox, 2, 1);
+    upperLayout->addWidget(formatLabel, 2, 0);
+    upperLayout->addWidget(formatComboBox, 2, 1);
 
-    upperLayout->addWidget(deckTagsDisplayWidget, 3, 1);
+    upperLayout->addWidget(commanderBracketWidget, 3, 0, 1, 2);
 
-    upperLayout->addWidget(activeGroupCriteriaLabel, 4, 0);
-    upperLayout->addWidget(activeGroupCriteriaComboBox, 4, 1);
+    upperLayout->addWidget(bannerCardLabel, 4, 0);
+    upperLayout->addWidget(bannerCardComboBox, 4, 1);
+
+    playmatLabel = new QLabel();
+    playmatLabel->setObjectName("playmatLabel");
+    playmatLabel->setText(tr("Playmat"));
+    playmatSettingsButton = new QPushButton(tr("Edit Playmat..."));
+    connect(playmatSettingsButton, &QPushButton::clicked, this, &DeckEditorDeckDockWidget::openPlaymatSettings);
+    upperLayout->addWidget(playmatLabel, 5, 0);
+    upperLayout->addWidget(playmatSettingsButton, 5, 1);
+
+    upperLayout->addWidget(deckTagsDisplayWidget, 6, 1);
+
+    upperLayout->addWidget(activeGroupCriteriaLabel, 7, 0);
+    upperLayout->addWidget(activeGroupCriteriaComboBox, 7, 1);
 
     hashLabel1 = new QLabel();
     hashLabel1->setObjectName("hashLabel1");
@@ -261,24 +342,69 @@ void DeckEditorDeckDockWidget::createDeckDock()
 
     refreshShortcuts();
     retranslateUi();
+
+    connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this,
+            &DeckEditorDeckDockWidget::initializeFormats);
+
+    if (CardDatabaseManager::getInstance()->getLoadStatus() == LoadStatus::Ok) {
+        initializeFormats();
+    }
+}
+
+void DeckEditorDeckDockWidget::initializeFormats()
+{
+    QStringList allFormats = CardDatabaseManager::query()->getAllFormatsWithCount().keys();
+
+    formatComboBox->clear(); // Remove "Loading Database..."
+    formatComboBox->setEnabled(true);
+
+    // Populate with formats
+    formatComboBox->addItem("", "");
+    for (auto formatName : allFormats) {
+        formatComboBox->addItem(formatName, formatName); // store the raw key in itemData
+    }
+
+    QString format = deckStateManager->getMetadata().gameFormat;
+    if (!format.isEmpty()) {
+        formatComboBox->setCurrentIndex(formatComboBox->findData(format));
+    } else {
+        // Ensure no selection is visible initially
+        formatComboBox->setCurrentIndex(-1);
+    }
+    connect(formatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index) {
+        QString formatKey;
+        if (index >= 0) {
+            formatKey = formatComboBox->itemData(index).toString();
+            deckStateManager->setFormat(formatKey);
+        } else {
+            deckStateManager->setFormat(""); // clear format if deselected
+        }
+
+        commanderBracketWidget->setDeck(deckStateManager->getDeckListShared());
+    });
+
+    commanderBracketWidget->setDeck(deckStateManager->getDeckListShared());
 }
 
 ExactCard DeckEditorDeckDockWidget::getCurrentCard()
 {
     QModelIndex current = deckView->selectionModel()->currentIndex();
-    if (!current.isValid())
+    if (!current.isValid()) {
         return {};
-    const QString cardName = current.sibling(current.row(), 1).data().toString();
-    const QString cardProviderID = current.sibling(current.row(), 4).data().toString();
+    }
+    // The display role holds the localized card name; the edit role always carries the
+    // canonical English name needed to look the card up in the database.
+    const QString cardName = current.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+    const QString cardProviderID = current.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data().toString();
     const QModelIndex gparent = current.parent().parent();
 
     if (!gparent.isValid()) {
         return {};
     }
 
-    const QString zoneName = gparent.sibling(gparent.row(), 1).data(Qt::EditRole).toString();
+    const QString zoneName = gparent.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
 
-    if (!current.model()->hasChildren(current.sibling(current.row(), 0))) {
+    if (!current.model()->hasChildren(current.siblingAtColumn(DeckListModelColumns::CARD_AMOUNT))) {
         if (ExactCard selectedCard = CardDatabaseManager::query()->getCard({cardName, cardProviderID})) {
             return selectedCard;
         }
@@ -289,43 +415,37 @@ ExactCard DeckEditorDeckDockWidget::getCurrentCard()
 void DeckEditorDeckDockWidget::updateCard(const QModelIndex /*&current*/, const QModelIndex & /*previous*/)
 {
     if (ExactCard card = getCurrentCard()) {
-        emit cardChanged(card);
+        emit selectedCardChanged(card);
     }
 }
 
-void DeckEditorDeckDockWidget::updateName(const QString &name)
+/**
+ * @brief Writes the contents of the name textBox to the DeckStateManager
+ */
+void DeckEditorDeckDockWidget::writeName()
 {
-    emit requestDeckHistorySave(
-        QString(tr("Rename deck to \"%1\" from \"%2\"")).arg(name).arg(deckLoader->getDeckList()->getName()));
-    deckModel->getDeckList()->setName(name);
-    deckEditor->setModified(name.isEmpty());
-    emit nameChanged();
-    emit deckModified();
+    QString name = nameEdit->text();
+    deckStateManager->setName(name);
 }
 
-void DeckEditorDeckDockWidget::updateComments()
+/**
+ * @brief Writes the contents of the comments textBox to the DeckStateManager
+ */
+void DeckEditorDeckDockWidget::writeComments()
 {
-    emit requestDeckHistorySave(tr("Updated comments (was %1 chars, now %2 chars)")
-                                    .arg(deckLoader->getDeckList()->getComments().size())
-                                    .arg(commentsEdit->toPlainText().size()));
-
-    deckModel->getDeckList()->setComments(commentsEdit->toPlainText());
-    deckEditor->setModified(commentsEdit->toPlainText().isEmpty());
-    emit commentsChanged();
-    emit deckModified();
+    QString comments = commentsEdit->toPlainText();
+    deckStateManager->setComments(comments);
 }
 
 void DeckEditorDeckDockWidget::updateHash()
 {
-    hashLabel->setText(deckModel->getDeckList()->getDeckHash());
-    emit hashChanged();
-    emit deckModified();
+    hashLabel->setText(deckStateManager->getDeckHash());
 }
 
 void DeckEditorDeckDockWidget::updateBannerCardComboBox()
 {
     // Store current banner card identity
-    CardRef wanted = deckModel->getDeckList()->getBannerCard();
+    CardRef wanted = deckStateManager->getMetadata().bannerCard;
 
     // Block signals temporarily
     bool wasBlocked = bannerCardComboBox->blockSignals(true);
@@ -335,15 +455,15 @@ void DeckEditorDeckDockWidget::updateBannerCardComboBox()
 
     // Collect unique (name, providerId) pairs
     QSet<QPair<QString, QString>> bannerCardSet;
-    QList<DecklistCardNode *> cardsInDeck = deckModel->getDeckList()->getCardNodes();
+    QList<CardRef> cardsInDeck = getModel()->getCardRefs();
 
-    for (auto currentCard : cardsInDeck) {
-        if (!CardDatabaseManager::query()->getCard(currentCard->toCardRef())) {
+    for (auto cardRef : cardsInDeck) {
+        if (!CardDatabaseManager::query()->getCard(cardRef)) {
             continue;
         }
 
         // Insert one entry per distinct card, ignore copies
-        bannerCardSet.insert({currentCard->getName(), currentCard->getCardProviderId()});
+        bannerCardSet.insert({cardRef.name, cardRef.providerId});
     }
 
     // Convert to sorted list
@@ -364,7 +484,6 @@ void DeckEditorDeckDockWidget::updateBannerCardComboBox()
     // Handle results
     if (restoreIndex != -1) {
         bannerCardComboBox->setCurrentIndex(restoreIndex);
-        syncDeckListBannerCardWithComboBox();
     } else {
         // Add a placeholder "-" and set it as the current selection
         bannerCardComboBox->insertItem(0, "-");
@@ -375,18 +494,50 @@ void DeckEditorDeckDockWidget::updateBannerCardComboBox()
     bannerCardComboBox->blockSignals(wasBlocked);
 }
 
-void DeckEditorDeckDockWidget::setBannerCard(int /* changedIndex */)
+/**
+ * @brief Writes the selected bannerCard to the DeckStateManager
+ */
+void DeckEditorDeckDockWidget::writeBannerCard(int index)
 {
-    emit requestDeckHistorySave(tr("Banner card changed"));
-    syncDeckListBannerCardWithComboBox();
-    deckEditor->setModified(true);
-    emit deckModified();
+    auto [name, id] = bannerCardComboBox->itemData(index).value<QPair<QString, QString>>();
+    CardRef bannerCard = {name, id};
+    deckStateManager->setBannerCard(bannerCard);
 }
 
-void DeckEditorDeckDockWidget::syncDeckListBannerCardWithComboBox()
+void DeckEditorDeckDockWidget::openPlaymatSettings()
 {
-    auto [name, id] = bannerCardComboBox->currentData().value<QPair<QString, QString>>();
-    deckModel->getDeckList()->setBannerCard({name, id});
+    PlaymatInfo current = deckStateManager->getMetadata().playmat;
+
+    PlaymatSettingsDialog dialog(current.card, current.params, this);
+    if (dialog.exec() == QDialog::Accepted) {
+        CardRef newCard = dialog.card();
+        PlaymatParams newParams = dialog.params();
+
+        if (newCard.isEmpty()) {
+            deckStateManager->setPlaymat(PlaymatInfo{});
+        } else {
+            deckStateManager->setPlaymat({newCard, newParams});
+        }
+
+        updatePlaymatLabel();
+    }
+}
+
+void DeckEditorDeckDockWidget::updatePlaymatLabel()
+{
+    CardRef playmat = deckStateManager->getMetadata().playmat.card;
+    if (playmat.isEmpty()) {
+        playmatSettingsButton->setText(tr("Edit Playmat..."));
+    } else {
+        playmatSettingsButton->setText(tr("Edit Playmat (%1)").arg(playmat.name));
+    }
+}
+
+void DeckEditorDeckDockWidget::applyActiveGroupCriteria()
+{
+    getModel()->setActiveGroupCriteria(
+        static_cast<DeckListModelGroupCriteria::Type>(activeGroupCriteriaComboBox->currentData(Qt::UserRole).toInt()));
+    getModel()->sort(deckView->header()->sortIndicatorSection(), deckView->header()->sortIndicatorOrder());
 }
 
 void DeckEditorDeckDockWidget::updateShowBannerCardComboBox(const bool visible)
@@ -402,7 +553,7 @@ void DeckEditorDeckDockWidget::updateShowTagsWidget(const bool visible)
 
 void DeckEditorDeckDockWidget::syncBannerCardComboBoxSelectionWithDeck()
 {
-    if (deckModel->getDeckList()->getBannerCard().name == "") {
+    if (deckStateManager->getMetadata().bannerCard.name == "") {
         if (bannerCardComboBox->findText("-") != -1) {
             bannerCardComboBox->setCurrentIndex(bannerCardComboBox->findText("-"));
         } else {
@@ -410,212 +561,231 @@ void DeckEditorDeckDockWidget::syncBannerCardComboBoxSelectionWithDeck()
             bannerCardComboBox->setCurrentIndex(0);
         }
     } else {
-        bannerCardComboBox->setCurrentText(deckModel->getDeckList()->getBannerCard().name);
+        bannerCardComboBox->setCurrentText(deckStateManager->getMetadata().bannerCard.name);
     }
 }
 
-/**
- * Sets the currently active deck for this tab
- * @param _deck The deck. Takes ownership of the object
- */
-void DeckEditorDeckDockWidget::setDeck(DeckLoader *_deck)
+void DeckEditorDeckDockWidget::setSelectedIndex(const QModelIndex &newCardIndex, bool preserveWidgetFocus)
 {
-    deckLoader = _deck;
-    deckLoader->setParent(this);
-    deckModel->setDeckList(deckLoader->getDeckList());
-    connect(deckLoader, &DeckLoader::deckLoaded, deckModel, &DeckListModel::rebuildTree);
+    const QModelIndex proxyIndex = proxy->mapFromSource(newCardIndex);
 
-    emit requestDeckHistoryClear();
-    historyManagerWidget->setDeckListModel(deckModel);
+    deckView->clearSelection();
+    deckView->setCurrentIndex(proxyIndex);
+    deckView->scrollTo(proxyIndex);
+    recursiveExpand(newCardIndex);
 
-    syncDisplayWidgetsToModel();
-
-    emit deckChanged();
+    if (!preserveWidgetFocus) {
+        deckView->setFocus(Qt::FocusReason::MouseFocusReason);
+    }
 }
 
 void DeckEditorDeckDockWidget::syncDisplayWidgetsToModel()
 {
     nameEdit->blockSignals(true);
-    nameEdit->setText(deckModel->getDeckList()->getName());
+    nameEdit->setText(deckStateManager->getMetadata().name);
     nameEdit->blockSignals(false);
 
     commentsEdit->blockSignals(true);
-    commentsEdit->setText(deckModel->getDeckList()->getComments());
+    commentsEdit->setText(deckStateManager->getMetadata().comments);
     commentsEdit->blockSignals(false);
 
     bannerCardComboBox->blockSignals(true);
     syncBannerCardComboBoxSelectionWithDeck();
     updateBannerCardComboBox();
     bannerCardComboBox->blockSignals(false);
+    updatePlaymatLabel();
     updateHash();
-    sortDeckModelToDeckView();
-    expandAll();
 
-    deckTagsDisplayWidget->setDeckList(deckModel->getDeckList());
-}
+    formatComboBox->blockSignals(true);
+    formatComboBox->setCurrentIndex(formatComboBox->findData(deckStateManager->getMetadata().gameFormat));
+    formatComboBox->blockSignals(false);
 
-void DeckEditorDeckDockWidget::sortDeckModelToDeckView()
-{
-    deckModel->sort(deckView->header()->sortIndicatorSection(), deckView->header()->sortIndicatorOrder());
-}
+    commanderBracketWidget->setDeck(deckStateManager->getDeckListShared());
 
-DeckLoader *DeckEditorDeckDockWidget::getDeckLoader()
-{
-    return deckLoader;
-}
-
-DeckList *DeckEditorDeckDockWidget::getDeckList()
-{
-    return deckModel->getDeckList();
+    deckTagsDisplayWidget->blockSignals(true);
+    deckTagsDisplayWidget->setTags(deckStateManager->getMetadata().tags);
+    deckTagsDisplayWidget->blockSignals(false);
 }
 
 /**
- * Resets the tab to the state for a blank new tab.
+ * @brief Convenience method to get the underlying model instance from the DeckStateManager
  */
-void DeckEditorDeckDockWidget::cleanDeck()
+DeckListModel *DeckEditorDeckDockWidget::getModel() const
 {
-    deckModel->cleanList();
-    nameEdit->setText(QString());
-    emit nameChanged();
-    commentsEdit->setText(QString());
-    emit commentsChanged();
-    hashLabel->setText(QString());
-    emit hashChanged();
-    emit deckModified();
-    emit deckChanged();
-    updateBannerCardComboBox();
-    deckTagsDisplayWidget->setDeckList(deckModel->getDeckList());
+    return deckStateManager->getModel();
 }
 
-void DeckEditorDeckDockWidget::recursiveExpand(const QModelIndex &index)
+void DeckEditorDeckDockWidget::selectPrevCard()
 {
-    if (index.parent().isValid())
-        recursiveExpand(index.parent());
-    deckView->expand(index);
+    changeSelectedCard(-1);
 }
 
+void DeckEditorDeckDockWidget::selectNextCard()
+{
+    changeSelectedCard(1);
+}
+
+/**
+ * @brief Selects a card based on the change direction.
+ *
+ * @param changeBy The direction to change, -1 for previous, 1 for next.
+ */
+void DeckEditorDeckDockWidget::changeSelectedCard(int changeBy)
+{
+    if (changeBy == 0) {
+        return;
+    }
+
+    // Get the current index of the selected item
+    auto deckViewCurrentIndex = deckView->currentIndex();
+
+    // For some reason, if the deckModel is modified but the view is not manually reselected,
+    // currentIndex will return an index for the underlying deckModel instead of the proxy.
+    // That index will return an invalid index when indexBelow/indexAbove crosses a header node,
+    // causing the selection to fail to move down.
+    //! \todo Figure out why it's happening so we can do a proper fix instead of a hacky workaround.
+    if (deckViewCurrentIndex.model() == proxy->sourceModel()) {
+        deckViewCurrentIndex = proxy->mapFromSource(deckViewCurrentIndex);
+    }
+
+    auto nextIndex = deckViewCurrentIndex.siblingAtRow(deckViewCurrentIndex.row() + changeBy);
+    if (!nextIndex.isValid()) {
+        nextIndex = deckViewCurrentIndex;
+
+        // Increment to the next valid index, skipping header rows
+        AbstractDecklistNode *node;
+        do {
+            if (changeBy > 0) {
+                nextIndex = deckView->indexBelow(nextIndex);
+            } else {
+                nextIndex = deckView->indexAbove(nextIndex);
+            }
+            node = static_cast<AbstractDecklistNode *>(nextIndex.internalPointer());
+        } while (node && node->isDeckHeader());
+    }
+
+    if (nextIndex.isValid()) {
+        deckView->setCurrentIndex(nextIndex);
+        deckView->setFocus(Qt::FocusReason::MouseFocusReason);
+    }
+}
+
+/**
+ * @brief Expands all parents of the given index.
+ * @param sourceIndex The index to expand (model source index)
+ */
+void DeckEditorDeckDockWidget::recursiveExpand(const QModelIndex &sourceIndex)
+{
+    auto index = proxy->mapFromSource(sourceIndex);
+
+    while (index.parent().isValid()) {
+        index = index.parent();
+        deckView->expand(index);
+    }
+}
+
+/**
+ * @brief Fully expands all levels of the deck view
+ */
 void DeckEditorDeckDockWidget::expandAll()
 {
-    deckView->expandAll();
-    deckView->expandAll();
+    deckView->expandRecursively(deckView->rootIndex());
 }
 
 /**
- * Gets the index of all the currently selected card nodes in the decklist table.
+ * Gets the source index of all the currently selected card nodes in the decklist table.
  * The list is in reverse order of the visual selection, so that rows can be deleted while iterating over them.
  *
- * @return A model index list containing all selected card nodes
+ * @return A list containing the source indices of all selected card nodes
  */
-QModelIndexList DeckEditorDeckDockWidget::getSelectedCardNodes() const
+QModelIndexList DeckEditorDeckDockWidget::getSelectedCardNodeSourceIndices() const
 {
     auto selectedRows = deckView->selectionModel()->selectedRows();
 
-    const auto notLeafNode = [this](const QModelIndex &index) {
-        return deckModel->hasChildren(proxy->mapToSource(index));
-    };
+    const auto mapToSource = [this](const QModelIndex &index) { return proxy->mapToSource(index); };
+    std::transform(selectedRows.begin(), selectedRows.end(), selectedRows.begin(), mapToSource);
+
+    const auto notLeafNode = [this](const QModelIndex &sourceIndex) { return getModel()->hasChildren(sourceIndex); };
     selectedRows.erase(std::remove_if(selectedRows.begin(), selectedRows.end(), notLeafNode), selectedRows.end());
 
     std::reverse(selectedRows.begin(), selectedRows.end());
     return selectedRows;
 }
 
-void DeckEditorDeckDockWidget::actIncrement()
+void DeckEditorDeckDockWidget::actAddCard(const ExactCard &card, const QString &zoneName)
 {
-    auto selectedRows = getSelectedCardNodes();
+    if (!card) {
+        return;
+    }
 
-    for (const auto &index : selectedRows) {
-        offsetCountAtIndex(index, 1);
+    deckStateManager->addCard(card, zoneName);
+}
+
+void DeckEditorDeckDockWidget::actIncrementSelection()
+{
+    auto selectedRows = getSelectedCardNodeSourceIndices();
+
+    for (const auto &sourceIndex : selectedRows) {
+        offsetCountAtIndex(sourceIndex, true);
     }
 }
 
-void DeckEditorDeckDockWidget::actSwapCard()
+void DeckEditorDeckDockWidget::actSwapCard(const ExactCard &card, const QString &zoneName)
 {
-    auto selectedRows = getSelectedCardNodes();
+    QString providerId = card.getPrinting().getUuid();
+    QString collectorNumber = card.getPrinting().getProperty("num");
 
-    // hack to maintain the old reselection behavior when currently selected row of a single-selection gets deleted
-    // TODO: remove the hack and also handle reselection when all rows of a multi-selection gets deleted
+    QModelIndex foundCard = getModel()->findCard(card.getName(), zoneName, providerId, collectorNumber);
+    if (!foundCard.isValid()) {
+        foundCard = getModel()->findCard(card.getName(), zoneName);
+    }
+
+    deckStateManager->swapCardAtIndex(foundCard);
+}
+
+void DeckEditorDeckDockWidget::actSwapSelection()
+{
+    auto selectedRows = getSelectedCardNodeSourceIndices();
+
+    //! \todo Remove the hack and also handle reselection when all rows of a multi-selection gets deleted.
+    // Hack: maintains old reselection behavior when single-selection row is deleted.
     if (selectedRows.length() == 1) {
         deckView->setSelectionMode(QAbstractItemView::SingleSelection);
     }
 
-    bool isModified = false;
-    for (const auto &currentIndex : selectedRows) {
-        if (swapCard(currentIndex)) {
-            isModified = true;
-        }
+    for (const auto &sourceIndex : selectedRows) {
+        deckStateManager->swapCardAtIndex(sourceIndex);
     }
 
     deckView->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
-    if (isModified) {
-        emit deckModified();
-    }
-
     update();
 }
 
-/**
- * Swaps the card at the index between the maindeck and sideboard
- *
- * @param currentIndex The index to swap.
- * @return True if the swap was successful
- */
-bool DeckEditorDeckDockWidget::swapCard(const QModelIndex &currentIndex)
-{
-    if (!currentIndex.isValid())
-        return false;
-    const QString cardName = currentIndex.sibling(currentIndex.row(), 1).data().toString();
-    const QString cardProviderID = currentIndex.sibling(currentIndex.row(), 4).data().toString();
-    const QModelIndex gparent = currentIndex.parent().parent();
-
-    if (!gparent.isValid())
-        return false;
-
-    const QString zoneName = gparent.sibling(gparent.row(), 1).data(Qt::EditRole).toString();
-    offsetCountAtIndex(currentIndex, -1);
-    const QString otherZoneName = zoneName == DECK_ZONE_MAIN ? DECK_ZONE_SIDE : DECK_ZONE_MAIN;
-
-    ExactCard card = CardDatabaseManager::query()->getCard({cardName, cardProviderID});
-    QModelIndex newCardIndex = card ? deckModel->addCard(card, otherZoneName)
-                                    // Third argument (true) says create the card no matter what, even if not in DB
-                                    : deckModel->addPreferredPrintingCard(cardName, otherZoneName, true);
-    recursiveExpand(proxy->mapToSource(newCardIndex));
-
-    return true;
-}
-
 void DeckEditorDeckDockWidget::actDecrementCard(const ExactCard &card, QString zoneName)
 {
-    if (!card)
-        return;
-    if (card.getInfo().getIsToken())
-        zoneName = DECK_ZONE_TOKENS;
-
-    QString providerId = card.getPrinting().getUuid();
-    QString collectorNumber = card.getPrinting().getProperty("num");
-
-    QModelIndex idx = deckModel->findCard(card.getName(), zoneName, providerId, collectorNumber);
-    if (!idx.isValid()) {
+    if (!card) {
         return;
     }
+    if (card.getInfo().getIsToken()) {
+        zoneName = DECK_ZONE_TOKENS;
+    }
 
-    deckView->clearSelection();
-    deckView->setCurrentIndex(proxy->mapToSource(idx));
-    offsetCountAtIndex(idx, -1);
+    deckStateManager->decrementCard(card, zoneName);
 }
 
 void DeckEditorDeckDockWidget::actDecrementSelection()
 {
-    auto selectedRows = getSelectedCardNodes();
+    auto selectedRows = getSelectedCardNodeSourceIndices();
 
-    // hack to maintain the old reselection behavior when currently selected row of a single-selection gets deleted
-    // TODO: remove the hack and also handle reselection when all rows of a multi-selection gets deleted
+    //! \todo Remove the hack and also handle reselection when all rows of a multi-selection gets deleted.
+    // Hack: maintains old reselection behavior when single-selection row is deleted.
     if (selectedRows.length() == 1) {
         deckView->setSelectionMode(QAbstractItemView::SingleSelection);
     }
 
-    for (const auto &index : selectedRows) {
-        offsetCountAtIndex(index, -1);
+    for (const auto &sourceIndex : selectedRows) {
+        offsetCountAtIndex(sourceIndex, false);
     }
 
     deckView->setSelectionMode(QAbstractItemView::ExtendedSelection);
@@ -623,78 +793,246 @@ void DeckEditorDeckDockWidget::actDecrementSelection()
 
 void DeckEditorDeckDockWidget::actRemoveCard()
 {
-    auto selectedRows = getSelectedCardNodes();
+    auto selectedRows = getSelectedCardNodeSourceIndices();
 
-    // hack to maintain the old reselection behavior when currently selected row of a single-selection gets deleted
-    // TODO: remove the hack and also handle reselection when all rows of a multi-selection gets deleted
+    //! \todo Remove the hack and also handle reselection when all rows of a multi-selection gets deleted.
+    // Hack: maintains old reselection behavior when single-selection row is deleted.
     if (selectedRows.length() == 1) {
         deckView->setSelectionMode(QAbstractItemView::SingleSelection);
     }
 
-    bool isModified = false;
-    for (const auto &index : selectedRows) {
-        if (!index.isValid() || deckModel->hasChildren(index)) {
-            continue;
-        }
-        QModelIndex sourceIndex = proxy->mapToSource(index);
-        QString cardName = sourceIndex.sibling(sourceIndex.row(), 1).data().toString();
-
-        emit requestDeckHistorySave(QString(tr("Removed \"%1\" (all copies)")).arg(cardName));
-
-        deckModel->removeRow(sourceIndex.row(), sourceIndex.parent());
-        isModified = true;
+    for (const auto &sourceIndex : selectedRows) {
+        deckStateManager->removeCardAtIndex(sourceIndex);
     }
 
     deckView->setSelectionMode(QAbstractItemView::ExtendedSelection);
-
-    if (isModified) {
-        emit deckModified();
-    }
 }
 
-void DeckEditorDeckDockWidget::offsetCountAtIndex(const QModelIndex &idx, int offset)
+/**
+ * @brief Increments or decrements the amount of the card node at the index by 1.
+ * @param idx The source index
+ * @param isIncrement If true, increments the count. If false, decrements the count
+ */
+void DeckEditorDeckDockWidget::offsetCountAtIndex(const QModelIndex &idx, bool isIncrement)
 {
-    if (!idx.isValid() || deckModel->hasChildren(idx)) {
+    if (!idx.isValid() || getModel()->hasChildren(idx)) {
         return;
     }
 
-    QModelIndex sourceIndex = proxy->mapToSource(idx);
-
-    const QModelIndex numberIndex = sourceIndex.sibling(sourceIndex.row(), 0);
-    const QModelIndex nameIndex = sourceIndex.sibling(sourceIndex.row(), 1);
-
-    const QString cardName = deckModel->data(nameIndex, Qt::EditRole).toString();
-    const int count = deckModel->data(numberIndex, Qt::EditRole).toInt();
-    const int new_count = count + offset;
-
-    const auto reason =
-        QString(tr("%1 %2 × \"%3\" (%4)"))
-            .arg(offset > 0 ? tr("Added") : tr("Removed"))
-            .arg(qAbs(offset))
-            .arg(cardName)
-            .arg(deckModel->data(sourceIndex.sibling(sourceIndex.row(), 4), Qt::DisplayRole).toString());
-
-    emit requestDeckHistorySave(reason);
-
-    if (new_count <= 0) {
-        deckModel->removeRow(sourceIndex.row(), sourceIndex.parent());
+    if (isIncrement) {
+        deckStateManager->incrementCountAtIndex(idx);
     } else {
-        deckModel->setData(numberIndex, new_count, Qt::EditRole);
+        deckStateManager->decrementCountAtIndex(idx);
     }
-
-    emit deckModified();
 }
 
 void DeckEditorDeckDockWidget::decklistCustomMenu(QPoint point)
 {
-    if (!SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) {
-        QMenu menu;
+    const QModelIndex sourceIndex = proxy->mapToSource(deckView->indexAt(point));
 
-        QAction *selectPrinting = menu.addAction(tr("Select Printing"));
-        connect(selectPrinting, &QAction::triggered, deckEditor, &AbstractTabDeckEditor::showPrintingSelector);
+    QMenu menu;
 
-        menu.exec(deckView->mapToGlobal(point));
+    const bool isCustomZoneRow = sourceIndex.isValid() && sourceIndex.data(DeckRoles::IsCustomZoneRole).toBool();
+    const bool isBoardZoneRow = sourceIndex.isValid() && !isCustomZoneRow && !sourceIndex.parent().isValid();
+    const bool isCardRow =
+        sourceIndex.isValid() && !isCustomZoneRow && !isBoardZoneRow && !getModel()->hasChildren(sourceIndex);
+
+    // Walk the row up to its top-level node to find the hosting board. Cards in
+    // the tokens board cannot be moved (moveCardToZone bails for it), so the
+    // move menu is skipped for them.
+    QString currentBoardName;
+    QModelIndex board = sourceIndex.parent();
+    while (board.isValid() && board.parent().isValid()) {
+        board = board.parent();
     }
+    if (board.isValid()) {
+        currentBoardName = board.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+    }
+
+    if (isCardRow) {
+        if (currentBoardName != DECK_ZONE_TOKENS) {
+            addMoveToZoneMenu(&menu, sourceIndex, currentBoardName);
+            menu.addSeparator();
+        }
+    } else if (isCustomZoneRow) {
+        const QString zoneName =
+            sourceIndex.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+
+        QAction *renameAction = menu.addAction(tr("&Rename zone..."));
+        connect(renameAction, &QAction::triggered, this, [this, zoneName] {
+            // The unchanged name must not validate as a duplicate.
+            const QString newName =
+                DeckZoneDialog::promptForRename(this, zoneName, [this, zoneName](const QString &candidate) {
+                    return candidate == zoneName ? QString() : deckStateManager->validateNewZoneName(candidate);
+                });
+            if (!newName.isEmpty() && newName != zoneName) {
+                deckStateManager->renameCustomZone(zoneName, newName);
+            }
+        });
+
+        QMenu *boardMenu = menu.addMenu(tr("Change &board"));
+        addChangeBoardMenu(boardMenu, zoneName);
+
+        QAction *deleteAction = menu.addAction(tr("&Delete zone"));
+        const bool zoneHasCards = getModel()->hasChildren(sourceIndex);
+        deleteAction->setEnabled(!zoneHasCards);
+        if (zoneHasCards) {
+            deleteAction->setToolTip(tr("Move or remove all cards first."));
+            menu.setToolTipsVisible(true);
+        }
+        connect(deleteAction, &QAction::triggered, this, [this, zoneName] {
+            const auto result =
+                QMessageBox::warning(this, tr("Delete zone"), tr("Delete the zone \"%1\"?").arg(zoneName),
+                                     QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+            if (result == QMessageBox::Yes) {
+                deckStateManager->removeCustomZone(zoneName);
+            }
+        });
+        menu.addSeparator();
+    } else if (isBoardZoneRow) {
+        const QString boardName =
+            sourceIndex.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+        // Tokens cannot host custom zones, so only offer the action on real boards.
+        const bool canHostCustomZones =
+            boardName == DECK_ZONE_MAIN || boardName == DECK_ZONE_SIDE || boardName == DECK_ZONE_MAYBEBOARD;
+        if (canHostCustomZones) {
+            addNewZoneAction(&menu, boardName);
+            menu.addSeparator();
+        }
+    } else if (!sourceIndex.isValid()) {
+        addNewZoneAction(&menu);
+        menu.addSeparator();
+    }
+
+    QAction *selectPrinting = menu.addAction(tr("Select Printing"));
+    connect(selectPrinting, &QAction::triggered, deckEditor, &AbstractTabDeckEditor::showPrintingSelector);
+
+    menu.exec(deckView->mapToGlobal(point));
+}
+
+void DeckEditorDeckDockWidget::addMoveToZoneMenu(QMenu *menu,
+                                                 const QModelIndex &sourceCardIndex,
+                                                 const QString &currentBoardName)
+{
+    // The card's current *zone*, derived with the same ancestor walk as
+    // DeckStateManager::moveCardToZone (nearest custom-zone ancestor, else the
+    // top-level board/zone): a card inside "Removal" under the maindeck lives in
+    // "Removal", not "main". Comparing against that instead of the board keeps
+    // the enabled state and the same-zone no-op consistent with the move logic.
+    QString currentZoneName;
+    for (QModelIndex ancestor = sourceCardIndex.parent(); ancestor.isValid(); ancestor = ancestor.parent()) {
+        if (ancestor.data(DeckRoles::IsCustomZoneRole).toBool() || !ancestor.parent().isValid()) {
+            currentZoneName = ancestor.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+            break;
+        }
+    }
+
+    const auto addMoveAction = [this, sourceCardIndex](QMenu *targetMenu, const QString &targetZoneName,
+                                                       const QString &label, bool enabled) {
+        QAction *action = targetMenu->addAction(label);
+        action->setEnabled(enabled);
+        if (enabled) {
+            connect(action, &QAction::triggered, this, [this, sourceCardIndex, targetZoneName] {
+                deckStateManager->moveCardToZone(sourceCardIndex, targetZoneName);
+            });
+        }
+    };
+
+    const auto tree = deckStateManager->getDeckListShared()->getTree();
+
+    QMenu *moveMenu = menu->addMenu(tr("Move to &zone"));
+
+    for (const QString &boardName : InnerDecklistNode::boardZoneNames()) {
+        const QString boardLabel = InnerDecklistNode::visibleNameFromName(boardName);
+        const auto customZones = tree->getCustomZones(boardName);
+
+        // Boards with zones nest their children so no two menu entries share a
+        // visible name: "Maindeck ▸ { Maindeck (whole board), Removal, … }".
+        // The board the card already lives on is marked instead of offered.
+        if (!customZones.isEmpty()) {
+            QMenu *boardSubmenu = moveMenu->addMenu(boardLabel);
+            addMoveAction(boardSubmenu, boardName, boardLabel, boardName != currentZoneName);
+            for (const auto *customZone : customZones) {
+                addMoveAction(boardSubmenu, customZone->getName(), customZone->getName(),
+                              customZone->getName() != currentZoneName);
+            }
+        } else {
+            addMoveAction(moveMenu, boardName, boardLabel, boardName != currentZoneName);
+        }
+    }
+
+    moveMenu->addSeparator();
+
+    QAction *newZoneAction = moveMenu->addAction(tr("Create new zone and move &here..."));
+    connect(newZoneAction, &QAction::triggered, this, [this, sourceCardIndex, currentBoardName, currentZoneName] {
+        // Resolve the card's identity before creating the zone:
+        // createNewCustomZone rebuilds the model tree, so sourceCardIndex's
+        // internal pointer is freed by the time it would be used.
+        const QString cardName =
+            sourceCardIndex.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+        const QString providerId =
+            sourceCardIndex.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data(Qt::DisplayRole).toString();
+        const QString collectorNumber = sourceCardIndex.siblingAtColumn(DeckListModelColumns::CARD_COLLECTOR_NUMBER)
+                                            .data(Qt::DisplayRole)
+                                            .toString();
+
+        const QString zoneName = createNewCustomZone(currentBoardName);
+        if (!zoneName.isEmpty()) {
+            // Re-find the card: the old index is no longer safe since rows were
+            // rebuilt. Mirror DeckStateManager::decrementCard's re-find pattern.
+            const QModelIndex refreshed = getModel()->findCard(cardName, currentZoneName, providerId, collectorNumber);
+            if (refreshed.isValid()) {
+                deckStateManager->moveCardToZone(refreshed, zoneName);
+            }
+        }
+    });
+}
+
+void DeckEditorDeckDockWidget::addChangeBoardMenu(QMenu *menu, const QString &zoneName)
+{
+    const auto tree = deckStateManager->getDeckListShared()->getTree();
+    for (const QString &boardName : InnerDecklistNode::boardZoneNames()) {
+        QAction *action = menu->addAction(InnerDecklistNode::visibleNameFromName(boardName));
+
+        // The board currently holding the zone is marked instead of offered.
+        // Duplicate names cannot come up through the editor, so this doubles as
+        // the uniqueness guard for imported decks.
+        bool holdsTheZone = false;
+        for (const auto *customZone : tree->getCustomZones(boardName)) {
+            if (customZone->getName() == zoneName) {
+                holdsTheZone = true;
+                break;
+            }
+        }
+        if (holdsTheZone) {
+            action->setCheckable(true);
+            action->setChecked(true);
+            continue;
+        }
+
+        connect(action, &QAction::triggered, this,
+                [this, zoneName, boardName] { deckStateManager->moveCustomZone(zoneName, boardName); });
+    }
+}
+
+void DeckEditorDeckDockWidget::addNewZoneAction(QMenu *menu, const QString &initialBoardName)
+{
+    QAction *newZoneAction = menu->addAction(tr("Create &new zone..."));
+    connect(newZoneAction, &QAction::triggered, this,
+            [this, initialBoardName] { createNewCustomZone(initialBoardName); });
+}
+
+QString DeckEditorDeckDockWidget::createNewCustomZone(const QString &initialBoardName)
+{
+    QString boardName;
+    const QString zoneName =
+        DeckZoneDialog::promptForNewZone(this, initialBoardName, &boardName, [this](const QString &candidate) {
+            return deckStateManager->validateNewZoneName(candidate);
+        });
+    if (!zoneName.isEmpty()) {
+        deckStateManager->createCustomZone(boardName, zoneName);
+    }
+    return zoneName;
 }
 
 void DeckEditorDeckDockWidget::refreshShortcuts()
@@ -715,10 +1053,13 @@ void DeckEditorDeckDockWidget::retranslateUi()
     showTagsWidgetCheckBox->setText(tr("Show tags selection menu"));
     commentsLabel->setText(tr("&Comments:"));
     activeGroupCriteriaLabel->setText(tr("Group by:"));
+    formatLabel->setText(tr("Format:"));
+    commanderBracketWidget->retranslateUi();
+
     hashLabel1->setText(tr("Hash:"));
 
     aIncrement->setText(tr("&Increment number"));
     aDecrement->setText(tr("&Decrement number"));
     aRemoveCard->setText(tr("&Remove row"));
     aSwapCard->setText(tr("Swap card to/from sideboard"));
-}
\ No newline at end of file
+}
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 37891072d..97ab8823e 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,42 +8,51 @@
 #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 "../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 "libcockatrice/card/printing/exact_card.h"
 
 #include <QDockWidget>
-#include <QLabel>
-#include <QTextEdit>
+#include <QModelIndexList>
+#include <QString>
 #include <QTreeView>
-#include <libcockatrice/card/card_info.h>
+#include <qtmetamacros.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
 public:
     explicit DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent);
-    DeckLoader *deckLoader;
+
     DeckListStyleProxy *proxy;
-    DeckListModel *deckModel;
     QTreeView *deckView;
     QComboBox *bannerCardComboBox;
+    QLabel *playmatLabel;
+    QPushButton *playmatSettingsButton;
     void createDeckDock();
     ExactCard getCurrentCard();
     void retranslateUi();
-    QString getDeckName()
-    {
-        return nameEdit->text();
-    }
-    QString getSimpleDeckName()
-    {
-        return nameEdit->text().simplified();
-    }
+
     QComboBox *getGroupByComboBox()
     {
         return activeGroupCriteriaComboBox;
@@ -55,34 +64,26 @@ public:
     }
 
 public slots:
-    void cleanDeck();
+    void selectPrevCard();
+    void selectNextCard();
     void updateBannerCardComboBox();
-    void setDeck(DeckLoader *_deck);
     void syncDisplayWidgetsToModel();
-    void sortDeckModelToDeckView();
-    DeckLoader *getDeckLoader();
-    DeckList *getDeckList();
-    void actIncrement();
-    bool swapCard(const QModelIndex &idx);
+    void actAddCard(const ExactCard &card, const QString &zoneName);
+    void actIncrementSelection();
     void actDecrementCard(const ExactCard &card, QString zoneName);
     void actDecrementSelection();
-    void actSwapCard();
+    void actSwapCard(const ExactCard &card, const QString &zoneName);
+    void actSwapSelection();
     void actRemoveCard();
-    void offsetCountAtIndex(const QModelIndex &idx, int offset);
-    void expandAll();
+    void initializeFormats();
 
 signals:
-    void nameChanged();
-    void commentsChanged();
-    void hashChanged();
-    void deckChanged();
-    void deckModified();
-    void requestDeckHistorySave(const QString &modificationReason);
-    void requestDeckHistoryClear();
-    void cardChanged(const ExactCard &_card);
+    void selectedCardChanged(const ExactCard &card);
 
 private:
     AbstractTabDeckEditor *deckEditor;
+    DeckStateManager *deckStateManager;
+
     DeckListHistoryManagerWidget *historyManagerWidget;
     KeySignals deckViewKeySignals;
     QLabel *nameLabel;
@@ -100,24 +101,40 @@ private:
     LineEditUnfocusable *hashLabel;
     QLabel *activeGroupCriteriaLabel;
     QComboBox *activeGroupCriteriaComboBox;
+    QLabel *formatLabel;
+    QComboBox *formatComboBox;
 
     QAction *aRemoveCard, *aIncrement, *aDecrement, *aSwapCard;
 
-    void recursiveExpand(const QModelIndex &index);
-    [[nodiscard]] QModelIndexList getSelectedCardNodes() const;
+    CommanderBracketWidget *commanderBracketWidget;
+
+    DeckListModel *getModel() const;
+    [[nodiscard]] QModelIndexList getSelectedCardNodeSourceIndices() const;
+    void offsetCountAtIndex(const QModelIndex &idx, bool isIncrement);
+
+    void addMoveToZoneMenu(QMenu *menu, const QModelIndex &sourceCardIndex, const QString &currentBoardName);
+    void addChangeBoardMenu(QMenu *menu, const QString &zoneName);
+    QString createNewCustomZone(const QString &initialBoardName = {});
+    void addNewZoneAction(QMenu *menu, const QString &initialBoardName = {});
 
 private slots:
     void decklistCustomMenu(QPoint point);
     void updateCard(QModelIndex, const QModelIndex &current);
-    void updateName(const QString &name);
-    void updateComments();
-    void setBannerCard(int);
-    void syncDeckListBannerCardWithComboBox();
+    void writeName();
+    void writeComments();
+    void writeBannerCard(int);
+    void openPlaymatSettings();
+    void updatePlaymatLabel();
+    void applyActiveGroupCriteria();
+    void setSelectedIndex(const QModelIndex &newCardIndex, bool preserveWidgetFocus);
     void updateHash();
     void refreshShortcuts();
     void updateShowBannerCardComboBox(bool visible);
     void updateShowTagsWidget(bool visible);
     void syncBannerCardComboBoxSelectionWithDeck();
+    void changeSelectedCard(int changeBy);
+    void recursiveExpand(const QModelIndex &parent);
+    void expandAll();
 };
 
 #endif // DECK_EDITOR_DECK_DOCK_WIDGET_H
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 5790131c5..0a47333fa 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
@@ -1,12 +1,34 @@
 #include "deck_editor_filter_dock_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#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)
@@ -41,11 +63,11 @@ void DeckEditorFilterDockWidget::createFiltersDock()
     connect(filterBuilder, &FilterBuilder::add, filterModel, &FilterTreeModel::addFilter);
 
     aClearFilterOne = new QAction(QString(), this);
-    aClearFilterOne->setIcon(QPixmap("theme:icons/decrement"));
+    aClearFilterOne->setIcon(themePixmap(QStringLiteral("icons/decrement")));
     connect(aClearFilterOne, &QAction::triggered, this, &DeckEditorFilterDockWidget::actClearFilterOne);
 
     aClearFilterAll = new QAction(QString(), this);
-    aClearFilterAll->setIcon(QPixmap("theme:icons/clearsearch"));
+    aClearFilterAll->setIcon(themePixmap(QStringLiteral("icons/clearsearch")));
     connect(aClearFilterAll, &QAction::triggered, this, &DeckEditorFilterDockWidget::actClearFilterAll);
 
     auto *filterDelOne = new QToolButton();
@@ -80,7 +102,6 @@ void DeckEditorFilterDockWidget::createFiltersDock()
     setWidget(filterDockContents);
 
     installEventFilter(deckEditor);
-    connect(this, &QDockWidget::topLevelChanged, deckEditor, &AbstractTabDeckEditor::dockTopLevelChanged);
 }
 
 void DeckEditorFilterDockWidget::filterViewCustomContextMenu(const QPoint &point)
@@ -90,8 +111,9 @@ void DeckEditorFilterDockWidget::filterViewCustomContextMenu(const QPoint &point
     QModelIndex idx;
 
     idx = filterView->indexAt(point);
-    if (!idx.isValid())
+    if (!idx.isValid()) {
         return;
+    }
 
     action = menu.addAction(QString("delete"));
     action->setData(point);
@@ -106,8 +128,9 @@ void DeckEditorFilterDockWidget::filterRemove(const QAction *action)
 
     point = action->data().toPoint();
     idx = filterView->indexAt(point);
-    if (!idx.isValid())
+    if (!idx.isValid()) {
         return;
+    }
 
     filterModel->removeRow(idx.row(), idx.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 b61fc72b5..7bb9c0045 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,13 +8,18 @@
 #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 0c068e043..d45e951ba 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
@@ -1,8 +1,16 @@
 #include "deck_editor_printing_selector_dock_widget.h"
 
+#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)
@@ -14,6 +22,12 @@ DeckEditorPrintingSelectorDockWidget::DeckEditorPrintingSelectorDockWidget(Abstr
     setFloating(false);
 
     createPrintingSelectorDock();
+    printingDisabledInfoWidget = new PrintingDisabledInfoWidget(this);
+
+    setVisibleWidget(SettingsCache::instance().cardsDisplay().getOverrideAllCardArtWithPersonalPreference());
+    connect(&SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::overrideAllCardArtWithPersonalPreferenceChanged, this,
+            &DeckEditorPrintingSelectorDockWidget::setVisibleWidget);
 
     retranslateUi();
 }
@@ -26,16 +40,31 @@ void DeckEditorPrintingSelectorDockWidget::createPrintingSelectorDock()
     printingSelectorFrame->setObjectName("printingSelectorFrame");
     printingSelectorFrame->addWidget(printingSelector);
 
-    auto *printingSelectorDockContents = new QWidget();
+    printingSelectorDockContents = new QWidget();
     printingSelectorDockContents->setObjectName("printingSelectorDockContents");
     printingSelectorDockContents->setLayout(printingSelectorFrame);
-    setWidget(printingSelectorDockContents);
 
     installEventFilter(deckEditor);
-    connect(this, &QDockWidget::topLevelChanged, deckEditor, &AbstractTabDeckEditor::dockTopLevelChanged);
+    connect(printingSelector, &PrintingSelector::prevCardRequested, deckEditor->getDeckDockWidget(),
+            &DeckEditorDeckDockWidget::selectPrevCard);
+    connect(printingSelector, &PrintingSelector::nextCardRequested, deckEditor->getDeckDockWidget(),
+            &DeckEditorDeckDockWidget::selectNextCard);
 }
 
 void DeckEditorPrintingSelectorDockWidget::retranslateUi()
 {
     setWindowTitle(tr("Printing Selector"));
 }
+
+void DeckEditorPrintingSelectorDockWidget::setVisibleWidget(bool overridePrintings)
+{
+    if (overridePrintings) {
+        setWidget(printingDisabledInfoWidget);
+    } else {
+        setWidget(printingSelectorDockContents);
+        printingSelector->updateDisplay();
+    }
+
+    printingDisabledInfoWidget->setVisible(overridePrintings);
+    printingSelectorDockContents->setVisible(!overridePrintings);
+}
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 d7836a938..e20ae932d 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,12 +7,14 @@
 #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
 {
     Q_OBJECT
@@ -20,10 +22,16 @@ public:
     explicit DeckEditorPrintingSelectorDockWidget(AbstractTabDeckEditor *parent);
     void createPrintingSelectorDock();
     void retranslateUi();
+
     PrintingSelector *printingSelector;
 
 private:
     AbstractTabDeckEditor *deckEditor;
+    QWidget *printingSelectorDockContents;
+    PrintingDisabledInfoWidget *printingDisabledInfoWidget;
+
+private slots:
+    void setVisibleWidget(bool overridePrintings);
 };
 
 #endif // DECK_EDITOR_PRINTING_SELECTOR_DOCK_WIDGET_H
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 c68934ea6..209dc7273 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,15 +1,38 @@
 #include "deck_list_history_manager_widget.h"
 
-DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckListModel *_deckListModel,
+#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,
-                                                           DeckListHistoryManager *manager,
                                                            QWidget *parent)
-    : QWidget(parent), deckListModel(_deckListModel), styleProxy(_styleProxy), historyManager(manager)
+    : QWidget(parent), deckStateManager(_deckStateManager), styleProxy(_styleProxy)
 {
     layout = new QHBoxLayout(this);
 
     aUndo = new QAction(QString(), this);
-    aUndo->setIcon(QPixmap("theme:icons/arrow_undo"));
+    aUndo->setIcon(themePixmap(QStringLiteral("icons/arrow_undo")));
     aUndo->setShortcut(QKeySequence::Undo);
     aUndo->setShortcutContext(Qt::ApplicationShortcut);
     connect(aUndo, &QAction::triggered, this, &DeckListHistoryManagerWidget::doUndo);
@@ -18,7 +41,7 @@ DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckListModel *_deckL
     undoButton->setDefaultAction(aUndo);
 
     aRedo = new QAction(QString(), this);
-    aRedo->setIcon(QPixmap("theme:icons/arrow_redo"));
+    aRedo->setIcon(themePixmap(QStringLiteral("icons/arrow_redo")));
     aRedo->setShortcut(QKeySequence::Redo);
     aRedo->setShortcutContext(Qt::ApplicationShortcut);
     connect(aRedo, &QAction::triggered, this, &DeckListHistoryManagerWidget::doRedo);
@@ -30,11 +53,12 @@ DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckListModel *_deckL
     layout->addWidget(redoButton);
 
     historyButton = new SettingsButtonWidget(this);
-    historyButton->setButtonIcon(QPixmap("theme:icons/arrow_history"));
+    historyButton->setButtonIcon(themePixmap(QStringLiteral("icons/arrow_history")));
 
     historyLabel = new QLabel(this);
 
     historyList = new QListWidget(this);
+    historyList->setAlternatingRowColors(true);
 
     historyButton->addSettingsWidget(historyLabel);
     historyButton->addSettingsWidget(historyList);
@@ -43,8 +67,7 @@ DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckListModel *_deckL
 
     connect(historyList, &QListWidget::itemClicked, this, &DeckListHistoryManagerWidget::onListClicked);
 
-    connect(historyManager, &DeckListHistoryManager::undoRedoStateChanged, this,
-            &DeckListHistoryManagerWidget::refreshList);
+    connect(deckStateManager, &DeckStateManager::historyChanged, this, &DeckListHistoryManagerWidget::refreshList);
 
     refreshList();
     retranslateUi();
@@ -58,15 +81,12 @@ void DeckListHistoryManagerWidget::retranslateUi()
     historyLabel->setText(tr("Click on an entry to revert to that point in the history."));
 }
 
-void DeckListHistoryManagerWidget::setDeckListModel(DeckListModel *_deckListModel)
-{
-    deckListModel = _deckListModel;
-}
-
 void DeckListHistoryManagerWidget::refreshList()
 {
     historyList->clear();
 
+    DeckListHistoryManager *historyManager = deckStateManager->getHistoryManager();
+
     // Fill redo section first (oldest redo at top, newest redo closest to divider)
     const auto redoStack = historyManager->getRedoStack();
     for (int i = 0; i < redoStack.size(); ++i) { // iterate forward
@@ -98,36 +118,7 @@ void DeckListHistoryManagerWidget::refreshList()
     redoButton->setEnabled(historyManager->canRedo());
 }
 
-void DeckListHistoryManagerWidget::doUndo()
-{
-    if (!historyManager->canUndo()) {
-        return;
-    }
-
-    historyManager->undo(deckListModel->getDeckList());
-    deckListModel->rebuildTree();
-    emit deckListModel->layoutChanged();
-    emit requestDisplayWidgetSync();
-
-    refreshList();
-}
-
-void DeckListHistoryManagerWidget::doRedo()
-{
-    if (!historyManager->canRedo()) {
-        return;
-    }
-
-    historyManager->redo(deckListModel->getDeckList());
-    deckListModel->rebuildTree();
-
-    emit deckListModel->layoutChanged();
-    emit requestDisplayWidgetSync();
-
-    refreshList();
-}
-
-void DeckListHistoryManagerWidget::onListClicked(QListWidgetItem *item)
+void DeckListHistoryManagerWidget::onListClicked(const QListWidgetItem *item)
 {
     // Ignore non-selectable items (like divider)
     if (!(item->flags() & Qt::ItemIsSelectable)) {
@@ -138,23 +129,24 @@ void DeckListHistoryManagerWidget::onListClicked(QListWidgetItem *item)
     int index = item->data(Qt::UserRole + 1).toInt();
 
     if (mode == "redo") {
-        const auto redoStack = historyManager->getRedoStack();
+        const auto redoStack = deckStateManager->getHistoryManager()->getRedoStack();
         int steps = redoStack.size() - index;
-        for (int i = 0; i < steps; ++i) {
-            historyManager->redo(deckListModel->getDeckList());
-        }
+        deckStateManager->redo(steps);
     } else if (mode == "undo") {
-        const auto undoStack = historyManager->getUndoStack();
-        int steps = undoStack.size() - 1 - index;
-        for (int i = 0; i < steps + 1; ++i) {
-            historyManager->undo(deckListModel->getDeckList());
-        }
+        const auto undoStack = deckStateManager->getHistoryManager()->getUndoStack();
+        int steps = undoStack.size() - index;
+        deckStateManager->undo(steps);
     }
 
-    deckListModel->rebuildTree();
-
-    emit deckListModel->layoutChanged();
-    emit requestDisplayWidgetSync();
-
     refreshList();
+}
+
+void DeckListHistoryManagerWidget::doUndo()
+{
+    deckStateManager->undo();
+}
+
+void DeckListHistoryManagerWidget::doRedo()
+{
+    deckStateManager->redo();
 }
\ No newline at end of file
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 0e208ad2b..5ed44b0fd 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,18 +1,22 @@
 #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;
 
 class DeckListHistoryManagerWidget : public QWidget
 {
@@ -25,22 +29,19 @@ public slots:
     void retranslateUi();
 
 public:
-    explicit DeckListHistoryManagerWidget(DeckListModel *deckListModel,
+    explicit DeckListHistoryManagerWidget(DeckStateManager *deckStateManager,
                                           DeckListStyleProxy *styleProxy,
-                                          DeckListHistoryManager *manager,
                                           QWidget *parent = nullptr);
-    void setDeckListModel(DeckListModel *_deckListModel);
 
 private slots:
     void refreshList();
-    void onListClicked(QListWidgetItem *item);
+    void onListClicked(const QListWidgetItem *item);
     void doUndo();
     void doRedo();
 
 private:
-    DeckListModel *deckListModel;
+    DeckStateManager *deckStateManager;
     DeckListStyleProxy *styleProxy;
-    DeckListHistoryManager *historyManager;
 
     QHBoxLayout *layout;
     QAction *aUndo;
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 9c2265dfd..1e1aefe58 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,13 +3,17 @@
 #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
 {
     QModelIndex src = mapToSource(index);
-    if (!src.isValid())
+    if (!src.isValid()) {
         return {};
+    }
 
     QVariant value = QIdentityProxyModel::data(index, role);
 
@@ -23,8 +27,7 @@ QVariant DeckListStyleProxy::data(const QModelIndex &index, int role) const
 
     if (role == Qt::BackgroundRole) {
         if (isCard) {
-            const bool legal =
-                true; // TODO: Not implemented yet. QIdentityProxyModel::data(index, DeckRoles::IsLegalRole).toBool();
+            const bool legal = QIdentityProxyModel::data(index, DeckRoles::IsLegalRole).toBool();
             int base = 255 - (index.row() % 2) * 30;
             return legal ? QBrush(QColor(base, base, base)) : QBrush(QColor(255, base / 3, base / 3));
         } else {
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 52b7eea10..e4d1de4f4 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,6 +2,7 @@
 #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
new file mode 100644
index 000000000..d4715c8d5
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp
@@ -0,0 +1,598 @@
+#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)),
+      deckListModel(new DeckListModel(this, deckList)), historyManager(new DeckListHistoryManager(this))
+{
+    deckListModel->setDisplayLanguage(SettingsCache::instance().cardsDisplay().getCardLang());
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, deckListModel,
+            [this](const QString &lang) { deckListModel->setDisplayLanguage(lang); });
+
+    connect(historyManager, &DeckListHistoryManager::undoRedoStateChanged, this, [this] {
+        setModified(true);
+        emit historyChanged();
+    });
+    connect(deckListModel, &DeckListModel::cardNodesChanged, this, &DeckStateManager::uniqueCardsChanged);
+}
+
+const DeckList &DeckStateManager::getDeckList() const
+{
+    return *deckList.get();
+}
+
+LoadedDeck DeckStateManager::toLoadedDeck() const
+{
+    return {getDeckList(), lastLoadInfo};
+}
+
+DeckList::Metadata const &DeckStateManager::getMetadata() const
+{
+    return deckList->getMetadata();
+}
+
+QString DeckStateManager::getSimpleDeckName() const
+{
+    return deckList->getMetadata().name.simplified();
+}
+
+QString DeckStateManager::getDeckHash() const
+{
+    return deckList->getDeckHash();
+}
+
+bool DeckStateManager::isModified() const
+{
+    return modified;
+}
+
+void DeckStateManager::setModified(bool state)
+{
+    if (state == modified) {
+        return;
+    }
+
+    modified = state;
+    emit isModifiedChanged(modified);
+}
+
+bool DeckStateManager::isBlankNewDeck() const
+{
+    return !isModified() && deckList->isBlankDeck();
+}
+
+void DeckStateManager::replaceDeck(const LoadedDeck &deck)
+{
+    lastLoadInfo = deck.lastLoadInfo;
+    deckList = QSharedPointer<DeckList>(new DeckList(deck.deckList));
+    deckListModel->setDeckList(deckList);
+
+    historyManager->clear();
+
+    setModified(false);
+    emit deckReplaced();
+}
+
+void DeckStateManager::clearDeck()
+{
+    replaceDeck(LoadedDeck());
+}
+
+bool DeckStateManager::modifyDeck(const QString &reason, const std::function<bool(DeckListModel *)> &operation)
+{
+    DeckListMemento memento = deckList->createMemento(reason);
+    bool success = operation(deckListModel);
+
+    if (success) {
+        historyManager->save(memento);
+        doCardModified();
+    }
+
+    return success;
+}
+
+QModelIndex DeckStateManager::modifyDeck(const QString &reason,
+                                         const std::function<QModelIndex(DeckListModel *)> &operation)
+{
+    DeckListMemento memento = deckList->createMemento(reason);
+    QModelIndex idx = operation(deckListModel);
+
+    if (idx.isValid()) {
+        historyManager->save(memento);
+        doCardModified();
+    }
+
+    return idx;
+}
+
+void DeckStateManager::setName(const QString &name)
+{
+    QString previous = deckList->getName();
+    if (previous == name) {
+        return;
+    }
+
+    requestHistorySave(tr("Rename deck to \"%1\" from \"%2\"").arg(name).arg(previous));
+    deckList->setName(name);
+
+    doMetadataModified();
+}
+
+void DeckStateManager::setComments(const QString &comments)
+{
+    QString previous = deckList->getComments();
+    if (previous == comments) {
+        return;
+    }
+
+    requestHistorySave(tr("Updated comments (was %1 chars, now %2 chars)").arg(previous.size()).arg(comments.size()));
+    deckList->setComments(comments);
+
+    doMetadataModified();
+}
+
+void DeckStateManager::setBannerCard(const CardRef &bannerCard)
+{
+    CardRef previous = deckList->getBannerCard();
+    if (previous == bannerCard) {
+        return;
+    }
+
+    requestHistorySave(tr("Set banner card to %1 (%2)").arg(bannerCard.name).arg(bannerCard.providerId));
+    deckList->setBannerCard(bannerCard);
+
+    doMetadataModified();
+}
+
+void DeckStateManager::setPlaymat(const PlaymatInfo &playmat)
+{
+    PlaymatInfo previous = deckList->getPlaymat();
+    if (previous == playmat) {
+        return;
+    }
+
+    requestHistorySave(tr("Set playmat to %1").arg(playmat.card.name));
+    deckList->setPlaymat(playmat);
+
+    doMetadataModified();
+}
+
+void DeckStateManager::setTags(const QStringList &tags)
+{
+    QStringList previous = deckList->getTags();
+    if (previous == tags) {
+        return;
+    }
+
+    requestHistorySave(tr("Tags changed"));
+    deckList->setTags(tags);
+
+    doMetadataModified();
+}
+
+void DeckStateManager::setFormat(const QString &format)
+{
+    if (deckList->getMetadata().gameFormat == format) {
+        return;
+    }
+
+    requestHistorySave(tr("Set format to %1").arg(format));
+    deckListModel->setActiveFormat(format);
+
+    doMetadataModified();
+}
+
+QModelIndex DeckStateManager::addCard(const ExactCard &card, const QString &zoneName)
+{
+    if (!card) {
+        return {};
+    }
+
+    QString zone = card.getInfo().getIsToken() ? DECK_ZONE_TOKENS : zoneName;
+
+    CardSetPtr set = card.getPrinting().getSet();
+    QString setName = set ? set->getCorrectedShortName() : "";
+
+    QString reason =
+        tr("Added (%1): %2 (%3) %4").arg(zone, card.getName(), setName, card.getPrinting().getProperty("num"));
+
+    QModelIndex idx = modifyDeck(reason, [&card, &zone](auto model) { return model->addCard(card, zone); });
+
+    if (idx.isValid()) {
+        emit focusIndexChanged(idx, true);
+    }
+
+    return idx;
+}
+
+QModelIndex DeckStateManager::decrementCard(const ExactCard &card, const QString &zoneName)
+{
+    if (!card) {
+        return {};
+    }
+
+    QString providerId = card.getPrinting().getUuid();
+    QString collectorNumber = card.getPrinting().getProperty("num");
+
+    QModelIndex idx = deckListModel->findCard(card.getName(), zoneName, providerId, collectorNumber);
+    if (!idx.isValid()) {
+        return {};
+    }
+
+    bool success = offsetCountAtIndex(idx, -1);
+
+    if (!success) {
+        return {};
+    }
+
+    // old index is no longer safe since rows could have been removed
+    QModelIndex newIdx = deckListModel->findCard(card.getName(), zoneName, providerId, collectorNumber);
+    if (newIdx.isValid()) {
+        emit focusIndexChanged(newIdx, true);
+    }
+
+    return newIdx;
+}
+
+static bool doSwapCard(DeckListModel *model,
+                       const QModelIndex &idx,
+                       const QString &cardName,
+                       const QString &providerId,
+                       const QString &otherZone)
+{
+    bool success = model->offsetCountAtIndex(idx, -1);
+    if (!success) {
+        return false;
+    }
+
+    if (ExactCard card = CardDatabaseManager::query()->getCard({cardName, providerId})) {
+        model->addCard(card, otherZone);
+    } else {
+        // Third argument (true) says create the card no matter what, even if not in DB
+        model->addPreferredPrintingCard(cardName, otherZone, true);
+    }
+
+    return true;
+}
+
+bool DeckStateManager::swapCardAtIndex(const QModelIndex &idx)
+{
+    if (!idx.isValid()) {
+        return false;
+    }
+
+    // The display role holds the localized card name; the edit role always carries the
+    // canonical English name needed to look the card up in the database.
+    QString displayCardName = idx.siblingAtColumn(DeckListModelColumns::CARD_NAME).data().toString();
+    QString cardName = idx.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+    QString providerId = idx.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data().toString();
+    QModelIndex gparent = idx.parent().parent();
+
+    if (!gparent.isValid()) {
+        return false;
+    }
+
+    QString zoneName = gparent.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+    // tokens have no swap target
+    if (zoneName == DECK_ZONE_TOKENS) {
+        return false;
+    }
+    QString otherZoneName = zoneName == DECK_ZONE_MAIN ? DECK_ZONE_SIDE : DECK_ZONE_MAIN;
+
+    QString reason = tr("Moved to %1 1 × \"%2\" (%3)") //
+                         .arg(otherZoneName)
+                         .arg(displayCardName)
+                         .arg(providerId);
+
+    return modifyDeck(reason, [&idx, &cardName, &providerId, &otherZoneName](auto model) {
+        return doSwapCard(model, idx, cardName, providerId, otherZoneName);
+    });
+}
+
+bool DeckStateManager::removeCardAtIndex(const QModelIndex &idx)
+{
+    if (!idx.isValid() || deckListModel->hasChildren(idx)) {
+        return false;
+    }
+
+    QString reason =
+        tr("Removed \"%1\" (all copies)").arg(idx.siblingAtColumn(DeckListModelColumns::CARD_NAME).data().toString());
+
+    return modifyDeck(reason, [&idx](auto model) { return model->removeRow(idx.row(), idx.parent()); });
+}
+
+bool DeckStateManager::incrementCountAtIndex(const QModelIndex &idx)
+{
+    return offsetCountAtIndex(idx, 1);
+}
+
+bool DeckStateManager::decrementCountAtIndex(const QModelIndex &idx)
+{
+    return offsetCountAtIndex(idx, -1);
+}
+
+bool DeckStateManager::moveCardToZone(const QModelIndex &idx, const QString &targetZoneName)
+{
+    if (!idx.isValid()) {
+        return false;
+    }
+
+    // Only actual card rows can be moved. Group or zone rows report an
+    // aggregate amount and must never be deleted by this operation.
+    if (!idx.data(DeckRoles::IsCardRole).toBool()) {
+        return false;
+    }
+
+    QString cardName = idx.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+    QString providerId = idx.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data(Qt::DisplayRole).toString();
+    int copies = idx.siblingAtColumn(DeckListModelColumns::CARD_AMOUNT).data(Qt::EditRole).toInt();
+
+    if (copies <= 0) {
+        return false;
+    }
+
+    // Tokens only live in the tokens zone and cannot be moved into decks.
+    CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(cardName);
+    if (info && info->getIsToken()) {
+        return false;
+    }
+
+    // Determine the zone the card currently lives in: the enclosing custom
+    // zone, or the nearest top-level zone (board zone or legacy zone).
+    QString currentZoneName;
+    for (QModelIndex ancestor = idx.parent(); ancestor.isValid(); ancestor = ancestor.parent()) {
+        bool isCustomZone = ancestor.data(DeckRoles::IsCustomZoneRole).toBool();
+        if (isCustomZone || !ancestor.parent().isValid()) {
+            currentZoneName = ancestor.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+            break;
+        }
+    }
+
+    if (currentZoneName == targetZoneName) {
+        return false;
+    }
+
+    QString reason = tr("Moved %1 × \"%2\" (%3) to %4")
+                         .arg(copies)
+                         .arg(cardName)
+                         .arg(providerId)
+                         .arg(InnerDecklistNode::visibleNameFromName(targetZoneName));
+
+    return modifyDeck(reason, [&idx, &cardName, &providerId, &targetZoneName, copies](auto model) {
+        if (!model->removeRow(idx.row(), idx.parent())) {
+            return false;
+        }
+
+        if (ExactCard card = CardDatabaseManager::query()->getCard({cardName, providerId})) {
+            for (int i = 0; i < copies; ++i) {
+                model->addCard(card, targetZoneName);
+            }
+        } else {
+            for (int i = 0; i < copies; ++i) {
+                model->addPreferredPrintingCard(cardName, targetZoneName, true);
+            }
+        }
+
+        return true;
+    });
+}
+
+bool DeckStateManager::createCustomZone(const QString &boardZoneName, const QString &zoneName)
+{
+    const QString trimmedZoneName = zoneName.trimmed();
+    if (trimmedZoneName.isEmpty()) {
+        return false;
+    }
+
+    QString reason =
+        tr("Created zone \"%1\" in %2").arg(trimmedZoneName, InnerDecklistNode::visibleNameFromName(boardZoneName));
+
+    return modifyTree(reason, [&boardZoneName, &trimmedZoneName](DecklistNodeTree *tree) {
+        return tree->addCustomZone(boardZoneName, trimmedZoneName) != nullptr;
+    });
+}
+
+bool DeckStateManager::renameCustomZone(const QString &oldZoneName, const QString &newZoneName)
+{
+    const QString trimmedNewZoneName = newZoneName.trimmed();
+    if (trimmedNewZoneName.isEmpty() || oldZoneName == trimmedNewZoneName) {
+        return false;
+    }
+
+    QString reason = tr("Renamed zone \"%1\" to \"%2\"").arg(oldZoneName, trimmedNewZoneName);
+
+    return modifyTree(reason, [&oldZoneName, &trimmedNewZoneName](DecklistNodeTree *tree) {
+        return tree->renameCustomZone(oldZoneName, trimmedNewZoneName);
+    });
+}
+
+bool DeckStateManager::moveCustomZone(const QString &zoneName, const QString &newBoardZoneName)
+{
+    const auto *tree = deckList->getTree();
+
+    // Locate the zone through the tree's own lookup, which walks every top-level
+    // zone (not just the standard boards) and covers the same-board no-op below.
+    const auto *zone = tree->findCustomZoneByName(zoneName);
+    if (!zone) {
+        return false;
+    }
+
+    // Same-board moves are no-ops and must not pollute the history.
+    const QString currentBoardName = zone->getParent() ? zone->getParent()->getName() : QString();
+    if (currentBoardName == newBoardZoneName) {
+        return true;
+    }
+
+    // Zone names are deck-unique among zones created through this manager, so a
+    // same-named zone on the target board can only come from an imported deck.
+    // Refuse the move instead of silently stacking same-named zones.
+    for (const auto *targetZone : tree->getCustomZones(newBoardZoneName)) {
+        if (targetZone->getName() == zoneName) {
+            return false;
+        }
+    }
+
+    QString reason =
+        tr("Moved zone \"%1\" to %2").arg(zoneName, InnerDecklistNode::visibleNameFromName(newBoardZoneName));
+
+    return modifyTree(reason, [&zoneName, &newBoardZoneName](DecklistNodeTree *tree) {
+        return tree->moveCustomZone(zoneName, newBoardZoneName);
+    });
+}
+
+bool DeckStateManager::removeCustomZone(const QString &zoneName)
+{
+    QString reason = tr("Deleted zone \"%1\"").arg(zoneName);
+
+    return modifyTree(reason, [&zoneName](DecklistNodeTree *tree) { return tree->removeCustomZone(zoneName); });
+}
+
+QString DeckStateManager::validateNewZoneName(const QString &zoneName) const
+{
+    if (zoneName.trimmed().isEmpty()) {
+        return tr("Enter a zone name.");
+    }
+
+    const QString trimmedZoneName = zoneName.trimmed();
+
+    // The standard zone names are reserved even before they exist.
+    if (trimmedZoneName == DECK_ZONE_MAIN || trimmedZoneName == DECK_ZONE_SIDE ||
+        trimmedZoneName == DECK_ZONE_MAYBEBOARD || trimmedZoneName == DECK_ZONE_TOKENS) {
+        return tr("This name is reserved.");
+    }
+
+    const auto *tree = deckList->getTree();
+
+    // Reuse the tree's own uniqueness contract: any top-level zone and any
+    // custom zone on *every* board claims the name (hasZoneName also reserves
+    // the standard board names, which we already rejected with a dedicated
+    // message above). Scanning only the standard boards here would miss a
+    // custom zone an imported deck carries under `tokens`.
+    if (tree->hasZoneName(trimmedZoneName)) {
+        return tr("A zone with this name already exists.");
+    }
+
+    return {};
+}
+
+bool DeckStateManager::offsetCountAtIndex(const QModelIndex &idx, int offset)
+{
+    if (!idx.isValid()) {
+        return false;
+    }
+
+    QString cardName = idx.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+    QString providerId = idx.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data(Qt::DisplayRole).toString();
+
+    QString reason = tr("%1 1 × \"%2\" (%3)") //
+                         .arg(offset > 0 ? tr("Added") : tr("Removed"))
+                         .arg(cardName)
+                         .arg(providerId);
+
+    return modifyDeck(reason, [&idx, &offset](auto model) { return model->offsetCountAtIndex(idx, offset); });
+}
+
+void DeckStateManager::undo(int steps)
+{
+    if (!historyManager->canUndo()) {
+        return;
+    }
+
+    for (int i = 0; i < steps; i++) {
+        if (!historyManager->canUndo()) {
+            continue;
+        }
+        historyManager->undo(deckList.get());
+    }
+
+    deckListModel->rebuildTree();
+
+    emit deckListModel->layoutChanged();
+    emit deckReplaced();
+}
+
+void DeckStateManager::redo(int steps)
+{
+    if (!historyManager->canRedo()) {
+        return;
+    }
+
+    for (int i = 0; i < steps; i++) {
+        if (!historyManager->canRedo()) {
+            continue;
+        }
+        historyManager->redo(deckList.get());
+    }
+
+    deckListModel->rebuildTree();
+
+    emit deckListModel->layoutChanged();
+    emit deckReplaced();
+}
+
+void DeckStateManager::requestHistorySave(const QString &reason)
+{
+    historyManager->save(deckList->createMemento(reason));
+}
+
+bool DeckStateManager::modifyTree(const QString &reason, const std::function<bool(DecklistNodeTree *)> &operation)
+{
+    DeckListMemento memento = deckList->createMemento(reason);
+    bool success = operation(deckList->getTree());
+
+    if (success) {
+        historyManager->save(memento);
+        deckListModel->rebuildTree();
+        deckList->refreshDeckHash();
+        emit deckListModel->deckHashChanged();
+        // removeCustomZone can drop whole card sets the model never notified
+        // about (rebuildTree emits no cardNodesChanged), so tell the consumers.
+        emit deckListModel->cardNodesChanged();
+        doCardModified();
+    }
+
+    return success;
+}
+
+/**
+ * @brief Handles updating state and emitting signals whenever the cards are modified
+ */
+void DeckStateManager::doCardModified()
+{
+    setModified(true);
+    emit cardModified();
+    emit deckModified();
+}
+
+/**
+ * @brief Handles updating state and emitting signals whenever the metadata is modified
+ */
+void DeckStateManager::doMetadataModified()
+{
+    setModified(true);
+    emit metadataModified();
+    emit deckModified();
+}
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
new file mode 100644
index 000000000..98876947b
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h
@@ -0,0 +1,382 @@
+#ifndef COCKATRICE_DECK_STATE_MANAGER_H
+#define COCKATRICE_DECK_STATE_MANAGER_H
+
+#include "../../deck_loader/loaded_deck.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.
+ * It is responsible for owning and managing the DeckListModel, underlying DeckList, load info, and edit history.
+ *
+ * Although this class provides getters for the underlying DeckListModel, you should generally refrain from directly
+ * modifying the returned model. Outside modifications to the deck state should be done through @link
+ * DeckStateManager::modifyDeck and the metadata setters.
+ * Those methods ensure that the history is recorded and correct signals are emitted.
+ */
+class DeckStateManager : public QObject
+{
+    Q_OBJECT
+
+    LoadedDeck::LoadInfo lastLoadInfo;
+    QSharedPointer<DeckList> deckList;
+    DeckListModel *deckListModel;
+    DeckListHistoryManager *historyManager;
+
+    bool modified = false;
+
+public:
+    explicit DeckStateManager(QObject *parent = nullptr);
+
+    /**
+     * Gets the underlying HistoryManager.
+     * @return The DeckListHistoryManager instance
+     */
+    DeckListHistoryManager *getHistoryManager() const
+    {
+        return historyManager;
+    }
+
+    /**
+     * @brief Gets the underlying DeckListModel.
+     * You should generally refrain modifying the returned model directly.
+     * However, it's fine (and intended) to perform queries on the returned model.
+     * @return The DeckListModel instance
+     */
+    DeckListModel *getModel() const
+    {
+        return deckListModel;
+    }
+
+    /**
+     * @brief Gets a view of the current deck.
+     */
+    const DeckList &getDeckList() const;
+
+    /**
+     * @brief Gets the underlying DeckList.
+     */
+    QSharedPointer<DeckList> getDeckListShared() const
+    {
+        return deckList;
+    }
+
+    /**
+     * @brief Creates a LoadedDeck containing the contents of the current deck and the current LoadInfo.
+     *
+     * @return A new LoadedDeck instance.
+     */
+    LoadedDeck toLoadedDeck() const;
+
+    /**
+     * @brief Gets a view of the metadata in the DeckList
+     */
+    DeckList::Metadata const &getMetadata() const;
+
+    /**
+     * @brief Gets the deck's simplified name.
+     */
+    QString getSimpleDeckName() const;
+
+    /**
+     * @brief Gets the deck hash.
+     */
+    QString getDeckHash() const;
+
+    /**
+     * @brief Checks if the deck has been modified since it was last saved
+     */
+    bool isModified() const;
+
+    /**
+     * @brief Sets the new isModified state, emitting a signal if the state changed.
+     * This class will automatically update its isModified state, but you may need to set it manually to handle, for
+     * example, saving.
+     * @param state The state
+     */
+    void setModified(bool state);
+
+    /**
+     * @brief Checks if the deck state is as if it was a new deck
+     */
+    bool isBlankNewDeck() const;
+
+    /**
+     * @brief Overwrites the current deck with a new deck, resetting all history
+     * @param deck The new deck.
+     */
+    void replaceDeck(const LoadedDeck &deck);
+
+    /**
+     * @brief Resets the deck to a blank new deck, resetting all history.
+     */
+    void clearDeck();
+
+    /**
+     * @brief Sets the lastLoadInfo.
+     * @param loadInfo The lastLoadInfo
+     */
+    void setLastLoadInfo(const LoadedDeck::LoadInfo &loadInfo)
+    {
+        lastLoadInfo = loadInfo;
+    }
+
+    /**
+     * @brief Modifies the cards in the deck, in a wrapped operation that is saved to the history.
+     *
+     * The operation is a function that accepts a DeckListModel that it operates upon, and returns a bool.
+     *
+     * This method will pass the underlying DeckListModel into the operation function. The function can call methods on
+     * the model to modify the deck.
+     * The function should return a bool to indicate success/failure.
+     *
+     * If the operation returns true, the state of the deck before the operation is ran is saved to the history, and the
+     * isModified state is updated.
+     * If the operation returns false, the history and isModified state is not updated.
+     *
+     * Note that even if the operation fails, any modifications to the model will already have been made.
+     * It's recommended for the operation to always return true if any modification has already been made to the model,
+     * as not doing that may cause the state to become desynced.
+     *
+     * @param reason The reason to display in the history
+     * @param operation The modification operation.
+     * @return The bool returned from the operation
+     */
+    bool modifyDeck(const QString &reason, const std::function<bool(DeckListModel *)> &operation);
+
+    /**
+     * @brief Modifies the cards in the deck, in a wrapped operation that is saved to the history.
+     *
+     * The operation is a function that accepts a DeckListModel that it operates upon, and returns a QModelIndex.
+     * If the index is invalid, then the operation is considered to be a failure.
+     *
+     * See the other @link DeckStateManager::modifyDeck for more info about the behavior of this method.
+     *
+     * @param reason The reason to display in the history
+     * @param operation The modification operation.
+     * @return The QModelIndex returned from the operation
+     */
+    QModelIndex modifyDeck(const QString &reason, const std::function<QModelIndex(DeckListModel *)> &operation);
+
+    /**
+     * @name Metadata setters
+     * @brief These methods set the metadata. Will no-op if the new value is the same as the current value.
+     * Saves the operation to history if successful.
+     */
+    ///@{
+    void setName(const QString &name);
+    void setComments(const QString &comments);
+    void setBannerCard(const CardRef &bannerCard);
+    void setPlaymat(const PlaymatInfo &playmat);
+    void setTags(const QStringList &tags);
+    void setFormat(const QString &format);
+    ///@}
+
+    /**
+     * @brief Adds the given card to the given zone.
+     * Saves the operation to history if successful.
+     *
+     * @param card The card to add
+     * @param zoneName The zone to add the card to
+     * @return The index of the added card
+     */
+    QModelIndex addCard(const ExactCard &card, const QString &zoneName);
+
+    /**
+     * @brief Removes 1 copy of the given card from the given zone.
+     * Saves the operation to history if successful.
+     *
+     * @param card The card to remove
+     * @param zoneName The zone to remove the card from
+     * @return The index of the removed card. Will be invalid if the last copy was removed.
+     */
+    QModelIndex decrementCard(const ExactCard &card, const QString &zoneName);
+
+    /**
+     * @brief Swaps one copy of the card at the given index between the maindeck and sideboard.
+     * No-ops if index is invalid or not a card node.
+     * Saves the operation to history if successful.
+     *
+     * @param idx The model index
+     * @return Whether the operation was successfully performed
+     */
+    bool swapCardAtIndex(const QModelIndex &idx);
+
+    /**
+     * @brief Removes all copies of the card at the given index.
+     * No-ops if index is invalid or not a card node.
+     * Saves the operation to history if successful.
+     *
+     * @param idx The model index
+     * @return Whether the operation was successfully performed
+     */
+    bool removeCardAtIndex(const QModelIndex &idx);
+
+    /**
+     * @brief Increments the number of copies of the card at the given index by 1.
+     * No-ops if index is invalid or not a card node.
+     * Saves the operation to history if successful.
+     *
+     * @param idx The model index
+     * @return Whether the operation was successfully performed
+     */
+    bool incrementCountAtIndex(const QModelIndex &idx);
+
+    /**
+     * @brief Decrements the number of copies of the card at the given index by 1.
+     * No-ops if index is invalid or not a card node.
+     * Saves the operation to history if successful.
+     *
+     * @param idx The model index
+     * @return Whether the operation was successfully performed
+     */
+    bool decrementCountAtIndex(const QModelIndex &idx);
+
+    /**
+     * @brief Moves all copies of the card at the given index to the given zone.
+     * No-ops if the index is invalid, not a card node, the card is a token, or the
+     * card is already in the target zone.
+     * Saves the operation to history if successful.
+     *
+     * @param idx The model index of the card to move
+     * @param targetZoneName The zone to move the card to (board zone or custom zone name)
+     * @return Whether the operation was successfully performed
+     */
+    bool moveCardToZone(const QModelIndex &idx, const QString &targetZoneName);
+
+    /**
+     * @brief Creates a new custom zone nested under a board zone.
+     * Saves the operation to history if successful.
+     *
+     * @param boardZoneName The board zone to nest the custom zone under
+     * @param zoneName The name of the new custom zone. Gets trimmed and must be
+     *        unique across the deck.
+     * @return Whether the zone was created
+     */
+    bool createCustomZone(const QString &boardZoneName, const QString &zoneName);
+
+    /**
+     * @brief Renames a custom zone.
+     * Saves the operation to history if successful.
+     *
+     * @param oldZoneName The current name of the custom zone
+     * @param newZoneName The new name. Gets trimmed and must be unique across the deck.
+     * @return Whether the rename succeeded
+     */
+    bool renameCustomZone(const QString &oldZoneName, const QString &newZoneName);
+
+    /**
+     * @brief Moves a custom zone (and its cards) to a different board zone.
+     * Same-board moves succeed without creating a history entry.
+     * Saves the operation to history if successful.
+     *
+     * @param zoneName The custom zone to move
+     * @param newBoardZoneName The board zone to move the custom zone under
+     * @return Whether the move succeeded
+     */
+    bool moveCustomZone(const QString &zoneName, const QString &newBoardZoneName);
+
+    /**
+     * @brief Removes a custom zone and all its cards.
+     * Saves the operation to history if successful.
+     *
+     * @param zoneName The custom zone to remove
+     * @return Whether the zone was removed
+     */
+    bool removeCustomZone(const QString &zoneName);
+
+    /**
+     * @brief Checks whether a candidate name is usable for a new custom zone.
+     *
+     * @param zoneName The candidate name
+     * @return An empty string when the name is usable, otherwise a user-facing
+     *         error message describing the problem
+     */
+    [[nodiscard]] QString validateNewZoneName(const QString &zoneName) const;
+
+    /**
+     * Undoes n steps of the history, setting the decklist state and updating the current step in the historyManager.
+     * @param steps Number of steps to undo.
+     */
+    void undo(int steps = 1);
+
+    /**
+     * Redoes n steps of the history, setting the decklist state and updating the current step in the historyManager.
+     * @param steps Number of steps to redo.
+     */
+    void redo(int steps = 1);
+
+public slots:
+    /**
+     * Saves the current decklist state to history.
+     * @param reason The reason that is shown in the history.
+     */
+    void requestHistorySave(const QString &reason);
+
+private:
+    bool offsetCountAtIndex(const QModelIndex &idx, int offset);
+    bool modifyTree(const QString &reason, const std::function<bool(DecklistNodeTree *)> &operation);
+    void doCardModified();
+    void doMetadataModified();
+
+signals:
+    /**
+     * A modification has been made to the cards in the deck
+     */
+    void cardModified();
+
+    /**
+     * A card that wasn't previously in the deck was added to the deck, or the last copy of a card was removed from the
+     * deck.
+     */
+    void uniqueCardsChanged();
+
+    /**
+     * A modification has been made to the metadata in the deck
+     */
+    void metadataModified();
+
+    /**
+     * A modification has been made to the cards or metadata in the deck
+     */
+    void deckModified();
+
+    /**
+     * The history has been greatly changed and needs to be reloaded.
+     */
+    void historyChanged();
+
+    /**
+     * The deck has been completely changed.
+     */
+    void deckReplaced();
+
+    /**
+     * The isModified state of the deck has changed
+     * @param isModified the new state
+     */
+    void isModifiedChanged(bool isModified);
+
+    /**
+     * The selected card on any views connected to this deck should be changed to this index.
+     * @param index The model index
+     * @param preserveWidgetFocus Whether to keep the widget focus unchanged
+     */
+    void focusIndexChanged(QModelIndex index, bool preserveWidgetFocus);
+};
+
+#endif // COCKATRICE_DECK_STATE_MANAGER_H
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.cpp
new file mode 100644
index 000000000..cb9667603
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.cpp
@@ -0,0 +1,149 @@
+#include "deck_zone_dialog.h"
+
+#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>
+
+DeckZoneDialog::DeckZoneDialog(QWidget *parent,
+                               const QString &initialBoardName,
+                               const std::function<QString(const QString &)> &_nameValidator,
+                               bool _allowBoardSelection)
+    : QDialog(parent), nameValidator(_nameValidator), allowBoardSelection(_allowBoardSelection)
+{
+    nameLabel = new QLabel(this);
+    nameEdit = new QLineEdit(this);
+    nameEdit->setMaxLength(MAX_NAME_LENGTH);
+
+    errorLabel = new QLabel(this);
+    errorLabel->hide();
+
+    boardLabel = new QLabel(this);
+    boardCombo = new QComboBox(this);
+    for (const QString &boardName : InnerDecklistNode::boardZoneNames()) {
+        // Use the icon overload explicitly so `boardName` lands in the user data role
+        // (visible text is applied below in retranslateUi). The two-argument form
+        // addItem({}, boardName) would be ambiguous and resolve to the icon overload
+        // with empty user data, yielding empty entries and an empty getBoardName().
+        boardCombo->addItem({}, {}, boardName);
+    }
+    if (!initialBoardName.isEmpty()) {
+        int idx = boardCombo->findData(initialBoardName);
+        if (idx != -1) {
+            boardCombo->setCurrentIndex(idx);
+        }
+    }
+
+    buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+    auto *layout = new QVBoxLayout(this);
+    layout->addWidget(nameLabel);
+    layout->addWidget(nameEdit);
+    layout->addWidget(errorLabel);
+    if (allowBoardSelection) {
+        layout->addWidget(boardLabel);
+        layout->addWidget(boardCombo);
+    } else {
+        boardLabel->hide();
+        boardCombo->hide();
+    }
+    layout->addWidget(buttonBox);
+
+    retranslateUi();
+
+    connect(nameEdit, &QLineEdit::textChanged, this, [this] { validateName(); });
+    validateName();
+
+    nameEdit->setFocus();
+}
+
+QString DeckZoneDialog::getZoneName() const
+{
+    return nameEdit->text().trimmed();
+}
+
+QString DeckZoneDialog::getBoardName() const
+{
+    return boardCombo->currentData().toString();
+}
+
+void DeckZoneDialog::setZoneName(const QString &zoneName)
+{
+    nameEdit->setText(zoneName);
+    nameEdit->selectAll();
+}
+
+void DeckZoneDialog::changeEvent(QEvent *event)
+{
+    QDialog::changeEvent(event);
+
+    if (event->type() == QEvent::LanguageChange) {
+        retranslateUi();
+    }
+}
+
+void DeckZoneDialog::retranslateUi()
+{
+    setWindowTitle(allowBoardSelection ? tr("New zone") : tr("Rename zone"));
+
+    nameLabel->setText(tr("Zone &name:"));
+    nameLabel->setBuddy(nameEdit);
+
+    boardLabel->setText(tr("&Parent zone:"));
+    boardLabel->setBuddy(boardCombo);
+
+    for (int i = 0; i < boardCombo->count(); i++) {
+        boardCombo->setItemText(i, InnerDecklistNode::visibleNameFromName(boardCombo->itemData(i).toString()));
+    }
+}
+
+void DeckZoneDialog::validateName()
+{
+    const QString zoneName = nameEdit->text().trimmed();
+    QString error;
+    if (zoneName.isEmpty()) {
+        error = tr("Enter a zone name.");
+    } else if (nameValidator) {
+        error = nameValidator(zoneName);
+    }
+
+    errorLabel->setText(error);
+    errorLabel->setVisible(!error.isEmpty());
+    buttonBox->button(QDialogButtonBox::Ok)->setEnabled(error.isEmpty());
+}
+
+QString DeckZoneDialog::promptForNewZone(QWidget *parent,
+                                         const QString &initialBoardName,
+                                         QString *chosenBoardName,
+                                         const std::function<QString(const QString &)> &nameValidator)
+{
+    DeckZoneDialog dialog(parent, initialBoardName, nameValidator);
+    if (dialog.exec() != QDialog::Accepted) {
+        return {};
+    }
+
+    if (chosenBoardName) {
+        *chosenBoardName = dialog.getBoardName();
+    }
+    return dialog.getZoneName();
+}
+
+QString DeckZoneDialog::promptForRename(QWidget *parent,
+                                        const QString &currentZoneName,
+                                        const std::function<QString(const QString &)> &nameValidator)
+{
+    DeckZoneDialog dialog(parent, {}, nameValidator, false);
+    dialog.setZoneName(currentZoneName);
+    return dialog.exec() == QDialog::Accepted ? dialog.getZoneName() : QString();
+}
diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.h b/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.h
new file mode 100644
index 000000000..f4c9c0f9d
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.h
@@ -0,0 +1,123 @@
+/**
+ * @file deck_zone_dialog.h
+ * @ingroup DeckEditorWidgets
+ * @brief Shared dialog for creating custom deck zones.
+ */
+
+#ifndef DECK_ZONE_DIALOG_H
+#define DECK_ZONE_DIALOG_H
+
+#include <QDialog>
+#include <QString>
+#include <functional>
+#include <qtmetamacros.h>
+
+class QComboBox;
+class QDialogButtonBox;
+class QLabel;
+class QLineEdit;
+class QWidget;
+
+/**
+ * @brief Modal dialog asking for the name and parent zone of a new custom deck zone.
+ *
+ * Menus construct the dialog transiently around exec(), so validation state only
+ * ever reflects the name currently typed.
+ */
+class DeckZoneDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    /**
+     * @brief Constructs the dialog and runs the initial validation pass.
+     *
+     * @param parent The parent widget for the dialog
+     * @param initialBoardName The board zone to preselect in the combo. Unknown names
+     *        fall back to main.
+     * @param _nameValidator Given the trimmed candidate name, returns an empty string
+     *        when it is usable, otherwise a user-facing error message. May be empty.
+     * @param _allowBoardSelection When false the parent-zone combo is hidden and the
+     *        dialog acts as a rename prompt for an existing zone.
+     */
+    explicit DeckZoneDialog(QWidget *parent = nullptr,
+                            const QString &initialBoardName = {},
+                            const std::function<QString(const QString &)> &_nameValidator = {},
+                            bool _allowBoardSelection = true);
+
+    /**
+     * @brief The trimmed zone name entered by the user.
+     */
+    [[nodiscard]] QString getZoneName() const;
+
+    /**
+     * @brief The internal name of the board zone selected in the combo.
+     */
+    [[nodiscard]] QString getBoardName() const;
+
+    /**
+     * @brief Prefills the name field, e.g. with the current name when renaming.
+     *
+     * @param zoneName The text to put into the name field, selected for quick editing
+     */
+    void setZoneName(const QString &zoneName);
+
+    /**
+     * @brief Prompts the user for a new custom zone name and the board zone to nest it under.
+     *
+     * Convenience wrapper that runs DeckZoneDialog modally.
+     *
+     * @param parent The parent widget for the dialog
+     * @param initialBoardName The board zone to preselect in the dialog. Unknown names fall
+     *        back to main.
+     * @param chosenBoardName (out) The internal name of the board zone the user chose
+     * @param nameValidator Optional validator forwarded to the dialog
+     * @return The trimmed zone name, or an empty string if the user cancelled
+     */
+    static QString promptForNewZone(QWidget *parent,
+                                    const QString &initialBoardName,
+                                    QString *chosenBoardName,
+                                    const std::function<QString(const QString &)> &nameValidator = {});
+
+    /**
+     * @brief Prompts the user for a new name for an existing custom zone.
+     *
+     * Same inline validation as promptForNewZone, but without a parent-zone picker.
+     *
+     * @param parent The parent widget for the dialog
+     * @param currentZoneName The current name, prefilled for editing
+     * @param nameValidator Validator deciding whether a candidate name is usable. It sees
+     *        the current name too, so callers wanting to allow unchanged names must
+     *        special-case that themselves.
+     * @return The trimmed new name, or an empty string if the user cancelled
+     */
+    static QString promptForRename(QWidget *parent,
+                                   const QString &currentZoneName,
+                                   const std::function<QString(const QString &)> &nameValidator = {});
+
+protected:
+    void changeEvent(QEvent *event) override;
+
+private:
+    /**
+     * @brief Sets every user-visible string. Runs on construction and on runtime
+     * language changes.
+     */
+    void retranslateUi();
+
+    /**
+     * @brief Validates the current input, toggling Ok and the inline error label.
+     */
+    void validateName();
+
+    QLabel *nameLabel;
+    QLineEdit *nameEdit;
+    QLabel *errorLabel;
+    QLabel *boardLabel;
+    QComboBox *boardCombo;
+    QDialogButtonBox *buttonBox;
+    std::function<QString(const QString &)> nameValidator;
+    bool allowBoardSelection;
+};
+
+#endif // DECK_ZONE_DIALOG_H
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
new file mode 100644
index 000000000..b2c4dd303
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp
@@ -0,0 +1,58 @@
+#include "printing_disabled_info_widget.h"
+
+#include "../dialogs/override_printing_warning.h"
+
+#include <QHBoxLayout>
+#include <QIcon>
+#include <QLabel>
+#include <QPushButton>
+#include <QSize>
+#include <QStyle>
+#include <QVBoxLayout>
+#include <qnamespace.h>
+
+PrintingDisabledInfoWidget::PrintingDisabledInfoWidget(QWidget *parent) : QWidget(parent)
+{
+    auto layout = new QVBoxLayout(this);
+    layout->setObjectName("PrintingDisabledInfoWidgetFrame");
+
+    QLabel *imageLabel = new QLabel(this);
+    imageLabel->setAlignment(Qt::AlignCenter);
+    QIcon icon = style()->standardIcon(QStyle::SP_MessageBoxWarning);
+    imageLabel->setPixmap(icon.pixmap({60, 60}));
+
+    textLabel = new QLabel(this);
+    textLabel->setWordWrap(true);
+    textLabel->setAlignment(Qt::AlignCenter);
+
+    settingsButton = new QPushButton(this);
+    connect(settingsButton, &QPushButton::clicked, this, &PrintingDisabledInfoWidget::disableOverridePrintings);
+
+    auto buttonLayout = new QHBoxLayout();
+    buttonLayout->addStretch();
+    buttonLayout->addWidget(settingsButton);
+    buttonLayout->addStretch();
+
+    layout->addStretch();
+    layout->addWidget(imageLabel);
+    layout->addWidget(textLabel);
+    layout->addLayout(buttonLayout);
+    layout->addStretch();
+
+    retranslateUi();
+}
+
+void PrintingDisabledInfoWidget::retranslateUi()
+{
+    textLabel->setText(
+        tr("The Printing Selector is disabled because you have currently enabled the setting to override all "
+           "selected printings with personal set preferences.\n\n"
+           "This setting means you'll only see the default printing for each card, instead of being able to select a "
+           "printing, and will not see the printings other people have selected.\n\n"));
+    settingsButton->setText(tr("Enable printings again"));
+}
+
+void PrintingDisabledInfoWidget::disableOverridePrintings()
+{
+    OverridePrintingWarning::execMessageBox(this, false);
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..c14c758ff
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_editor/printing_disabled_info_widget.h
@@ -0,0 +1,25 @@
+#ifndef COCKATRICE_PRINTING_DISABLED_INFO_WIDGET_H
+#define COCKATRICE_PRINTING_DISABLED_INFO_WIDGET_H
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class QPushButton;
+class QLabel;
+
+class PrintingDisabledInfoWidget : public QWidget
+{
+    Q_OBJECT
+
+    QLabel *textLabel;
+    QPushButton *settingsButton;
+
+private slots:
+    void disableOverridePrintings();
+
+public:
+    explicit PrintingDisabledInfoWidget(QWidget *parent);
+
+    void retranslateUi();
+};
+
+#endif // COCKATRICE_PRINTING_DISABLED_INFO_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/deck_share/deck_share_utils.cpp b/cockatrice/src/interface/widgets/deck_share/deck_share_utils.cpp
new file mode 100644
index 000000000..0ebdc0647
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_share/deck_share_utils.cpp
@@ -0,0 +1,61 @@
+#include "deck_share_utils.h"
+
+#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>
+
+namespace DeckShareUtils
+{
+
+QString buildShareLink(const AbstractClient *client, const QString &token)
+{
+    QUrl url;
+    url.setScheme(QStringLiteral("cockatrice"));
+    url.setHost(QStringLiteral("opendeck"));
+
+    QUrlQuery query;
+    query.addQueryItem(QStringLiteral("share"), token);
+    query.addQueryItem(QStringLiteral("hostname"), client->serverName());
+    query.addQueryItem(QStringLiteral("port"), QString::number(client->serverPort()));
+    url.setQuery(query);
+
+    return url.toString(QUrl::FullyEncoded);
+}
+
+QString copyShareLinkToClipboard(const QString &link)
+{
+    QGuiApplication::clipboard()->setText(link);
+    return link;
+}
+
+QString formatShareExpiry(const QDateTime &expiry)
+{
+    return QLocale().toString(expiry.toLocalTime(), QLocale::ShortFormat);
+}
+
+ShareResponse handleShareResponse(const AbstractClient *client, const Response &response)
+{
+    const Response_DeckShareCreate &resp = response.GetExtension(Response_DeckShareCreate::ext);
+    const QString token = QString::fromStdString(resp.token());
+
+    const QString link = buildShareLink(client, token);
+    copyShareLinkToClipboard(link);
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+    const QDateTime expiry = QDateTime::fromSecsSinceEpoch(resp.expires_at(), QTimeZone::UTC);
+#else
+    const QDateTime expiry = QDateTime::fromSecsSinceEpoch(resp.expires_at(), Qt::UTC);
+#endif
+
+    return {link, expiry};
+}
+
+} // namespace DeckShareUtils
diff --git a/cockatrice/src/interface/widgets/deck_share/deck_share_utils.h b/cockatrice/src/interface/widgets/deck_share/deck_share_utils.h
new file mode 100644
index 000000000..c9f7afa8b
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_share/deck_share_utils.h
@@ -0,0 +1,59 @@
+/**
+ * @file deck_share_utils.h
+ * @ingroup DeckShareWidgets
+ */
+//! \todo Document this file.
+
+#ifndef DECK_SHARE_UTILS_H
+#define DECK_SHARE_UTILS_H
+
+#include <QDateTime>
+#include <QString>
+
+class AbstractClient;
+class Response;
+
+/**
+ * @brief Shared helpers for creating temporary deck shares.
+ */
+namespace DeckShareUtils
+{
+
+/**
+ * @brief The outcome of a successful share-create response.
+ */
+struct ShareResponse
+{
+    QString link;     ///< The share link that was copied to the clipboard.
+    QDateTime expiry; ///< When the share expires (UTC).
+};
+
+/**
+ * @brief Builds the cockatrice:// link for a freshly created deck share.
+ * @param client Used to embed the target server's hostname and port.
+ * @param token The share token from Response_DeckShareCreate.
+ */
+QString buildShareLink(const AbstractClient *client, const QString &token);
+
+/**
+ * @brief Copies the share link to the clipboard.
+ * @return The link that was copied.
+ */
+QString copyShareLinkToClipboard(const QString &link);
+
+/**
+ * @brief Formats the expiration timestamp for a share.
+ */
+QString formatShareExpiry(const QDateTime &expiry);
+
+/**
+ * @brief Handles a successful Response_DeckShareCreate: builds the share link,
+ *        copies it to the clipboard, and derives the share expiry.
+ * @param client Used to embed the target server's hostname and port.
+ * @param response The successful response carrying the share token and expiry.
+ */
+ShareResponse handleShareResponse(const AbstractClient *client, const Response &response);
+
+} // namespace DeckShareUtils
+
+#endif // DECK_SHARE_UTILS_H
diff --git a/cockatrice/src/interface/widgets/deck_share/share_bar_widget.cpp b/cockatrice/src/interface/widgets/deck_share/share_bar_widget.cpp
new file mode 100644
index 000000000..5aca343ca
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_share/share_bar_widget.cpp
@@ -0,0 +1,77 @@
+#include "share_bar_widget.h"
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+
+ShareBarWidget::ShareBarWidget(QWidget *parent) : QWidget(parent)
+{
+    auto *layout = new QHBoxLayout(this);
+    layout->setContentsMargins(12, 10, 12, 10);
+    layout->setSpacing(8);
+
+    hintLabel = new QLabel(this);
+    hintLabel->setWordWrap(true);
+
+    nameEdit = new QLineEdit(this);
+    nameEdit->setMaximumWidth(260);
+
+    countLabel = new QLabel(this);
+
+    cancelButton = new QPushButton(this);
+    connect(cancelButton, &QPushButton::clicked, this, &ShareBarWidget::cancelRequested);
+
+    createButton = new QPushButton(this);
+    createButton->setDefault(true);
+    connect(createButton, &QPushButton::clicked, this, &ShareBarWidget::createRequested);
+
+    layout->addWidget(hintLabel, 1);
+    layout->addWidget(nameEdit);
+    layout->addWidget(countLabel);
+    layout->addStretch();
+    layout->addWidget(cancelButton);
+    layout->addWidget(createButton);
+
+    setLayout(layout);
+
+    retranslateUi();
+}
+
+void ShareBarWidget::retranslateUi()
+{
+    nameEdit->setPlaceholderText(tr("Share name"));
+    cancelButton->setText(tr("Cancel"));
+    createButton->setText(tr("Create share link"));
+}
+
+QString ShareBarWidget::name() const
+{
+    return nameEdit->text().trimmed();
+}
+
+void ShareBarWidget::setName(const QString &value)
+{
+    nameEdit->setText(value);
+}
+
+void ShareBarWidget::setCountText(const QString &text)
+{
+    countLabel->setText(text);
+}
+
+void ShareBarWidget::setHintText(const QString &text, bool visible)
+{
+    hintLabel->setText(text);
+    hintLabel->setVisible(visible);
+}
+
+void ShareBarWidget::setCreateEnabled(bool enabled)
+{
+    createButton->setEnabled(enabled);
+}
+
+void ShareBarWidget::focusName()
+{
+    nameEdit->setFocus();
+}
diff --git a/cockatrice/src/interface/widgets/deck_share/share_bar_widget.h b/cockatrice/src/interface/widgets/deck_share/share_bar_widget.h
new file mode 100644
index 000000000..f97cc6788
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_share/share_bar_widget.h
@@ -0,0 +1,65 @@
+/**
+ * @file share_bar_widget.h
+ * @ingroup DeckShareWidgets
+ */
+//! \todo Document this file.
+
+#ifndef SHARE_BAR_WIDGET_H
+#define SHARE_BAR_WIDGET_H
+
+#include <QString>
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class QLabel;
+class QLineEdit;
+class QPushButton;
+
+/**
+ * @brief The activated toolbar used to create a temporary deck share.
+ *
+ * A single reusable component shared by the local visual deck storage and the
+ * remote server deck storage tabs, so the share workflow renders identically in
+ * both places. It owns its own widgets, strings, and layout; the owning tab only
+ * sets the count/hint text and reacts to the create/cancel signals.
+ */
+class ShareBarWidget final : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ShareBarWidget(QWidget *parent = nullptr);
+
+    void retranslateUi();
+
+    /** @return The trimmed name entered by the user. */
+    [[nodiscard]] QString name() const;
+
+    /** @brief Resets the name field to the given default. */
+    void setName(const QString &name);
+
+    /** @brief Sets the selected-count summary label text. */
+    void setCountText(const QString &text);
+
+    /** @brief Sets the explainer hint text, showing it when @p visible is true. */
+    void setHintText(const QString &text, bool visible);
+
+    /** @brief Enables or disables the create-share-link button (guards double submission). */
+    void setCreateEnabled(bool enabled);
+
+    /** @brief Moves keyboard focus to the name field. */
+    void focusName();
+
+signals:
+    void createRequested();
+    void cancelRequested();
+
+private:
+    QLabel *hintLabel;
+    QLineEdit *nameEdit;
+    QLabel *countLabel;
+    QPushButton *cancelButton;
+    QPushButton *createButton;
+};
+
+#endif // SHARE_BAR_WIDGET_H
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
new file mode 100644
index 000000000..3bb829089
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.cpp
@@ -0,0 +1,146 @@
+#include "shared_deck_preview_widget.h"
+
+#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,
+                                                 const QString &deckName,
+                                                 const QString &bannerCardName,
+                                                 const QString &colorIdentity,
+                                                 const QString &gameFormat,
+                                                 const QString &deckToolTip)
+    : QWidget(parent)
+{
+    bannerCardDisplayWidget =
+        new DeckPreviewCardPictureWidget(this, false, false, Qt::white, Qt::black, 12, Qt::AlignCenter, true);
+    bannerCardDisplayWidget->setScaleFactor(100);
+    const ExactCard bannerCard = bannerCardName.isEmpty() ? ExactCard() : querier->getCard(CardRef{bannerCardName, {}});
+    bannerCardDisplayWidget->setCard(bannerCard);
+    bannerCardDisplayWidget->setOverlayText(deckName);
+    setToolTip(deckToolTip.isEmpty() ? deckName : deckToolTip);
+    setFocusPolicy(Qt::StrongFocus);
+    setBaseAccessibleName(deckName);
+
+    colorIdentityWidget = new ColorIdentityWidget(this, colorIdentity);
+    colorIdentityWidget->setVisible(!colorIdentity.isEmpty());
+
+    // gameFormat is server-supplied and the QLabel renders AutoText, so escape it.
+    gameFormatLabel = new QLabel(gameFormat.toHtmlEscaped(), this);
+    gameFormatLabel->setAlignment(Qt::AlignCenter);
+    gameFormatLabel->setVisible(!gameFormat.isEmpty());
+
+    selectionCheckBox = new QCheckBox(this);
+    selectionCheckBox->setToolTip(tr("Select this deck"));
+    // The tile itself is focusable (Space/Enter toggles); keep the checkbox
+    // from creating a second tab stop per tile.
+    selectionCheckBox->setFocusPolicy(Qt::NoFocus);
+
+    // Selection frame reused from the deck-preview selection covenant: a
+    // palette(highlight) border around the banner card, shown while selected.
+    selectionFrame = new QFrame(bannerCardDisplayWidget);
+    selectionFrame->setAttribute(Qt::WA_TransparentForMouseEvents);
+    selectionFrame->setStyleSheet(QStringLiteral(
+        "QFrame { border: 2px solid palette(highlight); border-radius: 4px; background: transparent; }"));
+    selectionFrame->setVisible(false);
+
+    auto *selectionRow = new QHBoxLayout;
+    selectionRow->addWidget(selectionCheckBox);
+    selectionRow->addStretch(1);
+
+    auto *layout = new QVBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->addLayout(selectionRow);
+    layout->addWidget(bannerCardDisplayWidget, 0, Qt::AlignHCenter);
+    layout->addWidget(colorIdentityWidget, 0, Qt::AlignHCenter);
+    layout->addWidget(gameFormatLabel, 0, Qt::AlignHCenter);
+    setLayout(layout);
+
+    connect(selectionCheckBox, &QCheckBox::toggled, this, [this](bool checked) {
+        updateSelectionVisual(checked);
+        emit selectionToggled(checked);
+    });
+    connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageClicked, this,
+            &SharedDeckPreviewWidget::toggleSelection);
+    connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageDoubleClicked, this,
+            &SharedDeckPreviewWidget::activate);
+}
+
+bool SharedDeckPreviewWidget::isSelected() const
+{
+    return selectionCheckBox->isChecked();
+}
+
+void SharedDeckPreviewWidget::setSelected(bool selected)
+{
+    if (isSelected() == selected) {
+        return;
+    }
+    selectionCheckBox->setChecked(selected);
+}
+
+void SharedDeckPreviewWidget::updateSelectionVisual(bool selected)
+{
+    selectionFrame->setVisible(selected);
+    selectionFrame->raise();
+    if (selected) {
+        setAccessibleName(baseAccessibleName + tr(" (selected)"));
+    } else {
+        setAccessibleName(baseAccessibleName);
+    }
+}
+
+void SharedDeckPreviewWidget::setBaseAccessibleName(const QString &name)
+{
+    baseAccessibleName = name;
+    setAccessibleName(name);
+}
+
+void SharedDeckPreviewWidget::toggleSelection()
+{
+    setSelected(!isSelected());
+}
+
+void SharedDeckPreviewWidget::activate()
+{
+    setSelected(true);
+    emit activated();
+}
+
+void SharedDeckPreviewWidget::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+    updateSelectionFrameGeometry();
+}
+
+void SharedDeckPreviewWidget::updateSelectionFrameGeometry()
+{
+    if (selectionFrame == nullptr || bannerCardDisplayWidget == nullptr) {
+        return;
+    }
+    selectionFrame->setGeometry(bannerCardDisplayWidget->rect().adjusted(1, 1, -1, -1));
+}
+
+void SharedDeckPreviewWidget::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_Space || event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) {
+        toggleSelection();
+        event->accept();
+        return;
+    }
+    QWidget::keyPressEvent(event);
+}
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
new file mode 100644
index 000000000..bff7de743
--- /dev/null
+++ b/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.h
@@ -0,0 +1,77 @@
+/**
+ * @file shared_deck_preview_widget.h
+ * @ingroup DeckShareWidgets
+ */
+//! \todo Document this file.
+
+#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 QLabel;
+class CardDatabaseQuerier;
+
+/**
+ * @brief A selectable preview tile for a deck that has no local file.
+ *
+ * Renders a banner card picture (looked up by name in the card database), the
+ * deck name, color identity and game format. Used to preview decks shared via a
+ * cockatrice:// link (metadata from Command_DeckShareList) and the deck
+ * currently open in the deck editor.
+ *
+ * Selection follows the deck-preview covenant: the tile reports its click
+ * immediately (no double-click interval delay), a palette(highlight) frame
+ * marks the selected tile, and Space/Enter toggles selection from the keyboard.
+ * A double click selects the tile and emits activated() so the caller can open
+ * just that deck.
+ */
+class SharedDeckPreviewWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit SharedDeckPreviewWidget(QWidget *parent,
+                                     const CardDatabaseQuerier *querier,
+                                     const QString &deckName,
+                                     const QString &bannerCardName,
+                                     const QString &colorIdentity,
+                                     const QString &gameFormat = QString(),
+                                     const QString &deckToolTip = QString());
+
+    [[nodiscard]] bool isSelected() const;
+    void setSelected(bool selected);
+
+    void setBaseAccessibleName(const QString &name);
+
+signals:
+    void selectionToggled(bool selected);
+    void activated();
+
+protected:
+    void resizeEvent(QResizeEvent *event) override;
+    void keyPressEvent(QKeyEvent *event) override;
+
+private slots:
+    void toggleSelection();
+    void activate();
+
+private:
+    void updateSelectionVisual(bool selected);
+    void updateSelectionFrameGeometry();
+
+    DeckPreviewCardPictureWidget *bannerCardDisplayWidget;
+    ColorIdentityWidget *colorIdentityWidget;
+    QLabel *gameFormatLabel;
+    QCheckBox *selectionCheckBox;
+    QFrame *selectionFrame;
+    QString baseAccessibleName;
+};
+
+#endif // SHARED_DECK_PREVIEW_WIDGET_H
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
index 0bb0eb1c9..7a7e31a58 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
@@ -1,18 +1,35 @@
 #include "dlg_connect.h"
 
 #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 <QKeyEvent>
+#include <QHBoxLayout>
+#include <QIntValidator>
 #include <QLabel>
+#include <QList>
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
-#include <libcockatrice/utility/trice_limits.h>
+#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)
 {
@@ -20,7 +37,7 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
     previousHosts = new QComboBox(this);
 
     btnDeleteServer = new QPushButton(this);
-    btnDeleteServer->setIcon(QPixmap("theme:icons/remove_row"));
+    btnDeleteServer->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
     btnDeleteServer->setToolTip(tr("Delete the currently selected saved server"));
     btnDeleteServer->setFixedWidth(30);
 
@@ -28,7 +45,7 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
 
     hps = new HandlePublicServers(this);
     btnRefreshServers = new QPushButton(this);
-    btnRefreshServers->setIcon(QPixmap("theme:icons/sync"));
+    btnRefreshServers->setIcon(themePixmap(QStringLiteral("icons/sync")));
     btnRefreshServers->setToolTip(tr("Refresh the server list with known public servers"));
     btnRefreshServers->setFixedWidth(30);
 
@@ -98,7 +115,7 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
     updateDisplayInfo(previousHosts->currentText());
 
     btnForgotPassword = new QPushButton(this);
-    btnForgotPassword->setIcon(QPixmap("theme:icons/forgot_password"));
+    btnForgotPassword->setIcon(themePixmap(QStringLiteral("icons/forgot_password")));
     btnForgotPassword->setToolTip(tr("Reset Password"));
     btnForgotPassword->setFixedWidth(30);
     connect(btnForgotPassword, &QPushButton::released, this, &DlgConnect::actForgotPassword);
@@ -261,13 +278,7 @@ void DlgConnect::updateDisplayInfo(const QString &saveName)
     QStringList _data = uci.getServerInfo(saveName);
 
     if (_data.isEmpty()) {
-        _data << ""
-              << ""
-              << ""
-              << ""
-              << ""
-              << ""
-              << "";
+        _data << "" << "" << "" << "" << "" << "" << "";
     }
 
     bool savePasswordStatus = (_data.at(5) == "1");
@@ -276,6 +287,7 @@ void DlgConnect::updateDisplayInfo(const QString &saveName)
     hostEdit->setText(_data.at(1));
     portEdit->setText(_data.at(2));
     playernameEdit->setText(_data.at(3));
+    playernameEdit->setFocus();
     savePasswordCheckBox->setChecked(savePasswordStatus);
 
     if (savePasswordStatus) {
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
index 41993e068..10cb5366a 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.h
@@ -1,18 +1,19 @@
 /**
  * @file dlg_connect.h
  * @ingroup ConnectionDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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;
@@ -23,6 +24,9 @@ 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 198fa259b..f2dd8c1e4 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,9 +1,18 @@
 #include "dlg_convert_deck_to_cod_format.h"
 
+#include "../../../client/settings/cache_settings.h"
+#include "../../deck_loader/deck_file_format.h"
+
 #include <QCheckBox>
 #include <QDialogButtonBox>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
 #include <QLabel>
+#include <QMessageBox>
+#include <QObject>
 #include <QVBoxLayout>
+#include <libcockatrice/settings/visual_deck_storage_settings.h>
 
 DialogConvertDeckToCodFormat::DialogConvertDeckToCodFormat(QWidget *parent) : QDialog(parent)
 {
@@ -38,3 +47,71 @@ bool DialogConvertDeckToCodFormat::dontAskAgain() const
 {
     return dontAskAgainCheckbox->isChecked();
 }
+
+namespace
+{
+
+bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath)
+{
+    QFileInfo fileInfo(filePath);
+    QString newFileName = QDir::toNativeSeparators(fileInfo.path() + "/" + fileInfo.completeBaseName() + ".cod");
+
+    if (QFile::exists(newFileName)) {
+        QMessageBox::StandardButton reply =
+            QMessageBox::question(parent, QObject::tr("Overwrite Existing File?"),
+                                  QObject::tr("A .cod version of this deck already exists. Overwrite it?"),
+                                  QMessageBox::Yes | QMessageBox::No);
+        return reply == QMessageBox::Yes;
+    }
+    return true; // Safe to proceed
+}
+
+} // namespace
+
+bool DialogConvertDeckToCodFormat::promptIfRequired(QWidget *parent,
+                                                    const QString &filePath,
+                                                    const std::function<bool()> &convert)
+{
+    if (DeckFileFormat::getFormatFromName(filePath) == DeckFileFormat::Cockatrice) {
+        return true;
+    }
+
+    // Retrieve saved preference if the prompt is disabled
+    if (!SettingsCache::instance().visualDeckStorage().getVisualDeckStoragePromptForConversion()) {
+        if (!SettingsCache::instance().visualDeckStorage().getVisualDeckStorageAlwaysConvert()) {
+            return false;
+        }
+
+        if (!confirmOverwriteIfExists(parent, filePath)) {
+            return false;
+        }
+
+        return convert();
+    }
+
+    // Show the dialog to the user
+    DialogConvertDeckToCodFormat conversionDialog(parent);
+    if (conversionDialog.exec() != QDialog::Accepted) {
+        SettingsCache::instance().visualDeckStorage().setVisualDeckStoragePromptForConversion(
+            !conversionDialog.dontAskAgain());
+        SettingsCache::instance().visualDeckStorage().setVisualDeckStorageAlwaysConvert(false);
+
+        return false;
+    }
+
+    // Try to convert file
+    if (!confirmOverwriteIfExists(parent, filePath)) {
+        return false;
+    }
+
+    if (!convert()) {
+        return false;
+    }
+
+    if (conversionDialog.dontAskAgain()) {
+        SettingsCache::instance().visualDeckStorage().setVisualDeckStoragePromptForConversion(false);
+        SettingsCache::instance().visualDeckStorage().setVisualDeckStorageAlwaysConvert(true);
+    }
+
+    return true;
+}
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 61eea1d6e..de2fb9a63 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
@@ -2,17 +2,23 @@
  * @file dlg_convert_deck_to_cod_format.h
  * @ingroup LocalDeckStorageDialogs
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DIALOG_CONVERT_DECK_TO_COD_FORMAT_H
 #define DIALOG_CONVERT_DECK_TO_COD_FORMAT_H
 
-#include <QCheckBox>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QVBoxLayout>
+#include <QString>
+#include <QtGlobal>
+#include <functional>
+#include <qtmetamacros.h>
+
+class QWidget;
+class QCheckBox;
+class QDialogButtonBox;
+class QLabel;
+class QVBoxLayout;
 
 class DialogConvertDeckToCodFormat : public QDialog
 {
@@ -24,6 +30,21 @@ public:
 
     [[nodiscard]] bool dontAskAgain() const;
 
+    /**
+     * @brief Checks whether the deck file at \a filePath can store tags.
+     *
+     * If the file is not a .cod deck, prompts the user for conversion to the
+     * Cockatrice format, honoring the saved "always convert / don't ask again"
+     * preference. On acceptance \a convert is called to perform the conversion.
+     *
+     * @param parent The widget to parent the prompt to.
+     * @param filePath The path of the deck file to check.
+     * @param convert Called to convert the deck once the user agrees.
+     * @return true if tags can be stored (no conversion needed, or the conversion
+     *         was performed), false if the user declined to convert.
+     */
+    static bool promptIfRequired(QWidget *parent, const QString &filePath, const std::function<bool()> &convert);
+
 private:
     QVBoxLayout *layout;
     QLabel *label;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
index 55b999ee9..104b695e6 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp
@@ -2,22 +2,35 @@
 
 #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/utility/trice_limits.h>
+#include <libcockatrice/settings/game_settings.h>
+#include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+#include <string>
+
+class QWidget;
 
 void DlgCreateGame::sharedCtor()
 {
@@ -49,7 +62,7 @@ void DlgCreateGame::sharedCtor()
         auto *gameTypeRadioButton = new QRadioButton(gameTypeIterator.value(), this);
         gameTypeLayout->addWidget(gameTypeRadioButton);
         gameTypeCheckBoxes.insert(gameTypeIterator.key(), gameTypeRadioButton);
-        bool isChecked = SettingsCache::instance().getGameTypes().contains(gameTypeIterator.value() + ", ");
+        bool isChecked = SettingsCache::instance().game().getGameTypes().contains(gameTypeIterator.value() + ", ");
         gameTypeCheckBoxes[gameTypeIterator.key()]->setChecked(isChecked);
     }
     auto *gameTypeGroupBox = new QGroupBox(tr("Game type"));
@@ -109,7 +122,7 @@ void DlgCreateGame::sharedCtor()
     gameSetupOptionsLayout->addWidget(startingLifeTotalLabel, 0, 0);
     gameSetupOptionsLayout->addWidget(startingLifeTotalEdit, 0, 1);
     gameSetupOptionsLayout->addWidget(shareDecklistsOnLoadCheckBox, 1, 0);
-    if (room->getUserInfo()->user_level() & ServerInfo_User::IsJudge) {
+    if (room && room->getUserInfo()->user_level() & ServerInfo_User::IsJudge) {
         gameSetupOptionsLayout->addWidget(createGameAsJudgeCheckBox, 2, 0);
     } else {
         createGameAsJudgeCheckBox->setChecked(false);
@@ -154,23 +167,23 @@ DlgCreateGame::DlgCreateGame(TabRoom *_room, const QMap<int, QString> &_gameType
 {
     sharedCtor();
 
-    rememberGameSettings->setChecked(SettingsCache::instance().getRememberGameSettings());
-    descriptionEdit->setText(SettingsCache::instance().getGameDescription());
-    maxPlayersEdit->setValue(SettingsCache::instance().getMaxPlayers());
+    rememberGameSettings->setChecked(SettingsCache::instance().game().getRememberGameSettings());
+    descriptionEdit->setText(SettingsCache::instance().game().getGameDescription());
+    maxPlayersEdit->setValue(SettingsCache::instance().game().getMaxPlayers());
     if (room && room->getUserInfo()->user_level() & ServerInfo_User::IsRegistered) {
-        onlyBuddiesCheckBox->setChecked(SettingsCache::instance().getOnlyBuddies());
-        onlyRegisteredCheckBox->setChecked(SettingsCache::instance().getOnlyRegistered());
+        onlyBuddiesCheckBox->setChecked(SettingsCache::instance().game().getOnlyBuddies());
+        onlyRegisteredCheckBox->setChecked(SettingsCache::instance().game().getOnlyRegistered());
     } else {
         onlyBuddiesCheckBox->setEnabled(false);
         onlyRegisteredCheckBox->setEnabled(false);
     }
-    spectatorsAllowedCheckBox->setChecked(SettingsCache::instance().getSpectatorsAllowed());
-    spectatorsNeedPasswordCheckBox->setChecked(SettingsCache::instance().getSpectatorsNeedPassword());
-    spectatorsCanTalkCheckBox->setChecked(SettingsCache::instance().getSpectatorsCanTalk());
-    spectatorsSeeEverythingCheckBox->setChecked(SettingsCache::instance().getSpectatorsCanSeeEverything());
-    createGameAsSpectatorCheckBox->setChecked(SettingsCache::instance().getCreateGameAsSpectator());
-    startingLifeTotalEdit->setValue(SettingsCache::instance().getDefaultStartingLifeTotal());
-    shareDecklistsOnLoadCheckBox->setChecked(SettingsCache::instance().getShareDecklistsOnLoad());
+    spectatorsAllowedCheckBox->setChecked(SettingsCache::instance().game().getSpectatorsAllowed());
+    spectatorsNeedPasswordCheckBox->setChecked(SettingsCache::instance().game().getSpectatorsNeedPassword());
+    spectatorsCanTalkCheckBox->setChecked(SettingsCache::instance().game().getSpectatorsCanTalk());
+    spectatorsSeeEverythingCheckBox->setChecked(SettingsCache::instance().game().getSpectatorsCanSeeEverything());
+    createGameAsSpectatorCheckBox->setChecked(SettingsCache::instance().game().getCreateGameAsSpectator());
+    startingLifeTotalEdit->setValue(SettingsCache::instance().game().getDefaultStartingLifeTotal());
+    shareDecklistsOnLoadCheckBox->setChecked(SettingsCache::instance().game().getShareDecklistsOnLoad());
 
     if (!rememberGameSettings->isChecked()) {
         actReset();
@@ -213,10 +226,12 @@ DlgCreateGame::DlgCreateGame(const ServerInfo_Game &gameInfo, const QMap<int, QS
     spectatorsNeedPasswordCheckBox->setChecked(gameInfo.spectators_need_password());
     spectatorsCanTalkCheckBox->setChecked(gameInfo.spectators_can_chat());
     spectatorsSeeEverythingCheckBox->setChecked(gameInfo.spectators_omniscient());
+    shareDecklistsOnLoadCheckBox->setChecked(gameInfo.share_decklists_on_load());
 
     QSet<int> types;
-    for (int i = 0; i < gameInfo.game_types_size(); ++i)
+    for (int i = 0; i < gameInfo.game_types_size(); ++i) {
         types.insert(gameInfo.game_types(i));
+    }
 
     QMapIterator<int, QString> gameTypeIterator(gameTypes);
     while (gameTypeIterator.hasNext()) {
@@ -290,20 +305,20 @@ void DlgCreateGame::actOK()
         }
     }
 
-    SettingsCache::instance().setRememberGameSettings(rememberGameSettings->isChecked());
+    SettingsCache::instance().game().setRememberGameSettings(rememberGameSettings->isChecked());
     if (rememberGameSettings->isChecked()) {
-        SettingsCache::instance().setGameDescription(descriptionEdit->text());
-        SettingsCache::instance().setMaxPlayers(maxPlayersEdit->value());
-        SettingsCache::instance().setOnlyBuddies(onlyBuddiesCheckBox->isChecked());
-        SettingsCache::instance().setOnlyRegistered(onlyRegisteredCheckBox->isChecked());
-        SettingsCache::instance().setSpectatorsAllowed(spectatorsAllowedCheckBox->isChecked());
-        SettingsCache::instance().setSpectatorsNeedPassword(spectatorsNeedPasswordCheckBox->isChecked());
-        SettingsCache::instance().setSpectatorsCanTalk(spectatorsCanTalkCheckBox->isChecked());
-        SettingsCache::instance().setSpectatorsCanSeeEverything(spectatorsSeeEverythingCheckBox->isChecked());
-        SettingsCache::instance().setCreateGameAsSpectator(createGameAsSpectatorCheckBox->isChecked());
-        SettingsCache::instance().setDefaultStartingLifeTotal(startingLifeTotalEdit->value());
-        SettingsCache::instance().setShareDecklistsOnLoad(shareDecklistsOnLoadCheckBox->isChecked());
-        SettingsCache::instance().setGameTypes(_gameTypes);
+        SettingsCache::instance().game().setGameDescription(descriptionEdit->text());
+        SettingsCache::instance().game().setMaxPlayers(maxPlayersEdit->value());
+        SettingsCache::instance().game().setOnlyBuddies(onlyBuddiesCheckBox->isChecked());
+        SettingsCache::instance().game().setOnlyRegistered(onlyRegisteredCheckBox->isChecked());
+        SettingsCache::instance().game().setSpectatorsAllowed(spectatorsAllowedCheckBox->isChecked());
+        SettingsCache::instance().game().setSpectatorsNeedPassword(spectatorsNeedPasswordCheckBox->isChecked());
+        SettingsCache::instance().game().setSpectatorsCanTalk(spectatorsCanTalkCheckBox->isChecked());
+        SettingsCache::instance().game().setSpectatorsCanSeeEverything(spectatorsSeeEverythingCheckBox->isChecked());
+        SettingsCache::instance().game().setCreateGameAsSpectator(createGameAsSpectatorCheckBox->isChecked());
+        SettingsCache::instance().game().setDefaultStartingLifeTotal(startingLifeTotalEdit->value());
+        SettingsCache::instance().game().setShareDecklistsOnLoad(shareDecklistsOnLoadCheckBox->isChecked());
+        SettingsCache::instance().game().setGameTypes(_gameTypes);
     }
     PendingCommand *pend = room->prepareRoomCommand(cmd);
     connect(pend, &PendingCommand::finished, this, &DlgCreateGame::checkResponse);
@@ -316,9 +331,9 @@ void DlgCreateGame::checkResponse(const Response &response)
 {
     buttonBox->setEnabled(true);
 
-    if (response.response_code() == Response::RespOk)
+    if (response.response_code() == Response::RespOk) {
         accept();
-    else {
+    } else {
         QMessageBox::critical(this, tr("Error"), tr("Server error."));
         return;
     }
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
index e28363311..71b09997c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.h
@@ -1,15 +1,17 @@
 /**
  * @file dlg_create_game.h
  * @ingroup RoomDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_CREATEGAME_H
 #define DLG_CREATEGAME_H
 
 #include <QDialog>
 #include <QMap>
+#include <QString>
 #include <libcockatrice/utility/macros.h>
+#include <qtmetamacros.h>
 
 class QCheckBox;
 class QDialogButtonBox;
@@ -22,6 +24,7 @@ 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 349f4ca4c..9eb064beb 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp
@@ -2,9 +2,21 @@
 
 #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)
 {
@@ -54,7 +66,7 @@ void DlgDefaultTagsEditor::retranslateUi()
 void DlgDefaultTagsEditor::loadStringList()
 {
     listWidget->clear();
-    QStringList tags = SettingsCache::instance().getVisualDeckStorageDefaultTagsList();
+    QStringList tags = SettingsCache::instance().visualDeckStorage().getVisualDeckStorageDefaultTagsList();
     for (const QString &tag : tags) {
         auto *item = new QListWidgetItem(); // Create item but don't insert yet
 
@@ -95,8 +107,9 @@ void DlgDefaultTagsEditor::addItem()
     // Prevent duplicate tags
     for (int i = 0; i < listWidget->count(); ++i) {
         QWidget *widget = listWidget->itemWidget(listWidget->item(i));
-        if (!widget)
+        if (!widget) {
             continue;
+        }
         QLineEdit *lineEdit = widget->findChild<QLineEdit *>();
         if (lineEdit && lineEdit->text() == newTag) {
             QMessageBox::warning(this, tr("Duplicate Tag"), tr("This tag already exists."));
@@ -138,13 +151,14 @@ void DlgDefaultTagsEditor::confirmChanges()
     QStringList updatedList;
     for (int i = 0; i < listWidget->count(); ++i) {
         QWidget *widget = listWidget->itemWidget(listWidget->item(i));
-        if (!widget)
+        if (!widget) {
             continue;
+        }
         QLineEdit *lineEdit = widget->findChild<QLineEdit *>();
         if (lineEdit) {
             updatedList.append(lineEdit->text());
         }
     }
-    SettingsCache::instance().setVisualDeckStorageDefaultTagsList(updatedList);
+    SettingsCache::instance().visualDeckStorage().setVisualDeckStorageDefaultTagsList(updatedList);
     accept(); // Close dialog and confirm changes
 }
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 27af74105..081701485 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.h
@@ -2,16 +2,22 @@
  * @file dlg_default_tags_editor.h
  * @ingroup Dialogs
  * @ingroup DeckStorageWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_DEFAULT_TAGS_EDITOR_H
 #define DLG_DEFAULT_TAGS_EDITOR_H
 
 #include <QDialog>
-#include <QLineEdit>
-#include <QListWidget>
-#include <QVBoxLayout>
+#include <qtmetamacros.h>
+
+class QHBoxLayout;
+class QLineEdit;
+class QListWidget;
+class QListWidgetItem;
+class QPushButton;
+class QVBoxLayout;
+class QWidget;
 
 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 db5f21701..520ece007 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.cpp
@@ -3,12 +3,22 @@
 #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/trice_limits.h>
+#include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent), image()
 {
@@ -19,6 +29,9 @@ DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent), image()
 
     textLabel = new QLabel(tr("To change your avatar, choose a new image.\nTo remove your current avatar, confirm "
                               "without choosing a new image."));
+    hintLabel = new QLabel(
+        tr("Images are automatically downscaled to at most %1x%1 pixels.").arg(QString::number(MAX_AVATAR_DIMENSION)));
+
     browseButton = new QPushButton(tr("Browse..."));
     connect(browseButton, &QPushButton::clicked, this, &DlgEditAvatar::actBrowse);
 
@@ -26,6 +39,7 @@ DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent), image()
     grid->addWidget(imageLabel, 0, 0, 1, 2);
     grid->addWidget(textLabel, 1, 0);
     grid->addWidget(browseButton, 1, 1);
+    grid->addWidget(hintLabel, 2, 0, 1, 2);
 
     auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgEditAvatar::actOk);
@@ -72,6 +86,10 @@ QByteArray DlgEditAvatar::getImage()
         return QByteArray();
     }
 
+    if (image.width() > MAX_AVATAR_DIMENSION || image.height() > MAX_AVATAR_DIMENSION) {
+        image = image.scaled(MAX_AVATAR_DIMENSION, MAX_AVATAR_DIMENSION, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    }
+
     for (;;) {
         QByteArray ba;
         QBuffer buffer(&ba);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
index 641b736dc..4df45711c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_avatar.h
@@ -1,22 +1,24 @@
 /**
  * @file dlg_edit_avatar.h
  * @ingroup AccountDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_EDITAVATAR_H
 #define DLG_EDITAVATAR_H
 
-#include <QComboBox>
+#include <QByteArray>
 #include <QDialog>
-#include <QLineEdit>
+#include <QImage>
 #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
 {
@@ -29,8 +31,9 @@ private slots:
     void actBrowse();
 
 private:
+    static constexpr int MAX_AVATAR_DIMENSION = 1024;
     QImage image;
-    QLabel *textLabel, *imageLabel;
+    QLabel *textLabel, *imageLabel, *hintLabel;
     QPushButton *browseButton;
 };
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
index 998dafb66..59f80c79c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp
@@ -4,10 +4,16 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
-#include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/utility/trice_limits.h>
+#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)
 {
@@ -59,7 +65,7 @@ DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent)
 
 void DlgEditPassword::actOk()
 {
-    // TODO this stuff should be using qvalidators
+    //! \todo This stuff should be using QValidators.
     if (newPasswordEdit->text().length() < 8) {
         QMessageBox::critical(this, tr("Error"), tr("Your password is too short."));
         return;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
index ee8e45985..e80ede3f3 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h
@@ -1,18 +1,19 @@
 /**
  * @file dlg_edit_password.h
  * @ingroup AccountDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_EDITPASSWORD_H
 #define DLG_EDITPASSWORD_H
 
 #include <QDialog>
 #include <QLineEdit>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QLabel;
-class QPushButton;
-class QCheckBox;
+class QWidget;
 
 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 fe9cd181c..cbf61a394 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
@@ -1,25 +1,42 @@
 #include "dlg_edit_tokens.h"
 
+#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 <QInputDialog>
+#include <QItemSelectionModel>
 #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/trice_limits.h>
+#include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr)
 {
@@ -90,10 +107,10 @@ DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nul
             &DlgEditTokens::tokenSelectionChanged);
 
     QAction *aAddToken = new QAction(tr("Add token"), this);
-    aAddToken->setIcon(QPixmap("theme:icons/increment"));
+    aAddToken->setIcon(themePixmap(QStringLiteral("icons/increment")));
     connect(aAddToken, &QAction::triggered, this, &DlgEditTokens::actAddToken);
     QAction *aRemoveToken = new QAction(tr("Remove token"), this);
-    aRemoveToken->setIcon(QPixmap("theme:icons/decrement"));
+    aRemoveToken->setIcon(themePixmap(QStringLiteral("icons/decrement")));
     connect(aRemoveToken, &QAction::triggered, this, &DlgEditTokens::actRemoveToken);
 
     auto *databaseToolBar = new QToolBar;
@@ -149,8 +166,9 @@ void DlgEditTokens::actAddToken()
     QString name;
     for (;;) {
         name = getTextWithMax(this, tr("Add token"), tr("Please enter the name of the token:"));
-        if (name.isEmpty())
+        if (name.isEmpty()) {
             return;
+        }
         if (databaseModel->getDatabase()->query()->getCardInfo(name)) {
             QMessageBox::critical(this, tr("Error"),
                                   tr("The chosen name conflicts with an existing card or token.\nMake sure to enable "
@@ -181,18 +199,21 @@ void DlgEditTokens::actRemoveToken()
 
 void DlgEditTokens::colorChanged(int colorIndex)
 {
-    if (currentCard)
+    if (currentCard) {
         currentCard->setColors(QString(colorEdit->itemData(colorIndex).toChar()));
+    }
 }
 
 void DlgEditTokens::ptChanged(const QString &_pt)
 {
-    if (currentCard)
+    if (currentCard) {
         currentCard->setPowTough(_pt);
+    }
 }
 
 void DlgEditTokens::annotationChanged(const QString &_annotation)
 {
-    if (currentCard)
+    if (currentCard) {
         currentCard->setText(_annotation);
+    }
 }
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h
index f19646756..cde89d22b 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.h
@@ -1,14 +1,18 @@
 /**
  * @file dlg_edit_tokens.h
  * @ingroup GameDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_EDIT_TOKENS_H
 #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;
@@ -17,6 +21,7 @@ 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 dcfbc91e9..ffe8391a0 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp
@@ -4,9 +4,17 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
-#include <QHBoxLayout>
 #include <QLabel>
-#include <libcockatrice/utility/trice_limits.h>
+#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)
 {
@@ -26,8 +34,9 @@ DlgEditUser::DlgEditUser(QWidget *parent, QString email, QString country, QStrin
     int i = 1;
     for (const QString &c : countries) {
         countryEdit->addItem(QPixmap("theme:countries/" + c.toLower()), c);
-        if (c == country)
+        if (c == country) {
             countryEdit->setCurrentIndex(i);
+        }
 
         ++i;
     }
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h
index b89a3be04..0385c2bbe 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h
@@ -1,8 +1,8 @@
 /**
  * @file dlg_edit user.h
  * @ingroup NetworkDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_EDITUSER_H
 #define DLG_EDITUSER_H
@@ -10,10 +10,11 @@
 #include <QComboBox>
 #include <QDialog>
 #include <QLineEdit>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QLabel;
-class QPushButton;
-class QCheckBox;
+class QWidget;
 
 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 1bf98822c..cd3c3893e 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.cpp
@@ -1,15 +1,25 @@
 #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 <QPushButton>
+#include <QList>
+#include <QMapIterator>
+#include <QSharedPointer>
+#include <QSize>
 #include <QSpinBox>
+#include <QVBoxLayout>
+#include <qnamespace.h>
+#include <utility>
+
+class QWidget;
 
 DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes,
                                const GamesProxyModel *_gamesProxyModel,
@@ -22,49 +32,51 @@ DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes,
                   {QTime(1, 0), tr("1 hour")},
                   {QTime(2, 0), tr("2 hours")}})
 {
+    const GameFilterConfigs &filters = gamesProxyModel->getFilters();
+
     hideBuddiesOnlyGames = new QCheckBox(tr("Hide 'buddies only' games"));
-    hideBuddiesOnlyGames->setChecked(gamesProxyModel->getHideBuddiesOnlyGames());
+    hideBuddiesOnlyGames->setChecked(filters.hideBuddiesOnlyGames);
 
     hideFullGames = new QCheckBox(tr("Hide full games"));
-    hideFullGames->setChecked(gamesProxyModel->getHideFullGames());
+    hideFullGames->setChecked(filters.hideFullGames);
 
-    hideGamesThatStarted = new QCheckBox(tr("Hide games that have started"));
-    hideGamesThatStarted->setChecked(gamesProxyModel->getHideGamesThatStarted());
+    hideGamesThatStarted = new QCheckBox(tr("Hide started games"));
+    hideGamesThatStarted->setChecked(filters.hideGamesThatStarted);
 
     hidePasswordProtectedGames = new QCheckBox(tr("Hide password protected games"));
-    hidePasswordProtectedGames->setChecked(gamesProxyModel->getHidePasswordProtectedGames());
+    hidePasswordProtectedGames->setChecked(filters.hidePasswordProtectedGames);
 
     hideIgnoredUserGames = new QCheckBox(tr("Hide 'ignored user' games"));
-    hideIgnoredUserGames->setChecked(gamesProxyModel->getHideIgnoredUserGames());
+    hideIgnoredUserGames->setChecked(filters.hideIgnoredUserGames);
 
     hideNotBuddyCreatedGames = new QCheckBox(tr("Hide games not created by buddies"));
-    hideNotBuddyCreatedGames->setChecked(gamesProxyModel->getHideNotBuddyCreatedGames());
+    hideNotBuddyCreatedGames->setChecked(filters.hideNotBuddyCreatedGames);
 
     hideOpenDecklistGames = new QCheckBox(tr("Hide games with forced open decklists"));
-    hideOpenDecklistGames->setChecked(gamesProxyModel->getHideOpenDecklistGames());
+    hideOpenDecklistGames->setChecked(filters.hideOpenDecklistGames);
 
     maxGameAgeComboBox = new QComboBox();
     maxGameAgeComboBox->setEditable(false);
     maxGameAgeComboBox->addItems(gameAgeMap.values());
-    QTime gameAge = gamesProxyModel->getMaxGameAge();
+    QTime gameAge = filters.maxGameAge;
     maxGameAgeComboBox->setCurrentIndex(gameAgeMap.keys().indexOf(gameAge)); // index is -1 if unknown
     auto *maxGameAgeLabel = new QLabel(tr("&Newer than:"));
     maxGameAgeLabel->setBuddy(maxGameAgeComboBox);
 
     gameNameFilterEdit = new QLineEdit;
-    gameNameFilterEdit->setText(gamesProxyModel->getGameNameFilter());
+    gameNameFilterEdit->setText(filters.gameNameFilter);
     auto *gameNameFilterLabel = new QLabel(tr("Game &description:"));
     gameNameFilterLabel->setBuddy(gameNameFilterEdit);
-    creatorNameFilterEdit = new QLineEdit;
-    creatorNameFilterEdit->setText(gamesProxyModel->getCreatorNameFilters().join(", "));
-    auto *creatorNameFilterLabel = new QLabel(tr("&Creator name:"));
-    creatorNameFilterLabel->setBuddy(creatorNameFilterEdit);
+    hostNameFilterEdit = new QLineEdit;
+    hostNameFilterEdit->setText(filters.hostNameFilters.join(", "));
+    auto *hostNameFilterLabel = new QLabel(tr("&Host name:"));
+    hostNameFilterLabel->setBuddy(hostNameFilterEdit);
 
     auto *generalGrid = new QGridLayout;
     generalGrid->addWidget(gameNameFilterLabel, 0, 0);
     generalGrid->addWidget(gameNameFilterEdit, 0, 1);
-    generalGrid->addWidget(creatorNameFilterLabel, 1, 0);
-    generalGrid->addWidget(creatorNameFilterEdit, 1, 1);
+    generalGrid->addWidget(hostNameFilterLabel, 1, 0);
+    generalGrid->addWidget(hostNameFilterEdit, 1, 1);
     generalGrid->addWidget(maxGameAgeLabel, 2, 0);
     generalGrid->addWidget(maxGameAgeComboBox, 2, 1);
     generalGroupBox = new QGroupBox(tr("General"));
@@ -76,7 +88,7 @@ DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes,
         gameTypesIterator.next();
 
         auto *temp = new QCheckBox(gameTypesIterator.value());
-        temp->setChecked(gamesProxyModel->getGameTypeFilter().contains(gameTypesIterator.key()));
+        temp->setChecked(filters.gameTypeFilter.contains(gameTypesIterator.key()));
 
         gameTypeFilterCheckBoxes.insert(gameTypesIterator.key(), temp);
         gameTypeFilterLayout->addWidget(temp);
@@ -85,21 +97,22 @@ DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes,
     if (!allGameTypes.isEmpty()) {
         gameTypeFilterGroupBox = new QGroupBox(tr("&Game types"));
         gameTypeFilterGroupBox->setLayout(gameTypeFilterLayout);
-    } else
+    } else {
         gameTypeFilterGroupBox = nullptr;
+    }
 
     auto *maxPlayersFilterMinLabel = new QLabel(tr("at &least:"));
     maxPlayersFilterMinSpinBox = new QSpinBox;
     maxPlayersFilterMinSpinBox->setMinimum(0);
     maxPlayersFilterMinSpinBox->setMaximum(99);
-    maxPlayersFilterMinSpinBox->setValue(gamesProxyModel->getMaxPlayersFilterMin());
+    maxPlayersFilterMinSpinBox->setValue(filters.maxPlayersFilterMin);
     maxPlayersFilterMinLabel->setBuddy(maxPlayersFilterMinSpinBox);
 
     auto *maxPlayersFilterMaxLabel = new QLabel(tr("at &most:"));
     maxPlayersFilterMaxSpinBox = new QSpinBox;
     maxPlayersFilterMaxSpinBox->setMinimum(0);
     maxPlayersFilterMaxSpinBox->setMaximum(99);
-    maxPlayersFilterMaxSpinBox->setValue(gamesProxyModel->getMaxPlayersFilterMax());
+    maxPlayersFilterMaxSpinBox->setValue(filters.maxPlayersFilterMax);
     maxPlayersFilterMaxLabel->setBuddy(maxPlayersFilterMaxSpinBox);
 
     auto *maxPlayersFilterLayout = new QGridLayout;
@@ -124,17 +137,17 @@ DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes,
     restrictionsGroupBox->setLayout(restrictionsLayout);
 
     showOnlyIfSpectatorsCanWatch = new QCheckBox(tr("Show games only if &spectators can watch"));
-    showOnlyIfSpectatorsCanWatch->setChecked(gamesProxyModel->getShowOnlyIfSpectatorsCanWatch());
+    showOnlyIfSpectatorsCanWatch->setChecked(filters.showOnlyIfSpectatorsCanWatch);
     connect(showOnlyIfSpectatorsCanWatch, &QCheckBox::toggled, this,
             &DlgFilterGames::toggleSpectatorCheckboxEnabledness);
 
     showSpectatorPasswordProtected = new QCheckBox(tr("Show spectator password p&rotected games"));
-    showSpectatorPasswordProtected->setChecked(gamesProxyModel->getShowSpectatorPasswordProtected());
+    showSpectatorPasswordProtected->setChecked(filters.showSpectatorPasswordProtected);
     showOnlyIfSpectatorsCanChat = new QCheckBox(tr("Show only if spectators can ch&at"));
-    showOnlyIfSpectatorsCanChat->setChecked(gamesProxyModel->getShowOnlyIfSpectatorsCanChat());
+    showOnlyIfSpectatorsCanChat->setChecked(filters.showOnlyIfSpectatorsCanChat);
     showOnlyIfSpectatorsCanSeeHands = new QCheckBox(tr("Show only if spectators can see &hands"));
-    showOnlyIfSpectatorsCanSeeHands->setChecked(gamesProxyModel->getShowOnlyIfSpectatorsCanSeeHands());
-    toggleSpectatorCheckboxEnabledness(getShowOnlyIfSpectatorsCanWatch());
+    showOnlyIfSpectatorsCanSeeHands->setChecked(filters.showOnlyIfSpectatorsCanSeeHands);
+    toggleSpectatorCheckboxEnabledness(filters.showOnlyIfSpectatorsCanWatch);
 
     auto *spectatorsLayout = new QGridLayout;
     spectatorsLayout->addWidget(showOnlyIfSpectatorsCanWatch, 0, 0);
@@ -180,6 +193,27 @@ DlgFilterGames::DlgFilterGames(const QMap<int, QString> &_allGameTypes,
     setFixedHeight(sizeHint().height());
 }
 
+GameFilterConfigs DlgFilterGames::getFilters() const
+{
+    return {hideBuddiesOnlyGames->isChecked(),
+            hideIgnoredUserGames->isChecked(),
+            hideFullGames->isChecked(),
+            hideGamesThatStarted->isChecked(),
+            hidePasswordProtectedGames->isChecked(),
+            hideNotBuddyCreatedGames->isChecked(),
+            hideOpenDecklistGames->isChecked(),
+            gameNameFilterEdit->text(),
+            getHostNameFilters(),
+            getGameTypeFilter(),
+            maxPlayersFilterMinSpinBox->value(),
+            maxPlayersFilterMaxSpinBox->value(),
+            getMaxGameAge(),
+            showOnlyIfSpectatorsCanWatch->isChecked(),
+            getShowSpectatorPasswordProtected(),
+            getShowOnlyIfSpectatorsCanChat(),
+            getShowOnlyIfSpectatorsCanSeeHands()};
+}
+
 void DlgFilterGames::actOk()
 {
     accept();
@@ -192,49 +226,9 @@ void DlgFilterGames::toggleSpectatorCheckboxEnabledness(bool spectatorsEnabled)
     showOnlyIfSpectatorsCanSeeHands->setDisabled(!spectatorsEnabled);
 }
 
-bool DlgFilterGames::getHideFullGames() const
+QStringList DlgFilterGames::getHostNameFilters() const
 {
-    return hideFullGames->isChecked();
-}
-
-bool DlgFilterGames::getHideGamesThatStarted() const
-{
-    return hideGamesThatStarted->isChecked();
-}
-
-bool DlgFilterGames::getHideBuddiesOnlyGames() const
-{
-    return hideBuddiesOnlyGames->isChecked();
-}
-
-bool DlgFilterGames::getHidePasswordProtectedGames() const
-{
-    return hidePasswordProtectedGames->isChecked();
-}
-
-bool DlgFilterGames::getHideIgnoredUserGames() const
-{
-    return hideIgnoredUserGames->isChecked();
-}
-
-bool DlgFilterGames::getHideNotBuddyCreatedGames() const
-{
-    return hideNotBuddyCreatedGames->isChecked();
-}
-
-bool DlgFilterGames::getHideOpenDecklistGames() const
-{
-    return hideOpenDecklistGames->isChecked();
-}
-
-QString DlgFilterGames::getGameNameFilter() const
-{
-    return gameNameFilterEdit->text();
-}
-
-QStringList DlgFilterGames::getCreatorNameFilters() const
-{
-    return creatorNameFilterEdit->text().split(",", Qt::SkipEmptyParts);
+    return hostNameFilterEdit->text().split(",", Qt::SkipEmptyParts);
 }
 
 QSet<int> DlgFilterGames::getGameTypeFilter() const
@@ -243,36 +237,22 @@ QSet<int> DlgFilterGames::getGameTypeFilter() const
     QMapIterator<int, QCheckBox *> i(gameTypeFilterCheckBoxes);
     while (i.hasNext()) {
         i.next();
-        if (i.value()->isChecked())
+        if (i.value()->isChecked()) {
             result.insert(i.key());
+        }
     }
     return result;
 }
 
-int DlgFilterGames::getMaxPlayersFilterMin() const
-{
-    return maxPlayersFilterMinSpinBox->value();
-}
-
-int DlgFilterGames::getMaxPlayersFilterMax() const
-{
-    return maxPlayersFilterMaxSpinBox->value();
-}
-
 QTime DlgFilterGames::getMaxGameAge() const
 {
     int index = maxGameAgeComboBox->currentIndex();
-    if (index < 0 || index >= gameAgeMap.size()) { // index is out of bounds
-        return gamesProxyModel->getMaxGameAge();   // leave the setting unchanged
+    if (index < 0 || index >= gameAgeMap.size()) {       // index is out of bounds
+        return gamesProxyModel->getFilters().maxGameAge; // leave the setting unchanged
     }
     return gameAgeMap.keys().at(index);
 }
 
-bool DlgFilterGames::getShowOnlyIfSpectatorsCanWatch() const
-{
-    return showOnlyIfSpectatorsCanWatch->isChecked();
-}
-
 bool DlgFilterGames::getShowSpectatorPasswordProtected() const
 {
     return showSpectatorPasswordProtected->isEnabled() && showSpectatorPasswordProtected->isChecked();
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h
index abfdab28a..d7c11d0f1 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h
@@ -1,26 +1,29 @@
 /**
  * @file dlg_filter_games.h
  * @ingroup RoomDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_FILTER_GAMES_H
 #define DLG_FILTER_GAMES_H
 
-#include "../interface/widgets/server/games_model.h"
+#include "../server/game_filter_configs.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
 {
@@ -35,7 +38,7 @@ private:
     QCheckBox *hideNotBuddyCreatedGames;
     QCheckBox *hideOpenDecklistGames;
     QLineEdit *gameNameFilterEdit;
-    QLineEdit *creatorNameFilterEdit;
+    QLineEdit *hostNameFilterEdit;
     QMap<int, QCheckBox *> gameTypeFilterCheckBoxes;
     QSpinBox *maxPlayersFilterMinSpinBox;
     QSpinBox *maxPlayersFilterMaxSpinBox;
@@ -48,6 +51,14 @@ private:
 
     const QMap<int, QString> &allGameTypes;
     const GamesProxyModel *gamesProxyModel;
+    const QMap<QTime, QString> gameAgeMap;
+
+    [[nodiscard]] QStringList getHostNameFilters() const;
+    [[nodiscard]] QSet<int> getGameTypeFilter() const;
+    [[nodiscard]] QTime getMaxGameAge() const;
+    [[nodiscard]] bool getShowSpectatorPasswordProtected() const;
+    [[nodiscard]] bool getShowOnlyIfSpectatorsCanChat() const;
+    [[nodiscard]] bool getShowOnlyIfSpectatorsCanSeeHands() const;
 
 private slots:
     void actOk();
@@ -58,32 +69,7 @@ public:
                    const GamesProxyModel *_gamesProxyModel,
                    QWidget *parent = nullptr);
 
-    [[nodiscard]] bool getHideFullGames() const;
-    [[nodiscard]] bool getHideGamesThatStarted() const;
-    [[nodiscard]] bool getHidePasswordProtectedGames() const;
-    void setShowPasswordProtectedGames(bool _passwordProtectedGamesHidden);
-    [[nodiscard]] bool getHideBuddiesOnlyGames() const;
-    void setHideBuddiesOnlyGames(bool _hideBuddiesOnlyGames);
-    [[nodiscard]] bool getHideOpenDecklistGames() const;
-    void setHideOpenDecklistGames(bool _hideOpenDecklistGames);
-    [[nodiscard]] bool getHideIgnoredUserGames() const;
-    void setHideIgnoredUserGames(bool _hideIgnoredUserGames);
-    [[nodiscard]] bool getHideNotBuddyCreatedGames() const;
-    [[nodiscard]] QString getGameNameFilter() const;
-    void setGameNameFilter(const QString &_gameNameFilter);
-    [[nodiscard]] QStringList getCreatorNameFilters() const;
-    void setCreatorNameFilter(const QString &_creatorNameFilter);
-    [[nodiscard]] QSet<int> getGameTypeFilter() const;
-    void setGameTypeFilter(const QSet<int> &_gameTypeFilter);
-    [[nodiscard]] int getMaxPlayersFilterMin() const;
-    [[nodiscard]] int getMaxPlayersFilterMax() const;
-    void setMaxPlayersFilter(int _maxPlayersFilterMin, int _maxPlayersFilterMax);
-    [[nodiscard]] QTime getMaxGameAge() const;
-    const QMap<QTime, QString> gameAgeMap;
-    [[nodiscard]] bool getShowOnlyIfSpectatorsCanWatch() const;
-    [[nodiscard]] bool getShowSpectatorPasswordProtected() const;
-    [[nodiscard]] bool getShowOnlyIfSpectatorsCanChat() const;
-    [[nodiscard]] bool getShowOnlyIfSpectatorsCanSeeHands() const;
+    [[nodiscard]] GameFilterConfigs getFilters() const;
 };
 
 #endif
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 24e9030e0..3ee74faab 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp
@@ -4,10 +4,15 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
-#include <QHBoxLayout>
+#include <QIntValidator>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/utility/trice_limits.h>
+#include <QSize>
+#include <QVBoxLayout>
+#include <libcockatrice/settings/servers_settings.h>
+#include <libcockatrice/utility/string_limits.h>
+
+class QWidget;
 
 DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialog(parent)
 {
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 e8925b1d3..f5678af17 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h
@@ -1,19 +1,19 @@
 /**
  * @file dlg_forgot_password_challenge.h
  * @ingroup AccountDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_FORGOTPASSWORDCHALLENGE_H
 #define DLG_FORGOTPASSWORDCHALLENGE_H
 
-#include <QComboBox>
 #include <QDialog>
 #include <QLineEdit>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QLabel;
-class QPushButton;
-class QCheckBox;
+class QWidget;
 
 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 c33a41bed..0cb1773b6 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp
@@ -4,10 +4,15 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
-#include <QHBoxLayout>
+#include <QIntValidator>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/utility/trice_limits.h>
+#include <QSize>
+#include <QVBoxLayout>
+#include <libcockatrice/settings/servers_settings.h>
+#include <libcockatrice/utility/string_limits.h>
+
+class QWidget;
 
 DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(parent)
 {
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 e51dad810..ff255c748 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h
@@ -1,19 +1,19 @@
 /**
  * @file dlg_forgot_password_request.h
  * @ingroup AccountDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_FORGOTPASSWORDREQUEST_H
 #define DLG_FORGOTPASSWORDREQUEST_H
 
-#include <QComboBox>
 #include <QDialog>
 #include <QLineEdit>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QLabel;
-class QPushButton;
-class QCheckBox;
+class QWidget;
 
 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 e0d855d7e..6c1b95b43 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp
@@ -4,10 +4,17 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
-#include <QHBoxLayout>
+#include <QIntValidator>
 #include <QLabel>
 #include <QMessageBox>
-#include <libcockatrice/utility/trice_limits.h>
+#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)
 {
@@ -121,7 +128,7 @@ void DlgForgotPasswordReset::actOk()
         return;
     }
 
-    // TODO this stuff should be using qvalidators
+    //! \todo This stuff should be using QValidators.
     if (newpasswordEdit->text().length() < 8) {
         QMessageBox::critical(this, tr("Error"), tr("Your password is too short."));
         return;
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 3d110c71d..995d67359 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h
@@ -1,19 +1,19 @@
 /**
  * @file dlg_forgot_password_reset.h
  * @ingroup AccountDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_FORGOTPASSWORDRESET_H
 #define DLG_FORGOTPASSWORDRESET_H
 
-#include <QComboBox>
 #include <QDialog>
 #include <QLineEdit>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QLabel;
-class QPushButton;
-class QCheckBox;
+class QWidget;
 
 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
new file mode 100644
index 000000000..cf503856f
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.cpp
@@ -0,0 +1,117 @@
+#include "dlg_invite_to_game.h"
+
+#include "../server/user/user_list_manager.h"
+#include "../server/user/user_list_widget.h"
+#include "../tabs/tab_supervisor.h"
+
+#include <QGuiApplication>
+#include <QHBoxLayout>
+#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,
+                                 bool _onlyBuddies,
+                                 const QStringList &_excludeUserNames,
+                                 QWidget *parent)
+    : QDialog(parent), tabSupervisor(_tabSupervisor), inviteUrl(_inviteUrl), onlyBuddies(_onlyBuddies),
+      excludeUserNames(_excludeUserNames)
+{
+    setModal(true);
+
+    searchEdit = new QLineEdit(this);
+    searchEdit->setClearButtonEnabled(true);
+    connect(searchEdit, &QLineEdit::textChanged, this, &DlgInviteToGame::searchTextChanged);
+
+    // The embedded list is the real room user list without the hover popup:
+    // same manager, same delegate/painter, same sections, live via manager
+    // signals while the modal loop runs.
+    UserListManager *manager = tabSupervisor->getUserListManager();
+    userList = new UserListWidget(tabSupervisor, tabSupervisor->getClient(), UserListWidget::RoomList, this,
+                                  /*hasUserInfoPopup=*/false);
+    userList->setUserFilter([this, manager](const QString &name, bool online) {
+        return !excludeUserNames.contains(name) && online && !manager->isUserIgnored(name);
+    });
+    if (onlyBuddies) {
+        userList->setSectioned({UserListWidget::Section::Buddy});
+    } else {
+        userList->setSectioned({UserListWidget::Section::Buddy, UserListWidget::Section::Online});
+    }
+    userList->bind(manager);
+    userList->rebuild();
+
+    connect(userList, &UserListWidget::userActivated, this, &DlgInviteToGame::inviteCurrentUser);
+    connect(userList, &UserListWidget::currentUserChanged, this, [this](const QString &userName) {
+        currentUserName = userName;
+        inviteButton->setEnabled(!userName.isEmpty());
+    });
+
+    inviteButton = new QPushButton(this);
+    inviteButton->setEnabled(false);
+    inviteButton->setDefault(true);
+    connect(inviteButton, &QPushButton::clicked, this, [this] { inviteCurrentUser(currentUserName); });
+
+    cancelButton = new QPushButton(this);
+    connect(cancelButton, &QPushButton::clicked, this, &QDialog::reject);
+
+    auto *buttonRow = new QHBoxLayout;
+    buttonRow->addStretch();
+    buttonRow->addWidget(inviteButton);
+    buttonRow->addWidget(cancelButton);
+
+    auto *layout = new QVBoxLayout(this);
+    layout->addWidget(searchEdit);
+    layout->addWidget(userList, 1);
+    layout->addLayout(buttonRow);
+
+    retranslateUi();
+
+    // Default to a comfortably tall dialog so the list has room to breathe,
+    // capped by the available screen. No minimum is enforced: small screens
+    // and manual resizing can go shorter than this.
+    const QRect availableScreen = QGuiApplication::primaryScreen()->availableGeometry();
+    resize(sizeHint().width(), qMin(sizeHint().height() * 3, availableScreen.height() * 4 / 5));
+}
+
+void DlgInviteToGame::searchTextChanged(const QString &text)
+{
+    userList->setFilterText(text);
+}
+
+void DlgInviteToGame::inviteCurrentUser(const QString &userName)
+{
+    if (userName.isEmpty()) {
+        return;
+    }
+    // The invite link carries the game's id and, when the game has one, its
+    // description (makeGameJoinLink embeds both). Read them back so the prefix
+    // names the game by description first, then its id — identical to the
+    // context-menu invite so recipients see one consistent message style.
+    const QUrl inviteUrlObj(inviteUrl);
+    const QUrlQuery inviteQuery(inviteUrlObj);
+    const int gameId = inviteQuery.queryItemValue("gameid").toInt();
+    const QString gameDescription = inviteQuery.queryItemValue("game");
+    const QString prefix = gameDescription.isEmpty()
+                               ? tr("Join my game (#%1):").arg(gameId)
+                               : tr("Join my game \"%1\" (#%2):").arg(gameDescription).arg(gameId);
+    tabSupervisor->sendInviteToUser(userName, prefix + " " + inviteUrl);
+    accept();
+}
+
+void DlgInviteToGame::retranslateUi()
+{
+    setWindowTitle(tr("Invite to Game"));
+    searchEdit->setPlaceholderText(tr("Search users..."));
+    inviteButton->setText(tr("Invite"));
+    cancelButton->setText(tr("Cancel"));
+}
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.h b/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.h
new file mode 100644
index 000000000..cfcc48733
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_invite_to_game.h
@@ -0,0 +1,50 @@
+/**
+ * @file dlg_invite_to_game.h
+ * @ingroup RoomDialogs
+ */
+//! \todo Document this file.
+
+#ifndef DLG_INVITE_TO_GAME_H
+#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
+{
+    Q_OBJECT
+public:
+    DlgInviteToGame(TabSupervisor *_tabSupervisor,
+                    const QString &_inviteUrl,
+                    bool _onlyBuddies,
+                    const QStringList &_excludeUserNames,
+                    QWidget *parent = nullptr);
+
+private slots:
+    void searchTextChanged(const QString &text);
+    void inviteCurrentUser(const QString &userName);
+
+private:
+    TabSupervisor *tabSupervisor;
+    QString inviteUrl;
+    bool onlyBuddies;
+    QStringList excludeUserNames;
+    QString currentUserName;
+    QLineEdit *searchEdit;
+    UserListWidget *userList;
+    QPushButton *inviteButton;
+    QPushButton *cancelButton;
+
+    void retranslateUi();
+};
+
+#endif
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
index b87800909..cbf24db87 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp
@@ -3,11 +3,18 @@
 #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();
     if (startingDir.isEmpty()) {
-        startingDir = SettingsCache::instance().getDeckPath();
+        startingDir = SettingsCache::instance().paths().getDeckPath();
     }
 
     setDirectory(startingDir);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
index b103f6a56..5ba07c01d 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.h
@@ -2,13 +2,16 @@
  * @file dlg_load_deck.h
  * @ingroup LocalDeckStorageDialogs
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_LOAD_DECK_H
 #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 2a276479f..2c0fd3f6f 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
@@ -1,18 +1,27 @@
 #include "dlg_load_deck_from_clipboard.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/shortcuts_settings.h"
+#include "../../deck_loader/card_node_function.h"
 #include "../../deck_loader/deck_loader.h"
-#include "dlg_settings.h"
 
 #include <QApplication>
 #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
@@ -65,26 +74,26 @@ void AbstractDlgDeckTextEdit::setText(const QString &text)
 }
 
 /**
- * Tries to load the current contents of the contentsEdit into the DeckLoader
+ * Tries to load the current contents of the contentsEdit into the deckList
  *
- * @param deckLoader The DeckLoader to load the deck into
+ * @param deckList The deckList to load the deck into
  * @return Whether the loading was successful
  */
-bool AbstractDlgDeckTextEdit::loadIntoDeck(DeckLoader *deckLoader) const
+bool AbstractDlgDeckTextEdit::loadIntoDeck(DeckList &deckList) const
 {
     QString buffer = contentsEdit->toPlainText();
 
     if (buffer.contains("<cockatrice_deck version=\"1\">")) {
-        return deckLoader->getDeckList()->loadFromString_Native(buffer);
+        return deckList.loadFromString_Native(buffer);
     }
 
     QTextStream stream(&buffer);
 
-    if (deckLoader->getDeckList()->loadFromStream_Plain(stream, true)) {
+    if (deckList.loadFromStream_Plain(stream, true, CardNameNormalizer())) {
         if (loadSetNameAndNumberCheckBox->isChecked()) {
-            DeckLoader::resolveSetNameAndNumberToProviderID(deckLoader->getDeckList());
+            deckList.forEachCard(CardNodeFunction::ResolveProviderId());
         } else {
-            DeckLoader::clearSetNamesAndNumbers(deckLoader->getDeckList());
+            deckList.forEachCard(CardNodeFunction::ClearPrintingData());
         }
         return true;
     }
@@ -107,7 +116,7 @@ void AbstractDlgDeckTextEdit::keyPressEvent(QKeyEvent *event)
  *
  * @param parent The parent widget
  */
-DlgLoadDeckFromClipboard::DlgLoadDeckFromClipboard(QWidget *parent) : AbstractDlgDeckTextEdit(parent), deckList(nullptr)
+DlgLoadDeckFromClipboard::DlgLoadDeckFromClipboard(QWidget *parent) : AbstractDlgDeckTextEdit(parent)
 {
     setWindowTitle(tr("Load deck from clipboard"));
 
@@ -121,8 +130,6 @@ void DlgLoadDeckFromClipboard::actRefresh()
 
 void DlgLoadDeckFromClipboard::actOK()
 {
-    deckList = new DeckLoader(this);
-
     if (loadIntoDeck(deckList)) {
         accept();
     } else {
@@ -133,18 +140,15 @@ void DlgLoadDeckFromClipboard::actOK()
 /**
  * Creates the dialog window for the "Edit deck in clipboard" action
  *
- * @param _deckLoader The existing deck in the deck editor. Copies the instance
+ * @param _deckList The existing deck in the deck editor.
  * @param _annotated Whether to add annotations to the text that is loaded from the deck
  * @param parent The parent widget
  */
-DlgEditDeckInClipboard::DlgEditDeckInClipboard(DeckLoader *_deckLoader, bool _annotated, QWidget *parent)
-    : AbstractDlgDeckTextEdit(parent), annotated(_annotated)
+DlgEditDeckInClipboard::DlgEditDeckInClipboard(const DeckList &_deckList, bool _annotated, QWidget *parent)
+    : AbstractDlgDeckTextEdit(parent), deckList(_deckList), annotated(_annotated)
 {
     setWindowTitle(tr("Edit deck in clipboard"));
 
-    deckLoader = new DeckLoader(this, _deckLoader->getDeckList());
-    deckLoader->setParent(this);
-
     DlgEditDeckInClipboard::actRefresh();
 }
 
@@ -154,7 +158,7 @@ DlgEditDeckInClipboard::DlgEditDeckInClipboard(DeckLoader *_deckLoader, bool _an
  * @param addComments Whether to add annotations
  * @return A QString
  */
-static QString deckListToString(const DeckList *deckList, bool addComments)
+static QString deckListToString(const DeckList &deckList, bool addComments)
 {
     QString buffer;
     QTextStream stream(&buffer);
@@ -164,12 +168,12 @@ static QString deckListToString(const DeckList *deckList, bool addComments)
 
 void DlgEditDeckInClipboard::actRefresh()
 {
-    setText(deckListToString(deckLoader->getDeckList(), annotated));
+    setText(deckListToString(deckList, annotated));
 }
 
 void DlgEditDeckInClipboard::actOK()
 {
-    if (loadIntoDeck(deckLoader)) {
+    if (loadIntoDeck(deckList)) {
         accept();
     } else {
         QMessageBox::critical(this, tr("Error"), tr("Invalid deck list."));
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 982840228..f3cbb7b62 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
@@ -2,18 +2,22 @@
  * @file dlg_load_deck_from_clipboard.h
  * @ingroup LocalDeckStorageDialogs
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_LOAD_DECK_FROM_CLIPBOARD_H
 #define DLG_LOAD_DECK_FROM_CLIPBOARD_H
 
-#include <QCheckBox>
-#include <QDialog>
+#include "libcockatrice/deck_list/deck_list.h"
+
+#include <QDialog>
+#include <QString>
+#include <qtmetamacros.h>
 
-class DeckLoader;
 class QPlainTextEdit;
 class QPushButton;
+class QCheckBox;
+class QWidget;
 
 /**
  * Base class for dialog windows for actions that involve loading decks from text input.
@@ -35,15 +39,13 @@ public:
     /**
      * Gets the loaded deck. Only call this method after this dialog window has been successfully exec'd.
      *
-     * The returned DeckLoader is parented to this object; make sure to take ownership of the DeckLoader if you intend
-     * to use it, since otherwise it will get destroyed once this dlg is destroyed
-     * @return The DeckLoader
+     * @return The loaded decklist
      */
-    [[nodiscard]] virtual DeckLoader *getDeckList() const = 0;
+    [[nodiscard]] virtual const DeckList &getDeckList() = 0;
 
 protected:
     void setText(const QString &text);
-    bool loadIntoDeck(DeckLoader *deckLoader) const;
+    bool loadIntoDeck(DeckList &deckList) const;
     void keyPressEvent(QKeyEvent *event) override;
 
 protected slots:
@@ -62,12 +64,12 @@ protected slots:
     void actRefresh() override;
 
 private:
-    DeckLoader *deckList;
+    DeckList deckList;
 
 public:
     explicit DlgLoadDeckFromClipboard(QWidget *parent = nullptr);
 
-    [[nodiscard]] DeckLoader *getDeckList() const override
+    [[nodiscard]] const DeckList &getDeckList() override
     {
         return deckList;
     }
@@ -84,15 +86,15 @@ protected slots:
     void actRefresh() override;
 
 private:
-    DeckLoader *deckLoader;
+    DeckList deckList;
     bool annotated;
 
 public:
-    explicit DlgEditDeckInClipboard(DeckLoader *_deckLoader, bool _annotated, QWidget *parent = nullptr);
+    explicit DlgEditDeckInClipboard(const DeckList &_deckList, bool _annotated, QWidget *parent = nullptr);
 
-    [[nodiscard]] DeckLoader *getDeckList() const override
+    [[nodiscard]] const DeckList &getDeckList() override
     {
-        return deckLoader;
+        return deckList;
     }
 };
 
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 f29984ab0..88b7e2bb3 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,13 +1,36 @@
 #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)
 {
@@ -67,6 +90,7 @@ void DlgLoadDeckFromWebsite::accept()
         }
 
         QNetworkRequest request(QUrl(info.fullUrl));
+        request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
         QNetworkReply *reply = nam->get(request);
 
         QEventLoop loop;
@@ -95,11 +119,11 @@ void DlgLoadDeckFromWebsite::accept()
             }
 
             // Parse the plain text deck here
-            DeckLoader *loader = new DeckLoader(this);
+            DeckList deckList;
             QTextStream stream(&deckText);
-            loader->getDeckList()->loadFromStream_Plain(stream, false);
-            DeckLoader::resolveSetNameAndNumberToProviderID(loader->getDeckList());
-            deck = loader;
+            deckList.loadFromStream_Plain(stream, false, CardNameNormalizer());
+            deckList.forEachCard(CardNodeFunction::ResolveProviderId());
+            deck = deckList;
 
             QDialog::accept();
             return;
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 84adb760f..3f6e759f2 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
@@ -2,20 +2,27 @@
  * @file dlg_load_deck_from_website.h
  * @ingroup RemoteDeckStorageDialogs
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 <QNetworkAccessManager>
-#include <QVBoxLayout>
+#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;
 
 inline Q_LOGGING_CATEGORY(DlgLoadDeckFromWebsiteLog, "dlg_load_deck_from_website");
 
@@ -26,9 +33,9 @@ public:
     explicit DlgLoadDeckFromWebsite(QWidget *parent);
     void retranslateUi();
     bool testValidUrl();
-    DeckLoader *deck;
+    DeckList deck;
 
-    DeckLoader *getDeck()
+    const DeckList &getDeck() const
     {
         return deck;
     }
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 ffe08bec9..a56009fe4 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.cpp
@@ -3,9 +3,13 @@
 #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 b7e0d7aa3..cfec16d90 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h
@@ -2,19 +2,20 @@
  * @file dlg_load_remote_deck.h
  * @ingroup RemoteDeckStorageDialogs
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_STARTGAME_H
 #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
new file mode 100644
index 000000000..858deb751
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.cpp
@@ -0,0 +1,89 @@
+#include "dlg_local_game_options.h"
+
+#include "../../../client/settings/cache_settings.h"
+
+#include <QCheckBox>
+#include <QDialogButtonBox>
+#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);
+    numberPlayersEdit = new QSpinBox(this);
+    numberPlayersEdit->setMinimum(1);
+    numberPlayersEdit->setMaximum(8);
+    numberPlayersEdit->setValue(1);
+    numberPlayersLabel->setBuddy(numberPlayersEdit);
+
+    auto *generalGrid = new QGridLayout;
+    generalGrid->setContentsMargins(5, 5, 5, 5);
+    generalGrid->addWidget(numberPlayersLabel, 0, 0);
+    generalGrid->addWidget(numberPlayersEdit, 0, 1);
+    generalGroupBox = new QGroupBox(tr("General"), this);
+    generalGroupBox->setLayout(generalGrid);
+
+    startingLifeTotalLabel = new QLabel(tr("Starting life total:"), this);
+    startingLifeTotalEdit = new QSpinBox(this);
+    startingLifeTotalEdit->setMinimum(-999999999);
+    startingLifeTotalEdit->setMaximum(999999999);
+    startingLifeTotalEdit->setValue(20);
+    startingLifeTotalLabel->setBuddy(startingLifeTotalEdit);
+
+    auto *gameSetupGrid = new QGridLayout;
+    gameSetupGrid->setContentsMargins(5, 5, 5, 5);
+    gameSetupGrid->addWidget(startingLifeTotalLabel, 0, 0);
+    gameSetupGrid->addWidget(startingLifeTotalEdit, 0, 1);
+    gameSetupOptionsGroupBox = new QGroupBox(tr("Game setup options"), this);
+    gameSetupOptionsGroupBox->setLayout(gameSetupGrid);
+
+    rememberSettingsCheckBox = new QCheckBox(tr("Remember settings"), this);
+
+    buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgLocalGameOptions::actOK);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgLocalGameOptions::reject);
+
+    auto *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(generalGroupBox);
+    mainLayout->addWidget(gameSetupOptionsGroupBox);
+    mainLayout->addWidget(rememberSettingsCheckBox);
+    mainLayout->addWidget(buttonBox);
+    setLayout(mainLayout);
+
+    rememberSettingsCheckBox->setChecked(SettingsCache::instance().game().getLocalGameRememberSettings());
+    if (rememberSettingsCheckBox->isChecked()) {
+        numberPlayersEdit->setValue(SettingsCache::instance().game().getLocalGameMaxPlayers());
+        startingLifeTotalEdit->setValue(SettingsCache::instance().game().getLocalGameStartingLifeTotal());
+    }
+
+    setWindowTitle(tr("Local game options"));
+    setFixedHeight(sizeHint().height());
+
+    numberPlayersEdit->setFocus();
+}
+
+void DlgLocalGameOptions::actOK()
+{
+    SettingsCache::instance().game().setLocalGameRememberSettings(rememberSettingsCheckBox->isChecked());
+    if (rememberSettingsCheckBox->isChecked()) {
+        SettingsCache::instance().game().setLocalGameMaxPlayers(numberPlayersEdit->value());
+        SettingsCache::instance().game().setLocalGameStartingLifeTotal(startingLifeTotalEdit->value());
+    }
+
+    accept();
+}
+
+LocalGameOptions DlgLocalGameOptions::getOptions() const
+{
+    return LocalGameOptions{
+        .numberPlayers = numberPlayersEdit->value(),
+        .startingLifeTotal = startingLifeTotalEdit->value(),
+    };
+}
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.h b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.h
new file mode 100644
index 000000000..0725a08db
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_local_game_options.h
@@ -0,0 +1,56 @@
+/**
+ * @file dlg_local_game_options.h
+ * @ingroup RoomDialogs
+ * @brief Dialog for configuring local game options.
+ *
+ * Provides a user interface for setting up local games with configurable
+ * number of players and starting life total.
+ */
+
+#ifndef DLG_LOCAL_GAME_OPTIONS_H
+#define DLG_LOCAL_GAME_OPTIONS_H
+
+#include <QDialog>
+#include <qtmetamacros.h>
+
+class QWidget;
+
+struct LocalGameOptions
+{
+    int numberPlayers = 1;
+    int startingLifeTotal = 20;
+};
+
+class QCheckBox;
+class QDialogButtonBox;
+class QGroupBox;
+class QLabel;
+class QSpinBox;
+
+class DlgLocalGameOptions : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit DlgLocalGameOptions(QWidget *parent = nullptr);
+
+    [[nodiscard]] LocalGameOptions getOptions() const;
+
+private slots:
+    void actOK();
+
+private:
+    QGroupBox *generalGroupBox;
+    QGroupBox *gameSetupOptionsGroupBox;
+
+    QLabel *numberPlayersLabel;
+    QSpinBox *numberPlayersEdit;
+
+    QLabel *startingLifeTotalLabel;
+    QSpinBox *startingLifeTotalEdit;
+
+    QCheckBox *rememberSettingsCheckBox;
+
+    QDialogButtonBox *buttonBox;
+};
+
+#endif // DLG_LOCAL_GAME_OPTIONS_H
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.cpp
new file mode 100644
index 000000000..0a18a759f
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.cpp
@@ -0,0 +1,52 @@
+#include "dlg_login_prompt.h"
+
+#include <QCheckBox>
+#include <QDialogButtonBox>
+#include <QFormLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QVBoxLayout>
+
+class QWidget;
+
+DlgLoginPrompt::DlgLoginPrompt(const QString &serverText, QWidget *parent) : QDialog(parent)
+{
+    setWindowTitle(tr("Sign in"));
+
+    auto *mainLayout = new QVBoxLayout(this);
+    mainLayout->addWidget(
+        new QLabel(tr("This link requires you to be signed in.\nSign in to %1:").arg(serverText), this));
+
+    auto *formLayout = new QFormLayout;
+    usernameEdit = new QLineEdit(this);
+    passwordEdit = new QLineEdit(this);
+    passwordEdit->setEchoMode(QLineEdit::Password);
+    formLayout->addRow(tr("Username:"), usernameEdit);
+    formLayout->addRow(tr("Password:"), passwordEdit);
+    mainLayout->addLayout(formLayout);
+
+    savePasswordCheckBox = new QCheckBox(tr("Save password for this server"), this);
+    mainLayout->addWidget(savePasswordCheckBox);
+
+    auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+    mainLayout->addWidget(buttonBox);
+
+    usernameEdit->setFocus();
+}
+
+QString DlgLoginPrompt::username() const
+{
+    return usernameEdit->text().trimmed();
+}
+
+QString DlgLoginPrompt::password() const
+{
+    return passwordEdit->text();
+}
+
+bool DlgLoginPrompt::savePassword() const
+{
+    return savePasswordCheckBox->isChecked();
+}
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h b/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h
new file mode 100644
index 000000000..47bf3bcf4
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h
@@ -0,0 +1,43 @@
+/**
+ * @file dlg_login_prompt.h
+ * @ingroup ConnectionDialogs
+ */
+//! \todo Document this file.
+
+#ifndef DLG_LOGIN_PROMPT_H
+#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
+ * that are not saved for the target server.
+ *
+ * The entered name and password are handed to the intent chain; when the user
+ * opts to save them, they are stored in the server settings so that later links
+ * to the same server connect seamlessly.
+ */
+class DlgLoginPrompt : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit DlgLoginPrompt(const QString &serverText, QWidget *parent = nullptr);
+
+    [[nodiscard]] QString username() const;
+    [[nodiscard]] QString password() const;
+    [[nodiscard]] bool savePassword() const;
+
+private:
+    QLineEdit *usernameEdit;
+    QLineEdit *passwordEdit;
+    QCheckBox *savePasswordCheckBox;
+};
+
+#endif // DLG_LOGIN_PROMPT_H
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
index 2cda51f2a..dbfe38e26 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
@@ -1,26 +1,50 @@
 #include "dlg_manage_sets.h"
 
 #include "../../../client/settings/cache_settings.h"
+#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>
-
-#define SORT_RESET -1
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/settings/download_settings.h>
+#include <libcockatrice/settings/layouts_settings.h>
 
 WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
 {
@@ -33,28 +57,28 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
     setsEditToolBar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
 
     aTop = new QAction(QString(), this);
-    aTop->setIcon(QPixmap("theme:icons/arrow_top_green"));
+    aTop->setIcon(themePixmap(QStringLiteral("icons/arrow_top_green")));
     aTop->setToolTip(tr("Move selected set to the top"));
     aTop->setEnabled(false);
     connect(aTop, &QAction::triggered, this, &WndSets::actTop);
     setsEditToolBar->addAction(aTop);
 
     aUp = new QAction(QString(), this);
-    aUp->setIcon(QPixmap("theme:icons/arrow_up_green"));
+    aUp->setIcon(themePixmap(QStringLiteral("icons/arrow_up_green")));
     aUp->setToolTip(tr("Move selected set up"));
     aUp->setEnabled(false);
     connect(aUp, &QAction::triggered, this, &WndSets::actUp);
     setsEditToolBar->addAction(aUp);
 
     aDown = new QAction(QString(), this);
-    aDown->setIcon(QPixmap("theme:icons/arrow_down_green"));
+    aDown->setIcon(themePixmap(QStringLiteral("icons/arrow_down_green")));
     aDown->setToolTip(tr("Move selected set down"));
     aDown->setEnabled(false);
     connect(aDown, &QAction::triggered, this, &WndSets::actDown);
     setsEditToolBar->addAction(aDown);
 
     aBottom = new QAction(QString(), this);
-    aBottom->setIcon(QPixmap("theme:icons/arrow_bottom_green"));
+    aBottom->setIcon(themePixmap(QStringLiteral("icons/arrow_bottom_green")));
     aBottom->setToolTip(tr("Move selected set to the bottom"));
     aBottom->setEnabled(false);
     connect(aBottom, &QAction::triggered, this, &WndSets::actBottom);
@@ -63,8 +87,8 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
     // search field
     searchField = new LineEditUnfocusable;
     searchField->setObjectName("searchEdit");
-    searchField->setPlaceholderText(tr("Search by set name, code, or type"));
-    searchField->addAction(QPixmap("theme:icons/search"), LineEditUnfocusable::LeadingPosition);
+    searchField->setPlaceholderText(tr("Search by set name, code, type, or release date"));
+    searchField->addAction(themePixmap(QStringLiteral("icons/search")), LineEditUnfocusable::LeadingPosition);
     searchField->setClearButtonEnabled(true);
     setFocusProxy(searchField);
 
@@ -97,7 +121,6 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
     view->setDropIndicatorShown(true);
     view->setDragDropMode(QAbstractItemView::InternalMove);
 
-    view->sortByColumn(SetsModel::SortKeyCol, Qt::AscendingOrder);
     view->setColumnHidden(SetsModel::SortKeyCol, true);
     view->setColumnHidden(SetsModel::IsKnownCol, true);
     view->setColumnHidden(SetsModel::PriorityCol, true);
@@ -155,12 +178,6 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
     sortWarning->setLayout(sortWarningLayout);
     sortWarning->setVisible(false);
 
-    includeRebalancedCards = SettingsCache::instance().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);
@@ -174,9 +191,8 @@ 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(includeRebalancedCardsCheckBox, 4, 1, 1, 2);
-    mainLayout->addWidget(hintsGroupBox, 5, 1, 1, 2);
-    mainLayout->addWidget(buttonBox, 6, 1, 1, 2);
+    mainLayout->addWidget(hintsGroupBox, 4, 1, 1, 2);
+    mainLayout->addWidget(buttonBox, 5, 1, 1, 2);
     mainLayout->setColumnStretch(1, 1);
     mainLayout->setColumnStretch(2, 1);
 
@@ -189,17 +205,17 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
 
     setWindowTitle(tr("Manage sets"));
     setMinimumSize(800, 500);
-    auto &geometry = SettingsCache::instance().getSetsDialogGeometry();
+    auto geometry = SettingsCache::instance().layouts().getSetsDialogGeometry();
     if (!geometry.isEmpty()) {
         restoreGeometry(geometry);
     }
-    auto &headerState = SettingsCache::instance().layouts().getSetsDialogHeaderState();
+    auto headerState = SettingsCache::instance().layouts().getSetsDialogHeaderState();
     if (!headerState.isEmpty()) {
         view->header()->restoreState(headerState);
-        view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
     } else {
         view->header()->resizeSections(QHeaderView::ResizeToContents);
     }
+    resetSort();
     connect(view->header(), &QHeaderView::geometriesChanged, this, &WndSets::saveHeaderState);
 }
 
@@ -209,7 +225,7 @@ WndSets::~WndSets()
 
 void WndSets::closeEvent(QCloseEvent * /*ev*/)
 {
-    SettingsCache::instance().setSetsDialogGeometry(saveGeometry());
+    SettingsCache::instance().layouts().setSetsDialogGeometry(saveGeometry());
 }
 
 void WndSets::saveHeaderState()
@@ -219,8 +235,9 @@ void WndSets::saveHeaderState()
 
 void WndSets::rebuildMainLayout(int actionToTake)
 {
-    if (mainLayout == nullptr)
+    if (mainLayout == nullptr) {
         return;
+    }
 
     switch (actionToTake) {
         case NO_SETS_SELECTED:
@@ -239,16 +256,22 @@ void WndSets::rebuildMainLayout(int actionToTake)
     }
 }
 
-void WndSets::includeRebalancedCardsChanged(bool _includeRebalancedCards)
+void WndSets::resetSort()
 {
-    includeRebalancedCards = _includeRebalancedCards;
+    view->sortByColumn(SetsModel::SortKeyCol, Qt::AscendingOrder);
+    sortIndex = -1;
+    sortWarning->setVisible(false);
 }
 
 void WndSets::actSave()
 {
     model->save(CardDatabaseManager::getInstance());
-    SettingsCache::instance().setIncludeRebalancedCards(includeRebalancedCards);
     CardPictureLoader::clearPixmapCache();
+    const auto reloadOk1 = QtConcurrent::run([] {
+        CardDatabaseManager::getInstance()->reloadCardDatabasesAndNotify();
+
+        SettingsCache::instance().downloads().sync();
+    });
     close();
 }
 
@@ -260,9 +283,9 @@ void WndSets::actRestore()
 
 void WndSets::actRestoreOriginalOrder()
 {
-    view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
     model->restoreOriginalOrder();
-    sortWarning->setVisible(false);
+    view->selectionModel()->reset();
+    resetSort();
 }
 
 void WndSets::actDisableResetButton(const QString &filterString)
@@ -288,11 +311,12 @@ void WndSets::actSort(int index)
             sortIndex = index;
             sortWarning->setVisible(true);
         } else {
-            view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
-            sortIndex = -1;
-            sortWarning->setVisible(false);
+            resetSort();
         }
     }
+    if (!view->selectionModel()->selection().empty()) {
+        view->scrollTo(view->selectionModel()->selectedRows().first());
+    }
 }
 
 void WndSets::actIgnoreWarning()
@@ -301,23 +325,18 @@ void WndSets::actIgnoreWarning()
         return;
     }
     model->sort(sortIndex, sortOrder);
-    view->header()->setSortIndicator(SORT_RESET, Qt::DescendingOrder);
-    sortIndex = -1;
-    sortWarning->setVisible(false);
+    resetSort();
 }
 
 void WndSets::actDisableSortButtons(int index)
 {
-    if (index != SORT_RESET) {
+    if (index != SetsModel::SortKeyCol) {
         view->setDragEnabled(false);
         setOrderIsSorted = true;
     } else {
         setOrderIsSorted = false;
         view->setDragEnabled(true);
     }
-    if (!view->selectionModel()->selection().empty()) {
-        view->scrollTo(view->selectionModel()->selectedRows().first());
-    }
     actToggleButtons(view->selectionModel()->selection(), QItemSelection());
 }
 
@@ -376,12 +395,14 @@ void WndSets::actUp()
     std::sort(rows.begin(), rows.end(), std::less<QModelIndex>());
     QSet<int> newRows;
 
-    if (rows.empty())
+    if (rows.empty()) {
         return;
+    }
 
     for (auto i : rows) {
-        if (i.row() <= 0)
+        if (i.row() <= 0) {
             continue;
+        }
         int oldRow = displayModel->mapToSource(i).row();
         int newRow = i.row() - 1;
 
@@ -399,12 +420,14 @@ void WndSets::actDown()
     std::sort(rows.begin(), rows.end(), [](const QModelIndex &a, const QModelIndex &b) { return b < a; });
     QSet<int> newRows;
 
-    if (rows.empty())
+    if (rows.empty()) {
         return;
+    }
 
     for (auto i : rows) {
-        if (i.row() >= displayModel->rowCount() - 1)
+        if (i.row() >= displayModel->rowCount() - 1) {
             continue;
+        }
         int oldRow = displayModel->mapToSource(i).row();
         int newRow = i.row() + 1;
 
@@ -422,8 +445,9 @@ void WndSets::actTop()
     QSet<int> newRows;
     int newRow = 0;
 
-    if (rows.empty())
+    if (rows.empty()) {
         return;
+    }
 
     for (int i = 0; i < rows.length(); i++) {
         int oldRow = displayModel->mapToSource(rows.at(i)).row();
@@ -448,8 +472,9 @@ void WndSets::actBottom()
     QSet<int> newRows;
     int newRow = model->rowCount() - 1;
 
-    if (rows.empty())
+    if (rows.empty()) {
         return;
+    }
 
     for (int i = 0; i < rows.length(); i++) {
         int oldRow = displayModel->mapToSource(rows.at(i)).row();
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
index d7341caff..67b4c90b1 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.h
@@ -1,18 +1,17 @@
 /**
  * @file dlg_manage_sets.h
  * @ingroup Dialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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;
@@ -20,7 +19,14 @@ class QPushButton;
 class QTreeView;
 class SetsDisplayModel;
 class SetsModel;
-class SetsProxyModel;
+class QAction;
+class QDialogButtonBox;
+class QGridLayout;
+class QHBoxLayout;
+class QLabel;
+class QToolBar;
+class QWidget;
+template <class T> class QSet;
 
 class WndSets : public QMainWindow
 {
@@ -45,17 +51,18 @@ private:
     QHBoxLayout *filterBox;
     int sortIndex;
     Qt::SortOrder sortOrder;
-    void closeEvent(QCloseEvent *ev) override;
-    void saveHeaderState();
-    void rebuildMainLayout(int actionToTake);
     bool setOrderIsSorted;
-    bool includeRebalancedCards;
     enum
     {
         NO_SETS_SELECTED,
         SOME_SETS_SELECTED
     };
 
+    void closeEvent(QCloseEvent *ev) override;
+    void saveHeaderState();
+    void rebuildMainLayout(int actionToTake);
+    void resetSort();
+
 public:
     explicit WndSets(QWidget *parent = nullptr);
     ~WndSets() override;
@@ -79,7 +86,6 @@ 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
new file mode 100644
index 000000000..52c9eaef0
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.cpp
@@ -0,0 +1,307 @@
+#include "dlg_my_reports.h"
+
+#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>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QSharedPointer>
+#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
+{
+constexpr int COL_ID = 0;
+constexpr int COL_TIME = 1;
+constexpr int COL_REPORTED = 2;
+constexpr int COL_CATEGORY = 3;
+constexpr int COL_GAMEID = 4;
+constexpr int COL_STATUS = 5;
+constexpr int COL_ASSIGNED = 6;
+constexpr int COL_COUNT = 7;
+} // namespace
+
+DlgMyReports::DlgMyReports(AbstractClient *_client, QWidget *parent)
+    : QDialog(parent), client(_client), selectedReportId(-1)
+{
+    setWindowTitle(tr("My Reports"));
+    setMinimumSize(800, 500);
+
+    table = new QTableWidget(0, COL_COUNT);
+    table->setHorizontalHeaderLabels(
+        {tr("#"), tr("Time"), tr("Reported User"), tr("Category"), tr("Game ID"), tr("Status"), tr("Assigned To")});
+    table->setSelectionBehavior(QAbstractItemView::SelectRows);
+    table->setSelectionMode(QAbstractItemView::SingleSelection);
+    table->setEditTriggers(QAbstractItemView::NoEditTriggers);
+    table->setSortingEnabled(true);
+    table->verticalHeader()->setVisible(false);
+    table->setAlternatingRowColors(true);
+    table->horizontalHeader()->setSectionResizeMode(COL_TIME, QHeaderView::ResizeToContents);
+    table->horizontalHeader()->setSectionResizeMode(COL_REPORTED, QHeaderView::Stretch);
+    connect(table, &QTableWidget::itemSelectionChanged, this, &DlgMyReports::onSelectionChanged);
+
+    auto *detailsGroup = new QGroupBox(tr("Report Details"));
+    descriptionEdit = new QTextEdit;
+    descriptionEdit->setReadOnly(true);
+    descriptionEdit->setFixedHeight(80);
+
+    auto *chatGroup = new QGroupBox(tr("Chat Log Context"));
+    chatLogEdit = new QTextEdit;
+    chatLogEdit->setReadOnly(true);
+    QFont monoFont("monospace");
+    monoFont.setStyleHint(QFont::Monospace);
+    const int systemPointSize = QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSize();
+    if (systemPointSize > 0) {
+        monoFont.setPointSize(systemPointSize);
+    }
+    chatLogEdit->setFont(monoFont);
+    auto *chatLayout = new QVBoxLayout(chatGroup);
+    chatLayout->setContentsMargins(4, 4, 4, 4);
+    chatLayout->addWidget(chatLogEdit);
+
+    auto *commentsLabel = new QLabel(tr("Comments:"));
+    commentsEdit = new QTextEdit;
+    commentsEdit->setReadOnly(true);
+    commentsEdit->setFixedHeight(120);
+
+    auto *addCommentLabel = new QLabel(tr("Add a comment:"));
+    commentInput = new QLineEdit;
+    commentInput->setPlaceholderText(tr("Type your comment here..."));
+    commentButton = new QPushButton(tr("Send"));
+    commentButton->setEnabled(false);
+    connect(commentButton, &QPushButton::clicked, this, &DlgMyReports::addComment);
+    connect(commentInput, &QLineEdit::returnPressed, this, &DlgMyReports::addComment);
+
+    auto *detailsLayout = new QVBoxLayout(detailsGroup);
+    detailsLayout->setContentsMargins(4, 4, 4, 4);
+    detailsLayout->addWidget(descriptionEdit);
+    detailsLayout->addWidget(chatGroup);
+    detailsLayout->addWidget(commentsLabel);
+    detailsLayout->addWidget(commentsEdit);
+    detailsLayout->addWidget(addCommentLabel);
+    auto *commentRow = new QHBoxLayout;
+    commentRow->addWidget(commentInput);
+    commentRow->addWidget(commentButton);
+    detailsLayout->addLayout(commentRow);
+
+    closeButton = new QPushButton(tr("Close"));
+    connect(closeButton, &QPushButton::clicked, this, &QDialog::accept);
+
+    refreshButton = new QPushButton(tr("Refresh"));
+    connect(refreshButton, &QPushButton::clicked, this, &DlgMyReports::refreshList);
+
+    statusLabel = new QLabel;
+
+    auto *bottomBar = new QHBoxLayout;
+    bottomBar->addWidget(statusLabel);
+    bottomBar->addStretch();
+    bottomBar->addWidget(refreshButton);
+    bottomBar->addWidget(closeButton);
+
+    auto *layout = new QVBoxLayout(this);
+    layout->addWidget(table, 1);
+    layout->addWidget(detailsGroup);
+    layout->addLayout(bottomBar);
+
+    setActionsEnabled(false);
+    refreshList();
+}
+
+void DlgMyReports::refreshList()
+{
+    selectedReportIdBeforeRefresh = selectedReportId;
+    commentDraftBeforeRefresh = commentInput->text();
+    statusLabel->setText(tr("Loading..."));
+    refreshButton->setEnabled(false);
+    table->setRowCount(0);
+    currentReports.clear();
+    descriptionEdit->clear();
+    chatLogEdit->clear();
+    commentsEdit->clear();
+    commentInput->clear();
+    setActionsEnabled(false);
+    selectedReportId = -1;
+
+    Command_ReportMyList cmd;
+
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &DlgMyReports::reportListResponse);
+    client->sendCommand(pend);
+}
+
+void DlgMyReports::reportListResponse(const Response &response)
+{
+    refreshButton->setEnabled(true);
+
+    if (response.response_code() != Response::RespOk) {
+        statusLabel->setText(tr("Failed to load reports."));
+        return;
+    }
+
+    const Response_ReportMyList &resp = response.GetExtension(Response_ReportMyList::ext);
+    currentReports.clear();
+    for (int i = 0; i < resp.reports_size(); ++i) {
+        currentReports.append(resp.reports(i));
+    }
+
+    table->setSortingEnabled(false);
+    table->setRowCount(currentReports.size());
+
+    for (int row = 0; row < currentReports.size(); ++row) {
+        const ServerInfo_Report &r = currentReports[row];
+
+        report_utils::fillReportTableRow(table, row, r, COL_ID, COL_TIME, COL_REPORTED, COL_CATEGORY, COL_GAMEID,
+                                         COL_STATUS, COL_ASSIGNED);
+    }
+
+    table->setSortingEnabled(true);
+    table->resizeColumnsToContents();
+    table->horizontalHeader()->setSectionResizeMode(COL_REPORTED, QHeaderView::Stretch);
+
+    if (selectedReportIdBeforeRefresh >= 0) {
+        for (int row = 0; row < table->rowCount(); ++row) {
+            if (table->item(row, COL_ID) &&
+                table->item(row, COL_ID)->data(Qt::UserRole).toInt() == selectedReportIdBeforeRefresh) {
+                table->setCurrentCell(row, 0);
+                break;
+            }
+        }
+    }
+
+    if (commentInput->text().isEmpty()) {
+        commentInput->setText(commentDraftBeforeRefresh);
+    }
+
+    statusLabel->setText(tr("%1 report(s)").arg(currentReports.size()));
+}
+
+void DlgMyReports::onSelectionChanged()
+{
+    const int row = table->currentRow();
+    if (row < 0 || !table->item(row, COL_ID)) {
+        descriptionEdit->clear();
+        chatLogEdit->clear();
+        commentsEdit->clear();
+        commentInput->clear();
+        commentButton->setEnabled(false);
+        selectedReportId = -1;
+        return;
+    }
+
+    const int reportId = table->item(row, COL_ID)->data(Qt::UserRole).toInt();
+    selectedReportId = reportId;
+
+    for (const ServerInfo_Report &r : currentReports) {
+        if (r.report_id() == reportId) {
+            descriptionEdit->setPlainText(QString::fromStdString(r.description()));
+            break;
+        }
+    }
+
+    chatLogEdit->setPlainText(tr("Loading..."));
+    commentsEdit->setPlainText(tr("Loading..."));
+
+    Command_ReportDetails cmd;
+    cmd.set_report_id(reportId);
+
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &DlgMyReports::reportDetailsResponse);
+    client->sendCommand(pend);
+
+    QString status = table->item(row, COL_STATUS)->text();
+    bool canComment = (status == "open" || status == "assigned");
+    commentButton->setEnabled(canComment);
+    commentInput->setEnabled(canComment);
+    if (!canComment) {
+        commentInput->setPlaceholderText(tr("This report is closed."));
+    } else {
+        commentInput->setPlaceholderText(tr("Type your comment here..."));
+    }
+}
+
+void DlgMyReports::reportDetailsResponse(const Response &response)
+{
+    if (response.response_code() != Response::RespOk) {
+        if (selectedReportId == -1) {
+            return;
+        }
+        chatLogEdit->clear();
+        commentsEdit->setPlainText(tr("Failed to load report details."));
+        return;
+    }
+
+    const Response_ReportDetails &resp = response.GetExtension(Response_ReportDetails::ext);
+    const ServerInfo_Report &r = resp.report();
+
+    if (selectedReportId != r.report_id()) {
+        return;
+    }
+
+    loadReportDetails(r);
+}
+
+void DlgMyReports::loadReportDetails(const ServerInfo_Report &report)
+{
+    report_utils::renderReportDetails(chatLogEdit, commentsEdit, report, tr("No comments yet."), tr("[Moderator]"),
+                                      tr("[You]"));
+}
+
+void DlgMyReports::addComment()
+{
+    if (selectedReportId < 0) {
+        return;
+    }
+
+    QString text = commentInput->text().trimmed();
+    if (text.isEmpty()) {
+        return;
+    }
+
+    commentButton->setEnabled(false);
+
+    Command_ReportAddComment cmd;
+    cmd.set_report_id(selectedReportId);
+    cmd.set_comment(text.toStdString());
+
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &DlgMyReports::addCommentResponse);
+    client->sendCommand(pend);
+}
+
+void DlgMyReports::addCommentResponse(const Response &response)
+{
+    if (response.response_code() == Response::RespOk) {
+        commentInput->clear();
+        refreshList();
+    } else {
+        commentButton->setEnabled(true);
+    }
+}
+
+void DlgMyReports::setActionsEnabled(bool enabled)
+{
+    commentButton->setEnabled(enabled);
+    commentInput->setEnabled(enabled);
+}
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h
new file mode 100644
index 000000000..dc9f90d2d
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_my_reports.h
@@ -0,0 +1,55 @@
+#ifndef COCKATRICE_DLG_MY_REPORTS_H
+#define COCKATRICE_DLG_MY_REPORTS_H
+
+#include <QDialog>
+#include <QList>
+#include <QString>
+#include <libcockatrice/protocol/pb/serverinfo_report.pb.h>
+#include <qtmetamacros.h>
+
+class AbstractClient;
+class QTableWidget;
+class QTextEdit;
+class QLineEdit;
+class QPushButton;
+class QLabel;
+class QWidget;
+class Response;
+
+class DlgMyReports : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit DlgMyReports(AbstractClient *_client, QWidget *parent = nullptr);
+
+private slots:
+    void refreshList();
+    void reportListResponse(const Response &response);
+    void onSelectionChanged();
+    void reportDetailsResponse(const Response &response);
+    void addComment();
+    void addCommentResponse(const Response &response);
+
+private:
+    void loadReportDetails(const ServerInfo_Report &report);
+    void setActionsEnabled(bool enabled);
+
+    AbstractClient *client;
+
+    QTableWidget *table;
+    QTextEdit *descriptionEdit;
+    QTextEdit *chatLogEdit;
+    QTextEdit *commentsEdit;
+    QLineEdit *commentInput;
+    QPushButton *commentButton;
+    QPushButton *refreshButton;
+    QPushButton *closeButton;
+    QLabel *statusLabel;
+
+    QList<ServerInfo_Report> currentReports;
+    int selectedReportId;
+    int selectedReportIdBeforeRefresh = -1;
+    QString commentDraftBeforeRefresh;
+};
+
+#endif // COCKATRICE_DLG_MY_REPORTS_H
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
index 4be4cdf78..9e32e87d1 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp
@@ -1,17 +1,72 @@
 #include "dlg_register.h"
 
 #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 <QCheckBox>
+#include <QComboBox>
 #include <QDialogButtonBox>
 #include <QGridLayout>
+#include <QGroupBox>
 #include <QHBoxLayout>
+#include <QIntValidator>
 #include <QLabel>
+#include <QList>
 #include <QMessageBox>
-#include <libcockatrice/utility/trice_limits.h>
+#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 ──────────────────────────────────────────────────
+    previousHostButton = new QRadioButton(tr("Known Hosts"), this);
+    previousHosts = new QComboBox(this);
+
+    btnDeleteServer = new QPushButton(this);
+    btnDeleteServer->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
+    btnDeleteServer->setToolTip(tr("Delete the currently selected saved server"));
+    btnDeleteServer->setFixedWidth(30);
+
+    connect(btnDeleteServer, &QPushButton::clicked, this, &DlgRegister::actRemoveSavedServer);
+
+    hps = new HandlePublicServers(this);
+    btnRefreshServers = new QPushButton(this);
+    btnRefreshServers->setIcon(themePixmap(QStringLiteral("icons/sync")));
+    btnRefreshServers->setToolTip(tr("Refresh the server list with known public servers"));
+    btnRefreshServers->setFixedWidth(30);
+
+    connect(hps, &HandlePublicServers::sigPublicServersDownloadedSuccessfully, this, [this] { rebuildComboBoxList(); });
+    connect(hps, &HandlePublicServers::sigPublicServersDownloadedUnsuccessfully, this,
+            &DlgRegister::rebuildComboBoxList);
+    connect(btnRefreshServers, &QPushButton::released, this, &DlgRegister::downloadThePublicServers);
+
+    newHostButton = new QRadioButton(tr("New Host"), this);
+
+    auto *serverPickerRow = new QHBoxLayout;
+    serverPickerRow->addWidget(previousHosts);
+    serverPickerRow->addWidget(btnDeleteServer);
+    serverPickerRow->addWidget(btnRefreshServers);
+
+    auto *serverGroupLayout = new QVBoxLayout;
+    serverGroupLayout->addWidget(previousHostButton);
+    serverGroupLayout->addLayout(serverPickerRow);
+    serverGroupLayout->addWidget(newHostButton);
+
+    auto *serverGroupBox = new QGroupBox(tr("Server"));
+    serverGroupBox->setLayout(serverGroupLayout);
+
+    // ── Registration fields ────────────────────────────────────────────
     ServersSettings &servers = SettingsCache::instance().servers();
     infoLabel = new QLabel(tr("Enter your information and the information of the server you'd like to register to.\n"
                               "Your email will be used to verify your account."));
@@ -311,34 +366,37 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
     countryEdit->addItem(QPixmap("theme:countries/zw"), "zw");
     countryEdit->setCurrentIndex(0);
     QStringList countries = SettingsCache::instance().getCountries();
-    for (const QString &c : countries)
+    for (const QString &c : countries) {
         countryEdit->addItem(QPixmap("theme:countries/" + c.toLower()), c);
+    }
 
     realnameLabel = new QLabel(tr("Real name:"));
     realnameEdit = new QLineEdit();
     realnameEdit->setMaxLength(MAX_NAME_LENGTH);
     realnameLabel->setBuddy(realnameEdit);
 
+    // ── Layout ─────────────────────────────────────────────────────────
     auto *grid = new QGridLayout;
-    grid->addWidget(infoLabel, 0, 0, 1, 2);
-    grid->addWidget(hostLabel, 1, 0);
-    grid->addWidget(hostEdit, 1, 1);
-    grid->addWidget(portLabel, 2, 0);
-    grid->addWidget(portEdit, 2, 1);
-    grid->addWidget(playernameLabel, 3, 0);
-    grid->addWidget(playernameEdit, 3, 1);
-    grid->addWidget(passwordLabel, 4, 0);
-    grid->addWidget(passwordEdit, 4, 1);
-    grid->addWidget(passwordConfirmationLabel, 5, 0);
-    grid->addWidget(passwordConfirmationEdit, 5, 1);
-    grid->addWidget(emailLabel, 6, 0);
-    grid->addWidget(emailEdit, 6, 1);
-    grid->addWidget(emailConfirmationLabel, 7, 0);
-    grid->addWidget(emailConfirmationEdit, 7, 1);
-    grid->addWidget(countryLabel, 9, 0);
-    grid->addWidget(countryEdit, 9, 1);
-    grid->addWidget(realnameLabel, 10, 0);
-    grid->addWidget(realnameEdit, 10, 1);
+    grid->addWidget(serverGroupBox, 0, 0, 1, 2);
+    grid->addWidget(infoLabel, 1, 0, 1, 2);
+    grid->addWidget(hostLabel, 2, 0);
+    grid->addWidget(hostEdit, 2, 1);
+    grid->addWidget(portLabel, 3, 0);
+    grid->addWidget(portEdit, 3, 1);
+    grid->addWidget(playernameLabel, 4, 0);
+    grid->addWidget(playernameEdit, 4, 1);
+    grid->addWidget(passwordLabel, 5, 0);
+    grid->addWidget(passwordEdit, 5, 1);
+    grid->addWidget(passwordConfirmationLabel, 6, 0);
+    grid->addWidget(passwordConfirmationEdit, 6, 1);
+    grid->addWidget(emailLabel, 7, 0);
+    grid->addWidget(emailEdit, 7, 1);
+    grid->addWidget(emailConfirmationLabel, 8, 0);
+    grid->addWidget(emailConfirmationEdit, 8, 1);
+    grid->addWidget(countryLabel, 10, 0);
+    grid->addWidget(countryEdit, 10, 1);
+    grid->addWidget(realnameLabel, 11, 0);
+    grid->addWidget(realnameEdit, 11, 1);
 
     auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgRegister::actOk);
@@ -350,13 +408,115 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
     setLayout(mainLayout);
 
     setWindowTitle(tr("Register to server"));
-    setFixedHeight(sizeHint().height());
-    setMinimumWidth(300);
+    setMinimumWidth(360);
+
+    connect(previousHostButton, &QRadioButton::toggled, this, &DlgRegister::previousHostSelected);
+    connect(newHostButton, &QRadioButton::toggled, this, &DlgRegister::newHostSelected);
+    connect(previousHosts, &QComboBox::currentTextChanged, this, &DlgRegister::updateDisplayInfo);
+
+    previousHostButton->setChecked(true);
+
+    preRebuildComboBoxList();
+}
+
+DlgRegister::~DlgRegister() = default;
+
+void DlgRegister::downloadThePublicServers()
+{
+    btnRefreshServers->setDisabled(true);
+    previousHosts->clear();
+    previousHosts->addItem(placeHolderText);
+    hps->downloadPublicServers();
+}
+
+void DlgRegister::preRebuildComboBoxList()
+{
+    UserConnection_Information uci;
+    savedHostList = uci.getServerInfo();
+
+    if (savedHostList.size() == 1) {
+        downloadThePublicServers();
+    } else {
+        rebuildComboBoxList();
+    }
+}
+
+void DlgRegister::rebuildComboBoxList(int failure)
+{
+    Q_UNUSED(failure);
+
+    previousHosts->clear();
+
+    UserConnection_Information uci;
+    savedHostList = uci.getServerInfo();
+
+    auto &servers = SettingsCache::instance().servers();
+    QString previousHostName = servers.getPrevioushostName();
+
+    for (const auto &pair : savedHostList) {
+        const auto &tmp = pair.second;
+        QString saveName = tmp.getSaveName();
+        if (saveName.size()) {
+            previousHosts->addItem(saveName);
+            if (saveName.compare(previousHostName) == 0) {
+                previousHosts->setCurrentIndex(previousHosts->count() - 1);
+            }
+        }
+    }
+
+    btnRefreshServers->setDisabled(false);
+}
+
+void DlgRegister::previousHostSelected(bool state)
+{
+    if (state) {
+        previousHosts->setDisabled(false);
+        btnRefreshServers->setDisabled(false);
+        hostEdit->setDisabled(true);
+        portEdit->setDisabled(true);
+    }
+}
+
+void DlgRegister::newHostSelected(bool state)
+{
+    if (state) {
+        previousHosts->setDisabled(true);
+        btnRefreshServers->setDisabled(true);
+        hostEdit->setDisabled(false);
+        hostEdit->clear();
+        hostEdit->setPlaceholderText(tr("Server URL"));
+        portEdit->setDisabled(false);
+        portEdit->clear();
+        portEdit->setPlaceholderText(tr("Communication Port"));
+        playernameEdit->setDisabled(false);
+        playernameEdit->clear();
+    } else {
+        // Rebuild the list so the previously selected host's details are
+        // repopulated (mirrors DlgConnect::newHostSelected).
+        preRebuildComboBoxList();
+    }
+}
+
+void DlgRegister::updateDisplayInfo(const QString &saveName)
+{
+    if (saveName.isEmpty() || saveName == placeHolderText) {
+        return;
+    }
+
+    UserConnection_Information uci;
+    QStringList _data = uci.getServerInfo(saveName);
+
+    if (_data.size() < 7) {
+        return;
+    }
+
+    hostEdit->setText(_data.at(1));
+    portEdit->setText(_data.at(2));
+    playernameEdit->setText(_data.at(3));
 }
 
 void DlgRegister::actOk()
 {
-    // TODO this stuff should be using qvalidators
     if (passwordEdit->text().length() < 8) {
         QMessageBox::critical(this, tr("Registration Warning"), tr("Your password is too short."));
         return;
@@ -373,5 +533,29 @@ void DlgRegister::actOk()
         return;
     }
 
+    ServersSettings &servers = SettingsCache::instance().servers();
+
+    if (newHostButton->isChecked()) {
+        // Persist the new host so it shows up in the Connect dialog later.
+        // The password is never stored: the account is not verified yet.
+        const QString host = hostEdit->text().trimmed();
+        if (!host.isEmpty()) {
+            servers.addNewServer(host, host, portEdit->text().trimmed(), playernameEdit->text().trimmed(), QString(),
+                                 false);
+            servers.setPrevioushostName(host);
+        }
+    } else {
+        const QString saveName = previousHosts->currentText();
+        if (!saveName.isEmpty() && saveName != placeHolderText) {
+            servers.setPrevioushostName(saveName);
+        }
+    }
+
     accept();
 }
+
+void DlgRegister::actRemoveSavedServer()
+{
+    SettingsCache::instance().servers().removeServer(hostEdit->text());
+    previousHosts->removeItem(previousHosts->currentIndex());
+}
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.h b/cockatrice/src/interface/widgets/dialogs/dlg_register.h
index bebbfc500..10ea98543 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_register.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.h
@@ -1,25 +1,28 @@
-/**
- * @file dlg_register.h
- * @ingroup AccountDialogs
- * @brief TODO: Document this.
- */
-
 #ifndef DLG_REGISTER_H
 #define DLG_REGISTER_H
 
 #include <QComboBox>
 #include <QDialog>
 #include <QLineEdit>
+#include <QMap>
+#include <QString>
+#include <qtmetamacros.h>
+#include <utility>
 
+class HandlePublicServers;
 class QLabel;
 class QPushButton;
-class QCheckBox;
+class QRadioButton;
+class UserConnection_Information;
+class QWidget;
 
 class DlgRegister : public QDialog
 {
     Q_OBJECT
 public:
     explicit DlgRegister(QWidget *parent = nullptr);
+    ~DlgRegister() override;
+
     [[nodiscard]] QString getHost() const
     {
         return hostEdit->text();
@@ -48,15 +51,35 @@ public:
     {
         return realnameEdit->text();
     }
+
+public slots:
+    void downloadThePublicServers();
+
 private slots:
     void actOk();
+    void previousHostSelected(bool state);
+    void newHostSelected(bool state);
+    void updateDisplayInfo(const QString &saveName);
+    void preRebuildComboBoxList();
+    void rebuildComboBoxList(int failure = -1);
+    void actRemoveSavedServer();
 
 private:
+    QRadioButton *newHostButton;
+    QRadioButton *previousHostButton;
+    QComboBox *previousHosts;
+    QPushButton *btnDeleteServer;
+    QPushButton *btnRefreshServers;
+    HandlePublicServers *hps;
+
     QLabel *infoLabel, *hostLabel, *portLabel, *playernameLabel, *passwordLabel, *passwordConfirmationLabel,
         *emailLabel, *emailConfirmationLabel, *countryLabel, *realnameLabel;
     QLineEdit *hostEdit, *portEdit, *playernameEdit, *passwordEdit, *passwordConfirmationEdit, *emailEdit,
         *emailConfirmationEdit, *realnameEdit;
     QComboBox *countryEdit;
+
+    QMap<QString, std::pair<QString, UserConnection_Information>> savedHostList;
+    const QString placeHolderText = tr("Downloading...");
 };
 
-#endif
+#endif // DLG_REGISTER_H
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp
new file mode 100644
index 000000000..b1ae479fe
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.cpp
@@ -0,0 +1,246 @@
+#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,
+                             int _gameId,
+                             const QString &_autoChatLog,
+                             QWidget *parent)
+    : QDialog(parent), client(_client), reportedUser(_reportedUser), gameId(_gameId)
+{
+    setWindowTitle(tr("Report User"));
+    setMinimumWidth(500);
+
+    auto *infoLabel =
+        new QLabel(tr("Reports are reviewed by moderators. False reports may result in account penalties."));
+    infoLabel->setWordWrap(true);
+    infoLabel->setStyleSheet("color: palette(placeholderText); padding: 5px;");
+
+    auto *reportGroup = new QGroupBox(tr("Report Details"));
+    auto *reportGrid = new QGridLayout(reportGroup);
+
+    reportGrid->addWidget(new QLabel(tr("Reported User:")), 0, 0);
+    reportedUserLabel = new QLabel(reportedUser);
+    reportedUserLabel->setStyleSheet("font-weight: bold;");
+    reportGrid->addWidget(reportedUserLabel, 0, 1);
+
+    reportGrid->addWidget(new QLabel(tr("Game ID:")), 1, 0);
+    if (gameId >= 0) {
+        gameIdLabel = new QLabel(QString::number(gameId));
+        gameIdLabel->setStyleSheet("font-weight: bold;");
+        reportGrid->addWidget(gameIdLabel, 1, 1);
+    } else {
+        gameIdEdit = new QLineEdit;
+        gameIdEdit->setPlaceholderText(tr("(Optional) Enter game ID if available"));
+        gameIdEdit->setToolTip(tr("If the report is related to a specific game, enter its ID."));
+        reportGrid->addWidget(gameIdEdit, 1, 1);
+        gameIdLabel = nullptr;
+    }
+
+    auto *categoryGroup = new QGroupBox(tr("Category"));
+    auto *categoryGrid = new QGridLayout(categoryGroup);
+
+    categoryBox = new QComboBox;
+    for (const QString &key : ReportCategories::keys()) {
+        const QString label = categoryLabel(key);
+        if (label.isEmpty()) {
+            continue; // skip keys without a dialog label
+        }
+        categoryBox->addItem(label, key);
+        categoryBox->setItemData(categoryBox->count() - 1, categoryToolTip(key), Qt::ToolTipRole);
+    }
+
+    categoryGrid->addWidget(new QLabel(tr("Category:")), 0, 0);
+    categoryGrid->addWidget(categoryBox, 0, 1);
+
+    auto *descGroup = new QGroupBox(tr("Description"));
+    auto *descLayout = new QVBoxLayout(descGroup);
+
+    descriptionEdit = new QTextEdit;
+    descriptionEdit->setPlaceholderText(
+        tr("Please describe what happened. Include dates, game details, or any evidence if available."));
+    descriptionEdit->setFixedHeight(120);
+    descLayout->addWidget(descriptionEdit);
+
+    auto *chatGroup = new QGroupBox(tr("Chat Log Context"));
+    auto *chatLayout = new QVBoxLayout(chatGroup);
+    chatLogEdit = new QTextEdit;
+    chatLogEdit->setReadOnly(true);
+    QFont monoFont("monospace");
+    monoFont.setStyleHint(QFont::Monospace);
+    const int systemPointSize = QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSize();
+    if (systemPointSize > 0) {
+        monoFont.setPointSize(systemPointSize);
+    }
+    chatLogEdit->setFont(monoFont);
+    if (!_autoChatLog.isEmpty()) {
+        chatLogEdit->setPlainText(_autoChatLog);
+    } else {
+        chatLogEdit->setPlaceholderText(tr("No chat context available (not triggered from chat)."));
+    }
+    chatLogEdit->setFixedHeight(100);
+    chatLayout->addWidget(chatLogEdit);
+
+    auto *chatNote = new QLabel(
+        tr("This chat log is captured from your local chat window and may not reflect the full conversation."));
+    chatNote->setWordWrap(true);
+    chatNote->setStyleSheet("color: palette(placeholderText);");
+    chatLayout->addWidget(chatNote);
+
+    buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Submit Report"));
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgReportUser::actSubmit);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+    auto *layout = new QVBoxLayout(this);
+    layout->addWidget(infoLabel);
+    layout->addWidget(reportGroup);
+    layout->addWidget(categoryGroup);
+    layout->addWidget(descGroup);
+    layout->addWidget(chatGroup);
+    layout->addWidget(buttonBox);
+}
+
+void DlgReportUser::actSubmit()
+{
+    const QString description = descriptionEdit->toPlainText().trimmed();
+    if (description.isEmpty()) {
+        QMessageBox::warning(this, tr("Missing description"), tr("Please describe what happened before submitting."));
+        return;
+    }
+
+    QMessageBox::StandardButton reply =
+        QMessageBox::question(this, tr("Confirm Report"),
+                              tr("Submit report against %1 for %2?").arg(reportedUser, categoryBox->currentText()),
+                              QMessageBox::Yes | QMessageBox::No);
+
+    if (reply != QMessageBox::Yes) {
+        return;
+    }
+
+    buttonBox->setEnabled(false);
+    buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Submitting..."));
+
+    Command_Report cmd;
+    cmd.set_reported_user(reportedUser.toStdString());
+    cmd.set_category(categoryBox->currentData().toString().toStdString());
+    cmd.set_description(description.toStdString());
+
+    if (gameId >= 0) {
+        cmd.set_game_id(gameId);
+    } else if (gameIdEdit && !gameIdEdit->text().trimmed().isEmpty()) {
+        bool ok;
+        int manualGameId = gameIdEdit->text().trimmed().toInt(&ok);
+        if (ok && manualGameId > 0) {
+            cmd.set_game_id(manualGameId);
+        }
+    }
+
+    const QString chatLog = chatLogEdit->toPlainText().trimmed();
+    if (!chatLog.isEmpty()) {
+        cmd.set_chat_log(chatLog.toStdString());
+    }
+
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &DlgReportUser::reportResponse);
+    client->sendCommand(pend);
+}
+
+void DlgReportUser::reportResponse(const Response &response)
+{
+    buttonBox->setEnabled(true);
+    buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Submit Report"));
+
+    if (response.response_code() == Response::RespOk) {
+        QMessageBox::information(this, tr("Report Submitted"),
+                                 tr("Your report has been submitted and will be reviewed by a moderator. Thank you."));
+        accept();
+    } else if (response.response_code() == Response::RespTooManyRequests) {
+        QMessageBox::warning(this, tr("Submission Failed"),
+                             tr("You have reached the daily report limit. Please try again later."));
+    } else if (response.response_code() == Response::RespNameNotFound) {
+        QMessageBox::warning(
+            this, tr("Submission Failed"),
+            tr("The reported user could not be found. Guests (unregistered users) cannot be reported."));
+    } else {
+        QMessageBox::warning(this, tr("Submission Failed"), tr("Failed to submit report. Please try again."));
+    }
+}
+
+QString DlgReportUser::categoryLabel(const QString &key)
+{
+    if (key == QLatin1String("cheating")) {
+        return tr("Cheating / Unsporting behavior");
+    }
+    if (key == QLatin1String("bug_abuse")) {
+        return tr("Bug Abuse");
+    }
+    if (key == QLatin1String("harassment")) {
+        return tr("Harassment / Abuse");
+    }
+    if (key == QLatin1String("verbal_abuse")) {
+        return tr("Verbal Abuse");
+    }
+    if (key == QLatin1String("hate_speech")) {
+        return tr("Hate speech");
+    }
+    if (key == QLatin1String("spam")) {
+        return tr("Spam");
+    }
+    if (key == QLatin1String("other")) {
+        return tr("Other");
+    }
+    return QString();
+}
+
+QString DlgReportUser::categoryToolTip(const QString &key)
+{
+    if (key == QLatin1String("cheating")) {
+        return tr("Using external tools, cheat programs, or exploiting game bugs");
+    }
+    if (key == QLatin1String("bug_abuse")) {
+        return tr("Exploiting a bug or glitch to gain an unfair advantage");
+    }
+    if (key == QLatin1String("harassment")) {
+        return tr("Threatening, bullying, or persistent unwanted contact");
+    }
+    if (key == QLatin1String("verbal_abuse")) {
+        return tr("Abusive or offensive language directed at another player");
+    }
+    if (key == QLatin1String("hate_speech")) {
+        return tr("Discriminatory language targeting race, gender, religion, etc.");
+    }
+    if (key == QLatin1String("spam")) {
+        return tr("Repeated unwanted messages or advertisements");
+    }
+    if (key == QLatin1String("other")) {
+        return tr("Any behavior not covered by the above categories");
+    }
+    return QString();
+}
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h
new file mode 100644
index 000000000..c7fce055d
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_report_user.h
@@ -0,0 +1,48 @@
+#ifndef COCKATRICE_DLG_REPORT_USER_H
+#define COCKATRICE_DLG_REPORT_USER_H
+
+#include <QDialog>
+#include <QString>
+#include <qtmetamacros.h>
+
+class AbstractClient;
+class QComboBox;
+class QDialogButtonBox;
+class QLineEdit;
+class QTextEdit;
+class QLabel;
+class QWidget;
+class Response;
+
+class DlgReportUser : public QDialog
+{
+    Q_OBJECT
+public:
+    DlgReportUser(AbstractClient *_client,
+                  const QString &_reportedUser,
+                  int _gameId = -1,
+                  const QString &_autoChatLog = QString(),
+                  QWidget *parent = nullptr);
+
+private slots:
+    void actSubmit();
+    void reportResponse(const Response &response);
+
+private:
+    static QString categoryLabel(const QString &key);
+    static QString categoryToolTip(const QString &key);
+
+    AbstractClient *client;
+    QString reportedUser;
+    int gameId;
+
+    QLabel *reportedUserLabel;
+    QLabel *gameIdLabel = nullptr;
+    QLineEdit *gameIdEdit = nullptr;
+    QComboBox *categoryBox;
+    QTextEdit *descriptionEdit;
+    QTextEdit *chatLogEdit;
+    QDialogButtonBox *buttonBox;
+};
+
+#endif // COCKATRICE_DLG_REPORT_USER_H
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 905ac5db0..55c6569f7 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,26 +1,62 @@
 #include "dlg_select_set_for_cards.h"
 
-#include "../../deck_loader/deck_loader.h"
+#include "../../deck_loader/card_node_function.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 <QMessageBox>
+#include <QLayoutItem>
 #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 <qdrag.h>
-#include <qevent.h>
+#include <qalgorithms.h>
+#include <qnamespace.h>
+#include <qobjectdefs.h>
+#include <utility>
 
-DlgSelectSetForCards::DlgSelectSetForCards(QWidget *parent, DeckListModel *_model) : QDialog(parent), model(_model)
+DlgSelectSetForCards::DlgSelectSetForCards(QWidget *parent, DeckStateManager *deckStateManger)
+    : QDialog(parent), deckStateManager(deckStateManger)
 {
     setMinimumSize(500, 500);
     setAcceptDrops(true);
@@ -142,52 +178,61 @@ void DlgSelectSetForCards::retranslateUi()
     setAllToPreferredButton->setText(tr("Set all to preferred"));
 }
 
+static bool swapPrinting(DeckListModel *model, const QString &modifiedSet, const QString &cardName)
+{
+    QModelIndex idx = model->findCard(cardName, DECK_ZONE_MAIN);
+    if (!idx.isValid()) {
+        return false;
+    }
+    int amount = model->data(idx.siblingAtColumn(DeckListModelColumns::CARD_AMOUNT), Qt::DisplayRole).toInt();
+    model->removeCardAtIndex(idx);
+    CardInfoPtr cardInfo = CardDatabaseManager::query()->getCardInfo(cardName);
+    PrintingInfo printing = CardDatabaseManager::query()->getSpecificPrinting(cardName, modifiedSet, "");
+    for (int i = 0; i < amount; i++) {
+        model->addCard(ExactCard(cardInfo, printing), DECK_ZONE_MAIN);
+    }
+    return true;
+}
+
 void DlgSelectSetForCards::actOK()
 {
     QMap<QString, QStringList> modifiedSetsAndCardsMap = getModifiedCards();
 
     if (modifiedSetsAndCardsMap.isEmpty()) {
         accept(); // Nothing to do
-    } else {
-        emit deckAboutToBeModified(tr("Bulk modified printings."));
+        return;
     }
 
-    for (QString modifiedSet : modifiedSetsAndCardsMap.keys()) {
-        for (QString card : modifiedSetsAndCardsMap.value(modifiedSet)) {
-            QModelIndex find_card = model->findCard(card, DECK_ZONE_MAIN);
-            if (!find_card.isValid()) {
-                continue;
-            }
-            int amount =
-                model->data(find_card.siblingAtColumn(DeckListModelColumns::CARD_AMOUNT), Qt::DisplayRole).toInt();
-            model->removeRow(find_card.row(), find_card.parent());
-            CardInfoPtr cardInfo = CardDatabaseManager::query()->getCardInfo(card);
-            PrintingInfo printing = CardDatabaseManager::query()->getSpecificPrinting(card, modifiedSet, "");
-            for (int i = 0; i < amount; i++) {
-                model->addCard(ExactCard(cardInfo, printing), DECK_ZONE_MAIN);
+    auto bulkModify = [&modifiedSetsAndCardsMap](DeckListModel *model) {
+        for (QString modifiedSet : modifiedSetsAndCardsMap.keys()) {
+            for (QString card : modifiedSetsAndCardsMap.value(modifiedSet)) {
+                swapPrinting(model, modifiedSet, card);
             }
         }
-    }
-    if (!modifiedSetsAndCardsMap.isEmpty()) {
-        emit deckModified();
-    }
+        return true;
+    };
+
+    deckStateManager->modifyDeck(tr("Bulk modified printings."), bulkModify);
+
     accept();
 }
 
 void DlgSelectSetForCards::actClear()
 {
-    emit deckAboutToBeModified(tr("Cleared all printing information."));
-    DeckLoader::clearSetNamesAndNumbers(model->getDeckList());
-    emit deckModified();
+    deckStateManager->modifyDeck(tr("Cleared all printing information."), [](auto model) {
+        model->forEachCard(CardNodeFunction::ClearPrintingData());
+        return true;
+    });
     accept();
 }
 
 void DlgSelectSetForCards::actSetAllToPreferred()
 {
-    emit deckAboutToBeModified(tr("Set all printings to preferred."));
-    DeckLoader::clearSetNamesAndNumbers(model->getDeckList());
-    DeckLoader::setProviderIdToPreferredPrinting(model->getDeckList());
-    emit deckModified();
+    deckStateManager->modifyDeck(tr("Set all printings to preferred."), [](auto model) {
+        model->forEachCard(CardNodeFunction::ClearPrintingData());
+        model->forEachCard(CardNodeFunction::SetProviderIdToPreferred());
+        return true;
+    });
     accept();
 }
 
@@ -220,19 +265,14 @@ void DlgSelectSetForCards::sortSetsByCount()
 QMap<QString, int> DlgSelectSetForCards::getSetsForCards()
 {
     QMap<QString, int> setCounts;
-    if (!model)
-        return setCounts;
 
-    DeckList *decklist = model->getDeckList();
-    if (!decklist)
-        return setCounts;
+    QList<QString> cardNames = deckStateManager->getModel()->getCardNames();
 
-    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
-
-    for (auto currentCard : cardsInDeck) {
-        CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
-        if (!infoPtr)
+    for (auto cardName : cardNames) {
+        CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(cardName);
+        if (!infoPtr) {
             continue;
+        }
 
         SetToPrintingsMap setMap = infoPtr->getSets();
         for (auto &setName : setMap.keys()) {
@@ -266,19 +306,15 @@ void DlgSelectSetForCards::updateCardLists()
         }
     }
 
-    DeckList *decklist = model->getDeckList();
-    if (!decklist)
-        return;
+    QList<QString> cardNames = deckStateManager->getModel()->getCardNames();
 
-    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
-
-    for (auto currentCard : cardsInDeck) {
+    for (auto cardName : cardNames) {
         bool found = false;
         QString foundSetName;
 
         // Check across all sets if the card is present
         for (auto it = selectedCardsBySet.begin(); it != selectedCardsBySet.end(); ++it) {
-            if (it.value().contains(currentCard->getName())) {
+            if (it.value().contains(cardName)) {
                 found = true;
                 foundSetName = it.key(); // Store the set name where it was found
                 break;                   // Stop at the first match
@@ -287,16 +323,16 @@ void DlgSelectSetForCards::updateCardLists()
 
         if (!found) {
             // The card was not in any selected set
-            ExactCard card = CardDatabaseManager::query()->getCard({currentCard->getName()});
+            ExactCard card = CardDatabaseManager::query()->getCard({cardName});
             CardInfoPictureWidget *picture_widget = new CardInfoPictureWidget(uneditedCardsFlowWidget);
             picture_widget->setCard(card);
             uneditedCardsFlowWidget->addWidget(picture_widget);
         } else {
-            ExactCard card = CardDatabaseManager::query()->getCard(
-                {currentCard->getName(), CardDatabaseManager::getInstance()
-                                             ->query()
-                                             ->getSpecificPrinting(currentCard->getName(), foundSetName, "")
-                                             .getUuid()});
+            ExactCard card =
+                CardDatabaseManager::query()->getCard({cardName, CardDatabaseManager::getInstance()
+                                                                     ->query()
+                                                                     ->getSpecificPrinting(cardName, foundSetName, "")
+                                                                     .getUuid()});
             CardInfoPictureWidget *picture_widget = new CardInfoPictureWidget(modifiedCardsFlowWidget);
             picture_widget->setCard(card);
             modifiedCardsFlowWidget->addWidget(picture_widget);
@@ -318,11 +354,7 @@ void DlgSelectSetForCards::dropEvent(QDropEvent *event)
 {
     QByteArray itemData = event->mimeData()->data("application/x-setentrywidget");
     QString draggedSetName = QString::fromUtf8(itemData);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     QPoint adjustedPos = event->position().toPoint() + QPoint(0, scrollArea->verticalScrollBar()->value());
-#else
-    QPoint adjustedPos = event->pos() + QPoint(0, scrollArea->verticalScrollBar()->value());
-#endif
     int dropIndex = -1;
     for (int i = 0; i < listLayout->count(); ++i) {
         QWidget *widget = listLayout->itemAt(i)->widget();
@@ -352,23 +384,18 @@ void DlgSelectSetForCards::dropEvent(QDropEvent *event)
 QMap<QString, QStringList> DlgSelectSetForCards::getCardsForSets()
 {
     QMap<QString, QStringList> setCards;
-    if (!model)
-        return setCards;
 
-    DeckList *decklist = model->getDeckList();
-    if (!decklist)
-        return setCards;
+    QList<QString> cardNames = deckStateManager->getModel()->getCardNames();
 
-    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
-
-    for (auto currentCard : cardsInDeck) {
-        CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
-        if (!infoPtr)
+    for (auto cardName : cardNames) {
+        CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(cardName);
+        if (!infoPtr) {
             continue;
+        }
 
         SetToPrintingsMap setMap = infoPtr->getSets();
         for (auto it = setMap.begin(); it != setMap.end(); ++it) {
-            setCards[it.key()].append(currentCard->getName());
+            setCards[it.key()].append(cardName);
         }
     }
 
@@ -493,11 +520,7 @@ void SetEntryWidget::mousePressEvent(QMouseEvent *event)
     }
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 void SetEntryWidget::enterEvent(QEnterEvent *event)
-#else
-void SetEntryWidget::enterEvent(QEvent *event)
-#endif
 {
     QWidget::enterEvent(event); // Call the base class handler
     // Highlight the widget by changing the background color only for the widget itself
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 5cdef5a30..89cc43662 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
@@ -1,31 +1,36 @@
 /**
  * @file dlg_select_set_for_cards.h
  * @ingroup Dialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 <QLabel>
-#include <QListWidget>
+#include <QList>
 #include <QMap>
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <QString>
+#include <QStringList>
+#include <QWidget>
+#include <qtmetamacros.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
 {
     Q_OBJECT
 
 public:
-    explicit DlgSelectSetForCards(QWidget *parent, DeckListModel *_model);
+    explicit DlgSelectSetForCards(QWidget *parent, DeckStateManager *deckStateManager);
     void retranslateUi();
     void sortSetsByCount();
     QMap<QString, QStringList> getCardsForSets();
@@ -37,7 +42,6 @@ public:
 signals:
     void widgetOrderChanged();
     void orderChanged();
-    void deckAboutToBeModified(const QString &reason);
     void deckModified();
 
 public slots:
@@ -61,7 +65,7 @@ private:
     QLabel *modifiedCardsLabel;
     QWidget *listContainer;
     QListWidget *listWidget;
-    DeckListModel *model;
+    DeckStateManager *deckStateManager;
     QMap<QString, SetEntryWidget *> setEntries;
     QPushButton *clearButton;
     QPushButton *setAllToPreferredButton;
@@ -87,11 +91,7 @@ public:
 
 public slots:
     void mousePressEvent(QMouseEvent *event) override;
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
     void enterEvent(QEnterEvent *event) override;
-#else
-    void enterEvent(QEvent *event) override;
-#endif
     void leaveEvent(QEvent *event) override;
     void dragMoveEvent(QDragMoveEvent *event) override;
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
index c0b80c6c1..d41c948eb 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
@@ -1,1744 +1,83 @@
+/**
+ * @file dlg_settings.cpp
+ * @brief Implementation of the main settings dialog
+ * @ingroup Dialogs
+ */
 #include "dlg_settings.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../client/settings/shortcut_treeview.h"
-#include "../client/network/update/card_spoiler/spoiler_background_updater.h"
-#include "../client/network/update/client/release_channel.h"
-#include "../client/sound_engine.h"
-#include "../interface/card_picture_loader/card_picture_loader.h"
-#include "../interface/theme_manager.h"
-#include "../interface/widgets/general/background_sources.h"
-#include "../interface/widgets/tabs/tab_supervisor.h"
-#include "../interface/widgets/utility/custom_line_edit.h"
-#include "../interface/widgets/utility/get_text_with_max.h"
-#include "../interface/widgets/utility/sequence_edit.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"
+#include "../settings_page/messages_settings_page.h"
+#include "../settings_page/settings_search_delegate.h"
+#include "../settings_page/settings_search_model.h"
+#include "../settings_page/shortcut_settings_page.h"
+#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 <../../client/settings/card_counter_settings.h>
-#include <QAbstractButton>
-#include <QAbstractListModel>
-#include <QAction>
+#include <QAbstractAnimation>
+#include <QAbstractItemView>
 #include <QApplication>
-#include <QCheckBox>
+#include <QBrush>
+#include <QByteArray>
 #include <QCloseEvent>
-#include <QColorDialog>
-#include <QComboBox>
+#include <QColor>
 #include <QDebug>
-#include <QDesktopServices>
-#include <QDialogButtonBox>
-#include <QFileDialog>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QHeaderView>
-#include <QInputDialog>
-#include <QLabel>
+#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 <QListWidget>
+#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 <QSlider>
-#include <QSpinBox>
+#include <QSequentialAnimationGroup>
+#include <QShortcut>
+#include <QSize>
+#include <QSizePolicy>
+#include <QStackedLayout>
 #include <QStackedWidget>
-#include <QToolBar>
-#include <QTranslator>
-#include <QVariant>
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/card_database_manager.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"
-#define WIKI_TRANSLATION_FAQ "https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ"
-
-enum startupCardUpdateCheckBehaviorIndex
-{
-    startupCardUpdateCheckBehaviorIndexNone,
-    startupCardUpdateCheckBehaviorIndexPrompt,
-    startupCardUpdateCheckBehaviorIndexAlways
-};
-
-GeneralSettingsPage::GeneralSettingsPage()
-{
-    QStringList languageCodes = findQmFiles();
-    for (const QString &code : languageCodes) {
-        QString langName = languageName(code);
-        languageBox.addItem(langName, code);
-    }
-
-    QString setLanguage = QCoreApplication::translate("i18n", DEFAULT_LANG_NAME);
-    int index = languageBox.findText(setLanguage, Qt::MatchExactly);
-    if (index == -1) {
-        qWarning() << "could not find language" << setLanguage;
-    } else {
-        languageBox.setCurrentIndex(index);
-    }
-
-    // updates
-    SettingsCache &settings = SettingsCache::instance();
-    startupUpdateCheckCheckBox.setChecked(settings.getCheckUpdatesOnStartup());
-
-    startupCardUpdateCheckBehaviorSelector.addItem(""); // these will be set in retranslateUI
-    startupCardUpdateCheckBehaviorSelector.addItem("");
-    startupCardUpdateCheckBehaviorSelector.addItem("");
-    if (SettingsCache::instance().getStartupCardUpdateCheckPromptForUpdate()) {
-        startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexPrompt);
-    } else if (SettingsCache::instance().getStartupCardUpdateCheckAlwaysUpdate()) {
-        startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexAlways);
-    } else {
-        startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexNone);
-    }
-
-    cardUpdateCheckIntervalSpinBox.setMinimum(1);
-    cardUpdateCheckIntervalSpinBox.setMaximum(30);
-    cardUpdateCheckIntervalSpinBox.setValue(settings.getCardUpdateCheckInterval());
-    updateNotificationCheckBox.setChecked(settings.getNotifyAboutUpdates());
-    newVersionOracleCheckBox.setChecked(settings.getNotifyAboutNewVersion());
-
-    showTipsOnStartup.setChecked(settings.getShowTipsOnStartup());
-
-    advertiseTranslationPageLabel.setTextInteractionFlags(Qt::LinksAccessibleByMouse);
-    advertiseTranslationPageLabel.setOpenExternalLinks(true);
-
-    connect(&languageBox, qOverload<int>(&QComboBox::currentIndexChanged), this,
-            &GeneralSettingsPage::languageBoxChanged);
-    connect(&startupUpdateCheckCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
-            &SettingsCache::setCheckUpdatesOnStartup);
-    connect(&startupCardUpdateCheckBehaviorSelector, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
-            [](int index) {
-                SettingsCache::instance().setStartupCardUpdateCheckPromptForUpdate(
-                    index == startupCardUpdateCheckBehaviorIndexPrompt);
-                SettingsCache::instance().setStartupCardUpdateCheckAlwaysUpdate(
-                    index == startupCardUpdateCheckBehaviorIndexAlways);
-            });
-    connect(&cardUpdateCheckIntervalSpinBox, qOverload<int>(&QSpinBox::valueChanged), &settings,
-            &SettingsCache::setCardUpdateCheckInterval);
-    connect(&updateNotificationCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setNotifyAboutUpdate);
-    connect(&newVersionOracleCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
-            &SettingsCache::setNotifyAboutNewVersion);
-    connect(&showTipsOnStartup, &QCheckBox::clicked, &settings, &SettingsCache::setShowTipsOnStartup);
-
-    auto *personalGrid = new QGridLayout;
-    personalGrid->addWidget(&languageLabel, 0, 0);
-    personalGrid->addWidget(&languageBox, 0, 1);
-    personalGrid->addWidget(&advertiseTranslationPageLabel, 1, 1, Qt::AlignRight);
-    personalGrid->addWidget(&updateReleaseChannelLabel, 2, 0);
-    personalGrid->addWidget(&updateReleaseChannelBox, 2, 1);
-    personalGrid->addWidget(&startupUpdateCheckCheckBox, 4, 0, 1, 2);
-    personalGrid->addWidget(&startupCardUpdateCheckBehaviorLabel, 5, 0);
-    personalGrid->addWidget(&startupCardUpdateCheckBehaviorSelector, 5, 1);
-    personalGrid->addWidget(&cardUpdateCheckIntervalLabel, 6, 0);
-    personalGrid->addWidget(&cardUpdateCheckIntervalSpinBox, 6, 1);
-    personalGrid->addWidget(&lastCardUpdateCheckDateLabel, 7, 1);
-    personalGrid->addWidget(&updateNotificationCheckBox, 8, 0, 1, 2);
-    personalGrid->addWidget(&newVersionOracleCheckBox, 9, 0, 1, 2);
-    personalGrid->addWidget(&showTipsOnStartup, 10, 0, 1, 2);
-
-    personalGroupBox = new QGroupBox;
-    personalGroupBox->setLayout(personalGrid);
-
-    deckPathEdit = new QLineEdit(settings.getDeckPath());
-    deckPathEdit->setReadOnly(true);
-    auto *deckPathButton = new QPushButton("...");
-    connect(deckPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::deckPathButtonClicked);
-
-    filtersPathEdit = new QLineEdit(settings.getFiltersPath());
-    filtersPathEdit->setReadOnly(true);
-    auto *filtersPathButton = new QPushButton("...");
-    connect(filtersPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::filtersPathButtonClicked);
-
-    replaysPathEdit = new QLineEdit(settings.getReplaysPath());
-    replaysPathEdit->setReadOnly(true);
-    auto *replaysPathButton = new QPushButton("...");
-    connect(replaysPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::replaysPathButtonClicked);
-
-    picsPathEdit = new QLineEdit(settings.getPicsPath());
-    picsPathEdit->setReadOnly(true);
-    auto *picsPathButton = new QPushButton("...");
-    connect(picsPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::picsPathButtonClicked);
-
-    cardDatabasePathEdit = new QLineEdit(settings.getCardDatabasePath());
-    cardDatabasePathEdit->setReadOnly(true);
-    auto *cardDatabasePathButton = new QPushButton("...");
-    connect(cardDatabasePathButton, &QPushButton::clicked, this, &GeneralSettingsPage::cardDatabasePathButtonClicked);
-
-    customCardDatabasePathEdit = new QLineEdit(settings.getCustomCardDatabasePath());
-    customCardDatabasePathEdit->setReadOnly(true);
-    auto *customCardDatabasePathButton = new QPushButton("...");
-    connect(customCardDatabasePathButton, &QPushButton::clicked, this,
-            &GeneralSettingsPage::customCardDatabaseButtonClicked);
-
-    tokenDatabasePathEdit = new QLineEdit(settings.getTokenDatabasePath());
-    tokenDatabasePathEdit->setReadOnly(true);
-    auto *tokenDatabasePathButton = new QPushButton("...");
-    connect(tokenDatabasePathButton, &QPushButton::clicked, this, &GeneralSettingsPage::tokenDatabasePathButtonClicked);
-
-    // Required init here to avoid crashing on Portable builds
-    resetAllPathsButton = new QPushButton;
-
-    bool isPortable = settings.getIsPortableBuild();
-    if (isPortable) {
-        deckPathEdit->setEnabled(false);
-        filtersPathEdit->setEnabled(false);
-        replaysPathEdit->setEnabled(false);
-        picsPathEdit->setEnabled(false);
-        cardDatabasePathEdit->setEnabled(false);
-        customCardDatabasePathEdit->setEnabled(false);
-        tokenDatabasePathEdit->setEnabled(false);
-
-        deckPathButton->setVisible(false);
-        replaysPathButton->setVisible(false);
-        picsPathButton->setVisible(false);
-        cardDatabasePathButton->setVisible(false);
-        customCardDatabasePathButton->setVisible(false);
-        tokenDatabasePathButton->setVisible(false);
-    } else {
-        connect(resetAllPathsButton, &QPushButton::clicked, this, &GeneralSettingsPage::resetAllPathsClicked);
-        allPathsResetLabel = new QLabel(tr("All paths have been reset"));
-        allPathsResetLabel->setVisible(false);
-    }
-
-    auto *pathsGrid = new QGridLayout;
-    pathsGrid->addWidget(&deckPathLabel, 0, 0);
-    pathsGrid->addWidget(deckPathEdit, 0, 1);
-    pathsGrid->addWidget(deckPathButton, 0, 2);
-    pathsGrid->addWidget(&filtersPathLabel, 1, 0);
-    pathsGrid->addWidget(filtersPathEdit, 1, 1);
-    pathsGrid->addWidget(filtersPathButton, 1, 2);
-    pathsGrid->addWidget(&replaysPathLabel, 2, 0);
-    pathsGrid->addWidget(replaysPathEdit, 2, 1);
-    pathsGrid->addWidget(replaysPathButton, 2, 2);
-    pathsGrid->addWidget(&picsPathLabel, 3, 0);
-    pathsGrid->addWidget(picsPathEdit, 3, 1);
-    pathsGrid->addWidget(picsPathButton, 3, 2);
-    pathsGrid->addWidget(&cardDatabasePathLabel, 4, 0);
-    pathsGrid->addWidget(cardDatabasePathEdit, 4, 1);
-    pathsGrid->addWidget(cardDatabasePathButton, 4, 2);
-    pathsGrid->addWidget(&customCardDatabasePathLabel, 5, 0);
-    pathsGrid->addWidget(customCardDatabasePathEdit, 5, 1);
-    pathsGrid->addWidget(customCardDatabasePathButton, 5, 2);
-    pathsGrid->addWidget(&tokenDatabasePathLabel, 6, 0);
-    pathsGrid->addWidget(tokenDatabasePathEdit, 6, 1);
-    pathsGrid->addWidget(tokenDatabasePathButton, 6, 2);
-    if (!isPortable) {
-        pathsGrid->addWidget(resetAllPathsButton, 7, 0);
-        pathsGrid->addWidget(allPathsResetLabel, 7, 1);
-    }
-    pathsGroupBox = new QGroupBox;
-    pathsGroupBox->setLayout(pathsGrid);
-
-    auto *mainLayout = new QVBoxLayout;
-    mainLayout->addWidget(personalGroupBox);
-    mainLayout->addWidget(pathsGroupBox);
-    mainLayout->addStretch();
-
-    GeneralSettingsPage::retranslateUi();
-
-    // connect the ReleaseChannel combo box only after the entries are inserted in retranslateUi
-    connect(&updateReleaseChannelBox, qOverload<int>(&QComboBox::currentIndexChanged), &settings,
-            &SettingsCache::setUpdateReleaseChannelIndex);
-    updateReleaseChannelBox.setCurrentIndex(settings.getUpdateReleaseChannelIndex());
-
-    setLayout(mainLayout);
-
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &GeneralSettingsPage::retranslateUi);
-    retranslateUi();
-}
-
-QStringList GeneralSettingsPage::findQmFiles()
-{
-    QDir dir(translationPath);
-    QStringList fileNames = dir.entryList(QStringList(translationPrefix + "_*.qm"), QDir::Files, QDir::Name);
-    fileNames.replaceInStrings(QRegularExpression(translationPrefix + "_(.*)\\.qm"), "\\1");
-    return fileNames;
-}
-
-QString GeneralSettingsPage::languageName(const QString &lang)
-{
-    QTranslator qTranslator;
-
-    QString appNameHint = translationPrefix + "_" + lang;
-    bool appTranslationLoaded = qTranslator.load(appNameHint, translationPath);
-    if (!appTranslationLoaded) {
-        qCWarning(DlgSettingsLog) << "Unable to load" << translationPrefix << "translation" << appNameHint << "at"
-                                  << translationPath;
-    }
-
-    return qTranslator.translate("i18n", DEFAULT_LANG_NAME);
-}
-
-void GeneralSettingsPage::deckPathButtonClicked()
-{
-    QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), deckPathEdit->text());
-    if (path.isEmpty())
-        return;
-
-    deckPathEdit->setText(path);
-    SettingsCache::instance().setDeckPath(path);
-}
-
-void GeneralSettingsPage::filtersPathButtonClicked()
-{
-    QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), filtersPathEdit->text());
-    if (path.isEmpty())
-        return;
-
-    filtersPathEdit->setText(path);
-    SettingsCache::instance().setFiltersPath(path);
-}
-
-void GeneralSettingsPage::replaysPathButtonClicked()
-{
-    QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), replaysPathEdit->text());
-    if (path.isEmpty())
-        return;
-
-    replaysPathEdit->setText(path);
-    SettingsCache::instance().setReplaysPath(path);
-}
-
-void GeneralSettingsPage::picsPathButtonClicked()
-{
-    QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), picsPathEdit->text());
-    if (path.isEmpty())
-        return;
-
-    picsPathEdit->setText(path);
-    SettingsCache::instance().setPicsPath(path);
-}
-
-void GeneralSettingsPage::cardDatabasePathButtonClicked()
-{
-    QString path = QFileDialog::getOpenFileName(this, tr("Choose path"), cardDatabasePathEdit->text());
-    if (path.isEmpty())
-        return;
-
-    cardDatabasePathEdit->setText(path);
-    SettingsCache::instance().setCardDatabasePath(path);
-}
-
-void GeneralSettingsPage::customCardDatabaseButtonClicked()
-{
-    QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), customCardDatabasePathEdit->text());
-    if (path.isEmpty())
-        return;
-
-    customCardDatabasePathEdit->setText(path);
-    SettingsCache::instance().setCustomCardDatabasePath(path);
-}
-
-void GeneralSettingsPage::tokenDatabasePathButtonClicked()
-{
-    QString path = QFileDialog::getOpenFileName(this, tr("Choose path"), tokenDatabasePathEdit->text());
-    if (path.isEmpty())
-        return;
-
-    tokenDatabasePathEdit->setText(path);
-    SettingsCache::instance().setTokenDatabasePath(path);
-}
-
-void GeneralSettingsPage::resetAllPathsClicked()
-{
-    SettingsCache &settings = SettingsCache::instance();
-    settings.resetPaths();
-    deckPathEdit->setText(settings.getDeckPath());
-    replaysPathEdit->setText(settings.getReplaysPath());
-    picsPathEdit->setText(settings.getPicsPath());
-    cardDatabasePathEdit->setText(settings.getCardDatabasePath());
-    customCardDatabasePathEdit->setText(settings.getCustomCardDatabasePath());
-    tokenDatabasePathEdit->setText(settings.getTokenDatabasePath());
-    allPathsResetLabel->setVisible(true);
-}
-
-void GeneralSettingsPage::languageBoxChanged(int index)
-{
-    SettingsCache::instance().setLang(languageBox.itemData(index).toString());
-}
-
-void GeneralSettingsPage::retranslateUi()
-{
-    personalGroupBox->setTitle(tr("Personal settings"));
-    languageLabel.setText(tr("Language:"));
-
-    if (SettingsCache::instance().getIsPortableBuild()) {
-        pathsGroupBox->setTitle(tr("Paths (editing disabled in portable mode)"));
-    } else {
-        pathsGroupBox->setTitle(tr("Paths"));
-    }
-    advertiseTranslationPageLabel.setText(
-        QString("<a href='%1'>%2</a>").arg(WIKI_TRANSLATION_FAQ).arg(tr("How to help with translations")));
-    deckPathLabel.setText(tr("Decks directory:"));
-    filtersPathLabel.setText(tr("Filters directory:"));
-    replaysPathLabel.setText(tr("Replays directory:"));
-    picsPathLabel.setText(tr("Pictures directory:"));
-    cardDatabasePathLabel.setText(tr("Card database:"));
-    customCardDatabasePathLabel.setText(tr("Custom database directory:"));
-    tokenDatabasePathLabel.setText(tr("Token database:"));
-    updateReleaseChannelLabel.setText(tr("Update channel"));
-    startupUpdateCheckCheckBox.setText(tr("Check for client updates on startup"));
-    startupCardUpdateCheckBehaviorLabel.setText(tr("Check for card database updates on startup"));
-    startupCardUpdateCheckBehaviorSelector.setItemText(startupCardUpdateCheckBehaviorIndexNone, tr("Don't check"));
-    startupCardUpdateCheckBehaviorSelector.setItemText(startupCardUpdateCheckBehaviorIndexPrompt,
-                                                       tr("Prompt for update"));
-    startupCardUpdateCheckBehaviorSelector.setItemText(startupCardUpdateCheckBehaviorIndexAlways,
-                                                       tr("Always update in the background"));
-    cardUpdateCheckIntervalLabel.setText(tr("Check for card database updates every"));
-    cardUpdateCheckIntervalSpinBox.setSuffix(tr(" days"));
-    updateNotificationCheckBox.setText(tr("Notify if a feature supported by the server is missing in my client"));
-    newVersionOracleCheckBox.setText(tr("Automatically run Oracle when running a new version of Cockatrice"));
-    showTipsOnStartup.setText(tr("Show tips on startup"));
-    resetAllPathsButton->setText(tr("Reset all paths"));
-
-    const auto &settings = SettingsCache::instance();
-
-    QDate lastCheckDate = settings.getLastCardUpdateCheck();
-    int daysAgo = lastCheckDate.daysTo(QDate::currentDate());
-
-    lastCardUpdateCheckDateLabel.setText(
-        tr("Last update check on %1 (%2 days ago)").arg(lastCheckDate.toString()).arg(daysAgo));
-
-    // We can't change the strings after they're put into the QComboBox, so this is our workaround
-    int oldIndex = updateReleaseChannelBox.currentIndex();
-    updateReleaseChannelBox.clear();
-    for (ReleaseChannel *chan : settings.getUpdateReleaseChannels()) {
-        updateReleaseChannelBox.addItem(tr(chan->getName().toUtf8()));
-    }
-    updateReleaseChannelBox.setCurrentIndex(oldIndex);
-}
-
-AppearanceSettingsPage::AppearanceSettingsPage()
-{
-    SettingsCache &settings = SettingsCache::instance();
-
-    // Theme settings
-    QString themeName = SettingsCache::instance().getThemeName();
-
-    QStringList themeDirs = themeManager->getAvailableThemes().keys();
-    for (int i = 0; i < themeDirs.size(); i++) {
-        themeBox.addItem(themeDirs[i]);
-        if (themeDirs[i] == themeName)
-            themeBox.setCurrentIndex(i);
-    }
-
-    connect(&themeBox, qOverload<int>(&QComboBox::currentIndexChanged), this, &AppearanceSettingsPage::themeBoxChanged);
-    connect(&openThemeButton, &QPushButton::clicked, this, &AppearanceSettingsPage::openThemeLocation);
-
-    for (const auto &entry : BackgroundSources::all()) {
-        homeTabBackgroundSourceBox.addItem(QObject::tr(entry.trKey), QVariant::fromValue(entry.type));
-    }
-
-    QString homeTabBackgroundSource = SettingsCache::instance().getHomeTabBackgroundSource();
-    int homeTabBackgroundSourceId =
-        homeTabBackgroundSourceBox.findData(BackgroundSources::fromId(homeTabBackgroundSource));
-    if (homeTabBackgroundSourceId != -1) {
-        homeTabBackgroundSourceBox.setCurrentIndex(homeTabBackgroundSourceId);
-    }
-
-    connect(&homeTabBackgroundSourceBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]() {
-        auto type = homeTabBackgroundSourceBox.currentData().value<BackgroundSources::Type>();
-        SettingsCache::instance().setHomeTabBackgroundSource(BackgroundSources::toId(type));
-    });
-
-    homeTabBackgroundShuffleFrequencySpinBox.setRange(0, 3600);
-    homeTabBackgroundShuffleFrequencySpinBox.setSuffix(tr(" seconds"));
-    homeTabBackgroundShuffleFrequencySpinBox.setValue(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency());
-    connect(&homeTabBackgroundShuffleFrequencySpinBox, qOverload<int>(&QSpinBox::valueChanged),
-            &SettingsCache::instance(), &SettingsCache::setHomeTabBackgroundShuffleFrequency);
-
-    auto *themeGrid = new QGridLayout;
-    themeGrid->addWidget(&themeLabel, 0, 0);
-    themeGrid->addWidget(&themeBox, 0, 1);
-    themeGrid->addWidget(&openThemeButton, 1, 1);
-    themeGrid->addWidget(&homeTabBackgroundSourceLabel, 2, 0);
-    themeGrid->addWidget(&homeTabBackgroundSourceBox, 2, 1);
-    themeGrid->addWidget(&homeTabBackgroundShuffleFrequencyLabel, 3, 0);
-    themeGrid->addWidget(&homeTabBackgroundShuffleFrequencySpinBox, 3, 1);
-
-    themeGroupBox = new QGroupBox;
-    themeGroupBox->setLayout(themeGrid);
-
-    // Menu settings
-    showShortcutsCheckBox.setChecked(settings.getShowShortcuts());
-    connect(&showShortcutsCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &AppearanceSettingsPage::showShortcutsChanged);
-
-    auto *menuGrid = new QGridLayout;
-    menuGrid->addWidget(&showShortcutsCheckBox, 0, 0);
-
-    menuGroupBox = new QGroupBox;
-    menuGroupBox->setLayout(menuGrid);
-
-    // Card rendering
-    displayCardNamesCheckBox.setChecked(settings.getDisplayCardNames());
-    connect(&displayCardNamesCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setDisplayCardNames);
-
-    autoRotateSidewaysLayoutCardsCheckBox.setChecked(settings.getAutoRotateSidewaysLayoutCards());
-    connect(&autoRotateSidewaysLayoutCardsCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
-            &SettingsCache::setAutoRotateSidewaysLayoutCards);
-
-    overrideAllCardArtWithPersonalPreferenceCheckBox.setChecked(settings.getOverrideAllCardArtWithPersonalPreference());
-    connect(&overrideAllCardArtWithPersonalPreferenceCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
-            &AppearanceSettingsPage::overrideAllCardArtWithPersonalPreferenceToggled);
-
-    bumpSetsWithCardsInDeckToTopCheckBox.setChecked(settings.getBumpSetsWithCardsInDeckToTop());
-    connect(&bumpSetsWithCardsInDeckToTopCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
-            &SettingsCache::setBumpSetsWithCardsInDeckToTop);
-
-    cardScalingCheckBox.setChecked(settings.getScaleCards());
-    connect(&cardScalingCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setCardScaling);
-
-    roundCardCornersCheckBox.setChecked(settings.getRoundCardCorners());
-    connect(&roundCardCornersCheckBox, &QAbstractButton::toggled, &settings, &SettingsCache::setRoundCardCorners);
-
-    verticalCardOverlapPercentBox.setValue(settings.getStackCardOverlapPercent());
-    verticalCardOverlapPercentBox.setRange(0, 80);
-    connect(&verticalCardOverlapPercentBox, qOverload<int>(&QSpinBox::valueChanged), &settings,
-            &SettingsCache::setStackCardOverlapPercent);
-
-    cardViewInitialRowsMaxBox.setRange(1, 999);
-    cardViewInitialRowsMaxBox.setValue(SettingsCache::instance().getCardViewInitialRowsMax());
-    connect(&cardViewInitialRowsMaxBox, qOverload<int>(&QSpinBox::valueChanged), this,
-            &AppearanceSettingsPage::cardViewInitialRowsMaxChanged);
-
-    cardViewExpandedRowsMaxBox.setRange(1, 999);
-    cardViewExpandedRowsMaxBox.setValue(SettingsCache::instance().getCardViewExpandedRowsMax());
-    connect(&cardViewExpandedRowsMaxBox, qOverload<int>(&QSpinBox::valueChanged), this,
-            &AppearanceSettingsPage::cardViewExpandedRowsMaxChanged);
-
-    auto *cardsGrid = new QGridLayout;
-    cardsGrid->addWidget(&displayCardNamesCheckBox, 0, 0, 1, 2);
-    cardsGrid->addWidget(&autoRotateSidewaysLayoutCardsCheckBox, 1, 0, 1, 2);
-    cardsGrid->addWidget(&cardScalingCheckBox, 2, 0, 1, 2);
-    cardsGrid->addWidget(&roundCardCornersCheckBox, 3, 0, 1, 2);
-    cardsGrid->addWidget(&overrideAllCardArtWithPersonalPreferenceCheckBox, 4, 0, 1, 2);
-    cardsGrid->addWidget(&bumpSetsWithCardsInDeckToTopCheckBox, 5, 0, 1, 2);
-    cardsGrid->addWidget(&verticalCardOverlapPercentLabel, 6, 0, 1, 1);
-    cardsGrid->addWidget(&verticalCardOverlapPercentBox, 6, 1, 1, 1);
-    cardsGrid->addWidget(&cardViewInitialRowsMaxLabel, 7, 0);
-    cardsGrid->addWidget(&cardViewInitialRowsMaxBox, 7, 1);
-    cardsGrid->addWidget(&cardViewExpandedRowsMaxLabel, 8, 0);
-    cardsGrid->addWidget(&cardViewExpandedRowsMaxBox, 8, 1);
-
-    cardsGroupBox = new QGroupBox;
-    cardsGroupBox->setLayout(cardsGrid);
-
-    // Card counter colors
-
-    auto *cardCounterColorsLayout = new QGridLayout;
-    cardCounterColorsLayout->setColumnStretch(1, 1);
-    cardCounterColorsLayout->setColumnStretch(3, 1);
-    cardCounterColorsLayout->setColumnStretch(5, 1);
-
-    auto &cardCounterSettings = SettingsCache::instance().cardCounters();
-    for (int index = 0; index < 6; ++index) {
-        auto *pushButton = new QPushButton;
-        pushButton->setStyleSheet(QString("background-color: %1").arg(cardCounterSettings.color(index).name()));
-
-        connect(&SettingsCache::instance().cardCounters(), &CardCounterSettings::colorChanged, pushButton,
-                [index, pushButton](int changedIndex, const QColor &color) {
-                    if (index == changedIndex) {
-                        pushButton->setStyleSheet(QString("background-color: %1").arg(color.name()));
-                    }
-                });
-
-        connect(pushButton, &QPushButton::clicked, this, [index, this]() {
-            auto &cardCounterSettings = SettingsCache::instance().cardCounters();
-
-            auto newColor = QColorDialog::getColor(cardCounterSettings.color(index), this);
-            if (!newColor.isValid())
-                return;
-
-            cardCounterSettings.setColor(index, newColor);
-        });
-
-        auto *colorName = new QLabel;
-        cardCounterNames.append(colorName);
-
-        int row = index / 3;
-        int column = 2 * (index % 3);
-
-        cardCounterColorsLayout->addWidget(pushButton, row, column);
-        cardCounterColorsLayout->addWidget(colorName, row, column + 1);
-    }
-
-    auto *cardCountersLayout = new QVBoxLayout;
-    cardCountersLayout->addLayout(cardCounterColorsLayout, 1);
-
-    cardCountersGroupBox = new QGroupBox;
-    cardCountersGroupBox->setLayout(cardCountersLayout);
-
-    // Hand layout
-    horizontalHandCheckBox.setChecked(settings.getHorizontalHand());
-    connect(&horizontalHandCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setHorizontalHand);
-
-    leftJustifiedHandCheckBox.setChecked(settings.getLeftJustified());
-    connect(&leftJustifiedHandCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings, &SettingsCache::setLeftJustified);
-
-    auto *handGrid = new QGridLayout;
-    handGrid->addWidget(&horizontalHandCheckBox, 0, 0, 1, 2);
-    handGrid->addWidget(&leftJustifiedHandCheckBox, 1, 0, 1, 2);
-
-    handGroupBox = new QGroupBox;
-    handGroupBox->setLayout(handGrid);
-
-    // table grid layout
-    invertVerticalCoordinateCheckBox.setChecked(settings.getInvertVerticalCoordinate());
-    connect(&invertVerticalCoordinateCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings,
-            &SettingsCache::setInvertVerticalCoordinate);
-
-    minPlayersForMultiColumnLayoutEdit.setMinimum(2);
-    minPlayersForMultiColumnLayoutEdit.setValue(settings.getMinPlayersForMultiColumnLayout());
-    connect(&minPlayersForMultiColumnLayoutEdit, qOverload<int>(&QSpinBox::valueChanged), &settings,
-            &SettingsCache::setMinPlayersForMultiColumnLayout);
-    minPlayersForMultiColumnLayoutLabel.setBuddy(&minPlayersForMultiColumnLayoutEdit);
-
-    connect(&maxFontSizeForCardsEdit, qOverload<int>(&QSpinBox::valueChanged), &settings,
-            &SettingsCache::setMaxFontSize);
-    maxFontSizeForCardsEdit.setValue(settings.getMaxFontSize());
-    maxFontSizeForCardsLabel.setBuddy(&maxFontSizeForCardsEdit);
-    maxFontSizeForCardsEdit.setMinimum(9);
-    maxFontSizeForCardsEdit.setMaximum(100);
-
-    auto *tableGrid = new QGridLayout;
-    tableGrid->addWidget(&invertVerticalCoordinateCheckBox, 0, 0, 1, 2);
-    tableGrid->addWidget(&minPlayersForMultiColumnLayoutLabel, 1, 0, 1, 1);
-    tableGrid->addWidget(&minPlayersForMultiColumnLayoutEdit, 1, 1, 1, 1);
-    tableGrid->addWidget(&maxFontSizeForCardsLabel, 2, 0, 1, 1);
-    tableGrid->addWidget(&maxFontSizeForCardsEdit, 2, 1, 1, 1);
-
-    tableGroupBox = new QGroupBox;
-    tableGroupBox->setLayout(tableGrid);
-
-    // putting it all together
-    auto *mainLayout = new QVBoxLayout;
-    mainLayout->addWidget(themeGroupBox);
-    mainLayout->addWidget(menuGroupBox);
-    mainLayout->addWidget(cardsGroupBox);
-    mainLayout->addWidget(cardCountersGroupBox);
-    mainLayout->addWidget(handGroupBox);
-    mainLayout->addWidget(tableGroupBox);
-    mainLayout->addStretch();
-
-    setLayout(mainLayout);
-
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &AppearanceSettingsPage::retranslateUi);
-    retranslateUi();
-}
-
-void AppearanceSettingsPage::themeBoxChanged(int index)
-{
-    QStringList themeDirs = themeManager->getAvailableThemes().keys();
-    if (index >= 0 && index < themeDirs.count())
-        SettingsCache::instance().setThemeName(themeDirs.at(index));
-}
-
-void AppearanceSettingsPage::openThemeLocation()
-{
-    QString dir = SettingsCache::instance().getThemesPath();
-    QDir dirDir = dir;
-    dirDir.cdUp();
-    // open if dir exists, create if parent dir does exist
-    if (dirDir.exists() && dirDir.mkpath(dir)) {
-        QDesktopServices::openUrl(QUrl::fromLocalFile(dir));
-    } else {
-        QMessageBox::critical(this, tr("Error"), tr("Could not create themes directory at '%1'.").arg(dir));
-    }
-}
-
-void AppearanceSettingsPage::showShortcutsChanged(QT_STATE_CHANGED_T value)
-{
-    SettingsCache::instance().setShowShortcuts(value);
-    qApp->setAttribute(Qt::AA_DontShowShortcutsInContextMenus, value == 0); // 0 = unchecked
-}
-
-void AppearanceSettingsPage::overrideAllCardArtWithPersonalPreferenceToggled(QT_STATE_CHANGED_T value)
-{
-    bool enable = static_cast<bool>(value);
-
-    QString message;
-    if (enable) {
-        message = tr("Enabling this feature will disable the use of the Printing Selector.\n\n"
-                     "You will not be able to manage printing preferences on a per-deck basis, "
-                     "or see printings other people have selected for their decks.\n\n"
-                     "You will have to use the Set Manager, available through Card Database -> Manage Sets.\n\n"
-                     "Are you sure you would like to enable this feature?");
-    } else {
-        message =
-            tr("Disabling this feature will enable the Printing Selector.\n\n"
-               "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.\n\n"
-               "You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector"
-               " (other sort orders like alphabetical or release date are available).\n\n"
-               "Are you sure you would like to disable this feature?");
-    }
-
-    QMessageBox::StandardButton result =
-        QMessageBox::question(this, tr("Confirm Change"), message, QMessageBox::Yes | QMessageBox::No);
-
-    if (result == QMessageBox::Yes) {
-        SettingsCache::instance().setOverrideAllCardArtWithPersonalPreference(value);
-        // Caches are now invalid.
-        CardPictureLoader::clearPixmapCache();
-        CardPictureLoader::clearNetworkCache();
-    } else {
-        // If user cancels, revert the checkbox/state back
-        QTimer::singleShot(0, this, [this, enable]() {
-            overrideAllCardArtWithPersonalPreferenceCheckBox.blockSignals(true);
-            overrideAllCardArtWithPersonalPreferenceCheckBox.setChecked(!enable);
-            overrideAllCardArtWithPersonalPreferenceCheckBox.blockSignals(false);
-        });
-    }
-}
+#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;
 
 /**
- * Updates the settings for cardViewInitialRowsMax.
- * Forces expanded rows max to always be >= initial rows max
- * @param value The new value
+ * @brief Wraps a widget in a scroll area for long settings pages
+ * @param widget The widget to wrap
+ * @return The scroll area containing the widget
  */
-void AppearanceSettingsPage::cardViewInitialRowsMaxChanged(int value)
-{
-    SettingsCache::instance().setCardViewInitialRowsMax(value);
-    if (cardViewExpandedRowsMaxBox.value() < value) {
-        cardViewExpandedRowsMaxBox.setValue(value);
-    }
-}
-
-/**
- * Updates the settings for cardViewExpandedRowsMax.
- * Forces initial rows max to always be <= expanded rows max
- * @param value The new value
- */
-void AppearanceSettingsPage::cardViewExpandedRowsMaxChanged(int value)
-{
-    SettingsCache::instance().setCardViewExpandedRowsMax(value);
-    if (cardViewInitialRowsMaxBox.value() > value) {
-        cardViewInitialRowsMaxBox.setValue(value);
-    }
-}
-
-void AppearanceSettingsPage::retranslateUi()
-{
-    themeGroupBox->setTitle(tr("Theme settings"));
-    themeLabel.setText(tr("Current theme:"));
-    openThemeButton.setText(tr("Open themes folder"));
-    homeTabBackgroundSourceLabel.setText(tr("Home tab background source:"));
-    homeTabBackgroundShuffleFrequencyLabel.setText(tr("Home tab background shuffle frequency:"));
-    homeTabBackgroundShuffleFrequencySpinBox.setSpecialValueText(tr("Disabled"));
-
-    menuGroupBox->setTitle(tr("Menu settings"));
-    showShortcutsCheckBox.setText(tr("Show keyboard shortcuts in right-click menus"));
-
-    cardsGroupBox->setTitle(tr("Card rendering"));
-    displayCardNamesCheckBox.setText(tr("Display card names on cards having a picture"));
-    autoRotateSidewaysLayoutCardsCheckBox.setText(tr("Auto-Rotate cards with sideways layout"));
-    overrideAllCardArtWithPersonalPreferenceCheckBox.setText(
-        tr("Override all card art with personal set preference (Pre-ProviderID change behavior)"));
-    bumpSetsWithCardsInDeckToTopCheckBox.setText(
-        tr("Bump sets that the deck contains cards from to the top in the printing selector"));
-    cardScalingCheckBox.setText(tr("Scale cards on mouse over"));
-    roundCardCornersCheckBox.setText(tr("Use rounded card corners"));
-    verticalCardOverlapPercentLabel.setText(
-        tr("Minimum overlap percentage of cards on the stack and in vertical hand"));
-    cardViewInitialRowsMaxLabel.setText(tr("Maximum initial height for card view window:"));
-    cardViewInitialRowsMaxBox.setSuffix(tr(" rows"));
-    cardViewExpandedRowsMaxLabel.setText(tr("Maximum expanded height for card view window:"));
-    cardViewExpandedRowsMaxBox.setSuffix(tr(" rows"));
-
-    cardCountersGroupBox->setTitle(tr("Card counters"));
-
-    auto &cardCounterSettings = SettingsCache::instance().cardCounters();
-    for (int index = 0; index < cardCounterNames.size(); ++index) {
-        cardCounterNames[index]->setText(tr("Counter %1").arg(cardCounterSettings.displayName(index)));
-    }
-
-    handGroupBox->setTitle(tr("Hand layout"));
-    horizontalHandCheckBox.setText(tr("Display hand horizontally (wastes space)"));
-    leftJustifiedHandCheckBox.setText(tr("Enable left justification"));
-
-    tableGroupBox->setTitle(tr("Table grid layout"));
-    invertVerticalCoordinateCheckBox.setText(tr("Invert vertical coordinate"));
-    minPlayersForMultiColumnLayoutLabel.setText(tr("Minimum player count for multi-column layout:"));
-    maxFontSizeForCardsLabel.setText(tr("Maximum font size for information displayed on cards:"));
-}
-
-enum visualDeckStoragePromptForConversionIndex
-{
-    visualDeckStoragePromptForConversionIndexNone,
-    visualDeckStoragePromptForConversionIndexPrompt,
-    visualDeckStoragePromptForConversionIndexAlways
-};
-
-UserInterfaceSettingsPage::UserInterfaceSettingsPage()
-{
-    // general settings and notification settings
-    notificationsEnabledCheckBox.setChecked(SettingsCache::instance().getNotificationsEnabled());
-    connect(&notificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setNotificationsEnabled);
-    connect(&notificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
-            &UserInterfaceSettingsPage::setNotificationEnabled);
-
-    specNotificationsEnabledCheckBox.setChecked(SettingsCache::instance().getSpectatorNotificationsEnabled());
-    specNotificationsEnabledCheckBox.setEnabled(SettingsCache::instance().getNotificationsEnabled());
-    connect(&specNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setSpectatorNotificationsEnabled);
-
-    buddyConnectNotificationsEnabledCheckBox.setChecked(
-        SettingsCache::instance().getBuddyConnectNotificationsEnabled());
-    buddyConnectNotificationsEnabledCheckBox.setEnabled(SettingsCache::instance().getNotificationsEnabled());
-    connect(&buddyConnectNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setBuddyConnectNotificationsEnabled);
-
-    doubleClickToPlayCheckBox.setChecked(SettingsCache::instance().getDoubleClickToPlay());
-    connect(&doubleClickToPlayCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setDoubleClickToPlay);
-
-    clickPlaysAllSelectedCheckBox.setChecked(SettingsCache::instance().getClickPlaysAllSelected());
-    connect(&clickPlaysAllSelectedCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setClickPlaysAllSelected);
-
-    playToStackCheckBox.setChecked(SettingsCache::instance().getPlayToStack());
-    connect(&playToStackCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setPlayToStack);
-
-    doNotDeleteArrowsInSubPhasesCheckBox.setChecked(SettingsCache::instance().getDoNotDeleteArrowsInSubPhases());
-    connect(&doNotDeleteArrowsInSubPhasesCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setDoNotDeleteArrowsInSubPhases);
-
-    closeEmptyCardViewCheckBox.setChecked(SettingsCache::instance().getCloseEmptyCardView());
-    connect(&closeEmptyCardViewCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setCloseEmptyCardView);
-
-    focusCardViewSearchBarCheckBox.setChecked(SettingsCache::instance().getFocusCardViewSearchBar());
-    connect(&focusCardViewSearchBarCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setFocusCardViewSearchBar);
-
-    annotateTokensCheckBox.setChecked(SettingsCache::instance().getAnnotateTokens());
-    connect(&annotateTokensCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setAnnotateTokens);
-
-    useTearOffMenusCheckBox.setChecked(SettingsCache::instance().getUseTearOffMenus());
-    connect(&useTearOffMenusCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            [](const QT_STATE_CHANGED_T state) { SettingsCache::instance().setUseTearOffMenus(state == Qt::Checked); });
-
-    auto *generalGrid = new QGridLayout;
-    generalGrid->addWidget(&doubleClickToPlayCheckBox, 0, 0);
-    generalGrid->addWidget(&clickPlaysAllSelectedCheckBox, 1, 0);
-    generalGrid->addWidget(&playToStackCheckBox, 2, 0);
-    generalGrid->addWidget(&doNotDeleteArrowsInSubPhasesCheckBox, 3, 0);
-    generalGrid->addWidget(&closeEmptyCardViewCheckBox, 4, 0);
-    generalGrid->addWidget(&focusCardViewSearchBarCheckBox, 5, 0);
-    generalGrid->addWidget(&annotateTokensCheckBox, 6, 0);
-    generalGrid->addWidget(&useTearOffMenusCheckBox, 7, 0);
-
-    generalGroupBox = new QGroupBox;
-    generalGroupBox->setLayout(generalGrid);
-
-    auto *notificationsGrid = new QGridLayout;
-    notificationsGrid->addWidget(&notificationsEnabledCheckBox, 0, 0);
-    notificationsGrid->addWidget(&specNotificationsEnabledCheckBox, 1, 0);
-    notificationsGrid->addWidget(&buddyConnectNotificationsEnabledCheckBox, 2, 0);
-
-    notificationsGroupBox = new QGroupBox;
-    notificationsGroupBox->setLayout(notificationsGrid);
-
-    // animation settings
-    tapAnimationCheckBox.setChecked(SettingsCache::instance().getTapAnimation());
-    connect(&tapAnimationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setTapAnimation);
-
-    auto *animationGrid = new QGridLayout;
-    animationGrid->addWidget(&tapAnimationCheckBox, 0, 0);
-
-    animationGroupBox = new QGroupBox;
-    animationGroupBox->setLayout(animationGrid);
-
-    // deck editor settings
-    openDeckInNewTabCheckBox.setChecked(SettingsCache::instance().getOpenDeckInNewTab());
-    connect(&openDeckInNewTabCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setOpenDeckInNewTab);
-
-    visualDeckStorageInGameCheckBox.setChecked(SettingsCache::instance().getVisualDeckStorageInGame());
-    connect(&visualDeckStorageInGameCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageInGame);
-
-    visualDeckStorageSelectionAnimationCheckBox.setChecked(
-        SettingsCache::instance().getVisualDeckStorageSelectionAnimation());
-    connect(&visualDeckStorageSelectionAnimationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageSelectionAnimation);
-
-    visualDeckStoragePromptForConversionSelector.addItem(""); // these will be set in retranslateUI
-    visualDeckStoragePromptForConversionSelector.addItem("");
-    visualDeckStoragePromptForConversionSelector.addItem("");
-    if (SettingsCache::instance().getVisualDeckStoragePromptForConversion()) {
-        visualDeckStoragePromptForConversionSelector.setCurrentIndex(visualDeckStoragePromptForConversionIndexPrompt);
-    } else if (SettingsCache::instance().getVisualDeckStorageAlwaysConvert()) {
-        visualDeckStoragePromptForConversionSelector.setCurrentIndex(visualDeckStoragePromptForConversionIndexAlways);
-    } else {
-        visualDeckStoragePromptForConversionSelector.setCurrentIndex(visualDeckStoragePromptForConversionIndexNone);
-    }
-    connect(&visualDeckStoragePromptForConversionSelector, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
-            [](int index) {
-                SettingsCache::instance().setVisualDeckStoragePromptForConversion(
-                    index == visualDeckStoragePromptForConversionIndexPrompt);
-                SettingsCache::instance().setVisualDeckStorageAlwaysConvert(
-                    index == visualDeckStoragePromptForConversionIndexAlways);
-            });
-
-    defaultDeckEditorTypeSelector.addItem(""); // these will be set in retranslateUI
-    defaultDeckEditorTypeSelector.addItem("");
-    defaultDeckEditorTypeSelector.setCurrentIndex(SettingsCache::instance().getDefaultDeckEditorType());
-    connect(&defaultDeckEditorTypeSelector, QOverload<int>::of(&QComboBox::currentIndexChanged),
-            &SettingsCache::instance(), &SettingsCache::setDefaultDeckEditorType);
-
-    auto *deckEditorGrid = new QGridLayout;
-    deckEditorGrid->addWidget(&openDeckInNewTabCheckBox, 0, 0);
-    deckEditorGrid->addWidget(&visualDeckStorageInGameCheckBox, 1, 0);
-    deckEditorGrid->addWidget(&visualDeckStorageSelectionAnimationCheckBox, 2, 0);
-    deckEditorGrid->addWidget(&visualDeckStoragePromptForConversionLabel, 3, 0);
-    deckEditorGrid->addWidget(&visualDeckStoragePromptForConversionSelector, 3, 1);
-    deckEditorGrid->addWidget(&defaultDeckEditorTypeLabel, 4, 0);
-    deckEditorGrid->addWidget(&defaultDeckEditorTypeSelector, 4, 1);
-
-    deckEditorGroupBox = new QGroupBox;
-    deckEditorGroupBox->setLayout(deckEditorGrid);
-
-    // replay settings
-    rewindBufferingMsBox.setRange(0, 9999);
-    rewindBufferingMsBox.setValue(SettingsCache::instance().getRewindBufferingMs());
-    connect(&rewindBufferingMsBox, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
-            &SettingsCache::setRewindBufferingMs);
-
-    auto *replayGrid = new QGridLayout;
-    replayGrid->addWidget(&rewindBufferingMsLabel, 0, 0, 1, 1);
-    replayGrid->addWidget(&rewindBufferingMsBox, 0, 1, 1, 1);
-
-    replayGroupBox = new QGroupBox;
-    replayGroupBox->setLayout(replayGrid);
-
-    // putting it all together
-    auto *mainLayout = new QVBoxLayout;
-    mainLayout->addWidget(generalGroupBox);
-    mainLayout->addWidget(notificationsGroupBox);
-    mainLayout->addWidget(animationGroupBox);
-    mainLayout->addWidget(deckEditorGroupBox);
-    mainLayout->addWidget(replayGroupBox);
-    mainLayout->addStretch();
-
-    setLayout(mainLayout);
-
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &UserInterfaceSettingsPage::retranslateUi);
-    retranslateUi();
-}
-
-void UserInterfaceSettingsPage::setNotificationEnabled(QT_STATE_CHANGED_T i)
-{
-    specNotificationsEnabledCheckBox.setEnabled(i != 0);
-    buddyConnectNotificationsEnabledCheckBox.setEnabled(i != 0);
-    if (i == 0) {
-        specNotificationsEnabledCheckBox.setChecked(false);
-        buddyConnectNotificationsEnabledCheckBox.setChecked(false);
-    }
-}
-
-void UserInterfaceSettingsPage::retranslateUi()
-{
-    generalGroupBox->setTitle(tr("General interface settings"));
-    doubleClickToPlayCheckBox.setText(tr("&Double-click cards to play them (instead of single-click)"));
-    clickPlaysAllSelectedCheckBox.setText(tr("&Clicking plays all selected cards (instead of just the clicked card)"));
-    playToStackCheckBox.setText(tr("&Play all nonlands onto the stack (not the battlefield) by default"));
-    doNotDeleteArrowsInSubPhasesCheckBox.setText(tr("Do not delete &arrows inside of subphases"));
-    closeEmptyCardViewCheckBox.setText(tr("Close card view window when last card is removed"));
-    focusCardViewSearchBarCheckBox.setText(tr("Auto focus search bar when card view window is opened"));
-    annotateTokensCheckBox.setText(tr("Annotate card text on tokens"));
-    useTearOffMenusCheckBox.setText(tr("Use tear-off menus, allowing right click menus to persist on screen"));
-    notificationsGroupBox->setTitle(tr("Notifications settings"));
-    notificationsEnabledCheckBox.setText(tr("Enable notifications in taskbar"));
-    specNotificationsEnabledCheckBox.setText(tr("Notify in the taskbar for game events while you are spectating"));
-    buddyConnectNotificationsEnabledCheckBox.setText(tr("Notify in the taskbar when users in your buddy list connect"));
-    animationGroupBox->setTitle(tr("Animation settings"));
-    tapAnimationCheckBox.setText(tr("&Tap/untap animation"));
-    deckEditorGroupBox->setTitle(tr("Deck editor/storage settings"));
-    openDeckInNewTabCheckBox.setText(tr("Open deck in new tab by default"));
-    visualDeckStorageInGameCheckBox.setText(tr("Use visual deck storage in game lobby"));
-    visualDeckStorageSelectionAnimationCheckBox.setText(tr("Use selection animation for Visual Deck Storage"));
-    visualDeckStoragePromptForConversionLabel.setText(
-        tr("When adding a tag in the visual deck storage to a .txt deck:"));
-    visualDeckStoragePromptForConversionSelector.setItemText(visualDeckStoragePromptForConversionIndexNone,
-                                                             tr("do nothing"));
-    visualDeckStoragePromptForConversionSelector.setItemText(visualDeckStoragePromptForConversionIndexPrompt,
-                                                             tr("ask to convert to .cod"));
-    visualDeckStoragePromptForConversionSelector.setItemText(visualDeckStoragePromptForConversionIndexAlways,
-                                                             tr("always convert to .cod"));
-    defaultDeckEditorTypeLabel.setText(tr("Default deck editor type"));
-    defaultDeckEditorTypeSelector.setItemText(TabSupervisor::ClassicDeckEditor, tr("Classic Deck Editor"));
-    defaultDeckEditorTypeSelector.setItemText(TabSupervisor::VisualDeckEditor, tr("Visual Deck Editor"));
-    replayGroupBox->setTitle(tr("Replay settings"));
-    rewindBufferingMsLabel.setText(tr("Buffer time for backwards skip via shortcut:"));
-    rewindBufferingMsBox.setSuffix(" ms");
-}
-
-DeckEditorSettingsPage::DeckEditorSettingsPage()
-{
-    picDownloadCheckBox.setChecked(SettingsCache::instance().getPicDownload());
-    connect(&picDownloadCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setPicDownload);
-
-    urlLinkLabel.setTextInteractionFlags(Qt::LinksAccessibleByMouse);
-    urlLinkLabel.setOpenExternalLinks(true);
-
-    connect(&clearDownloadedPicsButton, &QPushButton::clicked, this,
-            &DeckEditorSettingsPage::clearDownloadedPicsButtonClicked);
-    connect(&resetDownloadURLs, &QPushButton::clicked, this, &DeckEditorSettingsPage::resetDownloadedURLsButtonClicked);
-
-    auto *lpGeneralGrid = new QGridLayout;
-    auto *lpSpoilerGrid = new QGridLayout;
-
-    mcDownloadSpoilersCheckBox.setChecked(SettingsCache::instance().getDownloadSpoilersStatus());
-
-    mpSpoilerSavePathLineEdit = new QLineEdit(SettingsCache::instance().getSpoilerCardDatabasePath());
-    mpSpoilerSavePathLineEdit->setReadOnly(true);
-    mpSpoilerPathButton = new QPushButton("...");
-    connect(mpSpoilerPathButton, &QPushButton::clicked, this, &DeckEditorSettingsPage::spoilerPathButtonClicked);
-
-    updateNowButton = new QPushButton;
-    updateNowButton->setFixedWidth(150);
-    connect(updateNowButton, &QPushButton::clicked, this, &DeckEditorSettingsPage::updateSpoilers);
-
-    // Update the GUI depending on if the box is ticked or not
-    setSpoilersEnabled(mcDownloadSpoilersCheckBox.isChecked());
-
-    urlList = new QListWidget;
-    urlList->setSelectionMode(QAbstractItemView::SingleSelection);
-    urlList->setAlternatingRowColors(true);
-    urlList->setDragEnabled(true);
-    urlList->setDragDropMode(QAbstractItemView::InternalMove);
-    connect(urlList->model(), &QAbstractItemModel::rowsMoved, this, &DeckEditorSettingsPage::urlListChanged);
-
-    urlList->addItems(SettingsCache::instance().downloads().getAllURLs());
-
-    aAdd = new QAction(this);
-    aAdd->setIcon(QPixmap("theme:icons/increment"));
-    connect(aAdd, &QAction::triggered, this, &DeckEditorSettingsPage::actAddURL);
-
-    aEdit = new QAction(this);
-    aEdit->setIcon(QPixmap("theme:icons/pencil"));
-    connect(aEdit, &QAction::triggered, this, &DeckEditorSettingsPage::actEditURL);
-
-    aRemove = new QAction(this);
-    aRemove->setIcon(QPixmap("theme:icons/decrement"));
-    connect(aRemove, &QAction::triggered, this, &DeckEditorSettingsPage::actRemoveURL);
-
-    auto *urlToolBar = new QToolBar;
-    urlToolBar->setOrientation(Qt::Vertical);
-    urlToolBar->addAction(aAdd);
-    urlToolBar->addAction(aRemove);
-    urlToolBar->addAction(aEdit);
-    urlToolBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
-
-    auto *urlListLayout = new QHBoxLayout;
-    urlListLayout->addWidget(urlToolBar);
-    urlListLayout->addWidget(urlList);
-
-    // pixmap cache
-    pixmapCacheEdit.setMinimum(PIXMAPCACHE_SIZE_MIN);
-    // 2047 is the max value to avoid overflowing of QPixmapCache::setCacheLimit(int size)
-    pixmapCacheEdit.setMaximum(PIXMAPCACHE_SIZE_MAX);
-    pixmapCacheEdit.setSingleStep(64);
-    pixmapCacheEdit.setValue(SettingsCache::instance().getPixmapCacheSize());
-    pixmapCacheEdit.setSuffix(" MB");
-
-    networkCacheEdit.setMinimum(NETWORK_CACHE_SIZE_MIN);
-    networkCacheEdit.setMaximum(NETWORK_CACHE_SIZE_MAX);
-    networkCacheEdit.setSingleStep(1);
-    networkCacheEdit.setValue(SettingsCache::instance().getNetworkCacheSizeInMB());
-    networkCacheEdit.setSuffix(" MB");
-
-    networkRedirectCacheTtlEdit.setMinimum(NETWORK_REDIRECT_CACHE_TTL_MIN);
-    networkRedirectCacheTtlEdit.setMaximum(NETWORK_REDIRECT_CACHE_TTL_MAX);
-    networkRedirectCacheTtlEdit.setSingleStep(1);
-    networkRedirectCacheTtlEdit.setValue(SettingsCache::instance().getRedirectCacheTtl());
-
-    auto networkCacheLayout = new QHBoxLayout;
-    networkCacheLayout->addStretch();
-    networkCacheLayout->addWidget(&networkCacheLabel);
-    networkCacheLayout->addWidget(&networkCacheEdit);
-
-    auto networkRedirectCacheLayout = new QHBoxLayout;
-    networkRedirectCacheLayout->addStretch();
-    networkRedirectCacheLayout->addWidget(&networkRedirectCacheTtlLabel);
-    networkRedirectCacheLayout->addWidget(&networkRedirectCacheTtlEdit);
-
-    auto pixmapCacheLayout = new QHBoxLayout;
-    pixmapCacheLayout->addStretch();
-    pixmapCacheLayout->addWidget(&pixmapCacheLabel);
-    pixmapCacheLayout->addWidget(&pixmapCacheEdit);
-
-    // Top Layout
-    lpGeneralGrid->addWidget(&picDownloadCheckBox, 0, 0);
-    lpGeneralGrid->addWidget(&resetDownloadURLs, 0, 1);
-    lpGeneralGrid->addLayout(urlListLayout, 1, 0, 1, 2);
-    lpGeneralGrid->addLayout(networkCacheLayout, 2, 1);
-    lpGeneralGrid->addLayout(networkRedirectCacheLayout, 3, 0);
-    lpGeneralGrid->addLayout(pixmapCacheLayout, 3, 1);
-    lpGeneralGrid->addWidget(&urlLinkLabel, 5, 0);
-    lpGeneralGrid->addWidget(&clearDownloadedPicsButton, 5, 1);
-
-    // Spoiler Layout
-    lpSpoilerGrid->addWidget(&mcDownloadSpoilersCheckBox, 0, 0);
-    lpSpoilerGrid->addWidget(&mcSpoilerSaveLabel, 1, 0);
-    lpSpoilerGrid->addWidget(mpSpoilerSavePathLineEdit, 1, 1);
-    lpSpoilerGrid->addWidget(mpSpoilerPathButton, 1, 2);
-    lpSpoilerGrid->addWidget(&lastUpdatedLabel, 2, 0);
-    lpSpoilerGrid->addWidget(updateNowButton, 2, 1);
-    lpSpoilerGrid->addWidget(&infoOnSpoilersLabel, 3, 0, 1, 3, Qt::AlignTop);
-
-    // On a change to the checkbox, hide/un-hide the other fields
-    connect(&mcDownloadSpoilersCheckBox, &QCheckBox::toggled, &SettingsCache::instance(),
-            &SettingsCache::setDownloadSpoilerStatus);
-    connect(&mcDownloadSpoilersCheckBox, &QCheckBox::toggled, this, &DeckEditorSettingsPage::setSpoilersEnabled);
-    connect(&pixmapCacheEdit, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
-            &SettingsCache::setPixmapCacheSize);
-    connect(&networkCacheEdit, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
-            &SettingsCache::setNetworkCacheSizeInMB);
-    connect(&networkRedirectCacheTtlEdit, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance(),
-            &SettingsCache::setNetworkRedirectCacheTtl);
-
-    mpGeneralGroupBox = new QGroupBox;
-    mpGeneralGroupBox->setLayout(lpGeneralGrid);
-
-    mpSpoilerGroupBox = new QGroupBox;
-    mpSpoilerGroupBox->setLayout(lpSpoilerGrid);
-
-    auto *lpMainLayout = new QVBoxLayout;
-    lpMainLayout->addWidget(mpGeneralGroupBox);
-    lpMainLayout->addWidget(mpSpoilerGroupBox);
-
-    setLayout(lpMainLayout);
-
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &DeckEditorSettingsPage::retranslateUi);
-    retranslateUi();
-}
-
-void DeckEditorSettingsPage::resetDownloadedURLsButtonClicked()
-{
-    SettingsCache::instance().downloads().resetToDefaultURLs();
-    urlList->clear();
-    urlList->addItems(SettingsCache::instance().downloads().getAllURLs());
-    QMessageBox::information(this, tr("Success"), tr("Download URLs have been reset."));
-}
-
-void DeckEditorSettingsPage::clearDownloadedPicsButtonClicked()
-{
-    CardPictureLoader::clearNetworkCache();
-
-    // These are not used anymore, but we don't delete them automatically, so
-    // we should do it here lest we leave pictures hanging around on users'
-    // machines.
-    QString picsPath = SettingsCache::instance().getPicsPath() + "/downloadedPics/";
-    QStringList dirs = QDir(picsPath).entryList(QDir::AllDirs | QDir::NoDotAndDotDot);
-    bool outerSuccessRemove = true;
-    for (const auto &dir : dirs) {
-        QString currentPath = picsPath + dir + "/";
-        QStringList files = QDir(currentPath).entryList(QDir::Files);
-        bool innerSuccessRemove = true;
-        for (int j = 0; j < files.length(); j++) {
-            if (!QDir(currentPath).remove(files.at(j))) {
-                qInfo() << "Failed to remove " + currentPath.toUtf8() + files.at(j).toUtf8();
-                outerSuccessRemove = false;
-                innerSuccessRemove = false;
-            }
-            qInfo() << "Removed " << currentPath << files.at(j);
-        }
-
-        if (innerSuccessRemove) {
-            bool success = QDir(picsPath).rmdir(dir);
-            if (!success) {
-                qInfo() << "Failed to remove inner directory" << picsPath;
-            } else {
-                qInfo() << "Removed" << currentPath;
-            }
-        }
-    }
-    if (outerSuccessRemove) {
-        QMessageBox::information(this, tr("Success"), tr("Downloaded card pictures have been reset."));
-        QDir(SettingsCache::instance().getPicsPath()).rmdir("downloadedPics");
-    } else {
-        QMessageBox::critical(this, tr("Error"), tr("One or more downloaded card pictures could not be cleared."));
-    }
-}
-
-void DeckEditorSettingsPage::actAddURL()
-{
-    bool ok;
-    QString msg = QInputDialog::getText(this, tr("Add URL"), tr("URL:"), QLineEdit::Normal, QString(), &ok);
-    if (ok) {
-        urlList->addItem(msg);
-        storeSettings();
-    }
-}
-
-void DeckEditorSettingsPage::actRemoveURL()
-{
-    if (urlList->currentItem() != nullptr) {
-        delete urlList->takeItem(urlList->currentRow());
-        storeSettings();
-    }
-}
-
-void DeckEditorSettingsPage::actEditURL()
-{
-    if (urlList->currentItem()) {
-        QString oldText = urlList->currentItem()->text();
-        bool ok;
-        QString msg = QInputDialog::getText(this, tr("Edit URL"), tr("URL:"), QLineEdit::Normal, oldText, &ok);
-        if (ok) {
-            urlList->currentItem()->setText(msg);
-            storeSettings();
-        }
-    }
-}
-
-void DeckEditorSettingsPage::storeSettings()
-{
-    qInfo() << "URL Priority Reset";
-
-    QStringList downloadUrls;
-    for (int i = 0; i < urlList->count(); i++) {
-        qInfo() << "Priority" << i << ":" << urlList->item(i)->text();
-        downloadUrls << urlList->item(i)->text();
-    }
-    SettingsCache::instance().downloads().setDownloadUrls(downloadUrls);
-}
-
-void DeckEditorSettingsPage::urlListChanged(const QModelIndex &, int, int, const QModelIndex &, int)
-{
-    storeSettings();
-}
-
-void DeckEditorSettingsPage::updateSpoilers()
-{
-    // Disable the button so the user can only press it once at a time
-    updateNowButton->setDisabled(true);
-    updateNowButton->setText(tr("Updating..."));
-
-    // Create a new SBU that will act as if the client was just reloaded
-    auto *sbu = new SpoilerBackgroundUpdater();
-    connect(sbu, &SpoilerBackgroundUpdater::spoilerCheckerDone, this, &DeckEditorSettingsPage::unlockSettings);
-    connect(sbu, &SpoilerBackgroundUpdater::spoilersUpdatedSuccessfully, this, &DeckEditorSettingsPage::unlockSettings);
-}
-
-void DeckEditorSettingsPage::unlockSettings()
-{
-    updateNowButton->setDisabled(false);
-    updateNowButton->setText(tr("Update Spoilers"));
-}
-
-QString DeckEditorSettingsPage::getLastUpdateTime()
-{
-    QString fileName = SettingsCache::instance().getSpoilerCardDatabasePath();
-    QFileInfo fi(fileName);
-    QDir fileDir(fi.path());
-    QFile file(fileName);
-
-    if (file.exists()) {
-        return fi.lastModified().toString("MMM d, hh:mm");
-    }
-
-    return QString();
-}
-
-void DeckEditorSettingsPage::spoilerPathButtonClicked()
-{
-    QString lsPath = QFileDialog::getExistingDirectory(this, tr("Choose path"), mpSpoilerSavePathLineEdit->text());
-    if (lsPath.isEmpty()) {
-        return;
-    }
-
-    mpSpoilerSavePathLineEdit->setText(lsPath + "/spoiler.xml");
-    SettingsCache::instance().setSpoilerDatabasePath(lsPath + "/spoiler.xml");
-}
-
-void DeckEditorSettingsPage::setSpoilersEnabled(bool anInput)
-{
-    msDownloadSpoilersLabel.setEnabled(anInput);
-    mcSpoilerSaveLabel.setEnabled(anInput);
-    mpSpoilerSavePathLineEdit->setEnabled(anInput);
-    mpSpoilerPathButton->setEnabled(anInput);
-    lastUpdatedLabel.setEnabled(anInput);
-    updateNowButton->setEnabled(anInput);
-    infoOnSpoilersLabel.setEnabled(anInput);
-
-    if (!anInput) {
-        SpoilerBackgroundUpdater::deleteSpoilerFile();
-    }
-}
-
-void DeckEditorSettingsPage::retranslateUi()
-{
-    mpGeneralGroupBox->setTitle(tr("URL Download Priority"));
-    mpSpoilerGroupBox->setTitle(tr("Spoilers"));
-    mcDownloadSpoilersCheckBox.setText(tr("Download Spoilers Automatically"));
-    mcSpoilerSaveLabel.setText(tr("Spoiler Location:"));
-    lastUpdatedLabel.setText(tr("Last Change") + ": " + getLastUpdateTime());
-    infoOnSpoilersLabel.setText(tr("Spoilers download automatically on launch") + "\n" +
-                                tr("Press the button to manually update without relaunching") + "\n\n" +
-                                tr("Do not close settings until manual update is complete"));
-    picDownloadCheckBox.setText(tr("Download card pictures on the fly"));
-    urlLinkLabel.setText(QString("<a href='%1'>%2</a>").arg(WIKI_CUSTOM_PIC_URL).arg(tr("How to add a custom URL")));
-    clearDownloadedPicsButton.setText(tr("Delete Downloaded Images"));
-    resetDownloadURLs.setText(tr("Reset Download URLs"));
-    networkCacheLabel.setText(tr("Network Cache Size:"));
-    networkCacheEdit.setToolTip(tr("On-disk cache for downloaded pictures"));
-    networkRedirectCacheTtlLabel.setText(tr("Redirect Cache TTL:"));
-    networkRedirectCacheTtlEdit.setToolTip(tr("How long cached redirects for urls are valid for."));
-    pixmapCacheLabel.setText(tr("Picture Cache Size:"));
-    pixmapCacheEdit.setToolTip(tr("In-memory cache for pictures not currently on screen"));
-    updateNowButton->setText(tr("Update Spoilers"));
-    aAdd->setText(tr("Add New URL"));
-    aEdit->setText(tr("Edit URL"));
-    aRemove->setText(tr("Remove URL"));
-    networkRedirectCacheTtlEdit.setSuffix(" " + tr("Day(s)"));
-}
-
-MessagesSettingsPage::MessagesSettingsPage()
-{
-    chatMentionCheckBox.setChecked(SettingsCache::instance().getChatMention());
-    connect(&chatMentionCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setChatMention);
-
-    chatMentionCompleterCheckbox.setChecked(SettingsCache::instance().getChatMentionCompleter());
-    connect(&chatMentionCompleterCheckbox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setChatMentionCompleter);
-
-    explainMessagesLabel.setTextInteractionFlags(Qt::LinksAccessibleByMouse);
-    explainMessagesLabel.setOpenExternalLinks(true);
-
-    ignoreUnregUsersMainChat.setChecked(SettingsCache::instance().getIgnoreUnregisteredUsers());
-    ignoreUnregUserMessages.setChecked(SettingsCache::instance().getIgnoreUnregisteredUserMessages());
-    connect(&ignoreUnregUsersMainChat, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setIgnoreUnregisteredUsers);
-    connect(&ignoreUnregUserMessages, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setIgnoreUnregisteredUserMessages);
-
-    invertMentionForeground.setChecked(SettingsCache::instance().getChatMentionForeground());
-    connect(&invertMentionForeground, &QCheckBox::QT_STATE_CHANGED, this, &MessagesSettingsPage::updateTextColor);
-
-    invertHighlightForeground.setChecked(SettingsCache::instance().getChatHighlightForeground());
-    connect(&invertHighlightForeground, &QCheckBox::QT_STATE_CHANGED, this,
-            &MessagesSettingsPage::updateTextHighlightColor);
-
-    mentionColor = new QLineEdit();
-    mentionColor->setText(SettingsCache::instance().getChatMentionColor());
-    updateMentionPreview();
-    connect(mentionColor, &QLineEdit::textChanged, this, &MessagesSettingsPage::updateColor);
-
-    messagePopups.setChecked(SettingsCache::instance().getShowMessagePopup());
-    connect(&messagePopups, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setShowMessagePopups);
-
-    mentionPopups.setChecked(SettingsCache::instance().getShowMentionPopup());
-    connect(&mentionPopups, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setShowMentionPopups);
-
-    roomHistory.setChecked(SettingsCache::instance().getRoomHistory());
-    connect(&roomHistory, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(), &SettingsCache::setRoomHistory);
-
-    customAlertString = new QLineEdit();
-    customAlertString->setText(SettingsCache::instance().getHighlightWords());
-    connect(customAlertString, &QLineEdit::textChanged, &SettingsCache::instance(), &SettingsCache::setHighlightWords);
-
-    auto *chatGrid = new QGridLayout;
-    chatGrid->addWidget(&chatMentionCheckBox, 0, 0);
-    chatGrid->addWidget(&invertMentionForeground, 0, 1);
-    chatGrid->addWidget(mentionColor, 0, 2);
-    chatGrid->addWidget(&chatMentionCompleterCheckbox, 1, 0);
-    chatGrid->addWidget(&ignoreUnregUsersMainChat, 2, 0);
-    chatGrid->addWidget(&hexLabel, 1, 2);
-    chatGrid->addWidget(&ignoreUnregUserMessages, 3, 0);
-    chatGrid->addWidget(&messagePopups, 4, 0);
-    chatGrid->addWidget(&mentionPopups, 5, 0);
-    chatGrid->addWidget(&roomHistory, 6, 0);
-    chatGroupBox = new QGroupBox;
-    chatGroupBox->setLayout(chatGrid);
-
-    highlightColor = new QLineEdit();
-    highlightColor->setText(SettingsCache::instance().getChatHighlightColor());
-    updateHighlightPreview();
-    connect(highlightColor, &QLineEdit::textChanged, this, &MessagesSettingsPage::updateHighlightColor);
-
-    auto *highlightNotice = new QGridLayout;
-    highlightNotice->addWidget(highlightColor, 0, 2);
-    highlightNotice->addWidget(&invertHighlightForeground, 0, 1);
-    highlightNotice->addWidget(&hexHighlightLabel, 1, 2);
-    highlightNotice->addWidget(customAlertString, 0, 0);
-    highlightNotice->addWidget(&customAlertStringLabel, 1, 0);
-    highlightGroupBox = new QGroupBox;
-    highlightGroupBox->setLayout(highlightNotice);
-
-    messageList = new QListWidget;
-
-    int count = SettingsCache::instance().messages().getCount();
-    for (int i = 0; i < count; i++)
-        messageList->addItem(SettingsCache::instance().messages().getMessageAt(i));
-
-    aAdd = new QAction(this);
-    aAdd->setIcon(QPixmap("theme:icons/increment"));
-    connect(aAdd, &QAction::triggered, this, &MessagesSettingsPage::actAdd);
-
-    aEdit = new QAction(this);
-    aEdit->setIcon(QPixmap("theme:icons/pencil"));
-    connect(aEdit, &QAction::triggered, this, &MessagesSettingsPage::actEdit);
-
-    aRemove = new QAction(this);
-    aRemove->setIcon(QPixmap("theme:icons/decrement"));
-    connect(aRemove, &QAction::triggered, this, &MessagesSettingsPage::actRemove);
-
-    auto *messageToolBar = new QToolBar;
-    messageToolBar->setOrientation(Qt::Vertical);
-    messageToolBar->addAction(aAdd);
-    messageToolBar->addAction(aRemove);
-    messageToolBar->addAction(aEdit);
-    messageToolBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
-
-    auto *messageListLayout = new QHBoxLayout;
-    messageListLayout->addWidget(messageToolBar);
-    messageListLayout->addWidget(messageList);
-
-    auto *messagesLayout = new QVBoxLayout; // combines the explainer label with the actual messages widget pieces
-    messagesLayout->addLayout(messageListLayout);
-    messagesLayout->addWidget(&explainMessagesLabel);
-
-    messageGroupBox = new QGroupBox; // draws a box around the above layout and allows it to be titled
-    messageGroupBox->setLayout(messagesLayout);
-
-    auto *mainLayout = new QVBoxLayout; // combines the messages groupbox with the rest of the menu
-    mainLayout->addWidget(messageGroupBox);
-    mainLayout->addWidget(chatGroupBox);
-    mainLayout->addWidget(highlightGroupBox);
-
-    setLayout(mainLayout);
-
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &MessagesSettingsPage::retranslateUi);
-    retranslateUi();
-}
-
-void MessagesSettingsPage::updateColor(const QString &value)
-{
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
-    QColor colorToSet = QColor::fromString("#" + value);
-#else
-    QColor colorToSet;
-    colorToSet.setNamedColor("#" + value);
-#endif
-    if (colorToSet.isValid()) {
-        SettingsCache::instance().setChatMentionColor(value);
-        updateMentionPreview();
-    }
-}
-
-void MessagesSettingsPage::updateHighlightColor(const QString &value)
-{
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
-    QColor colorToSet = QColor::fromString("#" + value);
-#else
-    QColor colorToSet;
-    colorToSet.setNamedColor("#" + value);
-#endif
-    if (colorToSet.isValid()) {
-        SettingsCache::instance().setChatHighlightColor(value);
-        updateHighlightPreview();
-    }
-}
-
-void MessagesSettingsPage::updateTextColor(QT_STATE_CHANGED_T value)
-{
-    SettingsCache::instance().setChatMentionForeground(value);
-    updateMentionPreview();
-}
-
-void MessagesSettingsPage::updateTextHighlightColor(QT_STATE_CHANGED_T value)
-{
-    SettingsCache::instance().setChatHighlightForeground(value);
-    updateHighlightPreview();
-}
-
-void MessagesSettingsPage::updateMentionPreview()
-{
-    mentionColor->setStyleSheet(
-        "QLineEdit{background:#" + SettingsCache::instance().getChatMentionColor() +
-        ";color: " + (SettingsCache::instance().getChatMentionForeground() ? "white" : "black") + ";}");
-}
-
-void MessagesSettingsPage::updateHighlightPreview()
-{
-    highlightColor->setStyleSheet(
-        "QLineEdit{background:#" + SettingsCache::instance().getChatHighlightColor() +
-        ";color: " + (SettingsCache::instance().getChatHighlightForeground() ? "white" : "black") + ";}");
-}
-
-void MessagesSettingsPage::storeSettings()
-{
-    SettingsCache::instance().messages().setCount(messageList->count());
-    for (int i = 0; i < messageList->count(); i++)
-        SettingsCache::instance().messages().setMessageAt(i, messageList->item(i)->text());
-    emit SettingsCache::instance().messages().messageMacrosChanged();
-}
-
-void MessagesSettingsPage::actAdd()
-{
-    bool ok;
-    QString msg =
-        getTextWithMax(this, tr("Add message"), tr("Message:"), QLineEdit::Normal, QString(), &ok, MAX_TEXT_LENGTH);
-    if (ok) {
-        messageList->addItem(msg);
-        storeSettings();
-    }
-}
-
-void MessagesSettingsPage::actEdit()
-{
-    if (messageList->currentItem()) {
-        QString oldText = messageList->currentItem()->text();
-        bool ok;
-        QString msg =
-            getTextWithMax(this, tr("Edit message"), tr("Message:"), QLineEdit::Normal, oldText, &ok, MAX_TEXT_LENGTH);
-        if (ok) {
-            messageList->currentItem()->setText(msg);
-            storeSettings();
-        }
-    }
-}
-
-void MessagesSettingsPage::actRemove()
-{
-    if (messageList->currentItem() != nullptr) {
-        delete messageList->takeItem(messageList->currentRow());
-        storeSettings();
-    }
-}
-
-void MessagesSettingsPage::retranslateUi()
-{
-    chatGroupBox->setTitle(tr("Chat settings"));
-    highlightGroupBox->setTitle(tr("Custom alert words"));
-    chatMentionCheckBox.setText(tr("Enable chat mentions"));
-    chatMentionCompleterCheckbox.setText(tr("Enable mention completer"));
-    messageGroupBox->setTitle(tr("In-game message macros"));
-    explainMessagesLabel.setText(
-        QString("<a href='%1'>%2</a>").arg(WIKI_CUSTOM_SHORTCUTS).arg(tr("How to use in-game message macros")));
-    ignoreUnregUsersMainChat.setText(tr("Ignore chat room messages sent by unregistered users"));
-    ignoreUnregUserMessages.setText(tr("Ignore private messages sent by unregistered users"));
-    invertMentionForeground.setText(tr("Invert text color"));
-    invertHighlightForeground.setText(tr("Invert text color"));
-    messagePopups.setText(tr("Enable desktop notifications for private messages"));
-    mentionPopups.setText(tr("Enable desktop notification for mentions"));
-    roomHistory.setText(tr("Enable room message history on join"));
-    hexLabel.setText(tr("(Color is hexadecimal)"));
-    hexHighlightLabel.setText(tr("(Color is hexadecimal)"));
-    customAlertStringLabel.setText(tr("Separate words with a space, alphanumeric characters only"));
-    customAlertString->setPlaceholderText(tr("Word1 Word2 Word3"));
-    aAdd->setText(tr("Add New Message"));
-    aEdit->setText(tr("Edit Message"));
-    aRemove->setText(tr("Remove Message"));
-}
-
-SoundSettingsPage::SoundSettingsPage()
-{
-    soundEnabledCheckBox.setChecked(SettingsCache::instance().getSoundEnabled());
-    connect(&soundEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setSoundEnabled);
-
-    QString themeName = SettingsCache::instance().getSoundThemeName();
-
-    QStringList themeDirs = soundEngine->getAvailableThemes().keys();
-    for (int i = 0; i < themeDirs.size(); i++) {
-        themeBox.addItem(themeDirs[i]);
-        if (themeDirs[i] == themeName)
-            themeBox.setCurrentIndex(i);
-    }
-
-    connect(&themeBox, qOverload<int>(&QComboBox::currentIndexChanged), this, &SoundSettingsPage::themeBoxChanged);
-    connect(&soundTestButton, &QPushButton::clicked, soundEngine, &SoundEngine::testSound);
-
-    masterVolumeSlider = new QSlider(Qt::Horizontal);
-    masterVolumeSlider->setMinimum(0);
-    masterVolumeSlider->setMaximum(100);
-    masterVolumeSlider->setValue(SettingsCache::instance().getMasterVolume());
-    masterVolumeSlider->setToolTip(QString::number(SettingsCache::instance().getMasterVolume()));
-    connect(&SettingsCache::instance(), &SettingsCache::masterVolumeChanged, this,
-            &SoundSettingsPage::masterVolumeChanged);
-    connect(masterVolumeSlider, &QSlider::sliderReleased, soundEngine, &SoundEngine::testSound);
-    connect(masterVolumeSlider, &QSlider::valueChanged, &SettingsCache::instance(), &SettingsCache::setMasterVolume);
-
-    masterVolumeSpinBox = new QSpinBox();
-    masterVolumeSpinBox->setMinimum(0);
-    masterVolumeSpinBox->setMaximum(100);
-    masterVolumeSpinBox->setValue(SettingsCache::instance().getMasterVolume());
-    connect(masterVolumeSlider, &QSlider::valueChanged, masterVolumeSpinBox, &QSpinBox::setValue);
-    connect(masterVolumeSpinBox, qOverload<int>(&QSpinBox::valueChanged), masterVolumeSlider, &QSlider::setValue);
-
-    auto *soundGrid = new QGridLayout;
-    soundGrid->addWidget(&soundEnabledCheckBox, 0, 0, 1, 3);
-    soundGrid->addWidget(&masterVolumeLabel, 1, 0);
-    soundGrid->addWidget(masterVolumeSlider, 1, 1);
-    soundGrid->addWidget(masterVolumeSpinBox, 1, 2);
-    soundGrid->addWidget(&themeLabel, 2, 0);
-    soundGrid->addWidget(&themeBox, 2, 1);
-    soundGrid->addWidget(&soundTestButton, 3, 1);
-
-    soundGroupBox = new QGroupBox;
-    soundGroupBox->setLayout(soundGrid);
-
-    auto *mainLayout = new QVBoxLayout;
-    mainLayout->addWidget(soundGroupBox);
-    mainLayout->addStretch();
-
-    setLayout(mainLayout);
-
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &SoundSettingsPage::retranslateUi);
-    retranslateUi();
-}
-
-void SoundSettingsPage::themeBoxChanged(int index)
-{
-    QStringList themeDirs = soundEngine->getAvailableThemes().keys();
-    if (index >= 0 && index < themeDirs.count())
-        SettingsCache::instance().setSoundThemeName(themeDirs.at(index));
-}
-
-void SoundSettingsPage::masterVolumeChanged(int value)
-{
-    masterVolumeSlider->setToolTip(QString::number(value));
-}
-
-void SoundSettingsPage::retranslateUi()
-{
-    soundEnabledCheckBox.setText(tr("Enable &sounds"));
-    themeLabel.setText(tr("Current sounds theme:"));
-    soundTestButton.setText(tr("Test system sound engine"));
-    soundGroupBox->setTitle(tr("Sound settings"));
-    masterVolumeLabel.setText(tr("Master volume"));
-}
-
-ShortcutSettingsPage::ShortcutSettingsPage()
-{
-    // search bar
-    searchEdit = new SearchLineEdit;
-    searchEdit->setObjectName("searchEdit");
-    searchEdit->setClearButtonEnabled(true);
-
-    setFocusProxy(searchEdit);
-    setFocusPolicy(Qt::ClickFocus);
-
-    // table
-    shortcutsTable = new ShortcutTreeView(this);
-
-    shortcutsTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    shortcutsTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
-    shortcutsTable->setColumnWidth(0, width() / 3 * 2);
-    searchEdit->setTreeView(shortcutsTable);
-
-    connect(searchEdit, &SearchLineEdit::textChanged, shortcutsTable, &ShortcutTreeView::updateSearchString);
-
-    // edit widget
-    currentActionGroupLabel = new QLabel(this);
-    currentActionGroupName = new QLabel(this);
-    currentActionLabel = new QLabel(this);
-    currentActionName = new QLabel(this);
-    currentShortcutLabel = new QLabel(this);
-    editTextBox = new SequenceEdit("", this);
-    shortcutsTable->installEventFilter(editTextBox);
-
-    // buttons
-    faqLabel = new QLabel(this);
-    faqLabel->setTextInteractionFlags(Qt::LinksAccessibleByMouse);
-    faqLabel->setOpenExternalLinks(true);
-
-    btnResetAll = new QPushButton(this);
-    btnClearAll = new QPushButton(this);
-
-    btnResetAll->setIcon(QPixmap("theme:icons/update"));
-    btnClearAll->setIcon(QPixmap("theme:icons/clearsearch"));
-
-    // layout
-    auto *_editLayout = new QGridLayout;
-    _editLayout->addWidget(currentActionGroupLabel, 0, 0);
-    _editLayout->addWidget(currentActionGroupName, 0, 1);
-    _editLayout->addWidget(currentActionLabel, 1, 0);
-    _editLayout->addWidget(currentActionName, 1, 1);
-    _editLayout->addWidget(currentShortcutLabel, 2, 0);
-    _editLayout->addWidget(editTextBox, 2, 1);
-
-    editShortcutGroupBox = new QGroupBox;
-    editShortcutGroupBox->setLayout(_editLayout);
-
-    auto *_buttonsLayout = new QHBoxLayout;
-    _buttonsLayout->addWidget(faqLabel);
-    _buttonsLayout->addWidget(btnResetAll);
-    _buttonsLayout->addWidget(btnClearAll);
-
-    auto *_mainLayout = new QVBoxLayout;
-    _mainLayout->addWidget(searchEdit);
-    _mainLayout->addWidget(shortcutsTable);
-    _mainLayout->addWidget(editShortcutGroupBox);
-    _mainLayout->addLayout(_buttonsLayout);
-
-    setLayout(_mainLayout);
-
-    connect(btnResetAll, &QPushButton::clicked, this, &ShortcutSettingsPage::resetShortcuts);
-    connect(btnClearAll, &QPushButton::clicked, this, &ShortcutSettingsPage::clearShortcuts);
-
-    connect(shortcutsTable, &ShortcutTreeView::currentItemChanged, this, &ShortcutSettingsPage::currentItemChanged);
-
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &ShortcutSettingsPage::retranslateUi);
-    retranslateUi();
-}
-
-void ShortcutSettingsPage::currentItemChanged(const QString &key)
-{
-    if (key.isEmpty()) {
-        currentActionGroupName->setText("");
-        currentActionName->setText("");
-        editTextBox->setShortcutName("");
-    } else {
-        QString group = SettingsCache::instance().shortcuts().getShortcut(key).getGroupName();
-        QString action = SettingsCache::instance().shortcuts().getShortcut(key).getName();
-        currentActionGroupName->setText(group);
-        currentActionName->setText(action);
-        editTextBox->setShortcutName(key);
-    }
-}
-
-void ShortcutSettingsPage::resetShortcuts()
-{
-    if (QMessageBox::question(this, tr("Restore all default shortcuts"),
-                              tr("Do you really want to restore all default shortcuts?")) == QMessageBox::Yes) {
-        SettingsCache::instance().shortcuts().resetAllShortcuts();
-    }
-}
-
-void ShortcutSettingsPage::clearShortcuts()
-{
-    if (QMessageBox::question(this, tr("Clear all default shortcuts"),
-                              tr("Do you really want to clear all shortcuts?")) == QMessageBox::Yes) {
-        SettingsCache::instance().shortcuts().clearAllShortcuts();
-    }
-}
-
-void ShortcutSettingsPage::retranslateUi()
-{
-    shortcutsTable->retranslateUi();
-
-    currentActionGroupLabel->setText(tr("Section:"));
-    currentActionLabel->setText(tr("Action:"));
-    currentShortcutLabel->setText(tr("Shortcut:"));
-    editTextBox->retranslateUi();
-    faqLabel->setText(QString("<a href='%1'>%2</a>").arg(WIKI_CUSTOM_SHORTCUTS).arg(tr("How to set custom shortcuts")));
-    btnResetAll->setText(tr("Restore all default shortcuts"));
-    btnClearAll->setText(tr("Clear all shortcuts"));
-    searchEdit->setPlaceholderText(tr("Search by shortcut name"));
-}
-
 static QScrollArea *makeScrollable(QWidget *widget)
 {
     widget->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Maximum);
@@ -1752,114 +91,412 @@ static QScrollArea *makeScrollable(QWidget *widget)
     return scrollArea;
 }
 
-DlgSettings::DlgSettings(QWidget *parent) : QDialog(parent)
+/**
+ * @brief Returns the theme icon resources for each settings page, indexed by SettingsPage order
+ */
+static QStringList pageIconResources()
+{
+    return {QStringLiteral("theme:config/general"),   QStringLiteral("theme:config/appearance"),
+            QStringLiteral("theme:config/interface"), QStringLiteral("theme:config/deckeditor"),
+            QStringLiteral("theme:config/storage"),   QStringLiteral("theme:config/messages"),
+            QStringLiteral("theme:config/sound"),     QStringLiteral("theme:config/shorcuts")};
+}
+
+DlgSettings::DlgSettings(QWidget *parent) : QDialog(parent), currentTabIndex(0), searchActive(false)
 {
     auto rec = QGuiApplication::primaryScreen()->availableGeometry();
-    this->setMinimumSize(qMin(700, rec.width()), qMin(700, rec.height()));
+    setMinimumSize(qMin(750, rec.width()), qMin(700, rec.height()));
 
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &DlgSettings::updateLanguage);
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this, &DlgSettings::updateLanguage);
 
-    contentsWidget = new QListWidget;
-    contentsWidget->setViewMode(QListView::IconMode);
-    contentsWidget->setIconSize(QSize(58, 50));
-    contentsWidget->setMovement(QListView::Static);
-    contentsWidget->setMinimumHeight(85);
-    contentsWidget->setMaximumHeight(85);
-    contentsWidget->setSpacing(5);
+    setupUi();
 
-    pagesWidget = new QStackedWidget;
-    pagesWidget->addWidget(new GeneralSettingsPage);
-    pagesWidget->addWidget(makeScrollable(new AppearanceSettingsPage));
-    pagesWidget->addWidget(makeScrollable(new UserInterfaceSettingsPage));
-    pagesWidget->addWidget(new DeckEditorSettingsPage);
-    pagesWidget->addWidget(new MessagesSettingsPage);
-    pagesWidget->addWidget(new SoundSettingsPage);
-    pagesWidget->addWidget(new ShortcutSettingsPage);
-
-    createIcons();
-    contentsWidget->setCurrentRow(0);
-
-    auto *vboxLayout = new QVBoxLayout;
-    vboxLayout->addWidget(contentsWidget);
-    vboxLayout->addWidget(pagesWidget);
-
-    auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok);
-    connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgSettings::close);
-
-    auto *mainLayout = new QVBoxLayout;
-    mainLayout->addLayout(vboxLayout);
-    mainLayout->addSpacing(2);
-    mainLayout->addWidget(buttonBox);
-    setLayout(mainLayout);
-
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &DlgSettings::retranslateUi);
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this, &DlgSettings::retranslateUi);
     retranslateUi();
 
+    searchEdit->setFocus();
+
     adjustSize();
 }
 
-void DlgSettings::createIcons()
+void DlgSettings::setupUi()
 {
-    generalButton = new QListWidgetItem(contentsWidget);
-    generalButton->setTextAlignment(Qt::AlignHCenter);
-    generalButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    generalButton->setIcon(QPixmap("theme:config/general"));
+    // Search bar
+    searchEdit = new QLineEdit;
+    searchEdit->setClearButtonEnabled(true);
+    searchEdit->addAction(themePixmap(QStringLiteral("icons/search")), QLineEdit::LeadingPosition);
+    searchEdit->installEventFilter(this);
+    connect(searchEdit, &QLineEdit::textChanged, this, &DlgSettings::onSearchTextChanged);
 
-    appearanceButton = new QListWidgetItem(contentsWidget);
-    appearanceButton->setTextAlignment(Qt::AlignHCenter);
-    appearanceButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    appearanceButton->setIcon(QPixmap("theme:config/appearance"));
+    auto *searchLayout = new QHBoxLayout;
+    searchLayout->addWidget(searchEdit);
 
-    userInterfaceButton = new QListWidgetItem(contentsWidget);
-    userInterfaceButton->setTextAlignment(Qt::AlignHCenter);
-    userInterfaceButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    userInterfaceButton->setIcon(QPixmap("theme:config/interface"));
+    // Tab bar (built in setupTabBar)
+    setupTabBar();
 
-    deckEditorButton = new QListWidgetItem(contentsWidget);
-    deckEditorButton->setTextAlignment(Qt::AlignHCenter);
-    deckEditorButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    deckEditorButton->setIcon(QPixmap("theme:config/deckeditor"));
+    // Pages stacked widget
+    pagesWidget = new QStackedWidget;
 
-    messagesButton = new QListWidgetItem(contentsWidget);
-    messagesButton->setTextAlignment(Qt::AlignHCenter);
-    messagesButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    messagesButton->setIcon(QPixmap("theme:config/messages"));
+    auto *generalPage = new GeneralSettingsPage;
+    auto *appearancePage = new AppearanceSettingsPage;
+    auto *userInterfacePage = new UserInterfaceSettingsPage;
+    auto *deckEditorPage = new DeckEditorSettingsPage;
+    auto *storagePage = new StorageSettingsPage;
+    auto *messagesPage = new MessagesSettingsPage;
+    auto *soundPage = new SoundSettingsPage;
+    auto *shortcutsPage = new ShortcutSettingsPage;
 
-    soundButton = new QListWidgetItem(contentsWidget);
-    soundButton->setTextAlignment(Qt::AlignHCenter);
-    soundButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    soundButton->setIcon(QPixmap("theme:config/sound"));
+    pages.append(generalPage);
+    pages.append(appearancePage);
+    pages.append(userInterfacePage);
+    pages.append(deckEditorPage);
+    pages.append(storagePage);
+    pages.append(messagesPage);
+    pages.append(soundPage);
+    pages.append(shortcutsPage);
 
-    shortcutsButton = new QListWidgetItem(contentsWidget);
-    shortcutsButton->setTextAlignment(Qt::AlignHCenter);
-    shortcutsButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    shortcutsButton->setIcon(QPixmap("theme:config/shorcuts"));
+    pagesWidget->addWidget(makeScrollable(generalPage));
+    pagesWidget->addWidget(makeScrollable(appearancePage));
+    pagesWidget->addWidget(makeScrollable(userInterfacePage));
+    pagesWidget->addWidget(makeScrollable(deckEditorPage));
+    pagesWidget->addWidget(makeScrollable(storagePage));
+    pagesWidget->addWidget(makeScrollable(messagesPage));
+    pagesWidget->addWidget(soundPage);
+    pagesWidget->addWidget(shortcutsPage);
 
-    connect(contentsWidget, &QListWidget::currentItemChanged, this, &DlgSettings::changePage);
+    Q_ASSERT(pages.size() == NumPages);
+
+    // Search results view (hidden by default)
+    searchResultsView = new QListView;
+    searchResultsView->setUniformItemSizes(false);
+    searchResultsView->setSelectionMode(QAbstractItemView::SingleSelection);
+    searchResultsView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    searchResultsView->setVisible(false);
+    searchResultsView->setStyleSheet(
+        "QListView::item:selected { background: palette(highlight); color: palette(highlighted-text); }");
+
+    searchModel = new SettingsSearchModel(this);
+    searchDelegate = new SettingsSearchDelegate(this);
+    searchResultsView->setModel(searchModel);
+    searchResultsView->setItemDelegate(searchDelegate);
+    connect(searchResultsView, &QListView::clicked, this, &DlgSettings::onSearchResultClicked);
+
+    connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this, [this] {
+        const QStringList icons = pageIconResources();
+        for (int i = 0; i < tabButtons.size() && i < icons.size(); ++i) {
+            tabButtons[i]->setIcon(QPixmap(icons[i]));
+        }
+        searchDelegate->setPageIcons(icons);
+        searchResultsView->viewport()->update();
+    });
+
+    // Build search index after pages are created
+    buildSearchIndex();
+
+    // Pages container (stacked widget + search results overlay)
+    pagesContainer = new QWidget;
+    auto *containerLayout = new QStackedLayout;
+    containerLayout->setStackingMode(QStackedLayout::StackAll);
+    containerLayout->addWidget(pagesWidget);
+    containerLayout->addWidget(searchResultsView);
+    pagesContainer->setLayout(containerLayout);
+
+    // Bottom buttons
+    auto *buttonBox = new QHBoxLayout;
+    buttonBox->addStretch();
+    okButton = new QPushButton;
+    okButton->setDefault(true);
+    connect(okButton, &QPushButton::clicked, this, &DlgSettings::close);
+    buttonBox->addWidget(okButton);
+
+    // Main layout
+    auto *mainLayout = new QVBoxLayout;
+    mainLayout->addLayout(searchLayout);
+    mainLayout->addWidget(tabBarWidget);
+    auto *separator = new QFrame;
+    separator->setFrameShape(QFrame::HLine);
+    separator->setFrameShadow(QFrame::Sunken);
+    mainLayout->addWidget(separator);
+    mainLayout->addWidget(pagesContainer);
+    mainLayout->addSpacing(4);
+    mainLayout->addLayout(buttonBox);
+    setLayout(mainLayout);
+
+    // Keyboard shortcuts
+    auto *searchShortcut = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_F), this);
+    connect(searchShortcut, &QShortcut::activated, searchEdit, qOverload<>(&QLineEdit::setFocus));
+
+    auto *nextTabShortcut = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_Tab), this);
+    connect(nextTabShortcut, &QShortcut::activated, this, [this] {
+        int next = (currentTabIndex + 1) % tabButtons.size();
+        setActiveTab(next);
+    });
+
+    auto *prevTabShortcut = new QShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab), this);
+    connect(prevTabShortcut, &QShortcut::activated, this, [this] {
+        int prev = (currentTabIndex - 1 + tabButtons.size()) % tabButtons.size();
+        setActiveTab(prev);
+    });
+
+    // Initialize to first tab
+    setActiveTab(0);
 }
 
-void DlgSettings::changePage(QListWidgetItem *current, QListWidgetItem *previous)
+void DlgSettings::setupTabBar()
 {
-    if (!current)
-        current = previous;
+    tabBarWidget = new QWidget;
+    auto *tabLayout = new QHBoxLayout;
+    tabLayout->setContentsMargins(0, 0, 0, 0);
+    tabLayout->setSpacing(2);
 
-    pagesWidget->setCurrentIndex(contentsWidget->row(current));
+    const QStringList iconResources = pageIconResources();
+
+    for (int i = 0; i < iconResources.size(); ++i) {
+        auto *tabButton = new QToolButton;
+        tabButton->setCheckable(true);
+        tabButton->setIcon(QPixmap(iconResources[i]));
+        tabButton->setIconSize(QSize(48, 48));
+        tabButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+        tabButton->setAutoExclusive(true);
+        tabButton->setMinimumHeight(85);
+        tabButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+        connect(tabButton, &QToolButton::clicked, this, [this, idx = i] { onTabClicked(idx); });
+
+        tabButtons.append(tabButton);
+        tabLayout->addWidget(tabButton);
+    }
+
+    tabBarWidget->setLayout(tabLayout);
+}
+
+void DlgSettings::buildSearchIndex()
+{
+    QList<SettingsSearchEntry> allEntries;
+
+    const QStringList pageNames = translatedPageNames();
+    searchDelegate->setPageNames(pageNames);
+    searchDelegate->setPageIcons(pageIconResources());
+
+    for (int i = 0; i < pages.size(); ++i) {
+        QList<SettingsSearchEntry> pageEntries = pages[i]->getSearchEntries();
+        for (auto &entry : pageEntries) {
+            if (entry.pageIndex == -1) {
+                entry.pageIndex = i;
+            }
+        }
+        allEntries.append(pageEntries);
+    }
+
+    searchModel->setSourceEntries(allEntries);
+}
+
+void DlgSettings::onTabClicked(int index)
+{
+    if (searchActive) {
+        switchToTabMode();
+    }
+    setActiveTab(index);
+}
+
+void DlgSettings::setActiveTab(int index)
+{
+    if (index < 0 || index >= tabButtons.size()) {
+        return;
+    }
+
+    currentTabIndex = index;
+    pagesWidget->setCurrentIndex(index);
+
+    for (int i = 0; i < tabButtons.size(); ++i) {
+        tabButtons[i]->setChecked(i == index);
+    }
+
+    // Style active tab with a thick accent border + subtle background tint
+    for (int i = 0; i < tabButtons.size(); ++i) {
+        if (i == index) {
+            tabButtons[i]->setStyleSheet("QToolButton { border: none; border-bottom: 3px solid palette(highlight); "
+                                         "border-top-left-radius: 4px; border-top-right-radius: 4px; "
+                                         "background: palette(window); padding-bottom: 1px; }");
+        } else {
+            tabButtons[i]->setStyleSheet("QToolButton { border: none; border-bottom: 1px solid transparent; "
+                                         "border-top-left-radius: 4px; border-top-right-radius: 4px; "
+                                         "background: transparent; }");
+        }
+    }
+}
+
+void DlgSettings::flashWidget(QWidget *widget)
+{
+    auto *overlay = new QWidget(widget);
+    overlay->setGeometry(widget->rect());
+    overlay->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+
+    QPalette pal = overlay->palette();
+    QColor flashColor = pal.color(QPalette::Highlight);
+    flashColor.setAlpha(100);
+    pal.setBrush(QPalette::Window, flashColor);
+    overlay->setPalette(pal);
+    overlay->setAutoFillBackground(true);
+
+    auto *effect = new QGraphicsOpacityEffect(overlay);
+    effect->setOpacity(0.0);
+    overlay->setGraphicsEffect(effect);
+    overlay->show();
+    overlay->raise();
+
+    auto *flashIn = new QPropertyAnimation(effect, "opacity");
+    flashIn->setDuration(120);
+    flashIn->setStartValue(0.0);
+    flashIn->setEndValue(0.6);
+    flashIn->setEasingCurve(QEasingCurve::OutCubic);
+
+    auto *fadeOut = new QPropertyAnimation(effect, "opacity");
+    fadeOut->setDuration(900);
+    fadeOut->setStartValue(0.6);
+    fadeOut->setEndValue(0.0);
+    fadeOut->setEasingCurve(QEasingCurve::InCubic);
+
+    auto *group = new QSequentialAnimationGroup(overlay);
+    group->addAnimation(flashIn);
+    group->addAnimation(fadeOut);
+
+    connect(group, &QSequentialAnimationGroup::finished, overlay, &QWidget::deleteLater);
+
+    group->start(QAbstractAnimation::DeleteWhenStopped);
+}
+
+void DlgSettings::onSearchTextChanged(const QString &text)
+{
+    searchModel->setFilterString(text);
+
+    if (searchModel->isFilterActive() && !text.trimmed().isEmpty()) {
+        if (!searchActive) {
+            switchToSearchMode();
+        }
+        if (searchModel->rowCount(QModelIndex()) > 0) {
+            searchResultsView->setCurrentIndex(searchModel->index(0));
+        }
+    } else if (searchActive) {
+        switchToTabMode();
+    }
+}
+
+void DlgSettings::switchToSearchMode()
+{
+    searchActive = true;
+    tabBarWidget->setVisible(false);
+    pagesWidget->setVisible(false);
+    searchResultsView->setVisible(true);
+    if (searchModel->rowCount(QModelIndex()) > 0) {
+        searchResultsView->setCurrentIndex(searchModel->index(0));
+    }
+}
+
+void DlgSettings::switchToTabMode()
+{
+    searchActive = false;
+    tabBarWidget->setVisible(true);
+    pagesWidget->setVisible(true);
+    searchResultsView->setVisible(false);
+    searchEdit->blockSignals(true);
+    searchEdit->clear();
+    searchEdit->blockSignals(false);
+    setActiveTab(currentTabIndex);
+}
+
+void DlgSettings::onSearchResultClicked(const QModelIndex &index)
+{
+    navigateToSearchResult(index);
+}
+
+void DlgSettings::navigateToSearchResult(const QModelIndex &index)
+{
+    SettingsSearchEntry entry = searchModel->entryForIndex(index);
+    if (entry.pageIndex < 0 || entry.pageIndex >= pages.size()) {
+        return;
+    }
+
+    // Switch to the page
+    switchToTabMode();
+    setActiveTab(entry.pageIndex);
+
+    // Scroll to the widget, focus it, and flash to highlight it
+    if (entry.widget) {
+        QWidget *widget = entry.widget;
+        while (widget) {
+            if (auto *scrollArea = qobject_cast<QScrollArea *>(widget)) {
+                scrollArea->ensureWidgetVisible(entry.widget);
+                break;
+            }
+            widget = widget->parentWidget();
+        }
+        entry.widget->setFocus();
+        flashWidget(entry.widget);
+    }
 }
 
 void DlgSettings::setTab(int index)
 {
-    if (index <= contentsWidget->count() - 1 && index >= 0) {
-        changePage(contentsWidget->item(index), contentsWidget->currentItem());
-        contentsWidget->setCurrentRow(index);
+    if (index >= 0 && index < tabButtons.size()) {
+        setActiveTab(index);
     }
 }
 
+AbstractSettingsPage *DlgSettings::page(SettingsPage which) const
+{
+    return pages.value(static_cast<int>(which));
+}
+
 void DlgSettings::updateLanguage()
 {
     qApp->removeTranslator(translator); // NOLINT(cppcoreguidelines-pro-type-static-cast-downcast)
     installNewTranslator();
 }
 
+bool DlgSettings::eventFilter(QObject *watched, QEvent *event)
+{
+    if (watched == searchEdit && event->type() == QEvent::KeyPress) {
+        auto *keyEvent = static_cast<QKeyEvent *>(event);
+        if (keyEvent->key() == Qt::Key_Escape) {
+            if (searchActive) {
+                switchToTabMode();
+                return true;
+            }
+        } else if (keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Enter) {
+            if (searchActive) {
+                if (searchResultsView->currentIndex().isValid()) {
+                    navigateToSearchResult(searchResultsView->currentIndex());
+                }
+                return true;
+            }
+        } else if (keyEvent->key() == Qt::Key_Down) {
+            if (searchActive) {
+                int nextRow = searchResultsView->currentIndex().row() + 1;
+                if (nextRow >= searchModel->rowCount()) {
+                    nextRow = 0;
+                }
+                searchResultsView->setCurrentIndex(searchModel->index(nextRow));
+                searchResultsView->scrollTo(searchModel->index(nextRow));
+                return true;
+            }
+        } else if (keyEvent->key() == Qt::Key_Up) {
+            if (searchActive) {
+                int prevRow = searchResultsView->currentIndex().row() - 1;
+                if (prevRow < 0) {
+                    prevRow = searchModel->rowCount() - 1;
+                }
+                if (prevRow >= 0) {
+                    searchResultsView->setCurrentIndex(searchModel->index(prevRow));
+                    searchResultsView->scrollTo(searchModel->index(prevRow));
+                }
+                return true;
+            }
+        }
+    }
+    return QDialog::eventFilter(watched, event);
+}
+
 void DlgSettings::closeEvent(QCloseEvent *event)
 {
     bool showLoadError = true;
@@ -1873,13 +510,13 @@ void DlgSettings::closeEvent(QCloseEvent *event)
         case Invalid:
             loadErrorMessage = tr("Your card database is invalid.\n\n"
                                   "Cockatrice may not function correctly with an invalid database\n\n"
-                                  "You may need to rerun oracle to update your card database.\n\n"
+                                  "You may need to rerun Oracle to update your card database.\n\n"
                                   "Would you like to change your database location setting?");
             break;
         case VersionTooOld:
             loadErrorMessage = tr("Your card database version is too old.\n\n"
                                   "This can cause problems loading card information or images\n\n"
-                                  "Usually this can be fixed by rerunning oracle to to update your card database.\n\n"
+                                  "Usually this can be fixed by rerunning Oracle to to update your card database.\n\n"
                                   "Would you like to change your database location setting?");
             break;
         case NotLoaded:
@@ -1912,8 +549,8 @@ void DlgSettings::closeEvent(QCloseEvent *event)
         }
     }
 
-    if (!QDir(SettingsCache::instance().getDeckPath()).exists() || SettingsCache::instance().getDeckPath().isEmpty()) {
-        // TODO: Prompt to create it
+    if (!QDir(SettingsCache::instance().paths().getDeckPath()).exists() ||
+        SettingsCache::instance().paths().getDeckPath().isEmpty()) {
         if (QMessageBox::critical(
                 this, tr("Error"),
                 tr("The path to your deck directory is invalid. Would you like to go back and set the correct path?"),
@@ -1923,8 +560,8 @@ void DlgSettings::closeEvent(QCloseEvent *event)
         }
     }
 
-    if (!QDir(SettingsCache::instance().getPicsPath()).exists() || SettingsCache::instance().getPicsPath().isEmpty()) {
-        // TODO: Prompt to create it
+    if (!QDir(SettingsCache::instance().paths().getPicsPath()).exists() ||
+        SettingsCache::instance().paths().getPicsPath().isEmpty()) {
         if (QMessageBox::critical(this, tr("Error"),
                                   tr("The path to your card pictures directory is invalid. Would you like to go back "
                                      "and set the correct path?"),
@@ -1939,14 +576,26 @@ void DlgSettings::closeEvent(QCloseEvent *event)
 void DlgSettings::retranslateUi()
 {
     setWindowTitle(tr("Settings"));
+    retranslateTabNames();
 
-    generalButton->setText(tr("General"));
-    appearanceButton->setText(tr("Appearance"));
-    userInterfaceButton->setText(tr("User Interface"));
-    deckEditorButton->setText(tr("Card Sources"));
-    messagesButton->setText(tr("Chat"));
-    soundButton->setText(tr("Sound"));
-    shortcutsButton->setText(tr("Shortcuts"));
+    searchEdit->setPlaceholderText(tr("Search settings..."));
+    okButton->setText(tr("OK"));
 
-    contentsWidget->reset();
+    // Rebuild search index for translated text
+    buildSearchIndex();
+}
+
+QStringList DlgSettings::translatedPageNames()
+{
+    return {tr("General"), tr("Appearance"), tr("User Interface"), tr("Card Sources"),
+            tr("Storage"), tr("Chat"),       tr("Sound"),          tr("Shortcuts")};
+}
+
+void DlgSettings::retranslateTabNames()
+{
+    const QStringList tabLabels = translatedPageNames();
+
+    for (int i = 0; i < tabButtons.size() && i < tabLabels.size(); ++i) {
+        tabButtons[i]->setText(tabLabels[i]);
+    }
 }
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.h b/cockatrice/src/interface/widgets/dialogs/dlg_settings.h
index 10134f3a8..1f15e76d5 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.h
@@ -1,359 +1,105 @@
 /**
  * @file dlg_settings.h
+ * @brief Main settings dialog for the Cockatrice client
  * @ingroup Dialogs
- * @brief TODO: Document this.
  */
-
 #ifndef DLG_SETTINGS_H
 #define DLG_SETTINGS_H
 
-#include <QCheckBox>
-#include <QComboBox>
 #include <QDialog>
-#include <QGroupBox>
-#include <QLabel>
+#include <QList>
 #include <QLoggingCategory>
-#include <QPushButton>
-#include <QSpinBox>
-#include <libcockatrice/utility/macros.h>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class QPushButton;
+class QModelIndex;
+class QWidget;
 
 inline Q_LOGGING_CATEGORY(DlgSettingsLog, "dlg_settings");
 
-class ShortcutTreeView;
-class SearchLineEdit;
-class QTreeView;
-class QStandardItemModel;
-class CardDatabase;
-class QCloseEvent;
-class QGridLayout;
-class QHBoxLayout;
-class QLineEdit;
-class QListWidget;
-class QListWidgetItem;
-class QRadioButton;
-class QSlider;
 class QStackedWidget;
-class QVBoxLayout;
-class SequenceEdit;
-
-class AbstractSettingsPage : public QWidget
-{
-public:
-    virtual void retranslateUi() = 0;
-};
-
-class GeneralSettingsPage : public AbstractSettingsPage
-{
-    Q_OBJECT
-public:
-    GeneralSettingsPage();
-    void retranslateUi() override;
-
-private slots:
-    void deckPathButtonClicked();
-    void filtersPathButtonClicked();
-    void replaysPathButtonClicked();
-    void picsPathButtonClicked();
-    void cardDatabasePathButtonClicked();
-    void customCardDatabaseButtonClicked();
-    void tokenDatabasePathButtonClicked();
-    void resetAllPathsClicked();
-    void languageBoxChanged(int index);
-
-private:
-    QStringList findQmFiles();
-    QString languageName(const QString &lang);
-    QLineEdit *deckPathEdit;
-    QLineEdit *filtersPathEdit;
-    QLineEdit *replaysPathEdit;
-    QLineEdit *picsPathEdit;
-    QLineEdit *cardDatabasePathEdit;
-    QLineEdit *customCardDatabasePathEdit;
-    QLineEdit *tokenDatabasePathEdit;
-    QPushButton *resetAllPathsButton;
-    QLabel *allPathsResetLabel;
-    QGroupBox *personalGroupBox;
-    QGroupBox *pathsGroupBox;
-    QComboBox languageBox;
-    QCheckBox startupUpdateCheckCheckBox;
-    QLabel startupCardUpdateCheckBehaviorLabel;
-    QComboBox startupCardUpdateCheckBehaviorSelector;
-    QLabel cardUpdateCheckIntervalLabel;
-    QSpinBox cardUpdateCheckIntervalSpinBox;
-    QLabel lastCardUpdateCheckDateLabel;
-    QCheckBox updateNotificationCheckBox;
-    QCheckBox newVersionOracleCheckBox;
-    QComboBox updateReleaseChannelBox;
-    QLabel languageLabel;
-    QLabel deckPathLabel;
-    QLabel filtersPathLabel;
-    QLabel replaysPathLabel;
-    QLabel picsPathLabel;
-    QLabel cardDatabasePathLabel;
-    QLabel customCardDatabasePathLabel;
-    QLabel tokenDatabasePathLabel;
-    QLabel updateReleaseChannelLabel;
-    QLabel advertiseTranslationPageLabel;
-    QCheckBox showTipsOnStartup;
-};
-
-class AppearanceSettingsPage : public AbstractSettingsPage
-{
-    Q_OBJECT
-private slots:
-    void themeBoxChanged(int index);
-    void openThemeLocation();
-    void showShortcutsChanged(QT_STATE_CHANGED_T enabled);
-    void overrideAllCardArtWithPersonalPreferenceToggled(QT_STATE_CHANGED_T enabled);
-
-    void cardViewInitialRowsMaxChanged(int value);
-    void cardViewExpandedRowsMaxChanged(int value);
-
-private:
-    QLabel themeLabel;
-    QComboBox themeBox;
-    QPushButton openThemeButton;
-    QLabel homeTabBackgroundSourceLabel;
-    QComboBox homeTabBackgroundSourceBox;
-    QLabel homeTabBackgroundShuffleFrequencyLabel;
-    QSpinBox homeTabBackgroundShuffleFrequencySpinBox;
-    QLabel minPlayersForMultiColumnLayoutLabel;
-    QLabel maxFontSizeForCardsLabel;
-    QCheckBox showShortcutsCheckBox;
-    QCheckBox displayCardNamesCheckBox;
-    QCheckBox autoRotateSidewaysLayoutCardsCheckBox;
-    QCheckBox overrideAllCardArtWithPersonalPreferenceCheckBox;
-    QCheckBox bumpSetsWithCardsInDeckToTopCheckBox;
-    QCheckBox cardScalingCheckBox;
-    QCheckBox roundCardCornersCheckBox;
-    QLabel verticalCardOverlapPercentLabel;
-    QSpinBox verticalCardOverlapPercentBox;
-    QLabel cardViewInitialRowsMaxLabel;
-    QSpinBox cardViewInitialRowsMaxBox;
-    QLabel cardViewExpandedRowsMaxLabel;
-    QSpinBox cardViewExpandedRowsMaxBox;
-    QCheckBox horizontalHandCheckBox;
-    QCheckBox leftJustifiedHandCheckBox;
-    QCheckBox invertVerticalCoordinateCheckBox;
-    QGroupBox *themeGroupBox;
-    QGroupBox *menuGroupBox;
-    QGroupBox *cardsGroupBox;
-    QGroupBox *handGroupBox;
-    QGroupBox *tableGroupBox;
-    QGroupBox *cardCountersGroupBox;
-    QList<QLabel *> cardCounterNames;
-    QSpinBox minPlayersForMultiColumnLayoutEdit;
-    QSpinBox maxFontSizeForCardsEdit;
-
-public:
-    AppearanceSettingsPage();
-    void retranslateUi() override;
-};
-
-class UserInterfaceSettingsPage : public AbstractSettingsPage
-{
-    Q_OBJECT
-private slots:
-    void setNotificationEnabled(QT_STATE_CHANGED_T);
-
-private:
-    QCheckBox notificationsEnabledCheckBox;
-    QCheckBox specNotificationsEnabledCheckBox;
-    QCheckBox buddyConnectNotificationsEnabledCheckBox;
-    QCheckBox doubleClickToPlayCheckBox;
-    QCheckBox clickPlaysAllSelectedCheckBox;
-    QCheckBox playToStackCheckBox;
-    QCheckBox doNotDeleteArrowsInSubPhasesCheckBox;
-    QCheckBox closeEmptyCardViewCheckBox;
-    QCheckBox focusCardViewSearchBarCheckBox;
-    QCheckBox annotateTokensCheckBox;
-    QCheckBox useTearOffMenusCheckBox;
-    QCheckBox tapAnimationCheckBox;
-    QCheckBox openDeckInNewTabCheckBox;
-    QLabel visualDeckStoragePromptForConversionLabel;
-    QComboBox visualDeckStoragePromptForConversionSelector;
-    QCheckBox visualDeckStorageInGameCheckBox;
-    QCheckBox visualDeckStorageSelectionAnimationCheckBox;
-    QLabel defaultDeckEditorTypeLabel;
-    QComboBox defaultDeckEditorTypeSelector;
-    QLabel rewindBufferingMsLabel;
-    QSpinBox rewindBufferingMsBox;
-    QGroupBox *generalGroupBox;
-    QGroupBox *notificationsGroupBox;
-    QGroupBox *animationGroupBox;
-    QGroupBox *deckEditorGroupBox;
-    QGroupBox *replayGroupBox;
-
-public:
-    UserInterfaceSettingsPage();
-    void retranslateUi() override;
-};
-
-class DeckEditorSettingsPage : public AbstractSettingsPage
-{
-    Q_OBJECT
-public:
-    DeckEditorSettingsPage();
-    void retranslateUi() override;
-    QString getLastUpdateTime();
-
-private slots:
-    void storeSettings();
-    void urlListChanged(const QModelIndex &, int, int, const QModelIndex &, int);
-    void setSpoilersEnabled(bool);
-    void spoilerPathButtonClicked();
-    void updateSpoilers();
-    void unlockSettings();
-    void actAddURL();
-    void actRemoveURL();
-    void actEditURL();
-    void clearDownloadedPicsButtonClicked();
-    void resetDownloadedURLsButtonClicked();
-
-private:
-    QPushButton clearDownloadedPicsButton;
-    QPushButton resetDownloadURLs;
-    QLabel urlLinkLabel;
-    QCheckBox picDownloadCheckBox;
-    QListWidget *urlList;
-    QAction *aAdd, *aEdit, *aRemove;
-    QCheckBox mcDownloadSpoilersCheckBox;
-    QLabel msDownloadSpoilersLabel;
-    QGroupBox *mpGeneralGroupBox;
-    QGroupBox *mpSpoilerGroupBox;
-    QLineEdit *mpSpoilerSavePathLineEdit;
-    QLabel mcSpoilerSaveLabel;
-    QLabel lastUpdatedLabel;
-    QLabel infoOnSpoilersLabel;
-    QPushButton *mpSpoilerPathButton;
-    QPushButton *updateNowButton;
-    QLabel networkCacheLabel;
-    QSpinBox networkCacheEdit;
-    QLabel networkRedirectCacheTtlLabel;
-    QSpinBox networkRedirectCacheTtlEdit;
-    QSpinBox pixmapCacheEdit;
-    QLabel pixmapCacheLabel;
-};
-
-class MessagesSettingsPage : public AbstractSettingsPage
-{
-    Q_OBJECT
-public:
-    MessagesSettingsPage();
-    void retranslateUi() override;
-
-private slots:
-    void actAdd();
-    void actEdit();
-    void actRemove();
-    void updateColor(const QString &value);
-    void updateHighlightColor(const QString &value);
-    void updateTextColor(QT_STATE_CHANGED_T value);
-    void updateTextHighlightColor(QT_STATE_CHANGED_T value);
-
-private:
-    QListWidget *messageList;
-    QAction *aAdd;
-    QAction *aEdit;
-    QAction *aRemove;
-    QCheckBox chatMentionCheckBox;
-    QCheckBox chatMentionCompleterCheckbox;
-    QCheckBox invertMentionForeground;
-    QCheckBox invertHighlightForeground;
-    QCheckBox ignoreUnregUsersMainChat;
-    QCheckBox ignoreUnregUserMessages;
-    QCheckBox messagePopups;
-    QCheckBox mentionPopups;
-    QCheckBox roomHistory;
-    QGroupBox *chatGroupBox;
-    QGroupBox *highlightGroupBox;
-    QGroupBox *messageGroupBox;
-    QLineEdit *mentionColor;
-    QLineEdit *highlightColor;
-    QLineEdit *customAlertString;
-    QLabel hexLabel;
-    QLabel hexHighlightLabel;
-    QLabel customAlertStringLabel;
-    QLabel explainMessagesLabel;
-
-    void storeSettings();
-    void updateMentionPreview();
-    void updateHighlightPreview();
-};
-
-class SoundSettingsPage : public AbstractSettingsPage
-{
-    Q_OBJECT
-public:
-    SoundSettingsPage();
-    void retranslateUi() override;
-
-private:
-    QLabel themeLabel;
-    QComboBox themeBox;
-    QGroupBox *soundGroupBox;
-    QPushButton soundTestButton;
-    QCheckBox soundEnabledCheckBox;
-    QLabel masterVolumeLabel;
-    QSlider *masterVolumeSlider;
-    QSpinBox *masterVolumeSpinBox;
-
-private slots:
-    void masterVolumeChanged(int value);
-    void themeBoxChanged(int index);
-};
-
-class ShortcutSettingsPage : public AbstractSettingsPage
-{
-    Q_OBJECT
-public:
-    ShortcutSettingsPage();
-    void retranslateUi() override;
-
-private:
-    SearchLineEdit *searchEdit;
-    ShortcutTreeView *shortcutsTable;
-    QVBoxLayout *mainLayout;
-    QHBoxLayout *buttonsLayout;
-    QGroupBox *editShortcutGroupBox;
-    QGridLayout *editLayout;
-    QLabel *currentActionGroupLabel;
-    QLabel *currentActionGroupName;
-    QLabel *currentActionLabel;
-    QLabel *currentActionName;
-    QLabel *currentShortcutLabel;
-    SequenceEdit *editTextBox;
-    QLabel *faqLabel;
-    QPushButton *btnResetAll;
-    QPushButton *btnClearAll;
-
-private slots:
-    void resetShortcuts();
-    void clearShortcuts();
-    void currentItemChanged(const QString &key);
-};
+class QToolButton;
+class QListView;
+class QLineEdit;
+class AbstractSettingsPage;
+class SettingsSearchModel;
+class SettingsSearchDelegate;
 
+/**
+ * @brief Main application settings dialog with tabbed navigation and search
+ *
+ * Provides a modern settings interface organized into tabbed pages. Users can
+ * either navigate by clicking tabs or search for specific settings using the
+ * built-in search bar. Search results are filtered and ranked by relevance.
+ */
 class DlgSettings : public QDialog
 {
     Q_OBJECT
 public:
+    /**
+     * @brief Page order in the tab bar, matching the order pages are added in setupUi()
+     *
+     * Use these values instead of raw indices so reordering pages never silently
+     * breaks external callers like tab_room.cpp.
+     */
+    enum SettingsPage
+    {
+        GeneralPage = 0,
+        AppearancePage,
+        UserInterfacePage,
+        DeckEditorPage,
+        StoragePage,
+        MessagesPage,
+        SoundPage,
+        ShortcutsPage,
+        NumPages
+    };
+
     explicit DlgSettings(QWidget *parent = nullptr);
     void setTab(int index);
+    AbstractSettingsPage *page(SettingsPage which) const;
 
 private slots:
-    void changePage(QListWidgetItem *current, QListWidgetItem *previous);
+    void onTabClicked(int index);
+    void onSearchTextChanged(const QString &text);
+    void onSearchResultClicked(const QModelIndex &index);
     void updateLanguage();
 
 private:
-    QListWidget *contentsWidget;
-    QStackedWidget *pagesWidget;
-    QListWidgetItem *generalButton, *appearanceButton, *userInterfaceButton, *deckEditorButton, *messagesButton,
-        *soundButton, *shortcutsButton;
-    void createIcons();
+    // UI elements
+    QLineEdit *searchEdit;           ///< Search bar for filtering settings
+    QWidget *tabBarWidget;           ///< Container widget for the tab buttons
+    QList<QToolButton *> tabButtons; ///< Navigation tab buttons
+    QStackedWidget *pagesWidget;     ///< Stacked widget containing settings pages
+    QListView *searchResultsView;    ///< Search results list view
+    QWidget *pagesContainer;         ///< Container stacking pages and search results
+    QPushButton *okButton;           ///< Button to close the dialog
+
+    // Data
+    QList<AbstractSettingsPage *> pages;    ///< All settings page instances
+    SettingsSearchModel *searchModel;       ///< Model for search results
+    SettingsSearchDelegate *searchDelegate; ///< Delegate for search result rendering
+    int currentTabIndex;                    ///< Currently active tab index
+    bool searchActive;                      ///< Whether search mode is active
+
+    void setupUi();
+    void setupTabBar();
+    void buildSearchIndex();
+    void switchToTabMode();
+    void switchToSearchMode();
+    void navigateToSearchResult(const QModelIndex &index);
+    void setActiveTab(int index);
+    static void flashWidget(QWidget *widget);
+    static QStringList translatedPageNames();
+
     void retranslateUi();
+    void retranslateTabNames();
 
 protected:
     void closeEvent(QCloseEvent *event) override;
+    bool eventFilter(QObject *watched, QEvent *event) override;
 };
 
-#endif
+#endif // DLG_SETTINGS_H
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.cpp
new file mode 100644
index 000000000..eec80a7e8
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.cpp
@@ -0,0 +1,101 @@
+#include "dlg_share_deck.h"
+
+#include "../../../client/settings/cache_settings.h"
+#include "../cards/additional_info/deck_color_identity.h"
+#include "../deck_share/deck_share_utils.h"
+
+#include <QDialogButtonBox>
+#include <QFormLayout>
+#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/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))
+{
+    setWindowTitle(tr("Share deck"));
+
+    auto *layout = new QVBoxLayout(this);
+
+    nameEdit = new QLineEdit(this);
+    nameEdit->setText(tr("Shared deck"));
+
+    auto *form = new QFormLayout;
+    form->addRow(tr("Share name:"), nameEdit);
+    layout->addLayout(form);
+
+    auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Create share link"));
+    buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel"));
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgShareDeck::actShare);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgShareDeck::reject);
+    this->buttonBox = buttonBox;
+    layout->addWidget(buttonBox);
+
+    shareTimeoutTimer->setSingleShot(true);
+    shareTimeoutTimer->setInterval(
+        static_cast<int>((static_cast<qint64>(SettingsCache::instance().network().getTimeOut()) + 1) *
+                         SettingsCache::instance().network().getKeepAlive() * 1000));
+    connect(shareTimeoutTimer, &QTimer::timeout, this, &DlgShareDeck::onShareTimeout);
+}
+
+void DlgShareDeck::actShare()
+{
+    buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+
+    Command_DeckShareCreate cmd;
+    cmd.set_name(nameEdit->text().trimmed().toStdString());
+    if (cmd.name().empty()) {
+        cmd.set_name(tr("Shared deck").toStdString());
+    }
+
+    DeckShareItem *item = cmd.add_items();
+    item->set_deck_list(deck->writeToString_Native().toStdString());
+    item->set_color_identity(getDeckColorIdentity(*deck, CardDatabaseManager::query()).toStdString());
+
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &DlgShareDeck::shareFinished);
+    client->sendCommand(pend);
+    shareTimeoutTimer->start();
+}
+
+void DlgShareDeck::shareFinished(const Response &response, const CommandContainer & /*commandContainer*/)
+{
+    shareTimeoutTimer->stop();
+    if (response.response_code() != Response::RespOk) {
+        buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
+        QMessageBox::critical(this, tr("Share deck"),
+                              tr("Failed to create the share link (server response code %1).")
+                                  .arg(QString::number(static_cast<int>(response.response_code()))));
+        return;
+    }
+
+    const DeckShareUtils::ShareResponse share = DeckShareUtils::handleShareResponse(client, response);
+
+    QMessageBox::information(this, tr("Share deck"),
+                             tr("Share link created and copied to the clipboard:\n\n%1\n\n"
+                                "The share expires on %2.")
+                                 .arg(share.link, DeckShareUtils::formatShareExpiry(share.expiry)));
+    accept();
+}
+
+void DlgShareDeck::onShareTimeout()
+{
+    buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
+    QMessageBox::warning(this, tr("Share deck"), tr("The server did not respond in time. Try again."));
+}
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.h
new file mode 100644
index 000000000..108a8c38b
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.h
@@ -0,0 +1,49 @@
+/**
+ * @file dlg_share_deck.h
+ * @ingroup Dialogs
+ */
+//! \todo Document this file.
+
+#ifndef DLG_SHARE_DECK_H
+#define DLG_SHARE_DECK_H
+
+#include <QDialog>
+#include <QSharedPointer>
+#include <qtmetamacros.h>
+
+class AbstractClient;
+class CommandContainer;
+class DeckList;
+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.
+ *
+ * Asks for a share name, sends Command_DeckShareCreate for the single inline
+ * deck, and copies the resulting link to the clipboard.
+ */
+class DlgShareDeck : public QDialog
+{
+    Q_OBJECT
+public:
+    DlgShareDeck(AbstractClient *_client, const QSharedPointer<DeckList> &_deck, QWidget *parent = nullptr);
+
+private slots:
+    void actShare();
+    void shareFinished(const Response &response, const CommandContainer &commandContainer);
+    void onShareTimeout();
+
+private:
+    AbstractClient *client;
+    QSharedPointer<DeckList> deck;
+    QLineEdit *nameEdit;
+    QDialogButtonBox *buttonBox;
+    QTimer *shareTimeoutTimer;
+};
+
+#endif // DLG_SHARE_DECK_H
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp
new file mode 100644
index 000000000..8ad91dcaf
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp
@@ -0,0 +1,186 @@
+#include "dlg_shared_decks_preview.h"
+
+#include "../deck_share/shared_deck_preview_widget.h"
+#include "../general/layout_containers/flow_widget.h"
+
+#include <QAbstractButton>
+#include <QDateTime>
+#include <QDialogButtonBox>
+#include <QFont>
+#include <QLabel>
+#include <QPushButton>
+#include <QStringList>
+#include <QVBoxLayout>
+#include <google/protobuf/repeated_ptr_field.h>
+#include <libcockatrice/protocol/pb/serverinfo_deck_share_item.pb.h>
+#include <qnamespace.h>
+
+class QWidget;
+
+DlgSharedDecksPreview::DlgSharedDecksPreview(QWidget *parent,
+                                             const CardDatabaseQuerier *querier,
+                                             const QString &shareName,
+                                             qint64 expiresAt,
+                                             const QString &serverText,
+                                             const QList<ServerInfo_DeckShareItem> &items)
+    : QDialog(parent)
+{
+    setWindowTitle(tr("Open shared decks"));
+    resize(700, 500);
+
+    auto *mainLayout = new QVBoxLayout(this);
+
+    // shareName and serverText come from the share server, so escape them: the
+    // QLabels render AutoText and markup would otherwise be shown as rich text.
+    auto *titleLabel =
+        new QLabel(tr("Share: %1").arg((shareName.isEmpty() ? tr("Untitled") : shareName).toHtmlEscaped()), this);
+    QFont titleFont = titleLabel->font();
+    titleFont.setBold(true);
+    titleFont.setPointSize(titleFont.pointSize() + 2);
+    titleLabel->setFont(titleFont);
+    mainLayout->addWidget(titleLabel);
+
+    if (!serverText.isEmpty()) {
+        mainLayout->addWidget(new QLabel(tr("From %1").arg(serverText.toHtmlEscaped()), this));
+    }
+
+    if (expiresAt > 0) {
+        const QString expiryText = QDateTime::fromSecsSinceEpoch(expiresAt).toLocalTime().toString(Qt::TextDate);
+        mainLayout->addWidget(new QLabel(tr("This share link expires on %1").arg(expiryText), this));
+    }
+
+    downloadStatusLabel = new QLabel(this);
+    downloadStatusLabel->setVisible(false);
+    mainLayout->addWidget(downloadStatusLabel);
+
+    flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
+    mainLayout->addWidget(flowWidget, 1);
+
+    for (const ServerInfo_DeckShareItem &item : items) {
+        QStringList tags;
+        for (const auto &tag : item.tags()) {
+            tags.append(QString::fromStdString(tag));
+        }
+
+        auto *tile = new SharedDeckPreviewWidget(
+            this, querier, QString::fromStdString(item.name()), QString::fromStdString(item.banner_card()),
+            QString::fromStdString(item.color_identity()), QString::fromStdString(item.game_format()), tags.join(", "));
+        flowWidget->addNavigableWidget(tile);
+        tiles.append(tile);
+        itemIds.append(item.id());
+    }
+
+    if (tiles.size() == 1) {
+        tiles.first()->setSelected(true);
+    }
+
+    auto *buttonBox = new QDialogButtonBox(this);
+    openSelectedButton = buttonBox->addButton(tr("Open selected"), QDialogButtonBox::AcceptRole);
+    openAllButton = buttonBox->addButton(tr("Open all"), QDialogButtonBox::ActionRole);
+    buttonBox->addButton(tr("Cancel"), QDialogButtonBox::RejectRole);
+    mainLayout->addWidget(buttonBox);
+
+    connect(buttonBox, &QDialogButtonBox::rejected, this, [this]() {
+        onCancel();
+        close();
+    });
+
+    // Esc calls QDialog::reject() directly (which hides the dialog without a
+    // close event), so route it through the same guarded cancel as the button.
+    connect(this, &QDialog::rejected, this, [this]() {
+        onCancel();
+        close();
+    });
+
+    connect(openSelectedButton, &QPushButton::clicked, this, &DlgSharedDecksPreview::openSelected);
+    connect(buttonBox, &QDialogButtonBox::clicked, this, [this, buttonBox](QAbstractButton *button) {
+        if (buttonBox->buttonRole(button) == QDialogButtonBox::ActionRole) {
+            openAll();
+        }
+    });
+
+    for (SharedDeckPreviewWidget *tile : tiles) {
+        connect(tile, &SharedDeckPreviewWidget::selectionToggled, this,
+                &DlgSharedDecksPreview::updateOpenSelectedEnabled);
+    }
+    for (int i = 0; i < tiles.size(); ++i) {
+        const int itemId = itemIds.at(i);
+        // Double-clicking a tile selects it and opens just that deck.
+        connect(tiles.at(i), &SharedDeckPreviewWidget::activated, this, [this, itemId]() {
+            resultEmitted = true;
+            setDownloading(true);
+            emit openRequested(QList<int>{itemId});
+        });
+    }
+    updateOpenSelectedEnabled();
+}
+
+QList<int> DlgSharedDecksPreview::selectedItemIds() const
+{
+    QList<int> selectedIds;
+    for (int i = 0; i < tiles.size(); ++i) {
+        if (tiles.at(i)->isSelected()) {
+            selectedIds.append(itemIds.at(i));
+        }
+    }
+    return selectedIds;
+}
+
+void DlgSharedDecksPreview::openSelected()
+{
+    const QList<int> selectedIds = selectedItemIds();
+    if (selectedIds.isEmpty()) {
+        return;
+    }
+    resultEmitted = true;
+    setDownloading(true);
+    emit openRequested(selectedIds);
+}
+
+void DlgSharedDecksPreview::openAll()
+{
+    resultEmitted = true;
+    setDownloading(true);
+    emit openRequested(itemIds);
+}
+
+void DlgSharedDecksPreview::setDownloading(bool downloading)
+{
+    if (downloadInProgress == downloading) {
+        return;
+    }
+    downloadInProgress = downloading;
+    downloadStatusLabel->setVisible(downloading);
+    for (SharedDeckPreviewWidget *tile : tiles) {
+        tile->setEnabled(!downloading);
+    }
+    openSelectedButton->setEnabled(!downloading);
+    openAllButton->setEnabled(!downloading);
+}
+
+void DlgSharedDecksPreview::setDownloadProgress(int done, int total, const QString &currentDeckName)
+{
+    if (!downloadInProgress) {
+        return;
+    }
+    downloadStatusLabel->setText(tr("Downloading deck %1 of %2: %3").arg(done).arg(total).arg(currentDeckName));
+}
+
+void DlgSharedDecksPreview::updateOpenSelectedEnabled()
+{
+    openSelectedButton->setEnabled(!selectedItemIds().isEmpty());
+}
+
+void DlgSharedDecksPreview::onCancel()
+{
+    if (!resultEmitted || downloadInProgress) {
+        resultEmitted = true;
+        emit cancelled();
+    }
+}
+
+void DlgSharedDecksPreview::closeEvent(QCloseEvent *event)
+{
+    onCancel();
+    QDialog::closeEvent(event);
+}
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.h b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.h
new file mode 100644
index 000000000..fab7ba6bf
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.h
@@ -0,0 +1,71 @@
+#ifndef COCKATRICE_DLG_SHARED_DECKS_PREVIEW_H
+#define COCKATRICE_DLG_SHARED_DECKS_PREVIEW_H
+
+#include <QDialog>
+#include <QList>
+#include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class FlowWidget;
+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.
+ *
+ * Lets the user pick which of the shared decks to open before anything is
+ * downloaded. Emits openRequested with the ids of the chosen decks, or
+ * cancelled when the user closes the dialog without choosing. Once the user
+ * picks, the dialog switches into a "downloading" state: the tiles and open
+ * buttons are disabled, a progress label shows the current download and Cancel
+ * stays functional so the download can be aborted.
+ */
+class DlgSharedDecksPreview : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit DlgSharedDecksPreview(QWidget *parent,
+                                   const CardDatabaseQuerier *querier,
+                                   const QString &shareName,
+                                   qint64 expiresAt,
+                                   const QString &serverText,
+                                   const QList<ServerInfo_DeckShareItem> &items);
+
+    void setDownloadProgress(int done, int total, const QString &currentDeckName);
+
+public slots:
+    void setDownloading(bool downloading);
+
+signals:
+    void openRequested(const QList<int> &itemIds);
+    void cancelled();
+
+protected:
+    void closeEvent(QCloseEvent *event) override;
+
+private slots:
+    void openSelected();
+    void openAll();
+    void updateOpenSelectedEnabled();
+    void onCancel();
+
+private:
+    QList<int> selectedItemIds() const;
+
+    FlowWidget *flowWidget;
+    QList<SharedDeckPreviewWidget *> tiles;
+    QList<int> itemIds;
+    QPushButton *openSelectedButton;
+    QPushButton *openAllButton;
+    QLabel *downloadStatusLabel;
+    bool resultEmitted = false;
+    bool downloadInProgress = false;
+};
+
+#endif // COCKATRICE_DLG_SHARED_DECKS_PREVIEW_H
\ No newline at end of file
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 ac1922a9d..3d50480cc 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp
@@ -2,7 +2,16 @@
 
 #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)
 {
@@ -10,7 +19,7 @@ DlgStartupCardCheck::DlgStartupCardCheck(QWidget *parent) : QDialog(parent)
 
     layout = new QVBoxLayout(this);
 
-    QDate lastCheckDate = SettingsCache::instance().getLastCardUpdateCheck();
+    QDate lastCheckDate = SettingsCache::instance().updates().getLastCardUpdateCheck();
     int daysAgo = lastCheckDate.daysTo(QDate::currentDate());
 
     instructionLabel = new QLabel(
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 44fc59d58..0d0fb6670 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.h
@@ -1,18 +1,21 @@
 /**
  * @file dlg_startup_card_check.h
  * @ingroup CardDatabaseUpdateDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_STARTUP_CARD_CHECK_H
 #define DLG_STARTUP_CARD_CHECK_H
 
-#include <QButtonGroup>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QRadioButton>
-#include <QVBoxLayout>
+#include <qtmetamacros.h>
+
+class QButtonGroup;
+class QDialogButtonBox;
+class QLabel;
+class QRadioButton;
+class QVBoxLayout;
+class QWidget;
 
 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 59330e27e..511ff1c7d 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,8 +7,19 @@
 #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
@@ -41,7 +52,7 @@ DlgTipOfTheDay::DlgTipOfTheDay(QWidget *parent) : QDialog(parent)
     tipNumber = new QLabel();
     tipNumber->setAlignment(Qt::AlignCenter);
 
-    QList<int> seenTips = SettingsCache::instance().getSeenTips();
+    QList<int> seenTips = SettingsCache::instance().personal().getSeenTips();
     newTipsAvailable = false;
     currentTip = 0;
     for (int i = 0; i < tipDatabase->rowCount(); i++) {
@@ -73,9 +84,9 @@ DlgTipOfTheDay::DlgTipOfTheDay(QWidget *parent) : QDialog(parent)
     connect(previousButton, &QPushButton::clicked, this, &DlgTipOfTheDay::previousClicked);
 
     showTipsOnStartupCheck = new QCheckBox("Show tips on startup");
-    showTipsOnStartupCheck->setChecked(SettingsCache::instance().getShowTipsOnStartup());
-    connect(showTipsOnStartupCheck, &QCheckBox::clicked, &SettingsCache::instance(),
-            &SettingsCache::setShowTipsOnStartup);
+    showTipsOnStartupCheck->setChecked(SettingsCache::instance().personal().getShowTipsOnStartup());
+    connect(showTipsOnStartupCheck, &QCheckBox::clicked, &SettingsCache::instance().personal(),
+            &PersonalSettings::setShowTipsOnStartup);
     buttonBar = new QHBoxLayout();
     buttonBar->addWidget(showTipsOnStartupCheck);
     buttonBar->addWidget(tipNumber);
@@ -130,10 +141,10 @@ void DlgTipOfTheDay::updateTip(int tipId)
     }
 
     // Store tip id as seen
-    QList<int> seenTips = SettingsCache::instance().getSeenTips();
+    QList<int> seenTips = SettingsCache::instance().personal().getSeenTips();
     if (!seenTips.contains(tipId)) {
         seenTips.append(tipId);
-        SettingsCache::instance().setSeenTips(seenTips);
+        SettingsCache::instance().personal().setSeenTips(seenTips);
     }
 
     TipOfTheDay tip = tipDatabase->getTip(tipId);
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 3dad7c652..689814115 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
@@ -1,18 +1,21 @@
 /**
  * @file dlg_tip_of_the_day.h
  * @ingroup Dialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_TIPOFDAY_H
 #define DLG_TIPOFDAY_H
 
-#include <QComboBox>
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QLineEdit>
 #include <QLoggingCategory>
-#include <QVBoxLayout>
+#include <qtmetamacros.h>
+
+class QDialogButtonBox;
+class QHBoxLayout;
+class QPixmap;
+class QVBoxLayout;
+class QWidget;
 
 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 0a9244dec..76bb13248 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
@@ -4,16 +4,41 @@
 #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 <QtNetwork>
+#include <QWidget>
+#include <qnamespace.h>
 #include <version_string.h>
 
+// Executable that, when it sits next to the downloaded update installer, is installed instead of
+// it. A packager shipping a custom build - or someone testing one - can drop the file there and
+// have Cockatrice run it rather than the official installer, without the release channel having to
+// host an installer for that build. It is a drop-in and is run with the same arguments.
+static const QString UPDATE_INSTALLER_OVERRIDE = "Cockatrice-Update-Override.exe";
+
 DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent)
 {
 
@@ -40,7 +65,7 @@ DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent)
     buttonBox->addButton(ok, QDialogButtonBox::AcceptRole);
 
     connect(gotoDownload, &QPushButton::clicked, this, &DlgUpdate::gotoDownloadPage);
-    // TODO: make reinstall button actually do something when clicked
+    //! \todo Make reinstall button actually do something when clicked.
     // connect(manualDownload, &QPushButton::clicked, this, &DlgUpdate::downloadUpdate);
     connect(stopDownload, &QPushButton::clicked, this, &DlgUpdate::cancelDownload);
     connect(ok, &QPushButton::clicked, this, &DlgUpdate::closeDialog);
@@ -134,7 +159,7 @@ void DlgUpdate::finishedUpdateCheck(bool needToUpdate, bool isCompatible, Releas
         // If there's no need to update, tell them that. However we still allow them to run the
         // downloader themselves if there's a compatible build
         QMessageBox::information(
-            this, tr("No Update Available"),
+            window(), tr("No Update Available"),
             tr("Cockatrice is up to date!") + "<br><br>" +
                 tr("You are already running the latest version available in the chosen release channel.") + "<br>" +
                 "<b>" + tr("Current version") + QString(":</b> %1<br>").arg(VERSION_STRING) + "<b>" +
@@ -147,18 +172,21 @@ void DlgUpdate::finishedUpdateCheck(bool needToUpdate, bool isCompatible, Releas
     if (isCompatible) {
         int reply;
         reply = QMessageBox::question(
-            this, tr("Update Available"),
+            window(), tr("Update Available"),
             tr("A new version of Cockatrice is available!") + "<br><br>" + "<b>" + tr("New version") +
                 QString(":</b> %1<br>").arg(release->getName()) + "<b>" + tr("Released") +
                 QString(":</b> %1 (<a href=\"%2\">").arg(publishDate, release->getDescriptionUrl()) + tr("Changelog") +
                 "</a>)<br><br>" + tr("Do you want to update now?"),
             QMessageBox::Yes | QMessageBox::No);
 
-        if (reply == QMessageBox::Yes)
+        if (reply == QMessageBox::Yes) {
             downloadUpdate(release->getName());
+        } else {
+            closeDialog();
+        }
     } else {
         QMessageBox::information(
-            this, tr("Update Available"),
+            window(), tr("Update Available"),
             tr("A new version of Cockatrice is available!") + "<br><br>" + "<b>" + tr("New version") +
                 QString(":</b> %1<br>").arg(release->getName()) + "<b>" + tr("Released") +
                 QString(":</b> %1 (<a href=\"%2\">").arg(publishDate, release->getDescriptionUrl()) + tr("Changelog") +
@@ -200,6 +228,24 @@ void DlgUpdate::setLabel(const QString &newText)
     statusLabel->setText(newText);
 }
 
+void DlgUpdate::warnInstallerIsWaiting()
+{
+    // Modeless on purpose: the installer asks the application to close exactly once (see
+    // CloseMatchingApps in NSIS.template.in) and only polls afterwards, while Qt drops spontaneous
+    // close events - a WM_CLOSE from the installer - for windows that are blocked by a modal
+    // widget (QGuiApplicationPrivate::processCloseEvent). An application modal message box here
+    // would therefore swallow the installer's one and only request for the rest of its wait.
+    auto *notification = new QMessageBox(QMessageBox::Warning, tr("Update"),
+                                         tr("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."),
+                                         QMessageBox::Ok, parentWidget());
+    notification->setWindowModality(Qt::NonModal);
+    notification->setAttribute(Qt::WA_DeleteOnClose);
+    notification->show();
+}
+
 void DlgUpdate::updateCheckError(const QString &errorString)
 {
     setLabel(tr("Error"));
@@ -218,10 +264,64 @@ void DlgUpdate::downloadError(const QString &errorString)
 void DlgUpdate::downloadSuccessful(const QUrl &filepath)
 {
     setLabel(tr("Installing..."));
+
+    QString installerPath = filepath.toLocalFile();
+
+    const QString overridePath = QDir(QFileInfo(installerPath).absolutePath()).filePath(UPDATE_INSTALLER_OVERRIDE);
+    if (QFileInfo::exists(overridePath)) {
+        qCInfo(DlgUpdateLog) << "Installing the update installer override instead of the download:" << overridePath;
+        installerPath = overridePath;
+    }
+
+    QString appDir = QDir::toNativeSeparators(QCoreApplication::applicationDirPath());
+    QProcess process;
+    process.setProgram(installerPath);
+
+    // NSIS needs the /D= argument to be an UNQUOTED string, even if it contains spaces. Qt likes to quote arguments if
+    // they contain spaces, so we use the windows exclusive QProcess::setNativeArguments in the only case where this is
+    // relevant, which preserves the argument unquoted.
+    //
+    // /PID= tells the installer which process to wait for before it replaces anything. We launch the installer first
+    // and only quit afterwards, so it starts while this process is still alive and still has every Qt runtime DLL
+    // mapped, and a mapped DLL cannot be deleted. Without the handle the installer can only poll for an image name and
+    // guess, and a wrong guess is what leaves the update writing new executables next to runtime files of the previous
+    // version, which fails on the next start with "The procedure entry point ... could not be located in the dynamic
+    // link library
+    // ...Qt6QuickWidgets.dll". /D= has to stay the last parameter, which is why it is last here too.
+#ifdef Q_OS_WIN
+    process.setNativeArguments(QString("/R /PID=%1 /D=%2").arg(QCoreApplication::applicationPid()).arg(appDir));
+#else
+    // Linux/macOS: normal argument passing (not relevant since they update differently.)
+    process.setArguments({"/R", QString("/D=%1").arg(appDir)});
+#endif
+
     // Try to open the installer. If it opens, quit Cockatrice
-    if (QDesktopServices::openUrl(filepath)) {
-        QMetaObject::invokeMethod(static_cast<MainWindow *>(parent()), "close", Qt::QueuedConnection);
-        qCInfo(DlgUpdateLog) << "Opened downloaded update file successfully - closing Cockatrice";
+    if (process.startDetached()) {
+        qCInfo(DlgUpdateLog) << "Opened update installer successfully - closing Cockatrice";
+        // Close the main window synchronously so file locks are released before the NSIS installer
+        // (already launched) starts replacing files. This also flushes settings and shuts down the
+        // tabs, but only when the close is actually accepted: MainWindow may veto it for a running
+        // card DB update, an open game, or an unsaved deck, and closeForUpdate() also reports a
+        // close already in progress (reached from a nested event loop while a shutdown prompt is
+        // up). Only quit when the shutdown really ran - otherwise keep running so the user can
+        // resolve the blocker, and warn them that the installer only waits about a minute
+        // before it gives up and cancels the update.
+        if (auto *window = qobject_cast<MainWindow *>(parent())) {
+            if (window->closeForUpdate()) {
+                QTimer::singleShot(0, qApp, [] { QCoreApplication::exit(0); });
+            } else {
+                warnInstallerIsWaiting();
+            }
+        } else {
+            // Not a MainWindow, so no faithful close can be requested - but the parent still gets
+            // its close() call, which is what the code before this change did and lets it flush
+            // settings and shut down its tabs. Leaving is then unconditional: the installer is
+            // already running against a process that still holds locks on the files it replaces.
+            if (auto *widget = parentWidget()) {
+                widget->close();
+            }
+            QTimer::singleShot(0, qApp, [] { QCoreApplication::exit(0); });
+        }
         close();
     } else {
         setLabel(tr("Error"));
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_update.h b/cockatrice/src/interface/widgets/dialogs/dlg_update.h
index daf0b9e47..026a54a8c 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_update.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.h
@@ -1,23 +1,30 @@
 /**
  * @file dlg_update.h
  * @ingroup ClientUpdateDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_UPDATE_H
 #define DLG_UPDATE_H
 
-#include "../client/network/update/client/update_downloader.h"
+#include "../../../client/network/update/client/release_channel.h"
 
-#include <QDialogButtonBox>
+#include <QDialog>
 #include <QLoggingCategory>
-#include <QProgressDialog>
-#include <QtNetwork>
+#include <QString>
+#include <QUrl>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class QDialogButtonBox;
+class QLabel;
+class QProgressBar;
+class QPushButton;
+class QWidget;
+class UpdateDownloader;
 
 inline Q_LOGGING_CATEGORY(DlgUpdateLog, "dlg_update");
 
-class Release;
-
 class DlgUpdate : public QDialog
 {
     Q_OBJECT
@@ -42,6 +49,7 @@ private:
     void addStopDownloadAndRemoveOthers(bool enable);
     void beginUpdateCheck();
     void setLabel(const QString &text);
+    void warnInstallerIsWaiting();
     QLabel *statusLabel, *descriptionLabel;
     QProgressBar *progress;
     QPushButton *manualDownload, *gotoDownload, *ok, *stopDownload;
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
index 3dd0fedb3..d55e800a1 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
@@ -3,11 +3,18 @@
 #include "../../../client/settings/cache_settings.h"
 #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)
 {
@@ -60,8 +67,9 @@ void DlgViewLog::actCopyToClipboard()
 void DlgViewLog::loadInitialLogBuffer()
 {
     QList<QString> logBuffer = Logger::getInstance().getLogBuffer();
-    for (const QString &message : logBuffer)
+    for (const QString &message : logBuffer) {
         appendLogEntry(message);
+    }
 }
 
 void DlgViewLog::appendLogEntry(const QString &message)
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h
index f0b900527..d63ff5ffc 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.h
@@ -1,17 +1,20 @@
 /**
  * @file dlg_view_log.h
  * @ingroup ServerLogDialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DLG_VIEWLOG_H
 #define DLG_VIEWLOG_H
 
-#include <QCheckBox>
 #include <QDialog>
+#include <QString>
+#include <qtmetamacros.h>
 
 class QPlainTextEdit;
-class QCloseEvent;
+class QCheckBox;
+class QPushButton;
+class QWidget;
 
 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
new file mode 100644
index 000000000..57f7ff7f5
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/override_printing_warning.cpp
@@ -0,0 +1,45 @@
+#include "override_printing_warning.h"
+
+#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;
+    if (enable) {
+        message =
+            QObject::tr("Enabling this feature will disable the use of the Printing Selector.\n\n"
+                        "You will not be able to manage printing preferences on a per-deck basis, "
+                        "or see printings other people have selected for their decks.\n\n"
+                        "You will have to use the Set Manager, available through Card Database -> Manage Sets.\n\n"
+                        "Are you sure you would like to enable this feature?");
+    } else {
+        message = QObject::tr(
+            "Disabling this feature will enable the Printing Selector.\n\n"
+            "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.\n\n"
+            "You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector"
+            " (other sort orders like alphabetical or release date are available).\n\n"
+            "Are you sure you would like to disable this feature?");
+    }
+
+    QMessageBox::StandardButton result =
+        QMessageBox::question(parent, QObject::tr("Confirm Change"), message, QMessageBox::Yes | QMessageBox::No);
+
+    if (result == QMessageBox::Yes) {
+        SettingsCache::instance().cardsDisplay().setOverrideAllCardArtWithPersonalPreference(enable);
+        // Caches are now invalid.
+        CardPictureLoader::clearPixmapCache();
+        CardPictureLoader::clearNetworkCache();
+        return true;
+    }
+
+    return false;
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/dialogs/override_printing_warning.h b/cockatrice/src/interface/widgets/dialogs/override_printing_warning.h
new file mode 100644
index 000000000..6c5891373
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/override_printing_warning.h
@@ -0,0 +1,21 @@
+#ifndef COCKATRICE_OVERRIDE_PRINTING_WARN_H
+#define COCKATRICE_OVERRIDE_PRINTING_WARN_H
+
+class QWidget;
+
+namespace OverridePrintingWarning
+{
+
+/**
+ * @brief Pops up the warning message for the changing the override printing setting.
+ * If the user clicks accept, then this also handles changing the setting and resetting the card image cache.
+ *
+ * @param parent The parent widget
+ * @param enable Whether the user is trying to enable or disable the setting
+ * @return Whether the user clicked accept. All other ways of closing the window returns false.
+ */
+bool execMessageBox(QWidget *parent, bool enable);
+
+} // namespace OverridePrintingWarning
+
+#endif // COCKATRICE_OVERRIDE_PRINTING_WARN_H
diff --git a/cockatrice/src/interface/widgets/dialogs/path_safety_warning.cpp b/cockatrice/src/interface/widgets/dialogs/path_safety_warning.cpp
new file mode 100644
index 000000000..d8eabd72d
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/path_safety_warning.cpp
@@ -0,0 +1,34 @@
+#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
new file mode 100644
index 000000000..058df3e4b
--- /dev/null
+++ b/cockatrice/src/interface/widgets/dialogs/path_safety_warning.h
@@ -0,0 +1,25 @@
+#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 94996e975..3463fe6df 100644
--- a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.cpp
@@ -2,11 +2,20 @@
 
 #include <QDate>
 #include <QFile>
-#include <QMessageBox>
+#include <QIODevice>
+#include <QList>
+#include <QSharedPointer>
+#include <QStringView>
 #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)
@@ -73,8 +82,9 @@ TipsOfTheDay::~TipsOfTheDay()
 
 QVariant TipsOfTheDay::data(const QModelIndex &index, int /*role*/) const
 {
-    if (!index.isValid() || index.row() >= tipList->size() || index.column() >= TIPDDBMODEL_COLUMNS)
+    if (!index.isValid() || index.row() >= tipList->size() || index.column() >= TIPDDBMODEL_COLUMNS) {
         return QVariant();
+    }
 
     TipOfTheDay tip = tipList->at(index.row());
     switch (index.column()) {
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 d61fddab5..4e6e23567 100644
--- a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h
+++ b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h
@@ -1,14 +1,20 @@
 /**
  * @file tip_of_the_day.h
  * @ingroup Dialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TIP_OF_DAY_H
 #define TIP_OF_DAY_H
 
 #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 15bf1d377..775d55895 100644
--- a/cockatrice/src/interface/widgets/general/background_sources.h
+++ b/cockatrice/src/interface/widgets/general/background_sources.h
@@ -1,15 +1,18 @@
 /**
  * @file background_sources.h
  * @ingroup UI
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_BACKGROUND_SOURCES_H
 #define COCKATRICE_BACKGROUND_SOURCES_H
 
 #include <QList>
 #include <QObject>
+#include <QSharedPointer>
 #include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class BackgroundSources
 {
@@ -40,8 +43,9 @@ public:
     static QString toId(Type type)
     {
         for (const auto &e : all()) {
-            if (e.type == type)
+            if (e.type == type) {
                 return e.id;
+            }
         }
         return {};
     }
@@ -49,8 +53,9 @@ public:
     static Type fromId(const QString &id)
     {
         for (const auto &e : all()) {
-            if (id == e.id)
+            if (id == e.id) {
                 return e.type;
+            }
         }
         return Theme; // default
     }
@@ -58,8 +63,9 @@ public:
     static QString toDisplay(Type type)
     {
         for (const auto &e : all()) {
-            if (e.type == type)
+            if (e.type == type) {
                 return QObject::tr(e.trKey);
+            }
         }
         return {};
     }
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 aad259900..fd9ad67a8 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 <QPen>
+#include <QRect>
+#include <qnamespace.h>
 
 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 1fc1bc3ba..6634069c4 100644
--- a/cockatrice/src/interface/widgets/general/display/background_plate_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/background_plate_widget.h
@@ -2,6 +2,7 @@
 #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 f03869a4d..baf46bbba 100644
--- a/cockatrice/src/interface/widgets/general/display/banner_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/banner_widget.cpp
@@ -2,13 +2,18 @@
 
 #include "../../../pixel_map_generator.h"
 
+#include <QBrush>
+#include <QColor>
+#include <QHBoxLayout>
 #include <QLinearGradient>
-#include <QMouseEvent>
 #include <QPainter>
-#include <QVBoxLayout>
+#include <QPixmap>
+#include <QPointF>
+#include <QRect>
+#include <QtGlobal>
 
-BannerWidget::BannerWidget(QWidget *parent, const QString &text, Qt::Orientation orientation, int transparency)
-    : QWidget(parent), gradientOrientation(orientation), transparency(qBound(0, transparency, 100))
+BannerWidget::BannerWidget(QWidget *parent, const QString &text, Qt::Orientation orientation, int transparency_)
+    : QWidget(parent), gradientOrientation(orientation), transparency(qBound(0, transparency_, 100))
 {
     auto layout = new QHBoxLayout(this);
 
@@ -18,7 +23,12 @@ BannerWidget::BannerWidget(QWidget *parent, const QString &text, Qt::Orientation
     // Create the banner label and set properties
     bannerLabel = new QLabel(text, this);
     bannerLabel->setAlignment(Qt::AlignCenter);
-    bannerLabel->setStyleSheet("font-size: 24px; font-weight: bold; color: white;");
+
+    QString textColor;
+    if (transparency > 50) {
+        textColor = " color: white;";
+    }
+    bannerLabel->setStyleSheet("font-size: 24px; font-weight: bold;" + textColor);
 
     layout->addWidget(iconLabel);
     layout->addWidget(bannerLabel);
@@ -27,6 +37,7 @@ BannerWidget::BannerWidget(QWidget *parent, const QString &text, Qt::Orientation
 
     // Set minimum height for the widget
     setMinimumHeight(50);
+    setMaximumHeight(100);
     connect(this, &BannerWidget::buddyVisibilityChanged, this, &BannerWidget::toggleBuddyVisibility);
 
     updateDropdownIconState();
diff --git a/cockatrice/src/interface/widgets/general/display/banner_widget.h b/cockatrice/src/interface/widgets/general/display/banner_widget.h
index 8a81dcfce..06556089b 100644
--- a/cockatrice/src/interface/widgets/general/display/banner_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/banner_widget.h
@@ -3,15 +3,17 @@
  * @ingroup Widgets
  * @ingroup DeckEditorCardGroupWidgets
  * @ingroup DeckStorageWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef BANNER_WIDGET_H
 #define BANNER_WIDGET_H
 
 #include <QLabel>
-#include <QVBoxLayout>
+#include <QString>
 #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
new file mode 100644
index 000000000..3ea2df6bd
--- /dev/null
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.cpp
@@ -0,0 +1,55 @@
+#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);
+}
+
+QSize BarChartBackgroundWidget::sizeHint() const
+{
+    return QSize(100, 150);
+}
+
+void BarChartBackgroundWidget::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event);
+    QPainter p(this);
+    p.setRenderHint(QPainter::Antialiasing);
+
+    constexpr int PAD = 4;
+    constexpr int LABEL_H = 20;
+
+    int left = 46; // axis space + internal padding
+    int right = width() - PAD;
+    int top = PAD;
+    int bottom = height() - PAD - LABEL_H;
+
+    int barAreaHeight = bottom - top;
+    int barAreaWidth = right - left;
+
+    p.fillRect(QRect(left, top, barAreaWidth, barAreaHeight), QColor(250, 250, 250));
+
+    int ticks = 5;
+    for (int i = 0; i <= ticks; i++) {
+        float r = float(i) / ticks;
+        int y = bottom - r * barAreaHeight;
+
+        p.setPen(QPen(QColor(180, 180, 180, 120), 1));
+        p.drawLine(left, y, right, y);
+
+        p.setPen(Qt::black);
+        p.drawText(left - 35, y - 6, 32, 12, Qt::AlignRight | Qt::AlignVCenter, QString::number(int(r * highest)));
+    }
+}
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
new file mode 100644
index 000000000..1fc8a3bde
--- /dev/null
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_background_widget.h
@@ -0,0 +1,23 @@
+#ifndef COCKATRICE_BAR_CHART_BACKGROUND_WIDGET_H
+#define COCKATRICE_BAR_CHART_BACKGROUND_WIDGET_H
+
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class BarChartBackgroundWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    int highest = 0;      // global maximum (shared across bars)
+    int barCount = 0;     // number of CMC columns
+    int labelHeight = 20; // reserved for CMC numbers
+
+    explicit BarChartBackgroundWidget(QWidget *parent);
+public slots:
+    QSize sizeHint() const override;
+
+protected:
+    void paintEvent(QPaintEvent *event) override;
+};
+
+#endif // COCKATRICE_BAR_CHART_BACKGROUND_WIDGET_H
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
new file mode 100644
index 000000000..484ac861d
--- /dev/null
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.cpp
@@ -0,0 +1,225 @@
+#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)
+{
+    setMouseTracking(true);
+}
+
+void BarChartWidget::setBars(const QVector<BarData> &newBars)
+{
+    bars = newBars;
+    update();
+}
+
+void BarChartWidget::setHighest(int h)
+{
+    highest = qMax(1, h);
+    update();
+}
+
+QSize BarChartWidget::sizeHint() const
+{
+    return QSize(300, 200);
+}
+
+QSize BarChartWidget::minimumSizeHint() const
+{
+    return QSize(300, 50);
+}
+
+void BarChartWidget::paintEvent(QPaintEvent *)
+{
+    QPainter p(this);
+    p.setRenderHint(QPainter::Antialiasing);
+
+    constexpr int PAD = 4;
+    constexpr int LABEL_H = 20;
+
+    int w = width();
+    int h = height();
+
+    int left = 46;
+    int right = w - PAD;
+    int top = PAD;
+    int bottom = h - PAD - LABEL_H;
+
+    int barAreaHeight = bottom - top;
+    int barAreaWidth = right - left;
+
+    int barCount = bars.size();
+    if (barCount == 0) {
+        return;
+    }
+
+    int spacing = 6;
+    int barWidth = (barAreaWidth - (barCount - 1) * spacing) / barCount;
+
+    // background
+    p.fillRect(QRect(left, top, barAreaWidth, barAreaHeight), QColor(250, 250, 250));
+
+    // y-axis ticks
+    int ticks = 5;
+    // qInfo() << "Tick Positions ";
+    for (int i = 0; i <= ticks; i++) {
+        float r = float(i) / ticks;
+        int tickVal = i * highest / ticks; // integer value of tick
+        int y = bottom - (tickVal * barAreaHeight / highest);
+
+        // qInfo() << "Tick" << i << "value" << int(r * highest) << "y" << y;
+
+        p.setPen(QPen(QColor(180, 180, 180, 120), 1));
+        p.drawLine(left, y, right, y);
+
+        p.setPen(Qt::black);
+        p.drawText(left - 35, y - 6, 32, 12, Qt::AlignRight | Qt::AlignVCenter, QString::number(int(r * highest)));
+    }
+
+    // draw bars
+    // qInfo() << "Bar Segments";
+    int drawWidth = barWidth / 4;             // 1/4 of allocated width
+    int xOffset = (barWidth - drawWidth) / 2; // center the narrow bar
+
+    for (int i = 0; i < barCount; i++) {
+        const BarData &bar = bars[i];
+        int x = left + i * (barWidth + spacing) + xOffset; // shift to center
+        int yCurrent = bottom;
+
+        for (int j = 0; j < bar.segments.size(); j++) {
+            const auto &seg = bar.segments[j];
+            int segHeight = (seg.value * barAreaHeight / highest);
+            if (segHeight < 2 && seg.value > 0) {
+                segHeight = 2;
+            }
+
+            int topY = yCurrent - segHeight;
+
+            QRect r(x, topY, drawWidth, segHeight); // use drawWidth instead of barWidth
+            bool isTop = (j == bar.segments.size() - 1);
+
+            QLinearGradient g(r.topLeft(), r.bottomLeft());
+            g.setColorAt(0, seg.color.lighter(120));
+            g.setColorAt(1, seg.color.darker(110));
+            p.setBrush(g);
+            p.setPen(Qt::NoPen);
+
+            if (isTop) {
+                QPainterPath path;
+                int radius = 6;
+
+                int bx = r.x();
+                int by = r.y();
+                int bw = r.width();
+                int bh = r.height();
+
+                path.moveTo(bx, by + bh);
+                path.lineTo(bx, by + radius);
+                path.quadTo(bx, by, bx + radius, by);
+                path.lineTo(bx + bw - radius, by);
+                path.quadTo(bx + bw, by, bx + bw, by + radius);
+                path.lineTo(bx + bw, by + bh);
+                path.lineTo(bx, by + bh);
+                path.closeSubpath();
+
+                p.drawPath(path);
+            } else {
+                p.drawRect(r);
+            }
+
+            yCurrent -= segHeight;
+        }
+
+        // draw label below bar
+        QRect labelRect(left + i * (barWidth + spacing), bottom, barWidth, LABEL_H);
+        QFont f = p.font();
+        f.setBold(true);
+        p.setFont(f);
+        p.setPen(Qt::black);
+        p.drawText(labelRect, Qt::AlignCenter, bar.label);
+    }
+}
+
+void BarChartWidget::leaveEvent(QEvent *)
+{
+    hoveredBar = -1;
+    hoveredSegment = -1;
+    QToolTip::hideText();
+}
+
+void BarChartWidget::mouseMoveEvent(QMouseEvent *e)
+{
+    if (bars.isEmpty()) {
+        return;
+    }
+
+    constexpr int PAD = 4;
+    constexpr int LABEL_H = 20;
+    int w = width();
+    int h = height();
+    int left = 46;
+    int right = w - PAD;
+    int top = PAD;
+    int bottom = h - PAD - LABEL_H;
+    int barAreaHeight = bottom - top;
+
+    int barCount = bars.size();
+    int spacing = 6;
+    int barWidth = (right - left - (barCount - 1) * spacing) / barCount;
+
+    // find hovered bar
+    int mx = e->pos().x();
+    hoveredBar = -1;
+    for (int i = 0; i < barCount; i++) {
+        int x0 = left + i * (barWidth + spacing);
+        if (mx >= x0 && mx <= x0 + barWidth) {
+            hoveredBar = i;
+            break;
+        }
+    }
+    if (hoveredBar < 0) {
+        return;
+    }
+
+    // find hovered segment
+    int yCurrent = bottom;
+    const auto &segments = bars[hoveredBar].segments;
+    hoveredSegment = -1;
+    for (int i = 0; i < segments.size(); i++) {
+        const auto &seg = segments[i];
+        int segHeight = (seg.value * barAreaHeight / highest);
+        if (segHeight < 2 && seg.value > 0) {
+            segHeight = 2;
+        }
+
+        int topY = yCurrent - segHeight;
+        int bottomY = yCurrent;
+        if (e->pos().y() >= topY && e->pos().y() <= bottomY) {
+            hoveredSegment = i;
+            break;
+        }
+        yCurrent -= segHeight;
+    }
+
+    if (hoveredSegment >= 0) {
+        const auto &s = segments[hoveredSegment];
+        QString text = QString("%1: %2 cards\n\n%3").arg(s.category).arg(s.value).arg(s.cards.join("\n"));
+        QToolTip::showText(e->globalPosition().toPoint(), text, this);
+    } else {
+        QToolTip::hideText();
+    }
+}
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
new file mode 100644
index 000000000..a596c094a
--- /dev/null
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_chart_widget.h
@@ -0,0 +1,55 @@
+#ifndef COCKATRICE_BAR_CHART_WIDGET_H
+#define COCKATRICE_BAR_CHART_WIDGET_H
+
+#include <QColor>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <QVector>
+#include <QWidget>
+#include <qtmetamacros.h>
+
+struct BarSegment
+{
+    QString category;
+    int value;
+    QStringList cards;
+    QColor color;
+};
+
+struct BarData
+{
+    QString label;
+    QVector<BarSegment> segments;
+};
+
+class BarChartWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit BarChartWidget(QWidget *parent = nullptr);
+
+    void setBars(const QVector<BarData> &bars);
+    void setHighest(int h); // global max for scaling
+    int barCount() const
+    {
+        return bars.size();
+    }
+
+protected:
+    void paintEvent(QPaintEvent *event) override;
+    QSize sizeHint() const override;
+    QSize minimumSizeHint() const override;
+
+    void mouseMoveEvent(QMouseEvent *event) override;
+    void leaveEvent(QEvent *event) override;
+
+private:
+    QVector<BarData> bars;
+    int highest = 1; // global maximum value
+
+    int hoveredBar = -1;
+    int hoveredSegment = -1;
+};
+
+#endif // COCKATRICE_BAR_CHART_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/general/display/bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.cpp
similarity index 96%
rename from cockatrice/src/interface/widgets/general/display/bar_widget.cpp
rename to cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.cpp
index 2194b6b03..82d15d5be 100644
--- a/cockatrice/src/interface/widgets/general/display/bar_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.cpp
@@ -2,6 +2,10 @@
 
 #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/bar_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h
similarity index 82%
rename from cockatrice/src/interface/widgets/general/display/bar_widget.h
rename to cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h
index 67ad24995..18da1f939 100644
--- a/cockatrice/src/interface/widgets/general/display/bar_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/bar_widget.h
@@ -2,13 +2,17 @@
  * @file bar_widget.h
  * @ingroup Widgets
  * @ingroup DeckEditorAnalyticsWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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/color_bar.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
similarity index 65%
rename from cockatrice/src/interface/widgets/general/display/color_bar.cpp
rename to cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
index d1eb7ef4c..28118cc9c 100644
--- a/cockatrice/src/interface/widgets/general/display/color_bar.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.cpp
@@ -1,19 +1,32 @@
-
 #include "color_bar.h"
 
+#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(_colors)
+ColorBar::ColorBar(const QMap<QString, int> &_colors, QWidget *parent)
+    : QWidget(parent), colors(GameSpecificColors::MTG::sortManaMapWUBRGCFirst(_colors))
 {
     setMouseTracking(true);
 }
 
 void ColorBar::setColors(const QMap<QString, int> &_colors)
 {
-    colors = _colors;
+    colors = GameSpecificColors::MTG::sortManaMapWUBRGCFirst(_colors);
     update();
 }
 
@@ -24,16 +37,19 @@ QSize ColorBar::minimumSizeHint() const
 
 void ColorBar::paintEvent(QPaintEvent *)
 {
-    if (colors.isEmpty())
+    if (colors.isEmpty()) {
         return;
+    }
 
     int total = 0;
-    for (int v : colors.values())
-        total += v;
+    for (const auto &pair : colors) {
+        total += pair.second;
+    }
 
     // Prevent divide-by-zero
-    if (total == 0)
+    if (total == 0) {
         return;
+    }
 
     QPainter p(this);
     p.setRenderHint(QPainter::Antialiasing, true);
@@ -51,15 +67,9 @@ void ColorBar::paintEvent(QPaintEvent *)
     // Clip to inside the border
     p.setClipRect(bounds.adjusted(2, 2, -2, -2));
 
-    // Ensure predictable order
-    QList<QString> sortedKeys = colors.keys();
-    std::sort(sortedKeys.begin(), sortedKeys.end()); // Sort alphabetically
-
-    // Draw each color segment in the sorted order
-    for (const QString &key : sortedKeys) {
-        int value = colors[key];
-        double ratio = double(value) / total;
-
+    // Draw segments IN ORDER
+    for (const auto &[key, value] : colors) {
+        const double ratio = double(value) / total;
         if (ratio <= minRatioThreshold) {
             continue;
         }
@@ -67,8 +77,9 @@ void ColorBar::paintEvent(QPaintEvent *)
         int segmentWidth = int(ratio * w);
 
         // Ensure the segment width is at least 1 to avoid degenerate rectangles
-        if (segmentWidth < 1)
+        if (segmentWidth < 1) {
             segmentWidth = 1;
+        }
 
         QColor base = colorFromName(key);
 
@@ -83,19 +94,11 @@ void ColorBar::paintEvent(QPaintEvent *)
     }
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 void ColorBar::enterEvent(QEnterEvent *event)
 {
     Q_UNUSED(event);
     isHovered = true;
 }
-#else
-void ColorBar::enterEvent(QEvent *event)
-{
-    Q_UNUSED(event);
-    isHovered = true;
-}
-#endif
 
 void ColorBar::leaveEvent(QEvent *)
 {
@@ -104,39 +107,39 @@ void ColorBar::leaveEvent(QEvent *)
 
 void ColorBar::mouseMoveEvent(QMouseEvent *event)
 {
-    if (!isHovered || colors.isEmpty())
+    if (!isHovered || colors.isEmpty()) {
         return;
+    }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     int x = int(event->position().x());
     QPoint gp = event->globalPosition().toPoint();
-#else
-    int x = event->pos().x();
-    QPoint gp = event->globalPos();
-#endif
 
     QString text = tooltipForPosition(x);
-    if (!text.isEmpty())
+    if (!text.isEmpty()) {
         QToolTip::showText(gp, text, this);
+    }
 }
 
 QString ColorBar::tooltipForPosition(int x) const
 {
     int total = 0;
-    for (int v : colors.values())
-        total += v;
+    for (const auto &pair : colors) {
+        total += pair.second;
+    }
 
-    if (total == 0)
+    if (total == 0) {
         return {};
+    }
 
     int pos = 0;
-    for (auto it = colors.cbegin(); it != colors.cend(); ++it) {
-        const double ratio = double(it.value()) / total;
+
+    for (const auto &[key, value] : colors) {
+        const double ratio = double(value) / total;
         const int segmentWidth = int(ratio * width());
 
         if (x >= pos && x < pos + segmentWidth) {
-            const double percent = (100.0 * it.value()) / total;
-            return QString("%1: %2 cards (%3%)").arg(it.key()).arg(it.value()).arg(QString::number(percent, 'f', 1));
+            const double percent = (100.0 * value) / total;
+            return QString("%1: %2 cards (%3%)").arg(key).arg(value).arg(QString::number(percent, 'f', 1));
         }
 
         pos += segmentWidth;
@@ -152,12 +155,14 @@ QColor ColorBar::colorFromName(const QString &name) const
         {"W", QColor(235, 235, 230)}, {"B", QColor(30, 30, 30)},
     };
 
-    if (map.contains(name))
+    if (map.contains(name)) {
         return map[name];
+    }
 
     QColor c(name);
-    if (!c.isValid())
+    if (!c.isValid()) {
         c = Qt::gray;
+    }
 
     return c;
 }
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/general/display/color_bar.h b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
similarity index 88%
rename from cockatrice/src/interface/widgets/general/display/color_bar.h
rename to cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
index f61ab6942..3acb7f97f 100644
--- a/cockatrice/src/interface/widgets/general/display/color_bar.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/color_bar.h
@@ -2,9 +2,13 @@
 #define COCKATRICE_COLOR_BAR_H
 
 #include <QColor>
-#include <QMap>
+#include <QList>
+#include <QPair>
 #include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+template <class Key, class T> class QMap;
 
 /**
  * @class ColorBar
@@ -76,17 +80,10 @@ protected:
      */
     void paintEvent(QPaintEvent *event) override;
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     /**
-     * @brief Handles mouse hover entering (Qt6 version).
+     * @brief Handles mouse hover entering.
      */
     void enterEvent(QEnterEvent *event) override;
-#else
-    /**
-     * @brief Handles mouse hover entering (Qt5 version).
-     */
-    void enterEvent(QEvent *event) override;
-#endif
 
     /**
      * @brief Handles mouse hover leaving.
@@ -99,13 +96,13 @@ protected:
     void mouseMoveEvent(QMouseEvent *event) override;
 
 private:
-    /// Map of color keys to counts used for rendering.
-    QMap<QString, int> colors;
+    /** @brief Map of color keys to counts used for rendering. */
+    QList<QPair<QString, int>> colors;
 
-    /// True if the mouse is currently inside the widget.
+    /** @brief True if the mouse is currently inside the widget. */
     bool isHovered = false;
 
-    /// Minimum ratio a segment must exceed to be drawn.
+    /** @brief Minimum ratio a segment must exceed to be drawn. */
     double minRatioThreshold = 0.0;
 
     /**
diff --git a/cockatrice/src/interface/widgets/general/display/percent_bar_widget.cpp b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp
similarity index 91%
rename from cockatrice/src/interface/widgets/general/display/percent_bar_widget.cpp
rename to cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp
index 3726dd061..33195a518 100644
--- a/cockatrice/src/interface/widgets/general/display/percent_bar_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.cpp
@@ -1,5 +1,13 @@
 #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/percent_bar_widget.h b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h
similarity index 90%
rename from cockatrice/src/interface/widgets/general/display/percent_bar_widget.h
rename to cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h
index ff7d91363..f12cb8ae7 100644
--- a/cockatrice/src/interface/widgets/general/display/percent_bar_widget.h
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/percent_bar_widget.h
@@ -2,14 +2,15 @@
  * @file percent_bar_widget.h
  * @ingroup Widgets
  * @ingroup DeckEditorAnalyticsWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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
new file mode 100644
index 000000000..5a3130964
--- /dev/null
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.cpp
@@ -0,0 +1,148 @@
+#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)
+{
+    setMouseTracking(true);
+    setMinimumWidth(36);
+    setMaximumWidth(50);
+    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+}
+
+QSize SegmentedBarWidget::sizeHint() const
+{
+    return QSize(50, 150);
+}
+
+void SegmentedBarWidget::paintEvent(QPaintEvent *)
+{
+    QPainter p(this);
+    p.setRenderHint(QPainter::Antialiasing);
+
+    constexpr int PAD = 4;
+    constexpr int LABEL_H = 20;
+
+    int w = width();
+    int h = height();
+
+    int barX = PAD;
+    int barWidth = w - PAD * 2;
+
+    int barTop = PAD;
+    int barBottom = h - PAD - LABEL_H;
+    int barHeight = barBottom - barTop;
+
+    int yCurrent = barBottom;
+
+    // draw stacked segments
+    for (int i = 0; i < segments.size(); i++) {
+        const auto &seg = segments[i];
+
+        int segHeight = total > 0 ? (seg.value * barHeight / total) : 0;
+        if (segHeight < 2) {
+            segHeight = 2;
+        }
+
+        QRect r(barX, yCurrent - segHeight, barWidth, segHeight);
+        bool isTop = (i == segments.size() - 1);
+
+        QLinearGradient g(r.topLeft(), r.bottomLeft());
+        g.setColorAt(0, seg.color.lighter(120));
+        g.setColorAt(1, seg.color.darker(110));
+        p.setBrush(g);
+        p.setPen(Qt::NoPen);
+
+        if (isTop) {
+            QPainterPath path;
+            int radius = 6;
+
+            int x = r.x();
+            int y = r.y();
+            int w = r.width();
+            int h = r.height();
+
+            path.moveTo(x, y + h);
+            path.lineTo(x, y + radius);
+            path.quadTo(x, y, x + radius, y);
+            path.lineTo(x + w - radius, y);
+            path.quadTo(x + w, y, x + w, y + radius);
+            path.lineTo(x + w, y + h);
+            path.lineTo(x, y + h);
+            path.closeSubpath();
+
+            p.drawPath(path);
+        } else {
+            p.drawRect(r);
+        }
+
+        yCurrent -= segHeight;
+    }
+
+    // draw label
+    QRect labelRect(0, h - LABEL_H, w, LABEL_H);
+    QFont f = p.font();
+    f.setBold(true);
+    p.setFont(f);
+    p.setPen(Qt::black);
+    p.drawText(labelRect, Qt::AlignCenter, label);
+}
+
+int SegmentedBarWidget::segmentAt(int y) const
+{
+    int padding = 4;
+    int labelHeight = 20;
+    int barHeight = height() - padding * 2 - labelHeight;
+    int barTop = padding;
+    int barBottom = barTop + barHeight;
+
+    int currentTop = barBottom;
+
+    for (int i = 0; i < segments.size(); i++) {
+        int segHeight = total > 0 ? (segments[i].value * barHeight / total) : 0;
+        if (segHeight < 1) {
+            segHeight = 1;
+        }
+
+        int top = currentTop - segHeight;
+        int bottom = currentTop;
+
+        if (y >= top && y <= bottom) {
+            return i;
+        }
+
+        currentTop -= segHeight;
+    }
+    return -1;
+}
+
+void SegmentedBarWidget::mouseMoveEvent(QMouseEvent *e)
+{
+    if (!hovered) {
+        return;
+    }
+
+    int idx = segmentAt(e->pos().y());
+    if (idx < 0) {
+        return;
+    }
+
+    const Segment &s = segments[idx];
+    QString text = QString("%1: %2 cards\n%3").arg(s.category).arg(s.value).arg(s.cards.join(", "));
+
+    QToolTip::showText(e->globalPosition().toPoint(), text, this);
+}
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
new file mode 100644
index 000000000..c8c7dc2b9
--- /dev/null
+++ b/cockatrice/src/interface/widgets/general/display/charts/bars/segmented_bar_widget.h
@@ -0,0 +1,42 @@
+#ifndef COCKATRICE_SEGMENTED_BAR_WIDGET_H
+#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
+{
+    Q_OBJECT
+
+public:
+    struct Segment
+    {
+        QString category;
+        int value = 0;
+        QStringList cards;
+        QColor color;
+    };
+
+    QString label;
+    QVector<Segment> segments;
+    float total = 1.0;
+
+    explicit SegmentedBarWidget(QString label, QVector<Segment> segments, int total, QWidget *parent = nullptr);
+    QSize sizeHint() const override;
+
+protected:
+    void paintEvent(QPaintEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *e) override;
+
+    int segmentAt(int y) const;
+
+private:
+    bool hovered = true;
+};
+
+#endif // COCKATRICE_SEGMENTED_BAR_WIDGET_H
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
new file mode 100644
index 000000000..82542a663
--- /dev/null
+++ b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.cpp
@@ -0,0 +1,202 @@
+#include "color_pie.h"
+
+#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))
+{
+    setMouseTracking(true);
+}
+
+void ColorPie::setColors(const QMap<QString, int> &_colors)
+{
+    colors = GameSpecificColors::MTG::sortManaMapWUBRGCFirst(_colors);
+    update();
+}
+
+QSize ColorPie::minimumSizeHint() const
+{
+    return QSize(200, 200);
+}
+
+void ColorPie::paintEvent(QPaintEvent *)
+{
+    if (colors.isEmpty()) {
+        return;
+    }
+
+    int total = 0;
+    for (const auto &pair : colors) {
+        total += pair.second;
+    }
+
+    if (total == 0) {
+        return;
+    }
+
+    QPainter p(this);
+    p.setRenderHint(QPainter::Antialiasing, true);
+
+    int w = width();
+    int h = height();
+    int size = qMin(w, h) - 40;
+    QRectF rect((w - size) / 2.0, (h - size) / 2.0, size, size);
+
+    // Border
+    p.setPen(QPen(Qt::black, 1));
+    p.setBrush(Qt::NoBrush);
+    p.drawEllipse(rect);
+
+    double startAngle = 0.0;
+
+    for (const auto &[key, value] : colors) {
+        double ratio = double(value) / total;
+        if (ratio <= minRatioThreshold) {
+            continue;
+        }
+
+        double spanAngle = ratio * 360.0;
+
+        QColor base = colorFromName(key);
+
+        QRadialGradient grad(rect.center(), size / 2);
+        grad.setColorAt(0, base.lighter(130));
+        grad.setColorAt(1, base.darker(130));
+
+        p.setBrush(grad);
+        p.setPen(Qt::NoPen);
+        p.drawPie(rect, int(startAngle * 16), int(spanAngle * 16));
+
+        // Percent label
+        double midAngle = startAngle + spanAngle / 2.0;
+        double rad = qDegreesToRadians(midAngle);
+        double labelRadius = size / 2 + 15;
+        QPointF center = rect.center();
+        QPointF labelPos(center.x() + labelRadius * qCos(rad), center.y() - labelRadius * qSin(rad));
+
+        QString label = QString("%1%").arg(int(ratio * 100 + 0.5));
+
+        QFontMetrics fm(p.font());
+        int labelWidth = fm.horizontalAdvance(label);
+        QRectF textRect(labelPos.x() - labelWidth / 2.0, labelPos.y() - fm.height() / 2.0, labelWidth, fm.height());
+
+        p.setPen(Qt::black);
+        p.drawText(textRect, Qt::AlignCenter, label);
+
+        startAngle += spanAngle;
+    }
+}
+
+void ColorPie::enterEvent(QEnterEvent *event)
+{
+    Q_UNUSED(event);
+    isHovered = true;
+}
+
+void ColorPie::leaveEvent(QEvent *)
+{
+    isHovered = false;
+}
+
+void ColorPie::mouseMoveEvent(QMouseEvent *event)
+{
+    if (!isHovered || colors.isEmpty()) {
+        return;
+    }
+
+    QPoint p = event->position().toPoint();
+    QPoint gp = event->globalPosition().toPoint();
+
+    QString text = tooltipForPoint(p);
+    if (!text.isEmpty()) {
+        QToolTip::showText(gp, text, this);
+    }
+}
+
+QString ColorPie::tooltipForPoint(const QPoint &pt) const
+{
+    if (colors.isEmpty()) {
+        return {};
+    }
+
+    int total = 0;
+    for (const auto &pair : colors) {
+        total += pair.second;
+    }
+
+    if (total == 0) {
+        return {};
+    }
+
+    int w = width();
+    int h = height();
+    int size = qMin(w, h) - 40;
+    QPointF center(w / 2.0, h / 2.0);
+
+    QPointF v = pt - center;
+    double distance = std::hypot(v.x(), v.y());
+    if (distance > size / 2.0) {
+        return {};
+    }
+
+    double angle = std::atan2(-v.y(), v.x()) * 180.0 / M_PI;
+    if (angle < 0) {
+        angle += 360.0;
+    }
+
+    double acc = 0.0;
+
+    for (const auto &[key, value] : colors) {
+        double ratio = double(value) / total;
+        if (ratio <= minRatioThreshold) {
+            continue;
+        }
+
+        double span = ratio * 360.0;
+
+        if (angle >= acc && angle < acc + span) {
+            double percent = (100.0 * value) / total;
+            return QString("%1: %2 cards (%3%)").arg(key).arg(value).arg(QString::number(percent, 'f', 1));
+        }
+
+        acc += span;
+    }
+
+    return {};
+}
+
+QColor ColorPie::colorFromName(const QString &name) const
+{
+    static QMap<QString, QColor> map = {
+        {"R", QColor(220, 30, 30)},   {"G", QColor(40, 170, 40)}, {"U", QColor(40, 90, 200)},
+        {"W", QColor(235, 235, 230)}, {"B", QColor(30, 30, 30)},
+    };
+
+    if (map.contains(name)) {
+        return map[name];
+    }
+
+    QColor c(name);
+    if (!c.isValid()) {
+        c = Qt::gray;
+    }
+
+    return c;
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..0fe023f63
--- /dev/null
+++ b/cockatrice/src/interface/widgets/general/display/charts/pies/color_pie.h
@@ -0,0 +1,46 @@
+#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
+
+#include <QMap>
+#include <QString>
+#include <QWidget>
+
+class ColorPie : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ColorPie(const QMap<QString, int> &_colors = {}, QWidget *parent = nullptr);
+
+    void setColors(const QMap<QString, int> &_colors);
+
+    QSize minimumSizeHint() const override;
+
+protected:
+    void paintEvent(QPaintEvent *) override;
+
+    void enterEvent(QEnterEvent *event) override;
+    void leaveEvent(QEvent *) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
+
+private:
+    QList<QPair<QString, int>> colors;
+    bool isHovered = false;
+    const double minRatioThreshold = 0.01; // skip tiny slices
+
+    QColor colorFromName(const QString &name) const;
+    QString tooltipForPoint(const QPoint &pt) const;
+};
+
+#endif // COLOR_PIE_H
+
+#endif // COCKATRICE_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 f485e0040..0609eb16a 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,7 +1,16 @@
 #include "dynamic_font_size_label.h"
-#define FONT_PRECISION (0.5)
 
-#include <QElapsedTimer>
+#include <QFont>
+#include <QFontMetricsF>
+#include <QObject>
+#include <QRect>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QSize>
+#include <QWidget>
+#include <QtGlobal>
+
+#define FONT_PRECISION (0.5)
 
 DynamicFontSizeLabel::DynamicFontSizeLabel(QWidget *parent, Qt::WindowFlags f) : QLabel(parent, f)
 {
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 ca3043d10..cd029902a 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
@@ -1,14 +1,20 @@
 /**
  * @file dynamic_font_size_label.h
  * @ingroup Widgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DYNAMICFONTSIZELABEL_H
 #define DYNAMICFONTSIZELABEL_H
 
 #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 653b2cd5c..25e8ca48f 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,7 +2,14 @@
 
 #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 19e67fd28..dfbb03d20 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
@@ -1,15 +1,18 @@
 /**
  * @file dynamic_font_size_push_button.h
  * @ingroup PrintingWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DYNAMICFONTSIZEPUSHBUTTON_H
 #define DYNAMICFONTSIZEPUSHBUTTON_H
 
-#include <QObject>
+#include <QColor>
 #include <QPushButton>
-#include <QWidget>
+#include <QString>
+#include <stddef.h>
+
+class 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 ee26c78d9..40ee91bcc 100644
--- a/cockatrice/src/interface/widgets/general/display/labeled_input.cpp
+++ b/cockatrice/src/interface/widgets/general/display/labeled_input.cpp
@@ -1,5 +1,12 @@
 #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 8424e09f0..a07d50dbb 100644
--- a/cockatrice/src/interface/widgets/general/display/labeled_input.h
+++ b/cockatrice/src/interface/widgets/general/display/labeled_input.h
@@ -1,17 +1,21 @@
 /**
  * @file labeled_input.h
  * @ingroup DeckEditorCardGroupWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef LABELED_INPUT_H
 #define LABELED_INPUT_H
 
-#include <QComboBox>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QSpinBox>
+#include <QString>
+#include <QStringList>
 #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 7db18c57d..e1218a6fb 100644
--- a/cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp
+++ b/cockatrice/src/interface/widgets/general/display/shadow_background_label.cpp
@@ -1,7 +1,13 @@
 #include "shadow_background_label.h"
 
-#include <QPaintEvent>
+#include <QColor>
+#include <QMargins>
 #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 b2344b7d0..e64b9ca5b 100644
--- a/cockatrice/src/interface/widgets/general/display/shadow_background_label.h
+++ b/cockatrice/src/interface/widgets/general/display/shadow_background_label.h
@@ -1,13 +1,17 @@
 /**
  * @file shadow_background_label.h
  * @ingroup PrintingWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef STYLEDLABEL_H
 #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 07c9894c1..7f23827bc 100644
--- a/cockatrice/src/interface/widgets/general/home_styled_button.cpp
+++ b/cockatrice/src/interface/widgets/general/home_styled_button.cpp
@@ -1,9 +1,19 @@
 #include "home_styled_button.h"
 
+#include <QBrush>
+#include <QFontMetrics>
 #include <QPainter>
 #include <QPainterPath>
-#include <qgraphicseffect.h>
-#include <qstyleoption.h>
+#include <QPen>
+#include <QPointF>
+#include <QSize>
+#include <QSizePolicy>
+#include <QStyle>
+#include <QStyleOptionButton>
+#include <QtGlobal>
+#include <qnamespace.h>
+
+class QWidget;
 
 HomeStyledButton::HomeStyledButton(const QString &text, QPair<QColor, QColor> _gradientColors, QWidget *parent)
     : QPushButton(text, parent), gradientColors(_gradientColors)
@@ -41,6 +51,8 @@ QString HomeStyledButton::generateButtonStylesheet(const QPair<QColor, QColor> &
     return QString(R"(
         QPushButton {
             font-size: 34px;
+            font-weight: bold;
+            font-family: sans-serif, "Segoe UI", "Helvetica Neue";
             padding: 30px;
             color: white;
             border: 2px solid %1;
@@ -88,18 +100,14 @@ void HomeStyledButton::paintEvent(QPaintEvent *event)
     painter.setRenderHint(QPainter::Antialiasing);
     painter.setRenderHint(QPainter::TextAntialiasing);
 
-    QFont font = this->font();
-    font.setBold(true);
-    painter.setFont(font);
-
-    QFontMetrics fm(font);
-    QSize textSize = fm.size(Qt::TextSingleLine, this->text());
+    QFontMetrics fm(font());
+    QSize textSize = fm.size(Qt::TextSingleLine, text());
     QPointF center((width() - textSize.width()) / 2.0, (height() + textSize.height() / 2.0) / 2.0);
 
     QPainterPath path;
-    path.addText(center, font, this->text());
+    path.addText(center, font(), text());
 
-    painter.setPen(QPen(Qt::black, 2.0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
-    painter.setBrush(Qt::white);
-    painter.drawPath(path);
+    QPen pen(Qt::black, 4.0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+    painter.strokePath(path, pen);
+    painter.fillPath(path, Qt::white);
 }
diff --git a/cockatrice/src/interface/widgets/general/home_styled_button.h b/cockatrice/src/interface/widgets/general/home_styled_button.h
index a053993da..55ac5550f 100644
--- a/cockatrice/src/interface/widgets/general/home_styled_button.h
+++ b/cockatrice/src/interface/widgets/general/home_styled_button.h
@@ -1,12 +1,18 @@
 /**
  * @file home_styled_button.h
  * @ingroup Widgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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_tab_button_color.h b/cockatrice/src/interface/widgets/general/home_tab_button_color.h
new file mode 100644
index 000000000..b45bd7a92
--- /dev/null
+++ b/cockatrice/src/interface/widgets/general/home_tab_button_color.h
@@ -0,0 +1,49 @@
+#ifndef COCKATRICE_HOME_TAB_BUTTON_COLOR_H
+#define COCKATRICE_HOME_TAB_BUTTON_COLOR_H
+
+#include <QList>
+
+namespace HomeTabButtonColor
+{
+
+/**
+ * @brief Where to get the colors for the home tab buttons from
+ */
+enum Source
+{
+    FromThemeColors, ///< Use the theme's identity accent colors
+    FromBackground,  ///< Extract colour from the background image
+};
+
+struct Entry
+{
+    Source source;
+    const char *trKey; ///< key for translation
+};
+
+inline QList<Entry> all()
+{
+    static QList<Entry> entries = {{FromThemeColors, QT_TR_NOOP("From theme colors")},
+                                   {FromBackground, QT_TR_NOOP("Extract from background")}};
+
+    return entries;
+}
+
+/**
+ * Safely converts an int into the corresponding Source.
+ *
+ * @param value The int value
+ * @return The Source. Returns Source::FromThemeColors if the value is not within range
+ */
+inline Source intToSource(int value)
+{
+    if (value > FromBackground) {
+        return FromThemeColors; // default
+    }
+
+    return static_cast<Source>(value);
+}
+
+} // namespace HomeTabButtonColor
+
+#endif // COCKATRICE_HOME_TAB_BUTTON_COLOR_H
diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp
index 88eec230c..c77fd76fd 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/home_widget.cpp
@@ -2,30 +2,77 @@
 
 #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("theme:backgrounds/home"), overlay("theme:cockatrice")
+    : QWidget(parent), tabSupervisor(_tabSupervisor), background(themePixmap(QStringLiteral("backgrounds/home")))
 {
     layout = new QGridLayout(this);
 
     backgroundSourceCard = new CardInfoPictureArtCropWidget(this);
-    backgroundSourceDeck = new DeckLoader(this);
 
-    backgroundSourceDeck->loadFromFile(SettingsCache::instance().getDeckPath() + "background.cod",
-                                       DeckLoader::CockatriceFormat, false);
-
-    gradientColors = extractDominantColors(background);
+    gradientColors = determineButtonColor();
 
     layout->addWidget(createButtons(), 1, 1, Qt::AlignVCenter | Qt::AlignHCenter);
 
@@ -44,44 +91,110 @@ HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor)
     updateConnectButton(tabSupervisor->getClient()->getStatus());
 
     connect(tabSupervisor->getClient(), &RemoteClient::statusChanged, this, &HomeWidget::updateConnectButton);
-    connect(&SettingsCache::instance(), &SettingsCache::homeTabBackgroundSourceChanged, this,
+    connect(&SettingsCache::instance().appearance(), &AppearanceSettings::homeTabBackgroundSourceChanged, this,
             &HomeWidget::initializeBackgroundFromSource);
-    connect(&SettingsCache::instance(), &SettingsCache::homeTabBackgroundShuffleFrequencyChanged, this,
-            &HomeWidget::onBackgroundShuffleFrequencyChanged);
+    connect(&SettingsCache::instance().appearance(), &AppearanceSettings::homeTabBackgroundShuffleFrequencyChanged,
+            this, &HomeWidget::onBackgroundShuffleFrequencyChanged);
+    // Lambda is cleaner to read than overloading this
+    connect(&SettingsCache::instance().appearance(), &AppearanceSettings::homeTabDisplayCardNameChanged, this,
+            [this] { repaint(); });
+    connect(&SettingsCache::instance().appearance(), &AppearanceSettings::homeTabBackgroundDimChanged, this,
+            [this] { repaint(); });
+    connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this,
+            &HomeWidget::initializeBackgroundFromSource);
+    connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this,
+            &HomeWidget::updateButtonsToBackgroundColor);
+    // Scheme flips (light/dark/system with an OS switch) fire on themeManager,
+    // not on SettingsCache::themeChanged, so re-resolve the variant background.
+    connect(themeManager, &ThemeManager::themeChanged, this, &HomeWidget::initializeBackgroundFromSource);
+    connect(themeManager, &ThemeManager::paletteChanged, this, &HomeWidget::updateButtonsToBackgroundColor);
+    connect(themeManager, &ThemeManager::paletteChanged, this, &HomeWidget::updateLogoOverlay);
+    connect(&SettingsCache::instance().appearance(), &AppearanceSettings::homeTabButtonColorChanged, this,
+            &HomeWidget::updateButtonsToBackgroundColor);
 }
 
 void HomeWidget::initializeBackgroundFromSource()
 {
+    // The featured logo is theme/scheme-derived too; reload it alongside the
+    // background so a theme or appearance switch doesn't leave it stale.
+    updateLogoOverlay();
+
     if (CardDatabaseManager::getInstance()->getLoadStatus() != LoadStatus::Ok) {
         connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this,
                 &HomeWidget::initializeBackgroundFromSource);
         return;
     }
 
-    auto backgroundSourceType = BackgroundSources::fromId(SettingsCache::instance().getHomeTabBackgroundSource());
-
-    cardChangeTimer->stop();
+    auto backgroundSourceType =
+        BackgroundSources::fromId(SettingsCache::instance().appearance().getHomeTabBackgroundSource());
 
     switch (backgroundSourceType) {
         case BackgroundSources::Theme:
-            background = QPixmap("theme:backgrounds/home");
+            cardChangeTimer->stop();
+            background = themePixmap(QStringLiteral("backgrounds/home"));
+            backgroundSourceDeck = DeckList();
+            backgroundSourceCard->setCard(ExactCard());
             updateButtonsToBackgroundColor();
             update();
             break;
         case BackgroundSources::RandomCardArt:
-            cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000);
+            backgroundSourceDeck = DeckList();
+            updateRandomCard();
+            onBackgroundShuffleFrequencyChanged();
             break;
         case BackgroundSources::DeckFileArt:
-            backgroundSourceDeck->loadFromFile(SettingsCache::instance().getDeckPath() + "background.cod",
-                                               DeckLoader::CockatriceFormat, false);
-            cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000);
+            loadBackgroundSourceDeck();
+            updateRandomCard();
+            onBackgroundShuffleFrequencyChanged();
             break;
     }
 }
 
+void HomeWidget::loadBackgroundSourceDeck()
+{
+    std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromFile(
+        SettingsCache::instance().paths().getDeckPath() + "background.cod", DeckFileFormat::Cockatrice, false);
+    backgroundSourceDeck = deckOpt.has_value() ? deckOpt.value().deckList : DeckList();
+}
+
+static QPair<QColor, QColor> paletteDerivedButtonColors()
+{
+    return {themeManager->appColor(AppColor::AccentStrong), themeManager->appColor(AppColor::AccentSoft)};
+}
+
+QPair<QColor, QColor> HomeWidget::determineButtonColor() const
+{
+    auto colorSource =
+        HomeTabButtonColor::intToSource(SettingsCache::instance().appearance().getHomeTabButtonColorSourceIndex());
+
+    switch (colorSource) {
+        case HomeTabButtonColor::FromThemeColors:
+            return paletteDerivedButtonColors();
+        case HomeTabButtonColor::FromBackground:
+            return extractDominantColors(background);
+    }
+
+    return paletteDerivedButtonColors();
+}
+
+void HomeWidget::setRandomCard(ExactCard &newCard)
+{
+    static constexpr int ATTEMPTS = 10;
+    for (int i = 0; i < ATTEMPTS; ++i) {
+        ExactCard tmpCard = CardDatabaseManager::query()->getRandomCard();
+        if (tmpCard != backgroundSourceCard->getCard() && tmpCard.getCardPtr()->getProperty("layout") == "normal" &&
+            tmpCard.getPrinting().getSet() != nullptr) {
+            newCard = tmpCard;
+            return;
+        }
+    }
+    qWarning() << "failed to set random card image after" << ATTEMPTS << "attempts";
+}
+
 void HomeWidget::updateRandomCard()
 {
-    auto backgroundSourceType = BackgroundSources::fromId(SettingsCache::instance().getHomeTabBackgroundSource());
+    auto backgroundSourceType =
+        BackgroundSources::fromId(SettingsCache::instance().appearance().getHomeTabBackgroundSource());
 
     ExactCard newCard;
 
@@ -89,13 +202,10 @@ void HomeWidget::updateRandomCard()
         case BackgroundSources::Theme:
             break;
         case BackgroundSources::RandomCardArt:
-            do {
-                newCard = CardDatabaseManager::query()->getRandomCard();
-            } while (newCard == backgroundSourceCard->getCard() &&
-                     newCard.getCardPtr()->getProperty("layout") != "normal");
+            setRandomCard(newCard);
             break;
         case BackgroundSources::DeckFileArt:
-            QList<CardRef> cardRefs = backgroundSourceDeck->getDeckList()->getCardRefList();
+            QList<CardRef> cardRefs = backgroundSourceDeck.getCardRefList();
             ExactCard oldCard = backgroundSourceCard->getCard();
 
             if (!cardRefs.empty()) {
@@ -115,37 +225,33 @@ void HomeWidget::updateRandomCard()
             }
             break;
     }
-    if (!newCard)
+    if (!newCard) {
         return;
+    }
 
     connect(newCard.getCardPtr().data(), &CardInfo::pixmapUpdated, this, &HomeWidget::updateBackgroundProperties);
     backgroundSourceCard->setCard(newCard);
-    background = backgroundSourceCard->getProcessedBackground(size());
-
-    if (SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() <= 0) {
-        cardChangeTimer->stop();
-    }
+    background = backgroundSourceCard->getBackground();
 }
 
 void HomeWidget::onBackgroundShuffleFrequencyChanged()
 {
     cardChangeTimer->stop();
-    if (SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() <= 0) {
-        return;
+    if (SettingsCache::instance().appearance().getHomeTabBackgroundShuffleFrequency() > 0) {
+        cardChangeTimer->start(SettingsCache::instance().appearance().getHomeTabBackgroundShuffleFrequency() * 1000);
     }
-    cardChangeTimer->start(SettingsCache::instance().getHomeTabBackgroundShuffleFrequency() * 1000);
 }
 
 void HomeWidget::updateBackgroundProperties()
 {
-    background = backgroundSourceCard->getProcessedBackground(size());
+    background = backgroundSourceCard->getBackground();
     updateButtonsToBackgroundColor();
     update(); // Triggers repaint
 }
 
 void HomeWidget::updateButtonsToBackgroundColor()
 {
-    gradientColors = extractDominantColors(background);
+    gradientColors = determineButtonColor();
     for (HomeStyledButton *button : findChildren<HomeStyledButton *>()) {
         button->updateStylesheet(gradientColors);
         button->update();
@@ -172,10 +278,10 @@ QGroupBox *HomeWidget::createButtons()
     QVBoxLayout *boxLayout = new QVBoxLayout;
     boxLayout->setAlignment(Qt::AlignHCenter);
 
-    QLabel *logoLabel = new QLabel;
-    logoLabel->setPixmap(overlay.scaledToWidth(200, Qt::SmoothTransformation));
+    logoLabel = new QLabel;
     logoLabel->setAlignment(Qt::AlignCenter);
     boxLayout->addWidget(logoLabel);
+    updateLogoOverlay();
     boxLayout->addSpacing(25);
 
     connectButton = new HomeStyledButton("Connect/Play", gradientColors);
@@ -183,7 +289,7 @@ QGroupBox *HomeWidget::createButtons()
 
     auto visualDeckEditorButton = new HomeStyledButton(tr("Create New Deck"), gradientColors);
     connect(visualDeckEditorButton, &QPushButton::clicked, tabSupervisor,
-            [this] { tabSupervisor->openDeckInNewTab(nullptr); });
+            [this] { tabSupervisor->openDeckInNewTab(LoadedDeck()); });
     boxLayout->addWidget(visualDeckEditorButton);
     auto visualDeckStorageButton = new HomeStyledButton(tr("Browse Decks"), gradientColors);
     connect(visualDeckStorageButton, &QPushButton::clicked, tabSupervisor,
@@ -240,11 +346,6 @@ void HomeWidget::updateConnectButton(const ClientStatus status)
 
 QPair<QColor, QColor> HomeWidget::extractDominantColors(const QPixmap &pixmap)
 {
-    if (SettingsCache::instance().getThemeName() == "Default" &&
-        SettingsCache::instance().getHomeTabBackgroundSource() == BackgroundSources::toId(BackgroundSources::Theme)) {
-        return QPair<QColor, QColor>(QColor::fromRgb(20, 140, 60), QColor::fromRgb(120, 200, 80));
-    }
-
     // Step 1: Downscale image for performance
     QImage image = pixmap.toImage()
                        .scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation)
@@ -294,24 +395,143 @@ QPair<QColor, QColor> HomeWidget::extractDominantColors(const QPixmap &pixmap)
 void HomeWidget::paintEvent(QPaintEvent *event)
 {
     QPainter painter(this);
-
-    background = background.scaled(size(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
-
-    // Draw already-scaled background centered
-    QSize widgetSize = size();
-    QSize bgSize = background.size();
-    QPoint topLeft((widgetSize.width() - bgSize.width()) / 2, (widgetSize.height() - bgSize.height()) / 2);
-
-    painter.drawPixmap(topLeft, background);
-
-    // Draw translucent black overlay with rounded corners
-    QRectF overlayRect(5, 5, width() - 10, height() - 10); // 5px inset
-    QPainterPath roundedRectPath;
-    roundedRectPath.addRoundedRect(overlayRect, 20, 20); // 20px corner radius
-
-    QColor semiTransparentBlack(0, 0, 0, static_cast<int>(255 * 0.33)); // 33% opacity
     painter.setRenderHint(QPainter::Antialiasing);
-    painter.fillPath(roundedRectPath, semiTransparentBlack);
+
+    if (!background.isNull()) {
+        QSize widgetSize = size() * devicePixelRatio();
+        QPixmap toDraw = background.scaled(widgetSize, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+
+        // Draw scaled background centered
+        QSize bgSize = toDraw.size();
+        QPoint topLeft((widgetSize.width() - bgSize.width()) / (devicePixelRatio() * 2), // undo scaling for painter
+                       (widgetSize.height() - bgSize.height()) / (devicePixelRatio() * 2));
+
+        painter.drawPixmap(topLeft, toDraw);
+    }
+
+    if (SettingsCache::instance().appearance().getHomeTabBackgroundDim()) {
+        // Draw translucent black overlay with rounded corners
+        QRectF overlayRect(5, 5, width() - 10, height() - 10);
+        QPainterPath roundedRectPath;
+        roundedRectPath.addRoundedRect(overlayRect, 20, 20);
+
+        QColor semiTransparentBlack(0, 0, 0, static_cast<int>(255 * 0.33));
+        painter.fillPath(roundedRectPath, semiTransparentBlack);
+    }
+
+    // Card name overlay (above the attribution, bottom-right)
+    QString cardName;
+    QString attribution;
+    ExactCard card = backgroundSourceCard->getCard();
+    if (card) {
+        cardName = card.getCardPtr()->getName();
+        if (card.getPrinting().getSet() != nullptr) {
+            cardName += " (" + card.getPrinting().getSet()->getCorrectedShortName() + ") " +
+                        card.getPrinting().getProperty("num");
+        }
+        attribution = buildArtAttribution(card);
+    }
+
+    // Scryfall requires artist attribution wherever card art is shown cropped.
+    // Pin it to the bottom-right corner, using the same font as the card name pill,
+    // and align its right edge with the card name pill's right edge.
+    constexpr int margin = 15;
+    constexpr qreal attributionMargin = 4.0;
+
+    QFont attributionFont = painter.font();
+    attributionFont.setPointSize(14);
+    attributionFont.setBold(true);
+    painter.setFont(attributionFont);
+
+    // paintArtAttribution insets the pill 4px from the given rect's right edge,
+    // so nudge the rect's right edge to land exactly on the pill's right edge.
+    QRectF attributionArea = rect();
+    attributionArea.setRight(width() - margin + attributionMargin);
+    const QRectF attributionRect = paintArtAttribution(painter, attributionArea, attribution);
+
+    // Card name bubble above the attribution (when enabled).
+    if (!cardName.isEmpty() && SettingsCache::instance().appearance().getHomeTabDisplayCardName()) {
+        QFont font = painter.font();
+        font.setPointSize(14);
+        font.setBold(true);
+        painter.setFont(font);
+
+        QFontMetrics fm(font);
+        constexpr int padding = 10;
+
+        QRect textRect = fm.boundingRect(cardName);
+
+        int bubbleBottom = height() - margin;
+        if (!attributionRect.isEmpty()) {
+            bubbleBottom = attributionRect.top() - 6;
+        }
+        const QRect nameBubbleRect(width() - textRect.width() - padding * 2 - margin,
+                                   bubbleBottom - textRect.height() - padding * 2, textRect.width() + padding * 2,
+                                   textRect.height() + padding * 2);
+
+        // Background bubble
+        painter.setPen(Qt::NoPen);
+        painter.setBrush(QColor(0, 0, 0, 160));
+        painter.drawRoundedRect(nameBubbleRect, 8, 8);
+
+        // Text
+        painter.setPen(Qt::white);
+        painter.drawText(nameBubbleRect.adjusted(padding, padding, -padding, -padding),
+                         Qt::AlignRight | Qt::AlignVCenter, cardName);
+    }
 
     QWidget::paintEvent(event);
 }
+
+void HomeWidget::updateLogoOverlay()
+{
+    // Emulate cockatrice.svg in Qt rather than rendering the baked-in SVG.
+    // The SVG has no separate plate: the gradient fills the bird's silhouette
+    // paths (light #c9fd62/AccentSoft at the top-left, dark #139740/AccentStrong
+    // toward the bottom-right — the SVG's linearGradient4265-7-8 stops along
+    // its userSpaceOnUse axis), and the white highlight path
+    // (cockatrice-logo-white) sits on top. So we paint that gradient clipped to
+    // the full logo silhouette (the full-color logo's alpha), then overlay the
+    // white mark. Colours stay fully theme-driven and independent of the static
+    // greens baked into the SVG.
+    const QColor strong = themeManager->appColor(AppColor::AccentStrong);
+    const QColor soft = themeManager->appColor(AppColor::AccentSoft);
+
+    const QPixmap silhouette = themePixmap(QStringLiteral("cockatrice")).scaledToWidth(200, Qt::SmoothTransformation);
+    const QPixmap whiteMark =
+        themePixmap(QStringLiteral("cockatrice-logo-white")).scaledToWidth(200, Qt::SmoothTransformation);
+    if (silhouette.isNull() || whiteMark.isNull()) {
+        return;
+    }
+
+    QPixmap composite(silhouette.size());
+    composite.fill(Qt::transparent);
+
+    {
+        QPainter painter(&composite);
+        painter.setRenderHint(QPainter::Antialiasing);
+        painter.setRenderHint(QPainter::SmoothPixmapTransform);
+
+        // Recreate cockatrice.svg's own gradient geometry (linearGradient
+        // 4265-7-8, userSpaceOnUse): light AccentSoft at S=(-8.097,-97.746),
+        // dark AccentStrong at E=(162.455,295.208), on the SVG's 300x300
+        // canvas. Scale those coordinates to this composite's size.
+        const qreal scale = composite.width() / 300.0;
+        QLinearGradient gradient(QPointF(-8.097, -97.746) * scale, QPointF(162.455, 295.208) * scale);
+        gradient.setColorAt(0.0, soft);
+        gradient.setColorAt(1.0, strong);
+        painter.fillRect(composite.rect(), gradient);
+
+        // Clip the gradient to the full logo silhouette exactly as the SVG's
+        // gradient paths are confined to the bird.
+        painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+        painter.drawPixmap(0, 0, silhouette);
+
+        painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+        painter.drawPixmap(0, 0, whiteMark);
+    }
+
+    if (logoLabel) {
+        logoLabel->setPixmap(composite);
+    }
+}
diff --git a/cockatrice/src/interface/widgets/general/home_widget.h b/cockatrice/src/interface/widgets/general/home_widget.h
index 1db33446a..fb9566cad 100644
--- a/cockatrice/src/interface/widgets/general/home_widget.h
+++ b/cockatrice/src/interface/widgets/general/home_widget.h
@@ -2,18 +2,28 @@
  * @file home_widget.h
  * @ingroup Core
  * @ingroup Widgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef HOME_WIDGET_H
 #define HOME_WIDGET_H
-#include "../../../interface/widgets/tabs/tab_supervisor.h"
-#include "../cards/card_info_picture_art_crop_widget.h"
-#include "home_styled_button.h"
+#include "libcockatrice/deck_list/deck_list.h"
 
-#include <QGridLayout>
+#include <QColor>
+#include <QPair>
+#include <QPixmap>
 #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
 {
@@ -23,7 +33,7 @@ class HomeWidget : public QWidget
 public:
     HomeWidget(QWidget *parent, TabSupervisor *tabSupervisor);
     void updateRandomCard();
-    QPair<QColor, QColor> extractDominantColors(const QPixmap &pixmap);
+    static QPair<QColor, QColor> extractDominantColors(const QPixmap &pixmap);
 
 public slots:
     void paintEvent(QPaintEvent *event) override;
@@ -40,10 +50,15 @@ private:
     TabSupervisor *tabSupervisor;
     QPixmap background;
     CardInfoPictureArtCropWidget *backgroundSourceCard = nullptr;
-    DeckLoader *backgroundSourceDeck;
-    QPixmap overlay;
+    DeckList backgroundSourceDeck;
+    QLabel *logoLabel = nullptr;
     QPair<QColor, QColor> gradientColors;
     HomeStyledButton *connectButton;
+
+    void setRandomCard(ExactCard &newCard);
+    void loadBackgroundSourceDeck();
+    QPair<QColor, QColor> determineButtonColor() const;
+    void updateLogoOverlay();
 };
 
 #endif // HOME_WIDGET_H
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 75ab56b34..6a6025ec2 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp
+++ b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp
@@ -1,42 +1,60 @@
 /**
  * @file flow_widget.cpp
- * @brief Implementation of the FlowWidget class for organizing widgets in a flow layout within a scrollable area.
+ * @brief Implementation of FlowWidget — a QWidget hosting a FlowLayout inside an
+ *        optional QScrollArea.
  */
 
 #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>
-#include <qscrollarea.h>
-#include <qsizepolicy.h>
 
 /**
- * @brief Constructs a FlowWidget with a scrollable layout.
+ * @brief Constructs a FlowWidget.
  *
- * @param parent The parent widget of this FlowWidget.
- * @param horizontalPolicy The horizontal scroll bar policy for the scroll area.
- * @param verticalPolicy The vertical scroll bar policy for the scroll area.
+ * When both scroll policies are Qt::ScrollBarAlwaysOff the scroll area is
+ * omitted entirely and the container is placed directly in the main layout.
+ *
+ * @param parent            Parent widget.
+ * @param _flowDirection    Qt::Horizontal for row-wrapping, Qt::Vertical for column-wrapping.
+ * @param horizontalPolicy  Horizontal scroll-bar policy.
+ * @param verticalPolicy    Vertical scroll-bar policy.
  */
 FlowWidget::FlowWidget(QWidget *parent,
                        const Qt::Orientation _flowDirection,
                        const Qt::ScrollBarPolicy horizontalPolicy,
                        const Qt::ScrollBarPolicy verticalPolicy)
-    : QWidget(parent), flowDirection(_flowDirection)
+    : QWidget(parent), scrollArea(nullptr), flowDirection(_flowDirection)
+
 {
-    // Main Widget and Layout
-    if (_flowDirection == Qt::Horizontal) {
-        setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
-        setMinimumWidth(0);
+    // Top-level size policy
+    // Horizontal flow: expand horizontally, let height be determined by wrapping.
+    // Vertical flow:   expand vertically, let width be determined by wrapping.
+    if (flowDirection == Qt::Horizontal) {
+        setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
     } else {
-        setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
-        setMinimumHeight(0);
+        setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
     }
+
     mainLayout = new QHBoxLayout(this);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     setLayout(mainLayout);
 
-    if (horizontalPolicy != Qt::ScrollBarAlwaysOff || verticalPolicy != Qt::ScrollBarAlwaysOff) {
-        // Scroll Area, which should expand as much as possible, since it should be the only direct child widget.
+    const bool useScrollArea = (horizontalPolicy != Qt::ScrollBarAlwaysOff || verticalPolicy != Qt::ScrollBarAlwaysOff);
+
+    // Scroll area (optional)
+    if (useScrollArea) {
         scrollArea = new QScrollArea(this);
         scrollArea->setWidgetResizable(true);
         scrollArea->setMinimumSize(0, 0);
@@ -48,46 +66,57 @@ FlowWidget::FlowWidget(QWidget *parent,
         scrollArea = nullptr;
     }
 
-    // Flow Layout inside the scroll area
-    if (horizontalPolicy == Qt::ScrollBarAlwaysOff && verticalPolicy == Qt::ScrollBarAlwaysOff) {
-        container = new QWidget(this);
-    } else {
-        container = new QWidget(scrollArea);
-    }
+    // Container widget (holds the FlowLayout)
+    container = new QWidget(useScrollArea ? static_cast<QWidget *>(scrollArea) : this);
+
+    // The container should be willing to grow in both axes; its actual size is
+    // governed by the FlowLayout's sizeHint / heightForWidth, not by a fixed policy.
+    container->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+    container->setMinimumSize(0, 0);
 
     flowLayout = new FlowLayout(container, flowDirection);
-
     container->setLayout(flowLayout);
-    // The container should expand as much as possible, trusting the scrollArea to constrain it.
-    if (_flowDirection == Qt::Horizontal) {
-        container->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-        container->setMinimumWidth(0);
-    } else {
-        container->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-        container->setMinimumHeight(0);
-    }
 
-    // Use the FlowLayout container directly if we disable the ScrollArea
-    if (horizontalPolicy == Qt::ScrollBarAlwaysOff && verticalPolicy == Qt::ScrollBarAlwaysOff) {
-        mainLayout->addWidget(container);
-    } else {
+    if (useScrollArea) {
         scrollArea->setWidget(container);
         mainLayout->addWidget(scrollArea);
+    } else {
+        mainLayout->addWidget(container);
     }
 }
 
 /**
  * @brief Adds a widget to the flow layout within the FlowWidget.
  *
- * Adjusts the widget's size policy based on the scroll bar policies.
+ * Plain widgets are not filtered for arrow keys: intercepting them would steal
+ * Up/Down/Left/Right from controls that use them (combo boxes, spin boxes
+ * etc.). Widgets that want keyboard navigation between flow items must be
+ * added via addNavigableWidget instead.
  *
  * @param widget_to_add The widget to add to the flow layout.
  */
-void FlowWidget::addWidget(QWidget *widget_to_add) const
+void FlowWidget::addWidget(QWidget *widget_to_add)
 {
     flowLayout->addWidget(widget_to_add);
 }
 
+/**
+ * @brief Adds a widget and routes its arrow keys to FlowWidget focus navigation.
+ *
+ * The widget is filtered for arrow-key events so keyboard navigation between
+ * the flow items keeps working even when the flow sits inside a QScrollArea,
+ * which swallows arrow keys before they can reach FlowWidget::keyPressEvent.
+ * Only widgets added through this method are affected; anything that needs its
+ * own arrow keys should use plain addWidget.
+ *
+ * @param widget_to_add The widget to add to the flow layout.
+ */
+void FlowWidget::addNavigableWidget(QWidget *widget_to_add)
+{
+    widget_to_add->installEventFilter(this);
+    flowLayout->addWidget(widget_to_add);
+}
+
 void FlowWidget::insertWidgetAtIndex(QWidget *toInsert, int index)
 {
     flowLayout->insertWidgetAtIndex(toInsert, index);
@@ -100,77 +129,75 @@ void FlowWidget::removeWidget(QWidget *widgetToRemove) const
 }
 
 /**
- * @brief Clears all widgets from the flow layout.
+ * @brief Removes all widgets from the flow layout and deletes them.
  *
- * Deletes each widget and layout item, and recreates the flow layout if it was removed.
+ * If the layout pointer has somehow been lost it is recreated before returning.
  */
 void FlowWidget::clearLayout()
 {
-    if (flowLayout != nullptr) {
+    if (flowLayout) {
         QLayoutItem *item;
-        while ((item = flowLayout->takeAt(0)) != nullptr) {
-            item->widget()->deleteLater(); // Delete the widget
-            delete item;                   // Delete the layout item
+        while ((item = flowLayout->takeAt(0))) {
+            if (item->widget()) {
+                item->widget()->deleteLater();
+            }
+            delete item;
         }
     } else {
+        // Defensive fallback: recreate the layout if it was deleted externally.
         flowLayout = new FlowLayout(container, flowDirection);
         container->setLayout(flowLayout);
     }
 }
 
 /**
- * @brief Handles resize events for the FlowWidget.
+ * @brief Marks the flow layout as dirty so Qt recomputes item positions.
  *
- * Triggers layout recalculation and adjusts the scroll area content size.
- *
- * @param event The resize event containing the new size information.
+ * We do NOT call adjustSize() or activate() here:
+ *  - adjustSize() would freeze geometry by calling setFixedSize internally.
+ *  - activate() called inside a resize event can cause synchronous re-entrancy.
+ * Qt automatically calls setGeometry on the layout after a resize, so simply
+ * invalidating is sufficient.
  */
 void FlowWidget::resizeEvent(QResizeEvent *event)
 {
     QWidget::resizeEvent(event);
+    qCDebug(FlowWidgetSizeLog) << "resizeEvent:" << event->size();
 
-    qCDebug(FlowWidgetSizeLog) << event->size();
-
-    // Trigger the layout to recalculate
-    if (flowLayout != nullptr) {
-        flowLayout->invalidate(); // Marks the layout as dirty and requires recalculation
-        flowLayout->activate();   // Recalculate the layout based on the new size
-    }
-
-    // Ensure the scroll area and its content adjust correctly
-    if (scrollArea != nullptr && scrollArea->widget() != nullptr) {
-        qCDebug(FlowWidgetSizeLog) << "Got a scrollarea: " << scrollArea->widget()->size();
-        scrollArea->widget()->adjustSize();
-    } else {
-        container->adjustSize();
+    if (flowLayout) {
+        flowLayout->invalidate();
     }
 }
 
+void FlowWidget::setSpacing(int hSpacing, int vSpacing)
+{
+    flowLayout->setHorizontalMargin(hSpacing);
+    flowLayout->setVerticalMargin(vSpacing);
+    flowLayout->invalidate();
+}
+
 /**
- * @brief Sets the minimum size for all widgets inside the FlowWidget to the maximum sizeHint of all of them.
+ * @brief Sets every child widget's minimum size to the largest sizeHint in the layout.
+ *
+ * Useful for toolbars or button bars where all items should be the same size.
  */
 void FlowWidget::setMinimumSizeToMaxSizeHint()
 {
-    QSize maxSize(0, 0); // Initialize to a zero size
+    QSize maxSize(0, 0);
 
     // Iterate over all widgets in the flow layout to find the maximum sizeHint
     for (int i = 0; i < flowLayout->count(); ++i) {
-        if (QLayoutItem *item = flowLayout->itemAt(i)) {
-            if (QWidget *widget = item->widget()) {
-                // Update the max size based on the sizeHint of each widget
-                QSize widgetSizeHint = widget->sizeHint();
-                maxSize.setWidth(qMax(maxSize.width(), widgetSizeHint.width()));
-                maxSize.setHeight(qMax(maxSize.height(), widgetSizeHint.height()));
-            }
+        QLayoutItem *item = flowLayout->itemAt(i);
+        if (item && item->widget()) {
+            maxSize = maxSize.expandedTo(item->widget()->sizeHint());
         }
     }
 
     // Set the minimum size for all widgets to the max sizeHint
     for (int i = 0; i < flowLayout->count(); ++i) {
-        if (QLayoutItem *item = flowLayout->itemAt(i)) {
-            if (QWidget *widget = item->widget()) {
-                widget->setMinimumSize(maxSize);
-            }
+        QLayoutItem *item = flowLayout->itemAt(i);
+        if (item && item->widget()) {
+            item->widget()->setMinimumSize(maxSize);
         }
     }
 }
@@ -180,6 +207,66 @@ QLayoutItem *FlowWidget::itemAt(int index) const
     return flowLayout->itemAt(index);
 }
 
+void FlowWidget::keyPressEvent(QKeyEvent *event)
+{
+    if (moveFocus(event)) {
+        event->accept();
+        return;
+    }
+    QWidget::keyPressEvent(event);
+}
+
+bool FlowWidget::eventFilter(QObject *watched, QEvent *event)
+{
+    if (event->type() == QEvent::KeyPress && moveFocus(static_cast<QKeyEvent *>(event))) {
+        return true;
+    }
+    return QWidget::eventFilter(watched, event);
+}
+
+bool FlowWidget::moveFocus(QKeyEvent *event)
+{
+    // Keyboard navigation between the flow items: arrow keys move focus just
+    // like clicking the sibling tiles would. Only items that can take keyboard
+    // focus (e.g. the deck-preview tiles in shared-deck links) are visited.
+    const bool moveForward = event->key() == Qt::Key_Right || event->key() == Qt::Key_Down;
+    const bool moveBackward = event->key() == Qt::Key_Left || event->key() == Qt::Key_Up;
+    if (!moveForward && !moveBackward) {
+        return false;
+    }
+
+    QList<QWidget *> focusableItems;
+    for (int i = 0; i < flowLayout->count(); ++i) {
+        QWidget *item = flowLayout->itemAt(i)->widget();
+        if (item != nullptr && (item->focusPolicy() & Qt::TabFocus)) {
+            focusableItems.append(item);
+        }
+    }
+
+    if (focusableItems.isEmpty()) {
+        return false;
+    }
+
+    int currentIndex = -1;
+    for (int i = 0; i < focusableItems.size(); ++i) {
+        if (focusableItems.at(i)->hasFocus()) {
+            currentIndex = i;
+            break;
+        }
+    }
+
+    const int delta = moveForward ? 1 : -1;
+    int nextIndex;
+    if (currentIndex < 0) {
+        nextIndex = moveForward ? 0 : focusableItems.size() - 1;
+    } else {
+        nextIndex = (currentIndex + delta + focusableItems.size()) % focusableItems.size();
+    }
+    focusableItems.value(nextIndex)->setFocus();
+    event->accept();
+    return true;
+}
+
 int FlowWidget::count() const
 {
     return flowLayout->count();
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 d9fa49937..dbf33d07f 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h
+++ b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h
@@ -1,22 +1,29 @@
 /**
  * @file flow_widget.h
  * @ingroup UI
- * @brief TODO: Document this.
+ * @brief A QWidget that wraps a FlowLayout inside an optional QScrollArea.
  */
+//! \todo Document this file.
 
 #ifndef FLOW_WIDGET_H
 #define FLOW_WIDGET_H
-#include "../../../layouts/flow_layout.h"
 
-#include <QHBoxLayout>
 #include <QLoggingCategory>
 #include <QWidget>
-#include <qscrollarea.h>
+#include <qlogging.h>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class FlowLayout;
+class QHBoxLayout;
+class QKeyEvent;
+class QLayoutItem;
+class QScrollArea;
 
 inline Q_LOGGING_CATEGORY(FlowWidgetLog, "flow_widget", QtInfoMsg);
 inline Q_LOGGING_CATEGORY(FlowWidgetSizeLog, "flow_widget.size", QtInfoMsg);
 
-class FlowWidget final : public QWidget
+class FlowWidget : public QWidget
 {
     Q_OBJECT
 
@@ -25,26 +32,36 @@ public:
                Qt::Orientation orientation,
                Qt::ScrollBarPolicy horizontalPolicy,
                Qt::ScrollBarPolicy verticalPolicy);
-    void addWidget(QWidget *widget_to_add) const;
+
+    void addWidget(QWidget *widget_to_add);
+    void addNavigableWidget(QWidget *widget_to_add);
     void insertWidgetAtIndex(QWidget *toInsert, int index);
     void removeWidget(QWidget *widgetToRemove) const;
     void clearLayout();
+
     [[nodiscard]] int count() const;
     [[nodiscard]] QLayoutItem *itemAt(int index) const;
 
-    QScrollArea *scrollArea;
+    QScrollArea *scrollArea; ///< Null when both scroll policies are AlwaysOff.
 
 public slots:
     void setMinimumSizeToMaxSizeHint();
+    void setSpacing(int hSpacing, int vSpacing);
 
 protected:
+    bool eventFilter(QObject *watched, QEvent *event) override;
     void resizeEvent(QResizeEvent *event) override;
+    void keyPressEvent(QKeyEvent *event) override;
 
 private:
+    /// @brief Moves keyboard focus to an adjacent flow item for an arrow-key event.
+    /// @return True when the event was an arrow key and was handled.
+    bool moveFocus(QKeyEvent *event);
+
     Qt::Orientation flowDirection;
     QHBoxLayout *mainLayout;
     FlowLayout *flowLayout;
     QWidget *container;
 };
 
-#endif // FLOW_WIDGET_H
+#endif // FLOW_WIDGET_H
\ No newline at end of file
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 2fd6cd6b8..8cfe190e2 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,7 +1,11 @@
 #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,
@@ -33,7 +37,7 @@ OverlapControlWidget::OverlapControlWidget(int overlapPercentage,
     layout->addWidget(overlap_percentage_input);
     layout->addWidget(overlap_direction);
 
-    // TODO probably connect this to the parent
+    //! \todo Probably connect this to the parent.
     // connect(card_size_slider, &QSlider::valueChanged, display, &CardPicture::setScaleFactor);
 }
 
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 b2c19a07f..c5639110f 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
@@ -1,17 +1,19 @@
 /**
  * @file overlap_control_widget.h
  * @ingroup UI
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef OVERLAP_CONTROL_WIDGET_H
 #define OVERLAP_CONTROL_WIDGET_H
-#include "../display/labeled_input.h"
-#include "overlap_widget.h"
-
-#include <QHBoxLayout>
-#include <QSlider>
 #include <QWidget>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class LabeledInput;
+class OverlapWidget;
+class QHBoxLayout;
+class QSlider;
 
 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 1c4ee30ab..03240211c 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/flow_layout.h"
+#include "../../../layouts/overlap_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 9ac6ac80e..c103c5f80 100644
--- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h
+++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.h
@@ -1,15 +1,18 @@
 /**
  * @file overlap_widget.h
  * @ingroup UI
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef OVERLAP_WIDGET_H
 #define OVERLAP_WIDGET_H
 
-#include "../../../layouts/overlap_layout.h"
-
+#include <QString>
 #include <QWidget>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class OverlapLayout;
 
 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 23d19abbb..b0503ec22 100644
--- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
+++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp
@@ -2,8 +2,14 @@
 
 #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);
@@ -27,6 +33,9 @@ DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), d
     aSaveDeckAs = new QAction(QString(), this);
     connect(aSaveDeckAs, &QAction::triggered, deckEditor, &AbstractTabDeckEditor::actSaveDeckAs);
 
+    aShareDeck = new QAction(QString(), this);
+    connect(aShareDeck, &QAction::triggered, deckEditor, &AbstractTabDeckEditor::actShareDeck);
+
     aLoadDeckFromClipboard = new QAction(QString(), this);
     connect(aLoadDeckFromClipboard, &QAction::triggered, deckEditor, &AbstractTabDeckEditor::actLoadDeckFromClipboard);
 
@@ -95,6 +104,7 @@ DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), d
     addMenu(loadRecentDeckMenu);
     addAction(aSaveDeck);
     addAction(aSaveDeckAs);
+    addAction(aShareDeck);
     addSeparator();
     addAction(aLoadDeckFromClipboard);
     addMenu(editDeckInClipboardMenu);
@@ -119,6 +129,7 @@ void DeckEditorMenu::setSaveStatus(bool newStatus)
 {
     aSaveDeck->setEnabled(newStatus);
     aSaveDeckAs->setEnabled(newStatus);
+    aShareDeck->setEnabled(newStatus);
     aSaveDeckToClipboard->setEnabled(newStatus);
     aSaveDeckToClipboardNoSetInfo->setEnabled(newStatus);
     aSaveDeckToClipboardRaw->setEnabled(newStatus);
@@ -156,6 +167,7 @@ void DeckEditorMenu::retranslateUi()
     aClearRecents->setText(tr("Clear"));
     aSaveDeck->setText(tr("&Save deck"));
     aSaveDeckAs->setText(tr("Save deck &as..."));
+    aShareDeck->setText(tr("Share deck..."));
 
     aLoadDeckFromClipboard->setText(tr("Load deck from cl&ipboard..."));
 
@@ -193,6 +205,8 @@ void DeckEditorMenu::refreshShortcuts()
     aEditDeckInClipboardRaw->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aEditDeckInClipboardRaw"));
     aPrintDeck->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aPrintDeck"));
 
+    aLoadDeckFromWebsite->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aLoadDeckFromWebsite"));
+
     aExportDeckDecklist->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aExportDeckDecklist"));
     aExportDeckDecklistXyz->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aExportDeckDecklistXyz"));
     aAnalyzeDeckDeckstats->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aAnalyzeDeck"));
diff --git a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h
index ac8f3b787..904fbb6f4 100644
--- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h
+++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h
@@ -1,15 +1,18 @@
 /**
  * @file deck_editor_menu.h
  * @ingroup DeckEditors
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DECK_EDITOR_MENU_H
 #define DECK_EDITOR_MENU_H
 
 #include <QMenu>
+#include <qtmetamacros.h>
 
 class AbstractTabDeckEditor;
+class QAction;
+
 class DeckEditorMenu : public QMenu
 {
     Q_OBJECT
@@ -21,7 +24,8 @@ public:
     QAction *aNewDeck, *aLoadDeck, *aClearRecents, *aSaveDeck, *aSaveDeckAs, *aLoadDeckFromClipboard,
         *aEditDeckInClipboard, *aEditDeckInClipboardRaw, *aSaveDeckToClipboard, *aSaveDeckToClipboardNoSetInfo,
         *aSaveDeckToClipboardRaw, *aSaveDeckToClipboardRawNoSetInfo, *aPrintDeck, *aLoadDeckFromWebsite,
-        *aExportDeckDecklist, *aExportDeckDecklistXyz, *aAnalyzeDeckDeckstats, *aAnalyzeDeckTappedout, *aClose;
+        *aExportDeckDecklist, *aExportDeckDecklistXyz, *aAnalyzeDeckDeckstats, *aAnalyzeDeckTappedout, *aShareDeck,
+        *aClose;
     QMenu *loadRecentDeckMenu, *analyzeDeckMenu, *editDeckInClipboardMenu, *saveDeckToClipboardMenu;
 
     void setSaveStatus(bool newStatus);
diff --git a/cockatrice/src/interface/widgets/menus/tearoff_menu.h b/cockatrice/src/interface/widgets/menus/tearoff_menu.h
index 3e6c47012..9a9c4ff01 100644
--- a/cockatrice/src/interface/widgets/menus/tearoff_menu.h
+++ b/cockatrice/src/interface/widgets/menus/tearoff_menu.h
@@ -1,30 +1,31 @@
 /**
  * @file tearoff_menu.h
  * @ingroup GameMenus
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #pragma once
 
 #include "../../../client/settings/cache_settings.h"
 
 #include <QMenu>
+#include <libcockatrice/settings/interface_settings.h>
 
 class TearOffMenu : public QMenu
 {
 public:
     explicit TearOffMenu(const QString &title, QWidget *parent = nullptr) : QMenu(title, parent)
     {
-        connect(&SettingsCache::instance(), &SettingsCache::useTearOffMenusChanged, this,
+        connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::useTearOffMenusChanged, this,
                 [this](const bool state) { setTearOffEnabled(state); });
-        setTearOffEnabled(SettingsCache::instance().getUseTearOffMenus());
+        setTearOffEnabled(SettingsCache::instance().userInterface().getUseTearOffMenus());
     }
 
     explicit TearOffMenu(QWidget *parent = nullptr) : QMenu(parent)
     {
-        connect(&SettingsCache::instance(), &SettingsCache::useTearOffMenusChanged, this,
+        connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::useTearOffMenusChanged, this,
                 [this](const bool state) { setTearOffEnabled(state); });
-        setTearOffEnabled(SettingsCache::instance().getUseTearOffMenus());
+        setTearOffEnabled(SettingsCache::instance().userInterface().getUseTearOffMenus());
     }
 
     TearOffMenu *addTearOffMenu(const QString &title)
diff --git a/cockatrice/src/interface/widgets/onboarding/banner_shader_config.h b/cockatrice/src/interface/widgets/onboarding/banner_shader_config.h
new file mode 100644
index 000000000..6008044ff
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/banner_shader_config.h
@@ -0,0 +1,313 @@
+#ifndef BANNER_SHADER_CONFIG_H
+#define BANNER_SHADER_CONFIG_H
+
+#include <QColor>
+#include <QObject>
+
+/**
+ * Uniform values fed to brand_banner.frag, exposed to QML as the
+ * "bannerConfig" context property.
+ *
+ * Two independent "banks" (A/B) each carry their own mode/speed/seed so
+ * BrandBanner.qml can render both simultaneously and crossfade between
+ * them via opacity -- see frontIsA. The shared palette (colorA/colorB/
+ * accent) and clock (time/aspect) apply to both banks identically, since
+ * only the foreground motif changes between onboarding pages, never the
+ * brand palette.
+ *
+ * Deliberately plain `property` (not `required property`) on the QML side
+ * -- a required-property shadowing bug bit the home-screen particle
+ * background before, and there's no reason to reintroduce that risk here.
+ */
+class BannerShaderConfig : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal time READ time WRITE setTime NOTIFY timeChanged)
+    Q_PROPERTY(qreal aspect READ aspect WRITE setAspect NOTIFY aspectChanged)
+
+    Q_PROPERTY(qreal modeA READ modeA WRITE setModeA NOTIFY modeAChanged)
+    Q_PROPERTY(qreal speedA READ speedA WRITE setSpeedA NOTIFY speedAChanged)
+    Q_PROPERTY(qreal seedA READ seedA WRITE setSeedA NOTIFY seedAChanged)
+
+    Q_PROPERTY(qreal modeB READ modeB WRITE setModeB NOTIFY modeBChanged)
+    Q_PROPERTY(qreal speedB READ speedB WRITE setSpeedB NOTIFY speedBChanged)
+    Q_PROPERTY(qreal seedB READ seedB WRITE setSeedB NOTIFY seedBChanged)
+
+    Q_PROPERTY(bool frontIsA READ frontIsA WRITE setFrontIsA NOTIFY frontIsAChanged)
+
+    Q_PROPERTY(QColor colorA READ colorA WRITE setColorA NOTIFY colorAChanged)
+    Q_PROPERTY(QColor colorB READ colorB WRITE setColorB NOTIFY colorBChanged)
+    Q_PROPERTY(QColor accent READ accent WRITE setAccent NOTIFY accentChanged)
+    Q_PROPERTY(QColor glowColor READ glowColor WRITE setGlowColor NOTIFY glowColorChanged)
+    Q_PROPERTY(QColor brandStrong READ brandStrong WRITE setBrandStrong NOTIFY brandStrongChanged)
+    Q_PROPERTY(QColor brandSoft READ brandSoft WRITE setBrandSoft NOTIFY brandSoftChanged)
+    Q_PROPERTY(qreal vignetteMin READ vignetteMin WRITE setVignetteMin NOTIFY vignetteMinChanged)
+
+    Q_PROPERTY(bool logoVisible READ logoVisible WRITE setLogoVisible NOTIFY logoVisibleChanged)
+    Q_PROPERTY(qreal logoGlow READ logoGlow WRITE setLogoGlow NOTIFY logoGlowChanged)
+
+public:
+    explicit BannerShaderConfig(QObject *parent = nullptr) : QObject(parent)
+    {
+    }
+
+    qreal time() const
+    {
+        return m_time;
+    }
+    void setTime(qreal v)
+    {
+        if (v != m_time) {
+            m_time = v;
+            emit timeChanged();
+        }
+    }
+
+    qreal aspect() const
+    {
+        return m_aspect;
+    }
+    void setAspect(qreal v)
+    {
+        if (v != m_aspect) {
+            m_aspect = v;
+            emit aspectChanged();
+        }
+    }
+
+    qreal modeA() const
+    {
+        return m_modeA;
+    }
+    void setModeA(qreal v)
+    {
+        if (v != m_modeA) {
+            m_modeA = v;
+            emit modeAChanged();
+        }
+    }
+    qreal speedA() const
+    {
+        return m_speedA;
+    }
+    void setSpeedA(qreal v)
+    {
+        if (v != m_speedA) {
+            m_speedA = v;
+            emit speedAChanged();
+        }
+    }
+    qreal seedA() const
+    {
+        return m_seedA;
+    }
+    void setSeedA(qreal v)
+    {
+        if (v != m_seedA) {
+            m_seedA = v;
+            emit seedAChanged();
+        }
+    }
+
+    qreal modeB() const
+    {
+        return m_modeB;
+    }
+    void setModeB(qreal v)
+    {
+        if (v != m_modeB) {
+            m_modeB = v;
+            emit modeBChanged();
+        }
+    }
+    qreal speedB() const
+    {
+        return m_speedB;
+    }
+    void setSpeedB(qreal v)
+    {
+        if (v != m_speedB) {
+            m_speedB = v;
+            emit speedBChanged();
+        }
+    }
+    qreal seedB() const
+    {
+        return m_seedB;
+    }
+    void setSeedB(qreal v)
+    {
+        if (v != m_seedB) {
+            m_seedB = v;
+            emit seedBChanged();
+        }
+    }
+
+    bool frontIsA() const
+    {
+        return m_frontIsA;
+    }
+    void setFrontIsA(bool v)
+    {
+        if (v != m_frontIsA) {
+            m_frontIsA = v;
+            emit frontIsAChanged();
+        }
+    }
+
+    QColor colorA() const
+    {
+        return m_colorA;
+    }
+    void setColorA(const QColor &c)
+    {
+        if (c != m_colorA) {
+            m_colorA = c;
+            emit colorAChanged();
+        }
+    }
+    QColor colorB() const
+    {
+        return m_colorB;
+    }
+    void setColorB(const QColor &c)
+    {
+        if (c != m_colorB) {
+            m_colorB = c;
+            emit colorBChanged();
+        }
+    }
+    QColor accent() const
+    {
+        return m_accent;
+    }
+    void setAccent(const QColor &c)
+    {
+        if (c != m_accent) {
+            m_accent = c;
+            emit accentChanged();
+        }
+    }
+
+    QColor glowColor() const
+    {
+        return m_glowColor;
+    }
+    void setGlowColor(const QColor &c)
+    {
+        if (c != m_glowColor) {
+            m_glowColor = c;
+            emit glowColorChanged();
+        }
+    }
+
+    QColor brandStrong() const
+    {
+        return m_brandStrong;
+    }
+    void setBrandStrong(const QColor &c)
+    {
+        if (c != m_brandStrong) {
+            m_brandStrong = c;
+            emit brandStrongChanged();
+        }
+    }
+
+    QColor brandSoft() const
+    {
+        return m_brandSoft;
+    }
+    void setBrandSoft(const QColor &c)
+    {
+        if (c != m_brandSoft) {
+            m_brandSoft = c;
+            emit brandSoftChanged();
+        }
+    }
+
+    qreal vignetteMin() const
+    {
+        return m_vignetteMin;
+    }
+    void setVignetteMin(qreal v)
+    {
+        if (v != m_vignetteMin) {
+            m_vignetteMin = v;
+            emit vignetteMinChanged();
+        }
+    }
+
+    bool logoVisible() const
+    {
+        return m_logoVisible;
+    }
+    void setLogoVisible(bool v)
+    {
+        if (v != m_logoVisible) {
+            m_logoVisible = v;
+            emit logoVisibleChanged();
+        }
+    }
+
+    qreal logoGlow() const
+    {
+        return m_logoGlow;
+    }
+    void setLogoGlow(qreal v)
+    {
+        if (v != m_logoGlow) {
+            m_logoGlow = v;
+            emit logoGlowChanged();
+        }
+    }
+
+signals:
+    void timeChanged();
+    void aspectChanged();
+    void modeAChanged();
+    void speedAChanged();
+    void seedAChanged();
+    void modeBChanged();
+    void speedBChanged();
+    void seedBChanged();
+    void frontIsAChanged();
+    void colorAChanged();
+    void colorBChanged();
+    void accentChanged();
+    void glowColorChanged();
+    void brandStrongChanged();
+    void brandSoftChanged();
+    void vignetteMinChanged();
+    void logoVisibleChanged();
+    void logoGlowChanged();
+
+private:
+    qreal m_time = 0.0;
+    qreal m_aspect = 16.0 / 9.0;
+
+    qreal m_modeA = 0.0;
+    qreal m_speedA = 1.0;
+    qreal m_seedA = 0.0;
+
+    qreal m_modeB = 0.0;
+    qreal m_speedB = 1.0;
+    qreal m_seedB = 0.0;
+
+    bool m_frontIsA = true;
+
+    // Curated fallback seed values -- BannerHost overwrites these with
+    // palette-derived colours (see shader_banner_widget.cpp) before the first
+    // paint, so they only matter as a safe pre-first-apply default.
+    QColor m_colorA{0x1A, 0x1A, 0x20};
+    QColor m_colorB{0x0E, 0x0E, 0x12};
+    QColor m_accent{0x8B, 0xDD, 0x6B};
+    QColor m_glowColor{Qt::white};
+    QColor m_brandStrong{0x13, 0x97, 0x40};
+    QColor m_brandSoft{0xC9, 0xFD, 0x62};
+    qreal m_vignetteMin = 0.62;
+
+    bool m_logoVisible = false;
+    qreal m_logoGlow = 1.0;
+};
+
+#endif // BANNER_SHADER_CONFIG_H
diff --git a/cockatrice/src/interface/widgets/onboarding/brand_colors.h b/cockatrice/src/interface/widgets/onboarding/brand_colors.h
new file mode 100644
index 000000000..bf173270b
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/brand_colors.h
@@ -0,0 +1,15 @@
+#ifndef BRAND_COLORS_H
+#define BRAND_COLORS_H
+
+#include <QColor>
+
+/** @brief Cockatrice brand green.
+ *
+ * Single source of truth for the onboarding brand accent: it backs the
+ * banner's shader-accent uniform as the curated fallback when the active
+ * palette resolves no usable Highlight, and it preseads the wizard's
+ * QuickSetupPanel so a freshly generated palette keeps the brand identity
+ * until the user picks their own look. */
+inline const QColor kCockatriceBrandGreen(0x8B, 0xDD, 0x6B);
+
+#endif // BRAND_COLORS_H
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp
new file mode 100644
index 000000000..426811ec2
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp
@@ -0,0 +1,228 @@
+#include "first_run_wizard.h"
+
+#include "first_run_wizard_page.h"
+#include "pages/account_setup_page.h"
+#include "pages/card_database_setup_page.h"
+#include "pages/finish_page.h"
+#include "pages/preferences_setup_page.h"
+#include "pages/theme_setup_page.h"
+#include "pages/welcome_page.h"
+#include "shader_banner_widget.h"
+#include "step_indicator_widget.h"
+
+#include <QEvent>
+#include <QFont>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QStackedWidget>
+#include <QVBoxLayout>
+#include <qnamespace.h>
+#include <utility>
+
+class QWidget;
+
+FirstRunWizard::FirstRunWizard(QWidget *parent) : QDialog(parent)
+{
+    setWindowFlag(Qt::WindowContextHelpButtonHint, false);
+    setMinimumSize(640, 490);
+    resize(720, 550);
+
+    bannerHost = new BannerHost(this);
+
+    titleLabel = new QLabel(this);
+    QFont titleFont = titleLabel->font();
+    titleFont.setPointSizeF(titleFont.pointSizeF() * 1.4);
+    titleFont.setBold(true);
+    titleLabel->setFont(titleFont);
+
+    subtitleLabel = new QLabel(this);
+    subtitleLabel->setWordWrap(true);
+
+    stack = new QStackedWidget(this);
+    stepIndicator = new StepIndicatorWidget(this);
+
+    backButton = new QPushButton(this);
+    skipButton = new QPushButton(this);
+    nextButton = new QPushButton(this);
+    nextButton->setDefault(true);
+
+    connect(backButton, &QPushButton::clicked, this, &FirstRunWizard::goBack);
+    connect(skipButton, &QPushButton::clicked, this, &FirstRunWizard::skip);
+    connect(nextButton, &QPushButton::clicked, this, &FirstRunWizard::goNext);
+
+    auto *headerLayout = new QVBoxLayout;
+    headerLayout->setContentsMargins(0, 0, 0, 0);
+    headerLayout->addWidget(bannerHost);
+    headerLayout->addSpacing(12);
+    headerLayout->addWidget(titleLabel);
+    headerLayout->addWidget(subtitleLabel);
+
+    auto *navLayout = new QHBoxLayout;
+    navLayout->addWidget(backButton);
+    navLayout->addWidget(skipButton);
+    navLayout->addStretch();
+    navLayout->addWidget(stepIndicator);
+    navLayout->addStretch();
+    navLayout->addWidget(nextButton);
+
+    auto *root = new QVBoxLayout(this);
+    root->addLayout(headerLayout);
+    root->addSpacing(8);
+    root->addWidget(stack, 1);
+    root->addSpacing(8);
+    root->addLayout(navLayout);
+
+    auto *welcome = new WelcomePage(this);
+    auto *cardDb = new CardDatabaseSetupPage(this);
+    auto *theme = new ThemeSetupPage(this);
+    auto *account = new AccountSetupPage(this);
+    auto *prefs = new PreferencesSetupPage(this);
+    auto *finishPg = new FinishPage(this);
+
+    cardDatabasePage = cardDb;
+
+    connect(cardDb, &CardDatabaseSetupPage::updateRequested, this, &FirstRunWizard::cardDatabaseUpdateRequested);
+    connect(cardDb, &CardDatabaseSetupPage::manualSetupRequested, this,
+            &FirstRunWizard::manualCardDatabaseSetupRequested);
+    connect(account, &AccountSetupPage::registerRequested, this, &FirstRunWizard::registerRequested);
+    connect(account, &AccountSetupPage::connectRequested, this, &FirstRunWizard::connectRequested);
+
+    connect(cardDb, &CardDatabaseSetupPage::advanceRequested, this, [this] {
+        if (stack->currentWidget() == cardDatabasePage) {
+            showPage(currentIndex + 1);
+        }
+    });
+
+    addPage(welcome);
+    addPage(cardDb);
+    addPage(theme);
+    addPage(account);
+    addPage(prefs);
+    addPage(finishPg);
+
+    stepIndicator->setStepCount(pages.count());
+    retranslateUi();
+    showPage(0);
+}
+
+void FirstRunWizard::addPage(FirstRunWizardPage *page)
+{
+    pages.append(page);
+    stack->addWidget(page);
+    connect(page, &FirstRunWizardPage::completeChanged, this, &FirstRunWizard::updateChrome);
+}
+
+void FirstRunWizard::showPage(int index)
+{
+    if (index < 0 || index >= pages.count()) {
+        return;
+    }
+    currentIndex = index;
+    stack->setCurrentIndex(index);
+    pages[index]->initializePage();
+    stepIndicator->setCurrentStep(index);
+    static const QList<BannerHost::Motif> motifs = {
+        BannerHost::Motif::Welcome, BannerHost::Motif::CardDatabase, BannerHost::Motif::Theming,
+        BannerHost::Motif::Account, BannerHost::Motif::Preferences,  BannerHost::Motif::Finish,
+    };
+    if (index < motifs.size()) {
+        bannerHost->setMotif(motifs[index]);
+    }
+    titleLabel->setText(pages[index]->stepTitle());
+    subtitleLabel->setText(pages[index]->stepSubtitle());
+    subtitleLabel->setVisible(!pages[index]->stepSubtitle().isEmpty());
+    updateChrome();
+}
+
+void FirstRunWizard::updateChrome()
+{
+    if (currentIndex < 0) {
+        return;
+    }
+    FirstRunWizardPage *page = pages[currentIndex];
+    const bool isLast = (currentIndex == pages.count() - 1);
+
+    backButton->setVisible(currentIndex > 0);
+    skipButton->setVisible(page->isSkippable());
+    nextButton->setEnabled(page->isComplete());
+
+    QString customText = page->nextButtonText();
+    if (!customText.isEmpty()) {
+        nextButton->setText(customText);
+    } else {
+        nextButton->setText(isLast ? tr("Finish") : tr("Next"));
+    }
+}
+
+void FirstRunWizard::goNext()
+{
+    FirstRunWizardPage *page = pages[currentIndex];
+    if (!page->validatePage() || !page->handleNextClick()) {
+        return;
+    }
+    if (currentIndex == pages.count() - 1) {
+        finish();
+        return;
+    }
+    showPage(currentIndex + 1);
+}
+
+void FirstRunWizard::goBack()
+{
+    showPage(currentIndex - 1);
+}
+
+void FirstRunWizard::skip()
+{
+    showPage(currentIndex + 1);
+}
+
+void FirstRunWizard::onCardDatabaseUpdateFinished(bool success)
+{
+    if (cardDatabasePage) {
+        cardDatabasePage->onUpdateFinished(success);
+    }
+}
+
+void FirstRunWizard::onCardDatabaseUpdateProgress(const CardUpdateProgress &progress)
+{
+    if (cardDatabasePage) {
+        cardDatabasePage->onUpdateProgress(progress);
+    }
+}
+
+void FirstRunWizard::finish()
+{
+    accept();
+}
+
+void FirstRunWizard::closeEvent(QCloseEvent *event)
+{
+    // Every step persists its own choice as it's made, so closing early
+    // isn't destructive -- treat it exactly like reaching the end.
+    QDialog::closeEvent(event);
+}
+
+void FirstRunWizard::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::LanguageChange) {
+        retranslateUi();
+    }
+    QDialog::changeEvent(event);
+}
+
+void FirstRunWizard::retranslateUi()
+{
+    setWindowTitle(tr("Welcome to Cockatrice"));
+    backButton->setText(tr("Back"));
+    skipButton->setText(tr("Skip"));
+    for (FirstRunWizardPage *page : std::as_const(pages)) {
+        page->retranslateUi();
+    }
+    if (currentIndex >= 0) {
+        titleLabel->setText(pages[currentIndex]->stepTitle());
+        subtitleLabel->setText(pages[currentIndex]->stepSubtitle());
+    }
+    updateChrome();
+}
diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h
new file mode 100644
index 000000000..812985a9f
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h
@@ -0,0 +1,80 @@
+#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;
+class StepIndicatorWidget;
+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.
+ *
+ * Deliberately ignorant of network/registration/download internals --
+ * pages that need them emit request signals for MainWindow to fulfill.
+ * Every choice is written to SettingsCache as it's made (via the pages
+ * themselves, same as AppearanceSettingsPage does), so "Skip" or closing
+ * the window never discards anything already confirmed. */
+class FirstRunWizard : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit FirstRunWizard(QWidget *parent = nullptr);
+
+signals:
+    void registerRequested();
+    void connectRequested();
+    void cardDatabaseUpdateRequested();
+    void manualCardDatabaseSetupRequested();
+
+public slots:
+    /** @brief Forwarded from MainWindow once the background card database update process exits. */
+    void onCardDatabaseUpdateFinished(bool success);
+
+    /** @brief Forwarded from MainWindow while the background card database update process runs. */
+    void onCardDatabaseUpdateProgress(const CardUpdateProgress &progress);
+
+protected:
+    void closeEvent(QCloseEvent *event) override;
+    void changeEvent(QEvent *event) override;
+
+private slots:
+    void goNext();
+    void goBack();
+    void skip();
+    void updateChrome();
+
+private:
+    void addPage(FirstRunWizardPage *page);
+    void showPage(int index);
+    void retranslateUi();
+    void finish();
+
+    QStackedWidget *stack;
+    StepIndicatorWidget *stepIndicator;
+    BannerHost *bannerHost;
+    QLabel *titleLabel;
+    QLabel *subtitleLabel;
+    QPushButton *backButton;
+    QPushButton *skipButton;
+    QPushButton *nextButton;
+
+    CardDatabaseSetupPage *cardDatabasePage = nullptr;
+
+    QList<FirstRunWizardPage *> pages;
+    int currentIndex = -1;
+};
+
+#endif // FIRST_RUN_WIZARD_H
diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard_page.cpp b/cockatrice/src/interface/widgets/onboarding/first_run_wizard_page.cpp
new file mode 100644
index 000000000..6da8958f2
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard_page.cpp
@@ -0,0 +1 @@
+#include "first_run_wizard_page.h"
diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard_page.h b/cockatrice/src/interface/widgets/onboarding/first_run_wizard_page.h
new file mode 100644
index 000000000..e7b818810
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard_page.h
@@ -0,0 +1,77 @@
+#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.
+ *
+ * QWidget-based rather than QWizardPage-based: FirstRunWizard is a
+ * QDialog + QStackedWidget shell (not a QWizard) so it can own the
+ * banner/step-dot chrome that QWizard's native styles don't give us
+ * consistent control over. Naming mirrors OracleWizardPage for
+ * familiarity only -- the two hierarchies are unrelated. */
+class FirstRunWizardPage : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit FirstRunWizardPage(QWidget *parent = nullptr) : QWidget(parent)
+    {
+    }
+
+    /** @brief Called every time the page becomes visible, including navigating back to it. */
+    virtual void initializePage()
+    {
+    }
+
+    /** @brief Called before advancing past this page. Return false to block navigation;
+        the page itself is responsible for telling the user why. */
+    virtual bool validatePage()
+    {
+        return true;
+    }
+
+    /** @brief Whether Next/Finish should currently be enabled. Pages doing async work
+        can flip this mid-step; emit completeChanged() when they do. */
+    virtual bool isComplete() const
+    {
+        return true;
+    }
+
+    /** @brief Whether the wizard's "Skip" button should be offered on this page. */
+    virtual bool isSkippable() const
+    {
+        return false;
+    }
+
+    virtual QString stepTitle() const = 0;
+    virtual QString stepSubtitle() const
+    {
+        return {};
+    }
+
+    /** @brief Override to replace the "Next"/"Finish" button text on this page.
+        Return an empty string to use the default label. */
+    virtual QString nextButtonText() const
+    {
+        return {};
+    }
+
+    /** @brief Called when the user presses the Next button. Return true to allow
+        advancing to the next page, false to stay on this page (e.g. to
+        trigger an async action first). */
+    virtual bool handleNextClick()
+    {
+        return true;
+    }
+
+    virtual void retranslateUi() = 0;
+
+signals:
+    void completeChanged();
+    void advanceRequested();
+};
+
+#endif // FIRST_RUN_WIZARD_PAGE_H
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.cpp
new file mode 100644
index 000000000..16a1d2254
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.cpp
@@ -0,0 +1,62 @@
+#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)
+{
+    bodyLabel = new QLabel(this);
+    bodyLabel->setWordWrap(true);
+    bodyLabel->setAlignment(Qt::AlignCenter);
+
+    registerButton = new QPushButton(this);
+    connectButton = new QPushButton(this);
+    skipHintLabel = new QLabel(this);
+    skipHintLabel->setWordWrap(true);
+    skipHintLabel->setAlignment(Qt::AlignCenter);
+
+    connect(registerButton, &QPushButton::clicked, this, &AccountSetupPage::registerRequested);
+    connect(connectButton, &QPushButton::clicked, this, &AccountSetupPage::connectRequested);
+
+    auto *layout = new QVBoxLayout(this);
+    layout->addStretch();
+    layout->addWidget(bodyLabel);
+    layout->addSpacing(16);
+    layout->addWidget(registerButton, 0, Qt::AlignHCenter);
+    layout->addWidget(connectButton, 0, Qt::AlignHCenter);
+    layout->addSpacing(16);
+    layout->addWidget(skipHintLabel);
+    layout->addStretch();
+
+    retranslateUi();
+}
+
+bool AccountSetupPage::isSkippable() const
+{
+    return true;
+}
+
+QString AccountSetupPage::stepTitle() const
+{
+    return tr("Join a Server");
+}
+
+QString AccountSetupPage::stepSubtitle() const
+{
+    return tr("Optional — you can always do this later from the menu.");
+}
+
+void AccountSetupPage::retranslateUi()
+{
+    bodyLabel->setText(tr("Playing online needs a server account."));
+    registerButton->setText(tr("Register a new account…"));
+    connectButton->setText(tr("I already have one — Connect…"));
+    skipHintLabel->setText(tr("Just want to play locally? Skip this and connect whenever you're ready."));
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.h b/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.h
new file mode 100644
index 000000000..344b4e41a
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/pages/account_setup_page.h
@@ -0,0 +1,41 @@
+#ifndef ACCOUNT_SETUP_PAGE_H
+#define ACCOUNT_SETUP_PAGE_H
+
+#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
+ *         this wizard has no visibility into. Reimplementing the fields here
+ *         without that wiring would look functional and silently do nothing --
+ *         worse than reuse. So: a friendly landing spot that opens the *existing*
+ *         DlgRegister / connect flow via signals FirstRunWizard forwards. */
+class AccountSetupPage : public FirstRunWizardPage
+{
+    Q_OBJECT
+
+public:
+    explicit AccountSetupPage(QWidget *parent = nullptr);
+
+    bool isSkippable() const override;
+    QString stepTitle() const override;
+    QString stepSubtitle() const override;
+    void retranslateUi() override;
+
+signals:
+    void registerRequested();
+    void connectRequested();
+
+private:
+    QLabel *bodyLabel;
+    QPushButton *registerButton;
+    QPushButton *connectButton;
+    QLabel *skipHintLabel;
+};
+
+#endif // ACCOUNT_SETUP_PAGE_H
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
new file mode 100644
index 000000000..cb53a25f3
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.cpp
@@ -0,0 +1,350 @@
+#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)
+{
+    statusLabel = new QLabel(this);
+    statusLabel->setWordWrap(true);
+    statusLabel->setAlignment(Qt::AlignCenter);
+
+    progressBar = new QProgressBar(this);
+    progressBar->setRange(0, 0);
+    progressBar->setTextVisible(false);
+    progressBar->setFixedWidth(280);
+
+    retryButton = new QPushButton(this);
+    manualButton = new QPushButton(this);
+
+    connect(retryButton, &QPushButton::clicked, this, [this] {
+        setState(State::Running);
+        emit updateRequested();
+    });
+    connect(manualButton, &QPushButton::clicked, this, &CardDatabaseSetupPage::manualSetupRequested);
+
+    // ── Advanced: custom download source ───────────────────────────────
+    advancedToggleButton = new QPushButton(this);
+    advancedToggleButton->setCheckable(true);
+    advancedToggleButton->setChecked(false);
+    advancedToggleButton->setFlat(true);
+    advancedToggleButton->setStyleSheet("QPushButton { text-align: left; padding: 5px 12px; font-weight: bold; }"
+                                        "QPushButton:checked { }");
+
+    advancedPanel = new QWidget(this);
+    advancedPanel->setVisible(false);
+
+    urlLineEdit = new QLineEdit(advancedPanel);
+    urlHintLabel = new QLabel(advancedPanel);
+    urlHintLabel->setWordWrap(true);
+
+    restoreDefaultUrlButton = new QPushButton(advancedPanel);
+    applyAndRetryButton = new QPushButton(advancedPanel);
+
+    connect(advancedToggleButton, &QPushButton::toggled, this, &CardDatabaseSetupPage::onToggleAdvanced);
+    connect(restoreDefaultUrlButton, &QPushButton::clicked, this, &CardDatabaseSetupPage::onRestoreDefaultUrl);
+    connect(applyAndRetryButton, &QPushButton::clicked, this, &CardDatabaseSetupPage::onApplyCustomUrl);
+
+    auto *advancedButtonRow = new QHBoxLayout;
+    advancedButtonRow->addWidget(restoreDefaultUrlButton);
+    advancedButtonRow->addStretch();
+    advancedButtonRow->addWidget(applyAndRetryButton);
+
+    auto *advancedLayout = new QVBoxLayout(advancedPanel);
+    advancedLayout->setContentsMargins(12, 4, 12, 4);
+    advancedLayout->addWidget(urlLineEdit);
+    advancedLayout->addWidget(urlHintLabel);
+    advancedLayout->addLayout(advancedButtonRow);
+
+    // ── Startup card update check ───────────────────────────────────────
+    auto &upd = SettingsCache::instance().updates();
+
+    const auto updateBehavior = [this] {
+        auto &u = SettingsCache::instance().updates();
+        int idx = startupBehaviorCombo->currentIndex();
+        u.setStartupCardUpdateCheckPromptForUpdate(idx == 1);
+        u.setStartupCardUpdateCheckAlwaysUpdate(idx == 2);
+    };
+
+    startupBehaviorLabel = new QLabel(this);
+    startupBehaviorCombo = new QComboBox(this);
+    startupBehaviorCombo->addItem(QString()); // placeholder, filled in retranslateUi
+    startupBehaviorCombo->addItem(QString());
+    startupBehaviorCombo->addItem(QString());
+    if (upd.getStartupCardUpdateCheckPromptForUpdate()) {
+        startupBehaviorCombo->setCurrentIndex(1);
+    } else if (upd.getStartupCardUpdateCheckAlwaysUpdate()) {
+        startupBehaviorCombo->setCurrentIndex(2);
+    } else {
+        startupBehaviorCombo->setCurrentIndex(0);
+    }
+    connect(startupBehaviorCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, updateBehavior);
+
+    checkIntervalLabel = new QLabel(this);
+    checkIntervalSpinBox = new QSpinBox(this);
+    checkIntervalSpinBox->setMinimum(1);
+    checkIntervalSpinBox->setMaximum(30);
+    checkIntervalSpinBox->setValue(upd.getCardUpdateCheckInterval());
+    connect(checkIntervalSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), &upd,
+            &UpdatesSettings::setCardUpdateCheckInterval);
+
+    auto *checkGrid = new QGridLayout;
+    checkGrid->addWidget(startupBehaviorLabel, 0, 0);
+    checkGrid->addWidget(startupBehaviorCombo, 0, 1);
+    checkGrid->addWidget(checkIntervalLabel, 1, 0);
+    checkGrid->addWidget(checkIntervalSpinBox, 1, 1);
+
+    auto *layout = new QVBoxLayout(this);
+    layout->addStretch();
+    layout->addWidget(statusLabel);
+    layout->addSpacing(12);
+    layout->addWidget(progressBar, 0, Qt::AlignHCenter);
+    layout->addSpacing(12);
+    layout->addWidget(retryButton, 0, Qt::AlignHCenter);
+    layout->addWidget(manualButton, 0, Qt::AlignHCenter);
+    layout->addSpacing(16);
+    layout->addWidget(advancedToggleButton);
+    layout->addWidget(advancedPanel);
+    layout->addSpacing(8);
+    layout->addLayout(checkGrid);
+    layout->addStretch();
+
+    retranslateUi();
+}
+
+bool CardDatabaseSetupPage::alreadyHaveDatabase() const
+{
+    return CardDatabaseManager::getInstance()->getCardList().count() > 0;
+}
+
+QString CardDatabaseSetupPage::oracleSettingsFilePath() const
+{
+    return SettingsCache::instance().getSettingsPath() + "oracle.ini";
+}
+
+QString CardDatabaseSetupPage::readCustomUrl() const
+{
+    QSettings oracleSettings(oracleSettingsFilePath(), QSettings::IniFormat);
+    return oracleSettings.value("allsetsurl").toString();
+}
+
+void CardDatabaseSetupPage::writeCustomUrl(const QString &url)
+{
+    QSettings oracleSettings(oracleSettingsFilePath(), QSettings::IniFormat);
+    if (url.isEmpty()) {
+        oracleSettings.remove("allsetsurl");
+    } else {
+        oracleSettings.setValue("allsetsurl", url);
+    }
+}
+
+void CardDatabaseSetupPage::initializePage()
+{
+    urlLineEdit->setText(readCustomUrl());
+
+    if (state != State::NotStarted) {
+        return;
+    }
+
+    if (alreadyHaveDatabase()) {
+        setState(State::Succeeded);
+        return;
+    }
+
+    // Don't auto-download — wait for the user to press "Download".
+    setState(State::NotStarted);
+    statusLabel->setText(tr("Press Download to fetch the card database, or Skip to do it later."));
+}
+
+void CardDatabaseSetupPage::onUpdateFinished(bool success)
+{
+    setState(success ? State::Succeeded : State::Failed);
+    if (success) {
+        emit advanceRequested();
+    }
+}
+
+void CardDatabaseSetupPage::onUpdateProgress(const CardUpdateProgress &progress)
+{
+    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;
+        }
+    }
+}
+
+QString CardDatabaseSetupPage::nextButtonText() const
+{
+    return state == State::NotStarted ? tr("Download") : QString();
+}
+
+bool CardDatabaseSetupPage::handleNextClick()
+{
+    if (state == State::NotStarted) {
+        setState(State::Running);
+        emit updateRequested();
+        return false;
+    }
+    return true;
+}
+
+void CardDatabaseSetupPage::onToggleAdvanced(bool open)
+{
+    advancedToggleButton->setText(open ? tr("▼  Advanced: custom download source")
+                                       : tr("▶  Advanced: custom download source"));
+    advancedPanel->setVisible(open);
+
+    QWidget *wizardWindow = window();
+    if (!wizardWindow) {
+        return;
+    }
+
+    if (open) {
+        windowSizeBeforeExpansion = wizardWindow->size();
+        QTimer::singleShot(0, this, [wizardWindow] {
+            wizardWindow->resize(wizardWindow->size().expandedTo(wizardWindow->sizeHint()));
+        });
+    } else {
+        QTimer::singleShot(0, this, [this, wizardWindow] {
+            wizardWindow->resize(wizardWindow->size().boundedTo(windowSizeBeforeExpansion));
+        });
+    }
+}
+
+void CardDatabaseSetupPage::onApplyCustomUrl()
+{
+    const QString text = urlLineEdit->text().trimmed();
+
+    if (!text.isEmpty()) {
+        const QUrl url = QUrl::fromUserInput(text);
+        if (!url.isValid()) {
+            QMessageBox::warning(this, tr("Invalid URL"),
+                                 tr("That doesn't look like a valid URL. Double-check it and try again, "
+                                    "or clear the field to use the default source."));
+            return;
+        }
+    }
+
+    writeCustomUrl(text);
+    setState(State::Running);
+    emit updateRequested();
+}
+
+void CardDatabaseSetupPage::onRestoreDefaultUrl()
+{
+    urlLineEdit->clear();
+    writeCustomUrl(QString());
+}
+
+void CardDatabaseSetupPage::setState(State newState)
+{
+    state = newState;
+
+    progressBar->setVisible(state == State::Running);
+    retryButton->setVisible(state == State::Failed);
+    manualButton->setVisible(state == State::Failed);
+    applyAndRetryButton->setEnabled(state != State::Running);
+
+    switch (state) {
+        case State::NotStarted:
+            statusLabel->setText(tr("Press Download to fetch the card database, or Skip to do it later."));
+            break;
+        case State::Running:
+            statusLabel->setText(tr("Downloading the latest card database…"));
+            break;
+        case State::Succeeded:
+            statusLabel->setText(tr("Card database ready ✓"));
+            break;
+        case State::Failed:
+            statusLabel->setText(
+                tr("Couldn'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."));
+            break;
+    }
+
+    emit completeChanged();
+}
+
+bool CardDatabaseSetupPage::isComplete() const
+{
+    return state != State::Running;
+}
+
+bool CardDatabaseSetupPage::isSkippable() const
+{
+    return state != State::Succeeded;
+}
+
+QString CardDatabaseSetupPage::stepTitle() const
+{
+    return tr("Card Database");
+}
+
+QString CardDatabaseSetupPage::stepSubtitle() const
+{
+    return tr("Cockatrice needs card data to know what you're playing with.");
+}
+
+void CardDatabaseSetupPage::retranslateUi()
+{
+    retryButton->setText(tr("Retry"));
+    manualButton->setText(tr("Set up manually…"));
+
+    onToggleAdvanced(advancedToggleButton->isChecked());
+    urlLineEdit->setPlaceholderText(tr("Leave blank to use the default source"));
+    urlHintLabel->setText(tr("Only change this if you know you need a mirror or a custom card data source."));
+    restoreDefaultUrlButton->setText(tr("Restore default"));
+    applyAndRetryButton->setText(tr("Apply && retry"));
+
+    startupBehaviorLabel->setText(tr("Check for card database updates on startup"));
+    startupBehaviorCombo->setItemText(0, tr("Don't check"));
+    startupBehaviorCombo->setItemText(1, tr("Prompt for update"));
+    startupBehaviorCombo->setItemText(2, tr("Always update in the background"));
+
+    checkIntervalLabel->setText(tr("Check for card database updates every"));
+    checkIntervalSpinBox->setSuffix(tr(" days"));
+
+    setState(state);
+}
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
new file mode 100644
index 000000000..a84223497
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.h
@@ -0,0 +1,84 @@
+#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;
+class QLineEdit;
+class QProgressBar;
+class QPushButton;
+class QSpinBox;
+class QWidget;
+
+class CardDatabaseSetupPage : public FirstRunWizardPage
+{
+    Q_OBJECT
+
+public:
+    explicit CardDatabaseSetupPage(QWidget *parent = nullptr);
+
+    void initializePage() override;
+    bool isComplete() const override;
+    bool isSkippable() const override;
+    QString stepTitle() const override;
+    QString stepSubtitle() const override;
+    QString nextButtonText() const override;
+    bool handleNextClick() override;
+    void retranslateUi() override;
+
+    void onUpdateFinished(bool success);
+    void onUpdateProgress(const CardUpdateProgress &progress);
+
+signals:
+    void updateRequested();
+    void manualSetupRequested();
+
+private:
+    enum class State
+    {
+        NotStarted,
+        Running,
+        Succeeded,
+        Failed,
+    };
+
+    void setState(State newState);
+    bool alreadyHaveDatabase() const;
+
+    QString oracleSettingsFilePath() const;
+    QString readCustomUrl() const;
+    void writeCustomUrl(const QString &url);
+
+    void onToggleAdvanced(bool open);
+    void onApplyCustomUrl();
+    void onRestoreDefaultUrl();
+
+    QLabel *statusLabel;
+    QProgressBar *progressBar;
+    QPushButton *retryButton;
+    QPushButton *manualButton;
+
+    QPushButton *advancedToggleButton;
+    QWidget *advancedPanel;
+    QLineEdit *urlLineEdit;
+    QLabel *urlHintLabel;
+    QPushButton *restoreDefaultUrlButton;
+    QPushButton *applyAndRetryButton;
+
+    QLabel *startupBehaviorLabel;
+    QComboBox *startupBehaviorCombo;
+    QLabel *checkIntervalLabel;
+    QSpinBox *checkIntervalSpinBox;
+
+    State state = State::NotStarted;
+    QSize windowSizeBeforeExpansion;
+};
+
+#endif // CARD_DATABASE_SETUP_PAGE_H
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/finish_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/finish_page.cpp
new file mode 100644
index 000000000..1adf35282
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/pages/finish_page.cpp
@@ -0,0 +1,36 @@
+#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)
+{
+    bodyLabel = new QLabel(this);
+    bodyLabel->setWordWrap(true);
+    bodyLabel->setAlignment(Qt::AlignCenter);
+
+    auto *layout = new QVBoxLayout(this);
+    layout->addStretch();
+    layout->addWidget(bodyLabel);
+    layout->addStretch();
+
+    retranslateUi();
+}
+
+QString FinishPage::stepTitle() const
+{
+    return tr("You're All Set");
+}
+
+void FinishPage::retranslateUi()
+{
+    bodyLabel->setText(
+        tr("That's everything for now. Jump into Settings any time to change your mind about any of this.\n\n"
+           "Have fun!"));
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/finish_page.h b/cockatrice/src/interface/widgets/onboarding/pages/finish_page.h
new file mode 100644
index 000000000..b78e40ec5
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/pages/finish_page.h
@@ -0,0 +1,25 @@
+#ifndef FINISH_PAGE_H
+#define FINISH_PAGE_H
+
+#include "../first_run_wizard_page.h"
+
+#include <qtmetamacros.h>
+
+class QLabel;
+class QWidget;
+
+class FinishPage : public FirstRunWizardPage
+{
+    Q_OBJECT
+
+public:
+    explicit FinishPage(QWidget *parent = nullptr);
+
+    QString stepTitle() const override;
+    void retranslateUi() override;
+
+private:
+    QLabel *bodyLabel;
+};
+
+#endif // FINISH_PAGE_H
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp
new file mode 100644
index 000000000..da08e3a12
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.cpp
@@ -0,0 +1,180 @@
+#include "preferences_setup_page.h"
+
+#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"
+
+#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
+{
+// The server destinations are omitted: during first run their tabs are not
+// open yet, and the wizard offers no way to fill in the server/room details.
+QList<StartupTab> wizardStartupTabOrder()
+{
+    return {StartupTabHome,    StartupTabVisualDeckStorage, StartupTabDeckStorage,
+            StartupTabReplays, StartupTabDeckEditor,        StartupTabVisualDeckEditor};
+}
+} // namespace
+
+PreferencesSetupPage::PreferencesSetupPage(QWidget *parent) : FirstRunWizardPage(parent)
+{
+    auto *content = new QWidget;
+    auto *contentLayout = new QVBoxLayout(content);
+
+    gameplayGroup = new QGroupBox(content);
+    auto *gameplayLayout = new QVBoxLayout(gameplayGroup);
+    contentLayout->addWidget(gameplayGroup);
+    doubleClickToPlayCheckBox = new QCheckBox(gameplayGroup);
+    horizontalHandCheckBox = new QCheckBox(gameplayGroup);
+    playToStackCheckBox = new QCheckBox(gameplayGroup);
+    gameplayLayout->addWidget(doubleClickToPlayCheckBox);
+    gameplayLayout->addWidget(horizontalHandCheckBox);
+    gameplayLayout->addWidget(playToStackCheckBox);
+
+    notificationsGroup = new QGroupBox(content);
+    auto *notificationsLayout = new QVBoxLayout(notificationsGroup);
+    contentLayout->addWidget(notificationsGroup);
+    notificationsEnabledCheckBox = new QCheckBox(notificationsGroup);
+    soundEnabledCheckBox = new QCheckBox(notificationsGroup);
+    notificationsLayout->addWidget(notificationsEnabledCheckBox);
+    notificationsLayout->addWidget(soundEnabledCheckBox);
+
+    startupGroup = new QGroupBox(content);
+    auto *startupForm = new QFormLayout(startupGroup);
+    contentLayout->addWidget(startupGroup);
+    startupTabLabel = new QLabel(startupGroup);
+    startupTabSelector = new QComboBox(startupGroup);
+    startupTabSelector->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+    for (StartupTab tab : wizardStartupTabOrder()) {
+        startupTabSelector->addItem(QString(), tab); // texts set in retranslateUi
+    }
+    startupForm->addRow(startupTabLabel, startupTabSelector);
+
+    contentLayout->addStretch();
+
+    auto *scrollArea = new QScrollArea(this);
+    scrollArea->setWidget(content);
+    scrollArea->setWidgetResizable(true);
+    scrollArea->setFrameShape(QFrame::NoFrame);
+
+    auto *layout = new QVBoxLayout(this);
+    layout->addWidget(scrollArea);
+
+    SettingsCache &settings = SettingsCache::instance();
+
+    connect(doubleClickToPlayCheckBox, &QCheckBox::toggled, &settings.userInterface(),
+            &InterfaceSettings::setDoubleClickToPlay);
+    connect(horizontalHandCheckBox, &QCheckBox::toggled, &settings.userInterface(),
+            &InterfaceSettings::setHorizontalHand);
+    connect(playToStackCheckBox, &QCheckBox::toggled, &settings.userInterface(), &InterfaceSettings::setPlayToStack);
+
+    connect(notificationsEnabledCheckBox, &QCheckBox::toggled, &settings.userInterface(),
+            &InterfaceSettings::setNotificationsEnabled);
+    connect(soundEnabledCheckBox, &QCheckBox::toggled, &settings.sound(), &SoundSettings::setSoundEnabled);
+    connect(soundEnabledCheckBox, &QCheckBox::toggled, soundEngine, &SoundEngine::testSound);
+
+    connect(startupTabSelector, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index) {
+        if (index < 0) {
+            return;
+        }
+        SettingsCache::instance().tabs().setStartupTabIndex(startupTabSelector->itemData(index).toInt());
+    });
+
+    retranslateUi();
+}
+
+void PreferencesSetupPage::initializePage()
+{
+    SettingsCache &settings = SettingsCache::instance();
+
+    doubleClickToPlayCheckBox->setChecked(settings.userInterface().getDoubleClickToPlay());
+    horizontalHandCheckBox->setChecked(settings.userInterface().getHorizontalHand());
+    playToStackCheckBox->setChecked(settings.userInterface().getPlayToStack());
+
+    notificationsEnabledCheckBox->setChecked(settings.userInterface().getNotificationsEnabled());
+    soundEnabledCheckBox->setChecked(settings.sound().getSoundEnabled());
+
+    startupTabSelector->setCurrentIndex(startupTabSelector->findData(settings.tabs().getStartupTabIndex()));
+}
+
+bool PreferencesSetupPage::isSkippable() const
+{
+    return true;
+}
+
+QString PreferencesSetupPage::stepTitle() const
+{
+    return tr("A Few Preferences");
+}
+
+QString PreferencesSetupPage::stepSubtitle() const
+{
+    return tr("Defaults are fine — tweak these now or from Settings anytime.");
+}
+
+void PreferencesSetupPage::retranslateUi()
+{
+    gameplayGroup->setTitle(tr("Gameplay"));
+    doubleClickToPlayCheckBox->setText(tr("Double-click cards to play them"));
+    doubleClickToPlayCheckBox->setToolTip(tr("When disabled, a single click plays the selected card onto the table."));
+    horizontalHandCheckBox->setText(tr("Display hand horizontally"));
+    horizontalHandCheckBox->setToolTip(
+        tr("Shows your hand as a row along the bottom of the table instead of a column beside it."));
+    playToStackCheckBox->setText(tr("Play all nonlands onto the stack by default"));
+    playToStackCheckBox->setToolTip(
+        tr("Cards you play appear on the stack so other players can respond to them, as in a tabletop game."));
+
+    notificationsGroup->setTitle(tr("Notifications && Sound"));
+    notificationsEnabledCheckBox->setText(tr("Show desktop notifications"));
+    soundEnabledCheckBox->setText(tr("Play sound effects"));
+
+    startupGroup->setTitle(tr("Startup"));
+    startupTabLabel->setText(tr("Startup tab:"));
+    const QList<StartupTab> tabs = wizardStartupTabOrder();
+    for (int i = 0; i < tabs.size(); ++i) {
+        QString name;
+        switch (tabs[i]) {
+            case StartupTabHome:
+                name = tr("Home");
+                break;
+            case StartupTabVisualDeckStorage:
+                name = tr("Visual Deck Storage");
+                break;
+            case StartupTabDeckStorage:
+                name = tr("Deck Storage");
+                break;
+            case StartupTabReplays:
+                name = tr("Game Replays");
+                break;
+            case StartupTabDeckEditor:
+                name = tr("Deck Editor");
+                break;
+            case StartupTabVisualDeckEditor:
+                name = tr("Visual Deck Editor");
+                break;
+            case StartupTabServer:
+                name = tr("Server");
+                break;
+            case StartupTabServerRoom:
+                name = tr("Server Room");
+                break;
+        }
+        startupTabSelector->setItemText(i, name);
+    }
+}
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.h b/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.h
new file mode 100644
index 000000000..18d6c0e8f
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/pages/preferences_setup_page.h
@@ -0,0 +1,44 @@
+#ifndef PREFERENCES_SETUP_PAGE_H
+#define PREFERENCES_SETUP_PAGE_H
+
+#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.
+ **/
+class PreferencesSetupPage : public FirstRunWizardPage
+{
+    Q_OBJECT
+
+public:
+    explicit PreferencesSetupPage(QWidget *parent = nullptr);
+
+    void initializePage() override;
+    bool isSkippable() const override;
+    QString stepTitle() const override;
+    QString stepSubtitle() const override;
+    void retranslateUi() override;
+
+private:
+    QGroupBox *gameplayGroup;
+    QCheckBox *doubleClickToPlayCheckBox;
+    QCheckBox *horizontalHandCheckBox;
+    QCheckBox *playToStackCheckBox;
+
+    QGroupBox *notificationsGroup;
+    QCheckBox *notificationsEnabledCheckBox;
+    QCheckBox *soundEnabledCheckBox;
+
+    QGroupBox *startupGroup;
+    QLabel *startupTabLabel;
+    QComboBox *startupTabSelector;
+};
+
+#endif // PREFERENCES_SETUP_PAGE_H
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp
new file mode 100644
index 000000000..66554d85c
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp
@@ -0,0 +1,287 @@
+#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>
+#include <QDir>
+#include <QFile>
+#include <QFormLayout>
+#include <QGroupBox>
+#include <QIODevice>
+#include <QList>
+#include <QMap>
+#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;
+
+namespace
+{
+/** @brief A theme's shipped identity accent, immune to any user- or auto-
+ *         generated palette that may currently be masking appColor(). */
+QColor themeIdentityAccent(const QString &themeDirPath, const QString &themeName)
+{
+    for (const QString &scheme : {QStringLiteral("Light"), QStringLiteral("Dark")}) {
+        const PaletteConfig cfg = ThemeManager::loadDefaultPaletteConfig(themeDirPath, themeName, scheme);
+        if (cfg.appColors.contains(AppColor::AccentStrong)) {
+            return cfg.appColors.value(AppColor::AccentStrong);
+        }
+        const QColor highlight = cfg.colors.value(QPalette::Active).value(QPalette::Highlight);
+        if (highlight.isValid()) {
+            return highlight;
+        }
+    }
+    return {};
+}
+} // namespace
+
+ThemeSetupPage::ThemeSetupPage(QWidget *parent) : FirstRunWizardPage(parent)
+{
+    themeCombo = new QComboBox(this);
+    schemeCombo = new QComboBox(this);
+    schemeCombo->addItem(tr("Light"), QStringLiteral("Light"));
+    schemeCombo->addItem(tr("Dark"), QStringLiteral("Dark"));
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+    schemeCombo->addItem(tr("Match system"), QStringLiteral("System"));
+#endif
+
+    quickSetupPanel = new QuickSetupPanel(this);
+
+    // Seed the picker from the current theme's own identity accent rather than
+    // a hardcoded brand green: Plasma seeds violet, Fusion green, etc., and it
+    // is immune to stale generated palettes that may mask appColor(). This was
+    // initially a brand-green workaround from before Fusion became the default.
+    // setAccentColor blocks signals, so this never triggers a generation.
+    lastSeededTheme = SettingsCache::instance().getThemeName();
+    quickSetupPanel->setAccentColor(
+        themeIdentityAccent(themeManager->getAvailableThemes().value(lastSeededTheme), lastSeededTheme));
+
+    connect(themeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeSetupPage::onThemeChanged);
+    connect(schemeCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeSetupPage::onSchemeChanged);
+    connect(quickSetupPanel, &QuickSetupPanel::valueChanged, this, &ThemeSetupPage::onGenerateFromAccent);
+
+    homeTabBackgroundCombo = new QComboBox(this);
+    for (const auto &entry : BackgroundSources::all()) {
+        homeTabBackgroundCombo->addItem(QObject::tr(entry.trKey), QVariant::fromValue(entry.type));
+    }
+    connect(homeTabBackgroundCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &ThemeSetupPage::onHomeTabBackgroundChanged);
+
+    // Keep the scheme combo honest when the *theme* changes underneath it
+    // (switching theme reloads that theme's own stored colorScheme), and
+    // opportunistically seed a palette for themes that ship none at all.
+    // Mirrors AppearanceSettingsPage's identical listener for the combo-sync
+    // half of this.
+    connect(themeManager, &ThemeManager::themeChanged, this, [this] {
+        const QString newTheme = SettingsCache::instance().getThemeName();
+        const QString newDir = themeManager->getAvailableThemes().value(newTheme);
+        const ThemeConfig cfg = ThemeConfig::fromThemeDir(newDir);
+        const QString current = cfg.colorScheme;
+
+        schemeCombo->blockSignals(true);
+        const int idx = schemeCombo->findData(current);
+        schemeCombo->setCurrentIndex(idx >= 0 ? idx : 0);
+        schemeCombo->blockSignals(false);
+
+        // Keep the picker's accent in step with the theme's own identity; the
+        // swatch seeded at construction would otherwise stay stale (e.g. green
+        // from a previous theme) when the user toggles themes.
+        if (newTheme != lastSeededTheme) {
+            lastSeededTheme = newTheme;
+            quickSetupPanel->setAccentColor(themeIdentityAccent(newDir, newTheme));
+        }
+
+        maybeAutoGeneratePalette();
+    });
+
+    auto *form = new QFormLayout;
+    form->addRow(tr("Theme:"), themeCombo);
+    form->addRow(tr("Appearance:"), schemeCombo);
+    form->addRow(tr("Home screen background:"), homeTabBackgroundCombo);
+
+    accentGroup = new QGroupBox(this);
+    auto *accentLayout = new QVBoxLayout(accentGroup);
+    accentLayout->addWidget(quickSetupPanel);
+
+    auto *layout = new QVBoxLayout(this);
+    layout->addLayout(form);
+    layout->addWidget(accentGroup);
+    layout->addStretch();
+
+    retranslateUi();
+}
+
+void ThemeSetupPage::initializePage()
+{
+    themeCombo->blockSignals(true);
+    themeCombo->clear();
+    const QString currentTheme = SettingsCache::instance().getThemeName();
+    for (const QString &name : themeManager->getAvailableThemes().keys()) {
+        themeCombo->addItem(name);
+    }
+    const int idx = themeCombo->findText(currentTheme);
+    themeCombo->setCurrentIndex(idx >= 0 ? idx : 0);
+    themeCombo->blockSignals(false);
+
+    const QString dirPath = themeManager->getAvailableThemes().value(SettingsCache::instance().getThemeName());
+    const ThemeConfig cfg = ThemeConfig::fromThemeDir(dirPath);
+    schemeCombo->blockSignals(true);
+    const int schemeIdx = schemeCombo->findData(cfg.colorScheme);
+    schemeCombo->setCurrentIndex(schemeIdx >= 0 ? schemeIdx : 0);
+    schemeCombo->blockSignals(false);
+
+    homeTabBackgroundCombo->blockSignals(true);
+    QString homeTabSource = SettingsCache::instance().appearance().getHomeTabBackgroundSource();
+    int homeTabIdx = homeTabBackgroundCombo->findData(BackgroundSources::fromId(homeTabSource));
+    homeTabBackgroundCombo->setCurrentIndex(homeTabIdx >= 0 ? homeTabIdx : 0);
+    homeTabBackgroundCombo->blockSignals(false);
+
+    // Opening the page must not touch the running application's palette:
+    // previews and auto-generation only happen in response to the user
+    // actually changing a control, never on mere page visibility.
+    paletteDirty = false;
+}
+
+QString ThemeSetupPage::currentScheme() const
+{
+    return schemeCombo->currentData().toString();
+}
+
+QString ThemeSetupPage::resolvedScheme() const
+{
+    const QString scheme = currentScheme();
+    if (scheme.isEmpty() || scheme == QStringLiteral("System")) {
+        return themeManager->isDarkMode(themeManager->getCurrentThemePath()) ? "Dark" : "Light";
+    }
+    return scheme;
+}
+
+void ThemeSetupPage::onThemeChanged(int index)
+{
+    if (index < 0) {
+        return;
+    }
+    paletteDirty = false;
+    SettingsCache::instance().setThemeName(themeCombo->itemText(index));
+    // Scheme-combo sync and auto-generation both happen via the
+    // ThemeManager::themeChanged listener above, triggered by setThemeName.
+}
+
+void ThemeSetupPage::onSchemeChanged()
+{
+    themeManager->setColorScheme(currentScheme());
+}
+
+void ThemeSetupPage::onHomeTabBackgroundChanged(int index)
+{
+    if (index < 0) {
+        return;
+    }
+    auto type = homeTabBackgroundCombo->currentData().value<BackgroundSources::Type>();
+    SettingsCache::instance().appearance().setHomeTabBackgroundSource(BackgroundSources::toId(type));
+}
+
+void ThemeSetupPage::onGenerateFromAccent(const QColor &accent, int intensity)
+{
+    PaletteConfig cfg = PaletteGenerator::fromAccent(accent, intensity, resolvedScheme());
+    themeManager->previewPalette(cfg, resolvedScheme());
+    paletteDirty = true;
+}
+
+void ThemeSetupPage::maybeAutoGeneratePalette()
+{
+    const QString dirPath = themeManager->getAvailableThemes().value(SettingsCache::instance().getThemeName());
+    const QString scheme = resolvedScheme();
+
+    // The theme dir may resolve to the user profile even for built-in themes
+    // (getAvailableThemes gives the user copy precedence), so consult the
+    // shipped palette too -- both via loadDefaultPaletteConfig's system fallback.
+    // Without it, scheme flips regenerate a fresh palette from the picker accent
+    // and clobber the curated colours the theme explicitly ships.
+    if (PaletteConfig::fromScheme(dirPath, scheme).hasPalette() ||
+        ThemeManager::loadDefaultPaletteConfig(dirPath, SettingsCache::instance().getThemeName(), scheme)
+            .hasPalette()) {
+        return; // theme already has something real to show -- leave it alone
+    }
+
+    // The theme+scheme combination has nothing saved and nothing shipped, and
+    // the user just switched to it. Rather than leaving a flat, unstyled look,
+    // seed one from whatever accent QuickSetupPanel currently holds and mark
+    // it dirty so it's written to disk if the user moves on. Only ever reached
+    // through user interaction (theme/scheme change, accent drag) -- never on
+    // page open.
+    PaletteConfig generated =
+        PaletteGenerator::fromAccent(quickSetupPanel->accentColor(), quickSetupPanel->intensity(), scheme);
+    themeManager->previewPalette(generated, scheme);
+    paletteDirty = true;
+}
+
+bool ThemeSetupPage::validatePage()
+{
+    if (paletteDirty) {
+        const QString scheme = resolvedScheme();
+        PaletteConfig cfg =
+            PaletteGenerator::fromAccent(quickSetupPanel->accentColor(), quickSetupPanel->intensity(), scheme);
+        if (!ThemeManager::commitPalette(writableThemeDir(), scheme, cfg)) {
+            QMessageBox::warning(this, tr("Save failed"),
+                                 tr("Could not write the theme palette to:\n%1").arg(writableThemeDir()));
+            return false;
+        }
+        themeManager->reloadCurrentTheme();
+    }
+    return true;
+}
+
+QString ThemeSetupPage::writableThemeDir() const
+{
+    // Built-in themes resolve to the read-only system themes directory;
+    // palette edits must go to the user themes directory instead, exactly
+    // as PaletteEditorDialog does.
+    const QString dirPath = themeManager->getAvailableThemes().value(SettingsCache::instance().getThemeName());
+    if (!dirPath.isEmpty()) {
+        const QString probe = QDir(dirPath).absoluteFilePath(".cockatrice_write_test");
+        QFile f(probe);
+        if (f.open(QIODevice::WriteOnly)) {
+            f.close();
+            f.remove();
+            return dirPath;
+        }
+    }
+    return QDir(SettingsCache::instance().paths().getThemesPath())
+        .absoluteFilePath(SettingsCache::instance().getThemeName());
+}
+
+bool ThemeSetupPage::isSkippable() const
+{
+    return true;
+}
+
+QString ThemeSetupPage::stepTitle() const
+{
+    return tr("Pick a Look");
+}
+
+QString ThemeSetupPage::stepSubtitle() const
+{
+    return tr("You can fine-tune every colour later from Settings → Appearance.");
+}
+
+void ThemeSetupPage::retranslateUi()
+{
+    accentGroup->setTitle(tr("Accent colour (optional)"));
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.h b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.h
new file mode 100644
index 000000000..b0d717043
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.h
@@ -0,0 +1,66 @@
+#ifndef THEME_SETUP_PAGE_H
+#define THEME_SETUP_PAGE_H
+
+#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,
+ *         PaletteGenerator, and the QuickSetupPanel widget itself) rather than
+ *         reimplementing palette generation or preview here.
+ *
+ * Behavior specific to this page (deliberately not pushed down into
+ * ThemeManager, to avoid changing app-wide behaviour for existing installs):
+ *  - Opening the page never changes the running palette; previews and
+ *    auto-generation only happen when the user actually changes a control.
+ *  - If a theme+scheme the user selects has no saved palette and no shipped
+ *    default, one is generated from the QuickSetupPanel's current accent so
+ *    the preview doesn't fall back to a flat, unstyled look. */
+class ThemeSetupPage : public FirstRunWizardPage
+{
+    Q_OBJECT
+
+public:
+    explicit ThemeSetupPage(QWidget *parent = nullptr);
+
+    void initializePage() override;
+    bool validatePage() override;
+    bool isSkippable() const override;
+    QString stepTitle() const override;
+    QString stepSubtitle() const override;
+    void retranslateUi() override;
+
+private slots:
+    void onThemeChanged(int index);
+    void onSchemeChanged();
+    void onGenerateFromAccent(const QColor &accent, int intensity);
+    void onHomeTabBackgroundChanged(int index);
+
+private:
+    QString currentScheme() const;
+    QString resolvedScheme() const; // "System" -> actual Light/Dark
+    void maybeAutoGeneratePalette();
+    QString writableThemeDir() const;
+
+    QComboBox *themeCombo;
+    QComboBox *schemeCombo;
+    QGroupBox *accentGroup;
+    QuickSetupPanel *quickSetupPanel;
+
+    QComboBox *homeTabBackgroundCombo;
+
+    bool paletteDirty = false;
+
+    /// Theme whose identity accent currently seeds the picker.
+    QString lastSeededTheme;
+};
+
+#endif // THEME_SETUP_PAGE_H
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.cpp
new file mode 100644
index 000000000..71d2fa409
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.cpp
@@ -0,0 +1,87 @@
+#include "welcome_page.h"
+
+#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 <QVBoxLayout>
+#include <QVariant>
+#include <QtGlobal>
+#include <qnamespace.h>
+
+class QWidget;
+
+WelcomePage::WelcomePage(QWidget *parent) : FirstRunWizardPage(parent)
+{
+    bodyLabel = new QLabel(this);
+    bodyLabel->setWordWrap(true);
+    bodyLabel->setAlignment(Qt::AlignCenter);
+
+    languageLabel = new QLabel(this);
+    langCombo = new QComboBox(this);
+    for (const QString &code : GeneralSettingsPage::findQmFiles()) {
+        langCombo->addItem(GeneralSettingsPage::languageName(code), code);
+    }
+
+    QString current = SettingsCache::instance().personal().getLang();
+    if (current.isEmpty()) {
+        current = QLocale::system().name();
+    }
+    int index = langCombo->findData(current);
+    if (index < 0) {
+        index = langCombo->findData(current.section('_', 0, 0));
+    }
+    if (index >= 0) {
+        langCombo->setCurrentIndex(index);
+    }
+
+    connect(langCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &WelcomePage::languageChanged);
+
+    auto *languageRow = new QHBoxLayout;
+    languageRow->addStretch();
+    languageRow->addWidget(languageLabel);
+    languageRow->addWidget(langCombo);
+    languageRow->addStretch();
+
+    auto *layout = new QVBoxLayout(this);
+    layout->addStretch();
+    layout->addWidget(bodyLabel);
+    layout->addStretch();
+    layout->addLayout(languageRow);
+
+    retranslateUi();
+}
+
+void WelcomePage::languageChanged(int index)
+{
+    if (index < 0) {
+        return;
+    }
+    SettingsCache::instance().personal().setLang(langCombo->itemData(index).toString());
+    qApp->removeTranslator(translator); // NOLINT(cppcoreguidelines-pro-type-static-cast-downcast)
+    installNewTranslator();
+}
+
+QString WelcomePage::stepTitle() const
+{
+    return tr("Welcome!");
+}
+
+void WelcomePage::retranslateUi()
+{
+    bodyLabel->setText(tr("Let's get you set up. This will only take a minute — "
+                          "we'll grab the card database, pick a look you like, "
+                          "and get you ready to connect to a server.\n\n"
+                          "You can change any of this later from Settings."));
+    languageLabel->setText(tr("Language:"));
+}
diff --git a/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.h b/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.h
new file mode 100644
index 000000000..289034ab1
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/pages/welcome_page.h
@@ -0,0 +1,31 @@
+#ifndef WELCOME_PAGE_H
+#define WELCOME_PAGE_H
+
+#include "../first_run_wizard_page.h"
+
+#include <qtmetamacros.h>
+
+class QComboBox;
+class QLabel;
+class QWidget;
+
+class WelcomePage : public FirstRunWizardPage
+{
+    Q_OBJECT
+
+public:
+    explicit WelcomePage(QWidget *parent = nullptr);
+
+    QString stepTitle() const override;
+    void retranslateUi() override;
+
+private slots:
+    void languageChanged(int index);
+
+private:
+    QLabel *bodyLabel;
+    QLabel *languageLabel;
+    QComboBox *langCombo;
+};
+
+#endif // WELCOME_PAGE_H
diff --git a/cockatrice/src/interface/widgets/onboarding/qml/BrandBanner.qml b/cockatrice/src/interface/widgets/onboarding/qml/BrandBanner.qml
new file mode 100644
index 000000000..d94e15280
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/qml/BrandBanner.qml
@@ -0,0 +1,96 @@
+import QtQuick
+
+Item {
+    id: root
+
+    ShaderEffect {
+        id: effectA
+        anchors.fill: parent
+        opacity: bannerConfig.frontIsA ? 1.0 : 0.0
+        Behavior on opacity { NumberAnimation { duration: 450; easing.type: Easing.InOutCubic } }
+        property real iTime: bannerConfig.time
+        property real uAspect: bannerConfig.aspect
+        property real uMode: bannerConfig.modeA
+        property real uSpeed: bannerConfig.speedA
+        property real uSeed: bannerConfig.seedA
+        property vector4d uColorA: Qt.vector4d(bannerConfig.colorA.r, bannerConfig.colorA.g, bannerConfig.colorA.b, 1.0)
+        property vector4d uColorB: Qt.vector4d(bannerConfig.colorB.r, bannerConfig.colorB.g, bannerConfig.colorB.b, 1.0)
+        property vector4d uAccent: Qt.vector4d(bannerConfig.accent.r, bannerConfig.accent.g, bannerConfig.accent.b, 1.0)
+        property vector4d uGlowColor: Qt.vector4d(bannerConfig.glowColor.r, bannerConfig.glowColor.g, bannerConfig.glowColor.b, 1.0)
+        property real uVignetteMin: bannerConfig.vignetteMin
+        property real uLogoGlow: bannerConfig.logoGlow
+        fragmentShader: "qrc:/onboarding/shaders/brand_banner.frag.qsb"
+    }
+
+    ShaderEffect {
+        id: effectB
+        anchors.fill: parent
+        opacity: bannerConfig.frontIsA ? 0.0 : 1.0
+        Behavior on opacity { NumberAnimation { duration: 450; easing.type: Easing.InOutCubic } }
+        property real iTime: bannerConfig.time
+        property real uAspect: bannerConfig.aspect
+        property real uMode: bannerConfig.modeB
+        property real uSpeed: bannerConfig.speedB
+        property real uSeed: bannerConfig.seedB
+        property vector4d uColorA: Qt.vector4d(bannerConfig.colorA.r, bannerConfig.colorA.g, bannerConfig.colorA.b, 1.0)
+        property vector4d uColorB: Qt.vector4d(bannerConfig.colorB.r, bannerConfig.colorB.g, bannerConfig.colorB.b, 1.0)
+        property vector4d uAccent: Qt.vector4d(bannerConfig.accent.r, bannerConfig.accent.g, bannerConfig.accent.b, 1.0)
+        property vector4d uGlowColor: Qt.vector4d(bannerConfig.glowColor.r, bannerConfig.glowColor.g, bannerConfig.glowColor.b, 1.0)
+        property real uVignetteMin: bannerConfig.vignetteMin
+        property real uLogoGlow: bannerConfig.logoGlow
+        fragmentShader: "qrc:/onboarding/shaders/brand_banner.frag.qsb"
+    }
+
+    // The white logo sits at full opacity on top of the static gradient plate —
+    // no glow, no breathing. The plate matches home_widget's QPainter composite.
+    Item {
+        id: logoHost
+        visible: bannerConfig.logoVisible
+        anchors.centerIn: parent
+        width: root.height * 0.6
+        height: width
+
+        // The full-color logo renders beneath the white mark and is consumed as
+        // a texture (layer.enabled) by the plate shader's silhouette mask, so
+        // the gradient is clipped to the bird exactly as the SVG's gradient
+        // paths are. It is never drawn to the screen itself.
+        Image {
+            id: silhouetteMask
+            anchors.fill: parent
+            source: "qrc:/resources/cockatrice.svg"
+            sourceSize: Qt.size(256, 256)
+            fillMode: Image.PreserveAspectFit
+            smooth: true
+            visible: false
+            layer.enabled: true
+            layer.smooth: true
+        }
+
+        // The logo's gradient plate, drawn behind the mark: a linear
+        // AccentSoft (light) -> AccentStrong (dark) sheet along the same
+        // top-left -> bottom-right userSpaceOnUse axis the baked-in SVG used,
+        // clipped to the bird silhouette via uSilhouette. The white highlight
+        // path above is theme independent. Sized to the logo itself — no
+        // rounded badge, matching home_widget's QPainter composite. Static.
+        // Small ShaderEffect, Qt 6.4-safe.
+        ShaderEffect {
+            id: brandPlate
+            anchors.fill: parent
+            property vector4d uStrong: Qt.vector4d(bannerConfig.brandStrong.r, bannerConfig.brandStrong.g,
+                                                   bannerConfig.brandStrong.b, 1.0)
+            property vector4d uSoft: Qt.vector4d(bannerConfig.brandSoft.r, bannerConfig.brandSoft.g,
+                                                 bannerConfig.brandSoft.b, 1.0)
+            property var uSilhouette: silhouetteMask
+            fragmentShader: "qrc:/onboarding/shaders/brand_plate.frag.qsb"
+        }
+
+        Image {
+            id: logoImage
+            anchors.fill: parent
+            source: "qrc:/resources/cockatrice-logo-white.svg"
+            sourceSize: Qt.size(256, 256)
+            fillMode: Image.PreserveAspectFit
+            smooth: true
+        }
+    }
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.cpp b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.cpp
new file mode 100644
index 000000000..c17399957
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.cpp
@@ -0,0 +1,337 @@
+#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 <QStackedLayout>
+#include <QString>
+#include <QUrl>
+#include <QtGlobal>
+#include <qmath.h>
+#include <qnamespace.h>
+#include <qnumeric.h>
+
+namespace
+{
+// Curated near-black stage -- used only when the active palette resolves no
+// usable window colour. Matches the banner's original design (dark and quiet
+// so the accent stands out) and satisfies design-plans §2.1's "identity
+// survives a bare palette".
+constexpr QRgb kFallbackColorA = 0x1A1A20;
+constexpr QRgb kFallbackColorB = 0x0E0E12;
+
+struct SuggestedColors
+{
+    QColor colorA;
+    QColor colorB;
+    QColor accent;
+    QColor glowColor;
+    QColor brandStrong;
+    QColor brandSoft;
+    qreal vignetteMin = 0.62;
+};
+
+SuggestedColors suggestedBannerColors()
+{
+    const QPalette &pal = qApp->palette();
+    const QColor window = pal.color(QPalette::Active, QPalette::Window);
+    // Identity accent: the theme's [AppColors] AccentStrong, which appColor()
+    // resolves to QPalette::Highlight when a theme doesn't pin AccentStrong.
+    // Reading bare Highlight ignored curated accent tokens (Plasma's violet
+    // vs Default's green) whenever a palette didn't set the role itself.
+    const QColor accentStrong = themeManager->appColor(AppColor::AccentStrong);
+    if (!window.isValid() || !accentStrong.isValid()) {
+        return {QColor(kFallbackColorA),
+                QColor(kFallbackColorB),
+                kCockatriceBrandGreen,
+                QColor(Qt::white),
+                kCockatriceBrandGreen,
+                QColor(0xC9, 0xFD, 0x62),
+                0.62};
+    }
+
+    // The theme's brand pair: AccentStrong is the deep green, AccentSoft the
+    // lime. These two appColors form the logo's "surrounding gradient" (deep
+    // core grading out to the soft, brand-toned glow) on both the banner and
+    // the home screen.
+    const QColor brandStrong = accentStrong;
+    const QColor brandSoft = themeManager->appColor(AppColor::AccentSoft);
+
+    // Dress the stage for the scheme so the banner never fights the
+    // surrounding window in either mode. Dark palettes keep the original
+    // quiet near-black stage (lightness 29 → 16) with the theme's window
+    // hue; light palettes get a pastel "frosted accent" treatment built from
+    // the accent hue instead of a plain near-white copy: a coloured wash that
+    // clearly belongs to the theme.
+    const qreal luma = 0.299 * window.red() + 0.587 * window.green() + 0.114 * window.blue();
+    const bool lightStage = luma > 115.0;
+    if (lightStage) {
+        const int hue = accentStrong.hslHue();
+        // Achromatic accents (grey) get a neutral near-white stage instead.
+        const int stageSat = hue < 0 ? 0 : 64;
+        const int hueSafe = hue < 0 ? 0 : hue;
+        // Depth is what stops a light stage reading as a washed-out near-white
+        // copy of the page behind the banner: deepen the lower pastel band and
+        // raise saturation so the hue is clearly present while staying frosted.
+        auto pastel = [hueSafe, stageSat](int lightness) { return QColor::fromHsl(hueSafe, stageSat, lightness); };
+        auto pastelLower = [hueSafe](int lightness) { return QColor::fromHsl(hueSafe, 76, lightness); };
+        // Brightness-lifted accent for additive glows: the raw accent on a
+        // light stage must be mid-bright to read instead of washing out, so
+        // lift lightness and saturation together.
+        const int accentLightness = qBound(158, accentStrong.lightness() + 82, 198);
+        const int accentSaturation = hue < 0 ? 0 : qMax(accentStrong.hslSaturation(), 180);
+        const QColor liftedAccent =
+            hue < 0 ? accentStrong : QColor::fromHsl(hueSafe, accentSaturation, accentLightness);
+        // The centre glow (and logo tint in QML) uses the deep accent itself:
+        // a coloured halo/fill behind the logo instead of a white or black one.
+        return {pastel(214), pastelLower(186), liftedAccent, accentStrong, brandStrong, brandSoft, 0.80};
+    }
+
+    // Dark stage: force the window hue down to the banner's curated darkness,
+    // scaling saturation away so chromatic palettes tint it without going
+    // muddy. The accent is the bright, brand-driven tone (hue from the accent
+    // itself, never the -- often grey -- window), and it drives both the
+    // embers/fog and the logo glow so the mark tints like the light stage.
+    auto stage = [&window](int lightness) {
+        const int hue = window.hslHue();
+        const int saturation = hue < 0 ? 0 : qBound(0, qRound(window.hslSaturation() * (lightness / 40.0)), 255);
+        return QColor::fromHsl(hue, saturation, lightness);
+    };
+    const int accentHue = accentStrong.hslHue();
+    const int accentHueSafe = accentHue < 0 ? 0 : accentHue;
+    const int accentLightness = qBound(150, accentStrong.lightness() + 70, 185);
+    const int accentSaturation = accentHue < 0 ? 0 : qMax(accentStrong.hslSaturation(), 160);
+    const QColor accent =
+        accentHue < 0 ? accentStrong : QColor::fromHsl(accentHueSafe, accentSaturation, accentLightness);
+    return {stage(29), stage(16), accent, accent, brandStrong, brandSoft, 0.62};
+}
+} // namespace
+
+class GradientFallbackWidget : public QWidget
+{
+public:
+    using QWidget::QWidget;
+
+    void setColors(const QColor &a, const QColor &b)
+    {
+        if (a != colorA || b != colorB) {
+            colorA = a;
+            colorB = b;
+        }
+    }
+
+protected:
+    void paintEvent(QPaintEvent *) override
+    {
+        QPainter painter(this);
+        QLinearGradient gradient(0, 0, width(), height());
+        gradient.setColorAt(0.0, colorA);
+        gradient.setColorAt(1.0, colorB);
+        painter.fillRect(rect(), gradient);
+    }
+
+private:
+    QColor colorA{QColor(kFallbackColorA)};
+    QColor colorB{QColor(kFallbackColorB)};
+};
+
+BannerHost::BannerHost(QWidget *parent) : QWidget(parent)
+{
+    setFixedHeight(150);
+
+    stack = new QStackedLayout(this);
+    stack->setContentsMargins(0, 0, 0, 0);
+
+    fallback = new GradientFallbackWidget(this);
+    stack->addWidget(fallback);
+
+    quickWidget = new QQuickWidget(this);
+    quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
+
+    config = new BannerShaderConfig(quickWidget->engine());
+    quickWidget->rootContext()->setContextProperty("bannerConfig", config);
+    quickWidget->setSource(QUrl("qrc:/onboarding/qml/BrandBanner.qml"));
+
+    if (quickWidget->status() == QQuickWidget::Error) {
+        activateFallback();
+    } else {
+        connect(quickWidget, &QQuickWidget::sceneGraphError, this, &BannerHost::onSceneGraphFailed);
+        stack->addWidget(quickWidget);
+        stack->setCurrentWidget(quickWidget);
+    }
+
+    connect(&clock, &QTimer::timeout, this, &BannerHost::tick);
+    clock.setInterval(16); // ~60fps; the shader itself is cheap, this is just a wall clock
+
+    connect(themeManager, &ThemeManager::themeChanged, this, &BannerHost::applyThemeColors);
+    applyThemeColors();
+
+    applyMotifPreset(currentMotif);
+    updateAspect();
+}
+
+void BannerHost::activateFallback()
+{
+    if (usingFallback) {
+        return;
+    }
+    usingFallback = true;
+    clock.stop();
+    stack->setCurrentWidget(fallback);
+
+    if (quickWidget) {
+        quickWidget->deleteLater(); // takes BannerShaderConfig (parented to its engine) with it
+        quickWidget = nullptr;
+        config = nullptr;
+    }
+}
+
+void BannerHost::onSceneGraphFailed()
+{
+    activateFallback();
+}
+
+void BannerHost::setMotif(Motif motif)
+{
+    currentMotif = motif;
+    applyMotifPreset(motif);
+}
+
+BannerHost::Preset BannerHost::presetFor(Motif motif)
+{
+    // speed/seed tuned per motif so e.g. the network "pulse" (Account) reads
+    // at a deliberately calmer cadence than the data "scan" lines
+    // (Preferences), even though both come from the same shader.
+    switch (motif) {
+        case Motif::Welcome:
+            return {0.0, 0.6, 0.15};
+        case Motif::CardDatabase:
+            return {1.0, 1.3, 0.42};
+        case Motif::Theming:
+            return {2.0, 1.2, 0.73};
+        case Motif::Account:
+            return {3.0, 0.8, 0.28};
+        case Motif::Preferences:
+            return {4.0, 1.0, 0.61};
+        case Motif::Finish:
+            return {5.0, 1.0, 0.91};
+    }
+    return {0.0, 0.6, 0.15};
+}
+
+void BannerHost::applyMotifPreset(Motif motif)
+{
+    if (usingFallback || !config) {
+        return;
+    }
+
+    const Preset p = presetFor(motif);
+
+    config->setColorA(bannerColorA);
+    config->setColorB(bannerColorB);
+    config->setAccent(bannerAccent);
+    config->setLogoVisible(motif == Motif::Welcome);
+
+    if (isFirstApply) {
+        // Nothing on screen yet -- write straight into the front bank, no
+        // crossfade needed for the very first paint.
+        config->setModeA(p.mode);
+        config->setSpeedA(p.speed);
+        config->setSeedA(p.seed);
+        config->setFrontIsA(true);
+        isFirstApply = false;
+        return;
+    }
+
+    // Write the new preset into whichever bank is currently hidden, then
+    // flip which one is front. QML's opacity Behavior does the actual
+    // crossfade -- BannerHost never animates anything itself.
+    if (config->frontIsA()) {
+        config->setModeB(p.mode);
+        config->setSpeedB(p.speed);
+        config->setSeedB(p.seed);
+        config->setFrontIsA(false);
+    } else {
+        config->setModeA(p.mode);
+        config->setSpeedA(p.speed);
+        config->setSeedA(p.seed);
+        config->setFrontIsA(true);
+    }
+}
+
+void BannerHost::updateAspect()
+{
+    if (config && height() > 0) {
+        config->setAspect(qreal(width()) / qreal(height()));
+    }
+}
+
+void BannerHost::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+    updateAspect();
+}
+
+void BannerHost::showEvent(QShowEvent *event)
+{
+    QWidget::showEvent(event);
+    if (!usingFallback) {
+        elapsed.restart();
+        clock.start();
+    }
+}
+
+void BannerHost::hideEvent(QHideEvent *event)
+{
+    QWidget::hideEvent(event);
+    clock.stop();
+}
+
+void BannerHost::applyThemeColors()
+{
+    const SuggestedColors colors = suggestedBannerColors();
+    bannerColorA = colors.colorA;
+    bannerColorB = colors.colorB;
+    bannerAccent = colors.accent;
+
+    if (usingFallback) {
+        fallback->setColors(bannerColorA, bannerColorB);
+        fallback->update();
+    } else if (config) {
+        config->setColorA(bannerColorA);
+        config->setColorB(bannerColorB);
+        config->setAccent(bannerAccent);
+        config->setGlowColor(colors.glowColor);
+        config->setBrandStrong(colors.brandStrong);
+        config->setBrandSoft(colors.brandSoft);
+        config->setVignetteMin(colors.vignetteMin);
+    }
+}
+
+void BannerHost::tick()
+{
+    // Palette previews (e.g. accent drags in the wizard's QuickSetupPanel)
+    // apply qApp->palette() without firing themeChanged, so re-derive here;
+    // BannerShaderConfig's setters are equality-guarded, so this is a no-op
+    // unless the colours actually changed.
+    applyThemeColors();
+    if (config) {
+        qreal t = elapsed.elapsed() / 1000.0;
+        config->setTime(t);
+        // Visible breathing for the logo: oscillates between 0.0 and 1.0
+        qreal glow = 0.5 + 0.5 * qSin(t * 0.4);
+        config->setLogoGlow(glow);
+    }
+}
diff --git a/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.h b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.h
new file mode 100644
index 000000000..6fa0c703f
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.h
@@ -0,0 +1,93 @@
+#ifndef SHADER_BANNER_WIDGET_H
+#define SHADER_BANNER_WIDGET_H
+
+#include <QColor>
+#include <QElapsedTimer>
+#include <QTimer>
+#include <QWidget>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class BannerShaderConfig;
+class QQuickWidget;
+class GradientFallbackWidget;
+class QStackedLayout;
+
+/** @brief Onboarding banner: a subtle, looping brand-shader animation, one of six
+ *         per-page "motifs" driving the same prebaked fragment shader
+ *         (onboarding/shaders/brand_banner.frag) with different uniform values, so
+ *         every page feels distinct but unmistakably part of the same family.
+ *
+ * Motif switches crossfade smoothly (see BrandBanner.qml's two stacked
+ * ShaderEffect layers + Behavior on opacity) rather than cutting instantly
+ * -- BannerHost just writes the new preset into whichever layer is
+ * currently hidden and flips BannerShaderConfig::frontIsA; QML handles the
+ * actual animation declaratively.
+ *
+ * Falls back to a static two-stop gradient (no shader, no QQuickWidget) if
+ * the platform's Qt Quick scenegraph can't initialize -- e.g. software
+ * rendering only, or a CI/VM environment with no GPU -- so onboarding
+ * never blocks or blanks out over a graphics driver problem. The fallback
+ * is permanent for the lifetime of this widget once triggered. */
+class BannerHost : public QWidget
+{
+    Q_OBJECT
+
+public:
+    enum class Motif
+    {
+        Welcome,
+        CardDatabase,
+        Theming,
+        Account,
+        Preferences,
+        Finish,
+    };
+
+    explicit BannerHost(QWidget *parent = nullptr);
+
+    void setMotif(Motif motif);
+
+protected:
+    void showEvent(QShowEvent *event) override;
+    void hideEvent(QHideEvent *event) override;
+    void resizeEvent(QResizeEvent *event) override;
+
+private slots:
+    void tick();
+    void onSceneGraphFailed();
+    void applyThemeColors();
+
+private:
+    struct Preset
+    {
+        qreal mode;
+        qreal speed;
+        qreal seed;
+    };
+
+    static Preset presetFor(Motif motif);
+
+    void applyMotifPreset(Motif motif);
+    void updateAspect();
+    void activateFallback();
+
+    QStackedLayout *stack;
+    QQuickWidget *quickWidget = nullptr;
+    BannerShaderConfig *config = nullptr;
+    GradientFallbackWidget *fallback = nullptr;
+
+    // Palette-derived banner colours -- the theme's window hue forced down to
+    // the banner's curated darkness, plus the theme's Highlight as accent.
+    QColor bannerColorA;
+    QColor bannerColorB;
+    QColor bannerAccent;
+
+    QTimer clock;
+    QElapsedTimer elapsed;
+    Motif currentMotif = Motif::Welcome;
+    bool usingFallback = false;
+    bool isFirstApply = true;
+};
+
+#endif // SHADER_BANNER_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/onboarding/shaders/brand_banner.frag b/cockatrice/src/interface/widgets/onboarding/shaders/brand_banner.frag
new file mode 100644
index 000000000..2bf6d0abf
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/shaders/brand_banner.frag
@@ -0,0 +1,468 @@
+#version 440
+
+// ════════════════════════════════════════════════════════════════════════
+// brand_banner.frag
+//
+// One shader, six motifs (uMode 0..5).  All motifs composite over a shared
+// backgroundField() whose colour is flow-noise-modulated blend of uColorA
+// and uColorB.  SDFs operate in aspect-corrected space (ac.x = uv.x *
+// uAspect) to preserve shape proportions on the wide banner.
+//
+// IMPORTANT: the uniform block below must list custom uniforms in EXACTLY
+// the order they're declared as properties on each ShaderEffect instance in
+// BrandBanner.qml (after the two Qt-supplied members, qt_Matrix/qt_Opacity).
+// ════════════════════════════════════════════════════════════════════════
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(std140, binding = 0) uniform buf
+{
+    mat4 qt_Matrix;
+    float qt_Opacity;
+    float iTime;
+    float uAspect;
+    float uMode;
+    float uSpeed;
+    float uSeed;
+    vec4 uColorA;
+    vec4 uColorB;
+    vec4 uAccent;
+    vec4 uGlowColor;
+    float uVignetteMin;
+    float uLogoGlow;
+};
+
+// ── Primitives ──────────────────────────────────────────────────────────
+
+float hash21(vec2 p)
+{
+    p = fract(p * vec2(123.34, 456.21));
+    p += dot(p, p + 45.32);
+    return fract(p.x * p.y);
+}
+
+float valueNoise(vec2 p)
+{
+    vec2 i = floor(p);
+    vec2 f = fract(p);
+    float a = hash21(i);
+    float b = hash21(i + vec2(1.0, 0.0));
+    float c = hash21(i + vec2(0.0, 1.0));
+    float d = hash21(i + vec2(1.0, 1.0));
+    vec2 u = f * f * (3.0 - 2.0 * f);
+    return mix(mix(a, b, u.x), mix(c, d, u.x), u.y);
+}
+
+float fbm(vec2 p)
+{
+    float v = 0.0;
+    float amp = 0.5;
+    for (int i = 0; i < 3; i++) {
+        v += amp * valueNoise(p);
+        p *= 2.03;
+        amp *= 0.5;
+    }
+    return v;
+}
+
+float flowNoise(vec2 p, float t)
+{
+    vec2 warp1 = vec2(fbm(p + vec2(0.0, 0.0)), fbm(p + vec2(5.2, 1.3)));
+    vec2 warp2 = vec2(fbm(p + 4.0 * warp1 + vec2(1.7, 9.2) + t * 0.6),
+                      fbm(p + 4.0 * warp1 + vec2(8.3, 2.8) - t * 0.5));
+    return fbm(p + 4.0 * warp2 + t * 0.15);
+}
+
+float bloom(float d, float coreRadius, float haloRadius)
+{
+    float core = exp(-(d * d) / (coreRadius * coreRadius));
+    float halo = exp(-d / haloRadius) * 0.35;
+    return core + halo;
+}
+
+float roundedBoxSDF(vec2 p, vec2 halfSize, float radius)
+{
+    vec2 d = abs(p) - halfSize + radius;
+    return length(max(d, 0.0)) - radius + min(max(d.x, d.y), 0.0);
+}
+
+// Rotated box SDF -- applies 2D rotation to p before evaluating roundedBoxSDF.
+float rotatedBoxSDF(vec2 p, vec2 halfSize, float radius, float angle)
+{
+    float c = cos(angle);
+    float s = sin(angle);
+    vec2 rp = vec2(p.x * c - p.y * s, p.x * s + p.y * c);
+    return roundedBoxSDF(rp, halfSize, radius);
+}
+
+float vignette(vec2 uv)
+{
+    vec2 c = uv - 0.5;
+    c.x *= max(uAspect, 0.0001);
+    return smoothstep(1.0, 0.25, length(c));
+}
+
+// ── Shared background ───────────────────────────────────────────────────
+
+vec3 backgroundField(vec2 uv, float time)
+{
+    // Diagonal luminance gradient from (0,0) to (1,1) used as blend factor
+    // between uColorA and uColorB; modulated by flowNoise.
+    float baseD = smoothstep(0.0, 1.0, uv.y * 0.5 + uv.x * 0.2);
+    float painted = flowNoise(uv * 1.5, time * 0.04) - 0.5;
+    baseD = clamp(baseD + painted * 0.12, 0.0, 1.0);
+
+    vec3 col = mix(uColorA.rgb, uColorB.rgb, baseD);
+
+    // Low-frequency fBM noise pushes local colour toward uColorB for depth
+    float deep = fbm(uv * 1.0 + vec2(37.1, 12.4) + time * 0.015);
+    col = mix(col, uColorB.rgb, (deep - 0.5) * 0.08);
+
+    // Accent-coloured fog layer: flowNoise peaks above 0.6 contribute accent
+    float fog = flowNoise(uv * 0.8 + vec2(100.0, 50.0), time * 0.02);
+    col += uAccent.rgb * max(fog - 0.6, 0.0) * 0.14;
+
+    return col;
+}
+
+// ── Motifs ──────────────────────────────────────────────────────────────
+
+// Centre bloom, flow-noise shimmer gated to centre, and 48 orbiting ember
+// particles that deflect into a tight ring near the centre.
+vec3 motifWelcome(vec2 uv, vec3 bg, float t)
+{
+    vec3 col = bg;
+    float asp = max(uAspect, 0.001);
+    vec2 ac = vec2(uv.x * asp, uv.y);
+    vec2 center = vec2(asp * 0.5, 0.5);
+    float cDist = length(ac - center);
+
+    // Centre bloom at logo position; intensity scales with uLogoGlow. The
+    // QML brandGlow halo now supplies the primary logo surround (the two
+    // brand appColors), so this shader bloom is deliberately kept as a subtle
+    // ambience rather than a competing glow.
+    float centreLight = bloom(cDist, 0.08 * asp, 0.40 * asp);
+    col += uGlowColor.rgb * centreLight * 0.20 * uLogoGlow;
+
+    // Flow-noise shimmer gated by Gaussian mask at centre
+    float shimmer = flowNoise(ac * 0.8 + vec2(55.0, 33.0), t * 0.05) * 0.5 + 0.5;
+    float shimmerMask = exp(-(cDist * cDist) / (0.18 * asp * 0.18 * asp));
+    col += uGlowColor.rgb * shimmer * shimmerMask * 0.04 * uLogoGlow;
+
+    // 48 ember particles: hash-seeded position, speed, size, brightness.
+    // Embers within a distance threshold of centre are deflected into an
+    // orbital ring via tangent displacement perpendicular to the centre vector.
+    const int EMBERS = 48;
+    for (int i = 0; i < EMBERS; i++) {
+        float fi = float(i);
+
+        float baseX = hash21(vec2(fi * 7.31 + uSeed, fi * 3.17));
+        float baseY = hash21(vec2(fi * 11.9 + uSeed * 1.4, fi * 5.53));
+
+        float riseSpeed = 0.025 + hash21(vec2(fi * 1.7, uSeed * 2.1)) * 0.035;
+        float driftAmp = 0.04 + hash21(vec2(fi * 9.3, uSeed)) * 0.06;
+        float driftFreq = 0.3 + hash21(vec2(fi * 4.1, uSeed * 3.3)) * 0.5;
+
+        float pX = baseX * asp + sin(t * driftFreq + fi * 1.7) * driftAmp * asp;
+        float pY = fract(baseY + t * riseSpeed);
+
+        float size = 0.010 + hash21(vec2(fi * 2.9, uSeed * 4.7)) * 0.014;
+        float bright = 0.18 + hash21(vec2(fi * 6.1, uSeed * 0.9)) * 0.32;
+
+        // Fade out near top/bottom edges
+        float edgeFade = smoothstep(0.0, 0.12, pY) * smoothstep(1.0, 0.88, pY);
+        float twinkle = 0.6 + 0.4 * sin(t * (1.2 + fi * 0.37) + fi * 2.9);
+
+        vec2 ePos = vec2(pX, pY);
+
+        // Embers near centre: deflect into orbital ring via tangent displacement
+        vec2 toCenter = ePos - center;
+        float distToCenter = length(toCenter);
+        float ringWeight = smoothstep(0.38 * asp, 0.06 * asp, distToCenter);
+
+        float orbitPhase = t * (0.15 + fi * 0.020) + fi * 2.3;
+        float orbitAmount = 0.020 + hash21(vec2(fi * 12.3, uSeed * 2.7)) * 0.020;
+        vec2 tangent = vec2(-toCenter.y, toCenter.x);
+        vec2 deflected = ePos + tangent * ringWeight * orbitAmount * asp * sin(orbitPhase);
+
+        float pushOut = ringWeight * (0.008 + hash21(vec2(fi * 6.7, uSeed * 1.1)) * 0.012) * asp;
+        deflected += normalize(toCenter + 0.001) * pushOut;
+
+        float dist = length(ac - deflected);
+        float intensity = bright * edgeFade * twinkle;
+        col += uAccent.rgb * bloom(dist, size, size * 4.0) * intensity;
+    }
+
+    return col;
+}
+
+// 25 card-shaped box SDFs at parallax depths drifting horizontally across
+// the banner; each card has a semi-transparent fill, accent outline, and
+// card-back diamond pattern.
+vec3 motifCardDatabase(vec2 uv, vec3 bg, float t)
+{
+    vec3 col = bg;
+    float asp = max(uAspect, 0.001);
+    vec2 ac = vec2(uv.x * asp, uv.y);
+
+    const int CARDS = 25;
+    for (int i = 0; i < CARDS; i++) {
+        float fi = float(i);
+
+        // Parallax depth via hash; used to scale size, speed, brightness
+        float depth = hash21(vec2(fi * 1.37 + uSeed, fi * 0.91));
+
+        // Card dimensions in corrected space (portrait: height > width)
+        float cardH = mix(0.055, 0.15, depth);
+        cardH *= 0.85 + 0.30 * hash21(vec2(fi * 3.14, uSeed * 2.71));
+        float cardW = cardH * 0.71; // 5:7 ratio
+
+        // Horizontal drift; nearer cards (higher depth) move faster
+        float speed = mix(0.06, 0.18, depth);
+        float xPhase = hash21(vec2(fi * 7.13, uSeed * 4.37));
+        xPhase = fract(xPhase + t * speed);
+        float x = mix(-1.5, asp + 1.5, xPhase);
+
+        // Vertical position: hash distribution with sinusoidal oscillation
+        float yBase = hash21(vec2(fi * 2.91, uSeed * 1.63));
+        float y = yBase + sin(t * 0.6 + fi * 1.9) * 0.035;
+        y = clamp(y, cardH + 0.02, 1.0 - cardH - 0.02);
+
+        // Random rotation angle ±4 degrees
+        float tilt = (hash21(vec2(fi * 5.71, uSeed * 8.29)) - 0.5) * 0.14;
+
+        vec2 p = ac - vec2(x, y);
+        float d = rotatedBoxSDF(p, vec2(cardW, cardH), cardW * 0.14, tilt);
+
+        // Semi-transparent dark fill
+        float fill = smoothstep(0.015, -0.005, d);
+        col = mix(col, uColorB.rgb * 0.60, fill * 0.62);
+
+        // Accent outline
+        float edge = smoothstep(0.035, 0.0, abs(d));
+        col += uAccent.rgb * edge * mix(0.18, 0.50, 1.0 - depth);
+
+        // Card-back diamond: smaller rotated box inset from card edges
+        float innerD = rotatedBoxSDF(p, vec2(cardW * 0.45, cardH * 0.55), cardW * 0.08, tilt);
+        float innerEdge = smoothstep(0.012, 0.0, abs(innerD));
+        col += uAccent.rgb * innerEdge * fill * 0.12 * (1.0 - depth);
+
+        // Centre dot
+        float dotDist = length(p);
+        col += uAccent.rgb * bloom(dotDist, 0.008, 0.02) * fill * 0.15 * (1.0 - depth);
+    }
+    return col;
+}
+
+// 4 horizontal bands with multi-frequency sinusoidal warp and pulsing width.
+vec3 motifTheming(vec2 uv, vec3 bg, float t)
+{
+    vec3 col = bg;
+
+    const int BANDS = 4;
+    for (int i = 0; i < BANDS; i++) {
+        float fi = float(i);
+        float yCenter = 0.18 + fi * 0.22;
+
+        // Three summed sinusoids for horizontal undulation
+        float wave = sin(uv.x * 3.2 + t * 0.5 + fi * 2.1) * 0.08;
+        wave += sin(uv.x * 7.0 - t * 0.3 + fi * 1.3) * 0.035;
+        wave += sin(uv.x * 1.6 + t * 0.18 + fi * 3.7) * 0.05;
+
+        float bandDist = abs(uv.y - yCenter - wave);
+        float bandWidth = 0.04 + sin(t * 0.2 + fi * 0.8) * 0.012;
+        float band = smoothstep(bandWidth, 0.0, bandDist);
+
+        // Upper bands have higher intensity
+        float intensity = mix(0.15, 0.38, 1.0 - fi / float(BANDS));
+        col += uAccent.rgb * band * intensity;
+    }
+
+    return col;
+}
+
+// 14 nodes at pseudo-random positions with sinusoidal pulse; edges drawn
+// between nodes within a threshold distance; central glow + periodic ring.
+vec3 motifAccount(vec2 uv, vec3 bg, float t)
+{
+    vec3 col = bg;
+    float asp = max(uAspect, 0.001);
+    vec2 ac = vec2(uv.x * asp, uv.y);
+    vec2 center = vec2(asp * 0.5, 0.5);
+
+    const int NODES = 14;
+    vec2 nodePos[14];
+    float nodePulse[14];
+
+    for (int i = 0; i < NODES; i++) {
+        float fi = float(i);
+
+        // Hash-seeded position with gentle sinusoidal drift
+        float nx = hash21(vec2(fi * 3.17 + uSeed, fi * 1.93)) * asp;
+        float ny = hash21(vec2(fi * 5.41 + uSeed * 1.7, fi * 2.79));
+
+        float dx = sin(t * 0.12 + fi * 1.7) * 0.08;
+        float dy = cos(t * 0.09 + fi * 2.3) * 0.04;
+        vec2 pos = vec2(nx + dx, ny + dy);
+        nodePos[i] = pos;
+
+        // Per-node pulse phase, normalised to [0, 1]
+        float pulsePhase = hash21(vec2(fi * 4.31, uSeed * 6.17));
+        float pulse = sin(t * 0.8 + pulsePhase * 6.283) * 0.5 + 0.5;
+        nodePulse[i] = pulse;
+
+        // Node glow via bloom; intensity modulated by pulse
+        float dist = length(ac - pos);
+        col += uAccent.rgb * bloom(dist, 0.018, 0.08) * mix(0.30, 0.55, pulse);
+    }
+
+    // Edges: connect nodes within a radius threshold
+    float connectDist = asp * 0.22;
+    for (int i = 0; i < NODES; i++) {
+        for (int j = i + 1; j < NODES; j++) {
+            float pairDist = length(nodePos[i] - nodePos[j]);
+            if (pairDist < connectDist) {
+                float strength = 1.0 - pairDist / connectDist;
+                vec2 pa = ac - nodePos[i];
+                vec2 ba = nodePos[j] - nodePos[i];
+                float h = clamp(dot(pa, ba) / dot(ba, ba), 0.0, 1.0);
+                float lineDist = length(pa - ba * h);
+                col += uAccent.rgb * smoothstep(0.010, 0.0, lineDist) * strength * 0.14;
+            }
+        }
+    }
+
+    // Central bloom at banner centre
+    float cDist = length(ac - center);
+    col += uAccent.rgb * bloom(cDist, 0.04, 0.25) * 0.20;
+
+    // Periodic expanding ring from centre
+    float ripplePhase = t * 0.4;
+    float rippleDist = abs(cDist - fract(ripplePhase) * asp * 0.7);
+    col += uAccent.rgb * smoothstep(0.02, 0.0, rippleDist) * 0.14;
+
+    return col;
+}
+
+// 18x5 toggle-grid of rounded boxes with hash-driven on/off per cell;
+// a scanning highlight sweeps L-to-R, brightening cells near the scan line.
+vec3 motifPreferences(vec2 uv, vec3 bg, float t)
+{
+    vec3 col = bg;
+
+    float cols = 18.0;
+    float rows = 5.0;
+    vec2 gridUV = uv * vec2(cols, rows);
+    vec2 cell = fract(gridUV) - 0.5;
+    vec2 cellId = floor(gridUV);
+
+    // On/off state per cell, hash-seeded for pseudo-randomness
+    float on = step(0.55, hash21(cellId + uSeed * 10.0));
+
+    float d = roundedBoxSDF(cell, vec2(0.28, 0.32), 0.06);
+
+    // Filled "on" cells
+    float cellFill = smoothstep(0.04, -0.02, d);
+    col += uAccent.rgb * cellFill * on * 0.18;
+
+    // Cell borders (drawn on all cells)
+    float border = smoothstep(0.025, 0.0, abs(d));
+    col += uAccent.rgb * border * 0.06;
+
+    // Scanning highlight: thin line + soft glow sweeping L-to-R
+    float scanX = fract(t * 0.15);
+    float scanDist = abs(uv.x - scanX);
+    float scanLine = smoothstep(0.015, 0.0, scanDist);
+    col += uAccent.rgb * scanLine * 0.40;
+
+    float scanGlow = smoothstep(0.08, 0.0, scanDist);
+    col += uAccent.rgb * scanGlow * 0.08;
+
+    // "On" cells near the scan line get extra brightness
+    float scanProximity = smoothstep(0.12, 0.0, scanDist);
+    col += uAccent.rgb * cellFill * on * scanProximity * 0.15;
+
+    return col;
+}
+
+// Centre radial bloom with sinusoidal pulse, 4 expanding ring halos with
+// outer glow falloff, and 35 rising particles.
+vec3 motifFinish(vec2 uv, vec3 bg, float t)
+{
+    vec3 col = bg;
+    float asp = max(uAspect, 0.001);
+    vec2 ac = vec2(uv.x * asp, uv.y);
+    vec2 center = vec2(asp * 0.5, 0.5);
+    float cDist = length(ac - center);
+
+    // Centre bloom with sinusoidal pulse modulation
+    float pulse = 0.65 + 0.35 * sin(t * 0.4);
+    col += uAccent.rgb * bloom(cDist, 0.12, 0.55) * 0.10 * pulse;
+
+    // 4 expanding rings: radius increases via phase; ring width grows with
+    // expansion; combined with exponential outer glow falloff
+    for (int i = 0; i < 4; i++) {
+        float fi = float(i);
+        float phase = fract(t * 0.06 + fi * 0.25);
+        float ringRadius = phase * asp * 0.7;
+        float ringDist = abs(cDist - ringRadius);
+        float ringWidth = 0.025 + phase * 0.025;
+        float ring = smoothstep(ringWidth, 0.0, ringDist);
+        float outerGlow = exp(-ringDist / (0.03 + phase * 0.02)) * 0.3;
+        float combined = ring + outerGlow;
+        float fade = 1.0 - phase * 0.5;
+        col += uAccent.rgb * combined * fade * 0.15;
+    }
+
+    // 35 particles rising vertically with sinusoidal horizontal drift;
+    // each particle uses bloom with edge fade and twinkle animation
+    const int PARTICLES = 35;
+    for (int i = 0; i < PARTICLES; i++) {
+        float fi = float(i);
+        float baseX = hash21(vec2(fi * 13.7 + uSeed, fi * 7.31));
+        float baseY = hash21(vec2(fi * 23.1 + uSeed * 1.9, fi * 11.3));
+
+        float riseSpeed = 0.04 + hash21(vec2(fi * 3.1, uSeed * 2.7)) * 0.06;
+        float driftAmp = 0.03 + hash21(vec2(fi * 8.9, uSeed)) * 0.05;
+        float driftFreq = 0.4 + hash21(vec2(fi * 5.3, uSeed * 4.1)) * 0.6;
+
+        float pX = baseX * asp + sin(t * driftFreq + fi * 2.3) * driftAmp * asp;
+        float pY = fract(baseY + t * riseSpeed);
+
+        float size = 0.005 + hash21(vec2(fi * 4.7, uSeed * 3.9)) * 0.010;
+        float bright = 0.12 + hash21(vec2(fi * 7.1, uSeed * 1.3)) * 0.25;
+
+        float edgeFade = smoothstep(0.0, 0.1, pY) * smoothstep(1.0, 0.9, pY);
+        float twinkle = 0.5 + 0.5 * sin(t * (1.8 + fi * 0.43) + fi * 3.1);
+
+        vec2 pPos = vec2(pX, pY);
+        float dist = length(ac - pPos);
+        col += uAccent.rgb * bloom(dist, size, size * 3.5) * bright * edgeFade * twinkle;
+    }
+
+    return col;
+}
+
+// ── Main ────────────────────────────────────────────────────────────────
+
+void main()
+{
+    vec2 uv = qt_TexCoord0;
+    float t = iTime * uSpeed;
+
+    vec3 bg = backgroundField(uv, iTime);
+
+    vec3 col;
+    if (uMode < 0.5) col = motifWelcome(uv, bg, t);
+    else if (uMode < 1.5) col = motifCardDatabase(uv, bg, t);
+    else if (uMode < 2.5) col = motifTheming(uv, bg, t);
+    else if (uMode < 3.5) col = motifAccount(uv, bg, t);
+    else if (uMode < 4.5) col = motifPreferences(uv, bg, t);
+    else col = motifFinish(uv, bg, t);
+
+    // Corner vignette; uVignetteMin is scheme-driven (0.62 on dark stages,
+    // gentler on light ones so near-white corners don't go muddy grey).
+    col *= mix(uVignetteMin, 1.0, vignette(uv));
+    fragColor = vec4(col, 1.0) * qt_Opacity;
+}
diff --git a/cockatrice/src/interface/widgets/onboarding/shaders/brand_plate.frag b/cockatrice/src/interface/widgets/onboarding/shaders/brand_plate.frag
new file mode 100644
index 000000000..43b798c9f
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/shaders/brand_plate.frag
@@ -0,0 +1,42 @@
+#version 440
+
+// The logo's gradient plate, drawn by us rather than the baked-in SVG: a
+// linear blend between the two brand appColors (light AccentSoft at the
+// top-left grading to dark AccentStrong at the bottom-right, mirroring
+// cockatrice.svg's linearGradient4265-7-8 userSpaceOnUse axis), clipped to
+// the bird's full silhouette via the full-color logo's alpha (uSilhouette).
+// The white highlight path (cockatrice-logo-white) is overlaid in QML on top,
+// exactly as the SVG stacks its white path over the gradient paths. Fully
+// static: no glow, no breathing — the plate just sits there like the home
+// widget's QPainter composite.
+
+layout(location = 0) in vec2 qt_TexCoord0;
+layout(location = 0) out vec4 fragColor;
+
+layout(std140, binding = 0) uniform buf
+{
+    mat4 qt_Matrix;
+    float qt_Opacity;
+    vec4 uStrong;
+    vec4 uSoft;
+};
+
+// The full-color logo's alpha channel acts as the silhouette mask: the
+// gradient only appears inside the bird, exactly like the SVG's gradient paths.
+layout(binding = 1) uniform sampler2D uSilhouette;
+
+void main()
+{
+    // Recreate cockatrice.svg's own gradient geometry (linearGradient4265-7-8,
+    // userSpaceOnUse): light AccentSoft at the start point S=(-8.097,-97.746),
+    // dark AccentStrong at the end E=(162.455,295.208), on the SVG's 300x300
+    // canvas. Normalized to UV space, V=E-S=(0.5685,1.3098), so
+    // t = dot(uv - S_norm, V)/|V|^2 with S_norm=(-0.0270,-0.3258).
+    float t = clamp(dot(qt_TexCoord0 - vec2(-0.02699, -0.32582), vec2(0.56851, 1.30985)) / 2.03891, 0.0, 1.0);
+    vec3 color = mix(uSoft.rgb, uStrong.rgb, t);
+
+    // Anti-aliased silhouette clip from the full-color logo's alpha.
+    float alpha = texture(uSilhouette, qt_TexCoord0).a;
+
+    fragColor = vec4(color * alpha, alpha) * qt_Opacity;
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.cpp b/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.cpp
new file mode 100644
index 000000000..004bdcc11
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.cpp
@@ -0,0 +1,90 @@
+#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)
+{
+    setFixedHeight(kDotDiameter + 2 * kVerticalMargin);
+}
+
+void StepIndicatorWidget::setStepCount(int count)
+{
+    stepCount = qMax(0, count);
+    currentStep = qBound(0, currentStep, qMax(0, stepCount - 1));
+    updateGeometry();
+    update();
+}
+
+void StepIndicatorWidget::setCurrentStep(int index)
+{
+    if (stepCount == 0) {
+        return;
+    }
+    currentStep = qBound(0, index, stepCount - 1);
+    update();
+}
+
+QSize StepIndicatorWidget::sizeHint() const
+{
+    return minimumSizeHint();
+}
+
+QSize StepIndicatorWidget::minimumSizeHint() const
+{
+    if (stepCount == 0) {
+        return QSize(0, height());
+    }
+    int width = kActiveDotWidth + (stepCount - 1) * kDotDiameter + (stepCount - 1) * kDotSpacing;
+    return QSize(width, height());
+}
+
+void StepIndicatorWidget::paintEvent(QPaintEvent * /*event*/)
+{
+    if (stepCount == 0) {
+        return;
+    }
+
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+
+    const QColor activeColor = palette().color(QPalette::Highlight);
+
+    // QPalette::Mid alpha-blended against a dark Window background reads as
+    // near-invisible (Mid is itself a dark grey in dark palettes -- see
+    // PaletteGenerator's satShadeLo/Dark roles). WindowText is guaranteed to
+    // contrast against Window in any theme by definition, so alpha-blending
+    // *that* instead keeps the dots visibly dim-but-present in both light and
+    // dark schemes. Same trick PaletteGenerator uses for placeholder text.
+    QColor inactiveColor = palette().color(QPalette::WindowText);
+    inactiveColor.setAlpha(100);
+
+    int totalWidth = 0;
+    for (int i = 0; i < stepCount; ++i) {
+        totalWidth += (i == currentStep) ? kActiveDotWidth : kDotDiameter;
+        if (i > 0) {
+            totalWidth += kDotSpacing;
+        }
+    }
+
+    int x = (width() - totalWidth) / 2;
+    const int y = height() / 2;
+
+    for (int i = 0; i < stepCount; ++i) {
+        const bool active = (i == currentStep);
+        const int dotWidth = active ? kActiveDotWidth : kDotDiameter;
+
+        QPainterPath path;
+        QRectF rect(x, y - kDotDiameter / 2.0, dotWidth, kDotDiameter);
+        path.addRoundedRect(rect, kDotDiameter / 2.0, kDotDiameter / 2.0);
+        painter.fillPath(path, active ? activeColor : inactiveColor);
+
+        x += dotWidth + kDotSpacing;
+    }
+}
diff --git a/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.h b/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.h
new file mode 100644
index 000000000..d2b5dfcb5
--- /dev/null
+++ b/cockatrice/src/interface/widgets/onboarding/step_indicator_widget.h
@@ -0,0 +1,35 @@
+#ifndef STEP_INDICATOR_WIDGET_H
+#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. */
+class StepIndicatorWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit StepIndicatorWidget(QWidget *parent = nullptr);
+
+    void setStepCount(int count);
+    void setCurrentStep(int index);
+
+    QSize sizeHint() const override;
+    QSize minimumSizeHint() const override;
+
+protected:
+    void paintEvent(QPaintEvent *event) override;
+
+private:
+    int stepCount = 0;
+    int currentStep = 0;
+
+    static constexpr int kDotDiameter = 8;
+    static constexpr int kActiveDotWidth = 22;
+    static constexpr int kDotSpacing = 10;
+    static constexpr int kVerticalMargin = 6;
+};
+
+#endif // STEP_INDICATOR_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.cpp b/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.cpp
new file mode 100644
index 000000000..f77aefb33
--- /dev/null
+++ b/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.cpp
@@ -0,0 +1,196 @@
+#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>
+#include <QDialogButtonBox>
+#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);
+    setupUi();
+    retranslateUi();
+}
+
+void PlaymatCollectionDialog::accept()
+{
+    auto &interfaceSettings = SettingsCache::instance().userInterface();
+    interfaceSettings.setPlaymatFallbackList(playmats);
+    interfaceSettings.setPlaymatFallbackBehavior(modeCombo->currentData().toInt());
+    QDialog::accept();
+}
+
+int PlaymatCollectionDialog::currentRow() const
+{
+    return playmatList->currentRow();
+}
+
+void PlaymatCollectionDialog::setupUi()
+{
+    auto &interfaceSettings = SettingsCache::instance().userInterface();
+    playmats = interfaceSettings.getPlaymatFallbackList();
+
+    playmatList = new QListWidget;
+    for (const PlaymatInfo &entry : playmats) {
+        playmatList->addItem(entry.card.name);
+    }
+    connect(playmatList, &QListWidget::itemSelectionChanged, this, &PlaymatCollectionDialog::selectionChanged);
+    connect(playmatList, &QListWidget::itemDoubleClicked, this, [this](QListWidgetItem *) { editPlaymat(); });
+
+    addButton = new QPushButton;
+    editButton = new QPushButton;
+    removeButton = new QPushButton;
+    moveUpButton = new QPushButton;
+    moveDownButton = new QPushButton;
+
+    connect(addButton, &QPushButton::clicked, this, &PlaymatCollectionDialog::addPlaymat);
+    connect(editButton, &QPushButton::clicked, this, &PlaymatCollectionDialog::editPlaymat);
+    connect(removeButton, &QPushButton::clicked, this, &PlaymatCollectionDialog::removePlaymat);
+    connect(moveUpButton, &QPushButton::clicked, this, &PlaymatCollectionDialog::movePlaymatUp);
+    connect(moveDownButton, &QPushButton::clicked, this, &PlaymatCollectionDialog::movePlaymatDown);
+
+    auto *listButtons = new QVBoxLayout;
+    listButtons->addWidget(addButton);
+    listButtons->addWidget(editButton);
+    listButtons->addWidget(removeButton);
+    listButtons->addWidget(moveUpButton);
+    listButtons->addWidget(moveDownButton);
+    listButtons->addStretch();
+
+    auto *listRow = new QHBoxLayout;
+    listRow->addWidget(playmatList, 1);
+    listRow->addLayout(listButtons);
+
+    modeCombo = new QComboBox;
+    modeCombo->addItem(QString(), PlaymatFallbackModeFixed);
+    modeCombo->addItem(QString(), PlaymatFallbackModeRoundRobin);
+    modeCombo->addItem(QString(), PlaymatFallbackModeRandom);
+    const int modeIndex = modeCombo->findData(interfaceSettings.getPlaymatFallbackBehavior());
+    if (modeIndex >= 0) {
+        modeCombo->setCurrentIndex(modeIndex);
+    }
+
+    auto *modeRow = new QHBoxLayout;
+    modeLabel = new QLabel;
+    modeLabel->setBuddy(modeCombo);
+    modeRow->addWidget(modeLabel);
+    modeRow->addWidget(modeCombo, 1);
+
+    auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &PlaymatCollectionDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+    auto *root = new QVBoxLayout;
+    root->addLayout(listRow);
+    root->addLayout(modeRow);
+    root->addWidget(buttonBox);
+    setLayout(root);
+
+    selectionChanged();
+}
+
+void PlaymatCollectionDialog::selectionChanged()
+{
+    const bool hasSelection = playmatList->currentRow() >= 0;
+    editButton->setEnabled(hasSelection);
+    removeButton->setEnabled(hasSelection);
+    moveUpButton->setEnabled(hasSelection && playmatList->currentRow() > 0);
+    moveDownButton->setEnabled(hasSelection && playmatList->currentRow() < playmatList->count() - 1);
+}
+
+void PlaymatCollectionDialog::addPlaymat()
+{
+    PlaymatSettingsDialog dialog(CardRef{}, PlaymatParams{}, this);
+    if (dialog.exec() == QDialog::Accepted) {
+        const CardRef card = dialog.card();
+        if (!card.isEmpty()) {
+            PlaymatInfo res = {card, dialog.params()};
+            playmats.append(res);
+            playmatList->addItem(res.card.name);
+            playmatList->setCurrentRow(playmatList->count() - 1);
+        }
+    }
+}
+
+void PlaymatCollectionDialog::editPlaymat()
+{
+    const int row = currentRow();
+    if (row < 0) {
+        return;
+    }
+
+    const PlaymatInfo &current = playmats.at(row);
+    PlaymatSettingsDialog dialog(current.card, current.params, this);
+    if (dialog.exec() == QDialog::Accepted) {
+        const CardRef card = dialog.card();
+        if (card.isEmpty()) {
+            return; // Removal is handled by the Remove button
+        }
+        playmats[row] = {card, dialog.params()};
+        playmatList->item(row)->setText(card.name);
+    }
+}
+
+void PlaymatCollectionDialog::removePlaymat()
+{
+    const int row = currentRow();
+    if (row < 0) {
+        return;
+    }
+    playmats.removeAt(row);
+    delete playmatList->takeItem(row);
+    selectionChanged();
+}
+
+void PlaymatCollectionDialog::movePlaymatUp()
+{
+    const int row = currentRow();
+    if (row <= 0) {
+        return;
+    }
+    playmats.swapItemsAt(row, row - 1);
+    playmatList->insertItem(row - 1, playmatList->takeItem(row));
+    playmatList->setCurrentRow(row - 1);
+    selectionChanged();
+}
+
+void PlaymatCollectionDialog::movePlaymatDown()
+{
+    const int row = currentRow();
+    if (row < 0 || row >= playmats.size() - 1) {
+        return;
+    }
+    playmats.swapItemsAt(row, row + 1);
+    playmatList->insertItem(row + 1, playmatList->takeItem(row));
+    playmatList->setCurrentRow(row + 1);
+    selectionChanged();
+}
+
+void PlaymatCollectionDialog::retranslateUi()
+{
+    setWindowTitle(tr("Default Playmats"));
+    addButton->setText(tr("Add..."));
+    editButton->setText(tr("Edit..."));
+    removeButton->setText(tr("Remove"));
+    moveUpButton->setText(tr("Move Up"));
+    moveDownButton->setText(tr("Move Down"));
+    modeLabel->setText(tr("List mode:"));
+    modeCombo->setItemText(0, tr("Fixed (always the first entry)"));
+    modeCombo->setItemText(1, tr("Round-robin (cycle through entries)"));
+    modeCombo->setItemText(2, tr("Random (pick one per game)"));
+}
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.h b/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.h
new file mode 100644
index 000000000..a04cfdf54
--- /dev/null
+++ b/cockatrice/src/interface/widgets/playmat/playmat_collection_dialog.h
@@ -0,0 +1,56 @@
+#ifndef COCKATRICE_PLAYMAT_COLLECTION_DIALOG_H
+#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 QPushButton;
+class QWidget;
+
+/**
+ * @brief Dialog for editing the user-level playmat collection.
+ *
+ * The collection is the fallback used when a deck has no playmat of its own.
+ * It supports multiple entries and a pick mode (always first / round-robin /
+ * random). The dialog edits a working copy and writes it to the settings only
+ * when accepted.
+ */
+class PlaymatCollectionDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit PlaymatCollectionDialog(QWidget *parent = nullptr);
+
+    void accept() override;
+
+private slots:
+    void addPlaymat();
+    void editPlaymat();
+    void removePlaymat();
+    void movePlaymatUp();
+    void movePlaymatDown();
+    void selectionChanged();
+
+private:
+    void setupUi();
+    void retranslateUi();
+    int currentRow() const;
+
+    QList<PlaymatInfo> playmats; ///< Working copy edited by the dialog.
+    QListWidget *playmatList;
+    QComboBox *modeCombo;
+    QLabel *modeLabel;
+    QPushButton *addButton;
+    QPushButton *editButton;
+    QPushButton *removeButton;
+    QPushButton *moveUpButton;
+    QPushButton *moveDownButton;
+};
+
+#endif // COCKATRICE_PLAYMAT_COLLECTION_DIALOG_H
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.cpp b/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.cpp
new file mode 100644
index 000000000..881866292
--- /dev/null
+++ b/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.cpp
@@ -0,0 +1,390 @@
+#include "playmat_preview_widget.h"
+
+#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 <QWheelEvent>
+#include <QtGlobal>
+#include <cmath>
+#include <qnamespace.h>
+
+namespace
+{
+// Mirrors the dialog/proto clamps so gestures can never produce an
+// out of range parameter. The zoom FLOOR is dynamic: see
+// playmatClampedZoom(), zooming out stops where the sampling window would
+// exceed the card itself, so there is no dead range at the bottom end.
+constexpr qreal MAX_MARGIN = 0.95;
+// Range of in game stack+table aspect ratios worth designing for, derived
+// from PlayerGraphicsItem::paint()'s combinedArea = stack ∪ table:
+//   height = 10 + 30 + 3*102 + 2*30 = 406            (TableZone rows)
+//   width  = 1.5*72 + (20 + 5*72 + 15) = 503         (StackZone + TableZone
+//                                                     at MIN_WIDTH)
+// The area's shape depends on GAME CONTENT (played card columns widen the
+// table by ~107 px each), not on the window size. Fresh board ≈ 503/406,
+// a table grown to roughly double its minimum width ≈ 2.2.
+constexpr qreal MIN_TABLE_ASPECT = 503.0 / 406.0; // fresh board: most generous framing
+constexpr qreal MAX_TABLE_ASPECT = 2.2;           // well developed, wide table
+// Keyboard nudge steps (viewport convention: Down looks further down).
+constexpr qreal KEY_PAN_MARGIN_STEP = 0.005;
+constexpr qreal KEY_PAN_OFFSET_STEP = 0.01;
+constexpr qreal KEY_ZOOM_STEP = 1.05;
+constexpr qreal WHEEL_ZOOM_BASE = 1.15; // zoom factor per wheel notch
+} // namespace
+
+PlaymatPreviewWidget::PlaymatPreviewWidget(QWidget *parent) : QWidget(parent)
+{
+    // The crop is square and drawn contain fit, so the height decides its
+    // on screen size, keep it generous but let the dialog compress on small
+    // or high DPI screens
+    setMinimumSize(400, 180);
+    QSizePolicy sp(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    setSizePolicy(sp);
+    setFocusPolicy(Qt::StrongFocus);
+    setCursor(Qt::OpenHandCursor);
+    setAccessibleName(tr("Playmat crop"));
+    setAccessibleDescription(tr("Zoom %1×").arg(QString::number(params.zoom, 'f', 2)));
+}
+
+void PlaymatPreviewWidget::setPixmap(const QPixmap &pixmap)
+{
+    sourcePixmap = pixmap;
+    setCursor(sourcePixmap.isNull() ? Qt::ArrowCursor : Qt::OpenHandCursor);
+    update();
+}
+
+void PlaymatPreviewWidget::setParams(const PlaymatParams &p)
+{
+    params = p;
+    setAccessibleDescription(tr("Zoom %1×").arg(QString::number(params.zoom, 'f', 2)));
+    update();
+}
+
+void PlaymatPreviewWidget::setAttribution(const QString &attribution)
+{
+    attributionText = attribution;
+    update();
+}
+
+QRectF PlaymatPreviewWidget::activePlayArea() const
+{
+    // The viewport is a frame shaped like a fresh board's stack+table area
+    // (kMinTableAspect): the most generous framing the game will produce.
+    // Dimmed strips mark where a wider, developed table crops further.
+    const QRectF cardRect = QRectF(rect()).adjusted(3, 2, -3, -2);
+    return PlaymatUtils::aspectFitRect(cardRect.adjusted(6, 4, -4, -4), MIN_TABLE_ASPECT);
+}
+
+qreal PlaymatPreviewWidget::samplingWindowSide() const
+{
+    if (sourcePixmap.isNull()) {
+        return 0.0;
+    }
+    // Same clamped window the render path uses, gestures and painting must
+    // never disagree about geometry.
+    return PlaymatUtils::playmatWindowSide(sourcePixmap.size(), params);
+}
+
+qreal PlaymatPreviewWidget::widgetToSourceScale() const
+{
+    const qreal cropSide = samplingWindowSide();
+    const QRectF area = activePlayArea();
+    if (cropSide <= 0.0 || area.isEmpty()) {
+        return 0.0;
+    }
+    // Mirror coverFitRect(): the square crop into the (wider) viewport fills
+    // its width.
+    return area.width() / cropSide;
+}
+
+void PlaymatPreviewWidget::applyCropDelta(qreal dMarginL, qreal dMarginR, qreal dOffset, qreal zoomFactor)
+{
+    PlaymatParams next = params;
+    if (dMarginL + dMarginR == 0.0) {
+        // Pure horizontal pan rebalances the margins along their
+        // sum constant segment. Individual bounds must not break that
+        // invariant, otherwise repeated corner drags let one margin grow
+        // without end, collapsing the viewing window and desynchronizing the
+        // visual zoom from the readout.
+        const qreal sum = params.marginPctL + params.marginPctR;
+        const qreal lo = qMax(0.0, sum - MAX_MARGIN);
+        const qreal hi = qMin(sum, MAX_MARGIN);
+        next.marginPctL = qBound(lo, params.marginPctL + dMarginL, hi);
+        next.marginPctR = sum - next.marginPctL;
+    } else {
+        next.marginPctL = qBound(0.0, params.marginPctL + dMarginL, MAX_MARGIN);
+        next.marginPctR = qBound(0.0, params.marginPctR + dMarginR, MAX_MARGIN);
+    }
+    next.verticalOffset = qBound(0.0, params.verticalOffset + dOffset, 1.0);
+    // Clamp through the shared helper so the floor tracks the new margins:
+    // zooming out stops exactly where the window reaches the card bounds.
+    next.zoom = params.zoom * zoomFactor;
+    if (!sourcePixmap.isNull()) {
+        next.zoom = PlaymatUtils::playmatClampedZoom(sourcePixmap.size(), next);
+    }
+
+    if (sameCrop(next, params)) {
+        return;
+    }
+
+    params = next;
+    setAccessibleDescription(tr("Zoom %1×").arg(QString::number(params.zoom, 'f', 2)));
+    update();
+    emit paramsEdited(params);
+}
+
+bool PlaymatPreviewWidget::sameCrop(const PlaymatParams &a, const PlaymatParams &b) const
+{
+    // Exact comparison on purpose: clamped assignments yield identical bits,
+    // while qFuzzyCompare based equality misbehaves around zero
+    return a.marginPctL == b.marginPctL && a.marginPctR == b.marginPctR && a.verticalOffset == b.verticalOffset &&
+           a.zoom == b.zoom;
+}
+
+void PlaymatPreviewWidget::restoreSnapshot()
+{
+    // The snapshot only ever holds values that passed the gesture clamps,
+    // so it is safe to restore verbatim
+    if (sameCrop(paramsAtFocusIn, params)) {
+        return;
+    }
+    params = paramsAtFocusIn;
+    setAccessibleDescription(tr("Zoom %1×").arg(QString::number(params.zoom, 'f', 2)));
+    update();
+    emit paramsEdited(params);
+}
+
+void PlaymatPreviewWidget::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::TextAntialiasing);
+
+    const QRect rect = this->rect();
+    const QColor accentColor(100, 116, 139);
+
+    // Background
+    const QRectF cardRect = QRectF(rect).adjusted(3, 2, -3, -2);
+    QLinearGradient bg(cardRect.topLeft(), cardRect.topRight());
+    bg.setColorAt(0, accentColor.darker(320));
+    bg.setColorAt(1, QColor(18, 22, 30));
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(bg);
+    painter.drawRoundedRect(cardRect, 6, 6);
+    painter.setBrush(accentColor);
+    painter.drawRoundedRect(QRectF(cardRect.left(), cardRect.top(), 3, cardRect.height()), 2, 2);
+
+    if (sourcePixmap.isNull()) {
+        painter.setPen(QColor(150, 150, 150));
+        painter.drawText(rect, Qt::AlignCenter, tr("No card selected"));
+        return;
+    }
+
+    const QRectF playArea = activePlayArea();
+
+    // Exactly the game's pipeline (player_graphics_item): cover fit the crop
+    // into the table shaped viewport, centered, so the frame shows precisely
+    // what a minimum aspect window shows, and dragging moves the art behind
+    // the fixed frame.
+    const QRectF srcRect = PlaymatUtils::computeArtSourceRect(sourcePixmap.size(), params);
+    const QRectF dstRect = PlaymatUtils::coverFitRect(playArea, srcRect.size());
+
+    painter.setClipRect(playArea.toRect());
+    painter.drawPixmap(dstRect, sourcePixmap, srcRect);
+
+    // Wider (developed) tables crop further: mark where a kMaxTableAspect
+    // board stops. Palette driven so theme authors can recolor the markers.
+    const qreal wideBandHeight = playArea.height() * (MIN_TABLE_ASPECT / MAX_TABLE_ASPECT);
+    const qreal stripHeight = (playArea.height() - wideBandHeight) / 2.0;
+    QColor stripColor = palette().color(QPalette::Window);
+    stripColor.setAlpha(150);
+    painter.fillRect(QRectF(playArea.left(), playArea.top(), playArea.width(), stripHeight), stripColor);
+    painter.fillRect(QRectF(playArea.left(), playArea.bottom() - stripHeight, playArea.width(), stripHeight),
+                     stripColor);
+    QColor hairlineColor = palette().color(QPalette::Highlight);
+    hairlineColor.setAlpha(110);
+    painter.setPen(QPen(hairlineColor, 1));
+    painter.drawLine(QPointF(playArea.left(), playArea.top() + stripHeight),
+                     QPointF(playArea.right(), playArea.top() + stripHeight));
+    painter.drawLine(QPointF(playArea.left(), playArea.bottom() - stripHeight),
+                     QPointF(playArea.right(), playArea.bottom() - stripHeight));
+
+    // Draw zone divider: stack is roughly the left portion
+    const double stackWidthRatio = 0.18; // Stack is about 18% of total play area
+    const double stackDividerX = playArea.left() + playArea.width() * stackWidthRatio;
+
+    // Subtle semi transparent overlays to distinguish zones
+    // Stack zone overlay (slightly darker)
+    QRectF stackOverlay(playArea.left(), playArea.top(), playArea.width() * stackWidthRatio, playArea.height());
+    painter.fillRect(stackOverlay, QColor(0, 0, 0, 40));
+
+    // Table zone overlay (very subtle)
+    QRectF tableOverlay(stackDividerX, playArea.top(), playArea.width() * (1.0 - stackWidthRatio), playArea.height());
+    painter.fillRect(tableOverlay, QColor(0, 0, 0, 20));
+
+    // Zone divider line
+    painter.setPen(QPen(QColor(255, 255, 255, 50), 1));
+    painter.drawLine(QPointF(stackDividerX, playArea.top()), QPointF(stackDividerX, playArea.bottom()));
+
+    // Land divider line (about 60% down the table area)
+    const double landDividerY = playArea.top() + playArea.height() * 0.65;
+    painter.setPen(QPen(QColor(255, 255, 255, 30), 1));
+    painter.drawLine(QPointF(stackDividerX, landDividerY), QPointF(playArea.right(), landDividerY));
+    painter.setClipping(false);
+
+    // Border around the viewport = boundary of every plausible framing.
+    painter.setPen(QPen(QColor(70, 80, 95, 120), 1));
+    painter.setBrush(Qt::NoBrush);
+    painter.drawRoundedRect(playArea.adjusted(0, 0, -1, -1), 3, 3);
+
+    // Visible keyboard focus per the focus cursor contract, Tab must show
+    // where the keys land
+    if (hasFocus()) {
+        QPen focusPen(palette().color(QPalette::Highlight), 2);
+        painter.setPen(focusPen);
+        painter.drawRoundedRect(playArea.adjusted(-1, -1, 1, 1), 3, 3);
+    }
+
+    paintArtAttribution(painter, playArea, attributionText, Qt::AlignRight | Qt::AlignBottom, 0.8);
+
+    // Zoom readout so the gesture has a visible, stable counterpart.
+    QColor ink = palette().color(QPalette::WindowText);
+    ink.setAlpha(160);
+    painter.setPen(ink);
+    painter.drawText(QPointF(playArea.left() + 8, playArea.bottom() - 8),
+                     tr("Zoom %1×").arg(QString::number(params.zoom, 'f', 2)));
+}
+
+void PlaymatPreviewWidget::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() != Qt::LeftButton || sourcePixmap.isNull() || samplingWindowSide() <= 0.0) {
+        QWidget::mousePressEvent(event);
+        return;
+    }
+    lastDragPos = event->pos();
+    setCursor(Qt::ClosedHandCursor);
+    event->accept();
+}
+
+void PlaymatPreviewWidget::mouseMoveEvent(QMouseEvent *event)
+{
+    if (!(event->buttons() & Qt::LeftButton) || sourcePixmap.isNull()) {
+        QWidget::mouseMoveEvent(event);
+        return;
+    }
+
+    const QPointF delta = QPointF(event->pos() - lastDragPos);
+    lastDragPos = event->pos();
+
+    const qreal scale = widgetToSourceScale();
+    // Vertical travel of the SAMPLING window: verticalOffset moves its top
+    // edge by exactly this much per unit, identical to the render path.
+    // Windows taller than the art (square/landscape sources zoomed out)
+    // leave no travel, vertical drags are then boundary no ops.
+    const qreal travel = static_cast<qreal>(sourcePixmap.height()) - samplingWindowSide();
+    if (scale <= 0.0) {
+        event->accept();
+        return;
+    }
+
+    // Dragging moves the ART with the cursor, so the viewing window slides the
+    // other way. Horizontal panning rebalances the margins (their sum, hence
+    // the window width, stays constant), vertical panning moves the window's
+    // top edge within its available travel.
+    const qreal sourceW = sourcePixmap.width();
+    const qreal dMargin = -(delta.x() / scale) / sourceW;
+    const qreal dOffset = travel > 0.5 ? -(delta.y() / scale) / travel : 0.0;
+
+    applyCropDelta(dMargin, -dMargin, dOffset, 1.0);
+    event->accept();
+}
+
+void PlaymatPreviewWidget::mouseReleaseEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton) {
+        setCursor(sourcePixmap.isNull() ? Qt::ArrowCursor : Qt::OpenHandCursor);
+        event->accept();
+        return;
+    }
+    QWidget::mouseReleaseEvent(event);
+}
+
+void PlaymatPreviewWidget::wheelEvent(QWheelEvent *event)
+{
+    if (sourcePixmap.isNull() || samplingWindowSide() <= 0.0) {
+        QWidget::wheelEvent(event);
+        return;
+    }
+    const qreal notches = static_cast<qreal>(event->angleDelta().y()) / 120.0;
+    if (notches == 0.0) {
+        event->accept();
+        return;
+    }
+    applyCropDelta(0.0, 0.0, 0.0, std::pow(WHEEL_ZOOM_BASE, notches));
+    event->accept();
+}
+
+void PlaymatPreviewWidget::keyPressEvent(QKeyEvent *event)
+{
+    if (sourcePixmap.isNull()) {
+        QWidget::keyPressEvent(event);
+        return;
+    }
+
+    switch (event->key()) {
+        case Qt::Key_Escape:
+            if (sameCrop(params, paramsAtFocusIn)) {
+                // Nothing to undo on this surface, let the event reach the
+                // dialog so Esc keeps its close meaning there
+                QWidget::keyPressEvent(event);
+                return;
+            }
+            restoreSnapshot();
+            break;
+        case Qt::Key_Backspace:
+            restoreSnapshot();
+            break;
+        case Qt::Key_Left:
+            applyCropDelta(-KEY_PAN_MARGIN_STEP, KEY_PAN_MARGIN_STEP, 0.0, 1.0);
+            break;
+        case Qt::Key_Right:
+            applyCropDelta(KEY_PAN_MARGIN_STEP, -KEY_PAN_MARGIN_STEP, 0.0, 1.0);
+            break;
+        case Qt::Key_Up:
+            applyCropDelta(0.0, 0.0, -KEY_PAN_OFFSET_STEP, 1.0);
+            break;
+        case Qt::Key_Down:
+            applyCropDelta(0.0, 0.0, KEY_PAN_OFFSET_STEP, 1.0);
+            break;
+        case Qt::Key_Plus:
+        case Qt::Key_Equal:
+            applyCropDelta(0.0, 0.0, 0.0, KEY_ZOOM_STEP);
+            break;
+        case Qt::Key_Minus:
+            applyCropDelta(0.0, 0.0, 0.0, 1.0 / KEY_ZOOM_STEP);
+            break;
+        default:
+            QWidget::keyPressEvent(event);
+            return;
+    }
+    event->accept();
+}
+
+void PlaymatPreviewWidget::focusInEvent(QFocusEvent *event)
+{
+    // Snapshot for the Esc or Backspace reset, restoring whatever the user
+    // had when the surface took focus
+    paramsAtFocusIn = params;
+    QWidget::focusInEvent(event);
+}
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.h b/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.h
new file mode 100644
index 000000000..5e54e96eb
--- /dev/null
+++ b/cockatrice/src/interface/widgets/playmat/playmat_preview_widget.h
@@ -0,0 +1,66 @@
+#ifndef COCKATRICE_PLAYMAT_PREVIEW_WIDGET_H
+#define COCKATRICE_PLAYMAT_PREVIEW_WIDGET_H
+
+#include "libcockatrice/utility/playmat_params.h"
+
+#include <QPixmap>
+#include <QPoint>
+#include <QRectF>
+#include <QString>
+#include <QWidget>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+/**
+ * @brief Interactive crop surface showing how a playmat card art will appear
+ *        across the combined table + stack play area.
+ *
+ * Renders a fixed frame shaped like a fresh board's stack+table area (the
+ * most generous framing the game produces): it shows the tallest slice of
+ * the square crop in normal play, with dimmed strips marking where a wider,
+ * developed table crops further, exactly the game's own render pipeline.
+ * The widget doubles as the editor's primary crop control: dragging pans the
+ * art behind the frame, the wheel zooms, and arrow keys nudge, mirroring
+ * the stored parameters (margins pan horizontally, verticalOffset
+ * vertically, zoom scales) so no separate numeric controls are needed.
+ */
+class PlaymatPreviewWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit PlaymatPreviewWidget(QWidget *parent = nullptr);
+
+    void setPixmap(const QPixmap &pixmap);
+    void setParams(const PlaymatParams &params);
+    void setAttribution(const QString &attribution);
+
+signals:
+    /** @brief Emitted whenever direct manipulation (drag, wheel, keys) changes the crop parameters. */
+    void paramsEdited(const PlaymatParams &params);
+
+protected:
+    void paintEvent(QPaintEvent *event) override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
+    void mouseReleaseEvent(QMouseEvent *event) override;
+    void wheelEvent(QWheelEvent *event) override;
+    void keyPressEvent(QKeyEvent *event) override;
+    void focusInEvent(QFocusEvent *event) override;
+
+private:
+    QRectF activePlayArea() const;    ///< destination rect used for rendering AND gesture math
+    qreal samplingWindowSide() const; ///< clamped square window side, shared with the render path
+    qreal widgetToSourceScale() const;
+    void applyCropDelta(qreal dMarginL, qreal dMarginR, qreal dOffset, qreal zoomFactor);
+    bool sameCrop(const PlaymatParams &a, const PlaymatParams &b) const;
+    void restoreSnapshot();
+
+    QPixmap sourcePixmap;
+    PlaymatParams params;
+    PlaymatParams paramsAtFocusIn; ///< crop as of the latest focus gain, restored by Esc or Backspace
+    QString attributionText;
+    QPoint lastDragPos; ///< widget space position of the previous mouse move while panning
+};
+
+#endif // COCKATRICE_PLAYMAT_PREVIEW_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.cpp b/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.cpp
new file mode 100644
index 000000000..5a4457d34
--- /dev/null
+++ b/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.cpp
@@ -0,0 +1,334 @@
+#include "playmat_settings_dialog.h"
+
+#include "../../card_picture_loader/card_picture_loader.h"
+#include "../cards/art_crop_attribution.h"
+#include "../cards/card_art_utils.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_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>
+#include <QComboBox>
+#include <QCompleter>
+#include <QDialogButtonBox>
+#include <QDoubleSpinBox>
+#include <QFormLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QList>
+#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,
+                                             QWidget *parent)
+    : QDialog(parent), currentCard(initialCard), currentParams(initialParams)
+{
+    setMinimumWidth(500);
+    setupUi();
+
+    // Seed UI from initial values
+    if (!initialCard.name.isEmpty()) {
+        searchBar->setText(initialCard.name);
+        onCardNameChanged(initialCard.name);
+
+        // onCardNameChanged leaves the printing combo on the first printing in
+        // the database, which would silently change the deck's stored playmat
+        // card on accept. Restore the stored printing when it resolves locally.
+        const int storedPrintingIndex = providerComboBox->findData(initialCard.providerId);
+        if (storedPrintingIndex != -1) {
+            providerComboBox->setCurrentIndex(storedPrintingIndex);
+        } else {
+            // Stored printing not in the local database: keep it rather than
+            // silently substituting the first printing.
+            currentCard.providerId = initialCard.providerId;
+            reloadPreview();
+        }
+    }
+
+    retranslateUi();
+}
+
+CardRef PlaymatSettingsDialog::card() const
+{
+    return currentCard;
+}
+
+PlaymatParams PlaymatSettingsDialog::params() const
+{
+    return currentParams;
+}
+
+QDoubleSpinBox *PlaymatSettingsDialog::makeSpinBox(double min, double max, double value, double step)
+{
+    auto *spin = new QDoubleSpinBox;
+    spin->setRange(min, max);
+    spin->setSingleStep(step);
+    spin->setDecimals(3);
+    spin->setValue(value);
+    return spin;
+}
+
+void PlaymatSettingsDialog::initializeSearchBar()
+{
+    searchBar = new QLineEdit;
+
+    cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this);
+    cardDatabaseDisplayModel = new CardDatabaseDisplayModel(this);
+    cardDatabaseDisplayModel->setSourceModel(cardDatabaseModel);
+
+    const CardCompleterSetup cardSetup = createCardCompleter(cardDatabaseDisplayModel, this, 15);
+    searchModel = cardSetup.searchModel;
+    proxyModel = cardSetup.proxyModel;
+    completer = cardSetup.completer;
+    searchBar->setCompleter(completer);
+
+    connectCardCompleterSearch(searchBar, cardSetup);
+
+    connect(completer, static_cast<void (QCompleter::*)(const QString &)>(&QCompleter::activated), this,
+            [this](const QString &completion) {
+                if (searchBar->text() != completion) {
+                    searchBar->setText(completion);
+                    searchBar->setCursorPosition(searchBar->text().length());
+                }
+                onCardNameChanged(completion);
+            });
+
+    connect(searchBar, &QLineEdit::returnPressed, this, [this]() { onCardNameChanged(searchBar->text()); });
+}
+
+void PlaymatSettingsDialog::setupUi()
+{
+    initializeSearchBar();
+
+    providerComboBox = new QComboBox;
+    connect(providerComboBox, &QComboBox::currentIndexChanged, this, [this]() {
+        currentCard.providerId = providerComboBox->currentData().toString();
+        reloadPreview();
+    });
+
+    auto *form = new QFormLayout;
+    controlsForm = form;
+    cardNameLabel = new QLabel;
+    printingLabel = new QLabel;
+    form->addRow(cardNameLabel, searchBar);
+    form->addRow(printingLabel, providerComboBox);
+
+    // Numerical editors expose the raw PlaymatParams for precise input. They
+    // share the same form as the rows above so every field lines up on one
+    // label column. They stay hidden until requested since the crop surface
+    // is the primary control.
+    marginLSpin = makeSpinBox(0.0, 0.95, currentParams.marginPctL, 0.01);
+    marginRSpin = makeSpinBox(0.0, 0.95, currentParams.marginPctR, 0.01);
+    verticalOffsetSpin = makeSpinBox(0.0, 1.0, currentParams.verticalOffset, 0.01);
+    zoomSpin = makeSpinBox(0.1, 4.0, currentParams.zoom, 0.05);
+
+    leftMarginLabel = new QLabel;
+    rightMarginLabel = new QLabel;
+    verticalOffsetLabel = new QLabel;
+    zoomLabel = new QLabel;
+
+    showNumericEditorsCheck = new QCheckBox;
+
+    form->addRow(showNumericEditorsCheck);
+    form->addRow(leftMarginLabel, marginLSpin);
+    form->addRow(rightMarginLabel, marginRSpin);
+    form->addRow(verticalOffsetLabel, verticalOffsetSpin);
+    form->addRow(zoomLabel, zoomSpin);
+
+    controlsGroup = new QGroupBox;
+    controlsGroup->setLayout(form);
+
+    preview = new PlaymatPreviewWidget;
+    preview->setParams(currentParams);
+
+    auto *previewLayout = new QVBoxLayout;
+    previewLayout->addWidget(preview);
+    previewCaptionLabel = new QLabel;
+    previewCaptionLabel->setAlignment(Qt::AlignCenter);
+    previewCaptionLabel->setWordWrap(true);
+    previewLayout->addWidget(previewCaptionLabel);
+    previewGroup = new QGroupBox;
+    previewGroup->setLayout(previewLayout);
+
+    auto *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    removeButton = new QPushButton;
+    buttons->addButton(removeButton, QDialogButtonBox::ResetRole);
+
+    connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
+    connect(removeButton, &QPushButton::clicked, this, [this]() {
+        currentCard = CardRef{}; // empty signals removal
+        accept();
+    });
+
+    // The crop surface is the primary control: dragging pans, wheel/keys zoom,
+    // editing exactly the same stored parameters the numeric fields do.
+    connect(preview, &PlaymatPreviewWidget::paramsEdited, this, [this](const PlaymatParams &edited) {
+        currentParams = edited;
+
+        QSignalBlocker blockMarginL(marginLSpin);
+        QSignalBlocker blockMarginR(marginRSpin);
+        QSignalBlocker blockOffset(verticalOffsetSpin);
+        QSignalBlocker blockZoom(zoomSpin);
+        marginLSpin->setValue(edited.marginPctL);
+        marginRSpin->setValue(edited.marginPctR);
+        verticalOffsetSpin->setValue(edited.verticalOffset);
+        zoomSpin->setValue(edited.zoom);
+    });
+
+    connect(showNumericEditorsCheck, &QCheckBox::toggled, this, &PlaymatSettingsDialog::setNumericEditorsVisible);
+    setNumericEditorsVisible(false);
+
+    connect(marginLSpin, &QDoubleSpinBox::valueChanged, this, &PlaymatSettingsDialog::onParamChanged);
+    connect(marginRSpin, &QDoubleSpinBox::valueChanged, this, &PlaymatSettingsDialog::onParamChanged);
+    connect(verticalOffsetSpin, &QDoubleSpinBox::valueChanged, this, &PlaymatSettingsDialog::onParamChanged);
+    connect(zoomSpin, &QDoubleSpinBox::valueChanged, this, &PlaymatSettingsDialog::onParamChanged);
+
+    // The crop surface leads visually, card selection supports it below.
+    auto *root = new QVBoxLayout;
+    root->addWidget(previewGroup);
+    root->addWidget(controlsGroup);
+    root->addWidget(buttons);
+    setLayout(root);
+}
+
+void PlaymatSettingsDialog::populateProviderCombo(const QString &cardName)
+{
+    providerComboBox->clear();
+
+    auto card = CardDatabaseManager::query()->getCard({cardName});
+
+    const auto &sets = card.getInfo().getSets();
+
+    for (const auto &printings : sets) {
+        for (const auto &p : printings) {
+            QString setName = p.getSet()->getLongName();
+            QString collector = p.getProperty("num");
+            QString uuid = p.getUuid();
+
+            QString label = setName;
+            if (!collector.isEmpty()) {
+                label += " #" + collector;
+            }
+
+            providerComboBox->addItem(label, uuid);
+        }
+    }
+}
+
+void PlaymatSettingsDialog::onCardNameChanged(const QString &name)
+{
+    if (name.isEmpty()) {
+        currentPixmap = QPixmap();
+        preview->setPixmap(currentPixmap);
+        return;
+    }
+
+    const ExactCard card = CardDatabaseManager::query()->getCard({name});
+    if (!card) {
+        currentPixmap = QPixmap();
+        preview->setPixmap(currentPixmap);
+        providerComboBox->clear();
+        return;
+    }
+
+    currentCard.name = name;
+
+    populateProviderCombo(name);
+
+    if (providerComboBox->count() == 0) {
+        currentPixmap = QPixmap();
+        preview->setPixmap(currentPixmap);
+        currentCard.providerId.clear();
+        return;
+    }
+
+    currentCard.providerId = providerComboBox->currentData().toString();
+    reloadPreview();
+}
+
+void PlaymatSettingsDialog::reloadPreview()
+{
+    if (currentCard.name.isEmpty()) {
+        return;
+    }
+
+    ExactCard card = CardDatabaseManager::query()->getCard({currentCard.name, currentCard.providerId});
+    if (!card) {
+        return;
+    }
+
+    disconnect(pixmapUpdatedConnection);
+
+    QPixmap fullRes;
+    CardPictureLoader::getPixmap(fullRes, card, QSize(745, 1040));
+
+    if (fullRes.isNull()) {
+        CardInfo *cardInfo = card.getCardPtr().data();
+        if (cardInfo) {
+            pixmapUpdatedConnection = connect(cardInfo, &CardInfo::pixmapUpdated, this, [this]() { reloadPreview(); });
+        }
+        return;
+    }
+
+    currentPixmap = CardArtUtils::rotateSidewaysLayoutArt(fullRes, card);
+    preview->setPixmap(currentPixmap);
+    preview->setParams(currentParams);
+    preview->setAttribution(buildArtAttribution(card));
+}
+
+void PlaymatSettingsDialog::onParamChanged()
+{
+    currentParams.marginPctL = marginLSpin->value();
+    currentParams.marginPctR = marginRSpin->value();
+    currentParams.verticalOffset = verticalOffsetSpin->value();
+    currentParams.zoom = zoomSpin->value();
+    preview->setParams(currentParams);
+}
+
+void PlaymatSettingsDialog::setNumericEditorsVisible(bool visible)
+{
+    controlsForm->setRowVisible(leftMarginLabel, visible);
+    controlsForm->setRowVisible(rightMarginLabel, visible);
+    controlsForm->setRowVisible(verticalOffsetLabel, visible);
+    controlsForm->setRowVisible(zoomLabel, visible);
+
+    // A QDialog never resizes itself when its content requirements change,
+    // so revealing the editors would squeeze the crop group until the info
+    // caption ran into the preview. Re-fit the dialog to the new size hint.
+    adjustSize();
+}
+
+void PlaymatSettingsDialog::retranslateUi()
+{
+    setWindowTitle(tr("Playmat Settings"));
+    searchBar->setPlaceholderText(tr("Type a card name..."));
+    cardNameLabel->setText(tr("Card name:"));
+    printingLabel->setText(tr("Printing:"));
+    showNumericEditorsCheck->setText(tr("Show numerical editors"));
+    leftMarginLabel->setText(tr("Left margin (%):"));
+    rightMarginLabel->setText(tr("Right margin (%):"));
+    verticalOffsetLabel->setText(tr("Vertical offset:"));
+    zoomLabel->setText(tr("Zoom:"));
+    controlsGroup->setTitle(tr("Card"));
+    previewGroup->setTitle(tr("Crop"));
+    previewCaptionLabel->setText(
+        tr("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."));
+    removeButton->setText(tr("Remove Playmat"));
+}
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.h b/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.h
new file mode 100644
index 000000000..07833af25
--- /dev/null
+++ b/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.h
@@ -0,0 +1,99 @@
+#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>
+
+class QCheckBox;
+class QComboBox;
+class QCompleter;
+class QDoubleSpinBox;
+class QFormLayout;
+class QGroupBox;
+class QLabel;
+class QLineEdit;
+class QPushButton;
+class QWidget;
+class CardDatabaseModel;
+class CardDatabaseDisplayModel;
+class CardSearchModel;
+class CardCompleterProxyModel;
+class PlaymatPreviewWidget;
+
+/**
+ * @brief Dialog for configuring the playmat card art for a deck.
+ *
+ * The crop surface is the primary control: drag to pan the visible art,
+ * scroll (or +/- keys) to zoom, arrow keys to nudge. Card name and printing
+ * are selected below. A checkbox reveals optional numerical editors for the
+ * raw PlaymatParams. These controls edit the same stored PlaymatParams that
+ * ship in deck files and player properties.
+ */
+class PlaymatSettingsDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit PlaymatSettingsDialog(const CardRef &initialCard = {},
+                                   const PlaymatParams &initialParams = {},
+                                   QWidget *parent = nullptr);
+
+    CardRef card() const;
+    PlaymatParams params() const;
+
+private slots:
+    void onCardNameChanged(const QString &name);
+    void onParamChanged();
+    void reloadPreview();
+
+private:
+    void setupUi();
+    void populateProviderCombo(const QString &cardName);
+    void initializeSearchBar();
+    void retranslateUi();
+    void setNumericEditorsVisible(bool visible);
+    QDoubleSpinBox *makeSpinBox(double min, double max, double value, double step);
+
+    QLineEdit *searchBar;
+    QCompleter *completer;
+    CardDatabaseModel *cardDatabaseModel;
+    CardDatabaseDisplayModel *cardDatabaseDisplayModel;
+    CardSearchModel *searchModel;
+    CardCompleterProxyModel *proxyModel;
+
+    QComboBox *providerComboBox;
+
+    QMetaObject::Connection pixmapUpdatedConnection;
+
+    QLabel *cardNameLabel;
+    QLabel *printingLabel;
+    QLabel *previewCaptionLabel;
+    QCheckBox *showNumericEditorsCheck;
+    QFormLayout *controlsForm;
+    QLabel *leftMarginLabel;
+    QLabel *rightMarginLabel;
+    QLabel *verticalOffsetLabel;
+    QLabel *zoomLabel;
+    QGroupBox *controlsGroup;
+    QGroupBox *previewGroup;
+    QPushButton *removeButton;
+
+    QDoubleSpinBox *marginLSpin;
+    QDoubleSpinBox *marginRSpin;
+    QDoubleSpinBox *verticalOffsetSpin;
+    QDoubleSpinBox *zoomSpin;
+
+    PlaymatPreviewWidget *preview;
+
+    QPixmap currentPixmap;
+    CardRef currentCard;
+    PlaymatParams currentParams;
+};
+
+#endif // COCKATRICE_PLAYMAT_SETTINGS_DIALOG_H
diff --git a/cockatrice/src/interface/widgets/playmat/playmat_utils.h b/cockatrice/src/interface/widgets/playmat/playmat_utils.h
new file mode 100644
index 000000000..0691a9637
--- /dev/null
+++ b/cockatrice/src/interface/widgets/playmat/playmat_utils.h
@@ -0,0 +1,140 @@
+#ifndef COCKATRICE_PLAYMAT_UTILS_H
+#define COCKATRICE_PLAYMAT_UTILS_H
+
+#include <QRectF>
+#include <QSize>
+#include <QSizeF>
+#include <libcockatrice/deck_list/deck_list.h>
+
+namespace PlaymatUtils
+{
+
+/** @brief Upper bound for zooming into the playmat art. */
+constexpr qreal MAX_ZOOM = 4.0;
+
+/**
+ * @brief Width of the outer viewing window: full card width trimmed by the
+ *        horizontal margins. Guarded against margins summing to >= 1.
+ */
+inline qreal playmatVisibleWidth(const QSize &fullCardSize, const PlaymatParams &params)
+{
+    const qreal srcW = fullCardSize.width();
+    const qreal marginL = params.marginPctL * srcW;
+    const qreal marginR = params.marginPctR * srcW;
+    return qMax(0.0, srcW - marginL - marginR);
+}
+
+/**
+ * @brief Zoom clamped to the range where every step renders differently.
+ *
+ * The square sampling window is visibleWidth / zoom, zooming out past
+ * visibleWidth / min(card width, height) would sample beyond the card itself,
+ * which both looks broken and makes whole ranges of the parameter dead. The
+ * floor is therefore derived from the actual image instead of a static value,
+ * and is shared verbatim by the render path and the editor's gesture math so
+ * the two can never disagree.
+ */
+inline qreal playmatClampedZoom(const QSize &fullCardSize, const PlaymatParams &params)
+{
+    const qreal minDim = qMin<qreal>(fullCardSize.width(), fullCardSize.height());
+    const qreal visibleW = playmatVisibleWidth(fullCardSize, params);
+    const qreal zoomOutFloor = (minDim > 0.0 && visibleW > 0.0) ? visibleW / minDim : 1.0;
+    // The floor deliberately bypasses MAX_ZOOM: when the art is much wider
+    // than tall, keeping the square window inside it requires more than 4x
+    // zoom-out, and honoring that larger floor keeps side within
+    // min(card width, height). Zooming IN is still capped at MAX_ZOOM.
+    return qMin(MAX_ZOOM, qMax(params.zoom, zoomOutFloor));
+}
+
+/**
+ * @brief Side of the square sampling window actually rendered for these
+ *        parameters. Never exceeds either card dimension, so the source rect
+ *        always lies within the image (vertical travel remains for panning
+ *        whenever the art is taller than it is wide).
+ */
+inline qreal playmatWindowSide(const QSize &fullCardSize, const PlaymatParams &params)
+{
+    const qreal visibleW = playmatVisibleWidth(fullCardSize, params);
+    if (visibleW <= 0.0) {
+        return 0.0;
+    }
+    return visibleW / playmatClampedZoom(fullCardSize, params);
+}
+
+/**
+ * @brief Computes the source region of the full resolution card image to use as a playmat.
+ *
+ * Parameters are relative to the full card image. horizontal margins trim the
+ * card borders (shifting them pans the window), verticalOffset places the top
+ * edge of the sampling window within its available travel, and zoom scales
+ * into the trimmed span. The result always lies within the card image bounds.
+ *
+ * @param fullCardSize Size of the full card image.
+ * @param params Positioning parameters.
+ * @return Source rectangle in full card image pixel coordinates.
+ */
+inline QRectF computeArtSourceRect(const QSize &fullCardSize, const PlaymatParams &params)
+{
+    const qreal srcW = fullCardSize.width();
+    const qreal srcH = fullCardSize.height();
+
+    // Square sampling window, keeps art unskewed, never exceeds the card on
+    // either axis thanks to the zoom floor in playmatWindowSide().
+    const qreal side = playmatWindowSide(fullCardSize, params);
+
+    // verticalOffset places the TOP edge of the sampling window itself within
+    // its travel, so the full [0, 1] parameter range is live at every zoom and
+    // the window can always reach the very top (0.0) and bottom (1.0) of the
+    // art.
+    const qreal offset = qBound(0.0, params.verticalOffset, 1.0);
+    const qreal y = offset * qMax(0.0, srcH - side);
+
+    // Horizontally the sampling window sits centered inside the trimmed span
+    // (margins pan it), zooming out can make it wider than that span, so it
+    // is then kept within the image, an edge stop, never an invalid rect.
+    const qreal outerW = playmatVisibleWidth(fullCardSize, params);
+    const qreal x = qBound(0.0, params.marginPctL * srcW + (outerW - side) / 2.0, qMax(0.0, srcW - side));
+
+    return QRectF(x, y, side, side);
+}
+
+/**
+ * @brief Returns the destination rectangle that fits a source of the given aspect
+ *        ratio into dstArea using "cover" semantics (no distortion, overflows cropped).
+ *
+ * @param dstArea Area to fill.
+ * @param srcSize Size of the source, only its aspect ratio matters.
+ * @return Destination rectangle centered in dstArea.
+ */
+inline QRectF coverFitRect(const QRectF &dstArea, const QSizeF &srcSize)
+{
+    const qreal srcAspect = srcSize.width() / srcSize.height();
+    const qreal dstAspect = dstArea.width() / dstArea.height();
+
+    if (srcAspect > dstAspect) {
+        const qreal dstW = dstArea.height() * srcAspect;
+        return QRectF(dstArea.left() + (dstArea.width() - dstW) / 2.0, dstArea.top(), dstW, dstArea.height());
+    }
+
+    const qreal dstH = dstArea.width() / srcAspect;
+    return QRectF(dstArea.left(), dstArea.top() + (dstArea.height() - dstH) / 2.0, dstArea.width(), dstH);
+}
+
+/**
+ * @brief Fits a rectangle of the given aspect ratio into dstArea, centered,
+ *        touching the constraining dimension ("aspect fit" of the FRAME
+ *        itself, not of a source image).
+ */
+inline QRectF aspectFitRect(const QRectF &dstArea, qreal aspect)
+{
+    if (aspect <= 0.0) {
+        return dstArea;
+    }
+    qreal w = qMin(dstArea.width(), dstArea.height() * aspect);
+    qreal h = w / aspect;
+    return QRectF(dstArea.left() + (dstArea.width() - w) / 2.0, dstArea.top() + (dstArea.height() - h) / 2.0, w, h);
+}
+
+} // namespace PlaymatUtils
+
+#endif // COCKATRICE_PLAYMAT_UTILS_H
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 5b67ae727..bad88ddbb 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,30 +1,38 @@
 #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.
  *
  * Initializes the widget with its layout and sets up the connections and necessary
- * UI elements for managing card counts in both the mainboard and sideboard zones.
+ * UI elements for managing card counts in all the mainboard, tokensboard and sideboard zones.
  *
  * @param parent The parent widget.
- * @param deckEditor Pointer to the TabDeckEditor.
- * @param deckModel Pointer to the DeckListModel.
- * @param deckView Pointer to the QTreeView for the deck display.
+ * @param deckStateManager Pointer to the DeckStateManager
  * @param cardSizeSlider Pointer to the QSlider used for dynamic font resizing.
  * @param rootCard The root card for the widget.
  */
 AllZonesCardAmountWidget::AllZonesCardAmountWidget(QWidget *parent,
-                                                   AbstractTabDeckEditor *deckEditor,
-                                                   DeckListModel *deckModel,
-                                                   QTreeView *deckView,
+                                                   DeckStateManager *deckStateManager,
                                                    QSlider *cardSizeSlider,
                                                    const ExactCard &rootCard)
-    : QWidget(parent), deckEditor(deckEditor), deckModel(deckModel), deckView(deckView), cardSizeSlider(cardSizeSlider),
-      rootCard(rootCard)
+    : QWidget(parent), cardSizeSlider(cardSizeSlider)
 {
     layout = new QVBoxLayout(this);
     layout->setAlignment(Qt::AlignHCenter);
@@ -33,18 +41,31 @@ AllZonesCardAmountWidget::AllZonesCardAmountWidget(QWidget *parent,
     setContentsMargins(5, 5, 5, 5); // Padding around the text
 
     zoneLabelMainboard = new ShadowBackgroundLabel(this, tr("Mainboard"));
-    buttonBoxMainboard =
-        new CardAmountWidget(this, deckEditor, deckModel, deckView, cardSizeSlider, rootCard, DECK_ZONE_MAIN);
+    buttonBoxMainboard = new CardAmountWidget(this, deckStateManager, cardSizeSlider, rootCard, DECK_ZONE_MAIN);
     zoneLabelSideboard = new ShadowBackgroundLabel(this, tr("Sideboard"));
-    buttonBoxSideboard =
-        new CardAmountWidget(this, deckEditor, deckModel, deckView, cardSizeSlider, rootCard, DECK_ZONE_SIDE);
+    buttonBoxSideboard = new CardAmountWidget(this, deckStateManager, cardSizeSlider, rootCard, DECK_ZONE_SIDE);
+    zoneLabelTokensboard = new ShadowBackgroundLabel(this, tr("Tokens"));
+    buttonBoxTokensboard = new CardAmountWidget(this, deckStateManager, cardSizeSlider, rootCard, DECK_ZONE_TOKENS);
 
     layout->addWidget(zoneLabelMainboard, 0, Qt::AlignHCenter | Qt::AlignBottom);
     layout->addWidget(buttonBoxMainboard, 0, Qt::AlignHCenter | Qt::AlignTop);
-    layout->addSpacing(25);
+    layout->addSpacing(12);
+    layout->addWidget(zoneLabelTokensboard, 0, Qt::AlignHCenter | Qt::AlignBottom);
+    layout->addWidget(buttonBoxTokensboard, 0, Qt::AlignHCenter | Qt::AlignTop);
+    layout->addSpacing(13);
     layout->addWidget(zoneLabelSideboard, 0, Qt::AlignHCenter | Qt::AlignBottom);
     layout->addWidget(buttonBoxSideboard, 0, Qt::AlignHCenter | Qt::AlignTop);
 
+    // Show Tokens buttons for token cards, Mainboard/Sideboard for non-token cards
+    bool isToken = rootCard.getInfo().getIsToken();
+
+    zoneLabelMainboard->setVisible(!isToken);
+    buttonBoxMainboard->setVisible(!isToken);
+    zoneLabelTokensboard->setVisible(isToken);
+    buttonBoxTokensboard->setVisible(isToken);
+    zoneLabelSideboard->setVisible(!isToken);
+    buttonBoxSideboard->setVisible(!isToken);
+
     connect(cardSizeSlider, &QSlider::valueChanged, this, &AllZonesCardAmountWidget::adjustFontSize);
 
     QTimer::singleShot(10, this, [this]() { adjustFontSize(this->cardSizeSlider->value()); });
@@ -74,11 +95,19 @@ void AllZonesCardAmountWidget::adjustFontSize(int scalePercentage)
     zoneLabelFont.setPointSize(newFontSize);
     zoneLabelMainboard->setFont(zoneLabelFont);
     zoneLabelSideboard->setFont(zoneLabelFont);
+    zoneLabelTokensboard->setFont(zoneLabelFont);
 
     // Repaint the widget (if necessary)
     repaint();
 }
 
+void AllZonesCardAmountWidget::setAmounts(int mainboardAmount, int sideboardAmount, int tokensboardAmount)
+{
+    buttonBoxMainboard->setAmount(mainboardAmount);
+    buttonBoxSideboard->setAmount(sideboardAmount);
+    buttonBoxTokensboard->setAmount(tokensboardAmount);
+}
+
 /**
  * @brief Gets the card count in the mainboard zone.
  *
@@ -86,7 +115,7 @@ void AllZonesCardAmountWidget::adjustFontSize(int scalePercentage)
  */
 int AllZonesCardAmountWidget::getMainboardAmount()
 {
-    return buttonBoxMainboard->countCardsInZone(DECK_ZONE_MAIN);
+    return buttonBoxMainboard->getAmount();
 }
 
 /**
@@ -96,7 +125,25 @@ int AllZonesCardAmountWidget::getMainboardAmount()
  */
 int AllZonesCardAmountWidget::getSideboardAmount()
 {
-    return buttonBoxSideboard->countCardsInZone(DECK_ZONE_SIDE);
+    return buttonBoxSideboard->getAmount();
+}
+
+/**
+ * @brief Gets the card count in the tokensboard zone.
+ *
+ * @return The number of cards in the tokensboard.
+ */
+int AllZonesCardAmountWidget::getTokensboardAmount()
+{
+    return buttonBoxTokensboard->getAmount();
+}
+
+/**
+ * @brief Checks if the amount is at least one in either the mainboard or sideboard or tokensboard.
+ */
+bool AllZonesCardAmountWidget::isNonZero()
+{
+    return getMainboardAmount() > 0 || getSideboardAmount() > 0 || getTokensboardAmount() > 0;
 }
 
 /**
@@ -107,11 +154,7 @@ int AllZonesCardAmountWidget::getSideboardAmount()
  *
  * @param event The event information for the mouse entry.
  */
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
 void AllZonesCardAmountWidget::enterEvent(QEnterEvent *event)
-#else
-void AllZonesCardAmountWidget::enterEvent(QEvent *event)
-#endif
 {
     QWidget::enterEvent(event);
     update();
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 1a8ec8bfd..cefabe293 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
@@ -2,49 +2,49 @@
  * @file all_zones_card_amount_widget.h
  * @ingroup CardExtraInfoWidgets
  * @ingroup PrintingWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef ALL_ZONES_CARD_AMOUNT_WIDGET_H
 #define ALL_ZONES_CARD_AMOUNT_WIDGET_H
-#include "../../deck_loader/deck_loader.h"
-#include "card_amount_widget.h"
-
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qtmetamacros.h>
+
+class CardAmountWidget;
+class DeckStateManager;
+class ExactCard;
+class QLabel;
+class QSlider;
+class QVBoxLayout;
 
 class AllZonesCardAmountWidget : public QWidget
 {
     Q_OBJECT
 public:
     explicit AllZonesCardAmountWidget(QWidget *parent,
-                                      AbstractTabDeckEditor *deckEditor,
-                                      DeckListModel *deckModel,
-                                      QTreeView *deckView,
+                                      DeckStateManager *deckStateManager,
                                       QSlider *cardSizeSlider,
                                       const ExactCard &rootCard);
     int getMainboardAmount();
     int getSideboardAmount();
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    int getTokensboardAmount();
+    bool isNonZero();
+
     void enterEvent(QEnterEvent *event) override;
-#else
-    void enterEvent(QEvent *event) override;
-#endif
 
 public slots:
     void adjustFontSize(int scalePercentage);
+    void setAmounts(int mainboardAmount, int sideboardAmount, int tokensboardAmount);
 
 private:
     QVBoxLayout *layout;
-    AbstractTabDeckEditor *deckEditor;
-    DeckListModel *deckModel;
-    QTreeView *deckView;
     QSlider *cardSizeSlider;
-    ExactCard rootCard;
     QLabel *zoneLabelMainboard;
     CardAmountWidget *buttonBoxMainboard;
     QLabel *zoneLabelSideboard;
     CardAmountWidget *buttonBoxSideboard;
+    QLabel *zoneLabelTokensboard;
+    CardAmountWidget *buttonBoxTokensboard;
 };
 
 #endif // ALL_ZONES_CARD_AMOUNT_WIDGET_H
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 80258be61..4b5040741 100644
--- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
@@ -1,28 +1,46 @@
 #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 <QTimer>
+#include <QPushButton>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
+#include <QSlider>
+#include <QVariant>
+#include <algorithm>
+#include <functional>
+#include <qnamespace.h>
+
+class QModelIndex;
 
 /**
  * @brief Constructs a widget for displaying and controlling the card count in a specific zone.
  *
  * @param parent The parent widget.
- * @param deckEditor Pointer to the TabDeckEditor instance.
- * @param deckModel Pointer to the DeckListModel instance.
- * @param deckView Pointer to the QTreeView displaying the deck.
  * @param cardSizeSlider Pointer to the QSlider for adjusting font size.
  * @param rootCard The root card to manage within the widget.
- * @param zoneName The zone name (e.g., DECK_ZONE_MAIN or DECK_ZONE_SIDE).
+ * @param zoneName The zone name (e.g., DECK_ZONE_MAIN , DECK_ZONE_SIDE, or DECK_ZONE_TOKENS).
  */
 CardAmountWidget::CardAmountWidget(QWidget *parent,
-                                   AbstractTabDeckEditor *deckEditor,
-                                   DeckListModel *deckModel,
-                                   QTreeView *deckView,
+                                   DeckStateManager *deckStateManager,
                                    QSlider *cardSizeSlider,
                                    const ExactCard &rootCard,
                                    const QString &zoneName)
-    : QWidget(parent), deckEditor(deckEditor), deckModel(deckModel), deckView(deckView), cardSizeSlider(cardSizeSlider),
-      rootCard(rootCard), zoneName(zoneName), hovered(false)
+    : QWidget(parent), deckStateManager(deckStateManager), cardSizeSlider(cardSizeSlider), rootCard(rootCard),
+      zoneName(zoneName), hovered(false)
 {
     layout = new QHBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
@@ -39,32 +57,38 @@ CardAmountWidget::CardAmountWidget(QWidget *parent,
     incrementButton->setFixedSize(parentWidget()->size().width() / 3, parentWidget()->size().height() / 9);
     decrementButton->setFixedSize(parentWidget()->size().width() / 3, parentWidget()->size().height() / 9);
 
-    // Set up connections based on the zone (Mainboard or Sideboard)
+    // Set up connections based on the zone (Mainboard, Sideboard, or Tokensboard)
     if (zoneName == DECK_ZONE_MAIN) {
         connect(incrementButton, &QPushButton::clicked, this, &CardAmountWidget::addPrintingMainboard);
         connect(decrementButton, &QPushButton::clicked, this, &CardAmountWidget::removePrintingMainboard);
     } else if (zoneName == DECK_ZONE_SIDE) {
         connect(incrementButton, &QPushButton::clicked, this, &CardAmountWidget::addPrintingSideboard);
         connect(decrementButton, &QPushButton::clicked, this, &CardAmountWidget::removePrintingSideboard);
+    } else if (zoneName == DECK_ZONE_TOKENS) {
+        connect(incrementButton, &QPushButton::clicked, this, &CardAmountWidget::addPrintingTokensboard);
+        connect(decrementButton, &QPushButton::clicked, this, &CardAmountWidget::removePrintingTokensboard);
     }
 
-    cardCountInZone = new QLabel(QString::number(countCardsInZone(zoneName)), this);
+    cardCountInZone = new QLabel(QString::number(amount), this);
     cardCountInZone->setAlignment(Qt::AlignCenter);
 
     layout->addWidget(decrementButton);
     layout->addWidget(cardCountInZone);
     layout->addWidget(incrementButton);
 
-    // React to model changes
-    connect(deckModel, &DeckListModel::dataChanged, this, &CardAmountWidget::updateCardCount);
-    connect(deckModel, &QAbstractItemModel::rowsRemoved, this, &CardAmountWidget::updateCardCount);
-
     // Connect slider for dynamic font size adjustment
     connect(cardSizeSlider, &QSlider::valueChanged, this, &CardAmountWidget::adjustFontSize);
+}
 
-    if (deckEditor) {
-        connect(this, &CardAmountWidget::deckModified, deckEditor, &AbstractTabDeckEditor::onDeckHistorySaveRequested);
-    }
+int CardAmountWidget::getAmount()
+{
+    return amount;
+}
+
+void CardAmountWidget::setAmount(int _amount)
+{
+    amount = _amount;
+    updateCardCount();
 }
 
 /**
@@ -132,67 +156,88 @@ void CardAmountWidget::adjustFontSize(int scalePercentage)
  */
 void CardAmountWidget::updateCardCount()
 {
-    cardCountInZone->setText("<font color='white'>" + QString::number(countCardsInZone(zoneName)) + "</font>");
+    cardCountInZone->setText("<font color='white'>" + QString::number(amount) + "</font>");
     layout->invalidate();
     layout->activate();
 }
 
+static QString zoneLogName(const QString &zone)
+{
+    if (zone == DECK_ZONE_MAIN) {
+        return "mainboard";
+    } else if (zone == DECK_ZONE_SIDE) {
+        return "sideboard";
+    } else if (zone == DECK_ZONE_TOKENS) {
+        return "tokens";
+    } else {
+        return "unknown";
+    }
+}
+
+static QModelIndex addAndReplacePrintings(DeckListModel *model,
+                                          const QModelIndex &existing,
+                                          const ExactCard &rootCard,
+                                          const QString &zone,
+                                          int extraCopies,
+                                          bool replaceProviderless)
+{
+    auto newCardIndex = model->addCard(rootCard, zone);
+    if (!newCardIndex.isValid()) {
+        return {};
+    }
+
+    // Check if a card without a providerId already exists in the deckModel and replace it, if so.
+    if (existing.isValid() && existing != newCardIndex && replaceProviderless) {
+        model->offsetCountAtIndex(newCardIndex, extraCopies);
+        model->removeCardAtIndex(existing);
+    }
+
+    // Set Index and Focus as if the user had just clicked the new card and modify the deckEditor saveState
+    return model->findCard(rootCard.getName(), zone, rootCard.getPrinting().getUuid(),
+                           rootCard.getPrinting().getProperty("num"));
+}
+
 /**
- * @brief Adds a printing of the card to the specified zone (Mainboard or Sideboard).
+ * @brief Adds a printing of the card to the specified zone (Mainboard, Sideboard, or Tokensboard).
  *
- * @param zone The zone to add the card to (DECK_ZONE_MAIN or DECK_ZONE_SIDE).
+ * @param zone The zone to add the card to (DECK_ZONE_MAIN, DECK_ZONE_SIDE, or DECK_ZONE_TOKENS).
  */
 void CardAmountWidget::addPrinting(const QString &zone)
 {
-    int addedCount = 1;
     // Check if we will need to add extra copies due to replacing copies without providerIds
-    QModelIndex existing = deckModel->findCard(rootCard.getName(), zone);
+    QModelIndex existing = deckStateManager->getModel()->findCard(rootCard.getName(), zone);
+
     int extraCopies = 0;
     bool replacingProviderless = false;
 
     if (existing.isValid()) {
-        QString providerId = deckModel->data(existing.sibling(existing.row(), 4), Qt::DisplayRole).toString();
-        if (providerId.isEmpty()) {
-            int amount = deckModel->data(existing, Qt::DisplayRole).toInt();
-            extraCopies = amount - 1; // One less because we *always* add one
+        QString foundProviderId =
+            existing.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data(Qt::DisplayRole).toString();
+        if (foundProviderId.isEmpty()) {
+            int existingAmount = existing.data(Qt::DisplayRole).toInt();
+            extraCopies = existingAmount - 1; // One less because we *always* add one
             replacingProviderless = true;
         }
     }
 
-    addedCount += extraCopies;
-
+    QString zoneName = zoneLogName(zone);
     QString reason = QString("Added %1 copies of '%2 (%3) %4' to %5 [ProviderID: %6]%7")
-                         .arg(addedCount)
+                         .arg(1 + extraCopies)
                          .arg(rootCard.getName())
                          .arg(rootCard.getPrinting().getSet()->getShortName())
                          .arg(rootCard.getPrinting().getProperty("num"))
-                         .arg(zone == DECK_ZONE_MAIN ? "mainboard" : "sideboard")
+                         .arg(zoneName)
                          .arg(rootCard.getPrinting().getUuid())
                          .arg(replacingProviderless ? " (replaced providerless printings)" : "");
 
-    emit deckModified(reason);
-
     // Add the card and expand the list UI
-    auto newCardIndex = deckModel->addCard(rootCard, zone);
-    recursiveExpand(newCardIndex);
+    QModelIndex newCardIndex = deckStateManager->modifyDeck(reason, [&](auto model) {
+        return addAndReplacePrintings(model, existing, rootCard, zone, extraCopies, replacingProviderless);
+    });
 
-    // Check if a card without a providerId already exists in the deckModel and replace it, if so.
-    QString foundProviderId = deckModel->data(existing.sibling(existing.row(), 4), Qt::DisplayRole).toString();
-    if (existing.isValid() && existing != newCardIndex && foundProviderId == "") {
-        auto amount = deckModel->data(existing, Qt::DisplayRole);
-        for (int i = 0; i < amount.toInt() - 1; i++) {
-            deckModel->addCard(rootCard, zone);
-        }
-        deckModel->removeRow(existing.row(), existing.parent());
+    if (newCardIndex.isValid()) {
+        emit deckStateManager->focusIndexChanged(newCardIndex, false);
     }
-
-    // Set Index and Focus as if the user had just clicked the new card and modify the deckEditor saveState
-    newCardIndex = deckModel->findCard(rootCard.getName(), zone, rootCard.getPrinting().getUuid(),
-                                       rootCard.getPrinting().getProperty("num"));
-
-    deckView->setCurrentIndex(newCardIndex);
-    deckView->setFocus(Qt::FocusReason::MouseFocusReason);
-    deckEditor->setModified(true);
 }
 
 /**
@@ -211,6 +256,14 @@ void CardAmountWidget::addPrintingSideboard()
     addPrinting(DECK_ZONE_SIDE);
 }
 
+/**
+ * @brief Adds a printing to the tokens zone.
+ */
+void CardAmountWidget::addPrintingTokensboard()
+{
+    addPrinting(DECK_ZONE_TOKENS);
+}
+
 /**
  * @brief Removes a printing from the mainboard zone.
  */
@@ -228,99 +281,31 @@ void CardAmountWidget::removePrintingSideboard()
 }
 
 /**
- * @brief Recursively expands the card in the deck view starting from the given index.
- *
- * @param index The model index of the card to expand.
+ * @brief Removes a printing from the tokens zone.
  */
-void CardAmountWidget::recursiveExpand(const QModelIndex &index)
+void CardAmountWidget::removePrintingTokensboard()
 {
-    if (index.parent().isValid()) {
-        recursiveExpand(index.parent());
-    }
-    deckView->expand(index);
-}
-
-/**
- * @brief Offsets the card count at the specified index by the given amount.
- *
- * @param idx The model index of the card.
- * @param offset The amount to add or subtract from the card count.
- */
-void CardAmountWidget::offsetCountAtIndex(const QModelIndex &idx, int offset)
-{
-    if (!idx.isValid() || offset == 0) {
-        return;
-    }
-
-    const QModelIndex numberIndex = idx.sibling(idx.row(), 0);
-    const int count = deckModel->data(numberIndex, Qt::EditRole).toInt();
-    const int new_count = count + offset;
-
-    deckView->setCurrentIndex(numberIndex);
-
-    if (new_count <= 0) {
-        deckModel->removeRow(idx.row(), idx.parent());
-    } else {
-        deckModel->setData(numberIndex, new_count, Qt::EditRole);
-    }
-
-    deckEditor->setModified(true);
+    decrementCardHelper(DECK_ZONE_TOKENS);
 }
 
 /**
  * @brief Helper function to decrement the card count for a given zone.
  *
- * @param zone The zone from which to remove the card (DECK_ZONE_MAIN or DECK_ZONE_SIDE).
+ * @param zone The zone from which to remove the card (DECK_ZONE_MAIN, DECK_ZONE_SIDE, or DECK_ZONE_TOKENS).
  */
 void CardAmountWidget::decrementCardHelper(const QString &zone)
 {
+    QString zoneName = zoneLogName(zone);
     QString reason = QString("Removed 1 copy of '%1 (%2) %3' from %4 [ProviderID: %5]")
                          .arg(rootCard.getName())
                          .arg(rootCard.getPrinting().getSet()->getShortName())
                          .arg(rootCard.getPrinting().getProperty("num"))
-                         .arg(zone == DECK_ZONE_MAIN ? "mainboard" : "sideboard")
+                         .arg(zoneName)
                          .arg(rootCard.getPrinting().getUuid());
 
-    emit deckModified(reason);
-
-    QModelIndex idx = deckModel->findCard(rootCard.getName(), zone, rootCard.getPrinting().getUuid(),
+    deckStateManager->modifyDeck(reason, [this, &zone](auto model) {
+        QModelIndex idx = model->findCard(rootCard.getName(), zone, rootCard.getPrinting().getUuid(),
                                           rootCard.getPrinting().getProperty("num"));
-
-    offsetCountAtIndex(idx, -1);
-    deckEditor->setModified(true);
+        return model->offsetCountAtIndex(idx, -1);
+    });
 }
-
-/**
- * @brief Counts the number of cards in a specific zone (mainboard or sideboard).
- *
- * @param deckZone The name of the zone (e.g., DECK_ZONE_MAIN or DECK_ZONE_SIDE).
- * @return The number of cards in the zone.
- */
-int CardAmountWidget::countCardsInZone(const QString &deckZone)
-{
-    if (rootCard.getPrinting().getUuid().isEmpty()) {
-        return 0; // Cards without uuids/providerIds CANNOT match another card, they are undefined for us.
-    }
-
-    if (!deckModel) {
-        return -1;
-    }
-
-    DeckList *decklist = deckModel->getDeckList();
-    if (!decklist) {
-        return -1;
-    }
-
-    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes({deckZone});
-
-    int count = 0;
-    for (auto currentCard : cardsInDeck) {
-        for (int k = 0; k < currentCard->getNumber(); ++k) {
-            if (currentCard->getCardProviderId() == rootCard.getPrinting().getProperty("uuid")) {
-                count++;
-            }
-        }
-    }
-
-    return count;
-}
\ No newline at end of file
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 6d059bc04..6f5889fc7 100644
--- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
+++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h
@@ -2,21 +2,23 @@
  * @file card_amount_widget.h
  * @ingroup CardExtraInfoWidgets
  * @ingroup PrintingWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARD_AMOUNT_WIDGET_H
 #define CARD_AMOUNT_WIDGET_H
 
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../general/display/dynamic_font_size_push_button.h"
+#include "libcockatrice/card/printing/exact_card.h"
 
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QTreeView>
+#include <QString>
 #include <QWidget>
-#include <libcockatrice/card/card_info.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qtmetamacros.h>
+
+class DeckStateManager;
+class DynamicFontSizePushButton;
+class QHBoxLayout;
+class QLabel;
+class QSlider;
 
 class CardAmountWidget : public QWidget
 {
@@ -27,15 +29,14 @@ signals:
 
 public:
     explicit CardAmountWidget(QWidget *parent,
-                              AbstractTabDeckEditor *deckEditor,
-                              DeckListModel *deckModel,
-                              QTreeView *deckView,
+                              DeckStateManager *deckStateManager,
                               QSlider *cardSizeSlider,
                               const ExactCard &rootCard,
                               const QString &zoneName);
-    int countCardsInZone(const QString &deckZone);
+    int getAmount();
 
 public slots:
+    void setAmount(int _amount);
     void updateCardCount();
     void addPrinting(const QString &zone);
 
@@ -44,9 +45,7 @@ protected:
     void showEvent(QShowEvent *event) override;
 
 private:
-    AbstractTabDeckEditor *deckEditor;
-    DeckListModel *deckModel;
-    QTreeView *deckView;
+    DeckStateManager *deckStateManager;
     QSlider *cardSizeSlider;
     ExactCard rootCard;
     QString zoneName;
@@ -56,16 +55,17 @@ private:
     QLabel *cardCountInZone;
 
     bool hovered;
+    int amount = 0;
 
-    void offsetCountAtIndex(const QModelIndex &idx, int offset);
     void decrementCardHelper(const QString &zoneName);
-    void recursiveExpand(const QModelIndex &index);
 
 private slots:
     void addPrintingMainboard();
     void addPrintingSideboard();
+    void addPrintingTokensboard();
     void removePrintingMainboard();
     void removePrintingSideboard();
+    void removePrintingTokensboard();
     void adjustFontSize(int scalePercentage);
 };
 
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
index f27101b93..27ae61b94 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp
@@ -1,15 +1,38 @@
 #include "printing_selector.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../../interface/card_picture_loader/card_picture_loader.h"
-#include "../../../interface/widgets/dialogs/dlg_select_set_for_cards.h"
+#include "../cards/card_size_widget.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 <QBoxLayout>
+#include <QCheckBox>
+#include <QDebug>
+#include <QHBoxLayout>
+#include <QList>
+#include <QMap>
+#include <QScrollArea>
 #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.
@@ -21,12 +44,9 @@
  *
  * @param parent The parent widget for the PrintingSelector.
  * @param deckEditor The TabDeckEditor instance used for managing the deck.
- * @param deckModel The DeckListModel instance that provides data for the deck's contents.
- * @param deckView The QTreeView instance used to display the deck and its contents.
  */
 PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deckEditor)
-    : QWidget(parent), deckEditor(_deckEditor), deckModel(deckEditor->deckDockWidget->deckModel),
-      deckView(deckEditor->deckDockWidget->deckView)
+    : QWidget(parent), deckEditor(_deckEditor), deckStateManager(_deckEditor->deckStateManager)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     layout = new QVBoxLayout(this);
@@ -36,6 +56,8 @@ PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deck
 
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
 
+    placeholderWidget = new PrintingSelectorPlaceholderWidget(this);
+
     sortToolBar = new PrintingSelectorCardSortingWidget(this);
     sortToolBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
 
@@ -44,16 +66,18 @@ PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deck
 
     // Create the checkbox for navigation buttons visibility
     navigationCheckBox = new QCheckBox(this);
-    navigationCheckBox->setChecked(SettingsCache::instance().getPrintingSelectorNavigationButtonsVisible());
+    navigationCheckBox->setChecked(
+        SettingsCache::instance().cardsDisplay().getPrintingSelectorNavigationButtonsVisible());
     connect(navigationCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
             &PrintingSelector::toggleVisibilityNavigationButtons);
-    connect(navigationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setPrintingSelectorNavigationButtonsVisible);
+    connect(navigationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::setPrintingSelectorNavigationButtonsVisible);
 
-    cardSizeWidget =
-        new CardSizeWidget(displayOptionsWidget, flowWidget, SettingsCache::instance().getPrintingSelectorCardSize());
-    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
-            &SettingsCache::setPrintingSelectorCardSize);
+    cardSizeWidget = new CardSizeWidget(displayOptionsWidget, flowWidget,
+                                        SettingsCache::instance().cardsDisplay().getPrintingSelectorCardSize());
+    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::setPrintingSelectorCardSize);
+    cardSizeWidget->enableCtrlScrollResize(flowWidget);
 
     displayOptionsWidget->addSettingsWidget(sortToolBar);
     displayOptionsWidget->addSettingsWidget(navigationCheckBox);
@@ -72,15 +96,21 @@ PrintingSelector::PrintingSelector(QWidget *parent, AbstractTabDeckEditor *_deck
 
     layout->addWidget(sortAndOptionsContainer);
 
+    layout->addWidget(placeholderWidget);
     layout->addWidget(flowWidget);
 
-    cardSelectionBar = new PrintingSelectorCardSelectionWidget(this);
-    cardSelectionBar->setVisible(SettingsCache::instance().getPrintingSelectorNavigationButtonsVisible());
+    // Initially show placeholder, hide flowWidget
+    placeholderWidget->setVisible(true);
+    flowWidget->setVisible(false);
+
+    cardSelectionBar = new PrintingSelectorCardSelectionWidget(this, deckStateManager);
+    cardSelectionBar->setVisible(
+        SettingsCache::instance().cardsDisplay().getPrintingSelectorNavigationButtonsVisible());
     layout->addWidget(cardSelectionBar);
 
     // Connect deck model data change signal to update display
-    connect(deckModel, &DeckListModel::rowsInserted, this, &PrintingSelector::printingsInDeckChanged);
-    connect(deckModel, &DeckListModel::rowsRemoved, this, &PrintingSelector::printingsInDeckChanged);
+    connect(deckStateManager, &DeckStateManager::uniqueCardsChanged, this, &PrintingSelector::printingsInDeckChanged);
+    connect(deckStateManager, &DeckStateManager::cardModified, this, &PrintingSelector::updateCardAmounts);
 
     retranslateUi();
 }
@@ -92,8 +122,51 @@ void PrintingSelector::retranslateUi()
 
 void PrintingSelector::printingsInDeckChanged()
 {
-    // Delay the update to avoid race conditions
-    QTimer::singleShot(100, this, &PrintingSelector::updateDisplay);
+    if (SettingsCache::instance().cardsDisplay().getBumpSetsWithCardsInDeckToTop()) {
+        // Delay the update to avoid race conditions
+        QTimer::singleShot(100, this, &PrintingSelector::updateDisplay);
+    }
+}
+
+/**
+ * @return A map of uuid to amounts (main, side, tokens).
+ */
+static QMap<QString, ZoneCounts> tallyUuidCounts(const DeckListModel *model, const QString &cardName)
+{
+    QMap<QString, ZoneCounts> map;
+
+    auto mainNodes = model->getCardNodesForZone(DECK_ZONE_MAIN);
+    for (auto &node : mainNodes) {
+        if (node->getName() == cardName) {
+            map[node->getCardProviderId()].mainboard += node->getNumber();
+        }
+    }
+
+    auto sideNodes = model->getCardNodesForZone(DECK_ZONE_SIDE);
+    for (auto &node : sideNodes) {
+        if (node->getName() == cardName) {
+            map[node->getCardProviderId()].sideboard += node->getNumber();
+        }
+    }
+
+    auto tokensNodes = model->getCardNodesForZone(DECK_ZONE_TOKENS);
+    for (auto &node : tokensNodes) {
+        if (node->getName() == cardName) {
+            map[node->getCardProviderId()].tokensboard += node->getNumber();
+        }
+    }
+
+    return map;
+}
+
+void PrintingSelector::updateCardAmounts()
+{
+    if (selectedCard.isNull()) {
+        return;
+    }
+
+    auto map = tallyUuidCounts(deckStateManager->getModel(), selectedCard->getName());
+    emit cardAmountsChanged(map);
 }
 
 /**
@@ -105,7 +178,16 @@ void PrintingSelector::updateDisplay()
     widgetLoadingBufferTimer->deleteLater();
     widgetLoadingBufferTimer = new QTimer(this);
     flowWidget->clearLayout();
-    if (selectedCard != nullptr) {
+
+    if (selectedCard.isNull()) {
+        // Show placeholder, hide flowWidget
+        placeholderWidget->setVisible(true);
+        flowWidget->setVisible(false);
+        setWindowTitle(tr("Printing Selector"));
+    } else {
+        // Hide placeholder, show flowWidget
+        placeholderWidget->setVisible(false);
+        flowWidget->setVisible(true);
         setWindowTitle(selectedCard->getName());
     }
     getAllSetsForCurrentCard();
@@ -115,11 +197,12 @@ void PrintingSelector::updateDisplay()
  * @brief Sets the current card for the selector and updates the display.
  *
  * @param newCard The new card to set.
- * @param _currentZone The current zone the card is in.
  */
-void PrintingSelector::setCard(const CardInfoPtr &newCard, const QString &_currentZone)
+void PrintingSelector::setCard(const CardInfoPtr &newCard)
 {
     if (newCard.isNull()) {
+        selectedCard = newCard;
+        updateDisplay();
         return;
     }
 
@@ -129,7 +212,6 @@ void PrintingSelector::setCard(const CardInfoPtr &newCard, const QString &_curre
     }
 
     selectedCard = newCard;
-    currentZone = _currentZone;
     if (isVisible()) {
         updateDisplay();
     }
@@ -138,58 +220,6 @@ void PrintingSelector::setCard(const CardInfoPtr &newCard, const QString &_curre
     flowWidget->repaint();
 }
 
-/**
- * @brief Selects the previous card in the list.
- */
-void PrintingSelector::selectPreviousCard()
-{
-    selectCard(-1);
-}
-
-/**
- * @brief Selects the next card in the list.
- */
-void PrintingSelector::selectNextCard()
-{
-    selectCard(1);
-}
-
-/**
- * @brief Selects a card based on the change direction.
- *
- * @param changeBy The direction to change, -1 for previous, 1 for next.
- */
-void PrintingSelector::selectCard(const int changeBy)
-{
-    if (changeBy == 0) {
-        return;
-    }
-
-    // Get the current index of the selected item
-    auto deckViewCurrentIndex = deckView->currentIndex();
-
-    auto nextIndex = deckViewCurrentIndex.siblingAtRow(deckViewCurrentIndex.row() + changeBy);
-    if (!nextIndex.isValid()) {
-        nextIndex = deckViewCurrentIndex;
-
-        // Increment to the next valid index, skipping header rows
-        AbstractDecklistNode *node;
-        do {
-            if (changeBy > 0) {
-                nextIndex = deckView->indexBelow(nextIndex);
-            } else {
-                nextIndex = deckView->indexAbove(nextIndex);
-            }
-            node = static_cast<AbstractDecklistNode *>(nextIndex.internalPointer());
-        } while (node && node->isDeckHeader());
-    }
-
-    if (nextIndex.isValid()) {
-        deckView->setCurrentIndex(nextIndex);
-        deckView->setFocus(Qt::FocusReason::MouseFocusReason);
-    }
-}
-
 /**
  * @brief Loads and displays all sets for the current selected card.
  */
@@ -205,25 +235,30 @@ void PrintingSelector::getAllSetsForCurrentCard()
         sortToolBar->filterSets(sortedPrintings, searchBar->getSearchText().trimmed().toLower());
     QList<PrintingInfo> printingsToUse;
 
-    if (SettingsCache::instance().getBumpSetsWithCardsInDeckToTop()) {
-        printingsToUse = sortToolBar->prependPrintingsInDeck(filteredPrintings, selectedCard, deckModel);
+    if (SettingsCache::instance().cardsDisplay().getBumpSetsWithCardsInDeckToTop()) {
+        printingsToUse =
+            sortToolBar->prependPrintingsInDeck(filteredPrintings, selectedCard, deckStateManager->getModel());
     } else {
         printingsToUse = filteredPrintings;
     }
     printingsToUse = sortToolBar->prependPinnedPrintings(printingsToUse, selectedCard->getName());
 
+    auto uuidToAmounts = tallyUuidCounts(deckStateManager->getModel(), selectedCard->getName());
+
     // Defer widget creation
     currentIndex = 0;
 
     connect(widgetLoadingBufferTimer, &QTimer::timeout, this, [=, this]() mutable {
         for (int i = 0; i < BATCH_SIZE && currentIndex < printingsToUse.size(); ++i, ++currentIndex) {
             auto card = ExactCard(selectedCard, printingsToUse[currentIndex]);
-            auto *cardDisplayWidget = new PrintingSelectorCardDisplayWidget(
-                this, deckEditor, deckModel, deckView, cardSizeWidget->getSlider(), card, currentZone);
+            auto *cardDisplayWidget = new PrintingSelectorCardDisplayWidget(this, deckEditor, deckStateManager,
+                                                                            cardSizeWidget->getSlider(), card);
             flowWidget->addWidget(cardDisplayWidget);
-            cardDisplayWidget->clampSetNameToPicture();
+            cardDisplayWidget->updateCardAmounts(uuidToAmounts);
             connect(cardDisplayWidget, &PrintingSelectorCardDisplayWidget::cardPreferenceChanged, this,
                     &PrintingSelector::updateDisplay);
+            connect(this, &PrintingSelector::cardAmountsChanged, cardDisplayWidget,
+                    &PrintingSelectorCardDisplayWidget::updateCardAmounts);
         }
 
         // Stop timer when done
@@ -243,4 +278,4 @@ void PrintingSelector::getAllSetsForCurrentCard()
 void PrintingSelector::toggleVisibilityNavigationButtons(bool _state)
 {
     cardSelectionBar->setVisible(_state);
-}
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
index fbe3b5b06..b9cb27ecd 100644
--- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h
@@ -1,31 +1,42 @@
 /**
  * @file printing_selector.h
  * @ingroup PrintingWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 <QCheckBox>
-#include <QLabel>
-#include <QTreeView>
-#include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
-#include <libcockatrice/models/deck_list/deck_list_model.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;
 
 #define BATCH_SIZE 10
 
+struct ZoneCounts
+{
+    int mainboard = 0;
+    int sideboard = 0;
+    int tokensboard = 0;
+};
+
+class DeckStateManager;
 class PrintingSelectorCardSearchWidget;
 class PrintingSelectorCardSelectionWidget;
 class PrintingSelectorCardSortingWidget;
-class PrintingSelectorViewOptionsWidget;
 class AbstractTabDeckEditor;
+
 class PrintingSelector : public QWidget
 {
     Q_OBJECT
@@ -33,27 +44,33 @@ class PrintingSelector : public QWidget
 public:
     PrintingSelector(QWidget *parent, AbstractTabDeckEditor *deckEditor);
 
-    void setCard(const CardInfoPtr &newCard, const QString &_currentZone);
+    void setCard(const CardInfoPtr &newCard);
     void getAllSetsForCurrentCard();
-    [[nodiscard]] DeckListModel *getDeckModel() const
-    {
-        return deckModel;
-    }
-
-    [[nodiscard]] AbstractTabDeckEditor *getDeckEditor() const
-    {
-        return deckEditor;
-    }
 
 public slots:
     void retranslateUi();
     void updateDisplay();
-    void selectPreviousCard();
-    void selectNextCard();
     void toggleVisibilityNavigationButtons(bool _state);
 
 private slots:
     void printingsInDeckChanged();
+    void updateCardAmounts();
+
+signals:
+    /**
+     * Requests the previous card in the list
+     */
+    void prevCardRequested();
+    /**
+     * Requests the next card in the list
+     */
+    void nextCardRequested();
+
+    /**
+     * The amounts of the printings in the deck has changed
+     * @param uuidToAmounts Map of uuids to the amounts (maindeck, sideboard, tokensboard) in the deck
+     */
+    void cardAmountsChanged(const QMap<QString, ZoneCounts> &uuidToAmounts);
 
 private:
     QVBoxLayout *layout;
@@ -63,17 +80,15 @@ private:
     QCheckBox *navigationCheckBox;
     PrintingSelectorCardSortingWidget *sortToolBar;
     PrintingSelectorCardSearchWidget *searchBar;
+    PrintingSelectorPlaceholderWidget *placeholderWidget;
     FlowWidget *flowWidget;
     CardSizeWidget *cardSizeWidget;
     PrintingSelectorCardSelectionWidget *cardSelectionBar;
     AbstractTabDeckEditor *deckEditor;
-    DeckListModel *deckModel;
-    QTreeView *deckView;
+    DeckStateManager *deckStateManager;
     CardInfoPtr selectedCard;
-    QString currentZone;
     QTimer *widgetLoadingBufferTimer;
     int currentIndex = 0;
-    void selectCard(int changeBy);
 };
 
 #endif // PRINTING_SELECTOR_H
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 24c45a7e3..1c3cb635d 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,11 +1,22 @@
 #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 <QGraphicsEffect>
+#include <QMap>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QString>
 #include <QVBoxLayout>
-#include <utility>
+#include <qnamespace.h>
+
+class AbstractTabDeckEditor;
+class DeckStateManager;
+class QSlider;
 
 /**
  * @brief Constructs a PrintingSelectorCardDisplayWidget to display card information.
@@ -17,30 +28,26 @@
  * display.
  *
  * @param parent The parent widget for this display.
- * @param _deckEditor The TabDeckEditor instance for deck management.
- * @param _deckModel The DeckListModel instance providing deck data.
- * @param _deckView The QTreeView instance displaying the deck.
- * @param _cardSizeSlider The slider controlling the size of the displayed card.
- * @param _rootCard The root card object, representing the card to be displayed.
- * @param _currentZone The current zone in which the card is located.
+ * @param deckEditor The TabDeckEditor instance for deck management.
+ * @param deckStateManager The DeckStateManager instance providing deck data.
+ * @param cardSizeSlider The slider controlling the size of the displayed card.
+ * @param rootCard The root card object, representing the card to be displayed.
  */
 PrintingSelectorCardDisplayWidget::PrintingSelectorCardDisplayWidget(QWidget *parent,
-                                                                     AbstractTabDeckEditor *_deckEditor,
-                                                                     DeckListModel *_deckModel,
-                                                                     QTreeView *_deckView,
-                                                                     QSlider *_cardSizeSlider,
-                                                                     const ExactCard &_rootCard,
-                                                                     QString &_currentZone)
-    : QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView),
-      cardSizeSlider(_cardSizeSlider), rootCard(_rootCard), currentZone(_currentZone)
+                                                                     AbstractTabDeckEditor *deckEditor,
+                                                                     DeckStateManager *deckStateManager,
+                                                                     QSlider *cardSizeSlider,
+                                                                     const ExactCard &rootCard)
+    : QWidget(parent), rootCard(rootCard)
 {
     layout = new QVBoxLayout(this);
+    layout->setContentsMargins(5, 5, 5, 5);
+    layout->setSpacing(3);
     setLayout(layout);
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
     // Create the overlay widget for the card display
-    overlayWidget =
-        new PrintingSelectorCardOverlayWidget(this, deckEditor, deckModel, deckView, cardSizeSlider, rootCard);
+    overlayWidget = new PrintingSelectorCardOverlayWidget(this, deckEditor, deckStateManager, cardSizeSlider, rootCard);
     connect(overlayWidget, &PrintingSelectorCardOverlayWidget::cardPreferenceChanged, this,
             [this]() { emit cardPreferenceChanged(); });
 
@@ -48,8 +55,8 @@ PrintingSelectorCardDisplayWidget::PrintingSelectorCardDisplayWidget(QWidget *pa
 
     // Create the widget to display the set name and collector's number
     QString combinedSetName = QString(set->getLongName() + " (" + set->getShortName() + ")");
-    setNameAndCollectorsNumberDisplayWidget = new SetNameAndCollectorsNumberDisplayWidget(
-        this, combinedSetName, rootCard.getPrinting().getProperty("num"), cardSizeSlider);
+    setNameAndCollectorsNumberDisplayWidget =
+        new SetNameAndCollectorsNumberDisplayWidget(this, combinedSetName, rootCard.getPrinting().getProperty("num"));
 
     // Add the widgets to the layout
     layout->addWidget(overlayWidget, 0, Qt::AlignHCenter);
@@ -70,3 +77,15 @@ void PrintingSelectorCardDisplayWidget::clampSetNameToPicture()
     }
     update();
 }
+
+void PrintingSelectorCardDisplayWidget::updateCardAmounts(const QMap<QString, ZoneCounts> &uuidToAmounts)
+{
+    auto counts = uuidToAmounts.value(rootCard.getPrinting().getUuid());
+    overlayWidget->updateCardAmounts(counts.mainboard, counts.sideboard, counts.tokensboard);
+}
+
+void PrintingSelectorCardDisplayWidget::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+    clampSetNameToPicture();
+}
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 2f6bd6920..f0a378fd3 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
@@ -1,18 +1,31 @@
 /**
  * @file printing_selector_card_display_widget.h
  * @ingroup PrintingWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_H
 #define PRINTING_SELECTOR_CARD_DISPLAY_WIDGET_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 "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 <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#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;
 
 class PrintingSelectorCardDisplayWidget : public QWidget
 {
@@ -20,28 +33,24 @@ class PrintingSelectorCardDisplayWidget : public QWidget
 
 public:
     PrintingSelectorCardDisplayWidget(QWidget *parent,
-                                      AbstractTabDeckEditor *_deckEditor,
-                                      DeckListModel *_deckModel,
-                                      QTreeView *_deckView,
-                                      QSlider *_cardSizeSlider,
-                                      const ExactCard &_rootCard,
-                                      QString &_currentZone);
+                                      AbstractTabDeckEditor *deckEditor,
+                                      DeckStateManager *deckStateManager,
+                                      QSlider *cardSizeSlider,
+                                      const ExactCard &rootCard);
 
 public slots:
     void clampSetNameToPicture();
+    void updateCardAmounts(const QMap<QString, ZoneCounts> &uuidToAmounts);
+
+    void resizeEvent(QResizeEvent *event) override;
 
 signals:
     void cardPreferenceChanged();
 
 private:
+    ExactCard rootCard;
     QVBoxLayout *layout;
     SetNameAndCollectorsNumberDisplayWidget *setNameAndCollectorsNumberDisplayWidget;
-    AbstractTabDeckEditor *deckEditor;
-    DeckListModel *deckModel;
-    QTreeView *deckView;
-    QSlider *cardSizeSlider;
-    ExactCard rootCard;
-    QString currentZone;
     PrintingSelectorCardOverlayWidget *overlayWidget;
 };
 
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 5f3a44b30..bec9100a6 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
@@ -1,17 +1,91 @@
 #include "printing_selector_card_overlay_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "printing_selector_card_display_widget.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 <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 <utility>
+#include <libcockatrice/settings/card_override_settings.h>
+#include <qnamespace.h>
+
+class DeckStateManager;
+
+namespace
+{
+/**
+ * @brief Places the preview beside the highlighted action inside the given screen.
+ *
+ * Side-aware: hugs the side of the action that has room, aligned with its row, then
+ * clamps every edge so the preview always lands fully on-screen on first show.
+ */
+QPoint
+previewPositionNear(const QRect &actionRect, const QSize &labelSize, const QRect &screenGeometry, int previewOffset)
+{
+    const bool rightFits = actionRect.right() + previewOffset + labelSize.width() <= screenGeometry.right();
+    const bool leftFits = actionRect.left() - previewOffset - labelSize.width() >= screenGeometry.left();
+
+    int x;
+    if (rightFits) {
+        x = actionRect.right() + previewOffset;
+    } else if (leftFits) {
+        x = actionRect.left() - previewOffset - labelSize.width();
+    } else {
+        x = actionRect.left();
+    }
+    x = qMax(screenGeometry.left(), x);
+    x = qMin(screenGeometry.right() - labelSize.width() + 1, x);
+
+    const bool belowFits = actionRect.bottom() + previewOffset + labelSize.height() <= screenGeometry.bottom();
+    const bool aboveFits = actionRect.top() - previewOffset - labelSize.height() >= screenGeometry.top();
+
+    int y;
+    if (belowFits) {
+        y = actionRect.bottom() + previewOffset;
+    } else if (aboveFits) {
+        y = actionRect.top() - previewOffset - labelSize.height();
+    } else {
+        y = actionRect.top();
+    }
+    y = qMax(screenGeometry.top(), y);
+    y = qMin(screenGeometry.bottom() - labelSize.height() + 1, y);
+
+    return {x, y};
+}
+} // namespace
 
 /**
  * @brief Constructs a PrintingSelectorCardOverlayWidget for displaying a card overlay.
@@ -22,19 +96,16 @@
  *
  * @param parent The parent widget for this overlay.
  * @param _deckEditor The TabDeckEditor instance for deck management.
- * @param _deckModel The DeckListModel instance providing deck data.
- * @param _deckView The QTreeView instance displaying the deck.
- * @param _cardSizeSlider The slider controlling the size of the card.
+ * @param deckStateManager The DeckStateManager instance providing deck data.
+ * @param cardSizeSlider The slider controlling the size of the card.
  * @param _rootCard The root card object that contains information about the card.
  */
 PrintingSelectorCardOverlayWidget::PrintingSelectorCardOverlayWidget(QWidget *parent,
                                                                      AbstractTabDeckEditor *_deckEditor,
-                                                                     DeckListModel *_deckModel,
-                                                                     QTreeView *_deckView,
-                                                                     QSlider *_cardSizeSlider,
+                                                                     DeckStateManager *deckStateManager,
+                                                                     QSlider *cardSizeSlider,
                                                                      const ExactCard &_rootCard)
-    : QWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), deckView(_deckView),
-      cardSizeSlider(_cardSizeSlider), rootCard(_rootCard)
+    : QWidget(parent), deckEditor(_deckEditor), rootCard(_rootCard)
 {
     // Set up the main layout
     auto *mainLayout = new QVBoxLayout(this);
@@ -51,6 +122,31 @@ PrintingSelectorCardOverlayWidget::PrintingSelectorCardOverlayWidget(QWidget *pa
 
     initializePinBadge();
 
+    // Parent the preview to this overlay so it is destroyed with it (Qt::ToolTip keeps
+    // it a frameless, non-activating top-level window despite the parent).
+    cardOverridePreviewLabel = new QLabel(this, Qt::ToolTip);
+    cardOverridePreviewLabel->setWindowFlag(Qt::FramelessWindowHint);
+    cardOverridePreviewLabel->setAttribute(Qt::WA_ShowWithoutActivating);
+    cardOverridePreviewLabel->setScaledContents(true);
+    cardOverridePreviewLabel->hide();
+
+    // While the preview is visible, keep it honest: when the hovered printing's art
+    // resolves (all alternate printings share the root card's CardInfo), redraw it in place.
+    if (rootCard.getCardPtr()) {
+        connect(rootCard.getCardPtr().data(), &CardInfo::pixmapUpdated, this, [this] {
+            if (cardOverridePreviewLabel->isVisible()) {
+                refreshPreview();
+            }
+        });
+    }
+
+    // Alt-Tab / app-inactive must not strand the floating preview.
+    connect(qApp, &QGuiApplication::applicationStateChanged, this, [this](Qt::ApplicationState state) {
+        if (state != Qt::ApplicationActive) {
+            hidePreview();
+        }
+    });
+
     // Update when this overlay emits cardPreferenceChanged or when size/scale changes
     connect(this, &PrintingSelectorCardOverlayWidget::cardPreferenceChanged, this,
             &PrintingSelectorCardOverlayWidget::updatePinBadgeVisibility);
@@ -59,22 +155,9 @@ PrintingSelectorCardOverlayWidget::PrintingSelectorCardOverlayWidget(QWidget *pa
     updatePinBadgeVisibility();
 
     // Add AllZonesCardAmountWidget
-    allZonesCardAmountWidget =
-        new AllZonesCardAmountWidget(this, deckEditor, deckModel, deckView, cardSizeSlider, _rootCard);
+    allZonesCardAmountWidget = new AllZonesCardAmountWidget(this, deckStateManager, cardSizeSlider, _rootCard);
 
     allZonesCardAmountWidget->raise(); // Ensure it's on top of the picture
-    // Set initial visibility based on amounts
-    if (allZonesCardAmountWidget->getMainboardAmount() > 0 || allZonesCardAmountWidget->getSideboardAmount() > 0) {
-        allZonesCardAmountWidget->setVisible(true);
-    } else {
-        allZonesCardAmountWidget->setVisible(false);
-    }
-
-    // Attempt to cast the parent to PrintingSelectorCardDisplayWidget
-    if (const auto *parentWidget = qobject_cast<PrintingSelectorCardDisplayWidget *>(parent)) {
-        connect(cardInfoPicture, &CardInfoPictureWidget::cardScaleFactorChanged, parentWidget,
-                &PrintingSelectorCardDisplayWidget::clampSetNameToPicture);
-    }
 
     connect(cardSizeSlider, &QSlider::valueChanged, cardInfoPicture, &CardInfoPictureWidget::setScaleFactor);
 }
@@ -117,29 +200,37 @@ void PrintingSelectorCardOverlayWidget::resizeEvent(QResizeEvent *event)
 /**
  * @brief Handles the mouse enter event when the cursor enters the overlay widget area.
  *
- * When the cursor enters the widget, the card information is updated, and the card amount widget
- * is displayed if the amounts are zero for both the mainboard and sideboard.
+ * When the cursor enters the widget, the card amount widget becomes visible regardless of whether the amounts are zero.
  *
  * @param event The event triggered when the mouse enters the widget.
  */
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 void PrintingSelectorCardOverlayWidget::enterEvent(QEnterEvent *event)
-#else
-void PrintingSelectorCardOverlayWidget::enterEvent(QEvent *event)
-#endif
 {
     QWidget::enterEvent(event);
     deckEditor->updateCard(rootCard);
-
-    // Check if either mainboard or sideboard amount is greater than 0
-    if (allZonesCardAmountWidget->getMainboardAmount() > 0 || allZonesCardAmountWidget->getSideboardAmount() > 0) {
-        // Don't change visibility if amounts are greater than 0
-        return;
-    }
-
-    // Show the widget if amounts are 0
-    allZonesCardAmountWidget->setVisible(true);
+    updateVisibility();
 }
+
+void PrintingSelectorCardOverlayWidget::updateCardAmounts(int mainboardAmount,
+                                                          int sideboardAmount,
+                                                          int tokensboardAmount)
+{
+    allZonesCardAmountWidget->setAmounts(mainboardAmount, sideboardAmount, tokensboardAmount);
+    updateVisibility();
+}
+
+/**
+ * @brief Sets the visibility of the widgets depending on the amounts and whether the mouse is hovering over.
+ */
+void PrintingSelectorCardOverlayWidget::updateVisibility()
+{
+    if (allZonesCardAmountWidget->isNonZero() || underMouse()) {
+        allZonesCardAmountWidget->setVisible(true);
+    } else {
+        allZonesCardAmountWidget->setVisible(false);
+    }
+}
+
 /**
  * @brief Updates the pin badge visibility and position based on the card's pinned state.
  *
@@ -153,8 +244,9 @@ void PrintingSelectorCardOverlayWidget::enterEvent(QEvent *event)
  */
 void PrintingSelectorCardOverlayWidget::updatePinBadgeVisibility()
 {
-    if (!pinBadge || !cardInfoPicture)
+    if (!pinBadge || !cardInfoPicture) {
         return;
+    }
 
     // Query the persisted preference override to decide whether this printing is pinned.
     const auto &preferredProviderId =
@@ -178,39 +270,35 @@ void PrintingSelectorCardOverlayWidget::updatePinBadgeVisibility()
 /**
  * @brief Handles the mouse leave event when the cursor leaves the overlay widget area.
  *
- * When the cursor leaves the widget, the card amount widget is hidden if both the mainboard and sideboard
- * amounts are zero.
+ * When the cursor leaves the widget, the card amount widget is hidden if all of the mainboard, sideboard, and
+ * tokensboard amounts are zero.
  *
  * @param event The event triggered when the mouse leaves the widget.
  */
 void PrintingSelectorCardOverlayWidget::leaveEvent(QEvent *event)
 {
     QWidget::leaveEvent(event);
-
-    // Check if either mainboard or sideboard amount is greater than 0
-    if (allZonesCardAmountWidget->getMainboardAmount() > 0 || allZonesCardAmountWidget->getSideboardAmount() > 0) {
-        // Don't hide the widget if amounts are greater than 0
-        return;
-    }
-
-    // Hide the widget if amounts are 0
-    allZonesCardAmountWidget->setVisible(false);
+    updateVisibility();
 }
 
 /**
- * @brief Creates and shows a custom context menu when the right mouse button is clicked.
+ * @brief Creates and shows the card-overlay context menu.
  *
- * The context menu includes an option to show related cards, which displays a submenu with actions
- * for each related card. When an action is triggered, the card information is updated, and the
- * printing selector is shown.
+ * The menu includes the card art preference (Pin/Unpin Printing), the Image Overrides
+ * submenu (Load Custom Image, Clear Custom Image, and one entry per alternate printing with a
+ * live preview), and the Show Related cards submenu.
  *
- * @param point The position of the mouse when the right-click occurred.
+ * @param point The local position the menu should pop at.
  */
 void PrintingSelectorCardOverlayWidget::customMenu(QPoint point)
 {
     QMenu menu;
 
-    auto *preferenceMenu = new QMenu(tr("Preference"));
+    hidePreview(); // Clear any preview state left over from a previous menu run.
+
+    // Submenus are owned by the stack-allocated top-level menu (addMenu() does not
+    // transfer ownership).
+    auto *preferenceMenu = new QMenu(tr("Preference"), &menu);
     menu.addMenu(preferenceMenu);
 
     const auto &preferredProviderId =
@@ -232,8 +320,66 @@ void PrintingSelectorCardOverlayWidget::customMenu(QPoint point)
         });
     }
 
+    menu.addSeparator();
+
+    auto *overrideMenu = new QMenu(tr("Image Overrides"), &menu);
+
+    auto *loadCustomAction = overrideMenu->addAction(tr("Load Custom Image..."));
+    auto *clearOverrideAction = overrideMenu->addAction(tr("Clear Custom Image"));
+
+    // Nothing to clear on a card that has no local override yet.
+    clearOverrideAction->setEnabled(CardPictureLoader::hasLocalOverrides(rootCard));
+
+    overrideMenu->addSeparator();
+
+    const auto &allSets = rootCard.getInfo().getSets();
+
+    for (const auto &set : allSets) {
+        for (const auto &printing : set) {
+            if (printing == rootCard.getPrinting()) {
+                continue;
+            }
+
+            // The submenu is already scoped to this card, so the rows lead with set +
+            // collector; only printings with a distinct display name add their own name.
+            const CardSetPtr cardSet = printing.getSet();
+            if (!cardSet) {
+                continue;
+            }
+
+            QString label = tr("%1 %2").arg(cardSet->getCorrectedShortName(), printing.getProperty("num"));
+
+            auto *action = overrideMenu->addAction(label);
+
+            ExactCard overrideCard(rootCard.getCardPtr(), printing);
+            action->setData(QVariant::fromValue(overrideCard));
+
+            connect(action, &QAction::triggered, this, [this, overrideCard]() {
+                CardPictureLoader::getInstance().installPrintingOverride(rootCard, overrideCard);
+                QPixmapCache::clear();
+                rootCard.emitPixmapUpdated(); // refresh the overlay art in place, like the other paths
+            });
+        }
+    }
+
+    connect(clearOverrideAction, &QAction::triggered, this, [this]() {
+        CardPictureLoader::deleteAllLocalOverrides(rootCard);
+        QPixmapCache::clear();
+        rootCard.emitPixmapUpdated(); // force UI refresh
+    });
+
+    connect(loadCustomAction, &QAction::triggered, this, &PrintingSelectorCardOverlayWidget::loadCustomImage);
+
+    connect(overrideMenu, &QMenu::hovered, this, &PrintingSelectorCardOverlayWidget::showPreviewForAction);
+    connect(overrideMenu, &QMenu::aboutToHide, this, &PrintingSelectorCardOverlayWidget::hidePreview);
+    connect(overrideMenu, &QMenu::triggered, this, &PrintingSelectorCardOverlayWidget::hidePreview);
+
+    menu.addMenu(overrideMenu);
+
+    menu.addSeparator();
+
     // filling out the related cards submenu
-    auto *relatedMenu = new QMenu(tr("Show Related cards"));
+    auto *relatedMenu = new QMenu(tr("Show Related cards"), &menu);
     menu.addMenu(relatedMenu);
     auto relatedCards = rootCard.getInfo().getAllRelatedCards();
     if (relatedCards.isEmpty()) {
@@ -248,7 +394,11 @@ void PrintingSelectorCardOverlayWidget::customMenu(QPoint point)
             });
         }
     }
+    // The preview anchors itself to this popup's global geometry while it is open, so the
+    // pointer must stay valid for the whole exec() and be dropped before the stack unwinds.
+    previewSourceMenu = overrideMenu;
     menu.exec(this->mapToGlobal(point));
+    previewSourceMenu = nullptr;
 }
 
 /**
@@ -304,3 +454,136 @@ void PrintingSelectorCardOverlayWidget::initializePinBadge()
     pinBadge->setVisible(false);
     pinBadge->raise();
 }
+
+/**
+ * @brief Asks for an image file and installs it as the card's custom art.
+ *
+ * Unreadable files answer with a visible warning instead of a silent no-op.
+ */
+void PrintingSelectorCardOverlayWidget::loadCustomImage()
+{
+    QString filePath = QFileDialog::getOpenFileName(this, tr("Select Card Image"), QString(),
+                                                    tr("Images (*.png *.jpg *.jpeg *.webp)"));
+
+    if (filePath.isEmpty()) {
+        return;
+    }
+
+    QPixmap pixmap(filePath);
+    if (pixmap.isNull()) {
+        // No silent paths: a file that cannot be read answers visibly instead of a no-op.
+        QMessageBox::warning(this, tr("Load Custom Image"), tr("The selected file could not be read as an image."));
+        return;
+    }
+
+    CardPictureLoader::getInstance().saveCardImageToLocalStorage(rootCard, pixmap, true);
+
+    QPixmapCache::clear();
+    rootCard.emitPixmapUpdated();
+}
+
+/**
+ * @brief Shows the hover preview for a highlighted printing entry in the Image Overrides submenu.
+ *
+ * QMenu::hovered fires on keyboard highlight too, so the preview appears when arrows walk
+ * onto a printing entry, not only under the mouse.
+ *
+ * Non-printing entries (e.g., Load Custom Image, Clear Custom Image) hide the preview.
+ *
+ * @param action The action that was highlighted.
+ */
+void PrintingSelectorCardOverlayWidget::showPreviewForAction(QAction *action)
+{
+    if (!action) {
+        hidePreview();
+        return;
+    }
+
+    const QVariant data = action->data();
+
+    if (!data.canConvert<ExactCard>()) {
+        hidePreview();
+        return;
+    }
+
+    const ExactCard previewCard = qvariant_cast<ExactCard>(data);
+    if (previewCard.isEmpty()) {
+        hidePreview();
+        return;
+    }
+
+    hoveredOverrideCard = previewCard;
+    hoveredOverrideAction = action;
+    refreshPreview();
+}
+
+/**
+ * @brief Renders the hover preview for the currently highlighted printing.
+ *
+ * The preview shows the loading placeholder while the art is pending and swaps in the real
+ * art when it resolves. The label is positioned against its already-resized geometry so the
+ * first-ever show at the screen's edges stays fully on-screen.
+ */
+void PrintingSelectorCardOverlayWidget::refreshPreview()
+{
+    if (hoveredOverrideCard.isEmpty()) {
+        hidePreview();
+        return;
+    }
+
+    constexpr QSize previewSize(240, 336);
+    constexpr int previewOffset = 20;
+
+    QPixmap pixmap;
+    CardPictureLoader::getPixmap(pixmap, hoveredOverrideCard, previewSize);
+
+    if (pixmap.isNull()) {
+        // Keep the preview honest while loading: show the loading placeholder instead of a void.
+        // Fetch at the logical size and let the label scale it, so the placeholder matches the
+        // real art's footprint rather than doubling on HiDPI displays.
+        CardPictureLoader::getCardBackLoadingInProgressPixmap(pixmap, previewSize);
+    }
+
+    cardOverridePreviewLabel->setPixmap(pixmap);
+    // QPixmap::size() is physical pixels; the label layout must use the device-independent size
+    // so the preview keeps a constant footprint across DPI settings (QScreen geometry is logical).
+    const QSize labelSize = pixmap.deviceIndependentSize().toSize();
+    cardOverridePreviewLabel->resize(labelSize);
+
+    // Anchor the preview to the walked submenu popup rather than QCursor::pos(), which is idle
+    // under keyboard-only operation: a keyboard-highlighted row must preview at the same place as
+    // a hovered one. The mouse path is unchanged in effect — the popup sits under the cursor, so
+    // the preview stays beside the row in both modalities.
+    const QMenu *popup = previewSourceMenu;
+    if (!popup || !popup->isVisible() || !hoveredOverrideAction) {
+        hidePreview();
+        return;
+    }
+
+    const QRect popupGeometry = popup->geometry();
+    const QRect actionRectLocal = popup->actionGeometry(hoveredOverrideAction);
+    const QRect actionRect(popupGeometry.topLeft() + actionRectLocal.topLeft(), actionRectLocal.size());
+
+    QScreen *screen = QGuiApplication::screenAt(popupGeometry.center());
+    if (!screen) {
+        hidePreview();
+        return;
+    }
+    const QRect &screenGeometry = screen->geometry();
+
+    cardOverridePreviewLabel->move(previewPositionNear(actionRect, labelSize, screenGeometry, previewOffset));
+    cardOverridePreviewLabel->show();
+}
+
+/**
+ * @brief Hides the hover preview and forgets the currently highlighted printing.
+ */
+void PrintingSelectorCardOverlayWidget::hidePreview()
+{
+    hoveredOverrideCard = ExactCard();
+    hoveredOverrideAction = nullptr;
+
+    if (cardOverridePreviewLabel) {
+        cardOverridePreviewLabel->hide();
+    }
+}
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 10df9d53e..20d8f7b4b 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
@@ -1,17 +1,26 @@
 /**
  * @file printing_selector_card_overlay_widget.h
  * @ingroup PrintingWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H
 #define PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_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 "libcockatrice/card/printing/exact_card.h"
 
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class QAction;
+class QMenu;
+class AbstractTabDeckEditor;
+class AllZonesCardAmountWidget;
+class CardInfoPictureWidget;
+class DeckStateManager;
+class QLabel;
+class QPoint;
+class QSlider;
 
 class PrintingSelectorCardOverlayWidget : public QWidget
 {
@@ -20,18 +29,13 @@ class PrintingSelectorCardOverlayWidget : public QWidget
 public:
     explicit PrintingSelectorCardOverlayWidget(QWidget *parent,
                                                AbstractTabDeckEditor *_deckEditor,
-                                               DeckListModel *_deckModel,
-                                               QTreeView *_deckView,
+                                               DeckStateManager *_deckStateManager,
                                                QSlider *_cardSizeSlider,
                                                const ExactCard &_rootCard);
 
 protected:
     void resizeEvent(QResizeEvent *event) override;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     void enterEvent(QEnterEvent *event) override;
-#else
-    void enterEvent(QEvent *event) override;
-#endif
     void leaveEvent(QEvent *event) override;
     void mousePressEvent(QMouseEvent *event) override;
     void customMenu(QPoint point);
@@ -39,19 +43,28 @@ protected:
 signals:
     void cardPreferenceChanged();
 
+public slots:
+    void updateCardAmounts(int mainboardAmount, int sideboardAmount, int tokensboardAmount);
+
 private slots:
+    void updateVisibility();
     void updatePinBadgeVisibility();
 
 private:
     void initializePinBadge();
+    void loadCustomImage();
+    void showPreviewForAction(QAction *action);
+    void refreshPreview();
+    void hidePreview();
     CardInfoPictureWidget *cardInfoPicture;
     AllZonesCardAmountWidget *allZonesCardAmountWidget;
     QLabel *pinBadge = nullptr;
     AbstractTabDeckEditor *deckEditor;
-    DeckListModel *deckModel;
-    QTreeView *deckView;
-    QSlider *cardSizeSlider;
     ExactCard rootCard;
+    QLabel *cardOverridePreviewLabel = nullptr;
+    ExactCard hoveredOverrideCard;
+    QMenu *previewSourceMenu = nullptr;
+    QAction *hoveredOverrideAction = nullptr;
 };
 
 #endif // PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H
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 3c42f06dc..718e24ea0 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,5 +1,11 @@
 #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 821addd01..d54cf5fbc 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
@@ -1,17 +1,20 @@
 /**
  * @file printing_selector_card_search_widget.h
  * @ingroup PrintingWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef PRINTING_SELECTOR_CARD_SEARCH_WIDGET_H
 #define PRINTING_SELECTOR_CARD_SEARCH_WIDGET_H
 
-#include "printing_selector.h"
-
-#include <QLineEdit>
-#include <QTimer>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class PrintingSelector;
+class QHBoxLayout;
+class QLineEdit;
+class QTimer;
 
 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 fc17cecd0..da66591b3 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,7 +1,12 @@
 #include "printing_selector_card_selection_widget.h"
 
 #include "../../../interface/widgets/dialogs/dlg_select_set_for_cards.h"
-#include "../tabs/abstract_tab_deck_editor.h"
+#include "printing_selector.h"
+
+#include <QHBoxLayout>
+#include <QPushButton>
+
+class DeckStateManager;
 
 /**
  * @brief Constructs a PrintingSelectorCardSelectionWidget for navigating through cards in the deck.
@@ -11,7 +16,9 @@
  *
  * @param parent The parent PrintingSelector widget responsible for managing card selection.
  */
-PrintingSelectorCardSelectionWidget::PrintingSelectorCardSelectionWidget(PrintingSelector *parent) : parent(parent)
+PrintingSelectorCardSelectionWidget::PrintingSelectorCardSelectionWidget(PrintingSelector *parent,
+                                                                         DeckStateManager *deckStateManager)
+    : parent(parent), deckStateManager(deckStateManager)
 {
     cardSelectionBarLayout = new QHBoxLayout(this);
     cardSelectionBarLayout->setContentsMargins(9, 0, 9, 0);
@@ -42,18 +49,12 @@ PrintingSelectorCardSelectionWidget::PrintingSelectorCardSelectionWidget(Printin
  */
 void PrintingSelectorCardSelectionWidget::connectSignals()
 {
-    connect(previousCardButton, &QPushButton::clicked, parent, &PrintingSelector::selectPreviousCard);
-    connect(nextCardButton, &QPushButton::clicked, parent, &PrintingSelector::selectNextCard);
+    connect(previousCardButton, &QPushButton::clicked, parent, &PrintingSelector::prevCardRequested);
+    connect(nextCardButton, &QPushButton::clicked, parent, &PrintingSelector::nextCardRequested);
 }
 
 void PrintingSelectorCardSelectionWidget::selectSetForCards()
 {
-    auto *setSelectionDialog = new DlgSelectSetForCards(nullptr, parent->getDeckModel());
-    connect(setSelectionDialog, &DlgSelectSetForCards::deckAboutToBeModified, parent->getDeckEditor(),
-            &AbstractTabDeckEditor::onDeckHistorySaveRequested);
-    connect(setSelectionDialog, &DlgSelectSetForCards::deckModified, parent->getDeckEditor(),
-            &AbstractTabDeckEditor::onDeckModified);
-    if (!setSelectionDialog->exec()) {
-        return;
-    }
+    auto *setSelectionDialog = new DlgSelectSetForCards(nullptr, deckStateManager);
+    setSelectionDialog->exec();
 }
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 a1176a76c..c619c5327 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
@@ -1,24 +1,26 @@
 /**
  * @file printing_selector_card_selection_widget.h
  * @ingroup PrintingWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef PRINTING_SELECTOR_CARD_SELECTION_WIDGET_H
 #define PRINTING_SELECTOR_CARD_SELECTION_WIDGET_H
 
-#include "printing_selector.h"
-
-#include <QHBoxLayout>
-#include <QPushButton>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class DeckStateManager;
+class PrintingSelector;
+class QHBoxLayout;
+class QPushButton;
 
 class PrintingSelectorCardSelectionWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit PrintingSelectorCardSelectionWidget(PrintingSelector *parent);
+    explicit PrintingSelectorCardSelectionWidget(PrintingSelector *parent, DeckStateManager *deckStateManager);
 
     void connectSignals();
 
@@ -27,6 +29,7 @@ public slots:
 
 private:
     PrintingSelector *parent;
+    DeckStateManager *deckStateManager;
     QHBoxLayout *cardSelectionBarLayout;
     QPushButton *previousCardButton;
     QPushButton *selectSetForCardsButton;
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 af7cedbeb..f47ba0746 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,8 +1,26 @@
 #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");
@@ -21,11 +39,12 @@ PrintingSelectorCardSortingWidget::PrintingSelectorCardSortingWidget(PrintingSel
 {
     setMinimumWidth(300);
     sortToolBar = new QHBoxLayout(this);
+    sortToolBar->setContentsMargins(11, 0, 11, 0);
 
     sortOptionsSelector = new QComboBox(this);
     sortOptionsSelector->setFocusPolicy(Qt::StrongFocus);
     sortOptionsSelector->addItems(SORT_OPTIONS);
-    sortOptionsSelector->setCurrentIndex(SettingsCache::instance().getPrintingSelectorSortOrder());
+    sortOptionsSelector->setCurrentIndex(SettingsCache::instance().cardsDisplay().getPrintingSelectorSortOrder());
     connect(sortOptionsSelector, &QComboBox::currentTextChanged, this,
             &PrintingSelectorCardSortingWidget::updateSortSetting);
     connect(sortOptionsSelector, &QComboBox::currentTextChanged, parent, &PrintingSelector::updateDisplay);
@@ -61,7 +80,7 @@ void PrintingSelectorCardSortingWidget::updateSortOrder()
  */
 void PrintingSelectorCardSortingWidget::updateSortSetting()
 {
-    SettingsCache::instance().setPrintingSelectorSortOrder(sortOptionsSelector->currentIndex());
+    SettingsCache::instance().cardsDisplay().setPrintingSelectorSortOrder(sortOptionsSelector->currentIndex());
 }
 
 /**
@@ -89,7 +108,7 @@ QList<PrintingInfo> PrintingSelectorCardSortingWidget::sortSets(const SetToPrint
     }
 
     if (sortedSets.empty()) {
-        sortedSets << CardSet::newInstance(SettingsCache::instance().cardDatabase(), "", "", "", QDate());
+        sortedSets << CardSet::newInstance(&SettingsCache::instance().cardDatabase(), "", "", "", QDate());
     }
 
     if (sortOptionsSelector->currentText() == SORT_OPTIONS_PREFERENCE) {
@@ -183,7 +202,7 @@ QList<PrintingInfo> PrintingSelectorCardSortingWidget::prependPinnedPrintings(co
  */
 QList<PrintingInfo> PrintingSelectorCardSortingWidget::prependPrintingsInDeck(const QList<PrintingInfo> &printings,
                                                                               const CardInfoPtr &selectedCard,
-                                                                              DeckListModel *deckModel)
+                                                                              const DeckListModel *deckModel)
 {
     if (!selectedCard) {
         return {};
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 d0faea4ac..1cd99457b 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
@@ -1,17 +1,26 @@
 /**
  * @file printing_selector_card_sorting_widget.h
  * @ingroup PrintingWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef PRINTING_SELECTOR_CARD_SORTING_WIDGET_H
 #define PRINTING_SELECTOR_CARD_SORTING_WIDGET_H
 
-#include "printing_selector.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/printing/printing_info.h"
 
-#include <QComboBox>
-#include <QPushButton>
+#include <QList>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class DeckListModel;
+class PrintingSelector;
+class QComboBox;
+class QHBoxLayout;
+class QPushButton;
 
 class PrintingSelectorCardSortingWidget : public QWidget
 {
@@ -23,7 +32,7 @@ public:
     QList<PrintingInfo> prependPinnedPrintings(const QList<PrintingInfo> &printings, const QString &cardName);
     QList<PrintingInfo> prependPrintingsInDeck(const QList<PrintingInfo> &printings,
                                                const CardInfoPtr &selectedCard,
-                                               DeckListModel *deckModel);
+                                               const DeckListModel *deckModel);
 
 public slots:
     void updateSortOrder();
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
new file mode 100644
index 000000000..7f9ad66c8
--- /dev/null
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp
@@ -0,0 +1,47 @@
+#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);
+    mainLayout = new QVBoxLayout(this);
+    mainLayout->setAlignment(Qt::AlignCenter);
+    setLayout(mainLayout);
+
+    // Image label with the background image
+    imageLabel = new QLabel(this);
+    imageLabel->setAlignment(Qt::AlignCenter);
+    imageLabel->setStyleSheet(R"(
+        QLabel {
+            background-image: url(theme:backgrounds/placeholder_printing_selector.svg);
+            background-repeat: no-repeat;
+            background-position: center;
+        }
+    )");
+    imageLabel->setFixedSize(300, 300);
+
+    textLabel = new QLabel(this);
+    textLabel->setAlignment(Qt::AlignCenter);
+    textLabel->setWordWrap(true);
+    textLabel->setStyleSheet(R"(
+        QLabel {
+            color: palette(mid);
+            font-size: 14px;
+            padding: 10px;
+        }
+    )");
+
+    mainLayout->addWidget(imageLabel);
+    mainLayout->addWidget(textLabel);
+
+    retranslateUi();
+}
+
+void PrintingSelectorPlaceholderWidget::retranslateUi()
+{
+    textLabel->setText(tr("Select a card to view its available printings"));
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..6702d325a
--- /dev/null
+++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_placeholder_widget.h
@@ -0,0 +1,25 @@
+#ifndef COCKATRICE_PRINTING_SELECTOR_PLACEHOLDER_WIDGET_H
+#define COCKATRICE_PRINTING_SELECTOR_PLACEHOLDER_WIDGET_H
+
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class QLabel;
+class QVBoxLayout;
+
+class PrintingSelectorPlaceholderWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit PrintingSelectorPlaceholderWidget(QWidget *parent = nullptr);
+
+private:
+    QVBoxLayout *mainLayout;
+    QLabel *imageLabel;
+    QLabel *textLabel;
+
+    void retranslateUi();
+};
+
+#endif // COCKATRICE_PRINTING_SELECTOR_PLACEHOLDER_WIDGET_H
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 b1a6a61c1..9bc92ad90 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,22 +1,27 @@
 #include "set_name_and_collectors_number_display_widget.h"
 
-#include <QSlider>
+#include <QFontMetrics>
+#include <QLabel>
+#include <QRect>
+#include <QSizePolicy>
+#include <QVBoxLayout>
+#include <qnamespace.h>
 
 /**
  * @class SetNameAndCollectorsNumberDisplayWidget
  * @brief A widget to display the set name and collectors number with adjustable font size.
  *
- * This widget displays the set name and collectors number on two separate labels. The font size is resized dynamically
- * when the card size is changed.
+ * This widget displays the set name and collectors number on two separate labels.
  */
 SetNameAndCollectorsNumberDisplayWidget::SetNameAndCollectorsNumberDisplayWidget(QWidget *parent,
                                                                                  const QString &_setName,
-                                                                                 const QString &_collectorsNumber,
-                                                                                 QSlider *_cardSizeSlider)
+                                                                                 const QString &_collectorsNumber)
     : QWidget(parent)
 {
     // Set up the layout for the widget
     layout = new QVBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(1);
     setLayout(layout);
 
     // Set the widget's size policy and minimum size
@@ -26,58 +31,19 @@ SetNameAndCollectorsNumberDisplayWidget::SetNameAndCollectorsNumberDisplayWidget
     // Create and configure the set name label
     setName = new QLabel(_setName);
     setName->setWordWrap(true);
-    setName->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    setName->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
     setName->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
 
     // Create and configure the collectors number label
     collectorsNumber = new QLabel(_collectorsNumber);
-    collectorsNumber->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    collectorsNumber->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
     collectorsNumber->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
 
-    // Store the card size slider and connect its signal to the font size adjustment slot
-    cardSizeSlider = _cardSizeSlider;
-    connect(cardSizeSlider, &QSlider::valueChanged, this, &SetNameAndCollectorsNumberDisplayWidget::adjustFontSize);
-
     // Add labels to the layout
     layout->addWidget(setName);
     layout->addWidget(collectorsNumber);
 }
 
-/**
- * @brief Adjusts the font size of the labels based on the slider value.
- *
- * This method adjusts the font size of the set name and collectors number labels
- * according to the scale percentage provided by the slider. The font size is clamped
- * to a range between the defined minimum and maximum font sizes.
- *
- * @param scalePercentage The scale percentage from the slider.
- */
-void SetNameAndCollectorsNumberDisplayWidget::adjustFontSize(int scalePercentage)
-{
-    // Define the base font size and the range
-    const int minFontSize = 8;      // Minimum font size
-    const int maxFontSize = 32;     // Maximum font size
-    const int basePercentage = 100; // Scale at 100%
-
-    // Calculate the new font size
-    int newFontSize = minFontSize + (scalePercentage - basePercentage) * (maxFontSize - minFontSize) / 225;
-
-    // Clamp the font size to the defined range
-    newFontSize = std::clamp(newFontSize, minFontSize, maxFontSize);
-
-    // Update the fonts for both labels
-    QFont setNameFont = setName->font();
-    setNameFont.setPointSize(newFontSize);
-    setName->setFont(setNameFont);
-
-    QFont collectorsNumberFont = collectorsNumber->font();
-    collectorsNumberFont.setPointSize(newFontSize);
-    collectorsNumber->setFont(collectorsNumberFont);
-
-    // Optionally trigger a resize to accommodate new font size
-    adjustSize();
-}
-
 /**
  * @brief Handles resize events to adjust the height of the set name label.
  *
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 057b42a66..54e580b67 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
@@ -2,35 +2,30 @@
  * @file set_name_and_collectors_number_display_widget.h
  * @ingroup CardExtraInfoWidgets
  * @ingroup PrintingWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef SET_NAME_AND_COLLECTORS_NUMBER_DISPLAY_WIDGET_H
 #define SET_NAME_AND_COLLECTORS_NUMBER_DISPLAY_WIDGET_H
 
-#include <QLabel>
-#include <QSlider>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QLabel;
+class QVBoxLayout;
 
 class SetNameAndCollectorsNumberDisplayWidget : public QWidget
 {
     Q_OBJECT
 public:
-    SetNameAndCollectorsNumberDisplayWidget(QWidget *parent,
-                                            const QString &setName,
-                                            const QString &collectorsNumber,
-                                            QSlider *cardSizeSlider);
+    SetNameAndCollectorsNumberDisplayWidget(QWidget *parent, const QString &setName, const QString &collectorsNumber);
     void resizeEvent(QResizeEvent *event) override;
 
-public slots:
-    void adjustFontSize(int scalePercentage);
-
 private:
     QVBoxLayout *layout;
     QLabel *setName;
     QLabel *collectorsNumber;
-    QSlider *cardSizeSlider;
 };
 
 #endif // SET_NAME_AND_COLLECTORS_NUMBER_DISPLAY_WIDGET_H
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 17087c8bc..981ed843c 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
@@ -1,15 +1,26 @@
 #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))
 {
-
-    button->setIcon(QPixmap("theme:icons/cogwheel"));
+    button->setIcon(themePixmap(QStringLiteral("icons/cogwheel")));
     button->setCheckable(true);
     button->setFixedSize(32, 32);
     connect(button, &QToolButton::clicked, this, &SettingsButtonWidget::togglePopup);
@@ -21,6 +32,13 @@ SettingsButtonWidget::SettingsButtonWidget(QWidget *parent)
     setLayout(layout);
 }
 
+SettingsButtonWidget::~SettingsButtonWidget()
+{
+    // We don't parent the popup because it might lead to better behavior on certain window managers.
+    // So we have to manually delete it
+    popup->deleteLater();
+}
+
 void SettingsButtonWidget::addSettingsWidget(QWidget *toAdd) const
 {
     popup->addSettingsWidget(toAdd);
@@ -36,6 +54,35 @@ void SettingsButtonWidget::setButtonIcon(QPixmap iconMap)
     button->setIcon(iconMap);
 }
 
+void SettingsButtonWidget::setButtonText(const QString &text)
+{
+    buttonText = text;
+
+    button->setMinimumSize(QSize(0, 0));
+    button->setMaximumSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
+    button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+    button->setText(text);
+    button->setFixedHeight(32);
+    button->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    button->setMinimumWidth(32); // icon-only fallback minimum
+}
+
+void SettingsButtonWidget::setCompact(bool _compact)
+{
+    compact = _compact;
+    if (compact) {
+        button->setToolButtonStyle(Qt::ToolButtonIconOnly);
+        button->setFixedWidth(32);
+    } else {
+        button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+        button->setText(buttonText);
+        button->setFixedWidth(QWIDGETSIZE_MAX); // release fixed width
+        button->setMinimumWidth(32);
+        button->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    }
+}
+
 void SettingsButtonWidget::togglePopup()
 {
     if (popup->isVisible()) {
@@ -75,11 +122,7 @@ void SettingsButtonWidget::onPopupClosed() const
 
 void SettingsButtonWidget::mousePressEvent(QMouseEvent *event)
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
     if (popup->isVisible() && !popup->geometry().contains(event->globalPosition().toPoint())) {
-#else
-    if (popup->isVisible() && !popup->geometry().contains(event->globalPos())) {
-#endif
         popup->close();
     }
     QWidget::mousePressEvent(event);
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 d93078126..015300bf8 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.h
@@ -2,16 +2,20 @@
  * @file settings_button_widget.h
  * @ingroup Widgets
  * @ingroup Settings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef SETTINGS_BUTTON_WIDGET_H
 #define SETTINGS_BUTTON_WIDGET_H
 
-#include "settings_popup_widget.h"
-
-#include <QToolButton>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QHBoxLayout;
+class QPixmap;
+class QToolButton;
+class SettingsPopupWidget;
 
 class SettingsButtonWidget : public QWidget
 {
@@ -19,9 +23,18 @@ class SettingsButtonWidget : public QWidget
 
 public:
     explicit SettingsButtonWidget(QWidget *parent = nullptr);
+
+    ~SettingsButtonWidget() override;
+
     void addSettingsWidget(QWidget *toAdd) const;
     void removeSettingsWidget(QWidget *toRemove) const;
     void setButtonIcon(QPixmap iconMap);
+    void setButtonText(const QString &buttonText);
+    void setCompact(bool compact);
+    bool isCompact() const
+    {
+        return compact;
+    }
 
 protected:
     void mousePressEvent(QMouseEvent *event) override;
@@ -33,6 +46,8 @@ private slots:
 private:
     QHBoxLayout *layout;
     QToolButton *button;
+    QString buttonText;
+    bool compact;
 
 public:
     SettingsPopupWidget *popup;
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 9b2e55e0f..7ace155a7 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp
@@ -1,15 +1,20 @@
 #include "settings_popup_widget.h"
 
 #include <QApplication>
-#include <QFocusEvent>
+#include <QFrame>
 #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)
 {
     // Main layout for the popup itself
     layout = new QVBoxLayout(this);
+    layout->setContentsMargins(5, 5, 5, 5);
 
     // Container for the content (with or without scroll area)
     containerWidget = new QWidget();
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 e9605e473..61b2cb013 100644
--- a/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h
+++ b/cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.h
@@ -2,16 +2,17 @@
  * @file settings_popup_widget.h
  * @ingroup Widgets
  * @ingroup Settings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 fac3576f2..f3f1da2c4 100644
--- a/cockatrice/src/interface/widgets/replay/replay_manager.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_manager.cpp
@@ -1,150 +1,242 @@
 #include "replay_manager.h"
 
-#include "../interface/widgets/tabs/tab_game.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 <QHBoxLayout>
-#include <QToolButton>
+#include <QTimer>
+#include <algorithm>
+#include <libcockatrice/protocol/get_pb_extension.h>
+#include <libcockatrice/settings/interface_settings.h>
+#include <qnumeric.h>
 
-ReplayManager::ReplayManager(TabGame *parent, GameReplay *_replay)
-    : QWidget(parent), game(parent), replay(_replay), replayPlayButton(nullptr), replayFastForwardButton(nullptr),
-      aReplaySkipForward(nullptr), aReplaySkipBackward(nullptr), aReplaySkipForwardBig(nullptr),
-      aReplaySkipBackwardBig(nullptr)
+static constexpr int TIMER_INTERVAL_MS = 200;
+static constexpr int EMPTY_SECTION_MARGIN_MS = 500;
+
+static QList<int> createReplayTimeline(const GameReplay *replay)
 {
-    if (replay) {
-        game->getGame()->loadReplay(replay);
+    // Create list: event number -> time [ms]
+    unsigned int lastEventTimestamp = 0;
+    const int eventCount = replay->event_list_size();
 
-        // Create list: event number -> time [ms]
-        // Distribute simultaneous events evenly across 1 second.
-        unsigned int lastEventTimestamp = 0;
-        const int eventCount = replay->event_list_size();
-        for (int i = 0; i < eventCount; ++i) {
-            int j = i + 1;
-            while ((j < eventCount) && (replay->event_list(j).seconds_elapsed() == lastEventTimestamp))
-                ++j;
-
-            const int numberEventsThisSecond = j - i;
-            for (int k = 0; k < numberEventsThisSecond; ++k)
-                replayTimeline.append(replay->event_list(i + k).seconds_elapsed() * 1000 +
-                                      (int)((qreal)k / (qreal)numberEventsThisSecond * 1000));
-
-            if (j < eventCount)
-                lastEventTimestamp = replay->event_list(j).seconds_elapsed();
-            i += numberEventsThisSecond - 1;
+    QList<int> replayTimeline;
+    for (int i = 0; i < eventCount; ++i) {
+        int nextSecondIndex = i + 1;
+        while (nextSecondIndex < eventCount &&
+               replay->event_list(nextSecondIndex).seconds_elapsed() == lastEventTimestamp) {
+            ++nextSecondIndex;
         }
+
+        // Distribute simultaneous events evenly across 1 second.
+        const int numberEventsThisSecond = nextSecondIndex - i;
+        for (int k = 0; k < numberEventsThisSecond; ++k) {
+            int eventMs = replay->event_list(i + k).seconds_elapsed() * 1000;
+            int distributionMs = static_cast<int>(static_cast<qreal>(k) / numberEventsThisSecond * 1000);
+            replayTimeline.append(eventMs + distributionMs);
+        }
+
+        if (nextSecondIndex < eventCount) {
+            lastEventTimestamp = replay->event_list(nextSecondIndex).seconds_elapsed();
+        }
+        i += numberEventsThisSecond - 1;
     }
 
-    // timeline widget
-    timelineWidget = new ReplayTimelineWidget;
-    timelineWidget->setTimeline(replayTimeline);
-    connect(timelineWidget, &ReplayTimelineWidget::processNextEvent, this, &ReplayManager::replayNextEvent);
-    connect(timelineWidget, &ReplayTimelineWidget::replayFinished, this, &ReplayManager::replayFinished);
-    connect(timelineWidget, &ReplayTimelineWidget::rewound, this, &ReplayManager::replayRewind);
-
-    // timeline skip shortcuts
-    aReplaySkipForward = new QAction(timelineWidget);
-    timelineWidget->addAction(aReplaySkipForward);
-    connect(aReplaySkipForward, &QAction::triggered, this,
-            [this] { timelineWidget->skipByAmount(ReplayTimelineWidget::SMALL_SKIP_MS); });
-
-    aReplaySkipBackward = new QAction(timelineWidget);
-    timelineWidget->addAction(aReplaySkipBackward);
-    connect(aReplaySkipBackward, &QAction::triggered, this,
-            [this] { timelineWidget->skipByAmount(-ReplayTimelineWidget::SMALL_SKIP_MS); });
-
-    aReplaySkipForwardBig = new QAction(timelineWidget);
-    timelineWidget->addAction(aReplaySkipForwardBig);
-    connect(aReplaySkipForwardBig, &QAction::triggered, this,
-            [this] { timelineWidget->skipByAmount(ReplayTimelineWidget::BIG_SKIP_MS); });
-
-    aReplaySkipBackwardBig = new QAction(timelineWidget);
-    timelineWidget->addAction(aReplaySkipBackwardBig);
-    connect(aReplaySkipBackwardBig, &QAction::triggered, this,
-            [this] { timelineWidget->skipByAmount(-ReplayTimelineWidget::BIG_SKIP_MS); });
-
-    // buttons
-    replayPlayButton = new QToolButton;
-    replayPlayButton->setIconSize(QSize(32, 32));
-    QIcon playButtonIcon = QIcon();
-    playButtonIcon.addPixmap(QPixmap("theme:replay/start"), QIcon::Normal, QIcon::Off);
-    playButtonIcon.addPixmap(QPixmap("theme:replay/pause"), QIcon::Normal, QIcon::On);
-    replayPlayButton->setIcon(playButtonIcon);
-    replayPlayButton->setCheckable(true);
-    connect(replayPlayButton, &QToolButton::toggled, this, &ReplayManager::replayPlayButtonToggled);
-
-    replayFastForwardButton = new QToolButton;
-    replayFastForwardButton->setIconSize(QSize(32, 32));
-    replayFastForwardButton->setIcon(QPixmap("theme:replay/fastforward"));
-    replayFastForwardButton->setCheckable(true);
-    connect(replayFastForwardButton, &QToolButton::toggled, this, &ReplayManager::replayFastForwardButtonToggled);
-
-    // putting everything together
-    auto replayControlLayout = new QHBoxLayout;
-    replayControlLayout->addWidget(timelineWidget, 10);
-    replayControlLayout->addWidget(replayPlayButton);
-    replayControlLayout->addWidget(replayFastForwardButton);
-
-    setObjectName("replayControlWidget");
-    setLayout(replayControlLayout);
-
-    connect(this, &ReplayManager::requestChatAndPhaseReset, game, &TabGame::resetChatAndPhase);
-
-    connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
-            &ReplayManager::refreshShortcuts);
-    refreshShortcuts();
+    return replayTimeline;
 }
 
-void ReplayManager::replayNextEvent(EventProcessingOptions options)
+ReplayManager::ReplayManager(QObject *parent, GameReplay *replay)
+    : QObject(parent), replay(replay), replayTimeline(createReplayTimeline(replay))
 {
-    game->getGame()->getGameEventHandler()->processGameEventContainer(
-        replay->event_list(timelineWidget->getCurrentEvent()), nullptr, options);
+    maxTime = replayTimeline.isEmpty() ? 0 : replayTimeline.last();
+
+    replayTimer = new QTimer(this);
+    replayTimer->setInterval(TIMER_INTERVAL_MS);
+    connect(replayTimer, &QTimer::timeout, this, &ReplayManager::replayTimerTimeout);
+
+    rewindBufferingTimer = new QTimer(this);
+    rewindBufferingTimer->setSingleShot(true);
+    connect(rewindBufferingTimer, &QTimer::timeout, this, &ReplayManager::processRewind);
 }
 
-void ReplayManager::replayFinished()
+ReplayManager::~ReplayManager()
 {
-    replayPlayButton->setChecked(false);
+    delete replay;
 }
 
-void ReplayManager::replayPlayButtonToggled(bool checked)
+void ReplayManager::skipToTime(int newTime, bool doRewindBuffering)
 {
-    if (checked) { // start replay
-        timelineWidget->startReplay();
-    } else { // pause replay
-        timelineWidget->stopReplay();
+    // check boundary conditions
+    if (newTime < 0) {
+        newTime = 0;
+    }
+    if (newTime > maxTime) {
+        newTime = maxTime;
     }
-}
 
-void ReplayManager::replayFastForwardButtonToggled(bool checked)
-{
-    timelineWidget->setTimeScaleFactor(checked ? ReplayTimelineWidget::FAST_FORWARD_SCALE_FACTOR : 1.0);
+    newTime -= newTime % TIMER_INTERVAL_MS; // Time should always be a multiple of the interval
+
+    const bool isBackwardsSkip = newTime < currentProcessedTime;
+    currentVisualTime = newTime;
+
+    if (isBackwardsSkip) {
+        handleBackwardsSkip(doRewindBuffering);
+    } else {
+        processNewEvents(FORWARD_SKIP);
+    }
+
+    timeChanged(currentVisualTime);
 }
 
 /**
- * @brief Handles everything that needs to be reset when doing a replay rewind.
+ * @brief Handles a backwards skip in the replay timeline.
+ *
+ * @param doRewindBuffering When true, if multiple backward skips are made in quick succession, only a single rewind
+ * is processed at the end. When false, the backwards skip will always cause an immediate rewind.
  */
-void ReplayManager::replayRewind()
+void ReplayManager::handleBackwardsSkip(bool doRewindBuffering)
 {
-    emit requestChatAndPhaseReset();
+    if (doRewindBuffering) {
+        // We use a one-shot timer to implement the rewind buffering.
+        // The rewind only happens once the timer runs out.
+        // If another backwards skip happens, the timer will just get reset instead of rewinding.
+        rewindBufferingTimer->stop();
+        rewindBufferingTimer->start(SettingsCache::instance().userInterface().getRewindBufferingMs());
+    } else {
+        // otherwise, process the rewind immediately
+        processRewind();
+    }
 }
 
-void ReplayManager::refreshShortcuts()
+void ReplayManager::processRewind()
 {
-    ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
-    if (aReplaySkipForward) {
-        aReplaySkipForward->setShortcuts(shortcuts.getShortcut("Replays/aSkipForward"));
+    // stop any queued-up rewinds
+    rewindBufferingTimer->stop();
+
+    // process the rewind
+    currentEvent = 0;
+    emit rewound();
+    processNewEvents(BACKWARD_SKIP);
+}
+
+void ReplayManager::replayTimerTimeout()
+{
+    currentVisualTime += TIMER_INTERVAL_MS;
+
+    processNewEvents(NORMAL_PLAYBACK);
+
+    timeChanged(currentVisualTime);
+
+    if (skipEmptySections) {
+        handleSkipEmptySection();
     }
-    if (aReplaySkipBackward) {
-        aReplaySkipBackward->setShortcuts(shortcuts.getShortcut("Replays/aSkipBackward"));
+}
+
+/** @brief Processes all unprocessed events up to the current time. */
+void ReplayManager::processNewEvents(PlaybackMode playbackMode)
+{
+    currentProcessedTime = currentVisualTime;
+
+    while (currentEvent < replayTimeline.size() && replayTimeline[currentEvent] < currentProcessedTime) {
+        EventProcessingOptions options;
+
+        // backwards skip => always skip reveal windows
+        // forwards skip => skip reveal windows that don't happen within a big skip of the target
+        if (playbackMode == BACKWARD_SKIP || currentProcessedTime - replayTimeline[currentEvent] > BIG_SKIP_MS) {
+            options |= SKIP_REVEAL_WINDOW;
+        }
+
+        // backwards skip => always skip tap animation
+        // backwards skip => always skip damage animation (battlefield shimmer / life counter flash)
+        if (playbackMode == BACKWARD_SKIP) {
+            options |= SKIP_TAP_ANIMATION;
+            options |= SKIP_DAMAGE_ANIMATION;
+        }
+
+        emit eventReplayed(replay->event_list(currentEvent), options);
+        ++currentEvent;
     }
-    if (aReplaySkipForwardBig) {
-        aReplaySkipForwardBig->setShortcuts(shortcuts.getShortcut("Replays/aSkipForwardBig"));
+    if (currentEvent == replayTimeline.size()) {
+        emit replayFinished();
+        replayTimer->stop();
     }
-    if (aReplaySkipBackwardBig) {
-        aReplaySkipBackwardBig->setShortcuts(shortcuts.getShortcut("Replays/aSkipBackwardBig"));
+}
+
+static bool hasMeaningfulEvent(const GameEventContainer &cont)
+{
+    const int eventListSize = cont.event_list_size();
+    for (int i = 0; i < eventListSize; ++i) {
+        const GameEvent &event = cont.event_list(i);
+        const auto eventType = static_cast<GameEvent::GameEventType>(getPbExtension(event));
+
+        if (eventType != GameEvent::PLAYER_PROPERTIES_CHANGED) {
+            return true;
+        }
     }
-    if (replayPlayButton) {
-        replayPlayButton->setShortcut(shortcuts.getSingleShortcut("Replays/playButton"));
+
+    return false;
+}
+
+void ReplayManager::handleSkipEmptySection()
+{
+    if (currentEvent == replayTimeline.size()) {
+        return;
     }
-    if (replayFastForwardButton) {
-        replayFastForwardButton->setShortcut(shortcuts.getSingleShortcut("Replays/fastForwardButton"));
+
+    // find most recent meaningful event
+    int prevEvent = std::max(0, currentEvent - 1);
+    for (; prevEvent > 0 && !hasMeaningfulEvent(replay->event_list(prevEvent)); --prevEvent) {
     }
+
+    int prevEventTime = replayTimeline.value(prevEvent);
+    if (currentVisualTime - prevEventTime <= EMPTY_SECTION_MARGIN_MS) {
+        return;
+    }
+
+    // find next earliest meaningful event
+    int nextEvent = currentEvent;
+    for (; nextEvent < replayTimeline.size() - 1 && !hasMeaningfulEvent(replay->event_list(nextEvent)); ++nextEvent) {
+    }
+
+    int nextEventTime = replayTimeline.value(nextEvent);
+    if (nextEventTime - currentVisualTime <= EMPTY_SECTION_MARGIN_MS) {
+        return;
+    }
+
+    // skip forward if we're not within margin of either event
+    skipToTime(nextEventTime - EMPTY_SECTION_MARGIN_MS, false);
+}
+
+void ReplayManager::setTimeScaleFactor(qreal _timeScaleFactor)
+{
+    timeScaleFactor = _timeScaleFactor;
+    int interval = std::max(1, qRound(TIMER_INTERVAL_MS / timeScaleFactor));
+    replayTimer->setInterval(interval);
+}
+
+void ReplayManager::setSkipEmptySections(bool value)
+{
+    skipEmptySections = value;
+}
+
+void ReplayManager::startReplay()
+{
+    replayTimer->start();
+}
+
+void ReplayManager::stopReplay()
+{
+    replayTimer->stop();
+}
+
+void ReplayManager::setTime(int time)
+{
+    // don't buffer rewinds from clicks, since clicks usually don't happen fast enough to require buffering
+    skipToTime(time, false);
+}
+
+void ReplayManager::skipByAmount(int amount)
+{
+    skipToTime(currentVisualTime + amount, amount < 0);
 }
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.h b/cockatrice/src/interface/widgets/replay/replay_manager.h
index 9469adcd4..3b33deada 100644
--- a/cockatrice/src/interface/widgets/replay/replay_manager.h
+++ b/cockatrice/src/interface/widgets/replay/replay_manager.h
@@ -1,48 +1,86 @@
+#ifndef COCKATRICE_REPLAY_MANAGER_H
+#define COCKATRICE_REPLAY_MANAGER_H
+
+#include "../../../game/player/event_processing_options.h"
+
+#include <QList>
+#include <QObject>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class GameReplay;
+class QTimer;
+class GameEventContainer;
+
 /**
- * @file replay_manager.h
- * @ingroup Core
- * @ingroup Replay
- * @brief TODO: Document this.
+ * @brief This class handles all logic to do with playing back replays
  */
-
-#ifndef REPLAY_MANAGER_H
-#define REPLAY_MANAGER_H
-
-#include "replay_timeline_widget.h"
-
-#include <QToolButton>
-#include <QWidget>
-#include <libcockatrice/protocol/pb/game_replay.pb.h>
-
-class TabGame;
-
-class ReplayManager : public QWidget
+class ReplayManager : public QObject
 {
     Q_OBJECT
 
-public:
-    ReplayManager(TabGame *parent, GameReplay *replay);
-    TabGame *game;
+    enum PlaybackMode
+    {
+        NORMAL_PLAYBACK,
+        FORWARD_SKIP,
+        BACKWARD_SKIP
+    };
+
     GameReplay *replay;
+    QList<int> replayTimeline; ///< timestamp of each event, with the indexes corresponding
+    int maxTime;
 
-signals:
-    void requestChatAndPhaseReset();
+    QTimer *replayTimer;
+    QTimer *rewindBufferingTimer;
 
-private:
-    // Replay related members
-    int currentReplayStep = 0;
-    QList<int> replayTimeline;
-    ReplayTimelineWidget *timelineWidget;
-    QToolButton *replayPlayButton, *replayFastForwardButton;
-    QAction *aReplaySkipForward, *aReplaySkipBackward, *aReplaySkipForwardBig, *aReplaySkipBackwardBig;
+    qreal timeScaleFactor = 1.0;
+    bool skipEmptySections = false;
+
+    int currentVisualTime = 0;    ///< time currently displayed by the timeline
+    int currentProcessedTime = 0; ///< time that events are currently processed up to. Could differ from visual time due
+                                  ///< to rewind buffering
+    int currentEvent = 0;         ///< current event's index
+
+    void skipToTime(int newTime, bool doRewindBuffering);
+    void handleBackwardsSkip(bool doRewindBuffering);
+    void processRewind();
+    void processNewEvents(PlaybackMode playbackMode);
+    void handleSkipEmptySection();
 
 private slots:
-    void replayNextEvent(EventProcessingOptions options);
+    void replayTimerTimeout();
+
+public:
+    static constexpr int SMALL_SKIP_MS = 1000;
+    static constexpr int BIG_SKIP_MS = 10000;
+
+    /**
+     * @param parent The parent QObject
+     * @param replay Cannot be null. Takes ownership of the object.
+     */
+    explicit ReplayManager(QObject *parent, GameReplay *replay);
+
+    ~ReplayManager() override;
+
+    const QList<int> &getReplayTimeline() const
+    {
+        return replayTimeline;
+    }
+
+    void setTimeScaleFactor(qreal _timeScaleFactor);
+    void setSkipEmptySections(bool value);
+
+public slots:
+    void startReplay();
+    void stopReplay();
+    void setTime(int time);
+    void skipByAmount(int amount); // use a negative amount to skip backwards
+
+signals:
+    void timeChanged(int time);
+    void eventReplayed(const GameEventContainer &cont, EventProcessingOptions options);
     void replayFinished();
-    void replayPlayButtonToggled(bool checked);
-    void replayFastForwardButtonToggled(bool checked);
-    void replayRewind();
-    void refreshShortcuts();
+    void rewound();
 };
 
-#endif // REPLAY_MANAGER_H
+#endif // COCKATRICE_REPLAY_MANAGER_H
diff --git a/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp
new file mode 100644
index 000000000..5b3829af2
--- /dev/null
+++ b/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.cpp
@@ -0,0 +1,62 @@
+#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>
+
+ReplayQuickSettingsWidget::ReplayQuickSettingsWidget(QWidget *parent) : SettingsButtonWidget(parent)
+{
+    // fast forward speed
+    fastForwardSpeedBox.setMinimum(1);
+    fastForwardSpeedBox.setMaximum(99.9);
+    fastForwardSpeedBox.setDecimals(1);
+    fastForwardSpeedBox.setValue(SettingsCache::instance().userInterface().getFastForwardSpeed());
+    connect(&fastForwardSpeedBox, qOverload<double>(&QDoubleSpinBox::valueChanged), this,
+            &ReplayQuickSettingsWidget::actUpdateFastForwardSpeed);
+
+    skipEmptyCheckBox.setChecked(SettingsCache::instance().userInterface().getSkipEmptySections());
+    connect(&skipEmptyCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
+            &ReplayQuickSettingsWidget::actUpdateSkipEmptySections);
+
+    // putting it all together
+    auto *widget = new QWidget;
+    auto *grid = new QGridLayout(widget);
+    grid->setContentsMargins(0, 0, 0, 0);
+    grid->addWidget(&fastForwardSpeedLabel, 0, 0, 1, 1);
+    grid->addWidget(&fastForwardSpeedBox, 0, 1, 1, 1);
+    grid->addWidget(&skipEmptyCheckBox, 1, 0, 1, 2);
+
+    this->addSettingsWidget(widget);
+
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &ReplayQuickSettingsWidget::retranslateUi);
+    retranslateUi();
+}
+
+void ReplayQuickSettingsWidget::retranslateUi()
+{
+    fastForwardSpeedLabel.setText(tr("Fast forward speed:"));
+    fastForwardSpeedBox.setSuffix("x");
+
+    skipEmptyCheckBox.setText(tr("Skip empty sections"));
+}
+
+void ReplayQuickSettingsWidget::actUpdateFastForwardSpeed(qreal value)
+{
+    SettingsCache::instance().userInterface().setFastForwardSpeed(value);
+    emit fastForwardSpeedChanged(value);
+}
+
+void ReplayQuickSettingsWidget::actUpdateSkipEmptySections(QT_STATE_CHANGED_T value)
+{
+    SettingsCache::instance().userInterface().setSkipEmptySections(value);
+    emit skipEmptySectionsChanged(value);
+}
diff --git a/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.h b/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.h
new file mode 100644
index 000000000..d0be7d58d
--- /dev/null
+++ b/cockatrice/src/interface/widgets/replay/replay_quick_settings_widget.h
@@ -0,0 +1,39 @@
+#ifndef COCKATRICE_REPLAY_QUICK_SETTINGS_WIDGET_H
+#define COCKATRICE_REPLAY_QUICK_SETTINGS_WIDGET_H
+
+#include "../../interface/widgets/quick_settings/settings_button_widget.h"
+
+#include <QCheckBox>
+#include <QDoubleSpinBox>
+#include <QLabel>
+#include <QtGlobal>
+#include <libcockatrice/utility/macros.h>
+#include <qtmetamacros.h>
+
+class QWidget;
+
+class ReplayQuickSettingsWidget : public SettingsButtonWidget
+{
+    Q_OBJECT
+
+public:
+    explicit ReplayQuickSettingsWidget(QWidget *parent);
+
+    void retranslateUi();
+
+signals:
+    void fastForwardSpeedChanged(qreal speed);
+    void skipEmptySectionsChanged(bool skip);
+
+private:
+    QLabel fastForwardSpeedLabel;
+    QDoubleSpinBox fastForwardSpeedBox;
+
+    QCheckBox skipEmptyCheckBox;
+
+private slots:
+    void actUpdateFastForwardSpeed(qreal value);
+    void actUpdateSkipEmptySections(QT_STATE_CHANGED_T value);
+};
+
+#endif // COCKATRICE_REPLAY_QUICK_SETTINGS_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
index 25ee58b67..48a43dba8 100644
--- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
+++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp
@@ -1,46 +1,50 @@
 #include "replay_timeline_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
-
+#include <QBrush>
+#include <QColor>
+#include <QMouseEvent>
 #include <QPainter>
 #include <QPainterPath>
-#include <QTimer>
+#include <QPointF>
+#include <QSize>
+#include <QtGlobal>
+#include <qnamespace.h>
+#include <qnumeric.h>
 
-ReplayTimelineWidget::ReplayTimelineWidget(QWidget *parent)
-    : QWidget(parent), maxBinValue(1), maxTime(1), timeScaleFactor(1.0), currentVisualTime(0), currentProcessedTime(0),
-      currentEvent(0)
+static constexpr int BIN_LENGTH = 5000;
+static constexpr int MIN_RESOLUTION_MS = 1000;
+
+ReplayTimelineWidget::ReplayTimelineWidget(QWidget *parent) : QWidget(parent)
 {
-    replayTimer = new QTimer(this);
-    connect(replayTimer, &QTimer::timeout, this, &ReplayTimelineWidget::replayTimerTimeout);
-
-    rewindBufferingTimer = new QTimer(this);
-    rewindBufferingTimer->setSingleShot(true);
-    connect(rewindBufferingTimer, &QTimer::timeout, this, &ReplayTimelineWidget::processRewind);
 }
 
-void ReplayTimelineWidget::setTimeline(const QList<int> &_replayTimeline)
+void ReplayTimelineWidget::setTimeline(const QList<int> &replayTimeline)
 {
-    replayTimeline = _replayTimeline;
     histogram.clear();
+    currentTime = 0;
+
     int binEndTime = BIN_LENGTH - 1;
     int binValue = 0;
     for (int i : replayTimeline) {
         if (i > binEndTime) {
             histogram.append(binValue);
-            if (binValue > maxBinValue)
+            if (binValue > maxBinValue) {
                 maxBinValue = binValue;
+            }
             while (i > binEndTime + BIN_LENGTH) {
                 histogram.append(0);
                 binEndTime += BIN_LENGTH;
             }
             binValue = 1;
             binEndTime += BIN_LENGTH;
-        } else
+        } else {
             ++binValue;
+        }
     }
     histogram.append(binValue);
-    if (!replayTimeline.isEmpty())
+    if (!replayTimeline.isEmpty()) {
         maxTime = replayTimeline.last();
+    }
 
     update();
 }
@@ -53,77 +57,39 @@ void ReplayTimelineWidget::paintEvent(QPaintEvent * /* event */)
     qreal binWidth = (qreal)width() / histogram.size();
     QPainterPath path;
     path.moveTo(0, height() - 1);
-    for (int i = 0; i < histogram.size(); ++i)
+    for (int i = 0; i < histogram.size(); ++i) {
         path.lineTo(qRound(i * binWidth), (height() - 1) * (1.0 - (qreal)histogram[i] / maxBinValue));
+    }
     path.lineTo(width() - 1, height() - 1);
     path.lineTo(0, height() - 1);
     painter.fillPath(path, Qt::black);
 
     const QColor barColor = QColor::fromHsv(120, 255, 255, 100);
-    quint64 w = (quint64)(width() - 1) * (quint64)currentVisualTime / maxTime;
+    quint64 w = (quint64)(width() - 1) * (quint64)currentTime / maxTime;
     painter.fillRect(0, 0, static_cast<int>(w), height() - 1, barColor);
 }
 
 void ReplayTimelineWidget::mousePressEvent(QMouseEvent *event)
 {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
     int newTime = static_cast<int>((qint64)maxTime * (qint64)event->position().x() / width());
-#else
-    int newTime = static_cast<int>((qint64)maxTime * (qint64)event->x() / width());
-#endif
-    // don't buffer rewinds from clicks, since clicks usually don't happen fast enough to require buffering
-    skipToTime(newTime, false);
+    emit timeClicked(newTime);
 }
 
-void ReplayTimelineWidget::skipToTime(int newTime, bool doRewindBuffering)
+void ReplayTimelineWidget::setCurrentTime(int time)
 {
-    // check boundary conditions
-    if (newTime < 0) {
-        newTime = 0;
-    }
-    if (newTime > maxTime) {
-        newTime = maxTime;
+    int newTime = qBound(0, time, maxTime);
+
+    if (currentTime == newTime) {
+        return;
     }
 
-    newTime -= newTime % TIMER_INTERVAL_MS; // Time should always be a multiple of the interval
+    bool doUpdate = currentTime / MIN_RESOLUTION_MS != newTime / MIN_RESOLUTION_MS;
 
-    const bool isBackwardsSkip = newTime < currentProcessedTime;
-    currentVisualTime = newTime;
+    currentTime = newTime;
 
-    if (isBackwardsSkip) {
-        handleBackwardsSkip(doRewindBuffering);
-    } else {
-        processNewEvents(FORWARD_SKIP);
+    if (doUpdate) {
+        update();
     }
-
-    update();
-}
-
-/// @param doRewindBuffering When true, if multiple backward skips are made in quick succession, only a single rewind
-/// is processed at the end. When false, the backwards skip will always cause an immediate rewind
-void ReplayTimelineWidget::handleBackwardsSkip(bool doRewindBuffering)
-{
-    if (doRewindBuffering) {
-        // We use a one-shot timer to implement the rewind buffering.
-        // The rewind only happens once the timer runs out.
-        // If another backwards skip happens, the timer will just get reset instead of rewinding.
-        rewindBufferingTimer->stop();
-        rewindBufferingTimer->start(SettingsCache::instance().getRewindBufferingMs());
-    } else {
-        // otherwise, process the rewind immediately
-        processRewind();
-    }
-}
-
-void ReplayTimelineWidget::processRewind()
-{
-    // stop any queued-up rewinds
-    rewindBufferingTimer->stop();
-
-    // process the rewind
-    currentEvent = 0;
-    emit rewound();
-    processNewEvents(BACKWARD_SKIP);
 }
 
 QSize ReplayTimelineWidget::sizeHint() const
@@ -135,60 +101,3 @@ QSize ReplayTimelineWidget::minimumSizeHint() const
 {
     return {400, 50};
 }
-
-void ReplayTimelineWidget::replayTimerTimeout()
-{
-    currentVisualTime += TIMER_INTERVAL_MS;
-
-    processNewEvents(NORMAL_PLAYBACK);
-
-    if (!(currentVisualTime % 1000))
-        update();
-}
-
-/// Processes all unprocessed events up to the current time.
-void ReplayTimelineWidget::processNewEvents(PlaybackMode playbackMode)
-{
-    currentProcessedTime = currentVisualTime;
-
-    while ((currentEvent < replayTimeline.size()) && (replayTimeline[currentEvent] < currentProcessedTime)) {
-        EventProcessingOptions options;
-
-        // backwards skip => always skip reveal windows
-        // forwards skip => skip reveal windows that don't happen within a big skip of the target
-        if (playbackMode == BACKWARD_SKIP || currentProcessedTime - replayTimeline[currentEvent] > BIG_SKIP_MS)
-            options |= SKIP_REVEAL_WINDOW;
-
-        // backwards skip => always skip tap animation
-        if (playbackMode == BACKWARD_SKIP)
-            options |= SKIP_TAP_ANIMATION;
-
-        emit processNextEvent(options);
-        ++currentEvent;
-    }
-    if (currentEvent == replayTimeline.size()) {
-        emit replayFinished();
-        replayTimer->stop();
-    }
-}
-
-void ReplayTimelineWidget::setTimeScaleFactor(qreal _timeScaleFactor)
-{
-    timeScaleFactor = _timeScaleFactor;
-    replayTimer->setInterval(static_cast<int>(TIMER_INTERVAL_MS / timeScaleFactor));
-}
-
-void ReplayTimelineWidget::startReplay()
-{
-    replayTimer->start(static_cast<int>(TIMER_INTERVAL_MS / timeScaleFactor));
-}
-
-void ReplayTimelineWidget::stopReplay()
-{
-    replayTimer->stop();
-}
-
-void ReplayTimelineWidget::skipByAmount(int amount)
-{
-    skipToTime(currentVisualTime + amount, amount < 0);
-}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
index 07a0c0b4c..2c277228f 100644
--- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
+++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h
@@ -1,75 +1,38 @@
 /**
  * @file replay_timeline_widget.h
  * @ingroup Replay
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef REPLAY_TIMELINE_WIDGET
 #define REPLAY_TIMELINE_WIDGET
 
-#include "../../../game/player/event_processing_options.h"
-
-#include <QMouseEvent>
+#include <QList>
 #include <QWidget>
-
-class QPaintEvent;
-class QTimer;
+#include <qtmetamacros.h>
 
 class ReplayTimelineWidget : public QWidget
 {
     Q_OBJECT
+
 signals:
-    void processNextEvent(EventProcessingOptions options);
-    void replayFinished();
-    void rewound();
+    void timeClicked(int newTime);
 
 private:
-    enum PlaybackMode
-    {
-        NORMAL_PLAYBACK,
-        FORWARD_SKIP,
-        BACKWARD_SKIP
-    };
-
-    static constexpr int TIMER_INTERVAL_MS = 200;
-    static constexpr int BIN_LENGTH = 5000;
-
-    QTimer *replayTimer;
-    QTimer *rewindBufferingTimer;
-    QList<int> replayTimeline;
     QList<int> histogram;
-    int maxBinValue, maxTime;
-    qreal timeScaleFactor;
-    int currentVisualTime;    // time currently displayed by the timeline
-    int currentProcessedTime; // time that events are currently processed up to. Could differ from visual time due to
-                              // rewind buffering
-    int currentEvent;
+    int maxBinValue = 1;
+    int maxTime = 1;
 
-    void skipToTime(int newTime, bool doRewindBuffering);
-    void handleBackwardsSkip(bool doRewindBuffering);
-    void processRewind();
-    void processNewEvents(PlaybackMode playbackMode);
-private slots:
-    void replayTimerTimeout();
+    int currentTime = 0;
 
 public:
-    static constexpr int SMALL_SKIP_MS = 1000;
-    static constexpr int BIG_SKIP_MS = 10000;
-    static constexpr qreal FAST_FORWARD_SCALE_FACTOR = 10.0;
-
     explicit ReplayTimelineWidget(QWidget *parent = nullptr);
-    void setTimeline(const QList<int> &_replayTimeline);
+    void setTimeline(const QList<int> &replayTimeline);
     [[nodiscard]] QSize sizeHint() const override;
     [[nodiscard]] QSize minimumSizeHint() const override;
-    void setTimeScaleFactor(qreal _timeScaleFactor);
-    [[nodiscard]] int getCurrentEvent() const
-    {
-        return currentEvent;
-    }
+
 public slots:
-    void startReplay();
-    void stopReplay();
-    void skipByAmount(int amount); // use a negative amount to skip backwards
+    void setCurrentTime(int time);
 
 protected:
     void paintEvent(QPaintEvent *event) override;
diff --git a/cockatrice/src/interface/widgets/replay/replay_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_widget.cpp
new file mode 100644
index 000000000..07b4e72ce
--- /dev/null
+++ b/cockatrice/src/interface/widgets/replay/replay_widget.cpp
@@ -0,0 +1,140 @@
+#include "replay_widget.h"
+
+#include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/shortcuts_settings.h"
+#include "../../pixel_map_generator.h"
+#include "libcockatrice/settings/interface_settings.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),
+      aReplaySkipBackward(nullptr), aReplaySkipForwardBig(nullptr), aReplaySkipBackwardBig(nullptr)
+{
+    // replay manager
+    replayManager = new ReplayManager(this, replay);
+    connect(replayManager, &ReplayManager::eventReplayed, this, &ReplayWidget::eventReplayed);
+    connect(replayManager, &ReplayManager::replayFinished, this, &ReplayWidget::replayFinished);
+    connect(replayManager, &ReplayManager::rewound, this, &ReplayWidget::rewound);
+
+    // timeline widget
+    timelineWidget = new ReplayTimelineWidget;
+    timelineWidget->setTimeline(replayManager->getReplayTimeline());
+    connect(replayManager, &ReplayManager::timeChanged, timelineWidget, &ReplayTimelineWidget::setCurrentTime);
+    connect(timelineWidget, &ReplayTimelineWidget::timeClicked, replayManager, &ReplayManager::setTime);
+
+    // timeline skip shortcuts
+    aReplaySkipForward = new QAction(timelineWidget);
+    timelineWidget->addAction(aReplaySkipForward);
+    connect(aReplaySkipForward, &QAction::triggered, this,
+            [this] { replayManager->skipByAmount(ReplayManager::SMALL_SKIP_MS); });
+
+    aReplaySkipBackward = new QAction(timelineWidget);
+    timelineWidget->addAction(aReplaySkipBackward);
+    connect(aReplaySkipBackward, &QAction::triggered, this,
+            [this] { replayManager->skipByAmount(-ReplayManager::SMALL_SKIP_MS); });
+
+    aReplaySkipForwardBig = new QAction(timelineWidget);
+    timelineWidget->addAction(aReplaySkipForwardBig);
+    connect(aReplaySkipForwardBig, &QAction::triggered, this,
+            [this] { replayManager->skipByAmount(ReplayManager::BIG_SKIP_MS); });
+
+    aReplaySkipBackwardBig = new QAction(timelineWidget);
+    timelineWidget->addAction(aReplaySkipBackwardBig);
+    connect(aReplaySkipBackwardBig, &QAction::triggered, this,
+            [this] { replayManager->skipByAmount(-ReplayManager::BIG_SKIP_MS); });
+
+    // buttons
+    replayPlayButton = new QToolButton;
+    replayPlayButton->setIconSize(QSize(32, 32));
+    QIcon playButtonIcon = QIcon();
+    playButtonIcon.addPixmap(themePixmap(QStringLiteral("replay/start")), QIcon::Normal, QIcon::Off);
+    playButtonIcon.addPixmap(themePixmap(QStringLiteral("replay/pause")), QIcon::Normal, QIcon::On);
+    replayPlayButton->setIcon(playButtonIcon);
+    replayPlayButton->setCheckable(true);
+    connect(replayPlayButton, &QToolButton::toggled, this, &ReplayWidget::replayPlayButtonToggled);
+
+    replayFastForwardButton = new QToolButton;
+    replayFastForwardButton->setIconSize(QSize(32, 32));
+    replayFastForwardButton->setIcon(themePixmap(QStringLiteral("replay/fastforward")));
+    replayFastForwardButton->setCheckable(true);
+    connect(replayFastForwardButton, &QToolButton::toggled, this, &ReplayWidget::updateTimeScaleFactor);
+
+    settingsWidget = new ReplayQuickSettingsWidget(this);
+    settingsWidget->setFixedSize(QSize(32, 32));
+    connect(settingsWidget, &ReplayQuickSettingsWidget::fastForwardSpeedChanged, this,
+            [this] { updateTimeScaleFactor(replayFastForwardButton->isChecked()); });
+    connect(settingsWidget, &ReplayQuickSettingsWidget::skipEmptySectionsChanged, replayManager,
+            &ReplayManager::setSkipEmptySections);
+
+    replayManager->setSkipEmptySections(SettingsCache::instance().userInterface().getSkipEmptySections());
+
+    // putting everything together
+    auto replayControlLayout = new QHBoxLayout;
+    replayControlLayout->addWidget(timelineWidget, 10);
+    replayControlLayout->addWidget(replayPlayButton);
+    replayControlLayout->addWidget(replayFastForwardButton);
+    replayControlLayout->addWidget(settingsWidget);
+
+    setObjectName("replayControlWidget");
+    setLayout(replayControlLayout);
+
+    connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
+            &ReplayWidget::refreshShortcuts);
+    refreshShortcuts();
+}
+
+void ReplayWidget::replayFinished()
+{
+    replayPlayButton->setChecked(false);
+}
+
+void ReplayWidget::replayPlayButtonToggled(bool checked)
+{
+    if (checked) { // start replay
+        replayManager->startReplay();
+    } else { // pause replay
+        replayManager->stopReplay();
+    }
+}
+
+void ReplayWidget::updateTimeScaleFactor(bool isFastForward)
+{
+    qreal factor = isFastForward ? SettingsCache::instance().userInterface().getFastForwardSpeed() : 1.0;
+    replayManager->setTimeScaleFactor(factor);
+}
+
+void ReplayWidget::refreshShortcuts()
+{
+    ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
+    if (aReplaySkipForward) {
+        aReplaySkipForward->setShortcuts(shortcuts.getShortcut("Replays/aSkipForward"));
+    }
+    if (aReplaySkipBackward) {
+        aReplaySkipBackward->setShortcuts(shortcuts.getShortcut("Replays/aSkipBackward"));
+    }
+    if (aReplaySkipForwardBig) {
+        aReplaySkipForwardBig->setShortcuts(shortcuts.getShortcut("Replays/aSkipForwardBig"));
+    }
+    if (aReplaySkipBackwardBig) {
+        aReplaySkipBackwardBig->setShortcuts(shortcuts.getShortcut("Replays/aSkipBackwardBig"));
+    }
+    if (replayPlayButton) {
+        replayPlayButton->setShortcut(shortcuts.getSingleShortcut("Replays/playButton"));
+    }
+    if (replayFastForwardButton) {
+        replayFastForwardButton->setShortcut(shortcuts.getSingleShortcut("Replays/fastForwardButton"));
+    }
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/replay/replay_widget.h b/cockatrice/src/interface/widgets/replay/replay_widget.h
new file mode 100644
index 000000000..74aace570
--- /dev/null
+++ b/cockatrice/src/interface/widgets/replay/replay_widget.h
@@ -0,0 +1,58 @@
+/**
+ * @file replay_widget.h
+ * @ingroup Core
+ * @ingroup Replay
+ */
+//! \todo Document this file.
+
+#ifndef REPLAY_WIDGET_H
+#define REPLAY_WIDGET_H
+
+#include "../../../game/player/event_processing_options.h"
+
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class ReplayManager;
+class ReplayQuickSettingsWidget;
+class GameEventContainer;
+class GameReplay;
+class QAction;
+class QToolButton;
+class ReplayTimelineWidget;
+
+/**
+ * @brief The top-level widget that is put in the replay dock widget.
+ * Contains the replay timeline as well as the buttons.
+ */
+class ReplayWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    /**
+     * @param parent The parent widget
+     * @param replay Cannot be null. Takes ownership of the replay.
+     */
+    ReplayWidget(QWidget *parent, GameReplay *replay);
+
+signals:
+    void rewound();
+    void eventReplayed(const GameEventContainer &cont, EventProcessingOptions options);
+
+private:
+    ReplayManager *replayManager;
+
+    ReplayTimelineWidget *timelineWidget;
+    QToolButton *replayPlayButton, *replayFastForwardButton;
+    ReplayQuickSettingsWidget *settingsWidget;
+    QAction *aReplaySkipForward, *aReplaySkipBackward, *aReplaySkipForwardBig, *aReplaySkipBackwardBig;
+
+private slots:
+    void replayFinished();
+    void replayPlayButtonToggled(bool checked);
+    void updateTimeScaleFactor(bool checked);
+    void refreshShortcuts();
+};
+
+#endif // REPLAY_WIDGET_H
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 c97d32d44..037a4a1e5 100644
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
+++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp
@@ -2,18 +2,49 @@
 
 #include "../../../../client/settings/cache_settings.h"
 #include "../../client/sound_engine.h"
+#include "../../interface/card_localization.h"
 #include "../../interface/pixel_map_generator.h"
-#include "../../interface/widgets/tabs/tab_account.h"
+#include "../../tabs/tab_supervisor.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);
 
@@ -28,21 +59,9 @@ ChatView::ChatView(TabSupervisor *_tabSupervisor, AbstractGame *_game, bool _sho
       userListProxy(_tabSupervisor->getUserListManager()), evenNumber(true), showTimestamps(_showTimestamps),
       hoveredItemType(HoveredNothing)
 {
-    if (palette().windowText().color().lightness() > 200) {
-        document()->setDefaultStyleSheet(R"(
-           a { text-decoration: none; color: rgb(71,158,252); }
-           .blue { color: rgb(71,158,252); }
-        )");
-        serverMessageColor = QColor(0xFF, 0x73, 0x83);
-        otherUserColor = otherUserColor.lighter(150);
-        linkColor = QColor(71, 158, 252);
-    } else {
-        document()->setDefaultStyleSheet(R"(
-            a { text-decoration: none; color: blue; }
-            .blue { color: blue }
-        )");
-        linkColor = palette().link().color();
-    }
+    adjustColorsToPalette();
+
+    connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this, &ChatView::adjustColorsToPalette);
 
     userContextMenu = new UserContextMenu(tabSupervisor, this, game);
     connect(userContextMenu, SIGNAL(openMessageDialog(QString, bool)), this, SIGNAL(openMessageDialog(QString, bool)));
@@ -58,9 +77,68 @@ ChatView::ChatView(TabSupervisor *_tabSupervisor, AbstractGame *_game, bool _sho
 
     viewport()->setCursor(Qt::IBeamCursor);
     setReadOnly(true);
-    setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse);
+    setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse | Qt::LinksAccessibleByKeyboard);
     setOpenLinks(false);
     connect(this, &ChatView::anchorClicked, this, &ChatView::openLink);
+
+    connect(verticalScrollBar(), &QScrollBar::rangeChanged, this, &ChatView::onScrollBarRangeChanged);
+    connect(verticalScrollBar(), &QScrollBar::valueChanged, this, &ChatView::onScrollBarValueChanged);
+}
+
+void ChatView::adjustColorsToPalette()
+{
+    if (palette().windowText().color().lightness() > 200) {
+        document()->setDefaultStyleSheet(R"(
+           a { text-decoration: none; color: rgb(71,158,252); }
+           .blue { color: rgb(71,158,252); }
+        )");
+        serverMessageColor = QColor(0xFF, 0x73, 0x83);
+        otherUserColor = otherUserColor.lighter(150);
+        linkColor = QColor(71, 158, 252);
+        unresolvedCardTagColor = QColor(0xFF, 0xA5, 0x00);
+    } else {
+        document()->setDefaultStyleSheet(R"(
+            a { text-decoration: none; color: blue; }
+            .blue { color: blue }
+        )");
+        linkColor = palette().link().color();
+        unresolvedCardTagColor = QColor(0xA0, 0x52, 0x2D);
+    }
+
+    QTimer::singleShot(0, this, &ChatView::refreshBlockColors);
+}
+
+void ChatView::refreshBlockColors()
+{
+    QTextDocument *doc = document();
+
+    // Empty QTextDocuments still have 1 block, so we need handle this edge case
+    if (doc->isEmpty()) {
+        evenNumber = true;
+        return;
+    }
+
+    QTextCursor cursor(doc);
+    bool even = true; // start fresh
+
+    for (QTextBlock block = doc->begin(); block.isValid(); block = block.next()) {
+        QTextBlockFormat fmt = block.blockFormat();
+
+        if (even) {
+            fmt.setBackground(palette().base());
+        } else {
+            fmt.setBackground(palette().window());
+        }
+
+        fmt.setForeground(palette().text());
+
+        cursor.setPosition(block.position());
+        cursor.setBlockFormat(fmt);
+
+        even = !even;
+    }
+
+    evenNumber = even; // keep future rows consistent
 }
 
 void ChatView::retranslateUi()
@@ -72,20 +150,29 @@ QTextCursor ChatView::prepareBlock(bool same)
 {
     lastSender.clear();
 
-    QTextCursor cursor(document());
+    QTextDocument *doc = document();
+    QTextCursor cursor(doc);
+
     cursor.movePosition(QTextCursor::End);
     if (same) {
         cursor.insertHtml("<br>");
     } else {
         QTextBlockFormat blockFormat;
-        if ((evenNumber = !evenNumber))
-            blockFormat.setBackground(palette().window());
-        else
+        if (evenNumber) {
             blockFormat.setBackground(palette().base());
+        } else {
+            blockFormat.setBackground(palette().window());
+        }
+
+        evenNumber = !evenNumber;
 
         blockFormat.setForeground(palette().text());
         blockFormat.setBottomMargin(4);
-        cursor.insertBlock(blockFormat);
+
+        // Empty QTextDocuments still have 1 block. Just write to that block instead of inserting a new one
+        if (!doc->isEmpty()) {
+            cursor.insertBlock(blockFormat);
+        }
     }
 
     return cursor;
@@ -95,8 +182,9 @@ void ChatView::appendHtml(const QString &html)
 {
     bool atBottom = verticalScrollBar()->value() >= verticalScrollBar()->maximum();
     prepareBlock().insertHtml(html);
-    if (atBottom)
-        verticalScrollBar()->setValue(verticalScrollBar()->maximum());
+    if (atBottom) {
+        scrollToBottom();
+    }
 }
 
 void ChatView::appendHtmlServerMessage(const QString &html, bool optionalIsBold, QString optionalFontColor)
@@ -105,34 +193,54 @@ void ChatView::appendHtmlServerMessage(const QString &html, bool optionalIsBold,
 
     QString htmlText =
         "<font color=" + ((optionalFontColor.size() > 0) ? optionalFontColor : serverMessageColor.name()) + ">" +
-        QDateTime::currentDateTime().toString("[hh:mm:ss] ") + html + "</font>";
+        getCurrentTime() + html + "</font>";
 
-    if (optionalIsBold)
+    if (optionalIsBold) {
         htmlText = "<b>" + htmlText + "</b>";
+    }
 
     prepareBlock().insertHtml(htmlText);
-    if (atBottom)
-        verticalScrollBar()->setValue(verticalScrollBar()->maximum());
+    if (atBottom) {
+        scrollToBottom();
+    }
+}
+
+QString ChatView::getCurrentTime() const
+{
+    return QDateTime::currentDateTime().toString("[hh:mm:ss] ");
 }
 
 void ChatView::appendCardTag(QTextCursor &cursor, const QString &cardName)
 {
     QTextCharFormat oldFormat = cursor.charFormat();
-    QTextCharFormat anchorFormat = oldFormat;
-    anchorFormat.setForeground(linkColor);
-    anchorFormat.setAnchor(true);
-    anchorFormat.setAnchorHref("card://" + cardName);
-    anchorFormat.setFontItalic(true);
+    QTextCharFormat cardFormat = oldFormat;
+    cardFormat.setFontItalic(true);
 
-    cursor.setCharFormat(anchorFormat);
-    cursor.insertText(cardName);
+    const CardInfoPtr card = CardDatabaseManager::query()->lookupCardByName(cardName);
+    if (card.isNull()) {
+        cardFormat.setForeground(unresolvedCardTagColor);
+        cursor.setCharFormat(cardFormat);
+        cursor.insertText(cardName);
+        cursor.setCharFormat(oldFormat);
+        return;
+    }
+
+    cardFormat.setForeground(linkColor);
+    cardFormat.setAnchor(true);
+    // The href keeps the canonical name so the card popup can resolve it, while the text shows the name
+    // in the configured card language.
+    cardFormat.setAnchorHref("card://" + cardName);
+
+    cursor.setCharFormat(cardFormat);
+    cursor.insertText(CardLocalization::displayName(card));
     cursor.setCharFormat(oldFormat);
 }
 
 void ChatView::appendUrlTag(QTextCursor &cursor, QString url)
 {
-    if (!url.contains("://"))
+    if (!url.contains("://")) {
         url.prepend("https://");
+    }
 
     QTextCharFormat oldFormat = cursor.charFormat();
     QTextCharFormat anchorFormat = oldFormat;
@@ -147,6 +255,46 @@ void ChatView::appendUrlTag(QTextCursor &cursor, QString url)
     cursor.setCharFormat(oldFormat);
 }
 
+void ChatView::appendGameLinkTag(QTextCursor &cursor, const QString &url)
+{
+    const QUrl gameUrl(url);
+    const QUrlQuery query(gameUrl);
+    const QString hostname = query.queryItemValue("hostname");
+    // FullyDecoded undoes every %XX escape, so a description that itself
+    // contains "%" cannot end up displayed as "%25" in the label.
+    const QString description = query.queryItemValue("game", QUrl::FullyDecoded);
+    const int gameId = query.queryItemValue("gameid").toInt();
+
+    QString label;
+    if (gameId > 0 && !hostname.isEmpty()) {
+        // Links built before the description was embedded stay readable: the
+        // id + server fallback below is identical to the old anchor text.
+        if (!description.isEmpty()) {
+            // Multi-arg .arg() replaces all placeholders in a single pass, so a
+            // description containing "%…" cannot corrupt later placeholders.
+            label = tr("Join game \"%1\" (#%2) on %3").arg(description, QString::number(gameId), hostname);
+        } else {
+            label = tr("Join game #%1 on %2").arg(QString::number(gameId), hostname);
+        }
+    } else {
+        label = tr("Join game");
+    }
+
+    QTextCharFormat oldFormat = cursor.charFormat();
+    QTextCharFormat gameLinkFormat = oldFormat;
+    gameLinkFormat.setForeground(linkColor);
+    gameLinkFormat.setFontWeight(QFont::Bold);
+    gameLinkFormat.setAnchor(true);
+    gameLinkFormat.setAnchorHref(url);
+    QColor background = palette().highlight().color();
+    background.setAlpha(40);
+    gameLinkFormat.setBackground(background);
+
+    cursor.setCharFormat(gameLinkFormat);
+    cursor.insertText(label);
+    cursor.setCharFormat(oldFormat);
+}
+
 void ChatView::appendMessage(QString message,
                              RoomMessageTypeFlags messageType,
                              const ServerInfo_User &userInfo,
@@ -159,6 +307,14 @@ void ChatView::appendMessage(QString message,
     // messageType should be Event_RoomSay::UserMessage though we don't actually check
     bool isUserMessage = !(userName.toLower() == "servatrice" || userName.isEmpty());
     bool sameSender = isUserMessage && userName == lastSender;
+
+    if (isUserMessage) {
+        chatHistory.append({userName, message, QDateTime::currentDateTime()});
+        while (chatHistory.size() > MAX_CHAT_HISTORY) {
+            chatHistory.removeFirst();
+        }
+    }
+
     QTextCursor cursor = prepareBlock(sameSender);
     lastSender = userName;
 
@@ -168,7 +324,7 @@ void ChatView::appendMessage(QString message,
         timeFormat.setForeground(serverMessageColor);
         timeFormat.setFontWeight(QFont::Bold);
         cursor.setCharFormat(timeFormat);
-        cursor.insertText(QDateTime::currentDateTime().toString("[hh:mm:ss] "));
+        cursor.insertText(getCurrentTime());
     }
 
     // nickname
@@ -206,7 +362,8 @@ void ChatView::appendMessage(QString message,
     defaultFormat = QTextCharFormat();
     if (!isUserMessage) {
         if (messageType == Event_RoomSay::ChatHistory) {
-            defaultFormat.setForeground(Qt::gray); // FIXME : hardcoded color
+            //! \todo Remove hardcoded color.
+            defaultFormat.setForeground(Qt::gray);
             defaultFormat.setFontWeight(QFont::Light);
             defaultFormat.setFontItalic(true);
             static const QRegularExpression userNameRegex("^(\\[[^\\]]*\\]\\s)(\\S+):\\s");
@@ -217,30 +374,38 @@ void ChatView::appendMessage(QString message,
                 pos.relativePosition = match.captured(0).length(); // set message start
                 auto before = match.captured(1);
                 auto sentBy = match.captured(2);
+
+                // The user level is not carried in the room chat history, so history
+                // entries used to render as fixed-level user tags. Resolve online users
+                // against the user list to turn their history entries into full user
+                // tags (correct level, name casing and moderation context menu).
+                QString displayName = sentBy;
+                // Offline users have no known level; render them as zero-level tags.
+                QString levelMarker = "0";
+                if (const ServerInfo_User *onlineUser = userListProxy->getOnlineUser(sentBy)) {
+                    displayName = QString::fromStdString(onlineUser->name());
+                    levelMarker = QString::number(onlineUser->user_level());
+                }
+
                 cursor.insertText(before); // add message timestamp
                 QTextCharFormat senderFormat(defaultFormat);
                 senderFormat.setAnchor(true);
-                // this underscore is important, it is used to add the user level, but in this case the level is
-                // unknown, if the name contains an underscore it would split up the name
-                senderFormat.setAnchorHref("user://_" + sentBy);
+                senderFormat.setAnchorHref("user://" + levelMarker + "_" + displayName);
                 cursor.setCharFormat(senderFormat);
-                cursor.insertText(sentBy);                   // add username with href so it shows the menu
-                userMessagePositions[sentBy].append(pos);    // save message position
-                message.remove(0, pos.relativePosition - 2); // do not remove semicolon
+                cursor.insertText(displayName);                // add username with href so it shows the menu
+                userMessagePositions[displayName].append(pos); // save message position
+                message.remove(0, pos.relativePosition - 2);   // do not remove semicolon
             }
         } else {
-            defaultFormat.setForeground(Qt::darkGreen); // FIXME : hardcoded color
+            //! \todo Remove hardcoded color.
+            defaultFormat.setForeground(Qt::darkGreen);
             defaultFormat.setFontWeight(QFont::Bold);
         }
     }
     cursor.setCharFormat(defaultFormat);
 
-    bool mentionEnabled = SettingsCache::instance().getChatMention();
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
-    highlightedWords = SettingsCache::instance().getHighlightWords().split(' ', Qt::SkipEmptyParts);
-#else
-    highlightedWords = SettingsCache::instance().getHighlightWords().split(' ', QString::SkipEmptyParts);
-#endif
+    bool mentionEnabled = SettingsCache::instance().chat().getChatMention();
+    highlightedWords = SettingsCache::instance().chat().getHighlightWords().split(' ', Qt::SkipEmptyParts);
 
     // parse the message
     while (message.size()) {
@@ -272,8 +437,34 @@ void ChatView::appendMessage(QString message,
         }
     }
 
-    if (atBottom)
+    // ChatHistory messages are only ever sent once per room, right after joining, before the user can
+    // interact with the view. Always scroll to the bottom so the whole history is visible on join.
+    if (atBottom || messageType.testFlag(Event_RoomSay::ChatHistory)) {
+        scrollToBottom();
+    }
+}
+
+void ChatView::scrollToBottom()
+{
+    // The document layout, and therefore the scrollbar range, may be updated asynchronously (e.g. while
+    // the chat history is loaded into a view that has not been laid out yet). Setting the value once is
+    // not enough: keep stickToBottom set so any later range change scrolls to the new maximum as well.
+    stickToBottom = true;
+    verticalScrollBar()->setValue(verticalScrollBar()->maximum());
+}
+
+void ChatView::onScrollBarRangeChanged()
+{
+    if (stickToBottom) {
         verticalScrollBar()->setValue(verticalScrollBar()->maximum());
+    }
+}
+
+void ChatView::onScrollBarValueChanged(int value)
+{
+    if (value < verticalScrollBar()->maximum()) {
+        stickToBottom = false;
+    }
 }
 
 void ChatView::checkTag(QTextCursor &cursor, QString &message)
@@ -282,10 +473,11 @@ void ChatView::checkTag(QTextCursor &cursor, QString &message)
         message = message.mid(6);
         int closeTagIndex = message.indexOf("[/card]");
         QString cardName = message.left(closeTagIndex);
-        if (closeTagIndex == -1)
+        if (closeTagIndex == -1) {
             message.clear();
-        else
+        } else {
             message = message.mid(closeTagIndex + 7);
+        }
 
         appendCardTag(cursor, cardName);
         return;
@@ -295,10 +487,11 @@ void ChatView::checkTag(QTextCursor &cursor, QString &message)
         message = message.mid(2);
         int closeTagIndex = message.indexOf("]]");
         QString cardName = message.left(closeTagIndex);
-        if (closeTagIndex == -1)
+        if (closeTagIndex == -1) {
             message.clear();
-        else
+        } else {
             message = message.mid(closeTagIndex + 2);
+        }
 
         appendCardTag(cursor, cardName);
         return;
@@ -308,10 +501,11 @@ void ChatView::checkTag(QTextCursor &cursor, QString &message)
         message = message.mid(5);
         int closeTagIndex = message.indexOf("[/url]");
         QString url = message.left(closeTagIndex);
-        if (closeTagIndex == -1)
+        if (closeTagIndex == -1) {
             message.clear();
-        else
+        } else {
             message = message.mid(closeTagIndex + 6);
+        }
 
         appendUrlTag(cursor, url);
         return;
@@ -338,8 +532,9 @@ void ChatView::checkMention(QTextCursor &cursor, QString &message, const QString
                 // You have received a valid mention!!
                 soundEngine->playSound("chat_mention");
                 mentionFormat.setBackground(QBrush(getCustomMentionColor()));
-                mentionFormat.setForeground(SettingsCache::instance().getChatMentionForeground() ? QBrush(Qt::white)
-                                                                                                 : QBrush(Qt::black));
+                mentionFormat.setForeground(SettingsCache::instance().chat().getChatMentionForeground()
+                                                ? QBrush(Qt::white)
+                                                : QBrush(Qt::black));
                 cursor.insertText(mention, mentionFormat);
                 message = message.mid(mention.size());
                 showSystemPopup(userName);
@@ -360,8 +555,8 @@ void ChatView::checkMention(QTextCursor &cursor, QString &message, const QString
             // Moderator Sending Global Message
             soundEngine->playSound("all_mention");
             mentionFormat.setBackground(QBrush(getCustomMentionColor()));
-            mentionFormat.setForeground(SettingsCache::instance().getChatMentionForeground() ? QBrush(Qt::white)
-                                                                                             : QBrush(Qt::black));
+            mentionFormat.setForeground(
+                SettingsCache::instance().chat().getChatMentionForeground() ? QBrush(Qt::white) : QBrush(Qt::black));
             cursor.insertText("@" + fullMentionUpToSpaceOrEnd, mentionFormat);
             message = message.mid(fullMentionUpToSpaceOrEnd.size() + 1);
             showSystemPopup(userName);
@@ -403,13 +598,24 @@ void ChatView::checkWord(QTextCursor &cursor, QString &message)
         }
     }
 
+    if (fullWordUpToSpaceOrEnd.startsWith("cockatrice://", Qt::CaseInsensitive)) {
+        // Only links to a game (cockatrice://joingame) become invite buttons;
+        // any other cockatrice:// scheme falls through to plain text below.
+        const QUrl gameLink(fullWordUpToSpaceOrEnd);
+        if (gameLink.host().compare("joingame", Qt::CaseInsensitive) == 0) {
+            appendGameLinkTag(cursor, fullWordUpToSpaceOrEnd);
+            cursor.insertText(rest, defaultFormat);
+            return;
+        }
+    }
+
     // check word mentions
     for (const QString &word : highlightedWords) {
         if (fullWordUpToSpaceOrEnd.compare(word, Qt::CaseInsensitive) == 0) {
             // You have received a valid mention of custom word!!
             highlightFormat.setBackground(QBrush(getCustomHighlightColor()));
-            highlightFormat.setForeground(SettingsCache::instance().getChatHighlightForeground() ? QBrush(Qt::white)
-                                                                                                 : QBrush(Qt::black));
+            highlightFormat.setForeground(
+                SettingsCache::instance().chat().getChatHighlightForeground() ? QBrush(Qt::white) : QBrush(Qt::black));
             cursor.insertText(fullWordUpToSpaceOrEnd, highlightFormat);
             cursor.insertText(rest, defaultFormat);
             QApplication::alert(this);
@@ -465,7 +671,7 @@ void ChatView::actMessageClicked()
 void ChatView::showSystemPopup(const QString &userName)
 {
     QApplication::alert(this);
-    if (SettingsCache::instance().getShowMentionPopup()) {
+    if (SettingsCache::instance().chat().getShowMentionPopup()) {
         emit showMentionPopup(userName);
     }
 }
@@ -473,10 +679,10 @@ void ChatView::showSystemPopup(const QString &userName)
 QColor ChatView::getCustomMentionColor()
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
-    QColor customColor = QColor::fromString("#" + SettingsCache::instance().getChatMentionColor());
+    QColor customColor = QColor::fromString("#" + SettingsCache::instance().chat().getChatMentionColor());
 #else
     QColor customColor;
-    customColor.setNamedColor("#" + SettingsCache::instance().getChatMentionColor());
+    customColor.setNamedColor("#" + SettingsCache::instance().chat().getChatMentionColor());
 #endif
     return customColor.isValid() ? customColor : DEFAULT_MENTION_COLOR;
 }
@@ -484,10 +690,10 @@ QColor ChatView::getCustomMentionColor()
 QColor ChatView::getCustomHighlightColor()
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
-    QColor customColor = QColor::fromString("#" + SettingsCache::instance().getChatMentionColor());
+    QColor customColor = QColor::fromString("#" + SettingsCache::instance().chat().getChatMentionColor());
 #else
     QColor customColor;
-    customColor.setNamedColor("#" + SettingsCache::instance().getChatMentionColor());
+    customColor.setNamedColor("#" + SettingsCache::instance().chat().getChatMentionColor());
 #endif
     return customColor.isValid() ? customColor : DEFAULT_MENTION_COLOR;
 }
@@ -497,6 +703,19 @@ void ChatView::clearChat()
     document()->clear();
     lastSender = "";
     evenNumber = true;
+    chatHistory.clear();
+}
+
+QString ChatView::getRecentChatLog(int maxMessages) const
+{
+    QStringList lines;
+    int start = qMax(0, chatHistory.size() - maxMessages);
+    for (int i = start; i < chatHistory.size(); ++i) {
+        const ChatLogEntry &entry = chatHistory.at(i);
+        lines.append(
+            QString("[%1] %2: %3").arg(entry.timestamp.toString("hh:mm:ss")).arg(entry.userName).arg(entry.message));
+    }
+    return lines.join("\n");
 }
 
 void ChatView::redactMessages(const QString &userName, int amount)
@@ -521,11 +740,7 @@ void ChatView::redactMessages(const QString &userName, int amount)
     }
 }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
 void ChatView::enterEvent(QEnterEvent * /*event*/)
-#else
-void ChatView::enterEvent(QEvent * /*event*/)
-#endif
 {
     setMouseTracking(true);
 }
@@ -542,8 +757,9 @@ QTextFragment ChatView::getFragmentUnderMouse(const QPoint &pos) const
     QTextBlock::iterator it;
     for (it = block.begin(); !(it.atEnd()); ++it) {
         QTextFragment frag = it.fragment();
-        if (frag.contains(cursor.position()))
+        if (frag.contains(cursor.position())) {
             return frag;
+        }
     }
     return QTextFragment();
 }
@@ -559,10 +775,11 @@ void ChatView::mouseMoveEvent(QMouseEvent *event)
             if (scheme == "card") {
                 hoveredItemType = HoveredCard;
                 emit cardNameHovered(hoveredContent);
-            } else if (scheme == "user")
+            } else if (scheme == "user") {
                 hoveredItemType = HoveredUser;
-            else
+            } else {
                 hoveredItemType = HoveredUrl;
+            }
             viewport()->setCursor(Qt::PointingHandCursor);
         } else {
             hoveredItemType = HoveredNothing;
@@ -580,12 +797,9 @@ void ChatView::mousePressEvent(QMouseEvent *event)
 {
     switch (hoveredItemType) {
         case HoveredCard: {
-            if ((event->button() == Qt::MiddleButton) || (event->button() == Qt::LeftButton))
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+            if ((event->button() == Qt::MiddleButton) || (event->button() == Qt::LeftButton)) {
                 emit showCardInfoPopup(event->globalPosition().toPoint(), {hoveredContent});
-#else
-                emit showCardInfoPopup(event->globalPos(), {hoveredContent});
-#endif
+            }
             break;
         }
         case HoveredUser: {
@@ -595,18 +809,15 @@ void ChatView::mousePressEvent(QMouseEvent *event)
                 switch (event->button()) {
                     case Qt::RightButton: {
                         UserLevelFlags userLevel(hoveredContent.left(delimiterIndex).toInt());
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
                         userContextMenu->showContextMenu(event->globalPosition().toPoint(), userName, userLevel, this);
-#else
-                        userContextMenu->showContextMenu(event->globalPos(), userName, userLevel, this);
-#endif
                         break;
                     }
                     case Qt::LeftButton: {
                         if (event->modifiers() == Qt::ControlModifier) {
                             emit openMessageDialog(userName, true);
-                        } else
+                        } else {
                             emit addMentionTag("@" + userName);
+                        }
                         break;
                     }
                     default:
@@ -623,16 +834,23 @@ void ChatView::mousePressEvent(QMouseEvent *event)
 
 void ChatView::mouseReleaseEvent(QMouseEvent *event)
 {
-    if ((event->button() == Qt::MiddleButton) || (event->button() == Qt::LeftButton))
+    if ((event->button() == Qt::MiddleButton) || (event->button() == Qt::LeftButton)) {
         emit deleteCardInfoPopup(QString("_"));
+    }
 
     QTextBrowser::mouseReleaseEvent(event);
 }
 
 void ChatView::openLink(const QUrl &link)
 {
-    if ((link.scheme() == "card") || (link.scheme() == "user"))
+    if (link.scheme() == "cockatrice") {
+        emit cockatriceLinkActivated(link.toString(QUrl::FullyEncoded));
         return;
+    }
+
+    if ((link.scheme() == "card") || (link.scheme() == "user")) {
+        return;
+    }
 
     QDesktopServices::openUrl(link);
 }
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 00fcc4f5e..3fa7224e5 100644
--- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
+++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.h
@@ -2,40 +2,56 @@
  * @file chat_view.h
  * @ingroup NetworkingWidgets
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CHATVIEW_H
 #define CHATVIEW_H
 
-#include "../../interface/widgets/tabs/tab_supervisor.h"
-#include "../user/user_list_widget.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.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
 {
 public:
-#if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
-    UserMessagePosition() = default; // older qt versions require a default constructor to use in containers
-#endif
     UserMessagePosition(QTextCursor &cursor);
     int relativePosition;
     QTextBlock block;
 };
 
+struct ChatLogEntry
+{
+    QString userName;
+    QString message;
+    QDateTime timestamp;
+};
+
 class ChatView : public QTextBrowser
 {
     Q_OBJECT
@@ -63,15 +79,20 @@ private:
     QStringList highlightedWords;
     bool evenNumber;
     bool showTimestamps;
+    bool stickToBottom = false;
     HoveredItemType hoveredItemType;
     QString hoveredContent;
     QAction *messageClicked;
     QMap<QString, QVector<UserMessagePosition>> userMessagePositions;
+    QList<ChatLogEntry> chatHistory;
+    static constexpr int MAX_CHAT_HISTORY = 200;
 
     [[nodiscard]] QTextFragment getFragmentUnderMouse(const QPoint &pos) const;
     QTextCursor prepareBlock(bool same = false);
+    void scrollToBottom();
     void appendCardTag(QTextCursor &cursor, const QString &cardName);
     void appendUrlTag(QTextCursor &cursor, QString url);
+    void appendGameLinkTag(QTextCursor &cursor, const QString &url);
     static QColor getCustomMentionColor();
     static QColor getCustomHighlightColor();
     void showSystemPopup(const QString &userName);
@@ -84,31 +105,33 @@ private:
     QColor otherUserColor = QColor(0, 65, 255); // dark blue
     QColor serverMessageColor = QColor(0x85, 0x15, 0x15);
     QColor linkColor;
+    QColor unresolvedCardTagColor;
 
 private slots:
     void openLink(const QUrl &link);
     void actMessageClicked();
+    void adjustColorsToPalette();
+    void refreshBlockColors();
+    void onScrollBarRangeChanged();
+    void onScrollBarValueChanged(int value);
 
 public:
     ChatView(TabSupervisor *_tabSupervisor, AbstractGame *_game, bool _showTimestamps, QWidget *parent = nullptr);
     void retranslateUi();
     void appendHtml(const QString &html);
-    void virtual appendHtmlServerMessage(const QString &html,
-                                         bool optionalIsBold = false,
-                                         QString optionalFontColor = QString());
+    virtual void
+    appendHtmlServerMessage(const QString &html, bool optionalIsBold = false, QString optionalFontColor = QString());
     void appendMessage(QString message,
                        RoomMessageTypeFlags messageType = {},
                        const ServerInfo_User &userInfo = {},
                        bool playerBold = false);
     void clearChat();
     void redactMessages(const QString &userName, int amount);
+    QString getRecentChatLog(int maxMessages = 50) const;
 
 protected:
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+    [[nodiscard]] virtual QString getCurrentTime() const;
     void enterEvent(QEnterEvent *event) override;
-#else
-    void enterEvent(QEvent *event) override;
-#endif
     void leaveEvent(QEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;
     void mousePressEvent(QMouseEvent *event) override;
@@ -121,6 +144,7 @@ signals:
     void addMentionTag(QString mentionTag);
     void messageClickedSignal();
     void showMentionPopup(const QString &userName);
+    void cockatriceLinkActivated(const QString &url);
 };
 
 #endif
diff --git a/cockatrice/src/interface/widgets/server/game_filter_configs.cpp b/cockatrice/src/interface/widgets/server/game_filter_configs.cpp
new file mode 100644
index 000000000..5a6282b75
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/game_filter_configs.cpp
@@ -0,0 +1,7 @@
+#include "game_filter_configs.h"
+
+bool GameFilterConfigs::isDefault() const
+{
+    static const GameFilterConfigs DEFAULT = {};
+    return *this == DEFAULT;
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/server/game_filter_configs.h b/cockatrice/src/interface/widgets/server/game_filter_configs.h
new file mode 100644
index 000000000..1b7322c55
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/game_filter_configs.h
@@ -0,0 +1,47 @@
+#ifndef COCKATRICE_GAME_FILTER_CONFIGS_H
+#define COCKATRICE_GAME_FILTER_CONFIGS_H
+
+#include <QList>
+#include <QSet>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
+#include <QTime>
+
+/**
+ * @brief The possible game filter configs.
+ */
+struct GameFilterConfigs
+{
+    static constexpr int DEFAULT_MAX_PLAYERS_MIN = 1;
+    static constexpr int DEFAULT_MAX_PLAYERS_MAX = 99;
+
+    bool hideBuddiesOnlyGames = false;
+    bool hideIgnoredUserGames = false;
+    bool hideFullGames = false;
+    bool hideGamesThatStarted = false;
+    bool hidePasswordProtectedGames = false;
+    bool hideNotBuddyCreatedGames = false;
+    bool hideOpenDecklistGames = false;
+    QString gameNameFilter = "";
+    QStringList hostNameFilters = {};
+    QSet<int> gameTypeFilter = {};
+    int maxPlayersFilterMin = DEFAULT_MAX_PLAYERS_MIN;
+    int maxPlayersFilterMax = DEFAULT_MAX_PLAYERS_MAX;
+    QTime maxGameAge = {};
+    bool showOnlyIfSpectatorsCanWatch = false;
+    bool showSpectatorPasswordProtected = false;
+    bool showOnlyIfSpectatorsCanChat = false;
+    bool showOnlyIfSpectatorsCanSeeHands = false;
+
+    bool operator==(const GameFilterConfigs &) const = default;
+
+    /**
+     * @brief Checks if this config has exactly the default values.
+     *
+     * @return Whether this config has the default values
+     */
+    bool isDefault() const;
+};
+
+#endif // COCKATRICE_GAME_FILTER_CONFIGS_H
diff --git a/cockatrice/src/interface/widgets/server/game_link.cpp b/cockatrice/src/interface/widgets/server/game_link.cpp
new file mode 100644
index 000000000..c866f6571
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/game_link.cpp
@@ -0,0 +1,23 @@
+#include "game_link.h"
+
+#include <QUrl>
+#include <QUrlQuery>
+
+QString makeGameJoinLink(const QString &hostname, int port, int roomId, int gameId, const QString &description)
+{
+    QUrl url;
+    url.setScheme("cockatrice");
+    url.setHost("joingame");
+    QUrlQuery query;
+    query.addQueryItem("hostname", hostname);
+    query.addQueryItem("port", QString::number(port));
+    query.addQueryItem("roomid", QString::number(roomId));
+    query.addQueryItem("gameid", QString::number(gameId));
+    if (!description.isEmpty()) {
+        // addQueryItem percent-encodes, so arbitrary descriptions (quotes,
+        // ampersands, non-ASCII…) survive the trip through chat.
+        query.addQueryItem("game", description);
+    }
+    url.setQuery(query);
+    return url.toString(QUrl::FullyEncoded);
+}
diff --git a/cockatrice/src/interface/widgets/server/game_link.h b/cockatrice/src/interface/widgets/server/game_link.h
new file mode 100644
index 000000000..d57bbd6d2
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/game_link.h
@@ -0,0 +1,41 @@
+/**
+ * @file game_link.h
+ * @ingroup UI
+ * @brief Builds cockatrice://joingame links that let another user join a server game.
+ */
+
+#ifndef GAME_LINK_H
+#define GAME_LINK_H
+
+#include <QString>
+
+/**
+ * Builds a cockatrice://joingame link for the given server game. The receiver's
+ * client opens it through the intent chain (connect -> join room -> join game).
+ * @p description, when non-empty, is embedded in the link as the URL-encoded
+ * "game" query item so the receiving client can name the game in its confirm
+ * prompt and chat anchor instead of only its numeric id. Links built without it
+ * stay valid: the parser and chat renderer fall back to the id alone.
+ */
+QString
+makeGameJoinLink(const QString &hostname, int port, int roomId, int gameId, const QString &description = QString());
+
+/**
+ * One game the inviter is currently in and can invite another user to.
+ * @p label is meant for display in menus, @p url is the ready-made invite link.
+ * @p description is the raw game description for building tr()-wrapped invite
+ * messages (the label already embeds it, but the send sites need the raw value).
+ * @p onlyBuddies and @p creatorName mirror the server game's room settings so
+ * callers can gate the invite to the creator's buddies.
+ */
+struct GameInviteOption
+{
+    int gameId = 0;
+    QString label;
+    QString url;
+    QString description;
+    bool onlyBuddies = false;
+    QString creatorName;
+};
+
+#endif // GAME_LINK_H
diff --git a/cockatrice/src/interface/widgets/server/game_selector.cpp b/cockatrice/src/interface/widgets/server/game_selector.cpp
index 48a12d5b3..27464e14e 100644
--- a/cockatrice/src/interface/widgets/server/game_selector.cpp
+++ b/cockatrice/src/interface/widgets/server/game_selector.cpp
@@ -1,26 +1,54 @@
 #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/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,
@@ -37,8 +65,9 @@ GameSelector::GameSelector(AbstractClient *_client,
     connect(gameListView, &QTreeView::customContextMenuRequested, this, &GameSelector::customContextMenu);
 
     gameListModel = new GamesModel(_rooms, _gameTypes, this);
+    gameListProxyModel = new GamesProxyModel(this, tabSupervisor->getUserListManager());
+
     if (showFilters) {
-        gameListProxyModel = new GamesProxyModel(this, tabSupervisor->getUserListManager());
         gameListProxyModel->setSourceModel(gameListModel);
         gameListProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
         gameListView->setModel(gameListProxyModel);
@@ -60,31 +89,43 @@ GameSelector::GameSelector(AbstractClient *_client,
     gameListView->setColumnWidth(3, gameListView->columnWidth(3) * 1.2);
     // game type width
     gameListView->setColumnWidth(4, gameListView->columnWidth(4) * 1.4);
-    if (_room)
+    if (_room) {
         gameListView->header()->hideSection(gameListModel->roomColIndex());
+    }
 
-    if (room)
+    if (room) {
         gameTypeMap = gameListModel->getGameTypes().value(room->getRoomId());
+    }
 
-    if (showFilters && restoresettings)
+    if (showFilters && restoresettings) {
         gameListProxyModel->loadFilterParameters(gameTypeMap);
+    }
 
     gameListView->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
 
     if (showFilters && restoresettings) {
         quickFilterToolBar = new GameSelectorQuickFilterToolBar(this, tabSupervisor, gameListProxyModel, gameTypeMap);
+        quickFilterToolBar->setVisible(showFilters && restoresettings &&
+                                       SettingsCache::instance().userInterface().getShowGameSelectorFilterToolbar());
+
+        connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::showGameSelectorFilterToolbarChanged,
+                this, [this] {
+                    quickFilterToolBar->setVisible(
+                        SettingsCache::instance().userInterface().getShowGameSelectorFilterToolbar());
+                });
     } else {
         quickFilterToolBar = nullptr;
     }
 
     filterButton = new QPushButton;
-    filterButton->setIcon(QPixmap("theme:icons/search"));
+    filterButton->setIcon(themePixmap(QStringLiteral("icons/search")));
     connect(filterButton, &QPushButton::clicked, this, &GameSelector::actSetFilter);
     clearFilterButton = new QPushButton;
-    clearFilterButton->setIcon(QPixmap("theme:icons/clearsearch"));
+    clearFilterButton->setIcon(themePixmap(QStringLiteral("icons/clearsearch")));
     bool filtersSetToDefault = showFilters && gameListProxyModel->areFilterParametersSetToDefaults();
     clearFilterButton->setEnabled(!filtersSetToDefault);
     connect(clearFilterButton, &QPushButton::clicked, this, &GameSelector::actClearFilter);
+    connect(gameListProxyModel, &GamesProxyModel::filtersChanged, this, &GameSelector::checkClearFilterButtonState);
 
     if (room) {
         createButton = new QPushButton;
@@ -103,8 +144,9 @@ GameSelector::GameSelector(AbstractClient *_client,
         buttonLayout->addWidget(clearFilterButton);
     }
     buttonLayout->addStretch();
-    if (room)
+    if (room) {
         buttonLayout->addWidget(createButton);
+    }
     buttonLayout->addWidget(joinButton);
     if (tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsJudge) {
         buttonLayout->addWidget(joinAsJudgeButton);
@@ -170,27 +212,23 @@ void GameSelector::actSetFilter()
 {
     DlgFilterGames dlg(gameTypeMap, gameListProxyModel, this);
 
-    if (!dlg.exec())
+    if (!dlg.exec()) {
         return;
+    }
 
-    gameListProxyModel->setGameFilters(
-        dlg.getHideBuddiesOnlyGames(), dlg.getHideIgnoredUserGames(), dlg.getHideFullGames(),
-        dlg.getHideGamesThatStarted(), dlg.getHidePasswordProtectedGames(), dlg.getHideNotBuddyCreatedGames(),
-        dlg.getHideOpenDecklistGames(), dlg.getGameNameFilter(), dlg.getCreatorNameFilters(), dlg.getGameTypeFilter(),
-        dlg.getMaxPlayersFilterMin(), dlg.getMaxPlayersFilterMax(), dlg.getMaxGameAge(),
-        dlg.getShowOnlyIfSpectatorsCanWatch(), dlg.getShowSpectatorPasswordProtected(),
-        dlg.getShowOnlyIfSpectatorsCanChat(), dlg.getShowOnlyIfSpectatorsCanSeeHands());
+    gameListProxyModel->setGameFilters(dlg.getFilters());
     gameListProxyModel->saveFilterParameters(gameTypeMap);
 
-    clearFilterButton->setEnabled(!gameListProxyModel->areFilterParametersSetToDefaults());
-
     updateTitle();
 }
 
+void GameSelector::checkClearFilterButtonState()
+{
+    clearFilterButton->setEnabled(!gameListProxyModel->areFilterParametersSetToDefaults());
+}
+
 void GameSelector::actClearFilter()
 {
-    clearFilterButton->setEnabled(false);
-
     gameListProxyModel->resetFilterParameters();
     gameListProxyModel->saveFilterParameters(gameTypeMap);
 
@@ -304,6 +342,14 @@ void GameSelector::customContextMenu(const QPoint &point)
         dlg.exec();
     });
 
+    QAction copyLink(tr("Cop&y game link"));
+    connect(&copyLink, &QAction::triggered, this, [=, this]() {
+        const ServerInfo_Game &gameInfo = gameListModel->getGame(index.data(Qt::UserRole).toInt());
+        QGuiApplication::clipboard()->setText(makeGameJoinLink(client->serverName(), client->serverPort(),
+                                                               gameInfo.room_id(), gameInfo.game_id(),
+                                                               QString::fromStdString(gameInfo.description())));
+    });
+
     QMenu menu;
     menu.addAction(&joinGame);
 
@@ -321,6 +367,11 @@ void GameSelector::customContextMenu(const QPoint &point)
 
     menu.addAction(&spectateGame);
     menu.addAction(&getGameInfo);
+
+    if (!client->serverName().isEmpty()) {
+        menu.addAction(&copyLink);
+    }
+
     menu.exec(gameListView->mapToGlobal(point));
 }
 
@@ -331,18 +382,40 @@ void GameSelector::joinGame(const bool asSpectator, const bool asJudge)
         return;
     }
 
-    const ServerInfo_Game &game = gameListModel->getGame(ind.data(Qt::UserRole).toInt());
+    joinGame(gameListModel->getGame(ind.data(Qt::UserRole).toInt()), asSpectator, asJudge);
+}
+
+void GameSelector::joinGame(const ServerInfo_Game &game, const bool asSpectator, const bool asJudge)
+{
     if (tabSupervisor->switchToGameTabIfAlreadyExists(game.game_id())) {
         return;
     }
 
-    bool spectator = asSpectator || game.player_count() == game.max_players();
+    bool overrideRestrictions = tabSupervisor->canOverrideGameRestrictions();
+
+    // Joining a full game without override privileges silently becomes a
+    // spectator join, so ask first instead of surprising the player.
+    const bool gameFull = game.player_count() == game.max_players();
+    if (gameFull && !asSpectator && !asJudge && !overrideRestrictions) {
+        const QMessageBox::StandardButton answer =
+            QMessageBox::question(this, tr("Join game"), tr("The game is full. Join as a spectator instead?"),
+                                  QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+        if (answer != QMessageBox::Yes) {
+            return;
+        }
+    }
+
+    bool spectator = asSpectator || gameFull;
 
-    bool overrideRestrictions = !tabSupervisor->getAdminLocked();
     QString password;
     if (game.with_password() && !(spectator && !game.spectators_need_password()) && !overrideRestrictions) {
         bool ok;
-        password = getTextWithMax(this, tr("Join game"), tr("Password:"), QLineEdit::Password, QString(), &ok);
+        // Games without a description have no sensible label — fall back to the
+        // game id so the prompt still tells the user which game they're entering.
+        const QString gameLabel = QString::fromStdString(game.description());
+        const QString prompt = gameLabel.isEmpty() ? tr("Password for game #%1:").arg(game.game_id())
+                                                   : tr("Password for \"%1\":").arg(gameLabel);
+        password = getTextWithMax(this, tr("Join game"), prompt, QLineEdit::Password, QString(), &ok);
         if (!ok) {
             return;
         }
@@ -368,10 +441,27 @@ void GameSelector::joinGame(const bool asSpectator, const bool asJudge)
     disableButtons();
 }
 
+bool GameSelector::joinGameById(const int gameId, const bool asSpectator)
+{
+    for (int row = 0; row < gameListModel->rowCount(); ++row) {
+        const ServerInfo_Game &game = gameListModel->getGame(row);
+        if (game.game_id() != gameId) {
+            continue;
+        }
+
+        joinGame(game, asSpectator);
+        return true;
+    }
+
+    qWarning() << "Game" << gameId << "not found";
+    return false;
+}
+
 void GameSelector::disableButtons()
 {
-    if (createButton)
+    if (createButton) {
         createButton->setEnabled(false);
+    }
 
     joinButton->setEnabled(false);
     spectateButton->setEnabled(false);
@@ -379,8 +469,9 @@ void GameSelector::disableButtons()
 
 void GameSelector::enableButtons()
 {
-    if (createButton)
+    if (createButton) {
         createButton->setEnabled(true);
+    }
 
     // Enable buttons for the currently selected game
     enableButtonsForIndex(gameListView->currentIndex());
@@ -388,11 +479,12 @@ void GameSelector::enableButtons()
 
 void GameSelector::enableButtonsForIndex(const QModelIndex &current)
 {
-    if (!current.isValid())
+    if (!current.isValid()) {
         return;
+    }
 
     const ServerInfo_Game &game = gameListModel->getGame(current.data(Qt::UserRole).toInt());
-    bool overrideRestrictions = !tabSupervisor->getAdminLocked();
+    bool overrideRestrictions = tabSupervisor->canOverrideGameRestrictions();
 
     spectateButton->setEnabled(game.spectators_allowed() || overrideRestrictions);
     joinButton->setEnabled(game.player_count() < game.max_players() || overrideRestrictions);
@@ -402,8 +494,9 @@ void GameSelector::retranslateUi()
 {
     filterButton->setText(tr("&Filter games"));
     clearFilterButton->setText(tr("C&lear filter"));
-    if (createButton)
+    if (createButton) {
         createButton->setText(tr("C&reate"));
+    }
     joinButton->setText(tr("&Join"));
     joinAsJudgeButton->setText(tr("Join as judge"));
     spectateButton->setText(tr("J&oin as spectator"));
diff --git a/cockatrice/src/interface/widgets/server/game_selector.h b/cockatrice/src/interface/widgets/server/game_selector.h
index ea0a4feb0..01e093b06 100644
--- a/cockatrice/src/interface/widgets/server/game_selector.h
+++ b/cockatrice/src/interface/widgets/server/game_selector.h
@@ -1,25 +1,34 @@
 #ifndef GAMESELECTOR_H
 #define GAMESELECTOR_H
 
-#include "game_selector_quick_filter_toolbar.h"
 #include "game_type_map.h"
 
 #include <QGroupBox>
-#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>
+#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>
 
 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
@@ -40,6 +49,7 @@ private slots:
      * Updates the proxy model with selected filter parameters and refreshes the displayed game list.
      */
     void actSetFilter();
+    void checkClearFilterButtonState();
 
     /**
      * @brief Clears all filters applied to the game list.
@@ -170,6 +180,17 @@ private:
      */
     void joinGame(bool asSpectator = false, bool asJudge = false);
 
+    /**
+     * @brief Performs the join or spectate action for a specific game.
+     * @param game The game to join.
+     * @param asSpectator True to join as a spectator, false to join as a player.
+     * @param asJudge True to join as a judge, false to join as a player.
+     *
+     * Unlike the selection-based overload, this does not depend on the game being
+     * visible in the filtered game list.
+     */
+    void joinGame(const ServerInfo_Game &game, bool asSpectator = false, bool asJudge = false);
+
 public:
     /**
      * @brief Constructs a GameSelector widget.
@@ -201,6 +222,16 @@ public:
      * @param info The ServerInfo_Game object containing information about the game to update.
      */
     void processGameInfo(const ServerInfo_Game &info);
+    /**
+     * @brief Finds a game by ID and joins or spectates it.
+     * @param gameId The ID of the game to join.
+     * @param asSpectator True to join as a spectator, false to join as a player.
+     * @return True if the game was found and joined, false otherwise.
+     *
+     * Unlike the selection-based overload, this does not depend on the game
+     * being visible in the filtered game list.
+     */
+    bool joinGameById(int gameId, bool asSpectator = false);
 };
 
 #endif
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 daab4d6eb..0fc3d879c 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,12 +1,22 @@
 #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,
@@ -18,33 +28,31 @@ GameSelectorQuickFilterToolBar::GameSelectorQuickFilterToolBar(QWidget *parent,
     mainLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->setSpacing(5);
 
+    const GameFilterConfigs &filters = model->getFilters();
+
     searchBar = new QLineEdit(this);
-    searchBar->setText(model->getCreatorNameFilters().join(", "));
-    connect(searchBar, &QLineEdit::textChanged, this, [this](const QString &text) { model->setGameNameFilter(text); });
+    searchBar->setText(filters.gameNameFilter);
+    connect(searchBar, &QLineEdit::textChanged, this, [this](const QString &text) {
+        applyFilters([&](GameFilterConfigs &configs) { configs.gameNameFilter = text; });
+    });
 
     hideGamesNotCreatedByBuddiesCheckBox = new QCheckBox(this);
-    hideGamesNotCreatedByBuddiesCheckBox->setChecked(model->getHideBuddiesOnlyGames());
+    hideGamesNotCreatedByBuddiesCheckBox->setChecked(filters.hideNotBuddyCreatedGames);
     connect(hideGamesNotCreatedByBuddiesCheckBox, &QCheckBox::toggled, this, [this](bool checked) {
-        if (checked) {
-            QStringList buddyNames;
-            for (auto buddy : tabSupervisor->getUserListManager()->getBuddyList().values()) {
-                buddyNames << QString::fromStdString(buddy.name());
-            }
-            model->setCreatorNameFilters(buddyNames);
-        } else {
-            model->setCreatorNameFilters({});
-        }
+        applyFilters([&](GameFilterConfigs &configs) { configs.hideNotBuddyCreatedGames = checked; });
     });
 
     hideFullGamesCheckBox = new QCheckBox(this);
-    hideFullGamesCheckBox->setChecked(model->getHideFullGames());
-    connect(hideFullGamesCheckBox, &QCheckBox::toggled, this,
-            [this](bool checked) { model->setHideFullGames(checked); });
+    hideFullGamesCheckBox->setChecked(filters.hideFullGames);
+    connect(hideFullGamesCheckBox, &QCheckBox::toggled, this, [this](bool checked) {
+        applyFilters([&](GameFilterConfigs &configs) { configs.hideFullGames = checked; });
+    });
 
     hideStartedGamesCheckBox = new QCheckBox(this);
-    hideStartedGamesCheckBox->setChecked(model->getHideGamesThatStarted());
-    connect(hideStartedGamesCheckBox, &QCheckBox::toggled, this,
-            [this](bool checked) { model->setHideGamesThatStarted(checked); });
+    hideStartedGamesCheckBox->setChecked(filters.hideGamesThatStarted);
+    connect(hideStartedGamesCheckBox, &QCheckBox::toggled, this, [this](bool checked) {
+        applyFilters([&](GameFilterConfigs &configs) { configs.hideGamesThatStarted = checked; });
+    });
 
     filterToFormatComboBox = new QComboBox(this);
 
@@ -57,25 +65,27 @@ GameSelectorQuickFilterToolBar::GameSelectorQuickFilterToolBar(QWidget *parent,
         filterToFormatComboBox->addItem(i.value(), i.key()); // text = name, data = type ID
     }
 
-    QSet<int> currentTypes = model->getGameTypeFilter();
+    QSet<int> currentTypes = filters.gameTypeFilter;
     if (currentTypes.size() == 1) {
         int typeId = *currentTypes.begin();
         int index = filterToFormatComboBox->findData(typeId);
-        if (index >= 0)
+        if (index >= 0) {
             filterToFormatComboBox->setCurrentIndex(index);
+        }
     } else {
         filterToFormatComboBox->setCurrentIndex(0); // "All types" by default
     }
 
     // Update proxy model on selection change
     connect(filterToFormatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this](int index) {
-        QVariant data = filterToFormatComboBox->itemData(index);
-        if (!data.isValid()) {
-            model->setGameTypeFilter({}); // empty = no filter
-        } else {
-            int typeId = data.toInt();
-            model->setGameTypeFilter({typeId});
-        }
+        applyFilters([&](GameFilterConfigs &configs) {
+            QVariant data = filterToFormatComboBox->itemData(index);
+            if (!data.isValid()) {
+                configs.gameTypeFilter.clear();
+            } else {
+                configs.gameTypeFilter = {data.toInt()};
+            }
+        });
     });
 
     hideGamesNotCreatedByBuddiesCheckBox->setMinimumSize(20, 20);
@@ -96,9 +106,47 @@ GameSelectorQuickFilterToolBar::GameSelectorQuickFilterToolBar(QWidget *parent,
 
     setLayout(mainLayout);
 
+    syncFromModel();
+
+    connect(model, &GamesProxyModel::filtersChanged, this, &GameSelectorQuickFilterToolBar::syncFromModel);
+
     retranslateUi();
 }
 
+void GameSelectorQuickFilterToolBar::syncFromModel()
+{
+    QSignalBlocker b1(searchBar);
+    QSignalBlocker b2(filterToFormatComboBox);
+    QSignalBlocker b3(hideGamesNotCreatedByBuddiesCheckBox);
+    QSignalBlocker b4(hideFullGamesCheckBox);
+    QSignalBlocker b5(hideStartedGamesCheckBox);
+
+    const GameFilterConfigs filters = model->getFilters();
+
+    searchBar->setText(filters.gameNameFilter);
+
+    hideGamesNotCreatedByBuddiesCheckBox->setChecked(filters.hideNotBuddyCreatedGames);
+    hideFullGamesCheckBox->setChecked(filters.hideFullGames);
+    hideStartedGamesCheckBox->setChecked(filters.hideGamesThatStarted);
+
+    QSet<int> types = filters.gameTypeFilter;
+    if (types.size() == 1) {
+        int idx = filterToFormatComboBox->findData(*types.begin());
+        filterToFormatComboBox->setCurrentIndex(idx >= 0 ? idx : 0);
+    } else {
+        filterToFormatComboBox->setCurrentIndex(0);
+    }
+}
+
+void GameSelectorQuickFilterToolBar::applyFilters(std::function<void(GameFilterConfigs &)> mutator)
+{
+    GameFilterConfigs configs = model->getFilters();
+
+    mutator(configs);
+
+    model->setGameFilters(configs);
+}
+
 void GameSelectorQuickFilterToolBar::retranslateUi()
 {
     searchBar->setPlaceholderText(tr("Filter by game name..."));
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 642fdd1c4..99ed179b5 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,12 +1,19 @@
 #ifndef COCKATRICE_GAME_SELECTOR_QUICK_FILTER_TOOLBAR_H
 #define COCKATRICE_GAME_SELECTOR_QUICK_FILTER_TOOLBAR_H
 
-#include "../tabs/tab_supervisor.h"
-#include "games_model.h"
-
-#include <QHBoxLayout>
-#include <QLineEdit>
 #include <QWidget>
+#include <functional>
+#include <qtmetamacros.h>
+
+class GamesProxyModel;
+class QCheckBox;
+class QComboBox;
+class QHBoxLayout;
+class QLineEdit;
+class QString;
+class TabSupervisor;
+struct GameFilterConfigs;
+template <class Key, class T> class QMap;
 
 class GameSelectorQuickFilterToolBar : public QWidget
 {
@@ -18,6 +25,8 @@ public:
                                             TabSupervisor *tabSupervisor,
                                             GamesProxyModel *model,
                                             const QMap<int, QString> &allGameTypes);
+    void syncFromModel();
+    void applyFilters(std::function<void(GameFilterConfigs &)> mutator);
     void retranslateUi();
 
 private:
diff --git a/cockatrice/src/interface/widgets/server/games_model.cpp b/cockatrice/src/interface/widgets/server/games_model.cpp
index cdac71b28..289dbee44 100644
--- a/cockatrice/src/interface/widgets/server/games_model.cpp
+++ b/cockatrice/src/interface/widgets/server/games_model.cpp
@@ -2,30 +2,54 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../interface/pixel_map_generator.h"
-#include "../interface/widgets/tabs/tab_account.h"
-#include "user/user_list_manager.h"
-#include "user/user_list_widget.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+#include "user/user_list_proxy.h"
+#include "user_level.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>
 
 enum GameListColumn
 {
     ROOM,
     CREATED,
     DESCRIPTION,
-    CREATOR,
+    HOST,
     GAME_TYPE,
     RESTRICTIONS,
     PLAYERS,
     SPECTATORS
 };
 
-const int DEFAULT_MAX_PLAYERS_MIN = 1;
-const int DEFAULT_MAX_PLAYERS_MAX = 99;
-constexpr auto DEFAULT_MAX_GAME_AGE = QTime();
+namespace
+{
+/**
+ * @brief Returns the user info of the game's current host, falling back to the creator.
+ *
+ * The server only sends host_info once a host transfer has happened, so older
+ * servers and freshly created games fall back to the original creator.
+ */
+const ServerInfo_User &getGameHost(const ServerInfo_Game &game)
+{
+    return game.has_host_info() ? game.host_info() : game.creator_info();
+}
+} // namespace
 
 const QString GamesModel::getGameCreatedString(const int secs)
 {
@@ -67,14 +91,18 @@ GamesModel::GamesModel(const QMap<int, QString> &_rooms, const QMap<int, GameTyp
 
 QVariant GamesModel::data(const QModelIndex &index, int role) const
 {
-    if (!index.isValid())
+    if (!index.isValid()) {
         return QVariant();
-    if (role == Qt::UserRole)
+    }
+    if (role == Qt::UserRole) {
         return index.row();
-    if (role != Qt::DisplayRole && role != SORT_ROLE && role != Qt::DecorationRole && role != Qt::TextAlignmentRole)
+    }
+    if (role != Qt::DisplayRole && role != SORT_ROLE && role != Qt::DecorationRole && role != Qt::TextAlignmentRole) {
         return QVariant();
-    if ((index.row() >= gameList.size()) || (index.column() >= columnCount()))
+    }
+    if ((index.row() >= gameList.size()) || (index.column() >= columnCount())) {
         return QVariant();
+    }
 
     const ServerInfo_Game &gameentry = gameList[index.row()];
     switch (index.column()) {
@@ -109,16 +137,16 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
                 default:
                     return QVariant();
             }
-        case CREATOR: {
+        case HOST: {
             switch (role) {
                 case SORT_ROLE:
                 case Qt::DisplayRole:
-                    return QString::fromStdString(gameentry.creator_info().name());
+                    return QString::fromStdString(getGameHost(gameentry).name());
                 case Qt::DecorationRole: {
-                    return UserLevelPixmapGenerator::generateIcon(
-                        13, UserLevelFlags(gameentry.creator_info().user_level()),
-                        gameentry.creator_info().pawn_colors(), false,
-                        QString::fromStdString(gameentry.creator_info().privlevel()));
+                    const ServerInfo_User &host = getGameHost(gameentry);
+                    return UserLevelPixmapGenerator::generateIcon(13, UserLevelFlags(host.user_level()),
+                                                                  host.pawn_colors(), false,
+                                                                  QString::fromStdString(host.privlevel()));
                 }
                 default:
                     return QVariant();
@@ -130,8 +158,9 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
                 case Qt::DisplayRole: {
                     QStringList result;
                     GameTypeMap gameTypeMap = gameTypes.value(gameentry.room_id());
-                    for (int i = gameentry.game_types_size() - 1; i >= 0; --i)
+                    for (int i = gameentry.game_types_size() - 1; i >= 0; --i) {
                         result.append(gameTypeMap.value(gameentry.game_types(i)));
+                    }
                     return result.join(", ");
                 }
                 case Qt::TextAlignmentRole:
@@ -144,14 +173,18 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
                 case SORT_ROLE:
                 case Qt::DisplayRole: {
                     QStringList result;
-                    if (gameentry.with_password())
+                    if (gameentry.with_password()) {
                         result.append(tr("password"));
-                    if (gameentry.only_buddies())
+                    }
+                    if (gameentry.only_buddies()) {
                         result.append(tr("buddies only"));
-                    if (gameentry.only_registered())
+                    }
+                    if (gameentry.only_registered()) {
                         result.append(tr("reg. users only"));
-                    if (gameentry.share_decklists_on_load())
+                    }
+                    if (gameentry.share_decklists_on_load()) {
                         result.append(tr("open decklists"));
+                    }
                     return result.join(", ");
                 }
                 case Qt::DecorationRole: {
@@ -209,8 +242,9 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
 
 QVariant GamesModel::headerData(int section, Qt::Orientation /*orientation*/, int role) const
 {
-    if ((role != Qt::DisplayRole) && (role != Qt::TextAlignmentRole))
+    if ((role != Qt::DisplayRole) && (role != Qt::TextAlignmentRole)) {
         return QVariant();
+    }
     switch (section) {
         case ROOM:
             return tr("Room");
@@ -226,8 +260,8 @@ QVariant GamesModel::headerData(int section, Qt::Orientation /*orientation*/, in
         }
         case DESCRIPTION:
             return tr("Description");
-        case CREATOR:
-            return tr("Creator");
+        case HOST:
+            return tr("Host");
         case GAME_TYPE:
             return tr("Type");
         case RESTRICTIONS:
@@ -264,6 +298,9 @@ void GamesModel::updateGameList(const ServerInfo_Game &game)
                 gameList.removeAt(i);
                 endRemoveRows();
             } else {
+                // MergeFrom concatenates repeated fields instead of replacing them,
+                // so clear game_types first to avoid duplicated entries.
+                gameList[i].clear_game_types();
                 gameList[i].MergeFrom(game);
                 emit dataChanged(index(i, 0), index(i, NUM_COLS - 1));
             }
@@ -283,56 +320,26 @@ GamesProxyModel::GamesProxyModel(QObject *parent, const UserListProxy *_userList
     setDynamicSortFilter(true);
 }
 
-void GamesProxyModel::setGameFilters(bool _hideBuddiesOnlyGames,
-                                     bool _hideIgnoredUserGames,
-                                     bool _hideFullGames,
-                                     bool _hideGamesThatStarted,
-                                     bool _hidePasswordProtectedGames,
-                                     bool _hideNotBuddyCreatedGames,
-                                     bool _hideOpenDecklistGames,
-                                     const QString &_gameNameFilter,
-                                     const QStringList &_creatorNameFilters,
-                                     const QSet<int> &_gameTypeFilter,
-                                     int _maxPlayersFilterMin,
-                                     int _maxPlayersFilterMax,
-                                     const QTime &_maxGameAge,
-                                     bool _showOnlyIfSpectatorsCanWatch,
-                                     bool _showSpectatorPasswordProtected,
-                                     bool _showOnlyIfSpectatorsCanChat,
-                                     bool _showOnlyIfSpectatorsCanSeeHands)
+void GamesProxyModel::setGameFilters(const GameFilterConfigs &_filters)
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0))
     beginFilterChange();
 #endif
-    hideBuddiesOnlyGames = _hideBuddiesOnlyGames;
-    hideIgnoredUserGames = _hideIgnoredUserGames;
-    hideFullGames = _hideFullGames;
-    hideGamesThatStarted = _hideGamesThatStarted;
-    hidePasswordProtectedGames = _hidePasswordProtectedGames;
-    hideNotBuddyCreatedGames = _hideNotBuddyCreatedGames;
-    hideOpenDecklistGames = _hideOpenDecklistGames;
-    gameNameFilter = _gameNameFilter;
-    creatorNameFilters = _creatorNameFilters;
-    gameTypeFilter = _gameTypeFilter;
-    maxPlayersFilterMin = _maxPlayersFilterMin;
-    maxPlayersFilterMax = _maxPlayersFilterMax;
-    maxGameAge = _maxGameAge;
-    showOnlyIfSpectatorsCanWatch = _showOnlyIfSpectatorsCanWatch;
-    showSpectatorPasswordProtected = _showSpectatorPasswordProtected;
-    showOnlyIfSpectatorsCanChat = _showOnlyIfSpectatorsCanChat;
-    showOnlyIfSpectatorsCanSeeHands = _showOnlyIfSpectatorsCanSeeHands;
+    filters = _filters;
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
     endFilterChange(QSortFilterProxyModel::Direction::Rows);
 #else
     invalidateFilter();
 #endif
+    emit filtersChanged();
 }
 
 int GamesProxyModel::getNumFilteredGames() const
 {
     auto *model = qobject_cast<GamesModel *>(sourceModel());
-    if (!model)
+    if (!model) {
         return 0;
+    }
 
     int numFilteredGames = 0;
     for (int row = 0; row < model->rowCount(); ++row) {
@@ -345,18 +352,12 @@ int GamesProxyModel::getNumFilteredGames() const
 
 void GamesProxyModel::resetFilterParameters()
 {
-    setGameFilters(false, false, false, false, false, false, false, QString(), QStringList(), {},
-                   DEFAULT_MAX_PLAYERS_MIN, DEFAULT_MAX_PLAYERS_MAX, DEFAULT_MAX_GAME_AGE, false, false, false, false);
+    setGameFilters({});
 }
 
 bool GamesProxyModel::areFilterParametersSetToDefaults() const
 {
-    return !hideFullGames && !hideGamesThatStarted && !hidePasswordProtectedGames && !hideBuddiesOnlyGames &&
-           !hideOpenDecklistGames && !hideIgnoredUserGames && !hideNotBuddyCreatedGames && gameNameFilter.isEmpty() &&
-           creatorNameFilters.isEmpty() && gameTypeFilter.isEmpty() && maxPlayersFilterMin == DEFAULT_MAX_PLAYERS_MIN &&
-           maxPlayersFilterMax == DEFAULT_MAX_PLAYERS_MAX && maxGameAge == DEFAULT_MAX_GAME_AGE &&
-           !showOnlyIfSpectatorsCanWatch && !showSpectatorPasswordProtected && !showOnlyIfSpectatorsCanChat &&
-           !showOnlyIfSpectatorsCanSeeHands;
+    return filters.isDefault();
 }
 
 void GamesProxyModel::loadFilterParameters(const QMap<int, QString> &allGameTypes)
@@ -372,44 +373,44 @@ void GamesProxyModel::loadFilterParameters(const QMap<int, QString> &allGameType
         }
     }
 
-    setGameFilters(gameFilters.isHideBuddiesOnlyGames(), gameFilters.isHideIgnoredUserGames(),
-                   gameFilters.isHideFullGames(), gameFilters.isHideGamesThatStarted(),
-                   gameFilters.isHidePasswordProtectedGames(), gameFilters.isHideNotBuddyCreatedGames(),
-                   gameFilters.isHideOpenDecklistGames(), gameFilters.getGameNameFilter(),
-                   gameFilters.getCreatorNameFilters(), newGameTypeFilter, gameFilters.getMinPlayers(),
-                   gameFilters.getMaxPlayers(), gameFilters.getMaxGameAge(),
-                   gameFilters.isShowOnlyIfSpectatorsCanWatch(), gameFilters.isShowSpectatorPasswordProtected(),
-                   gameFilters.isShowOnlyIfSpectatorsCanChat(), gameFilters.isShowOnlyIfSpectatorsCanSeeHands());
+    setGameFilters({gameFilters.isHideBuddiesOnlyGames(), gameFilters.isHideIgnoredUserGames(),
+                    gameFilters.isHideFullGames(), gameFilters.isHideGamesThatStarted(),
+                    gameFilters.isHidePasswordProtectedGames(), gameFilters.isHideNotBuddyCreatedGames(),
+                    gameFilters.isHideOpenDecklistGames(), gameFilters.getGameNameFilter(),
+                    gameFilters.getHostNameFilters(), newGameTypeFilter, gameFilters.getMinPlayers(),
+                    gameFilters.getMaxPlayers(), gameFilters.getMaxGameAge(),
+                    gameFilters.isShowOnlyIfSpectatorsCanWatch(), gameFilters.isShowSpectatorPasswordProtected(),
+                    gameFilters.isShowOnlyIfSpectatorsCanChat(), gameFilters.isShowOnlyIfSpectatorsCanSeeHands()});
 }
 
 void GamesProxyModel::saveFilterParameters(const QMap<int, QString> &allGameTypes)
 {
     GameFiltersSettings &gameFilters = SettingsCache::instance().gameFilters();
-    gameFilters.setHideBuddiesOnlyGames(hideBuddiesOnlyGames);
-    gameFilters.setHideFullGames(hideFullGames);
-    gameFilters.setHideGamesThatStarted(hideGamesThatStarted);
-    gameFilters.setHidePasswordProtectedGames(hidePasswordProtectedGames);
-    gameFilters.setHideIgnoredUserGames(hideIgnoredUserGames);
-    gameFilters.setHideNotBuddyCreatedGames(hideNotBuddyCreatedGames);
-    gameFilters.setHideOpenDecklistGames(hideOpenDecklistGames);
-    gameFilters.setGameNameFilter(gameNameFilter);
-    gameFilters.setCreatorNameFilters(creatorNameFilters);
+    gameFilters.setHideBuddiesOnlyGames(filters.hideBuddiesOnlyGames);
+    gameFilters.setHideFullGames(filters.hideFullGames);
+    gameFilters.setHideGamesThatStarted(filters.hideGamesThatStarted);
+    gameFilters.setHidePasswordProtectedGames(filters.hidePasswordProtectedGames);
+    gameFilters.setHideIgnoredUserGames(filters.hideIgnoredUserGames);
+    gameFilters.setHideNotBuddyCreatedGames(filters.hideNotBuddyCreatedGames);
+    gameFilters.setHideOpenDecklistGames(filters.hideOpenDecklistGames);
+    gameFilters.setGameNameFilter(filters.gameNameFilter);
+    gameFilters.setHostNameFilters(filters.hostNameFilters);
 
     QMapIterator<int, QString> gameTypeIterator(allGameTypes);
     while (gameTypeIterator.hasNext()) {
         gameTypeIterator.next();
-        bool enabled = gameTypeFilter.contains(gameTypeIterator.key());
+        bool enabled = filters.gameTypeFilter.contains(gameTypeIterator.key());
         gameFilters.setGameTypeEnabled(gameTypeIterator.value(), enabled);
     }
 
-    gameFilters.setMinPlayers(maxPlayersFilterMin);
-    gameFilters.setMaxPlayers(maxPlayersFilterMax);
-    gameFilters.setMaxGameAge(maxGameAge);
+    gameFilters.setMinPlayers(filters.maxPlayersFilterMin);
+    gameFilters.setMaxPlayers(filters.maxPlayersFilterMax);
+    gameFilters.setMaxGameAge(filters.maxGameAge);
 
-    gameFilters.setShowOnlyIfSpectatorsCanWatch(showOnlyIfSpectatorsCanWatch);
-    gameFilters.setShowSpectatorPasswordProtected(showSpectatorPasswordProtected);
-    gameFilters.setShowOnlyIfSpectatorsCanChat(showOnlyIfSpectatorsCanChat);
-    gameFilters.setShowOnlyIfSpectatorsCanSeeHands(showOnlyIfSpectatorsCanSeeHands);
+    gameFilters.setShowOnlyIfSpectatorsCanWatch(filters.showOnlyIfSpectatorsCanWatch);
+    gameFilters.setShowSpectatorPasswordProtected(filters.showSpectatorPasswordProtected);
+    gameFilters.setShowOnlyIfSpectatorsCanChat(filters.showOnlyIfSpectatorsCanChat);
+    gameFilters.setShowOnlyIfSpectatorsCanSeeHands(filters.showOnlyIfSpectatorsCanSeeHands);
 }
 
 bool GamesProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex & /*sourceParent*/) const
@@ -421,45 +422,53 @@ bool GamesProxyModel::filterAcceptsRow(int sourceRow) const
 {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
     static const QDate epochDate = QDateTime::fromSecsSinceEpoch(0, QTimeZone::UTC).date();
-#elif (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
-    static const QDate epochDate = QDateTime::fromSecsSinceEpoch(0, Qt::UTC).date();
 #else
-    static const QDate epochDate = QDateTime::fromTime_t(0, Qt::UTC).date();
+    static const QDate epochDate = QDateTime::fromSecsSinceEpoch(0, Qt::UTC).date();
 #endif
     auto *model = qobject_cast<GamesModel *>(sourceModel());
-    if (!model)
+    if (!model) {
         return false;
+    }
 
     const ServerInfo_Game &game = model->getGame(sourceRow);
 
-    if (hideBuddiesOnlyGames && game.only_buddies()) {
+    if (filters.hideBuddiesOnlyGames && game.only_buddies()) {
         return false;
     }
-    if (hideOpenDecklistGames && game.share_decklists_on_load()) {
+    if (filters.hideOpenDecklistGames && game.share_decklists_on_load()) {
         return false;
     }
-    if (hideIgnoredUserGames && userListProxy->isUserIgnored(QString::fromStdString(game.creator_info().name()))) {
+    if (filters.hideIgnoredUserGames &&
+        userListProxy->isUserIgnored(QString::fromStdString(getGameHost(game).name()))) {
         return false;
     }
-    if (hideNotBuddyCreatedGames && !userListProxy->isUserBuddy(QString::fromStdString(game.creator_info().name()))) {
+    if (filters.hideNotBuddyCreatedGames &&
+        !userListProxy->isUserBuddy(QString::fromStdString(getGameHost(game).name()))) {
         return false;
     }
-    if (hideFullGames && game.player_count() == game.max_players())
+    if (filters.hideFullGames && game.player_count() == game.max_players()) {
         return false;
-    if (hideGamesThatStarted && game.started())
+    }
+    if (filters.hideGamesThatStarted && game.started()) {
         return false;
-    if (!userListProxy->isOwnUserRegistered())
-        if (game.only_registered())
+    }
+    if (!userListProxy->isOwnUserRegistered()) {
+        if (game.only_registered()) {
             return false;
-    if (hidePasswordProtectedGames && game.with_password())
+        }
+    }
+    if (filters.hidePasswordProtectedGames && game.with_password()) {
         return false;
-    if (!gameNameFilter.isEmpty())
-        if (!QString::fromStdString(game.description()).contains(gameNameFilter, Qt::CaseInsensitive))
+    }
+    if (!filters.gameNameFilter.isEmpty()) {
+        if (!QString::fromStdString(game.description()).contains(filters.gameNameFilter, Qt::CaseInsensitive)) {
             return false;
-    if (!creatorNameFilters.isEmpty()) {
+        }
+    }
+    if (!filters.hostNameFilters.isEmpty()) {
         bool found = false;
-        for (const auto &createNameFilter : creatorNameFilters) {
-            if (QString::fromStdString(game.creator_info().name()).contains(createNameFilter, Qt::CaseInsensitive)) {
+        for (const auto &hostNameFilter : filters.hostNameFilters) {
+            if (QString::fromStdString(getGameHost(game).name()).contains(hostNameFilter, Qt::CaseInsensitive)) {
                 found = true;
             }
         }
@@ -469,36 +478,45 @@ bool GamesProxyModel::filterAcceptsRow(int sourceRow) const
     }
 
     QSet<int> gameTypes;
-    for (int i = 0; i < game.game_types_size(); ++i)
+    for (int i = 0; i < game.game_types_size(); ++i) {
         gameTypes.insert(game.game_types(i));
-    if (!gameTypeFilter.isEmpty() && gameTypes.intersect(gameTypeFilter).isEmpty())
+    }
+    if (!filters.gameTypeFilter.isEmpty() && gameTypes.intersect(filters.gameTypeFilter).isEmpty()) {
         return false;
+    }
 
-    if (game.max_players() < maxPlayersFilterMin)
+    if (static_cast<int>(game.max_players()) < filters.maxPlayersFilterMin) {
         return false;
-    if (game.max_players() > maxPlayersFilterMax)
+    }
+    if (static_cast<int>(game.max_players()) > filters.maxPlayersFilterMax) {
         return false;
+    }
 
-    if (maxGameAge.isValid()) {
+    if (filters.maxGameAge.isValid()) {
         QDateTime now = QDateTime::currentDateTimeUtc();
         qint64 signed_start_time = game.start_time();      // cast to 64 bit value to allow signed value
         QDateTime total = now.addSecs(-signed_start_time); // a 32 bit value would wrap at 2038-1-19
         // games shouldn't have negative ages but we'll not filter them
         // because qtime wraps after a day we consider all games older than a day to be too old
-        if (total.isValid() && total.date() >= epochDate && (total.date() > epochDate || total.time() > maxGameAge)) {
+        if (total.isValid() && total.date() >= epochDate &&
+            (total.date() > epochDate || total.time() > filters.maxGameAge)) {
             return false;
         }
     }
 
-    if (showOnlyIfSpectatorsCanWatch) {
-        if (!game.spectators_allowed())
+    if (filters.showOnlyIfSpectatorsCanWatch) {
+        if (!game.spectators_allowed()) {
             return false;
-        if (!showSpectatorPasswordProtected && game.spectators_need_password())
+        }
+        if (!filters.showSpectatorPasswordProtected && game.spectators_need_password()) {
             return false;
-        if (showOnlyIfSpectatorsCanChat && !game.spectators_can_chat())
+        }
+        if (filters.showOnlyIfSpectatorsCanChat && !game.spectators_can_chat()) {
             return false;
-        if (showOnlyIfSpectatorsCanSeeHands && !game.spectators_omniscient())
+        }
+        if (filters.showOnlyIfSpectatorsCanSeeHands && !game.spectators_omniscient()) {
             return false;
+        }
     }
     return true;
 }
diff --git a/cockatrice/src/interface/widgets/server/games_model.h b/cockatrice/src/interface/widgets/server/games_model.h
index 56c806fb6..9bf54b83a 100644
--- a/cockatrice/src/interface/widgets/server/games_model.h
+++ b/cockatrice/src/interface/widgets/server/games_model.h
@@ -1,15 +1,21 @@
 #ifndef GAMESMODEL_H
 #define GAMESMODEL_H
 
+#include "game_filter_configs.h"
 #include "game_type_map.h"
 
+#include <QAbstractTableModel>
 #include <QList>
-#include <QSet>
+#include <QMap>
+#include <QModelIndex>
 #include <QSortFilterProxyModel>
-#include <QTime>
+#include <QString>
 #include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
 class UserListProxy;
+class QObject;
 
 /**
  * @class GamesModel
@@ -121,22 +127,10 @@ private:
     // - loadFilterParameters()
     // - saveFilterParameters()
     // - filterAcceptsRow()
-    bool hideBuddiesOnlyGames;
-    bool hideIgnoredUserGames;
-    bool hideFullGames;
-    bool hideGamesThatStarted;
-    bool hidePasswordProtectedGames;
-    bool hideNotBuddyCreatedGames;
-    bool hideOpenDecklistGames;
-    QString gameNameFilter;
-    QStringList creatorNameFilters;
-    QSet<int> gameTypeFilter;
-    quint32 maxPlayersFilterMin, maxPlayersFilterMax;
-    QTime maxGameAge;
-    bool showOnlyIfSpectatorsCanWatch;
-    bool showSpectatorPasswordProtected;
-    bool showOnlyIfSpectatorsCanChat;
-    bool showOnlyIfSpectatorsCanSeeHands;
+    GameFilterConfigs filters;
+
+signals:
+    void filtersChanged();
 
 public:
     /**
@@ -147,182 +141,15 @@ public:
     explicit GamesProxyModel(QObject *parent = nullptr, const UserListProxy *_userListProxy = nullptr);
 
     // Getters for filter parameters
-    [[nodiscard]] bool getHideBuddiesOnlyGames() const
+    [[nodiscard]] const GameFilterConfigs &getFilters() const
     {
-        return hideBuddiesOnlyGames;
-    }
-    [[nodiscard]] bool getHideIgnoredUserGames() const
-    {
-        return hideIgnoredUserGames;
-    }
-    [[nodiscard]] bool getHideFullGames() const
-    {
-        return hideFullGames;
-    }
-    [[nodiscard]] bool getHideGamesThatStarted() const
-    {
-        return hideGamesThatStarted;
-    }
-    [[nodiscard]] bool getHidePasswordProtectedGames() const
-    {
-        return hidePasswordProtectedGames;
-    }
-    [[nodiscard]] bool getHideNotBuddyCreatedGames() const
-    {
-        return hideNotBuddyCreatedGames;
-    }
-    [[nodiscard]] bool getHideOpenDecklistGames() const
-    {
-        return hideOpenDecklistGames;
-    }
-    [[nodiscard]] QString getGameNameFilter() const
-    {
-        return gameNameFilter;
-    }
-    [[nodiscard]] QStringList getCreatorNameFilters() const
-    {
-        return creatorNameFilters;
-    }
-    [[nodiscard]] QSet<int> getGameTypeFilter() const
-    {
-        return gameTypeFilter;
-    }
-    [[nodiscard]] int getMaxPlayersFilterMin() const
-    {
-        return maxPlayersFilterMin;
-    }
-    [[nodiscard]] int getMaxPlayersFilterMax() const
-    {
-        return maxPlayersFilterMax;
-    }
-    [[nodiscard]] const QTime &getMaxGameAge() const
-    {
-        return maxGameAge;
-    }
-    [[nodiscard]] bool getShowOnlyIfSpectatorsCanWatch() const
-    {
-        return showOnlyIfSpectatorsCanWatch;
-    }
-    [[nodiscard]] bool getShowSpectatorPasswordProtected() const
-    {
-        return showSpectatorPasswordProtected;
-    }
-    [[nodiscard]] bool getShowOnlyIfSpectatorsCanChat() const
-    {
-        return showOnlyIfSpectatorsCanChat;
-    }
-    [[nodiscard]] bool getShowOnlyIfSpectatorsCanSeeHands() const
-    {
-        return showOnlyIfSpectatorsCanSeeHands;
+        return filters;
     }
 
     /**
      * @brief Sets all game filters at once.
      */
-    void setGameFilters(bool _hideBuddiesOnlyGames,
-                        bool _hideIgnoredUserGames,
-                        bool _hideFullGames,
-                        bool _hideGamesThatStarted,
-                        bool _hidePasswordProtectedGames,
-                        bool _hideNotBuddyCreatedGames,
-                        bool _hideOpenDecklistGames,
-                        const QString &_gameNameFilter,
-                        const QStringList &_creatorNameFilter,
-                        const QSet<int> &_gameTypeFilter,
-                        int _maxPlayersFilterMin,
-                        int _maxPlayersFilterMax,
-                        const QTime &_maxGameAge,
-                        bool _showOnlyIfSpectatorsCanWatch,
-                        bool _showSpectatorPasswordProtected,
-                        bool _showOnlyIfSpectatorsCanChat,
-                        bool _showOnlyIfSpectatorsCanSeeHands);
-
-    // Individual setters
-    void setHideBuddiesOnlyGames(bool value)
-    {
-        hideBuddiesOnlyGames = value;
-        refresh();
-    }
-    void setHideIgnoredUserGames(bool value)
-    {
-        hideIgnoredUserGames = value;
-        refresh();
-    }
-    void setHideFullGames(bool value)
-    {
-        hideFullGames = value;
-        refresh();
-    }
-    void setHideGamesThatStarted(bool value)
-    {
-        hideGamesThatStarted = value;
-        refresh();
-    }
-    void setHidePasswordProtectedGames(bool value)
-    {
-        hidePasswordProtectedGames = value;
-        refresh();
-    }
-    void setHideNotBuddyCreatedGames(bool value)
-    {
-        hideNotBuddyCreatedGames = value;
-        refresh();
-    }
-    void setHideOpenDecklistGames(bool value)
-    {
-        hideOpenDecklistGames = value;
-        refresh();
-    }
-    void setGameNameFilter(const QString &value)
-    {
-        gameNameFilter = value;
-        refresh();
-    }
-    void setCreatorNameFilters(const QStringList &values)
-    {
-        creatorNameFilters = values;
-        refresh();
-    }
-    void setGameTypeFilter(const QSet<int> &value)
-    {
-        gameTypeFilter = value;
-        refresh();
-    }
-    void setMaxPlayersFilterMin(int value)
-    {
-        maxPlayersFilterMin = value;
-        refresh();
-    }
-    void setMaxPlayersFilterMax(int value)
-    {
-        maxPlayersFilterMax = value;
-        refresh();
-    }
-    void setMaxGameAge(const QTime &value)
-    {
-        maxGameAge = value;
-        refresh();
-    }
-    void setShowOnlyIfSpectatorsCanWatch(bool value)
-    {
-        showOnlyIfSpectatorsCanWatch = value;
-        refresh();
-    }
-    void setShowSpectatorPasswordProtected(bool value)
-    {
-        showSpectatorPasswordProtected = value;
-        refresh();
-    }
-    void setShowOnlyIfSpectatorsCanChat(bool value)
-    {
-        showOnlyIfSpectatorsCanChat = value;
-        refresh();
-    }
-    void setShowOnlyIfSpectatorsCanSeeHands(bool value)
-    {
-        showOnlyIfSpectatorsCanSeeHands = value;
-        refresh();
-    }
+    void setGameFilters(const GameFilterConfigs &_filters);
 
     /**
      * @brief Returns the number of games filtered out by the current filter.
diff --git a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
index f37c957a4..08b7837dd 100644
--- a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
+++ b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp
@@ -2,9 +2,19 @@
 
 #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"
 
@@ -37,13 +47,11 @@ void HandlePublicServers::actFinishParsingDownloadedData()
             QVariantMap jsonMap = jsonResponse.toVariant().toMap();
             updateServerINISettings(jsonMap);
         } else {
-            qDebug() << "[PUBLIC SERVER HANDLER]"
-                     << "JSON Parsing Error:" << parseError.errorString();
+            qDebug() << "[PUBLIC SERVER HANDLER]" << "JSON Parsing Error:" << parseError.errorString();
             emit sigPublicServersDownloadedUnsuccessfully(errorCode);
         }
     } else {
-        qDebug() << "[PUBLIC SERVER HANDLER]"
-                 << "Error Downloading Public Servers" << errorCode;
+        qDebug() << "[PUBLIC SERVER HANDLER]" << "Error Downloading Public Servers" << errorCode;
         emit sigPublicServersDownloadedUnsuccessfully(errorCode);
     }
 
diff --git a/cockatrice/src/interface/widgets/server/handle_public_servers.h b/cockatrice/src/interface/widgets/server/handle_public_servers.h
index f06bb3ff6..bacc7d3bf 100644
--- a/cockatrice/src/interface/widgets/server/handle_public_servers.h
+++ b/cockatrice/src/interface/widgets/server/handle_public_servers.h
@@ -1,16 +1,25 @@
 /**
  * @file handle_public_servers.h
  * @ingroup Server
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_HANDLE_PUBLIC_SERVERS_H
 #define COCKATRICE_HANDLE_PUBLIC_SERVERS_H
 
 #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 6ca680c3f..74e403ea8 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,14 +1,23 @@
 #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)
@@ -22,8 +31,9 @@ RemoteDeckList_TreeModel::DirectoryNode::~DirectoryNode()
 
 void RemoteDeckList_TreeModel::DirectoryNode::clearTree()
 {
-    for (int i = 0; i < size(); ++i)
+    for (int i = 0; i < size(); ++i) {
         delete at(i);
+    }
     clear();
 }
 
@@ -31,31 +41,37 @@ QString RemoteDeckList_TreeModel::DirectoryNode::getPath() const
 {
     if (parent) {
         QString parentPath = parent->getPath();
-        if (parentPath.isEmpty())
+        if (parentPath.isEmpty()) {
             return name;
-        else
+        } else {
             return parentPath + "/" + name;
-    } else
+        }
+    } else {
         return name;
+    }
 }
 
 RemoteDeckList_TreeModel::DirectoryNode *RemoteDeckList_TreeModel::DirectoryNode::getNodeByPath(QStringList path)
 {
     QString pathItem;
     if (parent) {
-        if (path.isEmpty())
+        if (path.isEmpty()) {
             return this;
+        }
         pathItem = path.takeFirst();
-        if (pathItem.isEmpty() && name.isEmpty())
+        if (pathItem.isEmpty() && name.isEmpty()) {
             return this;
+        }
     }
 
     for (int i = 0; i < size(); ++i) {
         DirectoryNode *node = dynamic_cast<DirectoryNode *>(at(i));
-        if (!node)
+        if (!node) {
             continue;
-        if (node->getName() == pathItem)
+        }
+        if (node->getName() == pathItem) {
             return node->getNodeByPath(path);
+        }
     }
     return 0;
 }
@@ -66,12 +82,14 @@ RemoteDeckList_TreeModel::FileNode *RemoteDeckList_TreeModel::DirectoryNode::get
         DirectoryNode *node = dynamic_cast<DirectoryNode *>(at(i));
         if (node) {
             FileNode *result = node->getNodeById(id);
-            if (result)
+            if (result) {
                 return result;
+            }
         } else {
             FileNode *file = dynamic_cast<FileNode *>(at(i));
-            if (file->getId() == id)
+            if (file->getId() == id) {
                 return file;
+            }
         }
     }
     return 0;
@@ -95,23 +113,26 @@ RemoteDeckList_TreeModel::~RemoteDeckList_TreeModel()
 int RemoteDeckList_TreeModel::rowCount(const QModelIndex &parent) const
 {
     DirectoryNode *node = getNode<DirectoryNode *>(parent);
-    if (node)
+    if (node) {
         return node->size();
-    else
+    } else {
         return 0;
+    }
 }
 
 int RemoteDeckList_TreeModel::columnCount(const QModelIndex & /*parent*/) const
 {
-    return 3;
+    return 4;
 }
 
 QVariant RemoteDeckList_TreeModel::data(const QModelIndex &index, int role) const
 {
-    if (!index.isValid())
+    if (!index.isValid()) {
         return QVariant();
-    if (index.column() >= 3)
+    }
+    if (index.column() >= 4) {
         return QVariant();
+    }
 
     Node *temp = static_cast<Node *>(index.internalPointer());
     FileNode *file = dynamic_cast<FileNode *>(temp);
@@ -122,12 +143,29 @@ QVariant RemoteDeckList_TreeModel::data(const QModelIndex &index, int role) cons
                 switch (index.column()) {
                     case 0:
                         return node->getName();
+                    case 3:
+                        // Report the node's own bit, not the inherited effective
+                        // state, so it stays in step with what publishing toggles.
+                        if (node->isPublic()) {
+                            return tr("Public");
+                        }
+                        return isEffectivelyPublic(node) ? tr("Public (inherited)") : tr("Private");
                     default:
                         return QVariant();
                 }
             }
             case Qt::DecorationRole:
                 return index.column() == 0 ? dirIcon : QVariant();
+            case Qt::ToolTipRole:
+                if (index.column() == 3) {
+                    if (node->isPublic()) {
+                        return tr("This folder is visible to other users");
+                    }
+                    return isEffectivelyPublic(node)
+                               ? tr("This folder is private, but a parent folder is public (inherited).")
+                               : tr("This folder is only visible to you");
+                }
+                return QVariant();
             default:
                 return QVariant();
         }
@@ -141,6 +179,13 @@ QVariant RemoteDeckList_TreeModel::data(const QModelIndex &index, int role) cons
                         return file->getId();
                     case 2:
                         return file->getUploadTime();
+                    case 3:
+                        // Report the node's own bit, not the inherited effective
+                        // state, so it stays in step with what publishing toggles.
+                        if (file->isPublic()) {
+                            return tr("Public");
+                        }
+                        return isEffectivelyPublic(file) ? tr("Public (inherited)") : tr("Private");
                     default:
                         return QVariant();
                 }
@@ -149,6 +194,16 @@ QVariant RemoteDeckList_TreeModel::data(const QModelIndex &index, int role) cons
                 return index.column() == 0 ? fileIcon : QVariant();
             case Qt::TextAlignmentRole:
                 return index.column() == 1 ? Qt::AlignRight : Qt::AlignLeft;
+            case Qt::ToolTipRole:
+                if (index.column() == 3) {
+                    if (file->isPublic()) {
+                        return tr("This deck is visible to other users");
+                    }
+                    return isEffectivelyPublic(file)
+                               ? tr("This deck is private, but a parent folder is public (inherited).")
+                               : tr("This deck is only visible to you");
+                }
+                return QVariant();
             default:
                 return QVariant();
         }
@@ -157,8 +212,9 @@ QVariant RemoteDeckList_TreeModel::data(const QModelIndex &index, int role) cons
 
 QVariant RemoteDeckList_TreeModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
-    if (orientation != Qt::Horizontal)
+    if (orientation != Qt::Horizontal) {
         return QVariant();
+    }
     switch (role) {
         case Qt::TextAlignmentRole:
             return section == 1 ? Qt::AlignRight : Qt::AlignLeft;
@@ -170,6 +226,8 @@ QVariant RemoteDeckList_TreeModel::headerData(int section, Qt::Orientation orien
                     return tr("ID");
                 case 2:
                     return tr("Upload time");
+                case 3:
+                    return tr("Visibility");
                 default:
                     return QVariant();
             }
@@ -181,20 +239,23 @@ QVariant RemoteDeckList_TreeModel::headerData(int section, Qt::Orientation orien
 
 QModelIndex RemoteDeckList_TreeModel::index(int row, int column, const QModelIndex &parent) const
 {
-    if (!hasIndex(row, column, parent))
+    if (!hasIndex(row, column, parent)) {
         return QModelIndex();
+    }
 
     DirectoryNode *parentNode = getNode<DirectoryNode *>(parent);
-    if (row >= parentNode->size())
+    if (row >= parentNode->size()) {
         return QModelIndex();
+    }
 
     return createIndex(row, column, parentNode->at(row));
 }
 
 QModelIndex RemoteDeckList_TreeModel::parent(const QModelIndex &ind) const
 {
-    if (!ind.isValid())
+    if (!ind.isValid()) {
         return QModelIndex();
+    }
 
     return nodeToIndex(static_cast<Node *>(ind.internalPointer())->getParent());
 }
@@ -210,8 +271,9 @@ Qt::ItemFlags RemoteDeckList_TreeModel::flags(const QModelIndex &index) const
 
 QModelIndex RemoteDeckList_TreeModel::nodeToIndex(Node *node) const
 {
-    if (node == nullptr || node == root)
+    if (node == nullptr || node == root) {
         return QModelIndex();
+    }
     return createIndex(node->getParent()->indexOf(node), 0, node);
 }
 
@@ -222,21 +284,23 @@ void RemoteDeckList_TreeModel::addFileToTree(const ServerInfo_DeckStorage_TreeIt
     time.setSecsSinceEpoch(fileInfo.creation_time());
 
     beginInsertRows(nodeToIndex(parent), parent->size(), parent->size());
-    parent->append(new FileNode(QString::fromStdString(file.name()), file.id(), time, parent));
+    parent->append(new FileNode(QString::fromStdString(file.name()), file.id(), time, parent, fileInfo.is_public()));
     endInsertRows();
 }
 
 void RemoteDeckList_TreeModel::addFolderToTree(const ServerInfo_DeckStorage_TreeItem &folder, DirectoryNode *parent)
 {
     DirectoryNode *newItem = addNamedFolderToTree(QString::fromStdString(folder.name()), parent);
+    newItem->setIsPublic(folder.folder().is_public());
     const ServerInfo_DeckStorage_Folder &folderInfo = folder.folder();
     const int folderItemsSize = folderInfo.items_size();
     for (int i = 0; i < folderItemsSize; ++i) {
         const ServerInfo_DeckStorage_TreeItem &subItem = folderInfo.items(i);
-        if (subItem.has_folder())
+        if (subItem.has_folder()) {
             addFolderToTree(subItem, newItem);
-        else
+        } else {
             addFileToTree(subItem, newItem);
+        }
     }
 }
 
@@ -267,6 +331,21 @@ void RemoteDeckList_TreeModel::refreshTree()
     client->sendCommand(pend);
 }
 
+bool RemoteDeckList_TreeModel::isEffectivelyPublic(const Node *node) const
+{
+    if (node == nullptr || node == root) {
+        return false;
+    }
+    const Node *current = node;
+    while (current != nullptr) {
+        if (current->isPublic()) {
+            return true;
+        }
+        current = current->getParent();
+    }
+    return false;
+}
+
 void RemoteDeckList_TreeModel::clearTree()
 {
     beginResetModel();
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 8254eb57b..d553ffe9e 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
@@ -2,19 +2,29 @@
  * @file remote_decklist_tree_widget.h
  * @ingroup NetworkingWidgets
  * @ingroup DeckStorageWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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
 {
@@ -22,14 +32,17 @@ class RemoteDeckList_TreeModel : public QAbstractItemModel
 public:
     class DirectoryNode;
     class FileNode;
+
     class Node
     {
     protected:
         DirectoryNode *parent;
         QString name;
+        bool publicFlag;
 
     public:
-        explicit Node(const QString &_name, DirectoryNode *_parent = nullptr) : parent(_parent), name(_name)
+        explicit Node(const QString &_name, DirectoryNode *_parent = nullptr)
+            : parent(_parent), name(_name), publicFlag(false)
         {
         }
         virtual ~Node() = default;
@@ -41,6 +54,14 @@ public:
         {
             return name;
         }
+        [[nodiscard]] bool isPublic() const
+        {
+            return publicFlag;
+        }
+        void setIsPublic(bool _public)
+        {
+            publicFlag = _public;
+        }
     };
     class DirectoryNode : public Node, public QList<Node *>
     {
@@ -59,9 +80,14 @@ public:
         QDateTime uploadTime;
 
     public:
-        FileNode(const QString &_name, int _id, const QDateTime &_uploadTime, DirectoryNode *_parent = nullptr)
+        FileNode(const QString &_name,
+                 int _id,
+                 const QDateTime &_uploadTime,
+                 DirectoryNode *_parent = nullptr,
+                 bool _isPublic = false)
             : Node(_name, _parent), id(_id), uploadTime(_uploadTime)
         {
+            setIsPublic(_isPublic);
         }
         [[nodiscard]] int getId() const
         {
@@ -75,8 +101,9 @@ public:
 
     template <typename T> [[nodiscard]] T getNode(const QModelIndex &index) const
     {
-        if (!index.isValid())
+        if (!index.isValid()) {
             return dynamic_cast<T>(root);
+        }
         return dynamic_cast<T>(static_cast<Node *>(index.internalPointer()));
     }
 
@@ -108,6 +135,11 @@ public:
     {
         return root;
     }
+    /**
+     * @brief Whether a node is visible to other users (own flag or inherited
+     * from any ancestor folder).
+     */
+    [[nodiscard]] bool isEffectivelyPublic(const Node *node) const;
     void addFileToTree(const ServerInfo_DeckStorage_TreeItem &file, DirectoryNode *parent);
     void addFolderToTree(const ServerInfo_DeckStorage_TreeItem &folder, DirectoryNode *parent);
     DirectoryNode *addNamedFolderToTree(const QString &name, DirectoryNode *parent);
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 5152880d9..c131c3cbf 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,42 @@
 #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)
     : RemoteReplayList_TreeModel::Node(QString::fromStdString(_matchInfo.game_name())), matchInfo(_matchInfo)
 {
-    for (int i = 0; i < matchInfo.replay_list_size(); ++i)
+    for (int i = 0; i < matchInfo.replay_list_size(); ++i) {
         append(new ReplayNode(matchInfo.replay_list(i), this));
+    }
 }
 
 RemoteReplayList_TreeModel::MatchNode::~MatchNode()
 {
-    for (int i = 0; i < size(); ++i)
+    for (int i = 0; i < size(); ++i) {
         delete at(i);
+    }
 }
 
 void RemoteReplayList_TreeModel::MatchNode::updateMatchInfo(const ServerInfo_ReplayMatch &_matchInfo)
@@ -35,7 +50,7 @@ RemoteReplayList_TreeModel::RemoteReplayList_TreeModel(AbstractClient *_client,
     QFileIconProvider fip;
     dirIcon = fip.icon(QFileIconProvider::Folder);
     fileIcon = fip.icon(QFileIconProvider::File);
-    lockIcon = QPixmap("theme:icons/lock");
+    lockIcon = themePixmap(QStringLiteral("icons/lock"));
 }
 
 RemoteReplayList_TreeModel::~RemoteReplayList_TreeModel()
@@ -45,22 +60,26 @@ RemoteReplayList_TreeModel::~RemoteReplayList_TreeModel()
 
 int RemoteReplayList_TreeModel::rowCount(const QModelIndex &parent) const
 {
-    if (!parent.isValid())
+    if (!parent.isValid()) {
         return replayMatches.size();
+    }
 
     auto *matchNode = dynamic_cast<MatchNode *>(static_cast<Node *>(parent.internalPointer()));
-    if (matchNode)
+    if (matchNode) {
         return matchNode->size();
-    else
+    } else {
         return 0;
+    }
 }
 
 QVariant RemoteReplayList_TreeModel::data(const QModelIndex &index, int role) const
 {
-    if (!index.isValid())
+    if (!index.isValid()) {
         return QVariant();
-    if (index.column() >= numberOfColumns)
+    }
+    if (index.column() >= numberOfColumns) {
         return QVariant();
+    }
 
     auto *replayNode = dynamic_cast<ReplayNode *>(static_cast<Node *>(index.internalPointer()));
     if (replayNode) {
@@ -103,8 +122,9 @@ QVariant RemoteReplayList_TreeModel::data(const QModelIndex &index, int role) co
                         return QString::fromStdString(matchInfo.game_name());
                     case 2: {
                         QStringList playerList;
-                        for (int i = 0; i < matchInfo.player_names_size(); ++i)
+                        for (int i = 0; i < matchInfo.player_names_size(); ++i) {
                             playerList.append(QString::fromStdString(matchInfo.player_names(i)));
+                        }
                         return playerList.join(", ");
                     }
                     case 4:
@@ -131,8 +151,9 @@ QVariant RemoteReplayList_TreeModel::data(const QModelIndex &index, int role) co
 
 QVariant RemoteReplayList_TreeModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
-    if (orientation != Qt::Horizontal)
+    if (orientation != Qt::Horizontal) {
         return QVariant();
+    }
     switch (role) {
         case Qt::TextAlignmentRole:
             switch (section) {
@@ -167,17 +188,20 @@ QVariant RemoteReplayList_TreeModel::headerData(int section, Qt::Orientation ori
 
 QModelIndex RemoteReplayList_TreeModel::index(int row, int column, const QModelIndex &parent) const
 {
-    if (!hasIndex(row, column, parent))
+    if (!hasIndex(row, column, parent)) {
         return QModelIndex();
+    }
 
     auto *matchNode = dynamic_cast<MatchNode *>(static_cast<Node *>(parent.internalPointer()));
     if (matchNode) {
-        if (row >= matchNode->size())
+        if (row >= matchNode->size()) {
             return QModelIndex();
+        }
         return createIndex(row, column, (void *)matchNode->at(row));
     } else {
-        if (row >= replayMatches.size())
+        if (row >= replayMatches.size()) {
             return QModelIndex();
+        }
         return createIndex(row, column, (void *)replayMatches[row]);
     }
 }
@@ -185,9 +209,9 @@ QModelIndex RemoteReplayList_TreeModel::index(int row, int column, const QModelI
 QModelIndex RemoteReplayList_TreeModel::parent(const QModelIndex &ind) const
 {
     MatchNode const *matchNode = dynamic_cast<MatchNode *>(static_cast<Node *>(ind.internalPointer()));
-    if (matchNode)
+    if (matchNode) {
         return QModelIndex();
-    else {
+    } else {
         auto *replayNode = dynamic_cast<ReplayNode *>(static_cast<Node *>(ind.internalPointer()));
         return createIndex(replayNode->getParent()->indexOf(replayNode), 0, replayNode->getParent());
     }
@@ -195,45 +219,52 @@ QModelIndex RemoteReplayList_TreeModel::parent(const QModelIndex &ind) const
 
 Qt::ItemFlags RemoteReplayList_TreeModel::flags(const QModelIndex &index) const
 {
-    if (!index.isValid())
+    if (!index.isValid()) {
         return Qt::NoItemFlags;
+    }
 
     return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
 }
 
 ServerInfo_Replay const *RemoteReplayList_TreeModel::getReplay(const QModelIndex &index) const
 {
-    if (!index.isValid())
+    if (!index.isValid()) {
         return 0;
+    }
 
     auto *node = dynamic_cast<ReplayNode *>(static_cast<Node *>(index.internalPointer()));
-    if (!node)
+    if (!node) {
         return 0;
+    }
     return &node->getReplayInfo();
 }
 
 ServerInfo_ReplayMatch const *RemoteReplayList_TreeModel::getReplayMatch(const QModelIndex &index) const
 {
-    if (!index.isValid())
+    if (!index.isValid()) {
         return nullptr;
+    }
 
     auto *node = dynamic_cast<MatchNode *>(static_cast<Node *>(index.internalPointer()));
-    if (!node)
+    if (!node) {
         return nullptr;
+    }
 
     return &node->getMatchInfo();
 }
 
 ServerInfo_ReplayMatch const *RemoteReplayList_TreeModel::getEnclosingReplayMatch(const QModelIndex &index) const
 {
-    if (!index.isValid())
+    if (!index.isValid()) {
         return nullptr;
+    }
 
     auto *node = dynamic_cast<MatchNode *>(static_cast<Node *>(index.internalPointer()));
     if (!node) {
         auto *_node = dynamic_cast<ReplayNode *>(static_cast<Node *>(index.internalPointer()));
-        if (!_node)
+        if (!_node) {
             return nullptr;
+        }
         return &_node->getParent()->getMatchInfo();
     }
     return &node->getMatchInfo();
@@ -244,8 +275,9 @@ ServerInfo_ReplayMatch const *RemoteReplayList_TreeModel::getEnclosingReplayMatc
  */
 void RemoteReplayList_TreeModel::clearAll()
 {
-    for (int i = 0; i < replayMatches.size(); ++i)
+    for (int i = 0; i < replayMatches.size(); ++i) {
         delete replayMatches[i];
+    }
     replayMatches.clear();
 }
 
@@ -275,24 +307,26 @@ void RemoteReplayList_TreeModel::addMatchInfo(const ServerInfo_ReplayMatch &matc
 
 void RemoteReplayList_TreeModel::updateMatchInfo(int gameId, const ServerInfo_ReplayMatch &matchInfo)
 {
-    for (int i = 0; i < replayMatches.size(); ++i)
+    for (int i = 0; i < replayMatches.size(); ++i) {
         if (replayMatches[i]->getMatchInfo().game_id() == gameId) {
             replayMatches[i]->updateMatchInfo(matchInfo);
             emit dataChanged(createIndex(i, 0, (void *)replayMatches[i]),
                              createIndex(i, numberOfColumns - 1, (void *)replayMatches[i]));
             break;
         }
+    }
 }
 
 void RemoteReplayList_TreeModel::removeMatchInfo(int gameId)
 {
-    for (int i = 0; i < replayMatches.size(); ++i)
+    for (int i = 0; i < replayMatches.size(); ++i) {
         if (replayMatches[i]->getMatchInfo().game_id() == gameId) {
             beginRemoveRows(QModelIndex(), i, i);
             replayMatches.removeAt(i);
             endRemoveRows();
             break;
         }
+    }
 }
 
 void RemoteReplayList_TreeModel::replayListFinished(const Response &r)
@@ -302,8 +336,9 @@ void RemoteReplayList_TreeModel::replayListFinished(const Response &r)
     beginResetModel();
     clearAll();
 
-    for (int i = 0; i < resp.match_list_size(); ++i)
+    for (int i = 0; i < resp.match_list_size(); ++i) {
         replayMatches.append(new MatchNode(resp.match_list(i)));
+    }
 
     endResetModel();
     emit treeRefreshed();
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 6d81aefca..e99702e60 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
@@ -3,27 +3,36 @@
  * @ingroup DeckStorageWidgets
  * @ingroup Replays
  * @ingroup NetworkingWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef REMOTEREPLAYLIST_TREEWIDGET_H
 #define REMOTEREPLAYLIST_TREEWIDGET_H
 
-#include <QDateTime>
+#include <QAbstractItemModel>
+#include <QIcon>
+#include <QList>
+#include <QModelIndex>
+#include <QSet>
+#include <QString>
 #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
new file mode 100644
index 000000000..cb5f84eef
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_avatar_provider.cpp
@@ -0,0 +1,55 @@
+#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)
+{
+}
+
+const QMap<QString, QPixmap> &UserAvatarProvider::cache() const
+{
+    return avatarCache;
+}
+
+void UserAvatarProvider::requestAvatar(const QString &userName)
+{
+    if (avatarCache.contains(userName) || pending.contains(userName)) {
+        return;
+    }
+
+    pending.insert(userName);
+
+    Command_GetUserInfo cmd;
+    cmd.set_user_name(userName.toStdString());
+
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+
+    connect(pend, &PendingCommand::finished, this, [this, userName](const Response &r) {
+        pending.remove(userName);
+
+        const auto &response = r.GetExtension(Response_GetUserInfo::ext);
+        const auto &user = response.user_info();
+        const std::string &bmp = user.avatar_bmp();
+
+        QPixmap avatar;
+        if (!bmp.empty() &&
+            avatar.loadFromData(reinterpret_cast<const uchar *>(bmp.data()), static_cast<uint>(bmp.size()))) {
+            avatarCache.insert(userName, avatar);
+        } else {
+            avatarCache.insert(userName, QPixmap());
+        }
+
+        emit avatarUpdated(userName);
+    });
+
+    client->sendCommand(pend);
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/server/user/user_avatar_provider.h b/cockatrice/src/interface/widgets/server/user/user_avatar_provider.h
new file mode 100644
index 000000000..c1e75bc1c
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_avatar_provider.h
@@ -0,0 +1,32 @@
+#ifndef COCKATRICE_USER_AVATAR_PROVIDER_H
+#define COCKATRICE_USER_AVATAR_PROVIDER_H
+
+#include <QMap>
+#include <QObject>
+#include <QPixmap>
+#include <QSet>
+#include <QString>
+#include <qtmetamacros.h>
+
+class AbstractClient;
+
+class UserAvatarProvider : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit UserAvatarProvider(AbstractClient *client, QObject *parent = nullptr);
+
+    void requestAvatar(const QString &userName);
+    const QMap<QString, QPixmap> &cache() const;
+
+signals:
+    void avatarUpdated(const QString &userName);
+
+private:
+    AbstractClient *client;
+    QMap<QString, QPixmap> avatarCache;
+    QSet<QString> pending;
+};
+
+#endif // COCKATRICE_USER_AVATAR_PROVIDER_H
\ No newline at end of file
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
new file mode 100644
index 000000000..d84bd5804
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp
@@ -0,0 +1,175 @@
+#include "user_card_art_provider.h"
+
+#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)
+{
+    return user + u'|' + card + u'|' + providerId;
+}
+
+UserCardArtProvider::UserCardArtProvider(QObject *parent) : QObject(parent)
+{
+    dbReady = (CardDatabaseManager::getInstance()->getLoadStatus() == LoadStatus::Ok);
+
+    if (!dbReady) {
+        connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this,
+                &UserCardArtProvider::onDatabaseReady);
+    }
+}
+
+void UserCardArtProvider::onDatabaseReady()
+{
+    dbReady = true;
+    processQueue();
+}
+
+const QMap<QString, QPixmap> &UserCardArtProvider::cache() const
+{
+    return cardArtCache;
+}
+
+void UserCardArtProvider::requestCardArt(const QString &userName, const QString &cardName, const QString &providerId)
+{
+    if (cardName.isEmpty()) {
+        return;
+    }
+
+    const QString key = makeKey(userName, cardName, providerId);
+
+    if (pending.contains(key)) {
+        return;
+    }
+    if (cardArtCache.contains(key) && !cardArtCache.value(key).isNull()) {
+        return;
+    }
+
+    pending.insert(key);
+    queue.enqueue(key);
+
+    processQueue();
+}
+
+QPixmap UserCardArtProvider::cropCardArt(const QPixmap &fullRes, const ExactCard &card)
+{
+    QPixmap source = fullRes;
+
+    // Sideways-layout cards (plane, siege/battle, split) store their landscape
+    // artwork rotated 90° inside a portrait frame. Rotate it upright first so
+    // the crop below lands on the horizontal art, mirroring the way
+    // CardInfoPictureWidget displays these cards.
+    const bool landscape = card.getInfo().getUiAttributes().landscapeOrientation;
+    source = CardArtUtils::rotateSidewaysLayoutArt(source, card);
+
+    const QSize sz = source.size();
+    const int marginX = sz.width() * 0.07;
+    const int topMargin = landscape ? sz.height() * 0.05 : sz.height() * 0.11;
+    const int bottomMargin = landscape ? sz.height() * 0.42 : sz.height() * 0.45;
+
+    const QRect artRect(marginX, topMargin, sz.width() - 2 * marginX, sz.height() - topMargin - bottomMargin);
+
+    return source.copy(artRect.intersected(source.rect()));
+}
+
+void UserCardArtProvider::insertIntoCache(const QString &key, const QPixmap &pixmap)
+{
+    if (pixmap.isNull()) {
+        return;
+    }
+
+    if (!cardArtCache.contains(key)) {
+        cacheInsertionOrder.append(key);
+        while (cacheInsertionOrder.size() > MaxCacheEntries) {
+            const QString evicted = cacheInsertionOrder.takeFirst();
+            cardArtCache.remove(evicted);
+        }
+    }
+    cardArtCache.insert(key, pixmap);
+}
+
+void UserCardArtProvider::processQueue()
+{
+    if (!dbReady) {
+        return;
+    }
+
+    while (!queue.isEmpty()) {
+        const QString key = queue.dequeue();
+
+        const QStringList parts = key.split(u'|');
+        if (parts.size() != 3) {
+            pending.remove(key);
+            continue;
+        }
+
+        const QString userName = parts.at(0);
+        const QString cardName = parts.at(1);
+        const QString providerId = parts.at(2);
+
+        ExactCard card = CardDatabaseManager::query()->getCard({cardName, providerId});
+
+        if (!card) {
+            pending.remove(key);
+            continue;
+        }
+
+        QPixmap fullRes;
+        CardPictureLoader::getPixmap(fullRes, card, QSize(745, 1040));
+
+        // Synchronous hit (already loaded/on disk)
+        if (!fullRes.isNull()) {
+            insertIntoCache(key, cropCardArt(fullRes, card));
+            pending.remove(key);
+
+            emit cardArtUpdated(userName);
+            continue;
+        }
+
+        // Async load required.
+        QPointer<UserCardArtProvider> self(this);
+
+        auto conn = std::make_shared<QMetaObject::Connection>();
+
+        *conn = connect(card.getCardPtr().data(), &CardInfo::pixmapUpdated, this,
+                        [self, key, userName, card, conn]() mutable {
+                            if (!self) {
+                                return;
+                            }
+
+                            QObject::disconnect(*conn);
+
+                            QPixmap fullRes;
+                            CardPictureLoader::getPixmap(fullRes, card, QSize(745, 1040));
+
+                            if (!fullRes.isNull()) {
+                                self->insertIntoCache(key, self->cropCardArt(fullRes, card));
+                            }
+
+                            self->pending.remove(key);
+
+                            emit self->cardArtUpdated(userName);
+
+                            // Resume processing remaining queued items.
+                            self->processQueue();
+                        });
+
+        // Stop here. We'll continue when the async load finishes.
+        return;
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..ce9225b00
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h
@@ -0,0 +1,44 @@
+#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;
+
+class UserCardArtProvider : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit UserCardArtProvider(QObject *parent = nullptr);
+
+    void requestCardArt(const QString &userName, const QString &cardName, const QString &providerId);
+    const QMap<QString, QPixmap> &cache() const;
+    static QPixmap cropCardArt(const QPixmap &fullRes, const ExactCard &card);
+
+signals:
+    void cardArtUpdated(const QString &userName);
+
+public slots:
+    void onDatabaseReady();
+
+private:
+    bool dbReady = false;
+    static constexpr int MaxCacheEntries = 1024;
+    QList<QString> cacheInsertionOrder; // FIFO eviction
+    QMap<QString, QPixmap> cardArtCache;
+    QSet<QString> pending;
+    QQueue<QString> queue;
+
+    void processQueue();
+    void insertIntoCache(const QString &key, const QPixmap &pixmap);
+};
+
+#endif // COCKATRICE_USER_CARD_ART_PROVIDER_H
\ No newline at end of file
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
new file mode 100644
index 000000000..f8b57cfc2
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp
@@ -0,0 +1,598 @@
+#include "user_card_settings_dialog.h"
+
+#include "../../../card_picture_loader/card_picture_loader.h"
+#include "../../cards/art_crop_attribution.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_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 <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 <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
+{
+// Gesture clamps and step sizes for this direct manipulation surface. The
+// gesture zoom floor is 1.0: basescale already cover fits the art, so any
+// smaller scale would underfill the strip.
+constexpr qreal kMinGestureZoom = 1.0;
+constexpr qreal kMaxZoom = 4.0;
+constexpr qreal kKeyPanOffsetStep = 0.01;
+constexpr qreal kKeyZoomStep = 1.05;
+constexpr qreal kWheelZoomBase = 1.15; // zoom factor per wheel notch
+} // namespace
+
+CardArtPreviewWidget::CardArtPreviewWidget(QWidget *parent) : QWidget(parent)
+{
+    setMinimumSize(400, 72);
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    setFocusPolicy(Qt::StrongFocus);
+    setAccessibleName(tr("Banner preview"));
+    setAccessibleDescription(tr("Zoom %1×").arg(QString::number(params.zoom, 'f', 2)));
+}
+
+void CardArtPreviewWidget::focusInEvent(QFocusEvent *event)
+{
+    // Snapshot for the Esc or Backspace reset, restoring whatever the user
+    // had when the surface took focus
+    paramsAtFocusIn = params;
+    QWidget::focusInEvent(event);
+}
+
+void CardArtPreviewWidget::setPixmap(const QPixmap &pixmap)
+{
+    sourcePixmap = pixmap;
+    update();
+}
+
+void CardArtPreviewWidget::setParams(const CardArtParams &p)
+{
+    params = p;
+    setAccessibleDescription(tr("Zoom %1×").arg(QString::number(params.zoom, 'f', 2)));
+    update();
+}
+
+void CardArtPreviewWidget::setAttribution(const QString &attribution)
+{
+    attributionText = attribution;
+    update();
+}
+
+void CardArtPreviewWidget::paintEvent(QPaintEvent *)
+{
+    QPainter painter(this);
+    painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::TextAntialiasing);
+
+    const QRect rect = this->rect();
+
+    const QColor accentColor(100, 116, 139);
+    const QRectF cardRect = QRectF(rect).adjusted(3, 2, -3, -2);
+
+    QLinearGradient bg(cardRect.topLeft(), cardRect.topRight());
+    bg.setColorAt(0, accentColor.darker(320));
+    bg.setColorAt(1, QColor(18, 22, 30));
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(bg);
+    painter.drawRoundedRect(cardRect, 6, 6);
+    painter.setBrush(accentColor);
+    painter.drawRoundedRect(QRectF(cardRect.left(), cardRect.top(), 3, cardRect.height()), 2, 2);
+
+    // Visible keyboard focus per the focus cursor contract, Tab must show
+    // where the keys land, including in the empty state
+    const auto paintFocusRing = [&painter, &cardRect, this]() {
+        if (!hasFocus()) {
+            return;
+        }
+        QPen focusPen(palette().color(QPalette::Highlight), 2);
+        painter.setPen(focusPen);
+        painter.setBrush(Qt::NoBrush);
+        painter.drawRoundedRect(cardRect.adjusted(-1, -1, 1, 1), 6, 6);
+    };
+
+    if (sourcePixmap.isNull()) {
+        painter.setPen(QColor(150, 150, 150));
+        painter.drawText(rect, Qt::AlignCenter, tr("No card selected"));
+        paintFocusRing();
+        return;
+    }
+
+    UserListPainter::drawCardArt(&painter, rect, rect.right() - 4,
+                                 QString(), // userName not needed for override path
+                                 nullptr,   // no cache
+                                 params,
+                                 &sourcePixmap // direct pixmap
+    );
+
+    // Avatar placeholder so the left margin interaction is visible
+    const int avatarX = rect.left() + 14;
+    const int avatarY = rect.top() + (rect.height() - 36) / 2;
+    const QRect avatarRect(avatarX, avatarY, 36, 36);
+
+    QPainterPath clip;
+    clip.addEllipse(avatarRect);
+    painter.save();
+    painter.setClipPath(clip);
+    painter.setBrush(accentColor.darker(200));
+    painter.setPen(Qt::NoPen);
+    painter.drawEllipse(avatarRect);
+    painter.restore();
+
+    painter.setPen(QPen(QColor(70, 80, 95), 2));
+    painter.setBrush(Qt::NoBrush);
+    painter.drawEllipse(avatarRect.adjusted(-1, -1, 1, 1));
+
+    paintArtAttribution(painter, cardRect, attributionText);
+
+    paintFocusRing();
+}
+
+qreal CardArtPreviewWidget::bannerTravel() const
+{
+    if (sourcePixmap.isNull()) {
+        return 0.0;
+    }
+    // Mirror UserListPainter::drawCardArt() exactly: same strip metrics, the
+    // copy is drawn 1:1, so output pixels equal widget pixels here.
+    const int cardH = rect().height() - 4;
+    const int totalW = (rect().right() - 4) - rect().left();
+    const int marginL = qRound(totalW * params.marginPctL);
+    const int marginR = qRound(totalW * params.marginPctR);
+    const int drawW = totalW - marginL - marginR;
+    const double basescale = qMax(double(drawW) / sourcePixmap.width(), double(cardH) / sourcePixmap.height());
+    // qRound for literal parity with drawCardArt, which rounds the scaled
+    // height before computing travel
+    const double scaledH = qRound(sourcePixmap.height() * basescale * params.zoom);
+    return scaledH - cardH;
+}
+
+void CardArtPreviewWidget::applyCropDelta(qreal dOffset, qreal zoomFactor)
+{
+    CardArtParams next = params;
+    next.verticalOffset = qBound(0.0, params.verticalOffset + dOffset, 1.0);
+    next.zoom = qBound(kMinGestureZoom, params.zoom * zoomFactor, kMaxZoom);
+
+    if (sameCrop(next, params)) {
+        return;
+    }
+
+    params = next;
+    setAccessibleDescription(tr("Zoom %1×").arg(QString::number(params.zoom, 'f', 2)));
+    update();
+    emit paramsEdited(params);
+}
+
+bool CardArtPreviewWidget::sameCrop(const CardArtParams &a, const CardArtParams &b) const
+{
+    // Exact comparison on purpose: clamped assignments yield identical bits,
+    // while qFuzzyCompare based equality misbehaves around zero
+    return a.verticalOffset == b.verticalOffset && a.zoom == b.zoom;
+}
+
+void CardArtPreviewWidget::restoreSnapshot()
+{
+    // The snapshot only ever holds values that passed the gesture clamps,
+    // so it is safe to restore verbatim
+    if (sameCrop(paramsAtFocusIn, params)) {
+        return;
+    }
+    params = paramsAtFocusIn;
+    setAccessibleDescription(tr("Zoom %1×").arg(QString::number(params.zoom, 'f', 2)));
+    update();
+    emit paramsEdited(params);
+}
+
+void CardArtPreviewWidget::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() != Qt::LeftButton || sourcePixmap.isNull() || bannerTravel() <= 0.5) {
+        QWidget::mousePressEvent(event);
+        return;
+    }
+    dragging = true;
+    lastDragPos = event->pos();
+    setCursor(Qt::ClosedHandCursor);
+    event->accept();
+}
+
+void CardArtPreviewWidget::mouseMoveEvent(QMouseEvent *event)
+{
+    if (!dragging || sourcePixmap.isNull()) {
+        QWidget::mouseMoveEvent(event);
+        return;
+    }
+
+    const qreal dy = event->pos().y() - lastDragPos.y();
+    lastDragPos = event->pos();
+
+    const qreal travel = bannerTravel();
+    if (travel <= 0.5) {
+        event->accept();
+        return;
+    }
+
+    // Dragging moves the ART with the cursor, so the crop window slides the
+    // other way through the available travel.
+    applyCropDelta(-dy / travel, 1.0);
+    event->accept();
+}
+
+void CardArtPreviewWidget::mouseReleaseEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton) {
+        dragging = false;
+        unsetCursor();
+        event->accept();
+        return;
+    }
+    QWidget::mouseReleaseEvent(event);
+}
+
+void CardArtPreviewWidget::wheelEvent(QWheelEvent *event)
+{
+    if (sourcePixmap.isNull()) {
+        QWidget::wheelEvent(event);
+        return;
+    }
+    const qreal notches = static_cast<qreal>(event->angleDelta().y()) / 120.0;
+    if (notches == 0.0) {
+        event->accept();
+        return;
+    }
+    applyCropDelta(0.0, std::pow(kWheelZoomBase, notches));
+    event->accept();
+}
+
+void CardArtPreviewWidget::keyPressEvent(QKeyEvent *event)
+{
+    if (sourcePixmap.isNull()) {
+        QWidget::keyPressEvent(event);
+        return;
+    }
+
+    switch (event->key()) {
+        case Qt::Key_Escape:
+            if (sameCrop(params, paramsAtFocusIn)) {
+                // Nothing to undo on this surface, let the event reach the
+                // dialog so Esc keeps its close meaning there
+                QWidget::keyPressEvent(event);
+                return;
+            }
+            restoreSnapshot();
+            break;
+        case Qt::Key_Backspace:
+            restoreSnapshot();
+            break;
+        case Qt::Key_Up:
+            applyCropDelta(-kKeyPanOffsetStep, 1.0);
+            break;
+        case Qt::Key_Down:
+            applyCropDelta(kKeyPanOffsetStep, 1.0);
+            break;
+        case Qt::Key_Plus:
+        case Qt::Key_Equal:
+            applyCropDelta(0.0, kKeyZoomStep);
+            break;
+        case Qt::Key_Minus:
+            applyCropDelta(0.0, 1.0 / kKeyZoomStep);
+            break;
+        default:
+            QWidget::keyPressEvent(event);
+            return;
+    }
+    event->accept();
+}
+
+UserCardArtSettingsDialog::UserCardArtSettingsDialog(const CardArtParams &initial, QWidget *parent)
+    : QDialog(parent), currentParams(initial)
+{
+    // Legacy stored banners may carry zoom below the gesture floor or an out
+    // of range offset. Normalize once on open so the preview renders filled
+    // and Ok saves a state the gestures can reach again
+    currentParams.zoom = qBound(kMinGestureZoom, currentParams.zoom, kMaxZoom);
+    currentParams.verticalOffset = qBound(0.0, currentParams.verticalOffset, 1.0);
+
+    setMinimumWidth(500);
+    setupUi();
+
+    // Seed UI from initial params
+    if (!currentParams.cardName.isEmpty()) {
+        // onCardNameChanged overwrites cardProviderId with the first printing,
+        // so remember the stored one before it runs
+        const QString storedProviderId = currentParams.cardProviderId;
+        searchBar->setText(currentParams.cardName);
+        onCardNameChanged(currentParams.cardName);
+
+        // onCardNameChanged leaves the printing combo on the first printing in
+        // the database, which would silently change the stored banner card on
+        // accept. Restore the stored printing when it resolves locally.
+        const int storedPrintingIndex = providerComboBox->findData(storedProviderId);
+        if (storedPrintingIndex != -1) {
+            providerComboBox->setCurrentIndex(storedPrintingIndex);
+        } else if (!storedProviderId.isEmpty()) {
+            // Stored printing not in the local database: keep it rather than
+            // silently substituting the first printing.
+            currentParams.cardProviderId = storedProviderId;
+            reloadPreview();
+        }
+    }
+    marginLSpin->setValue(currentParams.marginPctL);
+    marginRSpin->setValue(currentParams.marginPctR);
+}
+
+CardArtParams UserCardArtSettingsDialog::params() const
+{
+    return currentParams;
+}
+
+QDoubleSpinBox *UserCardArtSettingsDialog::makeSpinBox(double min, double max, double value, double step)
+{
+    auto *spin = new QDoubleSpinBox;
+    spin->setRange(min, max);
+    spin->setSingleStep(step);
+    spin->setDecimals(3);
+    spin->setValue(value);
+    return spin;
+}
+
+void UserCardArtSettingsDialog::initializeSearchBar()
+{
+    searchBar = new QLineEdit;
+
+    cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this);
+    cardDatabaseDisplayModel = new CardDatabaseDisplayModel(this);
+    cardDatabaseDisplayModel->setSourceModel(cardDatabaseModel);
+
+    const CardCompleterSetup cardSetup = createCardCompleter(cardDatabaseDisplayModel, this, 15);
+    searchModel = cardSetup.searchModel;
+    proxyModel = cardSetup.proxyModel;
+    completer = cardSetup.completer;
+    searchBar->setCompleter(completer);
+
+    connectCardCompleterSearch(searchBar, cardSetup);
+
+    connect(completer, static_cast<void (QCompleter::*)(const QString &)>(&QCompleter::activated), this,
+            [this](const QString &completion) {
+                if (searchBar->text() != completion) {
+                    searchBar->setText(completion);
+                    searchBar->setCursorPosition(searchBar->text().length());
+                }
+                onCardNameChanged(completion);
+            });
+
+    // Also trigger a load when the user hits Return on a typed name
+    connect(searchBar, &QLineEdit::returnPressed, this, [this]() { onCardNameChanged(searchBar->text()); });
+}
+
+void UserCardArtSettingsDialog::setupUi()
+{
+    initializeSearchBar();
+
+    providerComboBox = new QComboBox;
+    connect(providerComboBox, &QComboBox::currentIndexChanged, this, [this]() {
+        currentParams.cardProviderId = providerComboBox->currentData().toString();
+        reloadPreview();
+        onParamChanged();
+    });
+
+    marginLSpin = makeSpinBox(0.0, 0.95, currentParams.marginPctL, 0.01);
+    marginRSpin = makeSpinBox(0.0, 0.95, currentParams.marginPctR, 0.01);
+
+    auto *form = new QFormLayout;
+    cardNameLabel = new QLabel;
+    printingLabel = new QLabel;
+    marginLLabel = new QLabel;
+    marginRLabel = new QLabel;
+    form->addRow(cardNameLabel, searchBar);
+    form->addRow(printingLabel, providerComboBox);
+    form->addRow(marginLLabel, marginLSpin);
+    form->addRow(marginRLabel, marginRSpin);
+
+    controlsGroup = new QGroupBox;
+    controlsGroup->setLayout(form);
+
+    preview = new CardArtPreviewWidget;
+
+    auto *previewLayout = new QVBoxLayout;
+    previewLayout->addWidget(preview);
+    previewCaptionLabel = new QLabel;
+    previewCaptionLabel->setAlignment(Qt::AlignCenter);
+    previewCaptionLabel->setWordWrap(true);
+    previewLayout->addWidget(previewCaptionLabel);
+    previewGroup = new QGroupBox;
+    previewGroup->setLayout(previewLayout);
+
+    auto *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    removeBtn = new QPushButton;
+    buttons->addButton(removeBtn, QDialogButtonBox::ResetRole);
+
+    connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
+    connect(removeBtn, &QPushButton::clicked, this, [this]() {
+        currentParams = CardArtParams{}; // empty cardName signals removal
+        accept();
+    });
+
+    // The banner leads visually, card selection and margins support it below.
+    auto *root = new QVBoxLayout;
+    root->addWidget(previewGroup);
+    root->addWidget(controlsGroup);
+    root->addWidget(buttons);
+    setLayout(root);
+
+    connect(marginLSpin, &QDoubleSpinBox::valueChanged, this, &UserCardArtSettingsDialog::onParamChanged);
+    connect(marginRSpin, &QDoubleSpinBox::valueChanged, this, &UserCardArtSettingsDialog::onParamChanged);
+
+    // Gestures are the only editors of offset and zoom on this surface.
+    // Margins stay explicit numeric controls: they trim the strip's
+    // sides and have no natural drag mapping.
+    connect(preview, &CardArtPreviewWidget::paramsEdited, this,
+            [this](const CardArtParams &edited) { currentParams = edited; });
+
+    retranslateUi();
+}
+
+void UserCardArtSettingsDialog::retranslateUi()
+{
+    setWindowTitle(tr("Card Art Settings"));
+    searchBar->setPlaceholderText(tr("Type a card name..."));
+    cardNameLabel->setText(tr("Card name:"));
+    printingLabel->setText(tr("Printing:"));
+    marginLLabel->setText(tr("Left margin (%):"));
+    marginRLabel->setText(tr("Right margin (%):"));
+    controlsGroup->setTitle(tr("Card"));
+    previewCaptionLabel->setText(
+        tr("Drag to pan, scroll to zoom, arrow keys nudge, plus and minus zoom, Backspace or Esc restores."));
+    previewGroup->setTitle(tr("Banner"));
+    removeBtn->setText(tr("Remove Banner Card"));
+}
+
+void UserCardArtSettingsDialog::populateProviderCombo(const QString &cardName)
+{
+    providerComboBox->clear();
+
+    auto card = CardDatabaseManager::query()->getCard({cardName});
+
+    const auto &sets = card.getInfo().getSets();
+
+    for (const auto &printings : sets) {
+        for (const auto &p : printings) {
+
+            QString setName = p.getSet()->getLongName();
+            QString collector = p.getProperty("num");
+            QString uuid = p.getUuid();
+
+            QString label = setName;
+
+            if (!collector.isEmpty()) {
+                label += " #" + collector;
+            }
+
+            providerComboBox->addItem(label, uuid);
+        }
+    }
+}
+
+void UserCardArtSettingsDialog::onCardNameChanged(const QString &name)
+{
+    if (name.isEmpty()) {
+        currentPixmap = QPixmap();
+        preview->setPixmap(currentPixmap);
+        return;
+    }
+
+    const ExactCard card = CardDatabaseManager::query()->getCard({name});
+    if (!card) {
+        currentPixmap = QPixmap();
+        preview->setPixmap(currentPixmap);
+        providerComboBox->clear();
+        return;
+    }
+
+    currentParams.cardName = name;
+
+    populateProviderCombo(name);
+
+    if (providerComboBox->count() == 0) {
+        // No printings found for this card, nothing to preview.
+        currentPixmap = QPixmap();
+        preview->setPixmap(currentPixmap);
+        currentParams.cardProviderId.clear();
+        return;
+    }
+
+    currentParams.cardProviderId = providerComboBox->currentData().toString();
+    reloadPreview();
+}
+
+void UserCardArtSettingsDialog::reloadPreview()
+{
+    if (currentParams.cardName.isEmpty()) {
+        return;
+    }
+
+    ExactCard card = CardDatabaseManager::query()->getCard({currentParams.cardName, currentParams.cardProviderId});
+    if (!card) {
+        return;
+    }
+
+    // CardPictureLoader::getPixmap() is async on a cache miss: it enqueues a
+    // background download and returns a null pixmap immediately. When that
+    // download finishes, CardPictureLoader::imageLoaded() caches the result
+    // and calls card.emitPixmapUpdated(), which emits pixmapUpdated() on the
+    // underlying CardInfo (see exact_card.h). Listen for that, scoped to
+    // whichever CardInfo we just asked for, so the preview catches up once
+    // the image actually arrives instead of staying on the placeholder.
+    //
+    // Disconnect any previous listener first, otherwise switching cards
+    // repeatedly stacks up connections to old CardInfo objects, each of
+    // which would still fire reloadPreview() (harmlessly, but wastefully)
+    // whenever ITS art finishes loading later.
+    disconnect(pixmapUpdatedConnection);
+
+    QPixmap fullRes;
+    CardPictureLoader::getPixmap(fullRes, card, QSize(745, 1040));
+
+    if (fullRes.isNull()) {
+        // Not loaded yet, wait for the signal instead of giving up.
+        // card.getCardPtr() is a CardInfoPtr (QSharedPointer<CardInfo>),
+        // .data() gives the raw QObject* needed for connect().
+        CardInfo *cardInfo = card.getCardPtr().data();
+        if (cardInfo) {
+            pixmapUpdatedConnection = connect(cardInfo, &CardInfo::pixmapUpdated, this, [this]() { reloadPreview(); });
+        }
+        return;
+    }
+
+    currentPixmap = UserCardArtProvider::cropCardArt(fullRes, card);
+    preview->setPixmap(currentPixmap);
+    preview->setParams(currentParams);
+
+    // Only attribute the art once the new pixmap is actually displayed, so a
+    // cache miss (which keeps the previous pixmap on screen) doesn't pair the
+    // new card's attribution with the old card's art.
+    preview->setAttribution(buildArtAttribution(card));
+}
+
+void UserCardArtSettingsDialog::onParamChanged()
+{
+    currentParams.marginPctL = marginLSpin->value();
+    currentParams.marginPctR = marginRSpin->value();
+    preview->setParams(currentParams);
+}
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
new file mode 100644
index 000000000..bfba8b007
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.h
@@ -0,0 +1,122 @@
+#ifndef COCKATRICE_USER_CARD_ART_SETTINGS_DIALOG_H
+#define COCKATRICE_USER_CARD_ART_SETTINGS_DIALOG_H
+
+#include "user_list_painter.h"
+
+#include <QDialog>
+#include <QMetaObject>
+#include <QPixmap>
+#include <QPoint>
+#include <QString>
+#include <QWidget>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class QCompleter;
+class QGroupBox;
+class QLineEdit;
+class QDoubleSpinBox;
+class QLabel;
+class QPushButton;
+class CardDatabaseModel;
+class CardDatabaseDisplayModel;
+class CardSearchModel;
+class CardCompleterProxyModel;
+class QComboBox;
+
+/**
+ * @brief Interactive preview of the user list banner art.
+ *
+ * Renders the banner strip with the given CardArtParams through the same
+ * UserListPainter::drawCardArt() the live delegate uses, including the
+ * avatar placeholder and fade masks. Dragging pans the art vertically at
+ * output scale, the wheel zooms, arrow keys nudge, Backspace or Esc
+ * restores the parameters as of focus gain.
+ */
+class CardArtPreviewWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit CardArtPreviewWidget(QWidget *parent = nullptr);
+
+    void setPixmap(const QPixmap &pixmap);
+    void setParams(const CardArtParams &params);
+    void setAttribution(const QString &attribution);
+
+signals:
+    /** @brief Emitted whenever direct manipulation (drag, wheel, keys) changes the parameters. */
+    void paramsEdited(const CardArtParams &params);
+
+protected:
+    void paintEvent(QPaintEvent *event) override;
+    void mousePressEvent(QMouseEvent *event) override;
+    void mouseMoveEvent(QMouseEvent *event) override;
+    void mouseReleaseEvent(QMouseEvent *event) override;
+    void wheelEvent(QWheelEvent *event) override;
+    void keyPressEvent(QKeyEvent *event) override;
+    void focusInEvent(QFocusEvent *event) override;
+
+private:
+    qreal bannerTravel() const; ///< vertical travel of the art behind the strip, in output pixels
+    void applyCropDelta(qreal dOffset, qreal zoomFactor);
+    bool sameCrop(const CardArtParams &a, const CardArtParams &b) const;
+    void restoreSnapshot();
+
+    QPixmap sourcePixmap;
+    CardArtParams params;
+    CardArtParams paramsAtFocusIn; ///< crop as of the latest focus gain, restored by Esc or Backspace
+    QString attributionText;
+    QPoint lastDragPos;   ///< widget space position of the previous mouse move while panning
+    bool dragging{false}; ///< true between an accepted press and its release, guards stale drag positions
+};
+
+class UserCardArtSettingsDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit UserCardArtSettingsDialog(const CardArtParams &initial = {}, QWidget *parent = nullptr);
+
+    CardArtParams params() const;
+
+private slots:
+    void onCardNameChanged(const QString &name);
+    void reloadPreview();
+    void onParamChanged();
+
+private:
+    void setupUi();
+    void retranslateUi();
+    void populateProviderCombo(const QString &cardName);
+    void initializeSearchBar();
+    QDoubleSpinBox *makeSpinBox(double min, double max, double value, double step);
+
+    QLineEdit *searchBar;
+    QCompleter *completer;
+    CardDatabaseModel *cardDatabaseModel;
+    CardDatabaseDisplayModel *cardDatabaseDisplayModel;
+    CardSearchModel *searchModel;
+    CardCompleterProxyModel *proxyModel;
+
+    QComboBox *providerComboBox;
+
+    QMetaObject::Connection pixmapUpdatedConnection;
+
+    QLabel *cardNameLabel;
+    QLabel *printingLabel;
+    QLabel *marginLLabel;
+    QLabel *marginRLabel;
+    QGroupBox *controlsGroup;
+    QLabel *previewCaptionLabel;
+    QGroupBox *previewGroup;
+    QPushButton *removeBtn;
+    QDoubleSpinBox *marginLSpin;
+    QDoubleSpinBox *marginRSpin;
+    CardArtPreviewWidget *preview;
+
+    QPixmap currentPixmap;
+    CardArtParams currentParams;
+};
+
+#endif // COCKATRICE_USER_CARD_ART_SETTINGS_DIALOG_H
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 7083ac899..c8fe97cda 100644
--- a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp
@@ -1,19 +1,42 @@
 #include "user_context_menu.h"
 
-#include "../../interface/widgets/tabs/tab_account.h"
-#include "../../interface/widgets/tabs/tab_game.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_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 "user_list_widget.h"
 
 #include <QAction>
+#include <QClipboard>
+#include <QCursor>
+#include <QDialog>
+#include <QFlags>
+#include <QGuiApplication>
+#include <QHeaderView>
+#include <QMap>
 #include <QMenu>
-#include <QtGui>
-#include <QtWidgets>
+#include <QMessageBox>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QTableWidget>
+#include <QTableWidgetItem>
+#include <QWidget>
 #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>
@@ -26,6 +49,10 @@
 #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),
@@ -36,11 +63,13 @@ UserContextMenu::UserContextMenu(TabSupervisor *_tabSupervisor, QWidget *parent,
     aDetails = new QAction(QString(), this);
     aChat = new QAction(QString(), this);
     aShowGames = new QAction(QString(), this);
+    aViewPublicDecks = new QAction(QString(), this);
     aAddToBuddyList = new QAction(QString(), this);
     aRemoveFromBuddyList = new QAction(QString(), this);
     aAddToIgnoreList = new QAction(QString(), this);
     aRemoveFromIgnoreList = new QAction(QString(), this);
     aKick = new QAction(QString(), this);
+    aReport = new QAction(QString(), this);
     aWarnUser = new QAction(QString(), this);
     aWarnHistory = new QAction(QString(), this);
     aBan = new QAction(QString(), this);
@@ -49,7 +78,10 @@ UserContextMenu::UserContextMenu(TabSupervisor *_tabSupervisor, QWidget *parent,
     aDemoteFromMod = new QAction(QString(), this);
     aPromoteToJudge = new QAction(QString(), this);
     aDemoteFromJudge = new QAction(QString(), this);
+    aPromoteToDeveloper = new QAction(QString(), this);
+    aDemoteFromDeveloper = new QAction(QString(), this);
     aGetAdminNotes = new QAction(QString(), this);
+    aInvestigateUser = new QAction(QString(), this);
 
     retranslateUi();
 }
@@ -59,11 +91,13 @@ void UserContextMenu::retranslateUi()
     aDetails->setText(tr("User &details"));
     aChat->setText(tr("Private &chat"));
     aShowGames->setText(tr("Show this user's &games"));
+    aViewPublicDecks->setText(tr("View this user's &public decks"));
     aAddToBuddyList->setText(tr("Add to &buddy list"));
     aRemoveFromBuddyList->setText(tr("Remove from &buddy list"));
     aAddToIgnoreList->setText(tr("Add to &ignore list"));
     aRemoveFromIgnoreList->setText(tr("Remove from &ignore list"));
     aKick->setText(tr("Kick from &game"));
+    aReport->setText(tr("Report user"));
     aWarnUser->setText(tr("Warn user"));
     aWarnHistory->setText(tr("View user's war&n history"));
     aBan->setText(tr("Ban from &server"));
@@ -72,7 +106,10 @@ void UserContextMenu::retranslateUi()
     aDemoteFromMod->setText(tr("Dem&ote user from moderator"));
     aPromoteToJudge->setText(tr("Promote user to &judge"));
     aDemoteFromJudge->setText(tr("Demote user from judge"));
+    aPromoteToDeveloper->setText(tr("Promote user to &developer"));
+    aDemoteFromDeveloper->setText(tr("Demote user from de&veloper"));
     aGetAdminNotes->setText(tr("View admin notes"));
+    aInvestigateUser->setText(tr("Investigate user"));
 }
 
 void UserContextMenu::gamesOfUserReceived(const Response &resp, const CommandContainer &commandContainer)
@@ -144,7 +181,8 @@ void UserContextMenu::warnUser_processGetWarningsListResponse(const Response &r)
 
     if (response.warning_size() > 0) {
         for (int i = 0; i < response.warning_size(); ++i) {
-            dlg->addWarningOption(QString::fromStdString(response.warning(i)).simplified());
+            int startingIl = i < response.warning_il_size() ? response.warning_il(i) : 1;
+            dlg->addWarningOption(QString::fromStdString(response.warning(i)).simplified(), startingIl);
         }
     }
     dlg->show();
@@ -192,13 +230,15 @@ void UserContextMenu::banUserHistory_processResponse(const Response &resp)
             table->setMinimumSize(table->horizontalHeader()->length() + (table->columnCount() * 5),
                                   table->verticalHeader()->length() + (table->rowCount() * 3));
             table->show();
-        } else
+        } else {
             QMessageBox::information(static_cast<QWidget *>(parent()), tr("Ban History"),
                                      tr("User has never been banned."));
+        }
 
-    } else
+    } else {
         QMessageBox::critical(static_cast<QWidget *>(parent()), tr("Ban History"),
                               tr("Failed to collect ban information."));
+    }
 }
 
 void UserContextMenu::warnUserHistory_processResponse(const Response &resp)
@@ -228,13 +268,15 @@ void UserContextMenu::warnUserHistory_processResponse(const Response &resp)
             table->setMinimumSize(table->horizontalHeader()->length() + (table->columnCount() * 5),
                                   table->verticalHeader()->length() + (table->rowCount() * 3));
             table->show();
-        } else
+        } else {
             QMessageBox::information(static_cast<QWidget *>(parent()), tr("Warning History"),
                                      tr("User has never been warned."));
+        }
 
-    } else
+    } else {
         QMessageBox::critical(static_cast<QWidget *>(parent()), tr("Warning History"),
                               tr("Failed to collect warning information."));
+    }
 }
 
 void UserContextMenu::getAdminNotes_processResponse(const Response &resp)
@@ -258,7 +300,7 @@ void UserContextMenu::adjustMod_processUserResponse(const Response &resp, const
     const Command_AdjustMod &cmd = commandContainer.admin_command(0).GetExtension(Command_AdjustMod::ext);
 
     if (resp.response_code() == Response::RespOk) {
-        if (cmd.should_be_mod() || cmd.should_be_judge()) {
+        if (cmd.should_be_mod() || cmd.should_be_judge() || cmd.should_be_developer()) {
             QMessageBox::information(static_cast<QWidget *>(parent()), tr("Success"),
                                      tr("Successfully promoted user."));
         } else {
@@ -266,7 +308,7 @@ void UserContextMenu::adjustMod_processUserResponse(const Response &resp, const
         }
 
     } else {
-        if (cmd.should_be_mod() || cmd.should_be_judge()) {
+        if (cmd.should_be_mod() || cmd.should_be_judge() || cmd.should_be_developer()) {
             QMessageBox::information(static_cast<QWidget *>(parent()), tr("Failed"), tr("Failed to promote user."));
         } else {
             QMessageBox::information(static_cast<QWidget *>(parent()), tr("Failed"), tr("Failed to demote user."));
@@ -297,8 +339,9 @@ void UserContextMenu::warnUser_dialogFinished()
 {
     auto *dlg = static_cast<WarningDialog *>(sender());
 
-    if (dlg->getName().isEmpty() || userListProxy->getOwnUsername().simplified().isEmpty())
+    if (dlg->getName().isEmpty() || userListProxy->getOwnUsername().simplified().isEmpty()) {
         return;
+    }
 
     Command_WarnUser cmd;
     cmd.set_user_name(dlg->getName().toStdString());
@@ -350,6 +393,7 @@ void UserContextMenu::showContextMenu(const QPoint &pos,
 {
     QAction *aCopyToClipBoard = nullptr, *aRemoveMessages = nullptr;
     aUserName->setText(userName);
+    const bool anotherUser = userName != userListProxy->getOwnUsername();
 
     auto *menu = new QMenu(static_cast<QWidget *>(parent()));
     menu->addAction(aUserName);
@@ -360,7 +404,21 @@ void UserContextMenu::showContextMenu(const QPoint &pos,
     }
     menu->addAction(aDetails);
     menu->addAction(aShowGames);
+    if (userLevel.testFlag(ServerInfo_User::IsRegistered)) {
+        menu->addAction(aViewPublicDecks);
+    }
     menu->addAction(aChat);
+    const QList<GameInviteOption> inviteOptions = inviteOptionsForUser(userName);
+    if (!inviteOptions.isEmpty()) {
+        auto *inviteMenu = new QMenu(tr("&Invite to Game"), menu);
+        for (const GameInviteOption &option : inviteOptions) {
+            QAction *inviteAction = inviteMenu->addAction(option.label);
+            inviteAction->setEnabled(anotherUser && online);
+            connect(inviteAction, &QAction::triggered, this,
+                    [this, userName, option] { execInvite(userName, option); });
+        }
+        menu->addMenu(inviteMenu);
+    }
     if (userLevel.testFlag(ServerInfo_User::IsRegistered) && userListProxy->isOwnUserRegistered()) {
         menu->addSeparator();
         if (userListProxy->isUserBuddy(userName)) {
@@ -378,6 +436,9 @@ void UserContextMenu::showContextMenu(const QPoint &pos,
         aRemoveMessages = new QAction(tr("Remove this user's messages"), this);
         menu->addAction(aRemoveMessages);
     }
+    if (userListProxy->isOwnUserRegistered()) {
+        menu->addAction(aReport);
+    }
     if (game && (game->isHost() || !tabSupervisor->getAdminLocked())) {
         menu->addSeparator();
         menu->addAction(aKick);
@@ -391,6 +452,7 @@ void UserContextMenu::showContextMenu(const QPoint &pos,
         menu->addAction(aBanHistory);
         menu->addSeparator();
         menu->addAction(aGetAdminNotes);
+        menu->addAction(aInvestigateUser);
 
         menu->addSeparator();
         if (userLevel.testFlag(ServerInfo_User::IsModerator) &&
@@ -410,11 +472,21 @@ void UserContextMenu::showContextMenu(const QPoint &pos,
                    (tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsAdmin)) {
             menu->addAction(aPromoteToJudge);
         }
+
+        if (userLevel.testFlag(ServerInfo_User::IsDeveloper) &&
+            (tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsAdmin)) {
+            menu->addAction(aDemoteFromDeveloper);
+
+        } else if (userLevel.testFlag(ServerInfo_User::IsRegistered) &&
+                   (tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsAdmin)) {
+            menu->addAction(aPromoteToDeveloper);
+        }
     }
-    bool anotherUser = userName != userListProxy->getOwnUsername();
     aDetails->setEnabled(true);
-    aChat->setEnabled(anotherUser && online);
+    aChat->setEnabled(anotherUser && online && !userListProxy->isUserIgnored(userName));
     aShowGames->setEnabled(online);
+    aReport->setEnabled(anotherUser);
+    aViewPublicDecks->setEnabled(anotherUser);
     aAddToBuddyList->setEnabled(anotherUser);
     aRemoveFromBuddyList->setEnabled(anotherUser);
     aAddToIgnoreList->setEnabled(anotherUser);
@@ -425,104 +497,61 @@ void UserContextMenu::showContextMenu(const QPoint &pos,
     aBan->setEnabled(anotherUser);
     aBanHistory->setEnabled(anotherUser);
     aGetAdminNotes->setEnabled(anotherUser);
+    aInvestigateUser->setEnabled(anotherUser);
     aPromoteToMod->setEnabled(anotherUser);
     aDemoteFromMod->setEnabled(anotherUser);
+    aPromoteToJudge->setEnabled(anotherUser);
+    aDemoteFromJudge->setEnabled(anotherUser);
+    aPromoteToDeveloper->setEnabled(anotherUser);
+    aDemoteFromDeveloper->setEnabled(anotherUser);
 
     QAction *actionClicked = menu->exec(pos);
     if (actionClicked == nullptr) {
     } else if (actionClicked == aDetails) {
-        auto *infoWidget =
-            new UserInfoBox(client, false, static_cast<QWidget *>(parent()),
-                            Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint);
-        infoWidget->setAttribute(Qt::WA_DeleteOnClose);
-        infoWidget->updateInfo(userName);
+        execDetails(userName);
     } else if (actionClicked == aChat) {
-        emit openMessageDialog(userName, true);
+        execChat(userName);
     } else if (actionClicked == aShowGames) {
-        Command_GetGamesOfUser cmd;
-        cmd.set_user_name(userName.toStdString());
-
-        PendingCommand *pend = client->prepareSessionCommand(cmd);
-        connect(pend, &PendingCommand::finished, this, &UserContextMenu::gamesOfUserReceived);
-
-        client->sendCommand(pend);
+        execShowGames(userName);
+    } else if (actionClicked == aViewPublicDecks) {
+        execViewPublicDecks(userName);
     } else if (actionClicked == aAddToBuddyList) {
-        Command_AddToList cmd;
-        cmd.set_list("buddy");
-        cmd.set_user_name(userName.toStdString());
-
-        client->sendCommand(client->prepareSessionCommand(cmd));
+        execAddToBuddy(userName);
     } else if (actionClicked == aRemoveFromBuddyList) {
-        Command_RemoveFromList cmd;
-        cmd.set_list("buddy");
-        cmd.set_user_name(userName.toStdString());
-
-        client->sendCommand(client->prepareSessionCommand(cmd));
+        execRemoveFromBuddy(userName);
     } else if (actionClicked == aAddToIgnoreList) {
-        Command_AddToList cmd;
-        cmd.set_list("ignore");
-        cmd.set_user_name(userName.toStdString());
-
-        client->sendCommand(client->prepareSessionCommand(cmd));
+        execAddToIgnore(userName);
     } else if (actionClicked == aRemoveFromIgnoreList) {
-        Command_RemoveFromList cmd;
-        cmd.set_list("ignore");
-        cmd.set_user_name(userName.toStdString());
-
-        client->sendCommand(client->prepareSessionCommand(cmd));
+        execRemoveFromIgnore(userName);
     } else if (actionClicked == aKick) {
-        Command_KickFromGame cmd;
-        cmd.set_player_id(playerId);
-
-        game->getGameEventHandler()->sendGameCommand(cmd);
+        execKick(playerId);
+    } else if (actionClicked == aReport) {
+        int gameId = game ? game->getGameMetaInfo()->gameId() : -1;
+        QString autoChatLog;
+        if (chatView) {
+            autoChatLog = chatView->getRecentChatLog(50);
+        }
+        auto dlgReport = new DlgReportUser(client, userName, gameId, autoChatLog, static_cast<QWidget *>(parent()));
+        dlgReport->setAttribute(Qt::WA_DeleteOnClose);
+        dlgReport->exec();
     } else if (actionClicked == aBan) {
-        Command_GetUserInfo cmd;
-        cmd.set_user_name(userName.toStdString());
-
-        PendingCommand *pend = client->prepareSessionCommand(cmd);
-        connect(pend, &PendingCommand::finished, this, &UserContextMenu::banUser_processUserInfoResponse);
-        client->sendCommand(pend);
+        execBan(userName);
     } else if (actionClicked == aPromoteToMod || actionClicked == aDemoteFromMod) {
-        Command_AdjustMod cmd;
-        cmd.set_user_name(userName.toStdString());
-        cmd.set_should_be_mod(actionClicked == aPromoteToMod);
-
-        PendingCommand *pend = client->prepareAdminCommand(cmd);
-        connect(pend, &PendingCommand::finished, this, &UserContextMenu::adjustMod_processUserResponse);
-        client->sendCommand(pend);
+        execAdjustMod(userName, actionClicked == aPromoteToMod);
     } else if (actionClicked == aPromoteToJudge || actionClicked == aDemoteFromJudge) {
-        Command_AdjustMod cmd;
-        cmd.set_user_name(userName.toStdString());
-        cmd.set_should_be_judge(actionClicked == aPromoteToJudge);
-
-        PendingCommand *pend = client->prepareAdminCommand(cmd);
-        connect(pend, &PendingCommand::finished, this, &UserContextMenu::adjustMod_processUserResponse);
-        client->sendCommand(pend);
+        execAdjustJudge(userName, actionClicked == aPromoteToJudge);
+    } else if (actionClicked == aPromoteToDeveloper || actionClicked == aDemoteFromDeveloper) {
+        execAdjustDeveloper(userName, actionClicked == aPromoteToDeveloper);
     } else if (actionClicked == aBanHistory) {
-        Command_GetBanHistory cmd;
-        cmd.set_user_name(userName.toStdString());
-        PendingCommand *pend = client->prepareModeratorCommand(cmd);
-        connect(pend, &PendingCommand::finished, this, &UserContextMenu::banUserHistory_processResponse);
-        client->sendCommand(pend);
+        execBanHistory(userName);
     } else if (actionClicked == aWarnUser) {
-        Command_GetUserInfo cmd;
-        cmd.set_user_name(userName.toStdString());
-        PendingCommand *pend = client->prepareSessionCommand(cmd);
-        connect(pend, &PendingCommand::finished, this, &UserContextMenu::warnUser_processUserInfoResponse);
-        client->sendCommand(pend);
+        execWarn(userName);
     } else if (actionClicked == aWarnHistory) {
-        Command_GetWarnHistory cmd;
-        cmd.set_user_name(userName.toStdString());
-        PendingCommand *pend = client->prepareModeratorCommand(cmd);
-        connect(pend, &PendingCommand::finished, this, &UserContextMenu::warnUserHistory_processResponse);
-        client->sendCommand(pend);
+        execWarnHistory(userName);
     } else if (actionClicked == aGetAdminNotes) {
-        Command_GetAdminNotes cmd;
-        cmd.set_user_name(userName.toStdString());
-        auto *pend = client->prepareModeratorCommand(cmd);
-        connect(pend, &PendingCommand::finished, this, &UserContextMenu::getAdminNotes_processResponse);
-        client->sendCommand(pend);
-
+        execAdminNotes(userName);
+    } else if (actionClicked == aInvestigateUser) {
+        execInvestigateUser(userName);
     } else if (actionClicked == aCopyToClipBoard) {
         QClipboard *clipboard = QGuiApplication::clipboard();
         clipboard->setText(deckHash);
@@ -532,3 +561,217 @@ void UserContextMenu::showContextMenu(const QPoint &pos,
 
     delete menu;
 }
+
+void UserContextMenu::execChat(const QString &userName)
+{
+    emit openMessageDialog(userName, true);
+}
+
+QList<GameInviteOption> UserContextMenu::inviteOptionsForUser(const QString &userName) const
+{
+    if (!gameInviteLinkProvider) {
+        return {};
+    }
+    const QList<GameInviteOption> options = gameInviteLinkProvider();
+    QList<GameInviteOption> result;
+    for (const GameInviteOption &option : options) {
+        // Buddy-only games accept invites only from their creator, and only to
+        // users on the creator's buddy list.
+        if (option.onlyBuddies &&
+            (option.creatorName != userListProxy->getOwnUsername() || !userListProxy->isUserBuddy(userName))) {
+            continue;
+        }
+        result.append(option);
+    }
+    return result;
+}
+
+void UserContextMenu::execInvite(const QString &userName)
+{
+    const QList<GameInviteOption> options = inviteOptionsForUser(userName);
+    if (options.isEmpty()) {
+        return;
+    }
+
+    if (options.size() == 1) {
+        execInvite(userName, options.first());
+        return;
+    }
+
+    // More than one game in the room — let the user pick which one to invite to.
+    auto *menu = new QMenu(static_cast<QWidget *>(parent()));
+    for (const GameInviteOption &option : options) {
+        QAction *action = menu->addAction(option.label);
+        connect(action, &QAction::triggered, this, [this, userName, option] { execInvite(userName, option); });
+    }
+    menu->setAttribute(Qt::WA_DeleteOnClose);
+    menu->popup(QCursor::pos());
+}
+
+void UserContextMenu::execInvite(const QString &userName, const GameInviteOption &option)
+{
+    // Name the game by description first, then its id — "Join my game 'Magic'
+    // (#123)" — so a description-less fallback still identifies the game.
+    // The multi-arg .arg() overloads replace in a single pass, so a description
+    // containing "%…" cannot corrupt later placeholders.
+    const QString prefix =
+        option.description.isEmpty()
+            ? tr("Join my game (#%1):").arg(option.gameId)
+            : tr("Join my game \"%1\" (#%2):").arg(option.description, QString::number(option.gameId));
+    tabSupervisor->sendInviteToUser(userName, prefix + " " + option.url);
+}
+
+void UserContextMenu::execDetails(const QString &userName)
+{
+    auto *w = new UserInfoBox(client, false, static_cast<QWidget *>(parent()),
+                              Qt::Dialog | Qt::WindowTitleHint | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint);
+    w->setAttribute(Qt::WA_DeleteOnClose);
+    w->updateInfo(userName);
+}
+
+void UserContextMenu::execShowGames(const QString &userName)
+{
+    Command_GetGamesOfUser cmd;
+    cmd.set_user_name(userName.toStdString());
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &UserContextMenu::gamesOfUserReceived);
+    client->sendCommand(pend);
+}
+
+void UserContextMenu::execViewPublicDecks(const QString &userName)
+{
+    tabSupervisor->openTabPublicDecks(userName);
+}
+
+void UserContextMenu::execAddToBuddy(const QString &userName)
+{
+    Command_AddToList cmd;
+    cmd.set_list("buddy");
+    cmd.set_user_name(userName.toStdString());
+    client->sendCommand(client->prepareSessionCommand(cmd));
+}
+
+void UserContextMenu::execRemoveFromBuddy(const QString &userName)
+{
+    Command_RemoveFromList cmd;
+    cmd.set_list("buddy");
+    cmd.set_user_name(userName.toStdString());
+    client->sendCommand(client->prepareSessionCommand(cmd));
+}
+
+void UserContextMenu::execAddToIgnore(const QString &userName)
+{
+    Command_AddToList cmd;
+    cmd.set_list("ignore");
+    cmd.set_user_name(userName.toStdString());
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this,
+            [this, userName](const Response &response, const CommandContainer &, const QVariant &) {
+                if (response.response_code() == Response::RespOk) {
+                    QMessageBox::information(static_cast<QWidget *>(parent()), tr("Ignore list"),
+                                             tr("%1 has been added to your ignore list.").arg(userName));
+                }
+            });
+    client->sendCommand(pend);
+}
+
+void UserContextMenu::execRemoveFromIgnore(const QString &userName)
+{
+    Command_RemoveFromList cmd;
+    cmd.set_list("ignore");
+    cmd.set_user_name(userName.toStdString());
+    client->sendCommand(client->prepareSessionCommand(cmd));
+}
+
+void UserContextMenu::execKick(int playerId)
+{
+    auto result = QMessageBox::question(static_cast<QWidget *>(parent()), tr("Kick Player"),
+                                        tr("Are you sure you want to kick this player from the game?"),
+                                        QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+    if (result == QMessageBox::Yes) {
+        Command_KickFromGame cmd;
+        cmd.set_player_id(playerId);
+
+        game->getGameEventHandler()->sendGameCommand(cmd);
+    }
+}
+
+void UserContextMenu::execBan(const QString &userName)
+{
+    Command_GetUserInfo cmd;
+    cmd.set_user_name(userName.toStdString());
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &UserContextMenu::banUser_processUserInfoResponse);
+    client->sendCommand(pend);
+}
+
+void UserContextMenu::execWarn(const QString &userName)
+{
+    Command_GetUserInfo cmd;
+    cmd.set_user_name(userName.toStdString());
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &UserContextMenu::warnUser_processUserInfoResponse);
+    client->sendCommand(pend);
+}
+
+void UserContextMenu::execBanHistory(const QString &userName)
+{
+    Command_GetBanHistory cmd;
+    cmd.set_user_name(userName.toStdString());
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &UserContextMenu::banUserHistory_processResponse);
+    client->sendCommand(pend);
+}
+
+void UserContextMenu::execWarnHistory(const QString &userName)
+{
+    Command_GetWarnHistory cmd;
+    cmd.set_user_name(userName.toStdString());
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &UserContextMenu::warnUserHistory_processResponse);
+    client->sendCommand(pend);
+}
+
+void UserContextMenu::execAdminNotes(const QString &userName)
+{
+    Command_GetAdminNotes cmd;
+    cmd.set_user_name(userName.toStdString());
+    auto *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &UserContextMenu::getAdminNotes_processResponse);
+    client->sendCommand(pend);
+}
+
+void UserContextMenu::execInvestigateUser(const QString &userName)
+{
+    tabSupervisor->openTabModeration(userName);
+}
+
+void UserContextMenu::execAdjustMod(const QString &userName, bool shouldBeMod)
+{
+    Command_AdjustMod cmd;
+    cmd.set_user_name(userName.toStdString());
+    cmd.set_should_be_mod(shouldBeMod);
+    PendingCommand *pend = client->prepareAdminCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &UserContextMenu::adjustMod_processUserResponse);
+    client->sendCommand(pend);
+}
+
+void UserContextMenu::execAdjustJudge(const QString &userName, bool shouldBeJudge)
+{
+    Command_AdjustMod cmd;
+    cmd.set_user_name(userName.toStdString());
+    cmd.set_should_be_judge(shouldBeJudge);
+    PendingCommand *pend = client->prepareAdminCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &UserContextMenu::adjustMod_processUserResponse);
+    client->sendCommand(pend);
+}
+
+void UserContextMenu::execAdjustDeveloper(const QString &userName, bool shouldBeDeveloper)
+{
+    Command_AdjustMod cmd;
+    cmd.set_user_name(userName.toStdString());
+    cmd.set_should_be_developer(shouldBeDeveloper);
+    PendingCommand *pend = client->prepareAdminCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &UserContextMenu::adjustMod_processUserResponse);
+    client->sendCommand(pend);
+}
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 0056d74ae..2536819a4 100644
--- a/cockatrice/src/interface/widgets/server/user/user_context_menu.h
+++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.h
@@ -1,14 +1,21 @@
 /**
  * @file user_context_menu.h
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef USER_CONTEXT_MENU_H
 #define USER_CONTEXT_MENU_H
 
+#include "../../interface/widgets/server/game_link.h"
+
+#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;
@@ -16,11 +23,10 @@ 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
 {
@@ -34,15 +40,20 @@ private:
     QAction *aUserName;
     QAction *aDetails;
     QAction *aShowGames;
+    QAction *aViewPublicDecks;
     QAction *aChat;
     QAction *aAddToBuddyList, *aRemoveFromBuddyList;
     QAction *aAddToIgnoreList, *aRemoveFromIgnoreList;
     QAction *aKick;
+    QAction *aReport;
     QAction *aBan, *aBanHistory;
     QAction *aPromoteToMod, *aDemoteFromMod;
     QAction *aPromoteToJudge, *aDemoteFromJudge;
+    QAction *aPromoteToDeveloper, *aDemoteFromDeveloper;
     QAction *aWarnUser, *aWarnHistory;
     QAction *aGetAdminNotes;
+    std::function<QList<GameInviteOption>()> gameInviteLinkProvider;
+    QAction *aInvestigateUser;
 signals:
     void openMessageDialog(const QString &userName, bool focus);
 private slots:
@@ -74,6 +85,54 @@ public:
                          int playerId,
                          const QString &deckHash,
                          ChatView *chatView = nullptr);
+
+    const UserListProxy *getUserListProxy() const
+    {
+        return userListProxy;
+    }
+
+    void setGameInviteLinkProvider(std::function<QList<GameInviteOption>()> provider)
+    {
+        gameInviteLinkProvider = std::move(provider);
+    }
+
+    /**
+     * The games currently inviteable for @p userName, honoring the room's
+     * buddy-only setting (the inviter must be the game's creator and the
+     * target a buddy of theirs). Empty when there is no live provider.
+     */
+    QList<GameInviteOption> inviteOptionsForUser(const QString &userName) const;
+
+    /** Whether at least one invite link is currently available for @p userName. */
+    bool hasGameInviteLink(const QString &userName) const
+    {
+        return !inviteOptionsForUser(userName).isEmpty();
+    }
+
+    // Individual action entry points — used by UserInfoPopup to trigger
+    // actions without re-running the full context menu flow.
+    void execChat(const QString &userName);
+    void execInvite(const QString &userName);
+    void execDetails(const QString &userName);
+    void execShowGames(const QString &userName);
+    void execViewPublicDecks(const QString &userName);
+    void execAddToBuddy(const QString &userName);
+    void execRemoveFromBuddy(const QString &userName);
+    void execAddToIgnore(const QString &userName);
+    void execRemoveFromIgnore(const QString &userName);
+    void execKick(int playerId);
+    void execBan(const QString &userName);
+    void execWarn(const QString &userName);
+    void execBanHistory(const QString &userName);
+    void execWarnHistory(const QString &userName);
+    void execAdminNotes(const QString &userName);
+    void execInvestigateUser(const QString &userName);
+    void execAdjustMod(const QString &userName, bool shouldBeMod);
+    void execAdjustJudge(const QString &userName, bool shouldBeJudge);
+    void execAdjustDeveloper(const QString &userName, bool shouldBeDeveloper);
+
+private:
+    void execInvite(const QString &userName, const GameInviteOption &option);
 };
 
 #endif
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 9ae4a42c2..ff3d9a224 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp
@@ -5,19 +5,36 @@
 #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)
@@ -61,11 +78,13 @@ UserInfoBox::UserInfoBox(AbstractClient *_client, bool _editable, QWidget *paren
         buttonsLayout->addWidget(&editButton);
         buttonsLayout->addWidget(&passwordButton);
         buttonsLayout->addWidget(&avatarButton);
+        buttonsLayout->addWidget(&bannerCardButton);
         mainLayout->addLayout(buttonsLayout, 7, 0, 1, 3);
 
         connect(&editButton, &QPushButton::clicked, this, &UserInfoBox::actEdit);
         connect(&passwordButton, &QPushButton::clicked, this, &UserInfoBox::actPassword);
         connect(&avatarButton, &QPushButton::clicked, this, &UserInfoBox::actAvatar);
+        connect(&bannerCardButton, &QPushButton::clicked, this, &UserInfoBox::actBannerCard);
     }
 
     setWindowTitle(tr("User Information"));
@@ -83,26 +102,21 @@ void UserInfoBox::retranslateUi()
     editButton.setText(tr("Edit"));
     passwordButton.setText(tr("Change password"));
     avatarButton.setText(tr("Change avatar"));
-}
-
-/**
- * Creates the default profile pic that is used when the user doesn't have a custom pic
- */
-static QPixmap createDefaultAvatar(int height, const ServerInfo_User &user)
-{
-    return UserLevelPixmapGenerator::generatePixmap(height, UserLevelFlags(user.user_level()), user.pawn_colors(),
-                                                    false, QString::fromStdString(user.privlevel()));
+    bannerCardButton.setText(tr("Edit Banner Card"));
 }
 
 void UserInfoBox::updateInfo(const ServerInfo_User &user)
 {
-    currentUserInfo = &user;
+    currentUserInfo = user;
+    hasUserInfo = true;
 
     const UserLevelFlags userLevel(user.user_level());
+    pawnColors = user.pawn_colors();
+    privLevel = QString::fromStdString(user.privlevel());
 
     const std::string &bmp = user.avatar_bmp();
     if (!avatarPixmap.loadFromData((const uchar *)bmp.data(), static_cast<uint>(bmp.size()))) {
-        avatarPixmap = createDefaultAvatar(64, user);
+        avatarPixmap = UserLevelPixmapGenerator::generatePixmap(64, userLevel, pawnColors, false, privLevel);
         hasAvatar = false;
     } else {
         hasAvatar = true;
@@ -120,20 +134,23 @@ void UserInfoBox::updateInfo(const ServerInfo_User &user)
         countryLabel3.setText("");
     }
 
-    userLevelIcon.setPixmap(UserLevelPixmapGenerator::generatePixmap(15, userLevel, user.pawn_colors(), false,
-                                                                     QString::fromStdString(user.privlevel())));
+    userLevelIcon.setPixmap(UserLevelPixmapGenerator::generatePixmap(15, userLevel, pawnColors, false, privLevel));
     QString userLevelText;
-    if (userLevel.testFlag(ServerInfo_User::IsAdmin))
+    if (userLevel.testFlag(ServerInfo_User::IsAdmin)) {
         userLevelText = tr("Administrator");
-    else if (userLevel.testFlag(ServerInfo_User::IsModerator))
+    } else if (userLevel.testFlag(ServerInfo_User::IsDeveloper)) {
+        userLevelText = tr("Developer");
+    } else if (userLevel.testFlag(ServerInfo_User::IsModerator)) {
         userLevelText = tr("Moderator");
-    else if (userLevel.testFlag(ServerInfo_User::IsRegistered))
+    } else if (userLevel.testFlag(ServerInfo_User::IsRegistered)) {
         userLevelText = tr("Registered user");
-    else
+    } else {
         userLevelText = tr("Unregistered user");
+    }
 
-    if (userLevel.testFlag(ServerInfo_User::IsJudge))
+    if (userLevel.testFlag(ServerInfo_User::IsJudge)) {
         userLevelText += " | " + tr("Judge");
+    }
 
     if (user.has_privlevel() && user.privlevel() != "NONE") {
         userLevelText += " | " + QString("%1").arg(user.privlevel().c_str());
@@ -152,15 +169,17 @@ void UserInfoBox::updateInfo(const ServerInfo_User &user)
 QString UserInfoBox::getAgeString(int ageSeconds)
 {
     QString accountAgeString = tr("Unknown");
-    if (ageSeconds <= 0)
+    if (ageSeconds <= 0) {
         return accountAgeString;
+    }
 
     // secsSinceEpoch is in utc
     auto secsSinceEpoch = QDateTime::currentSecsSinceEpoch() - ageSeconds;
     // the date is in local time, fromSecsSinceEpoch expects a timestamp from utc and converts it to local time
     auto date = QDateTime::fromSecsSinceEpoch(secsSinceEpoch).date();
-    if (!date.isValid())
+    if (!date.isValid()) {
         return accountAgeString;
+    }
 
     // now can be local time as the date is also local time
     auto now = QDate::currentDate();
@@ -218,8 +237,9 @@ void UserInfoBox::actEditInternal(const Response &r)
     QString realName = QString::fromStdString(user.real_name());
 
     DlgEditUser dlg(this, email, country, realName);
-    if (!dlg.exec())
+    if (!dlg.exec()) {
         return;
+    }
 
     Command_AccountEdit cmd;
     cmd.set_real_name(dlg.getRealName().toStdString());
@@ -231,8 +251,9 @@ void UserInfoBox::actEditInternal(const Response &r)
                 getTextWithMax(this, tr("Enter Password"),
                                tr("Password verification is required in order to change your email address"),
                                QLineEdit::Password, "", &ok);
-            if (!ok)
+            if (!ok) {
                 return;
+            }
             cmd.set_password_check(password.toStdString());
             cmd.set_email(dlg.getEmail().toStdString());
         } // servers that support password hash do not require all fields to be filled anymore
@@ -250,8 +271,9 @@ void UserInfoBox::actEditInternal(const Response &r)
 void UserInfoBox::actPassword()
 {
     DlgEditPassword dlg(this);
-    if (!dlg.exec())
+    if (!dlg.exec()) {
         return;
+    }
 
     auto oldPassword = dlg.getOldPassword();
     auto newPassword = dlg.getNewPassword();
@@ -296,8 +318,9 @@ void UserInfoBox::changePassword(const QString &oldPassword, const QString &newP
 void UserInfoBox::actAvatar()
 {
     DlgEditAvatar dlg(this);
-    if (!dlg.exec())
+    if (!dlg.exec()) {
         return;
+    }
 
     Command_AccountImage cmd;
     cmd.set_image(dlg.getImage().data(), dlg.getImage().size());
@@ -308,6 +331,50 @@ void UserInfoBox::actAvatar()
     client->sendCommand(pend);
 }
 
+void UserInfoBox::actBannerCard()
+{
+    CardArtParams initial;
+    if (hasUserInfo && currentUserInfo.has_card_art_params()) {
+        const auto &cap = currentUserInfo.card_art_params();
+        initial.cardName = QString::fromStdString(cap.card_name());
+        initial.cardProviderId = QString::fromStdString(cap.card_provider_id());
+        initial.marginPctL = cap.margin_pct_l();
+        initial.marginPctR = cap.margin_pct_r();
+        initial.verticalOffset = cap.vertical_offset();
+        initial.zoom = cap.zoom();
+    }
+
+    UserCardArtSettingsDialog dlg(initial, this);
+    if (dlg.exec() != QDialog::Accepted) {
+        return;
+    }
+
+    const CardArtParams p = dlg.params();
+
+    Command_SetCardArtParams cmd;
+    cmd.set_card_name(p.cardName.toStdString());
+    if (!p.cardName.isEmpty()) {
+        cmd.set_card_provider_id(p.cardProviderId.toStdString());
+        cmd.set_margin_pct_l(p.marginPctL);
+        cmd.set_margin_pct_r(p.marginPctR);
+        cmd.set_vertical_offset(p.verticalOffset);
+        cmd.set_zoom(p.zoom);
+    }
+
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, [p, this](const Response &r) {
+        if (r.response_code() != Response::RespOk) {
+            QMessageBox::critical(this, tr("Error"),
+                                  tr("The selected card is blacklisted on this server or another error occurred."));
+        } else {
+            updateInfo(nameLabel.text()); // re-fetch so currentUserInfo reflects the change
+            QMessageBox::information(this, tr("Information"),
+                                     p.cardName.isEmpty() ? tr("Banner card removed.") : tr("Banner card updated."));
+        }
+    });
+    client->sendCommand(pend);
+}
+
 void UserInfoBox::processEditResponse(const Response &r)
 {
     switch (r.response_code()) {
@@ -365,7 +432,7 @@ void UserInfoBox::processAvatarResponse(const Response &r)
             break;
         case Response::RespInternalError:
         default:
-            QMessageBox::critical(this, tr("Error"), tr("An error occured while trying to updater your avatar."));
+            QMessageBox::critical(this, tr("Error"), tr("An error occured while trying to update your avatar."));
             break;
     }
 }
@@ -377,7 +444,7 @@ void UserInfoBox::resizeEvent(QResizeEvent *event)
         resizedPixmap = avatarPixmap.scaled(avatarPic.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
     } else {
         int height = qMin(avatarPic.size().width(), avatarPic.size().height());
-        resizedPixmap = createDefaultAvatar(height, *currentUserInfo);
+        resizedPixmap = UserLevelPixmapGenerator::generatePixmap(height, userLevel, pawnColors, false, privLevel);
     }
     avatarPic.setPixmap(resizedPixmap);
 
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 d3d926bed..6bc571a37 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_box.h
+++ b/cockatrice/src/interface/widgets/server/user/user_info_box.h
@@ -1,18 +1,22 @@
 /**
  * @file user_info_box.h
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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>
 
-class ServerInfo_User;
 class AbstractClient;
 class Response;
 
@@ -24,10 +28,14 @@ private:
     bool editable;
     QLabel avatarPic, userLevelIcon, nameLabel, realNameLabel1, realNameLabel2, countryLabel1, countryLabel2,
         countryLabel3, userLevelLabel1, userLevelLabel2, accountAgeLabel1, accountAgeLabel2;
-    QPushButton editButton, passwordButton, avatarButton;
+    QPushButton editButton, passwordButton, avatarButton, bannerCardButton;
     QPixmap avatarPixmap;
     bool hasAvatar;
-    const ServerInfo_User *currentUserInfo;
+    ServerInfo_User currentUserInfo;
+    bool hasUserInfo = false;
+    UserLevelFlags userLevel;
+    ServerInfo_User::PawnColorsOverride pawnColors;
+    QString privLevel;
 
     static QString getAgeString(int ageSeconds);
 
@@ -35,12 +43,6 @@ public:
     UserInfoBox(AbstractClient *_client, bool editable, QWidget *parent = nullptr, Qt::WindowFlags flags = {});
     void retranslateUi();
 
-    inline static QPair<int, int> getDaysAndYearsBetween(const QDate &then, const QDate &now)
-    {
-        int years = now.addDays(1 - then.dayOfYear()).year() - then.year(); // there is no yearsTo
-        int days = then.addYears(years).daysTo(now);
-        return {days, years};
-    }
 private slots:
     void processResponse(const Response &r);
     void processEditResponse(const Response &r);
@@ -51,6 +53,7 @@ private slots:
     void actEditInternal(const Response &r);
     void actPassword();
     void actAvatar();
+    void actBannerCard();
 public slots:
     void updateInfo(const ServerInfo_User &user);
     void updateInfo(const QString &userName);
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 069e438a9..d23ac63ba 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp
@@ -2,7 +2,11 @@
 
 #include "../../../../client/settings/cache_settings.h"
 
-#include <QDebug>
+#include <QList>
+#include <QMessageLogger>
+#include <QSharedPointer>
+#include <QVariant>
+#include <libcockatrice/settings/servers_settings.h>
 #include <utility>
 
 UserConnection_Information::UserConnection_Information() = default;
@@ -53,8 +57,9 @@ QStringList UserConnection_Information::getServerInfo(const QString &find)
     for (int i = 0; i < size; i++) {
         QString _saveName = servers.getValue(QString("saveName%1").arg(i), "server", "server_details").toString();
 
-        if (find != _saveName)
+        if (find != _saveName) {
             continue;
+        }
 
         QString serverName = servers.getValue(QString("server%1").arg(i), "server", "server_details").toString();
         QString portNum = servers.getValue(QString("port%1").arg(i), "server", "server_details").toString();
@@ -73,8 +78,9 @@ QStringList UserConnection_Information::getServerInfo(const QString &find)
         break;
     }
 
-    if (_server.empty())
+    if (_server.empty()) {
         qCWarning(UserInfoConnectionLog) << "There was a problem!";
+    }
 
     return _server;
 }
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 cfba22346..b44d97d42 100644
--- a/cockatrice/src/interface/widgets/server/user/user_info_connection.h
+++ b/cockatrice/src/interface/widgets/server/user/user_info_connection.h
@@ -1,18 +1,17 @@
 /**
  * @file user_info_connection.h
  * @ingroup Client
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef USERCONNECTION_INFORMATION_H
 #define USERCONNECTION_INFORMATION_H
 
-#include <QApplication>
-#include <QDir>
-#include <QFile>
 #include <QLoggingCategory>
-#include <QSettings>
-#include <QStandardPaths>
+#include <QMap>
+#include <QString>
+#include <QStringList>
+#include <utility>
 
 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
new file mode 100644
index 000000000..c3e880084
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp
@@ -0,0 +1,823 @@
+#include "user_info_popup.h"
+
+#include "../../cards/art_crop_attribution.h"
+#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 <QPushButton>
+#include <QRect>
+#include <QRectF>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
+#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/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)
+{
+    return color.name(QColor::HexArgb);
+}
+
+PopupTheme PopupTheme::fromPalette(const QPalette &palette, bool dark)
+{
+    PopupTheme t;
+    t.dark = dark;
+    const QColor window = palette.color(QPalette::Window);
+    const QColor base = palette.color(QPalette::Base);
+    const QColor mid = palette.color(QPalette::Mid);
+    const QColor text = palette.color(QPalette::Text);
+    const QColor disabledText = palette.color(QPalette::Disabled, QPalette::Text);
+    const QColor highlight = palette.color(QPalette::Highlight);
+
+    t.bg = window;
+    t.border = mid;
+    t.text = text;
+    t.subText = disabledText;
+    t.statusText = disabledText;
+    t.buttonBg = base;
+    t.buttonBorder = mid;
+    t.buttonHover = UserListPainter::blend(base, highlight, dark ? 0.30 : 0.12);
+    t.buttonPressed = UserListPainter::blend(base, highlight, dark ? 0.50 : 0.25);
+    t.buttonDisabled = disabledText;
+    t.closeBg = UserListPainter::blend(base, window, 0.5);
+    t.closeHover = dark ? QColor(200, 50, 50) : UserListPainter::blend(QColor(200, 50, 50), base, 0.45);
+    t.gamesRow = base;
+    t.gamesSelected = UserListPainter::blend(base, highlight, dark ? 0.45 : 0.30);
+    t.gamesSeparator = mid;
+    t.gamesSeparator.setAlpha(90);
+    return t;
+}
+
+// ── Compact game row delegate ─────────────────────────────────────────────────
+
+class PopupGameDelegate : public QStyledItemDelegate
+{
+public:
+    using QStyledItemDelegate::QStyledItemDelegate;
+
+    QSize sizeHint(const QStyleOptionViewItem &, const QModelIndex &) const override
+    {
+        return QSize(0, 38);
+    }
+
+    void paint(QPainter *p, const QStyleOptionViewItem &option, const QModelIndex &index) const override
+    {
+        const QVariant var = index.data(PopupRoles::GameData);
+        if (!var.isValid()) {
+            QStyledItemDelegate::paint(p, option, index);
+            return;
+        }
+
+        p->save();
+        p->setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
+
+        const QRect rect = option.rect;
+        const ServerInfo_Game game = var.value<ServerInfo_Game>();
+        const bool selected = option.state & QStyle::State_Selected;
+        const bool dark = themeManager && themeManager->isDarkModeActive();
+        // The widget palette can be stale after a runtime theme change, so the
+        // rows are styled from the application palette (always current).
+        const QPalette pal = qApp->palette();
+        const QColor base = pal.color(QPalette::Base);
+        const QColor highlight = pal.color(QPalette::Highlight);
+
+        p->fillRect(rect, selected ? UserListPainter::blend(base, highlight, dark ? 0.45 : 0.30) : base);
+
+        // State colour dot
+        const QColor dot = game.started()                                ? QColor(239, 68, 68)
+                           : (game.player_count() >= game.max_players()) ? QColor(249, 115, 22)
+                           : game.with_password()                        ? QColor(59, 130, 246)
+                                                                         : QColor(34, 197, 94);
+        p->setPen(Qt::NoPen);
+        p->setBrush(dot);
+        p->drawEllipse(QRectF(rect.left() + 9, rect.top() + (rect.height() - 8) / 2.0, 8, 8));
+
+        // Game title (bold, elided)
+        QFont tf = option.font;
+        tf.setBold(true);
+        p->setFont(tf);
+        p->setPen(pal.color(QPalette::Text));
+        const int textX = rect.left() + 26;
+        const int countW = 52;
+        const int titleW = rect.width() - textX - countW - 6;
+        p->drawText(QRect(textX, rect.top(), titleW, rect.height()), Qt::AlignVCenter | Qt::AlignLeft,
+                    QFontMetrics(tf).elidedText(QString::fromStdString(game.description()), Qt::ElideRight, titleW));
+
+        // Player count
+        const bool full = game.player_count() >= game.max_players();
+        p->setFont(option.font);
+        p->setPen(full ? QColor(249, 115, 22) : pal.color(QPalette::Disabled, QPalette::Text));
+        p->drawText(QRect(rect.right() - countW - 4, rect.top(), countW, rect.height()),
+                    Qt::AlignVCenter | Qt::AlignRight,
+                    QStringLiteral("%1/%2").arg(game.player_count()).arg(game.max_players()));
+
+        // Row separator
+        QColor separator = pal.color(QPalette::Mid);
+        separator.setAlpha(90);
+        p->setPen(separator);
+        p->drawLine(rect.bottomLeft(), rect.bottomRight());
+
+        p->restore();
+    }
+};
+
+// ── UserInfoHeaderWidget ──────────────────────────────────────────────────────
+
+UserInfoHeaderWidget::UserInfoHeaderWidget(QWidget *parent) : QWidget(parent)
+{
+    setFixedHeight(HeaderHeight);
+    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+}
+
+void UserInfoHeaderWidget::setUserData(const ServerInfo_User &_user,
+                                       bool _online,
+                                       const QPixmap &_avatar,
+                                       const QPixmap &_cardArt,
+                                       const CardArtParams &_params)
+{
+    user = _user;
+    online = _online;
+    avatar = _avatar;
+    cardArt = _cardArt;
+    params = _params;
+
+    attribution.clear();
+    if (user.has_card_art_params()) {
+        const ExactCard card =
+            CardDatabaseManager::query()->getCard({QString::fromStdString(user.card_art_params().card_name()),
+                                                   QString::fromStdString(user.card_art_params().card_provider_id())});
+        if (card) {
+            attribution = buildArtAttribution(card);
+        }
+    }
+    update();
+}
+
+void UserInfoHeaderWidget::paintEvent(QPaintEvent *)
+{
+    QPainter p(this);
+    p.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::TextAntialiasing);
+
+    const QRect rect = this->rect();
+    const UserLevelFlags level(user.user_level());
+    const QString userName = QString::fromStdString(user.name());
+    const QString privLevel = QString::fromStdString(user.privlevel());
+
+    const bool dark = themeManager && themeManager->isDarkModeActive();
+    const UserListPainter::Style style = UserListPainter::resolveStyle(qApp->palette(), dark);
+
+    // Palette surface
+    {
+        QLinearGradient bg(0, 0, rect.width(), 0);
+        bg.setColorAt(0, style.cardStart);
+        bg.setColorAt(1, style.cardEnd);
+        p.fillRect(rect, bg);
+    }
+
+    // ── Card art background ───────────────────────────────────────────────────
+    if (!cardArt.isNull()) {
+        // Same DPR normalization as UserListPainter::drawCardArt: the cache
+        // carries screen scaled pixmaps on HiDPI displays, the math below is
+        // in raw pixels.
+        QPixmap art = cardArt;
+        art.setDevicePixelRatio(1.0);
+
+        const int w = rect.width();
+        const int h = rect.height();
+        const int mL = qRound(w * params.marginPctL);
+        const int mR = qRound(w * params.marginPctR);
+        const int dW = w - mL - mR;
+
+        const double base = qMax(double(dW) / art.width(), double(h) / art.height());
+        const double scale = base * params.zoom;
+        const int sW = qRound(art.width() * scale);
+        const int sH = qRound(art.height() * scale);
+
+        const QPixmap scaled = art.scaled(sW, sH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+        // Clamp against stored zoom < 1, which can push srcX negative and silently
+        // underfill the strip with transparent padding
+        const int safeSrcX = qBound(0, (sW - dW) / 2, qMax(0, sW - dW));
+        const int safeSrcY = qBound(0, qRound((sH - h) * params.verticalOffset), qMax(0, sH - h));
+
+        QImage img =
+            scaled.copy(safeSrcX, safeSrcY, dW, h).toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied);
+        {
+            QPainter mask(&img);
+            mask.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+            QLinearGradient g(0, 0, img.width(), 0);
+            g.setColorAt(0.00, Qt::transparent);
+            g.setColorAt(0.18, Qt::white);
+            g.setColorAt(0.82, Qt::white);
+            g.setColorAt(1.00, Qt::transparent);
+            mask.fillRect(img.rect(), g);
+        }
+        p.setOpacity(0.48);
+        p.drawImage(mL, 0, img);
+        p.setOpacity(1.0);
+    }
+
+    // Bottom gradient overlay so avatar and text are always legible. The scrim
+    // is the palette's Window color so it reads naturally in either scheme.
+    {
+        const QColor scrim = qApp->palette().color(QPalette::Window);
+        QLinearGradient ov(0, 0, 0, rect.height());
+        ov.setColorAt(0.0, QColor(scrim.red(), scrim.green(), scrim.blue(), 0));
+        ov.setColorAt(0.55, QColor(scrim.red(), scrim.green(), scrim.blue(), 110));
+        ov.setColorAt(1.0, QColor(scrim.red(), scrim.green(), scrim.blue(), 230));
+        p.fillRect(rect, ov);
+    }
+
+    // ── Avatar ────────────────────────────────────────────────────────────────
+    const QColor accent = [&]() -> QColor {
+        if (level.testFlag(ServerInfo_User::IsAdmin)) {
+            return QColor(245, 158, 11);
+        }
+        if (level.testFlag(ServerInfo_User::IsDeveloper)) {
+            return QColor(185, 28, 28);
+        }
+        if (level.testFlag(ServerInfo_User::IsModerator)) {
+            return QColor(59, 130, 246);
+        }
+        if (level.testFlag(ServerInfo_User::IsJudge)) {
+            return QColor(168, 85, 247);
+        }
+        return QColor(100, 116, 139);
+    }();
+
+    const int ax = LeftPad;
+    const int ay = rect.height() - AvatarSize - 10;
+    const QRect ar(ax, ay, AvatarSize, AvatarSize);
+
+    QPainterPath clip;
+    clip.addEllipse(ar);
+    p.save();
+    p.setClipPath(clip);
+
+    if (!avatar.isNull()) {
+        p.drawPixmap(ar, avatar.scaled(ar.size(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation));
+    } else {
+        p.setPen(Qt::NoPen);
+        p.setBrush(UserListPainter::blend(accent, style.base, dark ? 0.45 : 0.72));
+        p.drawEllipse(ar);
+        const QPixmap pawn =
+            UserLevelPixmapGenerator::generatePixmap(AvatarPawnSize, level, user.pawn_colors(), false, privLevel);
+        p.drawPixmap(ar.center().x() - AvatarPawnSize / 2, ar.center().y() - AvatarPawnSize / 2, pawn);
+    }
+    p.restore();
+
+    // Status ring
+    p.setPen(QPen(online ? QColor(34, 197, 94) : style.ringOffline, 2.5));
+    p.setBrush(Qt::NoBrush);
+    p.drawEllipse(QRectF(ar).adjusted(-1.25, -1.25, 1.25, 1.25));
+
+    // ── Username + badge ──────────────────────────────────────────────────────
+    const int tx = ax + AvatarSize + AvatarToTextGap;
+    const int tw = rect.width() - tx - 8;
+
+    QFont nf = font();
+    nf.setBold(true);
+    nf.setPointSizeF(nf.pointSizeF() * 1.12);
+    p.setFont(nf);
+    p.setPen(online ? style.textOnline : style.textOffline);
+    p.drawText(QRect(tx, ay, tw, AvatarSize / 2 + 4), Qt::AlignBottom | Qt::AlignLeft,
+               QFontMetrics(nf).elidedText(userName, Qt::ElideRight, tw));
+
+    // Level / priv badge
+    struct
+    {
+        QString text;
+        QColor color;
+    } badge;
+    if (level.testFlag(ServerInfo_User::IsAdmin)) {
+        badge = {"ADMIN", QColor(245, 158, 11)};
+    } else if (level.testFlag(ServerInfo_User::IsDeveloper)) {
+        badge = {"DEV", QColor(185, 28, 28)};
+    } else if (level.testFlag(ServerInfo_User::IsModerator)) {
+        badge = {"MOD", QColor(59, 130, 246)};
+    } else if (level.testFlag(ServerInfo_User::IsJudge)) {
+        badge = {"JUDGE", QColor(168, 85, 247)};
+    } else if (privLevel == "VIP") {
+        badge = {"VIP", QColor(20, 184, 166)};
+    } else if (privLevel == "DONATOR") {
+        badge = {"DONATOR", QColor(249, 115, 22)};
+    }
+
+    if (!badge.text.isEmpty()) {
+        QFont bf = font();
+        bf.setPointSizeF(bf.pointSizeF() * 0.70);
+        bf.setBold(true);
+        p.setFont(bf);
+        const QFontMetrics bfm(bf);
+        const int bw = bfm.horizontalAdvance(badge.text) + 10;
+        const QRect br(tx, ay + AvatarSize / 2 + 6, bw, 15);
+        p.setPen(Qt::NoPen);
+        p.setBrush(UserListPainter::blend(badge.color, style.base, dark ? 0.55 : 0.78));
+        p.drawRoundedRect(br, 3, 3);
+        p.setPen(dark ? UserListPainter::blend(badge.color, Qt::white, 0.5)
+                      : UserListPainter::blend(badge.color, Qt::black, 0.35));
+        p.drawText(br, Qt::AlignCenter, badge.text);
+    }
+
+    // The painter font at this point depends on whether a badge was drawn
+    // (badge font vs username font), so pin an explicit font for the pill.
+    p.setFont(font());
+
+    // Only show the attribution when there is actually art on screen: on a
+    // cache miss cardArt is null and the pill would float over the plain
+    // header with no art behind it.
+    if (!cardArt.isNull()) {
+        paintArtAttribution(p, rect, attribution, Qt::AlignRight | Qt::AlignBottom, 0.8);
+    }
+}
+
+// ── UserInfoPopup ─────────────────────────────────────────────────────────────
+
+UserInfoPopup::UserInfoPopup(TabSupervisor *_ts,
+                             AbstractClient *_client,
+                             const QMap<QString, QPixmap> *_avatarCache,
+                             const QMap<QString, QPixmap> *_cardArtCache,
+                             const QMap<QString, CardArtParams> *_cardArtParamsMap,
+                             QWidget *parent)
+    : QFrame(parent, Qt::Tool | Qt::FramelessWindowHint), ts(_ts), client(_client), avatarCache(_avatarCache),
+      cardArtCache(_cardArtCache), cardArtParamsMap(_cardArtParamsMap)
+{
+    setAttribute(Qt::WA_ShowWithoutActivating);
+    setFixedWidth(PopupWidth);
+    setFrameShape(QFrame::NoFrame);
+    buildUi();
+
+    // Restyle the popup chrome when the theme or its color scheme changes.
+    if (themeManager) {
+        connect(themeManager, &ThemeManager::themeChanged, this, &UserInfoPopup::applyTheme);
+    }
+}
+
+void UserInfoPopup::buildUi()
+{
+    auto *root = new QVBoxLayout(this);
+    root->setContentsMargins(0, 0, 0, 0);
+    root->setSpacing(0);
+
+    // Header
+    header = new UserInfoHeaderWidget(this);
+    root->addWidget(header);
+
+    // Action area, rebuilt per user
+    actionArea = new QWidget(this);
+    root->addWidget(actionArea);
+
+    // Thin separator
+    separator = new QFrame(this);
+    separator->setFrameShape(QFrame::HLine);
+    root->addWidget(separator);
+
+    // Games header row
+    auto *gh = new QHBoxLayout;
+    gh->setContentsMargins(10, 4, 8, 2);
+    gamesLabel = new QLabel(tr("Games"), this);
+    gh->addWidget(gamesLabel);
+    gh->addStretch();
+    refreshBtn = new QPushButton(QStringLiteral("↻"), this);
+    refreshBtn->setFixedSize(20, 20);
+    refreshBtn->setFlat(true);
+    connect(refreshBtn, &QPushButton::clicked, this, &UserInfoPopup::refreshGames);
+    gh->addWidget(refreshBtn);
+    root->addLayout(gh);
+
+    // Status label
+    gamesStatus = new QLabel(this);
+    gamesStatus->setAlignment(Qt::AlignCenter);
+    root->addWidget(gamesStatus);
+
+    // Games list
+    gamesModel = new QStandardItemModel(this);
+    gamesView = new QListView(this);
+    gamesView->setModel(gamesModel);
+    gamesView->setItemDelegate(new PopupGameDelegate(gamesView));
+    gamesView->setFrameShape(QFrame::NoFrame);
+    gamesView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    gamesView->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    gamesView->setMaximumHeight(220);
+    gamesView->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(gamesView, &QListView::customContextMenuRequested, this, &UserInfoPopup::onGamesContextMenu);
+
+    root->addWidget(gamesView);
+
+    // Close button, positioned absolutely in the top right corner
+    closeBtn = new QPushButton(QStringLiteral("✕"), this);
+    closeBtn->setFixedSize(22, 22);
+    closeBtn->setFlat(true);
+    connect(closeBtn, &QPushButton::clicked, this, &UserInfoPopup::closeRequested);
+
+    applyTheme();
+}
+
+void UserInfoPopup::applyTheme()
+{
+    const bool dark = themeManager && themeManager->isDarkModeActive();
+    theme = PopupTheme::fromPalette(qApp->palette(), dark);
+
+    setStyleSheet(QStringLiteral("UserInfoPopup {"
+                                 "  background:%1;"
+                                 "  border:1px solid %2;"
+                                 "  border-radius:8px;"
+                                 "}")
+                      .arg(colorStr(theme.bg), colorStr(theme.border)));
+
+    actionArea->setStyleSheet(QStringLiteral("background:%1;").arg(colorStr(theme.bg)));
+
+    separator->setStyleSheet(QStringLiteral("color:%1; margin: 0 8px;").arg(colorStr(theme.border)));
+
+    gamesLabel->setStyleSheet(QStringLiteral("color:%1; font-size:11px; font-weight:bold; background:transparent;")
+                                  .arg(colorStr(theme.subText)));
+
+    refreshBtn->setStyleSheet(QStringLiteral("QPushButton{color:%1;border:none;font-size:14px;background:transparent;}"
+                                             "QPushButton:hover{color:%2;}")
+                                  .arg(colorStr(theme.subText), colorStr(theme.text)));
+
+    gamesStatus->setStyleSheet(QStringLiteral("color:%1; font-size:11px; padding:10px; background:transparent;")
+                                   .arg(colorStr(theme.statusText)));
+
+    gamesView->setStyleSheet(QStringLiteral("QListView{background:%1;border:none;}"
+                                            "QListView::item:selected{background:%2;}")
+                                 .arg(colorStr(theme.gamesRow), colorStr(theme.gamesSelected)));
+
+    closeBtn->setStyleSheet(
+        QStringLiteral("QPushButton{background:%1;color:%2;"
+                       "border:none;border-radius:11px;font-size:10px;}"
+                       "QPushButton:hover{color:%3;background:%4;}")
+            .arg(colorStr(theme.closeBg), colorStr(theme.subText), colorStr(theme.text), colorStr(theme.closeHover)));
+
+    header->update();
+}
+
+// ── Action button factory ─────────────────────────────────────────────────────
+
+static QPushButton *makeBtn(const QString &label, const QString &tip, QWidget *p, const PopupTheme &t)
+{
+    auto *b = new QPushButton(label, p);
+    b->setToolTip(tip);
+    b->setFixedHeight(26);
+    b->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    b->setStyleSheet(QStringLiteral("QPushButton{"
+                                    "  background:%1;color:%2;border:1px solid %3;"
+                                    "  border-radius:4px;font-size:11px;padding:0 4px;"
+                                    "}"
+                                    "QPushButton:hover{background:%4;color:%5;}"
+                                    "QPushButton:pressed{background:%6;}"
+                                    "QPushButton:disabled{color:%7;border-color:%3;}")
+                         .arg(colorStr(t.buttonBg), colorStr(t.text), colorStr(t.buttonBorder), colorStr(t.buttonHover),
+                              colorStr(t.text), colorStr(t.buttonPressed), colorStr(t.buttonDisabled)));
+    return b;
+}
+
+void UserInfoPopup::rebuildActionButtons(const ServerInfo_User &userInfo, bool online, bool isBuddy, bool isIgnored)
+{
+    // Clear previous contents
+    delete actionArea->layout();
+    const auto old = actionArea->findChildren<QPushButton *>(QString{}, Qt::FindDirectChildrenOnly);
+    for (auto *w : old) {
+        w->deleteLater();
+    }
+
+    const QString name = QString::fromStdString(userInfo.name());
+    const auto ownLevel = UserLevelFlags(ts->getUserInfo()->user_level());
+    const bool isSelf = (name == QString::fromStdString(ts->getUserInfo()->name()));
+    const bool isMod = ownLevel.testFlag(ServerInfo_User::IsModerator);
+    const bool isAdmin = ownLevel.testFlag(ServerInfo_User::IsAdmin);
+    const auto their = UserLevelFlags(userInfo.user_level());
+    const bool isReg = their.testFlag(ServerInfo_User::IsRegistered);
+
+    auto *grid = new QGridLayout(actionArea);
+    grid->setContentsMargins(8, 6, 8, 6);
+    grid->setSpacing(4);
+
+    int row = 0, col = 0;
+    const int cols = 3;
+    auto add = [&](QPushButton *btn) {
+        grid->addWidget(btn, row, col);
+        if (++col == cols) {
+            col = 0;
+            ++row;
+        }
+    };
+
+    // ── Always visible ────────────────────────────────────────────────────────
+    auto *chat = makeBtn(tr("Chat"), tr("Open private chat"), actionArea, theme);
+    chat->setEnabled(!isSelf && online);
+    connect(chat, &QPushButton::clicked, this, [this, name] { emit chatRequested(name); });
+    add(chat);
+
+    auto *prof = makeBtn(tr("Profile"), tr("View user profile"), actionArea, theme);
+    connect(prof, &QPushButton::clicked, this, [this, name] { emit detailsRequested(name); });
+    add(prof);
+
+    auto *games = makeBtn(tr("Games"), tr("Show this user's games"), actionArea, theme);
+    games->setEnabled(!isSelf && online);
+    connect(games, &QPushButton::clicked, this, [this, name] { emit showGamesRequested(name); });
+    add(games);
+
+    // ── Invite (only while the inviter has a joinable game for this user) ────
+    if (!isSelf && online && gameInviteAvailable && gameInviteAvailable(name)) {
+        auto *invite = makeBtn(tr("Invite"), tr("Invite to your game"), actionArea, theme);
+        connect(invite, &QPushButton::clicked, this, [this, name] { emit inviteRequested(name); });
+        add(invite);
+    }
+
+    // ── Buddy / ignore (registered users only) ────────────────────────────────
+    if (!isSelf && isReg) {
+        if (isBuddy) {
+            auto *b = makeBtn(tr("− Buddy"), tr("Remove from buddy list"), actionArea, theme);
+            connect(b, &QPushButton::clicked, this, [this, name] { emit removeBuddyRequested(name); });
+            add(b);
+        } else {
+            auto *b = makeBtn(tr("+ Buddy"), tr("Add to buddy list"), actionArea, theme);
+            connect(b, &QPushButton::clicked, this, [this, name] { emit addBuddyRequested(name); });
+            add(b);
+        }
+        if (isIgnored) {
+            auto *b = makeBtn(tr("− Ignore"), tr("Remove from ignore list"), actionArea, theme);
+            connect(b, &QPushButton::clicked, this, [this, name] { emit removeIgnoreRequested(name); });
+            add(b);
+        } else {
+            auto *b = makeBtn(tr("+ Ignore"), tr("Add to ignore list"), actionArea, theme);
+            connect(b, &QPushButton::clicked, this, [this, name] { emit addIgnoreRequested(name); });
+            add(b);
+        }
+    }
+
+    // ── Moderator actions ─────────────────────────────────────────────────────
+    if (!isSelf && (isMod || isAdmin)) {
+        if (col != 0) {
+            ++row;
+            col = 0;
+        } // start mod section on a fresh row
+
+        auto *ban = makeBtn(tr("Ban"), tr("Ban from server"), actionArea, theme);
+        auto *warn = makeBtn(tr("Warn"), tr("Warn user"), actionArea, theme);
+        auto *bLog = makeBtn(tr("Ban log"), tr("View ban history"), actionArea, theme);
+        auto *wLog = makeBtn(tr("Warn log"), tr("View warning history"), actionArea, theme);
+        connect(ban, &QPushButton::clicked, this, [this, name] { emit banRequested(name); });
+        connect(warn, &QPushButton::clicked, this, [this, name] { emit warnRequested(name); });
+        connect(bLog, &QPushButton::clicked, this, [this, name] { emit banHistoryRequested(name); });
+        connect(wLog, &QPushButton::clicked, this, [this, name] { emit warnHistoryRequested(name); });
+        add(ban);
+        add(warn);
+        add(bLog);
+        add(wLog);
+    }
+
+    // ── Admin actions ─────────────────────────────────────────────────────────
+    if (!isSelf && isAdmin) {
+        auto *notes = makeBtn(tr("Notes"), tr("View admin notes"), actionArea, theme);
+        connect(notes, &QPushButton::clicked, this, [this, name] { emit adminNotesRequested(name); });
+        add(notes);
+
+        if (their.testFlag(ServerInfo_User::IsModerator)) {
+            auto *b = makeBtn(tr("− Mod"), tr("Demote from moderator"), actionArea, theme);
+            connect(b, &QPushButton::clicked, this, [this, name] { emit demoteFromModRequested(name); });
+            add(b);
+        } else if (isReg) {
+            auto *b = makeBtn(tr("+ Mod"), tr("Promote to moderator"), actionArea, theme);
+            connect(b, &QPushButton::clicked, this, [this, name] { emit promoteToModRequested(name); });
+            add(b);
+        }
+        if (their.testFlag(ServerInfo_User::IsJudge)) {
+            auto *b = makeBtn(tr("− Judge"), tr("Demote from judge"), actionArea, theme);
+            connect(b, &QPushButton::clicked, this, [this, name] { emit demoteFromJudgeRequested(name); });
+            add(b);
+        } else if (isReg) {
+            auto *b = makeBtn(tr("+ Judge"), tr("Promote to judge"), actionArea, theme);
+            connect(b, &QPushButton::clicked, this, [this, name] { emit promoteToJudgeRequested(name); });
+            add(b);
+        }
+    }
+
+    actionArea->adjustSize();
+}
+
+void UserInfoPopup::updateActionButtons(const ServerInfo_User &userInfo, bool online, bool isBuddy, bool isIgnored)
+{
+    rebuildActionButtons(userInfo, online, isBuddy, isIgnored);
+    adjustSize();
+}
+
+void UserInfoPopup::onGamesContextMenu(const QPoint &pos)
+{
+    const QModelIndex idx = gamesView->indexAt(pos);
+    if (!idx.isValid()) {
+        return;
+    }
+
+    const QVariant var = idx.data(PopupRoles::GameData);
+    if (!var.isValid()) {
+        return;
+    }
+    const ServerInfo_Game game = var.value<ServerInfo_Game>();
+
+    QMenu menu(this);
+    menu.setStyleSheet(
+        QStringLiteral("QMenu{background:%1;color:%2;border:1px solid %3;border-radius:4px;}"
+                       "QMenu::item:selected{background:%4;}")
+            .arg(colorStr(theme.bg), colorStr(theme.text), colorStr(theme.border), colorStr(theme.buttonHover)));
+
+    // Never grey the join action out: GameSelector::joinGame() asks whether to
+    // fall back to spectating when the game is full or already running, so a
+    // disabled entry would just read as a dead button.
+    QAction *join = menu.addAction(tr("Join game"));
+
+    QAction *spec = nullptr;
+    if (game.spectators_allowed()) {
+        spec = menu.addAction(tr("Spectate"));
+    }
+
+    const QAction *chosen = menu.exec(gamesView->viewport()->mapToGlobal(pos));
+    if (!chosen) {
+        return;
+    }
+
+    if (chosen == join) {
+        emit joinGameRequested(game.game_id(), game.room_id(), false);
+    } else if (spec && chosen == spec) {
+        emit joinGameRequested(game.game_id(), game.room_id(), true);
+    }
+}
+
+// ── showForUser ───────────────────────────────────────────────────────────────
+
+void UserInfoPopup::refreshHeader()
+{
+    if (currentUser.isEmpty()) {
+        return;
+    }
+
+    const QPixmap avatar = avatarCache ? avatarCache->value(currentUser) : QPixmap{};
+    const CardArtParams params = (cardArtParamsMap && cardArtParamsMap->contains(currentUser))
+                                     ? cardArtParamsMap->value(currentUser)
+                                     : CardArtParams{};
+    const QString artKey = currentUser + u'|' + params.cardName + u'|' + params.cardProviderId;
+    const QPixmap cardArt = (cardArtCache && !params.cardName.isEmpty()) ? cardArtCache->value(artKey) : QPixmap{};
+    header->setUserData(currentUserInfo, currentOnline, avatar, cardArt, params);
+}
+
+void UserInfoPopup::showForUser(const QString &userName,
+                                const ServerInfo_User &userInfo,
+                                bool online,
+                                bool isBuddy,
+                                bool isIgnored)
+{
+    currentUser = userName;
+    currentUserInfo = userInfo;
+    currentOnline = online;
+
+    // Header
+    refreshHeader();
+
+    // Actions
+    rebuildActionButtons(userInfo, online, isBuddy, isIgnored);
+
+    // Games list reset
+    gamesModel->clear();
+    gamesView->hide();
+    gamesStatus->setText(tr("Loading games…"));
+    gamesStatus->show();
+
+    // Close button, top right corner, above everything
+    closeBtn->move(PopupWidth - closeBtn->width() - 6, 6);
+    closeBtn->raise();
+
+    adjustSize();
+    fetchGames();
+}
+
+// ── Games fetch ───────────────────────────────────────────────────────────────
+
+void UserInfoPopup::fetchGames()
+{
+    if (!client || currentUser.isEmpty()) {
+        return;
+    }
+
+    Command_GetGamesOfUser cmd;
+    cmd.set_user_name(currentUser.toStdString());
+
+    const QString snapshot = currentUser;
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this,
+            [this, snapshot](const Response &r) { onGamesReceived(r, snapshot); });
+    client->sendCommand(pend);
+}
+
+void UserInfoPopup::onGamesReceived(const Response &r, const QString &forUser)
+{
+    if (forUser != currentUser) {
+        return; // stale response, different user showing now
+    }
+
+    gamesModel->clear();
+
+    if (r.response_code() != Response::RespOk) {
+        gamesStatus->setText(tr("Could not load games."));
+        gamesStatus->show();
+        gamesView->hide();
+        return;
+    }
+
+    const auto &resp = r.GetExtension(Response_GetGamesOfUser::ext);
+    if (resp.game_list_size() == 0) {
+        gamesStatus->setText(tr("No active games."));
+        gamesStatus->show();
+        gamesView->hide();
+        return;
+    }
+
+    for (int i = 0; i < resp.game_list_size(); ++i) {
+        auto *item = new QStandardItem;
+        item->setData(QVariant::fromValue(resp.game_list(i)), PopupRoles::GameData);
+        item->setEditable(false);
+        gamesModel->appendRow(item);
+    }
+
+    gamesStatus->hide();
+    gamesView->show();
+
+    // Fit exactly to the number of visible rows, scroll when more than 5
+    constexpr int rowH = 38; // must match PopupGameDelegate::sizeHint
+    constexpr int maxRows = 5;
+    const int count = gamesModel->rowCount();
+    const int visible = qMin(count, maxRows);
+    gamesView->setFixedHeight(visible * rowH + 2);
+    gamesView->setVerticalScrollBarPolicy(count > maxRows ? Qt::ScrollBarAlwaysOn : Qt::ScrollBarAlwaysOff);
+
+    adjustSize();
+}
+
+void UserInfoPopup::refreshGames()
+{
+    gamesModel->clear();
+    gamesView->hide();
+    gamesStatus->setText(tr("Loading games…"));
+    gamesStatus->show();
+    fetchGames();
+}
+
+// ── Mouse events ──────────────────────────────────────────────────────────────
+
+void UserInfoPopup::enterEvent(QEnterEvent *e)
+{
+    QFrame::enterEvent(e);
+    emit mouseEnteredPopup();
+}
+void UserInfoPopup::leaveEvent(QEvent *e)
+{
+    QFrame::leaveEvent(e);
+    emit mouseLeftPopup();
+}
diff --git a/cockatrice/src/interface/widgets/server/user/user_info_popup.h b/cockatrice/src/interface/widgets/server/user/user_info_popup.h
new file mode 100644
index 000000000..f2a91d025
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_info_popup.h
@@ -0,0 +1,234 @@
+#ifndef COCKATRICE_USER_INFO_POPUP_H
+#define COCKATRICE_USER_INFO_POPUP_H
+
+#include "user_list_painter.h"
+
+#include <QColor>
+#include <QFrame>
+#include <QPalette>
+#include <QPixmap>
+#include <QString>
+#include <QWidget>
+#include <functional>
+#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 ─────────────────────────────────────────────────────────────────────
+
+namespace PopupRoles
+{
+constexpr int GameData = Qt::UserRole + 10;
+}
+
+// Popup theme
+
+/**
+ * Palette-derived colors for the popup chrome. Both color schemes read from
+ * the active QPalette so custom palettes are respected. @c dark only tunes the
+ * blend strengths.
+ */
+struct PopupTheme
+{
+    bool dark = false;
+    QColor bg;
+    QColor border;
+    QColor text;
+    QColor subText;
+    QColor buttonBg;
+    QColor buttonBorder;
+    QColor buttonHover;
+    QColor buttonPressed;
+    QColor buttonDisabled;
+    QColor closeBg;
+    QColor closeHover;
+    QColor gamesRow;
+    QColor gamesSelected;
+    QColor gamesSeparator;
+    QColor statusText;
+
+    static PopupTheme fromPalette(const QPalette &palette, bool dark);
+};
+
+// ── Header widget ─────────────────────────────────────────────────────────────
+
+/**
+ * @class UserInfoHeaderWidget
+ * @brief Paints the enlarged banner card art + circular avatar section at the
+ *        top of the UserInfoPopup.
+ *
+ * Layout mirrors UserListPainter but at a larger scale: the card art fills the
+ * full width as a semi-transparent background, a bottom gradient ensures the
+ * avatar and username text remain legible, and the status ring colour matches
+ * the UserListPainter convention.
+ */
+class UserInfoHeaderWidget : public QWidget
+{
+    Q_OBJECT
+
+    static constexpr int HeaderHeight = 130;
+    static constexpr int AvatarSize = 68;
+    static constexpr int AvatarPawnSize = 46;
+    static constexpr int LeftPad = 14;
+    static constexpr int AvatarToTextGap = 10;
+
+public:
+    explicit UserInfoHeaderWidget(QWidget *parent = nullptr);
+
+    void setUserData(const ServerInfo_User &_user,
+                     bool _online,
+                     const QPixmap &_avatar,
+                     const QPixmap &_cardArt,
+                     const CardArtParams &_params);
+
+protected:
+    void paintEvent(QPaintEvent *e) override;
+
+private:
+    ServerInfo_User user;
+    bool online = false;
+    QPixmap avatar;
+    QPixmap cardArt;
+    CardArtParams params;
+    QString attribution;
+};
+
+// ── Main popup ────────────────────────────────────────────────────────────────
+
+/**
+ * @class UserInfoPopup
+ * @brief Floating panel showing an enlarged user card, quick action buttons,
+ *        and a live scrollable games list.
+ *
+ * Lifecycle (mirrors DeckEditorDeckDockWidget):
+ *   - showForUser() — populate, position externally, call show()
+ *   - mouseEnteredPopup / mouseLeftPopup — caller manages hide timer
+ *   - closeRequested() — emitted by the internal close button
+ *
+ * The popup is a Qt::Tool frameless child so windowOpacity animations and
+ * move() in screen coordinates work identically to CardInfoPictureEnlargedWidget.
+ *
+ * Action signals map 1-to-1 to UserContextMenu::exec*() methods so all action
+ * logic stays in one place.
+ */
+class UserInfoPopup : public QFrame
+{
+    Q_OBJECT
+
+    static constexpr int PopupWidth = 316;
+
+public:
+    explicit UserInfoPopup(TabSupervisor *_ts,
+                           AbstractClient *_client,
+                           const QMap<QString, QPixmap> *_avatarCache,
+                           const QMap<QString, QPixmap> *_cardArtCache,
+                           const QMap<QString, CardArtParams> *_cardArtParamsMap,
+                           QWidget *parent);
+
+    /**
+     * Populate the popup for @p userName and kick off a game list fetch.
+     * Call show() / move() externally after this.
+     */
+    void
+    showForUser(const QString &userName, const ServerInfo_User &userInfo, bool online, bool isBuddy, bool isIgnored);
+    void fetchGames();
+
+    [[nodiscard]] QString getCurrentUser() const
+    {
+        return currentUser;
+    }
+
+    /** Called when buddy/ignore status changes externally while popup is open. */
+    void updateActionButtons(const ServerInfo_User &userInfo, bool online, bool isBuddy, bool isIgnored);
+
+    /** Re-pulls the avatar/card art for the currently shown user (e.g. after it loads). */
+    void refreshHeader();
+
+    /**
+     * Sets a predicate evaluated on every action-button rebuild. It receives
+     * the name of the user the popup currently shows; when it returns true an
+     * "Invite" button is shown. The popup itself never resolves the invite
+     * link, it just forwards the request.
+     */
+    void setGameInviteAvailable(std::function<bool(const QString &userName)> available)
+    {
+        gameInviteAvailable = std::move(available);
+    }
+
+signals:
+    void mouseEnteredPopup();
+    void mouseLeftPopup();
+    void closeRequested();
+
+    /** Emitted when the user requests joining or spectating a game in the list. */
+    void joinGameRequested(int gameId, int roomId, bool asSpectator);
+
+    // ── Action signals — connect to UserContextMenu::exec*() ──────────────────
+    void chatRequested(const QString &userName);
+    void inviteRequested(const QString &userName);
+    void detailsRequested(const QString &userName);
+    void showGamesRequested(const QString &userName);
+    void addBuddyRequested(const QString &userName);
+    void removeBuddyRequested(const QString &userName);
+    void addIgnoreRequested(const QString &userName);
+    void removeIgnoreRequested(const QString &userName);
+    void banRequested(const QString &userName);
+    void warnRequested(const QString &userName);
+    void banHistoryRequested(const QString &userName);
+    void warnHistoryRequested(const QString &userName);
+    void adminNotesRequested(const QString &userName);
+    void promoteToModRequested(const QString &userName);
+    void demoteFromModRequested(const QString &userName);
+    void promoteToJudgeRequested(const QString &userName);
+    void demoteFromJudgeRequested(const QString &userName);
+
+protected:
+    void enterEvent(QEnterEvent *e) override;
+    void leaveEvent(QEvent *e) override;
+
+private slots:
+    void refreshGames();
+    void onGamesReceived(const Response &r, const QString &forUser);
+    void onGamesContextMenu(const QPoint &pos);
+
+private:
+    void buildUi();
+    void applyTheme();
+    void rebuildActionButtons(const ServerInfo_User &userInfo, bool online, bool isBuddy, bool isIgnored);
+
+    TabSupervisor *ts;
+    AbstractClient *client;
+    const QMap<QString, QPixmap> *avatarCache;
+    const QMap<QString, QPixmap> *cardArtCache;
+    const QMap<QString, CardArtParams> *cardArtParamsMap;
+
+    PopupTheme theme;
+
+    QString currentUser;
+    ServerInfo_User currentUserInfo;
+    bool currentOnline = false;
+    std::function<bool(const QString &userName)> gameInviteAvailable;
+
+    UserInfoHeaderWidget *header;
+    QWidget *actionArea; ///< rebuilt per user
+    QLabel *gamesLabel;
+    QFrame *separator;
+    QListView *gamesView;
+    QStandardItemModel *gamesModel;
+    QLabel *gamesStatus;
+    QPushButton *closeBtn;
+    QPushButton *refreshBtn;
+};
+
+#endif // COCKATRICE_USER_INFO_POPUP_H
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_dialog.cpp b/cockatrice/src/interface/widgets/server/user/user_list_dialog.cpp
new file mode 100644
index 000000000..605c89734
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_list_dialog.cpp
@@ -0,0 +1,311 @@
+#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)
+{
+    setAttribute(Qt::WA_DeleteOnClose);
+
+    nameBanCheckBox = new QCheckBox(tr("ban &user name"));
+    nameBanCheckBox->setChecked(true);
+    nameBanEdit = new QLineEdit(QString::fromStdString(info.name()));
+    nameBanEdit->setMaxLength(MAX_NAME_LENGTH);
+    ipBanCheckBox = new QCheckBox(tr("ban &IP address"));
+    ipBanCheckBox->setChecked(true);
+    ipBanEdit = new QLineEdit(QString::fromStdString(info.address()));
+    ipBanEdit->setMaxLength(MAX_NAME_LENGTH);
+    idBanCheckBox = new QCheckBox(tr("ban client I&D"));
+    idBanCheckBox->setChecked(true);
+    idBanEdit = new QLineEdit(QString::fromStdString(info.clientid()));
+    idBanEdit->setMaxLength(MAX_NAME_LENGTH);
+    if (QString::fromStdString(info.clientid()).isEmpty()) {
+        idBanCheckBox->setChecked(false);
+    }
+
+    QGridLayout *banTypeGrid = new QGridLayout;
+    banTypeGrid->addWidget(nameBanCheckBox, 0, 0);
+    banTypeGrid->addWidget(nameBanEdit, 0, 1);
+    banTypeGrid->addWidget(ipBanCheckBox, 1, 0);
+    banTypeGrid->addWidget(ipBanEdit, 1, 1);
+    banTypeGrid->addWidget(idBanCheckBox, 2, 0);
+    banTypeGrid->addWidget(idBanEdit, 2, 1);
+    QGroupBox *banTypeGroupBox = new QGroupBox(tr("Ban type"));
+    banTypeGroupBox->setLayout(banTypeGrid);
+
+    permanentRadio = new QRadioButton(tr("&permanent ban"));
+    temporaryRadio = new QRadioButton(tr("&temporary ban"));
+    temporaryRadio->setChecked(true);
+    connect(temporaryRadio, &QRadioButton::toggled, this, &BanDialog::enableTemporaryEdits);
+    daysLabel = new QLabel(tr("&Days:"));
+    daysEdit = new QSpinBox;
+    daysEdit->setMinimum(0);
+    daysEdit->setValue(0);
+    daysEdit->setMaximum(10000);
+    daysLabel->setBuddy(daysEdit);
+    hoursLabel = new QLabel(tr("&Hours:"));
+    hoursEdit = new QSpinBox;
+    hoursEdit->setMinimum(0);
+    hoursEdit->setValue(0);
+    hoursEdit->setMaximum(24);
+    hoursLabel->setBuddy(hoursEdit);
+    minutesLabel = new QLabel(tr("&Minutes:"));
+    minutesEdit = new QSpinBox;
+    minutesEdit->setMinimum(0);
+    minutesEdit->setValue(5);
+    minutesEdit->setMaximum(60);
+    minutesLabel->setBuddy(minutesEdit);
+    QGridLayout *durationLayout = new QGridLayout;
+    durationLayout->addWidget(permanentRadio, 0, 0, 1, 6);
+    durationLayout->addWidget(temporaryRadio, 1, 0, 1, 6);
+    durationLayout->addWidget(daysLabel, 2, 0);
+    durationLayout->addWidget(daysEdit, 2, 1);
+    durationLayout->addWidget(hoursLabel, 2, 2);
+    durationLayout->addWidget(hoursEdit, 2, 3);
+    durationLayout->addWidget(minutesLabel, 2, 4);
+    durationLayout->addWidget(minutesEdit, 2, 5);
+    QGroupBox *durationGroupBox = new QGroupBox(tr("Duration of the ban"));
+    durationGroupBox->setLayout(durationLayout);
+
+    QLabel *reasonLabel = new QLabel(tr("Please enter the reason for the ban.\n"
+                                        "This is only saved for moderators and cannot be seen by the banned person."));
+    reasonEdit = new QPlainTextEdit;
+
+    QLabel *visibleReasonLabel =
+        new QLabel(tr("Please enter the reason for the ban that will be visible to the banned person."));
+    visibleReasonEdit = new QPlainTextEdit;
+
+    deleteMessages = new QCheckBox(tr("Redact all messages from this user in all rooms"));
+
+    QPushButton *okButton = new QPushButton(tr("&OK"));
+    okButton->setAutoDefault(true);
+    connect(okButton, &QPushButton::clicked, this, &BanDialog::okClicked);
+    QPushButton *cancelButton = new QPushButton(tr("&Cancel"));
+    connect(cancelButton, &QPushButton::clicked, this, &BanDialog::reject);
+
+    QHBoxLayout *buttonLayout = new QHBoxLayout;
+    buttonLayout->addStretch();
+    buttonLayout->addWidget(okButton);
+    buttonLayout->addWidget(cancelButton);
+
+    QVBoxLayout *vbox = new QVBoxLayout;
+    vbox->addWidget(banTypeGroupBox);
+    vbox->addWidget(durationGroupBox);
+    vbox->addWidget(reasonLabel);
+    vbox->addWidget(reasonEdit);
+    vbox->addWidget(visibleReasonLabel);
+    vbox->addWidget(visibleReasonEdit);
+    vbox->addWidget(deleteMessages);
+    vbox->addLayout(buttonLayout);
+
+    setLayout(vbox);
+    setWindowTitle(tr("Ban user from server"));
+}
+
+WarningDialog::WarningDialog(const QString &userName, const QString &clientID, QWidget *parent) : QDialog(parent)
+{
+    setAttribute(Qt::WA_DeleteOnClose);
+    descriptionLabel = new QLabel(tr("Which warning would you like to send?"));
+    nameWarning = new QLineEdit(userName);
+    nameWarning->setMaxLength(MAX_NAME_LENGTH);
+    warnClientID = new QLineEdit(clientID);
+    warnClientID->setMaxLength(MAX_NAME_LENGTH);
+    warningOption = new QComboBox();
+    warningOption->addItem("", "");
+
+    deleteMessages = new QCheckBox(tr("Redact all messages from this user in all rooms"));
+
+    QPushButton *okButton = new QPushButton(tr("&OK"));
+    okButton->setAutoDefault(true);
+    connect(okButton, &QPushButton::clicked, this, &WarningDialog::okClicked);
+    QPushButton *cancelButton = new QPushButton(tr("&Cancel"));
+    connect(cancelButton, &QPushButton::clicked, this, &WarningDialog::reject);
+
+    QHBoxLayout *buttonLayout = new QHBoxLayout;
+    buttonLayout->addStretch();
+    buttonLayout->addWidget(okButton);
+    buttonLayout->addWidget(cancelButton);
+
+    QVBoxLayout *vbox = new QVBoxLayout;
+    vbox->addWidget(descriptionLabel);
+    vbox->addWidget(nameWarning);
+    vbox->addWidget(warningOption);
+    vbox->addWidget(deleteMessages);
+    vbox->addLayout(buttonLayout);
+    setLayout(vbox);
+    setWindowTitle(tr("Warn user for misconduct"));
+}
+
+void WarningDialog::okClicked()
+{
+    if (nameWarning->text().simplified().isEmpty()) {
+        QMessageBox::critical(this, tr("Error"),
+                              tr("User name to send a warning to can not be blank, please specify a user to warn."));
+        return;
+    }
+
+    if (warningOption->currentData().toString().simplified().isEmpty()) {
+        QMessageBox::critical(this, tr("Error"),
+                              tr("Warning to use can not be blank, please select a valid warning to send."));
+        return;
+    }
+
+    accept();
+}
+
+QString WarningDialog::getName() const
+{
+    return nameWarning->text().simplified();
+}
+
+QString WarningDialog::getWarnID() const
+{
+    return warnClientID->text().simplified();
+}
+
+QString WarningDialog::getReason() const
+{
+    return warningOption->currentData().toString().simplified();
+}
+
+int WarningDialog::getDeleteMessages() const
+{
+    return deleteMessages->isChecked() ? -1 : 0;
+}
+
+void WarningDialog::addWarningOption(const QString &warning, int startingIl)
+{
+    if (startingIl > 1) {
+        warningOption->addItem(tr("%1 (IL %2)").arg(warning).arg(startingIl), warning);
+    } else {
+        warningOption->addItem(warning, warning);
+    }
+}
+
+void BanDialog::okClicked()
+{
+    if (!nameBanCheckBox->isChecked() && !ipBanCheckBox->isChecked() && !idBanCheckBox->isChecked()) {
+        QMessageBox::critical(this, tr("Error"),
+                              tr("You have to select a name-based, IP-based, clientId based, or some combination of "
+                                 "the three to place a ban."));
+        return;
+    }
+
+    if (nameBanCheckBox->isChecked()) {
+        if (nameBanEdit->text().simplified() == "") {
+            QMessageBox::critical(this, tr("Error"),
+                                  tr("You must have a value in the name ban when selecting the name ban checkbox."));
+            return;
+        }
+    }
+
+    if (ipBanCheckBox->isChecked()) {
+        if (ipBanEdit->text().simplified() == "") {
+            QMessageBox::critical(this, tr("Error"),
+                                  tr("You must have a value in the ip ban when selecting the ip ban checkbox."));
+            return;
+        }
+    }
+
+    if (idBanCheckBox->isChecked()) {
+        if (idBanEdit->text().simplified() == "") {
+            QMessageBox::critical(
+                this, tr("Error"),
+                tr("You must have a value in the clientid ban when selecting the clientid ban checkbox."));
+            return;
+        }
+    }
+
+    accept();
+}
+
+void BanDialog::enableTemporaryEdits(bool enabled)
+{
+    daysLabel->setEnabled(enabled);
+    daysEdit->setEnabled(enabled);
+    hoursLabel->setEnabled(enabled);
+    hoursEdit->setEnabled(enabled);
+    minutesLabel->setEnabled(enabled);
+    minutesEdit->setEnabled(enabled);
+}
+
+QString BanDialog::getBanId() const
+{
+    return idBanCheckBox->isChecked() ? idBanEdit->text() : QString();
+}
+
+QString BanDialog::getBanName() const
+{
+    return nameBanCheckBox->isChecked() ? nameBanEdit->text() : QString();
+}
+
+QString BanDialog::getBanIP() const
+{
+    return ipBanCheckBox->isChecked() ? ipBanEdit->text() : QString();
+}
+
+int BanDialog::getMinutes() const
+{
+    return permanentRadio->isChecked() ? 0
+                                       : (daysEdit->value() * 24 * 60 + hoursEdit->value() * 60 + minutesEdit->value());
+}
+
+QString BanDialog::getReason() const
+{
+    return reasonEdit->toPlainText();
+}
+
+QString BanDialog::getVisibleReason() const
+{
+    return visibleReasonEdit->toPlainText();
+}
+
+int BanDialog::getDeleteMessages() const
+{
+    return deleteMessages->isChecked() ? -1 : 0;
+}
+
+AdminNotesDialog::AdminNotesDialog(const QString &_userName, const QString &_notes, QWidget *_parent)
+    : QDialog(_parent), userName(_userName)
+{
+    setAttribute(Qt::WA_DeleteOnClose);
+
+    auto *updateButton = new QPushButton(tr("Update Notes"));
+    updateButton->setEnabled(false);
+    connect(updateButton, &QPushButton::clicked, this, &AdminNotesDialog::accept);
+
+    notes = new QPlainTextEdit(_notes);
+    notes->setMinimumWidth(500);
+    connect(notes, &QPlainTextEdit::textChanged, this, [=]() { updateButton->setEnabled(true); });
+
+    auto *vbox = new QVBoxLayout;
+    vbox->addWidget(notes);
+    vbox->addWidget(updateButton);
+
+    setLayout(vbox);
+    setWindowTitle(tr("Admin Notes for %1").arg(_userName));
+}
+
+QString AdminNotesDialog::getNotes() const
+{
+    return notes->toPlainText();
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_dialog.h b/cockatrice/src/interface/widgets/server/user/user_list_dialog.h
new file mode 100644
index 000000000..e10fca5bb
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_list_dialog.h
@@ -0,0 +1,82 @@
+#ifndef COCKATRICE_USER_LIST_DIALOG_H
+#define COCKATRICE_USER_LIST_DIALOG_H
+
+#include <QDialog>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QComboBox;
+class QLabel;
+class QPlainTextEdit;
+class QRadioButton;
+class QSpinBox;
+class QLineEdit;
+class QCheckBox;
+class QWidget;
+class ServerInfo_User;
+
+class BanDialog : public QDialog
+{
+    Q_OBJECT
+
+    QLabel *daysLabel, *hoursLabel, *minutesLabel;
+    QCheckBox *nameBanCheckBox, *ipBanCheckBox, *idBanCheckBox, *deleteMessages;
+    QLineEdit *nameBanEdit, *ipBanEdit, *idBanEdit;
+    QSpinBox *daysEdit, *hoursEdit, *minutesEdit;
+    QRadioButton *permanentRadio, *temporaryRadio;
+    QPlainTextEdit *reasonEdit, *visibleReasonEdit;
+
+private slots:
+    void okClicked();
+    void enableTemporaryEdits(bool enabled);
+
+public:
+    explicit BanDialog(const ServerInfo_User &info, QWidget *parent = nullptr);
+    [[nodiscard]] QString getBanName() const;
+    [[nodiscard]] QString getBanIP() const;
+    [[nodiscard]] QString getBanId() const;
+    [[nodiscard]] int getMinutes() const;
+    [[nodiscard]] QString getReason() const;
+    [[nodiscard]] QString getVisibleReason() const;
+    [[nodiscard]] int getDeleteMessages() const;
+};
+
+class WarningDialog : public QDialog
+{
+    Q_OBJECT
+
+    QLabel *descriptionLabel;
+    QLineEdit *nameWarning;
+    QComboBox *warningOption;
+    QLineEdit *warnClientID;
+    QCheckBox *deleteMessages;
+
+private slots:
+    void okClicked();
+
+public:
+    WarningDialog(const QString &userName, const QString &clientID, QWidget *parent = nullptr);
+    [[nodiscard]] QString getName() const;
+    [[nodiscard]] QString getWarnID() const;
+    [[nodiscard]] QString getReason() const;
+    [[nodiscard]] int getDeleteMessages() const;
+    void addWarningOption(const QString &warning, int startingIl = 1);
+};
+
+class AdminNotesDialog : public QDialog
+{
+    Q_OBJECT
+
+    QString userName;
+    QPlainTextEdit *notes;
+
+public:
+    explicit AdminNotesDialog(const QString &_userName, const QString &_notes, QWidget *_parent = nullptr);
+    [[nodiscard]] QString getName() const
+    {
+        return userName;
+    }
+    [[nodiscard]] QString getNotes() const;
+};
+
+#endif // COCKATRICE_USER_LIST_DIALOG_H
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 4bc2c84d6..385a969fd 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_manager.cpp
@@ -1,8 +1,11 @@
 #include "user_list_manager.h"
 
-#include "../../client/sound_engine.h"
-#include "user_info_box.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.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>
@@ -42,6 +45,9 @@ void UserListManager::handleDisconnect()
 
     delete ownUserInfo;
     ownUserInfo = nullptr;
+
+    // Full rebuild — all lists are gone
+    emit listReset();
 }
 
 void UserListManager::setOwnUserInfo(const ServerInfo_User &userInfo)
@@ -63,74 +69,77 @@ void UserListManager::processListUsersResponse(const Response &response)
     const int userListSize = resp.user_list_size();
     for (int i = 0; i < userListSize; ++i) {
         const ServerInfo_User &info = resp.user_list(i);
-        const QString &userName = QString::fromStdString(info.name());
-        onlineUsers.insert(userName, info);
+        onlineUsers.insert(QString::fromStdString(info.name()), info);
     }
+
+    // Bulk load complete — widgets rebuild once from the now-populated map
+    emit listReset();
 }
 
 void UserListManager::processUserJoinedEvent(const Event_UserJoined &event)
 {
     const auto &info = event.user_info();
-    const QString &userName = QString::fromStdString(info.name());
-    onlineUsers.insert(userName, info);
+    const QString name = QString::fromStdString(info.name());
+    onlineUsers.insert(name, info);
+
+    emit userJoinedOnline(info);
 }
 
 void UserListManager::processUserLeftEvent(const Event_UserLeft &event)
 {
-    const auto &userName = QString::fromStdString(event.name());
-    onlineUsers.remove(userName);
+    const QString name = QString::fromStdString(event.name());
+    onlineUsers.remove(name);
+
+    emit userLeftOnline(name);
 }
 
 void UserListManager::buddyListReceived(const QList<ServerInfo_User> &_buddyList)
 {
     for (const auto &user : _buddyList) {
-        const auto &userName = QString::fromStdString(user.name());
-        buddyUsers.insert(userName, user);
+        buddyUsers.insert(QString::fromStdString(user.name()), user);
     }
+
+    // Bulk load — one reset covers all newly added entries
+    emit listReset();
 }
 
 void UserListManager::ignoreListReceived(const QList<ServerInfo_User> &_ignoreList)
 {
     for (const auto &user : _ignoreList) {
-        const auto &userName = QString::fromStdString(user.name());
-        ignoredUsers.insert(userName, user);
+        ignoredUsers.insert(QString::fromStdString(user.name()), user);
     }
+
+    // Bulk load — one reset covers all newly added entries
+    emit listReset();
 }
 
 void UserListManager::processAddToListEvent(const Event_AddToList &event)
 {
     const auto &user = event.user_info();
-    const auto &userName = QString::fromStdString(user.name());
+    const QString userName = QString::fromStdString(user.name());
+    const QString listType = QString::fromStdString(event.list_name());
 
-    const auto &userListType = QString::fromStdString(event.list_name());
-
-    QMap<QString, ServerInfo_User> *userMap;
-    if (userListType == "buddy") {
-        userMap = &buddyUsers;
-    } else if (userListType == "ignore") {
-        userMap = &ignoredUsers;
-    } else {
-        return;
+    if (listType == "buddy") {
+        buddyUsers.insert(userName, user);
+        emit addedToBuddyList(user);
+    } else if (listType == "ignore") {
+        ignoredUsers.insert(userName, user);
+        emit addedToIgnoreList(user);
     }
-
-    userMap->insert(userName, user);
 }
 
 void UserListManager::processRemoveFromListEvent(const Event_RemoveFromList &event)
 {
-    const auto &userListType = QString::fromStdString(event.list_name());
-    const auto &userName = QString::fromStdString(event.user_name());
+    const QString listType = QString::fromStdString(event.list_name());
+    const QString userName = QString::fromStdString(event.user_name());
 
-    QMap<QString, ServerInfo_User> *userMap;
-    if (userListType == "buddy") {
-        userMap = &buddyUsers;
-    } else if (userListType == "ignore") {
-        userMap = &ignoredUsers;
-    } else {
-        return;
+    if (listType == "buddy") {
+        buddyUsers.remove(userName);
+        emit removedFromBuddyList(userName);
+    } else if (listType == "ignore") {
+        ignoredUsers.remove(userName);
+        emit removedFromIgnoreList(userName);
     }
-
-    userMap->remove(userName);
 }
 
 bool UserListManager::isOwnUserRegistered() const
@@ -155,16 +164,9 @@ bool UserListManager::isUserIgnored(const QString &userName) const
 
 const ServerInfo_User *UserListManager::getOnlineUser(const QString &userName) const
 {
-    const QString &userNameToMatchLower = userName.toLower();
-
-    const auto it =
-        std::find_if(onlineUsers.begin(), onlineUsers.end(), [&userNameToMatchLower](const ServerInfo_User &user) {
-            return userNameToMatchLower == QString::fromStdString(user.name()).toLower();
-        });
-
-    if (it != onlineUsers.end()) {
-        return &*it;
-    }
-
-    return nullptr;
+    const QString lower = userName.toLower();
+    const auto it = std::find_if(onlineUsers.begin(), onlineUsers.end(), [&lower](const ServerInfo_User &user) {
+        return lower == QString::fromStdString(user.name()).toLower();
+    });
+    return it != onlineUsers.end() ? &*it : nullptr;
 }
\ No newline at end of file
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 f378bd08d..b2ff69286 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_manager.h
+++ b/cockatrice/src/interface/widgets/server/user/user_list_manager.h
@@ -1,8 +1,8 @@
 /**
  * @file user_list_manager.h
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_USER_LIST_MANAGER_H
 #define COCKATRICE_USER_LIST_MANAGER_H
@@ -10,18 +10,22 @@
 #include "user_list_proxy.h"
 
 #include <QMap>
-#include <QWidget>
+#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 <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;
-class TabSupervisor;
+template <typename T> class QList;
 
 class UserListManager : public QObject, public UserListProxy
 {
@@ -47,15 +51,17 @@ public:
     explicit UserListManager(AbstractClient *_client, QObject *parent = nullptr);
     ~UserListManager() override;
 
-    [[nodiscard]] QMap<QString, ServerInfo_User> getAllUsersList() const
+    [[nodiscard]] const QMap<QString, ServerInfo_User> &getAllUsersList() const
     {
         return onlineUsers;
     }
-    [[nodiscard]] QMap<QString, ServerInfo_User> getBuddyList() const
+
+    [[nodiscard]] const QMap<QString, ServerInfo_User> &getBuddyList() const
     {
         return buddyUsers;
     }
-    [[nodiscard]] QMap<QString, ServerInfo_User> getIgnoreList() const
+
+    [[nodiscard]] const QMap<QString, ServerInfo_User> &getIgnoreList() const
     {
         return ignoredUsers;
     }
@@ -71,8 +77,26 @@ public slots:
     void handleDisconnect();
 
 signals:
-    void userLeft(const QString &userName);
-    void userJoined(const ServerInfo_User &userInfo);
+    /**
+     * The entire list needs to be rebuilt from scratch.
+     * Fired on disconnect, reconnect, and initial bulk loads
+     * (Command_ListUsers response, initial buddy/ignore lists).
+     */
+    void listReset();
+
+    // ── Online user presence ──────────────────────────────────────────────────
+    /** A user came online (or joined the room). Full ServerInfo_User available. */
+    void userJoinedOnline(const ServerInfo_User &user);
+    /** A user went offline (or left the room). */
+    void userLeftOnline(const QString &userName);
+
+    // ── Buddy list mutations (individual, post-login) ─────────────────────────
+    void addedToBuddyList(const ServerInfo_User &user);
+    void removedFromBuddyList(const QString &userName);
+
+    // ── Ignore list mutations (individual, post-login) ────────────────────────
+    void addedToIgnoreList(const ServerInfo_User &user);
+    void removedFromIgnoreList(const QString &userName);
 };
 
 #endif // COCKATRICE_USER_LIST_MANAGER_H
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp b/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp
new file mode 100644
index 000000000..08eaaaff7
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp
@@ -0,0 +1,438 @@
+#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;
+static constexpr int LeftPadding = 14;
+static constexpr int TextSpacing = 10;
+
+QSize UserListPainter::sizeHint()
+{
+    return QSize(0, RowHeight);
+}
+
+UserListPainter::Style UserListPainter::resolveStyle(const QPalette &palette, bool dark)
+{
+    Style style;
+    style.dark = dark;
+    const QColor base = palette.color(QPalette::Base);
+    const QColor alt = palette.color(QPalette::AlternateBase);
+    style.cardStart = base;
+    style.cardEnd = (alt != base) ? alt : palette.color(QPalette::Midlight);
+    style.base = base;
+    style.textOnline = palette.color(QPalette::Text);
+    style.textOffline = palette.color(QPalette::Disabled, QPalette::Text);
+    style.ringOffline = palette.color(QPalette::Disabled, QPalette::Text);
+    style.dropShadow = dark;
+    return style;
+}
+
+QColor UserListPainter::blend(const QColor &a, const QColor &b, qreal t)
+{
+    const qreal u = 1.0 - t;
+    return QColor(qRound(a.red() * u + b.red() * t), qRound(a.green() * u + b.green() * t),
+                  qRound(a.blue() * u + b.blue() * t), qRound(a.alpha() * u + b.alpha() * t));
+}
+
+QColor UserListPainter::getAccentColor(const UserLevelFlags &userLevel, bool online)
+{
+    QColor accentColor;
+
+    if (userLevel.testFlag(ServerInfo_User::IsAdmin)) {
+        accentColor = QColor(245, 158, 11);
+    } else if (userLevel.testFlag(ServerInfo_User::IsDeveloper)) {
+        accentColor = QColor(185, 28, 28);
+    } else if (userLevel.testFlag(ServerInfo_User::IsModerator)) {
+        accentColor = QColor(59, 130, 246);
+    } else if (userLevel.testFlag(ServerInfo_User::IsJudge)) {
+        accentColor = QColor(168, 85, 247);
+    } else {
+        accentColor = QColor(100, 116, 139);
+    }
+
+    if (!online) {
+        accentColor = accentColor.darker(160);
+    }
+
+    return accentColor;
+}
+
+int UserListPainter::getCardRight(const QStyleOptionViewItem &option, const QRect &rect)
+{
+    int scrollBarWidth = 0;
+
+    if (const auto *scrollArea = qobject_cast<const QAbstractScrollArea *>(option.widget)) {
+        const QScrollBar *sb = scrollArea->verticalScrollBar();
+        if (sb && sb->isVisible()) {
+            scrollBarWidth = sb->width();
+        }
+    }
+
+    const int viewportRight = option.widget ? option.widget->width() - scrollBarWidth : rect.right();
+
+    return qMin(rect.right(), viewportRight - 4);
+}
+
+void UserListPainter::drawBackground(QPainter *painter,
+                                     const QRectF &cardRect,
+                                     const QColor &accentColor,
+                                     bool selected,
+                                     const Style &style,
+                                     bool hasRole)
+{
+    QLinearGradient bg(cardRect.topLeft(), cardRect.topRight());
+    if (style.dark) {
+        // Dark mode darkens the role color to fit the dark surface and fades
+        // it into the deep navy surface on the right. The text drop shadow
+        // keeps the username legible over the colored edge.
+        bg.setColorAt(0, selected ? accentColor.darker(130) : accentColor.darker(320));
+        bg.setColorAt(1, selected ? QColor(40, 48, 60) : QColor(18, 22, 30));
+    } else if (hasRole) {
+        // Light mode pegs the role color on the left at near full strength
+        // and fades it into the white surface on the right. The tint stays
+        // bright enough that the dark text remains legible without a shadow.
+        bg.setColorAt(0, blend(style.cardStart, accentColor, selected ? 0.75 : 0.65));
+        bg.setColorAt(1, blend(style.cardEnd, accentColor, selected ? 0.18 : 0.10));
+    } else {
+        // Regular users keep a scaled-down accent tint so the banner card art
+        // stays legible over a colored backdrop (the pre-branch painter was
+        // always dark-styled) while the role hierarchy still reads.
+        bg.setColorAt(0, blend(style.cardStart, accentColor, (selected ? 0.75 : 0.65) * 0.7));
+        bg.setColorAt(1, blend(style.cardEnd, accentColor, (selected ? 0.18 : 0.10) * 0.7));
+    }
+
+    painter->setPen(Qt::NoPen);
+    painter->setBrush(bg);
+    painter->drawRoundedRect(cardRect, 6, 6);
+
+    // The 3px accent bar anchors every row so the banner card art reads as a
+    // consistent strip in either scheme (pre-branch parity).
+    painter->setBrush(accentColor);
+    painter->drawRoundedRect(QRectF(cardRect.left(), cardRect.top(), 3, cardRect.height()), 2, 2);
+}
+
+static QString makeKey(const QString &user, const QString &card, const QString &providerId)
+{
+    return user + u'|' + card + u'|' + providerId;
+}
+
+void UserListPainter::drawCardArt(QPainter *painter,
+                                  const QRect &rect,
+                                  int cardRight,
+                                  const QString &userName,
+                                  const QMap<QString, QPixmap> *cardArtCache,
+                                  const CardArtParams &params,
+                                  const QPixmap *overridePixmap = nullptr)
+{
+    QPixmap art;
+
+    if (overridePixmap && !overridePixmap->isNull()) {
+        art = *overridePixmap;
+    } else {
+        if (!cardArtCache) {
+            return;
+        }
+
+        const QString key = makeKey(userName, params.cardName, params.cardProviderId);
+
+        if (!cardArtCache->contains(key)) {
+            return;
+        }
+
+        art = cardArtCache->value(key);
+    }
+
+    if (art.isNull()) {
+        return;
+    }
+
+    // CardPictureLoader::getPixmap tags its output with the screen's
+    // devicePixelRatio on HiDPI displays. Every calculation below is in raw
+    // pixels, so normalize to 1.0 or the crop renders at 1/dpr scale anchored
+    // to the top left corner of the row.
+    art.setDevicePixelRatio(1.0);
+
+    const int cardH = rect.height() - 4;
+    const int totalW = cardRight - rect.left();
+    const int marginL = qRound(totalW * params.marginPctL);
+    const int marginR = qRound(totalW * params.marginPctR);
+    const int drawW = totalW - marginL - marginR;
+
+    const double basescale = qMax(double(drawW) / art.width(), double(cardH) / art.height());
+    const double scale = basescale * params.zoom;
+
+    const int scaledW = qRound(art.width() * scale);
+    const int scaledH = qRound(art.height() * scale);
+
+    const QPixmap scaled = art.scaled(scaledW, scaledH, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+
+    const int srcX = (scaledW - drawW) / 2;
+    const int srcY = qRound((scaledH - cardH) * params.verticalOffset);
+
+    // Clamp so we never copy outside the pixmap bounds. srcX can go negative
+    // for stored zoom values below 1, which would silently underfill the
+    // strip with transparent padding.
+    const int safeSrcX = qBound(0, srcX, qMax(0, scaledW - drawW));
+    const int safeSrcY = qBound(0, srcY, qMax(0, scaledH - cardH));
+
+    QImage img =
+        scaled.copy(safeSrcX, safeSrcY, drawW, cardH).toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied);
+
+    {
+        QPainter mask(&img);
+        mask.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+
+        QLinearGradient grad(0, 0, img.width(), 0);
+        grad.setColorAt(0.00, Qt::transparent);
+        grad.setColorAt(0.22, Qt::white);
+        grad.setColorAt(0.78, Qt::white);
+        grad.setColorAt(1.00, Qt::transparent);
+
+        mask.fillRect(img.rect(), grad);
+    }
+
+    painter->setOpacity(0.55);
+    painter->drawImage(rect.left() + marginL, rect.top() + 2, img);
+    painter->setOpacity(1.0);
+}
+
+QRect UserListPainter::getAvatarRect(const QRect &rect)
+{
+    const int avatarX = rect.left() + LeftPadding;
+    const int avatarY = rect.top() + (rect.height() - AvatarSize) / 2;
+    return QRect(avatarX, avatarY, AvatarSize, AvatarSize);
+}
+
+void UserListPainter::drawAvatar(QPainter *painter,
+                                 const QRect &avatarRect,
+                                 const QString &userName,
+                                 const QColor &accentColor,
+                                 const UserLevelFlags &userLevel,
+                                 const ServerInfo_User &userInfo,
+                                 const QString &privLevel,
+                                 const QMap<QString, QPixmap> *avatarCache,
+                                 const Style &style)
+{
+    QPainterPath clipPath;
+    clipPath.addEllipse(avatarRect);
+
+    painter->save();
+    painter->setClipPath(clipPath);
+
+    bool drewAvatar = false;
+
+    if (avatarCache && avatarCache->contains(userName)) {
+        const QPixmap &avatar = avatarCache->value(userName);
+        if (!avatar.isNull()) {
+            painter->drawPixmap(
+                avatarRect, avatar.scaled(avatarRect.size(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation));
+            drewAvatar = true;
+        }
+    }
+
+    if (!drewAvatar) {
+        painter->setBrush(blend(accentColor, style.base, style.dark ? 0.45 : 0.72));
+        painter->setPen(Qt::NoPen);
+        painter->drawEllipse(avatarRect);
+
+        const QPixmap pawn =
+            UserLevelPixmapGenerator::generatePixmap(24, userLevel, userInfo.pawn_colors(), false, privLevel);
+
+        painter->drawPixmap(avatarRect.center().x() - 12, avatarRect.center().y() - 12, pawn);
+    }
+
+    painter->restore();
+}
+
+void UserListPainter::drawStatusRing(QPainter *painter, const QRect &avatarRect, bool online, const Style &style)
+{
+    const QColor statusColor = online ? QColor(34, 197, 94) : style.ringOffline;
+
+    painter->setPen(QPen(statusColor, 2));
+    painter->setBrush(Qt::NoBrush);
+    painter->drawEllipse(avatarRect.adjusted(-1, -1, 1, 1));
+}
+
+void UserListPainter::drawUserName(QPainter *painter,
+                                   const QStyleOptionViewItem &option,
+                                   const QRect &rect,
+                                   int cardRight,
+                                   int textX,
+                                   const QString &userName,
+                                   bool online,
+                                   const Style &style)
+{
+    QFont nameFont = option.font;
+    nameFont.setBold(true);
+    painter->setFont(nameFont);
+
+    const QRect nameRect(textX, rect.top() + 8, cardRight - textX - 10, 20);
+    const QString elidedName = QFontMetrics(nameFont).elidedText(userName, Qt::ElideRight, cardRight - textX - 10);
+
+    if (style.dropShadow) {
+        painter->setPen(QColor(0, 0, 0, 200));
+        painter->drawText(nameRect.translated(1, 1), Qt::AlignVCenter | Qt::AlignLeft, elidedName);
+    }
+
+    painter->setPen(online ? style.textOnline : style.textOffline);
+    painter->drawText(nameRect, Qt::AlignVCenter | Qt::AlignLeft, elidedName);
+}
+
+void UserListPainter::drawCountryFlag(QPainter *painter, const QRect &rect, int textX, const ServerInfo_User &userInfo)
+{
+    const QPixmap flag = CountryPixmapGenerator::generatePixmap(13, QString::fromStdString(userInfo.country()));
+    if (!flag.isNull()) {
+        painter->drawPixmap(textX, rect.top() + 46, flag);
+    }
+}
+
+QList<UserListPainter::Badge> UserListPainter::buildBadges(const UserLevelFlags &userLevel, const QString &privLevel)
+{
+    QList<Badge> badges;
+
+    if (userLevel.testFlag(ServerInfo_User::IsAdmin)) {
+        badges << Badge{"ADMIN", QColor(245, 158, 11)};
+    } else if (userLevel.testFlag(ServerInfo_User::IsDeveloper)) {
+        badges << Badge{"DEV", QColor(185, 28, 28)};
+    } else if (userLevel.testFlag(ServerInfo_User::IsModerator)) {
+        badges << Badge{"MOD", QColor(59, 130, 246)};
+    } else if (userLevel.testFlag(ServerInfo_User::IsJudge)) {
+        badges << Badge{"JUDGE", QColor(168, 85, 247)};
+    }
+
+    if (privLevel == "VIP") {
+        badges << Badge{"VIP", QColor(20, 184, 166)};
+    } else if (privLevel == "DONATOR") {
+        badges << Badge{"DONATOR", QColor(249, 115, 22)};
+    }
+
+    return badges;
+}
+
+void UserListPainter::drawBadges(QPainter *painter,
+                                 const QStyleOptionViewItem &option,
+                                 const QRect &rect,
+                                 int cardRight,
+                                 const QList<Badge> &badges,
+                                 bool online,
+                                 const Style &style)
+{
+    if (badges.isEmpty()) {
+        return;
+    }
+
+    QFont badgeFont = option.font;
+    badgeFont.setPointSizeF(badgeFont.pointSizeF() * 0.68);
+    badgeFont.setBold(true);
+    painter->setFont(badgeFont);
+
+    QFontMetrics fm(badgeFont);
+
+    int totalBadgeW = 0;
+    for (const Badge &b : badges) {
+        totalBadgeW += fm.horizontalAdvance(b.text) + 8 + 4;
+    }
+    totalBadgeW -= 4;
+
+    int bx = cardRight - 6 - totalBadgeW;
+
+    for (const Badge &b : badges) {
+        const QColor col = online ? b.color : blend(b.color, style.base, 0.55);
+        const QColor surface = blend(col, style.base, style.dark ? 0.55 : 0.78);
+        const QColor text = style.dark ? blend(col, Qt::white, 0.5) : blend(col, Qt::black, 0.35);
+        const int bw = fm.horizontalAdvance(b.text) + 8;
+        const QRect br(bx, rect.top() + 44, bw, 13);
+
+        painter->setPen(Qt::NoPen);
+        painter->setBrush(surface);
+        painter->drawRoundedRect(br, 3, 3);
+
+        painter->setPen(text);
+        painter->drawText(br, Qt::AlignCenter, b.text);
+
+        bx += bw + 4;
+    }
+}
+
+void UserListPainter::paint(QPainter *painter,
+                            const QStyleOptionViewItem &option,
+                            const QModelIndex &index,
+                            const ServerInfo_User &userInfo,
+                            const QMap<QString, QPixmap> *avatarCache,
+                            const QMap<QString, QPixmap> *cardArtCache,
+                            const QMap<QString, CardArtParams> *cardArtParamsMap,
+                            bool dark)
+{
+    painter->save();
+    painter->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform | QPainter::TextAntialiasing);
+
+    // The delegate supplies the application palette in option.palette, which
+    // always reflects the active theme. The widget palette can be stale after
+    // a runtime theme change, so it is only used as a defensive fallback.
+    const QPalette pal =
+        option.palette == QPalette() ? (option.widget ? option.widget->palette() : qApp->palette()) : option.palette;
+    const Style style = resolveStyle(pal, dark);
+
+    const QRect rect = option.rect;
+    const bool online = index.data(Qt::UserRole + 1).toBool();
+    const bool selected = option.state & QStyle::State_Selected;
+    const UserLevelFlags userLevel(userInfo.user_level());
+    const QString userName = QString::fromStdString(userInfo.name());
+    const QString privLevel = QString::fromStdString(userInfo.privlevel());
+    const QColor accentColor = getAccentColor(userLevel, online);
+    const bool hasRole =
+        userLevel.testFlag(ServerInfo_User::IsAdmin) || userLevel.testFlag(ServerInfo_User::IsDeveloper) ||
+        userLevel.testFlag(ServerInfo_User::IsModerator) || userLevel.testFlag(ServerInfo_User::IsJudge);
+    const QRectF cardRect = QRectF(rect).adjusted(3, 2, -3, -2);
+    const int cardRight = getCardRight(option, rect);
+
+    const CardArtParams params = (cardArtParamsMap && cardArtParamsMap->contains(userName))
+                                     ? cardArtParamsMap->value(userName)
+                                     : CardArtParams{};
+
+    drawBackground(painter, cardRect, accentColor, selected, style, hasRole);
+    drawCardArt(painter, rect, cardRight, userName, cardArtCache, params);
+
+    const QRect avatarRect = getAvatarRect(rect);
+    drawAvatar(painter, avatarRect, userName, accentColor, userLevel, userInfo, privLevel, avatarCache, style);
+    drawStatusRing(painter, avatarRect, online, style);
+
+    const int textX = avatarRect.right() + TextSpacing;
+    drawUserName(painter, option, rect, cardRight, textX, userName, online, style);
+    drawCountryFlag(painter, rect, textX, userInfo);
+
+    const QList<Badge> badges = buildBadges(userLevel, privLevel);
+    drawBadges(painter, option, rect, cardRight, badges, online, style);
+
+    painter->restore();
+}
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_painter.h b/cockatrice/src/interface/widgets/server/user/user_list_painter.h
new file mode 100644
index 000000000..e7293a097
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_list_painter.h
@@ -0,0 +1,121 @@
+#ifndef COCKATRICE_USER_LIST_PAINTER_H
+#define COCKATRICE_USER_LIST_PAINTER_H
+
+#include "user_level.h"
+
+#include <QColor>
+#include <QList>
+#include <QPalette>
+#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
+{
+    QString cardName = "";
+    QString cardProviderId = "";
+    double marginPctL = 0.33;
+    double marginPctR = 0.02;
+    double verticalOffset = 0.35;
+    double zoom = 1.0;
+};
+
+class UserListPainter
+{
+public:
+    /**
+     * Palette-derived surface colors for the current color scheme. Both the
+     * light and the dark scheme read from the active QPalette so custom
+     * palettes are respected. @c dark only tunes the blend strengths (and
+     * whether the name text keeps its drop shadow).
+     */
+    struct Style
+    {
+        bool dark = true;
+        QColor cardStart; ///< row fill, left edge (normal)
+        QColor cardEnd;   ///< row fill, right edge (normal)
+        QColor base;      ///< lightest surface, used for blending accent hues
+        QColor textOnline;
+        QColor textOffline;
+        QColor ringOffline;
+        bool dropShadow = false;
+    };
+
+    static Style resolveStyle(const QPalette &palette, bool dark);
+    /// Linear interpolation: @p t = 0 returns @p a, @p t = 1 returns @p b.
+    static QColor blend(const QColor &a, const QColor &b, qreal t);
+
+    static void paint(QPainter *painter,
+                      const QStyleOptionViewItem &option,
+                      const QModelIndex &index,
+                      const ServerInfo_User &userInfo,
+                      const QMap<QString, QPixmap> *avatarCache,
+                      const QMap<QString, QPixmap> *cardArtCache,
+                      const QMap<QString, CardArtParams> *cardArtParamsMap,
+                      bool dark);
+
+    static QSize sizeHint();
+
+    static void drawCardArt(QPainter *painter,
+                            const QRect &rect,
+                            int cardRight,
+                            const QString &userName,
+                            const QMap<QString, QPixmap> *cardArtCache,
+                            const CardArtParams &params,
+                            const QPixmap *overridePixmap);
+
+private:
+    struct Badge
+    {
+        QString text;
+        QColor color;
+    };
+
+    static QColor getAccentColor(const UserLevelFlags &userLevel, bool online);
+    static int getCardRight(const QStyleOptionViewItem &option, const QRect &rect);
+    static void drawBackground(QPainter *painter,
+                               const QRectF &cardRect,
+                               const QColor &accentColor,
+                               bool selected,
+                               const Style &style,
+                               bool hasRole);
+    static QRect getAvatarRect(const QRect &rect);
+    static void drawAvatar(QPainter *painter,
+                           const QRect &avatarRect,
+                           const QString &userName,
+                           const QColor &accentColor,
+                           const UserLevelFlags &userLevel,
+                           const ServerInfo_User &userInfo,
+                           const QString &privLevel,
+                           const QMap<QString, QPixmap> *avatarCache,
+                           const Style &style);
+    static void drawStatusRing(QPainter *painter, const QRect &avatarRect, bool online, const Style &style);
+    static void drawUserName(QPainter *painter,
+                             const QStyleOptionViewItem &option,
+                             const QRect &rect,
+                             int cardRight,
+                             int textX,
+                             const QString &userName,
+                             bool online,
+                             const Style &style);
+    static void drawCountryFlag(QPainter *painter, const QRect &rect, int textX, const ServerInfo_User &userInfo);
+    static QList<Badge> buildBadges(const UserLevelFlags &userLevel, const QString &privLevel);
+    static void drawBadges(QPainter *painter,
+                           const QStyleOptionViewItem &option,
+                           const QRect &rect,
+                           int cardRight,
+                           const QList<Badge> &badges,
+                           bool online,
+                           const Style &style);
+};
+
+#endif // COCKATRICE_USER_LIST_PAINTER_H
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
new file mode 100644
index 000000000..78d45d120
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.cpp
@@ -0,0 +1,89 @@
+#include "user_list_panel_widget.h"
+
+#include "../../../../client/settings/cache_settings.h"
+#include "user_list_widget.h"
+
+#include <QLineEdit>
+#include <QList>
+#include <QStringList>
+#include <QStringLiteral>
+#include <QVBoxLayout>
+#include <libcockatrice/settings/interface_settings.h>
+
+namespace
+{
+// The persisted section keys are the serialization contract with the user's
+// settings file, so the values must stay stable across versions.
+QString sectionKey(UserListWidget::Section section)
+{
+    switch (section) {
+        case UserListWidget::Section::Buddy:
+            return QStringLiteral("buddy");
+        case UserListWidget::Section::Online:
+            return QStringLiteral("online");
+        case UserListWidget::Section::Ignore:
+            return QStringLiteral("ignore");
+    }
+    return {};
+}
+} // namespace
+
+UserListPanelWidget::UserListPanelWidget(TabSupervisor *_tabSupervisor, AbstractClient *_client, QWidget *parent)
+    : QWidget(parent)
+{
+    auto *mainLayout = new QVBoxLayout(this);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
+    mainLayout->setSpacing(2);
+
+    searchBar = new QLineEdit(this);
+    searchBar->setClearButtonEnabled(true);
+    mainLayout->addWidget(searchBar);
+
+    userList = new UserListWidget(_tabSupervisor, _client, UserListWidget::RoomList, this);
+    userList->setSectioned(
+        {UserListWidget::Section::Buddy, UserListWidget::Section::Online, UserListWidget::Section::Ignore});
+    mainLayout->addWidget(userList, 1);
+
+    connect(searchBar, &QLineEdit::textChanged, userList, &UserListWidget::setFilterText);
+
+    connect(userList, &UserListWidget::sectionExpanded, this, &UserListPanelWidget::persistExpandedSections);
+    connect(userList, &UserListWidget::openMessageDialog, this, &UserListPanelWidget::openMessageDialog);
+
+    // Restore the persisted expansion state, then apply it to the tree.
+    const QStringList expandedSections = SettingsCache::instance().userInterface().getUserListExpandedSections();
+    for (const UserListWidget::Section section : userList->getSectionIds()) {
+        userList->setSectionExpanded(section, expandedSections.contains(sectionKey(section)));
+    }
+
+    retranslateUi();
+}
+
+void UserListPanelWidget::bind(UserListManager *manager)
+{
+    userList->bind(manager);
+}
+
+void UserListPanelWidget::persistExpandedSections(UserListWidget::Section section, bool expanded)
+{
+    const QString key = sectionKey(section);
+    QStringList expandedSections = SettingsCache::instance().userInterface().getUserListExpandedSections();
+    if (expanded) {
+        if (!expandedSections.contains(key)) {
+            expandedSections.append(key);
+        }
+    } else {
+        expandedSections.removeAll(key);
+    }
+    SettingsCache::instance().userInterface().setUserListExpandedSections(expandedSections);
+}
+
+void UserListPanelWidget::retranslateUi()
+{
+    searchBar->setPlaceholderText(tr("Search users..."));
+    userList->retranslateUi();
+}
+
+UserListWidget *UserListPanelWidget::getUserList() const
+{
+    return userList;
+}
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
new file mode 100644
index 000000000..088365bbc
--- /dev/null
+++ b/cockatrice/src/interface/widgets/server/user/user_list_panel_widget.h
@@ -0,0 +1,45 @@
+/**
+ * @file user_list_panel_widget.h
+ * @ingroup Lobby
+ */
+
+#ifndef COCKATRICE_USER_LIST_PANEL_WIDGET_H
+#define COCKATRICE_USER_LIST_PANEL_WIDGET_H
+
+#include "user_list_widget.h"
+
+#include <QString>
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class AbstractClient;
+class QLineEdit;
+class TabSupervisor;
+class UserListManager;
+
+/**
+ * A unified user list: a search bar above a single tree whose section headers
+ * (buddy, online, ignored) are inline dividers. The tree owns the scrolling.
+ */
+class UserListPanelWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit UserListPanelWidget(TabSupervisor *tabSupervisor, AbstractClient *client, QWidget *parent = nullptr);
+    void bind(UserListManager *manager);
+    void retranslateUi();
+
+    [[nodiscard]] UserListWidget *getUserList() const;
+
+signals:
+    void openMessageDialog(const QString &userName, bool focus);
+
+private:
+    void persistExpandedSections(UserListWidget::Section section, bool expanded);
+
+    QLineEdit *searchBar = nullptr;
+    UserListWidget *userList = nullptr;
+};
+
+#endif // COCKATRICE_USER_LIST_PANEL_WIDGET_H
diff --git a/cockatrice/src/interface/widgets/server/user/user_list_proxy.h b/cockatrice/src/interface/widgets/server/user/user_list_proxy.h
index bff76077f..626f89b8f 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_proxy.h
+++ b/cockatrice/src/interface/widgets/server/user/user_list_proxy.h
@@ -2,8 +2,8 @@
  * @file user_list_proxy.h
  * @ingroup UI
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_USERLISTPROXY_H
 #define COCKATRICE_USERLISTPROXY_H
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 852743479..b3fd1d1a9 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
+++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp
@@ -1,310 +1,85 @@
 #include "user_list_widget.h"
 
+#include "../../../../client/settings/cache_settings.h"
 #include "../../interface/pixel_map_generator.h"
-#include "../../interface/widgets/tabs/tab_account.h"
+#include "../../interface/theme_manager.h"
 #include "../../interface/widgets/tabs/tab_supervisor.h"
-#include "../game_selector.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 <QCheckBox>
-#include <QHBoxLayout>
+#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 <QInputDialog>
-#include <QLabel>
-#include <QLineEdit>
-#include <QMessageBox>
+#include <QIcon>
+#include <QItemSelection>
+#include <QItemSelectionModel>
+#include <QKeyEvent>
+#include <QLayout>
+#include <QMenu>
+#include <QModelIndex>
 #include <QMouseEvent>
-#include <QPlainTextEdit>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QSpinBox>
+#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 <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/response_get_games_of_user.pb.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <QtGlobal>
+#include <libcockatrice/settings/appearance_settings.h>
+#include <qnamespace.h>
 
-BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(parent)
+class QPixmap;
+struct GameInviteOption;
+
+namespace UserListRoles
 {
-    setAttribute(Qt::WA_DeleteOnClose);
+constexpr int Online = Qt::UserRole + 1;
+constexpr int UserInfo = Qt::UserRole + 2;
+} // namespace UserListRoles
 
-    nameBanCheckBox = new QCheckBox(tr("ban &user name"));
-    nameBanCheckBox->setChecked(true);
-    nameBanEdit = new QLineEdit(QString::fromStdString(info.name()));
-    nameBanEdit->setMaxLength(MAX_NAME_LENGTH);
-    ipBanCheckBox = new QCheckBox(tr("ban &IP address"));
-    ipBanCheckBox->setChecked(true);
-    ipBanEdit = new QLineEdit(QString::fromStdString(info.address()));
-    ipBanEdit->setMaxLength(MAX_NAME_LENGTH);
-    idBanCheckBox = new QCheckBox(tr("ban client I&D"));
-    idBanCheckBox->setChecked(true);
-    idBanEdit = new QLineEdit(QString::fromStdString(info.clientid()));
-    idBanEdit->setMaxLength(MAX_NAME_LENGTH);
-    if (QString::fromStdString(info.clientid()).isEmpty())
-        idBanCheckBox->setChecked(false);
+// Divider items (section headers) in sectioned mode are distinguished from user
+// rows (UserListTWI, which uses QTreeWidgetItem::Type) by this item type.
+constexpr int SectionItemType = QTreeWidgetItem::UserType + 1;
 
-    QGridLayout *banTypeGrid = new QGridLayout;
-    banTypeGrid->addWidget(nameBanCheckBox, 0, 0);
-    banTypeGrid->addWidget(nameBanEdit, 0, 1);
-    banTypeGrid->addWidget(ipBanCheckBox, 1, 0);
-    banTypeGrid->addWidget(ipBanEdit, 1, 1);
-    banTypeGrid->addWidget(idBanCheckBox, 2, 0);
-    banTypeGrid->addWidget(idBanEdit, 2, 1);
-    QGroupBox *banTypeGroupBox = new QGroupBox(tr("Ban type"));
-    banTypeGroupBox->setLayout(banTypeGrid);
-
-    permanentRadio = new QRadioButton(tr("&permanent ban"));
-    temporaryRadio = new QRadioButton(tr("&temporary ban"));
-    temporaryRadio->setChecked(true);
-    connect(temporaryRadio, &QRadioButton::toggled, this, &BanDialog::enableTemporaryEdits);
-    daysLabel = new QLabel(tr("&Days:"));
-    daysEdit = new QSpinBox;
-    daysEdit->setMinimum(0);
-    daysEdit->setValue(0);
-    daysEdit->setMaximum(10000);
-    daysLabel->setBuddy(daysEdit);
-    hoursLabel = new QLabel(tr("&Hours:"));
-    hoursEdit = new QSpinBox;
-    hoursEdit->setMinimum(0);
-    hoursEdit->setValue(0);
-    hoursEdit->setMaximum(24);
-    hoursLabel->setBuddy(hoursEdit);
-    minutesLabel = new QLabel(tr("&Minutes:"));
-    minutesEdit = new QSpinBox;
-    minutesEdit->setMinimum(0);
-    minutesEdit->setValue(5);
-    minutesEdit->setMaximum(60);
-    minutesLabel->setBuddy(minutesEdit);
-    QGridLayout *durationLayout = new QGridLayout;
-    durationLayout->addWidget(permanentRadio, 0, 0, 1, 6);
-    durationLayout->addWidget(temporaryRadio, 1, 0, 1, 6);
-    durationLayout->addWidget(daysLabel, 2, 0);
-    durationLayout->addWidget(daysEdit, 2, 1);
-    durationLayout->addWidget(hoursLabel, 2, 2);
-    durationLayout->addWidget(hoursEdit, 2, 3);
-    durationLayout->addWidget(minutesLabel, 2, 4);
-    durationLayout->addWidget(minutesEdit, 2, 5);
-    QGroupBox *durationGroupBox = new QGroupBox(tr("Duration of the ban"));
-    durationGroupBox->setLayout(durationLayout);
-
-    QLabel *reasonLabel = new QLabel(tr("Please enter the reason for the ban.\nThis is only saved for moderators and "
-                                        "cannot be seen by the banned person."));
-    reasonEdit = new QPlainTextEdit;
-
-    QLabel *visibleReasonLabel =
-        new QLabel(tr("Please enter the reason for the ban that will be visible to the banned person."));
-    visibleReasonEdit = new QPlainTextEdit;
-
-    deleteMessages = new QCheckBox(tr("Redact all messages from this user in all rooms"));
-
-    QPushButton *okButton = new QPushButton(tr("&OK"));
-    okButton->setAutoDefault(true);
-    connect(okButton, &QPushButton::clicked, this, &BanDialog::okClicked);
-    QPushButton *cancelButton = new QPushButton(tr("&Cancel"));
-    connect(cancelButton, &QPushButton::clicked, this, &BanDialog::reject);
-
-    QHBoxLayout *buttonLayout = new QHBoxLayout;
-    buttonLayout->addStretch();
-    buttonLayout->addWidget(okButton);
-    buttonLayout->addWidget(cancelButton);
-
-    QVBoxLayout *vbox = new QVBoxLayout;
-    vbox->addWidget(banTypeGroupBox);
-    vbox->addWidget(durationGroupBox);
-    vbox->addWidget(reasonLabel);
-    vbox->addWidget(reasonEdit);
-    vbox->addWidget(visibleReasonLabel);
-    vbox->addWidget(visibleReasonEdit);
-    vbox->addWidget(deleteMessages);
-    vbox->addLayout(buttonLayout);
-
-    setLayout(vbox);
-    setWindowTitle(tr("Ban user from server"));
-}
-
-WarningDialog::WarningDialog(const QString userName, const QString clientID, QWidget *parent) : QDialog(parent)
-{
-    setAttribute(Qt::WA_DeleteOnClose);
-    descriptionLabel = new QLabel(tr("Which warning would you like to send?"));
-    nameWarning = new QLineEdit(userName);
-    nameWarning->setMaxLength(MAX_NAME_LENGTH);
-    warnClientID = new QLineEdit(clientID);
-    warnClientID->setMaxLength(MAX_NAME_LENGTH);
-    warningOption = new QComboBox();
-    warningOption->addItem("");
-
-    deleteMessages = new QCheckBox(tr("Redact all messages from this user in all rooms"));
-
-    QPushButton *okButton = new QPushButton(tr("&OK"));
-    okButton->setAutoDefault(true);
-    connect(okButton, &QPushButton::clicked, this, &WarningDialog::okClicked);
-    QPushButton *cancelButton = new QPushButton(tr("&Cancel"));
-    connect(cancelButton, &QPushButton::clicked, this, &WarningDialog::reject);
-
-    QHBoxLayout *buttonLayout = new QHBoxLayout;
-    buttonLayout->addStretch();
-    buttonLayout->addWidget(okButton);
-    buttonLayout->addWidget(cancelButton);
-
-    QVBoxLayout *vbox = new QVBoxLayout;
-    vbox->addWidget(descriptionLabel);
-    vbox->addWidget(nameWarning);
-    vbox->addWidget(warningOption);
-    vbox->addWidget(deleteMessages);
-    vbox->addLayout(buttonLayout);
-    setLayout(vbox);
-    setWindowTitle(tr("Warn user for misconduct"));
-}
-
-void WarningDialog::okClicked()
-{
-    if (nameWarning->text().simplified().isEmpty()) {
-        QMessageBox::critical(this, tr("Error"),
-                              tr("User name to send a warning to can not be blank, please specify a user to warn."));
-        return;
-    }
-
-    if (warningOption->currentText().simplified().isEmpty()) {
-        QMessageBox::critical(this, tr("Error"),
-                              tr("Warning to use can not be blank, please select a valid warning to send."));
-        return;
-    }
-
-    accept();
-}
-
-QString WarningDialog::getName() const
-{
-    return nameWarning->text().simplified();
-}
-
-QString WarningDialog::getWarnID() const
-{
-    return warnClientID->text().simplified();
-}
-
-QString WarningDialog::getReason() const
-{
-    return warningOption->currentText().simplified();
-}
-
-int WarningDialog::getDeleteMessages() const
-{
-    return deleteMessages->isChecked() ? -1 : 0;
-}
-
-void WarningDialog::addWarningOption(const QString warning)
-{
-    warningOption->addItem(warning);
-}
-
-void BanDialog::okClicked()
-{
-    if (!nameBanCheckBox->isChecked() && !ipBanCheckBox->isChecked() && !idBanCheckBox->isChecked()) {
-        QMessageBox::critical(this, tr("Error"),
-                              tr("You have to select a name-based, IP-based, clientId based, or some combination of "
-                                 "the three to place a ban."));
-        return;
-    }
-
-    if (nameBanCheckBox->isChecked())
-        if (nameBanEdit->text().simplified() == "") {
-            QMessageBox::critical(this, tr("Error"),
-                                  tr("You must have a value in the name ban when selecting the name ban checkbox."));
-            return;
-        }
-
-    if (ipBanCheckBox->isChecked())
-        if (ipBanEdit->text().simplified() == "") {
-            QMessageBox::critical(this, tr("Error"),
-                                  tr("You must have a value in the ip ban when selecting the ip ban checkbox."));
-            return;
-        }
-
-    if (idBanCheckBox->isChecked())
-        if (idBanEdit->text().simplified() == "") {
-            QMessageBox::critical(
-                this, tr("Error"),
-                tr("You must have a value in the clientid ban when selecting the clientid ban checkbox."));
-            return;
-        }
-
-    accept();
-}
-
-void BanDialog::enableTemporaryEdits(bool enabled)
-{
-    daysLabel->setEnabled(enabled);
-    daysEdit->setEnabled(enabled);
-    hoursLabel->setEnabled(enabled);
-    hoursEdit->setEnabled(enabled);
-    minutesLabel->setEnabled(enabled);
-    minutesEdit->setEnabled(enabled);
-}
-
-QString BanDialog::getBanId() const
-{
-    return idBanCheckBox->isChecked() ? idBanEdit->text() : QString();
-}
-
-QString BanDialog::getBanName() const
-{
-    return nameBanCheckBox->isChecked() ? nameBanEdit->text() : QString();
-}
-
-QString BanDialog::getBanIP() const
-{
-    return ipBanCheckBox->isChecked() ? ipBanEdit->text() : QString();
-}
-
-int BanDialog::getMinutes() const
-{
-    return permanentRadio->isChecked() ? 0
-                                       : (daysEdit->value() * 24 * 60 + hoursEdit->value() * 60 + minutesEdit->value());
-}
-
-QString BanDialog::getReason() const
-{
-    return reasonEdit->toPlainText();
-}
-
-QString BanDialog::getVisibleReason() const
-{
-    return visibleReasonEdit->toPlainText();
-}
-
-int BanDialog::getDeleteMessages() const
-{
-    return deleteMessages->isChecked() ? -1 : 0;
-}
-
-AdminNotesDialog::AdminNotesDialog(const QString &_userName, const QString &_notes, QWidget *_parent)
-    : QDialog(_parent), userName(_userName)
-{
-    setAttribute(Qt::WA_DeleteOnClose);
-
-    auto *updateButton = new QPushButton(tr("Update Notes"));
-    updateButton->setEnabled(false);
-    connect(updateButton, &QPushButton::clicked, this, &AdminNotesDialog::accept);
-
-    notes = new QPlainTextEdit(_notes);
-    notes->setMinimumWidth(500);
-    connect(notes, &QPlainTextEdit::textChanged, this, [=]() { updateButton->setEnabled(true); });
-
-    auto *vbox = new QVBoxLayout;
-    vbox->addWidget(notes);
-    vbox->addWidget(updateButton);
-
-    setLayout(vbox);
-    setWindowTitle(tr("Admin Notes for %1").arg(_userName));
-}
-
-QString AdminNotesDialog::getNotes() const
-{
-    return notes->toPlainText();
-}
-
-UserListItemDelegate::UserListItemDelegate(QObject *const parent) : QStyledItemDelegate(parent)
+UserListItemDelegate::UserListItemDelegate(UserListWidget *owner,
+                                           QTreeWidget *tree,
+                                           const QMap<QString, QPixmap> *avatarCache,
+                                           const QMap<QString, QPixmap> *cardArtCache,
+                                           const QMap<QString, CardArtParams> *cardArtParamsMap)
+    : QStyledItemDelegate(tree), tree(tree), owner(owner), avatarCache(avatarCache), cardArtCache(cardArtCache),
+      cardArtParamsMap(cardArtParamsMap)
 {
 }
 
@@ -316,17 +91,146 @@ bool UserListItemDelegate::editorEvent(QEvent *event,
     if ((event->type() == QEvent::MouseButtonPress) && index.isValid()) {
         QMouseEvent *const mouseEvent = static_cast<QMouseEvent *>(event);
         if (mouseEvent->button() == Qt::RightButton) {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-            static_cast<UserListWidget *>(parent())->showContextMenu(mouseEvent->globalPosition().toPoint(), index);
-#else
-            static_cast<UserListWidget *>(parent())->showContextMenu(mouseEvent->globalPos(), index);
-#endif
+            // Dialog mode has no context menu: consume the press, show nothing.
+            if (owner->getHasUserInfoPopup()) {
+                owner->showContextMenu(mouseEvent->globalPosition().toPoint(), index);
+            }
             return true;
         }
     }
     return QStyledItemDelegate::editorEvent(event, model, option, index);
 }
 
+QSize UserListItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    if (!SettingsCache::instance().appearance().getStyleUserList()) {
+        return QStyledItemDelegate::sizeHint(option, index);
+    }
+    if (!index.data(UserListRoles::UserInfo).isValid()) {
+        return QStyledItemDelegate::sizeHint(option, index); // section dividers stay compact
+    }
+    return UserListPainter::sizeHint();
+}
+
+void UserListItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    const bool styled = SettingsCache::instance().appearance().getStyleUserList();
+    // UserInfo/Online are stored on column 0 only. The name lives on column 2,
+    // so resolve the user data against column 0 no matter which cell is painted.
+    const QModelIndex userIndex = index.siblingAtColumn(0).isValid() ? index.siblingAtColumn(0) : index;
+    const QVariant var = userIndex.data(UserListRoles::UserInfo);
+
+    if (styled && var.isValid()) {
+        // Styled card rows: the tree's cached palette can be stale after a
+        // runtime theme change, so paint from the application palette (always
+        // current) instead of option.palette (frozen at the last style switch).
+        QStyleOptionViewItem opt = option;
+        opt.palette = qApp->palette();
+
+        UserListPainter::paint(painter, opt, index, var.value<ServerInfo_User>(), avatarCache, cardArtCache,
+                               cardArtParamsMap, themeManager && themeManager->isDarkModeActive());
+        return;
+    }
+
+    // Unstyled rows and section dividers are painted manually so every color
+    // is derived from the current application palette at paint time. The widget
+    // palette, the view's alternation, and the stored brushes (one per item)
+    // all go stale after a runtime theme change.
+    const QPalette appPal = qApp->palette();
+    const bool selected = option.state & QStyle::State_Selected;
+    const bool hovered = option.state & QStyle::State_MouseOver;
+
+    // Row background: selection, hover, zebra striping, plain base.
+    QColor bg = appPal.color(QPalette::Base);
+    if (selected) {
+        bg = appPal.color(QPalette::Highlight);
+    } else if (hovered) {
+        bg = UserListPainter::blend(appPal.color(QPalette::Base), appPal.color(QPalette::Highlight), 0.12);
+    } else if (var.isValid()) {
+        // Zebra alternation per section. The dividers are top level rows too,
+        // so the view's own alternation would drift across sections. Count the
+        // visible user rows back to the previous divider within the same parent
+        // (sectioned mode stores users as children of the dividers, flat mode
+        // as top level rows), so the stripe restarts at every divider and at
+        // the tree top. Hidden filter matches are skipped the same way the view
+        // skips them, so adjacent visible rows always alternate.
+        int usersSinceDivider = 0;
+        const QModelIndex parent = userIndex.parent();
+        for (int r = userIndex.row() - 1; r >= 0; --r) {
+            if (tree->isRowHidden(r, parent)) {
+                continue;
+            }
+            const QModelIndex above = userIndex.model()->index(r, 0, parent);
+            if (above.isValid() && above.data(UserListRoles::UserInfo).isValid()) {
+                ++usersSinceDivider;
+            } else {
+                break;
+            }
+        }
+        if (usersSinceDivider % 2 == 1) {
+            bg = appPal.color(QPalette::AlternateBase);
+        }
+    }
+    // Paint the row background. In the column 0 pass the fill spans the full
+    // viewport width so stripes, hover and selection cover the whole row (the
+    // name column is content sized in unstyled mode). Later column passes fill
+    // only their own cell, which is the same color and cannot cover the icons.
+    QRect bgRect = option.rect;
+    if (index.column() == 0) {
+        bgRect = QRect(0, option.rect.top(), tree->viewport()->width(), option.rect.height());
+    }
+    painter->fillRect(bgRect, bg);
+
+    // Text color.
+    QColor fg = appPal.color(QPalette::Text);
+    if (selected) {
+        fg = appPal.color(QPalette::HighlightedText);
+    } else if (!var.isValid()) {
+        // Section divider: muted application text color.
+        fg = appPal.color(QPalette::WindowText);
+        fg.setAlpha(170);
+    } else if (index.column() == 2) {
+        // Name column: online/offline color recomputed at paint time instead
+        // of trusting the brush stored at login time.
+        QTreeWidgetItem *item = tree->itemFromIndex(index);
+        const bool online = item && item->data(0, UserListRoles::Online).toBool();
+        if (online) {
+            fg = appPal.color(QPalette::WindowText);
+        } else {
+            fg = (themeManager && themeManager->isDarkModeActive())
+                     ? QColor(Qt::gray)
+                     : UserListPainter::blend(appPal.color(QPalette::Text), appPal.color(QPalette::Mid), 0.5);
+        }
+    }
+
+    // Icon (level badge in column 0, country flag in column 1).
+    QRect textRect = option.rect;
+    const QIcon icon = index.data(Qt::DecorationRole).value<QIcon>();
+    if (!icon.isNull()) {
+        const QSize iconSize = icon.actualSize(QSize(18, 18));
+        const QRect iconRect(option.rect.left() + 2, option.rect.center().y() - iconSize.height() / 2, iconSize.width(),
+                             iconSize.height());
+        icon.paint(painter, iconRect);
+        textRect.setLeft(iconRect.right() + 4);
+    }
+
+    // Text (name column / divider title), elided to the row width.
+    painter->save();
+    painter->setPen(fg);
+    const QFont itemFont = index.data(Qt::FontRole).value<QFont>();
+    painter->setFont(itemFont.isCopyOf(QFont()) ? option.font : itemFont);
+    const QString text = index.data(Qt::DisplayRole).toString();
+    const QString elided = painter->fontMetrics().elidedText(text, Qt::ElideRight, textRect.width() - 4);
+    painter->drawText(textRect.adjusted(2, 0, -2, 0), Qt::AlignLeft | Qt::AlignVCenter, elided);
+    painter->restore();
+
+    // Focus indicator for the current item.
+    if (option.state & QStyle::State_HasFocus) {
+        painter->setPen(appPal.color(QPalette::Highlight));
+        painter->drawRect(option.rect.adjusted(0, 0, -1, -1));
+    }
+}
+
 UserListTWI::UserListTWI(const ServerInfo_User &_userInfo) : QTreeWidgetItem(Type)
 {
     setUserInfo(_userInfo);
@@ -343,12 +247,15 @@ void UserListTWI::setUserInfo(const ServerInfo_User &_userInfo)
     setData(2, Qt::UserRole, QString::fromStdString(userInfo.name()));
     setData(2, Qt::DisplayRole, QString::fromStdString(userInfo.name()));
     setData(3, Qt::InitialSortOrderRole, QString::fromStdString(userInfo.privlevel()));
+    setData(0, UserListRoles::UserInfo, QVariant::fromValue(userInfo));
 }
 
 void UserListTWI::setOnline(bool online)
 {
-    setData(0, Qt::UserRole + 1, online);
-    setData(2, Qt::ForegroundRole, online ? qApp->palette().brush(QPalette::WindowText) : QBrush(Qt::gray));
+    // Only the online state is stored here: the delegate derives the
+    // online/offline text color at paint time from the current application
+    // palette, so no brush is cached (it would go stale on theme change).
+    setData(0, UserListRoles::Online, online);
 }
 
 /**
@@ -357,23 +264,25 @@ void UserListTWI::setOnline(bool online)
  * 2) Admins, judge/vip/donator status ignored
  * 3) Moderators, judge/vip/donator status ignored
  * 4) Judges
- * 5) VIPs
- * 6) Donators
- * 7) Everyone else
+ * 5) Developers
+ * 6) VIPs
+ * 7) Donators
+ * 8) Everyone else
  * @param other RHS to compare to
  * @return Left is less than the Right
  */
 bool UserListTWI::operator<(const QTreeWidgetItem &other) const
 {
     // Sort by online/offline
-    if (data(0, Qt::UserRole + 1) != other.data(0, Qt::UserRole + 1)) {
-        return data(0, Qt::UserRole + 1).toBool();
+    if (data(0, UserListRoles::Online) != other.data(0, UserListRoles::Online)) {
+        return data(0, UserListRoles::Online).toBool();
     }
 
     const auto &lhsUserLevelFlags = UserLevelFlags(data(0, Qt::UserRole).toInt());
     const auto &rhsUserLevelFlags = UserLevelFlags(other.data(0, Qt::UserRole).toInt());
 
-    // Admins & Mods need no additional comparison checks, just to see if they're an admin or a moderator
+    // Admins & Moderators need no additional comparison checks, just to see if they're an admin
+    // or a moderator
     static const QList<ServerInfo_User_UserLevelFlag> userLevelWithNoOtherPrefOrder = {
         ServerInfo_User_UserLevelFlag_IsAdmin, ServerInfo_User_UserLevelFlag_IsModerator};
     for (const auto &userLevelEntry : userLevelWithNoOtherPrefOrder) {
@@ -386,10 +295,10 @@ bool UserListTWI::operator<(const QTreeWidgetItem &other) const
         }
     }
 
-    // Judges can be sorted by their additional ranks
-    static const QList<ServerInfo_User_UserLevelFlag> userLevelOrder = {ServerInfo_User_UserLevelFlag_IsJudge,
-                                                                        ServerInfo_User_UserLevelFlag_IsRegistered,
-                                                                        ServerInfo_User_UserLevelFlag_IsUser};
+    // Judges and developers can be sorted by their additional ranks
+    static const QList<ServerInfo_User_UserLevelFlag> userLevelOrder = {
+        ServerInfo_User_UserLevelFlag_IsJudge, ServerInfo_User_UserLevelFlag_IsDeveloper,
+        ServerInfo_User_UserLevelFlag_IsRegistered, ServerInfo_User_UserLevelFlag_IsUser};
     for (const auto &userLevelEntry : userLevelOrder) {
         if (lhsUserLevelFlags.testFlag(userLevelEntry) != rhsUserLevelFlags.testFlag(userLevelEntry)) {
             return lhsUserLevelFlags.testFlag(userLevelEntry) > rhsUserLevelFlags.testFlag(userLevelEntry);
@@ -411,23 +320,201 @@ bool UserListTWI::operator<(const QTreeWidgetItem &other) const
 UserListWidget::UserListWidget(TabSupervisor *_tabSupervisor,
                                AbstractClient *_client,
                                UserListType _type,
-                               QWidget *parent)
-    : QGroupBox(parent), tabSupervisor(_tabSupervisor), client(_client), type(_type), onlineCount(0)
+                               QWidget *parent,
+                               bool _hasUserInfoPopup)
+    : QGroupBox(parent), hasUserInfoPopup(_hasUserInfoPopup), tabSupervisor(_tabSupervisor), client(_client),
+      type(_type), onlineCount(0)
 {
-    itemDelegate = new UserListItemDelegate(this);
+    avatarProvider = new UserAvatarProvider(client, this);
+    cardArtProvider = new UserCardArtProvider(this);
+
     userContextMenu = new UserContextMenu(tabSupervisor, this);
     connect(userContextMenu, &UserContextMenu::openMessageDialog, this, &UserListWidget::openMessageDialog);
 
     userTree = new QTreeWidget;
-    userTree->setColumnCount(3);
-    userTree->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+    userTree->setColumnCount(4); // 0=display, 1=flag(hidden), 2=name(hidden), 3=privlevel(hidden)
+    userTree->header()->setSectionResizeMode(0, QHeaderView::Stretch);
     userTree->header()->setMinimumSectionSize(0);
     userTree->setHeaderHidden(true);
     userTree->setRootIsDecorated(false);
     userTree->setIconSize(QSize(20, 18));
+    itemDelegate = new UserListItemDelegate(this, userTree, &avatarProvider->cache(), &cardArtProvider->cache(),
+                                            &cardArtParamsMap);
     userTree->setItemDelegate(itemDelegate);
     userTree->setAlternatingRowColors(true);
+    userTree->hideColumn(1);
+    userTree->hideColumn(2);
+    userTree->hideColumn(3);
     connect(userTree, &QTreeWidget::itemActivated, this, &UserListWidget::userClicked);
+    userTree->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    // QTreeWidget enables stretchLastSection by default. Left on, the hidden
+    // last section absorbs viewport resizes, the Stretch sections never
+    // redistribute, and the header keeps a stale length past the viewport —
+    // an invisible horizontal pan range under ScrollBarAlwaysOff. Disable it
+    // so the explicit resize modes in applyDisplayMode() own the geometry.
+    userTree->header()->setStretchLastSection(false);
+
+    // Always create timers so callers never segfault on a null deref;
+    // showPopupForUser / hidePopup already guard against a null userInfoPopup.
+    showPopupTimer = new QTimer(this);
+    showPopupTimer->setSingleShot(true);
+    showPopupTimer->setInterval(280);
+    connect(showPopupTimer, &QTimer::timeout, this, [this] {
+        if (hoveredUser.isEmpty()) {
+            return;
+        }
+        // Resolve the row under the cursor again. In sectioned mode a user can
+        // own several rows (online + buddy), so the popup must anchor to the
+        // exact hovered row instead of a lookup by name.
+        const QPoint viewportPos = userTree->viewport()->mapFromGlobal(QCursor::pos());
+        QTreeWidgetItem *item = userTree->itemAt(viewportPos);
+        if (item && item->type() == QTreeWidgetItem::Type &&
+            QString::fromStdString(static_cast<UserListTWI *>(item)->getUserInfo().name()) == hoveredUser) {
+            showPopupForUser(static_cast<UserListTWI *>(item));
+        }
+    });
+
+    hidePopupTimer = new QTimer(this);
+    hidePopupTimer->setSingleShot(true);
+    hidePopupTimer->setInterval(160);
+    connect(hidePopupTimer, &QTimer::timeout, this, [this] {
+        // The hover ends when the cursor leaves the user row. Empty list
+        // space, a section divider and anything outside the tree all close
+        // the popup, while the popup itself keeps it alive.
+        if (!popupPinned && userInfoPopup && !userInfoPopup->underMouse() &&
+            (hoveredUser.isEmpty() || !userTree->underMouse())) {
+            hidePopup();
+        }
+    });
+
+    if (hasUserInfoPopup) {
+        // ── Hover popup ───────────────────────────────────────────────────────
+        userInfoPopup = new UserInfoPopup(tabSupervisor, tabSupervisor->getClient(), &avatarProvider->cache(),
+                                          &cardArtProvider->cache(), &cardArtParamsMap,
+                                          window()); // parented to main window so it floats above siblings
+
+        // The invite availability is scoped to the room this list belongs to,
+        // and gated on the room's buddy-only setting for the hovered user.
+        userInfoPopup->setGameInviteAvailable(
+            [this](const QString &userName) { return userContextMenu->hasGameInviteLink(userName); });
+
+        userInfoPopup->hide();
+        userInfoPopup->setWindowOpacity(0.0);
+        userInfoPopup->installEventFilter(this);
+
+        connectPopupSignals();
+    }
+
+    userTree->setMouseTracking(true);
+    userTree->viewport()->setMouseTracking(true);
+    userTree->viewport()->installEventFilter(this);
+    userTree->installEventFilter(this); // keyboard handling for section dividers
+
+    if (hasUserInfoPopup) {
+        // Clicking anywhere outside the list clears its selection and closes the
+        // popup. The filter watches all widgets because the press can land on any
+        // part of the window, on another list or on the popup itself.
+        qApp->installEventFilter(this);
+
+        // Pin on item click
+        connect(userTree, &QTreeWidget::itemClicked, this, [this](QTreeWidgetItem *item, int) {
+            // Clicking a section divider toggles it
+            if (sectioned && item->type() == SectionItemType) {
+                setExpandedProgrammatically(item, !item->isExpanded());
+                handleSectionExpansion(item, item->isExpanded());
+                return;
+            }
+            if (!SettingsCache::instance().appearance().getStyleUserList()) {
+                return;
+            }
+            if (item->type() != QTreeWidgetItem::Type) {
+                return; // divider rows have no user popup
+            }
+            popupPinned = false; // reset so showPopupForUser can update
+            showPopupForUser(static_cast<UserListTWI *>(item));
+            popupPinned = true; // pin after showing
+        });
+
+        connect(userTree->selectionModel(), &QItemSelectionModel::selectionChanged, this,
+                [this](const QItemSelection &sel, const QItemSelection &) {
+                    if (sel.isEmpty() && popupPinned) {
+                        popupPinned = false;
+                        hidePopup();
+                    }
+                });
+
+        // Keyboard selection: the popup is a mouse surface, so keyboard
+        // navigation shows no floating popup. A pinned (clicked) popup still
+        // follows the selection so it does not strand on a stale user while
+        // arrows move the cursor.
+        connect(userTree, &QTreeWidget::currentItemChanged, this, [this](QTreeWidgetItem *current, QTreeWidgetItem *) {
+            if (!popupPinned) {
+                return; // keyboard navigation shows no popup
+            }
+            if (!isVisible() || !SettingsCache::instance().appearance().getStyleUserList()) {
+                return;
+            }
+            if (current && current->type() == QTreeWidgetItem::Type) {
+                showPopupForUser(static_cast<UserListTWI *>(current));
+            } else {
+                popupPinned = false;
+                hidePopup();
+            }
+        });
+
+        // Section dividers can be collapsed/expanded by the user. Surface those
+        // changes only from real user interaction. Programmatic expansion is
+        // applied through setSectionExpanded() / setExpandedProgrammatically().
+        connect(userTree, &QTreeWidget::itemExpanded, this,
+                [this](QTreeWidgetItem *item) { handleSectionExpansion(item, true); });
+        connect(userTree, &QTreeWidget::itemCollapsed, this,
+                [this](QTreeWidgetItem *item) { handleSectionExpansion(item, false); });
+
+        // Hide popup when list scrolls (reference row has moved)
+        connect(userTree->verticalScrollBar(), &QScrollBar::valueChanged, this, [this] {
+            showPopupTimer->stop();
+            hidePopup(true);
+            requestVisibleItemResources();
+        });
+    } else {
+        // Dialog mode: keyboard selection drives the Invite button.
+        connect(userTree, &QTreeWidget::currentItemChanged, this, [this](QTreeWidgetItem *current, QTreeWidgetItem *) {
+            const QString userName = (current && current->type() == QTreeWidgetItem::Type)
+                                         ? current->data(2, Qt::UserRole).toString()
+                                         : QString();
+            emit currentUserChanged(userName);
+        });
+
+        // Keep the popup-less scroll path alive for avatar prefetch.
+        connect(userTree->verticalScrollBar(), &QScrollBar::valueChanged, this,
+                [this] { requestVisibleItemResources(); });
+    }
+
+    // Section dividers can be collapsed/expanded by the user. Surface those
+    // changes only from real user interaction. Programmatic expansion is
+    // applied through setSectionExpanded() / setExpandedProgrammatically().
+    connect(userTree, &QTreeWidget::itemExpanded, this,
+            [this](QTreeWidgetItem *item) { handleSectionExpansion(item, true); });
+    connect(userTree, &QTreeWidget::itemCollapsed, this,
+            [this](QTreeWidgetItem *item) { handleSectionExpansion(item, false); });
+
+    connect(avatarProvider, &UserAvatarProvider::avatarUpdated, this, &UserListWidget::refreshVisibleUserHeader);
+    connect(cardArtProvider, &UserCardArtProvider::cardArtUpdated, this, &UserListWidget::refreshVisibleUserHeader);
+
+    connect(&SettingsCache::instance().appearance(), &AppearanceSettings::styleUserListChanged, this,
+            &UserListWidget::applyDisplayMode);
+    applyDisplayMode();
+
+    // The tree's cached palette can go stale after a runtime theme change (Qt
+    // freezes widget palettes when the style is switched), so rows and dividers
+    // derive all colors from the application palette at paint time. The theme
+    // change only needs a repaint to pick them up.
+    if (themeManager) {
+        connect(themeManager, &ThemeManager::themeChanged, this, [this] {
+            userTree->viewport()->update();
+            userTree->update();
+        });
+    }
 
     QVBoxLayout *vbox = new QVBoxLayout;
     vbox->addWidget(userTree);
@@ -437,6 +524,485 @@ UserListWidget::UserListWidget(TabSupervisor *_tabSupervisor,
     retranslateUi();
 }
 
+UserListWidget::~UserListWidget()
+{
+    qApp->removeEventFilter(this);
+}
+
+void UserListWidget::bind(UserListManager *mgr)
+{
+    manager = mgr;
+
+    // ── Full rebuild: disconnect / reconnect / bulk initial load ──────────────
+    connect(manager, &UserListManager::listReset, this, &UserListWidget::rebuild);
+
+    if (!sectioned) {
+        // Online users list (AllUsersList / RoomList)
+        if (type == AllUsersList || type == RoomList) {
+            connect(manager, &UserListManager::userJoinedOnline, this,
+                    [this](const ServerInfo_User &user) { processUserInfo(user, true); });
+            connect(manager, &UserListManager::userLeftOnline, this, [this](const QString &name) { deleteUser(name); });
+        }
+
+        // Buddy list
+        if (type == BuddyList) {
+            connect(manager, &UserListManager::addedToBuddyList, this, [this](const ServerInfo_User &user) {
+                const QString name = QString::fromStdString(user.name());
+                processUserInfo(user, manager->getOnlineUser(name) != nullptr);
+            });
+            connect(manager, &UserListManager::removedFromBuddyList, this,
+                    [this](const QString &name) { deleteUser(name); });
+            // Track online presence changes for buddies already in the tree
+            connect(manager, &UserListManager::userJoinedOnline, this, [this](const ServerInfo_User &user) {
+                const QString name = QString::fromStdString(user.name());
+                if (users.contains(name)) {
+                    users[name]->setUserInfo(user);
+                    setUserOnline(name, true);
+                }
+            });
+            connect(manager, &UserListManager::userLeftOnline, this, [this](const QString &name) {
+                if (users.contains(name)) {
+                    setUserOnline(name, false);
+                }
+            });
+        }
+
+        // Ignore list
+        if (type == IgnoreList) {
+            connect(manager, &UserListManager::addedToIgnoreList, this, [this](const ServerInfo_User &user) {
+                const QString name = QString::fromStdString(user.name());
+                processUserInfo(user, manager->getOnlineUser(name) != nullptr);
+            });
+            connect(manager, &UserListManager::removedFromIgnoreList, this,
+                    [this](const QString &name) { deleteUser(name); });
+        }
+    } else {
+        // Sectioned mode: one tree, every source feeds its own section.
+        // Sections are pure membership views: the "Online" section holds every
+        // currently online user, the "Buddy"/"Ignore" sections hold those
+        // lists. A user can therefore appear in several sections at once (an
+        // online buddy gets one row in each).
+        connect(manager, &UserListManager::userJoinedOnline, this,
+                [this](const ServerInfo_User &user) { handleOnlineChange(user); });
+        connect(manager, &UserListManager::userLeftOnline, this,
+                [this](const QString &name) { handleOnlineChangeLeft(name); });
+        connect(manager, &UserListManager::addedToBuddyList, this,
+                [this](const ServerInfo_User &user) { handleListAdd(Section::Buddy, user); });
+        connect(manager, &UserListManager::removedFromBuddyList, this,
+                [this](const QString &name) { handleListRemove(Section::Buddy, name); });
+        connect(manager, &UserListManager::addedToIgnoreList, this,
+                [this](const ServerInfo_User &user) { handleListAdd(Section::Ignore, user); });
+        connect(manager, &UserListManager::removedFromIgnoreList, this,
+                [this](const QString &name) { handleListRemove(Section::Ignore, name); });
+    }
+
+    // ── Popup button refresh ──────────────────────────────────────────────────
+    // Any buddy/ignore mutation while the popup is open refreshes its buttons
+    auto refreshIfPopupOpen = [this](const QString &name) {
+        if (userInfoPopup && userInfoPopup->isVisible() && userInfoPopup->getCurrentUser() == name) {
+            refreshPopupButtons(name);
+        }
+    };
+    auto refreshCurrentPopup = [refreshIfPopupOpen](const ServerInfo_User &u) {
+        refreshIfPopupOpen(QString::fromStdString(u.name()));
+    };
+
+    connect(manager, &UserListManager::addedToBuddyList, this, refreshCurrentPopup);
+    connect(manager, &UserListManager::removedFromBuddyList, this, refreshIfPopupOpen);
+    connect(manager, &UserListManager::addedToIgnoreList, this, refreshCurrentPopup);
+    connect(manager, &UserListManager::removedFromIgnoreList, this, refreshIfPopupOpen);
+    connect(manager, &UserListManager::userJoinedOnline, this, refreshCurrentPopup);
+    connect(manager, &UserListManager::userLeftOnline, this, refreshIfPopupOpen);
+
+    rebuild();
+}
+
+void UserListWidget::refreshVisibleUserHeader(const QString &name)
+{
+    userTree->viewport()->update();
+    if (!userInfoPopup) {
+        return;
+    }
+    if (userInfoPopup->isVisible() && userInfoPopup->getCurrentUser() == name) {
+        userInfoPopup->refreshHeader();
+    }
+}
+
+void UserListWidget::refreshPopupButtons(const QString &userName)
+{
+    if (!userInfoPopup) {
+        return;
+    }
+    UserListTWI *item = users.value(userName);
+    if (!item) {
+        return;
+    }
+
+    const UserListProxy *proxy = tabSupervisor->getUserListManager();
+    const bool online = item->data(0, UserListRoles::Online).toBool();
+    const bool isBuddy = proxy->isUserBuddy(userName);
+    const bool isIgn = proxy->isUserIgnored(userName);
+
+    userInfoPopup->updateActionButtons(item->getUserInfo(), online, isBuddy, isIgn);
+    positionPopup(item); // height may have changed, reposition
+}
+
+void UserListWidget::hideEvent(QHideEvent *e)
+{
+    QGroupBox::hideEvent(e);
+    if (!userInfoPopup) {
+        return;
+    }
+    showPopupTimer->stop();
+    hidePopupTimer->stop();
+    hidePopup(true);
+}
+
+void UserListWidget::showEvent(QShowEvent *e)
+{
+    QGroupBox::showEvent(e);
+    if (!userInfoPopup) {
+        return;
+    }
+    requestVisibleItemResources();
+}
+
+void UserListWidget::applyDisplayMode()
+{
+    const bool styled = SettingsCache::instance().appearance().getStyleUserList();
+
+    // Both modes must keep the header length at the viewport width: with
+    // ScrollBarAlwaysOff a nonzero horizontal range is invisible but still
+    // pans via trackpad gestures, which reads as janky random drift.
+    if (styled) {
+        userTree->header()->setSectionResizeMode(0, QHeaderView::Stretch);
+        userTree->hideColumn(1);
+        userTree->hideColumn(2);
+        userTree->hideColumn(3);
+    } else {
+        // Bounded widths instead of ResizeToContents: content sizing measures
+        // the FULL text width while the delegate elides afterwards, so long
+        // names widened the header past the viewport. Fixed icon columns plus
+        // a stretched name column keep the range at zero, eliding trims.
+        userTree->header()->setSectionResizeMode(0, QHeaderView::Fixed);
+        userTree->header()->resizeSection(0, 24);
+        userTree->header()->setSectionResizeMode(1, QHeaderView::Fixed);
+        userTree->header()->resizeSection(1, 22);
+        userTree->header()->setSectionResizeMode(2, QHeaderView::Stretch);
+        userTree->showColumn(1);
+        userTree->showColumn(2);
+        userTree->hideColumn(3);
+    }
+
+    userTree->viewport()->update();
+}
+
+void UserListWidget::connectPopupSignals()
+{
+    connect(userInfoPopup, &UserInfoPopup::closeRequested, this, [this] {
+        popupPinned = false;
+        hidePopup(true);
+    });
+    connect(userInfoPopup, &UserInfoPopup::mouseEnteredPopup, hidePopupTimer, &QTimer::stop);
+    connect(userInfoPopup, &UserInfoPopup::mouseLeftPopup, this, [this] {
+        if (!popupPinned) {
+            hidePopupTimer->start();
+        }
+    });
+
+    // Wire all action signals to UserContextMenu::exec*()
+    connect(userInfoPopup, &UserInfoPopup::chatRequested, userContextMenu, &UserContextMenu::execChat);
+    connect(userInfoPopup, &UserInfoPopup::inviteRequested, this,
+            [this](const QString &userName) { userContextMenu->execInvite(userName); });
+    connect(userInfoPopup, &UserInfoPopup::detailsRequested, userContextMenu, &UserContextMenu::execDetails);
+    connect(userInfoPopup, &UserInfoPopup::showGamesRequested, userContextMenu, &UserContextMenu::execShowGames);
+    connect(userInfoPopup, &UserInfoPopup::addBuddyRequested, userContextMenu, &UserContextMenu::execAddToBuddy);
+    connect(userInfoPopup, &UserInfoPopup::removeBuddyRequested, userContextMenu,
+            &UserContextMenu::execRemoveFromBuddy);
+    connect(userInfoPopup, &UserInfoPopup::addIgnoreRequested, userContextMenu, &UserContextMenu::execAddToIgnore);
+    connect(userInfoPopup, &UserInfoPopup::removeIgnoreRequested, userContextMenu,
+            &UserContextMenu::execRemoveFromIgnore);
+    connect(userInfoPopup, &UserInfoPopup::banRequested, userContextMenu, &UserContextMenu::execBan);
+    connect(userInfoPopup, &UserInfoPopup::warnRequested, userContextMenu, &UserContextMenu::execWarn);
+    connect(userInfoPopup, &UserInfoPopup::banHistoryRequested, userContextMenu, &UserContextMenu::execBanHistory);
+    connect(userInfoPopup, &UserInfoPopup::warnHistoryRequested, userContextMenu, &UserContextMenu::execWarnHistory);
+    connect(userInfoPopup, &UserInfoPopup::adminNotesRequested, userContextMenu, &UserContextMenu::execAdminNotes);
+    connect(userInfoPopup, &UserInfoPopup::promoteToModRequested, this,
+            [this](const QString &n) { userContextMenu->execAdjustMod(n, true); });
+    connect(userInfoPopup, &UserInfoPopup::demoteFromModRequested, this,
+            [this](const QString &n) { userContextMenu->execAdjustMod(n, false); });
+    connect(userInfoPopup, &UserInfoPopup::promoteToJudgeRequested, this,
+            [this](const QString &n) { userContextMenu->execAdjustJudge(n, true); });
+    connect(userInfoPopup, &UserInfoPopup::demoteFromJudgeRequested, this,
+            [this](const QString &n) { userContextMenu->execAdjustJudge(n, false); });
+
+    // Joining is a tab-level action, not a per-user one: the popup's games list
+    // spans every room the user is in, so the target room may not be open yet.
+    // Hand it to the supervisor, which owns the intent that joins the room if
+    // needed. The popup closes here because that intent switches tabs, which
+    // would otherwise strand it on a list that is no longer on screen.
+    connect(userInfoPopup, &UserInfoPopup::joinGameRequested, this,
+            [this](const int gameId, const int roomId, const bool asSpectator) {
+                hidePopup(true);
+                tabSupervisor->joinGameFromUserCard(gameId, roomId, asSpectator);
+            });
+}
+
+bool UserListWidget::eventFilter(QObject *obj, QEvent *event)
+{
+    // A press outside the tree, the popup and any open menu deselects the
+    // list and closes the popup. The filter is installed application-wide, so
+    // the target can be any widget in the window or another list.
+    if (event->type() == QEvent::MouseButtonPress) {
+        auto *pressTarget = qobject_cast<QWidget *>(obj);
+        if (pressTarget && !isPressInsideListUi(pressTarget)) {
+            clearSelectionAndClosePopup();
+        }
+    }
+
+    // Keyboard entry to the user context menu: the Menu key (or Shift+F10)
+    // pops the same menu the right-click shows, anchored to the focused row.
+    // Divider rows have no menu. Mouse-triggered context events are NOT handled
+    // here — the delegate's right-press path already pops the menu, and
+    // handling both would open two menus on one right-click.
+    if (hasUserInfoPopup && (obj == userTree || obj == userTree->viewport()) && event->type() == QEvent::ContextMenu) {
+        auto *contextEvent = static_cast<QContextMenuEvent *>(event);
+        if (contextEvent->reason() == QContextMenuEvent::Keyboard) {
+            QTreeWidgetItem *current = userTree->currentItem();
+            if (current && current->type() == QTreeWidgetItem::Type) {
+                const QPoint globalPos = userTree->viewport()->mapToGlobal(userTree->visualItemRect(current).center());
+                showContextMenu(globalPos, userTree->indexFromItem(current));
+                return true;
+            }
+            return false; // divider rows: no menu
+        }
+    }
+
+    // Keyboard navigation of the section dividers.
+    // The dividers are selectable so arrow keys land on them. When one is the
+    // current item, Enter/Space toggle it (like a button) and Left/Right follow
+    // the tree convention (Left collapses, Right expands).
+    if (obj == userTree && event->type() == QEvent::KeyPress) {
+        auto *keyEvent = static_cast<QKeyEvent *>(event);
+        QTreeWidgetItem *current = userTree->currentItem();
+        if (sectioned && current && current->type() == SectionItemType) {
+            const bool toggle = keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Enter ||
+                                keyEvent->key() == Qt::Key_Space;
+            const bool collapse = keyEvent->key() == Qt::Key_Left && current->isExpanded();
+            const bool expand = keyEvent->key() == Qt::Key_Right && !current->isExpanded();
+            if (toggle || collapse || expand) {
+                const bool expanded = toggle ? !current->isExpanded() : expand;
+                setExpandedProgrammatically(current, expanded);
+                handleSectionExpansion(current, expanded);
+                return true;
+            }
+        }
+    }
+
+    if (hasUserInfoPopup && obj == userTree->viewport()) {
+        if (event->type() == QEvent::MouseMove) {
+            if (!SettingsCache::instance().appearance().getStyleUserList()) {
+                return QGroupBox::eventFilter(obj, event);
+            }
+            auto *me = static_cast<QMouseEvent *>(event);
+            QTreeWidgetItem *hoveredItem = userTree->itemAt(me->pos());
+            QString hovName;
+            if (hoveredItem && hoveredItem->type() == QTreeWidgetItem::Type) {
+                hovName = QString::fromStdString(static_cast<UserListTWI *>(hoveredItem)->getUserInfo().name());
+            }
+
+            if (hovName != hoveredUser) {
+                hoveredUser = hovName;
+                if (!hovName.isEmpty()) {
+                    hidePopupTimer->stop();
+                    if (!popupPinned) {
+                        showPopupTimer->start();
+                    }
+                } else {
+                    showPopupTimer->stop();
+                    if (!popupPinned) {
+                        hidePopupTimer->start();
+                    }
+                }
+            }
+        } else if (event->type() == QEvent::Leave) {
+            hoveredUser.clear();
+            showPopupTimer->stop();
+            if (!popupPinned) {
+                hidePopupTimer->start();
+            }
+        }
+    }
+
+    return QGroupBox::eventFilter(obj, event);
+}
+
+void UserListWidget::showPopupForUser(UserListTWI *item)
+{
+    if (!userInfoPopup) {
+        return;
+    }
+    if (!item) {
+        return;
+    }
+
+    const QString userName = QString::fromStdString(item->getUserInfo().name());
+    avatarProvider->requestAvatar(userName); // ensure the hovered user's avatar is fetched promptly
+    if (cardArtParamsMap.contains(userName)) {
+        const CardArtParams &params = cardArtParamsMap.value(userName);
+        cardArtProvider->requestCardArt(userName, params.cardName, params.cardProviderId);
+    }
+
+    const ServerInfo_User &info = item->getUserInfo();
+    const bool online = item->data(0, UserListRoles::Online).toBool();
+    const bool isBuddy = userContextMenu->getUserListProxy()->isUserBuddy(userName);
+    const bool isIgn = userContextMenu->getUserListProxy()->isUserIgnored(userName);
+
+    // The popup is already showing this user (e.g. arrow key navigation between
+    // the online/buddy rows of the same user): just reposition it.
+    if (userInfoPopup->isVisible() && userInfoPopup->getCurrentUser() == userName) {
+        positionPopup(item);
+        return;
+    }
+
+    // Cancel any pending show/hide so a hover timer that armed before a row
+    // selected via the keyboard cannot override it, and a pending hide cannot
+    // kill the popup right after it appears.
+    showPopupTimer->stop();
+    hidePopupTimer->stop();
+
+    userInfoPopup->showForUser(userName, info, online, isBuddy, isIgn);
+
+    const bool wasVisible = userInfoPopup->isVisible();
+    if (!wasVisible) {
+        // Realize the native window at opacity 0 before positioning so that:
+        //   1) move() applies to an existing native handle (not overridden by
+        //      Qt's default centering logic on first show)
+        //   2) adjustSize() inside positionPopup() can measure the final
+        //      laid out geometry correctly
+        userInfoPopup->setWindowOpacity(0.0);
+    }
+    userInfoPopup->show();
+    userInfoPopup->raise();
+
+    positionPopup(item); // geometry is accurate after show, so move() is not overridden
+
+    if (wasVisible) {
+        // Content swap while already open (hover or arrow key navigation):
+        // keep the popup opaque instead of flashing through a fade on every
+        // step.
+        userInfoPopup->setWindowOpacity(1.0);
+        return;
+    }
+
+    auto *fade = new QPropertyAnimation(userInfoPopup, "windowOpacity", userInfoPopup);
+    fade->setDuration(120);
+    fade->setStartValue(0.0);
+    fade->setEndValue(1.0);
+    fade->start(QAbstractAnimation::DeleteWhenStopped);
+}
+
+void UserListWidget::positionPopup(UserListTWI *item)
+{
+    if (!userInfoPopup) {
+        return;
+    }
+    if (!item) {
+        return;
+    }
+
+    QWidget *vp = userTree->viewport();
+    const QRect itemR = userTree->visualItemRect(item);
+    const QPoint itemTL = vp->mapToGlobal(itemR.topLeft());
+    const QPoint vpTL = vp->mapToGlobal(vp->rect().topLeft());
+    const QPoint vpTR = vp->mapToGlobal(vp->rect().topRight());
+
+    userInfoPopup->adjustSize();
+    const int popW = userInfoPopup->width();
+    const int popH = userInfoPopup->height();
+    const int margin = 12;
+
+    QScreen *activeScreen = QGuiApplication::screenAt(itemTL);
+    if (!activeScreen) {
+        activeScreen = window()->screen();
+    }
+    const QRect screen =
+        activeScreen ? activeScreen->availableGeometry() : QGuiApplication::primaryScreen()->availableGeometry();
+
+    // ── X: prefer the side with more space ───────────────────────────────────
+    const int spaceLeft = vpTL.x() - screen.left() - margin;
+    const int spaceRight = screen.right() - vpTR.x() - margin;
+    int x;
+    if (spaceLeft >= spaceRight) {
+        x = (spaceLeft >= popW) ? (vpTL.x() - margin - popW) : (vpTR.x() + margin);
+    } else {
+        x = (spaceRight >= popW) ? (vpTR.x() + margin) : (vpTL.x() - margin - popW);
+    }
+    x = qBound(screen.left() + margin, x, screen.right() - popW - margin);
+
+    // ── Y: grow down if there's room, otherwise grow up ───────────────────────
+    const int itemTopY = itemTL.y();
+    const int spaceBelow = screen.bottom() - itemTopY - margin;
+    const int spaceAbove = itemTopY - screen.top() - margin;
+
+    int y;
+    if (spaceBelow >= popH) {
+        y = itemTopY; // top edges align, popup grows downward
+    } else if (spaceAbove >= popH) {
+        y = itemTopY - popH; // bottom of popup meets top of item, grows upward
+    } else {
+        // Neither side fits cleanly — pick the roomier side and let clamp handle the rest
+        y = (spaceBelow >= spaceAbove) ? itemTopY : (itemTopY - popH);
+    }
+    y = qBound(screen.top() + margin, y, screen.bottom() - popH - margin);
+
+    userInfoPopup->move(x, y);
+}
+
+void UserListWidget::hidePopup(bool immediate)
+{
+    if (!userInfoPopup) {
+        return;
+    }
+    showPopupTimer->stop();
+    hidePopupTimer->stop();
+    if (!userInfoPopup->isVisible()) {
+        return;
+    }
+
+    if (immediate) {
+        userInfoPopup->hide();
+        return;
+    }
+
+    // Fade out
+    auto *fade = new QPropertyAnimation(userInfoPopup, "windowOpacity", userInfoPopup);
+    fade->setDuration(100);
+    fade->setStartValue(userInfoPopup->windowOpacity());
+    fade->setEndValue(0.0);
+    connect(fade, &QPropertyAnimation::finished, userInfoPopup, &QWidget::hide);
+    fade->start(QAbstractAnimation::DeleteWhenStopped);
+}
+
+bool UserListWidget::isPressInsideListUi(const QWidget *widget) const
+{
+    const QWidget *w = widget;
+    while (w) {
+        if (w == userTree || w == userInfoPopup || qobject_cast<const QMenu *>(w)) {
+            return true;
+        }
+        w = w->parentWidget();
+    }
+    return false;
+}
+
+void UserListWidget::clearSelectionAndClosePopup()
+{
+    popupPinned = false;
+    hidePopup(true);
+    userTree->clearSelection();
+}
+
 void UserListWidget::retranslateUi()
 {
     userContextMenu->retranslateUi();
@@ -457,70 +1023,409 @@ void UserListWidget::retranslateUi()
     updateCount();
 }
 
+void UserListWidget::beginBulkLoad()
+{
+    bulkLoading = true;
+}
+
+void UserListWidget::endBulkLoad()
+{
+    bulkLoading = false;
+    sortItems();
+    updateCount(); // divider counts were deferred during the bulk build
+    requestVisibleItemResources();
+    userTree->viewport()->update();
+}
+
+bool UserListWidget::isItemNearViewport(const UserListTWI *item) const
+{
+    // Prefetch a full viewport of rows above and below so scrolling never shows
+    // an unloaded row.
+    const QRect nearView =
+        userTree->viewport()->rect().adjusted(0, -userTree->viewport()->height(), 0, userTree->viewport()->height());
+    return userTree->visualItemRect(item).intersects(nearView);
+}
+
+void UserListWidget::requestVisibleItemResources()
+{
+    const auto requestResources = [this](UserListTWI *twi) {
+        if (!isItemNearViewport(twi)) {
+            return;
+        }
+        const QString userName = QString::fromStdString(twi->getUserInfo().name());
+        avatarProvider->requestAvatar(userName);
+        if (cardArtParamsMap.contains(userName)) {
+            const CardArtParams &params = cardArtParamsMap.value(userName);
+            cardArtProvider->requestCardArt(userName, params.cardName, params.cardProviderId);
+        }
+    };
+
+    if (sectioned) {
+        // Top level items are dividers, user rows hang below them.
+        for (const Section section : sectionIds) {
+            QTreeWidgetItem *divider = sectionItems.value(section);
+            if (!divider) {
+                continue;
+            }
+            for (int i = 0; i < divider->childCount(); ++i) {
+                requestResources(static_cast<UserListTWI *>(divider->child(i)));
+            }
+        }
+        return;
+    }
+
+    for (int i = 0; i < userTree->topLevelItemCount(); ++i) {
+        requestResources(static_cast<UserListTWI *>(userTree->topLevelItem(i)));
+    }
+}
+
+void UserListWidget::rebuild()
+{
+    userTree->clear();
+    users.clear();
+    sectionUsers.clear();
+    cardArtParamsMap.clear();
+    onlineCount = 0;
+
+    if (sectioned) {
+        createSectionItems();
+    }
+
+    if (!manager) {
+        return;
+    }
+
+    if (sectioned) {
+        // Every source feeds its own section. Users that belong to several
+        // sources (an online buddy) get one row per section because
+        // ensureSectionMembership() creates the row when it is missing.
+        beginBulkLoad();
+        const auto &onlineUsers = manager->getAllUsersList();
+        for (auto it = onlineUsers.cbegin(); it != onlineUsers.cend(); ++it) {
+            processUserInfo(Section::Online, it.value(), true);
+        }
+        const auto &buddyUsers = manager->getBuddyList();
+        for (auto it = buddyUsers.cbegin(); it != buddyUsers.cend(); ++it) {
+            processUserInfo(Section::Buddy, it.value(), manager->getOnlineUser(it.key()) != nullptr);
+        }
+        const auto &ignoreUsers = manager->getIgnoreList();
+        for (auto it = ignoreUsers.cbegin(); it != ignoreUsers.cend(); ++it) {
+            processUserInfo(Section::Ignore, it.value(), manager->getOnlineUser(it.key()) != nullptr);
+        }
+        endBulkLoad();
+        applyFilter();
+        return;
+    }
+
+    const QMap<QString, ServerInfo_User> *source = nullptr;
+
+    switch (type) {
+        case AllUsersList:
+        case RoomList:
+            source = &manager->getAllUsersList();
+            break;
+        case BuddyList:
+            source = &manager->getBuddyList();
+            break;
+        case IgnoreList:
+            source = &manager->getIgnoreList();
+            break;
+    }
+
+    beginBulkLoad();
+    for (auto it = source->cbegin(); it != source->cend(); ++it) {
+        processUserInfo(it.value(), manager->getOnlineUser(it.key()) != nullptr);
+    }
+    endBulkLoad();
+    applyFilter();
+}
+
+void UserListWidget::updateCardArtParams(const ServerInfo_User &user, const QString &userName)
+{
+    // Always update params from the latest ServerInfo_User, whether the
+    // item is new or existing, so a live server push refreshes the rendering.
+    if (user.has_card_art_params()) {
+        const auto &cap = user.card_art_params();
+        CardArtParams params;
+        params.cardName = QString::fromStdString(cap.card_name());
+        params.cardProviderId = QString::fromStdString(cap.card_provider_id());
+        params.marginPctL = cap.margin_pct_l();
+        params.marginPctR = cap.margin_pct_r();
+        params.verticalOffset = cap.vertical_offset();
+        params.zoom = cap.zoom();
+        cardArtParamsMap.insert(userName, params);
+        cardArtProvider->requestCardArt(userName, params.cardName, params.cardProviderId);
+    }
+    // Intentionally no removal branch: buddy/ignore list copies never carry
+    // card_art_params (the server omits the column), so a params-less copy here
+    // means "this snapshot doesn't include it", not "the banner was removed".
+    // Removing on such copies would wipe banners that the live online list set.
+    // The map is rebuilt from scratch (clear() + repopulate) on every rebuild,
+    // which is what actually drops stale entries.
+}
+
 void UserListWidget::processUserInfo(const ServerInfo_User &user, bool online)
 {
     const QString userName = QString::fromStdString(user.name());
+
+    updateCardArtParams(user, userName);
+
     UserListTWI *item = users.value(userName);
-    if (item)
+    if (item) {
         item->setUserInfo(user);
-    else {
+    } else {
         item = new UserListTWI(user);
         users.insert(userName, item);
         userTree->addTopLevelItem(item);
-        if (online)
+        if (online) {
             ++onlineCount;
+        }
         updateCount();
+        if (!bulkLoading && isItemNearViewport(item)) {
+            avatarProvider->requestAvatar(userName);
+        }
     }
     item->setOnline(online);
+    if (!bulkLoading) {
+        sortItems();
+        applyFilter();
+        userTree->viewport()->update();
+    }
+}
+
+void UserListWidget::processUserInfo(Section section, const ServerInfo_User &user, bool online)
+{
+    ensureSectionMembership(section, user, online);
+    if (!bulkLoading) {
+        sortItems();
+        applyFilter();
+        userTree->viewport()->update();
+    }
 }
 
 bool UserListWidget::deleteUser(const QString &userName)
 {
-    UserListTWI *twi = users.value(userName);
-    if (twi) {
-        users.remove(userName);
-        userTree->takeTopLevelItem(userTree->indexOfTopLevelItem(twi));
-        if (twi->data(0, Qt::UserRole + 1).toBool())
-            --onlineCount;
-        delete twi;
-        updateCount();
-        return true;
+    if (sectioned) {
+        // The user may own several rows (one per section). Drop them all.
+        bool removed = false;
+        const QList<Section> sections = sectionUsers.keys(); // snapshot: maps mutate
+        for (const Section section : sections) {
+            removed = dropSectionMembership(section, userName) || removed;
+        }
+        if (removed && !bulkLoading) {
+            sortItems();
+            applyFilter();
+            userTree->viewport()->update();
+        }
+        return removed;
     }
 
-    return false;
+    UserListTWI *twi = users.value(userName);
+    if (!twi) {
+        return false;
+    }
+
+    users.remove(userName);
+    if (twi->parent()) {
+        twi->parent()->removeChild(twi); // sectioned mode: rows hang off a divider
+    } else {
+        userTree->takeTopLevelItem(userTree->indexOfTopLevelItem(twi));
+    }
+    if (twi->data(0, UserListRoles::Online).toBool()) {
+        --onlineCount;
+    }
+    delete twi;
+    updateCount();
+    applyFilter();
+    return true;
 }
 
 void UserListWidget::setUserOnline(const QString &userName, bool online)
 {
-    UserListTWI *twi = users.value(userName);
-    if (!twi)
+    if (sectioned) {
+        // The rows in the "Online" section are created/removed by the presence
+        // handlers. This only keeps the presence flag of the surviving rows
+        // (e.g. a buddy row after the user went offline) in sync.
+        for (auto it = sectionUsers.cbegin(); it != sectionUsers.cend(); ++it) {
+            UserListTWI *item = it.value().value(userName);
+            if (item) {
+                item->setOnline(online);
+            }
+        }
         return;
+    }
+
+    UserListTWI *twi = users.value(userName);
+    if (!twi) {
+        return;
+    }
+
+    // No state change: nothing to resort. This also keeps the presence
+    // broadcasts cheap (userJoinedOnline fires once per online user) when the
+    // row already carries the right flag.
+    if (twi->data(0, UserListRoles::Online).toBool() == online) {
+        return;
+    }
 
     twi->setOnline(online);
-    if (online)
+    if (online) {
         ++onlineCount;
-    else
+    } else {
         --onlineCount;
+    }
     updateCount();
+
+    // Online users sort above offline users (UserListTWI::operator<), so a
+    // flag change moves the row. Resort to place the user by the new state.
+    if (!bulkLoading) {
+        sortItems();
+        applyFilter();
+        userTree->viewport()->update();
+    }
 }
 
 void UserListWidget::updateCount()
 {
-    QString str = titleStr;
-    if ((type == BuddyList) || (type == IgnoreList))
-        str = str.arg(onlineCount);
-    setTitle(str.arg(userTree->topLevelItemCount()));
+    if (sectioned) {
+        // The dividers carry the section titles
+        setTitle(QString());
+        for (const Section section : sectionIds) {
+            updateSectionDivider(section);
+        }
+        return;
+    }
+
+    if (showTitle) {
+        QString str = titleStr;
+        if ((type == BuddyList) || (type == IgnoreList)) {
+            str = str.arg(onlineCount);
+        }
+        setTitle(str.arg(userTree->topLevelItemCount()));
+    } else {
+        setTitle(QString());
+    }
+}
+
+void UserListWidget::setShowTitle(bool _showTitle)
+{
+    this->showTitle = _showTitle;
+    updateCount();
+}
+
+void UserListWidget::setFilterText(const QString &text)
+{
+    if (filterText == text) {
+        return;
+    }
+    filterText = text;
+    applyFilter();
+}
+
+void UserListWidget::applyFilter()
+{
+    if (sectioned) {
+        const bool searching = !filterText.isEmpty();
+        const QString lower = filterText.toLower();
+        for (const Section section : sectionIds) {
+            QTreeWidgetItem *divider = sectionItems.value(section);
+            if (!divider) {
+                continue;
+            }
+            int visible = 0;
+            for (int i = 0; i < divider->childCount(); ++i) {
+                auto *child = static_cast<UserListTWI *>(divider->child(i));
+                const QString name = QString::fromStdString(child->getUserInfo().name());
+                const bool passesFilter =
+                    !userFilter || userFilter(name, child->data(0, UserListRoles::Online).toBool());
+                const bool match = passesFilter && (!searching || name.toLower().contains(lower));
+                child->setHidden(!match);
+                if (match) {
+                    ++visible;
+                }
+            }
+            if (searching) {
+                // During a search the sections with matches stay open and empty
+                // sections disappear entirely. The persisted expansion state is
+                // untouched and restored when the search is cleared.
+                divider->setHidden(visible == 0);
+                setExpandedProgrammatically(divider, visible > 0);
+            } else {
+                divider->setHidden(false);
+                setExpandedProgrammatically(divider, expandedSections.contains(section));
+            }
+            updateSectionDivider(section);
+        }
+        requestVisibleItemResources();
+        userTree->viewport()->update();
+        emit userListChanged();
+        return;
+    }
+
+    if (filterText.isEmpty()) {
+        for (auto it = users.cbegin(); it != users.cend(); ++it) {
+            it.value()->setHidden(false);
+        }
+    } else {
+        const QString lower = filterText.toLower();
+        for (auto it = users.cbegin(); it != users.cend(); ++it) {
+            const bool match = QString::fromStdString(it.value()->getUserInfo().name()).toLower().contains(lower);
+            it.value()->setHidden(!match);
+        }
+    }
+
+    requestVisibleItemResources();
+    userTree->viewport()->update();
+    emit userListChanged();
 }
 
 void UserListWidget::userClicked(QTreeWidgetItem *item, int /*column*/)
 {
-    emit openMessageDialog(item->data(2, Qt::UserRole).toString(), true);
+    if (item->type() != QTreeWidgetItem::Type) {
+        return; // divider rows open no chat
+    }
+    const QString userName = item->data(2, Qt::UserRole).toString();
+    if (hasUserInfoPopup) {
+        emit openMessageDialog(userName, true);
+    } else {
+        emit userActivated(userName);
+    }
+}
+
+int UserListWidget::visibleUserRowCount() const
+{
+    int count = 0;
+    if (sectioned) {
+        for (const Section section : sectionIds) {
+            QTreeWidgetItem *divider = sectionItems.value(section);
+            if (!divider || divider->isHidden()) {
+                continue;
+            }
+            for (int i = 0; i < divider->childCount(); ++i) {
+                if (!divider->child(i)->isHidden()) {
+                    ++count;
+                }
+            }
+        }
+        return count;
+    }
+    for (int i = 0; i < userTree->topLevelItemCount(); ++i) {
+        QTreeWidgetItem *item = userTree->topLevelItem(i);
+        if (!item->isHidden() && item->type() == QTreeWidgetItem::Type) {
+            ++count;
+        }
+    }
+    return count;
 }
 
 void UserListWidget::showContextMenu(const QPoint &pos, const QModelIndex &index)
 {
-    const ServerInfo_User &userInfo = static_cast<UserListTWI *>(userTree->topLevelItem(index.row()))->getUserInfo();
-    bool online = index.sibling(index.row(), 0).data(Qt::UserRole + 1).toBool();
+    QTreeWidgetItem *item = userTree->itemFromIndex(index);
+    if (!item || item->type() != QTreeWidgetItem::Type) {
+        return; // divider rows have no user menu
+    }
+    const auto *userItem = static_cast<UserListTWI *>(item);
+    const ServerInfo_User &userInfo = userItem->getUserInfo();
+    const bool online = userItem->data(0, UserListRoles::Online).toBool();
 
     userContextMenu->showContextMenu(pos, QString::fromStdString(userInfo.name()),
                                      UserLevelFlags(userInfo.user_level()), online);
@@ -528,5 +1433,313 @@ void UserListWidget::showContextMenu(const QPoint &pos, const QModelIndex &index
 
 void UserListWidget::sortItems()
 {
-    userTree->sortItems(1, Qt::AscendingOrder);
+    if (sectioned) {
+        // Sorting must stay inside each section so the dividers keep their
+        // places as top level items.
+        for (auto it = sectionItems.cbegin(); it != sectionItems.cend(); ++it) {
+            it.value()->sortChildren(0, Qt::AscendingOrder);
+        }
+        return;
+    }
+    userTree->sortItems(0, Qt::AscendingOrder);
+}
+
+// Sectioned mode
+
+void UserListWidget::setSectioned(const QList<Section> &ids)
+{
+    if (sectioned || ids.isEmpty()) {
+        return;
+    }
+
+    sectioned = true;
+    sectionIds = ids;
+    expandedSections.clear();
+    for (const Section section : sectionIds) {
+        expandedSections.insert(section); // everything starts expanded
+    }
+
+    // The single tree owns scrolling and the dividers carry the section titles,
+    // so the group box chrome and tree decorations collapse into a flat list.
+    setFlat(true);
+    setShowTitle(false);
+    userTree->setFrameStyle(QFrame::NoFrame);
+    // No tree branches: the dividers draw their own arrow glyph, so the rows can
+    // sit flush with the left border.
+    userTree->setRootIsDecorated(false);
+    userTree->setIndentation(0);
+    userTree->setAlternatingRowColors(false);
+    if (auto *listLayout = layout()) {
+        listLayout->setContentsMargins(0, 0, 0, 0);
+    }
+
+    createSectionItems();
+    updateCount();
+}
+
+void UserListWidget::createSectionItems()
+{
+    sectionItems.clear();
+    QSignalBlocker blocker(userTree); // no expansion signals while building
+    for (const Section section : sectionIds) {
+        QTreeWidgetItem *divider = createSectionItem(section);
+        sectionItems.insert(section, divider);
+        divider->setExpanded(expandedSections.contains(section));
+    }
+}
+
+QTreeWidgetItem *UserListWidget::createSectionItem(Section section)
+{
+    Q_UNUSED(section);
+    auto *divider = new QTreeWidgetItem(SectionItemType);
+    // Selectable so keyboard navigation (Up/Down) can land on the dividers.
+    // They act as collapsible section headers once they have focus.
+    divider->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
+
+    QFont font = userTree->font();
+    font.setBold(true);
+    divider->setFont(0, font);
+    // A little taller than a plain text row so the header reads as a section
+    // separator without matching the full user row height.
+    divider->setSizeHint(0, QSize(0, QFontMetrics(font).height() + 16));
+
+    userTree->addTopLevelItem(divider);
+    // QTreeWidgetItem::setFirstColumnSpanned() does nothing while the item is
+    // detached from the tree (Qt returns early when treeModel() is null), so it
+    // must be called after addTopLevelItem(). Without the span the divider text
+    // is confined to column 0 and gets elided in unstyled mode.
+    divider->setFirstColumnSpanned(true);
+    return divider;
+}
+
+QString UserListWidget::sectionTitle(Section section) const
+{
+    switch (section) {
+        case Section::Buddy:
+            return tr("Buddies");
+        case Section::Online:
+            return tr("Online");
+        case Section::Ignore:
+            return tr("Ignored");
+    }
+    return {};
+}
+
+void UserListWidget::updateSectionDivider(Section section)
+{
+    QTreeWidgetItem *divider = sectionItems.value(section);
+    if (!divider) {
+        return;
+    }
+    int visible = 0;
+    int online = 0;
+    for (int i = 0; i < divider->childCount(); ++i) {
+        QTreeWidgetItem *child = divider->child(i);
+        if (!child->isHidden()) {
+            ++visible;
+            if (child->data(0, UserListRoles::Online).toBool()) {
+                ++online;
+            }
+        }
+    }
+    // The tree draws no branches (rows are flush), so the divider carries its
+    // own collapse arrow glyph.
+    const QString arrow = divider->isExpanded() ? QStringLiteral("\u25BE") : QStringLiteral("\u25B8");
+    if (section == Section::Buddy) {
+        // The buddy divider reports how many of the shown buddies are online,
+        // mirroring the "Buddies online: %1 / %2" title of the non-sectioned
+        // buddy list.
+        divider->setText(0, tr("%1 %2 (%3/%4)").arg(arrow, sectionTitle(section)).arg(online).arg(visible));
+    } else {
+        divider->setText(0, tr("%1 %2 (%3)").arg(arrow, sectionTitle(section)).arg(visible));
+    }
+}
+
+void UserListWidget::handleSectionExpansion(QTreeWidgetItem *item, bool expanded)
+{
+    if (!sectioned || item->type() != SectionItemType) {
+        return;
+    }
+    // Reverse lookup. Only three dividers exist, so a linear scan over the
+    // section map is cheaper than caching the section on each divider.
+    auto dividerIt = sectionItems.constBegin();
+    while (dividerIt != sectionItems.constEnd() && dividerIt.value() != item) {
+        ++dividerIt;
+    }
+    if (dividerIt == sectionItems.constEnd()) {
+        return;
+    }
+    const Section section = dividerIt.key();
+    if (expanded) {
+        expandedSections.insert(section);
+    } else {
+        expandedSections.remove(section);
+    }
+    updateSectionDivider(section); // the arrow glyph follows the state
+    emit sectionExpanded(section, expanded);
+}
+
+void UserListWidget::setExpandedProgrammatically(QTreeWidgetItem *item, bool expanded)
+{
+    QSignalBlocker blocker(userTree);
+    item->setExpanded(expanded);
+}
+
+void UserListWidget::setSectionExpanded(Section section, bool expanded)
+{
+    if (!sectioned) {
+        return;
+    }
+    if (expanded) {
+        expandedSections.insert(section);
+    } else {
+        expandedSections.remove(section);
+    }
+    QTreeWidgetItem *divider = sectionItems.value(section);
+    if (!divider) {
+        return;
+    }
+    QSignalBlocker blocker(userTree);
+    divider->setExpanded(expanded);
+    updateSectionDivider(section); // the arrow glyph follows the state
+    userTree->viewport()->update();
+}
+
+void UserListWidget::handleOnlineChange(const ServerInfo_User &user)
+{
+    // A user came online: they get a row in the "Online" section, plus (if
+    // applicable) a row in the buddy/ignore sections, which flip to online.
+    const QString name = QString::fromStdString(user.name());
+    ensureSectionMembership(Section::Online, user, true);
+    if (manager->isUserBuddy(name)) {
+        ensureSectionMembership(Section::Buddy, user, true);
+    }
+    if (manager->isUserIgnored(name)) {
+        ensureSectionMembership(Section::Ignore, user, true);
+    }
+    finishSectionedMutation();
+}
+
+void UserListWidget::handleOnlineChangeLeft(const QString &userName)
+{
+    // The user is no longer online: their "Online" row disappears. Buddies and
+    // ignored users keep their own section's row, marked offline. A plain user
+    // has no rows left.
+    const bool dropped = dropSectionMembership(Section::Online, userName);
+    const bool kept = manager->isUserBuddy(userName) || manager->isUserIgnored(userName);
+    if (kept) {
+        setUserOnline(userName, false);
+    }
+    if (dropped || kept) {
+        finishSectionedMutation();
+    }
+}
+
+void UserListWidget::handleListAdd(Section section, const ServerInfo_User &user)
+{
+    const QString name = QString::fromStdString(user.name());
+    const bool online = manager->getOnlineUser(name) != nullptr;
+    ensureSectionMembership(section, user, online);
+    if (online) {
+        // The user belongs to the "Online" section as well. Make sure the row
+        // exists even if the join event raced ahead of the list mutation.
+        ensureSectionMembership(Section::Online, user, true);
+    }
+    finishSectionedMutation();
+}
+
+void UserListWidget::handleListRemove(Section section, const QString &userName)
+{
+    // Only the row of the removed section disappears: an online user keeps
+    // their "Online" row, and other list memberships keep theirs.
+    if (dropSectionMembership(section, userName)) {
+        finishSectionedMutation();
+    }
+}
+
+UserListTWI *UserListWidget::ensureSectionMembership(Section section, const ServerInfo_User &user, bool online)
+{
+    const QString userName = QString::fromStdString(user.name());
+
+    updateCardArtParams(user, userName);
+
+    // Dialog mode: rows that fail the user filter never exist. applyFilter()
+    // re-checks the predicate on every pass so a live state change (e.g. the
+    // user being ignored mid-dialog) hides an already created row.
+    if (userFilter && !userFilter(userName, online)) {
+        return nullptr;
+    }
+
+    QTreeWidgetItem *divider = sectionItems.value(section);
+    if (!divider) {
+        return nullptr;
+    }
+
+    QMap<QString, UserListTWI *> &sectionMap = sectionUsers[section];
+    UserListTWI *item = sectionMap.value(userName);
+    if (!item) {
+        item = new UserListTWI(user);
+        sectionMap.insert(userName, item);
+        divider->addChild(item);
+        if (!users.contains(userName)) {
+            users.insert(userName, item); // primary row for lookups by name
+        }
+        // The divider counts are refreshed once in endBulkLoad(). Calling
+        // updateCount() per row during a large rebuild would be quadratic.
+        if (!bulkLoading) {
+            updateCount(); // a new row changes the divider's count
+        }
+        if (!bulkLoading && isItemNearViewport(item)) {
+            avatarProvider->requestAvatar(userName);
+        }
+    } else {
+        item->setUserInfo(user);
+    }
+    item->setOnline(online);
+    return item;
+}
+
+bool UserListWidget::dropSectionMembership(Section section, const QString &userName)
+{
+    QMap<QString, UserListTWI *> &sectionMap = sectionUsers[section];
+    UserListTWI *item = sectionMap.take(userName);
+    if (!item) {
+        return false;
+    }
+
+    if (item->parent()) {
+        item->parent()->removeChild(item);
+    } else {
+        userTree->takeTopLevelItem(userTree->indexOfTopLevelItem(item));
+    }
+    if (users.value(userName) == item) {
+        // Repoint the primary row at another surviving row, if any.
+        UserListTWI *replacement = nullptr;
+        for (auto it = sectionUsers.cbegin(); it != sectionUsers.cend() && !replacement; ++it) {
+            replacement = it.value().value(userName);
+        }
+        if (replacement) {
+            users.insert(userName, replacement);
+        } else {
+            users.remove(userName);
+        }
+    }
+    delete item;
+    updateCount();
+    return true;
+}
+
+void UserListWidget::finishSectionedMutation()
+{
+    if (bulkLoading) {
+        return;
+    }
+    sortItems();
+    applyFilter();
+    userTree->viewport()->update();
+}
+
+void UserListWidget::setGameInviteLinkProvider(std::function<QList<GameInviteOption>()> provider)
+{
+    userContextMenu->setGameInviteLinkProvider(std::move(provider));
 }
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 036837673..8093222ea 100644
--- a/cockatrice/src/interface/widgets/server/user/user_list_widget.h
+++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.h
@@ -1,105 +1,61 @@
 /**
  * @file user_list_widget.h
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef USERLIST_H
 #define USERLIST_H
 
-#include <QComboBox>
-#include <QDialog>
-#include <QGroupBox>
-#include <QStyledItemDelegate>
-#include <QTextEdit>
-#include <QTreeWidgetItem>
-#include <libcockatrice/network/server/remote/user_level.h>
-#include <libcockatrice/protocol/pb/moderator_commands.pb.h>
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+
+#include <QGroupBox>
+#include <QList>
+#include <QMap>
+#include <QSet>
+#include <QString>
+#include <QStyledItemDelegate>
+#include <QTreeWidgetItem>
+#include <functional>
+#include <qtmetamacros.h>
+#include <utility>
 
-class QTreeWidget;
-class ServerInfo_User;
 class AbstractClient;
 class TabSupervisor;
-class QLabel;
-class QCheckBox;
-class QSpinBox;
-class QRadioButton;
-class QPlainTextEdit;
-class Response;
-class CommandContainer;
 class UserContextMenu;
-
-class BanDialog : public QDialog
-{
-    Q_OBJECT
-private:
-    QLabel *daysLabel, *hoursLabel, *minutesLabel;
-    QCheckBox *nameBanCheckBox, *ipBanCheckBox, *idBanCheckBox, *deleteMessages;
-    QLineEdit *nameBanEdit, *ipBanEdit, *idBanEdit;
-    QSpinBox *daysEdit, *hoursEdit, *minutesEdit;
-    QRadioButton *permanentRadio, *temporaryRadio;
-    QPlainTextEdit *reasonEdit, *visibleReasonEdit;
-private slots:
-    void okClicked();
-    void enableTemporaryEdits(bool enabled);
-
-public:
-    explicit BanDialog(const ServerInfo_User &info, QWidget *parent = nullptr);
-    [[nodiscard]] QString getBanName() const;
-    [[nodiscard]] QString getBanIP() const;
-    [[nodiscard]] QString getBanId() const;
-    [[nodiscard]] int getMinutes() const;
-    [[nodiscard]] QString getReason() const;
-    [[nodiscard]] QString getVisibleReason() const;
-    [[nodiscard]] int getDeleteMessages() const;
-};
-
-class WarningDialog : public QDialog
-{
-    Q_OBJECT
-private:
-    QLabel *descriptionLabel;
-    QLineEdit *nameWarning;
-    QComboBox *warningOption;
-    QLineEdit *warnClientID;
-    QCheckBox *deleteMessages;
-private slots:
-    void okClicked();
-
-public:
-    WarningDialog(const QString userName, const QString clientID, QWidget *parent = nullptr);
-    [[nodiscard]] QString getName() const;
-    [[nodiscard]] QString getWarnID() const;
-    [[nodiscard]] QString getReason() const;
-    [[nodiscard]] int getDeleteMessages() const;
-    void addWarningOption(const QString warning);
-};
-
-class AdminNotesDialog : public QDialog
-{
-    Q_OBJECT
-
-private:
-    QString userName;
-    QPlainTextEdit *notes;
-
-public:
-    explicit AdminNotesDialog(const QString &_userName, const QString &_notes, QWidget *_parent = nullptr);
-    [[nodiscard]] QString getName() const
-    {
-        return userName;
-    }
-    [[nodiscard]] QString getNotes() const;
-};
+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 UserListItemDelegate : public QStyledItemDelegate
 {
+    QTreeWidget *tree;
+    UserListWidget *owner;
+    const QMap<QString, QPixmap> *avatarCache;
+    const QMap<QString, QPixmap> *cardArtCache;
+    const QMap<QString, CardArtParams> *cardArtParamsMap;
+
 public:
-    explicit UserListItemDelegate(QObject *const parent);
+    explicit UserListItemDelegate(UserListWidget *owner,
+                                  QTreeWidget *tree,
+                                  const QMap<QString, QPixmap> *avatarCache,
+                                  const QMap<QString, QPixmap> *cardArtCache,
+                                  const QMap<QString, CardArtParams> *cardArtParamsMap);
     bool editorEvent(QEvent *event,
                      QAbstractItemModel *model,
                      const QStyleOptionViewItem &option,
                      const QModelIndex &index) override;
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 };
 
 class UserListTWI : public QTreeWidgetItem
@@ -129,42 +85,148 @@ public:
         BuddyList,
         IgnoreList
     };
+    enum class Section
+    {
+        Buddy,
+        Online,
+        Ignore
+    };
 
 private:
+    UserListManager *manager = nullptr;
+    UserAvatarProvider *avatarProvider = nullptr;
+    UserCardArtProvider *cardArtProvider = nullptr;
+    QMap<QString, CardArtParams> cardArtParamsMap;
+    // ── Hover popup ───────────────────────────────────────────────────────────
+    UserInfoPopup *userInfoPopup = nullptr;
+    QTimer *showPopupTimer = nullptr;
+    QTimer *hidePopupTimer = nullptr;
+    QString hoveredUser;
+    bool popupPinned = false;
+    bool bulkLoading = false;
+    bool hasUserInfoPopup = true;
+    std::function<bool(const QString &userName, bool online)> userFilter;
+
+    /**
+     * Popup functions are anchored on the row, not the user name. In sectioned
+     * mode a user can own several rows (online + buddy), and the popup must
+     * follow the hovered/selected row rather than a lookup by name.
+     */
+    void showPopupForUser(UserListTWI *item);
+    void hidePopup(bool immediate = false);
+    void positionPopup(UserListTWI *item);
+    void connectPopupSignals();
+    /** True when @p widget is the tree, the popup or an open menu. */
+    bool isPressInsideListUi(const QWidget *widget) const;
+    void clearSelectionAndClosePopup();
+    bool isItemNearViewport(const UserListTWI *item) const;
+    void requestVisibleItemResources();
+
+    // Sectioned mode (single tree with inline dividers)
+    bool sectioned = false;
+    QList<Section> sectionIds;
+    QMap<Section, QTreeWidgetItem *> sectionItems;
+    // One row per (section, user): a user that is online AND a buddy appears in
+    // both the "Online" and the "Buddies" sections, so the same user can own
+    // several rows, each hanging off its section's divider.
+    QMap<Section, QMap<QString, UserListTWI *>> sectionUsers;
+    QSet<Section> expandedSections;
+    void createSectionItems();
+    QTreeWidgetItem *createSectionItem(Section section);
+    [[nodiscard]] QString sectionTitle(Section section) const;
+    void updateSectionDivider(Section section);
+    void handleSectionExpansion(QTreeWidgetItem *item, bool expanded);
+    void setExpandedProgrammatically(QTreeWidgetItem *item, bool expanded);
+    void handleOnlineChange(const ServerInfo_User &user);
+    void handleOnlineChangeLeft(const QString &userName);
+    void handleListAdd(Section section, const ServerInfo_User &user);
+    void handleListRemove(Section section, const QString &userName);
+    /** Creates or updates the row for @p user in @p section. */
+    UserListTWI *ensureSectionMembership(Section section, const ServerInfo_User &user, bool online);
+    /** Removes and deletes the row for @p userName in @p section. */
+    bool dropSectionMembership(Section section, const QString &userName);
+    /** Sorts, refilters and repaints after a sectioned mode mutation. */
+    void finishSectionedMutation();
+    void updateCardArtParams(const ServerInfo_User &user, const QString &userName);
+    void processUserInfo(Section section, const ServerInfo_User &user, bool online);
+
     QMap<QString, UserListTWI *> users;
     TabSupervisor *tabSupervisor;
     AbstractClient *client;
     UserListType type;
-    QTreeWidget *userTree;
+    QTreeWidget *userTree = nullptr;
     UserListItemDelegate *itemDelegate;
     UserContextMenu *userContextMenu;
     int onlineCount;
     QString titleStr;
+    QString filterText;
+    bool showTitle = true;
     void updateCount();
+    void applyFilter();
+    void refreshPopupButtons(const QString &userName);
 private slots:
     void userClicked(QTreeWidgetItem *item, int column);
+    void refreshVisibleUserHeader(const QString &name);
 signals:
     void openMessageDialog(const QString &userName, bool focus);
     void addBuddy(const QString &userName);
     void removeBuddy(const QString &userName);
     void addIgnore(const QString &userName);
     void removeIgnore(const QString &userName);
+    void sectionExpanded(Section section, bool expanded);
+    /** Dialog mode: the user activated (Enter/double-click) the given row. */
+    void userActivated(const QString &userName);
+    /** Dialog mode: the current row changed; empty string means no user row. */
+    void currentUserChanged(const QString &userName);
+    /** The set of visible rows changed (filter, search or a live mutation). */
+    void userListChanged();
 
 public:
     UserListWidget(TabSupervisor *_tabSupervisor,
                    AbstractClient *_client,
                    UserListType _type,
-                   QWidget *parent = nullptr);
+                   QWidget *parent = nullptr,
+                   bool hasUserInfoPopup = true);
+    ~UserListWidget() override;
+    void bind(UserListManager *mgr);
+    void applyDisplayMode();
+    void beginBulkLoad();
+    void endBulkLoad();
+    bool eventFilter(QObject *obj, QEvent *event) override;
     void retranslateUi();
+    void rebuild();
     void processUserInfo(const ServerInfo_User &user, bool online);
     bool deleteUser(const QString &userName);
     void setUserOnline(const QString &userName, bool online);
+    void setFilterText(const QString &text);
+    void setShowTitle(bool showTitle);
+    void setSectioned(const QList<Section> &ids);
+    void setSectionExpanded(Section section, bool expanded);
+    /** Dialog mode: rows that fail the predicate are never shown. */
+    void setUserFilter(std::function<bool(const QString &userName, bool online)> filter)
+    {
+        userFilter = std::move(filter);
+    }
+    [[nodiscard]] int visibleUserRowCount() const;
+    [[nodiscard]] bool getHasUserInfoPopup() const
+    {
+        return hasUserInfoPopup;
+    }
+    [[nodiscard]] const QList<Section> &getSectionIds() const
+    {
+        return sectionIds;
+    }
     [[nodiscard]] const QMap<QString, UserListTWI *> &getUsers() const
     {
         return users;
     }
     void showContextMenu(const QPoint &pos, const QModelIndex &index);
     void sortItems();
+    void setGameInviteLinkProvider(std::function<QList<GameInviteOption>()> provider);
+
+protected:
+    void hideEvent(QHideEvent *e) override;
+    void showEvent(QShowEvent *e) override;
 };
 
 #endif
diff --git a/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.cpp
new file mode 100644
index 000000000..9c43d1f7b
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.cpp
@@ -0,0 +1,204 @@
+#include "abstract_settings_page.h"
+
+#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
+ * @param layout The layout to walk
+ * @param widgets Output list of (widget, containing layout) pairs
+ */
+static void collectWidgets(QLayout *layout, QList<QPair<QWidget *, QLayout *>> &widgets)
+{
+    for (int i = 0; i < layout->count(); ++i) {
+        QLayoutItem *item = layout->itemAt(i);
+        if (!item) {
+            continue;
+        }
+        if (QWidget *widget = item->widget()) {
+            widgets.append({widget, layout});
+        } else if (QLayout *subLayout = item->layout()) {
+            collectWidgets(subLayout, widgets);
+        }
+    }
+}
+
+/**
+ * @brief Rejects QLabels that are not setting names
+ *
+ * HTML link labels, path values, and excessively long labels are filtered out.
+ */
+static bool isValidSettingLabel(const QLabel *label)
+{
+    const QString &text = label->text();
+    if (Qt::mightBeRichText(text)) {
+        return false;
+    }
+    if (text.contains(QLatin1Char('/')) || text.contains(QLatin1Char('\\'))) {
+        return false;
+    }
+    if (text.size() > 60) {
+        return false;
+    }
+    return true;
+}
+
+/**
+ * @brief Finds the control associated with a setting label
+ *
+ * Uses the explicit buddy if set, otherwise the widget in the cell (or slot)
+ * immediately following the label within the same layout. Returns nullptr when
+ * no obvious control is found.
+ */
+static QWidget *controlForLabel(QLabel *label, QLayout *containingLayout)
+{
+    if (QWidget *buddy = label->buddy()) {
+        return buddy;
+    }
+
+    if (auto *grid = qobject_cast<QGridLayout *>(containingLayout)) {
+        int index = grid->indexOf(label);
+        if (index != -1) {
+            int row = 0;
+            int column = 0;
+            int rowSpan = 1;
+            int columnSpan = 1;
+            grid->getItemPosition(index, &row, &column, &rowSpan, &columnSpan);
+            if (QLayoutItem *next = grid->itemAtPosition(row, column + columnSpan)) {
+                if (QWidget *nextWidget = next->widget()) {
+                    return nextWidget;
+                }
+            }
+        }
+    } else {
+        int index = containingLayout->indexOf(label);
+        if (index != -1) {
+            for (int i = index + 1; i < containingLayout->count(); ++i) {
+                if (QLayoutItem *next = containingLayout->itemAt(i)) {
+                    if (QWidget *nextWidget = next->widget()) {
+                        return nextWidget;
+                    }
+                }
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+/**
+ * @brief Builds the extended search text for an entry
+ *
+ * Combines the group title, label, and any extra searchable text derived from
+ * the associated control (placeholder, prefix/suffix, tooltip). Combo values
+ * and numeric tooltips are excluded since they change at runtime and would
+ * make the search index stale.
+ */
+static QString buildFullSearchText(const QString &groupTitle, const QString &cleanLabel, QWidget *control)
+{
+    QStringList parts = {groupTitle, cleanLabel};
+    if (control) {
+        if (auto *lineEdit = qobject_cast<QLineEdit *>(control)) {
+            parts.append(lineEdit->placeholderText());
+        } else if (auto *spinBox = qobject_cast<QSpinBox *>(control)) {
+            parts.append(spinBox->prefix());
+            parts.append(spinBox->suffix());
+        }
+        if (!control->toolTip().isEmpty()) {
+            bool isNumeric = false;
+            control->toolTip().toInt(&isNumeric);
+            if (!isNumeric) {
+                parts.append(control->toolTip());
+            }
+        }
+    }
+    parts.removeAll(QString());
+    return parts.join(QLatin1Char(' '));
+}
+
+QList<SettingsSearchEntry> AbstractSettingsPage::getSearchEntries()
+{
+    return autoDetectSearchEntries(this, -1);
+}
+
+QList<SettingsSearchEntry> AbstractSettingsPage::autoDetectSearchEntries(QWidget *page, int pageIndex)
+{
+    QList<SettingsSearchEntry> entries;
+
+    const auto children = page->children();
+    for (QObject *child : children) {
+        auto *groupBox = qobject_cast<QGroupBox *>(child);
+        if (!groupBox) {
+            continue;
+        }
+
+        QString groupTitle = groupBox->title();
+        if (groupTitle.isEmpty()) {
+            continue;
+        }
+
+        QLayout *groupLayout = groupBox->layout();
+        if (!groupLayout) {
+            continue;
+        }
+
+        QList<QPair<QWidget *, QLayout *>> widgets;
+        collectWidgets(groupLayout, widgets);
+
+        for (const auto &pair : widgets) {
+            QWidget *widget = pair.first;
+            QString label;
+
+            auto *checkBox = qobject_cast<QCheckBox *>(widget);
+            if (checkBox) {
+                label = checkBox->text();
+            } else {
+                auto *labelWidget = qobject_cast<QLabel *>(widget);
+                if (!labelWidget || labelWidget->text().isEmpty() || !isValidSettingLabel(labelWidget)) {
+                    continue;
+                }
+                label = labelWidget->text();
+            }
+
+            if (label.isEmpty()) {
+                continue;
+            }
+
+            // Strip accelerator markers (&) for search
+            QString cleanLabel = label;
+            cleanLabel.remove(QLatin1Char('&'));
+
+            QWidget *control = widget;
+            if (auto *labelWidget = qobject_cast<QLabel *>(widget)) {
+                control = controlForLabel(labelWidget, pair.second);
+                if (!control) {
+                    continue;
+                }
+            }
+
+            entries.append(SettingsSearchEntry{.pageIndex = pageIndex,
+                                               .groupTitle = groupTitle,
+                                               .widgetLabel = cleanLabel,
+                                               .fullSearchText = buildFullSearchText(groupTitle, cleanLabel, control),
+                                               .widget = control});
+        }
+    }
+
+    return entries;
+}
diff --git a/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h b/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h
new file mode 100644
index 000000000..722a91e62
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/abstract_settings_page.h
@@ -0,0 +1,25 @@
+#ifndef COCKATRICE_ABSTRACT_SETTINGS_PAGE_H
+#define COCKATRICE_ABSTRACT_SETTINGS_PAGE_H
+
+#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"
+#define WIKI_TRANSLATION_FAQ "https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ"
+
+struct SettingsSearchEntry;
+
+class AbstractSettingsPage : public QWidget
+{
+    Q_OBJECT
+public:
+    virtual void retranslateUi() = 0;
+    virtual QList<SettingsSearchEntry> getSearchEntries();
+
+protected:
+    static QList<SettingsSearchEntry> autoDetectSearchEntries(QWidget *page, int pageIndex);
+};
+
+#endif // COCKATRICE_ABSTRACT_SETTINGS_PAGE_H
diff --git a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp
new file mode 100644
index 000000000..4c38459c6
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp
@@ -0,0 +1,607 @@
+#include "appearance_settings_page.h"
+
+#include "../../../client/settings/cache_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 <QAbstractButton>
+#include <QApplication>
+#include <QColor>
+#include <QColorDialog>
+#include <QDebug>
+#include <QDesktopServices>
+#include <QDir>
+#include <QGridLayout>
+#include <QGroupBox>
+#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()
+{
+    SettingsCache &settings = SettingsCache::instance();
+
+    // Theme settings
+    QString themeName = SettingsCache::instance().getThemeName();
+
+    QStringList themeDirs = themeManager->getAvailableThemes().keys();
+    for (int i = 0; i < themeDirs.size(); i++) {
+        themeBox.addItem(themeDirs[i]);
+        if (themeDirs[i] == themeName) {
+            themeBox.setCurrentIndex(i);
+        }
+    }
+
+    connect(&themeBox, qOverload<int>(&QComboBox::currentIndexChanged), this, &AppearanceSettingsPage::themeBoxChanged);
+    connect(&openThemeButton, &QPushButton::clicked, this, &AppearanceSettingsPage::openThemeLocation);
+
+    schemeCombo.addItem(tr("Light"), QStringLiteral("Light"));
+    schemeCombo.addItem(tr("Dark"), QStringLiteral("Dark"));
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+    schemeCombo.addItem(tr("System"), QStringLiteral("System"));
+#endif
+
+    // Seed from whatever the current theme already has saved
+    const QString dirPath = themeManager->getAvailableThemes().value(SettingsCache::instance().getThemeName());
+    const ThemeConfig cfg = ThemeConfig::fromThemeDir(dirPath);
+    const QString current = cfg.colorScheme;
+    const int seedIdx = schemeCombo.findData(current);
+    schemeCombo.setCurrentIndex(seedIdx >= 0 ? seedIdx : 0);
+
+    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.
+    styleCombo.addItem(tr("System"), QStringLiteral("System"));
+    for (const QString &key : QStyleFactory::keys()) {
+        styleCombo.addItem(key, key);
+    }
+
+    const QString currentStyle = cfg.styleName;
+    const int styleSeedIdx = currentStyle.isEmpty() ? 0 : styleCombo.findData(currentStyle);
+    styleCombo.setCurrentIndex(styleSeedIdx >= 0 ? styleSeedIdx : 0);
+
+    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());
+        const ThemeConfig cfg = ThemeConfig::fromThemeDir(newDir);
+        const QString current = cfg.colorScheme;
+
+        schemeCombo.blockSignals(true);
+        const int idx = schemeCombo.findData(current);
+        schemeCombo.setCurrentIndex(idx >= 0 ? idx : 0);
+        schemeCombo.blockSignals(false);
+
+        styleCombo.blockSignals(true);
+        const QString currentStyle = cfg.styleName;
+        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);
+
+    auto *themeGrid = new QGridLayout;
+    themeGrid->addWidget(&themeLabel, 0, 0);
+    themeGrid->addWidget(&themeBox, 0, 1);
+    themeGrid->addWidget(&openThemeButton, 1, 1);
+    themeGrid->addWidget(&schemeComboLabel, 2, 0);
+    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);
+
+    themeGroupBox = new QGroupBox;
+    themeGroupBox->setLayout(themeGrid);
+
+    // Home tab settings
+    for (const auto &entry : BackgroundSources::all()) {
+        homeTabBackgroundSourceBox.addItem(QObject::tr(entry.trKey), QVariant::fromValue(entry.type));
+    }
+
+    QString homeTabBackgroundSource = settings.appearance().getHomeTabBackgroundSource();
+    int homeTabBackgroundSourceId =
+        homeTabBackgroundSourceBox.findData(BackgroundSources::fromId(homeTabBackgroundSource));
+    if (homeTabBackgroundSourceId != -1) {
+        homeTabBackgroundSourceBox.setCurrentIndex(homeTabBackgroundSourceId);
+    }
+
+    connect(&homeTabBackgroundSourceBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]() {
+        auto type = homeTabBackgroundSourceBox.currentData().value<BackgroundSources::Type>();
+        SettingsCache::instance().appearance().setHomeTabBackgroundSource(BackgroundSources::toId(type));
+        updateHomeTabSettingsVisibility();
+    });
+
+    homeTabBackgroundShuffleFrequencySpinBox.setRange(0, 3600);
+    homeTabBackgroundShuffleFrequencySpinBox.setSuffix(tr(" seconds"));
+    homeTabBackgroundShuffleFrequencySpinBox.setValue(settings.appearance().getHomeTabBackgroundShuffleFrequency());
+    connect(&homeTabBackgroundShuffleFrequencySpinBox, qOverload<int>(&QSpinBox::valueChanged), &settings.appearance(),
+            &AppearanceSettings::setHomeTabBackgroundShuffleFrequency);
+
+    homeTabDisplayCardNameCheckBox.setChecked(settings.appearance().getHomeTabDisplayCardName());
+    connect(&homeTabDisplayCardNameCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.appearance(),
+            &AppearanceSettings::setHomeTabDisplayCardName);
+
+    homeTabBackgroundDimCheckBox.setChecked(settings.appearance().getHomeTabBackgroundDim());
+    connect(&homeTabBackgroundDimCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.appearance(),
+            &AppearanceSettings::setHomeTabBackgroundDim);
+
+    for (const auto &entry : HomeTabButtonColor::all()) {
+        homeTabButtonColorSourceBox.addItem(QObject::tr(entry.trKey));
+    }
+
+    homeTabButtonColorSourceBox.setCurrentIndex(settings.appearance().getHomeTabButtonColorSourceIndex());
+    connect(&homeTabButtonColorSourceBox, QOverload<int>::of(&QComboBox::currentIndexChanged), &settings.appearance(),
+            &AppearanceSettings::setHomeTabButtonColorSourceIndex);
+
+    updateHomeTabSettingsVisibility();
+
+    auto *homeTabGrid = new QGridLayout;
+    homeTabGrid->addWidget(&homeTabBackgroundSourceLabel, 0, 0);
+    homeTabGrid->addWidget(&homeTabBackgroundSourceBox, 0, 1);
+    homeTabGrid->addWidget(&homeTabBackgroundShuffleFrequencyLabel, 1, 0);
+    homeTabGrid->addWidget(&homeTabBackgroundShuffleFrequencySpinBox, 1, 1);
+    homeTabGrid->addWidget(&homeTabDisplayCardNameCheckBox, 2, 0, 1, 2);
+    homeTabGrid->addWidget(&homeTabButtonColorSourceLabel, 3, 0);
+    homeTabGrid->addWidget(&homeTabButtonColorSourceBox, 3, 1);
+    homeTabGrid->addWidget(&homeTabBackgroundDimCheckBox, 4, 0, 1, 2);
+
+    homeTabGroupBox = new QGroupBox;
+    homeTabGroupBox->setLayout(homeTabGrid);
+
+    // Playmat settings
+    playmatVisibilityCombo.addItem(tr("Show all playmats"), PlaymatVisibilityAll);
+    playmatVisibilityCombo.addItem(tr("Show own playmat only"), PlaymatVisibilityOwnOnly);
+    playmatVisibilityCombo.addItem(tr("Don't use playmats"), PlaymatVisibilityNone);
+    int visIdx = playmatVisibilityCombo.findData(settings.userInterface().getPlaymatVisibility());
+    if (visIdx >= 0) {
+        playmatVisibilityCombo.setCurrentIndex(visIdx);
+    }
+    connect(&playmatVisibilityCombo, qOverload<int>(&QComboBox::currentIndexChanged), this, [this](int index) {
+        SettingsCache::instance().userInterface().setPlaymatVisibility(playmatVisibilityCombo.itemData(index).toInt());
+    });
+    playmatVisibilityLabel.setBuddy(&playmatVisibilityCombo);
+
+    // Playmat mode: Override / Fallback / Deck-only
+    playmatModeCombo.addItem(tr("Override deck playmat"), PlaymatModeOverrideDeck);
+    playmatModeCombo.addItem(tr("Fallback if deck has none"), PlaymatModeFallback);
+    playmatModeCombo.addItem(tr("Deck only, ignore collection"), PlaymatModeDeckOnly);
+    int modeIdx = playmatModeCombo.findData(settings.userInterface().getPlaymatMode());
+    if (modeIdx >= 0) {
+        playmatModeCombo.setCurrentIndex(modeIdx);
+    }
+    connect(&playmatModeCombo, qOverload<int>(&QComboBox::currentIndexChanged), this, [this](int index) {
+        SettingsCache::instance().userInterface().setPlaymatMode(playmatModeCombo.itemData(index).toInt());
+    });
+    playmatModeLabel.setBuddy(&playmatModeCombo);
+
+    // User-level playmat settings: fallback collection.
+    connect(&playmatDefaultEditButton, &QPushButton::clicked, this,
+            &AppearanceSettingsPage::openPlaymatCollectionDialog);
+
+    auto *playmatGrid = new QGridLayout;
+    playmatGrid->addWidget(&playmatVisibilityLabel, 0, 0, 1, 1);
+    playmatGrid->addWidget(&playmatVisibilityCombo, 0, 1, 1, 1);
+    playmatGrid->addWidget(&playmatModeLabel, 1, 0, 1, 1);
+    playmatGrid->addWidget(&playmatModeCombo, 1, 1, 1, 1);
+    playmatGrid->addWidget(&playmatDefaultLabel, 2, 0, 1, 1);
+    playmatGrid->addWidget(&playmatDefaultEditButton, 2, 1, 1, 1);
+
+    playmatGroupBox = new QGroupBox;
+    playmatGroupBox->setLayout(playmatGrid);
+
+    // Styling settings
+    styleUserListCheckBox.setChecked(settings.appearance().getStyleUserList());
+    connect(&styleUserListCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.appearance(),
+            &AppearanceSettings::setStyleUserList);
+
+    auto stylingTabGrid = new QGridLayout;
+    stylingTabGrid->addWidget(&styleUserListCheckBox, 0, 0, 1, 2);
+
+    stylingGroupBox = new QGroupBox;
+    stylingGroupBox->setLayout(stylingTabGrid);
+
+    // Menu settings
+    showShortcutsCheckBox.setChecked(settings.userInterface().getShowShortcuts());
+    connect(&showShortcutsCheckBox, &QCheckBox::QT_STATE_CHANGED, this, &AppearanceSettingsPage::showShortcutsChanged);
+
+    showGameSelectorFilterToolbarCheckBox.setChecked(settings.userInterface().getShowGameSelectorFilterToolbar());
+    connect(&showGameSelectorFilterToolbarCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.userInterface(),
+            &InterfaceSettings::setShowGameSelectorFilterToolbar);
+
+    auto *menuGrid = new QGridLayout;
+    menuGrid->addWidget(&showShortcutsCheckBox, 0, 0);
+    menuGrid->addWidget(&showGameSelectorFilterToolbarCheckBox, 1, 0);
+
+    menuGroupBox = new QGroupBox;
+    menuGroupBox->setLayout(menuGrid);
+
+    // Printings settings
+    overrideAllCardArtWithPersonalPreferenceCheckBox.setChecked(
+        settings.cardsDisplay().getOverrideAllCardArtWithPersonalPreference());
+    connect(&overrideAllCardArtWithPersonalPreferenceCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
+            &AppearanceSettingsPage::overrideAllCardArtWithPersonalPreferenceToggled);
+
+    bumpSetsWithCardsInDeckToTopCheckBox.setChecked(settings.cardsDisplay().getBumpSetsWithCardsInDeckToTop());
+    connect(&bumpSetsWithCardsInDeckToTopCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.cardsDisplay(),
+            &CardsDisplaySettings::setBumpSetsWithCardsInDeckToTop);
+
+    auto *printingsGrid = new QGridLayout;
+    printingsGrid->addWidget(&overrideAllCardArtWithPersonalPreferenceCheckBox, 0, 0, 1, 2);
+    printingsGrid->addWidget(&bumpSetsWithCardsInDeckToTopCheckBox, 1, 0, 1, 2);
+
+    printingsGroupBox = new QGroupBox;
+    printingsGroupBox->setLayout(printingsGrid);
+
+    // Card rendering
+    displayCardNamesCheckBox.setChecked(settings.cardsDisplay().getDisplayCardNames());
+    connect(&displayCardNamesCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.cardsDisplay(),
+            &CardsDisplaySettings::setDisplayCardNames);
+
+    autoRotateSidewaysLayoutCardsCheckBox.setChecked(settings.cardsDisplay().getAutoRotateSidewaysLayoutCards());
+    connect(&autoRotateSidewaysLayoutCardsCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.cardsDisplay(),
+            &CardsDisplaySettings::setAutoRotateSidewaysLayoutCards);
+
+    cardScalingCheckBox.setChecked(settings.cardsDisplay().getScaleCards());
+    connect(&cardScalingCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.cardsDisplay(),
+            &CardsDisplaySettings::setCardScaling);
+
+    roundCardCornersCheckBox.setChecked(settings.cardsDisplay().getRoundCardCorners());
+    connect(&roundCardCornersCheckBox, &QAbstractButton::toggled, &settings.cardsDisplay(),
+            &CardsDisplaySettings::setRoundCardCorners);
+
+    connect(&maxFontSizeForCardsEdit, qOverload<int>(&QSpinBox::valueChanged), &settings.appearance(),
+            &AppearanceSettings::setMaxFontSize);
+    maxFontSizeForCardsEdit.setValue(settings.appearance().getMaxFontSize());
+    maxFontSizeForCardsLabel.setBuddy(&maxFontSizeForCardsEdit);
+    maxFontSizeForCardsEdit.setMinimum(9);
+    maxFontSizeForCardsEdit.setMaximum(100);
+
+    auto *cardsGrid = new QGridLayout;
+    cardsGrid->addWidget(&displayCardNamesCheckBox, 0, 0, 1, 2);
+    cardsGrid->addWidget(&autoRotateSidewaysLayoutCardsCheckBox, 1, 0, 1, 2);
+    cardsGrid->addWidget(&cardScalingCheckBox, 2, 0, 1, 2);
+    cardsGrid->addWidget(&roundCardCornersCheckBox, 3, 0, 1, 2);
+    cardsGrid->addWidget(&maxFontSizeForCardsLabel, 4, 0, 1, 1);
+    cardsGrid->addWidget(&maxFontSizeForCardsEdit, 4, 1, 1, 1);
+
+    cardsGroupBox = new QGroupBox;
+    cardsGroupBox->setLayout(cardsGrid);
+
+    // Card layout
+    verticalCardOverlapPercentBox.setValue(settings.cardsDisplay().getStackCardOverlapPercent());
+    verticalCardOverlapPercentBox.setRange(0, 80);
+    connect(&verticalCardOverlapPercentBox, qOverload<int>(&QSpinBox::valueChanged), &settings.cardsDisplay(),
+            &CardsDisplaySettings::setStackCardOverlapPercent);
+
+    cardViewInitialRowsMaxBox.setRange(1, 999);
+    cardViewInitialRowsMaxBox.setValue(SettingsCache::instance().userInterface().getCardViewInitialRowsMax());
+    connect(&cardViewInitialRowsMaxBox, qOverload<int>(&QSpinBox::valueChanged), this,
+            &AppearanceSettingsPage::cardViewInitialRowsMaxChanged);
+
+    cardViewExpandedRowsMaxBox.setRange(1, 999);
+    cardViewExpandedRowsMaxBox.setValue(SettingsCache::instance().userInterface().getCardViewExpandedRowsMax());
+    connect(&cardViewExpandedRowsMaxBox, qOverload<int>(&QSpinBox::valueChanged), this,
+            &AppearanceSettingsPage::cardViewExpandedRowsMaxChanged);
+
+    auto *cardLayoutGrid = new QGridLayout;
+    cardLayoutGrid->addWidget(&verticalCardOverlapPercentLabel, 0, 0, 1, 1);
+    cardLayoutGrid->addWidget(&verticalCardOverlapPercentBox, 0, 1, 1, 1);
+    cardLayoutGrid->addWidget(&cardViewInitialRowsMaxLabel, 1, 0);
+    cardLayoutGrid->addWidget(&cardViewInitialRowsMaxBox, 1, 1);
+    cardLayoutGrid->addWidget(&cardViewExpandedRowsMaxLabel, 2, 0);
+    cardLayoutGrid->addWidget(&cardViewExpandedRowsMaxBox, 2, 1);
+
+    cardLayoutGroupBox = new QGroupBox;
+    cardLayoutGroupBox->setLayout(cardLayoutGrid);
+
+    // Card counter colors
+    auto *cardCounterColorsLayout = new QGridLayout;
+    cardCounterColorsLayout->setColumnStretch(1, 1);
+    cardCounterColorsLayout->setColumnStretch(3, 1);
+    cardCounterColorsLayout->setColumnStretch(5, 1);
+
+    auto &cardCounterSettings = SettingsCache::instance().cardCounters();
+    for (int index = 0; index < 6; ++index) {
+        auto *pushButton = new QPushButton;
+        pushButton->setStyleSheet(QString("background-color: %1").arg(cardCounterSettings.color(index).name()));
+
+        connect(&SettingsCache::instance().cardCounters(), &CardCounterSettings::colorChanged, pushButton,
+                [index, pushButton](int changedIndex, const QColor &color) {
+                    if (index == changedIndex) {
+                        pushButton->setStyleSheet(QString("background-color: %1").arg(color.name()));
+                    }
+                });
+
+        connect(pushButton, &QPushButton::clicked, this, [index, this]() {
+            auto &cardCounterSettings = SettingsCache::instance().cardCounters();
+
+            auto newColor = QColorDialog::getColor(cardCounterSettings.color(index), this);
+            if (!newColor.isValid()) {
+                return;
+            }
+
+            cardCounterSettings.setColor(index, newColor);
+        });
+
+        auto *colorName = new QLabel;
+        cardCounterNames.append(colorName);
+
+        int row = index / 3;
+        int column = 2 * (index % 3);
+
+        cardCounterColorsLayout->addWidget(pushButton, row, column);
+        cardCounterColorsLayout->addWidget(colorName, row, column + 1);
+    }
+
+    auto *cardCountersLayout = new QVBoxLayout;
+    cardCountersLayout->addLayout(cardCounterColorsLayout, 1);
+
+    cardCountersGroupBox = new QGroupBox;
+    cardCountersGroupBox->setLayout(cardCountersLayout);
+
+    // Hand layout
+    horizontalHandCheckBox.setChecked(settings.userInterface().getHorizontalHand());
+    connect(&horizontalHandCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.userInterface(),
+            &InterfaceSettings::setHorizontalHand);
+
+    leftJustifiedHandCheckBox.setChecked(settings.userInterface().getLeftJustified());
+    connect(&leftJustifiedHandCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.userInterface(),
+            &InterfaceSettings::setLeftJustified);
+
+    auto *handGrid = new QGridLayout;
+    handGrid->addWidget(&horizontalHandCheckBox, 0, 0, 1, 2);
+    handGrid->addWidget(&leftJustifiedHandCheckBox, 1, 0, 1, 2);
+
+    handGroupBox = new QGroupBox;
+    handGroupBox->setLayout(handGrid);
+
+    // table grid layout
+    invertVerticalCoordinateCheckBox.setChecked(settings.userInterface().getInvertVerticalCoordinate());
+    connect(&invertVerticalCoordinateCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.userInterface(),
+            &InterfaceSettings::setInvertVerticalCoordinate);
+
+    minPlayersForMultiColumnLayoutEdit.setMinimum(2);
+    minPlayersForMultiColumnLayoutEdit.setValue(settings.userInterface().getMinPlayersForMultiColumnLayout());
+    connect(&minPlayersForMultiColumnLayoutEdit, qOverload<int>(&QSpinBox::valueChanged), &settings.userInterface(),
+            &InterfaceSettings::setMinPlayersForMultiColumnLayout);
+    minPlayersForMultiColumnLayoutLabel.setBuddy(&minPlayersForMultiColumnLayoutEdit);
+
+    auto *tableGrid = new QGridLayout;
+    tableGrid->addWidget(&invertVerticalCoordinateCheckBox, 0, 0, 1, 2);
+    tableGrid->addWidget(&minPlayersForMultiColumnLayoutLabel, 1, 0, 1, 1);
+    tableGrid->addWidget(&minPlayersForMultiColumnLayoutEdit, 1, 1, 1, 1);
+
+    tableGroupBox = new QGroupBox;
+    tableGroupBox->setLayout(tableGrid);
+
+    // putting it all together
+    auto *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(themeGroupBox);
+    mainLayout->addWidget(homeTabGroupBox);
+    mainLayout->addWidget(playmatGroupBox);
+    mainLayout->addWidget(stylingGroupBox);
+    mainLayout->addWidget(menuGroupBox);
+    mainLayout->addWidget(printingsGroupBox);
+    mainLayout->addWidget(cardsGroupBox);
+    mainLayout->addWidget(cardLayoutGroupBox);
+    mainLayout->addWidget(cardCountersGroupBox);
+    mainLayout->addWidget(handGroupBox);
+    mainLayout->addWidget(tableGroupBox);
+    mainLayout->addStretch();
+
+    setLayout(mainLayout);
+
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &AppearanceSettingsPage::retranslateUi);
+    retranslateUi();
+}
+
+void AppearanceSettingsPage::themeBoxChanged(int index)
+{
+    QStringList themeDirs = themeManager->getAvailableThemes().keys();
+    if (index >= 0 && index < themeDirs.count()) {
+        SettingsCache::instance().setThemeName(themeDirs.at(index));
+    }
+}
+
+void AppearanceSettingsPage::openThemeLocation()
+{
+    QString dir = SettingsCache::instance().paths().getThemesPath();
+    QDir dirDir = dir;
+    dirDir.cdUp();
+    // open if dir exists, create if parent dir does exist
+    if (dirDir.exists() && dirDir.mkpath(dir)) {
+        QDesktopServices::openUrl(QUrl::fromLocalFile(dir));
+    } else {
+        QMessageBox::critical(this, tr("Error"), tr("Could not create themes directory at '%1'.").arg(dir));
+    }
+}
+
+void AppearanceSettingsPage::editPalette()
+{
+    PaletteEditorDialog dlg(themeManager->getCurrentThemePath(), SettingsCache::instance().getThemeName(), this);
+    dlg.exec();
+}
+
+void AppearanceSettingsPage::updateHomeTabSettingsVisibility()
+{
+    QString sourceId = SettingsCache::instance().appearance().getHomeTabBackgroundSource();
+    bool visible = BackgroundSources::fromId(sourceId) != BackgroundSources::Theme;
+
+    homeTabBackgroundShuffleFrequencyLabel.setVisible(visible);
+    homeTabBackgroundShuffleFrequencySpinBox.setVisible(visible);
+    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);
+    qApp->setAttribute(Qt::AA_DontShowShortcutsInContextMenus, value == 0); // 0 = unchecked
+}
+
+void AppearanceSettingsPage::overrideAllCardArtWithPersonalPreferenceToggled(QT_STATE_CHANGED_T value)
+{
+    bool enable = static_cast<bool>(value);
+
+    bool accepted = OverridePrintingWarning::execMessageBox(this, enable);
+
+    if (!accepted) {
+        // If user cancels, revert the checkbox/state back
+        QTimer::singleShot(0, this, [this, enable]() {
+            overrideAllCardArtWithPersonalPreferenceCheckBox.blockSignals(true);
+            overrideAllCardArtWithPersonalPreferenceCheckBox.setChecked(!enable);
+            overrideAllCardArtWithPersonalPreferenceCheckBox.blockSignals(false);
+        });
+    }
+}
+
+/**
+ * Updates the settings for cardViewInitialRowsMax.
+ * Forces expanded rows max to always be >= initial rows max
+ * @param value The new value
+ */
+void AppearanceSettingsPage::cardViewInitialRowsMaxChanged(int value)
+{
+    SettingsCache::instance().userInterface().setCardViewInitialRowsMax(value);
+    if (cardViewExpandedRowsMaxBox.value() < value) {
+        cardViewExpandedRowsMaxBox.setValue(value);
+    }
+}
+
+/**
+ * Updates the settings for cardViewExpandedRowsMax.
+ * Forces initial rows max to always be <= expanded rows max
+ * @param value The new value
+ */
+void AppearanceSettingsPage::cardViewExpandedRowsMaxChanged(int value)
+{
+    SettingsCache::instance().userInterface().setCardViewExpandedRowsMax(value);
+    if (cardViewInitialRowsMaxBox.value() > value) {
+        cardViewInitialRowsMaxBox.setValue(value);
+    }
+}
+
+void AppearanceSettingsPage::openPlaymatCollectionDialog()
+{
+    PlaymatCollectionDialog dialog(this);
+    dialog.exec();
+}
+
+void AppearanceSettingsPage::retranslateUi()
+{
+    themeGroupBox->setTitle(tr("Theme settings"));
+    themeLabel.setText(tr("Current theme:"));
+    openThemeButton.setText(tr("Open themes folder"));
+    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"));
+    homeTabBackgroundSourceLabel.setText(tr("Home tab background source:"));
+    homeTabBackgroundShuffleFrequencyLabel.setText(tr("Home tab background shuffle frequency:"));
+    homeTabBackgroundShuffleFrequencySpinBox.setSpecialValueText(tr("Disabled"));
+    homeTabDisplayCardNameCheckBox.setText(tr("Display card name of background in bottom right"));
+    homeTabBackgroundDimCheckBox.setText(tr("Dim the home tab background"));
+    homeTabBackgroundDimCheckBox.setToolTip(
+        tr("Draw a translucent overlay over the home tab background so buttons and text stand out"));
+    homeTabButtonColorSourceLabel.setText(tr("Home tab button color:"));
+    homeTabButtonColorSourceBox.setToolTip(
+        tr("Use the theme's identity accent colors, or extract colors from the background image"));
+
+    playmatGroupBox->setTitle(tr("Playmat settings"));
+    playmatVisibilityLabel.setText(tr("Playmat visibility:"));
+    playmatModeLabel.setText(tr("Default collection behavior:"));
+    playmatDefaultLabel.setText(tr("Default playmat collection:"));
+    playmatDefaultEditButton.setText(tr("Edit..."));
+
+    stylingGroupBox->setTitle(tr("Styling settings"));
+    styleUserListCheckBox.setText(tr("Style user list"));
+
+    menuGroupBox->setTitle(tr("Menu settings"));
+    showShortcutsCheckBox.setText(tr("Show keyboard shortcuts in right-click menus"));
+    showGameSelectorFilterToolbarCheckBox.setText(tr("Show game filter toolbar above list in room tab"));
+
+    printingsGroupBox->setTitle(tr("Card printings"));
+    overrideAllCardArtWithPersonalPreferenceCheckBox.setText(
+        tr("Override all card art with personal set preference (Pre-ProviderID change behavior)"));
+    bumpSetsWithCardsInDeckToTopCheckBox.setText(
+        tr("Bump sets that the deck contains cards from to the top in the printing selector"));
+
+    cardsGroupBox->setTitle(tr("Card rendering"));
+    displayCardNamesCheckBox.setText(tr("Display card names on cards having a picture"));
+    autoRotateSidewaysLayoutCardsCheckBox.setText(tr("Auto-Rotate cards with sideways layout"));
+    cardScalingCheckBox.setText(tr("Scale cards on mouse over"));
+    roundCardCornersCheckBox.setText(tr("Use rounded card corners"));
+    maxFontSizeForCardsLabel.setText(tr("Maximum font size for information displayed on cards:"));
+
+    cardLayoutGroupBox->setTitle(tr("Card layout"));
+    verticalCardOverlapPercentLabel.setText(
+        tr("Minimum overlap percentage of cards on the stack and in vertical hand"));
+    cardViewInitialRowsMaxLabel.setText(tr("Maximum initial height for card view window:"));
+    cardViewInitialRowsMaxBox.setSuffix(tr(" rows"));
+    cardViewExpandedRowsMaxLabel.setText(tr("Maximum expanded height for card view window:"));
+    cardViewExpandedRowsMaxBox.setSuffix(tr(" rows"));
+
+    cardCountersGroupBox->setTitle(tr("Card counters"));
+
+    auto &cardCounterSettings = SettingsCache::instance().cardCounters();
+    for (int index = 0; index < cardCounterNames.size(); ++index) {
+        cardCounterNames[index]->setText(tr("Counter %1").arg(cardCounterSettings.displayName(index)));
+    }
+
+    handGroupBox->setTitle(tr("Hand layout"));
+    horizontalHandCheckBox.setText(tr("Display hand horizontally (wastes space)"));
+    leftJustifiedHandCheckBox.setText(tr("Enable left justification"));
+
+    tableGroupBox->setTitle(tr("Table grid layout"));
+    invertVerticalCoordinateCheckBox.setText(tr("Invert vertical coordinate"));
+    minPlayersForMultiColumnLayoutLabel.setText(tr("Minimum player count for multi-column layout:"));
+}
diff --git a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h
new file mode 100644
index 000000000..8afd326a3
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h
@@ -0,0 +1,108 @@
+#ifndef COCKATRICE_APPEARANCE_SETTINGS_PAGE_H
+#define COCKATRICE_APPEARANCE_SETTINGS_PAGE_H
+
+#include "abstract_settings_page.h"
+
+#include <QCheckBox>
+#include <QComboBox>
+#include <QLabel>
+#include <QList>
+#include <QPushButton>
+#include <QSpinBox>
+#include <libcockatrice/utility/macros.h>
+#include <qtmetamacros.h>
+
+class QGroupBox;
+
+class AppearanceSettingsPage : public AbstractSettingsPage
+{
+    Q_OBJECT
+private slots:
+    void themeBoxChanged(int index);
+    void openThemeLocation();
+    void editPalette();
+    void updateHomeTabSettingsVisibility();
+    void updateStyleWarning();
+    void showShortcutsChanged(QT_STATE_CHANGED_T enabled);
+    void overrideAllCardArtWithPersonalPreferenceToggled(QT_STATE_CHANGED_T enabled);
+
+    void cardViewInitialRowsMaxChanged(int value);
+    void cardViewExpandedRowsMaxChanged(int value);
+    void openPlaymatCollectionDialog();
+
+private:
+    QLabel themeLabel;
+    QComboBox themeBox;
+    QPushButton openThemeButton;
+    QLabel schemeComboLabel;
+    QComboBox schemeCombo;
+    QLabel styleComboLabel;
+    QComboBox styleCombo;
+    QLabel styleWarningLabel;
+    QPushButton editPaletteButton;
+
+    QLabel homeTabBackgroundSourceLabel;
+    QComboBox homeTabBackgroundSourceBox;
+    QLabel homeTabBackgroundShuffleFrequencyLabel;
+    QSpinBox homeTabBackgroundShuffleFrequencySpinBox;
+    QCheckBox homeTabDisplayCardNameCheckBox;
+    QCheckBox homeTabBackgroundDimCheckBox;
+    QLabel homeTabButtonColorSourceLabel;
+    QComboBox homeTabButtonColorSourceBox;
+
+    QLabel playmatVisibilityLabel;
+    QComboBox playmatVisibilityCombo;
+    QLabel playmatModeLabel;
+    QComboBox playmatModeCombo;
+    QLabel playmatDefaultLabel;
+    QPushButton playmatDefaultEditButton;
+
+    QCheckBox styleUserListCheckBox;
+
+    QCheckBox showShortcutsCheckBox;
+    QCheckBox showGameSelectorFilterToolbarCheckBox;
+
+    QCheckBox overrideAllCardArtWithPersonalPreferenceCheckBox;
+    QCheckBox bumpSetsWithCardsInDeckToTopCheckBox;
+
+    QCheckBox displayCardNamesCheckBox;
+    QCheckBox autoRotateSidewaysLayoutCardsCheckBox;
+    QCheckBox cardScalingCheckBox;
+    QCheckBox roundCardCornersCheckBox;
+    QLabel maxFontSizeForCardsLabel;
+    QSpinBox maxFontSizeForCardsEdit;
+
+    QLabel verticalCardOverlapPercentLabel;
+    QSpinBox verticalCardOverlapPercentBox;
+    QLabel cardViewInitialRowsMaxLabel;
+    QSpinBox cardViewInitialRowsMaxBox;
+    QLabel cardViewExpandedRowsMaxLabel;
+    QSpinBox cardViewExpandedRowsMaxBox;
+
+    QList<QLabel *> cardCounterNames;
+
+    QCheckBox horizontalHandCheckBox;
+    QCheckBox leftJustifiedHandCheckBox;
+
+    QCheckBox invertVerticalCoordinateCheckBox;
+    QLabel minPlayersForMultiColumnLayoutLabel;
+    QSpinBox minPlayersForMultiColumnLayoutEdit;
+
+    QGroupBox *themeGroupBox;
+    QGroupBox *homeTabGroupBox;
+    QGroupBox *playmatGroupBox;
+    QGroupBox *stylingGroupBox;
+    QGroupBox *menuGroupBox;
+    QGroupBox *printingsGroupBox;
+    QGroupBox *cardsGroupBox;
+    QGroupBox *cardLayoutGroupBox;
+    QGroupBox *cardCountersGroupBox;
+    QGroupBox *handGroupBox;
+    QGroupBox *tableGroupBox;
+
+public:
+    AppearanceSettingsPage();
+    void retranslateUi() override;
+};
+
+#endif // COCKATRICE_APPEARANCE_SETTINGS_PAGE_H
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
new file mode 100644
index 000000000..31178ba4c
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp
@@ -0,0 +1,411 @@
+#include "deck_editor_settings_page.h"
+
+#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()
+{
+    picDownloadCheckBox.setChecked(SettingsCache::instance().downloads().getPicDownload());
+    connect(&picDownloadCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().downloads(),
+            &DownloadSettings::setPicDownload);
+
+    urlLinkLabel.setTextInteractionFlags(Qt::LinksAccessibleByMouse);
+    urlLinkLabel.setOpenExternalLinks(true);
+
+    connect(&resetDownloadURLs, &QPushButton::clicked, this, &DeckEditorSettingsPage::resetDownloadedURLsButtonClicked);
+
+    auto *lpGeneralGrid = new QGridLayout;
+    auto *lpSpoilerGrid = new QGridLayout;
+
+    mcDownloadSpoilersCheckBox.setChecked(SettingsCache::instance().downloads().getDownloadSpoilersStatus());
+
+    mpSpoilerSavePathLineEdit = new QLineEdit(SettingsCache::instance().getSpoilerCardDatabasePath());
+    mpSpoilerSavePathLineEdit->setReadOnly(true);
+    mpSpoilerPathButton = new QPushButton("...");
+    connect(mpSpoilerPathButton, &QPushButton::clicked, this, &DeckEditorSettingsPage::spoilerPathButtonClicked);
+
+    updateNowButton = new QPushButton;
+    updateNowButton->setFixedWidth(150);
+    connect(updateNowButton, &QPushButton::clicked, this, &DeckEditorSettingsPage::updateSpoilers);
+
+    // Update the GUI depending on if the box is ticked or not
+    setSpoilersEnabled(mcDownloadSpoilersCheckBox.isChecked());
+
+    urlList = new QListWidget;
+    urlList->setSelectionMode(QAbstractItemView::SingleSelection);
+    urlList->setAlternatingRowColors(true);
+    urlList->setDragEnabled(true);
+    urlList->setDragDropMode(QAbstractItemView::InternalMove);
+    connect(urlList->model(), &QAbstractItemModel::rowsMoved, this, &DeckEditorSettingsPage::urlListChanged);
+
+    for (const QString &url : SettingsCache::instance().downloads().getAllURLs()) {
+        addUrlItem(url);
+    }
+
+    aAdd = new QAction(this);
+    aAdd->setIcon(themePixmap(QStringLiteral("icons/increment")));
+    connect(aAdd, &QAction::triggered, this, &DeckEditorSettingsPage::actAddURL);
+
+    aEdit = new QAction(this);
+    aEdit->setIcon(themePixmap(QStringLiteral("icons/pencil")));
+    connect(aEdit, &QAction::triggered, this, &DeckEditorSettingsPage::actEditURL);
+
+    aRemove = new QAction(this);
+    aRemove->setIcon(themePixmap(QStringLiteral("icons/decrement")));
+    connect(aRemove, &QAction::triggered, this, &DeckEditorSettingsPage::actRemoveURL);
+
+    aRateLimit = new QAction(this);
+    aRateLimit->setIcon(themePixmap(QStringLiteral("icons/cogwheel")));
+    connect(aRateLimit, &QAction::triggered, this, &DeckEditorSettingsPage::actAdjustRateLimit);
+
+    auto *urlToolBar = new QToolBar;
+    urlToolBar->setOrientation(Qt::Vertical);
+    urlToolBar->addAction(aAdd);
+    urlToolBar->addAction(aRemove);
+    urlToolBar->addAction(aEdit);
+    urlToolBar->addAction(aRateLimit);
+    urlToolBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
+
+    auto *urlListLayout = new QHBoxLayout;
+    urlListLayout->addWidget(urlToolBar);
+    urlListLayout->addWidget(urlList);
+
+    // Top Layout
+    lpGeneralGrid->addWidget(&picDownloadCheckBox, 0, 0);
+    lpGeneralGrid->addWidget(&resetDownloadURLs, 0, 1);
+    lpGeneralGrid->addLayout(urlListLayout, 1, 0, 1, 2);
+    lpGeneralGrid->addWidget(&urlLinkLabel, 4, 0);
+
+    // Spoiler Layout
+    lpSpoilerGrid->addWidget(&mcDownloadSpoilersCheckBox, 0, 0);
+    lpSpoilerGrid->addWidget(&mcSpoilerSaveLabel, 1, 0);
+    lpSpoilerGrid->addWidget(mpSpoilerSavePathLineEdit, 1, 1);
+    lpSpoilerGrid->addWidget(mpSpoilerPathButton, 1, 2);
+    lpSpoilerGrid->addWidget(&lastUpdatedLabel, 2, 0);
+    lpSpoilerGrid->addWidget(updateNowButton, 2, 1);
+    lpSpoilerGrid->addWidget(&infoOnSpoilersLabel, 3, 0, 1, 3, Qt::AlignTop);
+
+    // On a change to the checkbox, hide/un-hide the other fields
+    connect(&mcDownloadSpoilersCheckBox, &QCheckBox::toggled, &SettingsCache::instance().downloads(),
+            &DownloadSettings::setDownloadSpoilerStatus);
+    connect(&mcDownloadSpoilersCheckBox, &QCheckBox::toggled, this, &DeckEditorSettingsPage::setSpoilersEnabled);
+
+    mpGeneralGroupBox = new QGroupBox;
+    mpGeneralGroupBox->setLayout(lpGeneralGrid);
+
+    mpSpoilerGroupBox = new QGroupBox;
+    mpSpoilerGroupBox->setLayout(lpSpoilerGrid);
+
+    auto *lpMainLayout = new QVBoxLayout;
+    lpMainLayout->addWidget(mpGeneralGroupBox);
+    lpMainLayout->addWidget(mpSpoilerGroupBox);
+
+    setLayout(lpMainLayout);
+
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &DeckEditorSettingsPage::retranslateUi);
+    retranslateUi();
+}
+
+void DeckEditorSettingsPage::resetDownloadedURLsButtonClicked()
+{
+    SettingsCache::instance().downloads().resetToDefaultURLs();
+    urlList->clear();
+    for (const QString &url : SettingsCache::instance().downloads().getAllURLs()) {
+        addUrlItem(url);
+    }
+    QMessageBox::information(this, tr("Success"), tr("Download URLs have been reset."));
+}
+
+void DeckEditorSettingsPage::actAddURL()
+{
+    bool ok;
+    QString msg = QInputDialog::getText(this, tr("Add URL"), tr("URL:"), QLineEdit::Normal, QString(), &ok);
+    if (ok) {
+        addUrlItem(msg);
+        storeSettings();
+    }
+}
+
+void DeckEditorSettingsPage::actRemoveURL()
+{
+    if (urlList->currentItem() != nullptr) {
+        delete urlList->takeItem(urlList->currentRow());
+        storeSettings();
+    }
+}
+
+void DeckEditorSettingsPage::actEditURL()
+{
+    QListWidgetItem *item = urlList->currentItem();
+    if (item) {
+        const QString oldText = urlForItem(item);
+        bool ok;
+        QString msg = QInputDialog::getText(this, tr("Edit URL"), tr("URL:"), QLineEdit::Normal, oldText, &ok);
+        if (ok) {
+            item->setData(Qt::UserRole, msg);
+            item->setText(urlLabel(msg));
+            storeSettings();
+        }
+    }
+}
+
+void DeckEditorSettingsPage::storeSettings()
+{
+    qInfo() << "URL Priority Reset";
+
+    QStringList downloadUrls;
+    for (int i = 0; i < urlList->count(); i++) {
+        const QString url = urlForItem(urlList->item(i));
+        qInfo() << "Priority" << i << ":" << url;
+        downloadUrls << url;
+    }
+    SettingsCache::instance().downloads().setDownloadUrls(downloadUrls);
+
+    // Drop per-host limits whose host is no longer referenced by any configured URL, so removing
+    // a URL doesn't leave a stale throttle behind that reactivates if the host is re-added.
+    QSet<QString> usedHosts;
+    for (const QString &url : downloadUrls) {
+        const QString host = QUrl(url).host();
+        if (!host.isEmpty()) {
+            usedHosts.insert(host);
+        }
+    }
+    QHash<QString, int> limits = SettingsCache::instance().downloads().getHostRequestLimits();
+    bool limitsChanged = false;
+    for (auto it = limits.begin(); it != limits.end();) {
+        // Prune only limits for hosts that are neither referenced by a configured URL nor carry a
+        // developer cap. Capped hosts are often redirect targets (e.g. api.scryfall.com redirects
+        // to cards.scryfall.io) that never appear in the URL list, yet they are exactly the hosts
+        // the throttle applies to, so dropping them when a URL is removed would silently re-enable
+        // free-running traffic to a rate-sensitive server.
+        if (!usedHosts.contains(it.key()) && !DownloadSettings::getDeveloperHostCaps().contains(it.key())) {
+            it = limits.erase(it);
+            limitsChanged = true;
+        } else {
+            ++it;
+        }
+    }
+    if (limitsChanged) {
+        SettingsCache::instance().downloads().setHostRequestLimits(limits);
+    }
+
+    refreshUrlItems();
+}
+
+QListWidgetItem *DeckEditorSettingsPage::addUrlItem(const QString &url)
+{
+    auto *item = new QListWidgetItem(urlLabel(url));
+    item->setData(Qt::UserRole, url);
+    urlList->addItem(item);
+    return item;
+}
+
+QString DeckEditorSettingsPage::urlForItem(const QListWidgetItem *item) const
+{
+    return item->data(Qt::UserRole).toString();
+}
+
+QString DeckEditorSettingsPage::urlLabel(const QString &url) const
+{
+    const QString host = QUrl(url).host();
+    if (host.isEmpty()) {
+        return url;
+    }
+
+    const QHash<QString, int> limits = SettingsCache::instance().downloads().getHostRequestLimits();
+    const int devCap =
+        DownloadSettings::getDeveloperHostCaps().value(host, DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT);
+    if (devCap == DownloadSettings::UNLIMITED_HOST_QUOTA && !limits.contains(host)) {
+        return tr("%1  (unlimited)").arg(url);
+    }
+
+    const int requested = limits.value(
+        host, devCap == DownloadSettings::UNLIMITED_HOST_QUOTA ? DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT : devCap);
+    const int effective = SettingsCache::instance().downloads().clampHostRequestLimit(host, requested);
+    return tr("%1  (%2/s)").arg(url).arg(effective);
+}
+
+void DeckEditorSettingsPage::refreshUrlItems()
+{
+    for (int i = 0; i < urlList->count(); ++i) {
+        QListWidgetItem *item = urlList->item(i);
+        item->setText(urlLabel(urlForItem(item)));
+    }
+}
+
+void DeckEditorSettingsPage::actAdjustRateLimit()
+{
+    if (urlList->currentItem() == nullptr) {
+        QMessageBox::information(this, tr("Adjust Rate Limit"), tr("Select a URL in the list first."));
+        return;
+    }
+
+    const QString host = QUrl(urlForItem(urlList->currentItem())).host();
+    if (host.isEmpty()) {
+        QMessageBox::information(this, tr("Adjust Rate Limit"), tr("The selected URL does not have a valid host."));
+        return;
+    }
+
+    const QHash<QString, int> &devCaps = DownloadSettings::getDeveloperHostCaps();
+    const QHash<QString, int> currentLimits = SettingsCache::instance().downloads().getHostRequestLimits();
+    const int devCap = devCaps.value(host, DownloadSettings::DEFAULT_HOST_REQUEST_LIMIT);
+    const bool unlocked = devCap == DownloadSettings::UNLIMITED_HOST_QUOTA;
+
+    bool ok = false;
+    int minimum;
+    int maximum;
+    int defaultValue;
+    QString prompt;
+    if (unlocked) {
+        minimum = 0; // 0 means "unlimited"
+        maximum = DownloadSettings::UNLOCKED_HOST_LIMIT_MAX;
+        defaultValue = currentLimits.value(host, 0);
+        prompt = tr("Requests per second (0 = unlimited, fastest; up to %1):").arg(maximum);
+    } else {
+        minimum = DownloadSettings::MIN_HOST_REQUEST_LIMIT;
+        maximum = devCap;
+        defaultValue = currentLimits.value(host, devCap);
+        prompt = tr("Requests per second (developer maximum is %1):").arg(maximum);
+    }
+
+    const int value = QInputDialog::getInt(this, tr("Adjust Rate Limit for %1").arg(host), prompt, defaultValue,
+                                           minimum, maximum, 1, &ok);
+    if (!ok) {
+        return;
+    }
+
+    QHash<QString, int> limits = currentLimits;
+    if (unlocked ? value == 0 : value == devCap) {
+        limits.remove(host);
+    } else {
+        limits.insert(host, value);
+    }
+    SettingsCache::instance().downloads().setHostRequestLimits(limits);
+    refreshUrlItems();
+}
+
+void DeckEditorSettingsPage::urlListChanged(const QModelIndex &, int, int, const QModelIndex &, int)
+{
+    storeSettings();
+}
+
+void DeckEditorSettingsPage::updateSpoilers()
+{
+    // Disable the button so the user can only press it once at a time
+    updateNowButton->setDisabled(true);
+    updateNowButton->setText(tr("Updating..."));
+
+    // Create a new SBU that will act as if the client was just reloaded
+    auto *sbu = new SpoilerBackgroundUpdater();
+    connect(sbu, &SpoilerBackgroundUpdater::spoilerCheckerDone, this, &DeckEditorSettingsPage::unlockSettings);
+    connect(sbu, &SpoilerBackgroundUpdater::spoilersUpdatedSuccessfully, this, &DeckEditorSettingsPage::unlockSettings);
+}
+
+void DeckEditorSettingsPage::unlockSettings()
+{
+    updateNowButton->setDisabled(false);
+    updateNowButton->setText(tr("Update Spoilers"));
+}
+
+QString DeckEditorSettingsPage::getLastUpdateTime()
+{
+    QString fileName = SettingsCache::instance().getSpoilerCardDatabasePath();
+    QFileInfo fi(fileName);
+    QDir fileDir(fi.path());
+    QFile file(fileName);
+
+    if (file.exists()) {
+        return fi.lastModified().toString("MMM d, hh:mm");
+    }
+
+    return QString();
+}
+
+void DeckEditorSettingsPage::spoilerPathButtonClicked()
+{
+    QString lsPath = QFileDialog::getExistingDirectory(this, tr("Choose path"), mpSpoilerSavePathLineEdit->text());
+    if (lsPath.isEmpty()) {
+        return;
+    }
+    if (!PathSafetyWarning::confirmOutsideProgramDir(this, lsPath + "/spoiler.xml")) {
+        return;
+    }
+
+    mpSpoilerSavePathLineEdit->setText(lsPath + "/spoiler.xml");
+    SettingsCache::instance().paths().setSpoilerDatabasePath(lsPath + "/spoiler.xml");
+}
+
+void DeckEditorSettingsPage::setSpoilersEnabled(bool anInput)
+{
+    msDownloadSpoilersLabel.setEnabled(anInput);
+    mcSpoilerSaveLabel.setEnabled(anInput);
+    mpSpoilerSavePathLineEdit->setEnabled(anInput);
+    mpSpoilerPathButton->setEnabled(anInput);
+    lastUpdatedLabel.setEnabled(anInput);
+    updateNowButton->setEnabled(anInput);
+    infoOnSpoilersLabel.setEnabled(anInput);
+
+    if (!anInput) {
+        SpoilerBackgroundUpdater::deleteSpoilerFile();
+    }
+}
+
+void DeckEditorSettingsPage::retranslateUi()
+{
+    mpGeneralGroupBox->setTitle(tr("URL Download Priority"));
+    mpSpoilerGroupBox->setTitle(tr("Spoilers"));
+    mcDownloadSpoilersCheckBox.setText(tr("Download Spoilers Automatically"));
+    mcSpoilerSaveLabel.setText(tr("Spoiler Location:"));
+    lastUpdatedLabel.setText(tr("Last Change") + ": " + getLastUpdateTime());
+    infoOnSpoilersLabel.setText(tr("Spoilers download automatically on launch") + "\n" +
+                                tr("Press the button to manually update without relaunching") + "\n\n" +
+                                tr("Do not close settings until manual update is complete"));
+    picDownloadCheckBox.setText(tr("Download card pictures on the fly"));
+    urlLinkLabel.setText(QString("<a href='%1'>%2</a>").arg(WIKI_CUSTOM_PIC_URL).arg(tr("How to add a custom URL")));
+    resetDownloadURLs.setText(tr("Reset Download URLs"));
+    updateNowButton->setText(tr("Update Spoilers"));
+    aAdd->setText(tr("Add New URL"));
+    aEdit->setText(tr("Edit URL"));
+    aRemove->setText(tr("Remove URL"));
+    aRateLimit->setText(tr("Adjust Rate Limit"));
+
+    // The per-URL rate limit suffixes are translated, so refresh them when the language changes.
+    refreshUrlItems();
+}
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
new file mode 100644
index 000000000..47f840191
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.h
@@ -0,0 +1,71 @@
+#ifndef COCKATRICE_DECK_EDITOR_SETTINGS_PAGE_H
+#define COCKATRICE_DECK_EDITOR_SETTINGS_PAGE_H
+
+#include "abstract_settings_page.h"
+
+#include <QCheckBox>
+#include <QLabel>
+#include <QPushButton>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QAction;
+class QGroupBox;
+class QLineEdit;
+class QListWidget;
+class QListWidgetItem;
+class QModelIndex;
+
+class DeckEditorSettingsPage : public AbstractSettingsPage
+{
+    Q_OBJECT
+public:
+    DeckEditorSettingsPage();
+    void retranslateUi() override;
+    QString getLastUpdateTime();
+
+private slots:
+    void storeSettings();
+    void urlListChanged(const QModelIndex &, int, int, const QModelIndex &, int);
+    void setSpoilersEnabled(bool);
+    void spoilerPathButtonClicked();
+    void updateSpoilers();
+    void unlockSettings();
+    void actAddURL();
+    void actRemoveURL();
+    void actEditURL();
+    void actAdjustRateLimit();
+    void resetDownloadedURLsButtonClicked();
+
+private:
+    QPushButton resetDownloadURLs;
+    QLabel urlLinkLabel;
+    QCheckBox picDownloadCheckBox;
+    QListWidget *urlList;
+    QAction *aAdd, *aEdit, *aRemove, *aRateLimit;
+    QCheckBox mcDownloadSpoilersCheckBox;
+    QLabel msDownloadSpoilersLabel;
+    QGroupBox *mpGeneralGroupBox;
+    QGroupBox *mpSpoilerGroupBox;
+
+    QLineEdit *mpSpoilerSavePathLineEdit;
+    QLabel mcSpoilerSaveLabel;
+    QLabel lastUpdatedLabel;
+    QLabel infoOnSpoilersLabel;
+    QPushButton *mpSpoilerPathButton;
+    QPushButton *updateNowButton;
+
+    /** @brief Adds a list item for the given URL, storing the raw URL alongside its displayed label. */
+    QListWidgetItem *addUrlItem(const QString &url);
+
+    /** @brief Returns the raw URL stored on a list item. */
+    [[nodiscard]] QString urlForItem(const QListWidgetItem *item) const;
+
+    /** @brief Returns the display label for a URL, including its current effective rate limit. */
+    [[nodiscard]] QString urlLabel(const QString &url) const;
+
+    /** @brief Refreshes the displayed label of every URL item after limits or settings change. */
+    void refreshUrlItems();
+};
+
+#endif // COCKATRICE_DECK_EDITOR_SETTINGS_PAGE_H
diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
new file mode 100644
index 000000000..fa8938b32
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp
@@ -0,0 +1,633 @@
+#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>
+#include <libcockatrice/settings/paths_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
+#include <libcockatrice/settings/tabs_settings.h>
+#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
+{
+    startupCardUpdateCheckBehaviorIndexNone,
+    startupCardUpdateCheckBehaviorIndexPrompt,
+    startupCardUpdateCheckBehaviorIndexAlways
+};
+
+GeneralSettingsPage::GeneralSettingsPage()
+{
+    // language settings
+    QStringList languageCodes = findQmFiles();
+    for (const QString &code : languageCodes) {
+        QString langName = languageName(code);
+        languageBox.addItem(langName, code);
+    }
+
+    QString setLanguage = QCoreApplication::translate("i18n", DEFAULT_LANG_NAME);
+    int index = languageBox.findText(setLanguage, Qt::MatchExactly);
+    if (index == -1) {
+        qWarning() << "could not find language" << setLanguage;
+    } else {
+        languageBox.setCurrentIndex(index);
+    }
+
+    advertiseTranslationPageLabel.setTextInteractionFlags(Qt::LinksAccessibleByMouse);
+    advertiseTranslationPageLabel.setOpenExternalLinks(true);
+
+    connect(&languageBox, qOverload<int>(&QComboBox::currentIndexChanged), this,
+            &GeneralSettingsPage::languageBoxChanged);
+
+    // card text & images language, independent of the UI language
+    cardLanguageBox.addItem(tr("English"), "en");
+    for (const QString &code : CardLocalization::supportedLanguages()) {
+        cardLanguageBox.addItem(CardLocalization::languageDisplayName(code), code);
+    }
+    const int cardLangIndex = cardLanguageBox.findData(SettingsCache::instance().cardsDisplay().getCardLang());
+    cardLanguageBox.setCurrentIndex(cardLangIndex < 0 ? 0 : cardLangIndex);
+
+    connect(&cardLanguageBox, qOverload<int>(&QComboBox::currentIndexChanged), this,
+            &GeneralSettingsPage::cardLanguageBoxChanged);
+
+    // card search language, independent of the card display language
+    cardSearchLanguageBox.addItem(""); // texts set in retranslateUi
+    cardSearchLanguageBox.addItem("");
+    cardSearchLanguageBox.addItem("");
+    const int cardSearchLanguageIndex = SettingsCache::instance().cardsDisplay().getCardSearchLanguage();
+    cardSearchLanguageBox.setCurrentIndex(cardSearchLanguageIndex < 0 ? static_cast<int>(SearchLanguageMode::English)
+                                                                      : cardSearchLanguageIndex);
+
+    connect(&cardSearchLanguageBox, qOverload<int>(&QComboBox::currentIndexChanged), this,
+            &GeneralSettingsPage::cardSearchLanguageBoxChanged);
+
+    auto *languageGrid = new QGridLayout;
+    languageGrid->addWidget(&languageLabel, 0, 0);
+    languageGrid->addWidget(&languageBox, 0, 1);
+    languageGrid->addWidget(&cardLanguageLabel, 1, 0);
+    languageGrid->addWidget(&cardLanguageBox, 1, 1);
+    languageGrid->addWidget(&cardLanguageNoteLabel, 2, 1);
+    languageGrid->addWidget(&cardSearchLanguageLabel, 3, 0);
+    languageGrid->addWidget(&cardSearchLanguageBox, 3, 1);
+    languageGrid->addWidget(&advertiseTranslationPageLabel, 4, 1, Qt::AlignRight);
+
+    cardLanguageNoteLabel.setWordWrap(true);
+    cardLanguageNoteLabel.setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
+
+    languageGroupBox = new QGroupBox;
+    languageGroupBox->setLayout(languageGrid);
+
+    // version settings
+    SettingsCache &settings = SettingsCache::instance();
+    startupUpdateCheckCheckBox.setChecked(settings.updates().getCheckUpdatesOnStartup());
+
+    connect(&startupUpdateCheckCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.updates(),
+            &UpdatesSettings::setCheckUpdatesOnStartup);
+
+    updateNotificationCheckBox.setChecked(settings.getNotifyAboutUpdates());
+
+    connect(&updateNotificationCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.updates(),
+            &UpdatesSettings::setNotifyAboutUpdates);
+
+    connect(&newVersionOracleCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.updates(),
+            &UpdatesSettings::setNotifyAboutNewVersion);
+
+    auto *versionGrid = new QGridLayout;
+    versionGrid->addWidget(&updateReleaseChannelLabel, 0, 0);
+    versionGrid->addWidget(&updateReleaseChannelBox, 0, 1);
+    versionGrid->addWidget(&startupUpdateCheckCheckBox, 1, 0, 1, 2);
+    versionGrid->addWidget(&updateNotificationCheckBox, 2, 0, 1, 2);
+    versionGrid->addWidget(&newVersionOracleCheckBox, 3, 0, 1, 2);
+
+    versionGroupBox = new QGroupBox;
+    versionGroupBox->setLayout(versionGrid);
+
+    // card database settings
+    startupCardUpdateCheckBehaviorSelector.addItem(""); // these will be set in retranslateUI
+    startupCardUpdateCheckBehaviorSelector.addItem("");
+    startupCardUpdateCheckBehaviorSelector.addItem("");
+    if (SettingsCache::instance().updates().getStartupCardUpdateCheckPromptForUpdate()) {
+        startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexPrompt);
+    } else if (SettingsCache::instance().updates().getStartupCardUpdateCheckAlwaysUpdate()) {
+        startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexAlways);
+    } else {
+        startupCardUpdateCheckBehaviorSelector.setCurrentIndex(startupCardUpdateCheckBehaviorIndexNone);
+    }
+
+    connect(&startupCardUpdateCheckBehaviorSelector, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            [](int index) {
+                SettingsCache::instance().updates().setStartupCardUpdateCheckPromptForUpdate(
+                    index == startupCardUpdateCheckBehaviorIndexPrompt);
+                SettingsCache::instance().updates().setStartupCardUpdateCheckAlwaysUpdate(
+                    index == startupCardUpdateCheckBehaviorIndexAlways);
+            });
+
+    cardUpdateCheckIntervalSpinBox.setMinimum(1);
+    cardUpdateCheckIntervalSpinBox.setMaximum(30);
+    cardUpdateCheckIntervalSpinBox.setValue(settings.updates().getCardUpdateCheckInterval());
+
+    connect(&cardUpdateCheckIntervalSpinBox, qOverload<int>(&QSpinBox::valueChanged), &settings.updates(),
+            &UpdatesSettings::setCardUpdateCheckInterval);
+
+    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);
+
+    // startup settings
+    showTipsOnStartup.setChecked(settings.personal().getShowTipsOnStartup());
+
+    connect(&showTipsOnStartup, &QCheckBox::clicked, &settings.personal(), &PersonalSettings::setShowTipsOnStartup);
+
+    // startup destination
+    for (int i = 0; i < 8; ++i) {
+        startupTabSelector.addItem(""); // texts set in retranslateUi
+    }
+    startupTabSelector.setCurrentIndex(settings.tabs().getStartupTabIndex());
+
+    connect(&startupTabSelector, qOverload<int>(&QComboBox::currentIndexChanged), &settings.tabs(),
+            &TabsSettings::setStartupTabIndex);
+    connect(&startupTabSelector, qOverload<int>(&QComboBox::currentIndexChanged), this,
+            &GeneralSettingsPage::updateStartupServerControlsVisibility);
+
+    const QString savedHost = settings.tabs().getStartupServerHost();
+    const QString savedPort = settings.tabs().getStartupServerPort();
+    int startupServerIndex = -1;
+    UserConnection_Information uci;
+    for (const auto &savedServer : uci.getServerInfo()) {
+        const UserConnection_Information &info = savedServer.second;
+        const QString saveName = info.getSaveName();
+        if (saveName.isEmpty()) {
+            continue;
+        }
+        startupServerSelector.addItem(saveName, QVariantList{info.getServer(), info.getPort()});
+        if (startupServerIndex == -1 && info.getServer() == savedHost && info.getPort() == savedPort) {
+            startupServerIndex = startupServerSelector.count() - 1;
+        }
+    }
+    startupServerSelector.setCurrentIndex(startupServerIndex);
+
+    connect(&startupServerSelector, qOverload<int>(&QComboBox::currentIndexChanged), this, [this](int index) {
+        const QVariantList serverInfo = startupServerSelector.itemData(index).toList();
+        if (serverInfo.size() != 2) {
+            return;
+        }
+        TabsSettings &tabs = SettingsCache::instance().tabs();
+        tabs.setStartupServerHost(serverInfo[0].toString());
+        tabs.setStartupServerPort(serverInfo[1].toString());
+    });
+
+    startupRoomNameEdit = new QLineEdit(settings.tabs().getStartupRoomName());
+    // Default (Expanding) would stretch the whole controls column when this row becomes visible,
+    // so size it like the combo boxes instead: fills the column, never widens it.
+    startupRoomNameEdit->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    connect(startupRoomNameEdit, &QLineEdit::editingFinished, this,
+            [this] { SettingsCache::instance().tabs().setStartupRoomName(startupRoomNameEdit->text().trimmed()); });
+
+    auto *startupGrid = new QGridLayout;
+    startupGrid->addWidget(&showTipsOnStartup, 0, 0, 1, 2);
+    startupGrid->addWidget(&startupTabLabel, 1, 0);
+    startupGrid->addWidget(&startupTabSelector, 1, 1);
+    startupGrid->addWidget(&startupServerLabel, 2, 0);
+    startupGrid->addWidget(&startupServerSelector, 2, 1);
+    startupGrid->addWidget(&startupRoomLabel, 3, 0);
+    startupGrid->addWidget(startupRoomNameEdit, 3, 1);
+
+    updateStartupServerControlsVisibility();
+
+    startupGroupBox = new QGroupBox;
+    startupGroupBox->setLayout(startupGrid);
+
+    // paths settings
+    deckPathEdit = new QLineEdit(settings.paths().getDeckPath());
+    deckPathEdit->setReadOnly(true);
+    auto *deckPathButton = new QPushButton("...");
+    connect(deckPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::deckPathButtonClicked);
+
+    filtersPathEdit = new QLineEdit(settings.paths().getFiltersPath());
+    filtersPathEdit->setReadOnly(true);
+    auto *filtersPathButton = new QPushButton("...");
+    connect(filtersPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::filtersPathButtonClicked);
+
+    replaysPathEdit = new QLineEdit(settings.paths().getReplaysPath());
+    replaysPathEdit->setReadOnly(true);
+    auto *replaysPathButton = new QPushButton("...");
+    connect(replaysPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::replaysPathButtonClicked);
+
+    picsPathEdit = new QLineEdit(settings.paths().getPicsPath());
+    picsPathEdit->setReadOnly(true);
+    auto *picsPathButton = new QPushButton("...");
+    connect(picsPathButton, &QPushButton::clicked, this, &GeneralSettingsPage::picsPathButtonClicked);
+
+    cardDatabasePathEdit = new QLineEdit(settings.getCardDatabasePath());
+    cardDatabasePathEdit->setReadOnly(true);
+    auto *cardDatabasePathButton = new QPushButton("...");
+    connect(cardDatabasePathButton, &QPushButton::clicked, this, &GeneralSettingsPage::cardDatabasePathButtonClicked);
+
+    customCardDatabasePathEdit = new QLineEdit(settings.getCustomCardDatabasePath());
+    customCardDatabasePathEdit->setReadOnly(true);
+    auto *customCardDatabasePathButton = new QPushButton("...");
+    connect(customCardDatabasePathButton, &QPushButton::clicked, this,
+            &GeneralSettingsPage::customCardDatabaseButtonClicked);
+
+    tokenDatabasePathEdit = new QLineEdit(settings.getTokenDatabasePath());
+    tokenDatabasePathEdit->setReadOnly(true);
+    auto *tokenDatabasePathButton = new QPushButton("...");
+    connect(tokenDatabasePathButton, &QPushButton::clicked, this, &GeneralSettingsPage::tokenDatabasePathButtonClicked);
+
+    // Required init here to avoid crashing on Portable builds
+    resetAllPathsButton = new QPushButton;
+
+    bool isPortable = settings.getIsPortableBuild();
+    if (isPortable) {
+        deckPathEdit->setEnabled(false);
+        filtersPathEdit->setEnabled(false);
+        replaysPathEdit->setEnabled(false);
+        picsPathEdit->setEnabled(false);
+        cardDatabasePathEdit->setEnabled(false);
+        customCardDatabasePathEdit->setEnabled(false);
+        tokenDatabasePathEdit->setEnabled(false);
+
+        deckPathButton->setVisible(false);
+        replaysPathButton->setVisible(false);
+        picsPathButton->setVisible(false);
+        cardDatabasePathButton->setVisible(false);
+        customCardDatabasePathButton->setVisible(false);
+        tokenDatabasePathButton->setVisible(false);
+    } else {
+        connect(resetAllPathsButton, &QPushButton::clicked, this, &GeneralSettingsPage::resetAllPathsClicked);
+        allPathsResetLabel = new QLabel(tr("All paths have been reset"));
+        allPathsResetLabel->setVisible(false);
+    }
+
+    auto *pathsGrid = new QGridLayout;
+    pathsGrid->addWidget(&deckPathLabel, 0, 0);
+    pathsGrid->addWidget(deckPathEdit, 0, 1);
+    pathsGrid->addWidget(deckPathButton, 0, 2);
+    pathsGrid->addWidget(&filtersPathLabel, 1, 0);
+    pathsGrid->addWidget(filtersPathEdit, 1, 1);
+    pathsGrid->addWidget(filtersPathButton, 1, 2);
+    pathsGrid->addWidget(&replaysPathLabel, 2, 0);
+    pathsGrid->addWidget(replaysPathEdit, 2, 1);
+    pathsGrid->addWidget(replaysPathButton, 2, 2);
+    pathsGrid->addWidget(&picsPathLabel, 3, 0);
+    pathsGrid->addWidget(picsPathEdit, 3, 1);
+    pathsGrid->addWidget(picsPathButton, 3, 2);
+    pathsGrid->addWidget(&cardDatabasePathLabel, 4, 0);
+    pathsGrid->addWidget(cardDatabasePathEdit, 4, 1);
+    pathsGrid->addWidget(cardDatabasePathButton, 4, 2);
+    pathsGrid->addWidget(&customCardDatabasePathLabel, 5, 0);
+    pathsGrid->addWidget(customCardDatabasePathEdit, 5, 1);
+    pathsGrid->addWidget(customCardDatabasePathButton, 5, 2);
+    pathsGrid->addWidget(&tokenDatabasePathLabel, 6, 0);
+    pathsGrid->addWidget(tokenDatabasePathEdit, 6, 1);
+    pathsGrid->addWidget(tokenDatabasePathButton, 6, 2);
+    if (!isPortable) {
+        pathsGrid->addWidget(resetAllPathsButton, 7, 0);
+        pathsGrid->addWidget(allPathsResetLabel, 7, 1);
+    }
+    pathsGroupBox = new QGroupBox;
+    pathsGroupBox->setLayout(pathsGrid);
+
+    auto *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(languageGroupBox);
+    mainLayout->addWidget(versionGroupBox);
+    mainLayout->addWidget(cardDatabaseGroupBox);
+    mainLayout->addWidget(startupGroupBox);
+    mainLayout->addWidget(pathsGroupBox);
+    mainLayout->addStretch();
+
+    GeneralSettingsPage::retranslateUi();
+
+    // connect the ReleaseChannel combo box only after the entries are inserted in retranslateUi
+    connect(&updateReleaseChannelBox, qOverload<int>(&QComboBox::currentIndexChanged), &settings.updates(),
+            &UpdatesSettings::setUpdateReleaseChannelIndex);
+    updateReleaseChannelBox.setCurrentIndex(settings.getUpdateReleaseChannelIndex());
+
+    setLayout(mainLayout);
+
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &GeneralSettingsPage::retranslateUi);
+    retranslateUi();
+}
+
+QStringList GeneralSettingsPage::findQmFiles()
+{
+    return TranslationLoader::availableLanguages(translationPrefix,
+                                                 TranslationLoader::applicationTranslationPaths(translationPath));
+}
+
+QString GeneralSettingsPage::languageName(const QString &lang)
+{
+    QTranslator qTranslator;
+
+    // Only the language name is needed here, so the file is loaded without logging a line per
+    // language: findQmFiles() asked for languages whose files exist in the first place.
+    TranslationLoader::loadFrom(qTranslator, translationPrefix + "_" + lang,
+                                TranslationLoader::applicationTranslationPaths(translationPath));
+
+    return qTranslator.translate("i18n", DEFAULT_LANG_NAME);
+}
+
+void GeneralSettingsPage::deckPathButtonClicked()
+{
+    QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), deckPathEdit->text());
+    if (path.isEmpty()) {
+        return;
+    }
+    if (!PathSafetyWarning::confirmOutsideProgramDir(this, path)) {
+        return;
+    }
+
+    deckPathEdit->setText(path);
+    SettingsCache::instance().paths().setDeckPath(path);
+}
+
+void GeneralSettingsPage::filtersPathButtonClicked()
+{
+    QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), filtersPathEdit->text());
+    if (path.isEmpty()) {
+        return;
+    }
+    if (!PathSafetyWarning::confirmOutsideProgramDir(this, path)) {
+        return;
+    }
+
+    filtersPathEdit->setText(path);
+    SettingsCache::instance().paths().setFiltersPath(path);
+}
+
+void GeneralSettingsPage::replaysPathButtonClicked()
+{
+    QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), replaysPathEdit->text());
+    if (path.isEmpty()) {
+        return;
+    }
+    if (!PathSafetyWarning::confirmOutsideProgramDir(this, path)) {
+        return;
+    }
+
+    replaysPathEdit->setText(path);
+    SettingsCache::instance().paths().setReplaysPath(path);
+}
+
+void GeneralSettingsPage::picsPathButtonClicked()
+{
+    QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), picsPathEdit->text());
+    if (path.isEmpty()) {
+        return;
+    }
+    if (!PathSafetyWarning::confirmOutsideProgramDir(this, path)) {
+        return;
+    }
+
+    picsPathEdit->setText(path);
+    SettingsCache::instance().paths().setPicsPath(path);
+}
+
+void GeneralSettingsPage::cardDatabasePathButtonClicked()
+{
+    QString path = QFileDialog::getOpenFileName(this, tr("Choose path"), cardDatabasePathEdit->text());
+    if (path.isEmpty()) {
+        return;
+    }
+    if (!PathSafetyWarning::confirmOutsideProgramDir(this, path)) {
+        return;
+    }
+
+    cardDatabasePathEdit->setText(path);
+    SettingsCache::instance().paths().setCardDatabasePath(path);
+}
+
+void GeneralSettingsPage::customCardDatabaseButtonClicked()
+{
+    QString path = QFileDialog::getExistingDirectory(this, tr("Choose path"), customCardDatabasePathEdit->text());
+    if (path.isEmpty()) {
+        return;
+    }
+    if (!PathSafetyWarning::confirmOutsideProgramDir(this, path)) {
+        return;
+    }
+
+    customCardDatabasePathEdit->setText(path);
+    SettingsCache::instance().paths().setCustomCardDatabasePath(path);
+}
+
+void GeneralSettingsPage::tokenDatabasePathButtonClicked()
+{
+    QString path = QFileDialog::getOpenFileName(this, tr("Choose path"), tokenDatabasePathEdit->text());
+    if (path.isEmpty()) {
+        return;
+    }
+    if (!PathSafetyWarning::confirmOutsideProgramDir(this, path)) {
+        return;
+    }
+
+    tokenDatabasePathEdit->setText(path);
+    SettingsCache::instance().paths().setTokenDatabasePath(path);
+}
+
+void GeneralSettingsPage::resetAllPathsClicked()
+{
+    SettingsCache &settings = SettingsCache::instance();
+    settings.resetPaths();
+    deckPathEdit->setText(settings.paths().getDeckPath());
+    replaysPathEdit->setText(settings.paths().getReplaysPath());
+    picsPathEdit->setText(settings.paths().getPicsPath());
+    cardDatabasePathEdit->setText(settings.getCardDatabasePath());
+    customCardDatabasePathEdit->setText(settings.getCustomCardDatabasePath());
+    tokenDatabasePathEdit->setText(settings.getTokenDatabasePath());
+    allPathsResetLabel->setVisible(true);
+}
+
+void GeneralSettingsPage::languageBoxChanged(int index)
+{
+    SettingsCache::instance().personal().setLang(languageBox.itemData(index).toString());
+}
+
+void GeneralSettingsPage::cardLanguageBoxChanged(int index)
+{
+    const QString lang = cardLanguageBox.itemData(index).toString();
+    SettingsCache::instance().cardsDisplay().setCardLang(lang);
+
+    // Switching to a non-default language only takes effect after the card
+    // database is re-imported with that language selected; English data is always
+    // present, so switching back to English needs no prompt.
+    if (lang == "en") {
+        return;
+    }
+
+    // The binary cache does not track the language its entries were imported in,
+    // and the downloaded pictures were fetched with English art names, so both are
+    // stale until Oracle re-imports the database in the new language: drop them.
+    QFile::remove(SettingsCache::instance().getCardDatabasePath() + ".cache");
+    CardPictureLoader::clearNetworkCache();
+    CardPictureLoader::clearPixmapCache();
+
+    // Art is resolved by the translated card name for non-English languages, so the
+    // matching Scryfall URL is added to the top of the download list. It stays
+    // visible in the deck editor settings, where it can be removed or reordered.
+    const bool localizedUrlAdded = SettingsCache::instance().downloads().addLocalizedScryfallUrl();
+
+    QString message = tr("<p>The card database only contains English card data. To see cards in <b>%1</b>, "
+                         "<b>Oracle</b> must run once with this language selected and re-import the card "
+                         "database.</p>"
+                         "<p>The cached database and the downloaded card pictures have been cleared, so a "
+                         "re-import is picked up without stale entries.</p>")
+                          .arg(cardLanguageBox.itemText(index));
+    if (localizedUrlAdded) {
+        message += tr("<p>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.</p>");
+    }
+    message += tr("<p>Run Oracle now?</p>");
+
+    const QMessageBox::StandardButton answer = QMessageBox::question(
+        this, tr("Card text & images language changed"), message, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
+
+    // The answer only controls whether Oracle starts right away; the caches stay
+    // cleared so the next import or launch rebuilds them in the new language.
+    if (answer == QMessageBox::Yes) {
+        emit cardDatabaseUpdateRequested();
+    }
+}
+
+void GeneralSettingsPage::cardSearchLanguageBoxChanged(int index)
+{
+    SettingsCache::instance().cardsDisplay().setCardSearchLanguage(index);
+}
+
+void GeneralSettingsPage::updateStartupServerControlsVisibility()
+{
+    const int index = startupTabSelector.currentIndex();
+    const bool serverNeeded = index == StartupTab::StartupTabServer || index == StartupTab::StartupTabServerRoom;
+    const bool roomNeeded = index == StartupTab::StartupTabServerRoom;
+    startupServerLabel.setVisible(serverNeeded);
+    startupServerSelector.setVisible(serverNeeded);
+    startupRoomLabel.setVisible(roomNeeded);
+    startupRoomNameEdit->setVisible(roomNeeded);
+}
+
+void GeneralSettingsPage::retranslateUi()
+{
+    const auto &settings = SettingsCache::instance();
+
+    languageGroupBox->setTitle(tr("Language settings"));
+    languageLabel.setText(tr("Language:"));
+    cardLanguageBox.setItemText(0, tr("English"));
+    cardLanguageLabel.setText(tr("Card text & images language:"));
+    cardLanguageNoteLabel.setText(
+        tr("Foreign card names, text and art apply after you update the card database (Oracle)."));
+    cardSearchLanguageLabel.setText(tr("Language used in card search:"));
+    cardSearchLanguageBox.setItemText(static_cast<int>(SearchLanguageMode::English), tr("English"));
+    cardSearchLanguageBox.setItemText(static_cast<int>(SearchLanguageMode::Selected),
+                                      tr("Selected card language (untranslated cards still match in English)"));
+    cardSearchLanguageBox.setItemText(static_cast<int>(SearchLanguageMode::Both),
+                                      tr("English and selected card language"));
+    advertiseTranslationPageLabel.setText(
+        QString("<a href='%1'>%2</a>").arg(WIKI_TRANSLATION_FAQ).arg(tr("How to help with translations")));
+
+    versionGroupBox->setTitle(tr("Version settings"));
+    updateReleaseChannelLabel.setText(tr("Update channel"));
+    startupUpdateCheckCheckBox.setText(tr("Check for client updates on startup"));
+    updateNotificationCheckBox.setText(tr("Notify if a feature supported by the server is missing in my client"));
+    newVersionOracleCheckBox.setText(tr("Automatically run Oracle when running a new version of Cockatrice"));
+
+    // We can't change the strings after they're put into the QComboBox, so this is our workaround
+    int oldIndex = updateReleaseChannelBox.currentIndex();
+    updateReleaseChannelBox.clear();
+    for (ReleaseChannel *chan : settings.getUpdateReleaseChannels()) {
+        updateReleaseChannelBox.addItem(tr(chan->getName().toUtf8()));
+    }
+    updateReleaseChannelBox.setCurrentIndex(oldIndex);
+
+    cardDatabaseGroupBox->setTitle(tr("Card database"));
+    startupCardUpdateCheckBehaviorLabel.setText(tr("Check for card database updates on startup"));
+    startupCardUpdateCheckBehaviorSelector.setItemText(startupCardUpdateCheckBehaviorIndexNone, tr("Don't check"));
+    startupCardUpdateCheckBehaviorSelector.setItemText(startupCardUpdateCheckBehaviorIndexPrompt,
+                                                       tr("Prompt for update"));
+    startupCardUpdateCheckBehaviorSelector.setItemText(startupCardUpdateCheckBehaviorIndexAlways,
+                                                       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());
+    lastCardUpdateCheckDateLabel.setText(
+        tr("Last update check on %1 (%2 days ago)").arg(lastCheckDate.toString()).arg(daysAgo));
+
+    startupGroupBox->setTitle(tr("Startup settings"));
+    showTipsOnStartup.setText(tr("Show tips on startup"));
+    startupTabLabel.setText(tr("Startup tab:"));
+    startupTabSelector.setItemText(StartupTab::StartupTabHome, tr("Home"));
+    startupTabSelector.setItemText(StartupTab::StartupTabVisualDeckStorage, tr("Visual Deck Storage"));
+    startupTabSelector.setItemText(StartupTab::StartupTabDeckStorage, tr("Deck Storage"));
+    startupTabSelector.setItemText(StartupTab::StartupTabReplays, tr("Game Replays"));
+    startupTabSelector.setItemText(StartupTab::StartupTabDeckEditor, tr("Deck Editor"));
+    startupTabSelector.setItemText(StartupTab::StartupTabVisualDeckEditor, tr("Visual Deck Editor"));
+    startupTabSelector.setItemText(StartupTab::StartupTabServer, tr("Server"));
+    startupTabSelector.setItemText(StartupTab::StartupTabServerRoom, tr("Server Room"));
+    startupTabSelector.setToolTip(
+        tr("The tab shown when Cockatrice starts. If the chosen tab is not open yet, it is opened."));
+    startupServerLabel.setText(tr("Server:"));
+    startupRoomLabel.setText(tr("Room:"));
+    startupRoomNameEdit->setPlaceholderText(tr("Room name"));
+
+    if (settings.getIsPortableBuild()) {
+        pathsGroupBox->setTitle(tr("Paths (editing disabled in portable mode)"));
+    } else {
+        pathsGroupBox->setTitle(tr("Paths"));
+    }
+    deckPathLabel.setText(tr("Decks directory:"));
+    filtersPathLabel.setText(tr("Filters directory:"));
+    replaysPathLabel.setText(tr("Replays directory:"));
+    picsPathLabel.setText(tr("Pictures directory:"));
+    cardDatabasePathLabel.setText(tr("Card database:"));
+    customCardDatabasePathLabel.setText(tr("Custom database directory:"));
+    tokenDatabasePathLabel.setText(tr("Token database:"));
+    resetAllPathsButton->setText(tr("Reset all paths"));
+}
diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.h b/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
new file mode 100644
index 000000000..fcf1c78d0
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/general_settings_page.h
@@ -0,0 +1,106 @@
+#ifndef COCKATRICE_GENERAL_SETTINGS_PAGE_H
+#define COCKATRICE_GENERAL_SETTINGS_PAGE_H
+
+#include "abstract_settings_page.h"
+
+#include <QCheckBox>
+#include <QComboBox>
+#include <QLabel>
+#include <QLoggingCategory>
+#include <QSpinBox>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class QGroupBox;
+class QLineEdit;
+class QPushButton;
+
+inline Q_LOGGING_CATEGORY(GeneralSettingsPageLog, "general_settings_page");
+
+class GeneralSettingsPage : public AbstractSettingsPage
+{
+    Q_OBJECT
+public:
+    GeneralSettingsPage();
+    void retranslateUi() override;
+
+    static QStringList findQmFiles();
+    static QString languageName(const QString &lang);
+
+signals:
+    /// Request to re-import the card database with the newly selected card language
+    void cardDatabaseUpdateRequested();
+
+private slots:
+    void deckPathButtonClicked();
+    void filtersPathButtonClicked();
+    void replaysPathButtonClicked();
+    void picsPathButtonClicked();
+    void cardDatabasePathButtonClicked();
+    void customCardDatabaseButtonClicked();
+    void tokenDatabasePathButtonClicked();
+    void resetAllPathsClicked();
+    void languageBoxChanged(int index);
+    void cardLanguageBoxChanged(int index);
+    void cardSearchLanguageBoxChanged(int index);
+    void updateStartupServerControlsVisibility();
+
+private:
+    QGroupBox *languageGroupBox;
+    QGroupBox *versionGroupBox;
+    QGroupBox *cardDatabaseGroupBox;
+    QGroupBox *startupGroupBox;
+    QGroupBox *pathsGroupBox;
+
+    QLabel languageLabel;
+    QComboBox languageBox;
+    QLabel advertiseTranslationPageLabel;
+
+    QLabel cardLanguageLabel;
+    QComboBox cardLanguageBox;
+    QLabel cardLanguageNoteLabel;
+
+    QLabel cardSearchLanguageLabel;
+    QComboBox cardSearchLanguageBox;
+
+    QLabel updateReleaseChannelLabel;
+    QComboBox updateReleaseChannelBox;
+    QCheckBox startupUpdateCheckCheckBox;
+    QCheckBox updateNotificationCheckBox;
+    QCheckBox newVersionOracleCheckBox;
+
+    QLabel startupCardUpdateCheckBehaviorLabel;
+    QComboBox startupCardUpdateCheckBehaviorSelector;
+    QLabel cardUpdateCheckIntervalLabel;
+    QSpinBox cardUpdateCheckIntervalSpinBox;
+    QLabel lastCardUpdateCheckDateLabel;
+    QCheckBox cardDatabaseUpdateTrayNotificationCheckBox;
+
+    QCheckBox showTipsOnStartup;
+    QLabel startupTabLabel;
+    QComboBox startupTabSelector;
+    QLabel startupServerLabel;
+    QComboBox startupServerSelector;
+    QLabel startupRoomLabel;
+    QLineEdit *startupRoomNameEdit;
+
+    QLabel deckPathLabel;
+    QLabel filtersPathLabel;
+    QLabel replaysPathLabel;
+    QLabel picsPathLabel;
+    QLabel cardDatabasePathLabel;
+    QLabel customCardDatabasePathLabel;
+    QLabel tokenDatabasePathLabel;
+    QLineEdit *deckPathEdit;
+    QLineEdit *filtersPathEdit;
+    QLineEdit *replaysPathEdit;
+    QLineEdit *picsPathEdit;
+    QLineEdit *cardDatabasePathEdit;
+    QLineEdit *customCardDatabasePathEdit;
+    QLineEdit *tokenDatabasePathEdit;
+    QPushButton *resetAllPathsButton;
+    QLabel *allPathsResetLabel;
+};
+
+#endif // COCKATRICE_GENERAL_SETTINGS_PAGE_H
diff --git a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp
new file mode 100644
index 000000000..9494155af
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp
@@ -0,0 +1,292 @@
+#include "messages_settings_page.h"
+
+#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()
+{
+    chatMentionCheckBox.setChecked(SettingsCache::instance().chat().getChatMention());
+    connect(&chatMentionCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
+            &ChatSettings::setChatMention);
+
+    chatMentionCompleterCheckbox.setChecked(SettingsCache::instance().chat().getChatMentionCompleter());
+    connect(&chatMentionCompleterCheckbox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
+            &ChatSettings::setChatMentionCompleter);
+
+    explainMessagesLabel.setTextInteractionFlags(Qt::LinksAccessibleByMouse);
+    explainMessagesLabel.setOpenExternalLinks(true);
+
+    ignoreUnregUsersMainChat.setChecked(SettingsCache::instance().chat().getIgnoreUnregisteredUsers());
+    ignoreUnregUserMessages.setChecked(SettingsCache::instance().chat().getIgnoreUnregisteredUserMessages());
+    ignoreNonBuddyUserMessages.setChecked(SettingsCache::instance().chat().getIgnoreNonBuddyUserMessages());
+
+    connect(&ignoreUnregUsersMainChat, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
+            &ChatSettings::setIgnoreUnregisteredUsers);
+    connect(&ignoreUnregUserMessages, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
+            &ChatSettings::setIgnoreUnregisteredUserMessages);
+    connect(&ignoreNonBuddyUserMessages, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
+            &ChatSettings::setIgnoreNonBuddyUserMessages);
+
+    invertMentionForeground.setChecked(SettingsCache::instance().chat().getChatMentionForeground());
+    connect(&invertMentionForeground, &QCheckBox::QT_STATE_CHANGED, this, &MessagesSettingsPage::updateTextColor);
+
+    invertHighlightForeground.setChecked(SettingsCache::instance().chat().getChatHighlightForeground());
+    connect(&invertHighlightForeground, &QCheckBox::QT_STATE_CHANGED, this,
+            &MessagesSettingsPage::updateTextHighlightColor);
+
+    mentionColor = new QLineEdit();
+    mentionColor->setText(SettingsCache::instance().chat().getChatMentionColor());
+    updateMentionPreview();
+    connect(mentionColor, &QLineEdit::textChanged, this, &MessagesSettingsPage::updateColor);
+
+    messagePopups.setChecked(SettingsCache::instance().chat().getShowMessagePopup());
+    connect(&messagePopups, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
+            &ChatSettings::setShowMessagePopups);
+
+    mentionPopups.setChecked(SettingsCache::instance().chat().getShowMentionPopup());
+    connect(&mentionPopups, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
+            &ChatSettings::setShowMentionPopups);
+
+    roomHistory.setChecked(SettingsCache::instance().chat().getRoomHistory());
+    connect(&roomHistory, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
+            &ChatSettings::setRoomHistory);
+
+    ignoreAllPrivateMessagesCheckBox.setChecked(SettingsCache::instance().chat().getIgnoreAllPrivateMessages());
+    connect(&ignoreAllPrivateMessagesCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
+            &ChatSettings::setIgnoreAllPrivateMessages);
+
+    useGameTimeCheckBox.setChecked(SettingsCache::instance().chat().getUseGameTime());
+    connect(&useGameTimeCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(),
+            &ChatSettings::setUseGameTime);
+
+    customAlertString = new QLineEdit();
+    customAlertString->setText(SettingsCache::instance().chat().getHighlightWords());
+    connect(customAlertString, &QLineEdit::textChanged, &SettingsCache::instance().chat(),
+            &ChatSettings::setHighlightWords);
+
+    auto *chatGrid = new QGridLayout;
+    chatGrid->addWidget(&chatMentionCheckBox, 0, 0);
+    chatGrid->addWidget(&invertMentionForeground, 0, 1);
+    chatGrid->addWidget(mentionColor, 0, 2);
+    chatGrid->addWidget(&chatMentionCompleterCheckbox, 1, 0);
+    chatGrid->addWidget(&ignoreUnregUsersMainChat, 2, 0);
+    chatGrid->addWidget(&hexLabel, 1, 2);
+    chatGrid->addWidget(&ignoreUnregUserMessages, 3, 0);
+    chatGrid->addWidget(&ignoreNonBuddyUserMessages, 4, 0);
+    chatGrid->addWidget(&messagePopups, 5, 0);
+    chatGrid->addWidget(&mentionPopups, 6, 0);
+    chatGrid->addWidget(&roomHistory, 7, 0);
+    chatGrid->addWidget(&ignoreAllPrivateMessagesCheckBox, 8, 0);
+    chatGrid->addWidget(&useGameTimeCheckBox, 9, 0);
+    chatGroupBox = new QGroupBox;
+    chatGroupBox->setLayout(chatGrid);
+
+    highlightColor = new QLineEdit();
+    highlightColor->setText(SettingsCache::instance().chat().getChatHighlightColor());
+    updateHighlightPreview();
+    connect(highlightColor, &QLineEdit::textChanged, this, &MessagesSettingsPage::updateHighlightColor);
+
+    auto *highlightNotice = new QGridLayout;
+    highlightNotice->addWidget(highlightColor, 0, 2);
+    highlightNotice->addWidget(&invertHighlightForeground, 0, 1);
+    highlightNotice->addWidget(&hexHighlightLabel, 1, 2);
+    highlightNotice->addWidget(customAlertString, 0, 0);
+    highlightNotice->addWidget(&customAlertStringLabel, 1, 0);
+    customAlertStringLabel.setBuddy(customAlertString);
+    highlightGroupBox = new QGroupBox;
+    highlightGroupBox->setLayout(highlightNotice);
+
+    messageList = new QListWidget;
+
+    int count = SettingsCache::instance().messages().getCount();
+    for (int i = 0; i < count; i++) {
+        messageList->addItem(SettingsCache::instance().messages().getMessageAt(i));
+    }
+
+    aAdd = new QAction(this);
+    aAdd->setIcon(themePixmap(QStringLiteral("icons/increment")));
+    connect(aAdd, &QAction::triggered, this, &MessagesSettingsPage::actAdd);
+
+    aEdit = new QAction(this);
+    aEdit->setIcon(themePixmap(QStringLiteral("icons/pencil")));
+    connect(aEdit, &QAction::triggered, this, &MessagesSettingsPage::actEdit);
+
+    aRemove = new QAction(this);
+    aRemove->setIcon(themePixmap(QStringLiteral("icons/decrement")));
+    connect(aRemove, &QAction::triggered, this, &MessagesSettingsPage::actRemove);
+
+    auto *messageToolBar = new QToolBar;
+    messageToolBar->setOrientation(Qt::Vertical);
+    messageToolBar->addAction(aAdd);
+    messageToolBar->addAction(aRemove);
+    messageToolBar->addAction(aEdit);
+    messageToolBar->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
+
+    auto *messageListLayout = new QHBoxLayout;
+    messageListLayout->addWidget(messageToolBar);
+    messageListLayout->addWidget(messageList);
+
+    auto *messagesLayout = new QVBoxLayout; // combines the explainer label with the actual messages widget pieces
+    messagesLayout->addLayout(messageListLayout);
+    messagesLayout->addWidget(&explainMessagesLabel);
+
+    messageGroupBox = new QGroupBox; // draws a box around the above layout and allows it to be titled
+    messageGroupBox->setLayout(messagesLayout);
+
+    auto *mainLayout = new QVBoxLayout; // combines the messages groupbox with the rest of the menu
+    mainLayout->addWidget(messageGroupBox);
+    mainLayout->addWidget(chatGroupBox);
+    mainLayout->addWidget(highlightGroupBox);
+
+    setLayout(mainLayout);
+
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &MessagesSettingsPage::retranslateUi);
+    retranslateUi();
+}
+
+void MessagesSettingsPage::updateColor(const QString &value)
+{
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
+    QColor colorToSet = QColor::fromString("#" + value);
+#else
+    QColor colorToSet;
+    colorToSet.setNamedColor("#" + value);
+#endif
+    if (colorToSet.isValid()) {
+        SettingsCache::instance().chat().setChatMentionColor(value);
+        updateMentionPreview();
+    }
+}
+
+void MessagesSettingsPage::updateHighlightColor(const QString &value)
+{
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
+    QColor colorToSet = QColor::fromString("#" + value);
+#else
+    QColor colorToSet;
+    colorToSet.setNamedColor("#" + value);
+#endif
+    if (colorToSet.isValid()) {
+        SettingsCache::instance().chat().setChatHighlightColor(value);
+        updateHighlightPreview();
+    }
+}
+
+void MessagesSettingsPage::updateTextColor(QT_STATE_CHANGED_T value)
+{
+    SettingsCache::instance().chat().setChatMentionForeground(value);
+    updateMentionPreview();
+}
+
+void MessagesSettingsPage::updateTextHighlightColor(QT_STATE_CHANGED_T value)
+{
+    SettingsCache::instance().chat().setChatHighlightForeground(value);
+    updateHighlightPreview();
+}
+
+void MessagesSettingsPage::updateMentionPreview()
+{
+    mentionColor->setStyleSheet(
+        "QLineEdit{background:#" + SettingsCache::instance().chat().getChatMentionColor() +
+        ";color: " + (SettingsCache::instance().chat().getChatMentionForeground() ? "white" : "black") + ";}");
+}
+
+void MessagesSettingsPage::updateHighlightPreview()
+{
+    highlightColor->setStyleSheet(
+        "QLineEdit{background:#" + SettingsCache::instance().chat().getChatHighlightColor() +
+        ";color: " + (SettingsCache::instance().chat().getChatHighlightForeground() ? "white" : "black") + ";}");
+}
+
+void MessagesSettingsPage::storeSettings()
+{
+    SettingsCache::instance().messages().setCount(messageList->count());
+    for (int i = 0; i < messageList->count(); i++) {
+        SettingsCache::instance().messages().setMessageAt(i, messageList->item(i)->text());
+    }
+    emit SettingsCache::instance().messages().messageMacrosChanged();
+}
+
+void MessagesSettingsPage::actAdd()
+{
+    bool ok;
+    QString msg =
+        getTextWithMax(this, tr("Add message"), tr("Message:"), QLineEdit::Normal, QString(), &ok, MAX_TEXT_LENGTH);
+    if (ok) {
+        messageList->addItem(msg);
+        storeSettings();
+    }
+}
+
+void MessagesSettingsPage::actEdit()
+{
+    if (messageList->currentItem()) {
+        QString oldText = messageList->currentItem()->text();
+        bool ok;
+        QString msg =
+            getTextWithMax(this, tr("Edit message"), tr("Message:"), QLineEdit::Normal, oldText, &ok, MAX_TEXT_LENGTH);
+        if (ok) {
+            messageList->currentItem()->setText(msg);
+            storeSettings();
+        }
+    }
+}
+
+void MessagesSettingsPage::actRemove()
+{
+    if (messageList->currentItem() != nullptr) {
+        delete messageList->takeItem(messageList->currentRow());
+        storeSettings();
+    }
+}
+
+void MessagesSettingsPage::retranslateUi()
+{
+    chatGroupBox->setTitle(tr("Chat settings"));
+    highlightGroupBox->setTitle(tr("Custom alert words"));
+    chatMentionCheckBox.setText(tr("Enable chat mentions"));
+    chatMentionCompleterCheckbox.setText(tr("Enable mention completer"));
+    messageGroupBox->setTitle(tr("In-game message macros"));
+    explainMessagesLabel.setText(
+        QString("<a href='%1'>%2</a>").arg(WIKI_CUSTOM_SHORTCUTS).arg(tr("How to use in-game message macros")));
+    ignoreUnregUsersMainChat.setText(tr("Ignore chat room messages sent by unregistered users"));
+    ignoreUnregUserMessages.setText(tr("Ignore private messages sent by unregistered users"));
+    ignoreNonBuddyUserMessages.setText(tr("Ignore private messages sent by non-buddy users"));
+    invertMentionForeground.setText(tr("Invert text color"));
+    invertHighlightForeground.setText(tr("Invert text color"));
+    messagePopups.setText(tr("Enable desktop notifications for private messages"));
+    mentionPopups.setText(tr("Enable desktop notification for mentions"));
+    roomHistory.setText(tr("Enable room message history on join"));
+    ignoreAllPrivateMessagesCheckBox.setText(tr("Ignore all private messages"));
+    useGameTimeCheckBox.setText(tr("Use game time instead of local time in game logs"));
+    hexLabel.setText(tr("(Color is hexadecimal)"));
+    hexHighlightLabel.setText(tr("(Color is hexadecimal)"));
+    customAlertStringLabel.setText(tr("Separate words with a space, alphanumeric characters only"));
+    customAlertString->setPlaceholderText(tr("Word1 Word2 Word3"));
+    aAdd->setText(tr("Add New Message"));
+    aEdit->setText(tr("Edit Message"));
+    aRemove->setText(tr("Remove Message"));
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h
new file mode 100644
index 000000000..e85e6cca7
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h
@@ -0,0 +1,66 @@
+#ifndef COCKATRICE_MESSAGES_SETTINGS_PAGE_H
+#define COCKATRICE_MESSAGES_SETTINGS_PAGE_H
+
+#include "abstract_settings_page.h"
+
+#include <QCheckBox>
+#include <QLabel>
+#include <QString>
+#include <libcockatrice/utility/macros.h>
+#include <qtmetamacros.h>
+
+class QAction;
+class QGroupBox;
+class QLineEdit;
+class QListWidget;
+
+class MessagesSettingsPage : public AbstractSettingsPage
+{
+    Q_OBJECT
+public:
+    MessagesSettingsPage();
+    void retranslateUi() override;
+
+private slots:
+    void actAdd();
+    void actEdit();
+    void actRemove();
+    void updateColor(const QString &value);
+    void updateHighlightColor(const QString &value);
+    void updateTextColor(QT_STATE_CHANGED_T value);
+    void updateTextHighlightColor(QT_STATE_CHANGED_T value);
+
+private:
+    QListWidget *messageList;
+    QAction *aAdd;
+    QAction *aEdit;
+    QAction *aRemove;
+    QCheckBox chatMentionCheckBox;
+    QCheckBox chatMentionCompleterCheckbox;
+    QCheckBox invertMentionForeground;
+    QCheckBox invertHighlightForeground;
+    QCheckBox ignoreUnregUsersMainChat;
+    QCheckBox ignoreUnregUserMessages;
+    QCheckBox ignoreNonBuddyUserMessages;
+    QCheckBox messagePopups;
+    QCheckBox mentionPopups;
+    QCheckBox roomHistory;
+    QCheckBox ignoreAllPrivateMessagesCheckBox;
+    QCheckBox useGameTimeCheckBox;
+    QGroupBox *chatGroupBox;
+    QGroupBox *highlightGroupBox;
+    QGroupBox *messageGroupBox;
+    QLineEdit *mentionColor;
+    QLineEdit *highlightColor;
+    QLineEdit *customAlertString;
+    QLabel hexLabel;
+    QLabel hexHighlightLabel;
+    QLabel customAlertStringLabel;
+    QLabel explainMessagesLabel;
+
+    void storeSettings();
+    void updateMentionPreview();
+    void updateHighlightPreview();
+};
+
+#endif // COCKATRICE_MESSAGES_SETTINGS_PAGE_H
diff --git a/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp
new file mode 100644
index 000000000..bf35b7557
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.cpp
@@ -0,0 +1,142 @@
+/**
+ * @file settings_search_delegate.cpp
+ * @brief Implementation of the custom settings search result delegate
+ * @ingroup Dialogs
+ */
+#include "settings_search_delegate.h"
+
+#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)
+{
+}
+
+void SettingsSearchDelegate::setPageNames(const QStringList &names)
+{
+    pageNames = names;
+}
+
+void SettingsSearchDelegate::setPageIcons(const QStringList &iconResources)
+{
+    pageIcons.clear();
+    for (const QString &resource : iconResources) {
+        pageIcons.append(QPixmap(resource));
+    }
+}
+
+void SettingsSearchDelegate::paint(QPainter *painter,
+                                   const QStyleOptionViewItem &option,
+                                   const QModelIndex &index) const
+{
+    painter->save();
+
+    SettingsSearchEntry entry = index.data(SettingsSearchModel::EntryRole).value<SettingsSearchEntry>();
+
+    bool isSelected = option.state & QStyle::State_Selected;
+    bool isHovered = option.state & QStyle::State_MouseOver;
+
+    // Background
+    QColor bgColor = isSelected  ? option.palette.color(QPalette::Highlight)
+                     : isHovered ? option.palette.color(QPalette::Midlight)
+                                 : option.palette.color(QPalette::Base);
+    painter->fillRect(option.rect, bgColor);
+
+    if (isSelected) {
+        // Accent bar on the left to make the selection unmistakable
+        painter->fillRect(QRect(option.rect.left(), option.rect.top(), 4, option.rect.height()),
+                          option.palette.color(QPalette::Highlight).darker(150));
+    }
+
+    int leftMargin = 12;
+    int topMargin = 8;
+    int rightMargin = 12;
+    int bottomMargin = 4;
+
+    QRect contentRect = option.rect.adjusted(leftMargin, topMargin, -rightMargin, -bottomMargin);
+    int yPos = contentRect.top();
+
+    // Icon of the related settings page
+    const int iconSize = 24;
+    QPixmap pageIcon =
+        (entry.pageIndex >= 0 && entry.pageIndex < pageIcons.size()) ? pageIcons.at(entry.pageIndex) : QPixmap();
+    int iconOffset = pageIcon.isNull() ? 0 : iconSize + 8;
+    if (!pageIcon.isNull()) {
+        QRect iconRect(contentRect.left(), contentRect.top() + (contentRect.height() - iconSize) / 2, iconSize,
+                       iconSize);
+        painter->drawPixmap(iconRect, pageIcon);
+    }
+
+    QRect textRect = contentRect.adjusted(iconOffset, 0, 0, 0);
+
+    // Breadcrumb: "Page > Group"
+    QFont breadcrumbFont = option.font;
+    breadcrumbFont.setPointSize(breadcrumbFont.pointSize() - 1);
+    breadcrumbFont.setBold(true);
+
+    QColor breadcrumbColor =
+        isSelected ? option.palette.color(QPalette::HighlightedText) : option.palette.color(QPalette::Text);
+    if (!isSelected) {
+        breadcrumbColor.setAlpha(180);
+    }
+
+    QString pageName;
+    if (entry.pageIndex >= 0 && entry.pageIndex < pageNames.size()) {
+        pageName = pageNames[entry.pageIndex];
+    } else {
+        pageName = QString::number(entry.pageIndex);
+    }
+
+    QString breadcrumbText = QStringLiteral("%1 > %2").arg(pageName, entry.groupTitle);
+    painter->setFont(breadcrumbFont);
+    painter->setPen(breadcrumbColor);
+    painter->drawText(QRect(textRect.left(), yPos, textRect.width(), 20), Qt::AlignLeft | Qt::AlignVCenter,
+                      breadcrumbText);
+    yPos += 20;
+
+    // Setting label
+    QFont labelFont = option.font;
+    labelFont.setPointSize(labelFont.pointSize() + 1);
+    labelFont.setBold(isSelected);
+
+    QColor labelColor =
+        isSelected ? option.palette.color(QPalette::HighlightedText) : option.palette.color(QPalette::Text);
+
+    painter->setFont(labelFont);
+    painter->setPen(labelColor);
+    painter->drawText(QRect(textRect.left(), yPos, textRect.width(), 24), Qt::AlignLeft | Qt::AlignVCenter,
+                      entry.widgetLabel);
+    yPos += 24;
+
+    // Bottom separator
+    QPen separatorPen(option.palette.color(QPalette::Mid), 1);
+    painter->setPen(separatorPen);
+    painter->drawLine(option.rect.left() + leftMargin, option.rect.bottom(), option.rect.right() - rightMargin,
+                      option.rect.bottom());
+
+    painter->restore();
+}
+
+QSize SettingsSearchDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    Q_UNUSED(index);
+    return QSize(option.rect.width(), 56);
+}
diff --git a/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.h b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.h
new file mode 100644
index 000000000..2e48a3de9
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/settings_search_delegate.h
@@ -0,0 +1,44 @@
+/**
+ * @file settings_search_delegate.h
+ * @brief Custom delegate for rendering settings search results
+ * @ingroup Dialogs
+ */
+#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
+ *
+ * Renders each search result with a breadcrumb line ("Page > Group"),
+ * the setting label, and a subtle separator. Supports selected/hovered states.
+ */
+class SettingsSearchDelegate : public QStyledItemDelegate
+{
+    Q_OBJECT
+public:
+    explicit SettingsSearchDelegate(QObject *parent = nullptr);
+
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+
+    /** @brief Sets the translated page names for breadcrumb display */
+    void setPageNames(const QStringList &names);
+
+    /** @brief Sets the icons shown in front of results, indexed by page position */
+    void setPageIcons(const QStringList &iconResources);
+
+private:
+    QStringList pageNames;    ///< Translated page names indexed by page position
+    QList<QPixmap> pageIcons; ///< Icons of the related settings pages
+};
+
+#endif // COCKATRICE_SETTINGS_SEARCH_DELEGATE_H
diff --git a/cockatrice/src/interface/widgets/settings_page/settings_search_model.cpp b/cockatrice/src/interface/widgets/settings_page/settings_search_model.cpp
new file mode 100644
index 000000000..015a7d45d
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/settings_search_model.cpp
@@ -0,0 +1,152 @@
+/**
+ * @file settings_search_model.cpp
+ * @brief Implementation of the settings search list model
+ * @ingroup Dialogs
+ */
+#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)
+{
+}
+
+void SettingsSearchModel::setSourceEntries(const QList<SettingsSearchEntry> &entries)
+{
+    beginResetModel();
+    sourceEntries = entries;
+    endResetModel();
+    rebuildFilter();
+}
+
+void SettingsSearchModel::setFilterString(const QString &text)
+{
+    filterActive = !text.trimmed().isEmpty();
+    if (filterActive) {
+        filterQuery = text.trimmed();
+        filterRegex =
+            QRegularExpression(QRegularExpression::escape(filterQuery), QRegularExpression::CaseInsensitiveOption);
+    }
+    rebuildFilter();
+}
+
+bool SettingsSearchModel::isFilterActive() const
+{
+    return filterActive;
+}
+
+/**
+ * @brief Calculates a relevance score for a single entry against the query
+ *
+ * Scoring priorities (highest to lowest):
+ * 1. Label starts with query -> 100
+ * 2. Label contains query    -> 80
+ * 3. Group title starts with query -> 60
+ * 4. Group title contains query    -> 40
+ * 5. Full text regex match   -> 20
+ * 6. No match                -> 0 (excluded from results)
+ */
+static int relevanceScore(const SettingsSearchEntry &entry, const QString &query, const QRegularExpression &regex)
+{
+    QString lowerQuery = query.toLower();
+
+    // Label matches are most relevant
+    QString label = entry.widgetLabel.toLower();
+    if (label.startsWith(lowerQuery)) {
+        return 100;
+    }
+    if (label.contains(lowerQuery)) {
+        return 80;
+    }
+
+    // Group title matches are next
+    QString group = entry.groupTitle.toLower();
+    if (group.startsWith(lowerQuery)) {
+        return 60;
+    }
+    if (group.contains(lowerQuery)) {
+        return 40;
+    }
+
+    // Full text match is least relevant
+    if (entry.fullSearchText.contains(regex)) {
+        return 20;
+    }
+
+    return 0;
+}
+
+void SettingsSearchModel::rebuildFilter()
+{
+    beginResetModel();
+    filteredIndices.clear();
+
+    if (!filterActive) {
+        for (int i = 0; i < sourceEntries.size(); ++i) {
+            filteredIndices.append(i);
+        }
+    } else {
+        QList<QPair<int, int>> scored; // <score, index>
+        for (int i = 0; i < sourceEntries.size(); ++i) {
+            const SettingsSearchEntry &entry = sourceEntries[i];
+            // Skip conditional settings that are currently disabled or hidden
+            if (entry.widget && (!entry.widget->isEnabled() || entry.widget->isHidden())) {
+                continue;
+            }
+            int score = relevanceScore(entry, filterQuery, filterRegex);
+            if (score > 0) {
+                scored.append({-score, i}); // negative for descending sort
+            }
+        }
+        std::sort(scored.begin(), scored.end());
+        for (const auto &pair : scored) {
+            filteredIndices.append(pair.second);
+        }
+    }
+    endResetModel();
+}
+
+int SettingsSearchModel::rowCount(const QModelIndex &parent) const
+{
+    if (parent.isValid()) {
+        return 0;
+    }
+    return filteredIndices.size();
+}
+
+QVariant SettingsSearchModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() >= filteredIndices.size()) {
+        return {};
+    }
+
+    const SettingsSearchEntry &entry = sourceEntries[filteredIndices[index.row()]];
+
+    switch (role) {
+        case EntryRole:
+            return QVariant::fromValue(entry);
+        case Qt::DisplayRole:
+            return entry.widgetLabel;
+        case Qt::ToolTipRole:
+            return QStringLiteral("%1 > %2 > %3")
+                .arg(QString::number(entry.pageIndex), entry.groupTitle, entry.widgetLabel);
+        default:
+            return {};
+    }
+}
+
+SettingsSearchEntry SettingsSearchModel::entryForIndex(const QModelIndex &index) const
+{
+    if (!index.isValid() || index.row() >= filteredIndices.size()) {
+        return {};
+    }
+    return sourceEntries[filteredIndices[index.row()]];
+}
diff --git a/cockatrice/src/interface/widgets/settings_page/settings_search_model.h b/cockatrice/src/interface/widgets/settings_page/settings_search_model.h
new file mode 100644
index 000000000..902a29312
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/settings_search_model.h
@@ -0,0 +1,84 @@
+/**
+ * @file settings_search_model.h
+ * @brief Data model for the settings search feature
+ * @ingroup Dialogs
+ */
+#ifndef COCKATRICE_SETTINGS_SEARCH_MODEL_H
+#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;
+
+/**
+ * @brief Represents a single searchable setting entry
+ *
+ * Each settings page provides a list of these entries via getSearchEntries().
+ * The model uses them for filtering, relevance scoring, and display.
+ */
+struct SettingsSearchEntry
+{
+    int pageIndex;          ///< Index of the settings page this entry belongs to
+    QString groupTitle;     ///< Title of the group/section within the page
+    QString widgetLabel;    ///< Display label for the setting widget
+    QString fullSearchText; ///< Extended search text (label, control text, tooltip) for full-text matching
+    QWidget *widget;        ///< Pointer to the setting widget for focus/scrolling
+};
+
+/**
+ * @brief List model providing filtered, ranked search results
+ *
+ * Manages a list of SettingsSearchEntry items. When a filter string is set,
+ * entries are scored by relevance and sorted so the best matches appear first.
+ * Supports custom roles for accessing entry fields from views and delegates.
+ */
+class SettingsSearchModel : public QAbstractListModel
+{
+    Q_OBJECT
+public:
+    /**
+     * @brief Custom data role for accessing the full entry
+     */
+    enum Roles
+    {
+        EntryRole = Qt::UserRole + 1, ///< Full SettingsSearchEntry object
+    };
+
+    explicit SettingsSearchModel(QObject *parent = nullptr);
+
+    /** @brief Replaces the source entries and rebuilds the filter */
+    void setSourceEntries(const QList<SettingsSearchEntry> &entries);
+    /** @brief Sets the filter string and recalculates the results */
+    void setFilterString(const QString &text);
+    /** @brief Whether a non-empty filter is currently active */
+    bool isFilterActive() const;
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+    /** @brief Returns the full entry for a given model index */
+    SettingsSearchEntry entryForIndex(const QModelIndex &index) const;
+
+private:
+    QList<SettingsSearchEntry> sourceEntries; ///< Complete unfiltered entry list
+    QList<int> filteredIndices;               ///< Indices into sourceEntries matching the filter
+    QRegularExpression filterRegex;           ///< Compiled regex for the current filter
+    QString filterQuery;                      ///< Current filter query string
+    bool filterActive = false;                ///< Whether filtering is active
+
+    /** @brief Recalculates the filtered index list and ranking */
+    void rebuildFilter();
+};
+
+Q_DECLARE_METATYPE(SettingsSearchEntry)
+
+#endif // COCKATRICE_SETTINGS_SEARCH_MODEL_H
diff --git a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp
new file mode 100644
index 000000000..ea7ed745c
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp
@@ -0,0 +1,142 @@
+#include "shortcut_settings_page.h"
+
+#include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/shortcut_treeview.h"
+#include "../../../client/settings/shortcuts_settings.h"
+#include "../../pixel_map_generator.h"
+#include "../interface/widgets/utility/custom_line_edit.h"
+#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()
+{
+    // search bar
+    searchEdit = new SearchLineEdit;
+    searchEdit->setObjectName("searchEdit");
+    searchEdit->setClearButtonEnabled(true);
+
+    setFocusProxy(searchEdit);
+    setFocusPolicy(Qt::ClickFocus);
+
+    // table
+    shortcutsTable = new ShortcutTreeView(this);
+
+    shortcutsTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    shortcutsTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
+    shortcutsTable->setColumnWidth(0, width() / 3 * 2);
+    searchEdit->setTreeView(shortcutsTable);
+
+    connect(searchEdit, &SearchLineEdit::textChanged, shortcutsTable, &ShortcutTreeView::updateSearchString);
+
+    // edit widget
+    currentActionGroupLabel = new QLabel(this);
+    currentActionGroupName = new QLabel(this);
+    currentActionLabel = new QLabel(this);
+    currentActionName = new QLabel(this);
+    currentShortcutLabel = new QLabel(this);
+    editTextBox = new SequenceEdit("", this);
+    shortcutsTable->installEventFilter(editTextBox);
+
+    // buttons
+    faqLabel = new QLabel(this);
+    faqLabel->setTextInteractionFlags(Qt::LinksAccessibleByMouse);
+    faqLabel->setOpenExternalLinks(true);
+
+    btnResetAll = new QPushButton(this);
+    btnClearAll = new QPushButton(this);
+
+    btnResetAll->setIcon(themePixmap(QStringLiteral("icons/update")));
+    btnClearAll->setIcon(themePixmap(QStringLiteral("icons/clearsearch")));
+
+    // layout
+    auto *_editLayout = new QGridLayout;
+    _editLayout->addWidget(currentActionGroupLabel, 0, 0);
+    _editLayout->addWidget(currentActionGroupName, 0, 1);
+    _editLayout->addWidget(currentActionLabel, 1, 0);
+    _editLayout->addWidget(currentActionName, 1, 1);
+    _editLayout->addWidget(currentShortcutLabel, 2, 0);
+    _editLayout->addWidget(editTextBox, 2, 1);
+
+    editShortcutGroupBox = new QGroupBox;
+    editShortcutGroupBox->setLayout(_editLayout);
+
+    auto *_buttonsLayout = new QHBoxLayout;
+    _buttonsLayout->addWidget(faqLabel);
+    _buttonsLayout->addWidget(btnResetAll);
+    _buttonsLayout->addWidget(btnClearAll);
+
+    auto *_mainLayout = new QVBoxLayout;
+    _mainLayout->addWidget(searchEdit);
+    _mainLayout->addWidget(shortcutsTable);
+    _mainLayout->addWidget(editShortcutGroupBox);
+    _mainLayout->addLayout(_buttonsLayout);
+
+    setLayout(_mainLayout);
+
+    connect(btnResetAll, &QPushButton::clicked, this, &ShortcutSettingsPage::resetShortcuts);
+    connect(btnClearAll, &QPushButton::clicked, this, &ShortcutSettingsPage::clearShortcuts);
+
+    connect(shortcutsTable, &ShortcutTreeView::currentItemChanged, this, &ShortcutSettingsPage::currentItemChanged);
+
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &ShortcutSettingsPage::retranslateUi);
+    retranslateUi();
+}
+
+void ShortcutSettingsPage::currentItemChanged(const QString &key)
+{
+    if (key.isEmpty()) {
+        currentActionGroupName->setText("");
+        currentActionName->setText("");
+        editTextBox->setShortcutName("");
+    } else {
+        QString group = SettingsCache::instance().shortcuts().getShortcut(key).getGroupName();
+        QString action = SettingsCache::instance().shortcuts().getShortcut(key).getName();
+        currentActionGroupName->setText(group);
+        currentActionName->setText(action);
+        editTextBox->setShortcutName(key);
+    }
+}
+
+void ShortcutSettingsPage::resetShortcuts()
+{
+    if (QMessageBox::question(this, tr("Restore all default shortcuts"),
+                              tr("Do you really want to restore all default shortcuts?")) == QMessageBox::Yes) {
+        SettingsCache::instance().shortcuts().resetAllShortcuts();
+    }
+}
+
+void ShortcutSettingsPage::clearShortcuts()
+{
+    if (QMessageBox::question(this, tr("Clear all default shortcuts"),
+                              tr("Do you really want to clear all shortcuts?")) == QMessageBox::Yes) {
+        SettingsCache::instance().shortcuts().clearAllShortcuts();
+    }
+}
+
+void ShortcutSettingsPage::retranslateUi()
+{
+    shortcutsTable->retranslateUi();
+
+    currentActionGroupLabel->setText(tr("Section:"));
+    currentActionLabel->setText(tr("Action:"));
+    currentShortcutLabel->setText(tr("Shortcut:"));
+    editShortcutGroupBox->setTitle(tr("Shortcut editor"));
+    editTextBox->retranslateUi();
+    faqLabel->setText(QString("<a href='%1'>%2</a>").arg(WIKI_CUSTOM_SHORTCUTS).arg(tr("How to set custom shortcuts")));
+    btnResetAll->setText(tr("Restore all default shortcuts"));
+    btnClearAll->setText(tr("Clear all shortcuts"));
+    searchEdit->setPlaceholderText(tr("Search by shortcut name"));
+}
diff --git a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h
new file mode 100644
index 000000000..6ae7fbfa7
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.h
@@ -0,0 +1,49 @@
+#ifndef COCKATRICE_SHORTCUT_SETTINGS_PAGE_H
+#define COCKATRICE_SHORTCUT_SETTINGS_PAGE_H
+
+#include "abstract_settings_page.h"
+
+#include <QString>
+#include <qtmetamacros.h>
+
+class SequenceEdit;
+class ShortcutTreeView;
+class SearchLineEdit;
+class QGridLayout;
+class QGroupBox;
+class QHBoxLayout;
+class QLabel;
+class QPushButton;
+class QVBoxLayout;
+
+class ShortcutSettingsPage : public AbstractSettingsPage
+{
+    Q_OBJECT
+public:
+    ShortcutSettingsPage();
+    void retranslateUi() override;
+
+private:
+    SearchLineEdit *searchEdit;
+    ShortcutTreeView *shortcutsTable;
+    QVBoxLayout *mainLayout;
+    QHBoxLayout *buttonsLayout;
+    QGroupBox *editShortcutGroupBox;
+    QGridLayout *editLayout;
+    QLabel *currentActionGroupLabel;
+    QLabel *currentActionGroupName;
+    QLabel *currentActionLabel;
+    QLabel *currentActionName;
+    QLabel *currentShortcutLabel;
+    SequenceEdit *editTextBox;
+    QLabel *faqLabel;
+    QPushButton *btnResetAll;
+    QPushButton *btnClearAll;
+
+private slots:
+    void resetShortcuts();
+    void clearShortcuts();
+    void currentItemChanged(const QString &key);
+};
+
+#endif // COCKATRICE_SHORTCUT_SETTINGS_PAGE_H
diff --git a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp
new file mode 100644
index 000000000..05725bb42
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/sound_settings_page.cpp
@@ -0,0 +1,102 @@
+#include "sound_settings_page.h"
+
+#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()
+{
+    soundEnabledCheckBox.setChecked(SettingsCache::instance().sound().getSoundEnabled());
+    connect(&soundEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().sound(),
+            &SoundSettings::setSoundEnabled);
+
+    QString themeName = SettingsCache::instance().sound().getSoundThemeName();
+
+    QStringList themeDirs = soundEngine->getAvailableThemes().keys();
+    for (int i = 0; i < themeDirs.size(); i++) {
+        themeBox.addItem(themeDirs[i]);
+        if (themeDirs[i] == themeName) {
+            themeBox.setCurrentIndex(i);
+        }
+    }
+
+    connect(&themeBox, qOverload<int>(&QComboBox::currentIndexChanged), this, &SoundSettingsPage::themeBoxChanged);
+    connect(&soundTestButton, &QPushButton::clicked, soundEngine, &SoundEngine::testSound);
+
+    masterVolumeSlider = new QSlider(Qt::Horizontal);
+    masterVolumeSlider->setMinimum(0);
+    masterVolumeSlider->setMaximum(100);
+    masterVolumeSlider->setValue(SettingsCache::instance().sound().getMasterVolume());
+    masterVolumeSlider->setToolTip(QString::number(SettingsCache::instance().sound().getMasterVolume()));
+    connect(&SettingsCache::instance().sound(), &SoundSettings::masterVolumeChanged, this,
+            &SoundSettingsPage::masterVolumeChanged);
+    connect(masterVolumeSlider, &QSlider::sliderReleased, soundEngine, &SoundEngine::testSound);
+    connect(masterVolumeSlider, &QSlider::valueChanged, &SettingsCache::instance().sound(),
+            &SoundSettings::setMasterVolume);
+
+    masterVolumeSpinBox = new QSpinBox();
+    masterVolumeSpinBox->setMinimum(0);
+    masterVolumeSpinBox->setMaximum(100);
+    masterVolumeSpinBox->setValue(SettingsCache::instance().sound().getMasterVolume());
+    connect(masterVolumeSlider, &QSlider::valueChanged, masterVolumeSpinBox, &QSpinBox::setValue);
+    connect(masterVolumeSpinBox, qOverload<int>(&QSpinBox::valueChanged), masterVolumeSlider, &QSlider::setValue);
+
+    auto *soundGrid = new QGridLayout;
+    soundGrid->addWidget(&soundEnabledCheckBox, 0, 0, 1, 3);
+    soundGrid->addWidget(&masterVolumeLabel, 1, 0);
+    soundGrid->addWidget(masterVolumeSlider, 1, 1);
+    soundGrid->addWidget(masterVolumeSpinBox, 1, 2);
+    soundGrid->addWidget(&themeLabel, 2, 0);
+    soundGrid->addWidget(&themeBox, 2, 1);
+    soundGrid->addWidget(&soundTestButton, 3, 1);
+
+    soundGroupBox = new QGroupBox;
+    soundGroupBox->setLayout(soundGrid);
+
+    auto *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(soundGroupBox);
+    mainLayout->addStretch();
+
+    setLayout(mainLayout);
+
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &SoundSettingsPage::retranslateUi);
+    retranslateUi();
+}
+
+void SoundSettingsPage::themeBoxChanged(int index)
+{
+    QStringList themeDirs = soundEngine->getAvailableThemes().keys();
+    if (index >= 0 && index < themeDirs.count()) {
+        SettingsCache::instance().sound().setSoundThemeName(themeDirs.at(index));
+    }
+}
+
+void SoundSettingsPage::masterVolumeChanged(int value)
+{
+    masterVolumeSlider->setToolTip(QString::number(value));
+}
+
+void SoundSettingsPage::retranslateUi()
+{
+    soundEnabledCheckBox.setText(tr("Enable &sounds"));
+    themeLabel.setText(tr("Current sounds theme:"));
+    soundTestButton.setText(tr("Test system sound engine"));
+    soundGroupBox->setTitle(tr("Sound settings"));
+    masterVolumeLabel.setText(tr("Master volume"));
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/settings_page/sound_settings_page.h b/cockatrice/src/interface/widgets/settings_page/sound_settings_page.h
new file mode 100644
index 000000000..acaa4f7c4
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/sound_settings_page.h
@@ -0,0 +1,38 @@
+#ifndef COCKATRICE_SOUND_SETTINGS_PAGE_H
+#define COCKATRICE_SOUND_SETTINGS_PAGE_H
+
+#include "abstract_settings_page.h"
+
+#include <QCheckBox>
+#include <QComboBox>
+#include <QLabel>
+#include <QPushButton>
+#include <qtmetamacros.h>
+
+class QGroupBox;
+class QSlider;
+class QSpinBox;
+
+class SoundSettingsPage : public AbstractSettingsPage
+{
+    Q_OBJECT
+public:
+    SoundSettingsPage();
+    void retranslateUi() override;
+
+private:
+    QLabel themeLabel;
+    QComboBox themeBox;
+    QGroupBox *soundGroupBox;
+    QPushButton soundTestButton;
+    QCheckBox soundEnabledCheckBox;
+    QLabel masterVolumeLabel;
+    QSlider *masterVolumeSlider;
+    QSpinBox *masterVolumeSpinBox;
+
+private slots:
+    void masterVolumeChanged(int value);
+    void themeBoxChanged(int index);
+};
+
+#endif // COCKATRICE_SOUND_SETTINGS_PAGE_H
diff --git a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp
new file mode 100644
index 000000000..a71296820
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/storage_settings_page.cpp
@@ -0,0 +1,266 @@
+#include "storage_settings_page.h"
+
+#include "../../../client/settings/cache_settings.h"
+#include "../../card_picture_loader/card_picture_loader_cache_method.h"
+#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()
+{
+    auto *lpNetworkCacheGrid = new QGridLayout;
+    auto *lpImageBackupGrid = new QGridLayout;
+    auto *lpPixmapCacheGrid = new QGridLayout;
+
+    networkCacheExplainerLabel.setWordWrap(true);
+    imageBackupExplainerLabel.setWordWrap(true);
+    pixmapCacheExplainerLabel.setWordWrap(true);
+
+    connect(&clearDownloadedPicsButton, &QPushButton::clicked, this,
+            &StorageSettingsPage::clearDownloadedPicsButtonClicked);
+
+    connect(&clearPixmapCacheButton, &QPushButton::clicked, this, &StorageSettingsPage::clearPixmapCacheButtonClicked);
+
+    // pixmap cache
+    pixmapCacheEdit.setMinimum(PIXMAPCACHE_SIZE_MIN);
+    // 2047 is the max value to avoid overflowing of QPixmapCache::setCacheLimit(int size)
+    pixmapCacheEdit.setMaximum(PIXMAPCACHE_SIZE_MAX);
+    pixmapCacheEdit.setSingleStep(64);
+    pixmapCacheEdit.setValue(SettingsCache::instance().cacheStorage().getPixmapCacheSize());
+    pixmapCacheEdit.setSuffix(" MB");
+
+    // Caching method
+
+    cardPictureLoaderCacheMethodComboBox = new QComboBox;
+    for (auto method : CardPictureLoaderCacheMethod::methods()) {
+        cardPictureLoaderCacheMethodComboBox->addItem(method.displayName, static_cast<int>(method.id));
+    }
+
+    int currentCacheMethod =
+        static_cast<int>(SettingsCache::instance().cacheStorage().getCardPictureLoaderCacheMethod());
+
+    int currentIndex = cardPictureLoaderCacheMethodComboBox->findData(currentCacheMethod);
+    if (currentIndex >= 0) {
+        cardPictureLoaderCacheMethodComboBox->setCurrentIndex(currentIndex);
+    }
+
+    connect(cardPictureLoaderCacheMethodComboBox, qOverload<int>(&QComboBox::currentIndexChanged), this,
+            [this](int index) {
+                auto cacheMethod = static_cast<CardPictureLoaderCacheMethod::CacheMethod>(
+                    cardPictureLoaderCacheMethodComboBox->itemData(index).toInt());
+
+                bool useNetworkCache = (cacheMethod == CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE);
+
+                if (useNetworkCache) {
+                    clearImageBackupsButtonClicked();
+                } else {
+                    clearDownloadedPicsButtonClicked();
+                }
+
+                mpNetworkCacheGroupBox->setEnabled(useNetworkCache);
+                mpImageBackupGroupBox->setEnabled(!useNetworkCache);
+
+                SettingsCache::instance().cacheStorage().setCardImageCacheMethod(static_cast<int>(cacheMethod));
+            });
+
+    // Network Cache
+
+    networkCacheEdit.setMinimum(NETWORK_CACHE_SIZE_MIN);
+    networkCacheEdit.setMaximum(NETWORK_CACHE_SIZE_MAX);
+    networkCacheEdit.setSingleStep(1);
+    networkCacheEdit.setValue(SettingsCache::instance().cacheStorage().getNetworkCacheSizeInMB());
+    networkCacheEdit.setSuffix(" MB");
+
+    networkRedirectCacheTtlEdit.setMinimum(NETWORK_REDIRECT_CACHE_TTL_MIN);
+    networkRedirectCacheTtlEdit.setMaximum(NETWORK_REDIRECT_CACHE_TTL_MAX);
+    networkRedirectCacheTtlEdit.setSingleStep(1);
+    networkRedirectCacheTtlEdit.setValue(SettingsCache::instance().cacheStorage().getRedirectCacheTtl());
+
+    // Image Backup
+    localCardImageStorageNamingSchemeComboBox = new QComboBox;
+    for (const auto &scheme : CardPictureLoaderLocalSchemes::exportSchemes()) {
+        localCardImageStorageNamingSchemeComboBox->addItem(scheme.displayName, static_cast<int>(scheme.id));
+    }
+
+    int current = static_cast<int>(SettingsCache::instance().cacheStorage().getLocalCardImageStorageNamingScheme());
+
+    int index = localCardImageStorageNamingSchemeComboBox->findData(current);
+    if (index >= 0) {
+        localCardImageStorageNamingSchemeComboBox->setCurrentIndex(index);
+    }
+
+    connect(localCardImageStorageNamingSchemeComboBox, qOverload<int>(&QComboBox::currentIndexChanged), this,
+            [this](int index) {
+                auto scheme = static_cast<CardPictureLoaderLocalSchemes::NamingScheme>(
+                    localCardImageStorageNamingSchemeComboBox->itemData(index).toInt());
+                SettingsCache::instance().cacheStorage().setLocalCardImageStorageNamingScheme(static_cast<int>(scheme));
+            });
+
+    connect(&clearBackupsButton, &QPushButton::clicked, this, &StorageSettingsPage::clearImageBackupsButtonClicked);
+
+    auto cacheMethodLayout = new QHBoxLayout;
+    cacheMethodLayout->addWidget(&cardPictureLoaderCacheMethodLabel);
+    cacheMethodLayout->addWidget(cardPictureLoaderCacheMethodComboBox);
+
+    auto networkCacheLayout = new QHBoxLayout;
+    networkCacheLayout->addWidget(&clearDownloadedPicsButton);
+    networkCacheLayout->addStretch();
+    networkCacheLayout->addWidget(&networkCacheLabel);
+    networkCacheLayout->addWidget(&networkCacheEdit);
+
+    auto networkRedirectCacheLayout = new QHBoxLayout;
+    networkRedirectCacheLayout->addStretch();
+    networkRedirectCacheLayout->addWidget(&networkRedirectCacheTtlLabel);
+    networkRedirectCacheLayout->addWidget(&networkRedirectCacheTtlEdit);
+
+    auto pixmapCacheLayout = new QHBoxLayout;
+    pixmapCacheLayout->addWidget(&clearPixmapCacheButton);
+    pixmapCacheLayout->addStretch();
+    pixmapCacheLayout->addWidget(&pixmapCacheLabel);
+    pixmapCacheLayout->addWidget(&pixmapCacheEdit);
+
+    lpNetworkCacheGrid->addWidget(&networkCacheExplainerLabel, 0, 0);
+    lpNetworkCacheGrid->addLayout(networkCacheLayout, 1, 0);
+    lpNetworkCacheGrid->addLayout(networkRedirectCacheLayout, 2, 0);
+
+    // Image Backup Layout
+    lpImageBackupGrid->addWidget(&imageBackupExplainerLabel, 0, 0, 1, 2);
+    lpImageBackupGrid->addWidget(&localCardImageStorageNamingSchemeLabel, 1, 0);
+    lpImageBackupGrid->addWidget(localCardImageStorageNamingSchemeComboBox, 1, 1);
+    lpImageBackupGrid->addWidget(&clearBackupsButton, 2, 0);
+
+    lpPixmapCacheGrid->addWidget(&pixmapCacheExplainerLabel, 0, 0);
+    lpPixmapCacheGrid->addLayout(pixmapCacheLayout, 1, 0);
+
+    connect(&pixmapCacheEdit, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance().cacheStorage(),
+            &CacheStorageSettings::setPixmapCacheSize);
+    connect(&networkCacheEdit, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance().cacheStorage(),
+            &CacheStorageSettings::setNetworkCacheSizeInMB);
+    connect(&networkRedirectCacheTtlEdit, qOverload<int>(&QSpinBox::valueChanged),
+            &SettingsCache::instance().cacheStorage(), &CacheStorageSettings::setNetworkRedirectCacheTtl);
+
+    mpCacheMethodGroupBox = new QGroupBox;
+    mpCacheMethodGroupBox->setLayout(cacheMethodLayout);
+
+    mpNetworkCacheGroupBox = new QGroupBox;
+    mpNetworkCacheGroupBox->setLayout(lpNetworkCacheGrid);
+
+    mpImageBackupGroupBox = new QGroupBox;
+    mpImageBackupGroupBox->setLayout(lpImageBackupGrid);
+
+    mpPixmapCacheGroupBox = new QGroupBox;
+    mpPixmapCacheGroupBox->setLayout(lpPixmapCacheGrid);
+
+    auto *lpMainLayout = new QVBoxLayout;
+
+    lpMainLayout->addWidget(mpCacheMethodGroupBox);
+    lpMainLayout->addWidget(mpNetworkCacheGroupBox);
+    lpMainLayout->addWidget(mpImageBackupGroupBox);
+    lpMainLayout->addWidget(mpPixmapCacheGroupBox);
+    lpMainLayout->addStretch();
+
+    setLayout(lpMainLayout);
+
+    bool useNetworkCache = static_cast<CardPictureLoaderCacheMethod::CacheMethod>(
+                               SettingsCache::instance().cacheStorage().getCardPictureLoaderCacheMethod()) ==
+                           CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE;
+
+    mpNetworkCacheGroupBox->setEnabled(useNetworkCache);
+    mpImageBackupGroupBox->setEnabled(!useNetworkCache);
+
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &StorageSettingsPage::retranslateUi);
+    retranslateUi();
+}
+
+void StorageSettingsPage::clearDownloadedPicsButtonClicked()
+{
+    // The network cache is cleared asynchronously on the worker thread, so wait for the completion
+    // signal before confirming; the in-memory pixmap cache is cleared synchronously right away.
+    connect(
+        &CardPictureLoader::getInstance(), &CardPictureLoader::networkCacheCleared, this,
+        [this] { QMessageBox::information(this, tr("Success"), tr("Cached card pictures have been reset.")); },
+        Qt::SingleShotConnection);
+    CardPictureLoader::clearPixmapCache();
+    CardPictureLoader::clearNetworkCache();
+}
+
+void StorageSettingsPage::clearImageBackupsButtonClicked()
+{
+    QString picsPath = SettingsCache::instance().paths().getPicsPath() + "/downloadedPics";
+
+    QDir dir(picsPath);
+    bool success = dir.removeRecursively();
+
+    CardPictureLoader::clearPixmapCache();
+
+    if (success) {
+        QMessageBox::information(this, tr("Success"), tr("Downloaded card pictures have been reset."));
+    } else {
+        QMessageBox::critical(this, tr("Error"), tr("One or more downloaded card pictures could not be cleared."));
+    }
+}
+
+void StorageSettingsPage::clearPixmapCacheButtonClicked()
+{
+    CardPictureLoader::clearPixmapCache();
+    QMessageBox::information(this, tr("Success"), tr("In-memory (currently loaded) card pictures have been reset."));
+}
+
+void StorageSettingsPage::retranslateUi()
+{
+    cardPictureLoaderCacheMethodLabel.setText(tr("Card Picture Loader Caching Method:"));
+
+    networkCacheExplainerLabel.setText(
+        tr("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."));
+    imageBackupExplainerLabel.setText(
+        tr("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."));
+    pixmapCacheExplainerLabel.setText(
+        tr("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't be necessary. Clearing this will make "
+           "Cockatrice reload all images from the network cache or the disk."));
+
+    clearDownloadedPicsButton.setText(tr("Delete Cached Images"));
+    clearBackupsButton.setText(tr("Delete Saved Images"));
+    clearPixmapCacheButton.setText(tr("Clear In-Memory Images"));
+
+    mpCacheMethodGroupBox->setTitle(tr("Card Picture Loader Cache Method"));
+    mpNetworkCacheGroupBox->setTitle(tr("Network Cache"));
+    mpImageBackupGroupBox->setTitle(tr("Filesystem"));
+    mpPixmapCacheGroupBox->setTitle(tr("In-Memory Picture Cache"));
+
+    networkCacheLabel.setText(tr("Network Cache Size:"));
+    networkCacheEdit.setToolTip(tr("On-disk cache for downloaded pictures"));
+    networkRedirectCacheTtlLabel.setText(tr("Redirect Cache TTL:"));
+    networkRedirectCacheTtlEdit.setToolTip(tr("How long cached redirects for urls are valid for."));
+    pixmapCacheLabel.setText(tr("Picture Cache Size:"));
+    pixmapCacheEdit.setToolTip(tr("In-memory cache for pictures not currently on screen"));
+    localCardImageStorageNamingSchemeLabel.setText(tr("Naming scheme:"));
+
+    networkRedirectCacheTtlEdit.setSuffix(" " + tr("Day(s)"));
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/settings_page/storage_settings_page.h b/cockatrice/src/interface/widgets/settings_page/storage_settings_page.h
new file mode 100644
index 000000000..1c9a35323
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/storage_settings_page.h
@@ -0,0 +1,52 @@
+#ifndef COCKATRICE_STORAGE_SETTINGS_PAGE_H
+#define COCKATRICE_STORAGE_SETTINGS_PAGE_H
+
+#include "abstract_settings_page.h"
+
+#include <QLabel>
+#include <QPushButton>
+#include <QSpinBox>
+#include <qtmetamacros.h>
+
+class QComboBox;
+class QGroupBox;
+
+class StorageSettingsPage : public AbstractSettingsPage
+{
+    Q_OBJECT
+public:
+    StorageSettingsPage();
+    void retranslateUi() override;
+
+private slots:
+    void clearDownloadedPicsButtonClicked();
+    void clearImageBackupsButtonClicked();
+    void clearPixmapCacheButtonClicked();
+
+private:
+    QPushButton clearDownloadedPicsButton;
+    QPushButton clearBackupsButton;
+    QPushButton clearPixmapCacheButton;
+
+    QGroupBox *mpCacheMethodGroupBox;
+    QGroupBox *mpNetworkCacheGroupBox;
+    QGroupBox *mpImageBackupGroupBox;
+    QGroupBox *mpPixmapCacheGroupBox;
+
+    QLabel networkCacheExplainerLabel;
+    QLabel imageBackupExplainerLabel;
+    QLabel pixmapCacheExplainerLabel;
+
+    QLabel cardPictureLoaderCacheMethodLabel;
+    QComboBox *cardPictureLoaderCacheMethodComboBox;
+    QLabel networkCacheLabel;
+    QSpinBox networkCacheEdit;
+    QLabel networkRedirectCacheTtlLabel;
+    QSpinBox networkRedirectCacheTtlEdit;
+    QSpinBox pixmapCacheEdit;
+    QLabel pixmapCacheLabel;
+    QLabel localCardImageStorageNamingSchemeLabel;
+    QComboBox *localCardImageStorageNamingSchemeComboBox;
+};
+
+#endif // COCKATRICE_STORAGE_SETTINGS_PAGE_H
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
new file mode 100644
index 000000000..0a5f57e1f
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp
@@ -0,0 +1,424 @@
+#include "user_interface_settings_page.h"
+
+#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
+{
+    visualDeckStoragePromptForConversionIndexNone,
+    visualDeckStoragePromptForConversionIndexPrompt,
+    visualDeckStoragePromptForConversionIndexAlways
+};
+
+UserInterfaceSettingsPage::UserInterfaceSettingsPage()
+{
+    // general settings
+    doubleClickToPlayCheckBox.setChecked(SettingsCache::instance().userInterface().getDoubleClickToPlay());
+    connect(&doubleClickToPlayCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(),
+            &InterfaceSettings::setDoubleClickToPlay);
+
+    clickPlaysAllSelectedCheckBox.setChecked(SettingsCache::instance().userInterface().getClickPlaysAllSelected());
+    connect(&clickPlaysAllSelectedCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(),
+            &InterfaceSettings::setClickPlaysAllSelected);
+
+    playToStackCheckBox.setChecked(SettingsCache::instance().userInterface().getPlayToStack());
+    connect(&playToStackCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(),
+            &InterfaceSettings::setPlayToStack);
+
+    doNotDeleteArrowsInSubPhasesCheckBox.setChecked(
+        SettingsCache::instance().userInterface().getDoNotDeleteArrowsInSubPhases());
+    connect(&doNotDeleteArrowsInSubPhasesCheckBox, &QCheckBox::QT_STATE_CHANGED,
+            &SettingsCache::instance().userInterface(), &InterfaceSettings::setDoNotDeleteArrowsInSubPhases);
+
+    closeEmptyCardViewCheckBox.setChecked(SettingsCache::instance().userInterface().getCloseEmptyCardView());
+    connect(&closeEmptyCardViewCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(),
+            &InterfaceSettings::setCloseEmptyCardView);
+
+    focusCardViewSearchBarCheckBox.setChecked(SettingsCache::instance().userInterface().getFocusCardViewSearchBar());
+    connect(&focusCardViewSearchBarCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(),
+            &InterfaceSettings::setFocusCardViewSearchBar);
+
+    annotateTokensCheckBox.setChecked(SettingsCache::instance().userInterface().getAnnotateTokens());
+    connect(&annotateTokensCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(),
+            &InterfaceSettings::setAnnotateTokens);
+
+    showDragSelectionCountCheckBox.setChecked(SettingsCache::instance().userInterface().getShowDragSelectionCount());
+    connect(&showDragSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(),
+            &InterfaceSettings::setShowDragSelectionCount);
+
+    showTotalSelectionCountCheckBox.setChecked(SettingsCache::instance().userInterface().getShowTotalSelectionCount());
+    connect(&showTotalSelectionCountCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(),
+            &InterfaceSettings::setShowTotalSelectionCount);
+
+    useTearOffMenusCheckBox.setChecked(SettingsCache::instance().userInterface().getUseTearOffMenus());
+    connect(&useTearOffMenusCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(),
+            [](const QT_STATE_CHANGED_T state) {
+                SettingsCache::instance().userInterface().setUseTearOffMenus(state == Qt::Checked);
+            });
+
+    keepGameChatFocusCheckBox.setChecked(SettingsCache::instance().userInterface().getKeepGameChatFocus());
+    connect(&keepGameChatFocusCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(),
+            &InterfaceSettings::setKeepGameChatFocus);
+
+    auto *generalGrid = new QGridLayout;
+    generalGrid->addWidget(&doubleClickToPlayCheckBox, 0, 0);
+    generalGrid->addWidget(&clickPlaysAllSelectedCheckBox, 1, 0);
+    generalGrid->addWidget(&playToStackCheckBox, 2, 0);
+    generalGrid->addWidget(&doNotDeleteArrowsInSubPhasesCheckBox, 3, 0);
+    generalGrid->addWidget(&closeEmptyCardViewCheckBox, 4, 0);
+    generalGrid->addWidget(&focusCardViewSearchBarCheckBox, 5, 0);
+    generalGrid->addWidget(&annotateTokensCheckBox, 6, 0);
+    generalGrid->addWidget(&showDragSelectionCountCheckBox, 7, 0);
+    generalGrid->addWidget(&showTotalSelectionCountCheckBox, 8, 0);
+    generalGrid->addWidget(&useTearOffMenusCheckBox, 9, 0);
+    generalGrid->addWidget(&keepGameChatFocusCheckBox, 10, 0);
+
+    generalGroupBox = new QGroupBox;
+    generalGroupBox->setLayout(generalGrid);
+
+    // notification settings
+    notificationsEnabledCheckBox.setChecked(SettingsCache::instance().userInterface().getNotificationsEnabled());
+    connect(&notificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(),
+            &InterfaceSettings::setNotificationsEnabled);
+    connect(&notificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
+            &UserInterfaceSettingsPage::setNotificationEnabled);
+
+    specNotificationsEnabledCheckBox.setChecked(
+        SettingsCache::instance().userInterface().getSpectatorNotificationsEnabled());
+    specNotificationsEnabledCheckBox.setEnabled(SettingsCache::instance().userInterface().getNotificationsEnabled());
+    connect(&specNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(),
+            &InterfaceSettings::setSpectatorNotificationsEnabled);
+
+    buddyConnectNotificationsEnabledCheckBox.setChecked(
+        SettingsCache::instance().userInterface().getBuddyConnectNotificationsEnabled());
+    buddyConnectNotificationsEnabledCheckBox.setEnabled(
+        SettingsCache::instance().userInterface().getNotificationsEnabled());
+    connect(&buddyConnectNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED,
+            &SettingsCache::instance().userInterface(), &InterfaceSettings::setBuddyConnectNotificationsEnabled);
+
+    auto *notificationsGrid = new QGridLayout;
+    notificationsGrid->addWidget(&notificationsEnabledCheckBox, 0, 0);
+    notificationsGrid->addWidget(&specNotificationsEnabledCheckBox, 1, 0);
+    notificationsGrid->addWidget(&buddyConnectNotificationsEnabledCheckBox, 2, 0);
+
+    notificationsGroupBox = new QGroupBox;
+    notificationsGroupBox->setLayout(notificationsGrid);
+
+    // animation settings
+    tapAnimationCheckBox.setChecked(SettingsCache::instance().cardsDisplay().getTapAnimation());
+    connect(&tapAnimationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::setTapAnimation);
+
+    arrowDrawAnimationCheckBox.setChecked(SettingsCache::instance().cardsDisplay().getArrowDrawAnimation());
+    connect(&arrowDrawAnimationCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::setArrowDrawAnimation);
+
+    lifeCounterAnimationsCheckBox.setChecked(
+        SettingsCache::instance().userInterface().getLifeCounterAnimationsEnabled());
+    connect(&lifeCounterAnimationsCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(),
+            &InterfaceSettings::setLifeCounterAnimationsEnabled);
+
+    battlefieldFlashCheckBox.setChecked(SettingsCache::instance().userInterface().getBattlefieldFlashEnabled());
+    connect(&battlefieldFlashCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(),
+            &InterfaceSettings::setBattlefieldFlashEnabled);
+
+    connect(&enableAllAnimationsButton, &QPushButton::clicked, this, &UserInterfaceSettingsPage::enableAllAnimations);
+    connect(&disableAllAnimationsButton, &QPushButton::clicked, this, &UserInterfaceSettingsPage::disableAllAnimations);
+
+    auto *animationGrid = new QGridLayout;
+    animationGrid->addWidget(&enableAllAnimationsButton, 0, 0);
+    animationGrid->addWidget(&disableAllAnimationsButton, 0, 1);
+    animationGrid->addWidget(&tapAnimationCheckBox, 1, 0);
+    animationGrid->addWidget(&arrowDrawAnimationCheckBox, 2, 0);
+    animationGrid->addWidget(&lifeCounterAnimationsCheckBox, 3, 0);
+    animationGrid->addWidget(&battlefieldFlashCheckBox, 4, 0);
+
+    animationGroupBox = new QGroupBox;
+    animationGroupBox->setLayout(animationGrid);
+
+    // deck editor settings
+    openDeckInNewTabCheckBox.setChecked(SettingsCache::instance().deckEditor().getOpenDeckInNewTab());
+    connect(&openDeckInNewTabCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().deckEditor(),
+            &DeckEditorSettings::setOpenDeckInNewTab);
+
+    visualDeckEditorShowCardCountsCheckBox.setChecked(
+        SettingsCache::instance().cardsDisplay().getVisualDeckEditorShowCardCounts());
+    connect(&visualDeckEditorShowCardCountsCheckBox, &QCheckBox::QT_STATE_CHANGED,
+            &SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::setVisualDeckEditorShowCardCounts);
+
+    visualDeckStorageInGameCheckBox.setChecked(
+        SettingsCache::instance().visualDeckStorage().getVisualDeckStorageInGame());
+    connect(&visualDeckStorageInGameCheckBox, &QCheckBox::QT_STATE_CHANGED,
+            &SettingsCache::instance().visualDeckStorage(), &VisualDeckStorageSettings::setVisualDeckStorageInGame);
+
+    visualDeckStorageSelectionAnimationCheckBox.setChecked(
+        SettingsCache::instance().visualDeckStorage().getVisualDeckStorageSelectionAnimation());
+    connect(&visualDeckStorageSelectionAnimationCheckBox, &QCheckBox::QT_STATE_CHANGED,
+            &SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::setVisualDeckStorageSelectionAnimation);
+
+    visualDeckStoragePromptForConversionSelector.addItem(""); // these will be set in retranslateUI
+    visualDeckStoragePromptForConversionSelector.addItem("");
+    visualDeckStoragePromptForConversionSelector.addItem("");
+    if (SettingsCache::instance().visualDeckStorage().getVisualDeckStoragePromptForConversion()) {
+        visualDeckStoragePromptForConversionSelector.setCurrentIndex(visualDeckStoragePromptForConversionIndexPrompt);
+    } else if (SettingsCache::instance().visualDeckStorage().getVisualDeckStorageAlwaysConvert()) {
+        visualDeckStoragePromptForConversionSelector.setCurrentIndex(visualDeckStoragePromptForConversionIndexAlways);
+    } else {
+        visualDeckStoragePromptForConversionSelector.setCurrentIndex(visualDeckStoragePromptForConversionIndexNone);
+    }
+    connect(&visualDeckStoragePromptForConversionSelector, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            [](int index) {
+                SettingsCache::instance().visualDeckStorage().setVisualDeckStoragePromptForConversion(
+                    index == visualDeckStoragePromptForConversionIndexPrompt);
+                SettingsCache::instance().visualDeckStorage().setVisualDeckStorageAlwaysConvert(
+                    index == visualDeckStoragePromptForConversionIndexAlways);
+            });
+
+    defaultDeckEditorTypeSelector.addItem(""); // these will be set in retranslateUI
+    defaultDeckEditorTypeSelector.addItem("");
+    defaultDeckEditorTypeSelector.setCurrentIndex(SettingsCache::instance().deckEditor().getDefaultDeckEditorType());
+    connect(&defaultDeckEditorTypeSelector, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            &SettingsCache::instance().deckEditor(), &DeckEditorSettings::setDefaultDeckEditorType);
+
+    vdeStartupTabSelector.addItem(""); // these will be set in retranslateUI
+    vdeStartupTabSelector.addItem("");
+    vdeStartupTabSelector.addItem("");
+    vdeStartupTabSelector.setCurrentIndex(SettingsCache::instance().deckEditor().getVdeStartupTab());
+    connect(&vdeStartupTabSelector, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            &SettingsCache::instance().deckEditor(), &DeckEditorSettings::setVdeStartupTab);
+
+    commanderSpellbookIntegrationUseOfficialBracketNamesExplainer.setText("?");
+    commanderSpellbookIntegrationUseOfficialBracketNamesExplainer.setAutoRaise(true);
+    commanderSpellbookIntegrationUseOfficialBracketNamesExplainer.setEnabled(false);
+
+    // Add items with userData = internal enum
+    commanderSpellbookIntegrationEnabledSelector.addItem(tr("Disabled"),
+                                                         commanderSpellbookIntegrationEnabledIndexDisabled);
+    commanderSpellbookIntegrationEnabledSelector.addItem(tr("Enabled"),
+                                                         commanderSpellbookIntegrationEnabledIndexEnabled);
+    commanderSpellbookIntegrationEnabledSelector.addItem(tr("Automatic"),
+                                                         commanderSpellbookIntegrationEnabledIndexAutomatic);
+
+    int storedMode = SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationEnabled();
+    for (int i = 0; i < commanderSpellbookIntegrationEnabledSelector.count(); ++i) {
+        if (commanderSpellbookIntegrationEnabledSelector.itemData(i).toInt() == storedMode) {
+            commanderSpellbookIntegrationEnabledSelector.setCurrentIndex(i);
+            break;
+        }
+    }
+
+    connect(&commanderSpellbookIntegrationEnabledSelector, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            [this](int index) {
+                int mode = commanderSpellbookIntegrationEnabledSelector.itemData(index).toInt();
+                SettingsCache::instance().deckEditor().setCommanderSpellbookIntegrationEnabled(mode);
+                updateCommanderSpellbookUiState();
+            });
+
+    commanderSpellbookIntegrationBracketNamingSelector.addItem(
+        tr("CommanderSpellbook bracket names")); // index 0 = false
+    commanderSpellbookIntegrationBracketNamingSelector.addItem(
+        tr("Official Commander bracket names (approximate)")); // index 1 = true
+
+    commanderSpellbookIntegrationBracketNamingSelector.setCurrentIndex(
+        SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationUseOfficialBracketNames() ? 1 : 0);
+
+    connect(&commanderSpellbookIntegrationBracketNamingSelector, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            &SettingsCache::instance(), [](int index) {
+                SettingsCache::instance().deckEditor().setCommanderSpellbookIntegrationUseOfficialBracketNames(index ==
+                                                                                                               1);
+            });
+
+    updateCommanderSpellbookUiState();
+
+    auto *labelLayout = new QHBoxLayout;
+    labelLayout->setContentsMargins(0, 0, 0, 0);
+    labelLayout->addWidget(&commanderSpellbookIntegrationUseOfficialBracketNamesLabel);
+    labelLayout->addWidget(&commanderSpellbookIntegrationUseOfficialBracketNamesExplainer);
+
+    auto *labelWidget = new QWidget;
+    labelWidget->setLayout(labelLayout);
+
+    auto *deckEditorGrid = new QGridLayout;
+    deckEditorGrid->addWidget(&openDeckInNewTabCheckBox, 0, 0);
+    deckEditorGrid->addWidget(&visualDeckEditorShowCardCountsCheckBox, 1, 0);
+    deckEditorGrid->addWidget(&visualDeckStorageInGameCheckBox, 2, 0);
+    deckEditorGrid->addWidget(&visualDeckStorageSelectionAnimationCheckBox, 3, 0);
+    deckEditorGrid->addWidget(&visualDeckStoragePromptForConversionLabel, 4, 0);
+    deckEditorGrid->addWidget(&visualDeckStoragePromptForConversionSelector, 4, 1);
+    deckEditorGrid->addWidget(&defaultDeckEditorTypeLabel, 5, 0);
+    deckEditorGrid->addWidget(&defaultDeckEditorTypeSelector, 5, 1);
+    deckEditorGrid->addWidget(&vdeStartupTabLabel, 6, 0);
+    deckEditorGrid->addWidget(&vdeStartupTabSelector, 6, 1);
+    deckEditorGrid->addWidget(&commanderSpellbookIntegrationEnabledLabel, 7, 0);
+    deckEditorGrid->addWidget(&commanderSpellbookIntegrationEnabledSelector, 7, 1);
+    deckEditorGrid->addWidget(labelWidget, 8, 0);
+    deckEditorGrid->addWidget(&commanderSpellbookIntegrationBracketNamingSelector, 8, 1);
+
+    deckEditorGroupBox = new QGroupBox;
+    deckEditorGroupBox->setLayout(deckEditorGrid);
+
+    // replay settings
+    rewindBufferingMsBox.setRange(0, 9999);
+    rewindBufferingMsBox.setValue(SettingsCache::instance().userInterface().getRewindBufferingMs());
+    connect(&rewindBufferingMsBox, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance().userInterface(),
+            &InterfaceSettings::setRewindBufferingMs);
+
+    auto *replayGrid = new QGridLayout;
+    replayGrid->addWidget(&rewindBufferingMsLabel, 0, 0, 1, 1);
+    replayGrid->addWidget(&rewindBufferingMsBox, 0, 1, 1, 1);
+
+    replayGroupBox = new QGroupBox;
+    replayGroupBox->setLayout(replayGrid);
+
+    // putting it all together
+    auto *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(generalGroupBox);
+    mainLayout->addWidget(notificationsGroupBox);
+    mainLayout->addWidget(animationGroupBox);
+    mainLayout->addWidget(deckEditorGroupBox);
+    mainLayout->addWidget(replayGroupBox);
+    mainLayout->addStretch();
+
+    setLayout(mainLayout);
+
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
+            &UserInterfaceSettingsPage::retranslateUi);
+    retranslateUi();
+}
+
+void UserInterfaceSettingsPage::setNotificationEnabled(QT_STATE_CHANGED_T i)
+{
+    specNotificationsEnabledCheckBox.setEnabled(i != 0);
+    buddyConnectNotificationsEnabledCheckBox.setEnabled(i != 0);
+    if (i == 0) {
+        specNotificationsEnabledCheckBox.setChecked(false);
+        buddyConnectNotificationsEnabledCheckBox.setChecked(false);
+    }
+}
+
+void UserInterfaceSettingsPage::enableAllAnimations()
+{
+    tapAnimationCheckBox.setChecked(true);
+    arrowDrawAnimationCheckBox.setChecked(true);
+    lifeCounterAnimationsCheckBox.setChecked(true);
+    battlefieldFlashCheckBox.setChecked(true);
+}
+
+void UserInterfaceSettingsPage::disableAllAnimations()
+{
+    tapAnimationCheckBox.setChecked(false);
+    arrowDrawAnimationCheckBox.setChecked(false);
+    lifeCounterAnimationsCheckBox.setChecked(false);
+    battlefieldFlashCheckBox.setChecked(false);
+}
+
+void UserInterfaceSettingsPage::updateCommanderSpellbookUiState()
+{
+    const int mode = SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationEnabled();
+
+    const bool enabled = mode != commanderSpellbookIntegrationEnabledIndexDisabled &&
+                         mode != commanderSpellbookIntegrationEnabledIndexUnprompted;
+
+    commanderSpellbookIntegrationBracketNamingSelector.setEnabled(enabled);
+    commanderSpellbookIntegrationUseOfficialBracketNamesExplainer.setEnabled(enabled);
+    commanderSpellbookIntegrationUseOfficialBracketNamesLabel.setVisible(enabled);
+    commanderSpellbookIntegrationUseOfficialBracketNamesExplainer.setVisible(enabled);
+    commanderSpellbookIntegrationBracketNamingSelector.setVisible(enabled);
+
+    if (enabled) {
+        // Sync selector with the current stored bool
+        const bool useOfficial =
+            SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationUseOfficialBracketNames();
+        commanderSpellbookIntegrationBracketNamingSelector.setCurrentIndex(useOfficial ? 1 : 0);
+    }
+}
+
+void UserInterfaceSettingsPage::retranslateUi()
+{
+    generalGroupBox->setTitle(tr("General interface settings"));
+    doubleClickToPlayCheckBox.setText(tr("&Double-click cards to play them (instead of single-click)"));
+    clickPlaysAllSelectedCheckBox.setText(tr("&Clicking plays all selected cards (instead of just the clicked card)"));
+    playToStackCheckBox.setText(tr("&Play all nonlands onto the stack (not the battlefield) by default"));
+    doNotDeleteArrowsInSubPhasesCheckBox.setText(tr("Do not delete &arrows inside of subphases"));
+    closeEmptyCardViewCheckBox.setText(tr("Close card view window when last card is removed"));
+    focusCardViewSearchBarCheckBox.setText(tr("Auto focus search bar when card view window is opened"));
+    annotateTokensCheckBox.setText(tr("Annotate card text on tokens"));
+    showDragSelectionCountCheckBox.setText(tr("Show selection count during drag selection"));
+    showTotalSelectionCountCheckBox.setText(tr("Show total selection count"));
+    useTearOffMenusCheckBox.setText(tr("Use tear-off menus, allowing right click menus to persist on screen"));
+    keepGameChatFocusCheckBox.setText(
+        tr("Keep game chat focused when clicking in game (Note: disables card view search bar)"));
+
+    notificationsGroupBox->setTitle(tr("Notifications settings"));
+    notificationsEnabledCheckBox.setText(tr("Enable notifications in taskbar"));
+    specNotificationsEnabledCheckBox.setText(tr("Notify in the taskbar for game events while you are spectating"));
+    buddyConnectNotificationsEnabledCheckBox.setText(tr("Notify in the taskbar when users in your buddy list connect"));
+
+    animationGroupBox->setTitle(tr("Animation settings"));
+    enableAllAnimationsButton.setText(tr("&Enable all animations"));
+    disableAllAnimationsButton.setText(tr("&Disable all animations"));
+    tapAnimationCheckBox.setText(tr("&Tap/untap animation"));
+    arrowDrawAnimationCheckBox.setText(tr("&Arrow draw animation"));
+    lifeCounterAnimationsCheckBox.setText(tr("Life counter flash"));
+    battlefieldFlashCheckBox.setText(tr("Battlefield flash on damage"));
+
+    deckEditorGroupBox->setTitle(tr("Deck editor/storage settings"));
+    openDeckInNewTabCheckBox.setText(tr("Open deck in new tab by default"));
+    visualDeckEditorShowCardCountsCheckBox.setText(tr("Show card counts in Visual Deck Editor"));
+    visualDeckStorageInGameCheckBox.setText(tr("Use visual deck storage in game lobby"));
+    visualDeckStorageSelectionAnimationCheckBox.setText(tr("Use selection animation for Visual Deck Storage"));
+    visualDeckStoragePromptForConversionLabel.setText(
+        tr("When adding a tag in the visual deck storage to a .txt deck:"));
+    visualDeckStoragePromptForConversionSelector.setItemText(visualDeckStoragePromptForConversionIndexNone,
+                                                             tr("Do nothing"));
+    visualDeckStoragePromptForConversionSelector.setItemText(visualDeckStoragePromptForConversionIndexPrompt,
+                                                             tr("Ask to convert to .cod"));
+    visualDeckStoragePromptForConversionSelector.setItemText(visualDeckStoragePromptForConversionIndexAlways,
+                                                             tr("Always convert to .cod"));
+    defaultDeckEditorTypeLabel.setText(tr("Default deck editor type"));
+    defaultDeckEditorTypeSelector.setItemText(TabSupervisor::ClassicDeckEditor, tr("Classic Deck Editor"));
+    defaultDeckEditorTypeSelector.setItemText(TabSupervisor::VisualDeckEditor, tr("Visual Deck Editor"));
+    vdeStartupTabLabel.setText(tr("Visual deck editor startup tab"));
+    vdeStartupTabSelector.setItemText(VdeStartupTabContext, tr("Context"));
+    vdeStartupTabSelector.setItemText(VdeStartupTabDeckDisplay, tr("Deck display"));
+    vdeStartupTabSelector.setItemText(VdeStartupTabDatabaseDisplay, tr("Database display"));
+    vdeStartupTabSelector.setToolTip(
+        tr("Context mode: New decks open on the database display, existing decks open on the deck view."));
+
+    commanderSpellbookIntegrationEnabledLabel.setText(
+        tr("CommanderSpellbook integration to estimate commander bracket"));
+    commanderSpellbookIntegrationEnabledSelector.setItemText(commanderSpellbookIntegrationEnabledIndexDisabled,
+                                                             tr("Disabled"));
+    commanderSpellbookIntegrationEnabledSelector.setItemText(commanderSpellbookIntegrationEnabledIndexEnabled,
+                                                             tr("Enabled"));
+    commanderSpellbookIntegrationEnabledSelector.setItemText(commanderSpellbookIntegrationEnabledIndexAutomatic,
+                                                             tr("Automatic"));
+    commanderSpellbookIntegrationUseOfficialBracketNamesLabel.setText(tr("Bracket naming"));
+    commanderSpellbookIntegrationBracketNamingSelector.setItemText(
+        0, CommanderBracketNames::CommanderSpellbookBracketNames);
+    commanderSpellbookIntegrationBracketNamingSelector.setItemText(
+        1, CommanderBracketNames::OfficialCommanderBracketNames);
+    commanderSpellbookIntegrationUseOfficialBracketNamesExplainer.setToolTip(CommanderBracketNames::Explainer);
+
+    replayGroupBox->setTitle(tr("Replay settings"));
+    rewindBufferingMsLabel.setText(tr("Buffer time for backwards skip via shortcut:"));
+    rewindBufferingMsBox.setSuffix(" ms");
+}
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
new file mode 100644
index 000000000..297d80c35
--- /dev/null
+++ b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h
@@ -0,0 +1,80 @@
+#ifndef COCKATRICE_USER_INTERFACE_SETTINGS_PAGE_H
+#define COCKATRICE_USER_INTERFACE_SETTINGS_PAGE_H
+
+#include "abstract_settings_page.h"
+
+#include <QCheckBox>
+#include <QComboBox>
+#include <QLabel>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QToolButton>
+#include <libcockatrice/utility/macros.h>
+#include <qtmetamacros.h>
+
+class QGroupBox;
+
+class UserInterfaceSettingsPage : public AbstractSettingsPage
+{
+    Q_OBJECT
+private slots:
+    void setNotificationEnabled(QT_STATE_CHANGED_T);
+    void enableAllAnimations();
+    void disableAllAnimations();
+    void updateCommanderSpellbookUiState();
+
+private:
+    QCheckBox doubleClickToPlayCheckBox;
+    QCheckBox clickPlaysAllSelectedCheckBox;
+    QCheckBox playToStackCheckBox;
+    QCheckBox doNotDeleteArrowsInSubPhasesCheckBox;
+    QCheckBox closeEmptyCardViewCheckBox;
+    QCheckBox focusCardViewSearchBarCheckBox;
+    QCheckBox annotateTokensCheckBox;
+    QCheckBox showDragSelectionCountCheckBox;
+    QCheckBox showTotalSelectionCountCheckBox;
+    QCheckBox useTearOffMenusCheckBox;
+    QCheckBox keepGameChatFocusCheckBox;
+
+    QCheckBox notificationsEnabledCheckBox;
+    QCheckBox specNotificationsEnabledCheckBox;
+    QCheckBox buddyConnectNotificationsEnabledCheckBox;
+
+    QPushButton enableAllAnimationsButton;
+    QPushButton disableAllAnimationsButton;
+    QCheckBox tapAnimationCheckBox;
+    QCheckBox arrowDrawAnimationCheckBox;
+    QCheckBox lifeCounterAnimationsCheckBox;
+    QCheckBox battlefieldFlashCheckBox;
+
+    QCheckBox openDeckInNewTabCheckBox;
+    QLabel visualDeckStoragePromptForConversionLabel;
+    QComboBox visualDeckStoragePromptForConversionSelector;
+    QCheckBox visualDeckStorageInGameCheckBox;
+    QCheckBox visualDeckStorageSelectionAnimationCheckBox;
+    QCheckBox visualDeckEditorShowCardCountsCheckBox;
+    QLabel defaultDeckEditorTypeLabel;
+    QComboBox defaultDeckEditorTypeSelector;
+    QLabel vdeStartupTabLabel;
+    QComboBox vdeStartupTabSelector;
+    QLabel commanderSpellbookIntegrationEnabledLabel;
+    QComboBox commanderSpellbookIntegrationEnabledSelector;
+    QLabel commanderSpellbookIntegrationUseOfficialBracketNamesLabel;
+    QToolButton commanderSpellbookIntegrationUseOfficialBracketNamesExplainer;
+    QComboBox commanderSpellbookIntegrationBracketNamingSelector;
+
+    QLabel rewindBufferingMsLabel;
+    QSpinBox rewindBufferingMsBox;
+
+    QGroupBox *generalGroupBox;
+    QGroupBox *notificationsGroupBox;
+    QGroupBox *animationGroupBox;
+    QGroupBox *deckEditorGroupBox;
+    QGroupBox *replayGroupBox;
+
+public:
+    UserInterfaceSettingsPage();
+    void retranslateUi() override;
+};
+
+#endif // COCKATRICE_USER_INTERFACE_SETTINGS_PAGE_H
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 a03b79e3f..4044f03db 100644
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp
@@ -10,38 +10,62 @@
 #include "abstract_tab_deck_editor.h"
 
 #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 <QHeaderView>
-#include <QLineEdit>
+#include <QFlags>
+#include <QList>
+#include <QMainWindow>
+#include <QMenu>
 #include <QMessageBox>
 #include <QPrintPreviewDialog>
 #include <QPrinter>
-#include <QProcessEnvironment>
 #include <QPushButton>
-#include <QRegularExpression>
-#include <QSplitter>
-#include <QTreeView>
+#include <QSharedPointer>
 #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>
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <libcockatrice/settings/deck_editor_settings.h>
+#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.
@@ -52,62 +76,74 @@ AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Ta
 {
     setDockOptions(QMainWindow::AnimatedDocks | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks);
 
-    historyManager = new DeckListHistoryManager(this);
+    deckStateManager = new DeckStateManager(this);
 
-    databaseDisplayDockWidget = new DeckEditorDatabaseDisplayWidget(this);
+    databaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), true, this);
+    databaseModel->setObjectName("databaseModel");
+
+    cardDatabaseDockWidget = new DeckEditorCardDatabaseDockWidget(this);
     deckDockWidget = new DeckEditorDeckDockWidget(this);
     cardInfoDockWidget = new DeckEditorCardInfoDockWidget(this);
     filterDockWidget = new DeckEditorFilterDockWidget(this);
     printingSelectorDockWidget = new DeckEditorPrintingSelectorDockWidget(this);
-    connect(&SettingsCache::instance(), &SettingsCache::overrideAllCardArtWithPersonalPreferenceChanged, this, [this] {
-        printingSelectorDockWidget->setHidden(SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference());
-    });
 
     // Connect deck signals to this tab
-    connect(deckDockWidget, &DeckEditorDeckDockWidget::deckChanged, this, &AbstractTabDeckEditor::onDeckChanged);
-    connect(deckDockWidget, &DeckEditorDeckDockWidget::deckModified, this, &AbstractTabDeckEditor::onDeckModified);
-    connect(deckDockWidget, &DeckEditorDeckDockWidget::requestDeckHistorySave, this,
-            &AbstractTabDeckEditor::onDeckHistorySaveRequested);
-    connect(deckDockWidget, &DeckEditorDeckDockWidget::requestDeckHistoryClear, this,
-            &AbstractTabDeckEditor::onDeckHistoryClearRequested);
-    connect(deckDockWidget, &DeckEditorDeckDockWidget::cardChanged, this, &AbstractTabDeckEditor::updateCard);
-    connect(this, &AbstractTabDeckEditor::decrementCard, deckDockWidget, &DeckEditorDeckDockWidget::actDecrementCard);
-
-    // Connect database display signals to this tab
-    connect(databaseDisplayDockWidget, &DeckEditorDatabaseDisplayWidget::cardChanged, this,
-            &AbstractTabDeckEditor::updateCard);
-    connect(databaseDisplayDockWidget, &DeckEditorDatabaseDisplayWidget::addCardToMainDeck, this,
-            &AbstractTabDeckEditor::actAddCard);
-    connect(databaseDisplayDockWidget, &DeckEditorDatabaseDisplayWidget::addCardToSideboard, this,
-            &AbstractTabDeckEditor::actAddCardToSideboard);
-    connect(databaseDisplayDockWidget, &DeckEditorDatabaseDisplayWidget::decrementCardFromMainDeck, this,
-            &AbstractTabDeckEditor::actDecrementCard);
-    connect(databaseDisplayDockWidget, &DeckEditorDatabaseDisplayWidget::decrementCardFromSideboard, this,
-            &AbstractTabDeckEditor::actDecrementCardFromSideboard);
+    connect(deckStateManager, &DeckStateManager::isModifiedChanged, this, &AbstractTabDeckEditor::onDeckModified);
+    connect(deckDockWidget, &DeckEditorDeckDockWidget::selectedCardChanged, this, &AbstractTabDeckEditor::updateCard);
 
     // Connect filter signals
-    connect(filterDockWidget, &DeckEditorFilterDockWidget::clearAllDatabaseFilters, databaseDisplayDockWidget,
-            &DeckEditorDatabaseDisplayWidget::clearAllDatabaseFilters);
+    connect(filterDockWidget, &DeckEditorFilterDockWidget::clearAllDatabaseFilters, cardDatabaseDockWidget,
+            &DeckEditorCardDatabaseDockWidget::clearAllDatabaseFilters);
 
     // Connect shortcut changes
     connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
             &AbstractTabDeckEditor::refreshShortcuts);
 }
 
-/**
- * @brief Updates the card info dock and printing selector.
- * @param card The card to display.
- */
+void AbstractTabDeckEditor::registerDockWidget(QMenu *_viewMenu, QDockWidget *widget, const QSize &defaultSize)
+{
+    QMenu *menu = _viewMenu->addMenu(QString());
+
+    QAction *aVisible = menu->addAction(QString());
+    aVisible->setCheckable(true);
+
+    QAction *aFloating = menu->addAction(QString());
+    aFloating->setCheckable(true);
+    aFloating->setEnabled(false);
+
+    // user interaction
+    connect(aVisible, &QAction::triggered, widget, [widget](bool checked) { widget->setVisible(checked); });
+    connect(aFloating, &QAction::triggered, this, [widget](bool checked) { widget->setFloating(checked); });
+
+    // sync aFloating's enabled state with aVisible's checked state
+    connect(aVisible, &QAction::toggled, aFloating, [aFloating](bool checked) { aFloating->setEnabled(checked); });
+
+    // sync aFloating with dockWidget's floating state
+    connect(widget, &QDockWidget::topLevelChanged, aFloating,
+            [aFloating](bool topLevel) { aFloating->setChecked(topLevel); });
+
+    // sync aVisible with dockWidget's visible state
+    auto filter = new VisibilityChangeListener(widget);
+    connect(filter, &VisibilityChangeListener::visibilityChanged, aVisible,
+            [aVisible](bool visible) { aVisible->setChecked(visible); });
+
+    dockToActions.insert(widget, {menu, aVisible, aFloating, defaultSize});
+}
+
 void AbstractTabDeckEditor::updateCard(const ExactCard &card)
 {
     cardInfoDockWidget->updateCard(card);
-    printingSelectorDockWidget->printingSelector->setCard(card.getCardPtr(), DECK_ZONE_MAIN);
+    printingSelectorDockWidget->printingSelector->setCard(card.getCardPtr());
+}
+
+void AbstractTabDeckEditor::updateCardInfo(const ExactCard &card)
+{
+    cardInfoDockWidget->updateCard(card);
 }
 
 /** @brief Placeholder: called when the deck changes. */
 void AbstractTabDeckEditor::onDeckChanged()
 {
-    historyManager->clear();
 }
 
 /**
@@ -115,169 +151,56 @@ void AbstractTabDeckEditor::onDeckChanged()
  */
 void AbstractTabDeckEditor::onDeckModified()
 {
-    setModified(!isBlankNewDeck());
-    deckMenu->setSaveStatus(!isBlankNewDeck());
+    deckMenu->setSaveStatus(!deckStateManager->isBlankNewDeck());
+    emit tabTextChanged(this, getTabText());
 }
 
-/**
- * @brief Marks the tab as modified and updates the save menu status.
- */
-void AbstractTabDeckEditor::onDeckHistorySaveRequested(const QString &modificationReason)
+void AbstractTabDeckEditor::addCard(const ExactCard &card, const QString &zoneName)
 {
-    historyManager->save(deckDockWidget->getDeckList()->createMemento(modificationReason));
+    deckStateManager->addCard(card, zoneName);
 }
 
-/**
- * @brief Marks the tab as modified and updates the save menu status.
- */
-void AbstractTabDeckEditor::onDeckHistoryClearRequested()
+void AbstractTabDeckEditor::decrementCard(const ExactCard &card, const QString &zoneName)
 {
-    historyManager->clear();
-}
-
-/**
- * @brief Helper for adding a card to a deck zone.
- * @param card Card to add.
- * @param zoneName Zone to add the card to.
- */
-void AbstractTabDeckEditor::addCardHelper(const ExactCard &card, QString zoneName)
-{
-    if (!card)
-        return;
-
-    if (card.getInfo().getIsToken())
-        zoneName = DECK_ZONE_TOKENS;
-
-    onDeckHistorySaveRequested(QString(tr("Added (%1): %2 (%3) %4"))
-                                   .arg(zoneName, card.getName(), card.getPrinting().getSet()->getCorrectedShortName(),
-                                        card.getPrinting().getProperty("num")));
-
-    QModelIndex newCardIndex = deckDockWidget->deckModel->addCard(card, zoneName);
-    deckDockWidget->expandAll();
-    deckDockWidget->deckView->clearSelection();
-    deckDockWidget->deckView->setCurrentIndex(newCardIndex);
-    setModified(true);
-
-    databaseDisplayDockWidget->searchEdit->setSelection(0, databaseDisplayDockWidget->searchEdit->text().length());
-}
-
-/**
- * @brief Adds a card to the main deck or sideboard depending on Ctrl key.
- */
-void AbstractTabDeckEditor::actAddCard(const ExactCard &card)
-{
-    if (QApplication::keyboardModifiers() & Qt::ControlModifier)
-        actAddCardToSideboard(card);
-    else
-        addCardHelper(card, DECK_ZONE_MAIN);
-
-    deckMenu->setSaveStatus(true);
-}
-
-/** @brief Adds a card to the sideboard explicitly. */
-void AbstractTabDeckEditor::actAddCardToSideboard(const ExactCard &card)
-{
-    addCardHelper(card, DECK_ZONE_SIDE);
-    deckMenu->setSaveStatus(true);
-}
-
-/** @brief Decrements a card from the main deck. */
-void AbstractTabDeckEditor::actDecrementCard(const ExactCard &card)
-{
-    emit decrementCard(card, DECK_ZONE_MAIN);
-}
-
-/** @brief Decrements a card from the sideboard. */
-void AbstractTabDeckEditor::actDecrementCardFromSideboard(const ExactCard &card)
-{
-    emit decrementCard(card, DECK_ZONE_SIDE);
-}
-
-/**
- * @brief Swaps a card in a deck zone.
- * @param card Card to swap.
- * @param zoneName Zone to swap in.
- */
-void AbstractTabDeckEditor::actSwapCard(const ExactCard &card, const QString &zoneName)
-{
-    QString providerId = card.getPrinting().getUuid();
-    QString collectorNumber = card.getPrinting().getProperty("num");
-
-    QModelIndex foundCard = deckDockWidget->deckModel->findCard(card.getName(), zoneName, providerId, collectorNumber);
-    if (!foundCard.isValid()) {
-        foundCard = deckDockWidget->deckModel->findCard(card.getName(), zoneName);
-    }
-
-    deckDockWidget->swapCard(foundCard);
+    deckStateManager->decrementCard(card, zoneName);
 }
 
 /**
  * @brief Opens a deck in this tab.
- * @param deck DeckLoader object (takes ownership).
+ * @param deck The deck
  */
-void AbstractTabDeckEditor::openDeck(DeckLoader *deck)
+void AbstractTabDeckEditor::openDeck(const LoadedDeck &deck)
 {
     setDeck(deck);
 
-    if (!deck->getLastLoadInfo().fileName.isEmpty()) {
-        SettingsCache::instance().recents().updateRecentlyOpenedDeckPaths(deck->getLastLoadInfo().fileName);
+    if (!deck.lastLoadInfo.fileName.isEmpty()) {
+        SettingsCache::instance().recents().updateRecentlyOpenedDeckPaths(deck.lastLoadInfo.fileName);
     }
 }
 
 /**
  * @brief Sets the currently active deck.
- * @param _deck DeckLoader object.
+ * @param _deck The deck
  */
-void AbstractTabDeckEditor::setDeck(DeckLoader *_deck)
+void AbstractTabDeckEditor::setDeck(const LoadedDeck &_deck)
 {
-    deckDockWidget->setDeck(_deck);
-    CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(getDeckList()->getCardRefList()));
-    setModified(false);
+    deckStateManager->replaceDeck(_deck);
+    CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(_deck.deckList.getCardRefList()));
 
-    aDeckDockVisible->setChecked(true);
-    deckDockWidget->setVisible(aDeckDockVisible->isChecked());
-}
-
-/** @brief Returns the currently loaded deck. */
-DeckLoader *AbstractTabDeckEditor::getDeckLoader() const
-{
-    return deckDockWidget->getDeckLoader();
-}
-
-/** @brief Returns the currently loaded deck list. */
-DeckList *AbstractTabDeckEditor::getDeckList() const
-{
-    return deckDockWidget->getDeckList();
-}
-
-/**
- * @brief Sets the modified state of the tab.
- * @param _modified True if tab is modified, false otherwise.
- */
-void AbstractTabDeckEditor::setModified(bool _modified)
-{
-    modified = _modified;
-    emit tabTextChanged(this, getTabText());
-}
-
-/**
- * @brief Returns true if the tab is a blank newly created deck.
- */
-bool AbstractTabDeckEditor::isBlankNewDeck() const
-{
-    DeckLoader *deck = deckDockWidget->getDeckLoader();
-    return !modified && deck->getDeckList()->isBlankDeck() && deck->hasNotBeenLoaded();
+    dockToActions.value(deckDockWidget).aVisible->setChecked(true);
+    deckDockWidget->setVisible(dockToActions.value(deckDockWidget).aVisible->isChecked());
 }
 
 /** @brief Creates a new deck. Handles opening in new tab if needed. */
 void AbstractTabDeckEditor::actNewDeck()
 {
     auto deckOpenLocation = confirmOpen(false);
-    if (deckOpenLocation == CANCELLED)
+    if (deckOpenLocation == CANCELLED) {
         return;
+    }
 
     if (deckOpenLocation == NEW_TAB) {
-        emit openDeckEditor(nullptr);
+        emit openDeckEditor(LoadedDeck());
         return;
     }
 
@@ -287,9 +210,8 @@ void AbstractTabDeckEditor::actNewDeck()
 /** @brief Clears the current deck and resets modified flag. */
 void AbstractTabDeckEditor::cleanDeckAndResetModified()
 {
+    deckStateManager->clearDeck();
     deckMenu->setSaveStatus(false);
-    deckDockWidget->cleanDeck();
-    setModified(false);
 }
 
 /**
@@ -299,23 +221,26 @@ void AbstractTabDeckEditor::cleanDeckAndResetModified()
  */
 AbstractTabDeckEditor::DeckOpenLocation AbstractTabDeckEditor::confirmOpen(const bool openInSameTabIfBlank)
 {
-    if (SettingsCache::instance().getOpenDeckInNewTab()) {
-        if (openInSameTabIfBlank && isBlankNewDeck())
+    if (SettingsCache::instance().deckEditor().getOpenDeckInNewTab()) {
+        if (openInSameTabIfBlank && deckStateManager->isBlankNewDeck()) {
             return SAME_TAB;
-        else
+        } else {
             return NEW_TAB;
+        }
     }
 
-    if (!modified)
+    if (!deckStateManager->isModified()) {
         return SAME_TAB;
+    }
 
     tabSupervisor->setCurrentWidget(this);
     QMessageBox *msgBox = createSaveConfirmationWindow();
     QPushButton *newTabButton = msgBox->addButton(tr("Open in new tab"), QMessageBox::ApplyRole);
     int ret = msgBox->exec();
 
-    if (msgBox->clickedButton() == newTabButton)
+    if (msgBox->clickedButton() == newTabButton) {
         return NEW_TAB;
+    }
 
     switch (ret) {
         case QMessageBox::Save:
@@ -348,16 +273,17 @@ QMessageBox *AbstractTabDeckEditor::createSaveConfirmationWindow()
 void AbstractTabDeckEditor::actLoadDeck()
 {
     auto deckOpenLocation = confirmOpen();
-    if (deckOpenLocation == CANCELLED)
+    if (deckOpenLocation == CANCELLED) {
         return;
+    }
 
     DlgLoadDeck dialog(this);
-    if (!dialog.exec())
+    if (!dialog.exec()) {
         return;
+    }
 
     QString fileName = dialog.selectedFiles().at(0);
     openDeckFromFile(fileName, deckOpenLocation);
-    deckDockWidget->updateBannerCardComboBox();
 }
 
 /**
@@ -367,8 +293,9 @@ void AbstractTabDeckEditor::actLoadDeck()
 void AbstractTabDeckEditor::actOpenRecent(const QString &fileName)
 {
     auto deckOpenLocation = confirmOpen();
-    if (deckOpenLocation == CANCELLED)
+    if (deckOpenLocation == CANCELLED) {
         return;
+    }
 
     openDeckFromFile(fileName, deckOpenLocation);
 }
@@ -380,19 +307,17 @@ void AbstractTabDeckEditor::actOpenRecent(const QString &fileName)
  */
 void AbstractTabDeckEditor::openDeckFromFile(const QString &fileName, DeckOpenLocation deckOpenLocation)
 {
-    DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(fileName);
+    DeckFileFormat::Format fmt = DeckFileFormat::getFormatFromName(fileName);
 
-    auto *l = new DeckLoader(this);
-    if (l->loadFromFile(fileName, fmt, true)) {
+    std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromFile(fileName, fmt, true);
+    if (deckOpt) {
         if (deckOpenLocation == NEW_TAB) {
-            emit openDeckEditor(l);
-            l->deleteLater();
+            emit openDeckEditor(deckOpt.value());
         } else {
             deckMenu->setSaveStatus(false);
-            openDeck(l);
+            openDeck(deckOpt.value());
         }
     } else {
-        l->deleteLater();
         QMessageBox::critical(this, tr("Error"), tr("Could not open deck at %1").arg(fileName));
     }
     deckMenu->setSaveStatus(true);
@@ -405,27 +330,31 @@ void AbstractTabDeckEditor::openDeckFromFile(const QString &fileName, DeckOpenLo
  */
 bool AbstractTabDeckEditor::actSaveDeck()
 {
-    DeckLoader *const deck = getDeckLoader();
-    if (deck->getLastLoadInfo().remoteDeckId != DeckLoader::LoadInfo::NON_REMOTE_ID) {
-        QString deckString = deck->getDeckList()->writeToString_Native();
+    const auto loadedDeck = deckStateManager->toLoadedDeck();
+    if (loadedDeck.lastLoadInfo.remoteDeckId != LoadedDeck::LoadInfo::NON_REMOTE_ID) {
+        QString deckString = loadedDeck.deckList.writeToString_Native();
         if (deckString.length() > MAX_FILE_LENGTH) {
             QMessageBox::critical(this, tr("Error"), tr("Could not save remote deck"));
             return false;
         }
 
         Command_DeckUpload cmd;
-        cmd.set_deck_id(static_cast<google::protobuf::uint32>(deck->getLastLoadInfo().remoteDeckId));
+        cmd.set_deck_id(static_cast<google::protobuf::uint32>(loadedDeck.lastLoadInfo.remoteDeckId));
         cmd.set_deck_list(deckString.toStdString());
+        cmd.set_color_identity(getDeckColorIdentity(loadedDeck.deckList, CardDatabaseManager::query()).toStdString());
 
         PendingCommand *pend = AbstractClient::prepareSessionCommand(cmd);
         connect(pend, &PendingCommand::finished, this, &AbstractTabDeckEditor::saveDeckRemoteFinished);
         tabSupervisor->getClient()->sendCommand(pend);
 
         return true;
-    } else if (deck->getLastLoadInfo().fileName.isEmpty())
+    }
+    if (loadedDeck.lastLoadInfo.fileName.isEmpty()) {
         return actSaveDeckAs();
-    else if (deck->saveToFile(deck->getLastLoadInfo().fileName, deck->getLastLoadInfo().fileFormat)) {
-        setModified(false);
+    }
+
+    if (DeckLoader::saveToFile(loadedDeck)) {
+        deckStateManager->setModified(false);
         return true;
     }
 
@@ -441,41 +370,69 @@ bool AbstractTabDeckEditor::actSaveDeck()
  */
 bool AbstractTabDeckEditor::actSaveDeckAs()
 {
+    DeckList deckList = deckStateManager->getDeckList();
+
     QFileDialog dialog(this, tr("Save deck"));
-    dialog.setDirectory(SettingsCache::instance().getDeckPath());
+    dialog.setDirectory(SettingsCache::instance().paths().getDeckPath());
     dialog.setAcceptMode(QFileDialog::AcceptSave);
     dialog.setDefaultSuffix("cod");
     dialog.setNameFilters(DeckLoader::FILE_NAME_FILTERS);
-    dialog.selectFile(getDeckList()->getName().trimmed());
+    dialog.selectFile(deckList.getName().trimmed());
 
-    if (!dialog.exec())
+    if (!dialog.exec()) {
         return false;
+    }
 
     QString fileName = dialog.selectedFiles().at(0);
-    DeckLoader::FileFormat fmt = DeckLoader::getFormatFromName(fileName);
+    DeckFileFormat::Format fmt = DeckFileFormat::getFormatFromName(fileName);
 
-    if (!getDeckLoader()->saveToFile(fileName, fmt)) {
+    std::optional<LoadedDeck::LoadInfo> infoOpt = DeckLoader::saveToFile(deckList, fileName, fmt);
+    if (!infoOpt) {
         QMessageBox::critical(
             this, tr("Error"),
             tr("The deck could not be saved.\nPlease check that the directory is writable and try again."));
         return false;
     }
 
-    setModified(false);
+    deckStateManager->setLastLoadInfo(infoOpt.value());
+
+    deckStateManager->setModified(false);
     SettingsCache::instance().recents().updateRecentlyOpenedDeckPaths(fileName);
     return true;
 }
 
+/**
+ * @brief Opens the deck share dialog with the current deck preselected.
+ */
+void AbstractTabDeckEditor::actShareDeck()
+{
+    AbstractClient *client = tabSupervisor->getServerClient();
+    if (client->getStatus() != StatusLoggedIn) {
+        QMessageBox::information(this, tr("Share deck"), tr("You must be connected to the server to share a deck."));
+        return;
+    }
+
+    const QSharedPointer<DeckList> deck = deckStateManager->getDeckListShared();
+    if (deck->isBlankDeck()) {
+        QMessageBox::information(this, tr("Share deck"), tr("The deck is empty. Add cards before sharing it."));
+        return;
+    }
+
+    DlgShareDeck shareDialog(client, deck, this);
+    shareDialog.exec();
+}
+
 /**
  * @brief Callback for remote deck save completion.
  * @param response Server response.
  */
 void AbstractTabDeckEditor::saveDeckRemoteFinished(const Response &response)
 {
-    if (response.response_code() != Response::RespOk)
+    if (response.response_code() != Response::RespOk) {
         QMessageBox::critical(this, tr("Error"), tr("The deck could not be saved."));
-    else
-        setModified(false);
+    } else {
+        deckStateManager->setModified(false);
+    }
 }
 
 /**
@@ -485,18 +442,20 @@ void AbstractTabDeckEditor::saveDeckRemoteFinished(const Response &response)
 void AbstractTabDeckEditor::actLoadDeckFromClipboard()
 {
     auto deckOpenLocation = confirmOpen();
-    if (deckOpenLocation == CANCELLED)
+    if (deckOpenLocation == CANCELLED) {
         return;
+    }
 
     DlgLoadDeckFromClipboard dlg(this);
-    if (!dlg.exec())
+    if (!dlg.exec()) {
         return;
+    }
 
     if (deckOpenLocation == NEW_TAB) {
-        emit openDeckEditor(dlg.getDeckList());
+        emit openDeckEditor({.deckList = dlg.getDeckList()});
     } else {
-        setDeck(dlg.getDeckList());
-        setModified(true);
+        setDeck({.deckList = dlg.getDeckList()});
+        deckStateManager->setModified(true);
     }
 
     deckMenu->setSaveStatus(true);
@@ -508,12 +467,14 @@ void AbstractTabDeckEditor::actLoadDeckFromClipboard()
  */
 void AbstractTabDeckEditor::editDeckInClipboard(bool annotated)
 {
-    DlgEditDeckInClipboard dlg(getDeckLoader(), annotated, this);
-    if (!dlg.exec())
+    LoadedDeck loadedDeck = deckStateManager->toLoadedDeck();
+    DlgEditDeckInClipboard dlg(loadedDeck.deckList, annotated, this);
+    if (!dlg.exec()) {
         return;
+    }
 
-    setDeck(dlg.getDeckList());
-    setModified(true);
+    setDeck({dlg.getDeckList(), loadedDeck.lastLoadInfo});
+    deckStateManager->setModified(true);
     deckMenu->setSaveStatus(true);
 }
 
@@ -532,25 +493,25 @@ void AbstractTabDeckEditor::actEditDeckInClipboardRaw()
 /** @brief Saves deck to clipboard with set info and annotation. */
 void AbstractTabDeckEditor::actSaveDeckToClipboard()
 {
-    DeckLoader::saveToClipboard(getDeckList(), true, true);
+    DeckLoader::saveToClipboard(deckStateManager->getDeckList(), true, true);
 }
 
 /** @brief Saves deck to clipboard with annotation, without set info. */
 void AbstractTabDeckEditor::actSaveDeckToClipboardNoSetInfo()
 {
-    DeckLoader::saveToClipboard(getDeckList(), true, false);
+    DeckLoader::saveToClipboard(deckStateManager->getDeckList(), true, false);
 }
 
 /** @brief Saves deck to clipboard without annotations, with set info. */
 void AbstractTabDeckEditor::actSaveDeckToClipboardRaw()
 {
-    DeckLoader::saveToClipboard(getDeckList(), false, true);
+    DeckLoader::saveToClipboard(deckStateManager->getDeckList(), false, true);
 }
 
 /** @brief Saves deck to clipboard without annotations or set info. */
 void AbstractTabDeckEditor::actSaveDeckToClipboardRawNoSetInfo()
 {
-    DeckLoader::saveToClipboard(getDeckList(), false, false);
+    DeckLoader::saveToClipboard(deckStateManager->getDeckList(), false, false);
 }
 
 /** @brief Prints the deck using a QPrintPreviewDialog. */
@@ -558,7 +519,7 @@ void AbstractTabDeckEditor::actPrintDeck()
 {
     auto *dlg = new QPrintPreviewDialog(this);
     connect(dlg, &QPrintPreviewDialog::paintRequested, this,
-            [this](QPrinter *printer) { DeckLoader::printDeckList(printer, getDeckList()); });
+            [this](QPrinter *printer) { DeckLoader::printDeckList(printer, deckStateManager->getDeckList()); });
     dlg->exec();
 }
 
@@ -568,18 +529,20 @@ void AbstractTabDeckEditor::actPrintDeck()
 void AbstractTabDeckEditor::actLoadDeckFromWebsite()
 {
     auto deckOpenLocation = confirmOpen();
-    if (deckOpenLocation == CANCELLED)
+    if (deckOpenLocation == CANCELLED) {
         return;
+    }
 
     DlgLoadDeckFromWebsite dlg(this);
-    if (!dlg.exec())
+    if (!dlg.exec()) {
         return;
+    }
 
     if (deckOpenLocation == NEW_TAB) {
-        emit openDeckEditor(dlg.getDeck());
+        emit openDeckEditor({.deckList = dlg.getDeck()});
     } else {
-        setDeck(dlg.getDeck());
-        setModified(true);
+        setDeck({.deckList = dlg.getDeck()});
+        deckStateManager->setModified(true);
     }
 
     deckMenu->setSaveStatus(true);
@@ -591,26 +554,21 @@ void AbstractTabDeckEditor::actLoadDeckFromWebsite()
  */
 void AbstractTabDeckEditor::exportToDecklistWebsite(DeckLoader::DecklistWebsite website)
 {
-    if (DeckLoader *const deck = getDeckLoader()) {
-        QString decklistUrlString = deck->exportDeckToDecklist(getDeckList(), website);
-        // Check to make sure the string isn't empty.
-        if (decklistUrlString.isEmpty()) {
-            // Show an error if the deck is empty, and return.
-            QMessageBox::critical(this, tr("Error"), tr("There are no cards in your deck to be exported"));
-            return;
-        }
-
-        // Encode the string recieved from the model to make sure all characters are encoded.
-        // first we put it into a qurl object
-        QUrl decklistUrl = QUrl(decklistUrlString);
-        // we get the correctly encoded url.
-        decklistUrlString = decklistUrl.toEncoded();
-        // We open the url in the user's default browser
-        QDesktopServices::openUrl(decklistUrlString);
-    } else {
-        // if there's no deck loader object, return an error
-        QMessageBox::critical(this, tr("Error"), tr("No deck was selected to be exported."));
+    QString decklistUrlString = DeckLoader::exportDeckToDecklist(deckStateManager->getDeckList(), website);
+    // Check to make sure the string isn't empty.
+    if (decklistUrlString.isEmpty()) {
+        // Show an error if the deck is empty, and return.
+        QMessageBox::critical(this, tr("Error"), tr("There are no cards in your deck to be exported"));
+        return;
     }
+
+    // Encode the string recieved from the model to make sure all characters are encoded.
+    // first we put it into a qurl object
+    QUrl decklistUrl = QUrl(decklistUrlString);
+    // we get the correctly encoded url.
+    decklistUrlString = decklistUrl.toEncoded();
+    // We open the url in the user's default browser
+    QDesktopServices::openUrl(decklistUrlString);
 }
 
 /** @brief Exports deck to www.decklist.org. */
@@ -628,21 +586,21 @@ void AbstractTabDeckEditor::actExportDeckDecklistXyz()
 /** @brief Analyzes the deck using DeckStats. */
 void AbstractTabDeckEditor::actAnalyzeDeckDeckstats()
 {
-    auto *interface = new DeckStatsInterface(*databaseDisplayDockWidget->databaseModel->getDatabase(), this);
-    interface->analyzeDeck(getDeckList());
+    auto *interface = new DeckStatsInterface(this);
+    interface->analyzeDeck(deckStateManager->getDeckList());
 }
 
 /** @brief Analyzes the deck using TappedOut. */
 void AbstractTabDeckEditor::actAnalyzeDeckTappedout()
 {
-    auto *interface = new TappedOutInterface(*databaseDisplayDockWidget->databaseModel->getDatabase(), this);
-    interface->analyzeDeck(getDeckList());
+    auto *interface = new TappedOutInterface(this);
+    interface->analyzeDeck(deckStateManager->getDeckList());
 }
 
 /** @brief Applies a new filter tree to the database display. */
 void AbstractTabDeckEditor::filterTreeChanged(FilterTree *filterTree)
 {
-    databaseDisplayDockWidget->setFilterTree(filterTree);
+    cardDatabaseDockWidget->setFilterTree(filterTree);
 }
 
 /**
@@ -655,53 +613,17 @@ void AbstractTabDeckEditor::closeEvent(QCloseEvent *event)
     event->accept();
 }
 
-/**
- * @brief Event filter for dock visibility and geometry changes.
- * @param o Object sending the event.
- * @param e Event.
- * @return False always.
- */
-bool AbstractTabDeckEditor::eventFilter(QObject *o, QEvent *e)
-{
-    if (e->type() == QEvent::Close) {
-        if (o == cardInfoDockWidget) {
-            aCardInfoDockVisible->setChecked(false);
-            aCardInfoDockFloating->setEnabled(false);
-        } else if (o == deckDockWidget) {
-            aDeckDockVisible->setChecked(false);
-            aDeckDockFloating->setEnabled(false);
-        } else if (o == filterDockWidget) {
-            aFilterDockVisible->setChecked(false);
-            aFilterDockFloating->setEnabled(false);
-        } else if (o == printingSelectorDockWidget) {
-            aPrintingSelectorDockVisible->setChecked(false);
-            aPrintingSelectorDockFloating->setEnabled(false);
-        }
-    }
-
-    if (o == this && e->type() == QEvent::Hide) {
-        LayoutsSettings &layouts = SettingsCache::instance().layouts();
-        layouts.setDeckEditorLayoutState(saveState());
-        layouts.setDeckEditorGeometry(saveGeometry());
-        layouts.setDeckEditorCardSize(cardInfoDockWidget->size());
-        layouts.setDeckEditorFilterSize(filterDockWidget->size());
-        layouts.setDeckEditorDeckSize(deckDockWidget->size());
-        layouts.setDeckEditorPrintingSelectorSize(printingSelectorDockWidget->size());
-    }
-
-    return false;
-}
-
 /** @brief Shows a confirmation dialog before closing. */
 bool AbstractTabDeckEditor::confirmClose()
 {
-    if (modified) {
+    if (deckStateManager->isModified()) {
         tabSupervisor->setCurrentWidget(this);
         int ret = createSaveConfirmationWindow()->exec();
-        if (ret == QMessageBox::Save)
+        if (ret == QMessageBox::Save) {
             return actSaveDeck();
-        else if (ret == QMessageBox::Cancel)
+        } else if (ret == QMessageBox::Cancel) {
             return false;
+        }
     }
     return true;
 }
@@ -709,7 +631,20 @@ bool AbstractTabDeckEditor::confirmClose()
 /** @brief Handles close requests from outside (tab manager). */
 bool AbstractTabDeckEditor::closeRequest()
 {
-    if (!confirmClose())
+    if (!confirmClose()) {
         return false;
+    }
     return close();
 }
+
+void AbstractTabDeckEditor::showPrintingSelector()
+{
+    printingSelectorDockWidget->printingSelector->setCard(cardInfoDockWidget->cardInfo->getCard().getCardPtr());
+    printingSelectorDockWidget->printingSelector->updateDisplay();
+    printingSelectorDockWidget->setVisible(true);
+}
+
+void AbstractTabDeckEditor::openEdhrecTab(const CardInfoPtr &info, bool isCommander)
+{
+    getTabSupervisor()->addEdhrecTab(info, isCommander);
+}
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 8544e6c00..1782e7afd 100644
--- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
+++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h
@@ -8,46 +8,32 @@
 #ifndef TAB_GENERIC_DECK_EDITOR_H
 #define TAB_GENERIC_DECK_EDITOR_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 "../../deck_loader/deck_loader.h"
+#include "libcockatrice/card/card_info.h"
 #include "tab.h"
 
-#include <libcockatrice/deck_list/deck_list_history_manager.h>
+#include <QMap>
+#include <QSize>
+#include <QString>
+#include <qtmetamacros.h>
 
+class DeckStateManager;
 class CardDatabaseModel;
-class CardDatabaseDisplayModel;
-
-class CardInfoFrameWidget;
-class DeckLoader;
 class DeckEditorMenu;
 class DeckEditorCardInfoDockWidget;
-class DeckEditorDatabaseDisplayWidget;
+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
@@ -75,9 +61,8 @@ class QAction;
  *
  * **Key Methods:**
  *
- * - actAddCard(const ExactCard &card) — Adds a card to the deck.
- * - actDecrementCard(const ExactCard &card) — Removes a single instance of a card from the deck.
- * - actSwapCard(const ExactCard &card, const QString &zone) — Swaps a card between zones.
+ * - addCard(const ExactCard &card, const QString &zoneName) — Adds a card to the deck.
+ * - decrementCard(const ExactCard &card, const QString &zoneName) — Removes a single instance of a card from the deck.
  * - actRemoveCard() — Removes the currently selected card from the deck.
  * - actSaveDeckAs() — Performs a "Save As" action for the deck.
  * - updateCard(const ExactCard &card) — Updates the currently displayed card info in the dock.
@@ -114,36 +99,20 @@ public:
     virtual void retranslateUi() override = 0;
 
     /** @brief Opens a deck in this tab.
-     *  @param deck Pointer to a DeckLoader object.
+     *  @param deck The deck to open
      */
-    void openDeck(DeckLoader *deck);
-
-    /** @brief Returns the currently active deck loader. */
-    DeckLoader *getDeckLoader() const;
-
-    /** @brief Returns the currently active deck list. */
-    DeckList *getDeckList() const;
-
-    /** @brief Sets the modified state of the tab.
-     *  @param _windowModified Whether the tab is modified.
-     */
-    void setModified(bool _windowModified);
+    void openDeck(const LoadedDeck &deck);
 
     DeckEditorDeckDockWidget *getDeckDockWidget() const
     {
         return deckDockWidget;
     }
 
-    DeckListHistoryManager *getHistoryManager() const
-    {
-        return historyManager;
-    }
-
-    DeckListHistoryManager *historyManager;
-
     // UI Elements
+    DeckStateManager *deckStateManager;
+    CardDatabaseModel *databaseModel;                                 ///< Card database
     DeckEditorMenu *deckMenu;                                         ///< Menu for deck operations
-    DeckEditorDatabaseDisplayWidget *databaseDisplayDockWidget;       ///< Database dock
+    DeckEditorCardDatabaseDockWidget *cardDatabaseDockWidget;         ///< Database dock
     DeckEditorCardInfoDockWidget *cardInfoDockWidget;                 ///< Card info dock
     DeckEditorDeckDockWidget *deckDockWidget;                         ///< Deck dock
     DeckEditorFilterDockWidget *filterDockWidget;                     ///< Filter dock
@@ -156,30 +125,35 @@ public slots:
     /** @brief Called when the deck is modified. */
     virtual void onDeckModified();
 
-    /** @brief Called when a widget is about to modify the state of the DeckList.
-     *  @param modificationReason The reason for the state modification
-     */
-    virtual void onDeckHistorySaveRequested(const QString &modificationReason);
-
-    /** @brief Called when a widget would like to clear the history. */
-    virtual void onDeckHistoryClearRequested();
-
-    /** @brief Updates the card info panel.
-     *  @param card The card to display.
+    /**
+     * @brief Updates the card info dock and printing selector.
+     * @param card The card to display.
      */
     void updateCard(const ExactCard &card);
 
-    /** @brief Adds a card to the main deck or sideboard based on Ctrl key. */
-    void actAddCard(const ExactCard &card);
+    /**
+     * @brief Updates just the card info dock
+     * @param card The card to display
+     */
+    void updateCardInfo(const ExactCard &card);
 
-    /** @brief Adds a card to the sideboard explicitly. */
-    void actAddCardToSideboard(const ExactCard &card);
+    /**
+     * @brief Adds a card to the given zone
+     * @param card Card to add.
+     * @param zoneName Zone to add the card to.
+     */
+    void addCard(const ExactCard &card, const QString &zoneName);
 
-    /** @brief Decrements a card from the main deck. */
-    void actDecrementCard(const ExactCard &card);
-
-    /** @brief Decrements a card from the sideboard. */
-    void actDecrementCardFromSideboard(const ExactCard &card);
+    /**
+     * @brief Decrements a card from the given zone
+     *
+     * Use an ExactCard with empty PrintingInfo if you want to remove a card by name regardless of printing.
+     * Otherwise, it won't remove anything unless there's an exact printing match.
+     *
+     * @param card Card to decrement.
+     * @param zoneName Zone to decrement from.
+     */
+    void decrementCard(const ExactCard &card, const QString &zoneName);
 
     /** @brief Opens a recently opened deck file. */
     void actOpenRecent(const QString &fileName);
@@ -190,22 +164,23 @@ public slots:
     /** @brief Requests closing the tab. */
     bool closeRequest() override;
 
-    /** @brief Shows the printing selector dock. Pure virtual. */
-    virtual void showPrintingSelector() = 0;
+    /** @brief Shows the printing selector dock and updates it with the current card. */
+    void showPrintingSelector();
 
-    /** @brief Slot for when a dock's top-level state changes. Pure virtual. */
-    virtual void dockTopLevelChanged(bool topLevel) = 0;
+    /**
+     * @brief Opens an EDHRec tab for the given card
+     * @param info The card
+     * @param isCommander The type of search
+     */
+    void openEdhrecTab(const CardInfoPtr &info, bool isCommander);
 
 signals:
     /** @brief Emitted when a deck should be opened in a new editor tab. */
-    void openDeckEditor(DeckLoader *deckLoader);
+    void openDeckEditor(const LoadedDeck &deck);
 
     /** @brief Emitted before the tab is closed. */
     void deckEditorClosing(AbstractTabDeckEditor *tab);
 
-    /** @brief Emitted when a card should be decremented. */
-    void decrementCard(const ExactCard &card, QString zoneName);
-
 protected slots:
     /** @brief Starts a new deck in this tab. */
     virtual void actNewDeck();
@@ -222,6 +197,9 @@ protected slots:
     /** @brief Saves the current deck under a new name. */
     virtual bool actSaveDeckAs();
 
+    /** @brief Opens the deck share dialog for the current deck. */
+    void actShareDeck();
+
     /** @brief Loads a deck from the clipboard. */
     virtual void actLoadDeckFromClipboard();
 
@@ -267,27 +245,17 @@ protected slots:
     // UI Layout Management
     virtual void loadLayout() = 0;
     virtual void restartLayout() = 0;
-    virtual void freeDocksSize() = 0;
     virtual void refreshShortcuts() = 0;
 
     /** @brief Handles dock close events. */
     void closeEvent(QCloseEvent *event) override;
 
-    /** @brief Event filter for dock state changes. */
-    bool eventFilter(QObject *o, QEvent *e) override;
-
-    /** @brief Slot triggered when a dock visibility changes. Pure virtual. */
-    virtual void dockVisibleTriggered() = 0;
-
-    /** @brief Slot triggered when a dock floating state changes. Pure virtual. */
-    virtual void dockFloatingTriggered() = 0;
-
-private:
     /** @brief Sets the deck for this tab.
      *  @param _deck The deck object.
      */
-    virtual void setDeck(DeckLoader *_deck);
+    virtual void setDeck(const LoadedDeck &_deck);
 
+private:
     /** @brief Helper for editing decks from the clipboard. */
     void editDeckInClipboard(bool annotated);
 
@@ -305,6 +273,23 @@ protected:
         NEW_TAB    ///< Open deck in a new tab
     };
 
+    /**
+     * @brief The actions associated with managing a QDockWidget
+     */
+    struct DockActions
+    {
+        QMenu *menu;        ///< The menu containing the actions
+        QAction *aVisible;  ///< The menu action that toggles visibility
+        QAction *aFloating; ///< The menu action that toggles floating
+        QSize defaultSize;  ///< The default size of the dock
+    };
+
+    /**
+     * @brief registers a QDockWidget as a managed dock widget. Creates the associated actions and menu, adds them to
+     * the viewMenu, and connects those actions to the tab's slots.
+     */
+    void registerDockWidget(QMenu *_viewMenu, QDockWidget *widget, const QSize &defaultSize);
+
     /** @brief Confirms deck open action based on settings and modified state.
      *  @param openInSameTabIfBlank Whether to reuse same tab if blank.
      *  @return Selected DeckOpenLocation.
@@ -316,26 +301,15 @@ protected:
      */
     QMessageBox *createSaveConfirmationWindow();
 
-    /** @brief Returns true if the tab is a blank newly created deck. */
-    bool isBlankNewDeck() const;
-
-    /** @brief Helper function to add a card to a specific deck zone. */
-    void addCardHelper(const ExactCard &card, QString zoneName);
-
-    /** @brief Swaps a card in the deck view. */
-    void actSwapCard(const ExactCard &card, const QString &zoneName);
-
     /** @brief Opens a deck from a file. */
     virtual void openDeckFromFile(const QString &fileName, DeckOpenLocation deckOpenLocation);
 
     // UI Menu Elements
-    QMenu *viewMenu, *cardInfoDockMenu, *deckDockMenu, *filterDockMenu, *printingSelectorDockMenu;
+    QMenu *viewMenu;
 
     QAction *aResetLayout;
-    QAction *aCardInfoDockVisible, *aCardInfoDockFloating, *aDeckDockVisible, *aDeckDockFloating;
-    QAction *aFilterDockVisible, *aFilterDockFloating, *aPrintingSelectorDockVisible, *aPrintingSelectorDockFloating;
 
-    bool modified = false; ///< Whether the deck/tab has unsaved changes
+    QMap<QDockWidget *, DockActions> dockToActions;
 };
 
 #endif // TAB_GENERIC_DECK_EDITOR_H
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 40882db04..8d023cd61 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,6 +2,9 @@
 
 #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 723c65ce2..c42bc1315 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,8 +4,9 @@
 #include "deck_listings/archidekt_api_response_deck_listing_container.h"
 
 #include <QJsonObject>
-#include <QString>
+#include <QList>
 #include <QUrl>
+#include <QVector>
 
 class ArchidektDeckListingApiResponse
 {
diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h
new file mode 100644
index 000000000..5b5c16302
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/api_response/archidekt_formats.h
@@ -0,0 +1,251 @@
+#ifndef COCKATRICE_ARCHIDEKT_FORMATS_H
+#define COCKATRICE_ARCHIDEKT_FORMATS_H
+#include <QHash>
+#include <QString>
+
+namespace ArchidektFormats
+{
+enum class DeckFormat
+{
+    Standard = 0,
+    Modern = 1,
+    Commander = 2,
+    Legacy = 3,
+    Vintage = 4,
+    Pauper = 5,
+    Custom = 6,
+    Frontier = 7,
+    FutureStandard = 8,
+    PennyDreadful = 9,
+    Commander1v1 = 10,
+    DualCommander = 11,
+    Brawl = 12,
+
+    // Values outside Archidekt range
+    Alchemy = 1000,
+    Historic = 1001,
+    Gladiator = 1002,
+    Oathbreaker = 1003,
+    OldSchool = 1004,
+    PauperCommander = 1005,
+    Pioneer = 1006,
+    PreDH = 1007,
+    Premodern = 1008,
+    StandardBrawl = 1009,
+    Timeless = 1010,
+    Unknown = 1011
+};
+
+inline static QString formatToApiName(DeckFormat format)
+{
+    switch (format) {
+        case DeckFormat::Standard:
+            return "Standard";
+        case DeckFormat::Modern:
+            return "Modern";
+        case DeckFormat::Commander:
+            return "Commander";
+        case DeckFormat::Legacy:
+            return "Legacy";
+        case DeckFormat::Vintage:
+            return "Vintage";
+        case DeckFormat::Pauper:
+            return "Pauper";
+        case DeckFormat::Custom:
+            return "Custom";
+        case DeckFormat::Frontier:
+            return "Frontier";
+        case DeckFormat::FutureStandard:
+            return "Future Std";
+        case DeckFormat::PennyDreadful:
+            return "Penny Dreadful";
+        case DeckFormat::Commander1v1:
+            return "1v1 Commander";
+        case DeckFormat::DualCommander:
+            return "Dual Commander";
+        case DeckFormat::Brawl:
+            return "Brawl";
+
+        case DeckFormat::Alchemy:
+            return "Alchemy";
+        case DeckFormat::Historic:
+            return "Historic";
+        case DeckFormat::Gladiator:
+            return "Gladiator";
+        case DeckFormat::Oathbreaker:
+            return "Oathbreaker";
+        case DeckFormat::OldSchool:
+            return "Old School";
+        case DeckFormat::PauperCommander:
+            return "Pauper Commander";
+        case DeckFormat::Pioneer:
+            return "Pioneer";
+        case DeckFormat::PreDH:
+            return "PreDH";
+        case DeckFormat::Premodern:
+            return "Premodern";
+        case DeckFormat::StandardBrawl:
+            return "Standard Brawl";
+        case DeckFormat::Timeless:
+            return "Timeless";
+
+        default:
+            return "Unknown";
+    }
+}
+
+inline static DeckFormat apiNameToFormat(const QString &name)
+{
+    const QString n = name.trimmed();
+
+    if (n.compare("Standard", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Standard;
+    }
+    if (n.compare("Modern", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Modern;
+    }
+    if (n.compare("Commander", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Commander;
+    }
+    if (n.compare("Legacy", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Legacy;
+    }
+    if (n.compare("Vintage", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Vintage;
+    }
+    if (n.compare("Pauper", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Pauper;
+    }
+    if (n.compare("Custom", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Custom;
+    }
+    if (n.compare("Frontier", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Frontier;
+    }
+    if (n.compare("Future Std", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::FutureStandard;
+    }
+    if (n.compare("Penny Dreadful", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::PennyDreadful;
+    }
+    if (n.compare("1v1 Commander", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Commander1v1;
+    }
+    if (n.compare("Dual Commander", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::DualCommander;
+    }
+    if (n.compare("Brawl", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Brawl;
+    }
+
+    if (n.compare("Alchemy", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Alchemy;
+    }
+    if (n.compare("Historic", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Historic;
+    }
+    if (n.compare("Gladiator", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Gladiator;
+    }
+    if (n.compare("Oathbreaker", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Oathbreaker;
+    }
+    if (n.compare("Old School", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::OldSchool;
+    }
+    if (n.compare("Pauper Commander", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::PauperCommander;
+    }
+    if (n.compare("Pioneer", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Pioneer;
+    }
+    if (n.compare("PreDH", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::PreDH;
+    }
+    if (n.compare("Premodern", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Premodern;
+    }
+    if (n.compare("Standard Brawl", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::StandardBrawl;
+    }
+    if (n.compare("Timeless", Qt::CaseInsensitive) == 0) {
+        return DeckFormat::Timeless;
+    }
+
+    return DeckFormat::Unknown;
+}
+
+inline static QString formatToCockatriceName(DeckFormat format)
+{
+    switch (format) {
+        case DeckFormat::Standard:
+            return "standard";
+        case DeckFormat::Modern:
+            return "modern";
+        case DeckFormat::Commander:
+            return "commander";
+        case DeckFormat::Legacy:
+            return "legacy";
+        case DeckFormat::Vintage:
+            return "vintage";
+        case DeckFormat::Pauper:
+            return "pauper";
+        case DeckFormat::Brawl:
+            return "brawl";
+        case DeckFormat::PennyDreadful:
+            return "penny";
+        case DeckFormat::FutureStandard:
+            return "future";
+        case DeckFormat::Commander1v1:
+            return "duel";
+        case DeckFormat::DualCommander:
+            return "duel";
+        case DeckFormat::Alchemy:
+            return "alchemy";
+        case DeckFormat::Historic:
+            return "historic";
+        case DeckFormat::Gladiator:
+            return "gladiator";
+        case DeckFormat::Oathbreaker:
+            return "oathbreaker";
+        case DeckFormat::OldSchool:
+            return "oldschool";
+        case DeckFormat::PauperCommander:
+            return "paupercommander";
+        case DeckFormat::Pioneer:
+            return "pioneer";
+        case DeckFormat::PreDH:
+            return "predh";
+        case DeckFormat::Premodern:
+            return "premodern";
+        case DeckFormat::StandardBrawl:
+            return "standardbrawl";
+        case DeckFormat::Timeless:
+            return "timeless";
+
+        default:
+            return {};
+    }
+}
+
+inline static DeckFormat cockatriceNameToFormat(const QString &apiName)
+{
+    static const QHash<QString, DeckFormat> map = {
+        {"standard", DeckFormat::Standard},     {"modern", DeckFormat::Modern},
+        {"commander", DeckFormat::Commander},   {"legacy", DeckFormat::Legacy},
+        {"vintage", DeckFormat::Vintage},       {"pauper", DeckFormat::Pauper},
+        {"brawl", DeckFormat::Brawl},           {"penny", DeckFormat::PennyDreadful},
+        {"future", DeckFormat::FutureStandard}, {"duel", DeckFormat::Commander1v1},
+        {"alchemy", DeckFormat::Alchemy},       {"historic", DeckFormat::Historic},
+        {"gladiator", DeckFormat::Gladiator},   {"oathbreaker", DeckFormat::Oathbreaker},
+        {"oldschool", DeckFormat::OldSchool},   {"paupercommander", DeckFormat::PauperCommander},
+        {"pioneer", DeckFormat::Pioneer},       {"predh", DeckFormat::PreDH},
+        {"premodern", DeckFormat::Premodern},   {"standardbrawl", DeckFormat::StandardBrawl},
+        {"timeless", DeckFormat::Timeless}};
+
+    return map.value(apiName.toLower(), DeckFormat::Unknown);
+}
+
+} // namespace ArchidektFormats
+
+#endif // COCKATRICE_ARCHIDEKT_FORMATS_H
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 909c4d9eb..d118301bb 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,5 +1,9 @@
 #include "archidekt_api_response_card.h"
 
+#include <QDebug>
+#include <QJsonValue>
+#include <qlogging.h>
+
 void ArchidektApiResponseCard::fromJson(const QJsonObject &json)
 {
     id = json.value("id").toInt();
@@ -21,7 +25,7 @@ void ArchidektApiResponseCard::fromJson(const QJsonObject &json)
     edition.fromJson(json.value("edition").toObject());
 
     flavor = json.value("flavor").toString();
-    // TODO but not really important
+    //! \todo Parse games and options fields (not really important).
     // games = {""};
     // options = {""};
     scryfallImageHash = json.value("scryfallImageHash").toString();
@@ -29,7 +33,7 @@ void ArchidektApiResponseCard::fromJson(const QJsonObject &json)
     owned = json.value("owned").toInt();
     pinnedStatus = json.value("pinnedStatus").toInt();
     rarity = json.value("rarity").toString();
-    // TODO but not really important
+    //! \todo Parse globalCategories field (not really important).
     // globalCategories = {""};
 }
 
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 265498228..8e9e0b12a 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,11 +3,10 @@
 
 #include "archidekt_api_response_edition.h"
 
-#include <QDebug>
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
 #include <QString>
-#include <QVector>
+#include <QStringList>
 
 class ArchidektApiResponseCard
 {
@@ -24,7 +23,7 @@ public:
     QJsonObject getOracleCard() const
     {
         return oracleCard;
-    };
+    }
 
     QString getCollectorNumber() const
     {
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 7a424de8b..14b13a4ed 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,13 +1,38 @@
 #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();
 
+    categories.clear();
+
     auto categoriesJson = json.value("categories").toArray();
 
-    for (auto category : categoriesJson) {
-        categories.append(category.toString());
+    for (const auto &categoryValue : categoriesJson) {
+        Category cat;
+
+        if (categoryValue.isObject()) {
+            QJsonObject obj = categoryValue.toObject();
+
+            cat.id = obj.value("id").toInt();
+            cat.name = obj.value("name").toString();
+            cat.isPremier = obj.value("isPremier").toBool();
+            cat.includedInDeck = obj.value("includedInDeck").toBool();
+            cat.includedInPrice = obj.value("includedInPrice").toBool();
+        } else if (categoryValue.isString()) {
+            cat.name = categoryValue.toString();
+
+            // assume mainboard unless known otherwise
+            cat.includedInDeck = true;
+        }
+
+        categories.append(cat);
     }
 
     companion = json.value("companion").toBool();
@@ -27,7 +52,13 @@ void ArchidektApiResponseCardEntry::fromJson(const QJsonObject &json)
 void ArchidektApiResponseCardEntry::debugPrint() const
 {
     qDebug() << "Id:" << id;
-    qDebug() << "Categories:" << categories;
+    for (auto category : categories) {
+        qDebug() << "Category ID:" << category.id;
+        qDebug() << "Category Name:" << category.name;
+        qDebug() << "Category Premier:" << category.isPremier;
+        qDebug() << "Category Included in Deck:" << category.includedInDeck;
+        qDebug() << "Category Included in Price:" << category.includedInPrice;
+    }
     qDebug() << "Companion:" << companion;
     qDebug() << "FlippedDefault:" << flippedDefault;
     qDebug() << "Label:" << label;
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 f7f86e9ed..eb7c4190c 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,11 +3,19 @@
 
 #include "archidekt_api_response_card.h"
 
-#include <QDebug>
-#include <QJsonArray>
 #include <QJsonObject>
+#include <QList>
 #include <QString>
-#include <QVector>
+#include <QStringList>
+
+struct Category
+{
+    int id;
+    QString name;
+    bool isPremier;
+    bool includedInDeck;
+    bool includedInPrice;
+};
 
 class ArchidektApiResponseCardEntry
 {
@@ -24,9 +32,9 @@ public:
     ArchidektApiResponseCard getCard() const
     {
         return card;
-    };
+    }
 
-    QStringList getCategories() const
+    QList<Category> getCategories() const
     {
         return categories;
     }
@@ -38,7 +46,7 @@ public:
 
 private:
     int id;
-    QStringList categories;
+    QList<Category> categories;
     bool companion;
     bool flippedDefault;
     QString label;
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 122617a22..73836b9c8 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,5 +1,9 @@
 #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 b898cd816..63d29652f 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,11 +1,8 @@
 #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 98d8c6c8c..362ac0f63 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,6 +1,13 @@
 #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)
 {
@@ -44,7 +51,7 @@ void ArchidektApiResponseDeck::fromJson(const QJsonObject &json)
         cards.append(entry);
     }
 
-    // TODO but not really important
+    //! \todo Parse customCards field (not really important).
     // customCards = {""};
 }
 
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 8cb81cac3..6af0a01c5 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,15 +1,14 @@
 #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
@@ -27,7 +26,7 @@ public:
     QVector<ArchidektApiResponseCardEntry> getCards() const
     {
         return cards;
-    };
+    }
 
     QVector<ArchidektApiResponseDeckCategory> getCategories() const
     {
@@ -37,7 +36,12 @@ public:
     QString getDeckName() const
     {
         return name;
-    };
+    }
+
+    int getDeckFormat() const
+    {
+        return deckFormat;
+    }
 
 private:
     int id;
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 990293bc6..0df8b9f68 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,5 +1,9 @@
 #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 5e218b6a4..b31743643 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,15 +1,8 @@
 #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 16ea60487..0f5290f02 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,8 +3,10 @@
 #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)
 {
@@ -23,7 +25,7 @@ void ArchidektApiResponseDeckListingContainer::fromJson(const QJsonObject &json)
     theoryCrafted = json.value("theoryCrafted").toBool();
     game = json.value("game").toString();
     hasDescription = json.value("hasDescription").toBool();
-    // TODO
+    //! \todo Parse tags field.
     // tags = {""};
     parentFolderId = json.value("parentFolderId").toInt();
     owner.fromJson(json.value("owner").toObject());
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 8924bb3f5..904d6b624 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 <QVector>
+#include <QStringList>
 
 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 2ba926f8b..67b80d67a 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,5 +1,9 @@
 #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();
@@ -7,7 +11,7 @@ void ArchidektApiResponseDeckOwner::fromJson(const QJsonObject &json)
     avatar = QUrl(json.value("avatar").toString());
     moderator = json.value("moderator").toBool();
     pledgeLevel = json.value("pledgeLevel").toInt();
-    // TODO but not really important
+    //! \todo Parse roles field (not really important).
     // roles = {""};
 }
 
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 df3f48fd2..f63d6af0e 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 <QVector>
+#include <QStringList>
+#include <QUrl>
 
 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 33ee67a1f..555ec7ec5 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
@@ -1,14 +1,40 @@
 #include "archidekt_api_response_deck_display_widget.h"
 
-#include "../../../../../deck_loader/deck_loader.h"
-#include "../../../../cards/card_info_picture_with_text_overlay_widget.h"
-#include "../../../../cards/card_size_widget.h"
+#include "../../../../../../client/settings/cache_settings.h"
+#include "../../../../../deck_loader/card_node_function.h"
+#include "../../../../../deck_loader/loaded_deck.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 <libcockatrice/card/database/card_database_manager.h>
+#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,
@@ -18,12 +44,22 @@ ArchidektApiResponseDeckDisplayWidget::ArchidektApiResponseDeckDisplayWidget(QWi
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
-    openInEditorButton = new QPushButton(this);
-    layout->addWidget(openInEditorButton);
+    navigationContainer = new QWidget(this);
+    navigationContainerLayout = new QHBoxLayout(navigationContainer);
+
+    homeButton = new QPushButton(navigationContainer);
+    navigationContainerLayout->addWidget(homeButton);
+
+    connect(homeButton, &QPushButton::clicked, this, &ArchidektApiResponseDeckDisplayWidget::requestSearch);
+
+    openInEditorButton = new QPushButton(navigationContainer);
+    navigationContainerLayout->addWidget(openInEditorButton);
 
     connect(openInEditorButton, &QPushButton::clicked, this,
             &ArchidektApiResponseDeckDisplayWidget::actOpenInDeckEditor);
 
+    layout->addWidget(navigationContainer);
+
     displayOptionsWidget = new VisualDeckDisplayOptionsWidget(this);
     layout->addWidget(displayOptionsWidget);
 
@@ -52,48 +88,99 @@ ArchidektApiResponseDeckDisplayWidget::ArchidektApiResponseDeckDisplayWidget(QWi
     QString tempDeck;
     QTextStream deckStream(&tempDeck);
 
-    for (auto card : response.getCards()) {
+    QString mainboardText;
+    QString sideboardText;
+
+    QTextStream mainStream(&mainboardText);
+    QTextStream sideStream(&sideboardText);
+
+    for (const auto &card : response.getCards()) {
         QString fullName = card.getCard().getOracleCard().value("name").toString();
         // We don't really care about the second card, the card database already has it as a relation
         QString cleanName = fullName.split("//").first().trimmed();
 
-        tempDeck += QString("%1 %2 (%3) %4\n")
-                        .arg(card.getQuantity())
-                        .arg(cleanName)
-                        .arg(card.getCard().getEdition().getEditionCode().toUpper())
-                        .arg(card.getCard().getCollectorNumber());
+        QString line = QString("%1 %2 (%3) %4\n")
+                           .arg(card.getQuantity())
+                           .arg(cleanName)
+                           .arg(card.getCard().getEdition().getEditionCode().toUpper())
+                           .arg(card.getCard().getCollectorNumber());
+
+        bool isCommander = false;
+        bool isSideboardCategory = false;
+        bool includedInDeck = false;
+
+        for (const auto &cat : card.getCategories()) {
+
+            if (cat.name.compare("Commander", Qt::CaseInsensitive) == 0) {
+                isCommander = true;
+            }
+
+            if (cat.name.compare("Sideboard", Qt::CaseInsensitive) == 0 ||
+                cat.name.compare("Maybeboard", Qt::CaseInsensitive) == 0) {
+                isSideboardCategory = true;
+            }
+
+            if (cat.includedInDeck) {
+                includedInDeck = true;
+            }
+        }
+
+        QString target;
+
+        if (isCommander || isSideboardCategory) {
+            sideStream << line;
+        } else if (includedInDeck) {
+            mainStream << line;
+        } else {
+            sideStream << line;
+        }
+    }
+
+    // Combine with blank line separator
+    tempDeck = mainboardText;
+
+    if (!sideboardText.isEmpty()) {
+        tempDeck += "\n";
+        tempDeck += sideboardText;
     }
 
     model = new DeckListModel(this);
+    model->setDisplayLanguage(SettingsCache::instance().cardsDisplay().getCardLang());
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, model,
+            [this](const QString &lang) { model->setDisplayLanguage(lang); });
     connect(model, &DeckListModel::modelReset, this, &ArchidektApiResponseDeckDisplayWidget::decklistModelReset);
-    model->getDeckList()->loadFromStream_Plain(deckStream, false);
 
-    DeckLoader::resolveSetNameAndNumberToProviderID(model->getDeckList());
+    auto decklist = QSharedPointer<DeckList>(new DeckList);
+    decklist->loadFromStream_Plain(deckStream, false, CardNameNormalizer());
+    model->setDeckList(decklist);
 
-    model->rebuildTree();
+    model->forEachCard(CardNodeFunction::ResolveProviderId());
 
     retranslateUi();
 }
 
 void ArchidektApiResponseDeckDisplayWidget::retranslateUi()
 {
+    homeButton->setText(tr("Back to results"));
     openInEditorButton->setText(tr("Open Deck in Deck Editor"));
 }
 
 void ArchidektApiResponseDeckDisplayWidget::onGroupCriteriaChange(const QString &activeGroupCriteria)
 {
     model->setActiveGroupCriteria(DeckListModelGroupCriteria::fromString(activeGroupCriteria));
-    model->sort(1, Qt::AscendingOrder);
+    model->sort(DeckListModelColumns::CARD_NAME, Qt::AscendingOrder);
 }
 
 void ArchidektApiResponseDeckDisplayWidget::actOpenInDeckEditor()
 {
-    auto loader = new DeckLoader(this);
-    loader->getDeckList()->loadFromString_Native(model->getDeckList()->writeToString_Native());
+    DeckList deckList(*model->getDeckList());
+    deckList.setName(response.getDeckName());
+    deckList.setGameFormat(
+        ArchidektFormats::formatToCockatriceName(ArchidektFormats::DeckFormat(response.getDeckFormat() - 1)));
 
-    loader->getDeckList()->setName(response.getDeckName());
+    LoadedDeck loadedDeck = {deckList, {}};
 
-    emit openInDeckEditor(loader);
+    emit openInDeckEditor(loadedDeck);
 }
 
 void ArchidektApiResponseDeckDisplayWidget::clearAllDisplayWidgets()
@@ -118,7 +205,7 @@ void ArchidektApiResponseDeckDisplayWidget::constructZoneWidgetsFromDeckListMode
     QSortFilterProxyModel proxy;
     proxy.setSourceModel(model);
     proxy.setSortRole(Qt::EditRole);
-    proxy.sort(1, Qt::AscendingOrder);
+    proxy.sort(DeckListModelColumns::CARD_NAME, Qt::AscendingOrder);
 
     for (int i = 0; i < proxy.rowCount(); ++i) {
         QModelIndex proxyIndex = proxy.index(i, 0);
@@ -131,10 +218,12 @@ void ArchidektApiResponseDeckDisplayWidget::constructZoneWidgetsFromDeckListMode
             continue;
         }
 
+        QString zoneName =
+            persistent.sibling(persistent.row(), DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+
         DeckCardZoneDisplayWidget *zoneDisplayWidget =
-            new DeckCardZoneDisplayWidget(zoneContainer, model, nullptr, persistent,
-                                          model->data(persistent.sibling(persistent.row(), 1), Qt::EditRole).toString(),
-                                          "maintype", {"name"}, DisplayType::Overlap, 20, 10, cardSizeSlider);
+            new DeckCardZoneDisplayWidget(zoneContainer, model, nullptr, persistent, zoneName, "maintype", {"name"},
+                                          DisplayType::Overlap, 20, 10, cardSizeSlider);
 
         connect(displayOptionsWidget, &VisualDeckDisplayOptionsWidget::sortCriteriaChanged, zoneDisplayWidget,
                 &DeckCardZoneDisplayWidget::onActiveSortCriteriaChanged);
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 3d624d293..cdacc70b3 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,18 +1,22 @@
 #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 <QPushButton>
-#include <QResizeEvent>
-#include <QScrollArea>
-#include <QVBoxLayout>
+#include <QHash>
+#include <QPersistentModelIndex>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class CardSizeWidget;
+class DeckListModel;
+class QHBoxLayout;
+class QPushButton;
+class QScrollArea;
+class QVBoxLayout;
+class VisualDeckDisplayOptionsWidget;
+struct LoadedDeck;
 
 /**
  * @class ArchidektApiResponseDeckDisplayWidget
@@ -31,7 +35,7 @@
  *
  * ### Signals
  * - `requestNavigation(QString url)` — triggered when navigation to a deck URL is requested.
- * - `openInDeckEditor(DeckLoader *loader)` — emitted when the user chooses to open the deck
+ * - `openInDeckEditor(const LoadedDeck &deck)` — emitted when the user chooses to open the deck
  *   in the deck editor.
  *
  * ### Features
@@ -49,12 +53,13 @@ signals:
      * @param url URL of the deck on Archidekt.
      */
     void requestNavigation(QString url);
+    void requestSearch();
 
     /**
      * @brief Emitted when the deck should be opened in the deck editor.
-     * @param loader Initialized DeckLoader containing the deck data.
+     * @param deck LoadedDeck containing the deck data.
      */
-    void openInDeckEditor(DeckLoader *loader);
+    void openInDeckEditor(const LoadedDeck &deck);
 
 public:
     /**
@@ -75,7 +80,7 @@ public:
     void retranslateUi();
 
     /**
-     * @brief Opens the deck in the deck editor via DeckLoader.
+     * @brief Opens the deck in the deck editor.
      */
     void actOpenInDeckEditor();
 
@@ -102,9 +107,12 @@ private slots:
     void onGroupCriteriaChange(const QString &activeGroupCriteria);
 
 private:
-    ArchidektApiResponseDeck response;                        ///< API deck data container
-    CardSizeWidget *cardSizeSlider;                           ///< Slider for adjusting card sizes
-    QVBoxLayout *layout;                                      ///< Main vertical layout
+    ArchidektApiResponseDeck response; ///< API deck data container
+    CardSizeWidget *cardSizeSlider;    ///< Slider for adjusting card sizes
+    QVBoxLayout *layout;               ///< Main vertical layout
+    QWidget *navigationContainer;
+    QHBoxLayout *navigationContainerLayout;
+    QPushButton *homeButton;
     QPushButton *openInEditorButton;                          ///< Button to open deck in editor
     VisualDeckDisplayOptionsWidget *displayOptionsWidget;     ///< Controls grouping/sorting/display
     QScrollArea *scrollArea;                                  ///< Scrollable area for deck zones
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 1b633c4d3..b5e28fcf5 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,39 +1,59 @@
 #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/color_bar.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 <QHBoxLayout>
+#include <QByteArray>
+#include <QDateTime>
+#include <QFontMetrics>
 #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"
 
-QString timeAgo(const QString &timestamp)
+static QString timeAgo(const QString &timestamp)
 {
     QDateTime dt = QDateTime::fromString(timestamp, Qt::ISODate);
 
-    if (!dt.isValid())
+    if (!dt.isValid()) {
         return timestamp; // fallback if parsing fails
+    }
 
     qint64 secs = dt.secsTo(QDateTime::currentDateTimeUtc());
 
-    if (secs < 60)
+    if (secs < 60) {
         return QString("%1 seconds ago").arg(secs);
-    if (secs < 3600)
+    }
+    if (secs < 3600) {
         return QString("%1 minutes ago").arg(secs / 60);
-    if (secs < 86400)
+    }
+    if (secs < 86400) {
         return QString("%1 hours ago").arg(secs / 3600);
-    if (secs < 30 * 86400)
+    }
+    if (secs < 30 * 86400) {
         return QString("%1 days ago").arg(secs / 86400);
-    if (secs < 365 * 86400)
+    }
+    if (secs < 365 * 86400) {
         return QString("%1 months ago").arg(secs / (30 * 86400));
+    }
 
     return QString("%1 years ago").arg(secs / (365 * 86400));
 }
@@ -82,6 +102,7 @@ ArchidektApiResponseDeckEntryDisplayWidget::ArchidektApiResponseDeckEntryDisplay
     imageUrl = response.getFeatured().isEmpty() ? QUrl(ARCHIDEKT_DEFAULT_IMAGE) : QUrl(response.getFeatured());
 
     QNetworkRequest req(imageUrl);
+    req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
     QNetworkReply *reply = imageNetworkManager->get(req);
 
     // tag the reply with "this" so we know it belongs to us later
@@ -129,11 +150,7 @@ void ArchidektApiResponseDeckEntryDisplayWidget::mousePressEvent(QMouseEvent *ev
     actRequestNavigationToDeck();
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 void ArchidektApiResponseDeckEntryDisplayWidget::enterEvent(QEnterEvent *event)
-#else
-void ArchidektApiResponseDeckEntryDisplayWidget::enterEvent(QEvent *event)
-#endif
 {
     QWidget::enterEvent(event);
     backgroundPlateWidget->setFocused(true);
@@ -211,7 +228,7 @@ void ArchidektApiResponseDeckEntryDisplayWidget::updateScaledPreview()
     int textMaxWidth = int(newWidth * 0.7); // allow 70% of width for text
     QFontMetrics fm(previewWidget->topLeftLabel->font());
     QString elided = fm.elidedText(response.getName(), Qt::ElideRight, textMaxWidth);
-    previewWidget->topLeftLabel->setText(elided);
+    previewWidget->topLeftLabel->setLabelText(elided);
     previewWidget->topLeftLabel->setToolTip(response.getName());
 
     setFixedWidth(newWidth);
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 365a99c9c..e8ed8561d 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,17 +1,20 @@
 #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 <QLabel>
-#include <QNetworkAccessManager>
-#include <QResizeEvent>
-#include <QVBoxLayout>
+#include <QPixmap>
+#include <QString>
+#include <QUrl>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class BackgroundPlateWidget;
+class ArchidektDeckPreviewImageDisplayWidget;
+class QLabel;
+class QNetworkAccessManager;
+class QNetworkReply;
+class QVBoxLayout;
 
 /**
  * @class ArchidektApiResponseDeckEntryDisplayWidget
@@ -98,11 +101,7 @@ public slots:
 protected:
     void mousePressEvent(QMouseEvent *event) override;
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    void enterEvent(QEnterEvent *event) override; ///< Qt6 hover enter
-#else
-    void enterEvent(QEvent *event) override; ///< Qt5 hover enter
-#endif
+    void enterEvent(QEnterEvent *event) override; ///< Hover enter
     void leaveEvent(QEvent *event) override;
 
 private:
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 5747ce90d..9c4ea59ab 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,8 +1,18 @@
 #include "archidekt_api_response_deck_listings_display_widget.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 "../api_response/archidekt_deck_listing_api_response.h"
+#include "../api_response/deck_listings/archidekt_api_response_deck_listing_container.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,
@@ -15,11 +25,10 @@ ArchidektApiResponseDeckListingsDisplayWidget::ArchidektApiResponseDeckListingsD
 
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
 
-    imageNetworkManager = new QNetworkAccessManager(this);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
-    imageNetworkManager->setTransferTimeout(); // Use Qt's default timeout
-#endif
+    cardSizeSlider->enableCtrlScrollResize(flowWidget);
 
+    imageNetworkManager = new QNetworkAccessManager(this);
+    imageNetworkManager->setTransferTimeout(); // Use Qt's default timeout
     imageNetworkManager->setRedirectPolicy(QNetworkRequest::ManualRedirectPolicy);
 
     // Add widgets for deck listings
@@ -38,6 +47,20 @@ ArchidektApiResponseDeckListingsDisplayWidget::ArchidektApiResponseDeckListingsD
     layout->addWidget(flowWidget);
 }
 
+void ArchidektApiResponseDeckListingsDisplayWidget::append(const ArchidektDeckListingApiResponse &data)
+{
+    for (const auto &deckListing : data.results) {
+        auto cardListDisplayWidget =
+            new ArchidektApiResponseDeckEntryDisplayWidget(this, deckListing, imageNetworkManager);
+        cardListDisplayWidget->setScaleFactor(cardSizeSlider->getSlider()->value());
+        connect(cardListDisplayWidget, &ArchidektApiResponseDeckEntryDisplayWidget::requestNavigation, this,
+                &ArchidektApiResponseDeckListingsDisplayWidget::requestNavigation);
+        connect(cardSizeSlider->getSlider(), &QSlider::valueChanged, cardListDisplayWidget,
+                &ArchidektApiResponseDeckEntryDisplayWidget::setScaleFactor);
+        flowWidget->addWidget(cardListDisplayWidget);
+    }
+}
+
 void ArchidektApiResponseDeckListingsDisplayWidget::resizeEvent(QResizeEvent *event)
 {
     QWidget::resizeEvent(event);
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 f00941239..a9a7da7a1 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 "../../../../cards/card_size_widget.h"
-#include "../../../../general/layout_containers/flow_widget.h"
-#include "../api_response/archidekt_deck_listing_api_response.h"
-
-#include <QNetworkAccessManager>
-#include <QResizeEvent>
-#include <QScrollArea>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class ArchidektDeckListingApiResponse;
+class CardSizeWidget;
+class FlowWidget;
+class QHBoxLayout;
+class QNetworkAccessManager;
 
 /**
  * @class ArchidektApiResponseDeckListingsDisplayWidget
@@ -69,6 +69,7 @@ public:
     explicit ArchidektApiResponseDeckListingsDisplayWidget(QWidget *parent,
                                                            ArchidektDeckListingApiResponse response,
                                                            CardSizeWidget *cardSizeSlider);
+    void append(const ArchidektDeckListingApiResponse &data);
 
     /**
      * @brief Ensures FlowWidget layout properly recomputes on resize.
@@ -81,16 +82,16 @@ public:
     void resizeEvent(QResizeEvent *event) override;
 
 private:
-    /// Slider controlling the scale of card thumbnails in all deck entry widgets.
+    /** @brief Slider controlling the scale of card thumbnails in all deck entry widgets. */
     CardSizeWidget *cardSizeSlider;
 
-    /// Main horizontal layout containing the FlowWidget.
+    /** @brief Main horizontal layout containing the FlowWidget. */
     QHBoxLayout *layout;
 
-    /// Container providing scrollable multi-row flow layout of deck entries.
+    /** @brief Container providing scrollable multi-row flow layout of deck entries. */
     FlowWidget *flowWidget;
 
-    /// Shared network manager used to download card images for all child entry widgets.
+    /** @brief Shared network manager used to download card images for all child entry widgets. */
     QNetworkAccessManager *imageNetworkManager;
 };
 
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 ced08491e..97383534f 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,7 +1,11 @@
 #include "archidekt_deck_preview_image_display_widget.h"
 
-#include <QFontMetrics>
-#include <QPainter>
+#include "../../../../general/display/shadow_background_label.h"
+
+#include <QFont>
+#include <QLabel>
+#include <QString>
+#include <qnamespace.h>
 
 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 053823c45..991f27b6a 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,10 +1,11 @@
 #ifndef COCKATRICE_ARCHIDEKT_DECK_PREVIEW_IMAGE_DISPLAY_WIDGET_H
 #define COCKATRICE_ARCHIDEKT_DECK_PREVIEW_IMAGE_DISPLAY_WIDGET_H
 
-#include "../../../../general/display/shadow_background_label.h"
-
-#include <QLabel>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QLabel;
+class ShadowBackgroundLabel;
 
 /**
  * @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 7f04987c1..02badf1aa 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp
@@ -1,79 +1,119 @@
 #include "tab_archidekt.h"
 
 #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 <QCompleter>
+#include <QByteArray>
+#include <QCheckBox>
+#include <QComboBox>
 #include <QDebug>
+#include <QEvent>
+#include <QGridLayout>
 #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 <QRegularExpression>
-#include <QResizeEvent>
+#include <QScrollArea>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QSpinBox>
+#include <QStringList>
+#include <QStringLiteral>
+#include <QTimer>
+#include <QUrl>
 #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) : Tab(_tabSupervisor)
+TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor)
+    : Tab(_tabSupervisor), currentPage(1), isLoadingMore(false), isListMode(true)
 {
+    // Initialize network
     networkManager = new QNetworkAccessManager(this);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
-    networkManager->setTransferTimeout(); // Use Qt's default timeout
-#endif
-
+    networkManager->setTransferTimeout();
     networkManager->setRedirectPolicy(QNetworkRequest::ManualRedirectPolicy);
-    connect(networkManager, SIGNAL(finished(QNetworkReply *)), this, SLOT(processApiJson(QNetworkReply *)));
+    connect(networkManager, &QNetworkAccessManager::finished, this, &TabArchidekt::processApiJson);
 
+    // Initialize debounce timer
     searchDebounceTimer = new QTimer(this);
-    searchDebounceTimer->setSingleShot(true); // We only want it to fire once after inactivity
-    searchDebounceTimer->setInterval(300);    // 300ms debounce
+    searchDebounceTimer->setSingleShot(true);
+    searchDebounceTimer->setInterval(300);
+    connect(searchDebounceTimer, &QTimer::timeout, this, &TabArchidekt::doSearchImmediate);
 
-    connect(searchDebounceTimer, &QTimer::timeout, this, [this]() { doSearchImmediate(); });
+    initializeUi();
+    setupFilterWidgets();
+    connectSignals();
+    retranslateUi();
 
+    getTopDecks();
+}
+
+void TabArchidekt::initializeUi()
+{
+    // Main container
     container = new QWidget(this);
     mainLayout = new QVBoxLayout(container);
     mainLayout->setContentsMargins(0, 0, 0, 0);
-    container->setLayout(mainLayout);
+    mainLayout->setSpacing(0);
 
-    navigationContainer = new QWidget(container);
-    navigationContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
-    navigationLayout = new QHBoxLayout(navigationContainer);
-    navigationLayout->setSpacing(3);
-    navigationContainer->setLayout(navigationLayout);
+    // Primary toolbar (most important filters)
+    primaryToolbar = new QWidget(container);
+    primaryToolbar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    primaryToolbarLayout = new QHBoxLayout(primaryToolbar);
+    primaryToolbarLayout->setContentsMargins(6, 6, 6, 6);
+    primaryToolbarLayout->setSpacing(6);
 
-    // Sort by
-
-    orderByCombo = new QComboBox(navigationContainer);
+    // Sort controls
+    sortByLabel = new QLabel(primaryToolbar);
+    orderByCombo = new QComboBox(primaryToolbar);
     orderByCombo->addItems({"name", "updatedAt", "createdAt", "viewCount", "size", "edhBracket"});
-    orderByCombo->setCurrentText("updatedAt"); // Pre-select updatedAt
+    orderByCombo->setCurrentText("updatedAt");
+    orderByCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents);
 
-    // Asc/Desc toggle
-    orderDirButton = new QPushButton(tr("Desc."), navigationContainer);
-    orderDirButton->setCheckable(true); // checked = DESC, unchecked = ASC
+    orderDirButton = new QPushButton(tr("Desc."), primaryToolbar);
+    orderDirButton->setCheckable(true);
     orderDirButton->setChecked(true);
+    orderDirButton->setFixedWidth(60);
 
-    connect(orderByCombo, &QComboBox::currentTextChanged, this, &TabArchidekt::doSearch);
-    connect(orderDirButton, &QPushButton::clicked, this, [this](bool checked) {
-        orderDirButton->setText(checked ? tr("Desc.") : tr("Asc."));
-        doSearch();
-    });
-
-    // Colors
-    QHBoxLayout *colorLayout = new QHBoxLayout();
-    QString colorIdentity = "WUBRG"; // Optionally include "C" for colorless once we have a symbol for it
+    // Color filter (inline)
+    QWidget *colorWidget = new QWidget(primaryToolbar);
+    QHBoxLayout *colorLayout = new QHBoxLayout(colorWidget);
+    colorLayout->setContentsMargins(0, 0, 0, 0);
+    colorLayout->setSpacing(2);
 
+    QString colorIdentity = "WUBRG";
     for (const QChar &color : colorIdentity) {
-        auto *manaSymbol = new ManaSymbolWidget(navigationContainer, color, false, true);
-        manaSymbol->setFixedWidth(25);
+        auto *manaSymbol = new ManaSymbolWidget(colorWidget, color, false, true);
+        manaSymbol->setFixedSize(28, 28);
+        colorSymbols.append(manaSymbol);
         colorLayout->addWidget(manaSymbol);
 
         connect(manaSymbol, &ManaSymbolWidget::colorToggled, this, [this](QChar c, bool active) {
@@ -86,221 +126,287 @@ TabArchidekt::TabArchidekt(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
         });
     }
 
-    logicalAndCheck = new QCheckBox("Require ALL colors", navigationContainer);
+    logicalAndCheck = new QCheckBox(tr("AND"), primaryToolbar);
+    logicalAndCheck->setToolTip(tr("Require ALL selected colors"));
 
-    // Formats
+    // Common search fields
+    nameField = new QLineEdit(primaryToolbar);
+    nameField->setPlaceholderText(tr("Deck name..."));
+    nameField->setMinimumWidth(150);
 
-    formatLabel = new QLabel(this);
+    ownerField = new QLineEdit(primaryToolbar);
+    ownerField->setPlaceholderText(tr("Owner..."));
+    ownerField->setMinimumWidth(120);
 
-    formatSettingsWidget = new SettingsButtonWidget(this);
+    // Filter by label
+    filterByLabel = new QLabel(primaryToolbar);
+
+    // Package toggle
+    packagesCheck = new QCheckBox(tr("Packages"), primaryToolbar);
+
+    // Search button
+    searchButton = new QPushButton(tr("Search"), primaryToolbar);
+    searchButton->setDefault(true);
+
+    // Advanced filters toggle button
+    advancedFiltersButton = new QPushButton(tr("Advanced Filters"), primaryToolbar);
+    advancedFiltersButton->setCheckable(true);
+    advancedFiltersButton->setChecked(false);
+
+    // Settings
+    settingsButton = new SettingsButtonWidget(primaryToolbar);
+    cardSizeSlider =
+        new CardSizeWidget(primaryToolbar, nullptr, SettingsCache::instance().cardsDisplay().getArchidektPreviewSize());
+    settingsButton->addSettingsWidget(cardSizeSlider);
+
+    // Assemble primary toolbar
+    primaryToolbarLayout->addWidget(sortByLabel);
+    primaryToolbarLayout->addWidget(orderByCombo);
+    primaryToolbarLayout->addWidget(orderDirButton);
+
+    // Add separator/spacing
+    primaryToolbarLayout->addSpacing(12);
+
+    primaryToolbarLayout->addWidget(filterByLabel);
+    primaryToolbarLayout->addWidget(colorWidget);
+    primaryToolbarLayout->addWidget(logicalAndCheck);
+    primaryToolbarLayout->addWidget(nameField, 1);
+    primaryToolbarLayout->addWidget(ownerField, 1);
+    primaryToolbarLayout->addWidget(packagesCheck);
+    primaryToolbarLayout->addWidget(searchButton, 1);
+    primaryToolbarLayout->addWidget(advancedFiltersButton);
+    primaryToolbarLayout->addWidget(settingsButton);
+
+    // Secondary toolbar (advanced filters - initially hidden)
+    secondaryToolbar = new QWidget(container);
+    secondaryToolbar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    secondaryToolbar->setVisible(false); // Start hidden
+    secondaryToolbarLayout = new QHBoxLayout(secondaryToolbar);
+    secondaryToolbarLayout->setContentsMargins(6, 3, 6, 6);
+    secondaryToolbarLayout->setSpacing(6);
+
+    // Scrollable results area
+    scrollArea = new QScrollArea(container);
+    scrollArea->setWidgetResizable(true);
+    scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+
+    resultsContainer = new QWidget();
+    resultsLayout = new QVBoxLayout(resultsContainer);
+    resultsLayout->setContentsMargins(0, 0, 0, 0);
+    resultsLayout->setSpacing(0);
+
+    scrollArea->setWidget(resultsContainer);
+
+    scrollArea->viewport()->installEventFilter(this);
+
+    mainLayout->addWidget(primaryToolbar);
+    mainLayout->addWidget(secondaryToolbar);
+    mainLayout->addWidget(scrollArea);
+
+    setCentralWidget(container);
+}
+
+bool TabArchidekt::eventFilter(QObject *obj, QEvent *event)
+{
+    if (obj == scrollArea->viewport() && event->type() == QEvent::Wheel) {
+        auto *wheelEvent = static_cast<QWheelEvent *>(event);
+
+        if (wheelEvent->angleDelta().y() < 0 && !isLoadingMore && isListMode) {
+            loadNextPage();
+            wheelEvent->accept();
+            return false; // allow scrolling
+        }
+    }
+
+    // Always pass the event to the parent to handle normal scrolling
+    return QWidget::eventFilter(obj, event);
+}
+
+void TabArchidekt::setupFilterWidgets()
+{
+    // Advanced filters (in secondary toolbar)
+
+    // EDH Bracket
+    auto *bracketLabel = new QLabel(tr("Bracket:"), secondaryToolbar);
+    edhBracketCombo = new QComboBox(secondaryToolbar);
+    edhBracketCombo->addItem(tr("Any"));
+    edhBracketCombo->addItems({"1", "2", "3", "4", "5"});
+    edhBracketCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+
+    // Format filter (collapsible)
+    formatButton = new SettingsButtonWidget(secondaryToolbar);
+    formatButton->setButtonText(tr("Formats"));
+    formatButton->setButtonIcon(themePixmap(QStringLiteral("icons/scale_balanced")));
+
+    QWidget *formatContainer = new QWidget(secondaryToolbar);
+    QGridLayout *formatLayout = new QGridLayout(formatContainer);
+    formatLayout->setContentsMargins(4, 4, 4, 4);
 
     QStringList formatNames = {"Standard",      "Modern",         "Commander", "Legacy",     "Vintage",
                                "Pauper",        "Custom",         "Frontier",  "Future Std", "Penny Dreadful",
                                "1v1 Commander", "Dual Commander", "Brawl"};
 
-    for (int i = 0; i < formatNames.size(); ++i) {
-        QCheckBox *formatCheckBox = new QCheckBox(formatNames[i], navigationContainer);
-        connect(formatCheckBox, &QCheckBox::clicked, this, &TabArchidekt::doSearch);
+    int row = 0, col = 0;
+    for (const QString &formatName : formatNames) {
+        auto *formatCheckBox = new QCheckBox(formatName, formatContainer);
         formatChecks << formatCheckBox;
-        formatSettingsWidget->addSettingsWidget(formatCheckBox);
+        formatLayout->addWidget(formatCheckBox, row, col);
+        connect(formatCheckBox, &QCheckBox::clicked, this, &TabArchidekt::doSearch);
+
+        col++;
+        if (col >= 3) {
+            col = 0;
+            row++;
+        }
     }
 
-    // EDH Bracket
-    edhBracketCombo = new QComboBox(navigationContainer);
-    edhBracketCombo->addItem(tr("Any Bracket"));
-    edhBracketCombo->addItems({"1", "2", "3", "4", "5"});
+    formatButton->addSettingsWidget(formatContainer);
 
-    connect(edhBracketCombo, &QComboBox::currentTextChanged, this, &TabArchidekt::doSearch);
+    cardsField = new QLineEdit(secondaryToolbar);
+    cardsField->setPlaceholderText(tr("Contains card..."));
+    cardsField->setMinimumWidth(140);
 
-    // Search for Card Packages instead of Decks
-    packagesCheck = new QCheckBox("Packages", navigationContainer);
+    commandersField = new QLineEdit(secondaryToolbar);
+    commandersField->setPlaceholderText(tr("Commander..."));
+    commandersField->setMinimumWidth(140);
 
-    connect(packagesCheck, &QCheckBox::clicked, this, [this]() {
-        bool disable = packagesCheck->isChecked();
-        for (auto *cb : formatChecks)
-            cb->setEnabled(!disable);
-        commandersField->setEnabled(!disable);
-        deckTagNameField->setEnabled(!disable);
-        edhBracketCombo->setCurrentIndex(0);
-        edhBracketCombo->setEnabled(!disable);
-        doSearch();
-    });
+    deckTagNameField = new QLineEdit(secondaryToolbar);
+    deckTagNameField->setPlaceholderText(tr("Tag..."));
+    deckTagNameField->setMinimumWidth(100);
 
-    // Deck Name
-    nameField = new QLineEdit(navigationContainer);
-    nameField->setPlaceholderText(tr("Deck name contains..."));
+    // Deck size filter (collapsible)
+    deckSizeButton = new SettingsButtonWidget(secondaryToolbar);
+    deckSizeButton->setButtonText(tr("Deck Size"));
 
-    // Owner Name
-    ownerField = new QLineEdit(navigationContainer);
-    ownerField->setPlaceholderText(tr("Owner name contains..."));
+    QWidget *sizeContainer = new QWidget(secondaryToolbar);
+    QHBoxLayout *sizeLayout = new QHBoxLayout(sizeContainer);
+    sizeLayout->setContentsMargins(4, 4, 4, 4);
 
-    // Contained cards
-    cardsField = new QLineEdit(navigationContainer);
-    cardsField->setPlaceholderText("Deck contains card...");
-
-    // Commanders
-    commandersField = new QLineEdit(navigationContainer);
-    commandersField->setPlaceholderText("Deck has commander...");
-
-    // DB supplemented card search
-    auto cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this);
-    auto displayModel = new CardDatabaseDisplayModel(this);
-    displayModel->setSourceModel(cardDatabaseModel);
-    auto *searchModel = new CardSearchModel(displayModel, this);
-
-    auto *proxyModel = new CardCompleterProxyModel(this);
-    proxyModel->setSourceModel(searchModel);
-    proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
-    proxyModel->setFilterRole(Qt::DisplayRole);
-
-    auto *completer = new QCompleter(proxyModel, this);
-    completer->setCompletionRole(Qt::DisplayRole);
-    completer->setCompletionMode(QCompleter::PopupCompletion);
-    completer->setCaseSensitivity(Qt::CaseInsensitive);
-    completer->setFilterMode(Qt::MatchContains);
-    completer->setMaxVisibleItems(10);
-
-    cardsField->setCompleter(completer);
-    commandersField->setCompleter(completer);
-
-    connect(cardsField, &QLineEdit::textChanged, searchModel, &CardSearchModel::updateSearchResults);
-
-    connect(cardsField, &QLineEdit::textChanged, this, [=](const QString &text) {
-        QString pattern = ".*" + QRegularExpression::escape(text) + ".*";
-        proxyModel->setFilterRegularExpression(QRegularExpression(pattern, QRegularExpression::CaseInsensitiveOption));
-        if (!text.isEmpty())
-            completer->complete();
-    });
-
-    connect(commandersField, &QLineEdit::textChanged, searchModel, &CardSearchModel::updateSearchResults);
-
-    connect(commandersField, &QLineEdit::textChanged, this, [=](const QString &text) {
-        QString pattern = ".*" + QRegularExpression::escape(text) + ".*";
-        proxyModel->setFilterRegularExpression(QRegularExpression(pattern, QRegularExpression::CaseInsensitiveOption));
-        if (!text.isEmpty())
-            completer->complete();
-    });
-
-    // Tag Name
-    deckTagNameField = new QLineEdit(navigationContainer);
-    deckTagNameField->setPlaceholderText("Deck tag");
-
-    connect(deckTagNameField, &QLineEdit::textChanged, this, &TabArchidekt::doSearch);
-
-    // Search button
-    searchPushButton = new QPushButton(navigationContainer);
-    searchPushButton->setText("Search");
-
-    connect(searchPushButton, &QPushButton::clicked, this, &TabArchidekt::doSearch);
-
-    // Card Size settings
-    settingsButton = new SettingsButtonWidget(this);
-    cardSizeSlider = new CardSizeWidget(this, nullptr, SettingsCache::instance().getArchidektPreviewSize());
-    connect(cardSizeSlider, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
-            &SettingsCache::setArchidektPreviewCardSize);
-    settingsButton->addSettingsWidget(cardSizeSlider);
-
-    // Min deck size
-    minDeckSizeLabel = new QLabel(navigationContainer);
-
-    minDeckSizeSpin = new QSpinBox(navigationContainer);
-    minDeckSizeSpin->setSpecialValueText(tr("Disabled"));
+    minDeckSizeSpin = new QSpinBox(sizeContainer);
+    minDeckSizeSpin->setSpecialValueText(tr("Any"));
     minDeckSizeSpin->setRange(0, 200);
     minDeckSizeSpin->setValue(0);
 
-    // Size logic
-    minDeckSizeLogicCombo = new QComboBox(navigationContainer);
-    minDeckSizeLogicCombo->addItems({"Exact", "≥", "≤"}); // Exact = unset, ≥ = GTE, ≤ = LTE
-    minDeckSizeLogicCombo->setCurrentIndex(1);            // default GTE
+    minDeckSizeLogicCombo = new QComboBox(sizeContainer);
+    minDeckSizeLogicCombo->addItems({"Exact", "≥", "≤"});
+    minDeckSizeLogicCombo->setCurrentIndex(1);
 
-    connect(minDeckSizeSpin, QOverload<int>::of(&QSpinBox::valueChanged), this, &TabArchidekt::doSearch);
+    sizeLayout->addWidget(new QLabel(tr("Cards:"), sizeContainer));
+    sizeLayout->addWidget(minDeckSizeSpin);
+    sizeLayout->addWidget(minDeckSizeLogicCombo);
+
+    deckSizeButton->addSettingsWidget(sizeContainer);
+
+    // Setup card name autocomplete
+    auto cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this);
+    auto displayModel = new CardDatabaseDisplayModel(this);
+    displayModel->setSourceModel(cardDatabaseModel);
+
+    const CardCompleterSetup cardSetup = createCardCompleter(displayModel, this);
+    cardsField->setCompleter(cardSetup.completer);
+    commandersField->setCompleter(cardSetup.completer);
+
+    // Keep autocomplete working for both fields
+    connectCardCompleterSearch(cardsField, cardSetup);
+    connectCardCompleterSearch(commandersField, cardSetup);
+
+    // Assemble secondary toolbar
+    secondaryToolbarLayout->addWidget(bracketLabel);
+    secondaryToolbarLayout->addWidget(edhBracketCombo);
+    secondaryToolbarLayout->addWidget(formatButton);
+    secondaryToolbarLayout->addWidget(cardsField);
+    secondaryToolbarLayout->addWidget(commandersField);
+    secondaryToolbarLayout->addWidget(deckTagNameField);
+    secondaryToolbarLayout->addWidget(deckSizeButton);
+    secondaryToolbarLayout->addStretch();
+}
+
+void TabArchidekt::connectSignals()
+{
+    // Advanced filters toggle
+    connect(advancedFiltersButton, &QPushButton::clicked, this,
+            [this](bool checked) { secondaryToolbar->setVisible(checked); });
+
+    // These trigger immediate search (no debounce needed)
+    connect(orderByCombo, &QComboBox::currentTextChanged, this, &TabArchidekt::doSearch);
+    connect(orderDirButton, &QPushButton::clicked, [this](bool checked) {
+        orderDirButton->setText(checked ? tr("Desc.") : tr("Asc."));
+        doSearch();
+    });
+
+    connect(cardSizeSlider, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::setArchidektPreviewCardSize);
+
+    // Search button triggers immediate search
+    connect(searchButton, &QPushButton::clicked, this, &TabArchidekt::doSearchImmediate);
+
+    // These trigger search (but not text fields)
+    connect(logicalAndCheck, &QCheckBox::clicked, this, &TabArchidekt::doSearch);
+    connect(packagesCheck, &QCheckBox::clicked, [this]() {
+        updatePackageModeState(packagesCheck->isChecked());
+        doSearch();
+    });
+
+    // Format filters trigger search
+    connect(edhBracketCombo, &QComboBox::currentTextChanged, this, &TabArchidekt::doSearch);
+    connect(minDeckSizeSpin, qOverload<int>(&QSpinBox::valueChanged), this, &TabArchidekt::doSearch);
     connect(minDeckSizeLogicCombo, &QComboBox::currentTextChanged, this, &TabArchidekt::doSearch);
 
-    // Page number
-    pageLabel = new QLabel(navigationContainer);
+    // Allow Enter key in text fields to trigger search
+    connect(nameField, &QLineEdit::returnPressed, this, &TabArchidekt::doSearchImmediate);
+    connect(ownerField, &QLineEdit::returnPressed, this, &TabArchidekt::doSearchImmediate);
+    connect(cardsField, &QLineEdit::returnPressed, this, &TabArchidekt::doSearchImmediate);
+    connect(commandersField, &QLineEdit::returnPressed, this, &TabArchidekt::doSearchImmediate);
+    connect(deckTagNameField, &QLineEdit::returnPressed, this, &TabArchidekt::doSearchImmediate);
 
-    pageSpin = new QSpinBox(navigationContainer);
-    pageSpin->setRange(1, 9999);
-    pageSpin->setValue(1);
+    // Format checkboxes trigger search
+    for (auto *formatCheck : formatChecks) {
+        connect(formatCheck, &QCheckBox::clicked, this, &TabArchidekt::doSearch);
+    }
+}
 
-    connect(pageSpin, QOverload<int>::of(&QSpinBox::valueChanged), this, &TabArchidekt::doSearch);
+void TabArchidekt::updatePackageModeState(bool isPackageMode)
+{
+    // Disable format-specific and commander-specific filters in package mode
+    for (auto *cb : formatChecks) {
+        cb->setEnabled(!isPackageMode);
+    }
 
-    // Page display
-    currentPageDisplay = new QWidget(container);
-    currentPageLayout = new QVBoxLayout(currentPageDisplay);
-    currentPageLayout->setContentsMargins(0, 0, 0, 0);
-    currentPageDisplay->setLayout(currentPageLayout);
+    edhBracketCombo->setEnabled(!isPackageMode);
+    if (isPackageMode) {
+        edhBracketCombo->setCurrentIndex(0);
+    }
 
-    // Layout composition
-
-    // Sort section
-    navigationLayout->addWidget(orderByCombo);
-    navigationLayout->addWidget(orderDirButton);
-
-    // Colors section
-    navigationLayout->addLayout(colorLayout);
-    navigationLayout->addWidget(logicalAndCheck);
-
-    // Formats section
-    navigationLayout->addWidget(formatSettingsWidget);
-    navigationLayout->addWidget(formatLabel);
-
-    // EDH Bracket
-    navigationLayout->addWidget(edhBracketCombo);
-
-    // Packages toggle
-    navigationLayout->addWidget(packagesCheck);
-
-    // Deck name
-    navigationLayout->addWidget(nameField);
-
-    // Owner name
-    navigationLayout->addWidget(ownerField);
-
-    // Contained cards
-    navigationLayout->addWidget(cardsField);
-
-    // Commanders
-    navigationLayout->addWidget(commandersField);
-
-    // Deck tag
-    navigationLayout->addWidget(deckTagNameField);
-
-    // Search button
-    navigationLayout->addWidget(searchPushButton);
-
-    // Card size settings
-    navigationLayout->addWidget(settingsButton);
-
-    // Min. # of cards in deck
-    navigationLayout->addWidget(minDeckSizeLabel);
-    navigationLayout->addWidget(minDeckSizeSpin);
-    navigationLayout->addWidget(minDeckSizeLogicCombo);
-
-    // Page number
-    navigationLayout->addWidget(pageLabel);
-    navigationLayout->addWidget(pageSpin);
-
-    mainLayout->addWidget(navigationContainer);
-    mainLayout->addWidget(currentPageDisplay);
-
-    // Ensure navigation stays at the top and currentPageDisplay takes remaining space
-    mainLayout->setStretch(0, 0); // navigationContainer gets minimum space
-    mainLayout->setStretch(1, 1); // currentPageDisplay expands as much as possible
-
-    setCentralWidget(container);
-
-    TabArchidekt::retranslateUi();
-
-    getTopDecks();
+    commandersField->setEnabled(!isPackageMode);
+    deckTagNameField->setEnabled(!isPackageMode);
 }
 
 void TabArchidekt::retranslateUi()
 {
-    searchPushButton->setText(tr("Search"));
-    formatLabel->setText(tr("Formats"));
-    minDeckSizeLabel->setText(tr("Min. # of Cards:"));
-    pageLabel->setText(tr("Page:"));
+    sortByLabel->setText(tr("Sort by:"));
+    orderDirButton->setText(orderDirButton->isChecked() ? tr("Desc.") : tr("Asc."));
+
+    filterByLabel->setText(tr("Filter by:"));
+
+    logicalAndCheck->setText(tr("AND"));
+    logicalAndCheck->setToolTip(tr("Require ALL selected colors"));
+
+    nameField->setPlaceholderText(tr("Deck name..."));
+    ownerField->setPlaceholderText(tr("Owner..."));
+    packagesCheck->setText(tr("Packages"));
+    advancedFiltersButton->setText(tr("Advanced Filters"));
+
+    cardsField->setPlaceholderText(tr("Contains card..."));
+    commandersField->setPlaceholderText(tr("Commander..."));
+    deckTagNameField->setPlaceholderText(tr("Tag..."));
+
+    formatButton->setButtonText(tr("Formats"));
+    deckSizeButton->setButtonText(tr("Deck Size"));
+
+    searchButton->setText(tr("Search"));
+
+    settingsButton->setToolTip(tr("Display Settings"));
 }
 
 QString TabArchidekt::buildSearchUrl()
@@ -308,13 +414,11 @@ QString TabArchidekt::buildSearchUrl()
     QUrlQuery query;
 
     // orderBy (field + direction)
-    {
-        QString field = orderByCombo->currentText();
-        if (!field.isEmpty()) {
-            bool desc = orderDirButton->isChecked();
-            QString final = desc ? "-" + field : field;
-            query.addQueryItem("orderBy", final);
-        }
+    QString field = orderByCombo->currentText();
+    if (!field.isEmpty()) {
+        bool desc = orderDirButton->isChecked();
+        QString final = desc ? "-" + field : field;
+        query.addQueryItem("orderBy", final);
     }
 
     // Colors
@@ -331,29 +435,26 @@ QString TabArchidekt::buildSearchUrl()
         query.addQueryItem("logicalAnd", "true");
     }
 
-    // Formats
+    // Formats (disabled in package mode)
     if (!packagesCheck->isChecked()) {
         QStringList formatIds;
-        for (int i = 0; i < formatChecks.size(); ++i)
+        for (int i = 0; i < formatChecks.size(); ++i) {
             if (formatChecks[i]->isChecked()) {
                 formatIds << QString::number(i + 1);
             }
+        }
 
         if (!formatIds.isEmpty()) {
             query.addQueryItem("deckFormat", formatIds.join(","));
         }
-    }
 
-    // edhBracket
-    if (!packagesCheck->isChecked()) {
-        if (!edhBracketCombo->currentText().isEmpty()) {
-            if (edhBracketCombo->currentText() != tr("Any Bracket")) {
-                query.addQueryItem("edhBracket", edhBracketCombo->currentText());
-            }
+        // edhBracket
+        if (edhBracketCombo->currentIndex() > 0) {
+            query.addQueryItem("edhBracket", edhBracketCombo->currentText());
         }
     }
 
-    // Search for card packages instead of decks
+    // Package mode
     if (packagesCheck->isChecked()) {
         query.addQueryItem("packages", "true");
     }
@@ -363,54 +464,48 @@ QString TabArchidekt::buildSearchUrl()
         query.addQueryItem("name", nameField->text());
     }
 
-    // owner
+    // Owner
     if (!ownerField->text().isEmpty()) {
         query.addQueryItem("ownerUsername", ownerField->text());
     }
 
-    // cards
+    // Cards
     if (!cardsField->text().isEmpty()) {
-        query.addQueryItem("cardName", cardsField->text());
+        query.addQueryItem("cards", cardsField->text());
     }
 
-    // Commander Name
-    if (!packagesCheck->isChecked()) {
-        if (!commandersField->text().isEmpty()) {
-            query.addQueryItem("commanderName", commandersField->text());
-        }
+    // Commander (disabled in package mode)
+    if (!packagesCheck->isChecked() && !commandersField->text().isEmpty()) {
+        query.addQueryItem("commanderName", commandersField->text());
     }
 
-    // deckTagName
-    if (!packagesCheck->isChecked()) {
-        if (!deckTagNameField->text().isEmpty()) {
-            query.addQueryItem("deckTagName", deckTagNameField->text());
-        }
+    // Deck tag (disabled in package mode)
+    if (!packagesCheck->isChecked() && !deckTagNameField->text().isEmpty()) {
+        query.addQueryItem("deckTagName", deckTagNameField->text());
     }
 
-    // page number
-    if (pageSpin->value() <= 1) {
-        query.addQueryItem("page", QString::number(pageSpin->value()));
-    }
+    // Page number (for infinite scroll)
+    query.addQueryItem("page", QString::number(currentPage));
 
     // Min deck size
     if (minDeckSizeSpin->value() != 0) {
         query.addQueryItem("size", QString::number(minDeckSizeSpin->value()));
 
-        QString logic = "GTE"; // default
+        QString logic = "GTE";
         QString selected = minDeckSizeLogicCombo->currentText();
-        if (selected == "≥")
+        if (selected == "≥") {
             logic = "GTE";
-        else if (selected == "≤")
+        } else if (selected == "≤") {
             logic = "LTE";
-        else
-            logic = ""; // Exact = unset
+        } else {
+            logic = "";
+        }
 
         if (!logic.isEmpty()) {
             query.addQueryItem("sizeLogic", logic);
         }
     }
 
-    // build final URL
     QUrl url("https://archidekt.com/api/decks/v3/");
     url.setQuery(query);
 
@@ -419,32 +514,56 @@ QString TabArchidekt::buildSearchUrl()
 
 void TabArchidekt::doSearch()
 {
-    searchDebounceTimer->start();
+    // Reset to first page on new search
+    currentPage = 1;
+    // We're searching, so we'll be in list mode
+    isListMode = true;
+    // Don't debounce - only called by explicit user actions now
+    doSearchImmediate();
 }
 
 void TabArchidekt::doSearchImmediate()
 {
     QString url = buildSearchUrl();
     QNetworkRequest req{QUrl(url)};
+    req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
+    networkManager->get(req);
+}
+
+void TabArchidekt::loadNextPage()
+{
+    if (isLoadingMore) {
+        return;
+    }
+
+    isLoadingMore = true;
+    currentPage++;
+
+    QString url = buildSearchUrl();
+    QNetworkRequest req{QUrl(url)};
+    req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
     networkManager->get(req);
 }
 
 void TabArchidekt::actNavigatePage(QString url)
 {
     QNetworkRequest request{QUrl(url)};
+    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
     networkManager->get(request);
 }
 
 void TabArchidekt::getTopDecks()
 {
+    currentPage = 1;
     QNetworkRequest request{QUrl(buildSearchUrl())};
+    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
     networkManager->get(request);
 }
 
 void TabArchidekt::processApiJson(QNetworkReply *reply)
 {
     if (reply->error() != QNetworkReply::NoError) {
-        qDebug() << "Network error occurred:" << reply->errorString();
+        isLoadingMore = false;
         reply->deleteLater();
         return;
     }
@@ -453,17 +572,14 @@ void TabArchidekt::processApiJson(QNetworkReply *reply)
     QJsonDocument jsonDoc = QJsonDocument::fromJson(responseData);
 
     if (!jsonDoc.isObject()) {
-        qDebug() << "Invalid JSON response received.";
+        isLoadingMore = false;
         reply->deleteLater();
         return;
     }
 
     QJsonObject jsonObj = jsonDoc.object();
-
-    // Get the actual URL from the reply
     QString responseUrl = reply->url().toString();
 
-    // Check if the response URL matches a commander request
     if (responseUrl.startsWith("https://archidekt.com/api/decks/v3/")) {
         processTopDecksResponse(jsonObj);
     } else if (responseUrl.startsWith("https://archidekt.com/api/decks/")) {
@@ -472,6 +588,7 @@ void TabArchidekt::processApiJson(QNetworkReply *reply)
         prettyPrintJson(jsonObj, 4);
     }
 
+    isLoadingMore = false;
     reply->deleteLater();
 }
 
@@ -480,28 +597,27 @@ void TabArchidekt::processTopDecksResponse(QJsonObject reply)
     ArchidektDeckListingApiResponse deckData;
     deckData.fromJson(reply);
 
-    // **Remove previous page display to prevent stacking**
-    if (currentPageDisplay) {
-        mainLayout->removeWidget(currentPageDisplay);
-        delete currentPageDisplay;
-        currentPageDisplay = nullptr;
+    // New search → clear everything
+    if (currentPage == 1) {
+        QLayoutItem *item;
+        while ((item = resultsLayout->takeAt(0)) != nullptr) {
+            delete item->widget();
+            delete item;
+        }
+
+        listingsWidget = new ArchidektApiResponseDeckListingsDisplayWidget(resultsContainer, deckData, cardSizeSlider);
+
+        connect(listingsWidget, &ArchidektApiResponseDeckListingsDisplayWidget::requestNavigation, this,
+                &TabArchidekt::actNavigatePage);
+
+        resultsLayout->addWidget(listingsWidget);
+        return;
     }
 
-    // **Create new currentPageDisplay**
-    currentPageDisplay = new QWidget(container);
-    currentPageLayout = new QVBoxLayout(currentPageDisplay);
-    currentPageDisplay->setLayout(currentPageLayout);
-
-    auto display = new ArchidektApiResponseDeckListingsDisplayWidget(currentPageDisplay, deckData, cardSizeSlider);
-    connect(display, &ArchidektApiResponseDeckListingsDisplayWidget::requestNavigation, this,
-            &TabArchidekt::actNavigatePage);
-    currentPageLayout->addWidget(display);
-
-    mainLayout->addWidget(currentPageDisplay);
-
-    // **Ensure layout stays correct**
-    mainLayout->setStretch(0, 0); // Keep navigationContainer at the top
-    mainLayout->setStretch(1, 1); // Make sure currentPageDisplay takes remaining space
+    // Infinite scroll → append
+    if (listingsWidget) {
+        listingsWidget->append(deckData);
+    }
 }
 
 void TabArchidekt::processDeckResponse(QJsonObject reply)
@@ -509,54 +625,47 @@ void TabArchidekt::processDeckResponse(QJsonObject reply)
     ArchidektApiResponseDeck deckData;
     deckData.fromJson(reply);
 
-    // **Remove previous page display to prevent stacking**
-    if (currentPageDisplay) {
-        mainLayout->removeWidget(currentPageDisplay);
-        delete currentPageDisplay;
-        currentPageDisplay = nullptr;
+    // We're in single deck mode - disable infinite scroll
+    isListMode = false;
+
+    // Clear existing results for single deck view
+    QLayoutItem *item;
+    while ((item = resultsLayout->takeAt(0)) != nullptr) {
+        delete item->widget();
+        delete item;
     }
 
-    // **Create new currentPageDisplay**
-    currentPageDisplay = new QWidget(container);
-    currentPageLayout = new QVBoxLayout(currentPageDisplay);
-    currentPageDisplay->setLayout(currentPageLayout);
-
-    auto display = new ArchidektApiResponseDeckDisplayWidget(currentPageDisplay, deckData, cardSizeSlider);
+    auto display = new ArchidektApiResponseDeckDisplayWidget(resultsContainer, deckData, cardSizeSlider);
     connect(display, &ArchidektApiResponseDeckDisplayWidget::requestNavigation, this, &TabArchidekt::actNavigatePage);
+    connect(display, &ArchidektApiResponseDeckDisplayWidget::requestSearch, this, &TabArchidekt::doSearch);
     connect(display, &ArchidektApiResponseDeckDisplayWidget::openInDeckEditor, tabSupervisor,
             &TabSupervisor::openDeckInNewTab);
-    currentPageLayout->addWidget(display);
-
-    mainLayout->addWidget(currentPageDisplay);
-
-    // **Ensure layout stays correct**
-    mainLayout->setStretch(0, 0); // Keep navigationContainer at the top
-    mainLayout->setStretch(1, 1); // Make sure currentPageDisplay takes remaining space
+    resultsLayout->addWidget(display);
 }
 
 void TabArchidekt::prettyPrintJson(const QJsonValue &value, int indentLevel)
 {
-    const QString indent(indentLevel * 2, ' '); // Adjust spacing as needed for pretty printing
+    const QString indent(indentLevel * 2, ' ');
 
     if (value.isObject()) {
         QJsonObject obj = value.toObject();
         for (auto it = obj.begin(); it != obj.end(); ++it) {
-            qDebug().noquote() << indent + it.key() + ":";
+            qInfo().noquote() << indent + it.key() + ":";
             prettyPrintJson(it.value(), indentLevel + 1);
         }
     } else if (value.isArray()) {
         QJsonArray array = value.toArray();
         for (int i = 0; i < array.size(); ++i) {
-            qDebug().noquote() << indent + QString("[%1]:").arg(i);
+            qInfo().noquote() << indent + QString("[%1]:").arg(i);
             prettyPrintJson(array[i], indentLevel + 1);
         }
     } else if (value.isString()) {
-        qDebug().noquote() << indent + "\"" + value.toString() + "\"";
+        qInfo().noquote() << indent + "\"" + value.toString() + "\"";
     } else if (value.isDouble()) {
-        qDebug().noquote() << indent + QString::number(value.toDouble());
+        qInfo().noquote() << indent + QString::number(value.toDouble());
     } else if (value.isBool()) {
-        qDebug().noquote() << indent + (value.toBool() ? "true" : "false");
+        qInfo().noquote() << indent + (value.toBool() ? "true" : "false");
     } else if (value.isNull()) {
-        qDebug().noquote() << indent + "null";
+        qInfo().noquote() << indent + "null";
     }
 }
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 68a5b78c9..015b8590b 100644
--- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h
+++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.h
@@ -1,29 +1,47 @@
 #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 <QCheckBox>
-#include <QComboBox>
-#include <QHBoxLayout>
-#include <QLineEdit>
-#include <QNetworkAccessManager>
-#include <QPushButton>
-#include <QSpinBox>
+#include <QChar>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QList>
+#include <QSet>
 #include <QString>
-#include <libcockatrice/card/database/card_database.h>
+#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;
 
 /** Base API link for Archidekt deck search */
 inline QString archidektApiLink = "https://archidekt.com/api/decks/v3/?name=";
 
+class ManaSymbolWidget;
+
 /**
  * @brief Tab for browsing, searching, and filtering Archidekt decks.
  *
  * This class provides a comprehensive interface for querying decks from the Archidekt API.
  * Users can filter decks by name, owner, included cards, commanders, deck tags, colors, EDH bracket,
- * and formats. It also provides sorting and pagination, as well as a card size adjustment widget.
+ * and formats. It supports infinite scroll pagination for seamless browsing.
  */
 class TabArchidekt : public Tab
 {
@@ -63,7 +81,7 @@ public:
      * - Packages toggle
      * - Sorting field and direction
      * - Minimum amount of cards in the deck
-     * - Pagination (page)
+     * - Current page (for infinite scroll)
      */
     QString buildSearchUrl();
 
@@ -90,32 +108,45 @@ public:
         return cardSizeSlider;
     }
 
-    /** @brief Network manager for handling API requests */
-    QNetworkAccessManager *networkManager;
-
 public slots:
     /**
-     * @brief Trigger a search using the current filters
+     * @brief Trigger a debounced search using the current filters
      *
-     * Sends a network request to the Archidekt API using the URL generated by buildSearchUrl().
-     * Updates the current page display with results asynchronously.
+     * Resets to page 1 and starts the debounce timer. The actual search will execute
+     * after 300ms of inactivity.
      */
     void doSearch();
+
+    /**
+     * @brief Immediately trigger a search using the current filters
+     *
+     * Sends a network request to the Archidekt API using the URL generated by buildSearchUrl().
+     * Updates the results display asynchronously.
+     */
     void doSearchImmediate();
+
+    /**
+     * @brief Load the next page of results for infinite scroll
+     *
+     * Increments the current page and fetches additional results, which are appended
+     * to the existing results display.
+     */
+    void loadNextPage();
+
     /**
      * @brief Process a network reply containing JSON data
      * @param reply QNetworkReply object with the API response
      *
-     * Determines whether the response corresponds to a top decks query or a single deck,
+     * Determines whether the response corresponds to a deck listing or a single deck,
      * and dispatches it to the appropriate handler.
      */
     void processApiJson(QNetworkReply *reply);
 
     /**
      * @brief Handle a JSON response containing multiple decks
-     * @param reply QJsonObject containing top deck listings
+     * @param reply QJsonObject containing deck listings
      *
-     * Clears the previous page display and creates a new display widget for the results.
+     * If this is page 1, clears previous results. Appends new results to the display.
      */
     void processTopDecksResponse(QJsonObject reply);
 
@@ -123,7 +154,7 @@ public slots:
      * @brief Handle a JSON response for a single deck
      * @param reply QJsonObject containing deck data
      *
-     * Clears the previous page display and creates a new display widget for the deck details.
+     * Clears the results area and displays the single deck details.
      */
     void processDeckResponse(QJsonObject reply);
 
@@ -138,107 +169,129 @@ public slots:
      * @brief Navigate to a specified page URL
      * @param url The URL to request
      *
-     * Typically called when a navigation button is clicked in a deck listing.
+     * Typically called when a deck card is clicked in the listing.
      */
     void actNavigatePage(QString url);
 
     /**
      * @brief Fetch top decks from the Archidekt API
      *
-     * Called on initialization to populate the initial page display.
+     * Called on initialization to populate the initial results display.
      */
     void getTopDecks();
 
+protected:
+    /**
+     * @brief Event filter to catch wheel events for infinite scroll
+     * @param obj The object that received the event
+     * @param event The event to filter
+     * @return bool Whether the event was handled
+     */
+    bool eventFilter(QObject *obj, QEvent *event) override;
+
 private:
-    QTimer *searchDebounceTimer; ///< Timer to debounce search requests by spin-boxes etc.
+    /**
+     * @brief Initialize the main UI layout and toolbars
+     *
+     * Creates the container, main layout, primary toolbar (sort, colors, name, owner, packages),
+     * secondary toolbar (advanced filters), and scrollable results area.
+     */
+    void initializeUi();
+
+    /**
+     * @brief Set up all filter widgets
+     *
+     * Creates filter widgets for:
+     * - Card search with autocomplete
+     * - Commander search with autocomplete
+     * - Deck tags
+     * - Format selection (collapsible)
+     * - Deck size filter (collapsible)
+     */
+    void setupFilterWidgets();
+
+    /**
+     * @brief Connect all signals and slots for UI interactions
+     *
+     * Links all widget signals to their appropriate handlers, including
+     * search triggers, filter changes, package mode toggling, and infinite scroll.
+     */
+    void connectSignals();
+
+    /**
+     * @brief Update UI state when package mode is toggled
+     * @param isPackageMode Whether package mode is currently enabled
+     *
+     * Disables format-specific and commander-specific filters when searching
+     * for card packages instead of full decks.
+     */
+    void updatePackageModeState(bool isPackageMode);
+
+    // ---------------------------------------------------------------------
+    // Network & Timing
+    // ---------------------------------------------------------------------
+
+    QNetworkAccessManager *networkManager; ///< Network manager for handling API requests
+    QTimer *searchDebounceTimer;           ///< Timer to debounce search requests
+    int currentPage;                       ///< Current page number for infinite scroll
+    bool isLoadingMore;                    ///< Flag to prevent multiple simultaneous page loads
+    bool isListMode;
+    ArchidektApiResponseDeckListingsDisplayWidget *listingsWidget = nullptr;
 
     // ---------------------------------------------------------------------
     // Layout Containers
     // ---------------------------------------------------------------------
 
-    QWidget *container;             ///< Root container for the entire tab
-    QVBoxLayout *mainLayout;        ///< Outer vertical layout containing navigation and page display
-    QWidget *navigationContainer;   ///< Container for all navigation/filter controls
-    QHBoxLayout *navigationLayout;  ///< Layout for horizontal arrangement of filter widgets
-    QWidget *currentPageDisplay;    ///< Widget containing the currently displayed deck(s)
-    QVBoxLayout *currentPageLayout; ///< Layout for deck display widgets
+    QWidget *container;      ///< Root container for the entire tab
+    QVBoxLayout *mainLayout; ///< Outer vertical layout containing toolbars and results
+
+    QWidget *primaryToolbar;           ///< Primary toolbar with most important filters
+    QHBoxLayout *primaryToolbarLayout; ///< Layout for primary toolbar
+
+    QWidget *secondaryToolbar;           ///< Secondary toolbar with advanced filters
+    QHBoxLayout *secondaryToolbarLayout; ///< Layout for secondary toolbar
+
+    QScrollArea *scrollArea;    ///< Scrollable area for results (enables infinite scroll)
+    QWidget *resultsContainer;  ///< Container widget inside scroll area
+    QVBoxLayout *resultsLayout; ///< Layout for results (decks appended here)
 
     // ---------------------------------------------------------------------
-    // Sorting Controls
+    // Primary Toolbar Controls (Most Important)
     // ---------------------------------------------------------------------
 
+    QLabel *sortByLabel;         ///< Label for sort controls
     QComboBox *orderByCombo;     ///< Dropdown for selecting the sort field
     QPushButton *orderDirButton; ///< Toggle button for ascending/descending sort
 
-    // ---------------------------------------------------------------------
-    // Color Filters
-    // ---------------------------------------------------------------------
+    QLabel *filterByLabel;                  ///< Label for filter controls
+    QList<ManaSymbolWidget *> colorSymbols; ///< Mana symbol toggle buttons
+    QSet<QChar> activeColors;               ///< Set of currently active mana colors
+    QCheckBox *logicalAndCheck;             ///< Require ALL selected colors instead of ANY
 
-    QSet<QChar> activeColors;   ///< Set of currently active mana colors
-    QCheckBox *logicalAndCheck; ///< Require ALL selected colors instead of ANY
+    QLineEdit *nameField;               ///< Input for deck name filter
+    QLineEdit *ownerField;              ///< Input for owner name filter
+    QCheckBox *packagesCheck;           ///< Toggle for searching card packages instead of full decks
+    QPushButton *searchButton;          ///< Button to trigger search
+    QPushButton *advancedFiltersButton; ///< Button to show/hide advanced filters
 
-    // ---------------------------------------------------------------------
-    // Format Filters
-    // ---------------------------------------------------------------------
-
-    QLabel *formatLabel;                        ///< Label displaying "Formats"
-    SettingsButtonWidget *formatSettingsWidget; ///< Collapsible widget containing format checkboxes
-    QVector<QCheckBox *> formatChecks;          ///< Individual checkboxes for each format
-
-    // ---------------------------------------------------------------------
-    // EDH Bracket / Package Toggle
-    // ---------------------------------------------------------------------
-
-    QComboBox *edhBracketCombo; ///< Dropdown for EDH bracket selection
-    QCheckBox *packagesCheck;   ///< Toggle for searching card packages instead of full decks
-
-    // ---------------------------------------------------------------------
-    // Basic Search Fields
-    // ---------------------------------------------------------------------
-
-    QLineEdit *nameField;  ///< Input for deck name filter
-    QLineEdit *ownerField; ///< Input for owner name filter
-
-    // ---------------------------------------------------------------------
-    // Card Filters
-    // ---------------------------------------------------------------------
-
-    QLineEdit *cardsField;      ///< Input for cards included in the deck (comma-separated)
-    QLineEdit *commandersField; ///< Input for commander cards (comma-separated)
-
-    // ---------------------------------------------------------------------
-    // Deck Tag
-    // ---------------------------------------------------------------------
-
-    QLineEdit *deckTagNameField; ///< Input for deck tag filtering
-
-    // ---------------------------------------------------------------------
-    // Search Trigger
-    // ---------------------------------------------------------------------
-
-    QPushButton *searchPushButton; ///< Button to trigger the search manually
-
-    // ---------------------------------------------------------------------
-    // UI Settings (Card Size)
-    // ---------------------------------------------------------------------
-
-    SettingsButtonWidget *settingsButton; ///< Container for additional UI settings
+    SettingsButtonWidget *settingsButton; ///< Container for card size settings
     CardSizeWidget *cardSizeSlider;       ///< Slider to adjust card size in results
 
     // ---------------------------------------------------------------------
-    // Minimum Cards in Deck
+    // Secondary Toolbar Controls (Advanced Filters)
     // ---------------------------------------------------------------------
 
-    QLabel *minDeckSizeLabel;         ///< Label for minimum number of cards per deck
-    QSpinBox *minDeckSizeSpin;        ///< Spinner to select minimum deck size
-    QComboBox *minDeckSizeLogicCombo; ///< Combo box for the size logic to apply
+    QLineEdit *cardsField;       ///< Input for cards included in the deck
+    QLineEdit *commandersField;  ///< Input for commander cards
+    QLineEdit *deckTagNameField; ///< Input for deck tag filtering
 
-    // ---------------------------------------------------------------------
-    // Pagination
-    // ---------------------------------------------------------------------
+    SettingsButtonWidget *formatButton; ///< Collapsible button for format filters
+    QVector<QCheckBox *> formatChecks;  ///< Individual checkboxes for each format
+    QComboBox *edhBracketCombo;         ///< Dropdown for EDH bracket selection
 
-    QLabel *pageLabel;  ///< Label for current page selection
-    QSpinBox *pageSpin; ///< Spinner to select the page number for results
+    SettingsButtonWidget *deckSizeButton; ///< Collapsible button for deck size filter
+    QSpinBox *minDeckSizeSpin;            ///< Spinner to select minimum deck size
+    QComboBox *minDeckSizeLogicCombo;     ///< Combo box for size comparison logic
 
     // ---------------------------------------------------------------------
     // Optional Context
@@ -247,4 +300,4 @@ private:
     CardInfoPtr cardToQuery; ///< Optional pre-selected card for initial filtering
 };
 
-#endif // COCKATRICE_TAB_ARCHIDEKT_H
+#endif // COCKATRICE_TAB_ARCHIDEKT_H
\ No newline at end of file
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
new file mode 100644
index 000000000..aa892d0d4
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.cpp
@@ -0,0 +1,19 @@
+#include "card_in_deck_request.h"
+
+#include <QJsonValue>
+
+CardInDeckRequest CardInDeckRequest::fromJson(const QJsonObject &json)
+{
+    CardInDeckRequest request;
+    request.card = json.value("card").toString();
+    request.quantity = json.value("quantity").toInt();
+    return request;
+}
+
+QJsonObject CardInDeckRequest::toJson() const
+{
+    QJsonObject json;
+    json.insert("card", card);
+    json.insert("quantity", quantity);
+    return json;
+}
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
new file mode 100644
index 000000000..6bcaca42f
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/card_in_deck_request.h
@@ -0,0 +1,15 @@
+#ifndef COCKATRICE_CARD_IN_DECK_REQUEST_H
+#define COCKATRICE_CARD_IN_DECK_REQUEST_H
+#include <QJsonObject>
+#include <QString>
+
+struct CardInDeckRequest
+{
+    static CardInDeckRequest fromJson(const QJsonObject &json);
+    QJsonObject toJson() const;
+
+    QString card;
+    int quantity;
+};
+
+#endif // COCKATRICE_CARD_IN_DECK_REQUEST_H
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
new file mode 100644
index 000000000..0ae5dd360
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_card_result.cpp
@@ -0,0 +1,28 @@
+#include "commander_spellbook_card_result.h"
+
+#include <QJsonValue>
+
+CommanderSpellbookCardResult CommanderSpellbookCardResult::fromJson(const QJsonObject &json)
+{
+    CommanderSpellbookCardResult result;
+
+    result.id = json.value("id").toString();
+    result.name = json.value("name").toString();
+    result.oracleId = json.value("oracleId").toString();
+    result.spoiler = json.value("spoiler").toBool();
+    result.typeLine = json.value("typeLine").toString();
+
+    result.imageUriFrontPng = json.value("imageUriFrontPng").toString();
+    result.imageUriFrontLarge = json.value("imageUriFrontLarge").toString();
+    result.imageUriFrontNormal = json.value("imageUriFrontNormal").toString();
+    result.imageUriFrontSmall = json.value("imageUriFrontSmall").toString();
+    result.imageUriFrontArtCrop = json.value("imageUriFrontArtCrop").toString();
+
+    result.imageUriBackPng = json.value("imageUriBackPng").toString();
+    result.imageUriBackLarge = json.value("imageUriBackLarge").toString();
+    result.imageUriBackNormal = json.value("imageUriBackNormal").toString();
+    result.imageUriBackSmall = json.value("imageUriBackSmall").toString();
+    result.imageUriBackArtCrop = json.value("imageUriBackArtCrop").toString();
+
+    return result;
+}
diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_card_result.h b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_card_result.h
new file mode 100644
index 000000000..eaa474097
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_card_result.h
@@ -0,0 +1,29 @@
+#ifndef COCKATRICE_COMMANDER_SPELLBOOK_CARD_RESULT_H
+#define COCKATRICE_COMMANDER_SPELLBOOK_CARD_RESULT_H
+#include <QJsonObject>
+#include <QString>
+
+struct CommanderSpellbookCardResult
+{
+    static CommanderSpellbookCardResult fromJson(const QJsonObject &json);
+
+    QString id;
+    QString name;
+    QString oracleId;
+    bool spoiler = false;
+    QString typeLine;
+
+    QString imageUriFrontPng;
+    QString imageUriFrontLarge;
+    QString imageUriFrontNormal;
+    QString imageUriFrontSmall;
+    QString imageUriFrontArtCrop;
+
+    QString imageUriBackPng;
+    QString imageUriBackLarge;
+    QString imageUriBackNormal;
+    QString imageUriBackSmall;
+    QString imageUriBackArtCrop;
+};
+
+#endif // COCKATRICE_COMMANDER_SPELLBOOK_CARD_RESULT_H
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
new file mode 100644
index 000000000..ac259f3aa
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.cpp
@@ -0,0 +1,103 @@
+#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)
+{
+    CommanderSpellbookDeckRequest request;
+
+    // Main deck
+    const QJsonArray mainArray = json.value("main").toArray();
+    for (const QJsonValue &value : mainArray) {
+        if (!value.isObject()) {
+            continue;
+        }
+
+        request.mainDeck.append(CardInDeckRequest::fromJson(value.toObject()));
+
+        // Max size allowed by commanderspellbook
+        if (request.mainDeck.size() >= 600) {
+            break;
+        }
+    }
+
+    // Commanders
+    const QJsonArray commanderArray = json.value("commanders").toArray();
+    for (const QJsonValue &value : commanderArray) {
+        if (!value.isObject()) {
+            continue;
+        }
+
+        request.commanderDeck.append(CardInDeckRequest::fromJson(value.toObject()));
+
+        // Max size allowed by commanderspellbook
+        if (request.commanderDeck.size() >= 12) {
+            break;
+        }
+    }
+
+    return request;
+}
+
+QJsonObject CommanderSpellbookDeckRequest::toJson() const
+{
+    QJsonObject json;
+
+    QJsonArray mainArray;
+    for (const CardInDeckRequest &card : mainDeck) {
+        mainArray.append(card.toJson());
+    }
+
+    QJsonArray commanderArray;
+    for (const CardInDeckRequest &card : commanderDeck) {
+        commanderArray.append(card.toJson());
+    }
+
+    json.insert("main", mainArray);
+    json.insert("commanders", commanderArray);
+
+    return json;
+}
+
+CommanderSpellbookDeckRequest CommanderSpellbookDeckRequest::fromDeckList(const DeckList &deck)
+{
+    CommanderSpellbookDeckRequest request;
+
+    // --- Mainboard ---
+    const auto mainCards = deck.getCardNodes({DECK_ZONE_MAIN});
+    for (const DecklistCardNode *node : mainCards) {
+        if (!node) {
+            continue;
+        }
+
+        QJsonObject json;
+        json.insert("card", node->getName());
+        json.insert("quantity", node->getNumber());
+        request.mainDeck.append(CardInDeckRequest::fromJson(json));
+
+        // Max size allowed by commanderspellbook
+        if (request.mainDeck.size() >= 600) {
+            break;
+        }
+    }
+
+    // --- Commander (bannerCard) ---
+    const auto &metadata = deck.getMetadata();
+    if (!metadata.bannerCard.name.isEmpty()) {
+        QJsonObject json;
+        json.insert("card", metadata.bannerCard.name);
+        json.insert("quantity", 1);
+        request.commanderDeck.append(CardInDeckRequest::fromJson(json));
+    }
+
+    return request;
+}
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
new file mode 100644
index 000000000..002f7666f
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_deck_request.h
@@ -0,0 +1,20 @@
+#ifndef COCKATRICE_COMMANDER_SPELLBOOK_DECK_REQUEST_H
+#define COCKATRICE_COMMANDER_SPELLBOOK_DECK_REQUEST_H
+#include "card_in_deck_request.h"
+
+#include <QJsonObject>
+#include <QList>
+
+class DeckList;
+
+struct CommanderSpellbookDeckRequest
+{
+    static CommanderSpellbookDeckRequest fromJson(const QJsonObject &json);
+    static CommanderSpellbookDeckRequest fromDeckList(const DeckList &deck);
+    QJsonObject toJson() const;
+
+    QList<CardInDeckRequest> mainDeck;      // maxItems: 600
+    QList<CardInDeckRequest> commanderDeck; // maxItems: 12
+};
+
+#endif // COCKATRICE_COMMANDER_SPELLBOOK_DECK_REQUEST_H
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
new file mode 100644
index 000000000..35ba954a1
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.cpp
@@ -0,0 +1,97 @@
+#include "commander_spellbook_estimate_bracket_result.h"
+
+#include <QJsonArray>
+#include <QJsonValue>
+#include <QJsonValueRef>
+
+EstimateBracketResult EstimateBracketResult::fromJson(const QJsonObject &json)
+{
+    EstimateBracketResult result;
+
+    result.bracketTag = json.value("bracketTag").toString();
+
+    //
+    // Cards
+    //
+    for (const auto &value : json.value("cards").toArray()) {
+        if (!value.isObject()) {
+            continue;
+        }
+
+        const QJsonObject obj = value.toObject();
+
+        CommanderSpellbookCardResult card = CommanderSpellbookCardResult::fromJson(obj.value("card").toObject());
+
+        if (obj.value("gameChanger").toBool()) {
+            result.gameChangerCards.append(card);
+        }
+
+        if (obj.value("massLandDenial").toBool()) {
+            result.massLandDenialCards.append(card);
+        }
+
+        if (obj.value("extraTurn").toBool()) {
+            result.extraTurnCards.append(card);
+        }
+    }
+
+    //
+    // Templates
+    //
+    for (const auto &value : json.value("templates").toArray()) {
+        if (!value.isObject()) {
+            continue;
+        }
+
+        const QJsonObject obj = value.toObject();
+
+        CommanderSpellbookVariantResult variant = CommanderSpellbookVariantResult::fromJson(obj);
+
+        if (obj.value("massLandDenial").toBool()) {
+            result.massLandDenialTemplates.append(variant);
+        }
+
+        if (obj.value("extraTurn").toBool()) {
+            result.extraTurnTemplates.append(variant);
+        }
+    }
+
+    //
+    // Combos
+    //
+    for (const auto &value : json.value("combos").toArray()) {
+        if (!value.isObject()) {
+            continue;
+        }
+
+        const QJsonObject obj = value.toObject();
+
+        CommanderSpellbookVariantResult combo = CommanderSpellbookVariantResult::fromJson(obj);
+
+        if (obj.value("massLandDenial").toBool()) {
+            result.massLandDenialCombos.append(combo);
+        }
+
+        if (obj.value("extraTurn").toBool()) {
+            result.extraTurnCombos.append(combo);
+        }
+
+        if (obj.value("lock").toBool()) {
+            result.lockCombos.append(combo);
+        }
+
+        if (obj.value("skipTurns").toBool()) {
+            result.skipTurnsCombos.append(combo);
+        }
+
+        if (obj.value("definitelyTwoCard").toBool()) {
+            result.definitelyTwoCardCombos.append(combo);
+        }
+
+        if (obj.value("arguablyTwoCard").toBool()) {
+            result.arguablyTwoCardCombos.append(combo);
+        }
+    }
+
+    return 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
new file mode 100644
index 000000000..c9c152d35
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_estimate_bracket_result.h
@@ -0,0 +1,33 @@
+#ifndef COCKATRICE_COMMANDER_SPELLBOOK_ESTIMATE_BRACKET_RESULT_H
+#define COCKATRICE_COMMANDER_SPELLBOOK_ESTIMATE_BRACKET_RESULT_H
+
+#include "commander_spellbook_card_result.h"
+#include "commander_spellbook_variant_result.h"
+
+#include <QJsonObject>
+#include <QList>
+#include <QString>
+
+struct EstimateBracketResult
+{
+    static EstimateBracketResult fromJson(const QJsonObject &json);
+
+    QString bracketTag;
+
+    QList<CommanderSpellbookCardResult> gameChangerCards;
+    QList<CommanderSpellbookCardResult> massLandDenialCards;
+    QList<CommanderSpellbookCardResult> extraTurnCards;
+
+    QList<CommanderSpellbookVariantResult> massLandDenialTemplates;
+    QList<CommanderSpellbookVariantResult> extraTurnTemplates;
+
+    QList<CommanderSpellbookVariantResult> massLandDenialCombos;
+    QList<CommanderSpellbookVariantResult> extraTurnCombos;
+    QList<CommanderSpellbookVariantResult> lockCombos;
+    QList<CommanderSpellbookVariantResult> skipTurnsCombos;
+
+    QList<CommanderSpellbookVariantResult> definitelyTwoCardCombos;
+    QList<CommanderSpellbookVariantResult> arguablyTwoCardCombos;
+};
+
+#endif // COCKATRICE_COMMANDER_SPELLBOOK_ESTIMATE_BRACKET_RESULT_H
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
new file mode 100644
index 000000000..53630a69e
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.cpp
@@ -0,0 +1,37 @@
+#include "commander_spellbook_variant_result.h"
+
+#include <QJsonValue>
+
+CommanderSpellbookVariantResult CommanderSpellbookVariantResult::fromJson(const QJsonObject &json)
+{
+    CommanderSpellbookVariantResult result;
+
+    result.id = json.value("id").toString();
+    result.status = json.value("status").toString();
+
+    result.uses = json.value("uses").toArray();
+    result.cardRequires = json.value("requires").toArray();
+    result.produces = json.value("produces").toArray();
+    result.of = json.value("of").toArray();
+    result.includes = json.value("includes").toArray();
+
+    result.manaNeeded = json.value("manaNeeded").toArray();
+    result.manaValueNeeded = json.value("manaValueNeeded").toArray();
+
+    result.easyPrerequisites = json.value("easyPrerequisites").toArray();
+    result.notablePrerequisites = json.value("notablePrerequisites").toArray();
+
+    result.description = json.value("description").toString();
+    result.notes = json.value("notes").toString();
+    result.popularity = json.value("popularity").toDouble();
+
+    result.spoiler = json.value("spoiler").toBool();
+    result.bracketTag = json.value("bracketTag").toString();
+
+    result.legalities = json.value("legalities").toObject();
+    result.prices = json.value("prices").toObject();
+
+    result.variantCount = json.value("variantCount").toInt();
+
+    return 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
new file mode 100644
index 000000000..49f45f92c
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/api_response/commander_spellbook_variant_result.h
@@ -0,0 +1,40 @@
+#ifndef COCKATRICE_COMMANDER_SPELLBOOK_VARIANT_RESULT_H
+#define COCKATRICE_COMMANDER_SPELLBOOK_VARIANT_RESULT_H
+
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QString>
+
+struct CommanderSpellbookVariantResult
+{
+    static CommanderSpellbookVariantResult fromJson(const QJsonObject &json);
+
+    QString id;
+    QString status;
+
+    QJsonArray uses;
+    QJsonArray cardRequires;
+    QJsonArray produces;
+    QJsonArray of;
+    QJsonArray includes;
+
+    QJsonArray manaNeeded;
+    QJsonArray manaValueNeeded;
+
+    QJsonArray easyPrerequisites;
+    QJsonArray notablePrerequisites;
+
+    QString description;
+    QString notes;
+    double popularity = 0.0;
+
+    bool spoiler = false;
+    QString bracketTag;
+
+    QJsonObject legalities;
+    QJsonObject prices;
+
+    int variantCount = 0;
+};
+
+#endif // COCKATRICE_COMMANDER_SPELLBOOK_VARIANT_RESULT_H
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
new file mode 100644
index 000000000..8e0448faa
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.cpp
@@ -0,0 +1,55 @@
+#include "commander_bracket_service.h"
+
+#include "../../../../../client/settings/cache_settings.h"
+
+#include <libcockatrice/settings/commander_bracket_settings.h>
+
+class DeckList;
+
+CommanderBracketService &CommanderBracketService::instance()
+{
+    static CommanderBracketService service;
+    return service;
+}
+
+CommanderBracketService::CommanderBracketService(QObject *parent) : QObject(parent)
+{
+    connect(&CommanderSpellbookApiAccessor::instance(), &CommanderSpellbookApiAccessor::estimateBracketFinished, this,
+            &CommanderBracketService::onEstimateBracketFinished);
+
+    connect(&CommanderSpellbookApiAccessor::instance(), &CommanderSpellbookApiAccessor::estimateBracketError, this,
+            &CommanderBracketService::onEstimateBracketError);
+}
+
+quint64 CommanderBracketService::estimateBracket(const DeckList &deck, QObject *requester)
+{
+    return CommanderSpellbookApiAccessor::instance().estimateBracket(deck, requester);
+}
+
+void CommanderBracketService::onEstimateBracketFinished(CommanderSpellbookApiAccessor::RequestId id,
+                                                        QObject *requester,
+                                                        const EstimateBracketResult &result)
+{
+    CommanderBracketEstimate estimate;
+
+    estimate.bracketTag = result.bracketTag;
+
+    estimate.rawResult = result;
+
+    auto &brackets = SettingsCache::instance().commanderBrackets();
+
+    estimate.officialName = brackets.officialName(result.bracketTag);
+
+    estimate.displayName = brackets.displayName(result.bracketTag);
+
+    estimate.explanation = brackets.explanation(result.bracketTag);
+
+    emit estimateFinished(id, requester, estimate);
+}
+
+void CommanderBracketService::onEstimateBracketError(CommanderSpellbookApiAccessor::RequestId id,
+                                                     QObject *requester,
+                                                     const QString &error)
+{
+    emit estimateError(id, requester, error);
+}
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
new file mode 100644
index 000000000..22962cc95
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_service.h
@@ -0,0 +1,50 @@
+#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 <QObject>
+#include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class DeckList;
+
+struct CommanderBracketEstimate
+{
+    QString bracketTag;
+
+    QString officialName;
+    QString displayName;
+    QString explanation;
+
+    EstimateBracketResult rawResult;
+};
+
+class CommanderBracketService : public QObject
+{
+    Q_OBJECT
+
+public:
+    static CommanderBracketService &instance();
+
+    quint64 estimateBracket(const DeckList &deck, QObject *requester);
+
+signals:
+    void estimateFinished(quint64 requestId, QObject *requester, const CommanderBracketEstimate &estimate);
+
+    void estimateError(quint64 requestId, QObject *requester, const QString &error);
+
+private slots:
+    void onEstimateBracketFinished(CommanderSpellbookApiAccessor::RequestId id,
+                                   QObject *requester,
+                                   const EstimateBracketResult &result);
+
+    void onEstimateBracketError(CommanderSpellbookApiAccessor::RequestId id, QObject *requester, const QString &error);
+
+private:
+    explicit CommanderBracketService(QObject *parent = nullptr);
+};
+
+#endif
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
new file mode 100644
index 000000000..06a76dd19
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp
@@ -0,0 +1,278 @@
+#include "commander_bracket_widget.h"
+
+#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>
+#include <QFormLayout>
+#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)
+{
+    bracketLabel = new QLabel(tr("Bracket:"), this);
+
+    bracketValueLabel = new QLabel(this);
+    bracketValueLabel->setText("-");
+    bracketValueLabel->setObjectName("bracketValueLabel");
+
+    bracketInfoButton = new QToolButton(this);
+    bracketInfoButton->setText("?");
+    bracketInfoButton->setAutoRaise(true);
+    bracketInfoButton->setEnabled(false);
+
+    bracketRefreshButton = new QToolButton(this);
+    bracketRefreshButton->setIcon(themePixmap(QStringLiteral("icons/reload")));
+    bracketRefreshButton->setAutoRaise(true);
+
+    connect(bracketRefreshButton, &QToolButton::clicked, this, &CommanderBracketWidget::requestBracketEstimate);
+
+    auto *layout = new QGridLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->addWidget(bracketLabel, 0, 0);
+
+    auto *bracketRow = new QHBoxLayout;
+    bracketRow->addWidget(bracketValueLabel);
+    bracketRow->addWidget(bracketInfoButton);
+    bracketRow->addWidget(bracketRefreshButton);
+    bracketRow->addStretch();
+
+    layout->addLayout(bracketRow, 0, 1);
+
+    connect(&CommanderBracketService::instance(), &CommanderBracketService::estimateFinished, this,
+            &CommanderBracketWidget::onEstimateBracketFinished);
+    connect(&CommanderBracketService::instance(), &CommanderBracketService::estimateError, this,
+            &CommanderBracketWidget::onEstimateBracketError);
+
+    connect(&SettingsCache::instance().deckEditor(), &DeckEditorSettings::commanderSpellbookIntegrationEnabledChanged,
+            this, &CommanderBracketWidget::maybeAutoEstimateBracket);
+    connect(&SettingsCache::instance().deckEditor(),
+            &DeckEditorSettings::commanderSpellbookIntegrationUseOfficialBracketNamesChanged, this,
+            &CommanderBracketWidget::maybeAutoEstimateBracket);
+
+    setVisible(false);
+}
+
+void CommanderBracketWidget::setDeck(const QSharedPointer<DeckList> &_deck)
+{
+    deck = _deck;
+    requestId = 0; // invalidate any in-flight estimate for the previous deck
+
+    // Reset the displayed bracket
+    bracketValueLabel->setText("-");
+    bracketInfoButton->setToolTip({});
+    bracketInfoButton->setEnabled(false);
+    bracketRefreshButton->setEnabled(true);
+
+    maybeAutoEstimateBracket();
+}
+
+bool CommanderBracketWidget::promptCommanderSpellbookIntegration()
+{
+    QDialog dialog(this);
+    dialog.setWindowTitle(tr("CommanderSpellbook integration"));
+
+    auto *mainLayout = new QVBoxLayout(&dialog);
+
+    // Main text
+    auto *label = new QLabel(tr("CommanderSpellbook can analyze your deck and estimate its Commander bracket.\n\n"
+                                "This sends your deck list to an external service.\n\n"
+                                "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."));
+    label->setWordWrap(true);
+    mainLayout->addWidget(label);
+
+    // Naming selector
+    auto *formLayout = new QFormLayout;
+    auto *namingCombo = new QComboBox(&dialog);
+    namingCombo->addItem(tr("CommanderSpellbook bracket names"));
+    namingCombo->addItem(tr("Official Commander bracket names (approximate)"));
+    namingCombo->setCurrentIndex(
+        SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationUseOfficialBracketNames() ? 1 : 0);
+
+    // Create label + explainer button
+    auto *labelWidget = new QWidget(&dialog);
+    auto *labelLayout = new QHBoxLayout(labelWidget);
+    labelLayout->setContentsMargins(0, 0, 0, 0);
+
+    auto *namingLabel = new QLabel(tr("Bracket naming:"), labelWidget);
+    auto *explainerButton = new QToolButton(labelWidget);
+    explainerButton->setText("?");
+    explainerButton->setAutoRaise(true);
+    explainerButton->setEnabled(false);
+    explainerButton->setToolTip(CommanderBracketNames::Explainer);
+
+    labelLayout->addWidget(namingLabel);
+    labelLayout->addWidget(explainerButton);
+    labelLayout->addStretch(); // push the button next to label, combo stays aligned
+
+    // Add row with the custom label widget
+    formLayout->addRow(labelWidget, namingCombo);
+    mainLayout->addLayout(formLayout);
+
+    // Buttons
+    auto *buttonBox = new QDialogButtonBox(&dialog);
+    auto *enableBtn = buttonBox->addButton(tr("Enable"), QDialogButtonBox::AcceptRole);
+    auto *automaticBtn = buttonBox->addButton(tr("Automatic"), QDialogButtonBox::ApplyRole);
+    auto *disableBtn = buttonBox->addButton(tr("Disable"), QDialogButtonBox::RejectRole);
+    mainLayout->addWidget(buttonBox);
+
+    // Track which button was clicked
+    QAbstractButton *clickedButton = nullptr;
+    QObject::connect(buttonBox, &QDialogButtonBox::clicked, &dialog, [&](QAbstractButton *btn) {
+        clickedButton = btn;
+        dialog.accept();
+    });
+
+    dialog.exec();
+
+    // Persist naming choice (if not disabled)
+    if (clickedButton != disableBtn) {
+        bool useOfficial = namingCombo->currentIndex() == 1;
+        SettingsCache::instance().deckEditor().setCommanderSpellbookIntegrationUseOfficialBracketNames(useOfficial);
+    }
+
+    // Persist integration mode
+    if (clickedButton == disableBtn) {
+        SettingsCache::instance().deckEditor().setCommanderSpellbookIntegrationEnabled(
+            commanderSpellbookIntegrationEnabledIndexDisabled);
+        return false;
+    }
+    if (clickedButton == enableBtn) {
+        SettingsCache::instance().deckEditor().setCommanderSpellbookIntegrationEnabled(
+            commanderSpellbookIntegrationEnabledIndexEnabled);
+        return true;
+    }
+    if (clickedButton == automaticBtn) {
+        SettingsCache::instance().deckEditor().setCommanderSpellbookIntegrationEnabled(
+            commanderSpellbookIntegrationEnabledIndexAutomatic);
+        return true;
+    }
+
+    return false;
+}
+
+void CommanderBracketWidget::updateBracketVisibility(bool visible)
+{
+    setVisible(visible);
+}
+
+void CommanderBracketWidget::requestBracketEstimate()
+{
+    bracketRefreshButton->setEnabled(false);
+    bracketInfoButton->setEnabled(false);
+    bracketValueLabel->setText(tr("Calculating…"));
+
+    requestId = CommanderBracketService::instance().estimateBracket(*deck, this);
+}
+
+void CommanderBracketWidget::onEstimateBracketFinished(quint64 id,
+                                                       QObject *requester,
+                                                       const CommanderBracketEstimate &result)
+{
+    if (requester != this || id != requestId) {
+        return;
+    }
+
+    BracketExplainer explainer;
+    lastBracketExplanation = explainer.explain(result.rawResult);
+
+    // Display bracket
+    bracketValueLabel->setText(
+        SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationUseOfficialBracketNames()
+            ? result.officialName
+            : result.displayName);
+    bracketRefreshButton->setEnabled(true);
+
+    // Build tooltip
+    QString tooltip;
+    for (const auto &section : lastBracketExplanation.sections) {
+        tooltip += "<b>" + section.title + "</b><br>";
+        for (const auto &line : section.bulletPoints) {
+            tooltip += "• " + line + "<br>";
+        }
+        tooltip += "<br>";
+    }
+
+    bracketInfoButton->setToolTip(tooltip);
+    bracketInfoButton->setEnabled(!tooltip.isEmpty());
+}
+
+void CommanderBracketWidget::onEstimateBracketError(quint64 id, QObject *requester, const QString & /*error*/)
+{
+    if (requester != this || id != requestId) {
+        return;
+    }
+
+    bracketValueLabel->setText("-");
+    bracketRefreshButton->setEnabled(true);
+    bracketInfoButton->setToolTip({});
+    bracketInfoButton->setEnabled(false);
+}
+
+void CommanderBracketWidget::maybeAutoEstimateBracket()
+{
+    const QString formatKey = deck->getGameFormat();
+
+    const bool isCommander = (formatKey.compare("commander", Qt::CaseInsensitive) == 0);
+
+    int mode = SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationEnabled();
+
+    if (!isCommander || mode == commanderSpellbookIntegrationEnabledIndexDisabled) {
+        updateBracketVisibility(false);
+        return;
+    }
+
+    if (mode == commanderSpellbookIntegrationEnabledIndexUnprompted) {
+        if (prompting) {
+            return;
+        }
+        prompting = true;
+        const bool accepted = promptCommanderSpellbookIntegration();
+        prompting = false;
+        if (!accepted) {
+            updateBracketVisibility(false);
+            return;
+        }
+    }
+
+    updateBracketVisibility(true);
+
+    mode = SettingsCache::instance().deckEditor().getCommanderSpellbookIntegrationEnabled();
+    if (mode != commanderSpellbookIntegrationEnabledIndexAutomatic) {
+        return;
+    }
+
+    // Avoid firing if we already have a result or a request in flight
+    if (!bracketRefreshButton->isEnabled()) {
+        return;
+    }
+
+    // Defer to avoid races during init / model rebuild
+    QTimer::singleShot(0, this, &CommanderBracketWidget::requestBracketEstimate);
+}
+
+void CommanderBracketWidget::retranslateUi()
+{
+    bracketLabel->setText(tr("Bracket:"));
+    bracketInfoButton->setToolTip(tr("Why this bracket?"));
+    bracketRefreshButton->setToolTip(tr("Recalculate bracket"));
+}
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
new file mode 100644
index 000000000..f5b2b7958
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.h
@@ -0,0 +1,51 @@
+#ifndef COCKATRICE_COMMANDER_BRACKET_WIDGET_H
+#define COCKATRICE_COMMANDER_BRACKET_WIDGET_H
+
+#include "commander_spellbook_bracket_explainer.h"
+
+#include <QSharedPointer>
+#include <QString>
+#include <QWidget>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class QLabel;
+class QToolButton;
+struct CommanderBracketEstimate;
+class DeckList;
+class QObject;
+template <class T> class QSharedPointer;
+
+class CommanderBracketWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit CommanderBracketWidget(QWidget *parent = nullptr);
+
+    void setDeck(const QSharedPointer<DeckList> &_deck);
+    void retranslateUi();
+
+private slots:
+    void requestBracketEstimate();
+    void onEstimateBracketFinished(quint64 id, QObject *requester, const CommanderBracketEstimate &result);
+    void onEstimateBracketError(quint64 id, QObject *requester, const QString &error);
+    void maybeAutoEstimateBracket();
+
+private:
+    bool promptCommanderSpellbookIntegration();
+    void updateBracketVisibility(bool visible);
+
+    QSharedPointer<DeckList> deck;
+    bool prompting = false;
+    quint64 requestId = 0;
+
+    QLabel *bracketLabel;
+    QLabel *bracketValueLabel;
+    QToolButton *bracketInfoButton;
+    QToolButton *bracketRefreshButton;
+
+    BracketExplanation lastBracketExplanation;
+};
+
+#endif // COCKATRICE_COMMANDER_BRACKET_WIDGET_H
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
new file mode 100644
index 000000000..bd8d9379d
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.cpp
@@ -0,0 +1,83 @@
+#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()
+{
+    static CommanderSpellbookApiAccessor instance;
+    return instance;
+}
+
+CommanderSpellbookApiAccessor::CommanderSpellbookApiAccessor(QObject *parent) : QObject(parent)
+{
+}
+
+CommanderSpellbookApiAccessor::RequestId CommanderSpellbookApiAccessor::estimateBracket(const DeckList &deck,
+                                                                                        QObject *requester)
+{
+    CommanderSpellbookDeckRequest deckRequest = CommanderSpellbookDeckRequest::fromDeckList(deck);
+
+    QJsonDocument doc(deckRequest.toJson());
+    QByteArray body = doc.toJson(QJsonDocument::Compact);
+
+    QNetworkRequest req(ESTIMATE_BRACKET_URL);
+    req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
+
+    QNetworkReply *reply = network.post(req, body);
+
+    const RequestId id = nextRequestId++;
+
+    reply->setProperty("requestId", QVariant::fromValue(id));
+    reply->setProperty("requester", QVariant::fromValue(requester));
+
+    connect(reply, &QNetworkReply::finished, this, [this, reply]() { onEstimateReplyFinished(reply); });
+
+    return id;
+}
+
+void CommanderSpellbookApiAccessor::onEstimateReplyFinished(QNetworkReply *reply)
+{
+    reply->deleteLater();
+
+    const RequestId id = reply->property("requestId").toULongLong();
+    QObject *requester = reply->property("requester").value<QObject *>();
+
+    if (!requester) {
+        // Requester died — silently drop
+        return;
+    }
+
+    if (reply->error() != QNetworkReply::NoError) {
+        emit estimateBracketError(id, requester, reply->errorString());
+        return;
+    }
+
+    QJsonParseError err;
+    QJsonDocument doc = QJsonDocument::fromJson(reply->readAll(), &err);
+
+    if (err.error != QJsonParseError::NoError || !doc.isObject()) {
+        emit estimateBracketError(id, requester, QStringLiteral("Invalid JSON response"));
+        return;
+    }
+
+    EstimateBracketResult result = EstimateBracketResult::fromJson(doc.object());
+
+    emit estimateBracketFinished(id, requester, result);
+}
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
new file mode 100644
index 000000000..98e7e3710
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_api_accessor.h
@@ -0,0 +1,40 @@
+#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>
+
+class DeckList;
+class QNetworkReply;
+struct EstimateBracketResult;
+
+class CommanderSpellbookApiAccessor final : public QObject
+{
+    Q_OBJECT
+
+public:
+    static CommanderSpellbookApiAccessor &instance();
+
+    using RequestId = quint64;
+
+    RequestId estimateBracket(const DeckList &deck, QObject *requester);
+
+signals:
+    void estimateBracketFinished(RequestId id, QObject *requester, const EstimateBracketResult &result);
+
+    void estimateBracketError(RequestId id, QObject *requester, const QString &errorMessage);
+
+private:
+    explicit CommanderSpellbookApiAccessor(QObject *parent = nullptr);
+    Q_DISABLE_COPY_MOVE(CommanderSpellbookApiAccessor)
+
+    void onEstimateReplyFinished(QNetworkReply *reply);
+
+    QNetworkAccessManager network;
+    RequestId nextRequestId = 1;
+};
+
+#endif // COCKATRICE_COMMANDER_SPELLBOOK_API_ACCESSOR_H
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
new file mode 100644
index 000000000..06250f1ea
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.cpp
@@ -0,0 +1,124 @@
+#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;
+    for (int i = 0; i < cards.size() && i < max; ++i) {
+        names << cards[i].name;
+    }
+
+    if (cards.size() > max) {
+        names << QString("and %1 more").arg(cards.size() - max);
+    }
+
+    return names.join(", ");
+}
+
+static QString comboCount(const QList<CommanderSpellbookVariantResult> &variants)
+{
+    return QString::number(variants.size());
+}
+
+BracketExplanation BracketExplainer::explain(const EstimateBracketResult &r)
+{
+    BracketExplanation out;
+    out.bracket = r.bracketTag;
+
+    if (!r.gameChangerCards.isEmpty()) {
+        BracketExplanationSection s;
+        s.title = "Game-changing cards";
+
+        s.bulletPoints << QString("Your deck contains %1 game-changing cards, such as %2.")
+                              .arg(r.gameChangerCards.size())
+                              .arg(cardList(r.gameChangerCards));
+
+        out.sections << s;
+    }
+
+    if (!r.extraTurnCards.isEmpty() || !r.extraTurnTemplates.isEmpty() || !r.extraTurnCombos.isEmpty()) {
+
+        BracketExplanationSection s;
+        s.title = "Extra turns";
+
+        if (!r.extraTurnCards.isEmpty()) {
+            s.bulletPoints << QString("The deck contains %1 extra-turn cards (%2).")
+                                  .arg(r.extraTurnCards.size())
+                                  .arg(cardList(r.extraTurnCards));
+        }
+
+        if (!r.extraTurnTemplates.isEmpty()) {
+            s.bulletPoints << QString("%1 extra-turn templates were identified.").arg(comboCount(r.extraTurnTemplates));
+        }
+
+        if (!r.extraTurnCombos.isEmpty()) {
+            s.bulletPoints
+                << QString("%1 extra-turn combo variants were identified.").arg(comboCount(r.extraTurnCombos));
+        }
+
+        out.sections << s;
+    }
+
+    if (!r.massLandDenialCards.isEmpty() || !r.massLandDenialTemplates.isEmpty() || !r.massLandDenialCombos.isEmpty()) {
+
+        BracketExplanationSection s;
+        s.title = "Mass land denial";
+
+        if (!r.massLandDenialCards.isEmpty()) {
+            s.bulletPoints << QString("The deck contains %1 mass land denial cards (%2).")
+                                  .arg(r.massLandDenialCards.size())
+                                  .arg(cardList(r.massLandDenialCards));
+        }
+
+        if (!r.massLandDenialTemplates.isEmpty()) {
+            s.bulletPoints
+                << QString("%1 mass land denial templates were identified.").arg(comboCount(r.massLandDenialTemplates));
+        }
+
+        if (!r.massLandDenialCombos.isEmpty()) {
+            s.bulletPoints << QString("%1 mass land denial combo variants were identified.")
+                                  .arg(comboCount(r.massLandDenialCombos));
+        }
+
+        out.sections << s;
+    }
+
+    if (!r.lockCombos.isEmpty() || !r.skipTurnsCombos.isEmpty()) {
+
+        BracketExplanationSection s;
+        s.title = "Lock pieces";
+
+        if (!r.lockCombos.isEmpty()) {
+            s.bulletPoints << QString("%1 lock combo variants were detected.").arg(comboCount(r.lockCombos));
+        }
+
+        if (!r.skipTurnsCombos.isEmpty()) {
+            s.bulletPoints << QString("%1 skip-turn combo variants were detected.").arg(comboCount(r.skipTurnsCombos));
+        }
+
+        out.sections << s;
+    }
+
+    if (!r.definitelyTwoCardCombos.isEmpty() || !r.arguablyTwoCardCombos.isEmpty()) {
+
+        BracketExplanationSection s;
+        s.title = "Two-card combos";
+
+        if (!r.definitelyTwoCardCombos.isEmpty()) {
+            s.bulletPoints << QString("%1 definite two-card combo variants were identified.")
+                                  .arg(comboCount(r.definitelyTwoCardCombos));
+        }
+
+        if (!r.arguablyTwoCardCombos.isEmpty()) {
+            s.bulletPoints << QString("%1 arguable two-card combo variants were identified.")
+                                  .arg(comboCount(r.arguablyTwoCardCombos));
+        }
+
+        out.sections << s;
+    }
+
+    return out;
+}
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
new file mode 100644
index 000000000..3ab317df9
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_spellbook_bracket_explainer.h
@@ -0,0 +1,49 @@
+#ifndef COCKATRICE_COMMANDER_SPELLBOOK_BRACKET_EXPLAINER_H
+#define COCKATRICE_COMMANDER_SPELLBOOK_BRACKET_EXPLAINER_H
+
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+
+struct EstimateBracketResult;
+
+namespace CommanderBracketNames
+{
+inline const char *CommanderSpellbookBracketNames = QT_TR_NOOP("CommanderSpellbook");
+inline const char *OfficialCommanderBracketNames = QT_TR_NOOP("Official (approximate)");
+inline const char *Explainer = QT_TR_NOOP(
+    "The bracket system combines both objective data, as well as subjective play experience to estimate a "
+    "bracket for a deck.\nCommanderSpellbook's estimation is algorithmical, which means that it can only operate "
+    "on the objective data, not the subjective intent. \nThey have chosen to represent this by defining their "
+    "own bracket system which matches their algorithm.\n"
+    "This custom bracket system maps loosely to the standard system. \nYou 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.\n\nAlways consider the subjective factors of the bracket system when determing a deck's "
+    "final bracket!");
+} // namespace CommanderBracketNames
+
+struct BracketExplanationSection
+{
+    QString title;
+    QStringList bulletPoints;
+};
+
+struct BracketExplanation
+{
+    QString bracket;
+    QList<BracketExplanationSection> sections;
+
+    bool isEmpty() const
+    {
+        return sections.isEmpty();
+    }
+};
+
+class BracketExplainer
+{
+public:
+    static BracketExplanation explain(const EstimateBracketResult &result);
+};
+
+#endif // COCKATRICE_COMMANDER_SPELLBOOK_BRACKET_EXPLAINER_H
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
new file mode 100644
index 000000000..22200ffa2
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp
@@ -0,0 +1,69 @@
+#include "handle_commander_brackets.h"
+
+#include "../../../../../client/settings/cache_settings.h"
+
+#include <QByteArray>
+#include <QJsonDocument>
+#include <QJsonParseError>
+#include <QMap>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QString>
+#include <QStringLiteral>
+#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"));
+
+HandleCommanderBrackets::HandleCommanderBrackets(QObject *parent)
+    : QObject(parent), nam(new QNetworkAccessManager(this)), reply(nullptr)
+{
+}
+
+void HandleCommanderBrackets::downloadBracketDefinitions()
+{
+    if (reply) {
+        return;
+    }
+
+    reply = nam->get(QNetworkRequest(COMMANDER_BRACKET_JSON_URL));
+
+    connect(reply, &QNetworkReply::finished, this, &HandleCommanderBrackets::actFinishParsingDownloadedData);
+}
+
+void HandleCommanderBrackets::actFinishParsingDownloadedData()
+{
+    reply = qobject_cast<QNetworkReply *>(sender());
+
+    if (reply->error() != QNetworkReply::NoError) {
+        emit sigBracketDefinitionsDownloadFailed(reply->error());
+
+        reply->deleteLater();
+        return;
+    }
+
+    QJsonParseError parseError;
+
+    auto document = QJsonDocument::fromJson(reply->readAll(), &parseError);
+
+    if (parseError.error != QJsonParseError::NoError) {
+        emit sigBracketDefinitionsDownloadFailed(QNetworkReply::UnknownContentError);
+
+        reply->deleteLater();
+        return;
+    }
+
+    updateBracketDefinitions(document.toVariant().toMap());
+
+    emit sigBracketDefinitionsDownloaded();
+
+    reply->deleteLater();
+}
+
+void HandleCommanderBrackets::updateBracketDefinitions(const QVariantMap &jsonMap)
+{
+    const auto bracketList = jsonMap.value("brackets").toList();
+    SettingsCache::instance().commanderBrackets().saveDefinitions(bracketList);
+    SettingsCache::instance().commanderBrackets().reloadDefinitions(bracketList);
+}
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
new file mode 100644
index 000000000..39bddba05
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.h
@@ -0,0 +1,34 @@
+#ifndef COCKATRICE_HANDLE_COMMANDER_BRACKETS_H
+#define COCKATRICE_HANDLE_COMMANDER_BRACKETS_H
+
+#include <QNetworkReply>
+#include <QObject>
+#include <QVariantMap>
+#include <qtmetamacros.h>
+
+class QNetworkAccessManager;
+
+class HandleCommanderBrackets : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit HandleCommanderBrackets(QObject *parent = nullptr);
+
+    void downloadBracketDefinitions();
+
+signals:
+    void sigBracketDefinitionsDownloaded();
+    void sigBracketDefinitionsDownloadFailed(QNetworkReply::NetworkError error);
+
+private slots:
+    void actFinishParsingDownloadedData();
+
+private:
+    void updateBracketDefinitions(const QVariantMap &jsonMap);
+
+    QNetworkAccessManager *nam;
+    QNetworkReply *reply;
+};
+
+#endif // COCKATRICE_HANDLE_COMMANDER_BRACKETS_H
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 145a3fca0..411fdd5ed 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,6 +3,9 @@
 #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 d265c164d..0786550fe 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,7 +1,9 @@
 #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 1297fc157..b6ecac0af 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,7 +1,13 @@
 #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 ceafb719b..324dce52a 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,11 +1,14 @@
 #include "edhrec_deck_api_response.h"
 
-#include "../../../../../../deck_loader/deck_loader.h"
-
-#include <QApplication>
 #include <QDebug>
 #include <QJsonArray>
-#include <QJsonObject>
+#include <QJsonValue>
+#include <QJsonValueConstRef>
+#include <QString>
+#include <QTextStream>
+#include <functional>
+#include <libcockatrice/card/import/card_name_normalizer.h>
+#include <qlogging.h>
 
 void EdhrecDeckApiResponse::fromJson(const QJsonArray &json)
 {
@@ -14,10 +17,8 @@ void EdhrecDeckApiResponse::fromJson(const QJsonArray &json)
         deckList += cardlistValue.toString() + "\n";
     }
 
-    deckLoader = new DeckLoader(nullptr);
-
     QTextStream stream(&deckList);
-    deckLoader->getDeckList()->loadFromStream_Plain(stream, true);
+    deck.loadFromStream_Plain(stream, true, CardNameNormalizer());
 }
 
 void EdhrecDeckApiResponse::debugPrint() const
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 96205e149..a47fcc10b 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
@@ -1,13 +1,15 @@
 /**
  * @file edhrec_deck_api_response.h
  * @ingroup ApiResponses
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef EDHREC_DECK_API_RESPONSE_H
 #define EDHREC_DECK_API_RESPONSE_H
 
-#include "../../../../../../deck_loader/deck_loader.h"
+#include "libcockatrice/deck_list/deck_list.h"
+
+#include <QJsonArray>
 
 class EdhrecDeckApiResponse
 {
@@ -21,7 +23,7 @@ public:
     // Debug method for logging
     void debugPrint() const;
 
-    DeckLoader *deckLoader;
+    DeckList deck;
 };
 
 #endif // EDHREC_DECK_API_RESPONSE_H
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 1231d147a..26502f1de 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,6 +1,8 @@
 #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/card_prices/edhrec_api_response_card_prices.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h
index 66a407acd..bd874d067 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h
@@ -1,8 +1,8 @@
 /**
  * @file edhrec_api_response_card_prices.h
  * @ingroup ApiResponses
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_PRICES_H
 #define EDHREC_COMMANDER_API_RESPONSE_CARD_PRICES_H
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 3fef8be34..8660cac50 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,6 +3,9 @@
 #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 07b53dd97..70d39474d 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
@@ -1,8 +1,8 @@
 /**
  * @file edhrec_api_response_card_container.h
  * @ingroup ApiResponses
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CONTAINER_ENTRY_H
 #define CONTAINER_ENTRY_H
@@ -11,6 +11,7 @@
 #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 a4a746c61..ebf09d2a9 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,6 +1,8 @@
 #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_details.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h
index 86d78c5e3..931850ea9 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_details.h
@@ -1,8 +1,8 @@
 /**
  * @file edhrec_api_response_card_details.h
  * @ingroup ApiResponses
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARD_VIEW_H
 #define CARD_VIEW_H
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 72d6fe2cc..0cf585ee9 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,6 +1,10 @@
 #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 15691fbe4..d6e0d7f75 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
@@ -1,15 +1,15 @@
 /**
  * @file edhrec_api_response_card_list.h
  * @ingroup ApiResponses
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARD_LIST_H
 #define CARD_LIST_H
 
 #include "edhrec_api_response_card_details.h"
 
-#include <QJsonArray>
+#include <QJsonObject>
 #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 7b220603e..7383677c8 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,6 +1,11 @@
 #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 629eb8273..a0858e9d2 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
@@ -1,8 +1,8 @@
 /**
  * @file edhrec_commander_api_response_commander_details.h
  * @ingroup ApiResponses
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_H
 #define EDHREC_COMMANDER_API_RESPONSE_COMMANDER_DETAILS_H
@@ -10,6 +10,8 @@
 #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 da2a9c052..1e0304e8a 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,7 +1,12 @@
 #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 74cce5322..996ec3c0c 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,5 +1,7 @@
 #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 26122ce89..4df2f3523 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,7 +1,10 @@
 #include "edhrec_top_cards_api_response.h"
 
+#include "../cards/edhrec_api_response_card_container.h"
+
 #include <QDebug>
-#include <QJsonArray>
+#include <QJsonValue>
+#include <qlogging.h>
 
 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 fb89c0b12..cdf0d4a71 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
@@ -1,14 +1,15 @@
 /**
  * @file edhrec_top_cards_api_response.h
  * @ingroup ApiResponses
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef EDHREC_TOP_CARDS_API_RESPONSE_H
 #define EDHREC_TOP_CARDS_API_RESPONSE_H
 
 #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 83b10c9e5..c1bf71cb2 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,7 +1,10 @@
 #include "edhrec_top_commanders_api_response.h"
 
+#include "../cards/edhrec_api_response_card_container.h"
+
 #include <QDebug>
-#include <QJsonArray>
+#include <QJsonValue>
+#include <qlogging.h>
 
 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 26c5afedb..4579632c6 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
@@ -1,14 +1,15 @@
 /**
  * @file edhrec_top_commanders_api_response.h
  * @ingroup ApiResponses
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef EDHREC_TOP_COMMANDERS_API_RESPONSE_H
 #define EDHREC_TOP_COMMANDERS_API_RESPONSE_H
 
 #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 56eb4fa4f..cf6ea5df8 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,7 +1,10 @@
 #include "edhrec_top_tags_api_response.h"
 
+#include "../cards/edhrec_api_response_card_container.h"
+
 #include <QDebug>
-#include <QJsonArray>
+#include <QJsonValue>
+#include <qlogging.h>
 
 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 48219893a..e6e25d97b 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
@@ -1,14 +1,15 @@
 /**
  * @file edhrec_top_tags_api_response.h
  * @ingroup ApiResponses
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef EDHREC_TOP_TAGS_API_RESPONSE_H
 #define EDHREC_TOP_TAGS_API_RESPONSE_H
 
 #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 75902daad..0ba74fd60 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,5 +1,13 @@
 #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 80d32a394..75fe033dc 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
@@ -1,17 +1,19 @@
 /**
  * @file edhrec_api_response_card_prices_display_widget.h
  * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef EDHREC_API_RESPONSE_CARD_PRICES_DISPLAY_WIDGET_H
 #define EDHREC_API_RESPONSE_CARD_PRICES_DISPLAY_WIDGET_H
 
 #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 26ade96dd..0728b3154 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,9 +1,21 @@
 #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,
@@ -19,17 +31,17 @@ EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWi
     nameLabel = new QLabel(this);
     nameLabel->setText(toDisplay.name);
     nameLabel->setAlignment(Qt::AlignHCenter);
+    nameLabel->setStyleSheet("font-size: 20px; font-weight: bold");
 
     inclusionDisplayWidget = new EdhrecApiResponseCardInclusionDisplayWidget(this, toDisplay);
 
     synergyDisplayWidget = new EdhrecApiResponseCardSynergyDisplayWidget(this, toDisplay);
 
-    layout->addWidget(nameLabel);
-    layout->addWidget(cardPictureWidget);
-
     backgroundPlateWidget = new BackgroundPlateWidget(this);
     auto plateLayout = new QVBoxLayout(backgroundPlateWidget);
 
+    plateLayout->addWidget(nameLabel);
+    plateLayout->addWidget(cardPictureWidget);
     plateLayout->addWidget(inclusionDisplayWidget);
     plateLayout->addWidget(synergyDisplayWidget);
 
@@ -48,25 +60,24 @@ EdhrecApiResponseCardDetailsDisplayWidget::EdhrecApiResponseCardDetailsDisplayWi
     if (parentTab) {
         cardPictureWidget->setScaleFactor(parentTab->getCardSizeSlider()->getSlider()->value());
         connect(cardPictureWidget, &CardInfoPictureWidget::cardClicked, this,
-                &EdhrecApiResponseCardDetailsDisplayWidget::actRequestPageNavigation);
+                &EdhrecApiResponseCardDetailsDisplayWidget::mousePressEvent);
         connect(parentTab->getCardSizeSlider()->getSlider(), &QSlider::valueChanged, cardPictureWidget,
                 &CardInfoPictureWidget::setScaleFactor);
         connect(this, &EdhrecApiResponseCardDetailsDisplayWidget::requestUrl, parentTab,
                 &TabEdhRecMain::actNavigatePage);
+        parentTab->getCardSizeSlider()->enableCtrlScrollResize(this);
     }
 }
 
 void EdhrecApiResponseCardDetailsDisplayWidget::mousePressEvent(QMouseEvent *event)
 {
     QWidget::mousePressEvent(event);
-    actRequestPageNavigation();
+    if (event->button() == Qt::LeftButton) {
+        actRequestPageNavigation();
+    }
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 void EdhrecApiResponseCardDetailsDisplayWidget::enterEvent(QEnterEvent *event)
-#else
-void EdhrecApiResponseCardDetailsDisplayWidget::enterEvent(QEvent *event)
-#endif
 {
     QWidget::enterEvent(event);
     backgroundPlateWidget->setFocused(true);
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 82dcfb8b0..d738f4685 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
@@ -1,21 +1,24 @@
 /**
  * @file edhrec_api_response_card_details_display_widget.h
  * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 <QHBoxLayout>
-#include <QLabel>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class BackgroundPlateWidget;
+class CardInfoPictureWidget;
+class EdhrecApiResponseCardInclusionDisplayWidget;
+class EdhrecApiResponseCardSynergyDisplayWidget;
+class QLabel;
+class QVBoxLayout;
 
 class EdhrecApiResponseCardDetailsDisplayWidget : public QWidget
 {
@@ -39,11 +42,7 @@ private:
 protected slots:
     void mousePressEvent(QMouseEvent *event) override;
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    void enterEvent(QEnterEvent *event) override; ///< Qt6 hover enter
-#else
-    void enterEvent(QEvent *event) override; ///< Qt5 hover enter
-#endif
+    void enterEvent(QEnterEvent *event) override; ///< Hover enter
     void leaveEvent(QEvent *event) override;
 };
 
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 8292b00ea..6786b006e 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,5 +1,13 @@
 #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 0174016f7..61a1bd645 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
@@ -1,18 +1,20 @@
 /**
  * @file edhrec_api_response_card_inclusion_display_widget.h
  * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef EDHREC_API_RESPONSE_CARD_INCLUSION_DISPLAY_WIDGET_H
 #define EDHREC_API_RESPONSE_CARD_INCLUSION_DISPLAY_WIDGET_H
 
-#include "../../../../../general/display/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 841ef315b..5295b92d5 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,9 +1,19 @@
 #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 <QLabel>
+#include <QDebug>
+#include <QForeach>
+#include <QList>
+#include <QResizeEvent>
+#include <QSize>
+#include <QVBoxLayout>
+#include <qlogging.h>
+#include <qnamespace.h>
 
 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 d34c3da34..20bdad8ea 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
@@ -1,19 +1,21 @@
 /**
  * @file edhrec_api_response_card_list_display_widget.h
  * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef EDHREC_COMMANDER_API_RESPONSE_CARD_LIST_DISPLAY_WIDGET_H
 #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 <QResizeEvent>
-#include <QVBoxLayout>
+#include <QString>
 #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 9d5571a8f..5f4b02327 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,5 +1,13 @@
 #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 39d26a409..71cca6ca4 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
@@ -1,18 +1,20 @@
 /**
  * @file edhrec_api_response_card_synergy_display_widget.h
  * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef EDHREC_API_RESPONSE_CARD_SYNERGY_DISPLAY_WIDGET_H
 #define EDHREC_API_RESPONSE_CARD_SYNERGY_DISPLAY_WIDGET_H
 
-#include "../../../../../general/display/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 b15d559f5..3da050edd 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,10 +1,20 @@
 #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 <QHBoxLayout>
+#include <QLabel>
+#include <QObject>
+#include <QSlider>
+#include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <qnamespace.h>
 
 EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCommanderDetailsDisplayWidget(
     QWidget *parent,
@@ -12,9 +22,14 @@ EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCom
     QString baseUrl)
     : QWidget(parent), commanderDetails(_commanderDetails)
 {
-    layout = new QVBoxLayout(this);
+    layout = new QHBoxLayout(this);
     setLayout(layout);
 
+    commanderLayout = new QHBoxLayout();
+    commanderDetailsLayout = new QVBoxLayout();
+    commanderDetailsLayout->setAlignment(Qt::AlignCenter);
+    navigationAndPricesLayout = new QVBoxLayout();
+
     commanderPicture = new CardInfoPictureWidget(this);
     commanderPicture->setCard(CardDatabaseManager::query()->getCard({commanderDetails.getName()}));
 
@@ -32,24 +47,40 @@ EdhrecCommanderResponseCommanderDetailsDisplayWidget::EdhrecCommanderResponseCom
         connect(parentTab->getCardSizeSlider()->getSlider(), &QSlider::valueChanged, commanderPicture,
                 &CardInfoPictureWidget::setScaleFactor);
         commanderPicture->setScaleFactor(parentTab->getCardSizeSlider()->getSlider()->value());
+        parentTab->getCardSizeSlider()->enableCtrlScrollResize(this);
     }
 
     commanderDetails.debugPrint();
 
+    commanderName = new QLabel(this);
+    commanderName->setText(commanderDetails.getName());
+    commanderName->setAlignment(Qt::AlignCenter);
+    commanderName->setStyleSheet("font-size: 28px; font-weight: bold");
+
     label = new QLabel(this);
     label->setAlignment(Qt::AlignCenter);
+    label->setStyleSheet("font-size: 16px");
+
     salt = new QLabel(this);
     salt->setAlignment(Qt::AlignCenter);
+    salt->setStyleSheet("font-size: 16px");
 
     cardPricesDisplayWidget = new EdhrecApiResponseCardPricesDisplayWidget(this, commanderDetails.getPrices());
 
     navigationWidget = new EdhrecCommanderApiResponseNavigationWidget(this, commanderDetails, baseUrl);
 
-    layout->addWidget(commanderPicture);
-    layout->addWidget(label);
-    layout->addWidget(salt);
-    layout->addWidget(cardPricesDisplayWidget);
-    layout->addWidget(navigationWidget);
+    commanderLayout->addWidget(commanderPicture);
+    commanderDetailsLayout->addWidget(commanderName);
+    commanderDetailsLayout->addSpacing(1);
+    commanderDetailsLayout->addWidget(label);
+    commanderDetailsLayout->addWidget(salt);
+    commanderDetailsLayout->addWidget(cardPricesDisplayWidget);
+    commanderLayout->addLayout(commanderDetailsLayout);
+    navigationAndPricesLayout->addWidget(navigationWidget);
+    // navigationAndPricesLayout->addWidget(cardPricesDisplayWidget);
+
+    layout->addLayout(commanderLayout);
+    layout->addLayout(navigationAndPricesLayout);
 
     retranslateUi();
 }
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 295e4228b..197263512 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
@@ -1,22 +1,25 @@
 /**
  * @file edhrec_api_response_commander_details_display_widget.h
  * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 <QLabel>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class EdhrecCommanderApiResponseNavigationWidget;
+class CardInfoPictureWidget;
+class EdhrecApiResponseCardPricesDisplayWidget;
+class QHBoxLayout;
+class QLabel;
+class QVBoxLayout;
+
 class EdhrecCommanderResponseCommanderDetailsDisplayWidget : public QWidget
 {
     Q_OBJECT
@@ -29,8 +32,12 @@ public:
 
 private:
     EdhrecCommanderApiResponseCommanderDetails commanderDetails;
-    QVBoxLayout *layout;
+    QHBoxLayout *layout;
+    QHBoxLayout *commanderLayout;
+    QVBoxLayout *commanderDetailsLayout;
+    QVBoxLayout *navigationAndPricesLayout;
     CardInfoPictureWidget *commanderPicture;
+    QLabel *commanderName;
     QLabel *label;
     QLabel *salt;
     EdhrecApiResponseCardPricesDisplayWidget *cardPricesDisplayWidget;
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
new file mode 100644
index 000000000..b26a7e574
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp
@@ -0,0 +1,101 @@
+#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,
+    const QString &baseUrl)
+    : QWidget(parent)
+{
+    layout = new QGridLayout(this);
+    setLayout(layout);
+
+    gameChangerLabel = new QLabel(this);
+
+    layout->addWidget(gameChangerLabel, 1, 0, 1, 2);
+
+    for (int i = 0; i < gameChangerOptions.length(); i++) {
+        QString option = gameChangerOptions.at(i);
+        QString label = option.isEmpty() ? "All" : option.at(0).toUpper() + option.mid(1);
+        QPushButton *optionButton = new QPushButton(label, this);
+        optionButton->setMinimumHeight(84);
+        optionButton->setStyleSheet("font-size: 24px");
+        gameChangerButtons[option] = optionButton;
+        layout->addWidget(optionButton, 2, i);
+        connect(optionButton, &QPushButton::clicked, this, [=, this]() {
+            selectedGameChanger = option;
+            updateOptionButtonSelection(gameChangerButtons, option);
+            emit requestNavigation();
+        });
+    }
+
+    updateOptionButtonSelection(gameChangerButtons, "");
+
+    retranslateUi();
+    applyOptionsFromUrl(baseUrl);
+}
+
+void EdhrecCommanderApiResponseBracketNavigationWidget::retranslateUi()
+{
+    gameChangerLabel->setText(tr("Game Changers"));
+}
+
+void EdhrecCommanderApiResponseBracketNavigationWidget::applyOptionsFromUrl(const QString &url)
+{
+    QString cleanedUrl = url;
+
+    // Remove base and file extension
+    if (cleanedUrl.startsWith("https://json.edhrec.com/pages/")) {
+        cleanedUrl = cleanedUrl.mid(QString("https://json.edhrec.com/pages/").length());
+    }
+    if (cleanedUrl.endsWith(".json")) {
+        cleanedUrl.chop(5);
+    }
+
+    // Expecting something like: "commanders/the-ur-dragon/core/expensive"
+    QStringList parts = cleanedUrl.split('/', Qt::SkipEmptyParts);
+
+    if (parts.size() < 2) {
+        return;
+    }
+
+    QString commanderName = parts[1];
+    QString gameChangerOpt;
+
+    // Define valid sets
+    QSet<QString> validGameChangers = {"exhibition", "core", "upgraded", "optimized", "cedh"};
+
+    // Check remaining parts after commander
+    for (int i = 2; i < parts.size(); ++i) {
+        QString part = parts[i].toLower();
+        if (validGameChangers.contains(part)) {
+            gameChangerOpt = part;
+        }
+    }
+
+    // Validate and apply
+    if (!gameChangerButtons.contains(gameChangerOpt)) {
+        gameChangerOpt.clear();
+    }
+
+    selectedGameChanger = gameChangerOpt;
+
+    updateOptionButtonSelection(gameChangerButtons, selectedGameChanger);
+}
+
+void EdhrecCommanderApiResponseBracketNavigationWidget::updateOptionButtonSelection(
+    QMap<QString, QPushButton *> &buttons,
+    const QString &selectedKey)
+{
+    for (auto it = buttons.begin(); it != buttons.end(); ++it) {
+        it.value()->setStyleSheet(it.key() == selectedKey
+                                      ? "background-color: lightblue; font-weight: bold; font-size: 24px;"
+                                      : "font-size: 24px");
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..a741b6696
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.h
@@ -0,0 +1,42 @@
+#ifndef COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BRACKET_NAVIGATION_WIDGET_H
+#define COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BRACKET_NAVIGATION_WIDGET_H
+
+#include <QList>
+#include <QMap>
+#include <QString>
+#include <QStringList>
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class QGridLayout;
+class QLabel;
+class QPushButton;
+
+class EdhrecCommanderApiResponseBracketNavigationWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit EdhrecCommanderApiResponseBracketNavigationWidget(QWidget *parent, const QString &baseUrl);
+    void retranslateUi();
+    void applyOptionsFromUrl(const QString &url);
+    QString getSelectedGameChanger() const
+    {
+        return selectedGameChanger;
+    }
+
+signals:
+    void requestNavigation();
+
+private:
+    QGridLayout *layout;
+    QLabel *gameChangerLabel;
+
+    QStringList gameChangerOptions = {"", "exhibition", "core", "upgraded", "optimized", "cedh"};
+    QString selectedGameChanger;
+
+    QMap<QString, QPushButton *> gameChangerButtons;
+
+    void updateOptionButtonSelection(QMap<QString, QPushButton *> &buttons, const QString &selectedKey);
+};
+
+#endif // COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BRACKET_NAVIGATION_WIDGET_H
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
new file mode 100644
index 000000000..48704d010
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp
@@ -0,0 +1,103 @@
+#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,
+    const QString &baseUrl)
+    : QWidget(parent)
+{
+    layout = new QGridLayout(this);
+    setLayout(layout);
+
+    budgetLabel = new QLabel(this);
+
+    layout->addWidget(budgetLabel, 3, 0, 1, 2);
+
+    for (int i = 0; i < budgetOptions.length(); i++) {
+        QString option = budgetOptions.at(i);
+        QString label = option.isEmpty() ? "Any" : option.at(0).toUpper() + option.mid(1);
+        QPushButton *btn = new QPushButton(label, this);
+        btn->setMinimumHeight(84);
+        btn->setStyleSheet("font-size: 24px");
+        budgetButtons[option] = btn;
+        layout->addWidget(btn, 4, i);
+        connect(btn, &QPushButton::clicked, this, [=, this]() {
+            selectedBudget = option;
+            updateOptionButtonSelection(budgetButtons, option);
+            emit requestNavigation();
+        });
+    }
+
+    updateOptionButtonSelection(budgetButtons, "");
+
+    retranslateUi();
+    applyOptionsFromUrl(baseUrl);
+}
+
+void EdhrecCommanderApiResponseBudgetNavigationWidget::retranslateUi()
+{
+    budgetLabel->setText(tr("Budget"));
+}
+
+void EdhrecCommanderApiResponseBudgetNavigationWidget::applyOptionsFromUrl(const QString &url)
+{
+    QString cleanedUrl = url;
+
+    // Remove base and file extension
+    if (cleanedUrl.startsWith("https://json.edhrec.com/pages/")) {
+        cleanedUrl = cleanedUrl.mid(QString("https://json.edhrec.com/pages/").length());
+    }
+    if (cleanedUrl.endsWith(".json")) {
+        cleanedUrl.chop(5);
+    }
+
+    // Expecting something like: "commanders/the-ur-dragon/core/expensive"
+    QStringList parts = cleanedUrl.split('/', Qt::SkipEmptyParts);
+
+    if (parts.size() < 2) {
+        return;
+    }
+
+    QString commanderName = parts[1];
+    QString gameChangerOpt, budgetOpt;
+
+    // Define valid sets
+    QSet<QString> validGameChangers = {"exhibition", "core", "upgraded", "optimized", "cedh"};
+    QSet<QString> validBudgets = {"budget", "expensive"};
+
+    // Check remaining parts after commander
+    for (int i = 2; i < parts.size(); ++i) {
+        QString part = parts[i].toLower();
+        if (validGameChangers.contains(part)) {
+            gameChangerOpt = part;
+        } else if (validBudgets.contains(part)) {
+            budgetOpt = part;
+        }
+    }
+
+    if (!budgetButtons.contains(budgetOpt)) {
+        budgetOpt.clear();
+    }
+
+    selectedBudget = budgetOpt;
+
+    updateOptionButtonSelection(budgetButtons, selectedBudget);
+}
+
+void EdhrecCommanderApiResponseBudgetNavigationWidget::updateOptionButtonSelection(
+    QMap<QString, QPushButton *> &buttons,
+    const QString &selectedKey)
+{
+    for (auto it = buttons.begin(); it != buttons.end(); ++it) {
+        it.value()->setStyleSheet(it.key() == selectedKey
+                                      ? "background-color: lightblue; font-weight: bold; font-size: 24px;"
+                                      : "font-size: 24px");
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..8013d1d6b
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.h
@@ -0,0 +1,42 @@
+#ifndef COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BUDGET_NAVIGATION_WIDGET_H
+#define COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BUDGET_NAVIGATION_WIDGET_H
+
+#include <QList>
+#include <QMap>
+#include <QString>
+#include <QStringList>
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class QGridLayout;
+class QLabel;
+class QPushButton;
+
+class EdhrecCommanderApiResponseBudgetNavigationWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit EdhrecCommanderApiResponseBudgetNavigationWidget(QWidget *parent, const QString &baseUrl);
+    void retranslateUi();
+    void applyOptionsFromUrl(const QString &url);
+    QString getSelectedBudget() const
+    {
+        return selectedBudget;
+    }
+
+signals:
+    void requestNavigation();
+
+private:
+    QGridLayout *layout;
+    QLabel *budgetLabel;
+
+    QStringList budgetOptions = {"", "budget", "expensive"};
+    QString selectedBudget;
+
+    QMap<QString, QPushButton *> budgetButtons;
+
+    void updateOptionButtonSelection(QMap<QString, QPushButton *> &buttons, const QString &selectedKey);
+};
+
+#endif // COCKATRICE_EDHREC_COMMANDER_API_RESPONSE_BUDGET_NAVIGATION_WIDGET_H
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 230858d6c..111d91b91 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,15 +1,30 @@
 #include "edhrec_commander_api_response_display_widget.h"
 
-#include "../../../../../cards/card_info_picture_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/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 1678e1380..5ada40df3 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
@@ -1,17 +1,20 @@
 /**
  * @file edhrec_commander_api_response_display_widget.h
  * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H
 #define EDHREC_COMMANDER_API_RESPONSE_DISPLAY_WIDGET_H
 
-#include "../../api_response/commander/edhrec_commander_api_response.h"
-
-#include <QScrollArea>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class EdhrecCommanderApiResponse;
+class QHBoxLayout;
+class QScrollArea;
+class QVBoxLayout;
 
 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 3f3b9f1ba..fd02c4261 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,6 +1,12 @@
 #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,
@@ -11,47 +17,28 @@ EdhrecCommanderApiResponseNavigationWidget::EdhrecCommanderApiResponseNavigation
     layout = new QGridLayout(this);
     setLayout(layout);
 
-    gameChangerLabel = new QLabel(this);
-    budgetLabel = new QLabel(this);
+    bracketNavigationWidget = new EdhrecCommanderApiResponseBracketNavigationWidget(this, baseUrl);
+
+    connect(bracketNavigationWidget, &EdhrecCommanderApiResponseBracketNavigationWidget::requestNavigation, this,
+            &EdhrecCommanderApiResponseNavigationWidget::actRequestCommanderNavigation);
+
+    budgetNavigationWidget = new EdhrecCommanderApiResponseBudgetNavigationWidget(this, baseUrl);
+
+    connect(budgetNavigationWidget, &EdhrecCommanderApiResponseBudgetNavigationWidget::requestNavigation, this,
+            &EdhrecCommanderApiResponseNavigationWidget::actRequestCommanderNavigation);
 
     comboPushButton = new QPushButton(this);
+    comboPushButton->setMinimumHeight(84);
+    comboPushButton->setStyleSheet("font-size: 24px");
     averageDeckPushButton = new QPushButton(this);
+    averageDeckPushButton->setMinimumHeight(84);
+    averageDeckPushButton->setStyleSheet("font-size: 24px");
 
     layout->addWidget(comboPushButton, 0, 0, 1, 1);
     layout->addWidget(averageDeckPushButton, 0, 1, 1, 1);
 
-    layout->addWidget(gameChangerLabel, 1, 0, 1, 2);
-
-    for (int i = 0; i < gameChangerOptions.length(); i++) {
-        QString option = gameChangerOptions.at(i);
-        QString label = option.isEmpty() ? "All" : option.at(0).toUpper() + option.mid(1);
-        QPushButton *optionButton = new QPushButton(label, this);
-        gameChangerButtons[option] = optionButton;
-        layout->addWidget(optionButton, 2, i);
-        connect(optionButton, &QPushButton::clicked, this, [=, this]() {
-            selectedGameChanger = option;
-            updateOptionButtonSelection(gameChangerButtons, option);
-            actRequestCommanderNavigation();
-        });
-    }
-
-    layout->addWidget(budgetLabel, 3, 0, 1, 2);
-
-    for (int i = 0; i < budgetOptions.length(); i++) {
-        QString option = budgetOptions.at(i);
-        QString label = option.isEmpty() ? "Any" : option.at(0).toUpper() + option.mid(1);
-        QPushButton *btn = new QPushButton(label, this);
-        budgetButtons[option] = btn;
-        layout->addWidget(btn, 4, i);
-        connect(btn, &QPushButton::clicked, this, [=, this]() {
-            selectedBudget = option;
-            updateOptionButtonSelection(budgetButtons, option);
-            actRequestCommanderNavigation();
-        });
-    }
-
-    updateOptionButtonSelection(gameChangerButtons, "");
-    updateOptionButtonSelection(budgetButtons, "");
+    layout->addWidget(bracketNavigationWidget, 1, 0, 1, 2);
+    layout->addWidget(budgetNavigationWidget, 2, 0, 1, 2);
 
     QWidget *currentParent = parentWidget();
     TabEdhRecMain *parentTab = nullptr;
@@ -73,87 +60,21 @@ EdhrecCommanderApiResponseNavigationWidget::EdhrecCommanderApiResponseNavigation
     }
 
     retranslateUi();
-    applyOptionsFromUrl(baseUrl);
 }
 
 void EdhrecCommanderApiResponseNavigationWidget::retranslateUi()
 {
     comboPushButton->setText(tr("Combos"));
     averageDeckPushButton->setText(tr("Average Deck"));
-    gameChangerLabel->setText(tr("Game Changers"));
-    budgetLabel->setText(tr("Budget"));
-}
-
-void EdhrecCommanderApiResponseNavigationWidget::applyOptionsFromUrl(const QString &url)
-{
-    QString cleanedUrl = url;
-
-    // Remove base and file extension
-    if (cleanedUrl.startsWith("https://json.edhrec.com/pages/")) {
-        cleanedUrl = cleanedUrl.mid(QString("https://json.edhrec.com/pages/").length());
-    }
-    if (cleanedUrl.endsWith(".json")) {
-        cleanedUrl.chop(5);
-    }
-
-    // Expecting something like: "commanders/the-ur-dragon/core/expensive"
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
-    QStringList parts = cleanedUrl.split('/', Qt::SkipEmptyParts);
-#else
-    QStringList parts = cleanedUrl.split('/', QString::SkipEmptyParts);
-#endif
-
-    if (parts.size() < 2) {
-        return;
-    }
-
-    QString commanderName = parts[1];
-    QString gameChangerOpt, budgetOpt;
-
-    // Define valid sets
-    QSet<QString> validGameChangers = {"core", "upgraded", "optimized"};
-    QSet<QString> validBudgets = {"budget", "expensive"};
-
-    // Check remaining parts after commander
-    for (int i = 2; i < parts.size(); ++i) {
-        QString part = parts[i].toLower();
-        if (validGameChangers.contains(part)) {
-            gameChangerOpt = part;
-        } else if (validBudgets.contains(part)) {
-            budgetOpt = part;
-        }
-    }
-
-    // Validate and apply
-    if (!gameChangerButtons.contains(gameChangerOpt)) {
-        gameChangerOpt.clear();
-    }
-    if (!budgetButtons.contains(budgetOpt)) {
-        budgetOpt.clear();
-    }
-
-    selectedGameChanger = gameChangerOpt;
-    selectedBudget = budgetOpt;
-
-    updateOptionButtonSelection(gameChangerButtons, selectedGameChanger);
-    updateOptionButtonSelection(budgetButtons, selectedBudget);
-}
-
-void EdhrecCommanderApiResponseNavigationWidget::updateOptionButtonSelection(QMap<QString, QPushButton *> &buttons,
-                                                                             const QString &selectedKey)
-{
-    for (auto it = buttons.begin(); it != buttons.end(); ++it) {
-        it.value()->setStyleSheet(it.key() == selectedKey ? "background-color: lightblue; font-weight: bold;" : "");
-    }
 }
 
 QString EdhrecCommanderApiResponseNavigationWidget::addNavigationOptionsToUrl(QString baseUrl)
 {
-    if (!selectedGameChanger.isEmpty()) {
-        baseUrl += "/" + selectedGameChanger;
+    if (!bracketNavigationWidget->getSelectedGameChanger().isEmpty()) {
+        baseUrl += "/" + bracketNavigationWidget->getSelectedGameChanger();
     }
-    if (!selectedBudget.isEmpty()) {
-        baseUrl += "/" + selectedBudget;
+    if (!budgetNavigationWidget->getSelectedBudget().isEmpty()) {
+        baseUrl += "/" + budgetNavigationWidget->getSelectedBudget();
     }
     return baseUrl;
 }
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 b97e095f7..737558625 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
@@ -1,18 +1,22 @@
 /**
  * @file edhrec_commander_api_response_navigation_widget.h
  * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef EDHREC_COMMANDER_API_RESPONSE_NAVIGATION_WIDGET_H
 #define EDHREC_COMMANDER_API_RESPONSE_NAVIGATION_WIDGET_H
 
-#include "edhrec_api_response_commander_details_display_widget.h"
+#include "../../api_response/cards/edhrec_commander_api_response_commander_details.h"
 
-#include <QGridLayout>
-#include <QLabel>
-#include <QPushButton>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class EdhrecCommanderApiResponseBracketNavigationWidget;
+class EdhrecCommanderApiResponseBudgetNavigationWidget;
+class QGridLayout;
+class QPushButton;
 
 class EdhrecCommanderApiResponseNavigationWidget : public QWidget
 {
@@ -23,7 +27,6 @@ public:
         const EdhrecCommanderApiResponseCommanderDetails &_commanderDetails,
         QString baseUrl);
     void retranslateUi();
-    void applyOptionsFromUrl(const QString &url);
 
 public slots:
     void actRequestCommanderNavigation();
@@ -35,24 +38,14 @@ signals:
 private:
     QGridLayout *layout;
 
-    QLabel *gameChangerLabel;
-    QLabel *budgetLabel;
-
-    QStringList gameChangerOptions = {"", "core", "upgraded", "optimized"};
-    QStringList budgetOptions = {"", "budget", "expensive"};
-
-    QString selectedGameChanger;
-    QString selectedBudget;
-
-    QMap<QString, QPushButton *> gameChangerButtons;
-    QMap<QString, QPushButton *> budgetButtons;
+    EdhrecCommanderApiResponseBracketNavigationWidget *bracketNavigationWidget;
+    EdhrecCommanderApiResponseBudgetNavigationWidget *budgetNavigationWidget;
 
     QPushButton *comboPushButton;
     QPushButton *averageDeckPushButton;
 
     EdhrecCommanderApiResponseCommanderDetails commanderDetails;
 
-    void updateOptionButtonSelection(QMap<QString, QPushButton *> &buttons, const QString &selectedKey);
     QString addNavigationOptionsToUrl(QString baseUrl);
     QString buildComboUrl() const;
 };
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 ae07c9dc8..6f32db102 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,8 +1,17 @@
 #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 e2748bf10..8b5ddfad0 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
@@ -1,18 +1,19 @@
 /**
  * @file edhrec_top_cards_api_response_display_widget.h
  * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef EDHREC_TOP_CARDS_API_RESPONSE_DISPLAY_WIDGET_H
 #define EDHREC_TOP_CARDS_API_RESPONSE_DISPLAY_WIDGET_H
 
-#include "../../api_response/top_cards/edhrec_top_cards_api_response.h"
-
-#include <QResizeEvent>
-#include <QScrollArea>
-#include <QVBoxLayout>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class EdhrecTopCardsApiResponse;
+class QHBoxLayout;
+class QScrollArea;
+class QVBoxLayout;
 
 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 13f54a979..4ab333fd4 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,8 +1,20 @@
 #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 766518c02..8471a8dda 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
@@ -1,18 +1,19 @@
 /**
  * @file edhrec_top_commanders_api_response_display_widget.h
  * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef EDHREC_TOP_COMMANDERS_API_RESPONSE_DISPLAY_WIDGET_H
 #define EDHREC_TOP_COMMANDERS_API_RESPONSE_DISPLAY_WIDGET_H
 
-#include "../../api_response/top_commanders/edhrec_top_commanders_api_response.h"
-
-#include <QResizeEvent>
-#include <QScrollArea>
-#include <QVBoxLayout>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class EdhrecTopCommandersApiResponse;
+class QHBoxLayout;
+class QScrollArea;
+class QVBoxLayout;
 
 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 91a1ce3fa..9c7ce8d06 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,8 +1,17 @@
 #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 64228b85d..2c13d069f 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
@@ -1,17 +1,19 @@
 /**
  * @file edhrec_top_tags_api_response_display_widget.h
  * @ingroup ApiResponseDisplayWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H
 #define EDHREC_TOP_TAGS_API_RESPONSE_DISPLAY_WIDGET_H
 
-#include "../../api_response/top_tags/edhrec_top_tags_api_response.h"
-
-#include <QScrollArea>
-#include <QVBoxLayout>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class EdhrecTopTagsApiResponse;
+class QHBoxLayout;
+class QScrollArea;
+class QVBoxLayout;
 
 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 93dbd6bc5..3aa395126 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.cpp
@@ -1,24 +1,31 @@
 #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 <QResizeEvent>
+#include <QSharedPointer>
+#include <QUrl>
+#include <qlogging.h>
+
+class TabSupervisor;
 
 TabEdhRec::TabEdhRec(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
 {
     networkManager = new QNetworkAccessManager(this);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
     networkManager->setTransferTimeout(); // Use Qt's default timeout
-#endif
-
     networkManager->setRedirectPolicy(QNetworkRequest::ManualRedirectPolicy);
     connect(networkManager, &QNetworkAccessManager::finished, this, &TabEdhRec::processApiJson);
 }
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 b5ee8d2ca..4e3c9c8ba 100644
--- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h
+++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h
@@ -1,17 +1,23 @@
 /**
  * @file tab_edhrec.h
  * @ingroup Tabs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TAB_EDHREC_H
 #define TAB_EDHREC_H
 
 #include "../../tab.h"
-#include "display/commander/edhrec_commander_api_response_display_widget.h"
 
-#include <QNetworkAccessManager>
+#include <QJsonValue>
+#include <QString>
 #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 06ce88f06..ca575dc02 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,6 +1,10 @@
 #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"
 #include "api_response/commander/edhrec_commander_api_response.h"
@@ -12,19 +16,24 @@
 #include "display/top_commander/edhrec_top_commanders_api_response_display_widget.h"
 #include "display/top_tags/edhrec_top_tags_api_response_display_widget.h"
 
-#include <QCompleter>
 #include <QDebug>
 #include <QHBoxLayout>
 #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>
 
 static bool canBeCommander(const CardInfoPtr &cardInfo)
 {
@@ -36,10 +45,7 @@ static bool canBeCommander(const CardInfoPtr &cardInfo)
 TabEdhRecMain::TabEdhRecMain(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
 {
     networkManager = new QNetworkAccessManager(this);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
     networkManager->setTransferTimeout(); // Use Qt's default timeout
-#endif
-
     networkManager->setRedirectPolicy(QNetworkRequest::ManualRedirectPolicy);
     connect(networkManager, SIGNAL(finished(QNetworkReply *)), this, SLOT(processApiJson(QNetworkReply *)));
 
@@ -64,41 +70,21 @@ TabEdhRecMain::TabEdhRecMain(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor
     auto cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this);
     auto displayModel = new CardDatabaseDisplayModel(this);
     displayModel->setSourceModel(cardDatabaseModel);
-    auto *searchModel = new CardSearchModel(displayModel, this);
 
-    auto *proxyModel = new CardCompleterProxyModel(this);
-    proxyModel->setSourceModel(searchModel);
-    proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
-    proxyModel->setFilterRole(Qt::DisplayRole);
-
-    auto *completer = new QCompleter(proxyModel, this);
-    completer->setCompletionRole(Qt::DisplayRole);
-    completer->setCompletionMode(QCompleter::PopupCompletion);
-    completer->setCaseSensitivity(Qt::CaseInsensitive);
-    completer->setFilterMode(Qt::MatchContains);
-    completer->setMaxVisibleItems(10);
-    searchBar->setCompleter(completer);
+    const CardCompleterSetup cardSetup = createCardCompleter(displayModel, this);
+    searchBar->setCompleter(cardSetup.completer);
 
     // Update suggestions dynamically
-    connect(searchBar, &QLineEdit::textChanged, searchModel, &CardSearchModel::updateSearchResults);
-    connect(searchBar, &QLineEdit::textChanged, this, [=](const QString &text) {
-        // Ensure substring matching
-        QString pattern = ".*" + QRegularExpression::escape(text) + ".*";
-        proxyModel->setFilterRegularExpression(QRegularExpression(pattern, QRegularExpression::CaseInsensitiveOption));
-
-        if (!text.isEmpty()) {
-            completer->complete(); // Force the dropdown to appear
-        }
-    });
+    connectCardCompleterSearch(searchBar, cardSetup);
 
     searchPushButton = new QPushButton(navigationContainer);
     connect(searchPushButton, &QPushButton::clicked, this, [=, this]() { doSearch(); });
 
     settingsButton = new SettingsButtonWidget(this);
 
-    cardSizeSlider = new CardSizeWidget(this, nullptr, SettingsCache::instance().getEDHRecCardSize());
-    connect(cardSizeSlider, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
-            &SettingsCache::setEDHRecCardSize);
+    cardSizeSlider = new CardSizeWidget(this, nullptr, SettingsCache::instance().cardsDisplay().getEDHRecCardSize());
+    connect(cardSizeSlider, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::setEDHRecCardSize);
 
     settingsButton->addSettingsWidget(cardSizeSlider);
 
@@ -155,6 +141,8 @@ 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\\-]"));
 
@@ -166,6 +154,7 @@ void TabEdhRecMain::setCard(CardInfoPtr _cardToQuery, bool isCommander)
     }
 
     QNetworkRequest request{QUrl(url)};
+    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     networkManager->get(request);
 }
@@ -173,6 +162,7 @@ void TabEdhRecMain::setCard(CardInfoPtr _cardToQuery, bool isCommander)
 void TabEdhRecMain::actNavigatePage(QString url)
 {
     QNetworkRequest request{QUrl("https://json.edhrec.com/pages" + url + ".json")};
+    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     networkManager->get(request);
 }
@@ -180,6 +170,7 @@ void TabEdhRecMain::actNavigatePage(QString url)
 void TabEdhRecMain::getTopCards()
 {
     QNetworkRequest request{QUrl("https://json.edhrec.com/pages/top/year.json")};
+    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     networkManager->get(request);
 }
@@ -187,6 +178,7 @@ void TabEdhRecMain::getTopCards()
 void TabEdhRecMain::getTopCommanders()
 {
     QNetworkRequest request{QUrl("https://json.edhrec.com/pages/commanders/year.json")};
+    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
 
     networkManager->get(request);
 }
@@ -194,7 +186,7 @@ void TabEdhRecMain::getTopCommanders()
 void TabEdhRecMain::getTopTags()
 {
     QNetworkRequest request{QUrl("https://json.edhrec.com/pages/tags.json")};
-
+    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
     networkManager->get(request);
 }
 
@@ -358,7 +350,7 @@ void TabEdhRecMain::processAverageDeckResponse(QJsonObject reply)
 {
     EdhrecAverageDeckApiResponse deckData;
     deckData.fromJson(reply);
-    tabSupervisor->openDeckInNewTab(deckData.deck.deckLoader);
+    tabSupervisor->openDeckInNewTab({deckData.deck.deck, {}});
 }
 
 void TabEdhRecMain::prettyPrintJson(const QJsonValue &value, int indentLevel)
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 04cf03fc1..5d0245ed4 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
@@ -1,22 +1,31 @@
 /**
  * @file tab_edhrec_main.h
  * @ingroup Tabs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 "display/commander/edhrec_commander_api_response_display_widget.h"
+#include "libcockatrice/card/card_info.h"
 
-#include <QHBoxLayout>
-#include <QLineEdit>
-#include <QNetworkAccessManager>
-#include <QPushButton>
-#include <libcockatrice/card/database/card_database.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;
 
 class TabEdhRecMain : public Tab
 {
diff --git a/cockatrice/src/interface/widgets/tabs/tab.cpp b/cockatrice/src/interface/widgets/tabs/tab.cpp
index 3dcb3b523..5ef4d18b8 100644
--- a/cockatrice/src/interface/widgets/tabs/tab.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab.cpp
@@ -1,12 +1,17 @@
 #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 <QCloseEvent>
-#include <QDebug>
+#include <QFlags>
+#include <QPoint>
+#include <QRect>
 #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 7cff01130..e114f9bd9 100644
--- a/cockatrice/src/interface/widgets/tabs/tab.h
+++ b/cockatrice/src/interface/widgets/tabs/tab.h
@@ -1,18 +1,22 @@
 /**
  * @file tab.h
  * @ingroup Tabs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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
 {
@@ -20,6 +24,7 @@ class Tab : public QMainWindow
 signals:
     void userEvent(bool globalEvent = true);
     void tabTextChanged(Tab *tab, const QString &newTabText);
+    void cockatriceLinkActivated(const QString &url);
 
 protected:
     TabSupervisor *tabSupervisor;
diff --git a/cockatrice/src/interface/widgets/tabs/tab_account.cpp b/cockatrice/src/interface/widgets/tabs/tab_account.cpp
index e61732f90..e55dc55d0 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_account.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_account.cpp
@@ -1,14 +1,22 @@
 #include "tab_account.h"
 
 #include "../client/sound_engine.h"
+#include "../interface/widgets/dialogs/dlg_my_reports.h"
 #include "../interface/widgets/server/user/user_info_box.h"
 #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>
@@ -17,7 +25,8 @@
 #include <libcockatrice/protocol/pb/response_list_users.pb.h>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
 
 TabAccount::TabAccount(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &userInfo)
     : Tab(_tabSupervisor), client(_client)
@@ -49,6 +58,11 @@ TabAccount::TabAccount(TabSupervisor *_tabSupervisor, AbstractClient *_client, c
 
     auto *vbox = new QVBoxLayout;
     vbox->addWidget(userInfoBox);
+
+    myReportsButton = new QPushButton(tr("My Reports"));
+    connect(myReportsButton, &QPushButton::clicked, this, &TabAccount::openMyReports);
+    vbox->addWidget(myReportsButton);
+
     vbox->addWidget(allUsersList);
 
     auto *addToBuddyList = new QHBoxLayout;
@@ -126,15 +140,22 @@ void TabAccount::addToList(const std::string &listName, const QString &userName)
 
 void TabAccount::retranslateUi()
 {
+    myReportsButton->setText(tr("My Reports"));
     allUsersList->retranslateUi();
     buddyList->retranslateUi();
     ignoreList->retranslateUi();
     userInfoBox->retranslateUi();
+
+    buddyList->setToolTip(tr("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."));
+    ignoreList->setToolTip(tr("Ignored users' chat messages are hidden from you, and they cannot send you private "
+                              "messages or join your games."));
 }
 
 void TabAccount::processListUsersResponse(const Response &response)
 {
     const Response_ListUsers &resp = response.GetExtension(Response_ListUsers::ext);
+    allUsersList->beginBulkLoad();
     for (int i = 0; i < resp.user_list_size(); ++i) {
         const ServerInfo_User &info = resp.user_list(i);
         const QString &userName = QString::fromStdString(info.name());
@@ -142,8 +163,8 @@ void TabAccount::processListUsersResponse(const Response &response)
         ignoreList->setUserOnline(userName, true);
         buddyList->setUserOnline(userName, true);
     }
+    allUsersList->endBulkLoad();
 
-    allUsersList->sortItems();
     ignoreList->sortItems();
     buddyList->sortItems();
 }
@@ -188,18 +209,20 @@ void TabAccount::processUserLeftEvent(const Event_UserLeft &event)
 
 void TabAccount::buddyListReceived(const QList<ServerInfo_User> &_buddyList)
 {
+    buddyList->beginBulkLoad();
     for (const auto &user : _buddyList) {
         buddyList->processUserInfo(user, false);
     }
-    buddyList->sortItems();
+    buddyList->endBulkLoad();
 }
 
 void TabAccount::ignoreListReceived(const QList<ServerInfo_User> &_ignoreList)
 {
+    ignoreList->beginBulkLoad();
     for (const auto &user : _ignoreList) {
         ignoreList->processUserInfo(user, false);
     }
-    ignoreList->sortItems();
+    ignoreList->endBulkLoad();
 }
 
 void TabAccount::processAddToListEvent(const Event_AddToList &event)
@@ -237,3 +260,10 @@ void TabAccount::processRemoveFromListEvent(const Event_RemoveFromList &event)
 
     userList->deleteUser(user);
 }
+
+void TabAccount::openMyReports()
+{
+    auto *dlg = new DlgMyReports(client, this);
+    dlg->setAttribute(Qt::WA_DeleteOnClose);
+    dlg->exec();
+}
diff --git a/cockatrice/src/interface/widgets/tabs/tab_account.h b/cockatrice/src/interface/widgets/tabs/tab_account.h
index e09c12eb2..ab2c4b38d 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_account.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_account.h
@@ -1,27 +1,35 @@
 /**
  * @file tab_account.h
  * @ingroup AccountTabs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TAB_ACCOUNT_H
 #define TAB_ACCOUNT_H
 
 #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;
 class LineEditUnfocusable;
+class QPushButton;
 class Response;
 class ServerInfo_User;
 class UserInfoBox;
 class UserListWidget;
+class TabSupervisor;
+template <typename T> class QList;
 
 class TabAccount : public Tab
 {
@@ -41,6 +49,7 @@ private slots:
     void processRemoveFromListEvent(const Event_RemoveFromList &event);
     void addToIgnoreList();
     void addToBuddyList();
+    void openMyReports();
 
 private:
     AbstractClient *client;
@@ -50,6 +59,7 @@ private:
     UserInfoBox *userInfoBox;
     LineEditUnfocusable *addBuddyEdit;
     LineEditUnfocusable *addIgnoreEdit;
+    QPushButton *myReportsButton;
     void addToList(const std::string &listName, const QString &userName);
 
 public:
diff --git a/cockatrice/src/interface/widgets/tabs/tab_admin.cpp b/cockatrice/src/interface/widgets/tabs/tab_admin.cpp
index 533e1cc83..cfbd00538 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_admin.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_admin.cpp
@@ -1,19 +1,31 @@
 #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/trice_limits.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 e1935e351..8eb139a8e 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_admin.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_admin.h
@@ -1,8 +1,8 @@
 /**
  * @file tab_admin.h
  * @ingroup ServerTabs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TAB_ADMIN_H
 #define TAB_ADMIN_H
@@ -10,15 +10,17 @@
 #include "tab.h"
 
 #include <QDialog>
-#include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
+#include <QString>
+#include <qtmetamacros.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
new file mode 100644
index 000000000..1fc2854ce
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.cpp
@@ -0,0 +1,302 @@
+#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)
+{
+}
+
+int CardArtRulesModel::rowCount(const QModelIndex &parent) const
+{
+    if (parent.isValid()) {
+        return 0;
+    }
+    return static_cast<int>(entries.size());
+}
+
+int CardArtRulesModel::columnCount(const QModelIndex &parent) const
+{
+    Q_UNUSED(parent);
+    return 4;
+}
+
+QVariant CardArtRulesModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid()) {
+        return {};
+    }
+
+    const auto &e = entries.at(index.row());
+
+    if (role == Qt::DisplayRole) {
+        switch (index.column()) {
+            case 0:
+                return e.cardName;
+            case 1:
+                return e.cardProviderId;
+            case 2:
+                return e.mode;
+            case 3:
+                return e.reason;
+        }
+    }
+
+    return {};
+}
+
+QVariant CardArtRulesModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if (orientation != Qt::Horizontal || role != Qt::DisplayRole) {
+        return {};
+    }
+
+    switch (section) {
+        case 0:
+            return tr("Card");
+        case 1:
+            return tr("ProviderId");
+        case 2:
+            return tr("Mode");
+        case 3:
+            return tr("Reason");
+        default:
+            return {};
+    }
+}
+
+void CardArtRulesModel::refresh()
+{
+    Command_ListCardArtRules cmd;
+
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+
+    connect(pend, &PendingCommand::finished, this, &CardArtRulesModel::onRefreshFinished);
+
+    client->sendCommand(pend);
+}
+
+void CardArtRulesModel::clear()
+{
+    beginResetModel();
+    entries.clear();
+    endResetModel();
+}
+
+QString CardArtRulesModel::cardAt(int row) const
+{
+    if (row < 0 || row >= static_cast<int>(entries.size())) {
+        return {};
+    }
+
+    return entries[row].cardName;
+}
+
+const CardArtRulesModel::Entry *CardArtRulesModel::entryAt(int row) const
+{
+    if (row < 0 || row >= static_cast<int>(entries.size())) {
+        return nullptr;
+    }
+
+    return &entries[row];
+}
+
+void CardArtRulesModel::onRefreshFinished(const Response &r)
+{
+    if (r.response_code() != Response::RespOk) {
+        return;
+    }
+
+    const auto &resp = r.GetExtension(Response_ListCardArtRules::ext);
+
+    beginResetModel();
+    entries.clear();
+
+    for (const auto &e : resp.entries()) {
+        entries.push_back({QString::fromStdString(e.card_name()), QString::fromStdString(e.card_provider_id()),
+                           QString::fromStdString(e.mode()), QString::fromStdString(e.reason())});
+    }
+
+    endResetModel();
+}
+
+TabCardArtRules::TabCardArtRules(TabSupervisor *parent, AbstractClient *_client) : Tab(parent), client(_client)
+{
+    setupUi();
+    refresh();
+}
+
+void TabCardArtRules::setupUi()
+{
+    auto *central = new QWidget(this);
+
+    initSearchBar();
+
+    providerComboBox = new QComboBox;
+    modeBox = new QComboBox;
+    reasonEdit = new QLineEdit;
+
+    addBtn = new QPushButton;
+    removeBtn = new QPushButton;
+    refreshBtn = new QPushButton;
+
+    modeBox->addItems({"ALLOW", "DENY"});
+
+    tableModel = new CardArtRulesModel(client, this);
+
+    table = new QTableView;
+    table->setModel(tableModel);
+    table->setSelectionBehavior(QAbstractItemView::SelectRows);
+    table->setSelectionMode(QAbstractItemView::SingleSelection);
+
+    auto *form = new QFormLayout;
+    form->addRow(tr("Card:"), searchEdit);
+    form->addRow(tr("ProviderId:"), providerComboBox);
+    form->addRow(tr("Mode:"), modeBox);
+    form->addRow(tr("Reason:"), reasonEdit);
+
+    auto *buttons = new QHBoxLayout;
+    buttons->addWidget(addBtn);
+    buttons->addWidget(removeBtn);
+    buttons->addWidget(refreshBtn);
+
+    auto *layout = new QVBoxLayout;
+    layout->addLayout(form);
+    layout->addLayout(buttons);
+    layout->addWidget(table);
+
+    central->setLayout(layout);
+    setCentralWidget(central);
+
+    connect(addBtn, &QPushButton::clicked, this, &TabCardArtRules::addRule);
+
+    connect(removeBtn, &QPushButton::clicked, this, &TabCardArtRules::removeSelected);
+
+    connect(refreshBtn, &QPushButton::clicked, this, &TabCardArtRules::refresh);
+
+    retranslateUi();
+}
+
+void TabCardArtRules::initSearchBar()
+{
+    searchEdit = new QLineEdit;
+    searchEdit->setPlaceholderText(tr("Type a card name..."));
+
+    cardDbModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this);
+    cardDbDisplayModel = new CardDatabaseDisplayModel(this);
+    cardDbDisplayModel->setSourceModel(cardDbModel);
+
+    const CardCompleterSetup cardSetup = createCardCompleter(cardDbDisplayModel, this, 15);
+    cardSearchModel = cardSetup.searchModel;
+    cardProxyModel = cardSetup.proxyModel;
+    searchCompleter = cardSetup.completer;
+    searchEdit->setCompleter(searchCompleter);
+
+    connectCardCompleterSearch(searchEdit, cardSetup);
+    connect(searchCompleter, static_cast<void (QCompleter::*)(const QString &)>(&QCompleter::activated), this,
+            [this](const QString &name) { searchEdit->setText(name); });
+    connect(searchEdit, &QLineEdit::editingFinished, this,
+            [this]() { populateProviderCombo(searchEdit->text().trimmed()); });
+}
+
+void TabCardArtRules::populateProviderCombo(const QString &cardName)
+{
+    providerComboBox->clear();
+
+    auto card = CardDatabaseManager::query()->getCard({cardName});
+
+    const auto &sets = card.getInfo().getSets();
+
+    for (const auto &printings : sets) {
+        for (const auto &p : printings) {
+
+            QString setName = p.getSet()->getLongName();
+            QString collector = p.getProperty("num");
+            QString uuid = p.getUuid();
+
+            QString label = setName;
+
+            if (!collector.isEmpty()) {
+                label += " #" + collector;
+            }
+
+            providerComboBox->addItem(label, uuid);
+        }
+    }
+}
+
+void TabCardArtRules::retranslateUi()
+{
+    addBtn->setText(tr("Add rule"));
+    removeBtn->setText(tr("Remove rule"));
+    refreshBtn->setText(tr("Refresh"));
+}
+
+void TabCardArtRules::refresh()
+{
+    tableModel->refresh();
+}
+
+void TabCardArtRules::addRule()
+{
+    Command_AddCardArtRule cmd;
+    cmd.set_card_name(searchEdit->text().toStdString());
+    cmd.set_card_provider_id(providerComboBox->currentData().toString().toStdString());
+    cmd.set_mode(modeBox->currentText().toStdString());
+    cmd.set_reason(reasonEdit->text().toStdString());
+
+    client->sendCommand(client->prepareModeratorCommand(cmd));
+
+    refresh();
+}
+
+void TabCardArtRules::removeSelected()
+{
+    QModelIndex idx = table->currentIndex();
+    if (!idx.isValid()) {
+        return;
+    }
+
+    Command_RemoveCardArtRule cmd;
+    const auto e = tableModel->entryAt(idx.row());
+
+    cmd.set_card_name(e->cardName.toStdString());
+    cmd.set_card_provider_id(e->cardProviderId.toStdString());
+
+    client->sendCommand(client->prepareModeratorCommand(cmd));
+
+    refresh();
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h
new file mode 100644
index 000000000..f34300179
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/tab_card_art_rules.h
@@ -0,0 +1,105 @@
+#ifndef COCKATRICE_DLG_CARD_ART_RULES_H
+#define COCKATRICE_DLG_CARD_ART_RULES_H
+
+#include "tab.h"
+
+#include <QAbstractTableModel>
+#include <QModelIndex>
+#include <QString>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+#include <vector>
+
+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
+{
+    Q_OBJECT
+
+public:
+    struct Entry
+    {
+        QString cardName;
+        QString cardProviderId;
+        QString mode;
+        QString reason;
+    };
+
+    explicit CardArtRulesModel(AbstractClient *client, QObject *parent = nullptr);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
+
+    void refresh();
+    void clear();
+
+    QString cardAt(int row) const;
+    const Entry *entryAt(int row) const;
+
+private slots:
+    void onRefreshFinished(const Response &r);
+
+private:
+    AbstractClient *client;
+    std::vector<Entry> entries;
+};
+
+class TabCardArtRules : public Tab
+{
+    Q_OBJECT
+
+public:
+    TabCardArtRules(TabSupervisor *parent, AbstractClient *client);
+
+    QString getTabText() const override
+    {
+        return tr("Card Art Rules");
+    }
+    void retranslateUi() override;
+
+private:
+    void setupUi();
+
+private slots:
+    void addRule();
+    void removeSelected();
+    void refresh();
+
+private:
+    AbstractClient *client;
+
+    QLineEdit *searchEdit;
+    void initSearchBar();
+    void populateProviderCombo(const QString &cardName);
+    QCompleter *searchCompleter;
+    CardDatabaseModel *cardDbModel;
+    CardDatabaseDisplayModel *cardDbDisplayModel;
+    CardSearchModel *cardSearchModel;
+    CardCompleterProxyModel *cardProxyModel;
+    QComboBox *providerComboBox;
+    QComboBox *modeBox;
+    QLineEdit *reasonEdit;
+
+    QPushButton *addBtn;
+    QPushButton *removeBtn;
+    QPushButton *refreshBtn;
+
+    QTableView *table;
+    CardArtRulesModel *tableModel;
+};
+
+#endif // COCKATRICE_DLG_CARD_ART_RULES_H
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
index 4fa12259c..7ca179cea 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp
@@ -1,26 +1,29 @@
 #include "tab_deck_editor.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../filters/filter_builder.h"
-#include "../interface/pixel_map_generator.h"
-#include "../interface/widgets/cards/card_info_frame_widget.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 "../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 <QCloseEvent>
-#include <QDebug>
-#include <QDir>
+#include <QByteArray>
 #include <QDockWidget>
-#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/utility/trice_limits.h>
+#include <QEvent>
+#include <QList>
+#include <QMap>
+#include <QMenu>
+#include <QSize>
+#include <QString>
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/settings/layouts_settings.h>
+#include <qnamespace.h>
+
+class TabSupervisor;
 
 /**
  * @brief Constructs a new TabDeckEditor object.
@@ -53,49 +56,15 @@ void TabDeckEditor::createMenus()
 
     viewMenu = new QMenu(this);
 
-    cardInfoDockMenu = viewMenu->addMenu(QString());
-    deckDockMenu = viewMenu->addMenu(QString());
-    filterDockMenu = viewMenu->addMenu(QString());
-    printingSelectorDockMenu = viewMenu->addMenu(QString());
+    registerDockWidget(viewMenu, cardDatabaseDockWidget, {500, 500});
+    registerDockWidget(viewMenu, cardInfoDockWidget, {250, 500});
+    registerDockWidget(viewMenu, deckDockWidget, {250, 360});
+    registerDockWidget(viewMenu, filterDockWidget, {250, 250});
+    registerDockWidget(viewMenu, printingSelectorDockWidget, {525, 250});
 
-    // Card Info dock
-    aCardInfoDockVisible = cardInfoDockMenu->addAction(QString());
-    aCardInfoDockVisible->setCheckable(true);
-    connect(aCardInfoDockVisible, &QAction::triggered, this, &TabDeckEditor::dockVisibleTriggered);
-    aCardInfoDockFloating = cardInfoDockMenu->addAction(QString());
-    aCardInfoDockFloating->setCheckable(true);
-    connect(aCardInfoDockFloating, &QAction::triggered, this, &TabDeckEditor::dockFloatingTriggered);
-
-    // Deck dock
-    aDeckDockVisible = deckDockMenu->addAction(QString());
-    aDeckDockVisible->setCheckable(true);
-    connect(aDeckDockVisible, &QAction::triggered, this, &TabDeckEditor::dockVisibleTriggered);
-    aDeckDockFloating = deckDockMenu->addAction(QString());
-    aDeckDockFloating->setCheckable(true);
-    connect(aDeckDockFloating, &QAction::triggered, this, &TabDeckEditor::dockFloatingTriggered);
-
-    // Filter dock
-    aFilterDockVisible = filterDockMenu->addAction(QString());
-    aFilterDockVisible->setCheckable(true);
-    connect(aFilterDockVisible, &QAction::triggered, this, &TabDeckEditor::dockVisibleTriggered);
-    aFilterDockFloating = filterDockMenu->addAction(QString());
-    aFilterDockFloating->setCheckable(true);
-    connect(aFilterDockFloating, &QAction::triggered, this, &TabDeckEditor::dockFloatingTriggered);
-
-    // Printing selector dock
-    aPrintingSelectorDockVisible = printingSelectorDockMenu->addAction(QString());
-    aPrintingSelectorDockVisible->setCheckable(true);
-    connect(aPrintingSelectorDockVisible, &QAction::triggered, this, &TabDeckEditor::dockVisibleTriggered);
-    aPrintingSelectorDockFloating = printingSelectorDockMenu->addAction(QString());
-    aPrintingSelectorDockFloating->setCheckable(true);
-    connect(aPrintingSelectorDockFloating, &QAction::triggered, this, &TabDeckEditor::dockFloatingTriggered);
-
-    if (SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) {
-        printingSelectorDockMenu->setEnabled(false);
-    }
-
-    connect(&SettingsCache::instance(), &SettingsCache::overrideAllCardArtWithPersonalPreferenceChanged, this,
-            [this](bool enabled) { printingSelectorDockMenu->setEnabled(!enabled); });
+    connect(&SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::overrideAllCardArtWithPersonalPreferenceChanged, this,
+            [this](bool enabled) { dockToActions[printingSelectorDockWidget].menu->setEnabled(!enabled); });
 
     viewMenu->addSeparator();
 
@@ -114,9 +83,10 @@ void TabDeckEditor::createMenus()
  */
 QString TabDeckEditor::getTabText() const
 {
-    QString result = tr("Deck: %1").arg(deckDockWidget->getSimpleDeckName());
-    if (modified)
+    QString result = tr("Deck: %1").arg(deckStateManager->getSimpleDeckName());
+    if (deckStateManager->isModified()) {
         result.prepend("* ");
+    }
     return result;
 }
 
@@ -124,25 +94,25 @@ QString TabDeckEditor::getTabText() const
 void TabDeckEditor::retranslateUi()
 {
     deckMenu->retranslateUi();
+    cardDatabaseDockWidget->retranslateUi();
     cardInfoDockWidget->retranslateUi();
     deckDockWidget->retranslateUi();
     filterDockWidget->retranslateUi();
     printingSelectorDockWidget->retranslateUi();
 
     viewMenu->setTitle(tr("&View"));
-    cardInfoDockMenu->setTitle(tr("Card Info"));
-    deckDockMenu->setTitle(tr("Deck"));
-    filterDockMenu->setTitle(tr("Filters"));
-    printingSelectorDockMenu->setTitle(tr("Printing"));
 
-    aCardInfoDockVisible->setText(tr("Visible"));
-    aCardInfoDockFloating->setText(tr("Floating"));
-    aDeckDockVisible->setText(tr("Visible"));
-    aDeckDockFloating->setText(tr("Floating"));
-    aFilterDockVisible->setText(tr("Visible"));
-    aFilterDockFloating->setText(tr("Floating"));
-    aPrintingSelectorDockVisible->setText(tr("Visible"));
-    aPrintingSelectorDockFloating->setText(tr("Floating"));
+    dockToActions[cardDatabaseDockWidget].menu->setTitle(tr("Card Database"));
+    dockToActions[cardInfoDockWidget].menu->setTitle(tr("Card Info"));
+    dockToActions[deckDockWidget].menu->setTitle(tr("Deck"));
+    dockToActions[filterDockWidget].menu->setTitle(tr("Filters"));
+    dockToActions[printingSelectorDockWidget].menu->setTitle(tr("Printing"));
+
+    for (auto &actions : dockToActions.values()) {
+        actions.aVisible->setText(tr("Visible"));
+        actions.aFloating->setText(tr("Floating"));
+    }
+
     aResetLayout->setText(tr("Reset layout"));
 }
 
@@ -153,69 +123,20 @@ void TabDeckEditor::refreshShortcuts()
     aResetLayout->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aResetLayout"));
 }
 
-/**
- * @brief Displays the printing selector dock with the current card.
- */
-void TabDeckEditor::showPrintingSelector()
-{
-    printingSelectorDockWidget->printingSelector->setCard(cardInfoDockWidget->cardInfo->getCard().getCardPtr(),
-                                                          DECK_ZONE_MAIN);
-    printingSelectorDockWidget->printingSelector->updateDisplay();
-    aPrintingSelectorDockVisible->setChecked(true);
-    printingSelectorDockWidget->setVisible(true);
-}
-
 /**
  * @brief Loads deck editor layout from settings or resets to default.
  */
 void TabDeckEditor::loadLayout()
 {
     LayoutsSettings &layouts = SettingsCache::instance().layouts();
-    setCentralWidget(databaseDisplayDockWidget);
 
-    auto &layoutState = layouts.getDeckEditorLayoutState();
-    if (layoutState.isNull())
+    auto layoutState = layouts.getDeckEditorLayoutState();
+    if (layoutState.isNull()) {
         restartLayout();
-    else {
+    } else {
         restoreState(layoutState);
         restoreGeometry(layouts.getDeckEditorGeometry());
     }
-
-    if (SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) {
-        if (!printingSelectorDockWidget->isHidden()) {
-            printingSelectorDockWidget->setHidden(true);
-            aPrintingSelectorDockVisible->setChecked(false);
-        }
-    }
-
-    aCardInfoDockVisible->setChecked(!cardInfoDockWidget->isHidden());
-    aFilterDockVisible->setChecked(!filterDockWidget->isHidden());
-    aDeckDockVisible->setChecked(!deckDockWidget->isHidden());
-    aPrintingSelectorDockVisible->setChecked(!printingSelectorDockWidget->isHidden());
-
-    aCardInfoDockFloating->setEnabled(aCardInfoDockVisible->isChecked());
-    aDeckDockFloating->setEnabled(aDeckDockVisible->isChecked());
-    aFilterDockFloating->setEnabled(aFilterDockVisible->isChecked());
-    aPrintingSelectorDockFloating->setEnabled(aPrintingSelectorDockVisible->isChecked());
-
-    aCardInfoDockFloating->setChecked(cardInfoDockWidget->isFloating());
-    aFilterDockFloating->setChecked(filterDockWidget->isFloating());
-    aDeckDockFloating->setChecked(deckDockWidget->isFloating());
-    aPrintingSelectorDockFloating->setChecked(printingSelectorDockWidget->isFloating());
-
-    cardInfoDockWidget->setMinimumSize(layouts.getDeckEditorCardSize());
-    cardInfoDockWidget->setMaximumSize(layouts.getDeckEditorCardSize());
-
-    filterDockWidget->setMinimumSize(layouts.getDeckEditorFilterSize());
-    filterDockWidget->setMaximumSize(layouts.getDeckEditorFilterSize());
-
-    deckDockWidget->setMinimumSize(layouts.getDeckEditorDeckSize());
-    deckDockWidget->setMaximumSize(layouts.getDeckEditorDeckSize());
-
-    printingSelectorDockWidget->setMinimumSize(layouts.getDeckEditorPrintingSelectorSize());
-    printingSelectorDockWidget->setMaximumSize(layouts.getDeckEditorPrintingSelectorSize());
-
-    QTimer::singleShot(100, this, &TabDeckEditor::freeDocksSize);
 }
 
 /**
@@ -223,107 +144,22 @@ void TabDeckEditor::loadLayout()
  */
 void TabDeckEditor::restartLayout()
 {
+    // Show/hide and reset floating
+    for (auto dockWidget : dockToActions.keys()) {
+        dockWidget->setVisible(true);
+        dockWidget->setFloating(false);
+    }
 
-    // Update menu checkboxes
-    aCardInfoDockVisible->setChecked(true);
-    aDeckDockVisible->setChecked(true);
-    aFilterDockVisible->setChecked(true);
-    aPrintingSelectorDockVisible->setChecked(!SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference());
-
-    aCardInfoDockFloating->setChecked(false);
-    aDeckDockFloating->setChecked(false);
-    aFilterDockFloating->setChecked(false);
-    aPrintingSelectorDockFloating->setChecked(false);
-
-    setCentralWidget(databaseDisplayDockWidget);
+    addDockWidget(Qt::LeftDockWidgetArea, cardDatabaseDockWidget);
     addDockWidget(Qt::RightDockWidgetArea, deckDockWidget);
     addDockWidget(Qt::RightDockWidgetArea, cardInfoDockWidget);
     addDockWidget(Qt::RightDockWidgetArea, filterDockWidget);
     addDockWidget(Qt::RightDockWidgetArea, printingSelectorDockWidget);
 
-    // Show/hide and reset floating
-    deckDockWidget->setFloating(false);
-    cardInfoDockWidget->setFloating(false);
-    filterDockWidget->setFloating(false);
-    printingSelectorDockWidget->setFloating(false);
-
-    deckDockWidget->setVisible(true);
-    cardInfoDockWidget->setVisible(true);
-    filterDockWidget->setVisible(true);
-    printingSelectorDockWidget->setVisible(!SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference());
-
     splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Horizontal);
     splitDockWidget(printingSelectorDockWidget, deckDockWidget, Qt::Horizontal);
     splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Horizontal);
     splitDockWidget(cardInfoDockWidget, filterDockWidget, Qt::Vertical);
-
-    QTimer::singleShot(100, this, &TabDeckEditor::freeDocksSize);
-}
-
-/** @brief Frees dock sizes to allow flexible resizing. */
-void TabDeckEditor::freeDocksSize()
-{
-    const QSize minSize(100, 100);
-    const QSize maxSize(5000, 5000);
-
-    deckDockWidget->setMinimumSize(minSize);
-    deckDockWidget->setMaximumSize(maxSize);
-
-    cardInfoDockWidget->setMinimumSize(minSize);
-    cardInfoDockWidget->setMaximumSize(maxSize);
-
-    filterDockWidget->setMinimumSize(minSize);
-    filterDockWidget->setMaximumSize(maxSize);
-
-    printingSelectorDockWidget->setMinimumSize(minSize);
-    printingSelectorDockWidget->setMaximumSize(maxSize);
-}
-
-/** @brief Handles dock visibility toggling from menu actions. */
-void TabDeckEditor::dockVisibleTriggered()
-{
-    QObject *o = sender();
-    if (o == aCardInfoDockVisible) {
-        cardInfoDockWidget->setHidden(!aCardInfoDockVisible->isChecked());
-        aCardInfoDockFloating->setEnabled(aCardInfoDockVisible->isChecked());
-    } else if (o == aDeckDockVisible) {
-        deckDockWidget->setHidden(!aDeckDockVisible->isChecked());
-        aDeckDockFloating->setEnabled(aDeckDockVisible->isChecked());
-    } else if (o == aFilterDockVisible) {
-        filterDockWidget->setHidden(!aFilterDockVisible->isChecked());
-        aFilterDockFloating->setEnabled(aFilterDockVisible->isChecked());
-    } else if (o == aPrintingSelectorDockVisible) {
-        printingSelectorDockWidget->setHidden(!aPrintingSelectorDockVisible->isChecked());
-        aPrintingSelectorDockFloating->setEnabled(aPrintingSelectorDockVisible->isChecked());
-    }
-}
-
-/** @brief Handles dock floating toggling from menu actions. */
-void TabDeckEditor::dockFloatingTriggered()
-{
-    QObject *o = sender();
-    if (o == aCardInfoDockFloating)
-        cardInfoDockWidget->setFloating(aCardInfoDockFloating->isChecked());
-    else if (o == aDeckDockFloating)
-        deckDockWidget->setFloating(aDeckDockFloating->isChecked());
-    else if (o == aFilterDockFloating)
-        filterDockWidget->setFloating(aFilterDockFloating->isChecked());
-    else if (o == aPrintingSelectorDockFloating)
-        printingSelectorDockWidget->setFloating(aPrintingSelectorDockFloating->isChecked());
-}
-
-/** @brief Syncs menu state with dock floating changes. */
-void TabDeckEditor::dockTopLevelChanged(bool topLevel)
-{
-    QObject *o = sender();
-    if (o == cardInfoDockWidget)
-        aCardInfoDockFloating->setChecked(topLevel);
-    else if (o == deckDockWidget)
-        aDeckDockFloating->setChecked(topLevel);
-    else if (o == filterDockWidget)
-        aFilterDockFloating->setChecked(topLevel);
-    else if (o == printingSelectorDockWidget)
-        aPrintingSelectorDockFloating->setChecked(topLevel);
 }
 
 /**
@@ -334,30 +170,10 @@ void TabDeckEditor::dockTopLevelChanged(bool topLevel)
  */
 bool TabDeckEditor::eventFilter(QObject *o, QEvent *e)
 {
-    if (e->type() == QEvent::Close) {
-        if (o == cardInfoDockWidget) {
-            aCardInfoDockVisible->setChecked(false);
-            aCardInfoDockFloating->setEnabled(false);
-        } else if (o == deckDockWidget) {
-            aDeckDockVisible->setChecked(false);
-            aDeckDockFloating->setEnabled(false);
-        } else if (o == filterDockWidget) {
-            aFilterDockVisible->setChecked(false);
-            aFilterDockFloating->setEnabled(false);
-        } else if (o == printingSelectorDockWidget) {
-            aPrintingSelectorDockVisible->setChecked(false);
-            aPrintingSelectorDockFloating->setEnabled(false);
-        }
-    }
-
     if (o == this && e->type() == QEvent::Hide) {
         LayoutsSettings &layouts = SettingsCache::instance().layouts();
         layouts.setDeckEditorLayoutState(saveState());
         layouts.setDeckEditorGeometry(saveGeometry());
-        layouts.setDeckEditorCardSize(cardInfoDockWidget->size());
-        layouts.setDeckEditorFilterSize(filterDockWidget->size());
-        layouts.setDeckEditorDeckSize(deckDockWidget->size());
-        layouts.setDeckEditorPrintingSelectorSize(printingSelectorDockWidget->size());
     }
     return false;
 }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
index 9e00099a0..afe62e962 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
@@ -1,18 +1,11 @@
 #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 <libcockatrice/card/card_info.h>
+#include <qtmetamacros.h>
 
-class CardDatabaseModel;
-class CardDatabaseDisplayModel;
-class DeckListModel;
-
-class QLabel;
-class DeckLoader;
+class TabSupervisor;
 
 /**
  * @class TabDeckEditor
@@ -63,17 +56,11 @@ protected slots:
     /** @brief Resets the layout to default positions and dock states. */
     void restartLayout() override;
 
-    /** @brief Frees the dock sizes for resizing flexibility. */
-    void freeDocksSize() override;
-
     /** @brief Refreshes shortcuts for this tab from settings. */
     void refreshShortcuts() override;
 
     /** @brief Handles dock visibility, floating, and top-level changes. */
     bool eventFilter(QObject *o, QEvent *e) override;
-    void dockVisibleTriggered() override;
-    void dockFloatingTriggered() override;
-    void dockTopLevelChanged(bool topLevel) override;
 
 public:
     /**
@@ -90,10 +77,6 @@ public:
 
     /** @brief Creates menus for deck editing and view options. */
     void createMenus() override;
-
-public slots:
-    /** @brief Shows the printing selector dock and updates it with current card. */
-    void showPrintingSelector() override;
 };
 
 #endif
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
index 854990e19..44d04bd24 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
@@ -1,33 +1,90 @@
 #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 <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>
 #include <libcockatrice/protocol/pb/command_deck_del_dir.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_download.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_new_dir.pb.h>
+#include <libcockatrice/protocol/pb/command_deck_set_visibility.pb.h>
+#include <libcockatrice/protocol/pb/command_deck_share_create.pb.h>
 #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_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
+{
+// How long to wait after the last visibility change before reading back the
+// Public/Private column, in milliseconds.
+constexpr int VISIBILITY_REFRESH_DELAY = 500;
+
+// Whether the file's name matches one of the deck formats Cockatrice can load.
+bool isSupportedDeckFile(const QString &filePath)
+{
+    return QDir::match(DeckLoader::ACCEPTED_FILE_EXTENSIONS, QFileInfo(filePath).fileName());
+}
+} // namespace
 
 TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
                                AbstractClient *_client,
@@ -35,7 +92,9 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
     : Tab(_tabSupervisor), client(_client)
 {
     localDirModel = new QFileSystemModel(this);
-    localDirModel->setRootPath(SettingsCache::instance().getDeckPath());
+    localDirModel->setRootPath(SettingsCache::instance().paths().getDeckPath());
+    localDirModel->setNameFilters(DeckLoader::ACCEPTED_FILE_EXTENSIONS);
+    localDirModel->setNameFilterDisables(false);
     localDirModel->sort(0, Qt::AscendingOrder);
 
     localDirView = new QTreeView;
@@ -89,8 +148,34 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
     serverDirView = new RemoteDeckList_TreeWidget(client);
 
     connect(serverDirView, &QTreeView::doubleClicked, this, &TabDeckStorage::actRemoteDoubleClick);
+    connect(serverDirView->selectionModel(), &QItemSelectionModel::selectionChanged, this,
+            [this] { onServerSelectionChanged(); });
+
+    // Share bar for creating a share link from the selected server decks/folders.
+    shareBar = new ShareBarWidget(this);
+    connect(shareBar, &ShareBarWidget::createRequested, this, &TabDeckStorage::actShareSelection);
+    connect(shareBar, &ShareBarWidget::cancelRequested, this, &TabDeckStorage::cancelShareDecks);
+    shareBar->setVisible(false);
+
+    shareTimeoutTimer = new QTimer(this);
+    shareTimeoutTimer->setSingleShot(true);
+    shareTimeoutTimer->setInterval(
+        static_cast<int>((static_cast<qint64>(SettingsCache::instance().network().getTimeOut()) + 1) *
+                         SettingsCache::instance().network().getKeepAlive() * 1000));
+    connect(shareTimeoutTimer, &QTimer::timeout, this, &TabDeckStorage::onShareFromTreeTimeout);
+
+    // Restartable single-shot refresh for the Public/Private column. It is
+    // armed with the full network timeout when a publish is sent (so a dropped
+    // reply still drains once) and re-armed with the short delay every time a
+    // reply lands, so the drain cannot fire while a slow round trip is still in
+    // flight. Either way the tree is re-read once things quiet down.
+    visibilityRefreshTimer = new QTimer(this);
+    visibilityRefreshTimer->setSingleShot(true);
+    visibilityRefreshTimer->setInterval(VISIBILITY_REFRESH_DELAY);
+    connect(visibilityRefreshTimer, &QTimer::timeout, this, &TabDeckStorage::onVisibilityRefreshTimeout);
 
     QVBoxLayout *rightVbox = new QVBoxLayout;
+    rightVbox->addWidget(shareBar);
     rightVbox->addWidget(serverDirView);
     rightVbox->addLayout(rightToolBarLayout);
     rightGroupBox = new QGroupBox;
@@ -103,19 +188,19 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
 
     // Left side actions
     aOpenLocalDeck = new QAction(this);
-    aOpenLocalDeck->setIcon(QPixmap("theme:icons/pencil"));
+    aOpenLocalDeck->setIcon(themePixmap(QStringLiteral("icons/pencil")));
     connect(aOpenLocalDeck, &QAction::triggered, this, &TabDeckStorage::actOpenLocalDeck);
     aRenameLocal = new QAction(this);
-    aRenameLocal->setIcon(QPixmap("theme:icons/rename"));
+    aRenameLocal->setIcon(themePixmap(QStringLiteral("icons/rename")));
     connect(aRenameLocal, &QAction::triggered, this, &TabDeckStorage::actRenameLocal);
     aUpload = new QAction(this);
-    aUpload->setIcon(QPixmap("theme:icons/arrow_right_green"));
+    aUpload->setIcon(themePixmap(QStringLiteral("icons/arrow_right_green")));
     connect(aUpload, &QAction::triggered, this, &TabDeckStorage::actUpload);
     aNewLocalFolder = new QAction(this);
     aNewLocalFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder));
     connect(aNewLocalFolder, &QAction::triggered, this, &TabDeckStorage::actNewLocalFolder);
     aDeleteLocalDeck = new QAction(this);
-    aDeleteLocalDeck->setIcon(QPixmap("theme:icons/remove_row"));
+    aDeleteLocalDeck->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
     connect(aDeleteLocalDeck, &QAction::triggered, this, &TabDeckStorage::actDeleteLocalDeck);
 
     aOpenDecksFolder = new QAction(this);
@@ -124,18 +209,26 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
 
     // Right side actions
     aOpenRemoteDeck = new QAction(this);
-    aOpenRemoteDeck->setIcon(QPixmap("theme:icons/pencil"));
+    aOpenRemoteDeck->setIcon(themePixmap(QStringLiteral("icons/pencil")));
     connect(aOpenRemoteDeck, &QAction::triggered, this, &TabDeckStorage::actOpenRemoteDeck);
     aDownload = new QAction(this);
-    aDownload->setIcon(QPixmap("theme:icons/arrow_left_green"));
+    aDownload->setIcon(themePixmap(QStringLiteral("icons/arrow_left_green")));
     connect(aDownload, &QAction::triggered, this, &TabDeckStorage::actDownload);
     aNewFolder = new QAction(this);
     aNewFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder));
     connect(aNewFolder, &QAction::triggered, this, &TabDeckStorage::actNewFolder);
     aDeleteRemoteDeck = new QAction(this);
-    aDeleteRemoteDeck->setIcon(QPixmap("theme:icons/remove_row"));
+    aDeleteRemoteDeck->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
     connect(aDeleteRemoteDeck, &QAction::triggered, this, &TabDeckStorage::actDeleteRemoteDeck);
 
+    aShareDecks = new QAction(this);
+    aShareDecks->setIcon(themePixmap(QStringLiteral("icons/share")));
+    connect(aShareDecks, &QAction::triggered, this, &TabDeckStorage::actShareDecks);
+
+    aPublishDeck = new QAction(this);
+    aPublishDeck->setIcon(QPixmap("theme:icons/lock"));
+    connect(aPublishDeck, &QAction::triggered, this, &TabDeckStorage::actPublishDeck);
+
     // Add actions to toolbars
     leftToolBar->addAction(aOpenLocalDeck);
     leftToolBar->addAction(aRenameLocal);
@@ -147,6 +240,8 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
 
     rightToolBar->addAction(aOpenRemoteDeck);
     rightToolBar->addAction(aDownload);
+    rightToolBar->addAction(aShareDecks);
+    rightToolBar->addAction(aPublishDeck);
     rightToolBar->addAction(aNewFolder);
     rightToolBar->addAction(aDeleteRemoteDeck);
 
@@ -175,14 +270,21 @@ void TabDeckStorage::retranslateUi()
     aNewFolder->setText(tr("New folder"));
     aDeleteLocalDeck->setText(tr("Delete"));
     aDeleteRemoteDeck->setText(tr("Delete"));
+    aShareDecks->setText(tr("Share decks"));
+    aPublishDeck->setText(tr("Publish/unpublish deck"));
     aOpenDecksFolder->setText(tr("Open decks folder"));
+    shareBar->retranslateUi();
+    if (shareBar->isVisible()) {
+        onServerSelectionChanged();
+    }
 }
 
 QString TabDeckStorage::getTargetPath() const
 {
     RemoteDeckList_TreeModel::Node *curRight = serverDirView->getCurrentItem();
-    if (curRight == nullptr)
+    if (curRight == nullptr) {
         return {};
+    }
     auto *dir = dynamic_cast<RemoteDeckList_TreeModel::DirectoryNode *>(curRight);
     if (dir == nullptr) {
         dir = dynamic_cast<RemoteDeckList_TreeModel::DirectoryNode *>(curRight->getParent());
@@ -207,6 +309,8 @@ void TabDeckStorage::handleConnected(const ServerInfo_User &userInfo)
 void TabDeckStorage::handleConnectionChanged(ClientStatus status)
 {
     if (status == StatusDisconnected) {
+        visibilityRefreshTimer->stop();
+        visibilityRefreshStarted = false;
         setRemoteEnabled(false);
     }
 }
@@ -216,12 +320,15 @@ void TabDeckStorage::setRemoteEnabled(bool enabled)
     aUpload->setEnabled(enabled);
     aOpenRemoteDeck->setEnabled(enabled);
     aDownload->setEnabled(enabled);
+    aShareDecks->setEnabled(enabled);
+    aPublishDeck->setEnabled(enabled);
     aNewFolder->setEnabled(enabled);
     aDeleteRemoteDeck->setEnabled(enabled);
 
     if (enabled) {
         serverDirView->refreshTree();
     } else {
+        setShareModeEnabled(false);
         serverDirView->clearTree();
     }
 }
@@ -237,15 +344,21 @@ void TabDeckStorage::actOpenLocalDeck()
 {
     QModelIndexList curLefts = localDirView->selectionModel()->selectedRows();
     for (const auto &curLeft : curLefts) {
-        if (localDirModel->isDir(curLeft))
+        if (localDirModel->isDir(curLeft)) {
             continue;
+        }
         QString filePath = localDirModel->filePath(curLeft);
 
-        auto deckLoader = new DeckLoader(this);
-        if (!deckLoader->loadFromFile(filePath, DeckLoader::CockatriceFormat, true))
+        if (!isSupportedDeckFile(filePath)) {
             continue;
+        }
 
-        emit openDeckEditor(deckLoader);
+        std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromFile(filePath, DeckFileFormat::Cockatrice, true);
+        if (!deckOpt) {
+            continue;
+        }
+
+        emit openDeckEditor(deckOpt.value());
     }
 }
 
@@ -304,30 +417,39 @@ void TabDeckStorage::actUpload()
 
 void TabDeckStorage::uploadDeck(const QString &filePath, const QString &targetPath)
 {
-    QFile deckFile(filePath);
-    QFileInfo deckFileInfo(deckFile);
-
-    DeckLoader deck(this);
-    if (!deck.loadFromFile(filePath, DeckLoader::CockatriceFormat)) {
+    if (!isSupportedDeckFile(filePath)) {
         QMessageBox::critical(this, tr("Error"), tr("Invalid deck file"));
         return;
     }
 
-    if (deck.getDeckList()->getName().isEmpty()) {
+    QFile deckFile(filePath);
+    QFileInfo deckFileInfo(deckFile);
+
+    std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromFile(filePath, DeckFileFormat::Cockatrice, true);
+    if (!deckOpt) {
+        QMessageBox::critical(this, tr("Error"), tr("Invalid deck file"));
+        return;
+    }
+
+    DeckList deck = deckOpt.value().deckList;
+
+    if (deck.getName().isEmpty()) {
         bool ok;
         QString deckName =
             getTextWithMax(this, tr("Enter deck name"), tr("This decklist does not have a name.\nPlease enter a name:"),
                            QLineEdit::Normal, deckFileInfo.completeBaseName(), &ok);
-        if (!ok)
+        if (!ok) {
             return;
-        if (deckName.isEmpty())
+        }
+        if (deckName.isEmpty()) {
             deckName = tr("Unnamed deck");
-        deck.getDeckList()->setName(deckName);
+        }
+        deck.setName(deckName);
     } else {
-        deck.getDeckList()->setName(deck.getDeckList()->getName().left(MAX_NAME_LENGTH));
+        deck.setName(deck.getName().left(MAX_NAME_LENGTH));
     }
 
-    QString deckString = deck.getDeckList()->writeToString_Native();
+    QString deckString = deck.writeToString_Native();
     if (deckString.length() > MAX_FILE_LENGTH) {
         QMessageBox::critical(this, tr("Error"), tr("Invalid deck file"));
         return;
@@ -337,6 +459,8 @@ void TabDeckStorage::uploadDeck(const QString &filePath, const QString &targetPa
     cmd.set_path(targetPath.toStdString());
     cmd.set_deck_list(deckString.toStdString());
 
+    cmd.set_color_identity(getDeckColorIdentity(deck, CardDatabaseManager::query()).toStdString());
+
     PendingCommand *pend = client->prepareSessionCommand(cmd);
     connect(pend, &PendingCommand::finished, this, &TabDeckStorage::uploadFinished);
     client->sendCommand(pend);
@@ -370,8 +494,9 @@ void TabDeckStorage::actNewLocalFolder()
     bool ok;
     QString folderName =
         QInputDialog::getText(this, tr("New folder"), tr("Name of new folder:"), QLineEdit::Normal, "", &ok);
-    if (!ok || folderName.isEmpty())
+    if (!ok || folderName.isEmpty()) {
         return;
+    }
 
     localDirModel->mkdir(dirIndex, folderName);
 }
@@ -385,8 +510,9 @@ void TabDeckStorage::actDeleteLocalDeck()
     }
 
     if (QMessageBox::warning(this, tr("Delete local file"), tr("Are you sure you want to delete the selected files?"),
-                             QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes)
+                             QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) {
         return;
+    }
 
     for (const auto &curLeft : curLefts) {
         if (curLeft.isValid()) {
@@ -412,8 +538,9 @@ void TabDeckStorage::actOpenRemoteDeck()
 {
     for (const auto &curRight : serverDirView->getCurrentSelection()) {
         RemoteDeckList_TreeModel::FileNode *node = dynamic_cast<RemoteDeckList_TreeModel::FileNode *>(curRight);
-        if (!node)
+        if (!node) {
             continue;
+        }
 
         Command_DeckDownload cmd;
         cmd.set_deck_id(node->getId());
@@ -426,17 +553,19 @@ void TabDeckStorage::actOpenRemoteDeck()
 
 void TabDeckStorage::openRemoteDeckFinished(const Response &r, const CommandContainer &commandContainer)
 {
-    if (r.response_code() != Response::RespOk)
+    if (r.response_code() != Response::RespOk) {
         return;
+    }
 
     const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext);
     const Command_DeckDownload &cmd = commandContainer.session_command(0).GetExtension(Command_DeckDownload::ext);
 
-    DeckLoader loader(this);
-    if (!loader.loadFromRemote(QString::fromStdString(resp.deck()), cmd.deck_id()))
+    std::optional<LoadedDeck> deckOpt = DeckLoader::loadFromRemote(QString::fromStdString(resp.deck()), cmd.deck_id());
+    if (!deckOpt) {
         return;
+    }
 
-    emit openDeckEditor(&loader);
+    emit openDeckEditor(deckOpt.value());
 }
 
 void TabDeckStorage::actDownload()
@@ -486,14 +615,16 @@ void TabDeckStorage::downloadFinished(const Response &r,
                                       const CommandContainer & /*commandContainer*/,
                                       const QVariant &extraData)
 {
-    if (r.response_code() != Response::RespOk)
+    if (r.response_code() != Response::RespOk) {
         return;
+    }
 
     const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext);
     QString filePath = extraData.toString();
 
-    DeckLoader deck(this, new DeckList(QString::fromStdString(resp.deck())));
-    deck.saveToFile(filePath, DeckLoader::CockatriceFormat);
+    DeckList deckList = DeckList(QString::fromStdString(resp.deck()));
+
+    DeckLoader::saveToFile(deckList, filePath, DeckFileFormat::Cockatrice);
 }
 
 void TabDeckStorage::actNewFolder()
@@ -501,12 +632,14 @@ void TabDeckStorage::actNewFolder()
     QString targetPath = getTargetPath();
     int max_length = MAX_NAME_LENGTH - targetPath.length() - 1; // generated length would be path + / + name
 
-    if (max_length < 1) // can't create path that's short enough
+    if (max_length < 1) { // can't create path that's short enough
         return;
+    }
 
     QString folderName = getTextWithMax(this, tr("New folder"), tr("Name of new folder:"), max_length);
-    if (folderName.isEmpty())
+    if (folderName.isEmpty()) {
         return;
+    }
 
     // '/' isn't a valid filename character on *nix so we're choosing to replace it with a different arbitrary
     // character.
@@ -524,8 +657,9 @@ void TabDeckStorage::actNewFolder()
 
 void TabDeckStorage::newFolderFinished(const Response &response, const CommandContainer &commandContainer)
 {
-    if (response.response_code() != Response::RespOk)
+    if (response.response_code() != Response::RespOk) {
         return;
+    }
 
     const Command_DeckNewDir &cmd = commandContainer.session_command(0).GetExtension(Command_DeckNewDir::ext);
     serverDirView->addFolderToTree(QString::fromStdString(cmd.dir_name()),
@@ -559,8 +693,9 @@ void TabDeckStorage::deleteRemoteDeck(const RemoteDeckList_TreeModel::Node *curR
     PendingCommand *pend;
     if (const auto *dir = dynamic_cast<const RemoteDeckList_TreeModel::DirectoryNode *>(curRight)) {
         QString targetPath = dir->getPath();
-        if (targetPath.isEmpty())
+        if (targetPath.isEmpty()) {
             return;
+        }
         if (targetPath.length() > MAX_NAME_LENGTH) {
             qCritical() << "target path to delete is too long" << targetPath;
             return;
@@ -582,22 +717,264 @@ void TabDeckStorage::deleteRemoteDeck(const RemoteDeckList_TreeModel::Node *curR
 
 void TabDeckStorage::deleteDeckFinished(const Response &response, const CommandContainer &commandContainer)
 {
-    if (response.response_code() != Response::RespOk)
+    if (response.response_code() != Response::RespOk) {
         return;
+    }
 
     const Command_DeckDel &cmd = commandContainer.session_command(0).GetExtension(Command_DeckDel::ext);
     RemoteDeckList_TreeModel::Node *toDelete = serverDirView->getNodeById(cmd.deck_id());
-    if (toDelete)
+    if (toDelete) {
         serverDirView->removeNode(toDelete);
+    }
 }
 
 void TabDeckStorage::deleteFolderFinished(const Response &response, const CommandContainer &commandContainer)
 {
-    if (response.response_code() != Response::RespOk)
+    if (response.response_code() != Response::RespOk) {
         return;
+    }
 
     const Command_DeckDelDir &cmd = commandContainer.session_command(0).GetExtension(Command_DeckDelDir::ext);
     RemoteDeckList_TreeModel::Node *toDelete = serverDirView->getNodeByPath(QString::fromStdString(cmd.path()));
-    if (toDelete)
+    if (toDelete) {
         serverDirView->removeNode(toDelete);
+    }
+}
+
+void TabDeckStorage::actShareDecks()
+{
+    setShareModeEnabled(true);
+}
+
+void TabDeckStorage::cancelShareDecks()
+{
+    setShareModeEnabled(false);
+}
+
+void TabDeckStorage::setShareModeEnabled(bool enabled)
+{
+    shareBar->setVisible(enabled);
+    if (enabled) {
+        shareBar->setCreateEnabled(true);
+        shareBar->setName(tr("Shared decks"));
+        onServerSelectionChanged();
+        shareBar->focusName();
+    } else {
+        // Abandon any in-flight request: otherwise the timer keeps running and a late
+        // response reports the share as created after the user already backed out.
+        shareTimeoutTimer->stop();
+        shareInFlightSeq = 0;
+        serverDirView->clearSelection();
+    }
+}
+
+void TabDeckStorage::onServerSelectionChanged()
+{
+    if (!shareBar->isVisible()) {
+        return;
+    }
+    const auto selection = serverDirView->getCurrentSelection();
+    int folders = 0;
+    int files = 0;
+    for (const auto *node : selection) {
+        if (dynamic_cast<const RemoteDeckList_TreeModel::DirectoryNode *>(node)) {
+            ++folders;
+        } else {
+            ++files;
+        }
+    }
+
+    QString hint;
+    if (folders > 1) {
+        hint = tr("Only one folder can be shared at a time.");
+    } else if (folders > 0 && files > 0) {
+        hint = tr("Share either a folder or decks, not both.");
+    } else if (folders == 0 && files == 0) {
+        hint = tr("Select folders or decks in the tree to share.");
+    }
+    shareBar->setHintText(hint, !hint.isEmpty());
+
+    QStringList parts;
+    if (folders > 0) {
+        parts << tr("%n folder(s)", "", folders);
+    }
+    if (files > 0) {
+        parts << tr("%n deck(s)", "", files);
+    }
+    shareBar->setCountText(parts.isEmpty() ? tr("No decks selected")
+                                           : tr("Selected: %1").arg(parts.join(QStringLiteral(", "))));
+}
+
+void TabDeckStorage::actShareSelection()
+{
+    const auto selection = serverDirView->getCurrentSelection();
+    QString sharedFolder;
+    bool hasFile = false;
+    bool hasFolder = false;
+    for (const auto *node : selection) {
+        if (const auto *dirNode = dynamic_cast<const RemoteDeckList_TreeModel::DirectoryNode *>(node)) {
+            hasFolder = true;
+            if (!sharedFolder.isEmpty()) {
+                showShareNotice(tr("Only one folder can be shared at a time."), true);
+                return;
+            }
+            sharedFolder = dirNode->getPath();
+        } else {
+            hasFile = true;
+        }
+    }
+
+    if (hasFile && hasFolder) {
+        showShareNotice(tr("Share either a folder or decks, not both."), true);
+        return;
+    }
+    if (hasFolder && sharedFolder.isEmpty()) {
+        showShareNotice(tr("The root folder cannot be shared."), true);
+        return;
+    }
+
+    Command_DeckShareCreate cmd;
+    cmd.set_name(shareBar->name().toStdString());
+    if (cmd.name().empty()) {
+        cmd.set_name(tr("Shared decks").toStdString());
+    }
+
+    if (!sharedFolder.isEmpty()) {
+        cmd.set_folder_path(sharedFolder.toStdString());
+    } else {
+        for (const auto *node : selection) {
+            if (const auto *fileNode = dynamic_cast<const RemoteDeckList_TreeModel::FileNode *>(node)) {
+                DeckShareItem *item = cmd.add_items();
+                item->set_deck_id(fileNode->getId());
+            }
+        }
+    }
+
+    if (cmd.items_size() == 0 && cmd.folder_path().empty()) {
+        showShareNotice(tr("Select decks to share."), true);
+        return;
+    }
+
+    shareBar->setCreateEnabled(false);
+    const int seq = ++shareRequestSeq;
+    shareInFlightSeq = seq;
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this,
+            [this, seq](const Response &response, const CommandContainer &commandContainer) {
+                if (shareInFlightSeq != seq) {
+                    return; // the user cancelled or a newer request superseded this one
+                }
+                shareInFlightSeq = 0;
+                shareFromTreeFinished(response, commandContainer);
+            });
+    client->sendCommand(pend);
+    shareTimeoutTimer->start();
+}
+
+void TabDeckStorage::shareFromTreeFinished(const Response &response, const CommandContainer & /*commandContainer*/)
+{
+    shareTimeoutTimer->stop();
+    shareBar->setCreateEnabled(true);
+    if (response.response_code() != Response::RespOk) {
+        qWarning() << "failed to create deck share:" << response.response_code();
+        showShareNotice(tr("Failed to create the share link (server response code %1).")
+                            .arg(QString::number(static_cast<int>(response.response_code()))),
+                        true);
+        return;
+    }
+    const DeckShareUtils::ShareResponse share = DeckShareUtils::handleShareResponse(client, response);
+
+    showShareNotice(
+        tr("Share link copied to the clipboard.\nExpires on %1.").arg(DeckShareUtils::formatShareExpiry(share.expiry)));
+    setShareModeEnabled(false);
+}
+
+void TabDeckStorage::showShareNotice(const QString &message, bool warning)
+{
+    QMessageBox box(warning ? QMessageBox::Warning : QMessageBox::Information, tr("Share link"), message,
+                    QMessageBox::Ok, this);
+    box.exec();
+}
+
+void TabDeckStorage::onShareFromTreeTimeout()
+{
+    if (shareInFlightSeq == 0) {
+        return; // share mode was left while the request was still outstanding
+    }
+    shareInFlightSeq = 0;
+    shareBar->setCreateEnabled(true);
+    showShareNotice(tr("The server did not respond in time. Try again."), true);
+}
+
+void TabDeckStorage::actPublishDeck()
+{
+    visibilityFailures.clear();
+    // Arm the drain with the full network timeout so a lost reply still costs
+    // one refresh instead of a dead column; each reply shrinks it to the short
+    // delay below, so a slow round trip is never drained before it lands.
+    const int visibilityFailSafeDelay =
+        static_cast<int>((static_cast<qint64>(SettingsCache::instance().network().getTimeOut()) + 1) *
+                         SettingsCache::instance().network().getKeepAlive() * 1000);
+
+    const auto selection = serverDirView->getCurrentSelection();
+    for (const auto *node : selection) {
+        Command_DeckSetVisibility cmd;
+        if (const auto *fileNode = dynamic_cast<const RemoteDeckList_TreeModel::FileNode *>(node)) {
+            cmd.set_deck_id(fileNode->getId());
+        } else if (const auto *dirNode = dynamic_cast<const RemoteDeckList_TreeModel::DirectoryNode *>(node)) {
+            const QString path = dirNode->getPath();
+            if (path.isEmpty()) {
+                continue; // the root folder cannot be published
+            }
+            cmd.set_folder_path(path.toStdString());
+        } else {
+            continue;
+        }
+        // Toggle the node's own visibility bit (what the server persists); the
+        // effective visibility shown by the column may additionally be inherited
+        // from a parent folder.
+        cmd.set_is_public(!node->isPublic());
+
+        PendingCommand *pend = client->prepareSessionCommand(cmd);
+        connect(pend, &PendingCommand::finished, this, &TabDeckStorage::setVisibilityFinished);
+        visibilityRefreshStarted = true;
+        visibilityRefreshTimer->setInterval(visibilityFailSafeDelay);
+        visibilityRefreshTimer->start();
+        client->sendCommand(pend);
+    }
+}
+
+void TabDeckStorage::setVisibilityFinished(const Response &r, const CommandContainer & /*commandContainer*/)
+{
+    if (r.response_code() == Response::RespOk) {
+        if (visibilityRefreshStarted) {
+            visibilityRefreshTimer->setInterval(VISIBILITY_REFRESH_DELAY);
+            visibilityRefreshTimer->start();
+        }
+        return;
+    }
+
+    // Collect batch failures and surface them once, when publishing quiets
+    // down, instead of stacking one modal dialog per rejected node.
+    const QString message = tr("Failed to change deck visibility on server (response code %1).")
+                                .arg(QString::number(static_cast<int>(r.response_code())));
+    if (visibilityRefreshStarted) {
+        visibilityFailures.append(message);
+        visibilityRefreshTimer->setInterval(VISIBILITY_REFRESH_DELAY);
+        visibilityRefreshTimer->start();
+    } else {
+        QMessageBox::critical(this, tr("Error"), message);
+    }
+}
+
+void TabDeckStorage::onVisibilityRefreshTimeout()
+{
+    visibilityRefreshStarted = false;
+    if (!visibilityFailures.isEmpty()) {
+        QMessageBox::critical(
+            this, tr("Error"),
+            tr("Failed to change the visibility of %n selected deck(s).", "", visibilityFailures.size()));
+        visibilityFailures.clear();
+    }
+    serverDirView->refreshTree();
 }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h
index 0226785e3..35a4649c7 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h
@@ -2,8 +2,8 @@
  * @file tab_deck_storage.h
  * @ingroup DeckStorageWidgets
  * @ingroup Tabs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TAB_DECK_STORAGE_H
 #define TAB_DECK_STORAGE_H
@@ -11,19 +11,26 @@
 #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 DeckLoader;
+class ShareBarWidget;
+class QAction;
+class QModelIndex;
+class TabSupervisor;
 
 class TabDeckStorage : public Tab
 {
@@ -35,14 +42,25 @@ private:
     QToolBar *leftToolBar, *rightToolBar;
     RemoteDeckList_TreeWidget *serverDirView;
     QGroupBox *leftGroupBox, *rightGroupBox;
+    ShareBarWidget *shareBar;
+    QTimer *shareTimeoutTimer;
+    int shareRequestSeq = 0;
+    int shareInFlightSeq = 0;
 
     QAction *aOpenLocalDeck, *aRenameLocal, *aUpload, *aNewLocalFolder, *aDeleteLocalDeck;
     QAction *aOpenDecksFolder;
-    QAction *aOpenRemoteDeck, *aDownload, *aNewFolder, *aDeleteRemoteDeck;
+    QAction *aOpenRemoteDeck, *aDownload, *aShareDecks, *aPublishDeck, *aNewFolder, *aDeleteRemoteDeck;
+    bool visibilityRefreshStarted = false;
+    QTimer *visibilityRefreshTimer;
+    QStringList visibilityFailures;
     QString getTargetPath() const;
 
     void setRemoteEnabled(bool enabled);
 
+    void showShareNotice(const QString &message, bool warning = false);
+
+    void setShareModeEnabled(bool enabled);
+
     void uploadDeck(const QString &filePath, const QString &targetPath);
     void deleteRemoteDeck(const RemoteDeckList_TreeModel::Node *node);
 
@@ -75,6 +93,17 @@ private slots:
     void actNewFolder();
     void newFolderFinished(const Response &response, const CommandContainer &commandContainer);
 
+    void actShareDecks();
+    void actShareSelection();
+    void cancelShareDecks();
+    void onServerSelectionChanged();
+    void shareFromTreeFinished(const Response &r, const CommandContainer &commandContainer);
+    void onShareFromTreeTimeout();
+
+    void actPublishDeck();
+    void setVisibilityFinished(const Response &r, const CommandContainer &commandContainer);
+    void onVisibilityRefreshTimeout();
+
     void actDeleteRemoteDeck();
     void deleteFolderFinished(const Response &response, const CommandContainer &commandContainer);
     void deleteDeckFinished(const Response &response, const CommandContainer &commandContainer);
@@ -87,7 +116,7 @@ public:
         return tr("Deck Storage");
     }
 signals:
-    void openDeckEditor(DeckLoader *deckLoader);
+    void openDeckEditor(const LoadedDeck &deck);
 };
 
 #endif
diff --git a/cockatrice/src/interface/widgets/tabs/tab_developer.cpp b/cockatrice/src/interface/widgets/tabs/tab_developer.cpp
new file mode 100644
index 000000000..d641a1ea5
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/tab_developer.cpp
@@ -0,0 +1,275 @@
+/**
+ * @file tab_developer.cpp
+ * @ingroup ServerTabs
+ */
+//! \todo Document this file.
+
+#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;
+
+TabDeveloper::TabDeveloper(TabSupervisor *_tabSupervisor, AbstractClient *_client)
+    : Tab(_tabSupervisor), client(_client)
+{
+    statsTable = new QTableWidget(0, 2);
+    statsTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    statsTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
+    statsTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+    statsTable->setSelectionMode(QAbstractItemView::SingleSelection);
+    statsTable->verticalHeader()->setVisible(false);
+    statsTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Interactive);
+    statsTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Interactive);
+    statsTable->horizontalHeader()->setStretchLastSection(true);
+
+    commandTable = new QTableWidget(0, 4);
+    commandTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    commandTable->setEditTriggers(QAbstractItemView::NoEditTriggers);
+    commandTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+    commandTable->setSelectionMode(QAbstractItemView::SingleSelection);
+    commandTable->verticalHeader()->setVisible(false);
+    commandTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Interactive);
+    commandTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Interactive);
+    commandTable->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Interactive);
+    commandTable->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Interactive);
+
+    statusLabel = new QLabel;
+
+    autoRefreshCheckBox = new QCheckBox;
+    autoRefreshCheckBox->setChecked(false);
+
+    refreshIntervalSpinBox = new QSpinBox;
+    refreshIntervalSpinBox->setRange(5, 3600);
+    refreshIntervalSpinBox->setValue(DEFAULT_AUTO_REFRESH_INTERVAL_SECS);
+    refreshIntervalSpinBox->setEnabled(false);
+
+    autoRefreshTimer = new QTimer(this);
+    connect(autoRefreshTimer, &QTimer::timeout, this, &TabDeveloper::refreshClicked);
+    connect(autoRefreshCheckBox, &QCheckBox::toggled, this, &TabDeveloper::autoRefreshToggled);
+    connect(refreshIntervalSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this,
+            &TabDeveloper::refreshIntervalChanged);
+
+    refreshButton = new QPushButton;
+    refreshButton->setAutoDefault(true);
+    connect(refreshButton, &QPushButton::clicked, this, &TabDeveloper::refreshClicked);
+
+    auto *buttonLayout = new QHBoxLayout;
+    buttonLayout->addWidget(statusLabel, 1, Qt::AlignLeft);
+    buttonLayout->addWidget(autoRefreshCheckBox, 0, Qt::AlignRight);
+    buttonLayout->addWidget(refreshIntervalSpinBox, 0, Qt::AlignRight);
+    buttonLayout->addWidget(refreshButton, 0, Qt::AlignRight);
+
+    auto *tableLayout = new QHBoxLayout;
+    tableLayout->addWidget(statsTable, 1);
+    tableLayout->addWidget(commandTable, 2);
+
+    auto *mainLayout = new QVBoxLayout;
+    mainLayout->addLayout(tableLayout, 1);
+    mainLayout->addLayout(buttonLayout);
+
+    auto *central = new QWidget;
+    central->setLayout(mainLayout);
+    setCentralWidget(central);
+
+    retranslateUi();
+}
+
+void TabDeveloper::retranslateUi()
+{
+    autoRefreshCheckBox->setText(tr("Auto-refresh"));
+    autoRefreshCheckBox->setToolTip(tr("Automatically request fresh server statistics at a fixed interval."));
+    refreshIntervalSpinBox->setSuffix(tr(" s"));
+    refreshIntervalSpinBox->setToolTip(tr("Seconds between automatic refreshes."));
+    refreshButton->setText(tr("Refresh server stats"));
+    statsTable->setHorizontalHeaderLabels(QString(tr("Statistic;Value")).split(";"));
+    commandTable->setHorizontalHeaderLabels(QString(tr("Command;Count;Total ms;Avg ms")).split(";"));
+    if (statsTable->rowCount() == 0) {
+        statusLabel->clear();
+    }
+}
+
+QString TabDeveloper::formatBytes(quint64 bytes)
+{
+    const quint64 kib = 1024;
+    const quint64 mib = 1024 * kib;
+    const quint64 gib = 1024 * mib;
+    if (bytes >= gib) {
+        return tr("%1 GiB").arg(QString::number(bytes / static_cast<double>(gib), 'f', 2));
+    }
+    if (bytes >= mib) {
+        return tr("%1 MiB").arg(QString::number(bytes / static_cast<double>(mib), 'f', 2));
+    }
+    if (bytes >= kib) {
+        return tr("%1 KiB").arg(QString::number(bytes / static_cast<double>(kib), 'f', 2));
+    }
+    return tr("%1 bytes").arg(bytes);
+}
+
+QString TabDeveloper::formatDurationMs(qint64 ms)
+{
+    if (ms >= 1000) {
+        return tr("%1 s").arg(QString::number(ms / 1000.0, 'f', 2));
+    }
+    return tr("%1 ms").arg(ms);
+}
+
+void TabDeveloper::appendStatRow(const QString &name, const QString &value)
+{
+    const int row = statsTable->rowCount();
+    statsTable->insertRow(row);
+    statsTable->setItem(row, 0, new QTableWidgetItem(name));
+    statsTable->setItem(row, 1, new QTableWidgetItem(value));
+}
+
+void TabDeveloper::appendSeparatorRow(const QString &sectionTitle)
+{
+    const int row = statsTable->rowCount();
+    statsTable->insertRow(row);
+    auto *labelItem = new QTableWidgetItem(sectionTitle);
+    auto font = labelItem->font();
+    font.setBold(true);
+    labelItem->setFont(font);
+    labelItem->setFlags(labelItem->flags() & ~Qt::ItemIsSelectable);
+    statsTable->setItem(row, 0, labelItem);
+    statsTable->setItem(row, 1, new QTableWidgetItem(QString()));
+}
+
+void TabDeveloper::refreshClicked()
+{
+    if (requestPending) {
+        return;
+    }
+    requestPending = true;
+    Command_GetServerStats cmd;
+    PendingCommand *pend = client->prepareDeveloperCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabDeveloper::serverStatsResponse);
+    client->sendCommand(pend);
+}
+
+void TabDeveloper::autoRefreshToggled(bool checked)
+{
+    refreshIntervalSpinBox->setEnabled(checked);
+    if (checked) {
+        refreshIntervalChanged();
+        refreshClicked();
+    } else {
+        autoRefreshTimer->stop();
+    }
+}
+
+void TabDeveloper::refreshIntervalChanged()
+{
+    if (autoRefreshCheckBox->isChecked()) {
+        autoRefreshTimer->start(refreshIntervalSpinBox->value() * 1000);
+    }
+}
+
+void TabDeveloper::serverStatsResponse(const Response &resp)
+{
+    requestPending = false;
+    if (resp.response_code() != Response::RespOk) {
+        statusLabel->setText(tr("No server statistics available yet."));
+        return;
+    }
+
+    const Response_GetServerStats &response = resp.GetExtension(Response_GetServerStats::ext);
+
+    statsTable->setRowCount(0);
+
+    // Overview section
+    appendStatRow(tr("Registered users online"), QString::number(response.users_count()));
+    appendStatRow(tr("Moderators online"), QString::number(response.mods_count()));
+    appendStatRow(tr("Games running"), QString::number(response.games_count()));
+    appendStatRow(tr("Traffic sent (last tick)"), formatBytes(response.tx_bytes()));
+    appendStatRow(tr("Traffic received (last tick)"), formatBytes(response.rx_bytes()));
+
+    const qint64 uptime = static_cast<qint64>(response.uptime_secs());
+    const int days = static_cast<int>(uptime / 86400);
+    const int hours = static_cast<int>((uptime % 86400) / 3600);
+    const int minutes = static_cast<int>((uptime % 3600) / 60);
+    appendStatRow(tr("Server uptime"), days > 0 ? tr("%1d %2h %3m").arg(days).arg(hours).arg(minutes)
+                                                : tr("%1h %2m").arg(hours).arg(minutes));
+
+    const QDateTime snapshotTime = QDateTime::fromSecsSinceEpoch(static_cast<qint64>(response.timest()));
+    appendStatRow(tr("Snapshot taken"), snapshotTime.toLocalTime().toString("yyyy-MM-dd HH:mm"));
+
+    // Live metrics section
+    appendSeparatorRow(tr("Live Metrics"));
+    appendStatRow(tr("Cards in live games"), QString::number(response.cards_in_games()));
+    appendStatRow(tr("Total commands processed"), QString::number(response.total_commands()));
+
+    if (response.total_commands() > 0) {
+        const double avgMs = static_cast<double>(response.total_command_time_ms()) / response.total_commands();
+        appendStatRow(tr("Avg command time"), QString::number(avgMs, 'f', 2) + " ms");
+    }
+    appendStatRow(tr("Active command types"), QString::number(response.active_command_types()));
+
+    appendStatRow(tr("Event loop stalls"), QString::number(response.eventloop_stalls_total()));
+    appendStatRow(tr("Last stall overshoot"), formatDurationMs(response.eventloop_last_stall_ms()));
+    appendStatRow(tr("Worst stall overshoot"), formatDurationMs(response.eventloop_max_stall_ms()));
+
+    if (response.game_start_count() > 0) {
+        appendStatRow(tr("Game starts"), QString::number(response.game_start_count()));
+        const double avgStartMs = static_cast<double>(response.game_start_total_ms()) / response.game_start_count();
+        appendStatRow(tr("Avg game start time"), QString::number(avgStartMs, 'f', 1) + " ms");
+    }
+
+    // Per-command breakdown table
+    QList<CommandStats> sortedStats(response.command_stats().begin(), response.command_stats().end());
+    std::sort(sortedStats.begin(), sortedStats.end(),
+              [](const auto &a, const auto &b) { return a.total_ms() > b.total_ms(); });
+
+    commandTable->setRowCount(0);
+    for (const auto &cs : sortedStats) {
+        const int row = commandTable->rowCount();
+        commandTable->insertRow(row);
+        commandTable->setItem(row, 0, new QTableWidgetItem(QString::fromStdString(cs.command_name())));
+
+        auto *countItem = new QTableWidgetItem(QString::number(cs.count()));
+        countItem->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+        commandTable->setItem(row, 1, countItem);
+
+        auto *totalItem = new QTableWidgetItem(QString::number(cs.total_ms()));
+        totalItem->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+        commandTable->setItem(row, 2, totalItem);
+
+        const double avg = cs.count() > 0 ? static_cast<double>(cs.total_ms()) / cs.count() : 0.0;
+        auto *avgItem = new QTableWidgetItem(QString::number(avg, 'f', 2));
+        avgItem->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
+        commandTable->setItem(row, 3, avgItem);
+    }
+    commandTable->resizeColumnsToContents();
+    statsTable->resizeColumnsToContents();
+    commandTable->resizeColumnsToContents();
+
+    statusLabel->setText(tr("Updated %1").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm")));
+}
diff --git a/cockatrice/src/interface/widgets/tabs/tab_developer.h b/cockatrice/src/interface/widgets/tabs/tab_developer.h
new file mode 100644
index 000000000..1a4e5904f
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/tab_developer.h
@@ -0,0 +1,60 @@
+/**
+ * @file tab_developer.h
+ * @ingroup ServerTabs
+ */
+//! \todo Document this file.
+
+#ifndef TAB_DEVELOPER_H
+#define TAB_DEVELOPER_H
+
+#include "tab.h"
+
+#include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class AbstractClient;
+class QCheckBox;
+class QLabel;
+class QPushButton;
+class QSpinBox;
+class QTableWidget;
+class QTimer;
+class Response;
+class TabSupervisor;
+
+class TabDeveloper : public Tab
+{
+    Q_OBJECT
+private:
+    AbstractClient *client;
+    QTableWidget *statsTable;
+    QTableWidget *commandTable;
+    QPushButton *refreshButton;
+    QLabel *statusLabel;
+    QCheckBox *autoRefreshCheckBox;
+    QSpinBox *refreshIntervalSpinBox;
+    QTimer *autoRefreshTimer;
+    bool requestPending = false;
+
+    void appendStatRow(const QString &name, const QString &value);
+    void appendSeparatorRow(const QString &sectionTitle);
+    static QString formatBytes(quint64 bytes);
+    static QString formatDurationMs(qint64 ms);
+
+private slots:
+    void refreshClicked();
+    void serverStatsResponse(const Response &resp);
+    void autoRefreshToggled(bool checked);
+    void refreshIntervalChanged();
+
+public:
+    explicit TabDeveloper(TabSupervisor *_tabSupervisor, AbstractClient *_client);
+    void retranslateUi() override;
+    [[nodiscard]] QString getTabText() const override
+    {
+        return tr("Developer");
+    }
+};
+
+#endif
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
index 2f83ba2e6..4cf5919ba 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp
@@ -1,52 +1,102 @@
 #include "tab_game.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../game/board/arrow_item.h"
-#include "../game/board/card_item.h"
-#include "../game/deckview/deck_view_container.h"
-#include "../game/deckview/tabbed_deck_view_container.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/game_scene.h"
-#include "../game/game_view.h"
-#include "../game/log/message_log_widget.h"
-#include "../game/phases_toolbar.h"
-#include "../game/player/player.h"
-#include "../game/player/player_list_widget.h"
+#include "../game/player/player_logic.h"
 #include "../game/replay.h"
+#include "../game_graphics/deckview/deck_view_container.h"
+#include "../game_graphics/deckview/tabbed_deck_view_container.h"
+#include "../game_graphics/game_scene.h"
+#include "../game_graphics/game_view.h"
+#include "../game_graphics/log/message_log_widget.h"
+#include "../game_graphics/phases_toolbar.h"
+#include "../game_graphics/player/menu/card_menu.h"
+#include "../game_graphics/player/menu/player_menu.h"
+#include "../game_graphics/player/player_graphics_item.h"
+#include "../game_graphics/player/player_list_widget.h"
 #include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../interface/widgets/cards/card_info_frame_widget.h"
 #include "../interface/widgets/dialogs/dlg_create_game.h"
+#include "../interface/widgets/dialogs/dlg_invite_to_game.h"
+#include "../interface/widgets/server/game_link.h"
 #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 <libcockatrice/card/database/card_database.h>
+#include <QtGlobal>
 #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/utility/trice_limits.h>
+#include <libcockatrice/settings/chat_settings.h>
+#include <libcockatrice/settings/debug_settings.h>
+#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)
 {
     // THIS CTOR IS USED ON REPLAY
-    game = new Replay(this, _replay);
+    game = new Replay(this, _replay, tabSupervisor->getIsLocalGame());
 
     createCardInfoDock(true);
     createPlayerListDock(true);
@@ -90,19 +140,18 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor,
     : Tab(_tabSupervisor), userListProxy(_tabSupervisor->getUserListManager())
 {
     // THIS CTOR IS USED ON GAMES
-    game = new Game(this, _clients, event, _roomGameTypes);
+    game = new Game(this, tabSupervisor->getIsLocalGame(), _clients, event, _roomGameTypes);
 
     createCardInfoDock();
     createPlayerListDock();
     createMessageDock();
     createPlayAreaWidget();
     createDeckViewContainerWidget();
-    createReplayDock(nullptr);
+    replayDock = nullptr;
 
     addDockWidget(Qt::RightDockWidgetArea, cardInfoDock);
     addDockWidget(Qt::RightDockWidgetArea, playerListDock);
     addDockWidget(Qt::RightDockWidgetArea, messageLayoutDock);
-    replayDock->setHidden(true);
 
     mainWidget = new QStackedWidget(this);
     mainWidget->addWidget(deckViewContainerWidget);
@@ -125,8 +174,9 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor,
     refreshShortcuts();
 
     // append game to rooms game list for others to see
-    for (int i = game->getGameMetaInfo()->gameTypesSize() - 1; i >= 0; i--)
+    for (int i = game->getGameMetaInfo()->gameTypesSize() - 1; i >= 0; i--) {
         gameTypes.append(game->getGameMetaInfo()->findRoomGameType(i));
+    }
 
     QTimer::singleShot(0, this, &TabGame::loadLayout);
 }
@@ -237,32 +287,41 @@ void TabGame::linkCardToChat(const QString &cardName)
     sayEdit->setFocus();
 }
 
-void TabGame::resetChatAndPhase()
+void TabGame::resetForRewind()
 {
     // reset chat log
     messageLog->clearChat();
 
     // reset phase markers
     game->getGameState()->setCurrentPhase(-1);
+
+    // reset view zones
+    static_cast<GameScene *>(gameView->scene())->emptyActiveViews();
+
+    // reset spectator state so the replay can rebuild it from the start
+    game->getPlayerManager()->clearSpectators();
+    playerListWidget->clearSpectators();
 }
 
 void TabGame::emitUserEvent()
 {
-    bool globalEvent =
-        !game->getPlayerManager()->isSpectator() || SettingsCache::instance().getSpectatorNotificationsEnabled();
+    bool globalEvent = !game->getPlayerManager()->isSpectator() ||
+                       SettingsCache::instance().userInterface().getSpectatorNotificationsEnabled();
     emit userEvent(globalEvent);
     updatePlayerListDockTitle();
 }
 
 TabGame::~TabGame()
 {
-    delete replayManager->replay;
+    for (auto &player : game->getPlayerManager()->getPlayers()) {
+        player->clear();
+    }
 }
 
 void TabGame::updatePlayerListDockTitle()
 {
-    QString tabText = " | " + (replayManager->replay ? tr("Replay") : tr("Game")) + " #" +
-                      QString::number(game->getGameMetaInfo()->gameId());
+    QString type = replayDock ? tr("Replay") : tr("Game");
+    QString tabText = " | " + type + " #" + QString::number(game->getGameMetaInfo()->gameId());
     QString userCountInfo =
         QString(" %1/%2").arg(game->getPlayerManager()->getPlayerCount()).arg(game->getGameMetaInfo()->maxPlayers());
     playerListDock->setWindowTitle(tr("Player List") + userCountInfo +
@@ -271,18 +330,23 @@ void TabGame::updatePlayerListDockTitle()
 
 void TabGame::retranslateUi()
 {
-    QString tabText = " | " + (replayManager->replay ? tr("Replay") : tr("Game")) + " #" +
-                      QString::number(game->getGameMetaInfo()->gameId());
+    QString type = replayDock ? tr("Replay") : tr("Game");
+    QString tabText = " | " + type + " #" + QString::number(game->getGameMetaInfo()->gameId());
 
     updatePlayerListDockTitle();
+    if (inviteButton) {
+        inviteButton->setText(tr("Invite"));
+    }
     cardInfoDock->setWindowTitle(tr("Card Info") + (cardInfoDock->isWindow() ? tabText : QString()));
     messageLayoutDock->setWindowTitle(tr("Messages") + (messageLayoutDock->isWindow() ? tabText : QString()));
-    if (replayDock)
+    if (replayDock) {
         replayDock->setWindowTitle(tr("Replay Timeline") + (replayDock->isWindow() ? tabText : QString()));
+    }
 
     if (phasesMenu) {
-        for (int i = 0; i < phaseActions.size(); ++i)
+        for (int i = 0; i < phaseActions.size(); ++i) {
             phaseActions[i]->setText(phasesToolbar->getLongPhaseName(i));
+        }
         phasesMenu->setTitle(tr("&Phases"));
     }
 
@@ -308,8 +372,15 @@ void TabGame::retranslateUi()
     if (aRotateViewCCW) {
         aRotateViewCCW->setText(tr("Rotate View Co&unterclockwise"));
     }
-    if (aGameInfo)
+    if (aGameInfo) {
         aGameInfo->setText(tr("Game &information"));
+    }
+    if (aCopyGameLink) {
+        aCopyGameLink->setText(tr("Cop&y game link"));
+    }
+    if (aInviteToGame) {
+        aInviteToGame->setText(tr("Invite to Game..."));
+    }
     if (aConcede) {
         if (game->getPlayerManager()->isMainPlayerConceded()) {
             aConcede->setText(tr("Un&concede"));
@@ -318,7 +389,7 @@ void TabGame::retranslateUi()
         }
     }
     if (aLeaveGame) {
-        if (replayManager->replay) {
+        if (replayDock) {
             aLeaveGame->setText(tr("C&lose replay"));
         } else {
             aLeaveGame->setText(tr("&Leave game"));
@@ -336,36 +407,32 @@ void TabGame::retranslateUi()
     }
 
     viewMenu->setTitle(tr("&View"));
-    cardInfoDockMenu->setTitle(tr("Card Info"));
-    messageLayoutDockMenu->setTitle(tr("Messages"));
-    playerListDockMenu->setTitle(tr("Player List"));
 
-    aCardInfoDockVisible->setText(tr("Visible"));
-    aCardInfoDockFloating->setText(tr("Floating"));
-
-    aMessageLayoutDockVisible->setText(tr("Visible"));
-    aMessageLayoutDockFloating->setText(tr("Floating"));
-
-    aPlayerListDockVisible->setText(tr("Visible"));
-    aPlayerListDockFloating->setText(tr("Floating"));
+    dockToActions[cardInfoDock].menu->setTitle(tr("Card Info"));
+    dockToActions[messageLayoutDock].menu->setTitle(tr("Messages"));
+    dockToActions[playerListDock].menu->setTitle(tr("Player List"));
 
     if (replayDock) {
-        replayDockMenu->setTitle(tr("Replay Timeline"));
-        aReplayDockVisible->setText(tr("Visible"));
-        aReplayDockFloating->setText(tr("Floating"));
+        dockToActions[replayDock].menu->setTitle(tr("Replay Timeline"));
+    }
+
+    for (auto &actions : dockToActions.values()) {
+        actions.aVisible->setText(tr("Visible"));
+        actions.aFloating->setText(tr("Floating"));
     }
 
     aResetLayout->setText(tr("Reset layout"));
 
     cardInfoFrameWidget->retranslateUi();
 
-    QMapIterator<int, Player *> i(game->getPlayerManager()->getPlayers());
+    for (auto playerView : scene->getPlayers().values()) {
+        playerView->retranslateUi();
+    }
 
-    while (i.hasNext())
-        i.next().value()->getGraphicsItem()->retranslateUi();
     QMapIterator<int, TabbedDeckViewContainer *> j(deckViewContainers);
-    while (j.hasNext())
+    while (j.hasNext()) {
         j.next().value()->playerDeckView->retranslateUi();
+    }
 
     scene->retranslateUi();
 }
@@ -481,24 +548,75 @@ void TabGame::actGameInfo()
     dlg.exec();
 }
 
+void TabGame::actCopyGameLink()
+{
+    const QString link =
+        makeGameJoinLink(tabSupervisor->getClient()->serverName(), tabSupervisor->getClient()->serverPort(),
+                         game->getGameMetaInfo()->proto().room_id(), game->getGameMetaInfo()->gameId(),
+                         QString::fromStdString(game->getGameMetaInfo()->proto().description()));
+    QApplication::clipboard()->setText(link);
+}
+
+void TabGame::updateInviteButtonState()
+{
+    // The dock button stays conservative (pre-start, not full); the menu action
+    // additionally covers started/full games, which are legitimate spectate
+    // invites, so it only needs the server-linked + not-closed conditions.
+    const bool canInvite = !tabSupervisor->getIsLocalGame() && !game->getGameState()->isGameClosed() &&
+                           !game->getGameMetaInfo()->started() &&
+                           game->getPlayerManager()->getPlayerCount() < game->getGameMetaInfo()->maxPlayers();
+    if (inviteButton) {
+        inviteButton->setVisible(canInvite);
+    }
+    if (aInviteToGame) {
+        aInviteToGame->setEnabled(!tabSupervisor->getIsLocalGame() && !game->getGameState()->isGameClosed());
+    }
+}
+
+void TabGame::actInviteToGame()
+{
+    if (!tabSupervisor || tabSupervisor->getIsLocalGame()) {
+        return;
+    }
+
+    GameMetaInfo *metaInfo = game->getGameMetaInfo();
+    const QString inviteUrl = makeGameJoinLink(
+        tabSupervisor->getClient()->serverName(), tabSupervisor->getClient()->serverPort(), metaInfo->proto().room_id(),
+        metaInfo->gameId(), QString::fromStdString(metaInfo->proto().description()));
+
+    QStringList excludeUserNames;
+    excludeUserNames << tabSupervisor->getUserListManager()->getOwnUsername();
+    for (auto player : game->getPlayerManager()->getPlayers()) {
+        excludeUserNames << player->getPlayerInfo()->getName();
+    }
+    for (auto it = game->getPlayerManager()->getSpectators().cbegin();
+         it != game->getPlayerManager()->getSpectators().cend(); ++it) {
+        excludeUserNames << QString::fromStdString(it.value().name());
+    }
+
+    DlgInviteToGame dlg(tabSupervisor, inviteUrl, metaInfo->proto().only_buddies(), excludeUserNames, this);
+    dlg.exec();
+}
+
 void TabGame::actConcede()
 {
-    Player *player = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer());
-    if (player == nullptr)
+    PlayerLogic *player = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer());
+    if (player == nullptr) {
         return;
+    }
     if (!player->getConceded()) {
         if (QMessageBox::question(this, tr("Concede"), tr("Are you sure you want to concede this game?"),
-                                  QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes)
+                                  QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) {
             return;
+        }
         emit game->getPlayerManager()->activeLocalPlayerConceded();
-        player->setConceded(true);
     } else {
         if (QMessageBox::question(this, tr("Unconcede"),
                                   tr("You have already conceded.  Do you want to return to this game?"),
-                                  QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes)
+                                  QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) {
             return;
+        }
         emit game->getPlayerManager()->activeLocalPlayerUnconceded();
-        player->setConceded(false);
     }
 }
 
@@ -513,20 +631,24 @@ bool TabGame::leaveGame()
         if (!game->getPlayerManager()->isSpectator()) {
             tabSupervisor->setCurrentWidget(this);
             if (QMessageBox::question(this, tr("Leave game"), tr("Are you sure you want to leave this game?"),
-                                      QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes)
+                                      QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) {
                 return false;
+            }
         }
 
-        if (!replayManager->replay)
+        if (!replayDock) {
             emit gameLeft();
+        }
     }
     return true;
 }
 
 void TabGame::actSay()
 {
-    if (completer->popup()->isVisible())
+    if (sayEdit->hasVisibleCompleterPopup()) {
+        sayEdit->hideCompleterPopups();
         return;
+    }
 
     if (sayEdit->text().startsWith("/card ")) {
         cardInfoFrameWidget->setCard(sayEdit->text().mid(6));
@@ -544,14 +666,14 @@ void TabGame::addPlayerToAutoCompleteList(QString playerName)
 {
     if (sayEdit && !autocompleteUserList.contains(playerName)) {
         autocompleteUserList << playerName;
-        sayEdit->setCompletionList(autocompleteUserList);
+        mentionModel->setStringList(autocompleteUserList);
     }
 }
 
 void TabGame::removePlayerFromAutoCompleteList(QString playerName)
 {
     if (sayEdit && autocompleteUserList.removeOne(playerName)) {
-        sayEdit->setCompletionList(autocompleteUserList);
+        mentionModel->setStringList(autocompleteUserList);
     }
 }
 
@@ -571,8 +693,9 @@ void TabGame::actPhaseAction()
 void TabGame::actNextPhase()
 {
     int phase = game->getGameState()->getCurrentPhase();
-    if (++phase >= phasesToolbar->phaseCount())
+    if (++phase >= phasesToolbar->phaseCount()) {
         phase = 0;
+    }
 
     emit phaseChanged(phase);
 }
@@ -595,16 +718,9 @@ void TabGame::actNextPhaseAction()
 
 void TabGame::actRemoveLocalArrows()
 {
-    QMapIterator<int, Player *> playerIterator(game->getPlayerManager()->getPlayers());
-    while (playerIterator.hasNext()) {
-        Player *player = playerIterator.next().value();
-        if (!player->getPlayerInfo()->getLocal())
-            continue;
-        QMapIterator<int, ArrowItem *> arrowIterator(player->getArrows());
-        while (arrowIterator.hasNext()) {
-            ArrowItem *a = arrowIterator.next().value();
-            emit arrowDeletionRequested(a->getId());
-        }
+    auto *local = game->getPlayerManager()->getActiveLocalPlayer(game->getGameState()->getActivePlayer());
+    if (local) {
+        scene->clearArrowsForPlayer(local->getPlayerInfo()->getId());
     }
 }
 
@@ -620,8 +736,8 @@ void TabGame::actRotateViewCCW()
 
 void TabGame::actCompleterChanged()
 {
-    SettingsCache::instance().getChatMentionCompleter() ? completer->setCompletionRole(2)
-                                                        : completer->setCompletionRole(1);
+    SettingsCache::instance().chat().getChatMentionCompleter() ? mentionCompleter->setCompletionRole(2)
+                                                               : mentionCompleter->setCompletionRole(1);
 }
 
 void TabGame::notifyPlayerJoin(QString playerName)
@@ -643,15 +759,19 @@ void TabGame::notifyPlayerKicked()
     msgBox.exec();
 }
 
-Player *TabGame::addPlayer(Player *newPlayer)
+PlayerLogic *TabGame::addPlayer(PlayerLogic *newPlayer)
 {
     QString newPlayerName = "@" + newPlayer->getPlayerInfo()->getName();
     addPlayerToAutoCompleteList(newPlayerName);
 
     scene->addPlayer(newPlayer);
 
-    connect(newPlayer, &Player::newCardAdded, this, &TabGame::newCardAdded);
-    connect(newPlayer->getPlayerMenu(), &PlayerMenu::cardMenuUpdated, this, &TabGame::setCardMenu);
+    auto *view = scene->viewForPlayer(newPlayer->getPlayerInfo()->getId());
+
+    connect(newPlayer, &PlayerLogic::newCardAdded, this, &TabGame::newCardAdded);
+    connect(newPlayer, &PlayerLogic::openDeckEditor, this, &TabGame::openDeckEditor);
+    connect(view->getPlayerMenu(), &PlayerMenu::cardMenuUpdated, this, &TabGame::setCardMenu);
+    connect(view, &PlayerGraphicsItem::cardInfoRequested, this, &TabGame::viewCardInfo);
 
     messageLog->connectToPlayerEventHandler(newPlayer->getPlayerEventHandler());
 
@@ -664,17 +784,17 @@ Player *TabGame::addPlayer(Player *newPlayer)
         addLocalPlayer(newPlayer, newPlayer->getPlayerInfo()->getId());
     }
 
-    gameMenu->insertMenu(playersSeparator, newPlayer->getPlayerMenu()->getPlayerMenu());
+    gameMenu->insertMenu(playersSeparator, view->getPlayerMenu()->getPlayerMenu());
 
     createZoneForPlayer(newPlayer, newPlayer->getPlayerInfo()->getId());
 
     return newPlayer;
 }
 
-void TabGame::addLocalPlayer(Player *newPlayer, int playerId)
+void TabGame::addLocalPlayer(PlayerLogic *newPlayer, int playerId)
 {
     if (game->getGameState()->getClients().size() == 1) {
-        newPlayer->getPlayerMenu()->setShortcutsActive();
+        scene->viewForPlayer(playerId)->getPlayerMenu()->setShortcutsActive();
     }
 
     auto *deckView = new TabbedDeckViewContainer(playerId, this);
@@ -692,29 +812,26 @@ void TabGame::addLocalPlayer(Player *newPlayer, int playerId)
     }
 }
 
-void TabGame::processPlayerLeave(Player *leavingPlayer)
+void TabGame::processPlayerLeave(PlayerLogic *leavingPlayer)
 {
-    QString playerName = "@" + leavingPlayer->getPlayerInfo()->getName();
-    removePlayerFromAutoCompleteList(playerName);
-
-    scene->removePlayer(leavingPlayer);
+    removePlayerFromAutoCompleteList("@" + leavingPlayer->getPlayerInfo()->getName());
 
     // When we inserted the playerMenu into the gameMenu earlier, Qt wrapped the playerMenu into a QAction*, which lives
     // independently and does not get cleaned up when the source menu gets destroyed. We have to manually clean here.
-    if (leavingPlayer->getPlayerMenu()) {
-        QMenu *menu = leavingPlayer->getPlayerMenu()->getPlayerMenu();
-        if (menu) {
-            // Find and remove the QAction pointing to this menu
-            QList<QAction *> actions = gameMenu->actions();
-            for (QAction *act : actions) {
-                if (act->menu() == menu) {
-                    gameMenu->removeAction(act);
-                    delete act; // deletes the QAction wrapper around the submenu
-                    break;
-                }
+    auto *view = scene->viewForPlayer(leavingPlayer->getPlayerInfo()->getId());
+    if (view) {
+        // Find and remove the QAction pointing to this menu
+        QMenu *menu = view->getPlayerMenu()->getPlayerMenu();
+        for (QAction *act : gameMenu->actions()) {
+            if (act->menu() == menu) {
+                gameMenu->removeAction(act);
+                delete act;
+                break;
             }
         }
     }
+
+    scene->removePlayer(leavingPlayer);
 }
 
 void TabGame::processRemotePlayerDeckSelect(QString deckList, int playerId, QString playerName)
@@ -739,21 +856,20 @@ void TabGame::processMultipleRemotePlayerDeckSelect(QVector<QPair<int, QPair<QSt
     }
 }
 
-void TabGame::processLocalPlayerDeckSelect(Player *localPlayer, int playerId, ServerInfo_Player playerInfo)
+void TabGame::processLocalPlayerDeckSelect(PlayerLogic *localPlayer, int playerId, ServerInfo_Player playerInfo)
 {
     loadDeckForLocalPlayer(localPlayer, playerId, playerInfo);
     processLocalPlayerReady(playerId, playerInfo);
 }
 
-void TabGame::loadDeckForLocalPlayer(Player *localPlayer, int playerId, ServerInfo_Player playerInfo)
+void TabGame::loadDeckForLocalPlayer(PlayerLogic *localPlayer, int playerId, ServerInfo_Player playerInfo)
 {
     TabbedDeckViewContainer *deckViewContainer = deckViewContainers.value(playerId);
     if (playerInfo.has_deck_list()) {
-        DeckLoader newDeck(this, new DeckList(QString::fromStdString(playerInfo.deck_list())));
-        CardPictureLoader::cacheCardPixmaps(
-            CardDatabaseManager::query()->getCards(newDeck.getDeckList()->getCardRefList()));
-        deckViewContainer->playerDeckView->setDeck(newDeck);
-        localPlayer->setDeck(newDeck);
+        DeckList deckList = DeckList(QString::fromStdString(playerInfo.deck_list()));
+        CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(deckList.getCardRefList()));
+        deckViewContainer->playerDeckView->setDeck(deckList);
+        localPlayer->setDeck(deckList);
     }
 }
 
@@ -773,7 +889,7 @@ void TabGame::processLocalPlayerReadyStateChanged(int playerId, bool ready)
     deckViewContainers.value(playerId)->playerDeckView->setReadyStart(ready);
 }
 
-void TabGame::createZoneForPlayer(Player *newPlayer, int playerId)
+void TabGame::createZoneForPlayer(PlayerLogic *newPlayer, int playerId)
 {
     if (!game->getPlayerManager()->getSpectators().contains(playerId)) {
 
@@ -809,9 +925,10 @@ void TabGame::startGame(bool _resuming)
     mainWidget->setCurrentWidget(gamePlayAreaWidget);
 
     if (!_resuming) {
-        QMapIterator<int, Player *> playerIterator(game->getPlayerManager()->getPlayers());
-        while (playerIterator.hasNext())
+        QMapIterator<int, PlayerLogic *> playerIterator(game->getPlayerManager()->getPlayers());
+        while (playerIterator.hasNext()) {
             playerIterator.next().value()->setGameStarted();
+        }
     }
 
     playerListWidget->setGameStarted(true, game->getGameState()->isResuming());
@@ -829,6 +946,7 @@ void TabGame::stopGame()
     QMapIterator<int, TabbedDeckViewContainer *> i(deckViewContainers);
     while (i.hasNext()) {
         i.next();
+        i.value()->playerDeckView->advancePlaymatRotation();
         i.value()->show();
     }
 
@@ -851,25 +969,26 @@ void TabGame::closeGame()
     gameMenu->addAction(aLeaveGame);
 }
 
-Player *TabGame::setActivePlayer(int id)
+PlayerLogic *TabGame::setActivePlayer(int id)
 {
-    Player *player = game->getPlayerManager()->getPlayer(id);
-    if (!player)
+    PlayerLogic *player = game->getPlayerManager()->getPlayer(id);
+    if (!player) {
         return nullptr;
+    }
 
     playerListWidget->setActivePlayer(id);
-    QMapIterator<int, Player *> i(game->getPlayerManager()->getPlayers());
+    QMapIterator<int, PlayerLogic *> i(game->getPlayerManager()->getPlayers());
     while (i.hasNext()) {
         i.next();
         if (i.value() == player) {
             i.value()->setActive(true);
             if (game->getGameState()->getClients().size() > 1) {
-                i.value()->getPlayerMenu()->setShortcutsActive();
+                scene->viewForPlayer(i.value()->getPlayerInfo()->getId())->getPlayerMenu()->setShortcutsActive();
             }
         } else {
             i.value()->setActive(false);
             if (game->getGameState()->getClients().size() > 1) {
-                i.value()->getPlayerMenu()->setShortcutsInactive();
+                scene->viewForPlayer(i.value()->getPlayerInfo()->getId())->getPlayerMenu()->setShortcutsInactive();
             }
         }
     }
@@ -885,8 +1004,13 @@ void TabGame::setActivePhase(int phase)
 
 void TabGame::newCardAdded(AbstractCardItem *card)
 {
+    connect(card, &AbstractCardItem::rightClicked, scene, &GameScene::onCardRightClicked);
+    connect(card, &AbstractCardItem::playSelected, scene, &GameScene::playSelected);
+    connect(card, &AbstractCardItem::playSelectedFaceDown, scene, &GameScene::playSelectedFaceDown);
+    connect(card, &AbstractCardItem::hideSelected, scene, &GameScene::hideSelected);
     connect(card, &AbstractCardItem::hovered, cardInfoFrameWidget,
             qOverload<AbstractCardItem *>(&CardInfoFrameWidget::setCard));
+    connect(card, &AbstractCardItem::selectionChanged, scene, &GameScene::onCardSelectionChanged);
     connect(card, &AbstractCardItem::showCardInfoPopup, this, &TabGame::showCardInfoPopup);
     connect(card, SIGNAL(deleteCardInfoPopup(QString)), this, SLOT(deleteCardInfoPopup(QString)));
     connect(card, &AbstractCardItem::cardShiftClicked, this, &TabGame::linkCardToChat);
@@ -897,26 +1021,31 @@ QString TabGame::getTabText() const
     QString gameTypeInfo;
     if (!gameTypes.empty()) {
         gameTypeInfo = gameTypes.at(0);
-        if (gameTypes.size() > 1)
+        if (gameTypes.size() > 1) {
             gameTypeInfo.append("...");
+        }
     }
 
     QString gameDesc(game->getGameMetaInfo()->description());
     QString gameId(QString::number(game->getGameMetaInfo()->gameId()));
 
     QString tabText;
-    if (replayManager->replay)
+    if (replayDock) {
         tabText.append(tr("Replay") + " ");
-    if (!gameTypeInfo.isEmpty())
-        tabText.append(gameTypeInfo + " ");
-    if (!gameDesc.isEmpty()) {
-        if (gameDesc.length() >= 15)
-            tabText.append("| " + gameDesc.left(15) + "... ");
-        else
-            tabText.append("| " + gameDesc + " ");
     }
-    if (!tabText.isEmpty())
+    if (!gameTypeInfo.isEmpty()) {
+        tabText.append(gameTypeInfo + " ");
+    }
+    if (!gameDesc.isEmpty()) {
+        if (gameDesc.length() >= 15) {
+            tabText.append("| " + gameDesc.left(15) + "... ");
+        } else {
+            tabText.append("| " + gameDesc + " ");
+        }
+    }
+    if (!tabText.isEmpty()) {
         tabText.append("| ");
+    }
     tabText.append("#" + gameId);
 
     return tabText;
@@ -925,12 +1054,18 @@ QString TabGame::getTabText() const
 /**
  * @param menu The menu to set. Pass in nullptr to set the menu to empty.
  */
-void TabGame::setCardMenu(QMenu *menu)
+void TabGame::setCardMenu(CardMenu *menu)
 {
     if (!aCardMenu) {
         return;
     }
 
+    if (aCardMenu->menu() && aCardMenu->menu()->isVisible()) {
+        aCardMenu->menu()->hide();
+        if (gameView && gameView->viewport()) {
+            gameView->viewport()->update();
+        }
+    }
     if (menu) {
         aCardMenu->setMenu(menu);
     } else {
@@ -952,14 +1087,17 @@ void TabGame::createMenuItems()
     connect(aReverseTurn, &QAction::triggered, game->getGameEventHandler(), &GameEventHandler::handleReverseTurn);
     aRemoveLocalArrows = new QAction(this);
     connect(aRemoveLocalArrows, &QAction::triggered, this, &TabGame::actRemoveLocalArrows);
-    connect(this, &TabGame::arrowDeletionRequested, game->getGameEventHandler(),
-            &GameEventHandler::handleArrowDeletion);
     aRotateViewCW = new QAction(this);
     connect(aRotateViewCW, &QAction::triggered, this, &TabGame::actRotateViewCW);
     aRotateViewCCW = new QAction(this);
     connect(aRotateViewCCW, &QAction::triggered, this, &TabGame::actRotateViewCCW);
     aGameInfo = new QAction(this);
     connect(aGameInfo, &QAction::triggered, this, &TabGame::actGameInfo);
+    aCopyGameLink = new QAction(this);
+    aCopyGameLink->setEnabled(!tabSupervisor->getIsLocalGame() && !tabSupervisor->getClient()->serverName().isEmpty());
+    connect(aCopyGameLink, &QAction::triggered, this, &TabGame::actCopyGameLink);
+    aInviteToGame = new QAction(this);
+    connect(aInviteToGame, &QAction::triggered, this, &TabGame::actInviteToGame);
     aConcede = new QAction(this);
     connect(aConcede, &QAction::triggered, this, &TabGame::actConcede);
     if (!game->getGameMetaInfo()->started()) {
@@ -998,6 +1136,8 @@ void TabGame::createMenuItems()
     gameMenu->addAction(aRotateViewCCW);
     gameMenu->addSeparator();
     gameMenu->addAction(aGameInfo);
+    gameMenu->addAction(aCopyGameLink);
+    gameMenu->addAction(aInviteToGame);
     gameMenu->addAction(aConcede);
     gameMenu->addAction(aFocusChat);
     gameMenu->addAction(aLeaveGame);
@@ -1006,6 +1146,9 @@ void TabGame::createMenuItems()
 
     aCardMenu = gameMenu->addMenu(new QMenu(this));
 
+    // Sync the new action with the same state the dock button already shows.
+    updateInviteButtonState();
+
     addTabMenu(gameMenu);
 }
 
@@ -1020,6 +1163,8 @@ void TabGame::createReplayMenuItems()
     aRotateViewCCW = nullptr;
     aResetLayout = nullptr;
     aGameInfo = nullptr;
+    aCopyGameLink = nullptr;
+    aInviteToGame = nullptr;
     aConcede = nullptr;
     aFocusChat = nullptr;
     aLeaveGame = new QAction(this);
@@ -1038,40 +1183,12 @@ void TabGame::createViewMenuItems()
 {
     viewMenu = new QMenu(this);
 
-    cardInfoDockMenu = viewMenu->addMenu(QString());
-    messageLayoutDockMenu = viewMenu->addMenu(QString());
-    playerListDockMenu = viewMenu->addMenu(QString());
-
-    aCardInfoDockVisible = cardInfoDockMenu->addAction(QString());
-    aCardInfoDockVisible->setCheckable(true);
-    connect(aCardInfoDockVisible, &QAction::triggered, this, &TabGame::dockVisibleTriggered);
-    aCardInfoDockFloating = cardInfoDockMenu->addAction(QString());
-    aCardInfoDockFloating->setCheckable(true);
-    connect(aCardInfoDockFloating, &QAction::triggered, this, &TabGame::dockFloatingTriggered);
-
-    aMessageLayoutDockVisible = messageLayoutDockMenu->addAction(QString());
-    aMessageLayoutDockVisible->setCheckable(true);
-    connect(aMessageLayoutDockVisible, &QAction::triggered, this, &TabGame::dockVisibleTriggered);
-    aMessageLayoutDockFloating = messageLayoutDockMenu->addAction(QString());
-    aMessageLayoutDockFloating->setCheckable(true);
-    connect(aMessageLayoutDockFloating, &QAction::triggered, this, &TabGame::dockFloatingTriggered);
-
-    aPlayerListDockVisible = playerListDockMenu->addAction(QString());
-    aPlayerListDockVisible->setCheckable(true);
-    connect(aPlayerListDockVisible, &QAction::triggered, this, &TabGame::dockVisibleTriggered);
-    aPlayerListDockFloating = playerListDockMenu->addAction(QString());
-    aPlayerListDockFloating->setCheckable(true);
-    connect(aPlayerListDockFloating, &QAction::triggered, this, &TabGame::dockFloatingTriggered);
+    registerDockWidget(viewMenu, cardInfoDock, {250, 360});
+    registerDockWidget(viewMenu, messageLayoutDock, {250, 200});
+    registerDockWidget(viewMenu, playerListDock, {250, 50});
 
     if (replayDock) {
-        replayDockMenu = viewMenu->addMenu(QString());
-
-        aReplayDockVisible = replayDockMenu->addAction(QString());
-        aReplayDockVisible->setCheckable(true);
-        connect(aReplayDockVisible, &QAction::triggered, this, &TabGame::dockVisibleTriggered);
-        aReplayDockFloating = replayDockMenu->addAction(QString());
-        aReplayDockFloating->setCheckable(true);
-        connect(aReplayDockFloating, &QAction::triggered, this, &TabGame::dockFloatingTriggered);
+        registerDockWidget(viewMenu, replayDock, {900, 100});
     }
 
     viewMenu->addSeparator();
@@ -1083,68 +1200,45 @@ void TabGame::createViewMenuItems()
     addTabMenu(viewMenu);
 }
 
+void TabGame::registerDockWidget(QMenu *_viewMenu, QDockWidget *widget, const QSize &defaultSize)
+{
+    QMenu *menu = _viewMenu->addMenu(QString());
+
+    QAction *aVisible = menu->addAction(QString());
+    aVisible->setCheckable(true);
+
+    QAction *aFloating = menu->addAction(QString());
+    aFloating->setCheckable(true);
+    aFloating->setEnabled(false);
+
+    // user interaction
+    connect(aVisible, &QAction::triggered, widget, [widget](bool checked) { widget->setVisible(checked); });
+    connect(aFloating, &QAction::triggered, this, [widget](bool checked) { widget->setFloating(checked); });
+
+    // sync aFloating's enabled state with aVisible's checked state
+    connect(aVisible, &QAction::toggled, aFloating, [aFloating](bool checked) { aFloating->setEnabled(checked); });
+
+    // sync aFloating with dockWidget's floating state
+    connect(widget, &QDockWidget::topLevelChanged, aFloating,
+            [aFloating](bool topLevel) { aFloating->setChecked(topLevel); });
+
+    // sync aVisible with dockWidget's visible state
+    auto filter = new VisibilityChangeListener(widget);
+    connect(filter, &VisibilityChangeListener::visibilityChanged, aVisible,
+            [aVisible](bool visible) { aVisible->setChecked(visible); });
+
+    dockToActions.insert(widget, {menu, aVisible, aFloating, defaultSize});
+}
+
 void TabGame::loadLayout()
 {
     LayoutsSettings &layouts = SettingsCache::instance().layouts();
-    if (replayManager->replay) {
+    if (replayDock) {
         restoreGeometry(layouts.getReplayPlayAreaGeometry());
         restoreState(layouts.getReplayPlayAreaLayoutState());
-
-        cardInfoDock->setMinimumSize(layouts.getReplayCardInfoSize());
-        cardInfoDock->setMaximumSize(layouts.getReplayCardInfoSize());
-        messageLayoutDock->setMinimumSize(layouts.getReplayMessageLayoutSize());
-        messageLayoutDock->setMaximumSize(layouts.getReplayMessageLayoutSize());
-        playerListDock->setMinimumSize(layouts.getReplayPlayerListSize());
-        playerListDock->setMaximumSize(layouts.getReplayPlayerListSize());
-        replayDock->setMinimumSize(layouts.getReplayReplaySize());
-        replayDock->setMaximumSize(layouts.getReplayReplaySize());
     } else {
         restoreGeometry(layouts.getGamePlayAreaGeometry());
         restoreState(layouts.getGamePlayAreaLayoutState());
-
-        cardInfoDock->setMinimumSize(layouts.getGameCardInfoSize());
-        cardInfoDock->setMaximumSize(layouts.getGameCardInfoSize());
-        messageLayoutDock->setMinimumSize(layouts.getGameMessageLayoutSize());
-        messageLayoutDock->setMaximumSize(layouts.getGameMessageLayoutSize());
-        playerListDock->setMinimumSize(layouts.getGamePlayerListSize());
-        playerListDock->setMaximumSize(layouts.getGamePlayerListSize());
-    }
-
-    aCardInfoDockVisible->setChecked(cardInfoDock->isVisible());
-    aMessageLayoutDockVisible->setChecked(messageLayoutDock->isVisible());
-    aPlayerListDockVisible->setChecked(playerListDock->isVisible());
-
-    aCardInfoDockFloating->setEnabled(aCardInfoDockVisible->isChecked());
-    aMessageLayoutDockFloating->setEnabled(aMessageLayoutDockVisible->isChecked());
-    aPlayerListDockFloating->setEnabled(aPlayerListDockVisible->isChecked());
-
-    aCardInfoDockFloating->setChecked(cardInfoDock->isFloating());
-    aMessageLayoutDockFloating->setChecked(messageLayoutDock->isFloating());
-    aPlayerListDockFloating->setChecked(playerListDock->isFloating());
-
-    if (replayManager->replay) {
-        aReplayDockVisible->setChecked(replayDock->isVisible());
-        aReplayDockFloating->setEnabled(aReplayDockVisible->isChecked());
-        aReplayDockFloating->setChecked(replayDock->isFloating());
-    }
-
-    QTimer::singleShot(100, this, &TabGame::freeDocksSize);
-}
-
-void TabGame::freeDocksSize()
-{
-    cardInfoDock->setMinimumSize(100, 100);
-    cardInfoDock->setMaximumSize(5000, 5000);
-
-    messageLayoutDock->setMinimumSize(100, 100);
-    messageLayoutDock->setMaximumSize(5000, 5000);
-
-    playerListDock->setMinimumSize(100, 100);
-    playerListDock->setMaximumSize(5000, 5000);
-
-    if (replayDock) {
-        replayDock->setMinimumSize(100, 100);
-        replayDock->setMaximumSize(5000, 5000);
     }
 }
 
@@ -1158,14 +1252,6 @@ void TabGame::actResetLayout()
     playerListDock->setFloating(false);
     messageLayoutDock->setFloating(false);
 
-    aCardInfoDockVisible->setChecked(true);
-    aPlayerListDockVisible->setChecked(true);
-    aMessageLayoutDockVisible->setChecked(true);
-
-    aCardInfoDockFloating->setChecked(false);
-    aPlayerListDockFloating->setChecked(false);
-    aMessageLayoutDockFloating->setChecked(false);
-
     addDockWidget(Qt::RightDockWidgetArea, cardInfoDock);
     addDockWidget(Qt::RightDockWidgetArea, playerListDock);
     addDockWidget(Qt::RightDockWidgetArea, messageLayoutDock);
@@ -1174,38 +1260,31 @@ void TabGame::actResetLayout()
         replayDock->setVisible(true);
         replayDock->setFloating(false);
         addDockWidget(Qt::BottomDockWidgetArea, replayDock);
-        aReplayDockVisible->setChecked(true);
-        aReplayDockFloating->setChecked(false);
 
-        cardInfoDock->setMinimumSize(250, 360);
-        cardInfoDock->setMaximumSize(250, 360);
-        messageLayoutDock->setMinimumSize(250, 200);
-        messageLayoutDock->setMaximumSize(250, 200);
-        playerListDock->setMinimumSize(250, 50);
-        playerListDock->setMaximumSize(250, 50);
-        replayDock->setMinimumSize(900, 100);
-        replayDock->setMaximumSize(900, 100);
+        cardInfoDock->resize(250, 360);
+        messageLayoutDock->resize(250, 200);
+        playerListDock->resize(250, 50);
+        replayDock->resize(900, 100);
     } else {
-        cardInfoDock->setMinimumSize(250, 360);
-        cardInfoDock->setMaximumSize(250, 360);
-        messageLayoutDock->setMinimumSize(250, 250);
-        messageLayoutDock->setMaximumSize(250, 250);
-        playerListDock->setMinimumSize(250, 50);
-        playerListDock->setMaximumSize(250, 50);
+        cardInfoDock->resize(250, 360);
+        messageLayoutDock->resize(250, 250);
+        playerListDock->resize(250, 50);
     }
-
-    QTimer::singleShot(100, this, &TabGame::freeDocksSize);
 }
 
 void TabGame::createPlayAreaWidget(bool bReplay)
 {
     phasesToolbar = new PhasesToolbar;
-    if (!bReplay)
+    if (!bReplay) {
         connect(phasesToolbar, &PhasesToolbar::sendGameCommand, game->getGameEventHandler(),
                 qOverload<const ::google::protobuf::Message &, int>(&GameEventHandler::sendGameCommand));
+    }
     scene = new GameScene(phasesToolbar, this);
     connect(game->getPlayerManager(), &PlayerManager::playerConceded, scene, &GameScene::rearrange);
     connect(game->getPlayerManager(), &PlayerManager::playerCountChanged, scene, &GameScene::rearrange);
+    connect(scene, &GameScene::arrowDeletionRequested, game->getGameEventHandler(),
+            &GameEventHandler::handleArrowDeletion);
+    connect(game->getGameEventHandler(), &GameEventHandler::arrowDeleted, scene, &GameScene::deleteArrow);
     gameView = new GameView(scene);
 
     auto gamePlayAreaVBox = new QVBoxLayout;
@@ -1219,17 +1298,20 @@ void TabGame::createPlayAreaWidget(bool bReplay)
 
 void TabGame::createReplayDock(GameReplay *replay)
 {
-    replayManager = new ReplayManager(this, replay);
+    replayWidget = new ReplayWidget(this, replay);
 
     replayDock = new QDockWidget(this);
     replayDock->setObjectName("replayDock");
     replayDock->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetFloatable |
                             QDockWidget::DockWidgetMovable);
-    replayDock->setWidget(replayManager);
+    replayDock->setWidget(replayWidget);
     replayDock->setFloating(false);
 
-    replayDock->installEventFilter(this);
-    connect(replayDock, &QDockWidget::topLevelChanged, this, &TabGame::dockTopLevelChanged);
+    connect(replayWidget, &ReplayWidget::rewound, this, &TabGame::resetForRewind);
+    connect(replayWidget, &ReplayWidget::eventReplayed, game->getGameEventHandler(),
+            [this](const auto &event, auto options) {
+                game->getGameEventHandler()->processGameEventContainer(event, nullptr, options);
+            });
 }
 
 void TabGame::createDeckViewContainerWidget(bool bReplay)
@@ -1268,9 +1350,6 @@ void TabGame::createCardInfoDock(bool bReplay)
                               QDockWidget::DockWidgetMovable);
     cardInfoDock->setWidget(cardBoxLayoutWidget);
     cardInfoDock->setFloating(false);
-
-    cardInfoDock->installEventFilter(this);
-    connect(cardInfoDock, &QDockWidget::topLevelChanged, this, &TabGame::dockTopLevelChanged);
 }
 
 void TabGame::createPlayerListDock(bool bReplay)
@@ -1284,15 +1363,30 @@ void TabGame::createPlayerListDock(bool bReplay)
     }
     playerListWidget->setFocusPolicy(Qt::NoFocus);
 
+    auto *playerListBox = new QWidget(this);
+    auto *vbox = new QVBoxLayout(playerListBox);
+    vbox->setContentsMargins(0, 0, 0, 0);
+    vbox->setSpacing(0);
+
+    vbox->addWidget(playerListWidget);
+
+    if (!bReplay) {
+        inviteButton = new QPushButton(tr("Invite"), playerListBox);
+        inviteButton->setVisible(false);
+        connect(inviteButton, &QPushButton::clicked, this, &TabGame::actInviteToGame);
+        vbox->addWidget(inviteButton);
+
+        connect(game->getGameMetaInfo(), &GameMetaInfo::startedChanged, this, &TabGame::updateInviteButtonState);
+        connect(game->getPlayerManager(), &PlayerManager::playerCountChanged, this, &TabGame::updateInviteButtonState);
+        updateInviteButtonState();
+    }
+
     playerListDock = new QDockWidget(this);
     playerListDock->setObjectName("playerListDock");
     playerListDock->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetFloatable |
                                 QDockWidget::DockWidgetMovable);
-    playerListDock->setWidget(playerListWidget);
+    playerListDock->setWidget(playerListBox);
     playerListDock->setFloating(false);
-
-    playerListDock->installEventFilter(this);
-    connect(playerListDock, &QDockWidget::topLevelChanged, this, &TabGame::dockTopLevelChanged);
 }
 
 void TabGame::createMessageDock(bool bReplay)
@@ -1315,11 +1409,12 @@ void TabGame::createMessageDock(bool bReplay)
             qOverload<const QString &>(&CardInfoFrameWidget::setCard));
     connect(messageLog, &MessageLogWidget::showCardInfoPopup, this, &TabGame::showCardInfoPopup);
     connect(messageLog, &MessageLogWidget::deleteCardInfoPopup, this, &TabGame::deleteCardInfoPopup);
+    connect(messageLog, &MessageLogWidget::cockatriceLinkActivated, this, &TabGame::cockatriceLinkActivated);
 
     if (!bReplay) {
         connect(messageLog, &MessageLogWidget::openMessageDialog, this, &TabGame::openMessageDialog);
         connect(messageLog, &MessageLogWidget::addMentionTag, this, &TabGame::addMentionTag);
-        connect(&SettingsCache::instance(), &SettingsCache::chatMentionCompleterChanged, this,
+        connect(&SettingsCache::instance().chat(), &ChatSettings::chatMentionCompleterChanged, this,
                 &TabGame::actCompleterChanged);
     }
 
@@ -1332,12 +1427,25 @@ void TabGame::createMessageDock(bool bReplay)
         sayEdit->setMaxLength(MAX_TEXT_LENGTH);
         sayLabel->setBuddy(sayEdit);
         connect(this, &TabGame::chatMessageSent, game->getGameEventHandler(), &GameEventHandler::handleChatMessageSent);
-        completer = new QCompleter(autocompleteUserList, sayEdit);
-        completer->setCaseSensitivity(Qt::CaseInsensitive);
-        completer->setMaxVisibleItems(5);
-        completer->setFilterMode(Qt::MatchStartsWith);
+        mentionModel = new QStringListModel(autocompleteUserList, sayEdit);
+        mentionCompleter = createMentionCompleter(mentionModel, sayEdit);
+        sayEdit->addCompleter(mentionCompleter, CompleterTrigger::Mention);
+
+        auto *cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, sayEdit);
+        auto *displayModel = new CardDatabaseDisplayModel(sayEdit);
+        displayModel->setSourceModel(cardDatabaseModel);
+        const CardCompleterSetup cardSetup = createCardCompleter(displayModel, sayEdit);
+        sayEdit->addCompleter(cardSetup.completer, CompleterTrigger::Card);
+
+        connect(sayEdit, &LineEditCompleter::cardPartialChanged, this, [this, cardSetup](const QString &text) {
+            cardSetup.searchModel->updateSearchResults(text);
+            cardSetup.proxyModel->setFilterRegularExpression(
+                QRegularExpression(QRegularExpression::escape(text), QRegularExpression::CaseInsensitiveOption));
+            if (sayEdit->hasFocus()) {
+                cardSetup.completer->complete();
+            }
+        });
 
-        sayEdit->setCompleter(completer);
         actCompleterChanged();
 
         if (game->getPlayerManager()->isSpectator()) {
@@ -1373,128 +1481,18 @@ void TabGame::createMessageDock(bool bReplay)
                                    QDockWidget::DockWidgetMovable);
     messageLayoutDock->setWidget(messageLogLayoutWidget);
     messageLayoutDock->setFloating(false);
-
-    messageLayoutDock->installEventFilter(this);
-    connect(messageLayoutDock, &QDockWidget::topLevelChanged, this, &TabGame::dockTopLevelChanged);
 }
 
 void TabGame::hideEvent(QHideEvent *event)
 {
     LayoutsSettings &layouts = SettingsCache::instance().layouts();
-    if (replayManager->replay) {
+    if (replayDock) {
         layouts.setReplayPlayAreaState(saveState());
         layouts.setReplayPlayAreaGeometry(saveGeometry());
-        layouts.setReplayCardInfoSize(cardInfoDock->size());
-        layouts.setReplayMessageLayoutSize(messageLayoutDock->size());
-        layouts.setReplayPlayerListSize(playerListDock->size());
-        layouts.setReplayReplaySize(replayDock->size());
     } else {
         layouts.setGamePlayAreaState(saveState());
         layouts.setGamePlayAreaGeometry(saveGeometry());
-        layouts.setGameCardInfoSize(cardInfoDock->size());
-        layouts.setGameMessageLayoutSize(messageLayoutDock->size());
-        layouts.setGamePlayerListSize(playerListDock->size());
     }
 
     Tab::hideEvent(event);
 }
-
-// Method uses to sync docks state with menu items state
-bool TabGame::eventFilter(QObject *o, QEvent *e)
-{
-    if (e->type() == QEvent::Close) {
-        if (o == cardInfoDock) {
-            aCardInfoDockVisible->setChecked(false);
-            aCardInfoDockFloating->setEnabled(false);
-        } else if (o == messageLayoutDock) {
-            aMessageLayoutDockVisible->setChecked(false);
-            aMessageLayoutDockFloating->setEnabled(false);
-        } else if (o == playerListDock) {
-            aPlayerListDockVisible->setChecked(false);
-            aPlayerListDockFloating->setEnabled(false);
-        } else if (o == replayDock) {
-            aReplayDockVisible->setChecked(false);
-            aReplayDockFloating->setEnabled(false);
-        }
-    }
-
-    return false;
-}
-
-void TabGame::dockVisibleTriggered()
-{
-    QObject *o = sender();
-    if (o == aCardInfoDockVisible) {
-        cardInfoDock->setVisible(aCardInfoDockVisible->isChecked());
-        aCardInfoDockFloating->setEnabled(aCardInfoDockVisible->isChecked());
-        return;
-    }
-
-    if (o == aMessageLayoutDockVisible) {
-        messageLayoutDock->setVisible(aMessageLayoutDockVisible->isChecked());
-        aMessageLayoutDockFloating->setEnabled(aMessageLayoutDockVisible->isChecked());
-        return;
-    }
-
-    if (o == aPlayerListDockVisible) {
-        playerListDock->setVisible(aPlayerListDockVisible->isChecked());
-        aPlayerListDockFloating->setEnabled(aPlayerListDockVisible->isChecked());
-        return;
-    }
-
-    if (o == aReplayDockVisible) {
-        replayDock->setVisible(aReplayDockVisible->isChecked());
-        aReplayDockFloating->setEnabled(aReplayDockVisible->isChecked());
-        return;
-    }
-}
-
-void TabGame::dockFloatingTriggered()
-{
-    QObject *o = sender();
-    if (o == aCardInfoDockFloating) {
-        cardInfoDock->setFloating(aCardInfoDockFloating->isChecked());
-        return;
-    }
-
-    if (o == aMessageLayoutDockFloating) {
-        messageLayoutDock->setFloating(aMessageLayoutDockFloating->isChecked());
-        return;
-    }
-
-    if (o == aPlayerListDockFloating) {
-        playerListDock->setFloating(aPlayerListDockFloating->isChecked());
-        return;
-    }
-
-    if (o == aReplayDockFloating) {
-        replayDock->setFloating(aReplayDockFloating->isChecked());
-        return;
-    }
-}
-
-void TabGame::dockTopLevelChanged(bool topLevel)
-{
-    retranslateUi();
-
-    QObject *o = sender();
-    if (o == cardInfoDock) {
-        aCardInfoDockFloating->setChecked(topLevel);
-        return;
-    }
-
-    if (o == messageLayoutDock) {
-        aMessageLayoutDockFloating->setChecked(topLevel);
-        return;
-    }
-
-    if (o == playerListDock) {
-        aPlayerListDockFloating->setChecked(topLevel);
-        return;
-    }
-
-    if (o == replayDock) {
-        aReplayDockFloating->setChecked(topLevel);
-        return;
-    }
-}
diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.h b/cockatrice/src/interface/widgets/tabs/tab_game.h
index b6fe5b51c..7bc52202f 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_game.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_game.h
@@ -3,51 +3,61 @@
  * @ingroup Tabs
  * @ingroup GameWidgets
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TAB_GAME_H
 #define TAB_GAME_H
 
-#include "../game/abstract_game.h"
-#include "../game/log/message_log_widget.h"
-#include "../game/player/player.h"
-#include "../interface/widgets/menus/tearoff_menu.h"
-#include "../interface/widgets/replay/replay_manager.h"
 #include "tab.h"
 
-#include <QCompleter>
+#include <QList>
 #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>
 
-class ServerInfo_PlayerProperties;
+class CardMenu;
 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 ReplayManager;
+class ReplayWidget;
 class CardInfoFrameWidget;
-class QTimer;
-class QSplitter;
 class QLabel;
-class QToolButton;
+class QPushButton;
 class QMenu;
-class ZoneViewLayout;
-class ZoneViewWidget;
 class PhasesToolbar;
 class PlayerListWidget;
-class ReplayTimelineWidget;
-class CardZone;
 class AbstractCardItem;
-class CardItem;
-class DeckLoader;
 class QVBoxLayout;
-class QHBoxLayout;
 class GameReplay;
 class LineEditCompleter;
 class QDockWidget;
@@ -59,14 +69,16 @@ class TabGame : public Tab
 private:
     AbstractGame *game;
     const UserListProxy *userListProxy;
-    ReplayManager *replayManager;
+    ReplayWidget *replayWidget = nullptr;
     QStringList gameTypes;
-    QCompleter *completer;
+    QCompleter *mentionCompleter;
+    QStringListModel *mentionModel;
     QStringList autocompleteUserList;
     QStackedWidget *mainWidget;
 
     CardInfoFrameWidget *cardInfoFrameWidget;
     PlayerListWidget *playerListWidget;
+    QPushButton *inviteButton = nullptr;
     QLabel *timeElapsedLabel;
     MessageLogWidget *messageLog;
     QLabel *sayLabel;
@@ -79,62 +91,77 @@ private:
     QWidget *gamePlayAreaWidget, *deckViewContainerWidget;
     QDockWidget *cardInfoDock, *messageLayoutDock, *playerListDock, *replayDock;
     QAction *playersSeparator;
-    QMenu *gameMenu, *viewMenu, *cardInfoDockMenu, *messageLayoutDockMenu, *playerListDockMenu, *replayDockMenu;
+    QMenu *gameMenu, *viewMenu;
     TearOffMenu *phasesMenu;
-    QAction *aGameInfo, *aConcede, *aLeaveGame, *aNextPhase, *aNextPhaseAction, *aNextTurn, *aReverseTurn,
-        *aRemoveLocalArrows, *aRotateViewCW, *aRotateViewCCW, *aResetLayout, *aResetReplayLayout;
-    QAction *aCardInfoDockVisible, *aCardInfoDockFloating, *aMessageLayoutDockVisible, *aMessageLayoutDockFloating,
-        *aPlayerListDockVisible, *aPlayerListDockFloating, *aReplayDockVisible, *aReplayDockFloating;
+    QAction *aGameInfo, *aConcede, *aCopyGameLink, *aLeaveGame, *aNextPhase, *aNextPhaseAction, *aNextTurn,
+        *aReverseTurn, *aRemoveLocalArrows, *aRotateViewCW, *aRotateViewCCW, *aResetLayout, *aResetReplayLayout;
     QAction *aFocusChat;
+    QAction *aInviteToGame = nullptr;
     QList<QAction *> phaseActions;
     QAction *aCardMenu;
 
-    Player *addPlayer(Player *newPlayer);
-    void addLocalPlayer(Player *newPlayer, int playerId);
+    /**
+     * @brief The actions associated with managing a QDockWidget
+     */
+    struct DockActions
+    {
+        QMenu *menu;
+        QAction *aVisible;
+        QAction *aFloating;
+        QSize defaultSize;
+    };
+
+    QMap<QDockWidget *, DockActions> dockToActions;
+
+    PlayerLogic *addPlayer(PlayerLogic *newPlayer);
+    void addLocalPlayer(PlayerLogic *newPlayer, int playerId);
     void processRemotePlayerDeckSelect(QString deckList, int playerId, QString playerName);
     void processMultipleRemotePlayerDeckSelect(QVector<QPair<int, QPair<QString, QString>>> playerIdDeckMap);
-    void processLocalPlayerDeckSelect(Player *localPlayer, int playerId, ServerInfo_Player playerInfo);
-    void loadDeckForLocalPlayer(Player *localPlayer, int playerId, ServerInfo_Player playerInfo);
+    void processLocalPlayerDeckSelect(PlayerLogic *localPlayer, int playerId, ServerInfo_Player playerInfo);
+    void loadDeckForLocalPlayer(PlayerLogic *localPlayer, int playerId, ServerInfo_Player playerInfo);
     void processLocalPlayerReady(int playerId, ServerInfo_Player playerInfo);
-    void createZoneForPlayer(Player *newPlayer, int playerId);
+    void createZoneForPlayer(PlayerLogic *newPlayer, int playerId);
 
     void startGame(bool resuming);
     void stopGame();
     void closeGame();
     bool leaveGame();
 
-    Player *setActivePlayer(int id);
+    PlayerLogic *setActivePlayer(int id);
     void setActivePhase(int phase);
     void createMenuItems();
     void createReplayMenuItems();
     void createViewMenuItems();
+    void registerDockWidget(QMenu *_viewMenu, QDockWidget *widget, const QSize &defaultSize);
     void createCardInfoDock(bool bReplay = false);
     void createPlayerListDock(bool bReplay = false);
     void createMessageDock(bool bReplay = false);
     void createPlayAreaWidget(bool bReplay = false);
     void createDeckViewContainerWidget(bool bReplay = false);
     void createReplayDock(GameReplay *replay);
+    void updateInviteButtonState();
 signals:
     void gameClosing(TabGame *tab);
     void containerProcessingStarted(const GameEventContext &context);
     void containerProcessingDone();
     void openMessageDialog(const QString &userName, bool focus);
-    void openDeckEditor(DeckLoader *deck);
+    void openDeckEditor(const LoadedDeck &deck);
     void notIdle();
 
     void phaseChanged(int phase);
     void gameLeft();
     void chatMessageSent(QString chatMessage);
     void turnAdvanced();
-    void arrowDeletionRequested(int arrowId);
 
 private slots:
     void adminLockChanged(bool lock);
     void newCardAdded(AbstractCardItem *card);
-    void setCardMenu(QMenu *menu);
+    void setCardMenu(CardMenu *menu);
 
     void actGameInfo();
+    void actInviteToGame();
     void actConcede();
+    void actCopyGameLink();
     void actRemoveLocalArrows();
     void actRotateViewCW();
     void actRotateViewCCW();
@@ -152,15 +179,10 @@ private slots:
     void actCompleterChanged();
     void notifyPlayerJoin(QString playerName);
     void notifyPlayerKicked();
-    void processPlayerLeave(Player *leavingPlayer);
+    void processPlayerLeave(PlayerLogic *leavingPlayer);
     void actResetLayout();
-    void freeDocksSize();
 
     void hideEvent(QHideEvent *event) override;
-    bool eventFilter(QObject *o, QEvent *e) override;
-    void dockVisibleTriggered();
-    void dockFloatingTriggered();
-    void dockTopLevelChanged(bool topLevel);
 
 protected slots:
     void closeEvent(QCloseEvent *event) override;
@@ -190,7 +212,7 @@ public:
 
 public slots:
     void viewCardInfo(const CardRef &cardRef = {}) const;
-    void resetChatAndPhase();
+    void resetForRewind();
     void updateTimeElapsedLabel(QString newTime);
     void addPlayerToAutoCompleteList(QString playerName);
     void removePlayerFromAutoCompleteList(QString playerName);
diff --git a/cockatrice/src/interface/widgets/tabs/tab_home.cpp b/cockatrice/src/interface/widgets/tabs/tab_home.cpp
index 7a79b1785..1358645d0 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_home.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_home.cpp
@@ -1,5 +1,9 @@
 #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 c40dfc269..bc86348cb 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_home.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_home.h
@@ -1,18 +1,20 @@
 /**
  * @file tab_home.h
  * @ingroup Tabs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TAB_HOME_H
 #define TAB_HOME_H
 
-#include "../interface/widgets/general/home_widget.h"
 #include "tab.h"
 
-#include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <QString>
+#include <qtmetamacros.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 e4f699160..9f17afea2 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp
@@ -1,25 +1,38 @@
 #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/trice_limits.h>
+#include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+#include <string>
 
-TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client)
+class TabSupervisor;
+
+TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _canUseDeveloperCommands)
+    : Tab(_tabSupervisor), client(_client), canUseDeveloperCommands(_canUseDeveloperCommands)
 {
     roomTable = new QTableWidget();
     roomTable->setColumnCount(6);
@@ -80,21 +93,27 @@ void TabLog::getClicked()
     if (!mainRoom->isChecked() && !gameRoom->isChecked() && !privateChat->isChecked()) {
         mainRoom->setChecked(true);
         gameRoom->setChecked(true);
-        privateChat->setChecked(true);
+        if (!canUseDeveloperCommands) {
+            privateChat->setChecked(true);
+        }
     }
 
-    if (maximumResults->value() == 0)
+    if (maximumResults->value() == 0) {
         maximumResults->setValue(1000);
+    }
 
     int dateRange = 0;
-    if (lastHour->isChecked())
+    if (lastHour->isChecked()) {
         dateRange = 1;
+    }
 
-    if (today->isChecked())
+    if (today->isChecked()) {
         dateRange = 24;
+    }
 
-    if (pastDays->isChecked())
+    if (pastDays->isChecked()) {
         dateRange = pastXDays->value() * 24;
+    }
 
     Command_ViewLogHistory cmd;
     cmd.set_user_name(findUsername->text().toStdString());
@@ -113,7 +132,15 @@ void TabLog::getClicked()
     };
     cmd.set_date_range(dateRange);
     cmd.set_maximum_results(maximumResults->value());
-    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+
+    PendingCommand *pend;
+    if (canUseDeveloperCommands) {
+        // Developers query logs through the developer command family.
+        pend = client->prepareDeveloperCommand(cmd);
+    } else {
+        pend = client->prepareModeratorCommand(cmd);
+    }
+
     connect(pend, &PendingCommand::finished, this, &TabLog::viewLogHistory_processResponse);
     client->sendCommand(pend);
 }
@@ -167,6 +194,14 @@ void TabLog::createDock()
     mainRoom = new QCheckBox(tr("Main Room"));
     gameRoom = new QCheckBox(tr("Game Room"));
     privateChat = new QCheckBox(tr("Private Chat"));
+    if (canUseDeveloperCommands) {
+        // Developers cannot query private conversations.
+        privateChat->setVisible(false);
+        // The developer family ignores the IP filter server-side, so showing
+        // the field would silently unfilter the result by it. Hide it.
+        labelFindIPAddress->setVisible(false);
+        findIPAddress->setVisible(false);
+    }
 
     pastDays = new QRadioButton(tr("Past X Days: "));
     today = new QRadioButton(tr("Today"));
diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.h b/cockatrice/src/interface/widgets/tabs/tab_logs.h
index a73af651b..fc8ef1ea0 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_logs.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_logs.h
@@ -1,15 +1,16 @@
 /**
  * @file tab_logs.h
  * @ingroup ServerTabs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TAB_LOG_H
 #define TAB_LOG_H
 
 #include "tab.h"
 
-#include <QDialog>
+#include <QString>
+#include <qtmetamacros.h>
 
 class AbstractClient;
 class LineEditUnfocusable;
@@ -24,15 +25,15 @@ class QWidget;
 class QGridLayout;
 class QVBoxLayout;
 class QTableWidget;
-class CommandContainer;
 class Response;
-class AbstractClient;
+class TabSupervisor;
 
 class TabLog : public Tab
 {
     Q_OBJECT
 private:
     AbstractClient *client;
+    bool canUseDeveloperCommands;
     QLabel *labelFindUserName, *labelFindIPAddress, *labelFindGameName, *labelFindGameID, *labelMessage, *labelMaximum,
         *labelDescription;
     LineEditUnfocusable *findUsername, *findIPAddress, *findGameName, *findGameID, *findMessage;
@@ -58,7 +59,7 @@ private slots:
     void restartLayout();
 
 public:
-    TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client);
+    TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _canUseDeveloperCommands = false);
     ~TabLog() override;
     void retranslateUi() override;
     [[nodiscard]] QString getTabText() const override
diff --git a/cockatrice/src/interface/widgets/tabs/tab_message.cpp b/cockatrice/src/interface/widgets/tabs/tab_message.cpp
index bd0457990..65186e396 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_message.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_message.cpp
@@ -6,30 +6,40 @@
 #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 <QDebug>
+#include <QCloseEvent>
 #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>
 #include <libcockatrice/protocol/pb/session_commands.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <libcockatrice/settings/chat_settings.h>
+#include <libcockatrice/utility/string_limits.h>
+#include <string>
 
 TabMessage::TabMessage(TabSupervisor *_tabSupervisor,
                        AbstractClient *_client,
                        const ServerInfo_User &_ownUserInfo,
-                       const ServerInfo_User &_otherUserInfo)
+                       const ServerInfo_User &_otherUserInfo,
+                       bool _userOnline)
     : Tab(_tabSupervisor), client(_client), ownUserInfo(new ServerInfo_User(_ownUserInfo)),
-      otherUserInfo(new ServerInfo_User(_otherUserInfo)), userOnline(true)
+      otherUserInfo(new ServerInfo_User(_otherUserInfo)), userOnline(_userOnline)
 {
     chatView = new ChatView(tabSupervisor, 0, true);
     connect(chatView, &ChatView::showCardInfoPopup, this, &TabMessage::showCardInfoPopup);
     connect(chatView, &ChatView::deleteCardInfoPopup, this, &TabMessage::deleteCardInfoPopup);
     connect(chatView, &ChatView::addMentionTag, this, &TabMessage::addMentionTag);
+    connect(chatView, &ChatView::cockatriceLinkActivated, this, &TabMessage::cockatriceLinkActivated);
     sayEdit = new LineEditUnfocusable;
     sayEdit->setMaxLength(MAX_TEXT_LENGTH);
     connect(sayEdit, &LineEditUnfocusable::returnPressed, this, &TabMessage::sendMessage);
@@ -72,8 +82,9 @@ void TabMessage::retranslateUi()
 
 void TabMessage::tabActivated()
 {
-    if (!sayEdit->hasFocus())
+    if (!sayEdit->hasFocus()) {
         sayEdit->setFocus();
+    }
 }
 
 QString TabMessage::getUserName() const
@@ -92,27 +103,65 @@ void TabMessage::closeEvent(QCloseEvent *event)
     event->accept();
 }
 
-void TabMessage::sendMessage()
+void TabMessage::sendPrivateMessage(const QString &text)
 {
-    if (sayEdit->text().isEmpty() || !userOnline)
+    if (tabSupervisor->getUserListManager()->isUserIgnored(getUserName())) {
+        chatView->appendMessage(tr("You have ignored %1; your messages are not delivered.")
+                                    .arg(QString::fromStdString(otherUserInfo->name())));
         return;
+    }
 
     Command_Message cmd;
     cmd.set_user_name(otherUserInfo->name());
-    cmd.set_message(sayEdit->text().toStdString());
+    cmd.set_message(text.toStdString());
 
     PendingCommand *pend = client->prepareSessionCommand(cmd);
+    pend->setExtraData(text);
     connect(pend, &PendingCommand::finished, this, &TabMessage::messageSent);
     client->sendCommand(pend);
+}
 
+void TabMessage::sendMessage()
+{
+    if (sayEdit->text().isEmpty()) {
+        return;
+    }
+
+    if (!userOnline) {
+        notifyUserOffline();
+        return;
+    }
+
+    sendPrivateMessage(sayEdit->text());
     sayEdit->clear();
 }
 
-void TabMessage::messageSent(const Response &response)
+bool TabMessage::isUserOnline() const
 {
-    if (response.response_code() == Response::RespInIgnoreList)
+    return userOnline;
+}
+
+void TabMessage::sendInviteMessage(const QString &text)
+{
+    sayEdit->setText(text);
+    sendMessage();
+}
+
+void TabMessage::messageSent(const Response &response,
+                             const CommandContainer & /*commandContainer*/,
+                             const QVariant &extraData)
+{
+    if (response.response_code() == Response::RespInIgnoreList) {
         chatView->appendMessage(tr(
             "This user is ignoring you, they cannot see your messages in main chat and you cannot join their games."));
+    } else if (response.response_code() == Response::RespNameNotFound) {
+        // The recipient went offline before the command reached the server: restore the draft.
+        userOnline = false;
+        if (sayEdit->text().isEmpty()) {
+            sayEdit->setText(extraData.toString());
+        }
+        notifyUserOffline();
+    }
 }
 
 void TabMessage::processUserMessageEvent(const Event_UserMessage &event)
@@ -120,12 +169,15 @@ void TabMessage::processUserMessageEvent(const Event_UserMessage &event)
     auto userInfo = event.sender_name() == otherUserInfo->name() ? otherUserInfo : ownUserInfo;
 
     chatView->appendMessage(QString::fromStdString(event.message()), {}, *userInfo, true);
-    if (tabSupervisor->currentIndex() != tabSupervisor->indexOf(this))
+    if (tabSupervisor->currentIndex() != tabSupervisor->indexOf(this)) {
         soundEngine->playSound("private_message");
-    if (SettingsCache::instance().getShowMessagePopup() && shouldShowSystemPopup(event))
+    }
+    if (SettingsCache::instance().chat().getShowMessagePopup() && shouldShowSystemPopup(event)) {
         showSystemPopup(event);
-    if (QString::fromStdString(event.sender_name()).toLower().simplified() == "servatrice")
+    }
+    if (QString::fromStdString(event.sender_name()).toLower().simplified() == "servatrice") {
         sayEdit->setDisabled(true);
+    }
 
     emit userEvent();
 }
@@ -168,3 +220,8 @@ void TabMessage::processUserJoined(const ServerInfo_User &_userInfo)
     userOnline = true;
     *otherUserInfo = _userInfo;
 }
+
+void TabMessage::notifyUserOffline()
+{
+    chatView->appendMessage(tr("Message not sent — %1 is offline.").arg(QString::fromStdString(otherUserInfo->name())));
+}
diff --git a/cockatrice/src/interface/widgets/tabs/tab_message.h b/cockatrice/src/interface/widgets/tabs/tab_message.h
index 36a0b5f78..bea58ecb3 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_message.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_message.h
@@ -1,8 +1,8 @@
 /**
  * @file tab_message.h
  * @ingroup MessagingTabs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TAB_MESSAGE_H
 #define TAB_MESSAGE_H
@@ -10,6 +10,13 @@
 #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");
 
@@ -19,6 +26,7 @@ class LineEditUnfocusable;
 class Event_UserMessage;
 class Response;
 class ServerInfo_User;
+class CommandContainer;
 
 class TabMessage : public Tab
 {
@@ -39,7 +47,7 @@ signals:
     void maximizeClient();
 private slots:
     void sendMessage();
-    void messageSent(const Response &response);
+    void messageSent(const Response &response, const CommandContainer &commandContainer, const QVariant &extraData);
     void addMentionTag(QString mentionTag);
     void messageClicked();
 
@@ -50,7 +58,8 @@ public:
     TabMessage(TabSupervisor *_tabSupervisor,
                AbstractClient *_client,
                const ServerInfo_User &_ownUserInfo,
-               const ServerInfo_User &_otherUserInfo);
+               const ServerInfo_User &_otherUserInfo,
+               bool _userOnline);
     ~TabMessage() override;
     void retranslateUi() override;
     void tabActivated() override;
@@ -62,9 +71,14 @@ public:
     void processUserLeft();
     void processUserJoined(const ServerInfo_User &_userInfo);
 
+    [[nodiscard]] bool isUserOnline() const;
+    void sendPrivateMessage(const QString &text);
+    void sendInviteMessage(const QString &text);
+
 private:
     bool shouldShowSystemPopup(const Event_UserMessage &event);
     void showSystemPopup(const Event_UserMessage &event);
+    void notifyUserOffline();
 };
 
 #endif
diff --git a/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp b/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp
new file mode 100644
index 000000000..09a640540
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp
@@ -0,0 +1,479 @@
+#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 <QAbstractItemView>
+#include <QDateTime>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#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>
+#include <libcockatrice/protocol/pb/response_remove_user_avatar.pb.h>
+#include <libcockatrice/protocol/pb/response_report_user_info.pb.h>
+#include <libcockatrice/protocol/pb/response_reset_user_password.pb.h>
+#include <libcockatrice/protocol/pb/response_user_alts.pb.h>
+#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
+{
+constexpr int COL_ALTS_USER = 0;
+constexpr int COL_ALTS_EMAIL = 1;
+constexpr int COL_ALTS_CLIENTID = 2;
+constexpr int COL_ALTS_REGISTERED = 3;
+constexpr int COL_ALTS_LAST_LOGIN = 4;
+constexpr int COL_ALTS_WARNS = 5;
+constexpr int COL_ALTS_BANS = 6;
+constexpr int COL_ALTS_ACTIVE = 7;
+constexpr int COL_ALTS_COUNT = 8;
+
+constexpr int COL_SESSIONS_IP = 0;
+constexpr int COL_SESSIONS_CLIENTID = 1;
+constexpr int COL_SESSIONS_START = 2;
+constexpr int COL_SESSIONS_END = 3;
+constexpr int COL_SESSIONS_TYPE = 4;
+constexpr int COL_SESSIONS_COUNT = 5;
+
+constexpr int COL_STAFF_USER = 0;
+constexpr int COL_STAFF_LEVEL = 1;
+constexpr int COL_STAFF_LAST_LOGIN = 2;
+constexpr int COL_STAFF_COUNT = 3;
+} // namespace
+
+TabModeration::TabModeration(TabSupervisor *_tabSupervisor, AbstractClient *_client, const QString &initialUser)
+    : Tab(_tabSupervisor), client(_client)
+{
+    auto *centralWidget = new QWidget(this);
+    setCentralWidget(centralWidget);
+
+    searchEdit = new QLineEdit;
+    searchEdit->setClearButtonEnabled(true);
+    connect(searchEdit, &QLineEdit::returnPressed, this, &TabModeration::investigateUser);
+
+    investigateButton = new QPushButton;
+    connect(investigateButton, &QPushButton::clicked, this, &TabModeration::investigateUser);
+
+    resetPasswordButton = new QPushButton;
+    connect(resetPasswordButton, &QPushButton::clicked, this, &TabModeration::resetPassword);
+
+    removeAvatarButton = new QPushButton;
+    connect(removeAvatarButton, &QPushButton::clicked, this, &TabModeration::removeAvatar);
+
+    auto *topBar = new QHBoxLayout;
+    topBar->addWidget(searchEdit);
+    topBar->addWidget(investigateButton);
+    topBar->addStretch();
+    topBar->addWidget(resetPasswordButton);
+    topBar->addWidget(removeAvatarButton);
+
+    userInfoGroup = new QGroupBox;
+    userInfoNameLabel = new QLabel;
+    userInfoNameValue = new QLabel;
+    userInfoRegisteredLabel = new QLabel;
+    userInfoRegisteredValue = new QLabel;
+    userInfoLastLoginLabel = new QLabel;
+    userInfoLastLoginValue = new QLabel;
+    userInfoStatusLabel = new QLabel;
+    userInfoStatusValue = new QLabel;
+    userInfoCountsLabel = new QLabel;
+    userInfoCountsValue = new QLabel;
+    userInfoNotesLabel = new QLabel;
+    userInfoNotesEdit = new QTextEdit;
+    userInfoNotesEdit->setReadOnly(true);
+
+    auto *infoGrid = new QGridLayout;
+    infoGrid->addWidget(userInfoNameLabel, 0, 0);
+    infoGrid->addWidget(userInfoNameValue, 0, 1);
+    infoGrid->addWidget(userInfoRegisteredLabel, 0, 2);
+    infoGrid->addWidget(userInfoRegisteredValue, 0, 3);
+    infoGrid->addWidget(userInfoLastLoginLabel, 1, 0);
+    infoGrid->addWidget(userInfoLastLoginValue, 1, 1);
+    infoGrid->addWidget(userInfoStatusLabel, 1, 2);
+    infoGrid->addWidget(userInfoStatusValue, 1, 3);
+    infoGrid->addWidget(userInfoCountsLabel, 2, 0);
+    infoGrid->addWidget(userInfoCountsValue, 2, 1, 1, 3);
+    infoGrid->addWidget(userInfoNotesLabel, 3, 0, Qt::AlignTop);
+    infoGrid->addWidget(userInfoNotesEdit, 3, 1, 1, 3);
+    infoGrid->setColumnStretch(1, 1);
+    infoGrid->setColumnStretch(3, 1);
+
+    auto *infoLayout = new QVBoxLayout(userInfoGroup);
+    infoLayout->addLayout(infoGrid);
+
+    auto configureTable = [](QTableWidget *table) {
+        table->setSelectionBehavior(QAbstractItemView::SelectRows);
+        table->setSelectionMode(QAbstractItemView::SingleSelection);
+        table->setEditTriggers(QAbstractItemView::NoEditTriggers);
+        table->verticalHeader()->setVisible(false);
+        table->setAlternatingRowColors(true);
+        table->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
+        table->horizontalHeader()->setStretchLastSection(true);
+    };
+
+    altsGroup = new QGroupBox;
+    altsTable = new QTableWidget(0, COL_ALTS_COUNT);
+    configureTable(altsTable);
+    auto *altsLayout = new QVBoxLayout(altsGroup);
+    altsLayout->addWidget(altsTable);
+
+    sessionsGroup = new QGroupBox;
+    sessionsTable = new QTableWidget(0, COL_SESSIONS_COUNT);
+    configureTable(sessionsTable);
+    auto *sessionsLayout = new QVBoxLayout(sessionsGroup);
+    sessionsLayout->addWidget(sessionsTable);
+
+    staffGroup = new QGroupBox;
+    staffTable = new QTableWidget(0, COL_STAFF_COUNT);
+    configureTable(staffTable);
+    refreshStaffButton = new QPushButton;
+    connect(refreshStaffButton, &QPushButton::clicked, this, &TabModeration::requestModeratorLogins);
+    auto *staffHeader = new QHBoxLayout;
+    staffHeader->addStretch();
+    staffHeader->addWidget(refreshStaffButton);
+    auto *staffLayout = new QVBoxLayout(staffGroup);
+    staffLayout->addWidget(staffTable);
+    staffLayout->addLayout(staffHeader);
+
+    auto *splitter = new QSplitter(Qt::Vertical);
+    splitter->addWidget(userInfoGroup);
+    splitter->addWidget(altsGroup);
+    splitter->addWidget(sessionsGroup);
+    splitter->addWidget(staffGroup);
+    splitter->setStretchFactor(0, 1);
+    splitter->setStretchFactor(1, 2);
+    splitter->setStretchFactor(2, 2);
+    splitter->setStretchFactor(3, 1);
+
+    auto *mainLayout = new QVBoxLayout(centralWidget);
+    mainLayout->addLayout(topBar);
+    mainLayout->addWidget(splitter);
+
+    retranslateUi();
+    clearUserData();
+    requestModeratorLogins();
+    investigate(initialUser);
+}
+
+void TabModeration::retranslateUi()
+{
+    searchEdit->setPlaceholderText(tr("User name"));
+    investigateButton->setText(tr("Investigate"));
+    resetPasswordButton->setText(tr("Reset Password"));
+    removeAvatarButton->setText(tr("Remove Avatar"));
+    refreshStaffButton->setText(tr("Refresh"));
+
+    userInfoGroup->setTitle(tr("User Info"));
+    userInfoNameLabel->setText(tr("Name:"));
+    userInfoRegisteredLabel->setText(tr("Registered:"));
+    userInfoLastLoginLabel->setText(tr("Last login:"));
+    userInfoStatusLabel->setText(tr("Status:"));
+    userInfoCountsLabel->setText(tr("Counts:"));
+    userInfoNotesLabel->setText(tr("Admin notes:"));
+
+    altsGroup->setTitle(tr("Alts"));
+    sessionsGroup->setTitle(tr("Sessions"));
+    staffGroup->setTitle(tr("Staff Last Logins"));
+
+    altsTable->setHorizontalHeaderLabels({tr("User"), tr("eMail"), tr("Client ID"), tr("Registered"), tr("Last login"),
+                                          tr("Warns"), tr("Bans"), tr("Active")});
+    sessionsTable->setHorizontalHeaderLabels({tr("IP"), tr("Client ID"), tr("Start"), tr("End"), tr("Type")});
+    staffTable->setHorizontalHeaderLabels({tr("User"), tr("Level"), tr("Last login")});
+}
+
+QString TabModeration::formatEpoch(quint64 ts) const
+{
+    if (ts == 0) {
+        return tr("Unknown");
+    }
+    return QDateTime::fromSecsSinceEpoch(ts).toLocalTime().toString("yyyy-MM-dd HH:mm");
+}
+
+void TabModeration::clearUserData()
+{
+    currentUser.clear();
+    userInfoNameValue->clear();
+    userInfoRegisteredValue->clear();
+    userInfoLastLoginValue->clear();
+    userInfoStatusValue->clear();
+    userInfoCountsValue->clear();
+    userInfoNotesEdit->clear();
+    altsTable->setRowCount(0);
+    sessionsTable->setRowCount(0);
+    resetPasswordButton->setEnabled(false);
+    removeAvatarButton->setEnabled(false);
+}
+
+void TabModeration::investigate(const QString &userName)
+{
+    if (userName.isEmpty()) {
+        return;
+    }
+    searchEdit->setText(userName);
+    investigateUser();
+}
+
+void TabModeration::investigateUser()
+{
+    const QString userName = searchEdit->text().simplified();
+    if (userName.isEmpty()) {
+        return;
+    }
+    currentUser = userName;
+    resetPasswordButton->setEnabled(true);
+    removeAvatarButton->setEnabled(true);
+    altsTable->setRowCount(0);
+    sessionsTable->setRowCount(0);
+    requestUserInfo(userName);
+    requestSessions(userName);
+    requestAlts(userName);
+}
+
+void TabModeration::requestUserInfo(const QString &userName)
+{
+    userInfoNameValue->setText(userName);
+    userInfoRegisteredValue->setText(tr("Loading..."));
+    userInfoLastLoginValue->setText(tr("Loading..."));
+    userInfoStatusValue->clear();
+    userInfoCountsValue->clear();
+    userInfoNotesEdit->clear();
+
+    Command_ReportUserInfo cmd;
+    cmd.set_user_name(userName.toStdString());
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabModeration::userInfoResponse);
+    client->sendCommand(pend);
+}
+
+void TabModeration::userInfoResponse(const Response &response)
+{
+    if (response.response_code() != Response::RespOk) {
+        userInfoRegisteredValue->clear();
+        userInfoLastLoginValue->clear();
+        userInfoStatusValue->setText(tr("Error loading user info."));
+        return;
+    }
+
+    const Response_ReportUserInfo &resp = response.GetExtension(Response_ReportUserInfo::ext);
+    if (resp.has_user_name() && QString::fromStdString(resp.user_name()) != currentUser) {
+        return;
+    }
+
+    userInfoRegisteredValue->setText(formatEpoch(resp.registration_time()));
+    userInfoLastLoginValue->setText(formatEpoch(resp.last_login()));
+
+    QStringList statusParts;
+    statusParts << (resp.is_active() ? tr("active") : tr("inactive"));
+    if (resp.has_is_admin() && resp.is_admin()) {
+        statusParts << tr("admin");
+    }
+    userInfoStatusValue->setText(statusParts.join(", "));
+
+    userInfoCountsValue->setText(tr("Reports: %1   Bans: %2   Warnings: %3")
+                                     .arg(resp.total_reports())
+                                     .arg(resp.total_bans())
+                                     .arg(resp.total_warns()));
+
+    if (resp.has_admin_notes() && !resp.admin_notes().empty()) {
+        userInfoNotesEdit->setPlainText(QString::fromStdString(resp.admin_notes()));
+    } else {
+        userInfoNotesEdit->setPlainText(tr("(none)"));
+    }
+}
+
+void TabModeration::requestSessions(const QString &userName)
+{
+    Command_GetUserSessions cmd;
+    cmd.set_user_name(userName.toStdString());
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabModeration::sessionsResponse);
+    client->sendCommand(pend);
+}
+
+void TabModeration::sessionsResponse(const Response &response)
+{
+    sessionsTable->setRowCount(0);
+    if (response.response_code() != Response::RespOk) {
+        return;
+    }
+
+    const Response_UserSessions &resp = response.GetExtension(Response_UserSessions::ext);
+    sessionsTable->setRowCount(resp.sessions_size());
+    for (int i = 0; i < resp.sessions_size(); ++i) {
+        const ServerInfo_UserSession &session = resp.sessions(i);
+        sessionsTable->setItem(i, COL_SESSIONS_IP, new QTableWidgetItem(QString::fromStdString(session.ip_address())));
+        sessionsTable->setItem(i, COL_SESSIONS_CLIENTID,
+                               new QTableWidgetItem(QString::fromStdString(session.clientid())));
+        sessionsTable->setItem(i, COL_SESSIONS_START, new QTableWidgetItem(formatEpoch(session.start_time())));
+        sessionsTable->setItem(
+            i, COL_SESSIONS_END,
+            new QTableWidgetItem(session.end_time() == 0 ? tr("Active") : formatEpoch(session.end_time())));
+        sessionsTable->setItem(i, COL_SESSIONS_TYPE,
+                               new QTableWidgetItem(QString::fromStdString(session.connection_type())));
+    }
+}
+
+void TabModeration::requestAlts(const QString &userName)
+{
+    Command_GetUserAlts cmd;
+    cmd.set_user_name(userName.toStdString());
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabModeration::altsResponse);
+    client->sendCommand(pend);
+}
+
+void TabModeration::altsResponse(const Response &response)
+{
+    altsTable->setRowCount(0);
+    if (response.response_code() != Response::RespOk) {
+        return;
+    }
+
+    const Response_UserAlts &resp = response.GetExtension(Response_UserAlts::ext);
+    altsTable->setRowCount(resp.alts_size());
+    for (int i = 0; i < resp.alts_size(); ++i) {
+        const ServerInfo_UserAlt &alt = resp.alts(i);
+        altsTable->setItem(i, COL_ALTS_USER, new QTableWidgetItem(QString::fromStdString(alt.user_name())));
+        altsTable->setItem(i, COL_ALTS_EMAIL, new QTableWidgetItem(QString::fromStdString(alt.email())));
+        altsTable->setItem(i, COL_ALTS_CLIENTID, new QTableWidgetItem(QString::fromStdString(alt.clientid())));
+        altsTable->setItem(i, COL_ALTS_REGISTERED, new QTableWidgetItem(formatEpoch(alt.registration_time())));
+        altsTable->setItem(i, COL_ALTS_LAST_LOGIN, new QTableWidgetItem(formatEpoch(alt.last_login())));
+        altsTable->setItem(i, COL_ALTS_WARNS, new QTableWidgetItem(QString::number(alt.warn_count())));
+        altsTable->setItem(i, COL_ALTS_BANS, new QTableWidgetItem(QString::number(alt.ban_count())));
+        altsTable->setItem(i, COL_ALTS_ACTIVE, new QTableWidgetItem(alt.is_active() ? tr("yes") : tr("no")));
+    }
+}
+
+void TabModeration::requestModeratorLogins()
+{
+    Command_GetModeratorLastLogins cmd;
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabModeration::moderatorLoginsResponse);
+    client->sendCommand(pend);
+}
+
+void TabModeration::moderatorLoginsResponse(const Response &response)
+{
+    staffTable->setRowCount(0);
+    if (response.response_code() != Response::RespOk) {
+        return;
+    }
+
+    const Response_ModeratorLastLogins &resp = response.GetExtension(Response_ModeratorLastLogins::ext);
+    staffTable->setRowCount(resp.logins_size());
+    for (int i = 0; i < resp.logins_size(); ++i) {
+        const ServerInfo_ModeratorLogin &login = resp.logins(i);
+        staffTable->setItem(i, COL_STAFF_USER, new QTableWidgetItem(QString::fromStdString(login.user_name())));
+        staffTable->setItem(i, COL_STAFF_LAST_LOGIN, new QTableWidgetItem(formatEpoch(login.last_login())));
+
+        QStringList levels;
+        if (login.user_level() & ServerInfo_User::IsAdmin) {
+            levels << tr("Admin");
+        }
+        if (login.user_level() & ServerInfo_User::IsDeveloper) {
+            levels << tr("Developer");
+        }
+        if (login.user_level() & ServerInfo_User::IsModerator) {
+            levels << tr("Moderator");
+        }
+        if (login.user_level() & ServerInfo_User::IsJudge) {
+            levels << tr("Judge");
+        }
+        staffTable->setItem(i, COL_STAFF_LEVEL, new QTableWidgetItem(levels.join(" / ")));
+    }
+}
+
+void TabModeration::resetPassword()
+{
+    if (currentUser.isEmpty()) {
+        return;
+    }
+
+    QMessageBox::StandardButton choice =
+        QMessageBox::warning(this, tr("Reset Password"),
+                             tr("Reset the password of %1? A temporary password will be generated and shown to you. "
+                                "The user must change it on their first login.")
+                                 .arg(currentUser),
+                             QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel);
+    if (choice != QMessageBox::Ok) {
+        return;
+    }
+
+    Command_ResetUserPassword cmd;
+    cmd.set_user_name(currentUser.toStdString());
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabModeration::resetPasswordResponse);
+    client->sendCommand(pend);
+}
+
+void TabModeration::resetPasswordResponse(const Response &response)
+{
+    if (response.response_code() != Response::RespOk) {
+        QMessageBox::critical(this, tr("Error"), tr("Password reset failed."));
+        return;
+    }
+
+    const Response_ResetUserPassword &resp = response.GetExtension(Response_ResetUserPassword::ext);
+    QMessageBox::information(this, tr("Password reset"),
+                             tr("Temporary password for %1:\n\n%2\n\nPass it to the user through a secure channel.")
+                                 .arg(QString::fromStdString(resp.user_name()))
+                                 .arg(QString::fromStdString(resp.temporary_password())));
+}
+
+void TabModeration::removeAvatar()
+{
+    if (currentUser.isEmpty()) {
+        return;
+    }
+
+    QMessageBox::StandardButton choice =
+        QMessageBox::warning(this, tr("Remove Avatar"),
+                             tr("Remove the avatar of %1? The user will have to upload a new one.").arg(currentUser),
+                             QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel);
+    if (choice != QMessageBox::Ok) {
+        return;
+    }
+
+    Command_RemoveUserAvatar cmd;
+    cmd.set_user_name(currentUser.toStdString());
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabModeration::removeAvatarResponse);
+    client->sendCommand(pend);
+}
+
+void TabModeration::removeAvatarResponse(const Response &response)
+{
+    if (response.response_code() != Response::RespOk) {
+        QMessageBox::critical(this, tr("Error"), tr("Could not remove the avatar."));
+        return;
+    }
+
+    const Response_RemoveUserAvatar &resp = response.GetExtension(Response_RemoveUserAvatar::ext);
+    QMessageBox::information(this, tr("Avatar removed"),
+                             tr("The avatar of %1 has been removed.").arg(QString::fromStdString(resp.user_name())));
+}
diff --git a/cockatrice/src/interface/widgets/tabs/tab_moderation.h b/cockatrice/src/interface/widgets/tabs/tab_moderation.h
new file mode 100644
index 000000000..e352e90bb
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/tab_moderation.h
@@ -0,0 +1,87 @@
+#ifndef TAB_MODERATION_H
+#define TAB_MODERATION_H
+
+#include "tab.h"
+
+#include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class AbstractClient;
+class QGroupBox;
+class QLabel;
+class QLineEdit;
+class QPushButton;
+class QTableWidget;
+class QTextEdit;
+class Response;
+class TabSupervisor;
+
+/**
+ * Staff investigation tool. Lets moderators look up a user's account data,
+ * alternate accounts, login sessions, and staff login activity, and offers
+ * the password-reset and remove-avatar actions.
+ */
+class TabModeration : public Tab
+{
+    Q_OBJECT
+public:
+    explicit TabModeration(TabSupervisor *_tabSupervisor, AbstractClient *_client, const QString &initialUser = {});
+    void retranslateUi() override;
+    [[nodiscard]] QString getTabText() const override
+    {
+        return tr("Moderation");
+    }
+    void investigate(const QString &userName);
+
+private slots:
+    void investigateUser();
+    void userInfoResponse(const Response &response);
+    void sessionsResponse(const Response &response);
+    void altsResponse(const Response &response);
+    void moderatorLoginsResponse(const Response &response);
+    void resetPassword();
+    void resetPasswordResponse(const Response &response);
+    void removeAvatar();
+    void removeAvatarResponse(const Response &response);
+
+private:
+    void requestUserInfo(const QString &userName);
+    void requestSessions(const QString &userName);
+    void requestAlts(const QString &userName);
+    void requestModeratorLogins();
+    void clearUserData();
+    [[nodiscard]] QString formatEpoch(quint64 ts) const;
+
+    AbstractClient *client;
+    QString currentUser;
+
+    QLineEdit *searchEdit;
+    QPushButton *investigateButton;
+    QPushButton *resetPasswordButton;
+    QPushButton *removeAvatarButton;
+
+    QGroupBox *userInfoGroup;
+    QLabel *userInfoNameLabel;
+    QLabel *userInfoNameValue;
+    QLabel *userInfoRegisteredLabel;
+    QLabel *userInfoRegisteredValue;
+    QLabel *userInfoLastLoginLabel;
+    QLabel *userInfoLastLoginValue;
+    QLabel *userInfoStatusLabel;
+    QLabel *userInfoStatusValue;
+    QLabel *userInfoCountsLabel;
+    QLabel *userInfoCountsValue;
+    QLabel *userInfoNotesLabel;
+    QTextEdit *userInfoNotesEdit;
+
+    QGroupBox *altsGroup;
+    QTableWidget *altsTable;
+    QGroupBox *sessionsGroup;
+    QTableWidget *sessionsTable;
+    QGroupBox *staffGroup;
+    QTableWidget *staffTable;
+    QPushButton *refreshStaffButton;
+};
+
+#endif // TAB_MODERATION_H
diff --git a/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp b/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp
new file mode 100644
index 000000000..6bf3f6be7
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp
@@ -0,0 +1,262 @@
+#include "tab_public_decks.h"
+
+#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"
+#include "../visual_deck_storage/deck_preview/public_deck_preview_widget.h"
+#include "../visual_deck_storage/remote_public_decks_model.h"
+#include "../visual_deck_storage/visual_deck_storage_quick_settings_widget.h"
+#include "../visual_deck_storage/visual_deck_storage_search_widget.h"
+#include "../visual_deck_storage/visual_deck_storage_tag_filter_widget.h"
+#include "tab_supervisor.h"
+
+#include <QAbstractItemModel>
+#include <QChar>
+#include <QDebug>
+#include <QFont>
+#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>
+#include <libcockatrice/protocol/pb/response_deck_download.pb.h>
+#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)
+{
+    model = new RemotePublicDecksModel(client, this);
+    cardSize = SettingsCache::instance().cardsDisplay().getVisualDeckStorageCardSize();
+
+    titleLabel = new QLabel(tr("Public decks of %1").arg(userName.toHtmlEscaped()), this);
+    QFont titleFont = titleLabel->font();
+    titleFont.setBold(true);
+    titleLabel->setFont(titleFont);
+
+    auto *headerLayout = new QHBoxLayout;
+    headerLayout->addWidget(titleLabel);
+    headerLayout->addStretch(1);
+
+    // Filter/toolbar row, matching the Visual Deck Storage: color identity filter
+    // first, the search bar stretching in the middle, and the quick settings
+    // cogwheel at the end. The card size slider lives inside the cogwheel popup.
+    emptyLabel = new QLabel(tr("This user has not published any decks."), this);
+    emptyLabel->setAlignment(Qt::AlignCenter);
+    emptyLabel->setVisible(false);
+
+    statusLabel = new QLabel(this);
+    statusLabel->setAlignment(Qt::AlignCenter);
+    statusLabel->setVisible(false);
+
+    flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
+    flowWidget->setSpacing(8, 8);
+
+    colorIdentityFilter = new DeckPreviewColorIdentityFilterWidget(this);
+    searchWidget = new VisualDeckStorageSearchWidget(this);
+    refreshButton = new QToolButton(this);
+    refreshButton->setIcon(QPixmap("theme:icons/reload"));
+    refreshButton->setFixedSize(32, 32);
+    quickSettingsWidget = new VisualDeckStorageQuickSettingsWidget(this);
+    quickSettingsWidget->setPublicDecksMode(true);
+
+    auto *filterLayout = new QHBoxLayout;
+    filterLayout->addWidget(colorIdentityFilter);
+    filterLayout->addWidget(searchWidget, 1);
+    filterLayout->addWidget(refreshButton);
+    filterLayout->addWidget(quickSettingsWidget);
+
+    tagFilterWidget = new VisualDeckStorageTagFilterWidget(this);
+    tagFilterWidget->setAllTagsProvider([this] { return model->allTags(); });
+    updateTagsVisibility(quickSettingsWidget->getShowTagFilter());
+
+    auto *layout = new QVBoxLayout;
+    layout->addLayout(headerLayout);
+    layout->addLayout(filterLayout);
+    layout->addWidget(tagFilterWidget);
+    layout->addWidget(statusLabel);
+    layout->addWidget(emptyLabel);
+    layout->addWidget(flowWidget, 1);
+
+    auto *mainWidget = new QWidget(this);
+    mainWidget->setLayout(layout);
+    setCentralWidget(mainWidget);
+
+    connect(refreshButton, &QToolButton::clicked, this, [this] { model->refresh(userName); });
+    connect(model, &QAbstractItemModel::modelReset, this, &TabPublicDecks::rebuildGrid);
+    connect(model, &RemotePublicDecksModel::loadingChanged, this, &TabPublicDecks::updateLoadingState);
+    connect(model, &RemotePublicDecksModel::loadFailed, this, [this](const QString &message) {
+        lastFailureMessage = message;
+        statusLabel->setText(message);
+        statusLabel->setVisible(true);
+        flowWidget->setVisible(false);
+        emptyLabel->setVisible(false);
+    });
+    connect(searchWidget, &VisualDeckStorageSearchWidget::searchTextChanged, this,
+            [this](const QString &text) { model->setSearchText(text); });
+    connect(colorIdentityFilter, &DeckPreviewColorIdentityFilterWidget::activeColorsChanged, this,
+            &TabPublicDecks::updateColorFilter);
+    connect(colorIdentityFilter, &DeckPreviewColorIdentityFilterWidget::filterModeChanged, this,
+            &TabPublicDecks::updateColorFilter);
+    connect(tagFilterWidget, &VisualDeckStorageTagFilterWidget::filterChanged, this, &TabPublicDecks::updateTagFilter);
+    connect(quickSettingsWidget, &VisualDeckStorageQuickSettingsWidget::cardSizeChanged, this,
+            &TabPublicDecks::updateCardSize);
+    connect(quickSettingsWidget, &VisualDeckStorageQuickSettingsWidget::showTagFilterChanged, this,
+            &TabPublicDecks::updateTagsVisibility);
+    quickSettingsWidget->getCardSizeWidget()->enableCtrlScrollResize(flowWidget);
+
+    retranslateUi();
+    model->refresh(userName);
+}
+
+QString TabPublicDecks::getTabText() const
+{
+    return tr("Public decks of %1").arg(userName);
+}
+
+void TabPublicDecks::retranslateUi()
+{
+    // The username is another user's data, so escape it for the AutoText QLabel.
+    titleLabel->setText(tr("Public decks of %1").arg(userName.toHtmlEscaped()));
+    // The same choice rebuildGrid makes, so a language change does not swap
+    // the "no match" variant for the "nothing published" one.
+    emptyLabel->setText(model->totalCount() > 0 ? tr("No decks match your filters.")
+                                                : tr("This user has not published any decks."));
+    refreshButton->setToolTip(tr("Refresh"));
+    refreshButton->setAccessibleName(tr("Refresh"));
+    quickSettingsWidget->setToolTip(tr("Public Decks Settings"));
+    // Re-show whatever the status label is showing so a language change picks up
+    // the new language or, for a failure message, at least does not hide it.
+    if (model->isLoading()) {
+        updateLoadingState(true);
+    } else if (!lastFailureMessage.isEmpty()) {
+        statusLabel->setText(lastFailureMessage);
+        statusLabel->setVisible(true);
+        flowWidget->setVisible(false);
+        emptyLabel->setVisible(false);
+    } else {
+        updateLoadingState(false);
+    }
+    emit tabTextChanged(this, getTabText());
+}
+
+bool TabPublicDecks::closeRequest()
+{
+    emit closing(this);
+    return Tab::closeRequest();
+}
+
+void TabPublicDecks::rebuildGrid()
+{
+    flowWidget->clearLayout();
+
+    const int count = model->rowCount();
+    if (count == 0) {
+        emptyLabel->setText(model->totalCount() > 0 ? tr("No decks match your filters.")
+                                                    : tr("This user has not published any decks."));
+    }
+    emptyLabel->setVisible(count == 0);
+    for (int i = 0; i < count; ++i) {
+        auto *tile = new PublicDeckPreviewWidget(flowWidget, model->entryAt(i));
+        tile->setScaleFactor(cardSize);
+        connect(tile, &PublicDeckPreviewWidget::openDeckRequested, this, &TabPublicDecks::openDeck);
+        flowWidget->addWidget(tile);
+    }
+
+    // The deck set changed, so the tag filter chips are re-gathered from it.
+    tagFilterWidget->refreshTags();
+}
+
+void TabPublicDecks::updateColorFilter()
+{
+    model->setColorFilter(colorIdentityFilter->getFilterMode(), colorIdentityFilter->getActiveColors());
+}
+
+void TabPublicDecks::updateTagFilter()
+{
+    const QStringList selectedTags = tagFilterWidget->selectedTags();
+    const QStringList excludedTags = tagFilterWidget->excludedTags();
+    model->setTagFilter(QSet<QString>(selectedTags.cbegin(), selectedTags.cend()),
+                        QSet<QString>(excludedTags.cbegin(), excludedTags.cend()));
+    tagFilterWidget->refreshTags();
+}
+
+void TabPublicDecks::updateTagsVisibility(bool visible)
+{
+    tagFilterWidget->setVisible(visible);
+}
+
+void TabPublicDecks::updateLoadingState(bool loading)
+{
+    if (loading) {
+        // A new attempt is under way, so the previously shown failure, if any,
+        // no longer describes the current state.
+        lastFailureMessage.clear();
+        statusLabel->setText(tr("Loading public decks…"));
+        statusLabel->setVisible(true);
+        flowWidget->setVisible(false);
+        emptyLabel->setVisible(false);
+    } else {
+        statusLabel->setVisible(false);
+        flowWidget->setVisible(true);
+    }
+}
+
+void TabPublicDecks::updateCardSize(int scale)
+{
+    cardSize = scale;
+    applyCardSize(scale);
+}
+
+void TabPublicDecks::applyCardSize(int scale)
+{
+    const auto tiles = flowWidget->findChildren<PublicDeckPreviewWidget *>();
+    for (PublicDeckPreviewWidget *tile : tiles) {
+        tile->setScaleFactor(scale);
+    }
+    flowWidget->setMinimumSizeToMaxSizeHint();
+}
+
+void TabPublicDecks::openDeck(int deckId)
+{
+    Command_DeckDownloadPublic cmd;
+    cmd.set_deck_id(deckId);
+
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabPublicDecks::openDeckFinished);
+    client->sendCommand(pend);
+}
+
+void TabPublicDecks::openDeckFinished(const Response &response, const CommandContainer & /*commandContainer*/)
+{
+    if (response.response_code() != Response::RespOk) {
+        QMessageBox::warning(this, tr("Open public deck"),
+                             tr("Failed to open the public deck (server response code %1).")
+                                 .arg(QString::number(static_cast<int>(response.response_code()))));
+        return;
+    }
+
+    const Response_DeckDownload &resp = response.GetExtension(Response_DeckDownload::ext);
+    std::optional<LoadedDeck> deckOpt =
+        DeckLoader::loadFromRemote(QString::fromStdString(resp.deck()), LoadedDeck::LoadInfo::NON_REMOTE_ID);
+    if (!deckOpt) {
+        QMessageBox::warning(this, tr("Open public deck"), tr("The public deck could not be parsed."));
+        return;
+    }
+
+    tabSupervisor->openDeckInNewTab(deckOpt.value());
+}
diff --git a/cockatrice/src/interface/widgets/tabs/tab_public_decks.h b/cockatrice/src/interface/widgets/tabs/tab_public_decks.h
new file mode 100644
index 000000000..847479e78
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/tab_public_decks.h
@@ -0,0 +1,83 @@
+/**
+ * @file tab_public_decks.h
+ * @ingroup Tabs
+ */
+
+#ifndef TAB_PUBLIC_DECKS_H
+#define TAB_PUBLIC_DECKS_H
+
+#include "tab.h"
+
+#include <QString>
+#include <qtmetamacros.h>
+
+class AbstractClient;
+class CommandContainer;
+class DeckPreviewColorIdentityFilterWidget;
+class FlowWidget;
+class QLabel;
+class QToolButton;
+class RemotePublicDecksModel;
+class Response;
+class VisualDeckStorageQuickSettingsWidget;
+class VisualDeckStorageSearchWidget;
+class VisualDeckStorageTagFilterWidget;
+class TabSupervisor;
+
+/**
+ * @brief A visual grid of the public decks published by another user.
+ *
+ * The grid is rendered from the preview metadata the server stores for the
+ * decks, so browsing costs no downloads; the deck list is fetched via
+ * Command_DeckDownloadPublic only when the user opens a deck. Multiple users
+ * can be browsed simultaneously; each gets its own tab.
+ */
+class TabPublicDecks final : public Tab
+{
+    Q_OBJECT
+
+public:
+    TabPublicDecks(TabSupervisor *tabSupervisor, AbstractClient *client, const QString &userName);
+
+    [[nodiscard]] QString getTabText() const override;
+    void retranslateUi() override;
+    bool closeRequest() override;
+
+    [[nodiscard]] QString getUserName() const
+    {
+        return userName;
+    }
+
+signals:
+    void closing(TabPublicDecks *tab);
+
+private slots:
+    void openDeck(int deckId);
+    void openDeckFinished(const Response &response, const CommandContainer &commandContainer);
+    void updateColorFilter();
+    void updateTagFilter();
+    void updateCardSize(int scale);
+    void updateTagsVisibility(bool visible);
+    void updateLoadingState(bool loading);
+
+private:
+    void rebuildGrid();
+    void applyCardSize(int scale);
+
+    AbstractClient *client;
+    QString userName;
+    RemotePublicDecksModel *model;
+    FlowWidget *flowWidget;
+    VisualDeckStorageSearchWidget *searchWidget;
+    DeckPreviewColorIdentityFilterWidget *colorIdentityFilter;
+    VisualDeckStorageTagFilterWidget *tagFilterWidget;
+    QToolButton *refreshButton;
+    VisualDeckStorageQuickSettingsWidget *quickSettingsWidget;
+    QLabel *titleLabel;
+    QLabel *statusLabel;
+    QLabel *emptyLabel;
+    QString lastFailureMessage; ///< Last load-failure text, re-shown on retranslate.
+    int cardSize = 100;
+};
+
+#endif // TAB_PUBLIC_DECKS_H
diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
index 2db9e83c5..52bc4cd8f 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp
@@ -1,22 +1,53 @@
 #include "tab_replays.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../pixel_map_generator.h"
 #include "../interface/widgets/server/remote/remote_replay_list_tree_widget.h"
-#include "tab_game.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 <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>
@@ -29,6 +60,20 @@
 #include <libcockatrice/protocol/pb/response_replay_download.pb.h>
 #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");
+
+namespace
+{
+// File name filters for the local replay files Cockatrice can load.
+const QStringList REPLAY_FILE_NAME_FILTERS = {"*.cor"};
+} // namespace
 
 TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo)
     : Tab(_tabSupervisor), client(_client)
@@ -57,7 +102,9 @@ TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, c
 QGroupBox *TabReplays::createLeftLayout()
 {
     localDirModel = new QFileSystemModel(this);
-    localDirModel->setRootPath(SettingsCache::instance().getReplaysPath());
+    localDirModel->setRootPath(SettingsCache::instance().paths().getReplaysPath());
+    localDirModel->setNameFilters(REPLAY_FILE_NAME_FILTERS);
+    localDirModel->setNameFilterDisables(false);
     localDirModel->sort(0, Qt::AscendingOrder);
 
     localDirView = new QTreeView;
@@ -99,17 +146,17 @@ QGroupBox *TabReplays::createLeftLayout()
 
     // Left side actions
     aOpenLocalReplay = new QAction(this);
-    aOpenLocalReplay->setIcon(QPixmap("theme:icons/view"));
+    aOpenLocalReplay->setIcon(themePixmap(QStringLiteral("icons/view")));
     connect(aOpenLocalReplay, &QAction::triggered, this, &TabReplays::actOpenLocalReplay);
     connect(localDirView, &QTreeView::doubleClicked, this, &TabReplays::actOpenLocalReplay);
     aRenameLocal = new QAction(this);
-    aRenameLocal->setIcon(QPixmap("theme:icons/rename"));
+    aRenameLocal->setIcon(themePixmap(QStringLiteral("icons/rename")));
     connect(aRenameLocal, &QAction::triggered, this, &TabReplays::actRenameLocal);
     aNewLocalFolder = new QAction(this);
     aNewLocalFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder));
     connect(aNewLocalFolder, &QAction::triggered, this, &TabReplays::actNewLocalFolder);
     aDeleteLocalReplay = new QAction(this);
-    aDeleteLocalReplay->setIcon(QPixmap("theme:icons/remove_row"));
+    aDeleteLocalReplay->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
     connect(aDeleteLocalReplay, &QAction::triggered, this, &TabReplays::actDeleteLocalReplay);
 
     aOpenReplaysFolder = new QAction(this);
@@ -161,24 +208,24 @@ QGroupBox *TabReplays::createRightLayout()
 
     // Right side actions
     aOpenRemoteReplay = new QAction(this);
-    aOpenRemoteReplay->setIcon(QPixmap("theme:icons/view"));
+    aOpenRemoteReplay->setIcon(themePixmap(QStringLiteral("icons/view")));
     connect(aOpenRemoteReplay, &QAction::triggered, this, &TabReplays::actOpenRemoteReplay);
     connect(serverDirView, &QTreeView::doubleClicked, this, &TabReplays::actOpenRemoteReplay);
     aDownload = new QAction(this);
-    aDownload->setIcon(QPixmap("theme:icons/arrow_left_green"));
+    aDownload->setIcon(themePixmap(QStringLiteral("icons/arrow_left_green")));
     connect(aDownload, &QAction::triggered, this, &TabReplays::actDownload);
     aKeep = new QAction(this);
-    aKeep->setIcon(QPixmap("theme:icons/lock"));
+    aKeep->setIcon(themePixmap(QStringLiteral("icons/lock")));
     connect(aKeep, &QAction::triggered, this, &TabReplays::actKeepRemoteReplay);
     aDeleteRemoteReplay = new QAction(this);
-    aDeleteRemoteReplay->setIcon(QPixmap("theme:icons/remove_row"));
+    aDeleteRemoteReplay->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
     connect(aDeleteRemoteReplay, &QAction::triggered, this, &TabReplays::actDeleteRemoteReplay);
     aGetReplayCode = new QAction(this);
-    aGetReplayCode->setIcon(QPixmap("theme:icons/share"));
+    aGetReplayCode->setIcon(themePixmap(QStringLiteral("icons/share")));
     connect(aGetReplayCode, &QAction::triggered, this, &TabReplays::actGetReplayCode);
 
     aSubmitReplayCode = new QAction(this);
-    aSubmitReplayCode->setIcon(QPixmap("theme:icons/search"));
+    aSubmitReplayCode->setIcon(themePixmap(QStringLiteral("icons/search")));
     connect(aSubmitReplayCode, &QAction::triggered, this, &TabReplays::actSubmitReplayCode);
 
     // Add actions to toolbars
@@ -254,20 +301,28 @@ void TabReplays::actOpenLocalReplay()
 {
     QModelIndexList curLefts = localDirView->selectionModel()->selectedRows();
     for (const auto &curLeft : curLefts) {
-        if (localDirModel->isDir(curLeft))
+        if (localDirModel->isDir(curLeft)) {
             continue;
+        }
         QString filePath = localDirModel->filePath(curLeft);
 
-        QFile f(filePath);
-        if (!f.open(QIODevice::ReadOnly))
+        if (!QDir::match(REPLAY_FILE_NAME_FILTERS, QFileInfo(filePath).fileName())) {
             continue;
+        }
+
+        QFile f(filePath);
+        if (!f.open(QIODevice::ReadOnly)) {
+            continue;
+        }
         QByteArray _data = f.readAll();
         f.close();
 
         GameReplay *replay = new GameReplay;
-        replay->ParseFromArray(_data.data(), _data.size());
-
-        emit openReplay(replay);
+        if (replay->ParseFromArray(_data.data(), _data.size())) {
+            emit openReplay(replay);
+        } else {
+            qCWarning(TabReplaysLog) << "could not parse replay!";
+        }
     }
 }
 
@@ -315,8 +370,9 @@ void TabReplays::actNewLocalFolder()
     bool ok;
     QString folderName =
         QInputDialog::getText(this, tr("New folder"), tr("Name of new folder:"), QLineEdit::Normal, "", &ok);
-    if (!ok || folderName.isEmpty())
+    if (!ok || folderName.isEmpty()) {
         return;
+    }
 
     localDirModel->mkdir(dirIndex, folderName);
 }
@@ -374,14 +430,18 @@ void TabReplays::actOpenRemoteReplay()
 
 void TabReplays::openRemoteReplayFinished(const Response &r)
 {
-    if (r.response_code() != Response::RespOk)
+    if (r.response_code() != Response::RespOk) {
         return;
+    }
 
     const Response_ReplayDownload &resp = r.GetExtension(Response_ReplayDownload::ext);
     GameReplay *replay = new GameReplay;
-    replay->ParseFromString(resp.replay_data());
+    if (replay->ParseFromString(resp.replay_data())) {
 
-    emit openReplay(replay);
+        emit openReplay(replay);
+    } else {
+        qCWarning(TabReplaysLog) << "could not parse remote replay!";
+    }
 }
 
 void TabReplays::actDownload()
@@ -431,8 +491,9 @@ void TabReplays::downloadFinished(const Response &r,
                                   const CommandContainer & /* commandContainer */,
                                   const QVariant &extraData)
 {
-    if (r.response_code() != Response::RespOk)
+    if (r.response_code() != Response::RespOk) {
         return;
+    }
 
     const Response_ReplayDownload &resp = r.GetExtension(Response_ReplayDownload::ext);
     QString filePath = extraData.toString();
@@ -468,8 +529,9 @@ void TabReplays::actKeepRemoteReplay()
 
 void TabReplays::keepRemoteReplayFinished(const Response &r, const CommandContainer &commandContainer)
 {
-    if (r.response_code() != Response::RespOk)
+    if (r.response_code() != Response::RespOk) {
         return;
+    }
 
     const Command_ReplayModifyMatch &cmd =
         commandContainer.session_command(0).GetExtension(Command_ReplayModifyMatch::ext);
@@ -506,8 +568,9 @@ void TabReplays::actDeleteRemoteReplay()
 
 void TabReplays::deleteRemoteReplayFinished(const Response &r, const CommandContainer &commandContainer)
 {
-    if (r.response_code() != Response::RespOk)
+    if (r.response_code() != Response::RespOk) {
         return;
+    }
 
     const Command_ReplayDeleteMatch &cmd =
         commandContainer.session_command(0).GetExtension(Command_ReplayDeleteMatch::ext);
diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.h b/cockatrice/src/interface/widgets/tabs/tab_replays.h
index fa1131cd5..e29e29bd7 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_replays.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_replays.h
@@ -2,27 +2,34 @@
  * @file tab_replays.h
  * @ingroup Replays
  * @ingroup Tabs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TAB_REPLAYS_H
 #define TAB_REPLAYS_H
 
 #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
new file mode 100644
index 000000000..9018e2477
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/tab_report.cpp
@@ -0,0 +1,1018 @@
+#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>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QInputDialog>
+#include <QLabel>
+#include <QLineEdit>
+#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>
+#include <libcockatrice/protocol/pb/game_replay.pb.h>
+#include <libcockatrice/protocol/pb/response_replay_download_by_game_id.pb.h>
+#include <libcockatrice/protocol/pb/response_report_details.pb.h>
+#include <libcockatrice/protocol/pb/response_report_list.pb.h>
+#include <libcockatrice/protocol/pb/response_report_stats.pb.h>
+#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
+{
+constexpr int COL_ID = 0;
+constexpr int COL_TIME = 1;
+constexpr int COL_REPORTER = 2;
+constexpr int COL_REPORTED = 3;
+constexpr int COL_CATEGORY = 4;
+constexpr int COL_GAMEID = 5;
+constexpr int COL_STATUS = 6;
+constexpr int COL_ASSIGNED = 7;
+constexpr int COL_REPLAY = 8;
+constexpr int COL_ROOM = 9;
+constexpr int COL_COUNT = 10;
+constexpr int REFRESH_INTERVAL_MS = 300000;
+} // namespace
+
+TabReport::TabReport(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client)
+{
+    auto *centralWidget = new QWidget(this);
+    setCentralWidget(centralWidget);
+
+    searchEdit = new QLineEdit;
+    searchEdit->setClearButtonEnabled(true);
+    connect(searchEdit, &QLineEdit::textChanged, this, &TabReport::applyFilters);
+
+    statusFilter = new QComboBox;
+    connect(statusFilter, &QComboBox::currentIndexChanged, this, &TabReport::applyFilters);
+
+    unresolvedOnlyBox = new QCheckBox;
+    unresolvedOnlyBox->setChecked(true);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
+    connect(unresolvedOnlyBox, &QCheckBox::checkStateChanged, this, &TabReport::refreshList);
+#else
+    connect(unresolvedOnlyBox, &QCheckBox::stateChanged, this, &TabReport::refreshList);
+#endif
+
+    refreshButton = new QPushButton;
+    connect(refreshButton, &QPushButton::clicked, this, &TabReport::refreshList);
+
+    refreshTimer = new QTimer(this);
+    refreshTimer->setInterval(REFRESH_INTERVAL_MS);
+    connect(refreshTimer, &QTimer::timeout, this, [this]() {
+        if (tabSupervisor->currentWidget() == this) {
+            refreshList();
+        }
+    });
+    refreshTimer->start();
+
+    auto *topBar = new QHBoxLayout;
+    topBar->addWidget(searchEdit);
+    topBar->addWidget(statusFilter);
+    topBar->addWidget(unresolvedOnlyBox);
+    topBar->addStretch();
+    topBar->addWidget(refreshButton);
+
+    statsLabel = new QLabel;
+
+    table = new QTableWidget(0, COL_COUNT);
+    table->setSelectionBehavior(QAbstractItemView::SelectRows);
+    table->setSelectionMode(QAbstractItemView::SingleSelection);
+    table->setEditTriggers(QAbstractItemView::NoEditTriggers);
+    table->setSortingEnabled(true);
+    table->verticalHeader()->setVisible(false);
+    table->setAlternatingRowColors(true);
+    table->horizontalHeader()->setSectionResizeMode(COL_TIME, QHeaderView::ResizeToContents);
+    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;
+    descriptionEdit->setReadOnly(true);
+    auto *descLayout = new QVBoxLayout(descGroup);
+    descLayout->setContentsMargins(4, 4, 4, 4);
+    descLayout->addWidget(descriptionEdit);
+
+    chatGroup = new QGroupBox;
+    chatLogEdit = new QTextEdit;
+    chatLogEdit->setReadOnly(true);
+    QFont monoFont("monospace");
+    monoFont.setStyleHint(QFont::Monospace);
+    const int systemPointSize = QFontDatabase::systemFont(QFontDatabase::GeneralFont).pointSize();
+    if (systemPointSize > 0) {
+        monoFont.setPointSize(systemPointSize);
+    }
+    chatLogEdit->setFont(monoFont);
+    auto *chatLayout = new QVBoxLayout(chatGroup);
+    chatLayout->setContentsMargins(4, 4, 4, 4);
+    chatLayout->addWidget(chatLogEdit);
+
+    commentsGroup = new QGroupBox;
+    commentsEdit = new QTextEdit;
+    commentsEdit->setReadOnly(true);
+    auto *commentInputRow = new QHBoxLayout;
+    commentInput = new QLineEdit;
+    commentButton = new QPushButton;
+    commentButton->setEnabled(false);
+    connect(commentButton, &QPushButton::clicked, this, &TabReport::addComment);
+    connect(commentInput, &QLineEdit::returnPressed, this, &TabReport::addComment);
+    commentInputRow->addWidget(commentInput);
+    commentInputRow->addWidget(commentButton);
+    auto *commentsLayout = new QVBoxLayout(commentsGroup);
+    commentsLayout->setContentsMargins(4, 4, 4, 4);
+    commentsLayout->addWidget(commentsEdit);
+    commentsLayout->addLayout(commentInputRow);
+
+    userContextGroup = new QGroupBox;
+    userContextName = new QLabel;
+    userContextAccountAge = new QLabel;
+    userContextReports = new QLabel;
+    userContextBans = new QLabel;
+    userContextWarns = new QLabel;
+    userContextNotes = new QTextEdit;
+    userContextNotes->setReadOnly(true);
+    userContextNotes->setMaximumHeight(80);
+    userContextRecentReports = new QTextEdit;
+    userContextRecentReports->setReadOnly(true);
+    userContextRecentReports->setMaximumHeight(120);
+    userContextUserLabel = new QLabel;
+    userContextAgeLabel = new QLabel;
+    userContextReportsLabel = new QLabel;
+    userContextBansLabel = new QLabel;
+    userContextWarnsLabel = new QLabel;
+    userContextNotesLabel = new QLabel;
+    userContextRecentReportsLabel = new QLabel;
+    auto *ucLayout = new QGridLayout(userContextGroup);
+    ucLayout->setContentsMargins(8, 8, 8, 8);
+    ucLayout->addWidget(userContextUserLabel, 0, 0);
+    ucLayout->addWidget(userContextName, 0, 1, 1, 3);
+    ucLayout->addWidget(userContextAgeLabel, 1, 0);
+    ucLayout->addWidget(userContextAccountAge, 1, 1);
+    ucLayout->addWidget(userContextReportsLabel, 1, 2);
+    ucLayout->addWidget(userContextReports, 1, 3);
+    ucLayout->addWidget(userContextBansLabel, 2, 0);
+    ucLayout->addWidget(userContextBans, 2, 1);
+    ucLayout->addWidget(userContextWarnsLabel, 2, 2);
+    ucLayout->addWidget(userContextWarns, 2, 3);
+    ucLayout->addWidget(userContextNotesLabel, 3, 0, Qt::AlignTop);
+    ucLayout->addWidget(userContextNotes, 3, 1, 1, 3);
+    ucLayout->addWidget(userContextRecentReportsLabel, 4, 0, 1, 4);
+    ucLayout->addWidget(userContextRecentReports, 5, 0, 1, 4);
+    userContextGroup->setVisible(false);
+
+    statsGroup = new QGroupBox;
+    statsGroup->setCheckable(true);
+    statsTotalLabel = new QLabel;
+    statsTrendLabel = new QLabel;
+    statsCategoriesLabel = new QLabel;
+    statsDetailText = new QTextEdit;
+    statsDetailText->setReadOnly(true);
+    statsDetailText->setMaximumHeight(150);
+    auto *statsContent = new QWidget;
+    auto *sgLayout = new QVBoxLayout(statsContent);
+    sgLayout->setContentsMargins(8, 8, 8, 8);
+    sgLayout->addWidget(statsTotalLabel);
+    sgLayout->addWidget(statsTrendLabel);
+    sgLayout->addWidget(statsCategoriesLabel);
+    sgLayout->addWidget(statsDetailText);
+    auto *statsGroupLayout = new QVBoxLayout(statsGroup);
+    statsGroupLayout->setContentsMargins(0, 0, 0, 0);
+    statsGroupLayout->addWidget(statsContent);
+    statsGroup->setChecked(true);
+    connect(statsGroup, &QGroupBox::toggled, this, [this, statsContent](bool checked) {
+        statsContent->setVisible(checked);
+        if (checked) {
+            requestStats();
+        }
+    });
+
+    detailSplitter = new QSplitter(Qt::Vertical);
+    detailSplitter->addWidget(descGroup);
+    detailSplitter->addWidget(chatGroup);
+    detailSplitter->addWidget(commentsGroup);
+    detailSplitter->setStretchFactor(0, 1);
+    detailSplitter->setStretchFactor(1, 1);
+    detailSplitter->setStretchFactor(2, 2);
+
+    assignButton = new QPushButton;
+    resolveButton = 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(viewReplayButton, &QPushButton::clicked, this, &TabReport::viewReplay);
+    connect(joinGameButton, &QPushButton::clicked, this, &TabReport::joinGame);
+
+    statusLabel = new QLabel;
+
+    auto *actionBar = new QHBoxLayout;
+    actionBar->addWidget(assignButton);
+    actionBar->addWidget(resolveButton);
+    actionBar->addWidget(dismissButton);
+    actionBar->addWidget(reopenButton);
+    actionBar->addSpacing(20);
+    actionBar->addWidget(viewReplayButton);
+    actionBar->addWidget(joinGameButton);
+    actionBar->addStretch();
+    actionBar->addWidget(statusLabel);
+
+    auto *layout = new QVBoxLayout(centralWidget);
+    layout->addLayout(topBar);
+    layout->addWidget(statsLabel);
+    layout->addWidget(table, 2);
+    layout->addWidget(detailSplitter, 1);
+    layout->addWidget(userContextGroup);
+    layout->addWidget(statsGroup);
+    layout->addLayout(actionBar);
+
+    retranslateUi();
+
+    setActionsEnabled(false);
+    refreshList();
+}
+
+void TabReport::retranslateUi()
+{
+    userContextMenu->retranslateUi();
+    searchEdit->setPlaceholderText(tr("Search by username, category..."));
+    statusFilter->clear();
+    statusFilter->addItem(tr("All Statuses"), "");
+    statusFilter->addItem(tr("Open"), "open");
+    statusFilter->addItem(tr("Assigned"), "assigned");
+    statusFilter->addItem(tr("Resolved"), "resolved");
+    statusFilter->addItem(tr("Dismissed"), "dismissed");
+    unresolvedOnlyBox->setText(tr("Unresolved only"));
+    refreshButton->setText(tr("Refresh"));
+
+    table->setHorizontalHeaderLabels({tr("#"), tr("Time"), tr("Reporter"), tr("Reported User"), tr("Category"),
+                                      tr("Game ID"), tr("Status"), tr("Assigned To"), tr("Replay"), tr("Room")});
+
+    descGroup->setTitle(tr("Description"));
+    chatGroup->setTitle(tr("Chat Log Context"));
+    chatGroup->setToolTip(
+        tr("Chat log attached by the reporter. It is captured from their client and may be incomplete or edited."));
+    commentsGroup->setTitle(tr("Comments / Thread"));
+    descriptionEdit->setPlaceholderText(tr("No description."));
+    chatLogEdit->setPlaceholderText(tr("No chat log attached."));
+    commentsEdit->setPlaceholderText(tr("No comments yet."));
+    commentInput->setPlaceholderText(tr("Type a reply..."));
+    commentButton->setText(tr("Send"));
+
+    userContextGroup->setTitle(tr("Reported User Context"));
+    userContextUserLabel->setText(tr("User:"));
+    userContextAgeLabel->setText(tr("Account Age:"));
+    userContextReportsLabel->setText(tr("Reports:"));
+    userContextBansLabel->setText(tr("Bans:"));
+    userContextWarnsLabel->setText(tr("Warns:"));
+    userContextNotesLabel->setText(tr("Admin Notes:"));
+    userContextRecentReportsLabel->setText(tr("Recent Reports Against User:"));
+    userContextAccountAge->setText(QString());
+    userContextReports->setText(QString());
+    userContextBans->setText(QString());
+    userContextWarns->setText(QString());
+
+    statsGroup->setTitle(tr("Report Statistics"));
+
+    assignButton->setText(tr("Assign to Me"));
+    resolveButton->setText(tr("Resolve..."));
+    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"));
+}
+
+void TabReport::refreshList()
+{
+    selectedReportIdBeforeRefresh = selectedReportId();
+    commentDraftBeforeRefresh = commentInput->text();
+    previousSelectedReportValid = selectedReportInfo(previousSelectedReport);
+
+    refreshButton->setEnabled(false);
+    statusLabel->setText(tr("Loading..."));
+    table->setRowCount(0);
+    allReports.clear();
+    filteredReports.clear();
+    commentButton->setEnabled(false);
+    setActionsEnabled(false);
+
+    Command_ReportList cmd;
+    cmd.set_unresolved_only(unresolvedOnlyBox->isChecked());
+
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabReport::reportListResponse);
+    client->sendCommand(pend);
+}
+
+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;
+    }
+
+    const Response_ReportList &resp = response.GetExtension(Response_ReportList::ext);
+    allReports.clear();
+    for (int i = 0; i < resp.reports_size(); ++i) {
+        allReports.append(resp.reports(i));
+    }
+
+    applyFilters();
+    updateStats();
+
+    if (!pendingStatusMessage.isEmpty()) {
+        statusLabel->setText(pendingStatusMessage);
+        pendingStatusMessage.clear();
+    }
+
+    if (selectedReportIdBeforeRefresh >= 0) {
+        bool found = false;
+        for (int row = 0; row < table->rowCount(); ++row) {
+            if (table->item(row, COL_ID) &&
+                table->item(row, COL_ID)->data(Qt::UserRole).toInt() == selectedReportIdBeforeRefresh) {
+                found = true;
+                {
+                    QSignalBlocker blocker(table);
+                    table->setCurrentCell(row, 0);
+                }
+                break;
+            }
+        }
+
+        if (found) {
+            bool dataChanged = false;
+            ServerInfo_Report newReport;
+            if (!selectedReportInfo(newReport) || !previousSelectedReportValid ||
+                previousSelectedReport.description() != newReport.description() ||
+                previousSelectedReport.status() != newReport.status() ||
+                previousSelectedReport.resolution_note() != newReport.resolution_note() ||
+                previousSelectedReport.assigned_mod_name() != newReport.assigned_mod_name()) {
+                dataChanged = true;
+            }
+
+            if (dataChanged || detailsRequestedReportId != selectedReportIdBeforeRefresh) {
+                loadReportDetails(selectedReportIdBeforeRefresh);
+            }
+            updateActionStates();
+        } else {
+            descriptionEdit->clear();
+            chatLogEdit->clear();
+            commentsEdit->clear();
+            setActionsEnabled(false);
+            userContextGroup->setVisible(false);
+        }
+    }
+
+    if (commentInput->text().isEmpty()) {
+        commentInput->setText(commentDraftBeforeRefresh);
+    }
+
+    if (statsGroup->isChecked()) {
+        requestStats();
+    }
+}
+
+void TabReport::applyFilters()
+{
+    filteredReports.clear();
+
+    const QString searchText = searchEdit->text().toLower();
+    const QString statusFilterValue = statusFilter->currentData().toString();
+
+    for (const ServerInfo_Report &r : allReports) {
+        bool matchesSearch = searchText.isEmpty() ||
+                             QString::fromStdString(r.reporter_name()).toLower().contains(searchText) ||
+                             QString::fromStdString(r.reported_user_name()).toLower().contains(searchText) ||
+                             QString::fromStdString(r.category()).toLower().contains(searchText) ||
+                             QString::fromStdString(r.description()).toLower().contains(searchText);
+
+        bool matchesStatus = statusFilterValue.isEmpty() || QString::fromStdString(r.status()) == statusFilterValue;
+
+        if (matchesSearch && matchesStatus) {
+            filteredReports.append(r);
+        }
+    }
+
+    table->setSortingEnabled(false);
+    table->setRowCount(filteredReports.size());
+
+    for (int row = 0; row < filteredReports.size(); ++row) {
+        const ServerInfo_Report &r = filteredReports[row];
+
+        report_utils::fillReportTableRow(table, row, r, COL_ID, COL_TIME, COL_REPORTED, COL_CATEGORY, COL_GAMEID,
+                                         COL_STATUS, COL_ASSIGNED);
+
+        table->setItem(row, COL_REPORTER, new QTableWidgetItem(QString::fromStdString(r.reporter_name())));
+
+        table->setItem(row, COL_REPLAY,
+                       new QTableWidgetItem(r.has_replay_id() && r.replay_id() > 0 ? tr("Yes") : tr("No")));
+
+        table->setItem(row, COL_ROOM,
+                       new QTableWidgetItem(r.has_room_id() && r.room_id() > 0 ? QString::number(r.room_id()) : ""));
+    }
+
+    table->setSortingEnabled(true);
+    table->resizeColumnsToContents();
+    table->horizontalHeader()->setSectionResizeMode(COL_REPORTED, QHeaderView::Stretch);
+
+    statusLabel->setText(tr("%1 report(s)").arg(filteredReports.size()));
+}
+
+void TabReport::updateStats()
+{
+    int open = 0, assigned = 0, resolved = 0, dismissed = 0;
+    for (const ServerInfo_Report &r : allReports) {
+        QString status = QString::fromStdString(r.status());
+        if (status == "open") {
+            open++;
+        } else if (status == "assigned") {
+            assigned++;
+        } else if (status == "resolved") {
+            resolved++;
+        } else if (status == "dismissed") {
+            dismissed++;
+        }
+    }
+
+    statsLabel->setText(tr("%1 open  |  %2 assigned  |  %3 resolved  |  %4 dismissed")
+                            .arg(open)
+                            .arg(assigned)
+                            .arg(resolved)
+                            .arg(dismissed));
+}
+
+void TabReport::onSelectionChanged()
+{
+    const int row = table->currentRow();
+    if (row < 0 || !table->item(row, COL_ID)) {
+        descriptionEdit->clear();
+        chatLogEdit->clear();
+        commentsEdit->clear();
+        commentInput->clear();
+        commentButton->setEnabled(false);
+        setActionsEnabled(false);
+        userContextGroup->setVisible(false);
+        return;
+    }
+
+    const int reportId = table->item(row, COL_ID)->data(Qt::UserRole).toInt();
+    loadReportDetails(reportId);
+    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;
+
+    for (const ServerInfo_Report &r : filteredReports) {
+        if (r.report_id() == reportId) {
+            descriptionEdit->setPlainText(QString::fromStdString(r.description()));
+
+            QString reportedUser = QString::fromStdString(r.reported_user_name());
+            if (!reportedUser.isEmpty()) {
+                requestUserInfo(reportedUser);
+            } else {
+                userContextGroup->setVisible(false);
+            }
+
+            QString status = QString::fromStdString(r.status());
+            bool canComment = (status == "open" || status == "assigned");
+            commentButton->setEnabled(canComment);
+            commentInput->setEnabled(canComment);
+            if (!canComment) {
+                commentInput->setPlaceholderText(tr("This report is closed."));
+            } else {
+                commentInput->setPlaceholderText(tr("Type a reply..."));
+            }
+            break;
+        }
+    }
+
+    chatLogEdit->setPlainText(tr("Loading..."));
+    commentsEdit->setPlainText(tr("Loading..."));
+
+    Command_ReportDetails cmd;
+    cmd.set_report_id(reportId);
+
+    const int seq = ++detailsRequestSeq;
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, [this, seq](const Response &response) {
+        if (seq != detailsRequestSeq) {
+            return;
+        }
+        reportDetailsResponse(response);
+    });
+    client->sendCommand(pend);
+}
+
+void TabReport::reportDetailsResponse(const Response &response)
+{
+    if (response.response_code() != Response::RespOk) {
+        if (selectedReportId() == detailsRequestedReportId) {
+            chatLogEdit->clear();
+            commentsEdit->setPlainText(tr("Failed to load report details."));
+        }
+        return;
+    }
+
+    const Response_ReportDetails &resp = response.GetExtension(Response_ReportDetails::ext);
+    const ServerInfo_Report &r = resp.report();
+
+    if (selectedReportId() != r.report_id()) {
+        return;
+    }
+
+    report_utils::renderReportDetails(chatLogEdit, commentsEdit, r, tr("No comments yet."), tr("[Moderator]"),
+                                      tr("[Reporter]"));
+}
+
+void TabReport::updateActionStates()
+{
+    const int row = table->currentRow();
+    if (row < 0 || !table->item(row, COL_STATUS)) {
+        setActionsEnabled(false);
+        return;
+    }
+
+    ServerInfo_Report report;
+    if (!selectedReportInfo(report)) {
+        setActionsEnabled(false);
+        return;
+    }
+
+    const QString status = QString::fromStdString(report.status());
+    assignButton->setEnabled(status == "open");
+    resolveButton->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;
+    viewReplayButton->setEnabled(hasReplay);
+    joinGameButton->setEnabled(hasGameId && report.has_room_id() && report.room_id() > 0);
+}
+
+void TabReport::setActionsEnabled(bool enabled)
+{
+    assignButton->setEnabled(enabled);
+    resolveButton->setEnabled(enabled);
+    dismissButton->setEnabled(enabled);
+    reopenButton->setEnabled(enabled);
+    viewReplayButton->setEnabled(false);
+    joinGameButton->setEnabled(false);
+    commentButton->setEnabled(enabled);
+    commentInput->setEnabled(enabled);
+}
+
+int TabReport::selectedReportId() const
+{
+    const int row = table->currentRow();
+    if (row < 0 || !table->item(row, COL_ID)) {
+        return -1;
+    }
+    return table->item(row, COL_ID)->data(Qt::UserRole).toInt();
+}
+
+bool TabReport::selectedReportInfo(ServerInfo_Report &info) const
+{
+    const int reportId = selectedReportId();
+    if (reportId < 0) {
+        return false;
+    }
+
+    for (const ServerInfo_Report &r : filteredReports) {
+        if (r.report_id() == reportId) {
+            info = r;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void TabReport::assignReport()
+{
+    const int reportId = selectedReportId();
+    if (reportId < 0) {
+        return;
+    }
+
+    setActionsEnabled(false);
+    statusLabel->setText(tr("Assigning..."));
+
+    Command_ReportAssign cmd;
+    cmd.set_report_id(reportId);
+
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabReport::assignResponse);
+    client->sendCommand(pend);
+}
+
+void TabReport::assignResponse(const Response &response)
+{
+    if (response.response_code() == Response::RespOk) {
+        pendingStatusMessage = tr("Assigned.");
+        refreshList();
+    } else {
+        statusLabel->setText(tr("Assignment failed."));
+        updateActionStates();
+    }
+}
+
+void TabReport::resolveReport(bool dismissed)
+{
+    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;
+    }
+
+    setActionsEnabled(false);
+    statusLabel->setText(dismissed ? tr("Dismissing...") : tr("Resolving..."));
+
+    Command_ReportResolve cmd;
+    cmd.set_report_id(reportId);
+    cmd.set_dismissed(dismissed);
+    if (!note.isEmpty()) {
+        cmd.set_resolution_note(note.toStdString());
+    }
+
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabReport::resolveResponse);
+    client->sendCommand(pend);
+}
+
+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.");
+        refreshList();
+    } else {
+        statusLabel->setText(tr("Action failed."));
+        updateActionStates();
+    }
+}
+
+void TabReport::viewReplay()
+{
+    ServerInfo_Report report;
+    if (!selectedReportInfo(report) || report.game_id() <= 0) {
+        return;
+    }
+
+    setActionsEnabled(false);
+    statusLabel->setText(tr("Loading replay..."));
+
+    Command_ReplayDownloadByGameId cmd;
+    cmd.set_game_id(report.game_id());
+
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabReport::viewReplayResponse);
+    client->sendCommand(pend);
+}
+
+void TabReport::viewReplayResponse(const Response &response)
+{
+    if (response.response_code() != Response::RespOk) {
+        statusLabel->setText(tr("No replay available for this game."));
+        updateActionStates();
+        return;
+    }
+
+    const Response_ReplayDownloadByGameId &resp = response.GetExtension(Response_ReplayDownloadByGameId::ext);
+    GameReplay *replay = new GameReplay;
+    if (replay->ParseFromString(resp.replay_data())) {
+        emit openReplay(replay);
+        statusLabel->setText(tr("Replay opened."));
+    } else {
+        delete replay;
+        statusLabel->setText(tr("Failed to parse replay."));
+    }
+
+    updateActionStates();
+}
+
+void TabReport::joinGame()
+{
+    ServerInfo_Report report;
+    if (!selectedReportInfo(report) || report.game_id() <= 0) {
+        return;
+    }
+
+    const int roomId = report.has_room_id() ? report.room_id() : -1;
+    if (roomId <= 0) {
+        statusLabel->setText(tr("No room recorded for this report, use the replay instead."));
+        return;
+    }
+
+    emit requestJoinGame(report.game_id(), roomId);
+    statusLabel->setText(tr("Attempting to join game..."));
+}
+
+void TabReport::addComment()
+{
+    const int reportId = selectedReportId();
+    if (reportId < 0) {
+        return;
+    }
+
+    QString text = commentInput->text().trimmed();
+    if (text.isEmpty()) {
+        return;
+    }
+
+    commentButton->setEnabled(false);
+
+    Command_ReportAddComment cmd;
+    cmd.set_report_id(reportId);
+    cmd.set_comment(text.toStdString());
+
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabReport::addCommentResponse);
+    client->sendCommand(pend);
+}
+
+void TabReport::addCommentResponse(const Response &response)
+{
+    if (response.response_code() == Response::RespOk) {
+        commentInput->clear();
+        refreshList();
+    } else {
+        commentButton->setEnabled(true);
+        statusLabel->setText(tr("Failed to send comment."));
+    }
+}
+
+void TabReport::requestUserInfo(const QString &userName)
+{
+    if (userName.isEmpty()) {
+        userContextGroup->setVisible(false);
+        return;
+    }
+
+    lastRequestedUser = userName;
+    userContextGroup->setVisible(true);
+    userContextName->setText(userName);
+    userContextAccountAge->setText(tr("Loading..."));
+    userContextReports->clear();
+    userContextBans->clear();
+    userContextWarns->clear();
+    userContextNotes->clear();
+    userContextRecentReports->clear();
+
+    Command_ReportUserInfo cmd;
+    cmd.set_user_name(userName.toStdString());
+
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabReport::userInfoResponse);
+    client->sendCommand(pend);
+}
+
+void TabReport::userInfoResponse(const Response &response)
+{
+    if (response.response_code() != Response::RespOk) {
+        userContextAccountAge->setText(tr("Error loading user info."));
+        return;
+    }
+
+    const Response_ReportUserInfo &resp = response.GetExtension(Response_ReportUserInfo::ext);
+
+    if (resp.has_user_name() && QString::fromStdString(resp.user_name()) != lastRequestedUser) {
+        return;
+    }
+
+    QDateTime regTime = QDateTime::fromSecsSinceEpoch(resp.registration_time());
+    qint64 daysSinceReg = regTime.daysTo(QDateTime::currentDateTime());
+    userContextAccountAge->setText(tr("%1 days (since %2)").arg(daysSinceReg).arg(regTime.toString("yyyy-MM-dd")));
+
+    userContextReports->setText(QString::number(resp.total_reports()));
+    userContextBans->setText(QString::number(resp.total_bans()));
+    userContextWarns->setText(QString::number(resp.total_warns()));
+
+    if (resp.has_admin_notes() && !resp.admin_notes().empty()) {
+        userContextNotes->setPlainText(QString::fromStdString(resp.admin_notes()));
+    } else {
+        userContextNotes->setPlainText(tr("(none)"));
+    }
+
+    userContextRecentReports->clear();
+    if (resp.recent_reports_size() == 0) {
+        userContextRecentReports->setPlainText(tr("No previous reports against this user."));
+    } else {
+        for (int i = 0; i < resp.recent_reports_size(); ++i) {
+            const ServerInfo_Report &r = resp.recent_reports(i);
+            QDateTime dt = QDateTime::fromSecsSinceEpoch(r.report_time());
+            userContextRecentReports->moveCursor(QTextCursor::End);
+            userContextRecentReports->insertPlainText(QString("[%1] #%2 by %3 [%4]: %5\n")
+                                                          .arg(dt.toString("yyyy-MM-dd"))
+                                                          .arg(r.report_id())
+                                                          .arg(QString::fromStdString(r.reporter_name()))
+                                                          .arg(QString::fromStdString(r.status()))
+                                                          .arg(QString::fromStdString(r.category())));
+        }
+    }
+}
+
+void TabReport::requestStats()
+{
+    statsTotalLabel->setText(tr("Loading statistics..."));
+    statsTrendLabel->clear();
+    statsCategoriesLabel->clear();
+    statsDetailText->clear();
+
+    Command_ReportStats cmd;
+
+    PendingCommand *pend = client->prepareModeratorCommand(cmd);
+    connect(pend, &PendingCommand::finished, this, &TabReport::statsResponse);
+    client->sendCommand(pend);
+}
+
+void TabReport::statsResponse(const Response &response)
+{
+    if (response.response_code() != Response::RespOk) {
+        statsTotalLabel->setText(tr("Error loading statistics."));
+        return;
+    }
+
+    const Response_ReportStats &resp = response.GetExtension(Response_ReportStats::ext);
+
+    statsTotalLabel->setText(tr("Total: %1 reports (%2 open, %3 assigned, %4 resolved/dismissed)")
+                                 .arg(resp.total_reports())
+                                 .arg(resp.total_pending())
+                                 .arg(resp.total_assigned())
+                                 .arg(resp.total_resolved()));
+
+    statsTrendLabel->setText(tr("Last 24h: %1  |  Last 7d: %2  |  Last 30d: %3  |  Avg resolution: %4h")
+                                 .arg(resp.reports_last_24h())
+                                 .arg(resp.reports_last_7d())
+                                 .arg(resp.reports_last_30d())
+                                 .arg(resp.avg_resolution_hours(), 0, 'f', 1));
+
+    QString weekCompare =
+        tr("This week: %1 vs last week: %2 (%3%)")
+            .arg(resp.reports_this_week())
+            .arg(resp.reports_last_week())
+            .arg(resp.reports_last_week() > 0 ? QString::number(((resp.reports_this_week() - resp.reports_last_week()) *
+                                                                 100.0 / resp.reports_last_week()),
+                                                                'f', 0)
+                 : resp.reports_this_week() > 0 ? "new"
+                                                : "0");
+    statsTrendLabel->setText(statsTrendLabel->text() + "  |  " + weekCompare);
+
+    statsCategoriesLabel->setText(tr("By category:"));
+    statsDetailText->clear();
+
+    statsDetailText->moveCursor(QTextCursor::End);
+    statsDetailText->insertPlainText(tr("=== Top Categories ===") + "\n");
+    for (int i = 0; i < resp.category_counts_size(); ++i) {
+        const ReportCategoryCount &cc = resp.category_counts(i);
+        QString cat = QString::fromStdString(cc.category());
+        cat.replace('_', ' ');
+        cat = cat.left(1).toUpper() + cat.mid(1);
+        statsDetailText->moveCursor(QTextCursor::End);
+        statsDetailText->insertPlainText(QString("  %1: %2\n").arg(cat).arg(cc.count()));
+    }
+
+    statsDetailText->moveCursor(QTextCursor::End);
+    statsDetailText->insertPlainText("\n" + tr("=== Most Reported Users ===") + "\n");
+    for (int i = 0; i < resp.top_reported_users_size(); ++i) {
+        const ReportTopUser &tu = resp.top_reported_users(i);
+        statsDetailText->moveCursor(QTextCursor::End);
+        statsDetailText->insertPlainText(
+            QString("  %1: %2 reports\n").arg(QString::fromStdString(tu.user_name())).arg(tu.count()));
+    }
+
+    statsDetailText->moveCursor(QTextCursor::End);
+    statsDetailText->insertPlainText("\n" + tr("=== Top Reporters ===") + "\n");
+    for (int i = 0; i < resp.top_reporters_size(); ++i) {
+        const ReportTopUser &tu = resp.top_reporters(i);
+        statsDetailText->moveCursor(QTextCursor::End);
+        statsDetailText->insertPlainText(
+            QString("  %1: %2 reports filed\n").arg(QString::fromStdString(tu.user_name())).arg(tu.count()));
+    }
+}
diff --git a/cockatrice/src/interface/widgets/tabs/tab_report.h b/cockatrice/src/interface/widgets/tabs/tab_report.h
new file mode 100644
index 000000000..32ebe1a3f
--- /dev/null
+++ b/cockatrice/src/interface/widgets/tabs/tab_report.h
@@ -0,0 +1,135 @@
+#ifndef TAB_REPORT_H
+#define TAB_REPORT_H
+
+#include "tab.h"
+
+#include <QList>
+#include <QPoint>
+#include <QString>
+#include <libcockatrice/protocol/pb/serverinfo_report.pb.h>
+#include <qtmetamacros.h>
+
+class AbstractClient;
+class QCheckBox;
+class QComboBox;
+class QGroupBox;
+class QLabel;
+class QLineEdit;
+class QPushButton;
+class QSplitter;
+class QTableWidget;
+class QTextEdit;
+class QTimer;
+class GameReplay;
+class Response;
+class TabSupervisor;
+class UserContextMenu;
+
+class TabReport : public Tab
+{
+    Q_OBJECT
+public:
+    TabReport(TabSupervisor *_tabSupervisor, AbstractClient *_client);
+    void retranslateUi() override;
+    [[nodiscard]] QString getTabText() const override
+    {
+        return tr("Report Queue");
+    }
+
+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 resolveResponse(const Response &response);
+    void onSelectionChanged();
+    void showTableContextMenu(const QPoint &pos);
+    void viewReplay();
+    void viewReplayResponse(const Response &response);
+    void joinGame();
+    void addComment();
+    void addCommentResponse(const Response &response);
+    void requestUserInfo(const QString &userName);
+    void userInfoResponse(const Response &response);
+    void reportDetailsResponse(const Response &response);
+    void requestStats();
+    void statsResponse(const Response &response);
+    void reopenReport();
+    void reopenResponse(const Response &response);
+
+private:
+    int selectedReportId() const;
+    bool selectedReportInfo(ServerInfo_Report &info) const;
+    void setActionsEnabled(bool enabled);
+    void updateActionStates();
+    void applyFilters();
+    void updateStats();
+    void loadReportDetails(int reportId);
+
+    AbstractClient *client;
+
+    QLineEdit *searchEdit;
+    QComboBox *statusFilter;
+    QCheckBox *unresolvedOnlyBox;
+    QPushButton *refreshButton;
+    QLabel *statsLabel;
+    QTableWidget *table;
+    QSplitter *detailSplitter;
+    QGroupBox *descGroup;
+    QGroupBox *chatGroup;
+    QGroupBox *commentsGroup;
+    QTextEdit *descriptionEdit;
+    QTextEdit *chatLogEdit;
+    QTextEdit *commentsEdit;
+    QLineEdit *commentInput;
+    QPushButton *commentButton;
+    QPushButton *assignButton;
+    QPushButton *resolveButton;
+    QPushButton *dismissButton;
+    QPushButton *reopenButton;
+    QPushButton *viewReplayButton;
+    QPushButton *joinGameButton;
+    QLabel *statusLabel;
+    QTimer *refreshTimer;
+    UserContextMenu *userContextMenu;
+
+    QGroupBox *userContextGroup;
+    QLabel *userContextName;
+    QLabel *userContextAccountAge;
+    QLabel *userContextReports;
+    QLabel *userContextBans;
+    QLabel *userContextWarns;
+    QTextEdit *userContextNotes;
+    QTextEdit *userContextRecentReports;
+    QLabel *userContextUserLabel;
+    QLabel *userContextAgeLabel;
+    QLabel *userContextReportsLabel;
+    QLabel *userContextBansLabel;
+    QLabel *userContextWarnsLabel;
+    QLabel *userContextNotesLabel;
+    QLabel *userContextRecentReportsLabel;
+    QString lastRequestedUser;
+    QString pendingStatusMessage;
+    QGroupBox *statsGroup;
+    QLabel *statsTotalLabel;
+    QLabel *statsTrendLabel;
+    QLabel *statsCategoriesLabel;
+    QTextEdit *statsDetailText;
+
+    QList<ServerInfo_Report> allReports;
+    QList<ServerInfo_Report> filteredReports;
+    int detailsRequestedReportId = -1;
+    int detailsRequestSeq = 0;
+    int selectedReportIdBeforeRefresh = -1;
+    QString commentDraftBeforeRefresh;
+    ServerInfo_Report previousSelectedReport;
+    bool previousSelectedReportValid = false;
+};
+
+#endif // TAB_REPORT_H
diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.cpp b/cockatrice/src/interface/widgets/tabs/tab_room.cpp
index 92e38662b..67106ba34 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_room.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_room.cpp
@@ -1,26 +1,51 @@
 #include "tab_room.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../../client/settings/shortcuts_settings.h"
+#include "../../pixel_map_generator.h"
 #include "../interface/widgets/dialogs/dlg_settings.h"
 #include "../interface/widgets/server/chat_view/chat_view.h"
+#include "../interface/widgets/server/game_link.h"
 #include "../interface/widgets/server/game_selector.h"
 #include "../interface/widgets/server/user/user_list_manager.h"
+#include "../interface/widgets/server/user/user_list_panel_widget.h"
 #include "../interface/widgets/server/user/user_list_widget.h"
 #include "../main.h"
-#include "tab_account.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_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 <QtCore/qdatetime.h>
+#include <QWidget>
+#include <functional>
+#include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/get_pb_extension.h>
 #include <libcockatrice/protocol/pb/event_join_room.pb.h>
@@ -31,7 +56,10 @@
 #include <libcockatrice/protocol/pb/room_commands.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <libcockatrice/settings/chat_settings.h>
+#include <libcockatrice/utility/string_limits.h>
+#include <qnamespace.h>
+#include <string>
 
 TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
                  AbstractClient *_client,
@@ -41,25 +69,32 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
       ownUser(_ownUser), userListProxy(_tabSupervisor->getUserListManager())
 {
     const int gameTypeListSize = info.gametype_list_size();
-    for (int i = 0; i < gameTypeListSize; ++i)
+    for (int i = 0; i < gameTypeListSize; ++i) {
         gameTypes.insert(info.gametype_list(i).game_type_id(),
                          QString::fromStdString(info.gametype_list(i).description()));
+    }
 
     QMap<int, GameTypeMap> tempMap;
     tempMap.insert(info.room_id(), gameTypes);
     gameSelector = new GameSelector(client, tabSupervisor, this, QMap<int, QString>(), tempMap, true, true);
-    userList = new UserListWidget(tabSupervisor, client, UserListWidget::RoomList);
-    connect(userList, SIGNAL(openMessageDialog(const QString &, bool)), this,
-            SIGNAL(openMessageDialog(const QString &, bool)));
+
+    userListPanel = new UserListPanelWidget(tabSupervisor, client, this);
+    userListPanel->bind(tabSupervisor->getUserListManager());
+    userList = userListPanel->getUserList();
+    connect(userListPanel, &UserListPanelWidget::openMessageDialog, this, &TabRoom::openMessageDialog);
+
+    const auto gameInviteLinkProvider = [this]() { return tabSupervisor->getGameInviteLinksForRoom(roomId); };
+    userList->setGameInviteLinkProvider(gameInviteLinkProvider);
 
     chatView = new ChatView(tabSupervisor, nullptr, true, this);
     connect(chatView, &ChatView::showMentionPopup, this, &TabRoom::actShowMentionPopup);
     connect(chatView, &ChatView::messageClickedSignal, this, &TabRoom::focusTab);
     connect(chatView, &ChatView::openMessageDialog, this, &TabRoom::openMessageDialog);
+    connect(chatView, &ChatView::cockatriceLinkActivated, this, &TabRoom::cockatriceLinkActivated);
     connect(chatView, &ChatView::showCardInfoPopup, this, &TabRoom::showCardInfoPopup);
     connect(chatView, &ChatView::deleteCardInfoPopup, this, &TabRoom::deleteCardInfoPopup);
     connect(chatView, &ChatView::addMentionTag, this, &TabRoom::addMentionTag);
-    connect(&SettingsCache::instance(), &SettingsCache::chatMentionCompleterChanged, this,
+    connect(&SettingsCache::instance().chat(), &ChatSettings::chatMentionCompleterChanged, this,
             &TabRoom::actCompleterChanged);
     sayLabel = new QLabel;
     sayEdit = new LineEditCompleter;
@@ -78,7 +113,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
     connect(aOpenChatSettings, &QAction::triggered, this, &TabRoom::actOpenChatSettings);
 
     auto *chatSettingsButton = new QToolButton;
-    chatSettingsButton->setIcon(QPixmap("theme:icons/settings"));
+    chatSettingsButton->setIcon(themePixmap(QStringLiteral("icons/settings")));
     chatSettingsButton->setMenu(chatSettingsMenu);
     chatSettingsButton->setPopupMode(QToolButton::InstantPopup);
 
@@ -100,7 +135,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
 
     auto *hbox = new QHBoxLayout;
     hbox->addWidget(splitter, 3);
-    hbox->addWidget(userList, 1);
+    hbox->addWidget(userListPanel, 1);
 
     aLeaveRoom = new QAction(this);
     connect(aLeaveRoom, &QAction::triggered, this, &TabRoom::closeRequest);
@@ -111,22 +146,35 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
 
     const int userListSize = info.user_list_size();
     for (int i = 0; i < userListSize; ++i) {
-        userList->processUserInfo(info.user_list(i), true);
         autocompleteUserList.append("@" + QString::fromStdString(info.user_list(i).name()));
     }
-    userList->sortItems();
 
     const int gameListSize = info.game_list_size();
-    for (int i = 0; i < gameListSize; ++i)
+    for (int i = 0; i < gameListSize; ++i) {
         gameSelector->processGameInfo(info.game_list(i));
+    }
 
-    completer = new QCompleter(autocompleteUserList, sayEdit);
-    completer->setCaseSensitivity(Qt::CaseInsensitive);
-    completer->setMaxVisibleItems(5);
-    completer->setFilterMode(Qt::MatchStartsWith);
+    mentionModel = new QStringListModel(autocompleteUserList, sayEdit);
+    mentionCompleter = createMentionCompleter(mentionModel, sayEdit);
+    sayEdit->addCompleter(mentionCompleter, CompleterTrigger::Mention);
+
+    auto *cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, sayEdit);
+    auto *displayModel = new CardDatabaseDisplayModel(sayEdit);
+    displayModel->setSourceModel(cardDatabaseModel);
+    const CardCompleterSetup cardSetup = createCardCompleter(displayModel, sayEdit);
+    sayEdit->addCompleter(cardSetup.completer, CompleterTrigger::Card);
+
+    connect(sayEdit, &LineEditCompleter::cardPartialChanged, this, [this, cardSetup](const QString &text) {
+        cardSetup.searchModel->updateSearchResults(text);
+        cardSetup.proxyModel->setFilterRegularExpression(
+            QRegularExpression(QRegularExpression::escape(text), QRegularExpression::CaseInsensitiveOption));
+        if (sayEdit->hasFocus()) {
+            cardSetup.completer->complete();
+        }
+    });
 
-    sayEdit->setCompleter(completer);
     actCompleterChanged();
+
     connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
             &TabRoom::refreshShortcuts);
     refreshShortcuts();
@@ -142,7 +190,7 @@ void TabRoom::retranslateUi()
 {
     gameSelector->retranslateUi();
     chatView->retranslateUi();
-    userList->retranslateUi();
+    userListPanel->retranslateUi();
     sayLabel->setText(tr("&Say:"));
     chatGroupBox->setTitle(tr("Chat"));
     roomMenu->setTitle(tr("&Room"));
@@ -182,8 +230,9 @@ void TabRoom::closeEvent(QCloseEvent *event)
 
 void TabRoom::tabActivated()
 {
-    if (!sayEdit->hasFocus())
+    if (!sayEdit->hasFocus()) {
         sayEdit->setFocus();
+    }
 }
 
 QString TabRoom::sanitizeHtml(QString dirty) const
@@ -195,8 +244,8 @@ void TabRoom::sendMessage()
 {
     if (sayEdit->text().isEmpty()) {
         return;
-    } else if (completer->popup()->isVisible()) {
-        completer->popup()->hide();
+    } else if (sayEdit->hasVisibleCompleterPopup()) {
+        sayEdit->hideCompleterPopups();
         return;
     } else {
         Command_RoomSay cmd;
@@ -211,8 +260,9 @@ void TabRoom::sendMessage()
 
 void TabRoom::sayFinished(const Response &response)
 {
-    if (response.response_code() == Response::RespChatFlood)
+    if (response.response_code() == Response::RespChatFlood) {
         chatView->appendMessage(tr("You are flooding the chat. Please wait a couple of seconds."));
+    }
 }
 
 void TabRoom::actClearChat()
@@ -223,14 +273,14 @@ void TabRoom::actClearChat()
 void TabRoom::actOpenChatSettings()
 {
     DlgSettings settings(this);
-    settings.setTab(4);
+    settings.setTab(DlgSettings::MessagesPage);
     settings.exec();
 }
 
 void TabRoom::actCompleterChanged()
 {
-    SettingsCache::instance().getChatMentionCompleter() ? completer->setCompletionRole(2)
-                                                        : completer->setCompletionRole(1);
+    SettingsCache::instance().chat().getChatMentionCompleter() ? mentionCompleter->setCompletionRole(2)
+                                                               : mentionCompleter->setCompletionRole(1);
 }
 
 void TabRoom::processRoomEvent(const RoomEvent &event)
@@ -258,25 +308,26 @@ void TabRoom::processRoomEvent(const RoomEvent &event)
 void TabRoom::processListGamesEvent(const Event_ListGames &event)
 {
     const int gameListSize = event.game_list_size();
-    for (int i = 0; i < gameListSize; ++i)
+    for (int i = 0; i < gameListSize; ++i) {
         gameSelector->processGameInfo(event.game_list(i));
+    }
+    emit gameListUpdated();
 }
 
 void TabRoom::processJoinRoomEvent(const Event_JoinRoom &event)
 {
-    userList->processUserInfo(event.user_info(), true);
-    userList->sortItems();
-    if (!autocompleteUserList.contains("@" + QString::fromStdString(event.user_info().name()))) {
-        autocompleteUserList << "@" + QString::fromStdString(event.user_info().name());
-        sayEdit->setCompletionList(autocompleteUserList);
+    QString mention = "@" + QString::fromStdString(event.user_info().name());
+    if (!autocompleteUserList.contains(mention)) {
+        autocompleteUserList << mention;
+        mentionModel->setStringList(autocompleteUserList);
     }
 }
 
 void TabRoom::processLeaveRoomEvent(const Event_LeaveRoom &event)
 {
-    userList->deleteUser(QString::fromStdString(event.name()));
-    autocompleteUserList.removeOne("@" + QString::fromStdString(event.name()));
-    sayEdit->setCompletionList(autocompleteUserList);
+    QString mention = "@" + QString::fromStdString(event.name());
+    autocompleteUserList.removeOne(mention);
+    mentionModel->setStringList(autocompleteUserList);
 }
 
 void TabRoom::processRoomSayEvent(const Event_RoomSay &event)
@@ -284,26 +335,30 @@ void TabRoom::processRoomSayEvent(const Event_RoomSay &event)
     QString senderName = QString::fromStdString(event.name());
     QString message = QString::fromStdString(event.message());
 
-    if (userListProxy->isUserIgnored(senderName))
+    if (userListProxy->isUserIgnored(senderName)) {
         return;
+    }
 
     UserListTWI *twi = userList->getUsers().value(senderName);
     ServerInfo_User userInfo = {};
     if (twi) {
         userInfo = twi->getUserInfo();
-        if (SettingsCache::instance().getIgnoreUnregisteredUsers() &&
-            !UserLevelFlags(userInfo.user_level()).testFlag(ServerInfo_User::IsRegistered))
+        if (SettingsCache::instance().chat().getIgnoreUnregisteredUsers() &&
+            !UserLevelFlags(userInfo.user_level()).testFlag(ServerInfo_User::IsRegistered)) {
             return;
+        }
     }
 
-    if (event.message_type() == Event_RoomSay::ChatHistory && !SettingsCache::instance().getRoomHistory())
+    if (event.message_type() == Event_RoomSay::ChatHistory && !SettingsCache::instance().chat().getRoomHistory()) {
         return;
+    }
 
-    if (event.message_type() == Event_RoomSay::ChatHistory)
+    if (event.message_type() == Event_RoomSay::ChatHistory) {
         message =
             "[" +
             QString(QDateTime::fromMSecsSinceEpoch(event.time_of()).toLocalTime().toString("d MMM yyyy HH:mm:ss")) +
             "] " + message;
+    }
 
     chatView->appendMessage(message, event.message_type(), userInfo, true);
     emit userEvent(false);
diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.h b/cockatrice/src/interface/widgets/tabs/tab_room.h
index 67d9afc86..031056145 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_room.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_room.h
@@ -2,21 +2,27 @@
  * @file tab_room.h
  * @ingroup RoomTabs
  * @ingroup Lobby
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TAB_ROOM_H
 #define TAB_ROOM_H
 
-#include "../interface/widgets/utility/line_edit_completer.h"
 #include "tab.h"
 
-#include <QFocusEvent>
-#include <QGroupBox>
+#include <QList>
 #include <QMap>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
 
 class UserListProxy;
-class UserListManager;
+class QAction;
+class QGroupBox;
+class QMenu;
+class QStringListModel;
+class TabSupervisor;
+
 namespace google
 {
 namespace protobuf
@@ -26,14 +32,12 @@ class Message;
 } // namespace google
 class AbstractClient;
 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;
@@ -56,11 +60,13 @@ private:
     QMap<int, QString> gameTypes;
 
     GameSelector *gameSelector;
+    UserListPanelWidget *userListPanel;
     UserListWidget *userList;
     const UserListProxy *userListProxy;
     ChatView *chatView;
     QLabel *sayLabel;
     LineEditCompleter *sayEdit;
+    QStringListModel *mentionModel;
     QGroupBox *chatGroupBox;
 
     QMenu *roomMenu;
@@ -70,12 +76,13 @@ private:
     [[nodiscard]] QString sanitizeHtml(QString dirty) const;
 
     QStringList autocompleteUserList;
-    QCompleter *completer;
+    QCompleter *mentionCompleter;
 signals:
     void roomClosing(TabRoom *tab);
     void openMessageDialog(const QString &userName, bool focus);
     void maximizeClient();
     void notIdle();
+    void gameListUpdated();
 private slots:
     void sendMessage();
     void sayFinished(const Response &response);
@@ -109,6 +116,10 @@ public:
     {
         return roomId;
     }
+    [[nodiscard]] QString getRoomName() const
+    {
+        return roomName;
+    }
     [[nodiscard]] const QMap<int, QString> &getGameTypes() const
     {
         return gameTypes;
@@ -125,6 +136,10 @@ public:
     {
         return ownUser;
     }
+    [[nodiscard]] GameSelector *getGameSelector() const
+    {
+        return gameSelector;
+    }
 
     PendingCommand *prepareRoomCommand(const ::google::protobuf::Message &cmd);
     void sendRoomCommand(PendingCommand *pend);
diff --git a/cockatrice/src/interface/widgets/tabs/tab_server.cpp b/cockatrice/src/interface/widgets/tabs/tab_server.cpp
index aa52b4b1a..0f3e76c76 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_server.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_server.cpp
@@ -1,20 +1,30 @@
 #include "tab_server.h"
 
-#include "../interface/widgets/server/user/user_list_widget.h"
+#include "libcockatrice/protocol/pb/response.pb.h"
+#include "libcockatrice/protocol/pb/serverinfo_room.pb.h"
 #include "tab_supervisor.h"
 
 #include <QHBoxLayout>
 #include <QHeaderView>
-#include <QInputDialog>
+#include <QMap>
 #include <QMessageBox>
 #include <QPushButton>
-#include <QTextEdit>
+#include <QSharedPointer>
+#include <QTextBrowser>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <QVBoxLayout>
+#include <QWidget>
 #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>
 #include <libcockatrice/protocol/pb/response_join_room.pb.h>
+#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)
 {
@@ -69,27 +79,35 @@ void RoomSelector::processListRoomsEvent(const Event_ListRooms &event)
         for (int j = 0; j < roomList->topLevelItemCount(); ++j) {
             QTreeWidgetItem *twi = roomList->topLevelItem(j);
             if (twi->data(0, Qt::UserRole).toInt() == room.room_id()) {
-                if (room.has_name())
+                if (room.has_name()) {
                     twi->setData(0, Qt::DisplayRole, QString::fromStdString(room.name()));
-                if (room.has_description())
+                }
+                if (room.has_description()) {
                     twi->setData(1, Qt::DisplayRole, QString::fromStdString(room.description()));
-                if (room.has_permissionlevel())
+                }
+                if (room.has_permissionlevel()) {
                     twi->setData(2, Qt::DisplayRole, getRoomPermissionDisplay(room));
-                if (room.has_player_count())
+                }
+                if (room.has_player_count()) {
                     twi->setData(3, Qt::DisplayRole, room.player_count());
-                if (room.has_game_count())
+                }
+                if (room.has_game_count()) {
                     twi->setData(4, Qt::DisplayRole, room.game_count());
+                }
                 return;
             }
         }
         QTreeWidgetItem *twi = new QTreeWidgetItem;
         twi->setData(0, Qt::UserRole, room.room_id());
-        if (room.has_name())
+        if (room.has_name()) {
             twi->setData(0, Qt::DisplayRole, QString::fromStdString(room.name()));
-        if (room.has_description())
+        }
+        if (room.has_description()) {
             twi->setData(1, Qt::DisplayRole, QString::fromStdString(room.description()));
-        if (room.has_permissionlevel())
+        }
+        if (room.has_permissionlevel()) {
             twi->setData(2, Qt::DisplayRole, getRoomPermissionDisplay(room));
+        }
         twi->setData(3, Qt::DisplayRole, room.player_count());
         twi->setData(4, Qt::DisplayRole, room.game_count());
         twi->setTextAlignment(2, Qt::AlignRight);
@@ -97,9 +115,11 @@ void RoomSelector::processListRoomsEvent(const Event_ListRooms &event)
         twi->setTextAlignment(4, Qt::AlignRight);
 
         roomList->addTopLevelItem(twi);
-        if (room.has_auto_join())
-            if (room.auto_join())
+        if (room.has_auto_join()) {
+            if (room.auto_join()) {
                 emit joinRoomRequest(room.room_id(), false);
+            }
+        }
     }
 }
 
@@ -113,10 +133,12 @@ QString RoomSelector::getRoomPermissionDisplay(const ServerInfo_Room &room)
      */
 
     QString roomPermissionDisplay = QString::fromStdString(room.privilegelevel()).toLower();
-    if (QString::fromStdString(room.permissionlevel()).toLower() != "none")
+    if (QString::fromStdString(room.permissionlevel()).toLower() != "none") {
         roomPermissionDisplay = QString::fromStdString(room.permissionlevel()).toLower();
-    if (roomPermissionDisplay == "") // catch all for misconfigured .ini room definitions
+    }
+    if (roomPermissionDisplay == "") { // catch all for misconfigured .ini room definitions
         roomPermissionDisplay = "none";
+    }
 
     return roomPermissionDisplay;
 }
@@ -124,8 +146,9 @@ QString RoomSelector::getRoomPermissionDisplay(const ServerInfo_Room &room)
 void RoomSelector::joinClicked()
 {
     QTreeWidgetItem *twi = roomList->currentItem();
-    if (!twi)
+    if (!twi) {
         return;
+    }
 
     int id = twi->data(0, Qt::UserRole).toInt();
 
@@ -172,51 +195,110 @@ void TabServer::processServerMessageEvent(const Event_ServerMessage &event)
 void TabServer::joinRoom(int id, bool setCurrent)
 {
     TabRoom *room = tabSupervisor->getRoomTabs().value(id);
-    if (!room) {
-        Command_JoinRoom cmd;
-        cmd.set_room_id(id);
-
-        PendingCommand *pend = client->prepareSessionCommand(cmd);
-        pend->setExtraData(setCurrent);
-        connect(pend, &PendingCommand::finished, this, &TabServer::joinRoomFinished);
-
-        client->sendCommand(pend);
-
+    if (room) {
+        if (setCurrent) {
+            tabSupervisor->setCurrentWidget((QWidget *)room);
+        }
         return;
     }
 
-    if (setCurrent)
-        tabSupervisor->setCurrentWidget((QWidget *)room);
+    auto pendingIt = pendingRoomJoins.find(id);
+    if (pendingIt != pendingRoomJoins.end()) {
+        // A join for this room is already in flight: the room tab opens when its response
+        // arrives. Fold the new request into the pending one so that, for example, clicking
+        // a room the selector is auto-joining does not send a second Command_JoinRoom - the
+        // server would reject that duplicate with RespContextError.
+        if (setCurrent) {
+            pendingIt.value() = true;
+        }
+        return;
+    }
+
+    pendingRoomJoins.insert(id, setCurrent);
+
+    Command_JoinRoom cmd;
+    cmd.set_room_id(id);
+
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    pend->setExtraData(setCurrent);
+    connect(
+        pend, &PendingCommand::finished, this,
+        [this, id](const Response &r, const CommandContainer &c, const QVariant &v) { joinRoomFinished(r, c, v, id); });
+
+    client->sendCommand(pend);
 }
 
 void TabServer::joinRoomFinished(const Response &r,
                                  const CommandContainer & /*commandContainer*/,
-                                 const QVariant &extraData)
+                                 const QVariant &extraData,
+                                 int roomId)
 {
+    const bool setCurrent = pendingRoomJoins.value(roomId, extraData.toBool());
+    pendingRoomJoins.remove(roomId);
+    const bool healedJoin = healedRoomJoins.contains(roomId);
+    healedRoomJoins.remove(roomId);
+
     switch (r.response_code()) {
         case Response::RespOk:
             break;
         case Response::RespNameNotFound:
-            QMessageBox::critical(this, tr("Error"),
-                                  tr("Failed to join the server room: it doesn't exist on the server."));
+            if (setCurrent) {
+                QMessageBox::critical(this, tr("Error"),
+                                      tr("Failed to join the server room: it doesn't exist on the server."));
+            }
+            emit roomJoinFailed(roomId);
             return;
         case Response::RespContextError:
-            QMessageBox::critical(
-                this, tr("Error"),
-                tr("The server thinks you are in the server room but your client is unable to display it. "
-                   "Try restarting your client."));
+            if (healedJoin) {
+                // The rejoin below was already answered and the server still rejects the join, so
+                // the stale-membership heal cannot help: surface the error. The guard was already
+                // released above so a later user-initiated join may try a fresh heal.
+                if (setCurrent) {
+                    QMessageBox::critical(
+                        this, tr("Error"),
+                        tr("The server thinks you are in the server room but your client is unable to display it. "
+                           "Try restarting your client."));
+                }
+                emit roomJoinFailed(roomId);
+                return;
+            }
+            // The server already had us registered in the room even though no tab was open,
+            // usually because two join attempts for the same room overlapped. Leaving and
+            // rejoining makes the server reply with a fresh RespOk so the tab is displayed
+            // without requiring a client restart. The guard above covers exactly the rejoin that
+            // leaveAndRejoinRoom triggers, so a server that keeps replying with RespContextError
+            // gets one heal attempt per join instead of an endless recursion.
+            healedRoomJoins.insert(roomId);
+            leaveAndRejoinRoom(roomId, setCurrent);
             return;
         case Response::RespUserLevelTooLow:
-            QMessageBox::critical(this, tr("Error"),
-                                  tr("You do not have the required permission to join this server room."));
+            if (setCurrent) {
+                QMessageBox::critical(this, tr("Error"),
+                                      tr("You do not have the required permission to join this server room."));
+            }
+            emit roomJoinFailed(roomId);
             return;
         default:
-            QMessageBox::critical(
-                this, tr("Error"),
-                tr("Failed to join the server room due to an unknown error: %1.").arg(r.response_code()));
+            if (setCurrent) {
+                QMessageBox::critical(
+                    this, tr("Error"),
+                    tr("Failed to join the server room due to an unknown error: %1.").arg(r.response_code()));
+            }
+            emit roomJoinFailed(roomId);
             return;
     }
 
     const Response_JoinRoom &resp = r.GetExtension(Response_JoinRoom::ext);
-    emit roomJoined(resp.room_info(), extraData.toBool());
+    emit roomJoined(resp.room_info(), setCurrent);
+}
+
+void TabServer::leaveAndRejoinRoom(int roomId, bool setCurrent)
+{
+    // Clear the stale room membership server-side. The leave is sent before the rejoin below,
+    // so the server no longer considers us a member by the time the join arrives. The leave
+    // response is intentionally not awaited: commands are processed in send order on the
+    // connection, and a failed leave (RespNotInRoom) only means the membership was already gone.
+    client->sendCommand(client->prepareRoomCommand(Command_LeaveRoom(), roomId));
+
+    joinRoom(roomId, setCurrent);
 }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_server.h b/cockatrice/src/interface/widgets/tabs/tab_server.h
index f2dd8f0a2..eb2f572fe 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_server.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_server.h
@@ -1,8 +1,8 @@
 /**
  * @file tab_server.h
  * @ingroup ServerTabs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TAB_SERVER_H
 #define TAB_SERVER_H
@@ -10,20 +10,23 @@
 #include "tab.h"
 
 #include <QGroupBox>
-#include <QTextBrowser>
-#include <QTreeWidget>
+#include <QHash>
+#include <QSet>
+#include <QString>
+#include <QVariant>
+#include <qtmetamacros.h>
 
 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
 {
@@ -49,19 +52,30 @@ class TabServer : public Tab
     Q_OBJECT
 signals:
     void roomJoined(const ServerInfo_Room &info, bool setCurrent);
+    void roomJoinFailed(int roomId);
 private slots:
     void processServerMessageEvent(const Event_ServerMessage &event);
-    void joinRoom(int id, bool setCurrent);
-    void joinRoomFinished(const Response &resp, const CommandContainer &commandContainer, const QVariant &extraData);
+    void joinRoomFinished(const Response &resp,
+                          const CommandContainer &commandContainer,
+                          const QVariant &extraData,
+                          int roomId);
 
 private:
+    void leaveAndRejoinRoom(int roomId, bool setCurrent);
+
     AbstractClient *client;
     RoomSelector *roomSelector;
     QTextBrowser *serverInfoBox;
     bool shouldEmitUpdate = false;
+    /** Room ids with a join command in flight, mapped to whether the tab should be focused once it opens. */
+    QHash<int, bool> pendingRoomJoins;
+    /** Room ids for which a stale-membership heal (leave + rejoin) is currently in flight. Released as soon as the
+     *  rejoin has been answered, so a heal is attempted at most once per join. */
+    QSet<int> healedRoomJoins;
 
 public:
     TabServer(TabSupervisor *_tabSupervisor, AbstractClient *_client);
+    void joinRoom(int id, bool setCurrent);
     void retranslateUi() override;
     [[nodiscard]] QString getTabText() const override
     {
diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
index df9387a6c..2352d7d7b 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
@@ -1,33 +1,72 @@
 #include "tab_supervisor.h"
 
 #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"
 #include "tab_deck_editor.h"
 #include "tab_deck_storage.h"
+#include "tab_developer.h"
 #include "tab_game.h"
 #include "tab_home.h"
 #include "tab_logs.h"
 #include "tab_message.h"
+#include "tab_moderation.h"
+#include "tab_public_decks.h"
 #include "tab_replays.h"
+#include "tab_report.h"
 #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>
 #include <libcockatrice/protocol/pb/event_notify_user.pb.h>
 #include <libcockatrice/protocol/pb/event_user_message.pb.h>
@@ -36,6 +75,16 @@
 #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/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
 {
@@ -44,7 +93,7 @@ QRect MacOSTabFixStyle::subElementRect(SubElement element, const QStyleOption *o
     }
 
     // Skip over QProxyStyle handling subElementRect,
-    // This fixes an issue with Qt 5.10 on OSX where the labels for tabs with a button and an icon
+    // This fixes an issue on OSX where the labels for tabs with a button and an icon
     // get cut-off too early
     return QCommonStyle::subElementRect(element, option, widget);
 }
@@ -64,11 +113,7 @@ QSize CloseButton::sizeHint() const
     return {width, height};
 }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
 void CloseButton::enterEvent(QEnterEvent *event)
-#else
-void CloseButton::enterEvent(QEvent *event)
-#endif
 {
     update();
     QAbstractButton::enterEvent(event);
@@ -86,34 +131,39 @@ void CloseButton::paintEvent(QPaintEvent * /*event*/)
     QStyleOption opt;
     opt.initFrom(this);
     opt.state |= QStyle::State_AutoRaise;
-    if (isEnabled() && underMouse() && !isChecked() && !isDown())
+    if (isEnabled() && underMouse() && !isChecked() && !isDown()) {
         opt.state |= QStyle::State_Raised;
-    if (isChecked())
+    }
+    if (isChecked()) {
         opt.state |= QStyle::State_On;
-    if (isDown())
+    }
+    if (isDown()) {
         opt.state |= QStyle::State_Sunken;
+    }
 
     if (const auto *tb = qobject_cast<const QTabBar *>(parent())) {
         int index = tb->currentIndex();
         auto position = (QTabBar::ButtonPosition)style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, nullptr, tb);
-        if (tb->tabButton(index, position) == this)
+        if (tb->tabButton(index, position) == this) {
             opt.state |= QStyle::State_Selected;
+        }
     }
 
     style()->drawPrimitive(QStyle::PE_IndicatorTabClose, &opt, &p, this);
 }
 
 TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *parent)
-    : QTabWidget(parent), userInfo(nullptr), client(_client), tabsMenu(tabsMenu), tabVisualDeckStorage(nullptr),
-      tabServer(nullptr), tabAccount(nullptr), tabDeckStorage(nullptr), tabReplays(nullptr), tabAdmin(nullptr),
-      tabLog(nullptr), isLocalGame(false)
+    : QTabWidget(parent), userInfo(nullptr), client(_client), tabsMenu(tabsMenu), tabHome(nullptr),
+      tabVisualDeckStorage(nullptr), tabServer(nullptr), tabAccount(nullptr), tabDeckStorage(nullptr),
+      tabReplays(nullptr), tabAdmin(nullptr), tabCardArtRules(nullptr), tabLog(nullptr), tabReport(nullptr),
+      tabModeration(nullptr), tabDeveloper(nullptr), isLocalGame(false)
 {
     setElideMode(Qt::ElideRight);
     setMovable(true);
     setIconSize(QSize(15, 15));
 
 #if defined(Q_OS_MAC)
-    // This is necessary to fix an issue on macOS with qt5.10,
+    // This is necessary to fix an issue on macOS,
     // where tabs with icons and buttons get drawn incorrectly
     tabBar()->setStyle(new MacOSTabFixStyle);
 #endif
@@ -129,14 +179,15 @@ TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *
     connect(client, &AbstractClient::gameJoinedEventReceived, this, &TabSupervisor::gameJoined);
     connect(client, &AbstractClient::userMessageEventReceived, this, &TabSupervisor::processUserMessageEvent);
     connect(client, &AbstractClient::maxPingTime, this, &TabSupervisor::updatePingTime);
+    connect(client, &AbstractClient::pingStatsUpdated, this, &TabSupervisor::updateLatencyTooltip);
     connect(client, &AbstractClient::notifyUserEventReceived, this, &TabSupervisor::processNotifyUserEvent);
 
     // create tabs menu actions
     aTabDeckEditor = new QAction(this);
-    connect(aTabDeckEditor, &QAction::triggered, this, [this] { addDeckEditorTab(nullptr); });
+    connect(aTabDeckEditor, &QAction::triggered, this, [this] { addDeckEditorTab(LoadedDeck()); });
 
     aTabVisualDeckEditor = new QAction(this);
-    connect(aTabVisualDeckEditor, &QAction::triggered, this, [this] { addVisualDeckEditorTab(nullptr); });
+    connect(aTabVisualDeckEditor, &QAction::triggered, this, [this] { addVisualDeckEditorTab(LoadedDeck()); });
 
     aTabEdhRec = new QAction(this);
     connect(aTabEdhRec, &QAction::triggered, this, [this] { addEdhrecMainTab(); });
@@ -175,10 +226,26 @@ TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *
     aTabAdmin->setCheckable(true);
     connect(aTabAdmin, &QAction::triggered, this, &TabSupervisor::actTabAdmin);
 
+    aTabCardArtRules = new QAction(this);
+    aTabCardArtRules->setCheckable(true);
+    connect(aTabCardArtRules, &QAction::triggered, this, &TabSupervisor::actTabCardArtRules);
+
     aTabLog = new QAction(this);
     aTabLog->setCheckable(true);
     connect(aTabLog, &QAction::triggered, this, &TabSupervisor::actTabLog);
 
+    aTabReport = new QAction(this);
+    aTabReport->setCheckable(true);
+    connect(aTabReport, &QAction::triggered, this, &TabSupervisor::actTabReport);
+
+    aTabModeration = new QAction(this);
+    aTabModeration->setCheckable(true);
+    connect(aTabModeration, &QAction::triggered, this, &TabSupervisor::actTabModeration);
+
+    aTabDeveloper = new QAction(this);
+    aTabDeveloper->setCheckable(true);
+    connect(aTabDeveloper, &QAction::triggered, this, &TabSupervisor::actTabDeveloper);
+
     connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
             &TabSupervisor::refreshShortcuts);
     refreshShortcuts();
@@ -218,6 +285,10 @@ void TabSupervisor::retranslateUi()
     aTabReplays->setText(tr("Game Replays"));
     aTabAdmin->setText(tr("Administration"));
     aTabLog->setText(tr("Logs"));
+    aTabReport->setText(tr("Report Queue"));
+    aTabModeration->setText(tr("Moderation"));
+    aTabCardArtRules->setText(tr("Card Art Rules"));
+    aTabDeveloper->setText(tr("Developer"));
 
     // tabs
     QList<Tab *> tabs;
@@ -227,21 +298,34 @@ void TabSupervisor::retranslateUi()
     tabs.append(tabAdmin);
     tabs.append(tabAccount);
     tabs.append(tabLog);
+    tabs.append(tabReport);
+    tabs.append(tabModeration);
+    tabs.append(tabCardArtRules);
+    tabs.append(tabDeveloper);
     QMapIterator<int, TabRoom *> roomIterator(roomTabs);
-    while (roomIterator.hasNext())
+    while (roomIterator.hasNext()) {
         tabs.append(roomIterator.next().value());
+    }
     QMapIterator<int, TabGame *> gameIterator(gameTabs);
-    while (gameIterator.hasNext())
+    while (gameIterator.hasNext()) {
         tabs.append(gameIterator.next().value());
+    }
+    QMapIterator<QString, TabPublicDecks *> publicDecksIterator(publicDecksTabs);
+    while (publicDecksIterator.hasNext()) {
+        tabs.append(publicDecksIterator.next().value());
+    }
     QListIterator<TabGame *> replayIterator(replayTabs);
-    while (replayIterator.hasNext())
+    while (replayIterator.hasNext()) {
         tabs.append(replayIterator.next());
+    }
     QListIterator<AbstractTabDeckEditor *> deckEditorIterator(deckEditorTabs);
-    while (deckEditorIterator.hasNext())
+    while (deckEditorIterator.hasNext()) {
         tabs.append(deckEditorIterator.next());
+    }
     QMapIterator<QString, TabMessage *> messageIterator(messageTabs);
-    while (messageIterator.hasNext())
+    while (messageIterator.hasNext()) {
         tabs.append(messageIterator.next().value());
+    }
 
     for (auto &tab : tabs) {
         if (tab) {
@@ -268,6 +352,8 @@ void TabSupervisor::refreshShortcuts()
     aTabReplays->setShortcuts(shortcuts.getShortcut("Tabs/aTabReplays"));
     aTabAdmin->setShortcuts(shortcuts.getShortcut("Tabs/aTabAdmin"));
     aTabLog->setShortcuts(shortcuts.getShortcut("Tabs/aTabLog"));
+    aTabReport->setShortcuts(shortcuts.getShortcut("Tabs/aTabReport"));
+    aTabModeration->setShortcuts(shortcuts.getShortcut("Tabs/aTabModeration"));
 }
 
 void TabSupervisor::closeEvent(QCloseEvent *event)
@@ -320,22 +406,63 @@ static void checkAndTrigger(QAction *checkableAction, bool checked)
 }
 
 /**
- * Opens the always-available tabs, depending on settings.
+ * Opens the always-available tabs, depending on settings, and lands on the configured startup tab.
+ *
+ * The startup destination is a request: tabs that were not open before (deck editors, storage
+ * tabs disabled in the Tabs menu) are opened as part of the startup flow. Destinations that
+ * require a server connection (Server, Server Room) are handled asynchronously by MainWindow
+ * through the intent system, since this class has no RemoteClient.
  */
 void TabSupervisor::initStartupTabs()
 {
     openTabHome();
     setCurrentWidget(tabHome);
 
-    if (SettingsCache::instance().getTabVisualDeckStorageOpen()) {
+    if (SettingsCache::instance().tabs().getTabVisualDeckStorageOpen()) {
         openTabVisualDeckStorage();
     }
-    if (SettingsCache::instance().getTabDeckStorageOpen()) {
+    if (SettingsCache::instance().tabs().getTabDeckStorageOpen()) {
         openTabDeckStorage();
     }
-    if (SettingsCache::instance().getTabReplaysOpen()) {
+    if (SettingsCache::instance().tabs().getTabReplaysOpen()) {
         openTabReplays();
     }
+
+    switch (SettingsCache::instance().tabs().getStartupTabIndex()) {
+        case StartupTab::StartupTabVisualDeckStorage:
+            if (!tabVisualDeckStorage) {
+                openTabVisualDeckStorage();
+            }
+            setCurrentWidget(tabVisualDeckStorage);
+            break;
+        case StartupTab::StartupTabDeckStorage:
+            if (!tabDeckStorage) {
+                openTabDeckStorage();
+            }
+            setCurrentWidget(tabDeckStorage);
+            break;
+        case StartupTab::StartupTabReplays:
+            if (!tabReplays) {
+                openTabReplays();
+            }
+            setCurrentWidget(tabReplays);
+            break;
+        case StartupTab::StartupTabDeckEditor:
+            addDeckEditorTab(LoadedDeck());
+            break;
+        case StartupTab::StartupTabVisualDeckEditor:
+            addVisualDeckEditorTab(LoadedDeck());
+            break;
+        case StartupTab::StartupTabServer:
+        case StartupTab::StartupTabServerRoom:
+            // Handled asynchronously by MainWindow::applyStartupDestination(); Home stays selected
+            // until the server connection succeeds.
+            break;
+        case StartupTab::StartupTabHome:
+        default:
+            setCurrentWidget(tabHome);
+            break;
+    }
 }
 
 /**
@@ -350,6 +477,7 @@ int TabSupervisor::myAddTab(Tab *tab, QAction *manager)
 {
     connect(tab, &TabGame::userEvent, this, &TabSupervisor::tabUserEvent);
     connect(tab, &TabGame::tabTextChanged, this, &TabSupervisor::updateTabText);
+    connect(tab, &TabGame::cockatriceLinkActivated, this, &TabSupervisor::cockatriceLinkActivated);
 
     QString tabText = tab->getTabText();
     int idx = addTab(tab, sanitizeTabName(tabText));
@@ -413,10 +541,10 @@ void TabSupervisor::start(const ServerInfo_User &_userInfo)
     tabsMenu->addAction(aTabServer);
     tabsMenu->addAction(aTabAccount);
 
-    if (SettingsCache::instance().getTabServerOpen()) {
+    if (SettingsCache::instance().tabs().getTabServerOpen()) {
         openTabServer();
     }
-    if (SettingsCache::instance().getTabAccountOpen()) {
+    if (SettingsCache::instance().tabs().getTabAccountOpen()) {
         openTabAccount();
     }
 
@@ -426,13 +554,38 @@ void TabSupervisor::start(const ServerInfo_User &_userInfo)
         tabsMenu->addSeparator();
         tabsMenu->addAction(aTabAdmin);
         tabsMenu->addAction(aTabLog);
+        tabsMenu->addAction(aTabCardArtRules);
+        tabsMenu->addAction(aTabReport);
+        tabsMenu->addAction(aTabModeration);
 
-        if (SettingsCache::instance().getTabAdminOpen()) {
+        if (SettingsCache::instance().tabs().getTabAdminOpen()) {
             openTabAdmin();
         }
-        if (SettingsCache::instance().getTabLogOpen()) {
+        if (SettingsCache::instance().tabs().getTabLogOpen()) {
             openTabLog();
         }
+        if (SettingsCache::instance().tabs().getTabReportOpen()) {
+            openTabReport();
+        }
+        if (SettingsCache::instance().tabs().getTabModerationOpen()) {
+            openTabModeration();
+        }
+        if (SettingsCache::instance().tabs().getTabCardArtRulesOpen()) {
+            openTabCardArtRules();
+        }
+    }
+
+    if (userInfo->user_level() & ServerInfo_User::IsDeveloper) {
+        tabsMenu->addSeparator();
+        tabsMenu->addAction(aTabDeveloper);
+        // Developers without moderation rights get log access through their
+        // own role. Moderators already have the Logs entry from above.
+        if (!(userInfo->user_level() & ServerInfo_User::IsModerator)) {
+            tabsMenu->addAction(aTabLog);
+            if (SettingsCache::instance().tabs().getTabLogOpen()) {
+                openTabLog();
+            }
+        }
     }
 
     retranslateUi();
@@ -445,12 +598,16 @@ void TabSupervisor::startLocal(const QList<AbstractClient *> &_clients)
     tabAccount = nullptr;
     tabAdmin = nullptr;
     tabLog = nullptr;
+    tabReport = nullptr;
+    tabModeration = nullptr;
+    tabDeveloper = nullptr;
     isLocalGame = true;
     userInfo = new ServerInfo_User;
     localClients = _clients;
-    for (int i = 0; i < localClients.size(); ++i)
+    for (int i = 0; i < localClients.size(); ++i) {
         connect(localClients[i], &AbstractClient::gameEventContainerReceived, this,
                 &TabSupervisor::processGameEventContainer);
+    }
     connect(localClients.first(), &AbstractClient::gameJoinedEventReceived, this, &TabSupervisor::localGameJoined);
 }
 
@@ -459,8 +616,9 @@ void TabSupervisor::startLocal(const QList<AbstractClient *> &_clients)
  */
 void TabSupervisor::stop()
 {
-    if ((!client) && localClients.isEmpty())
+    if ((!client) && localClients.isEmpty()) {
         return;
+    }
 
     resetTabsMenu();
 
@@ -484,6 +642,18 @@ void TabSupervisor::stop()
         if (tabLog) {
             tabLog->close();
         }
+        if (tabReport) {
+            tabReport->close();
+        }
+        if (tabModeration) {
+            tabModeration->close();
+        }
+        if (tabCardArtRules) {
+            tabCardArtRules->close();
+        }
+        if (tabDeveloper) {
+            tabDeveloper->close();
+        }
     }
 
     QList<Tab *> tabsToDelete;
@@ -496,6 +666,10 @@ void TabSupervisor::stop()
         tabsToDelete << i.value();
     }
 
+    for (auto i = publicDecksTabs.cbegin(), end = publicDecksTabs.cend(); i != end; ++i) {
+        tabsToDelete << i.value();
+    }
+
     for (const auto tab : tabsToDelete) {
         tab->close();
     }
@@ -529,7 +703,7 @@ void TabSupervisor::openTabHome()
 
 void TabSupervisor::actTabVisualDeckStorage(bool checked)
 {
-    SettingsCache::instance().setTabVisualDeckStorageOpen(checked);
+    SettingsCache::instance().tabs().setTabVisualDeckStorageOpen(checked);
     if (checked && !tabVisualDeckStorage) {
         openTabVisualDeckStorage();
         setCurrentWidget(tabVisualDeckStorage);
@@ -542,7 +716,7 @@ void TabSupervisor::actTabVisualDeckStorage(bool checked)
 
 void TabSupervisor::openTabVisualDeckStorage()
 {
-    tabVisualDeckStorage = new TabDeckStorageVisual(this);
+    tabVisualDeckStorage = new TabDeckStorageVisual(this, client);
     myAddTab(tabVisualDeckStorage, aTabVisualDeckStorage);
     connect(tabVisualDeckStorage, &QObject::destroyed, this, [this] {
         tabVisualDeckStorage = nullptr;
@@ -553,7 +727,7 @@ void TabSupervisor::openTabVisualDeckStorage()
 
 void TabSupervisor::actTabServer(bool checked)
 {
-    SettingsCache::instance().setTabServerOpen(checked);
+    SettingsCache::instance().tabs().setTabServerOpen(checked);
     if (checked && !tabServer) {
         openTabServer();
         setCurrentWidget(tabServer);
@@ -564,6 +738,11 @@ void TabSupervisor::actTabServer(bool checked)
 
 void TabSupervisor::openTabServer()
 {
+    SettingsCache::instance().tabs().setTabServerOpen(true);
+    if (tabServer) {
+        return;
+    }
+
     tabServer = new TabServer(this, client);
     connect(tabServer, &TabServer::roomJoined, this, &TabSupervisor::addRoomTab);
     myAddTab(tabServer, aTabServer);
@@ -576,7 +755,7 @@ void TabSupervisor::openTabServer()
 
 void TabSupervisor::actTabAccount(bool checked)
 {
-    SettingsCache::instance().setTabAccountOpen(checked);
+    SettingsCache::instance().tabs().setTabAccountOpen(checked);
     if (checked && !tabAccount) {
         openTabAccount();
         setCurrentWidget(tabAccount);
@@ -601,7 +780,7 @@ void TabSupervisor::openTabAccount()
 
 void TabSupervisor::actTabDeckStorage(bool checked)
 {
-    SettingsCache::instance().setTabDeckStorageOpen(checked);
+    SettingsCache::instance().tabs().setTabDeckStorageOpen(checked);
     if (checked && !tabDeckStorage) {
         openTabDeckStorage();
         setCurrentWidget(tabDeckStorage);
@@ -624,7 +803,7 @@ void TabSupervisor::openTabDeckStorage()
 
 void TabSupervisor::actTabReplays(bool checked)
 {
-    SettingsCache::instance().setTabReplaysOpen(checked);
+    SettingsCache::instance().tabs().setTabReplaysOpen(checked);
     if (checked && !tabReplays) {
         openTabReplays();
         setCurrentWidget(tabReplays);
@@ -649,7 +828,7 @@ void TabSupervisor::openTabReplays()
 
 void TabSupervisor::actTabAdmin(bool checked)
 {
-    SettingsCache::instance().setTabAdminOpen(checked);
+    SettingsCache::instance().tabs().setTabAdminOpen(checked);
     if (checked && !tabAdmin) {
         openTabAdmin();
         setCurrentWidget(tabAdmin);
@@ -670,9 +849,34 @@ void TabSupervisor::openTabAdmin()
     aTabAdmin->setChecked(true);
 }
 
+void TabSupervisor::actTabCardArtRules(bool checked)
+{
+    SettingsCache::instance().tabs().setTabCardArtRulesOpen(checked);
+    if (checked && !tabCardArtRules) {
+        openTabCardArtRules();
+        setCurrentWidget(tabCardArtRules);
+    } else if (!checked && tabCardArtRules) {
+        tabCardArtRules->closeRequest();
+    }
+}
+
+void TabSupervisor::openTabCardArtRules()
+{
+    tabCardArtRules = new TabCardArtRules(this, client);
+
+    myAddTab(tabCardArtRules, aTabCardArtRules);
+
+    connect(tabCardArtRules, &QObject::destroyed, this, [this] {
+        tabCardArtRules = nullptr;
+        aTabCardArtRules->setChecked(false);
+    });
+
+    aTabCardArtRules->setChecked(true);
+}
+
 void TabSupervisor::actTabLog(bool checked)
 {
-    SettingsCache::instance().setTabLogOpen(checked);
+    SettingsCache::instance().tabs().setTabLogOpen(checked);
     if (checked && !tabLog) {
         openTabLog();
         setCurrentWidget(tabLog);
@@ -683,7 +887,13 @@ void TabSupervisor::actTabLog(bool checked)
 
 void TabSupervisor::openTabLog()
 {
-    tabLog = new TabLog(this, client);
+    // Developers query logs through the developer command family, so tell the
+    // tab which family to use. The moderator family is strictly stronger, so a
+    // moderator who also holds the developer bit keeps the moderator path — the
+    // developer bit only selects the (narrowed) developer family on its own.
+    const bool useDeveloperCommands = (userInfo->user_level() & ServerInfo_User::IsDeveloper) &&
+                                      !(userInfo->user_level() & ServerInfo_User::IsModerator);
+    tabLog = new TabLog(this, client, useDeveloperCommands);
     myAddTab(tabLog, aTabLog);
     connect(tabLog, &QObject::destroyed, this, [this] {
         tabLog = nullptr;
@@ -692,26 +902,122 @@ void TabSupervisor::openTabLog()
     aTabLog->setChecked(true);
 }
 
+void TabSupervisor::actTabReport(bool checked)
+{
+    SettingsCache::instance().tabs().setTabReportOpen(checked);
+    if (checked && !tabReport) {
+        openTabReport();
+        setCurrentWidget(tabReport);
+    } else if (!checked && tabReport) {
+        tabReport->closeRequest();
+    }
+}
+
+void TabSupervisor::openTabReport()
+{
+    tabReport = new TabReport(this, client);
+    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);
+    });
+    aTabReport->setChecked(true);
+}
+
+void TabSupervisor::actTabModeration(bool checked)
+{
+    SettingsCache::instance().tabs().setTabModerationOpen(checked);
+    if (checked && !tabModeration) {
+        openTabModeration();
+        setCurrentWidget(tabModeration);
+    } else if (!checked && tabModeration) {
+        tabModeration->closeRequest();
+    }
+}
+
+void TabSupervisor::openTabModeration(const QString &userName)
+{
+    if (tabModeration) {
+        setCurrentWidget(tabModeration);
+        if (!userName.isEmpty()) {
+            tabModeration->investigate(userName);
+        }
+        return;
+    }
+    tabModeration = new TabModeration(this, client, userName);
+    myAddTab(tabModeration, aTabModeration);
+    connect(tabModeration, &QObject::destroyed, this, [this] {
+        tabModeration = nullptr;
+        aTabModeration->setChecked(false);
+    });
+    aTabModeration->setChecked(true);
+}
+
+void TabSupervisor::actTabDeveloper(bool checked)
+{
+    if (checked && !tabDeveloper) {
+        openTabDeveloper();
+        setCurrentWidget(tabDeveloper);
+    } else if (!checked && tabDeveloper) {
+        tabDeveloper->closeRequest();
+    }
+}
+
+void TabSupervisor::openTabDeveloper()
+{
+    tabDeveloper = new TabDeveloper(this, client);
+    myAddTab(tabDeveloper, aTabDeveloper);
+    connect(tabDeveloper, &QObject::destroyed, this, [this] {
+        tabDeveloper = nullptr;
+        aTabDeveloper->setChecked(false);
+    });
+    aTabDeveloper->setChecked(true);
+}
+
 void TabSupervisor::updatePingTime(int value, int max)
 {
-    if (!tabServer)
+    if (!tabServer) {
         return;
-    if (tabServer->getContentsChanged())
+    }
+    if (tabServer->getContentsChanged()) {
         return;
+    }
 
     setTabIcon(indexOf(tabServer), QIcon(PingPixmapGenerator::generatePixmap(15, value, max)));
 }
 
+void TabSupervisor::updateLatencyTooltip(const LatencyTracker::Stats &stats)
+{
+    if (!tabServer) {
+        return;
+    }
+
+    if (stats.sampleCount == 0) {
+        setTabToolTip(indexOf(tabServer), QString());
+        return;
+    }
+
+    setTabToolTip(indexOf(tabServer),
+                  tr("Connection quality over the last %n sample(s):", "", stats.sampleCount) + "\n" +
+                      tr("Last: %1 ms").arg(stats.lastMs) + "\n" + tr("Median: %1 ms").arg(stats.medianMs) + "\n" +
+                      tr("95th percentile: %1 ms").arg(stats.p95Ms) + "\n" + tr("Maximum: %1 ms").arg(stats.maxMs));
+}
+
 void TabSupervisor::gameJoined(const Event_GameJoined &event)
 {
     QMap<int, QString> roomGameTypes;
     TabRoom *room = roomTabs.value(event.game_info().room_id());
-    if (room)
+    if (room) {
         roomGameTypes = room->getGameTypes();
-    else
-        for (int i = 0; i < event.game_types_size(); ++i)
+    } else {
+        for (int i = 0; i < event.game_types_size(); ++i) {
             roomGameTypes.insert(event.game_types(i).game_type_id(),
                                  QString::fromStdString(event.game_types(i).description()));
+        }
+    }
 
     auto *tab = new TabGame(this, QList<AbstractClient *>() << client, event, roomGameTypes);
     connect(tab, &TabGame::gameClosing, this, &TabSupervisor::gameLeft);
@@ -740,14 +1046,16 @@ void TabSupervisor::localGameJoined(const Event_GameJoined &event)
 
 void TabSupervisor::gameLeft(TabGame *tab)
 {
-    if (tab == currentWidget())
+    if (tab == currentWidget()) {
         emit setMenu();
+    }
 
     gameTabs.remove(tab->getGame()->getGameMetaInfo()->gameId());
     removeTab(indexOf(tab));
 
-    if (!localClients.isEmpty())
+    if (!localClients.isEmpty()) {
         stop();
+    }
 }
 
 void TabSupervisor::addRoomTab(const ServerInfo_Room &info, bool setCurrent)
@@ -756,21 +1064,48 @@ void TabSupervisor::addRoomTab(const ServerInfo_Room &info, bool setCurrent)
     connect(tab, &TabRoom::maximizeClient, this, &TabSupervisor::maximizeMainWindow);
     connect(tab, &TabRoom::roomClosing, this, &TabSupervisor::roomLeft);
     connect(tab, &TabRoom::openMessageDialog, this, &TabSupervisor::addMessageTab);
+    connect(tab, &TabRoom::cockatriceLinkActivated, this, &TabSupervisor::cockatriceLinkActivated);
     myAddTab(tab);
     roomTabs.insert(info.room_id(), tab);
-    if (setCurrent)
+    if (setCurrent) {
         setCurrentWidget(tab);
+    }
 }
 
 void TabSupervisor::roomLeft(TabRoom *tab)
 {
-    if (tab == currentWidget())
+    if (tab == currentWidget()) {
         emit setMenu();
+    }
 
     roomTabs.remove(tab->getRoomId());
     removeTab(indexOf(tab));
 }
 
+void TabSupervisor::openTabPublicDecks(const QString &userName)
+{
+    if (auto *existing = publicDecksTabs.value(userName, nullptr)) {
+        setCurrentWidget(existing);
+        return;
+    }
+
+    auto *tab = new TabPublicDecks(this, client, userName);
+    connect(tab, &TabPublicDecks::closing, this, &TabSupervisor::publicDecksClosed);
+    myAddTab(tab);
+    publicDecksTabs.insert(userName, tab);
+    setCurrentWidget(tab);
+}
+
+void TabSupervisor::publicDecksClosed(TabPublicDecks *tab)
+{
+    if (tab == currentWidget()) {
+        emit setMenu();
+    }
+
+    publicDecksTabs.remove(tab->getUserName());
+    removeTab(indexOf(tab));
+}
+
 void TabSupervisor::switchToFirstAvailableNetworkTab()
 {
     if (!roomTabs.isEmpty()) {
@@ -793,20 +1128,65 @@ void TabSupervisor::openReplay(GameReplay *replay)
 
 void TabSupervisor::replayLeft(TabGame *tab)
 {
-    if (tab == currentWidget())
+    if (tab == currentWidget()) {
         emit setMenu();
+    }
 
     replayTabs.removeOne(tab);
 }
 
+void TabSupervisor::joinReportGame(const int gameId, const int roomId)
+{
+    joinGameByIntent(gameId, roomId, true);
+}
+
+void TabSupervisor::joinGameFromUserCard(const int gameId, const int roomId, const bool asSpectator)
+{
+    joinGameByIntent(gameId, roomId, asSpectator);
+}
+
+/**
+ * Runs the join/spectate intent for @p gameId in @p roomId.
+ *
+ * The intent owns the whole flow: if the room tab is not open yet it joins the
+ * room first, then retries the game, so callers do not have to care whether the
+ * room happens to be on screen.
+ */
+void TabSupervisor::joinGameByIntent(const int gameId, const int roomId, const bool asSpectator)
+{
+    auto *remoteClient = qobject_cast<RemoteClient *>(client);
+    if (!remoteClient) {
+        actShowPopup(tr("Game joins are only available on a remote server."));
+        return;
+    }
+
+    auto ctx = std::make_unique<ContextJoinGame>();
+    ctx->roomContext.serverContext.hostname = remoteClient->peerName();
+    ctx->roomContext.serverContext.port = QString::number(remoteClient->peerPort());
+    ctx->roomContext.roomId = roomId;
+    ctx->gameId = gameId;
+    ctx->asSpectator = asSpectator;
+
+    auto *joinGameIntent = new IntentJoinServerGame(this, remoteClient, std::move(ctx));
+    joinGameIntent->setParent(this);
+    connect(joinGameIntent, &Intent::failed, this, [gameId](const QString &reason) {
+        actShowPopup(tr("Could not join game %1.\n%2").arg(gameId).arg(reason));
+    });
+
+    joinGameIntent->execute();
+}
+
 TabMessage *TabSupervisor::addMessageTab(const QString &receiverName, bool focus)
 {
-    if (receiverName == QString::fromStdString(userInfo->name()))
+    if (receiverName == QString::fromStdString(userInfo->name())) {
         return nullptr;
+    }
 
     ServerInfo_User otherUser;
+    bool userOnline = false;
     if (auto user = userListManager->getOnlineUser(receiverName)) {
         otherUser = ServerInfo_User(*user);
+        userOnline = true;
     } else {
         otherUser.set_name(receiverName.toStdString());
     }
@@ -814,18 +1194,28 @@ TabMessage *TabSupervisor::addMessageTab(const QString &receiverName, bool focus
     TabMessage *tab;
     tab = messageTabs.value(QString::fromStdString(otherUser.name()));
     if (tab) {
-        if (focus)
+        if (focus) {
             setCurrentWidget(tab);
+        }
         return tab;
     }
 
-    tab = new TabMessage(this, client, *userInfo, otherUser);
+    if (focus && userListManager->isUserIgnored(receiverName)) {
+        QMessageBox::information(
+            this, tr("Ignored user"),
+            tr("You have ignored %1. Remove them from your ignore list to open a private chat.").arg(receiverName));
+        return nullptr;
+    }
+
+    tab = new TabMessage(this, client, *userInfo, otherUser, userOnline);
     connect(tab, &TabMessage::talkClosing, this, &TabSupervisor::talkLeft);
     connect(tab, &TabMessage::maximizeClient, this, &TabSupervisor::maximizeMainWindow);
+    connect(tab, &TabMessage::cockatriceLinkActivated, this, &TabSupervisor::cockatriceLinkActivated);
     myAddTab(tab);
     messageTabs.insert(receiverName, tab);
-    if (focus)
+    if (focus) {
         setCurrentWidget(tab);
+    }
     return tab;
 }
 
@@ -836,21 +1226,70 @@ void TabSupervisor::maximizeMainWindow()
 
 void TabSupervisor::talkLeft(TabMessage *tab)
 {
-    if (tab == currentWidget())
+    if (tab == currentWidget()) {
         emit setMenu();
+    }
 
     messageTabs.remove(tab->getUserName());
     removeTab(indexOf(tab));
 }
 
+QList<GameInviteOption> TabSupervisor::getGameInviteLinksForRoom(int roomId) const
+{
+    QList<GameInviteOption> options;
+    if (isLocalGame) {
+        return options;
+    }
+
+    // The inviter may be in several games of the same room (hosting one and
+    // spectating another, for example). Return every game so the caller can
+    // let the user choose which one to invite to.
+    for (auto it = gameTabs.cbegin(); it != gameTabs.cend(); ++it) {
+        TabGame *tab = it.value();
+        GameMetaInfo *metaInfo = tab->getGame()->getGameMetaInfo();
+        if (metaInfo->proto().room_id() != roomId) {
+            continue;
+        }
+        // A closed game is a dead end — drop it. Started/full games stay
+        // listed: an invite to them is a legitimate "come spectate" offer.
+        if (metaInfo->proto().closed()) {
+            continue;
+        }
+
+        const int gameId = metaInfo->gameId();
+        const QString description = QString::fromStdString(metaInfo->proto().description());
+
+        GameInviteOption option{
+            .gameId = gameId,
+            .label =
+                description.isEmpty() ? tr("Game #%1").arg(gameId) : tr("Game #%1 — %2").arg(gameId).arg(description),
+            .url = makeGameJoinLink(client->serverName(), client->serverPort(), roomId, gameId, description),
+            .description = description,
+            .onlyBuddies = metaInfo->proto().only_buddies(),
+            .creatorName = QString::fromStdString(metaInfo->proto().creator_info().name()),
+        };
+        options.append(option);
+    }
+
+    return options;
+}
+
+void TabSupervisor::sendInviteToUser(const QString &userName, const QString &inviteText)
+{
+    TabMessage *tab = addMessageTab(userName, true);
+    if (tab) {
+        tab->sendInviteMessage(inviteText);
+    }
+}
+
 /**
  * Creates a new deck editor tab and loads the deck into it.
  * Creates either a classic or visual deck editor tab depending on settings
- * @param deckToOpen The deck to open in the tab. Creates a copy of the DeckLoader instance.
+ * @param deckToOpen The deck to open in the tab.
  */
-void TabSupervisor::openDeckInNewTab(DeckLoader *deckToOpen)
+void TabSupervisor::openDeckInNewTab(const LoadedDeck &deckToOpen)
 {
-    int type = SettingsCache::instance().getDefaultDeckEditorType();
+    int type = SettingsCache::instance().deckEditor().getDefaultDeckEditorType();
     switch (type) {
         case ClassicDeckEditor:
             addDeckEditorTab(deckToOpen);
@@ -868,13 +1307,12 @@ void TabSupervisor::openDeckInNewTab(DeckLoader *deckToOpen)
 
 /**
  * Creates a new deck editor tab
- * @param deckToOpen The deck to open in the tab. Creates a copy of the DeckLoader instance.
+ * @param deckToOpen The deck to open in the tab.
  */
-TabDeckEditor *TabSupervisor::addDeckEditorTab(DeckLoader *deckToOpen)
+TabDeckEditor *TabSupervisor::addDeckEditorTab(const LoadedDeck &deckToOpen)
 {
     auto *tab = new TabDeckEditor(this);
-    if (deckToOpen)
-        tab->openDeck(deckToOpen);
+    tab->openDeck(deckToOpen);
     connect(tab, &AbstractTabDeckEditor::deckEditorClosing, this, &TabSupervisor::deckEditorClosed);
     connect(tab, &AbstractTabDeckEditor::openDeckEditor, this, &TabSupervisor::addDeckEditorTab);
     myAddTab(tab);
@@ -883,11 +1321,10 @@ TabDeckEditor *TabSupervisor::addDeckEditorTab(DeckLoader *deckToOpen)
     return tab;
 }
 
-TabDeckEditorVisual *TabSupervisor::addVisualDeckEditorTab(DeckLoader *deckToOpen)
+TabDeckEditorVisual *TabSupervisor::addVisualDeckEditorTab(const LoadedDeck &deckToOpen)
 {
     auto *tab = new TabDeckEditorVisual(this);
-    if (deckToOpen)
-        tab->openDeck(deckToOpen);
+    tab->openDeck(deckToOpen);
     connect(tab, &AbstractTabDeckEditor::deckEditorClosing, this, &TabSupervisor::deckEditorClosed);
     connect(tab, &AbstractTabDeckEditor::openDeckEditor, this, &TabSupervisor::addVisualDeckEditorTab);
     myAddTab(tab);
@@ -936,8 +1373,9 @@ TabEdhRec *TabSupervisor::addEdhrecTab(const CardInfoPtr &cardToQuery, bool isCo
 
 void TabSupervisor::deckEditorClosed(AbstractTabDeckEditor *tab)
 {
-    if (tab == currentWidget())
+    if (tab == currentWidget()) {
         emit setMenu();
+    }
 
     deckEditorTabs.removeOne(tab);
     removeTab(indexOf(tab));
@@ -948,10 +1386,11 @@ void TabSupervisor::tabUserEvent(bool globalEvent)
     auto *tab = static_cast<Tab *>(sender());
     if (tab != currentWidget()) {
         tab->setContentsChanged(true);
-        setTabIcon(indexOf(tab), QPixmap("theme:icons/tab_changed"));
+        setTabIcon(indexOf(tab), themePixmap(QStringLiteral("icons/tab_changed")));
     }
-    if (globalEvent && SettingsCache::instance().getNotificationsEnabled())
+    if (globalEvent && SettingsCache::instance().userInterface().getNotificationsEnabled()) {
         QApplication::alert(this);
+    }
 }
 
 void TabSupervisor::updateTabText(Tab *tab, const QString &newTabText)
@@ -964,39 +1403,64 @@ void TabSupervisor::updateTabText(Tab *tab, const QString &newTabText)
 void TabSupervisor::processRoomEvent(const RoomEvent &event)
 {
     TabRoom *tab = roomTabs.value(event.room_id(), 0);
-    if (tab)
+    if (tab) {
         tab->processRoomEvent(event);
+    }
 }
 
 void TabSupervisor::processGameEventContainer(const GameEventContainer &cont)
 {
     TabGame *tab = gameTabs.value(cont.game_id());
-    if (tab)
+    if (tab) {
         tab->getGame()->getGameEventHandler()->processGameEventContainer(cont, qobject_cast<AbstractClient *>(sender()),
                                                                          {});
-    else
+    } else {
         qCInfo(TabSupervisorLog) << "gameEvent: invalid gameId" << cont.game_id();
+    }
 }
 
 void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event)
 {
+    // "Ignore all private messages" silences every PM, including messages to
+    // already-open tabs — unlike the unregistered/non-buddy filters below,
+    // which only apply when creating a new tab. Messages from moderators/admins
+    // are exempt to ensure warnings still reach users.
     QString senderName = QString::fromStdString(event.sender_name());
+    if (SettingsCache::instance().chat().getIgnoreAllPrivateMessages()) {
+        const ServerInfo_User *onlineUserInfo = userListManager->getOnlineUser(senderName);
+        if (!onlineUserInfo) {
+            return;
+        }
+        const UserLevelFlags userLevel(onlineUserInfo->user_level());
+        if (!userLevel.testFlag(ServerInfo_User::IsModerator) && !userLevel.testFlag(ServerInfo_User::IsAdmin)) {
+            return;
+        }
+    }
     TabMessage *tab = messageTabs.value(senderName);
-    if (!tab)
+    if (!tab) {
         tab = messageTabs.value(QString::fromStdString(event.receiver_name()));
+    }
     if (!tab) {
         const ServerInfo_User *onlineUserInfo = userListManager->getOnlineUser(senderName);
         if (onlineUserInfo) {
             auto userLevel = UserLevelFlags(onlineUserInfo->user_level());
-            if (SettingsCache::instance().getIgnoreUnregisteredUserMessages() &&
-                !userLevel.testFlag(ServerInfo_User::IsRegistered))
+            if (SettingsCache::instance().chat().getIgnoreUnregisteredUserMessages() &&
+                !userLevel.testFlag(ServerInfo_User::IsRegistered)) {
                 // Flags are additive, so reg/mod/admin are all IsRegistered
                 return;
+            } else if (SettingsCache::instance().chat().getIgnoreNonBuddyUserMessages() &&
+                       !userListManager->isUserBuddy(senderName) && !userLevel.testFlag(ServerInfo_User::IsModerator) &&
+                       !userLevel.testFlag(ServerInfo_User::IsAdmin)) {
+                // Ignore private messages from non-buddies
+                // Moderator/Admin messages are exempt to ensure warnings reach users
+                return;
+            }
         }
         tab = addMessageTab(QString::fromStdString(event.sender_name()), false);
     }
-    if (!tab)
+    if (!tab) {
         return;
+    }
     tab->processUserMessageEvent(event);
 }
 
@@ -1014,8 +1478,9 @@ void TabSupervisor::actShowPopup(const QString &message)
 void TabSupervisor::processUserLeft(const QString &userName)
 {
     TabMessage *tab = messageTabs.value(userName);
-    if (tab)
+    if (tab) {
         tab->processUserLeft();
+    }
 }
 
 void TabSupervisor::processUserJoined(const ServerInfo_User &userInfoJoined)
@@ -1032,15 +1497,16 @@ void TabSupervisor::processUserJoined(const ServerInfo_User &userInfoJoined)
             }
         }
 
-        if (SettingsCache::instance().getBuddyConnectNotificationsEnabled()) {
+        if (SettingsCache::instance().userInterface().getBuddyConnectNotificationsEnabled()) {
             QApplication::alert(this);
             this->actShowPopup(tr("Your buddy %1 has signed on!").arg(userName));
         }
     }
 
     TabMessage *tab = messageTabs.value(userName);
-    if (tab)
+    if (tab) {
         tab->processUserJoined(userInfoJoined);
+    }
 }
 
 void TabSupervisor::updateCurrent(int index)
@@ -1053,8 +1519,9 @@ void TabSupervisor::updateCurrent(int index)
         }
         emit setMenu(static_cast<Tab *>(widget(index))->getTabMenus());
         tab->tabActivated();
-    } else
+    } else {
         emit setMenu();
+    }
 }
 
 /**
@@ -1064,11 +1531,17 @@ void TabSupervisor::updateCurrent(int index)
  */
 bool TabSupervisor::getAdminLocked() const
 {
-    if (!tabAdmin)
+    if (!tabAdmin) {
         return true;
+    }
     return tabAdmin->getLocked();
 }
 
+bool TabSupervisor::canOverrideGameRestrictions() const
+{
+    return !getAdminLocked() || (userInfo->user_level() & ServerInfo_User::IsJudge);
+}
+
 void TabSupervisor::processNotifyUserEvent(const Event_NotifyUser &event)
 {
 
@@ -1089,12 +1562,13 @@ void TabSupervisor::processNotifyUserEvent(const Event_NotifyUser &event)
                 tr("You have been promoted. Please log out and back in for changes to take effect."));
             break;
         case Event_NotifyUser::WARNING: {
-            if (!QString::fromStdString(event.warning_reason()).simplified().isEmpty())
+            if (!QString::fromStdString(event.warning_reason()).simplified().isEmpty()) {
                 QMessageBox::warning(this, tr("Warned"),
                                      tr("You have received a warning due to %1.\nPlease refrain from engaging in this "
                                         "activity or further actions may be taken against you. If you have any "
                                         "questions, please private message a moderator.")
                                          .arg(QString::fromStdString(event.warning_reason()).simplified()));
+            }
             break;
         }
         case Event_NotifyUser::CUSTOM: {
@@ -1113,6 +1587,24 @@ void TabSupervisor::processNotifyUserEvent(const Event_NotifyUser &event)
             }
             break;
         }
+        case Event_NotifyUser::REPORT_RESOLVED: {
+            QString title = QString::fromStdString(event.custom_title()).simplified();
+            QString content = QString::fromStdString(event.custom_content()).trimmed();
+            if (!title.isEmpty() && !content.isEmpty()) {
+                actShowPopup(title + "\n" + content);
+                QApplication::alert(this);
+            }
+            break;
+        }
+        case Event_NotifyUser::REPORT_COMMENT: {
+            QString title = QString::fromStdString(event.custom_title()).simplified();
+            QString content = QString::fromStdString(event.custom_content()).trimmed();
+            if (!title.isEmpty() && !content.isEmpty()) {
+                actShowPopup(title + "\n" + content);
+                QApplication::alert(this);
+            }
+            break;
+        }
         default:;
     }
 }
diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
index 948ac6d7e..9c7dc48d1 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h
@@ -2,32 +2,42 @@
  * @file tab_supervisor.h
  * @ingroup Core
  * @ingroup Tabs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TAB_SUPERVISOR_H
 #define TAB_SUPERVISOR_H
 
-#include "../../deck_loader/deck_loader.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 "../interface/widgets/server/game_link.h"
+#include "libcockatrice/card/card_info.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;
@@ -38,9 +48,13 @@ class TabDeckStorage;
 class TabReplays;
 class TabAdmin;
 class TabMessage;
+class TabReport;
+class TabModeration;
 class TabAccount;
 class TabDeckEditor;
+class TabDeveloper;
 class TabLog;
+class TabPublicDecks;
 class RoomEvent;
 class GameEventContainer;
 class Event_GameJoined;
@@ -49,7 +63,6 @@ class Event_NotifyUser;
 class ServerInfo_Room;
 class ServerInfo_User;
 class GameReplay;
-class DeckList;
 
 class MacOSTabFixStyle : public QProxyStyle
 {
@@ -70,11 +83,7 @@ public:
     }
 
 protected:
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
     void enterEvent(QEnterEvent *event) override;
-#else
-    void enterEvent(QEvent *event) override;
-#endif
     void leaveEvent(QEvent *event) override;
     void paintEvent(QPaintEvent *event) override;
 };
@@ -103,22 +112,30 @@ private:
     TabDeckStorage *tabDeckStorage;
     TabReplays *tabReplays;
     TabAdmin *tabAdmin;
+    TabCardArtRules *tabCardArtRules;
     TabLog *tabLog;
+    TabReport *tabReport;
+    TabModeration *tabModeration;
+    TabDeveloper *tabDeveloper;
     QMap<int, TabRoom *> roomTabs;
     QMap<int, TabGame *> gameTabs;
     QList<TabGame *> replayTabs;
     QMap<QString, TabMessage *> messageTabs;
+    QMap<QString, TabPublicDecks *> publicDecksTabs;
     QList<AbstractTabDeckEditor *> deckEditorTabs;
     bool isLocalGame;
 
     QAction *aTabHome, *aTabDeckEditor, *aTabVisualDeckEditor, *aTabEdhRec, *aTabArchidekt, *aTabVisualDeckStorage,
-        *aTabVisualDatabaseDisplay, *aTabServer, *aTabAccount, *aTabDeckStorage, *aTabReplays, *aTabAdmin, *aTabLog;
+        *aTabVisualDatabaseDisplay, *aTabServer, *aTabAccount, *aTabDeckStorage, *aTabReplays, *aTabAdmin,
+        *aTabCardArtRules, *aTabLog, *aTabReport, *aTabModeration, *aTabDeveloper;
 
     int myAddTab(Tab *tab, QAction *manager = nullptr);
     void addCloseButtonToTab(Tab *tab, int tabIndex, QAction *manager);
     static QString sanitizeTabName(QString dirty);
     static QString sanitizeHtml(QString dirty);
     void resetTabsMenu();
+    /** Shared join/spectate driver behind the report tab and the profile hover card. */
+    void joinGameByIntent(int gameId, int roomId, bool asSpectator);
 
 public:
     explicit TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *parent = nullptr);
@@ -145,10 +162,18 @@ public:
         return userInfo;
     }
     [[nodiscard]] AbstractClient *getClient() const;
-    [[nodiscard]] const UserListManager *getUserListManager() const
+    [[nodiscard]] AbstractClient *getServerClient() const
+    {
+        return client;
+    }
+    [[nodiscard]] UserListManager *getUserListManager() const
     {
         return userListManager;
     }
+    [[nodiscard]] TabServer *getTabServer() const
+    {
+        return tabServer;
+    }
     [[nodiscard]] const QMap<int, TabRoom *> &getRoomTabs() const
     {
         return roomTabs;
@@ -157,7 +182,10 @@ public:
     {
         return deckEditorTabs;
     }
+    [[nodiscard]] QList<GameInviteOption> getGameInviteLinksForRoom(int roomId) const;
+    void sendInviteToUser(const QString &userName, const QString &inviteText);
     [[nodiscard]] bool getAdminLocked() const;
+    [[nodiscard]] bool canOverrideGameRestrictions() const;
     void closeEvent(QCloseEvent *event) override;
     bool switchToGameTabIfAlreadyExists(const int gameId);
     static void actShowPopup(const QString &message);
@@ -166,20 +194,28 @@ signals:
     void localGameEnded();
     void adminLockChanged(bool lock);
     void showWindowIfHidden();
+    void cockatriceLinkActivated(const QString &url);
 
 public slots:
-    void openDeckInNewTab(DeckLoader *deckToOpen);
-    TabDeckEditor *addDeckEditorTab(DeckLoader *deckToOpen);
-    TabDeckEditorVisual *addVisualDeckEditorTab(DeckLoader *deckToOpen);
+    void openDeckInNewTab(const LoadedDeck &deckToOpen);
+    TabDeckEditor *addDeckEditorTab(const LoadedDeck &deckToOpen);
+    TabDeckEditorVisual *addVisualDeckEditorTab(const LoadedDeck &deckToOpen);
     TabVisualDatabaseDisplay *addVisualDatabaseDisplayTab();
     TabEdhRecMain *addEdhrecMainTab();
     TabArchidekt *addArchidektTab();
     TabEdhRec *addEdhrecTab(const CardInfoPtr &cardToQuery, bool isCommander = false);
     void openReplay(GameReplay *replay);
+    void joinReportGame(int gameId, int roomId);
+    /** Joins or spectates a game listed on a user's profile hover card. */
+    void joinGameFromUserCard(int gameId, int roomId, bool asSpectator);
+    void openTabModeration(const QString &userName = {});
     void switchToFirstAvailableNetworkTab();
     void maximizeMainWindow();
     void actTabVisualDeckStorage(bool checked);
     void actTabReplays(bool checked);
+    void openTabServer();
+    void addRoomTab(const ServerInfo_Room &info, bool setCurrent);
+    void openTabPublicDecks(const QString &userName);
 private slots:
     void refreshShortcuts();
 
@@ -189,23 +225,30 @@ private slots:
     void actTabDeckStorage(bool checked);
     void actTabAdmin(bool checked);
     void actTabLog(bool checked);
+    void actTabReport(bool checked);
+    void actTabModeration(bool checked);
+    void actTabDeveloper(bool checked);
 
     void openTabVisualDeckStorage();
     void openTabHome();
-    void openTabServer();
     void openTabAccount();
     void openTabDeckStorage();
     void openTabReplays();
     void openTabAdmin();
+    void actTabCardArtRules(bool checked);
+    void openTabCardArtRules();
     void openTabLog();
+    void openTabReport();
+    void openTabDeveloper();
 
     void updateCurrent(int index);
     void updatePingTime(int value, int max);
+    void updateLatencyTooltip(const LatencyTracker::Stats &stats);
     void gameJoined(const Event_GameJoined &event);
     void localGameJoined(const Event_GameJoined &event);
     void gameLeft(TabGame *tab);
-    void addRoomTab(const ServerInfo_Room &info, bool setCurrent);
     void roomLeft(TabRoom *tab);
+    void publicDecksClosed(TabPublicDecks *tab);
     TabMessage *addMessageTab(const QString &userName, bool focus);
     void replayLeft(TabGame *tab);
     void processUserLeft(const QString &userName);
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 d45cdded0..f4b007072 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.cpp
@@ -1,14 +1,20 @@
 #include "tab_visual_database_display.h"
 
-#include "tab_deck_editor.h"
+#include "../visual_database_display/visual_database_display_widget.h"
+#include "card_database_model.h"
+#include "tab_supervisor.h"
+
+#include <libcockatrice/card/database/card_database_manager.h>
 
 TabVisualDatabaseDisplay::TabVisualDatabaseDisplay(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor)
 {
-    deckEditor = new TabDeckEditor(_tabSupervisor);
-    deckEditor->setHidden(true);
-    visualDatabaseDisplayWidget =
-        new VisualDatabaseDisplayWidget(this, deckEditor, deckEditor->databaseDisplayDockWidget->databaseModel,
-                                        deckEditor->databaseDisplayDockWidget->databaseDisplayModel);
+    auto databaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), true, this);
+    databaseModel->setObjectName("databaseModel");
+
+    visualDatabaseDisplayWidget = new VisualDatabaseDisplayWidget(this, databaseModel);
+
+    connect(visualDatabaseDisplayWidget, &VisualDatabaseDisplayWidget::edhrecRequested, this,
+            &TabVisualDatabaseDisplay::openEdhrecTab);
 
     setCentralWidget(visualDatabaseDisplayWidget);
 
@@ -18,3 +24,8 @@ TabVisualDatabaseDisplay::TabVisualDatabaseDisplay(TabSupervisor *_tabSupervisor
 void TabVisualDatabaseDisplay::retranslateUi()
 {
 }
+
+void TabVisualDatabaseDisplay::openEdhrecTab(const CardInfoPtr &info, bool isCommander) const
+{
+    getTabSupervisor()->addEdhrecTab(info, isCommander);
+}
\ No newline at end of file
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 66f38fb3d..31633f10c 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h
+++ b/cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h
@@ -1,30 +1,38 @@
 /**
  * @file tab_visual_database_display.h
  * @ingroup Tabs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TAB_VISUAL_DATABASE_DISPLAY_H
 #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
 
 private:
-    TabDeckEditor *deckEditor;
     VisualDatabaseDisplayWidget *visualDatabaseDisplayWidget;
 
+private slots:
+    void openEdhrecTab(const CardInfoPtr &info, bool isCommander) const;
+
 public:
     TabVisualDatabaseDisplay(TabSupervisor *_tabSupervisor);
     void retranslateUi() override;
     [[nodiscard]] QString getTabText() const override
     {
-        return visualDatabaseDisplayWidget->displayModeButton->isChecked() ? tr("Database Display")
-                                                                           : tr("Visual Database Display");
+        return visualDatabaseDisplayWidget->isVisualDisplayMode() ? tr("Visual Database Display")
+                                                                  : tr("Database Display");
     }
 };
 
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 6dd55d545..be7255dc3 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
@@ -1,32 +1,54 @@
 #include "tab_deck_editor_visual.h"
 
 #include "../../../../client/settings/cache_settings.h"
-#include "../../filters/filter_builder.h"
-#include "../../interface/pixel_map_generator.h"
-#include "../../interface/widgets/cards/card_info_frame_widget.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 "../../deck_editor/deck_state_manager.h"
+#include "../../deck_editor/deck_zone_dialog.h"
 #include "../../interface/widgets/deck_analytics/deck_analytics_widget.h"
 #include "../../interface/widgets/visual_deck_editor/visual_deck_editor_widget.h"
-#include "../tab_deck_editor.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_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 <QCloseEvent>
-#include <QCompleter>
-#include <QDir>
+#include <QApplication>
+#include <QByteArray>
+#include <QDebug>
 #include <QDockWidget>
-#include <QHeaderView>
+#include <QEvent>
+#include <QFlags>
+#include <QItemSelection>
+#include <QItemSelectionModel>
 #include <QLineEdit>
+#include <QList>
+#include <QLoggingCategory>
+#include <QMainWindow>
+#include <QMap>
 #include <QMenu>
-#include <QProcessEnvironment>
-#include <QSplitter>
-#include <QTextStream>
+#include <QMessageLogger>
+#include <QModelIndex>
+#include <QMouseEvent>
+#include <QSize>
 #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.
@@ -49,7 +71,8 @@ TabDeckEditorVisual::TabDeckEditorVisual(TabSupervisor *_tabSupervisor) : Abstra
     refreshShortcuts();
 
     loadLayout();
-    databaseDisplayDockWidget->setHidden(true);
+    filterDockWidget->setHidden(true);
+    cardDatabaseDockWidget->setHidden(true);
 }
 
 /** @brief Creates the central frame containing the tab container. */
@@ -61,9 +84,7 @@ void TabDeckEditorVisual::createCentralFrame()
     centralFrame = new QVBoxLayout;
     centralWidget->setLayout(centralFrame);
 
-    tabContainer = new TabDeckEditorVisualTabWidget(centralWidget, this, deckDockWidget->deckModel,
-                                                    databaseDisplayDockWidget->databaseModel,
-                                                    databaseDisplayDockWidget->databaseDisplayModel);
+    tabContainer = new TabDeckEditorVisualTabWidget(centralWidget, this, deckStateManager->getModel(), databaseModel);
 
     connect(tabContainer, &TabDeckEditorVisualTabWidget::cardChanged, this,
             &TabDeckEditorVisual::changeModelIndexAndCardInfo);
@@ -72,7 +93,15 @@ void TabDeckEditorVisual::createCentralFrame()
     connect(tabContainer, &TabDeckEditorVisualTabWidget::cardClicked, this,
             &TabDeckEditorVisual::processMainboardCardClick);
     connect(tabContainer, &TabDeckEditorVisualTabWidget::cardClickedDatabaseDisplay, this,
-            &TabDeckEditorVisual::processCardClickDatabaseDisplay);
+            &TabDeckEditorVisual::processDatabaseCardClick);
+
+    connect(tabContainer, &TabDeckEditorVisualTabWidget::cardAdded, this, &TabDeckEditorVisual::addCard);
+    connect(tabContainer, &TabDeckEditorVisualTabWidget::cardDecremented, this, &TabDeckEditorVisual::decrementCard);
+    connect(tabContainer, &TabDeckEditorVisualTabWidget::edhrecRequested, this, &TabDeckEditorVisual::openEdhrecTab);
+    connect(tabContainer, &TabDeckEditorVisualTabWidget::printingSelectorRequested, this,
+            &TabDeckEditorVisual::showPrintingSelector);
+    connect(tabContainer, &TabDeckEditorVisualTabWidget::cardInfoRequested, this, &TabDeckEditorVisual::updateCardInfo);
+    tabContainer->visualDatabaseDisplay->setNewZoneCreator([this] { return createNewZone(); });
 
     centralFrame->addWidget(tabContainer);
     setCentralWidget(centralWidget);
@@ -84,8 +113,35 @@ void TabDeckEditorVisual::onDeckChanged()
 {
     AbstractTabDeckEditor::onDeckModified();
     tabContainer->visualDeckView->constructZoneWidgetsFromDeckListModel();
-    tabContainer->deckAnalytics->refreshDisplays();
-    tabContainer->sampleHandWidget->setDeckModel(deckDockWidget->deckModel);
+    tabContainer->deckAnalytics->updateDisplays();
+    tabContainer->sampleHandWidget->setDeckModel(deckStateManager->getModel());
+}
+
+/** @brief Sets the deck and selects the startup sub-tab matching the context. */
+void TabDeckEditorVisual::setDeck(const LoadedDeck &_deck)
+{
+    AbstractTabDeckEditor::setDeck(_deck);
+
+    int startupTab = SettingsCache::instance().deckEditor().getVdeStartupTab();
+    if (startupTab == VdeStartupTabContext) {
+        // New (empty) decks open on the database display so cards can be added
+        // right away. Existing decks open on the deck view.
+        startupTab = _deck.isEmpty() ? VdeStartupTabDatabaseDisplay : VdeStartupTabDeckDisplay;
+    }
+
+    switch (startupTab) {
+        case VdeStartupTabDatabaseDisplay:
+            tabContainer->setCurrentIndex(TabDeckEditorVisualTabWidget::TabIndex::VisualDatabaseDisplay);
+            break;
+        case VdeStartupTabDeckDisplay:
+            tabContainer->setCurrentIndex(TabDeckEditorVisualTabWidget::TabIndex::VisualDeckView);
+            break;
+        default:
+            qCWarning(TabSupervisorLog) << "Unknown VdeStartupTab [" << startupTab
+                                        << "]; falling back to the deck view";
+            tabContainer->setCurrentIndex(TabDeckEditorVisualTabWidget::TabIndex::VisualDeckView);
+            break;
+    }
 }
 
 /** @brief Creates menus for deck editing and view options, including dock actions. */
@@ -96,45 +152,10 @@ void TabDeckEditorVisual::createMenus()
 
     viewMenu = new QMenu(this);
 
-    cardInfoDockMenu = viewMenu->addMenu(QString());
-    deckDockMenu = viewMenu->addMenu(QString());
-    filterDockMenu = viewMenu->addMenu(QString());
-    printingSelectorDockMenu = viewMenu->addMenu(QString());
-
-    aCardInfoDockVisible = cardInfoDockMenu->addAction(QString());
-    aCardInfoDockVisible->setCheckable(true);
-    connect(aCardInfoDockVisible, SIGNAL(triggered()), this, SLOT(dockVisibleTriggered()));
-    aCardInfoDockFloating = cardInfoDockMenu->addAction(QString());
-    aCardInfoDockFloating->setCheckable(true);
-    connect(aCardInfoDockFloating, SIGNAL(triggered()), this, SLOT(dockFloatingTriggered()));
-
-    aDeckDockVisible = deckDockMenu->addAction(QString());
-    aDeckDockVisible->setCheckable(true);
-    connect(aDeckDockVisible, SIGNAL(triggered()), this, SLOT(dockVisibleTriggered()));
-    aDeckDockFloating = deckDockMenu->addAction(QString());
-    aDeckDockFloating->setCheckable(true);
-    connect(aDeckDockFloating, SIGNAL(triggered()), this, SLOT(dockFloatingTriggered()));
-
-    aFilterDockVisible = filterDockMenu->addAction(QString());
-    aFilterDockVisible->setCheckable(true);
-    connect(aFilterDockVisible, SIGNAL(triggered()), this, SLOT(dockVisibleTriggered()));
-    aFilterDockFloating = filterDockMenu->addAction(QString());
-    aFilterDockFloating->setCheckable(true);
-    connect(aFilterDockFloating, SIGNAL(triggered()), this, SLOT(dockFloatingTriggered()));
-
-    aPrintingSelectorDockVisible = printingSelectorDockMenu->addAction(QString());
-    aPrintingSelectorDockVisible->setCheckable(true);
-    connect(aPrintingSelectorDockVisible, SIGNAL(triggered()), this, SLOT(dockVisibleTriggered()));
-    aPrintingSelectorDockFloating = printingSelectorDockMenu->addAction(QString());
-    aPrintingSelectorDockFloating->setCheckable(true);
-    connect(aPrintingSelectorDockFloating, SIGNAL(triggered()), this, SLOT(dockFloatingTriggered()));
-
-    if (SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) {
-        printingSelectorDockMenu->setEnabled(false);
-    }
-
-    connect(&SettingsCache::instance(), &SettingsCache::overrideAllCardArtWithPersonalPreferenceChanged, this,
-            [this](bool enabled) { printingSelectorDockMenu->setEnabled(!enabled); });
+    registerDockWidget(viewMenu, cardInfoDockWidget, {250, 500});
+    registerDockWidget(viewMenu, deckDockWidget, {250, 360});
+    // registerDockWidget(viewMenu, filterDockWidget, {250, 250});
+    registerDockWidget(viewMenu, printingSelectorDockWidget, {525, 250});
 
     viewMenu->addSeparator();
 
@@ -149,9 +170,10 @@ void TabDeckEditorVisual::createMenus()
 /** @brief Returns the tab text, prepending a mark if the deck has unsaved changes. */
 QString TabDeckEditorVisual::getTabText() const
 {
-    QString result = tr("Visual Deck: %1").arg(deckDockWidget->getSimpleDeckName());
-    if (modified)
+    QString result = tr("Visual Deck: %1").arg(deckStateManager->getSimpleDeckName());
+    if (deckStateManager->isModified()) {
         result.prepend("* ");
+    }
     return result;
 }
 
@@ -166,23 +188,21 @@ void TabDeckEditorVisual::changeModelIndexAndCardInfo(const ExactCard &activeCar
 void TabDeckEditorVisual::changeModelIndexToCard(const ExactCard &activeCard)
 {
     QString cardName = activeCard.getName();
-    QModelIndex index = deckDockWidget->deckModel->findCard(cardName, DECK_ZONE_MAIN);
+    QModelIndex index = deckStateManager->getModel()->findCard(cardName, DECK_ZONE_MAIN);
     if (!index.isValid()) {
-        index = deckDockWidget->deckModel->findCard(cardName, DECK_ZONE_SIDE);
+        index = deckStateManager->getModel()->findCard(cardName, DECK_ZONE_SIDE);
     }
     if (!deckDockWidget->getSelectionModel()->hasSelection()) {
         deckDockWidget->getSelectionModel()->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
     }
 }
 
-void TabDeckEditorVisual::processMainboardCardClick(QMouseEvent *event,
-                                                    CardInfoPictureWithTextOverlayWidget *instance,
+void TabDeckEditorVisual::processMainboardCardClick(const QMouseEvent *event,
+                                                    const ExactCard &card,
                                                     const QString &zoneName)
 {
-    auto card = instance->getCard();
-
     // Get the model index for the card
-    QModelIndex idx = deckDockWidget->deckModel->findCard(card.getName(), zoneName);
+    QModelIndex idx = deckStateManager->getModel()->findCard(card.getName(), zoneName);
     if (!idx.isValid()) {
         return;
     }
@@ -190,23 +210,24 @@ void TabDeckEditorVisual::processMainboardCardClick(QMouseEvent *event,
     QItemSelectionModel *sel = deckDockWidget->getSelectionModel();
 
     // Double click = swap
-    if (event->type() == QEvent::MouseButtonDblClick && event->button() == Qt::LeftButton) {
-        actSwapCard(card, zoneName);
-        idx = deckDockWidget->deckModel->findCard(card.getName(), zoneName);
+    if (event->type() == QEvent::MouseButtonDblClick && event->button() == Qt::LeftButton &&
+        !event->modifiers().testFlag(Qt::AltModifier)) {
+        deckStateManager->swapCardAtIndex(idx);
+        idx = deckStateManager->getModel()->findCard(card.getName(), zoneName);
         sel->setCurrentIndex(idx, QItemSelectionModel::ClearAndSelect);
         return;
     }
 
-    // Right-click = decrement
-    if (event->button() == Qt::RightButton) {
-        actDecrementCard(card);
+    // Alt + Right-click = decrement
+    if (event->button() == Qt::RightButton && event->modifiers().testFlag(Qt::AltModifier)) {
+        decrementCard(card, zoneName);
         //  Keep selection intact.
         return;
     }
 
     // Alt + Left click = increment
     if (event->button() == Qt::LeftButton && event->modifiers().testFlag(Qt::AltModifier)) {
-        // actIncrementCard(card);
+        addCard(card, zoneName);
         //  Keep selection intact.
         return;
     }
@@ -242,13 +263,16 @@ void TabDeckEditorVisual::processMainboardCardClick(QMouseEvent *event,
 }
 
 /** @brief Handles clicks on cards in the database display. */
-void TabDeckEditorVisual::processCardClickDatabaseDisplay(QMouseEvent *event,
-                                                          CardInfoPictureWithTextOverlayWidget *instance)
+void TabDeckEditorVisual::processDatabaseCardClick(const QMouseEvent *event, const ExactCard &card)
 {
     if (event->button() == Qt::LeftButton) {
-        actAddCard(instance->getCard());
+        if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
+            addCard(card, DECK_ZONE_SIDE);
+        } else {
+            addCard(card, DECK_ZONE_MAIN);
+        }
     } else if (event->button() == Qt::RightButton) {
-        actDecrementCard(instance->getCard());
+        decrementCard(card, DECK_ZONE_MAIN);
     } else if (event->button() == Qt::MiddleButton) {
         deckDockWidget->actRemoveCard();
     }
@@ -263,30 +287,17 @@ bool TabDeckEditorVisual::actSaveDeckAs()
     return result;
 }
 
-/** @brief Shows the printing selector dock and updates it with the current card. */
-void TabDeckEditorVisual::showPrintingSelector()
+/** @brief Prompts for and creates a new custom deck zone. Returns the name of the created zone. */
+QString TabDeckEditorVisual::createNewZone()
 {
-    printingSelectorDockWidget->printingSelector->setCard(cardInfoDockWidget->cardInfo->getCard().getCardPtr(),
-                                                          DECK_ZONE_MAIN);
-    printingSelectorDockWidget->printingSelector->updateDisplay();
-    aPrintingSelectorDockVisible->setChecked(true);
-    printingSelectorDockWidget->setVisible(true);
-}
-
-/** @brief Set size restrictions for free floating dock widgets. */
-void TabDeckEditorVisual::freeDocksSize()
-{
-    deckDockWidget->setMinimumSize(100, 100);
-    deckDockWidget->setMaximumSize(5000, 5000);
-
-    cardInfoDockWidget->setMinimumSize(100, 100);
-    cardInfoDockWidget->setMaximumSize(5000, 5000);
-
-    filterDockWidget->setMinimumSize(100, 100);
-    filterDockWidget->setMaximumSize(5000, 5000);
-
-    printingSelectorDockWidget->setMinimumSize(100, 100);
-    printingSelectorDockWidget->setMaximumSize(5000, 5000);
+    QString boardName;
+    const QString zoneName = DeckZoneDialog::promptForNewZone(this, {}, &boardName, [this](const QString &candidate) {
+        return deckStateManager->validateNewZoneName(candidate);
+    });
+    if (!zoneName.isEmpty()) {
+        deckStateManager->createCustomZone(boardName, zoneName);
+    }
+    return zoneName;
 }
 
 /** @brief Refreshes keyboard shortcuts for this tab from settings. */
@@ -300,83 +311,36 @@ void TabDeckEditorVisual::refreshShortcuts()
 void TabDeckEditorVisual::loadLayout()
 {
     LayoutsSettings &layouts = SettingsCache::instance().layouts();
-    auto &layoutState = layouts.getDeckEditorLayoutState();
+    auto layoutState = layouts.getVisualDeckEditorLayoutState();
     if (layoutState.isNull()) {
         restartLayout();
     } else {
         restoreState(layoutState);
-        restoreGeometry(layouts.getDeckEditorGeometry());
+        restoreGeometry(layouts.getVisualDeckEditorGeometry());
     }
-
-    if (SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) {
-        if (!printingSelectorDockWidget->isHidden()) {
-            printingSelectorDockWidget->setHidden(true);
-            aPrintingSelectorDockVisible->setChecked(false);
-        }
-    }
-
-    aCardInfoDockVisible->setChecked(!cardInfoDockWidget->isHidden());
-    aFilterDockVisible->setChecked(!filterDockWidget->isHidden());
-    aDeckDockVisible->setChecked(!deckDockWidget->isHidden());
-    aPrintingSelectorDockVisible->setChecked(!printingSelectorDockWidget->isHidden());
-
-    aCardInfoDockFloating->setEnabled(aCardInfoDockVisible->isChecked());
-    aDeckDockFloating->setEnabled(aDeckDockVisible->isChecked());
-    aFilterDockFloating->setEnabled(aFilterDockVisible->isChecked());
-    aPrintingSelectorDockFloating->setEnabled(aPrintingSelectorDockVisible->isChecked());
-
-    aCardInfoDockFloating->setChecked(cardInfoDockWidget->isFloating());
-    aFilterDockFloating->setChecked(filterDockWidget->isFloating());
-    aDeckDockFloating->setChecked(deckDockWidget->isFloating());
-    aPrintingSelectorDockFloating->setChecked(printingSelectorDockWidget->isFloating());
-
-    cardInfoDockWidget->setMinimumSize(layouts.getDeckEditorCardSize());
-    cardInfoDockWidget->setMaximumSize(layouts.getDeckEditorCardSize());
-
-    filterDockWidget->setMinimumSize(layouts.getDeckEditorFilterSize());
-    filterDockWidget->setMaximumSize(layouts.getDeckEditorFilterSize());
-
-    deckDockWidget->setMinimumSize(layouts.getDeckEditorDeckSize());
-    deckDockWidget->setMaximumSize(layouts.getDeckEditorDeckSize());
-
-    printingSelectorDockWidget->setMinimumSize(layouts.getDeckEditorPrintingSelectorSize());
-    printingSelectorDockWidget->setMaximumSize(layouts.getDeckEditorPrintingSelectorSize());
-
-    QTimer::singleShot(100, this, &TabDeckEditorVisual::freeDocksSize);
 }
 
 /** @brief Resets the layout to default positions and dock states. */
 void TabDeckEditorVisual::restartLayout()
 {
-    aCardInfoDockVisible->setChecked(true);
-    aDeckDockVisible->setChecked(true);
-    aFilterDockVisible->setChecked(false);
-    aPrintingSelectorDockVisible->setChecked(!SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference());
+    for (auto dockWidget : dockToActions.keys()) {
+        dockWidget->setFloating(false);
+    }
 
-    aCardInfoDockFloating->setChecked(false);
-    aDeckDockFloating->setChecked(false);
-    aFilterDockFloating->setChecked(false);
-    aPrintingSelectorDockFloating->setChecked(false);
+    deckDockWidget->setVisible(true);
+    cardInfoDockWidget->setVisible(true);
+    // filterDockWidget->setVisible(false);
+    printingSelectorDockWidget->setVisible(true);
 
     setCentralWidget(centralWidget);
     addDockWidget(Qt::RightDockWidgetArea, deckDockWidget);
     addDockWidget(Qt::RightDockWidgetArea, cardInfoDockWidget);
-    addDockWidget(Qt::RightDockWidgetArea, filterDockWidget);
+    // addDockWidget(Qt::RightDockWidgetArea, filterDockWidget);
     addDockWidget(Qt::RightDockWidgetArea, printingSelectorDockWidget);
 
-    deckDockWidget->setVisible(true);
-    cardInfoDockWidget->setVisible(true);
-    filterDockWidget->setVisible(false);
-    printingSelectorDockWidget->setVisible(!SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference());
-
-    deckDockWidget->setFloating(false);
-    cardInfoDockWidget->setFloating(false);
-    filterDockWidget->setFloating(false);
-    printingSelectorDockWidget->setFloating(false);
-
     splitDockWidget(cardInfoDockWidget, printingSelectorDockWidget, Qt::Vertical);
     splitDockWidget(cardInfoDockWidget, deckDockWidget, Qt::Horizontal);
-    splitDockWidget(cardInfoDockWidget, filterDockWidget, Qt::Horizontal);
+    // splitDockWidget(cardInfoDockWidget, filterDockWidget, Qt::Horizontal);
 
     QTimer::singleShot(100, this, SLOT(freeDocksSize()));
 }
@@ -388,25 +352,19 @@ void TabDeckEditorVisual::retranslateUi()
 
     cardInfoDockWidget->setWindowTitle(tr("Card Info"));
     deckDockWidget->setWindowTitle(tr("Deck"));
-    filterDockWidget->setWindowTitle(tr("Filters"));
+    // filterDockWidget->setWindowTitle(tr("Filters"));
 
     viewMenu->setTitle(tr("&View"));
-    cardInfoDockMenu->setTitle(tr("Card Info"));
-    deckDockMenu->setTitle(tr("Deck"));
-    filterDockMenu->setTitle(tr("Filters"));
-    printingSelectorDockMenu->setTitle(tr("Printing"));
 
-    aCardInfoDockVisible->setText(tr("Visible"));
-    aCardInfoDockFloating->setText(tr("Floating"));
+    dockToActions[cardInfoDockWidget].menu->setTitle(tr("Card Info"));
+    dockToActions[deckDockWidget].menu->setTitle(tr("Deck"));
+    // dockToActions[filterDockWidget].menu->setTitle(tr("Filters"));
+    dockToActions[printingSelectorDockWidget].menu->setTitle(tr("Printing"));
 
-    aDeckDockVisible->setText(tr("Visible"));
-    aDeckDockFloating->setText(tr("Floating"));
-
-    aFilterDockVisible->setText(tr("Visible"));
-    aFilterDockFloating->setText(tr("Floating"));
-
-    aPrintingSelectorDockVisible->setText(tr("Visible"));
-    aPrintingSelectorDockFloating->setText(tr("Floating"));
+    for (auto &actions : dockToActions.values()) {
+        actions.aVisible->setText(tr("Visible"));
+        actions.aFloating->setText(tr("Floating"));
+    }
 
     aResetLayout->setText(tr("Reset layout"));
 }
@@ -418,109 +376,10 @@ void TabDeckEditorVisual::retranslateUi()
  */
 bool TabDeckEditorVisual::eventFilter(QObject *o, QEvent *e)
 {
-    if (e->type() == QEvent::Close) {
-        if (o == cardInfoDockWidget) {
-            aCardInfoDockVisible->setChecked(false);
-            aCardInfoDockFloating->setEnabled(false);
-        } else if (o == deckDockWidget) {
-            aDeckDockVisible->setChecked(false);
-            aDeckDockFloating->setEnabled(false);
-        } else if (o == filterDockWidget) {
-            aFilterDockVisible->setChecked(false);
-            aFilterDockFloating->setEnabled(false);
-        } else if (o == printingSelectorDockWidget) {
-            aPrintingSelectorDockVisible->setChecked(false);
-            aPrintingSelectorDockFloating->setEnabled(false);
-        }
-    }
-
     if (o == this && e->type() == QEvent::Hide) {
         LayoutsSettings &layouts = SettingsCache::instance().layouts();
-        layouts.setDeckEditorLayoutState(saveState());
-        layouts.setDeckEditorGeometry(saveGeometry());
-        layouts.setDeckEditorCardSize(cardInfoDockWidget->size());
-        layouts.setDeckEditorFilterSize(filterDockWidget->size());
-        layouts.setDeckEditorDeckSize(deckDockWidget->size());
-        layouts.setDeckEditorPrintingSelectorSize(printingSelectorDockWidget->size());
+        layouts.setVisualDeckEditorLayoutState(saveState());
+        layouts.setVisualDeckEditorGeometry(saveGeometry());
     }
     return false;
 }
-
-/** @brief Toggles dock visibility based on the corresponding menu action. */
-void TabDeckEditorVisual::dockVisibleTriggered()
-{
-    QObject *o = sender();
-    if (o == aCardInfoDockVisible) {
-        cardInfoDockWidget->setHidden(!aCardInfoDockVisible->isChecked());
-        aCardInfoDockFloating->setEnabled(aCardInfoDockVisible->isChecked());
-        return;
-    }
-
-    if (o == aDeckDockVisible) {
-        deckDockWidget->setHidden(!aDeckDockVisible->isChecked());
-        aDeckDockFloating->setEnabled(aDeckDockVisible->isChecked());
-        return;
-    }
-
-    if (o == aFilterDockVisible) {
-        filterDockWidget->setHidden(!aFilterDockVisible->isChecked());
-        aFilterDockFloating->setEnabled(aFilterDockVisible->isChecked());
-        return;
-    }
-
-    if (o == aPrintingSelectorDockVisible) {
-        printingSelectorDockWidget->setHidden(!aPrintingSelectorDockVisible->isChecked());
-        aPrintingSelectorDockFloating->setEnabled(aPrintingSelectorDockVisible->isChecked());
-        return;
-    }
-}
-
-/** @brief Toggles dock floating state based on the corresponding menu action. */
-void TabDeckEditorVisual::dockFloatingTriggered()
-{
-    QObject *o = sender();
-    if (o == aCardInfoDockFloating) {
-        cardInfoDockWidget->setFloating(aCardInfoDockFloating->isChecked());
-        return;
-    }
-
-    if (o == aDeckDockFloating) {
-        deckDockWidget->setFloating(aDeckDockFloating->isChecked());
-        return;
-    }
-
-    if (o == aFilterDockFloating) {
-        filterDockWidget->setFloating(aFilterDockFloating->isChecked());
-        return;
-    }
-
-    if (o == aPrintingSelectorDockFloating) {
-        printingSelectorDockWidget->setFloating(aPrintingSelectorDockFloating->isChecked());
-        return;
-    }
-}
-
-/** @brief Updates menu checkboxes when a dock's top-level/floating state changes. */
-void TabDeckEditorVisual::dockTopLevelChanged(bool topLevel)
-{
-    QObject *o = sender();
-    if (o == cardInfoDockWidget) {
-        aCardInfoDockFloating->setChecked(topLevel);
-        return;
-    }
-
-    if (o == deckDockWidget) {
-        aDeckDockFloating->setChecked(topLevel);
-        return;
-    }
-
-    if (o == filterDockWidget) {
-        aFilterDockFloating->setChecked(topLevel);
-        return;
-    }
-
-    if (o == printingSelectorDockWidget) {
-        aPrintingSelectorDockFloating->setChecked(topLevel);
-        return;
-    }
-}
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 2f1d11d82..f5eb9981a 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,8 +1,19 @@
 #ifndef WINDOW_DECKEDITORVISUAL_H
 #define WINDOW_DECKEDITORVISUAL_H
 
-#include "../tab.h"
-#include "tab_deck_editor_visual_tab_widget.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;
 
 /**
  * @class TabDeckEditorVisual
@@ -41,7 +52,7 @@
  * - changeModelIndexAndCardInfo(const ExactCard &card) — Updates deck model selection and card info.
  * - changeModelIndexToCard(const ExactCard &card) — Selects the card in the deck view.
  * - processMainboardCardClick(QMouseEvent *event, ...) — Handles clicks on mainboard cards.
- * - processCardClickDatabaseDisplay(QMouseEvent *event, ...) — Handles clicks on database cards.
+ * - processDatabaseCardClick(QMouseEvent *event, ...) — Handles clicks on database cards.
  * - actSaveDeckAs() — Overrides save action with temporary UI adjustments.
  * - showPrintingSelector() — Opens the printing selector dock for the current card.
  * - freeDocksSize() — Frees constraints on dock widget sizes.
@@ -66,11 +77,6 @@ protected slots:
      */
     void restartLayout() override;
 
-    /**
-     * @brief Set size restrictions for free floating dock widgets.
-     */
-    void freeDocksSize() override;
-
     /**
      * @brief Refresh keyboard shortcuts for this tab.
      */
@@ -84,22 +90,6 @@ protected slots:
      */
     bool eventFilter(QObject *o, QEvent *e) override;
 
-    /**
-     * @brief Triggered when a dock visibility menu item is clicked.
-     */
-    void dockVisibleTriggered() override;
-
-    /**
-     * @brief Triggered when a dock floating menu item is clicked.
-     */
-    void dockFloatingTriggered() override;
-
-    /**
-     * @brief Triggered when a dock top-level state changes.
-     * @param topLevel True if the dock became floating.
-     */
-    void dockTopLevelChanged(bool topLevel) override;
-
 protected:
     TabDeckEditorVisualTabWidget *tabContainer; ///< Tab container holding different visual widgets.
 
@@ -165,33 +155,41 @@ public slots:
      */
     void onDeckChanged() override;
 
-    /**
-     * @brief Show the printing selector dock for the currently active card.
-     */
-    void showPrintingSelector() override;
-
     /**
      * @brief Handle card clicks in the mainboard visual deck.
      * @param event Mouse event triggering the action.
-     * @param instance Widget representing the clicked card.
+     * @param card The clicked card.
      * @param zoneName Deck zone of the card.
      */
-    void processMainboardCardClick(QMouseEvent *event,
-                                   CardInfoPictureWithTextOverlayWidget *instance,
-                                   const QString &zoneName);
+    void processMainboardCardClick(const QMouseEvent *event, const ExactCard &card, const QString &zoneName);
 
     /**
      * @brief Handle card clicks in the database visual display.
      * @param event Mouse event triggering the action.
-     * @param instance Widget representing the clicked card.
+     * @param card  The clicked card.
      */
-    void processCardClickDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
+    void processDatabaseCardClick(const QMouseEvent *event, const ExactCard &card);
 
     /**
      * @brief Save the deck under a new name.
      * @return true if successful, false otherwise.
      */
     bool actSaveDeckAs() override;
+
+    /**
+     * @brief Prompts for and creates a new custom deck zone.
+     * @return The name of the created zone, or an empty string if creation was cancelled.
+     */
+    QString createNewZone();
+
+private:
+    /**
+     * @brief Sets the deck for this tab and selects the sub-tab to open on
+     * startup, per the "Visual deck editor startup tab" setting (Context /
+     * Deck display / Database display).
+     * @param _deck The deck object.
+     */
+    void setDeck(const LoadedDeck &_deck) override;
 };
 
-#endif
\ No newline at end of file
+#endif
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 98b6aff00..8e01ff983 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,7 +1,24 @@
 #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.
@@ -9,7 +26,6 @@
  * @param _deckEditor Pointer to the associated deck editor.
  * @param _deckModel Pointer to the deck list model.
  * @param _cardDatabaseModel Pointer to the card database model.
- * @param _cardDatabaseDisplayModel Pointer to the card database display model.
  *
  * Initializes all sub-widgets (visual deck view, database display, deck analytics,
  * sample hand) and sets up the tab layout and signal connections.
@@ -17,10 +33,8 @@
 TabDeckEditorVisualTabWidget::TabDeckEditorVisualTabWidget(QWidget *parent,
                                                            AbstractTabDeckEditor *_deckEditor,
                                                            DeckListModel *_deckModel,
-                                                           CardDatabaseModel *_cardDatabaseModel,
-                                                           CardDatabaseDisplayModel *_cardDatabaseDisplayModel)
-    : QTabWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), cardDatabaseModel(_cardDatabaseModel),
-      cardDatabaseDisplayModel(_cardDatabaseDisplayModel)
+                                                           CardDatabaseModel *_cardDatabaseModel)
+    : QTabWidget(parent), deckEditor(_deckEditor), deckModel(_deckModel), cardDatabaseModel(_cardDatabaseModel)
 {
     this->setTabsClosable(true); // Enable tab closing
     connect(this, &QTabWidget::tabCloseRequested, this, &TabDeckEditorVisualTabWidget::handleTabClose);
@@ -28,32 +42,47 @@ TabDeckEditorVisualTabWidget::TabDeckEditorVisualTabWidget(QWidget *parent,
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
-    visualDeckView = new VisualDeckEditorWidget(this, deckModel, _deckEditor->deckDockWidget->getSelectionModel());
+    visualDeckView = new VisualDeckEditorWidget(this, deckModel, _deckEditor->deckDockWidget->getSelectionModel(),
+                                                _cardDatabaseModel);
     visualDeckView->setObjectName("visualDeckView");
     connect(visualDeckView, &VisualDeckEditorWidget::activeCardChanged, this,
             &TabDeckEditorVisualTabWidget::onCardChanged);
     connect(visualDeckView, &VisualDeckEditorWidget::cardClicked, this,
             &TabDeckEditorVisualTabWidget::onCardClickedDeckEditor);
-    connect(visualDeckView, &VisualDeckEditorWidget::cardAdditionRequested, deckEditor,
-            &AbstractTabDeckEditor::actAddCard);
+    connect(visualDeckView, &VisualDeckEditorWidget::cardAdditionRequested, this,
+            &TabDeckEditorVisualTabWidget::actAddCard);
 
-    visualDatabaseDisplay =
-        new VisualDatabaseDisplayWidget(this, deckEditor, _cardDatabaseModel, _cardDatabaseDisplayModel);
+    visualDatabaseDisplay = new VisualDatabaseDisplayWidget(this, _cardDatabaseModel, deckModel);
     visualDatabaseDisplay->setObjectName("visualDatabaseView");
     connect(visualDatabaseDisplay, &VisualDatabaseDisplayWidget::cardHoveredDatabaseDisplay, this,
             &TabDeckEditorVisualTabWidget::onCardChangedDatabaseDisplay);
     connect(visualDatabaseDisplay, &VisualDatabaseDisplayWidget::cardClickedDatabaseDisplay, this,
             &TabDeckEditorVisualTabWidget::onCardClickedDatabaseDisplay);
+    connect(visualDatabaseDisplay, &VisualDatabaseDisplayWidget::cardAdded, this,
+            &TabDeckEditorVisualTabWidget::cardAdded);
+    connect(visualDatabaseDisplay, &VisualDatabaseDisplayWidget::cardDecremented, this,
+            &TabDeckEditorVisualTabWidget::cardDecremented);
+    connect(visualDatabaseDisplay, &VisualDatabaseDisplayWidget::edhrecRequested, this,
+            &TabDeckEditorVisualTabWidget::edhrecRequested);
+    connect(visualDatabaseDisplay, &VisualDatabaseDisplayWidget::printingSelectorRequested, this,
+            &TabDeckEditorVisualTabWidget::printingSelectorRequested);
+    connect(visualDatabaseDisplay, &VisualDatabaseDisplayWidget::cardInfoRequested, this,
+            &TabDeckEditorVisualTabWidget::cardInfoRequested);
 
-    deckAnalytics = new DeckAnalyticsWidget(this, deckModel);
+    statsAnalyzer = new DeckListStatisticsAnalyzer(this, deckModel);
+    statsAnalyzer->analyze();
+
+    deckAnalytics = new DeckAnalyticsWidget(this, statsAnalyzer);
     deckAnalytics->setObjectName("deckAnalytics");
 
-    sampleHandWidget = new VisualDeckEditorSampleHandWidget(this, deckModel);
+    sampleHandWidget = new VisualDeckEditorSampleHandWidget(this, deckModel, statsAnalyzer);
 
     this->addNewTab(visualDeckView, tr("Visual Deck View"));
     this->addNewTab(visualDatabaseDisplay, tr("Visual Database Display"));
     this->addNewTab(deckAnalytics, tr("Deck Analytics"));
     this->addNewTab(sampleHandWidget, tr("Sample Hand"));
+
+    setTabsClosable(false);
 }
 
 /**
@@ -77,25 +106,24 @@ void TabDeckEditorVisualTabWidget::onCardChangedDatabaseDisplay(const ExactCard
 /**
  * @brief Emits the cardClicked signal when a card is clicked in the visual deck view.
  * @param event The mouse event.
- * @param instance The widget instance of the clicked card.
+ * @param card The clicked card.
  * @param zoneName The zone of the deck where the card is located.
  */
 void TabDeckEditorVisualTabWidget::onCardClickedDeckEditor(QMouseEvent *event,
-                                                           CardInfoPictureWithTextOverlayWidget *instance,
-                                                           QString zoneName)
+                                                           const ExactCard &card,
+                                                           const QString &zoneName)
 {
-    emit cardClicked(event, instance, zoneName);
+    emit cardClicked(event, card, zoneName);
 }
 
 /**
  * @brief Emits the cardClickedDatabaseDisplay signal when a card is clicked in the database display.
  * @param event The mouse event.
- * @param instance The widget instance of the clicked card.
+ * @param card The clicked card.
  */
-void TabDeckEditorVisualTabWidget::onCardClickedDatabaseDisplay(QMouseEvent *event,
-                                                                CardInfoPictureWithTextOverlayWidget *instance)
+void TabDeckEditorVisualTabWidget::onCardClickedDatabaseDisplay(QMouseEvent *event, const ExactCard &card)
 {
-    emit cardClickedDatabaseDisplay(event, instance);
+    emit cardClickedDatabaseDisplay(event, card);
 }
 
 /**
@@ -161,3 +189,15 @@ void TabDeckEditorVisualTabWidget::handleTabClose(int index)
     this->removeTab(index);
     delete tab;
 }
+
+void TabDeckEditorVisualTabWidget::actAddCard(const ExactCard &card)
+{
+    QString zoneName;
+    if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
+        zoneName = DECK_ZONE_SIDE;
+    } else {
+        zoneName = DECK_ZONE_MAIN;
+    }
+
+    deckEditor->addCard(card, zoneName);
+}
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 59c577024..fff978f42 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,16 +1,25 @@
 #ifndef TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_H
 #define TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_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 "libcockatrice/card/card_info.h"
 
+#include <QMouseEvent>
+#include <QString>
 #include <QTabWidget>
-#include <QVBoxLayout>
-#include <QWidget>
+#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;
 
 /**
  * @class TabDeckEditorVisualTabWidget
@@ -49,36 +58,46 @@ class TabDeckEditorVisualTabWidget : public QTabWidget
     Q_OBJECT
 
 public:
+    /**
+     * @brief Sub-tab order in the container; addNewTab() is called in this order.
+     */
+    enum TabIndex
+    {
+        VisualDeckView,
+        VisualDatabaseDisplay,
+        DeckAnalytics,
+        SampleHand,
+    };
+
     /**
      * @brief Construct the tab widget with required models.
      * @param parent Parent widget.
      * @param _deckEditor Pointer to the deck editor instance.
      * @param _deckModel Deck list model.
      * @param _cardDatabaseModel Card database model.
-     * @param _cardDatabaseDisplayModel Database display model.
      */
     explicit TabDeckEditorVisualTabWidget(QWidget *parent,
                                           AbstractTabDeckEditor *_deckEditor,
                                           DeckListModel *_deckModel,
-                                          CardDatabaseModel *_cardDatabaseModel,
-                                          CardDatabaseDisplayModel *_cardDatabaseDisplayModel);
+                                          CardDatabaseModel *_cardDatabaseModel);
 
-    /// Add a new tab with a widget and title.
+    /** @brief Add a new tab with a widget and title. */
     void addNewTab(QWidget *widget, const QString &title);
 
-    /// Remove the currently active tab.
+    /** @brief Remove the currently active tab. */
     void removeCurrentTab();
 
-    /// Set the title of a specific tab.
+    /** @brief Set the title of a specific tab. */
     void setTabTitle(int index, const QString &title);
 
-    /// Get the currently active tab widget.
+    /** @brief Get the currently active tab widget. */
     [[nodiscard]] QWidget *getCurrentTab() const;
 
-    /// Get the total number of tabs.
+    /** @brief Get the total number of tabs. */
     [[nodiscard]] int getTabCount() const;
 
-    VisualDeckEditorWidget *visualDeckView;             ///< Visual deck editor widget.
+    VisualDeckEditorWidget *visualDeckView; ///< Visual deck editor widget.
+    DeckListStatisticsAnalyzer *statsAnalyzer;
     DeckAnalyticsWidget *deckAnalytics;                 ///< Deck analytics widget.
     VisualDatabaseDisplayWidget *visualDatabaseDisplay; ///< Database display widget.
     PrintingSelector *printingSelector;                 ///< Printing selector widget.
@@ -100,30 +119,35 @@ public slots:
     /**
      * @brief Emitted when a card is clicked in the deck view.
      * @param event Mouse event.
-     * @param instance Widget representing the clicked card.
+     * @param card The clicked card.
      * @param zoneName Deck zone of the card.
      */
-    void onCardClickedDeckEditor(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
+    void onCardClickedDeckEditor(QMouseEvent *event, const ExactCard &card, const QString &zoneName);
 
     /**
      * @brief Emitted when a card is clicked in the database display.
      * @param event Mouse event.
-     * @param instance Widget representing the clicked card.
+     * @param card The clicked card.
      */
-    void onCardClickedDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
+    void onCardClickedDatabaseDisplay(QMouseEvent *event, const ExactCard &card);
 
 signals:
     void cardChanged(const ExactCard &activeCard);
     void cardChangedDatabaseDisplay(const ExactCard &activeCard);
-    void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
-    void cardClickedDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
+    void cardClicked(QMouseEvent *event, const ExactCard &card, const QString &zoneName);
+    void cardClickedDatabaseDisplay(QMouseEvent *event, const ExactCard &card);
+
+    void cardAdded(const ExactCard &card, const QString &zoneName);
+    void cardDecremented(const ExactCard &card, const QString &zoneName);
+    void edhrecRequested(const CardInfoPtr &cardInfo, bool isCommander);
+    void printingSelectorRequested();
+    void cardInfoRequested(const ExactCard &cardName);
 
 private:
-    QVBoxLayout *layout;                                ///< Layout for tabs and controls.
-    AbstractTabDeckEditor *deckEditor;                  ///< Reference to the deck editor.
-    DeckListModel *deckModel;                           ///< Deck list model.
-    CardDatabaseModel *cardDatabaseModel;               ///< Card database model.
-    CardDatabaseDisplayModel *cardDatabaseDisplayModel; ///< Card database display model.
+    QVBoxLayout *layout;                  ///< Layout for tabs and controls.
+    AbstractTabDeckEditor *deckEditor;    ///< Reference to the deck editor.
+    DeckListModel *deckModel;             ///< Deck list model.
+    CardDatabaseModel *cardDatabaseModel; ///< Card database model.
 
 private slots:
     /**
@@ -131,6 +155,12 @@ private slots:
      * @param index Index of the tab to close.
      */
     void handleTabClose(int index);
+
+    /**
+     * @brief Adds card to maindeck or side depending on whether ctrl is held
+     * @param card
+     */
+    void actAddCard(const ExactCard &card);
 };
 
 #endif // TAB_DECK_EDITOR_VISUAL_TAB_WIDGET_H
\ No newline at end of file
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 975c011dc..cb6dfab9c 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,34 +1,236 @@
 #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 <libcockatrice/protocol/pb/command_deck_del.pb.h>
+#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/pending_command.h>
+#include <libcockatrice/settings/network_settings.h>
+#include <optional>
+#include <string>
 
-TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor)
-    : Tab(_tabSupervisor), visualDeckStorageWidget(new VisualDeckStorageWidget(this))
+TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor, AbstractClient *_client)
+    : Tab(_tabSupervisor), visualDeckStorageWidget(new VisualDeckStorageWidget(this)), client(_client),
+      shareTimeoutTimer(new QTimer(this))
 {
     connect(this, &TabDeckStorageVisual::openDeckEditor, tabSupervisor, &TabSupervisor::openDeckInNewTab);
     connect(visualDeckStorageWidget, &VisualDeckStorageWidget::deckLoadRequested, this,
             &TabDeckStorageVisual::actOpenLocalDeck);
     connect(visualDeckStorageWidget, &VisualDeckStorageWidget::openDeckEditor, this,
             &TabDeckStorageVisual::openDeckEditor);
+    connect(visualDeckStorageWidget, &VisualDeckStorageWidget::shareDeckRequested, this,
+            &TabDeckStorageVisual::actShareDeck);
+    connect(visualDeckStorageWidget, &VisualDeckStorageWidget::shareSelectionChanged, this,
+            &TabDeckStorageVisual::onShareSelectionChanged);
+    connect(visualDeckStorageWidget, &VisualDeckStorageWidget::shareRequested, this, [this] {
+        if (shareDeckAvailable) {
+            enterShareMode();
+        }
+    });
 
     auto *widget = new QWidget(this);
     auto *layout = new QVBoxLayout(widget);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
     widget->setLayout(layout);
     this->setCentralWidget(widget);
     layout->addWidget(visualDeckStorageWidget);
+
+    shareBar = new ShareBarWidget(this);
+    connect(shareBar, &ShareBarWidget::createRequested, this, &TabDeckStorageVisual::actShareSelected);
+    connect(shareBar, &ShareBarWidget::cancelRequested, this, &TabDeckStorageVisual::exitShareMode);
+
+    layout->insertWidget(0, shareBar);
+    shareBar->setVisible(false);
+
+    connect(client, &AbstractClient::statusChanged, this, &TabDeckStorageVisual::handleConnectionChanged);
+    shareDeckAvailable = (client->getStatus() == StatusLoggedIn);
+    visualDeckStorageWidget->setShareAvailable(shareDeckAvailable);
+
+    shareTimeoutTimer->setSingleShot(true);
+    shareTimeoutTimer->setInterval(
+        static_cast<int>((static_cast<qint64>(SettingsCache::instance().network().getTimeOut()) + 1) *
+                         SettingsCache::instance().network().getKeepAlive() * 1000));
+    connect(shareTimeoutTimer, &QTimer::timeout, this, &TabDeckStorageVisual::onShareTimeout);
+
+    retranslateUi();
+}
+
+void TabDeckStorageVisual::retranslateUi()
+{
+    visualDeckStorageWidget->retranslateUi();
+    shareBar->retranslateUi();
+    if (shareBar->isVisible()) {
+        updateShareHint();
+    }
 }
 
 void TabDeckStorageVisual::actOpenLocalDeck(const QString &filePath)
 {
-    auto deckLoader = new DeckLoader(this);
-    if (!deckLoader->loadFromFile(filePath, DeckLoader::getFormatFromName(filePath), true)) {
+    std::optional<LoadedDeck> deckOpt =
+        DeckLoader::loadFromFile(filePath, DeckFileFormat::getFormatFromName(filePath), true);
+    if (!deckOpt) {
         QMessageBox::critical(this, tr("Error"), tr("Could not open deck at %1").arg(filePath));
         return;
     }
 
-    emit openDeckEditor(deckLoader);
+    emit openDeckEditor(deckOpt.value());
+}
+
+void TabDeckStorageVisual::enterShareMode(const QStringList &preselectFiles)
+{
+    if (!shareDeckAvailable) {
+        return; // sharing is gated on being logged in
+    }
+    shareBar->setCreateEnabled(true);
+    visualDeckStorageWidget->setShareSelectable(true);
+    visualDeckStorageWidget->setShareSelectedFiles(preselectFiles);
+    shareBar->setName(tr("Shared decks"));
+    shareBar->setVisible(true);
+    updateShareHint();
+    shareBar->focusName();
+}
+
+void TabDeckStorageVisual::exitShareMode()
+{
+    // Abandon any in-flight request: otherwise the timer keeps running and a late
+    // response reports the share as created after the user already backed out.
+    shareTimeoutTimer->stop();
+    shareInFlightSeq = 0;
+    visualDeckStorageWidget->setShareSelectable(false);
+    visualDeckStorageWidget->clearShareSelection();
+    shareBar->setVisible(false);
+}
+
+void TabDeckStorageVisual::actShareDeck(const QString &filePath)
+{
+    if (!shareDeckAvailable) {
+        QMessageBox::information(this, tr("Share deck"), tr("You must be connected to the server to share a deck."));
+        return;
+    }
+    enterShareMode({filePath});
+}
+
+void TabDeckStorageVisual::onShareSelectionChanged()
+{
+    if (shareBar->isVisible()) {
+        updateShareHint();
+    }
+}
+
+void TabDeckStorageVisual::updateShareHint()
+{
+    const int count = visualDeckStorageWidget->selectedFilePaths().size();
+    shareBar->setCountText(tr("%n deck(s)", "", count));
+    if (count == 0) {
+        shareBar->setHintText(tr("Click deck tiles to select the decks you want to share."), true);
+    } else if (count == 1) {
+        shareBar->setHintText(tr("One deck selected. Create the link to share it with other players."), true);
+    } else {
+        shareBar->setHintText(tr("%n decks selected. Create the link to share them with other players.", "", count),
+                              true);
+    }
+}
+
+void TabDeckStorageVisual::actShareSelected()
+{
+    const QStringList filePaths = visualDeckStorageWidget->selectedFilePaths();
+    if (filePaths.isEmpty()) {
+        QMessageBox::warning(this, tr("Share decks"), tr("Select at least one deck to share."));
+        return;
+    }
+
+    Command_DeckShareCreate cmd;
+    cmd.set_name(shareBar->name().toStdString());
+    if (cmd.name().empty()) {
+        cmd.set_name(tr("Shared decks").toStdString());
+    }
+
+    for (const QString &filePath : filePaths) {
+        std::optional<LoadedDeck> deckOpt =
+            DeckLoader::loadFromFile(filePath, DeckFileFormat::getFormatFromName(filePath), true);
+        if (!deckOpt) {
+            QMessageBox::warning(this, tr("Share decks"), tr("Unable to load deck file %1").arg(filePath));
+            return;
+        }
+        DeckShareItem *item = cmd.add_items();
+        item->set_deck_list(deckOpt->deckList.writeToString_Native().toStdString());
+        item->set_color_identity(getDeckColorIdentity(deckOpt->deckList, CardDatabaseManager::query()).toStdString());
+    }
+
+    shareBar->setCreateEnabled(false);
+    const int seq = ++shareRequestSeq;
+    shareInFlightSeq = seq;
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this,
+            [this, seq](const Response &response, const CommandContainer &commandContainer) {
+                if (shareInFlightSeq != seq) {
+                    return; // the user cancelled or a newer request superseded this one
+                }
+                shareInFlightSeq = 0;
+                shareFinished(response, commandContainer);
+            });
+    client->sendCommand(pend);
+    shareTimeoutTimer->start();
+}
+
+void TabDeckStorageVisual::shareFinished(const Response &response, const CommandContainer & /*commandContainer*/)
+{
+    shareTimeoutTimer->stop();
+    shareBar->setCreateEnabled(true);
+    if (response.response_code() != Response::RespOk) {
+        showShareNotice(tr("Failed to create the share link (server response code %1).")
+                            .arg(QString::number(static_cast<int>(response.response_code()))),
+                        true);
+        return;
+    }
+
+    const DeckShareUtils::ShareResponse share = DeckShareUtils::handleShareResponse(client, response);
+
+    showShareNotice(
+        tr("Share link copied to the clipboard.\nExpires on %1.").arg(DeckShareUtils::formatShareExpiry(share.expiry)));
+    exitShareMode();
+}
+
+void TabDeckStorageVisual::handleConnectionChanged(ClientStatus status)
+{
+    shareDeckAvailable = (status == StatusLoggedIn);
+    visualDeckStorageWidget->setShareAvailable(shareDeckAvailable);
+    if (!shareDeckAvailable && shareBar->isVisible()) {
+        exitShareMode();
+    }
+}
+
+void TabDeckStorageVisual::showShareNotice(const QString &message, bool warning)
+{
+    QMessageBox box(warning ? QMessageBox::Warning : QMessageBox::Information, tr("Share link"), message,
+                    QMessageBox::Ok, this);
+    box.exec();
+}
+
+void TabDeckStorageVisual::onShareTimeout()
+{
+    if (shareInFlightSeq == 0) {
+        return; // share mode was left while the request was still outstanding
+    }
+    shareInFlightSeq = 0;
+    shareBar->setCreateEnabled(true);
+    showShareNotice(tr("The server did not respond in time. Try again."), true);
 }
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 a56ce4c24..13a078fce 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
@@ -1,48 +1,81 @@
 /**
  * @file tab_deck_storage_visual.h
  * @ingroup Tabs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef TAB_DECK_STORAGE_VISUAL_H
 #define TAB_DECK_STORAGE_VISUAL_H
 
+#include "../../deck_share/share_bar_widget.h"
 #include "../tab.h"
 
-class AbstractClient;
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <qtmetamacros.h>
+
+struct LoadedDeck;
 class CommandContainer;
-class DeckLoader;
-class DeckPreviewWidget;
-class QFileSystemModel;
-class QGroupBox;
-class QToolBar;
-class QTreeView;
-class QTreeWidget;
-class QTreeWidgetItem;
+class QTimer;
 class Response;
 class VisualDeckStorageWidget;
+class TabSupervisor;
 
 class TabDeckStorageVisual final : public Tab
 {
     Q_OBJECT
 public:
-    explicit TabDeckStorageVisual(TabSupervisor *_tabSupervisor);
-    void retranslateUi() override
-    {
-    }
+    explicit TabDeckStorageVisual(TabSupervisor *_tabSupervisor, AbstractClient *_client);
+    void retranslateUi() override;
+
     [[nodiscard]] QString getTabText() const override
     {
         return tr("Visual Deck Storage");
     }
 
+    /**
+     * @brief Enters share-selection mode, optionally preselecting the given deck files.
+     */
+    void enterShareMode(const QStringList &preselectFiles = {});
+
+    /**
+     * @brief Leaves share-selection mode and clears the selection.
+     */
+    void exitShareMode();
+
+    [[nodiscard]] bool isShareModeActive() const
+    {
+        return shareBar->isVisible();
+    }
+
 public slots:
     void actOpenLocalDeck(const QString &filePath);
+    void actShareDeck(const QString &filePath);
 
 signals:
-    void openDeckEditor(DeckLoader *deckLoader);
+    void openDeckEditor(const LoadedDeck &deck);
+
+private slots:
+    void actShareSelected();
+    void shareFinished(const Response &response, const CommandContainer &commandContainer);
+    void onShareTimeout();
+    void onShareSelectionChanged();
+    void handleConnectionChanged(ClientStatus status);
 
 private:
+    void showShareNotice(const QString &message, bool warning = false);
+    void updateShareHint();
+
     VisualDeckStorageWidget *visualDeckStorageWidget;
+
+    ShareBarWidget *shareBar = nullptr;
+    AbstractClient *client;
+    QTimer *shareTimeoutTimer;
+    int shareRequestSeq = 0;
+    int shareInFlightSeq = 0;
+    bool shareDeckAvailable = false;
 };
 
 #endif
diff --git a/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp b/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp
new file mode 100644
index 000000000..8042fb9fc
--- /dev/null
+++ b/cockatrice/src/interface/widgets/utility/card_completer_delegate.cpp
@@ -0,0 +1,443 @@
+#include "card_completer_delegate.h"
+
+#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
+// ---------------------------------------------------------------------------
+
+namespace
+{
+
+struct ManaColor
+{
+    QColor fill;
+    QColor rim;
+    QColor text;
+};
+
+ManaColor manaColor(QChar symbol)
+{
+    switch (symbol.unicode()) {
+        case 'W':
+            return {QColor(248, 248, 246), QColor(190, 180, 160), QColor(80, 70, 50)};
+        case 'U':
+            return {QColor(55, 130, 210), QColor(30, 90, 160), QColor(255, 255, 255)};
+        case 'B':
+            return {QColor(90, 65, 160), QColor(55, 38, 110), QColor(220, 200, 255)};
+        case 'R':
+            return {QColor(210, 55, 55), QColor(150, 30, 30), QColor(255, 255, 255)};
+        case 'G':
+            return {QColor(45, 148, 90), QColor(28, 95, 58), QColor(255, 255, 255)};
+        default:
+            return {QColor(100, 115, 135), QColor(65, 78, 95), QColor(230, 235, 240)};
+    }
+}
+
+QColor blend(QColor a, QColor b, qreal t)
+{
+    return QColor::fromRgbF(a.redF() + (b.redF() - a.redF()) * t, a.greenF() + (b.greenF() - a.greenF()) * t,
+                            a.blueF() + (b.blueF() - a.blueF()) * t, a.alphaF() + (b.alphaF() - a.alphaF()) * t);
+}
+
+} // namespace
+
+// ---------------------------------------------------------------------------
+
+QColor CardCompleterDelegate::accentForColors(const QString &colors)
+{
+    if (colors.isEmpty()) {
+        return QColor(100, 115, 135);
+    }
+
+    QSet<QChar> seen;
+    for (const QChar c : colors) {
+        if (QString("WUBRG").contains(c)) {
+            seen.insert(c);
+        }
+    }
+
+    if (seen.size() > 1) {
+        return QColor(205, 145, 25);
+    }
+
+    if (seen.isEmpty()) {
+        return QColor(100, 115, 135);
+    }
+
+    return manaColor(*seen.begin()).fill;
+}
+
+// ---------------------------------------------------------------------------
+
+CardCompleterDelegate::CardCompleterDelegate(QObject *parent) : QStyledItemDelegate(parent)
+{
+    setCodeCache.setMaxCost(64);
+}
+
+// ---------------------------------------------------------------------------
+// sizeHint
+// ---------------------------------------------------------------------------
+
+QSize CardCompleterDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    Q_UNUSED(option)
+
+    if (!index.isValid()) {
+        return QStyledItemDelegate::sizeHint(option, index);
+    }
+
+    // Fixed wide rows so the popup has room for name, type line, set and mana
+    return {480, CardRowHeight};
+}
+
+// ---------------------------------------------------------------------------
+// Mana symbol painting
+// ---------------------------------------------------------------------------
+
+// ---------------------------------------------------------------------------
+
+void CardCompleterDelegate::drawManaSymbol(QPainter *p, QPoint centre, const QString &symbol, int radius) const
+{
+    const QRect pip(centre.x() - radius, centre.y() - radius, radius * 2, radius * 2);
+
+    const QPixmap px = ManaSymbolPixmapGenerator::generatePixmap(symbol, QSize(radius * 2, radius * 2));
+
+    if (!px.isNull()) {
+        p->drawPixmap(pip, px);
+        return;
+    }
+
+    bool isNumeric = false;
+    const int numVal = symbol.toInt(&isNumeric);
+
+    const QString label = isNumeric ? QString::number(numVal) : symbol;
+
+    const ManaColor mc =
+        (symbol.length() == 1 && QString("WUBRG").contains(symbol)) ? manaColor(symbol[0]) : manaColor(QChar('X'));
+
+    QPainterPath circle;
+    circle.addEllipse(pip);
+
+    p->save();
+    p->setClipPath(circle);
+    p->fillPath(circle, mc.fill);
+    p->restore();
+
+    p->setPen(QPen(mc.rim, 1.2));
+    p->setBrush(Qt::NoBrush);
+    p->drawEllipse(pip.adjusted(1, 1, -1, -1));
+
+    QFont f = p->font();
+    f.setPixelSize(qMax(radius - 1, 7));
+    f.setBold(true);
+
+    p->setFont(f);
+    p->setPen(mc.text);
+    p->drawText(pip, Qt::AlignCenter, label);
+}
+
+// ---------------------------------------------------------------------------
+
+int CardCompleterDelegate::drawManaCost(QPainter *p, const QRect &row, const QString &manaCost, int radius) const
+{
+    if (manaCost.isEmpty()) {
+        return row.right();
+    }
+
+    const int diam = radius * 2;
+
+    // Split, adventure, aftermath and prepare cards store both halves of the
+    // cost joined by "//" (e.g. "1W // W"); draw each half as its own group.
+    static const QRegularExpression splitRegex("\\s*//\\s*");
+
+    QList<QStringList> parts;
+
+    for (const QString &part : manaCost.split(splitRegex, Qt::SkipEmptyParts)) {
+        const QStringList symbols = ManaCostWidget::parseManaCost(part);
+
+        if (!symbols.isEmpty()) {
+            parts.append(symbols);
+        }
+    }
+
+    int totalW = 0;
+
+    for (int i = 0; i < parts.size(); ++i) {
+        if (i > 0) {
+            totalW += PartGap;
+        }
+
+        totalW += parts.at(i).size() * diam + qMax(0, parts.at(i).size() - 1) * SymbolSpacing;
+    }
+
+    const int rightPad = 14;
+
+    int x = row.right() - rightPad - totalW + radius;
+
+    const int cy = row.center().y();
+
+    for (int i = 0; i < parts.size(); ++i) {
+        const QStringList &symbols = parts.at(i);
+
+        for (const QString &sym : symbols) {
+            drawManaSymbol(p, {x, cy}, sym, radius);
+            x += diam + SymbolSpacing;
+        }
+
+        if (i < parts.size() - 1) {
+            x += PartGap - SymbolSpacing;
+        }
+    }
+
+    return row.right() - rightPad - totalW - 10;
+}
+
+// ---------------------------------------------------------------------------
+
+QString CardCompleterDelegate::setCodeForCard(const QSharedPointer<CardInfo> &card) const
+{
+    if (!card) {
+        return QString();
+    }
+
+    const QString name = card->getName();
+
+    if (setCodeCache.contains(name)) {
+        return *setCodeCache[name];
+    }
+
+    QString code;
+
+    const PrintingInfo printing = CardDatabaseManager::query()->getPreferredPrinting(card);
+
+    if (auto set = printing.getSet()) {
+        code = set->getShortName();
+    }
+
+    auto *cached = new QString(code);
+    setCodeCache.insert(name, cached);
+    return code;
+}
+
+// ---------------------------------------------------------------------------
+// paint
+// ---------------------------------------------------------------------------
+
+void CardCompleterDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    if (!index.isValid()) {
+        QStyledItemDelegate::paint(painter, option, index);
+        return;
+    }
+
+    const QRect rect = option.rect;
+    const QPalette &pal = option.palette;
+
+    const bool selected = option.state & QStyle::State_Selected;
+    const bool hovered = option.state & QStyle::State_MouseOver;
+
+    painter->save();
+    painter->setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform);
+
+    auto card = index.data(CardSearchModel::CardInfoRole).value<QSharedPointer<CardInfo>>();
+
+    if (!card) {
+        painter->fillRect(rect, pal.color(QPalette::Base));
+        painter->restore();
+        return;
+    }
+
+    const QString cardName = card->getName();
+    const QString manaCost = card->getManaCost();
+    const QString typeLine = card->getCardType();
+    const QString setCode = setCodeForCard(card);
+
+    const QColor accent = accentForColors(card->getColors());
+
+    const QColor base = pal.color(QPalette::Base);
+    const QColor textColor = pal.color(QPalette::Text);
+    const QColor secondaryColor = pal.color(QPalette::PlaceholderText);
+
+    QColor tinted = blend(base, accent, 0.40);
+
+    if (hovered) {
+        tinted = blend(tinted, Qt::white, 0.05);
+    }
+
+    const QRectF cardRect = rect.adjusted(3, 2, -3, -2);
+
+    // -----------------------------------------------------------------------
+    // Main card body
+    // -----------------------------------------------------------------------
+
+    QPainterPath path;
+    path.addRoundedRect(cardRect, 7, 7);
+
+    painter->save();
+    painter->setClipPath(path);
+
+    QLinearGradient bodyGrad(cardRect.topLeft(), cardRect.bottomLeft());
+
+    bodyGrad.setColorAt(0.0, blend(tinted, Qt::white, 0.10));
+    bodyGrad.setColorAt(1.0, blend(tinted, Qt::black, 0.18));
+
+    painter->fillPath(path, bodyGrad);
+
+    // -----------------------------------------------------------------------
+    // Accent strip
+    // -----------------------------------------------------------------------
+
+    QRectF accentRect(cardRect.left(), cardRect.top(), AccentBarWidth, cardRect.height());
+
+    QLinearGradient accentGrad(accentRect.topLeft(), accentRect.bottomLeft());
+
+    accentGrad.setColorAt(0.0, blend(accent, Qt::white, 0.20));
+    accentGrad.setColorAt(1.0, blend(accent, Qt::black, 0.25));
+
+    painter->fillRect(accentRect, accentGrad);
+
+    // -----------------------------------------------------------------------
+    // Right mana zone
+    // -----------------------------------------------------------------------
+
+    const QRectF manaZone(cardRect.right() - 110, cardRect.top(), 110, cardRect.height());
+
+    QLinearGradient manaGrad(manaZone.topLeft(), manaZone.bottomLeft());
+
+    manaGrad.setColorAt(0, QColor(0, 0, 0, 18));
+    manaGrad.setColorAt(1, QColor(0, 0, 0, 42));
+
+    painter->fillRect(manaZone, manaGrad);
+
+    painter->restore();
+
+    // -----------------------------------------------------------------------
+    // Border
+    // -----------------------------------------------------------------------
+
+    QColor border = blend(accent, Qt::black, 0.45);
+
+    if (hovered) {
+        border = blend(border, Qt::white, 0.18);
+    }
+
+    painter->setPen(QPen(border, 1.2));
+    painter->drawPath(path);
+
+    // -----------------------------------------------------------------------
+    // Selection glow
+    // -----------------------------------------------------------------------
+
+    if (selected) {
+        QColor glow = pal.color(QPalette::Highlight);
+        glow.setAlpha(30);
+
+        painter->fillPath(path, glow);
+
+        painter->setPen(QPen(pal.color(QPalette::Highlight), 2));
+        painter->drawPath(path);
+    }
+
+    // -----------------------------------------------------------------------
+    // Mana cost
+    // -----------------------------------------------------------------------
+
+    const int costLeft = drawManaCost(painter, cardRect.toRect(), manaCost, SymbolRadius);
+
+    // -----------------------------------------------------------------------
+    // Card name + type line + set code
+    // -----------------------------------------------------------------------
+
+    const int textLeft = cardRect.left() + AccentBarWidth + 12;
+    const int textRight = costLeft - 8;
+    const int textWidth = qMax(0, textRight - textLeft);
+
+    // -----------------------------------------------------------------------
+    // Card name (top band)
+    // -----------------------------------------------------------------------
+
+    {
+        const QRect nameRect(textLeft, rect.top() + 2, textWidth, 20);
+
+        QFont f = option.font;
+        f.setPixelSize(13);
+        f.setBold(true);
+
+        painter->setFont(f);
+
+        const QString nameText = QFontMetrics(f).elidedText(cardName, Qt::ElideRight, nameRect.width());
+
+        painter->setPen(QColor(0, 0, 0, 140));
+        painter->drawText(nameRect.translated(0, 1), Qt::AlignLeft | Qt::AlignVCenter, nameText);
+
+        painter->setPen(textColor);
+        painter->drawText(nameRect, Qt::AlignLeft | Qt::AlignVCenter, nameText);
+    }
+
+    // -----------------------------------------------------------------------
+    // Type line + set code (bottom band)
+    // -----------------------------------------------------------------------
+
+    {
+        const QRect infoRect(textLeft, rect.top() + 22, textWidth, rect.height() - 24);
+
+        QFont f = option.font;
+        f.setPixelSize(10);
+
+        painter->setFont(f);
+
+        QString infoLine = typeLine;
+
+        if (!setCode.isEmpty()) {
+            infoLine += " \u00b7 " + setCode;
+        }
+
+        const QString infoText = QFontMetrics(f).elidedText(infoLine, Qt::ElideRight, infoRect.width());
+
+        painter->setPen(QColor(0, 0, 0, 120));
+        painter->drawText(infoRect.translated(0, 1), Qt::AlignLeft | Qt::AlignVCenter, infoText);
+
+        painter->setPen(secondaryColor);
+        painter->drawText(infoRect, Qt::AlignLeft | Qt::AlignVCenter, infoText);
+    }
+
+    painter->restore();
+}
diff --git a/cockatrice/src/interface/widgets/utility/card_completer_delegate.h b/cockatrice/src/interface/widgets/utility/card_completer_delegate.h
new file mode 100644
index 000000000..ad81d86e4
--- /dev/null
+++ b/cockatrice/src/interface/widgets/utility/card_completer_delegate.h
@@ -0,0 +1,63 @@
+/**
+ * @file card_completer_delegate.h
+ * @ingroup UtilityWidgets
+ */
+//! \todo Document this file.
+
+#ifndef CARD_COMPLETER_DELEGATE_H
+#define CARD_COMPLETER_DELEGATE_H
+
+#include <QCache>
+#include <QColor>
+#include <QString>
+#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.
+ *
+ * Each row shows the card name, type line, set code and mana cost pips,
+ * color-coded by the card's color identity. Card data is read directly from
+ * the CardSearchModel::CardInfoRole so no extra database lookups are needed.
+ */
+class CardCompleterDelegate : public QStyledItemDelegate
+{
+    Q_OBJECT
+public:
+    explicit CardCompleterDelegate(QObject *parent = nullptr);
+
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+
+private:
+    // Set short codes, resolved once per card name and cached
+    mutable QCache<QString, QString> setCodeCache;
+
+    // Resolve the card's color string ("RG", "W", "", ...) → accent QColor
+    static QColor accentForColors(const QString &colors);
+
+    // Draw a single mana symbol pip at centre point
+    void drawManaSymbol(QPainter *p, QPoint centre, const QString &symbol, int radius) const;
+
+    // Draw all mana pips for a cost string like "2RG" or "{2}{R}{G}"; split and
+    // adventure costs ("1W // W") are drawn as separate groups. Returns the left-most x used
+    int drawManaCost(QPainter *p, const QRect &row, const QString &manaCost, int radius) const;
+
+    // Resolve the preferred printing's set short code for a card
+    QString setCodeForCard(const QSharedPointer<CardInfo> &card) const;
+
+    static constexpr int CardRowHeight = 40;
+    static constexpr int AccentBarWidth = 5;
+    static constexpr int SymbolRadius = 9;
+    static constexpr int SymbolSpacing = 2;
+    static constexpr int PartGap = 14;
+};
+
+#endif // CARD_COMPLETER_DELEGATE_H
diff --git a/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp b/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp
new file mode 100644
index 000000000..1ddcc4200
--- /dev/null
+++ b/cockatrice/src/interface/widgets/utility/card_completer_styler.cpp
@@ -0,0 +1,360 @@
+#include "card_completer_styler.h"
+
+#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
+{
+const QSize PreviewSize(300, 419);
+const int PreviewMargin = 16;
+const int FadeDuration = 120;
+} // namespace
+
+// ---------------------------------------------------------------------------
+
+void CardCompleterStyler::apply(QCompleter *completer)
+{
+    if (!completer) {
+        return;
+    }
+
+    // The styler lives as long as the completer
+    new CardCompleterStyler(completer, completer);
+}
+
+// ---------------------------------------------------------------------------
+
+CardCompleterStyler::CardCompleterStyler(QCompleter *completer, QObject *parent)
+    : QObject(parent), completer(completer), reversedModel(nullptr), preview(nullptr), above(false)
+{
+    auto *popup = completer->popup();
+
+    // Wrap the completer's model so its row order can be reversed when the
+    // popup is shown above the text edit
+    QAbstractItemModel *sourceModel = completer->model();
+    reversedModel = new ReversedCompleterModel(completer);
+    reversedModel->setSourceModel(sourceModel);
+    completer->setModel(reversedModel);
+
+    popup->setItemDelegate(new CardCompleterDelegate(popup));
+
+    popup->viewport()->setMouseTracking(true);
+
+    popup->installEventFilter(this);
+    popup->viewport()->installEventFilter(this);
+
+    connect(popup->selectionModel(), &QItemSelectionModel::currentRowChanged, this,
+            &CardCompleterStyler::updatePreview);
+    connect(completer, qOverload<const QString &>(&QCompleter::activated), this, &CardCompleterStyler::hidePreview);
+    connect(completer->completionModel(), &QAbstractItemModel::modelReset, this,
+            &CardCompleterStyler::onCompletionReset);
+}
+
+CardCompleterStyler::~CardCompleterStyler()
+{
+    if (preview) {
+        preview->deleteLater();
+    }
+}
+
+// ---------------------------------------------------------------------------
+
+bool CardCompleterStyler::eventFilter(QObject *obj, QEvent *ev)
+{
+    auto *popup = completer->popup();
+
+    if (obj == popup->viewport()) {
+        if (ev->type() == QEvent::MouseMove) {
+            updatePreviewFromHover(static_cast<QMouseEvent *>(ev)->pos());
+        }
+    } else if (obj == popup) {
+        switch (ev->type()) {
+            case QEvent::Show:
+            case QEvent::Move:
+            case QEvent::Resize:
+                updateOrientation();
+                reposition();
+                break;
+            case QEvent::Hide:
+                hidePreview();
+                break;
+            case QEvent::KeyPress:
+                if (handlePopupKeyPress(static_cast<QKeyEvent *>(ev))) {
+                    return true;
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    return QObject::eventFilter(obj, ev);
+}
+
+// ---------------------------------------------------------------------------
+
+bool CardCompleterStyler::handlePopupKeyPress(QKeyEvent *event)
+{
+    const int key = event->key();
+    if (key != Qt::Key_Up && key != Qt::Key_Down) {
+        return false;
+    }
+
+    if (!above) {
+        return false;
+    }
+
+    auto *popup = completer->popup();
+    const int rowCount = completer->completionModel()->rowCount();
+    if (rowCount == 0) {
+        return true;
+    }
+
+    // With the popup above the text edit the rows are shown in reverse order and
+    // the closest match is in the bottom-most row. The up arrow then advances
+    // through the list (towards its end at the top of the popup).
+    const int currentRow = popup->currentIndex().row();
+    const int step = (key == Qt::Key_Up) ? -1 : 1;
+    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);
+    }
+
+    return true;
+}
+
+// ---------------------------------------------------------------------------
+
+void CardCompleterStyler::updateOrientation()
+{
+    above = isPopupAboveWidget();
+    reversedModel->setEnabled(above);
+}
+
+// ---------------------------------------------------------------------------
+
+void CardCompleterStyler::ensureClosestSelected()
+{
+    auto *popup = completer->popup();
+    auto *completionModel = completer->completionModel();
+    const int rowCount = completionModel->rowCount();
+    if (rowCount == 0) {
+        return;
+    }
+
+    const int currentRow = popup->currentIndex().row();
+    const int closestRow = rowCount - 1;
+
+    if (currentRow != closestRow) {
+        popup->selectionModel()->setCurrentIndex(completionModel->index(closestRow, completer->completionColumn()),
+                                                 QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+    }
+}
+
+// ---------------------------------------------------------------------------
+
+void CardCompleterStyler::onCompletionReset()
+{
+    if (above) {
+        ensureClosestSelected();
+    }
+}
+
+// ---------------------------------------------------------------------------
+
+bool CardCompleterStyler::isPopupAboveWidget() const
+{
+    auto *popup = completer->popup();
+    QWidget *widget = completer->widget();
+
+    if (!widget || !popup->isVisible()) {
+        return false;
+    }
+
+    const QPoint popupBottom = popup->mapToGlobal(QPoint(0, popup->height()));
+    const QPoint fieldTop = widget->mapToGlobal(QPoint(0, 0));
+
+    return popupBottom.y() <= fieldTop.y();
+}
+
+// ---------------------------------------------------------------------------
+
+void CardCompleterStyler::updatePreviewFromHover(const QPoint &pos)
+{
+    const QModelIndex index = completer->popup()->indexAt(pos);
+
+    // Hovering updates the preview but must not change the current completion
+    if (index.isValid() && index != previewedIndex) {
+        updatePreview(index);
+    }
+}
+
+// ---------------------------------------------------------------------------
+
+void CardCompleterStyler::updatePreview(const QModelIndex &index)
+{
+    previewedIndex = index;
+
+    if (!index.isValid()) {
+        hidePreview();
+        return;
+    }
+
+    auto card = index.data(CardSearchModel::CardInfoRole).value<QSharedPointer<CardInfo>>();
+
+    if (!card) {
+        hidePreview();
+        return;
+    }
+
+    if (!preview) {
+        QWidget *contextWindow = completer->widget() ? completer->widget()->window() : nullptr;
+
+        preview = new CardInfoPictureEnlargedWidget(contextWindow);
+        preview->hide();
+        preview->setWindowOpacity(0.0);
+    }
+
+    const ExactCard exact = CardDatabaseManager::query()->getCard({card->getName()});
+
+    if (!exact) {
+        hidePreview();
+        return;
+    }
+
+    preview->setCardPixmap(exact, PreviewSize);
+
+    reposition();
+    showPreview();
+}
+
+// ---------------------------------------------------------------------------
+
+void CardCompleterStyler::showPreview()
+{
+    if (!preview) {
+        return;
+    }
+
+    stopPreviewFade();
+
+    preview->show();
+    preview->raise();
+
+    auto *fade = new QPropertyAnimation(preview, "windowOpacity", preview);
+
+    fade->setDuration(FadeDuration);
+    fade->setStartValue(preview->windowOpacity());
+    fade->setEndValue(1.0);
+    fade->start(QAbstractAnimation::DeleteWhenStopped);
+}
+
+// ---------------------------------------------------------------------------
+
+void CardCompleterStyler::hidePreview()
+{
+    if (!preview) {
+        return;
+    }
+
+    // Stop any in-flight fade first so a stale one cannot keep the preview visible
+    stopPreviewFade();
+    preview->hide();
+}
+
+// ---------------------------------------------------------------------------
+
+void CardCompleterStyler::stopPreviewFade()
+{
+    if (!preview) {
+        return;
+    }
+
+    const auto animations = preview->findChildren<QPropertyAnimation *>();
+    for (auto *animation : animations) {
+        animation->stop();
+    }
+}
+
+// ---------------------------------------------------------------------------
+
+void CardCompleterStyler::reposition()
+{
+    if (!preview) {
+        return;
+    }
+
+    auto *popup = completer->popup();
+
+    const QRect popupGlobalRect(popup->mapToGlobal(popup->rect().topLeft()), popup->rect().size());
+
+    int anchorY;
+
+    if (previewedIndex.isValid()) {
+        const QRect itemRect = popup->visualRect(previewedIndex);
+        const QPoint itemCenter = popup->viewport()->mapToGlobal(itemRect.center());
+        anchorY = itemCenter.y();
+    } else {
+        anchorY = popupGlobalRect.center().y();
+    }
+
+    const QScreen *screen = popup->screen();
+    const QRect screenGeom = screen ? screen->availableGeometry() : QRect();
+
+    const int rightX = popupGlobalRect.right() + PreviewMargin;
+    const int leftX = popupGlobalRect.left() - PreviewMargin - preview->width();
+
+    int x;
+    int y = anchorY - preview->height() / 2;
+
+    if (screenGeom.isEmpty()) {
+        x = rightX;
+    } else if (rightX + preview->width() <= screenGeom.right()) {
+        x = rightX;
+    } else if (leftX >= screenGeom.left()) {
+        x = leftX;
+    } else {
+        x = rightX;
+    }
+
+    if (!screenGeom.isEmpty()) {
+        x = qBound(screenGeom.left(), x, qMax(screenGeom.left(), screenGeom.right() - preview->width()));
+        y = qBound(screenGeom.top(), y, qMax(screenGeom.top(), screenGeom.bottom() - preview->height()));
+    }
+
+    preview->move(x, y);
+}
diff --git a/cockatrice/src/interface/widgets/utility/card_completer_styler.h b/cockatrice/src/interface/widgets/utility/card_completer_styler.h
new file mode 100644
index 000000000..9245c9095
--- /dev/null
+++ b/cockatrice/src/interface/widgets/utility/card_completer_styler.h
@@ -0,0 +1,68 @@
+/**
+ * @file card_completer_styler.h
+ * @ingroup UtilityWidgets
+ */
+//! \todo Document this file.
+
+#ifndef CARD_COMPLETER_STYLER_H
+#define CARD_COMPLETER_STYLER_H
+
+#include <QModelIndex>
+#include <QObject>
+#include <qtmetamacros.h>
+
+class CardInfoPictureEnlargedWidget;
+class QCompleter;
+class QKeyEvent;
+class QPoint;
+class ReversedCompleterModel;
+
+/**
+ * @brief Applies styled row painting and a card-image preview to a card completer.
+ *
+ * The completer popup rows are painted by CardCompleterDelegate and the image of
+ * the currently selected (or hovered) row is shown beside the popup.
+ */
+class CardCompleterStyler : public QObject
+{
+    Q_OBJECT
+public:
+    /**
+     * @brief Styles @p completer and follows its current selection.
+     *
+     * The styler is parented to the completer so it lives exactly as long as the
+     * completer itself.
+     */
+    static void apply(QCompleter *completer);
+
+protected:
+    bool eventFilter(QObject *obj, QEvent *ev) override;
+
+private slots:
+    void updatePreview(const QModelIndex &index);
+    void updatePreviewFromHover(const QPoint &pos);
+    void onCompletionReset();
+
+private:
+    explicit CardCompleterStyler(QCompleter *completer, QObject *parent = nullptr);
+    ~CardCompleterStyler() override;
+
+    void showPreview();
+    void hidePreview();
+    void stopPreviewFade();
+    void reposition();
+
+    void updateOrientation();
+    void ensureClosestSelected();
+
+    bool handlePopupKeyPress(QKeyEvent *event);
+    bool isPopupAboveWidget() const;
+
+    QCompleter *completer;
+    ReversedCompleterModel *reversedModel;
+    CardInfoPictureEnlargedWidget *preview;
+    QModelIndex previewedIndex;
+    bool above;
+};
+
+#endif // CARD_COMPLETER_STYLER_H
diff --git a/cockatrice/src/interface/widgets/utility/compact_push_button.cpp b/cockatrice/src/interface/widgets/utility/compact_push_button.cpp
new file mode 100644
index 000000000..7df105d15
--- /dev/null
+++ b/cockatrice/src/interface/widgets/utility/compact_push_button.cpp
@@ -0,0 +1,77 @@
+#include "compact_push_button.h"
+
+#include <QFontMetrics>
+#include <QSizePolicy>
+#include <QWidget>
+
+CompactPushButton::CompactPushButton(QWidget *parent) : QPushButton(parent)
+{
+    setCheckable(true);
+    setFixedHeight(32);
+
+    // default sizing
+    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+
+    connect(this, &QPushButton::clicked, this, [] {
+        // your popup logic here
+    });
+}
+
+void CompactPushButton::setButtonText(const QString &text)
+{
+    fullText = text;
+
+    if (!compact) {
+        setText(fullText);
+    }
+
+    updateGeometryState();
+}
+
+void CompactPushButton::setButtonIcon(const QIcon &icon)
+{
+    setIcon(icon);
+}
+
+void CompactPushButton::setCompact(bool enabled)
+{
+    compact = enabled;
+
+    if (compact) {
+        setText(QString()); // icon only
+    } else {
+        setText(fullText);
+    }
+
+    updateGeometryState();
+}
+
+void CompactPushButton::updateGeometryState()
+{
+    const int buttonHeight = 32;
+
+    setMinimumHeight(buttonHeight);
+    setMaximumHeight(buttonHeight);
+
+    if (compact) {
+        setMinimumWidth(buttonHeight);
+        setMaximumWidth(buttonHeight);
+    } else {
+        setMinimumWidth(0);
+        setMaximumWidth(QWIDGETSIZE_MAX);
+    }
+
+    updateGeometry();
+}
+
+int CompactPushButton::expandedWidth() const
+{
+    QFontMetrics fm(font());
+
+    return fm.horizontalAdvance(fullText) + 48; // icon + padding
+}
+
+int CompactPushButton::compactWidth() const
+{
+    return 32;
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/utility/compact_push_button.h b/cockatrice/src/interface/widgets/utility/compact_push_button.h
new file mode 100644
index 000000000..fa8c8080a
--- /dev/null
+++ b/cockatrice/src/interface/widgets/utility/compact_push_button.h
@@ -0,0 +1,36 @@
+#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
+{
+    Q_OBJECT
+
+public:
+    explicit CompactPushButton(QWidget *parent = nullptr);
+
+    void setButtonText(const QString &text);
+
+    void setButtonIcon(const QIcon &icon);
+
+    void setCompact(bool enabled);
+
+    int expandedWidth() const;
+
+    int compactWidth() const;
+
+private:
+    void updateGeometryState();
+
+private:
+    QString fullText;
+    bool compact = false;
+};
+
+#endif // COCKATRICE_COMPACT_PUSH_BUTTON_H
diff --git a/cockatrice/src/interface/widgets/utility/completer_utils.cpp b/cockatrice/src/interface/widgets/utility/completer_utils.cpp
new file mode 100644
index 000000000..f1cd9c6a7
--- /dev/null
+++ b/cockatrice/src/interface/widgets/utility/completer_utils.cpp
@@ -0,0 +1,125 @@
+#include "completer_utils.h"
+
+#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/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();
+    searchModel->setSearchLanguage(CardSearchLanguage{
+        cardsDisplay.getCardLang(), static_cast<SearchLanguageMode>(cardsDisplay.getCardSearchLanguage())});
+}
+} // namespace
+
+CardCompleterSetup createCardCompleter(CardDatabaseDisplayModel *displayModel, QObject *parent, int maxVisibleItems)
+{
+    auto *searchModel = new CardSearchModel(displayModel, parent);
+    applyCardSearchLanguage(searchModel);
+
+    auto *proxyModel = new CardCompleterProxyModel(parent);
+    proxyModel->setSourceModel(searchModel);
+    proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
+
+    auto *completer = new QCompleter(proxyModel, parent);
+    completer->setCompletionRole(Qt::DisplayRole);
+    completer->setCompletionMode(QCompleter::PopupCompletion);
+    completer->setCaseSensitivity(Qt::CaseInsensitive);
+    completer->setFilterMode(Qt::MatchContains);
+    completer->setMaxVisibleItems(maxVisibleItems);
+    CardCompleterStyler::apply(completer);
+
+    auto *cardsDisplay = &SettingsCache::instance().cardsDisplay();
+    QObject::connect(cardsDisplay, &CardsDisplaySettings::cardLangChanged, searchModel,
+                     [searchModel] { applyCardSearchLanguage(searchModel); });
+    QObject::connect(cardsDisplay, &CardsDisplaySettings::cardSearchLanguageChanged, searchModel,
+                     [searchModel] { applyCardSearchLanguage(searchModel); });
+
+    return {searchModel, proxyModel, completer};
+}
+
+void connectCardCompleterSearch(QLineEdit *edit, const CardCompleterSetup &setup)
+{
+    QObject::connect(edit, &QLineEdit::textEdited, setup.searchModel, &CardSearchModel::updateSearchResults);
+    QObject::connect(edit, &QLineEdit::textEdited, setup.completer, [setup](const QString &text) {
+        setup.proxyModel->setFilterRegularExpression(
+            QRegularExpression(QRegularExpression::escape(text), QRegularExpression::CaseInsensitiveOption));
+        if (!text.isEmpty()) {
+            setup.completer->complete();
+        }
+    });
+}
+
+QCompleter *createMentionCompleter(QStringListModel *model, QObject *parent)
+{
+    auto *completer = new QCompleter(model, 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/completer_utils.h b/cockatrice/src/interface/widgets/utility/completer_utils.h
new file mode 100644
index 000000000..5d2ddfc30
--- /dev/null
+++ b/cockatrice/src/interface/widgets/utility/completer_utils.h
@@ -0,0 +1,32 @@
+/**
+ * @file completer_utils.h
+ * @ingroup UtilityWidgets
+ */
+//! \todo Document this file.
+
+#ifndef COMPLETER_UTILS_H
+#define COMPLETER_UTILS_H
+
+class CardCompleterProxyModel;
+class CardDatabaseDisplayModel;
+class CardSearchModel;
+class QCompleter;
+class QLineEdit;
+class QObject;
+class QStringListModel;
+
+struct CardCompleterSetup
+{
+    CardSearchModel *searchModel;
+    CardCompleterProxyModel *proxyModel;
+    QCompleter *completer;
+};
+
+CardCompleterSetup
+createCardCompleter(CardDatabaseDisplayModel *displayModel, QObject *parent, int maxVisibleItems = 10);
+
+void connectCardCompleterSearch(QLineEdit *edit, const CardCompleterSetup &setup);
+
+QCompleter *createMentionCompleter(QStringListModel *model, QObject *parent);
+
+#endif // CARD_COMPLETER_UTILS_H
diff --git a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
index c137b4f35..d524041c3 100644
--- a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
+++ b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp
@@ -3,11 +3,17 @@
 #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 <QObject>
+#include <QList>
+#include <QString>
 #include <QTreeView>
-#include <QWidget>
+#include <QVector>
+#include <qnamespace.h>
 
 LineEditUnfocusable::LineEditUnfocusable(QWidget *parent) : QLineEdit(parent)
 {
@@ -24,14 +30,18 @@ bool LineEditUnfocusable::isUnfocusShortcut(QKeyEvent *event)
     QString modifier;
     QString keyNoMod;
 
-    if (event->modifiers() & Qt::ShiftModifier)
+    if (event->modifiers() & Qt::ShiftModifier) {
         modifier += "Shift+";
-    if (event->modifiers() & Qt::ControlModifier)
+    }
+    if (event->modifiers() & Qt::ControlModifier) {
         modifier += "Ctrl+";
-    if (event->modifiers() & Qt::AltModifier)
+    }
+    if (event->modifiers() & Qt::AltModifier) {
         modifier += "Alt+";
-    if (event->modifiers() & Qt::MetaModifier)
+    }
+    if (event->modifiers() & Qt::MetaModifier) {
         modifier += "Meta+";
+    }
 
     keyNoMod = QKeySequence(event->key()).toString();
 
@@ -39,8 +49,9 @@ bool LineEditUnfocusable::isUnfocusShortcut(QKeyEvent *event)
     QList<QKeySequence> unfocusShortcut = SettingsCache::instance().shortcuts().getShortcut("Player/unfocusTextBox");
 
     for (const auto &unfocusKey : unfocusShortcut) {
-        if (key.matches(unfocusKey) == QKeySequence::ExactMatch)
+        if (key.matches(unfocusKey) == QKeySequence::ExactMatch) {
             return true;
+        }
     }
     return false;
 }
@@ -79,10 +90,12 @@ void SearchLineEdit::keyPressEvent(QKeyEvent *event)
     static const QVector<Qt::Key> forwardWhenEmpty = {Qt::Key_Home, Qt::Key_End};
     Qt::Key key = static_cast<Qt::Key>(event->key());
     if (treeView) {
-        if (forwardToTreeView.contains(key))
+        if (forwardToTreeView.contains(key)) {
             QCoreApplication::sendEvent(treeView, event);
-        if (text().isEmpty() && forwardWhenEmpty.contains(key))
+        }
+        if (text().isEmpty() && forwardWhenEmpty.contains(key)) {
             QCoreApplication::sendEvent(treeView, event);
+        }
     }
     LineEditUnfocusable::keyPressEvent(event);
 }
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/utility/custom_line_edit.h b/cockatrice/src/interface/widgets/utility/custom_line_edit.h
index 2026c1c1c..4d256d3dc 100644
--- a/cockatrice/src/interface/widgets/utility/custom_line_edit.h
+++ b/cockatrice/src/interface/widgets/utility/custom_line_edit.h
@@ -1,13 +1,14 @@
 /**
  * @file custom_line_edit.h
  * @ingroup UI
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CUSTOMLINEEDIT_H
 #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 134352eb3..1a1bc924d 100644
--- a/cockatrice/src/interface/widgets/utility/get_text_with_max.cpp
+++ b/cockatrice/src/interface/widgets/utility/get_text_with_max.cpp
@@ -2,6 +2,8 @@
 
 #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 923d6f427..f1c89c703 100644
--- a/cockatrice/src/interface/widgets/utility/get_text_with_max.h
+++ b/cockatrice/src/interface/widgets/utility/get_text_with_max.h
@@ -8,8 +8,11 @@
 #define GETTEXTWITHMAX_H
 
 #include <QLineEdit>
-#include <QWidget>
-#include <libcockatrice/utility/trice_limits.h>
+#include <QString>
+#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 389e69d57..d692fb41b 100644
--- a/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp
+++ b/cockatrice/src/interface/widgets/utility/line_edit_completer.cpp
@@ -1,132 +1,272 @@
 #include "line_edit_completer.h"
 
+#include <QAbstractItemModel>
 #include <QAbstractItemView>
+#include <QChar>
 #include <QCompleter>
 #include <QFocusEvent>
-#include <QScrollBar>
-#include <QStringListModel>
-#include <QTextCursor>
-#include <QWidget>
+#include <QItemSelectionModel>
+#include <QKeyEvent>
+#include <QModelIndex>
+#include <QVariant>
+#include <QtGlobal>
+#include <qnamespace.h>
 
-LineEditCompleter::LineEditCompleter(QWidget *parent) : LineEditUnfocusable(parent), c(nullptr)
+class QWidget;
+
+LineEditCompleter::LineEditCompleter(QWidget *parent) : LineEditUnfocusable(parent)
 {
 }
 
+void LineEditCompleter::addCompleter(QCompleter *c, CompleterTrigger trigger)
+{
+    c->setWidget(this);
+    c->setCompletionMode(QCompleter::PopupCompletion);
+    c->setCaseSensitivity(Qt::CaseInsensitive);
+    connect(c, qOverload<const QString &>(&QCompleter::activated), this,
+            qOverload<const QString &>(&LineEditCompleter::insertCompletion));
+
+    completers.append({c, trigger});
+}
+
+bool LineEditCompleter::hasVisibleCompleterPopup() const
+{
+    for (const auto &info : completers) {
+        if (info.completer->popup()->isVisible()) {
+            return true;
+        }
+    }
+    return false;
+}
+
+void LineEditCompleter::hideCompleterPopups()
+{
+    for (const auto &info : completers) {
+        info.completer->popup()->hide();
+    }
+}
+
 void LineEditCompleter::focusOutEvent(QFocusEvent *e)
 {
     LineEditUnfocusable::focusOutEvent(e);
-    if (c->popup()->isVisible()) {
-        // Remove Popup
-        c->popup()->hide();
-        // Truncate the line to last space or whole string
-        QString textValue = text();
-        int lastIndex = textValue.length();
-        int lastWordStartIndex = textValue.lastIndexOf(" ") + 1;
-        int leftShift = qMin(lastIndex, lastWordStartIndex);
-        setText(textValue.left(leftShift));
-        // Insert highlighted line from popup
-        insert(c->completionModel()->index(c->popup()->currentIndex().row(), 0).data().toString() + " ");
-        // Set focus back to the textbox since tab was pressed
-        setFocus();
+
+    // Commit completion when focus moves away via Tab if popup is visible.
+    // Other focus losses (e.g. the unfocus shortcut / Escape) must simply close
+    // the popup without inserting anything.
+    bool popupWasVisible = false;
+    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);
+            }
+        }
+    }
+    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)
 {
-    switch (event->key()) {
-        case Qt::Key_Return:
-        case Qt::Key_Enter:
-        case Qt::Key_Escape:
-            if (c->popup()->isVisible()) {
+    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();
-                // Remove Popup
-                c->popup()->hide();
-                // Truncate the line to last space or whole string
-                QString textValue = text();
-                int lastIndexof = qMax(0, textValue.lastIndexOf(" "));
-                QString finalString = textValue.left(lastIndexof);
-                // Add a space if there's a word
-                if (finalString != "")
-                    finalString += " ";
-                setText(finalString);
+                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;
             }
-            break;
-        case Qt::Key_Space:
-            if (c->popup()->isVisible()) {
-                event->ignore();
-                // Remove Popup
-                c->popup()->hide();
-                // Truncate the line to last space or whole string
-                QString textValue = text();
-                int lastIndex = textValue.length();
-                int lastWordStartIndex = textValue.lastIndexOf(" ") + 1;
-                int leftShift = qMin(lastIndex, lastWordStartIndex);
-                setText(textValue.left(leftShift));
-                // Insert highlighted line from popup
-                insert(c->completionModel()->index(c->popup()->currentIndex().row(), 0).data().toString() + " ");
-                return;
-            }
-            break;
-        default:
-            break;
+        }
+    }
+
+    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);
-    // return if the completer is null or if the most recently typed char was '@'.
-    // Only want the popup AFTER typing the first char of the mention.
-    if (!c || text().right(1).contains("@")) {
-        c->popup()->hide();
+
+    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;
+                    // Keep the "@" so the prefix matches the "@"-prefixed mention model entries.
+                    prefix = textValue.mid(triggerPos, cursorPos - triggerPos);
+                }
+                break;
+            }
+            case CompleterTrigger::Card: {
+                int triggerPos = textValue.lastIndexOf("[[", cursorPos - 1);
+                int closePos = textValue.indexOf("]]", triggerPos + 2);
+                if (triggerPos != -1 && (closePos == -1 || closePos >= cursorPos)) {
+                    triggered = true;
+                    prefix = textValue.mid(triggerPos + 2, cursorPos - (triggerPos + 2));
+                }
+                break;
+            }
+        }
+
+        if (triggered) {
+            active = &info;
+            break;
+        }
+    }
+
+    if (!active) {
+        for (auto &info : completers) {
+            info.completer->popup()->hide();
+        }
         return;
     }
 
-    // Set new completion prefix
-    c->setCompletionPrefix(cursorWord(text()));
-    if (c->completionPrefix().length() < 1) {
-        c->popup()->hide();
-        return;
+    active->completer->setCompletionPrefix(prefix);
+
+    switch (active->trigger) {
+        case CompleterTrigger::Card:
+            emit cardPartialChanged(prefix);
+            return;
+        case CompleterTrigger::Mention:
+            break;
     }
 
-    // Draw completion box
-    QRect cr = cursorRect();
-    cr.setWidth(c->popup()->sizeHintForColumn(0) + c->popup()->verticalScrollBar()->sizeHint().width());
-    c->complete(cr);
+    active->completer->complete();
 
-    // Select first item in the completion popup
-    QItemSelectionModel *sm = new QItemSelectionModel(c->completionModel());
-    c->popup()->setSelectionModel(sm);
-    sm->select(c->completionModel()->index(0, 0), QItemSelectionModel::ClearAndSelect);
-    sm->setCurrentIndex(c->completionModel()->index(0, 0), QItemSelectionModel::NoUpdate);
+    // 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);
+    }
 }
 
-QString LineEditCompleter::cursorWord(const QString &line) const
+void LineEditCompleter::insertCompletion(const QString &completion)
 {
-    return line.mid(line.left(cursorPosition()).lastIndexOf(" ") + 1,
-                    cursorPosition() - line.left(cursorPosition()).lastIndexOf(" ") - 1);
+    for (auto &info : completers) {
+        if (info.completer == sender()) {
+            insertCompletion(info.completer, completion);
+            return;
+        }
+    }
 }
 
-void LineEditCompleter::insertCompletion(QString arg)
+void LineEditCompleter::insertCompletion(QCompleter *completer, const QString &completion)
 {
-    QString s_arg = arg + " ";
-    setText(text().replace(text().left(cursorPosition()).lastIndexOf(" ") + 1,
-                           cursorPosition() - text().left(cursorPosition()).lastIndexOf(" ") - 1, s_arg));
-}
+    QString t = text();
+    int pos = cursorPosition();
 
-void LineEditCompleter::setCompleter(QCompleter *completer)
-{
-    c = completer;
-    c->setWidget(this);
-    connect(c, qOverload<const QString &>(&QCompleter::activated), this, &LineEditCompleter::insertCompletion);
-}
+    for (const auto &info : completers) {
+        if (info.completer != completer) {
+            continue;
+        }
 
-void LineEditCompleter::setCompletionList(QStringList completionList)
-{
-    if (!c || c->popup()->isVisible())
-        return;
+        switch (info.trigger) {
+            case CompleterTrigger::Card: {
+                int triggerPos = t.lastIndexOf("[[", pos - 1);
+                if (triggerPos == -1) {
+                    return;
+                }
 
-    QStringListModel *model;
-    model = (QStringListModel *)(c->model());
-    if (model == NULL)
-        model = new QStringListModel();
-    model->setStringList(completionList);
+                // If an earlier "[[" is still open it also encloses the cursor, so
+                // replace from its start. Otherwise completing in text such as
+                // "[[Opt[[Amok" would leave a stray "[[" behind.
+                int startPos = triggerPos;
+                for (int searchFrom = triggerPos; searchFrom > 0;) {
+                    const int earlier = t.lastIndexOf("[[", searchFrom - 1);
+                    if (earlier == -1) {
+                        break;
+                    }
+                    const int earlierClose = t.indexOf("]]", earlier + 2);
+                    if (earlierClose != -1 && earlierClose < pos) {
+                        break;
+                    }
+                    startPos = earlier;
+                    searchFrom = earlier;
+                }
+
+                // If the cursor sits inside an already-closed [[...]] pair, replace
+                // the whole construct instead of leaving a duplicate closing bracket
+                // behind.
+                int insertEnd = pos;
+                const int closePos = t.indexOf("]]", startPos + 2);
+                if (closePos != -1 && closePos >= pos) {
+                    insertEnd = closePos + 2;
+                }
+
+                QString after = t.mid(insertEnd);
+                QString replaced = t.left(startPos + 2) + completion + "]] ";
+                setText(replaced + after);
+                setCursorPosition(replaced.length());
+                return;
+            }
+            case CompleterTrigger::Mention: {
+                int triggerPos = t.lastIndexOf("@", pos - 1);
+                if (triggerPos == -1) {
+                    return;
+                }
+                setText(t.replace(triggerPos, pos - triggerPos, completion + " "));
+                setCursorPosition(triggerPos + completion.length() + 1);
+                return;
+            }
+        }
+    }
 }
diff --git a/cockatrice/src/interface/widgets/utility/line_edit_completer.h b/cockatrice/src/interface/widgets/utility/line_edit_completer.h
index 7b3756e3c..c141682bf 100644
--- a/cockatrice/src/interface/widgets/utility/line_edit_completer.h
+++ b/cockatrice/src/interface/widgets/utility/line_edit_completer.h
@@ -1,33 +1,58 @@
 /**
  * @file line_edit_completer.h
  * @ingroup UI
- * @brief TODO: Document this.
+ * @brief Line edit with support for multiple trigger-based completers, e.g., @mention and [[card]].
  */
+//! \todo Document this file.
 
 #ifndef LINEEDITCOMPLETER_H
 #define LINEEDITCOMPLETER_H
 
 #include "custom_line_edit.h"
 
-#include <QKeyEvent>
+#include <QList>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QCompleter;
+class QWidget;
+
+enum class CompleterTrigger
+{
+    Mention, //< "@" prefix, replaced in place with a trailing space.
+    Card     //< "[[" prefix, replaced with the completion plus a closing "]] ".
+};
+
+struct CompleterInfo
+{
+    QCompleter *completer;
+    CompleterTrigger trigger;
+};
 
 class LineEditCompleter : public LineEditUnfocusable
 {
     Q_OBJECT
+signals:
+    void cardPartialChanged(const QString &partial);
+
 private:
-    QString cursorWord(const QString &line) const;
-    QCompleter *c;
+    QList<CompleterInfo> completers;
+
+    void insertCompletion(QCompleter *completer, const QString &completion);
+
 private slots:
-    void insertCompletion(QString);
+    void insertCompletion(const QString &text);
 
 protected:
-    void keyPressEvent(QKeyEvent *event);
-    void focusOutEvent(QFocusEvent *e);
+    void keyPressEvent(QKeyEvent *event) override;
+    void focusOutEvent(QFocusEvent *e) override;
 
 public:
     explicit LineEditCompleter(QWidget *parent = nullptr);
-    void setCompleter(QCompleter *);
-    void setCompletionList(QStringList);
+    void addCompleter(QCompleter *c, CompleterTrigger trigger);
+
+    bool hasVisibleCompleterPopup() const;
+    void hideCompleterPopups();
 };
 
 #endif
diff --git a/cockatrice/src/interface/widgets/utility/report_utils.cpp b/cockatrice/src/interface/widgets/utility/report_utils.cpp
new file mode 100644
index 000000000..d7fc083c6
--- /dev/null
+++ b/cockatrice/src/interface/widgets/utility/report_utils.cpp
@@ -0,0 +1,144 @@
+#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
+{
+
+namespace
+{
+QColor reportStatusColor(const QString &status)
+{
+    const QColor text = qApp->palette().color(QPalette::Text);
+    const int luminance = (299 * text.red() + 587 * text.green() + 114 * text.blue()) / 1000;
+    const bool dark = luminance < 128;
+
+    if (status == "open") {
+        return dark ? QColor("#e06060") : QColor("#c0392b");
+    }
+    if (status == "assigned") {
+        return dark ? QColor("#e0a030") : QColor("#d68910");
+    }
+    if (status == "resolved") {
+        return dark ? QColor("#50c878") : QColor("#1e8449");
+    }
+    if (status == "dismissed") {
+        return qApp->palette().color(QPalette::PlaceholderText);
+    }
+    return QColor();
+}
+
+void setReportStatusItemColor(QTableWidgetItem *item, const QString &status)
+{
+    const QColor color = reportStatusColor(status);
+    if (color.isValid()) {
+        item->setForeground(QBrush(color));
+    }
+}
+} // namespace
+
+QString formatReportCategory(const QString &category)
+{
+    QString result = category;
+    result.replace('_', ' ');
+    return result.left(1).toUpper() + result.mid(1);
+}
+
+QString formatReportTime(qint64 secondsSinceEpoch)
+{
+    const QDateTime dt = QDateTime::fromSecsSinceEpoch(secondsSinceEpoch);
+    return dt.toString("yyyy-MM-dd hh:mm");
+}
+
+void fillReportTableRow(QTableWidget *table,
+                        int row,
+                        const ServerInfo_Report &report,
+                        int idColumn,
+                        int timeColumn,
+                        int reportedColumn,
+                        int categoryColumn,
+                        int gameIdColumn,
+                        int statusColumn,
+                        int assignedColumn)
+{
+    auto *idItem = new QTableWidgetItem(QString::number(report.report_id()));
+    idItem->setData(Qt::UserRole, report.report_id());
+    table->setItem(row, idColumn, idItem);
+
+    table->setItem(row, timeColumn, new QTableWidgetItem(formatReportTime(report.report_time())));
+    table->setItem(row, reportedColumn, new QTableWidgetItem(QString::fromStdString(report.reported_user_name())));
+    table->setItem(row, categoryColumn,
+                   new QTableWidgetItem(formatReportCategory(QString::fromStdString(report.category()))));
+    table->setItem(row, gameIdColumn,
+                   new QTableWidgetItem(report.game_id() > 0 ? QString::number(report.game_id()) : QString()));
+
+    auto *statusItem = new QTableWidgetItem(QString::fromStdString(report.status()));
+    setReportStatusItemColor(statusItem, QString::fromStdString(report.status()));
+    table->setItem(row, statusColumn, statusItem);
+
+    table->setItem(row, assignedColumn, new QTableWidgetItem(QString::fromStdString(report.assigned_mod_name())));
+}
+
+void renderReportDetails(QTextEdit *chatLogEdit,
+                         QTextEdit *commentsEdit,
+                         const ServerInfo_Report &report,
+                         const QString &commentsEmptyText,
+                         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);
+    } else {
+        chatLogEdit->setPlainText(details);
+    }
+
+    commentsEdit->clear();
+
+    if (report.comments_size() == 0) {
+        commentsEdit->setPlainText(commentsEmptyText);
+        return;
+    }
+
+    for (int i = 0; i < report.comments_size(); ++i) {
+        const ServerInfo_ReportComment &c = report.comments(i);
+        const QString author = QString::fromStdString(c.author_name());
+        const QString text = QString::fromStdString(c.comment_text());
+        const QString prefix = c.is_moderator() ? moderatorPrefix : nonModeratorPrefix;
+        commentsEdit->moveCursor(QTextCursor::End);
+        commentsEdit->insertPlainText(
+            QString("[%1] %2 %3:\n%4\n\n").arg(formatReportTime(c.comment_time()), prefix, author, text));
+    }
+}
+
+} // namespace report_utils
diff --git a/cockatrice/src/interface/widgets/utility/report_utils.h b/cockatrice/src/interface/widgets/utility/report_utils.h
new file mode 100644
index 000000000..679989486
--- /dev/null
+++ b/cockatrice/src/interface/widgets/utility/report_utils.h
@@ -0,0 +1,37 @@
+#ifndef REPORT_UTILS_H
+#define REPORT_UTILS_H
+
+#include <QString>
+#include <QtGlobal>
+
+class QTableWidget;
+class QTextEdit;
+class ServerInfo_Report;
+
+namespace report_utils
+{
+
+QString formatReportCategory(const QString &category);
+QString formatReportTime(qint64 secondsSinceEpoch);
+
+void fillReportTableRow(QTableWidget *table,
+                        int row,
+                        const ServerInfo_Report &report,
+                        int idColumn,
+                        int timeColumn,
+                        int reportedColumn,
+                        int categoryColumn,
+                        int gameIdColumn,
+                        int statusColumn,
+                        int assignedColumn);
+
+void renderReportDetails(QTextEdit *chatLogEdit,
+                         QTextEdit *commentsEdit,
+                         const ServerInfo_Report &report,
+                         const QString &commentsEmptyText,
+                         const QString &moderatorPrefix,
+                         const QString &nonModeratorPrefix);
+
+} // namespace report_utils
+
+#endif // REPORT_UTILS_H
diff --git a/cockatrice/src/interface/widgets/utility/reversed_completer_model.cpp b/cockatrice/src/interface/widgets/utility/reversed_completer_model.cpp
new file mode 100644
index 000000000..3702798fd
--- /dev/null
+++ b/cockatrice/src/interface/widgets/utility/reversed_completer_model.cpp
@@ -0,0 +1,105 @@
+#include "reversed_completer_model.h"
+
+#include <QAbstractItemModel>
+#include <QDebug>
+#include <QList>
+#include <QModelIndex>
+#include <QPersistentModelIndex>
+#include <QVariant>
+
+void ReversedCompleterModel::setSourceModel(QAbstractItemModel *sourceModel)
+{
+    if (sourceModel == this->sourceModel()) {
+        return;
+    }
+
+    if (QAbstractItemModel *old = this->sourceModel()) {
+        disconnect(old, nullptr, this, nullptr);
+    }
+
+    QAbstractProxyModel::setSourceModel(sourceModel);
+
+    if (sourceModel) {
+        connect(sourceModel, &QAbstractItemModel::modelReset, this, &ReversedCompleterModel::invalidate);
+        connect(sourceModel, &QAbstractItemModel::rowsInserted, this, &ReversedCompleterModel::invalidate);
+        connect(sourceModel, &QAbstractItemModel::rowsRemoved, this, &ReversedCompleterModel::invalidate);
+        connect(sourceModel, &QAbstractItemModel::rowsMoved, this, &ReversedCompleterModel::invalidate);
+        connect(sourceModel, &QAbstractItemModel::columnsInserted, this, &ReversedCompleterModel::invalidate);
+        connect(sourceModel, &QAbstractItemModel::columnsRemoved, this, &ReversedCompleterModel::invalidate);
+        connect(sourceModel, &QAbstractItemModel::dataChanged, this, &ReversedCompleterModel::invalidate);
+        connect(sourceModel, &QAbstractItemModel::layoutChanged, this, &ReversedCompleterModel::invalidate);
+    }
+
+    invalidate();
+}
+
+void ReversedCompleterModel::setEnabled(bool enabled)
+{
+    if (enabled == isEnabled) {
+        return;
+    }
+    isEnabled = enabled;
+    invalidate();
+}
+
+QModelIndex ReversedCompleterModel::mapToSource(const QModelIndex &proxyIndex) const
+{
+    if (!proxyIndex.isValid() || !sourceModel()) {
+        return {};
+    }
+    const int sourceRow = isEnabled ? sourceRowCount() - 1 - proxyIndex.row() : proxyIndex.row();
+    return sourceModel()->index(sourceRow, proxyIndex.column());
+}
+
+QModelIndex ReversedCompleterModel::mapFromSource(const QModelIndex &sourceIndex) const
+{
+    if (!sourceIndex.isValid() || !sourceModel()) {
+        return {};
+    }
+    const int proxyRow = isEnabled ? sourceRowCount() - 1 - sourceIndex.row() : sourceIndex.row();
+    return index(proxyRow, sourceIndex.column());
+}
+
+QModelIndex ReversedCompleterModel::index(int row, int column, const QModelIndex &parent) const
+{
+    if (parent.isValid() || !sourceModel() || row < 0 || row >= rowCount() || column < 0 || column >= columnCount()) {
+        return {};
+    }
+    return createIndex(row, column);
+}
+
+QModelIndex ReversedCompleterModel::parent(const QModelIndex &) const
+{
+    return {};
+}
+
+int ReversedCompleterModel::rowCount(const QModelIndex &parent) const
+{
+    return parent.isValid() || !sourceModel() ? 0 : sourceModel()->rowCount();
+}
+
+int ReversedCompleterModel::columnCount(const QModelIndex &parent) const
+{
+    return parent.isValid() || !sourceModel() ? 0 : sourceModel()->columnCount();
+}
+
+QVariant ReversedCompleterModel::data(const QModelIndex &proxyIndex, int role) const
+{
+    return sourceModel() ? sourceModel()->data(mapToSource(proxyIndex), role) : QVariant();
+}
+
+QVariant ReversedCompleterModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    return sourceModel() ? sourceModel()->headerData(section, orientation, role) : QVariant();
+}
+
+int ReversedCompleterModel::sourceRowCount() const
+{
+    return sourceModel() ? sourceModel()->rowCount() : 0;
+}
+
+void ReversedCompleterModel::invalidate()
+{
+    beginResetModel();
+    endResetModel();
+}
diff --git a/cockatrice/src/interface/widgets/utility/reversed_completer_model.h b/cockatrice/src/interface/widgets/utility/reversed_completer_model.h
new file mode 100644
index 000000000..cf4b44974
--- /dev/null
+++ b/cockatrice/src/interface/widgets/utility/reversed_completer_model.h
@@ -0,0 +1,47 @@
+/**
+ * @file reversed_completer_model.h
+ * @ingroup UtilityWidgets
+ */
+//! \todo Document this file.
+
+#ifndef REVERSED_COMPLETER_MODEL_H
+#define REVERSED_COMPLETER_MODEL_H
+
+#include <QAbstractProxyModel>
+#include <QModelIndex>
+#include <qnamespace.h>
+
+/**
+ * @brief A completer model that can present its rows bottom-to-top.
+ *
+ * The original row order is kept intact in the source model (row 0 is always the
+ * closest match). When enabled, the proxy maps the source rows in reverse so the
+ * popup shows the closest match in the row nearest to the text edit. Any change
+ * in the source model is forwarded as a full reset, which is all QCompleter
+ * needs to rebuild its completion list.
+ */
+class ReversedCompleterModel : public QAbstractProxyModel
+{
+public:
+    using QAbstractProxyModel::QAbstractProxyModel;
+
+    void setSourceModel(QAbstractItemModel *sourceModel) override;
+    void setEnabled(bool enabled);
+
+    QModelIndex mapToSource(const QModelIndex &proxyIndex) const override;
+    QModelIndex mapFromSource(const QModelIndex &sourceIndex) const override;
+    QModelIndex index(int row, int column, const QModelIndex &parent = {}) const override;
+    QModelIndex parent(const QModelIndex &) const override;
+    int rowCount(const QModelIndex &parent = {}) const override;
+    int columnCount(const QModelIndex &parent = {}) const override;
+    QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+
+private:
+    int sourceRowCount() const;
+    void invalidate();
+
+    bool isEnabled = false;
+};
+
+#endif // REVERSED_COMPLETER_MODEL_H
diff --git a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp
index a34f39042..e92287c9a 100644
--- a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp
+++ b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp
@@ -1,9 +1,19 @@
 #include "sequence_edit.h"
 
 #include "../../../client/settings/cache_settings.h"
+#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)
@@ -13,8 +23,8 @@ SequenceEdit::SequenceEdit(const QString &_shortcutName, QWidget *parent) : QWid
     defaultButton = new QPushButton("", this);
 
     lineEdit->setMinimumWidth(70);
-    clearButton->setIcon(QPixmap("theme:icons/clearsearch"));
-    defaultButton->setIcon(QPixmap("theme:icons/update"));
+    clearButton->setIcon(themePixmap(QStringLiteral("icons/clearsearch")));
+    defaultButton->setIcon(themePixmap(QStringLiteral("icons/update")));
 
     auto *layout = new QHBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
diff --git a/cockatrice/src/interface/widgets/utility/sequence_edit.h b/cockatrice/src/interface/widgets/utility/sequence_edit.h
index a5fe1a1c6..0cdd48ceb 100644
--- a/cockatrice/src/interface/widgets/utility/sequence_edit.h
+++ b/cockatrice/src/interface/widgets/utility/sequence_edit.h
@@ -1,16 +1,21 @@
 /**
  * @file sequence_edit.h
  * @ingroup UI
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef SEQUENCEEDIT_H
 #define SEQUENCEEDIT_H
 
-#include <QEvent>
-#include <QLineEdit>
-#include <QPushButton>
+#include <QKeySequence>
+#include <QString>
 #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.cpp b/cockatrice/src/interface/widgets/utility/visibility_change_listener.cpp
new file mode 100644
index 000000000..38696f775
--- /dev/null
+++ b/cockatrice/src/interface/widgets/utility/visibility_change_listener.cpp
@@ -0,0 +1,26 @@
+#include "visibility_change_listener.h"
+
+#include <QEvent>
+#include <QWidget>
+
+VisibilityChangeListener::VisibilityChangeListener(QWidget *targetWidget)
+    : QObject(targetWidget), targetWidget(targetWidget)
+{
+    if (targetWidget) {
+        targetWidget->installEventFilter(this);
+    }
+}
+
+bool VisibilityChangeListener::eventFilter(QObject *o, QEvent *e)
+{
+    if (o == targetWidget && !e->spontaneous()) {
+        if (e->type() == QEvent::Show) {
+            emit visibilityChanged(true);
+        }
+
+        if (e->type() == QEvent::Hide) {
+            emit visibilityChanged(false);
+        }
+    }
+    return false;
+}
\ No newline at end of file
diff --git a/cockatrice/src/interface/widgets/utility/visibility_change_listener.h b/cockatrice/src/interface/widgets/utility/visibility_change_listener.h
new file mode 100644
index 000000000..f154918d6
--- /dev/null
+++ b/cockatrice/src/interface/widgets/utility/visibility_change_listener.h
@@ -0,0 +1,38 @@
+#ifndef COCKATRICE_VISIBILITY_LISTENER_H
+#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
+ * that widget changes.
+ */
+class VisibilityChangeListener : public QObject
+{
+    Q_OBJECT
+
+    QWidget *targetWidget;
+
+public:
+    /**
+     * Creates a new instance of this class, watching the targetWidget.
+     * This class automatically installs itself as an eventFilter to the targetWidget.
+     *
+     * @param targetWidget The widget to watch. Sets that widget as this object's parent.
+     */
+    explicit VisibilityChangeListener(QWidget *targetWidget);
+
+    bool eventFilter(QObject *o, QEvent *e) override;
+
+signals:
+    /**
+     * Emitted whenever the target widget's visibility changes
+     * @param visible The widget's new visibility
+     */
+    void visibilityChanged(bool visible);
+};
+
+#endif // COCKATRICE_VISIBILITY_LISTENER_H
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 3ca709071..cf815ace0 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,8 +1,19 @@
 #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>
 
 /**
@@ -31,12 +42,12 @@ VisualDatabaseDisplayColorFilterWidget::VisualDatabaseDisplayColorFilterWidget(Q
                 &VisualDatabaseDisplayColorFilterWidget::handleColorToggled);
     }
 
-    toggleButton = new QPushButton(this);
-    toggleButton->setCheckable(true);
-    layout->addWidget(toggleButton);
+    modeComboBox = new QComboBox(this);
+    layout->addWidget(modeComboBox);
+
+    connect(modeComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &VisualDatabaseDisplayColorFilterWidget::updateFilterMode);
 
-    // Connect the button's toggled signal
-    connect(toggleButton, &QPushButton::toggled, this, &VisualDatabaseDisplayColorFilterWidget::updateFilterMode);
     connect(filterModel, &FilterTreeModel::layoutChanged, this,
             [this]() { QTimer::singleShot(100, this, &VisualDatabaseDisplayColorFilterWidget::syncWithFilterModel); });
 
@@ -46,19 +57,22 @@ VisualDatabaseDisplayColorFilterWidget::VisualDatabaseDisplayColorFilterWidget(Q
 
 void VisualDatabaseDisplayColorFilterWidget::retranslateUi()
 {
-    switch (currentMode) {
-        case FilterMode::ExactMatch:
-            toggleButton->setText(tr("Mode: Exact Match"));
-            break;
-        case FilterMode::Includes:
-            toggleButton->setText(tr("Mode: Includes"));
-            break;
-        case FilterMode::IncludeExclude:
-            toggleButton->setText(tr("Mode: Include/Exclude"));
-            break;
+    modeComboBox->blockSignals(true);
+    modeComboBox->clear();
+
+    modeComboBox->addItem(tr("Exact match"), QVariant::fromValue(FilterMode::ExactMatch));
+    modeComboBox->addItem(tr("Includes"), QVariant::fromValue(FilterMode::Includes));
+    modeComboBox->addItem(tr("Include / Exclude"), QVariant::fromValue(FilterMode::IncludeExclude));
+
+    modeComboBox->setToolTip(tr("How selected and unselected colors are combined in the filter"));
+
+    // Restore current mode
+    const int index = modeComboBox->findData(QVariant::fromValue(currentMode));
+    if (index >= 0) {
+        modeComboBox->setCurrentIndex(index);
     }
 
-    toggleButton->setToolTip(tr("Filter mode (AND/OR/NOT conjunctions of filters)"));
+    modeComboBox->blockSignals(false);
 }
 
 void VisualDatabaseDisplayColorFilterWidget::handleColorToggled(QChar color, bool active)
@@ -145,24 +159,19 @@ void VisualDatabaseDisplayColorFilterWidget::removeFilter(QChar color)
 
 void VisualDatabaseDisplayColorFilterWidget::updateFilterMode()
 {
-    switch (currentMode) {
-        case FilterMode::ExactMatch:
-            currentMode = FilterMode::Includes; // Switch to Includes
-            break;
-        case FilterMode::Includes:
-            currentMode = FilterMode::IncludeExclude; // Switch to Include/Exclude
-            break;
-        case FilterMode::IncludeExclude:
-            currentMode = FilterMode::ExactMatch; // Switch to Exact Match
-            break;
+    const QVariant data = modeComboBox->currentData();
+    if (!data.isValid()) {
+        return;
     }
 
+    currentMode = data.value<FilterMode>();
+
     filterModel->blockSignals(true);
     filterModel->filterTree()->blockSignals(true);
 
     filterModel->clearFiltersOfType(CardFilter::Attr::AttrColor);
 
-    QList<ManaSymbolWidget *> manaSymbolWidgets = findChildren<ManaSymbolWidget *>();
+    const QList<ManaSymbolWidget *> manaSymbolWidgets = findChildren<ManaSymbolWidget *>();
 
     for (ManaSymbolWidget *manaSymbolWidget : manaSymbolWidgets) {
         handleColorToggled(manaSymbolWidget->getSymbolChar(), manaSymbolWidget->isColorActive());
@@ -173,9 +182,7 @@ void VisualDatabaseDisplayColorFilterWidget::updateFilterMode()
 
     emit filterModel->filterTree()->changed();
     emit filterModel->layoutChanged();
-
-    retranslateUi();                     // Update button text based on the mode
-    emit filterModeChanged(currentMode); // Signal mode change
+    emit filterModeChanged(currentMode);
 }
 
 void VisualDatabaseDisplayColorFilterWidget::setManaSymbolActive(QChar color, bool active)
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 7b4c365c0..38812b02a 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
@@ -1,17 +1,22 @@
 /**
  * @file visual_database_display_color_filter_widget.h
  * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef VISUAL_DATABASE_DISPLAY_COLOR_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_COLOR_FILTER_WIDGET_H
 
-#include "../../../filters/filter_tree_model.h"
-
-#include <QHBoxLayout>
-#include <QPushButton>
+#include <QByteArray>
+#include <QChar>
+#include <QList>
+#include <QMetaType>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class FilterTreeModel;
+class QComboBox;
+class QHBoxLayout;
 
 class VisualDatabaseDisplayColorFilterCircleWidget : public QWidget
 {
@@ -39,6 +44,8 @@ enum class FilterMode
     IncludeExclude // Include selected colors (OR) and exclude unselected colors (AND NOT).
 };
 
+Q_DECLARE_METATYPE(FilterMode)
+
 class VisualDatabaseDisplayColorFilterWidget : public QWidget
 {
     Q_OBJECT
@@ -62,7 +69,7 @@ private slots:
 private:
     FilterTreeModel *filterModel;
     QHBoxLayout *layout;
-    QPushButton *toggleButton;
+    QComboBox *modeComboBox;
     FilterMode currentMode = FilterMode::Includes; // Default mode
 };
 
diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_button.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_button.h
new file mode 100644
index 000000000..5d9f7f944
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_button.h
@@ -0,0 +1,21 @@
+#ifndef COCKATRICE_VISUAL_DATABASE_DISPLAY_FILTER_BUTTON_H
+#define COCKATRICE_VISUAL_DATABASE_DISPLAY_FILTER_BUTTON_H
+
+#include <QString>
+
+const QString visualDatabaseDisplayFilterButtonStyle = QString(R"(
+    QPushButton {
+        background-color: palette(button);
+        color: palette(button-text);
+        padding: 5px 10px;
+        border-radius: 4px;
+        border: 1px solid palette(dark);
+    }
+    QPushButton:checked {
+        background-color: palette(highlight);
+        color: palette(highlighted-text);
+        border: 1px solid palette(shadow);
+    }
+)");
+
+#endif // COCKATRICE_VISUAL_DATABASE_DISPLAY_FILTER_BUTTON_H
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 4d8eb5c57..fd005b315 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,12 +1,28 @@
 #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 <QHBoxLayout>
+#include <QByteArray>
+#include <QChar>
+#include <QDir>
+#include <QFile>
+#include <QIODevice>
 #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)
@@ -18,6 +34,16 @@ VisualDatabaseDisplayFilterSaveLoadWidget::VisualDatabaseDisplayFilterSaveLoadWi
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
+    // Filter search input
+    searchInput = new QLineEdit(this);
+    layout->addWidget(searchInput);
+
+    connect(searchInput, &QLineEdit::textChanged, this, &VisualDatabaseDisplayFilterSaveLoadWidget::applySearchFilter);
+
+    // File list container
+    fileListWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
+    layout->addWidget(fileListWidget);
+
     // Input for filter filename
     filenameInput = new QLineEdit(this);
     layout->addWidget(filenameInput);
@@ -25,11 +51,12 @@ VisualDatabaseDisplayFilterSaveLoadWidget::VisualDatabaseDisplayFilterSaveLoadWi
     // Save button
     saveButton = new QPushButton(this);
     layout->addWidget(saveButton);
-    connect(saveButton, &QPushButton::clicked, this, &VisualDatabaseDisplayFilterSaveLoadWidget::saveFilter);
+    // Disable save if empty
+    saveButton->setEnabled(false);
+    connect(filenameInput, &QLineEdit::textChanged, this,
+            [this](const QString &text) { saveButton->setEnabled(!text.trimmed().isEmpty()); });
 
-    // File list container
-    fileListWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
-    layout->addWidget(fileListWidget);
+    connect(saveButton, &QPushButton::clicked, this, &VisualDatabaseDisplayFilterSaveLoadWidget::saveFilter);
 
     refreshFilterList(); // Populate the file list on startup
     retranslateUi();
@@ -37,6 +64,7 @@ VisualDatabaseDisplayFilterSaveLoadWidget::VisualDatabaseDisplayFilterSaveLoadWi
 
 void VisualDatabaseDisplayFilterSaveLoadWidget::retranslateUi()
 {
+    searchInput->setPlaceholderText(tr("Search filter..."));
     saveButton->setText(tr("Save Filter"));
     saveButton->setToolTip(tr("Save all currently applied filters to a file"));
     filenameInput->setPlaceholderText(tr("Enter filename..."));
@@ -45,10 +73,11 @@ void VisualDatabaseDisplayFilterSaveLoadWidget::retranslateUi()
 void VisualDatabaseDisplayFilterSaveLoadWidget::saveFilter()
 {
     QString filename = filenameInput->text().trimmed();
-    if (filename.isEmpty())
+    if (filename.isEmpty()) {
         return;
+    }
 
-    QString filePath = SettingsCache::instance().getFiltersPath() + QDir::separator() + filename + ".json";
+    QString filePath = SettingsCache::instance().paths().getFiltersPath() + QDir::separator() + filename + ".json";
 
     // Serialize the filter model to JSON
     QJsonArray filtersArray;
@@ -73,22 +102,25 @@ void VisualDatabaseDisplayFilterSaveLoadWidget::saveFilter()
 
 void VisualDatabaseDisplayFilterSaveLoadWidget::loadFilter(const QString &filename)
 {
-    QString filePath = SettingsCache::instance().getFiltersPath() + QDir::separator() + filename;
+    QString filePath = SettingsCache::instance().paths().getFiltersPath() + QDir::separator() + filename;
 
     QFile file(filePath);
-    if (!file.open(QIODevice::ReadOnly))
+    if (!file.open(QIODevice::ReadOnly)) {
         return;
+    }
 
     QByteArray jsonData = file.readAll();
     file.close();
 
     QJsonDocument doc = QJsonDocument::fromJson(jsonData);
-    if (!doc.isObject())
+    if (!doc.isObject()) {
         return;
+    }
 
     QJsonObject root = doc.object();
-    if (!root.contains("filters") || !root["filters"].isArray())
+    if (!root.contains("filters") || !root["filters"].isArray()) {
         return;
+    }
 
     QJsonArray filtersArray = root["filters"].toArray();
 
@@ -112,42 +144,36 @@ void VisualDatabaseDisplayFilterSaveLoadWidget::loadFilter(const QString &filena
     emit filterModel->layoutChanged();
 }
 
+void VisualDatabaseDisplayFilterSaveLoadWidget::applySearchFilter(const QString &text)
+{
+    fileListWidget->clearLayout();
+
+    QString filter = text.trimmed();
+    QStringList filtered = allFilterFiles;
+
+    if (!filter.isEmpty()) {
+        filtered = filtered.filter(QRegularExpression(filter, QRegularExpression::CaseInsensitiveOption));
+    }
+
+    for (const QString &filename : filtered) {
+        FilterDisplayWidget *filterWidget = new FilterDisplayWidget(this, filename, filterModel);
+        fileListWidget->addWidget(filterWidget);
+
+        connect(filterWidget, &FilterDisplayWidget::filterLoadRequested, this,
+                &VisualDatabaseDisplayFilterSaveLoadWidget::loadFilter);
+
+        connect(filterWidget, &FilterDisplayWidget::filterDeleted, this,
+                &VisualDatabaseDisplayFilterSaveLoadWidget::refreshFilterList);
+    }
+}
+
 void VisualDatabaseDisplayFilterSaveLoadWidget::refreshFilterList()
 {
     fileListWidget->clearLayout();
-    // Clear existing widgets
-    for (auto buttonPair : fileButtons) {
-        buttonPair.first->deleteLater();
-        buttonPair.second->deleteLater();
-    }
-    fileButtons.clear(); // Clear the list of buttons
+    fileButtons.clear();
 
-    // Refresh the filter file list
-    QDir dir(SettingsCache::instance().getFiltersPath());
-    QStringList filterFiles = dir.entryList(QStringList() << "*.json", QDir::Files, QDir::Name);
+    QDir dir(SettingsCache::instance().paths().getFiltersPath());
+    allFilterFiles = dir.entryList({"*.json"}, QDir::Files, QDir::Name);
 
-    // Loop through the filter files and create widgets for them
-    for (const QString &filename : filterFiles) {
-        bool alreadyAdded = false;
-
-        // Check if the widget for this filter file already exists to avoid duplicates
-        for (const auto &pair : fileButtons) {
-            if (pair.first->text() == filename) {
-                alreadyAdded = true;
-                break;
-            }
-        }
-
-        if (!alreadyAdded) {
-            // Create a new custom widget for the filter
-            FilterDisplayWidget *filterWidget = new FilterDisplayWidget(this, filename, filterModel);
-            fileListWidget->addWidget(filterWidget);
-
-            // Connect signals to handle loading and deletion
-            connect(filterWidget, &FilterDisplayWidget::filterLoadRequested, this,
-                    &VisualDatabaseDisplayFilterSaveLoadWidget::loadFilter);
-            connect(filterWidget, &FilterDisplayWidget::filterDeleted, this,
-                    &VisualDatabaseDisplayFilterSaveLoadWidget::refreshFilterList);
-        }
-    }
+    applySearchFilter(searchInput->text());
 }
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 48e6f9498..ea8a0ed6b 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
@@ -1,23 +1,25 @@
 /**
  * @file visual_database_display_filter_save_load_widget.h
  * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef VISUAL_DATABASE_DISPLAY_FILTER_SAVE_LOAD_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_FILTER_SAVE_LOAD_WIDGET_H
 
-#include "../../../filters/filter_tree_model.h"
-#include "../general/layout_containers/flow_widget.h"
-
-#include <QFile>
-#include <QFileDialog>
-#include <QJsonObject>
-#include <QLineEdit>
+#include <QList>
 #include <QMap>
-#include <QPushButton>
-#include <QVBoxLayout>
+#include <QPair>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class FilterTreeModel;
+class FlowWidget;
+class QLineEdit;
+class QPushButton;
+class QVBoxLayout;
 
 class VisualDatabaseDisplayFilterSaveLoadWidget : public QWidget
 {
@@ -27,6 +29,7 @@ public:
 
     void saveFilter();
     void loadFilter(const QString &filename);
+    void applySearchFilter(const QString &text);
     void refreshFilterList();
     void deleteFilter(const QString &filename, QPushButton *deleteButton);
 
@@ -37,9 +40,11 @@ private:
     FilterTreeModel *filterModel;
 
     QVBoxLayout *layout;
+    QLineEdit *searchInput;
+    FlowWidget *fileListWidget;
     QLineEdit *filenameInput;
     QPushButton *saveButton;
-    FlowWidget *fileListWidget;
+    QStringList allFilterFiles;
 
     QMap<QString, QPair<QPushButton *, QPushButton *>> fileButtons;
 };
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
new file mode 100644
index 000000000..3e9d9e525
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp
@@ -0,0 +1,207 @@
+#include "visual_database_display_filter_toolbar_widget.h"
+
+#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)
+    : FlowWidget(_parent, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff),
+      visualDatabaseDisplay(_parent), deckListModel(deckListModel)
+{
+    connect(this, &VisualDatabaseDisplayFilterToolbarWidget::searchModelChanged, visualDatabaseDisplay,
+            &VisualDatabaseDisplayWidget::onSearchModelChanged);
+
+    sortGroupBox = new QGroupBox(this);
+    filterGroupBox = new QGroupBox(this);
+
+    auto scalePixmap = [](const QString &fileName) { return QIcon(QPixmap(fileName)).pixmap({20, 20}); };
+
+    sortByLabel = new QLabel(this);
+    sortByLabel->setPixmap(scalePixmap("theme:icons/sort_arrow_down"));
+
+    filterByLabel = new QLabel(this);
+    filterByLabel->setPixmap(scalePixmap("theme:icons/filter"));
+
+    sortColumnCombo = new QComboBox(this);
+    sortColumnCombo->setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy::AdjustToContents);
+    sortOrderCombo = new QComboBox(this);
+    sortOrderCombo->setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy::AdjustToContents);
+
+    sortOrderCombo->addItem("Ascending", Qt::AscendingOrder);
+    sortOrderCombo->addItem("Descending", Qt::DescendingOrder);
+    sortOrderCombo->view()->setMinimumWidth(sortOrderCombo->view()->sizeHintForColumn(0));
+    sortOrderCombo->adjustSize();
+
+    // Populate columns dynamically from the model
+    for (int i = 0; i < visualDatabaseDisplay->getDatabaseDisplayModel()->columnCount(); ++i) {
+        QString header = visualDatabaseDisplay->getDatabaseDisplayModel()->headerData(i, Qt::Horizontal).toString();
+        sortColumnCombo->addItem(header, i);
+    }
+
+    sortColumnCombo->view()->setMinimumWidth(sortColumnCombo->view()->sizeHintForColumn(0));
+    sortColumnCombo->adjustSize();
+
+    connect(sortColumnCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]() {
+        int column = sortColumnCombo->currentData().toInt();
+        Qt::SortOrder order = static_cast<Qt::SortOrder>(sortOrderCombo->currentData().toInt());
+        visualDatabaseDisplay->getDatabaseView()->sortByColumn(column, order);
+
+        emit searchModelChanged();
+    });
+
+    connect(sortOrderCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]() {
+        int column = sortColumnCombo->currentData().toInt();
+        Qt::SortOrder order = static_cast<Qt::SortOrder>(sortOrderCombo->currentData().toInt());
+        visualDatabaseDisplay->getDatabaseView()->sortByColumn(column, order);
+
+        emit searchModelChanged();
+    });
+
+    quickFilterSaveLoadWidget = new SettingsButtonWidget(this);
+    quickFilterSaveLoadWidget->setButtonIcon(themePixmap(QStringLiteral("icons/floppy_disk")));
+
+    quickFilterNameWidget = new SettingsButtonWidget(this);
+    quickFilterNameWidget->setButtonIcon(themePixmap(QStringLiteral("icons/pen_to_square")));
+
+    quickFilterMainTypeWidget = new SettingsButtonWidget(this);
+    quickFilterMainTypeWidget->setButtonIcon(themePixmap(QStringLiteral("icons/circle_half_stroke")));
+
+    quickFilterSubTypeWidget = new SettingsButtonWidget(this);
+    quickFilterSubTypeWidget->setButtonIcon(themePixmap(QStringLiteral("icons/dragon")));
+
+    quickFilterSetWidget = new SettingsButtonWidget(this);
+    quickFilterSetWidget->setButtonIcon(themePixmap(QStringLiteral("icons/scroll")));
+
+    quickFilterFormatLegalityWidget = new SettingsButtonWidget(this);
+    quickFilterFormatLegalityWidget->setButtonIcon(themePixmap(QStringLiteral("icons/scale_balanced")));
+
+    retranslateUi();
+}
+
+void VisualDatabaseDisplayFilterToolbarWidget::initialize()
+{
+    auto sortLayout = new QHBoxLayout(sortGroupBox);
+    sortLayout->setContentsMargins(0, 0, 0, 0);
+    sortLayout->setSpacing(0);
+    sortLayout->setAlignment(Qt::AlignLeft);
+
+    auto filterLayout = new QHBoxLayout(filterGroupBox);
+    filterLayout->setContentsMargins(0, 0, 0, 0);
+    filterLayout->setSpacing(2);
+    filterLayout->setAlignment(Qt::AlignLeft);
+
+    // create settings widgets
+    auto filterModel = visualDatabaseDisplay->getFilterModel();
+
+    saveLoadWidget = new VisualDatabaseDisplayFilterSaveLoadWidget(this, filterModel);
+    nameFilterWidget = new VisualDatabaseDisplayNameFilterWidget(this, filterModel, deckListModel);
+    mainTypeFilterWidget = new VisualDatabaseDisplayMainTypeFilterWidget(this, filterModel);
+    formatLegalityWidget = new VisualDatabaseDisplayFormatLegalityFilterWidget(this, filterModel);
+    subTypeFilterWidget = new VisualDatabaseDisplaySubTypeFilterWidget(this, filterModel);
+    setFilterWidget = new VisualDatabaseDisplaySetFilterWidget(this, filterModel);
+
+    quickFilterSaveLoadWidget->addSettingsWidget(saveLoadWidget);
+    quickFilterNameWidget->addSettingsWidget(nameFilterWidget);
+    quickFilterMainTypeWidget->addSettingsWidget(mainTypeFilterWidget);
+    quickFilterSubTypeWidget->addSettingsWidget(subTypeFilterWidget);
+    quickFilterSetWidget->addSettingsWidget(setFilterWidget);
+    quickFilterFormatLegalityWidget->addSettingsWidget(formatLegalityWidget);
+
+    // fill groupbox layouts
+    sortLayout->addWidget(sortByLabel);
+    sortLayout->addWidget(sortColumnCombo);
+    sortLayout->addWidget(sortOrderCombo);
+
+    filterLayout->addWidget(filterByLabel);
+    filterLayout->addWidget(quickFilterNameWidget);
+    filterLayout->addWidget(quickFilterMainTypeWidget);
+    filterLayout->addWidget(quickFilterSubTypeWidget);
+    filterLayout->addWidget(quickFilterSetWidget);
+    filterLayout->addWidget(quickFilterFormatLegalityWidget);
+
+    // put everything into main layout
+    addWidget(sortGroupBox);
+    addWidget(filterGroupBox);
+    auto *spacer = new QWidget(this);
+    spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    spacer->setAttribute(Qt::WA_TransparentForMouseEvents);
+    addWidget(spacer);
+    addWidget(quickFilterSaveLoadWidget);
+    addWidget(quickFilterSaveLoadWidget);
+
+    // Force a layout pass so sizeHint() is accurate
+    layout()->activate();
+    fullWidthHint = sizeHint().width();
+}
+
+void VisualDatabaseDisplayFilterToolbarWidget::retranslateUi()
+{
+    sortByLabel->setToolTip(tr("Sort by"));
+    filterByLabel->setToolTip(tr("Filter by"));
+
+    quickFilterSaveLoadWidget->setToolTip(tr("Save and load filters"));
+    quickFilterNameWidget->setToolTip(tr("Filter by exact card name"));
+    quickFilterMainTypeWidget->setToolTip(tr("Filter by card main-type"));
+    quickFilterSubTypeWidget->setToolTip(tr("Filter by card sub-type"));
+    quickFilterSetWidget->setToolTip(tr("Filter by set"));
+    quickFilterFormatLegalityWidget->setToolTip(tr("Filter by format legality"));
+
+    quickFilterSaveLoadWidget->setButtonText(tr("Save/Load"));
+    quickFilterNameWidget->setButtonText(tr("Name"));
+    quickFilterMainTypeWidget->setButtonText(tr("Main Type"));
+    quickFilterSubTypeWidget->setButtonText(tr("Sub Type"));
+    quickFilterSetWidget->setButtonText(tr("Sets"));
+    quickFilterFormatLegalityWidget->setButtonText(tr("Formats"));
+}
+
+void VisualDatabaseDisplayFilterToolbarWidget::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+    updateCompactMode(event->size().width());
+}
+
+void VisualDatabaseDisplayFilterToolbarWidget::updateCompactMode(int availableWidth)
+{
+    const bool compact = availableWidth < fullWidthHint;
+
+    const QList<SettingsButtonWidget *> filterButtons = {
+        quickFilterSaveLoadWidget, quickFilterNameWidget, quickFilterMainTypeWidget,
+        quickFilterSubTypeWidget,  quickFilterSetWidget,  quickFilterFormatLegalityWidget,
+    };
+
+    for (auto *btn : filterButtons) {
+        if (btn->isCompact() != compact) { // only act on transitions
+            btn->setCompact(compact);
+        }
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..f97310c1b
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.h
@@ -0,0 +1,65 @@
+#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>
+
+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
+{
+    Q_OBJECT
+
+signals:
+    void searchModelChanged();
+
+public:
+    explicit VisualDatabaseDisplayFilterToolbarWidget(VisualDatabaseDisplayWidget *parent,
+                                                      DeckListModel *deckListModel = nullptr);
+    void initialize();
+    void retranslateUi();
+
+private:
+    VisualDatabaseDisplayWidget *visualDatabaseDisplay;
+    DeckListModel *deckListModel;
+
+    QGroupBox *sortGroupBox;
+    QLabel *sortByLabel;
+    QComboBox *sortColumnCombo, *sortOrderCombo;
+
+    QGroupBox *filterGroupBox;
+    QLabel *filterByLabel;
+
+    SettingsButtonWidget *quickFilterSaveLoadWidget;
+    VisualDatabaseDisplayFilterSaveLoadWidget *saveLoadWidget;
+    SettingsButtonWidget *quickFilterNameWidget;
+    VisualDatabaseDisplayNameFilterWidget *nameFilterWidget;
+    SettingsButtonWidget *quickFilterMainTypeWidget;
+    VisualDatabaseDisplayMainTypeFilterWidget *mainTypeFilterWidget;
+    SettingsButtonWidget *quickFilterSubTypeWidget;
+    VisualDatabaseDisplaySubTypeFilterWidget *subTypeFilterWidget;
+    SettingsButtonWidget *quickFilterSetWidget;
+    VisualDatabaseDisplaySetFilterWidget *setFilterWidget;
+    SettingsButtonWidget *quickFilterFormatLegalityWidget;
+    VisualDatabaseDisplayFormatLegalityFilterWidget *formatLegalityWidget;
+
+    int fullWidthHint = 0;
+    void updateCompactMode(int availableWidth);
+
+protected:
+    void resizeEvent(QResizeEvent *event) override;
+};
+
+#endif // COCKATRICE_VISUAL_DATABASE_DISPLAY_FILTER_TOOLBAR_WIDGET_H
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
new file mode 100644
index 000000000..a5725ff3f
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp
@@ -0,0 +1,236 @@
+#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,
+    FilterTreeModel *_filterModel)
+    : QWidget(parent), filterModel(_filterModel)
+{
+    allFormatsWithCount = CardDatabaseManager::query()->getAllFormatsWithCount();
+    int maxValue = std::numeric_limits<int>::min();
+    for (int value : allFormatsWithCount) {
+        maxValue = std::max(maxValue, value);
+    }
+    setMinimumWidth(300);
+    setMaximumHeight(300);
+
+    layout = new QVBoxLayout(this);
+    setLayout(layout);
+    layout->setContentsMargins(0, 1, 0, 1);
+    layout->setSpacing(1);
+    layout->setAlignment(Qt::AlignTop);
+
+    flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
+    layout->addWidget(flowWidget);
+
+    // Create a container for the threshold control
+    auto *thresholdLayout = new QHBoxLayout();
+    thresholdLayout->setContentsMargins(0, 0, 0, 0);
+
+    thresholdLabel = new QLabel(this);
+    thresholdLayout->addWidget(thresholdLabel);
+
+    // Create the spinbox
+    spinBox = new QSpinBox(this);
+    spinBox->setMinimum(1);
+    spinBox->setMaximum(maxValue); // Set the max value dynamically
+    spinBox->setValue(150);
+    thresholdLayout->addWidget(spinBox);
+    thresholdLayout->addStretch();
+
+    layout->addLayout(thresholdLayout);
+
+    connect(spinBox, qOverload<int>(&QSpinBox::valueChanged), this,
+            &VisualDatabaseDisplayFormatLegalityFilterWidget::updateFormatButtonsVisibility);
+
+    // Create the toggle button for Exact Match/Includes mode
+    toggleButton = new QPushButton(this);
+    layout->addWidget(toggleButton);
+    connect(toggleButton, &QPushButton::clicked, this,
+            &VisualDatabaseDisplayFormatLegalityFilterWidget::updateFilterMode);
+    connect(filterModel, &FilterTreeModel::layoutChanged, this, [this]() {
+        QTimer::singleShot(100, this, &VisualDatabaseDisplayFormatLegalityFilterWidget::syncWithFilterModel);
+    });
+
+    createFormatButtons(); // Populate buttons initially
+    updateFilterMode();    // Initialize toggle button text
+
+    retranslateUi();
+}
+
+void VisualDatabaseDisplayFormatLegalityFilterWidget::retranslateUi()
+{
+    thresholdLabel->setText(tr("Show formats with at least:"));
+    spinBox->setSuffix(tr(" cards"));
+    spinBox->setToolTip(tr("Do not display formats with less than this amount of cards in the database"));
+    toggleButton->setToolTip(tr("Filter mode (AND/OR/NOT conjunctions of filters)"));
+}
+
+void VisualDatabaseDisplayFormatLegalityFilterWidget::createFormatButtons()
+{
+    // Iterate through main types and create buttons
+    for (auto it = allFormatsWithCount.begin(); it != allFormatsWithCount.end(); ++it) {
+        auto *button = new QPushButton(it.key(), flowWidget);
+        button->setCheckable(true);
+        button->setStyleSheet(visualDatabaseDisplayFilterButtonStyle);
+
+        flowWidget->addWidget(button);
+        formatButtons[it.key()] = button;
+
+        // Connect toggle signal
+        connect(button, &QPushButton::toggled, this,
+                [this, mainType = it.key()](bool checked) { handleFormatToggled(mainType, checked); });
+    }
+    updateFormatButtonsVisibility(); // Ensure visibility is updated initially
+}
+
+void VisualDatabaseDisplayFormatLegalityFilterWidget::updateFormatButtonsVisibility()
+{
+    int threshold = spinBox->value(); // Get the current spinbox value
+
+    // Iterate through buttons and hide/disable those below the threshold
+    for (auto it = formatButtons.begin(); it != formatButtons.end(); ++it) {
+        bool visible = allFormatsWithCount[it.key()] >= threshold;
+        it.value()->setVisible(visible);
+        it.value()->setEnabled(visible);
+    }
+}
+
+int VisualDatabaseDisplayFormatLegalityFilterWidget::getMaxMainTypeCount() const
+{
+    int maxCount = 1;
+    for (auto it = allFormatsWithCount.begin(); it != allFormatsWithCount.end(); ++it) {
+        maxCount = qMax(maxCount, it.value());
+    }
+    return maxCount;
+}
+
+void VisualDatabaseDisplayFormatLegalityFilterWidget::handleFormatToggled(const QString &format, bool active)
+{
+    activeFormats[format] = active;
+
+    if (formatButtons.contains(format)) {
+        formatButtons[format]->setChecked(active);
+    }
+
+    updateFormatFilter();
+}
+
+void VisualDatabaseDisplayFormatLegalityFilterWidget::updateFormatFilter()
+{
+    // Clear existing filters related to main type
+    filterModel->blockSignals(true);
+    filterModel->filterTree()->blockSignals(true);
+    filterModel->clearFiltersOfType(CardFilter::Attr::AttrFormat);
+
+    if (exactMatchMode) {
+        // Exact Match: Only selected main types are allowed
+        QSet<QString> selectedTypes;
+        for (const auto &type : activeFormats.keys()) {
+            if (activeFormats[type]) {
+                selectedTypes.insert(type);
+            }
+        }
+
+        if (!selectedTypes.isEmpty()) {
+            // Require all selected types (TypeAnd)
+            for (const auto &type : selectedTypes) {
+                QString typeString = type;
+                filterModel->addFilter(
+                    new CardFilter(typeString, CardFilter::Type::TypeAnd, CardFilter::Attr::AttrFormat));
+            }
+
+            // Exclude any other types (TypeAndNot)
+            for (const auto &type : formatButtons.keys()) {
+                if (!selectedTypes.contains(type)) {
+                    QString typeString = type;
+                    filterModel->addFilter(
+                        new CardFilter(typeString, CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrFormat));
+                }
+            }
+        }
+    } else {
+        // Default Includes Mode (TypeOr) - match any selected main types
+        for (const auto &type : activeFormats.keys()) {
+            if (activeFormats[type]) {
+                QString typeString = type;
+                filterModel->addFilter(
+                    new CardFilter(typeString, CardFilter::Type::TypeAnd, CardFilter::Attr::AttrFormat));
+            }
+        }
+    }
+
+    filterModel->blockSignals(false);
+    filterModel->filterTree()->blockSignals(false);
+
+    emit filterModel->filterTree()->changed();
+    emit filterModel->layoutChanged();
+}
+
+void VisualDatabaseDisplayFormatLegalityFilterWidget::updateFilterMode()
+{
+    exactMatchMode = !exactMatchMode;
+    toggleButton->setText(exactMatchMode ? tr("Mode: Exact Match") : tr("Mode: Includes"));
+    updateFormatFilter();
+}
+
+void VisualDatabaseDisplayFormatLegalityFilterWidget::syncWithFilterModel()
+{
+    // Temporarily block signals for each button to prevent toggling while updating button states
+    for (auto it = formatButtons.begin(); it != formatButtons.end(); ++it) {
+        it.value()->blockSignals(true);
+    }
+
+    // Uncheck all buttons
+    for (auto it = formatButtons.begin(); it != formatButtons.end(); ++it) {
+        it.value()->setChecked(false);
+    }
+
+    // Get active filters for main types
+    QSet<QString> activeTypes;
+    for (const auto &filter : filterModel->getFiltersOfType(CardFilter::AttrFormat)) {
+        if (filter->type() == CardFilter::Type::TypeAnd) {
+            activeTypes.insert(filter->term());
+        }
+    }
+
+    // Check the buttons for active types
+    for (const auto &type : activeTypes) {
+        activeFormats[type] = true;
+        if (formatButtons.contains(type)) {
+            formatButtons[type]->setChecked(true);
+        }
+    }
+
+    // Re-enable signal emissions for each button
+    for (auto it = formatButtons.begin(); it != formatButtons.end(); ++it) {
+        it.value()->blockSignals(false);
+    }
+
+    // Update the visibility of buttons
+    updateFormatButtonsVisibility();
+}
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
new file mode 100644
index 000000000..e94593e67
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.h
@@ -0,0 +1,47 @@
+#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>
+
+class FilterTreeModel;
+class FlowWidget;
+class QLabel;
+class QPushButton;
+class QSpinBox;
+class QVBoxLayout;
+
+class VisualDatabaseDisplayFormatLegalityFilterWidget : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit VisualDatabaseDisplayFormatLegalityFilterWidget(QWidget *parent, FilterTreeModel *filterModel);
+    void retranslateUi();
+    void createFormatButtons();
+    void updateFormatButtonsVisibility();
+    int getMaxMainTypeCount() const;
+
+    void handleFormatToggled(const QString &format, bool active);
+    void updateFormatFilter();
+    void updateFilterMode();
+    void syncWithFilterModel();
+
+private:
+    FilterTreeModel *filterModel;
+    QMap<QString, int> allFormatsWithCount;
+
+    QVBoxLayout *layout;
+    FlowWidget *flowWidget;
+    QLabel *thresholdLabel;
+    QSpinBox *spinBox;
+    QPushButton *toggleButton; // Mode switch button
+
+    QMap<QString, bool> activeFormats;          // Track active filters
+    QMap<QString, QPushButton *> formatButtons; // Store toggle buttons
+
+    bool exactMatchMode = true; // Toggle between "Exact Match" and "Includes"
+};
+
+#endif // COCKATRICE_VISUAL_DATABASE_DISPLAY_FORMAT_LEGALITY_FILTER_WIDGET_H
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 32652c346..eff0fe10b 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,24 +1,38 @@
 #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)
     : QWidget(parent), filterModel(_filterModel)
 {
-    allMainCardTypesWithCount = CardDatabaseManager::query()->getAllMainCardTypesWithCount();
     // Get all main card types with their count
+    allMainCardTypesWithCount = CardDatabaseManager::query()->getAllMainCardTypesWithCount();
+    setMinimumWidth(300);
+    setMaximumHeight(200);
 
-    setMaximumHeight(75);
-    setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
-
-    layout = new QHBoxLayout(this);
+    layout = new QVBoxLayout(this);
     setLayout(layout);
     layout->setContentsMargins(0, 1, 0, 1);
     layout->setSpacing(1);
@@ -27,32 +41,44 @@ VisualDatabaseDisplayMainTypeFilterWidget::VisualDatabaseDisplayMainTypeFilterWi
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
     layout->addWidget(flowWidget);
 
+    // Create a container for the threshold control
+    auto *thresholdLayout = new QHBoxLayout();
+    thresholdLayout->setContentsMargins(0, 0, 0, 0);
+
+    thresholdLabel = new QLabel(this);
+    thresholdLayout->addWidget(thresholdLabel);
+
     // Create the spinbox
     spinBox = new QSpinBox(this);
     spinBox->setMinimum(1);
-    spinBox->setMaximum(getMaxMainTypeCount()); // Set the max value dynamically
+    spinBox->setMaximum(getMaxMainTypeCount());
     spinBox->setValue(150);
-    layout->addWidget(spinBox);
-    connect(spinBox, QOverload<int>::of(&QSpinBox::valueChanged), this,
+    thresholdLayout->addWidget(spinBox);
+    thresholdLayout->addStretch();
+
+    layout->addLayout(thresholdLayout);
+
+    connect(spinBox, qOverload<int>(&QSpinBox::valueChanged), this,
             &VisualDatabaseDisplayMainTypeFilterWidget::updateMainTypeButtonsVisibility);
 
     // Create the toggle button for Exact Match/Includes mode
     toggleButton = new QPushButton(this);
-    toggleButton->setCheckable(true);
     layout->addWidget(toggleButton);
-    connect(toggleButton, &QPushButton::toggled, this, &VisualDatabaseDisplayMainTypeFilterWidget::updateFilterMode);
+    connect(toggleButton, &QPushButton::clicked, this, &VisualDatabaseDisplayMainTypeFilterWidget::updateFilterMode);
     connect(filterModel, &FilterTreeModel::layoutChanged, this, [this]() {
         QTimer::singleShot(100, this, &VisualDatabaseDisplayMainTypeFilterWidget::syncWithFilterModel);
     });
 
     createMainTypeButtons(); // Populate buttons initially
-    updateFilterMode(false); // Initialize toggle button text
+    updateFilterMode();      // Initialize toggle button text
 
     retranslateUi();
 }
 
 void VisualDatabaseDisplayMainTypeFilterWidget::retranslateUi()
 {
+    thresholdLabel->setText(tr("Show main types with at least:"));
+    spinBox->setSuffix(tr(" cards"));
     spinBox->setToolTip(tr("Do not display card main-types with less than this amount of cards in the database"));
     toggleButton->setToolTip(tr("Filter mode (AND/OR/NOT conjunctions of filters)"));
 }
@@ -63,8 +89,8 @@ void VisualDatabaseDisplayMainTypeFilterWidget::createMainTypeButtons()
     for (auto it = allMainCardTypesWithCount.begin(); it != allMainCardTypesWithCount.end(); ++it) {
         auto *button = new QPushButton(it.key(), flowWidget);
         button->setCheckable(true);
-        button->setStyleSheet("QPushButton { background-color: lightgray; border: 1px solid gray; padding: 5px; }"
-                              "QPushButton:checked { background-color: green; color: white; }");
+
+        button->setStyleSheet(visualDatabaseDisplayFilterButtonStyle);
 
         flowWidget->addWidget(button);
         typeButtons[it.key()] = button;
@@ -159,9 +185,9 @@ void VisualDatabaseDisplayMainTypeFilterWidget::updateMainTypeFilter()
     emit filterModel->layoutChanged();
 }
 
-void VisualDatabaseDisplayMainTypeFilterWidget::updateFilterMode(bool checked)
+void VisualDatabaseDisplayMainTypeFilterWidget::updateFilterMode()
 {
-    exactMatchMode = checked;
+    exactMatchMode = !exactMatchMode;
     toggleButton->setText(exactMatchMode ? tr("Mode: Exact Match") : tr("Mode: Includes"));
     updateMainTypeFilter();
 }
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 27c61dffc..b5a6f332c 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
@@ -1,20 +1,23 @@
 /**
  * @file visual_database_display_main_type_filter_widget.h
  * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H
 
-#include "../../../filters/filter_tree_model.h"
-#include "../general/layout_containers/flow_widget.h"
-
 #include <QMap>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class FilterTreeModel;
+class FlowWidget;
+class QLabel;
+class QPushButton;
+class QSpinBox;
+class QVBoxLayout;
 
 class VisualDatabaseDisplayMainTypeFilterWidget : public QWidget
 {
@@ -28,21 +31,23 @@ public:
 
     void handleMainTypeToggled(const QString &mainType, bool active);
     void updateMainTypeFilter();
-    void updateFilterMode(bool checked);
+    void updateFilterMode();
     void syncWithFilterModel();
 
 private:
     FilterTreeModel *filterModel;
     QMap<QString, int> allMainCardTypesWithCount;
-    QSpinBox *spinBox;
-    QHBoxLayout *layout;
+
+    QVBoxLayout *layout;
     FlowWidget *flowWidget;
+    QLabel *thresholdLabel;
+    QSpinBox *spinBox;
     QPushButton *toggleButton; // Mode switch button
 
     QMap<QString, bool> activeMainTypes;      // Track active filters
     QMap<QString, QPushButton *> typeButtons; // Store toggle buttons
 
-    bool exactMatchMode = false; // Toggle between "Exact Match" and "Includes"
+    bool exactMatchMode = true; // Toggle between "Exact Match" and "Includes"
 };
 
 #endif // VISUAL_DATABASE_DISPLAY_MAIN_TYPE_FILTER_WIDGET_H
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 64eed8b16..d3e497b21 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,14 +1,31 @@
 #include "visual_database_display_name_filter_widget.h"
 
 #include "../../../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h"
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.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 "visual_database_display_filter_button.h"
 
-#include <QHBoxLayout>
+#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>
 
 VisualDatabaseDisplayNameFilterWidget::VisualDatabaseDisplayNameFilterWidget(QWidget *parent,
-                                                                             AbstractTabDeckEditor *_deckEditor,
-                                                                             FilterTreeModel *_filterModel)
-    : QWidget(parent), deckEditor(_deckEditor), filterModel(_filterModel)
+                                                                             FilterTreeModel *_filterModel,
+                                                                             DeckListModel *deckListModel)
+    : QWidget(parent), filterModel(_filterModel), deckListModel(deckListModel)
 {
     setMinimumWidth(300);
     setMaximumHeight(300);
@@ -51,7 +68,7 @@ VisualDatabaseDisplayNameFilterWidget::VisualDatabaseDisplayNameFilterWidget(QWi
 
 void VisualDatabaseDisplayNameFilterWidget::retranslateUi()
 {
-    searchBox->setPlaceholderText(tr("Filter by name..."));
+    searchBox->setPlaceholderText(tr("Filter by name... (Exact match)"));
     loadFromDeckButton->setText(tr("Load from Deck"));
     loadFromDeckButton->setToolTip(tr("Apply all card names in currently loaded deck as exact match name filters"));
     loadFromClipboardButton->setText(tr("Load from Clipboard"));
@@ -60,18 +77,13 @@ void VisualDatabaseDisplayNameFilterWidget::retranslateUi()
 
 void VisualDatabaseDisplayNameFilterWidget::actLoadFromDeck()
 {
-    DeckListModel *deckListModel = deckEditor->deckDockWidget->deckModel;
-
-    if (!deckListModel)
-        return;
-    DeckList *decklist = deckListModel->getDeckList();
-    if (!decklist)
+    if (!deckListModel) {
         return;
+    }
 
-    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
-
-    for (auto currentCard : cardsInDeck) {
-        createNameFilter(currentCard->getName());
+    QList<QString> cardNames = deckListModel->getCardNames();
+    for (auto cardName : cardNames) {
+        createNameFilter(cardName);
     }
 
     updateFilterModel();
@@ -80,10 +92,11 @@ void VisualDatabaseDisplayNameFilterWidget::actLoadFromDeck()
 void VisualDatabaseDisplayNameFilterWidget::actLoadFromClipboard()
 {
     DlgLoadDeckFromClipboard dlg(this);
-    if (!dlg.exec())
+    if (!dlg.exec()) {
         return;
+    }
 
-    QStringList cardsInClipboard = dlg.getDeckList()->getDeckList()->getCardList();
+    QStringList cardsInClipboard = dlg.getDeckList().getCardList();
     for (QString cardName : cardsInClipboard) {
         createNameFilter(cardName);
     }
@@ -93,13 +106,14 @@ void VisualDatabaseDisplayNameFilterWidget::actLoadFromClipboard()
 
 void VisualDatabaseDisplayNameFilterWidget::createNameFilter(const QString &name)
 {
-    if (activeFilters.contains(name))
+    if (activeFilters.contains(name)) {
         return;
+    }
 
     // Create a button for the filter
     auto *button = new QPushButton(name, flowWidget);
-    button->setStyleSheet("QPushButton { background-color: lightgray; border: 1px solid gray; padding: 5px; }"
-                          "QPushButton:hover { background-color: red; color: white; }");
+
+    button->setStyleSheet(visualDatabaseDisplayFilterButtonStyle);
 
     connect(button, &QPushButton::clicked, this, [this, name]() {
         removeNameFilter(name);
@@ -123,14 +137,14 @@ void VisualDatabaseDisplayNameFilterWidget::updateFilterModel()
 {
     // Clear existing name filters
     emit filterModel->layoutAboutToBeChanged();
-    filterModel->clearFiltersOfType(CardFilter::Attr::AttrName);
+    filterModel->clearFiltersOfType(CardFilter::Attr::AttrNameExact);
 
     filterModel->blockSignals(true);
     filterModel->filterTree()->blockSignals(true);
 
     for (const auto &name : activeFilters.keys()) {
         QString nameString = name;
-        filterModel->addFilter(new CardFilter(nameString, CardFilter::Type::TypeOr, CardFilter::Attr::AttrName));
+        filterModel->addFilter(new CardFilter(nameString, CardFilter::Type::TypeOr, CardFilter::Attr::AttrNameExact));
     }
 
     filterModel->blockSignals(false);
@@ -146,7 +160,7 @@ void VisualDatabaseDisplayNameFilterWidget::updateFilterModel()
 void VisualDatabaseDisplayNameFilterWidget::syncWithFilterModel()
 {
     QStringList currentFilters;
-    for (const auto &filter : filterModel->getFiltersOfType(CardFilter::Attr::AttrName)) {
+    for (const auto &filter : filterModel->getFiltersOfType(CardFilter::Attr::AttrNameExact)) {
         if (filter->type() == CardFilter::Type::TypeOr) {
             currentFilters.append(filter->term());
         }
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 76d3ec29e..1629cb93b 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
@@ -1,28 +1,31 @@
 /**
  * @file visual_database_display_name_filter_widget.h
  * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef VISUAL_DATABASE_DISPLAY_NAME_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_NAME_FILTER_WIDGET_H
 
-#include "../../../filters/filter_tree_model.h"
-#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h"
-#include "../general/layout_containers/flow_widget.h"
-
-#include <QLineEdit>
 #include <QMap>
-#include <QPushButton>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class DeckListModel;
+class FilterTreeModel;
+class FlowWidget;
+class QLineEdit;
+class QPushButton;
+class QVBoxLayout;
 
 class VisualDatabaseDisplayNameFilterWidget : public QWidget
 {
     Q_OBJECT
 public:
     explicit VisualDatabaseDisplayNameFilterWidget(QWidget *parent,
-                                                   AbstractTabDeckEditor *deckEditor,
-                                                   FilterTreeModel *filterModel);
+                                                   FilterTreeModel *filterModel,
+                                                   DeckListModel *deckListModel = nullptr);
 
     void createNameFilter(const QString &name);
     void removeNameFilter(const QString &name);
@@ -34,8 +37,8 @@ public slots:
     void retranslateUi();
 
 private:
-    AbstractTabDeckEditor *deckEditor;
     FilterTreeModel *filterModel;
+    DeckListModel *deckListModel;
     QVBoxLayout *layout;
     QLineEdit *searchBox;
     FlowWidget *flowWidget;
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 1ea6e8e67..3d76fb78a 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,33 +2,59 @@
 
 #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)
 {
     layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+
     setLayout(layout);
 
     filterToMostRecentSetsCheckBox = new QCheckBox(this);
     filterToMostRecentSetsCheckBox->setChecked(
-        SettingsCache::instance().getVisualDatabaseDisplayFilterToMostRecentSetsEnabled());
-    connect(filterToMostRecentSetsCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setVisualDatabaseDisplayFilterToMostRecentSetsEnabled);
+        SettingsCache::instance().visualDeckStorage().getVisualDatabaseDisplayFilterToMostRecentSetsEnabled());
+    connect(filterToMostRecentSetsCheckBox, &QCheckBox::QT_STATE_CHANGED,
+            &SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::setVisualDatabaseDisplayFilterToMostRecentSetsEnabled);
 
     filterToMostRecentSetsAmount = new QSpinBox(this);
     filterToMostRecentSetsAmount->setMinimum(1);
     filterToMostRecentSetsAmount->setMaximum(100);
     filterToMostRecentSetsAmount->setValue(
-        SettingsCache::instance().getVisualDatabaseDisplayFilterToMostRecentSetsAmount());
-    connect(filterToMostRecentSetsAmount, QOverload<int>::of(&QSpinBox::valueChanged), &SettingsCache::instance(),
-            &SettingsCache::setVisualDatabaseDisplayFilterToMostRecentSetsAmount);
+        SettingsCache::instance().visualDeckStorage().getVisualDatabaseDisplayFilterToMostRecentSetsAmount());
+    connect(filterToMostRecentSetsAmount, qOverload<int>(&QSpinBox::valueChanged),
+            &SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::setVisualDatabaseDisplayFilterToMostRecentSetsAmount);
 
     layout->addWidget(filterToMostRecentSetsCheckBox);
     layout->addWidget(filterToMostRecentSetsAmount);
@@ -51,14 +77,6 @@ VisualDatabaseDisplaySetFilterWidget::VisualDatabaseDisplaySetFilterWidget(QWidg
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
-    recentSetsSettingsWidget = new VisualDatabaseDisplayRecentSetFilterSettingsWidget(this);
-    layout->addWidget(recentSetsSettingsWidget);
-
-    connect(&SettingsCache::instance(), &SettingsCache::visualDatabaseDisplayFilterToMostRecentSetsEnabledChanged, this,
-            &VisualDatabaseDisplaySetFilterWidget::filterToRecentSets);
-    connect(&SettingsCache::instance(), &SettingsCache::visualDatabaseDisplayFilterToMostRecentSetsAmountChanged, this,
-            &VisualDatabaseDisplaySetFilterWidget::filterToRecentSets);
-
     searchBox = new QLineEdit(this);
     searchBox->setPlaceholderText(tr("Search sets..."));
     layout->addWidget(searchBox);
@@ -68,15 +86,25 @@ VisualDatabaseDisplaySetFilterWidget::VisualDatabaseDisplaySetFilterWidget(QWidg
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
     layout->addWidget(flowWidget);
 
+    recentSetsSettingsWidget = new VisualDatabaseDisplayRecentSetFilterSettingsWidget(this);
+    layout->addWidget(recentSetsSettingsWidget);
+
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDatabaseDisplayFilterToMostRecentSetsEnabledChanged, this,
+            &VisualDatabaseDisplaySetFilterWidget::filterToRecentSets);
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDatabaseDisplayFilterToMostRecentSetsAmountChanged, this,
+            &VisualDatabaseDisplaySetFilterWidget::filterToRecentSets);
+
     // Create the toggle button for Exact Match/Includes mode
     toggleButton = new QPushButton(this);
-    toggleButton->setCheckable(true);
     layout->addWidget(toggleButton);
-    connect(toggleButton, &QPushButton::toggled, this, &VisualDatabaseDisplaySetFilterWidget::updateFilterMode);
+    connect(toggleButton, &QPushButton::clicked, this, &VisualDatabaseDisplaySetFilterWidget::updateFilterMode);
     connect(filterModel, &FilterTreeModel::layoutChanged, this,
             [this]() { QTimer::singleShot(100, this, &VisualDatabaseDisplaySetFilterWidget::syncWithFilterModel); });
 
     createSetButtons(); // Populate buttons initially
+    updateFilterMode();
     retranslateUi();
 }
 
@@ -99,8 +127,8 @@ void VisualDatabaseDisplaySetFilterWidget::createSetButtons()
 
         auto *button = new QPushButton(longName + " (" + shortName + ")", flowWidget);
         button->setCheckable(true);
-        button->setStyleSheet("QPushButton { background-color: lightgray; border: 1px solid gray; padding: 5px; }"
-                              "QPushButton:checked { background-color: green; color: white; }");
+
+        button->setStyleSheet(visualDatabaseDisplayFilterButtonStyle);
 
         flowWidget->addWidget(button);
         setButtons[shortName] = button;
@@ -115,7 +143,7 @@ void VisualDatabaseDisplaySetFilterWidget::createSetButtons()
 
 void VisualDatabaseDisplaySetFilterWidget::filterToRecentSets()
 {
-    if (SettingsCache::instance().getVisualDatabaseDisplayFilterToMostRecentSetsEnabled()) {
+    if (SettingsCache::instance().visualDeckStorage().getVisualDatabaseDisplayFilterToMostRecentSetsEnabled()) {
         for (auto set : activeSets.keys()) {
             activeSets[set] = false;
         }
@@ -126,7 +154,8 @@ void VisualDatabaseDisplaySetFilterWidget::filterToRecentSets()
         std::sort(allSets.begin(), allSets.end(),
                   [](const auto &a, const auto &b) { return a->getReleaseDate() > b->getReleaseDate(); });
 
-        int setsToPreactivate = SettingsCache::instance().getVisualDatabaseDisplayFilterToMostRecentSetsAmount();
+        int setsToPreactivate =
+            SettingsCache::instance().visualDeckStorage().getVisualDatabaseDisplayFilterToMostRecentSetsAmount();
         int setsActivated = 0;
 
         for (const auto &set : allSets) {
@@ -264,9 +293,16 @@ void VisualDatabaseDisplaySetFilterWidget::syncWithFilterModel()
     }
 }
 
-void VisualDatabaseDisplaySetFilterWidget::updateFilterMode(bool checked)
+void VisualDatabaseDisplaySetFilterWidget::updateFilterMode()
 {
-    exactMatchMode = checked;
+    // Disconnect the layoutChanged -> sync lambda temporarily
+    disconnect(filterModel, &FilterTreeModel::layoutChanged, this, nullptr);
+
+    exactMatchMode = !exactMatchMode;
     updateSetFilter();
     retranslateUi();
+
+    // Reconnect the layoutChanged -> sync lambda
+    connect(filterModel, &FilterTreeModel::layoutChanged, this,
+            [this]() { QTimer::singleShot(100, this, &VisualDatabaseDisplaySetFilterWidget::syncWithFilterModel); });
 }
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 b4362d1db..468e97e0d 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
@@ -1,22 +1,25 @@
 /**
  * @file visual_database_display_set_filter_widget.h
  * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H
 
-#include "../../../filters/filter_tree_model.h"
-#include "../general/layout_containers/flow_widget.h"
-
-#include <QCheckBox>
-#include <QLineEdit>
 #include <QMap>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QVBoxLayout>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class FilterTreeModel;
+class FlowWidget;
+class QCheckBox;
+class QHBoxLayout;
+class QLineEdit;
+class QPushButton;
+class QSpinBox;
+class QVBoxLayout;
 
 class VisualDatabaseDisplayRecentSetFilterSettingsWidget : public QWidget
 {
@@ -44,7 +47,7 @@ public:
 
     void updateSetFilter();
     void syncWithFilterModel();
-    void updateFilterMode(bool checked);
+    void updateFilterMode();
 
 private:
     FilterTreeModel *filterModel;
@@ -60,7 +63,7 @@ private:
     QMap<QString, QPushButton *> setButtons;  // Store set filter buttons
     QMap<QString, bool> activeSets;           // Track active set filters
 
-    bool exactMatchMode = false; // Toggle between "Exact Match" and "Includes"
+    bool exactMatchMode = true; // Toggle between "Exact Match" and "Includes"
 };
 
 #endif // VISUAL_DATABASE_DISPLAY_SET_FILTER_WIDGET_H
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 7a88b51cf..705bb8efa 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,13 +1,28 @@
 #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)
@@ -20,15 +35,6 @@ VisualDatabaseDisplaySubTypeFilterWidget::VisualDatabaseDisplaySubTypeFilterWidg
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
-    // Create and setup the spinbox
-    spinBox = new QSpinBox(this);
-    spinBox->setMinimum(1);
-    spinBox->setMaximum(getMaxSubTypeCount());
-    spinBox->setValue(150);
-    layout->addWidget(spinBox);
-    connect(spinBox, QOverload<int>::of(&QSpinBox::valueChanged), this,
-            &VisualDatabaseDisplaySubTypeFilterWidget::updateSubTypeButtonsVisibility);
-
     // Create search box
     searchBox = new QLineEdit(this);
     searchBox->setPlaceholderText(tr("Search subtypes..."));
@@ -40,23 +46,44 @@ VisualDatabaseDisplaySubTypeFilterWidget::VisualDatabaseDisplaySubTypeFilterWidg
     flowWidget->setMaximumHeight(300);
     layout->addWidget(flowWidget);
 
+    // Create a container for the threshold control
+    auto *thresholdLayout = new QHBoxLayout();
+    thresholdLayout->setContentsMargins(0, 0, 0, 0);
+
+    thresholdLabel = new QLabel(this);
+    thresholdLayout->addWidget(thresholdLabel);
+
+    // Create the spinbox
+    spinBox = new QSpinBox(this);
+    spinBox->setMinimum(1);
+    spinBox->setMaximum(getMaxSubTypeCount());
+    spinBox->setValue(150);
+    thresholdLayout->addWidget(spinBox);
+    thresholdLayout->addStretch();
+
+    layout->addLayout(thresholdLayout);
+
+    connect(spinBox, qOverload<int>(&QSpinBox::valueChanged), this,
+            &VisualDatabaseDisplaySubTypeFilterWidget::updateSubTypeButtonsVisibility);
+
     // Toggle button setup (Exact Match / Includes mode)
     toggleButton = new QPushButton(this);
-    toggleButton->setCheckable(true);
     layout->addWidget(toggleButton);
-    connect(toggleButton, &QPushButton::toggled, this, &VisualDatabaseDisplaySubTypeFilterWidget::updateFilterMode);
+    connect(toggleButton, &QPushButton::clicked, this, &VisualDatabaseDisplaySubTypeFilterWidget::updateFilterMode);
     connect(filterModel, &FilterTreeModel::layoutChanged, this, [this]() {
         QTimer::singleShot(100, this, &VisualDatabaseDisplaySubTypeFilterWidget::syncWithFilterModel);
     });
 
-    createSubTypeButtons();  // Populate buttons initially
-    updateFilterMode(false); // Initialize the toggle button text
+    createSubTypeButtons(); // Populate buttons initially
+    updateFilterMode();     // Initialize the toggle button text
 
     retranslateUi();
 }
 
 void VisualDatabaseDisplaySubTypeFilterWidget::retranslateUi()
 {
+    thresholdLabel->setText(tr("Show sub types with at least:"));
+    spinBox->setSuffix(tr(" cards"));
     spinBox->setToolTip(tr("Do not display card sub-types with less than this amount of cards in the database"));
     toggleButton->setToolTip(tr("Filter mode (AND/OR/NOT conjunctions of filters)"));
 }
@@ -67,8 +94,8 @@ void VisualDatabaseDisplaySubTypeFilterWidget::createSubTypeButtons()
     for (auto it = allSubCardTypesWithCount.begin(); it != allSubCardTypesWithCount.end(); ++it) {
         auto *button = new QPushButton(it.key(), flowWidget);
         button->setCheckable(true);
-        button->setStyleSheet("QPushButton { background-color: lightgray; border: 1px solid gray; padding: 5px; }"
-                              "QPushButton:checked { background-color: green; color: white; }");
+
+        button->setStyleSheet(visualDatabaseDisplayFilterButtonStyle);
 
         flowWidget->addWidget(button);
         typeButtons[it.key()] = button;
@@ -155,7 +182,7 @@ void VisualDatabaseDisplaySubTypeFilterWidget::updateSubTypeFilter()
             if (activeSubTypes[type]) {
                 QString typeString = type;
                 filterModel->addFilter(
-                    new CardFilter(typeString, CardFilter::Type::TypeAnd, CardFilter::Attr::AttrSubType));
+                    new CardFilter(typeString, CardFilter::Type::TypeOr, CardFilter::Attr::AttrSubType));
             }
         }
     }
@@ -166,9 +193,9 @@ void VisualDatabaseDisplaySubTypeFilterWidget::updateSubTypeFilter()
     emit filterModel->layoutChanged();
 }
 
-void VisualDatabaseDisplaySubTypeFilterWidget::updateFilterMode(bool checked)
+void VisualDatabaseDisplaySubTypeFilterWidget::updateFilterMode()
 {
-    exactMatchMode = checked;
+    exactMatchMode = !exactMatchMode;
     toggleButton->setText(exactMatchMode ? tr("Mode: Exact Match") : tr("Mode: Includes"));
     updateSubTypeFilter();
 }
@@ -188,7 +215,7 @@ void VisualDatabaseDisplaySubTypeFilterWidget::syncWithFilterModel()
     // Get active filters for sub types
     QSet<QString> activeTypes;
     for (const auto &filter : filterModel->getFiltersOfType(CardFilter::AttrSubType)) {
-        if (filter->type() == CardFilter::Type::TypeAnd) {
+        if (filter->type() == CardFilter::Type::TypeAnd || filter->type() == CardFilter::Type::TypeOr) {
             activeTypes.insert(filter->term());
         }
     }
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 c02db29be..7929063fd 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
@@ -1,19 +1,24 @@
 /**
  * @file visual_database_display_sub_type_filter_widget.h
  * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H
 
-#include "../../../filters/filter_tree_model.h"
-#include "../general/layout_containers/flow_widget.h"
-
 #include <QMap>
-#include <QPushButton>
-#include <QSpinBox>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class FilterTreeModel;
+class FlowWidget;
+class QLabel;
+class QLineEdit;
+class QPushButton;
+class QSpinBox;
+class QVBoxLayout;
 
 class VisualDatabaseDisplaySubTypeFilterWidget : public QWidget
 {
@@ -27,22 +32,24 @@ public:
 
     void handleSubTypeToggled(const QString &mainType, bool active);
     void updateSubTypeFilter();
-    void updateFilterMode(bool checked);
+    void updateFilterMode();
     void syncWithFilterModel();
 
 private:
     FilterTreeModel *filterModel;
     QMap<QString, int> allSubCardTypesWithCount;
-    QSpinBox *spinBox;
+
     QVBoxLayout *layout;
     QLineEdit *searchBox;
     FlowWidget *flowWidget;
+    QLabel *thresholdLabel;
+    QSpinBox *spinBox;
     QPushButton *toggleButton; // Mode switch button
 
     QMap<QString, bool> activeSubTypes;       // Track active filters
     QMap<QString, QPushButton *> typeButtons; // Store toggle buttons
 
-    bool exactMatchMode = false; // Toggle between "Exact Match" and "Includes"
+    bool exactMatchMode = true; // Toggle between "Exact Match" and "Includes"
 };
 
 #endif // VISUAL_DATABASE_DISPLAY_SUB_TYPE_FILTER_WIDGET_H
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 cc0fc8033..599ac97b4 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,32 +3,88 @@
 #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 "../quick_settings/settings_button_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_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 "visual_database_display_filter_toolbar_widget.h"
 
-#include <QHeaderView>
+#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 <QScrollBar>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QSlider>
+#include <QStringLiteral>
 #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>
+#include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
+#include <libcockatrice/settings/cards_display_settings.h>
 #include <utility>
 
+class QMouseEvent;
+
 VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
-                                                         AbstractTabDeckEditor *_deckEditor,
                                                          CardDatabaseModel *database_model,
-                                                         CardDatabaseDisplayModel *database_display_model)
-    : QWidget(parent), deckEditor(_deckEditor), databaseModel(database_model),
-      databaseDisplayModel(database_display_model)
+                                                         DeckListModel *deckListModel)
+    : QWidget(parent)
 {
+    debounceTimer = new QTimer(this);
+    debounceTimer->setSingleShot(true); // Ensure it only fires once after the timeout
+
+    connect(debounceTimer, &QTimer::timeout, this, &VisualDatabaseDisplayWidget::onSearchModelChanged);
+
+    // Create display model
+    databaseDisplayModel = new CardDatabaseDisplayModel(this);
+    databaseDisplayModel->setObjectName("databaseDisplayModel");
+    databaseDisplayModel->setSourceModel(database_model);
+    databaseDisplayModel->setFilterKeyColumn(0);
+
+    const auto applyCardSearchLanguage = [this]() {
+        const CardsDisplaySettings &cardsDisplay = SettingsCache::instance().cardsDisplay();
+        databaseDisplayModel->setSearchLanguage(CardSearchLanguage{
+            cardsDisplay.getCardLang(), static_cast<SearchLanguageMode>(cardsDisplay.getCardSearchLanguage())});
+    };
+    applyCardSearchLanguage();
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this,
+            applyCardSearchLanguage);
+    connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardSearchLanguageChanged, this,
+            applyCardSearchLanguage);
+
     cards = new QList<ExactCard>;
     connect(databaseDisplayModel, &CardDatabaseDisplayModel::modelDirty, this,
             &VisualDatabaseDisplayWidget::modelDirty);
@@ -42,22 +98,21 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
     mainLayout->setContentsMargins(0, 0, 0, 0);
 
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarPolicy::ScrollBarAsNeeded);
-    cardSizeWidget = new CardSizeWidget(this, flowWidget, SettingsCache::instance().getVisualDatabaseDisplayCardSize());
-    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
-            &SettingsCache::setVisualDatabaseDisplayCardSize);
+    cardSizeWidget = new CardSizeWidget(this, flowWidget,
+                                        SettingsCache::instance().cardsDisplay().getVisualDatabaseDisplayCardSize());
+    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::setVisualDatabaseDisplayCardSize);
+    cardSizeWidget->enableCtrlScrollResize(flowWidget);
 
-    searchContainer = new QWidget(this);
-    searchLayout = new QHBoxLayout(searchContainer);
-    searchContainer->setLayout(searchLayout);
+    searchContainer = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff);
 
     searchEdit = new SearchLineEdit();
     searchEdit->setObjectName("searchEdit");
     searchEdit->setPlaceholderText(tr("Search by card name (or search expressions)"));
     searchEdit->setClearButtonEnabled(true);
     searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition);
-    auto help = searchEdit->addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition);
+    auto help = searchEdit->addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition);
     connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(searchEdit); });
-    searchEdit->installEventFilter(&searchKeySignals);
 
     setFocusProxy(searchEdit);
     setFocusPolicy(Qt::ClickFocus);
@@ -72,80 +127,46 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
     filterModel = new FilterTreeModel();
     filterModel->setObjectName("filterModel");
 
-    searchKeySignals.setObjectName("searchKeySignals");
-    connect(searchEdit, &SearchLineEdit::textChanged, this, &VisualDatabaseDisplayWidget::updateSearch);
-    connect(&searchKeySignals, &KeySignals::onEnter, deckEditor->databaseDisplayDockWidget,
-            &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck);
-    connect(&searchKeySignals, &KeySignals::onCtrlAltEqual, deckEditor->databaseDisplayDockWidget,
-            &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck);
-    connect(&searchKeySignals, &KeySignals::onCtrlAltRBracket, deckEditor->databaseDisplayDockWidget,
-            &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard);
-    connect(&searchKeySignals, &KeySignals::onCtrlAltMinus, deckEditor->databaseDisplayDockWidget,
-            &DeckEditorDatabaseDisplayWidget::actDecrementCardFromMainDeck);
-    connect(&searchKeySignals, &KeySignals::onCtrlAltLBracket, deckEditor->databaseDisplayDockWidget,
-            &DeckEditorDatabaseDisplayWidget::actDecrementCardFromSideboard);
-    connect(&searchKeySignals, &KeySignals::onCtrlAltEnter, deckEditor->databaseDisplayDockWidget,
-            &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard);
-    connect(&searchKeySignals, &KeySignals::onCtrlEnter, deckEditor->databaseDisplayDockWidget,
-            &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard);
-    connect(&searchKeySignals, &KeySignals::onCtrlC, deckEditor->databaseDisplayDockWidget,
-            &DeckEditorDatabaseDisplayWidget::copyDatabaseCellContents);
-    connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(searchEdit); });
+    connect(searchEdit, &SearchLineEdit::textChanged, databaseDisplayModel, &CardDatabaseDisplayModel::setStringFilter);
 
-    databaseView = deckEditor->databaseDisplayDockWidget->getDatabaseView();
+    databaseView = new CardDatabaseView(this, databaseDisplayModel);
+    databaseView->setObjectName("databaseView");
     databaseView->setFocusProxy(searchEdit);
     databaseView->setItemDelegate(nullptr);
     databaseView->setVisible(false);
 
-    searchEdit->setTreeView(databaseView);
-
-    sortByLabel = new QLabel(this);
-    sortColumnCombo = new QComboBox(this);
-    sortColumnCombo->setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy::AdjustToContents);
-    sortOrderCombo = new QComboBox(this);
-    sortOrderCombo->setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy::AdjustToContents);
-
-    sortOrderCombo->addItem("Ascending", Qt::AscendingOrder);
-    sortOrderCombo->addItem("Descending", Qt::DescendingOrder);
-    sortOrderCombo->view()->setMinimumWidth(sortOrderCombo->view()->sizeHintForColumn(0));
-    sortOrderCombo->adjustSize();
-
-    // Populate columns dynamically from the model
-    for (int i = 0; i < databaseDisplayModel->columnCount(); ++i) {
-        QString header = databaseDisplayModel->headerData(i, Qt::Horizontal).toString();
-        sortColumnCombo->addItem(header, i);
+    // Without a deck model there is nothing to add cards to, so the zone menu stays hidden.
+    if (deckListModel) {
+        databaseView->setZoneMenuProvider(
+            [deckListModel]() -> QList<QPair<QString, QStringList>> {
+                QList<QPair<QString, QStringList>> result;
+                for (const QString &boardName : InnerDecklistNode::boardZoneNames()) {
+                    result.append({boardName, deckListModel->getCustomZoneNames(boardName)});
+                }
+                return result;
+            },
+            [this] { return newZoneCreator ? newZoneCreator() : QString(); });
     }
 
-    sortColumnCombo->view()->setMinimumWidth(sortColumnCombo->view()->sizeHintForColumn(0));
-    sortColumnCombo->adjustSize();
+    searchEdit->setTreeView(databaseView);
+    searchEdit->installEventFilter(databaseView->getKeySignals());
 
-    connect(sortColumnCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]() {
-        int column = sortColumnCombo->currentData().toInt();
-        Qt::SortOrder order = static_cast<Qt::SortOrder>(sortOrderCombo->currentData().toInt());
-        databaseView->sortByColumn(column, order);
-
-        searchModelChanged();
-    });
-
-    connect(sortOrderCombo, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this]() {
-        int column = sortColumnCombo->currentData().toInt();
-        Qt::SortOrder order = static_cast<Qt::SortOrder>(sortOrderCombo->currentData().toInt());
-        databaseView->sortByColumn(column, order);
-
-        searchModelChanged();
-    });
+    connect(databaseView, &CardDatabaseView::cardChanged, this, &VisualDatabaseDisplayWidget::onSelectedCardChanged);
+    connect(databaseView, &CardDatabaseView::cardAdded, this, &VisualDatabaseDisplayWidget::actAddCard);
+    connect(databaseView, &CardDatabaseView::cardDecremented, this, &VisualDatabaseDisplayWidget::actDecrementCard);
+    connect(databaseView, &CardDatabaseView::edhrecClicked, this, &VisualDatabaseDisplayWidget::edhrecRequested);
+    connect(databaseView, &CardDatabaseView::selectPrintingClicked, this,
+            &VisualDatabaseDisplayWidget::printingSelectorRequested);
+    connect(databaseView, &CardDatabaseView::relatedCardClicked, this,
+            &VisualDatabaseDisplayWidget::onRelatedCardClicked);
 
     colorFilterWidget = new VisualDatabaseDisplayColorFilterWidget(this, filterModel);
 
-    filterContainer = new QWidget(this);
-    filterContainerLayout = new QHBoxLayout(filterContainer);
-    filterContainer->setLayout(filterContainerLayout);
-
-    filterByLabel = new QLabel(this);
+    filterContainer = new VisualDatabaseDisplayFilterToolbarWidget(this, deckListModel);
 
     clearFilterWidget = new QToolButton();
     clearFilterWidget->setFixedSize(32, 32);
-    clearFilterWidget->setIcon(QPixmap("theme:icons/delete"));
+    clearFilterWidget->setIcon(themePixmap(QStringLiteral("icons/delete")));
     connect(clearFilterWidget, &QToolButton::clicked, this, [this] {
         filterModel->blockSignals(true);
         filterModel->filterTree()->blockSignals(true);
@@ -156,20 +177,6 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
         emit filterModel->layoutChanged();
     });
 
-    quickFilterSaveLoadWidget = new SettingsButtonWidget(this);
-    quickFilterSaveLoadWidget->setButtonIcon(QPixmap("theme:icons/lock"));
-
-    quickFilterNameWidget = new SettingsButtonWidget(this);
-    quickFilterNameWidget->setButtonIcon(QPixmap("theme:icons/rename"));
-
-    quickFilterSubTypeWidget = new SettingsButtonWidget(this);
-    quickFilterSubTypeWidget->setButtonIcon(QPixmap("theme:icons/player"));
-
-    quickFilterSetWidget = new SettingsButtonWidget(this);
-    quickFilterSetWidget->setButtonIcon(QPixmap("theme:icons/scales"));
-
-    filterContainer->setMaximumHeight(80);
-
     databaseLoadIndicator = new QLabel(this);
     databaseLoadIndicator->setAlignment(Qt::AlignCenter);
 
@@ -178,17 +185,14 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent,
     if (CardDatabaseManager::getInstance()->getLoadStatus() != LoadStatus::Ok) {
         connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this,
                 &VisualDatabaseDisplayWidget::initialize);
-        sortByLabel->setVisible(false);
-        filterByLabel->setVisible(false);
-        quickFilterSaveLoadWidget->setVisible(false);
-        quickFilterNameWidget->setVisible(false);
-        quickFilterSubTypeWidget->setVisible(false);
-        quickFilterSetWidget->setVisible(false);
+        filterContainer->setVisible(false);
     } else {
         initialize();
         databaseLoadIndicator->setVisible(false);
     }
 
+    QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar();
+    connect(scrollBar, &QScrollBar::valueChanged, [this](int /*value*/) { loadCurrentPage(); });
     retranslateUi();
 }
 
@@ -196,38 +200,10 @@ void VisualDatabaseDisplayWidget::initialize()
 {
     databaseLoadIndicator->setVisible(false);
 
-    sortByLabel->setVisible(true);
-    filterByLabel->setVisible(true);
-    quickFilterSaveLoadWidget->setVisible(true);
-    quickFilterNameWidget->setVisible(true);
-    quickFilterSubTypeWidget->setVisible(true);
-    quickFilterSetWidget->setVisible(true);
-
-    saveLoadWidget = new VisualDatabaseDisplayFilterSaveLoadWidget(this, filterModel);
-    nameFilterWidget = new VisualDatabaseDisplayNameFilterWidget(this, deckEditor, filterModel);
-    mainTypeFilterWidget = new VisualDatabaseDisplayMainTypeFilterWidget(this, filterModel);
-    subTypeFilterWidget = new VisualDatabaseDisplaySubTypeFilterWidget(this, filterModel);
-    setFilterWidget = new VisualDatabaseDisplaySetFilterWidget(this, filterModel);
-
-    quickFilterSaveLoadWidget->addSettingsWidget(saveLoadWidget);
-    quickFilterNameWidget->addSettingsWidget(nameFilterWidget);
-    quickFilterSubTypeWidget->addSettingsWidget(subTypeFilterWidget);
-    quickFilterSetWidget->addSettingsWidget(setFilterWidget);
-
-    filterContainerLayout->addWidget(sortByLabel);
-    filterContainerLayout->addWidget(sortColumnCombo);
-    filterContainerLayout->addWidget(sortOrderCombo);
-    filterContainerLayout->addWidget(filterByLabel);
-    filterContainerLayout->addWidget(quickFilterSaveLoadWidget);
-    filterContainerLayout->addWidget(quickFilterNameWidget);
-    filterContainerLayout->addWidget(quickFilterSubTypeWidget);
-    filterContainerLayout->addWidget(quickFilterSetWidget);
-    filterContainerLayout->addWidget(mainTypeFilterWidget);
-
-    searchLayout->addWidget(colorFilterWidget);
-    searchLayout->addWidget(clearFilterWidget);
-    searchLayout->addWidget(searchEdit);
-    searchLayout->addWidget(displayModeButton);
+    searchContainer->addWidget(colorFilterWidget);
+    searchContainer->addWidget(clearFilterWidget);
+    searchContainer->addWidget(searchEdit);
+    searchContainer->addWidget(displayModeButton);
 
     mainLayout->addWidget(searchContainer);
 
@@ -239,37 +215,59 @@ void VisualDatabaseDisplayWidget::initialize()
 
     mainLayout->addWidget(cardSizeWidget);
 
-    debounceTimer = new QTimer(this);
-    debounceTimer->setSingleShot(true); // Ensure it only fires once after the timeout
+    connect(filterModel, &FilterTreeModel::layoutChanged, this, &VisualDatabaseDisplayWidget::onSearchModelChanged);
 
-    connect(debounceTimer, &QTimer::timeout, this, &VisualDatabaseDisplayWidget::searchModelChanged);
+    initializeFilters();
+}
 
-    databaseDisplayModel->setFilterTree(filterModel->filterTree());
+void VisualDatabaseDisplayWidget::initializeFilters()
+{
+    if (filtersInitialized || !isVisible() || CardDatabaseManager::getInstance()->getLoadStatus() != LoadStatus::Ok) {
+        return;
+    }
 
-    connect(filterModel, &FilterTreeModel::layoutChanged, this, &VisualDatabaseDisplayWidget::searchModelChanged);
+    filtersInitialized = true;
 
-    loadCardsTimer = new QTimer(this);
-    loadCardsTimer->setSingleShot(true); // Ensure it only fires once after the timeout
+    // The filter toolbar builds its widgets by iterating the entire card database
+    // (per-set, per-main-type, per-sub-type and per-format buttons). Building it
+    // inside showEvent would block the tab switch, so keep it hidden and defer the
+    // build to the next event loop turn, letting the tab paint first. The toolbar
+    // then appears one event loop turn later, shifting the grid down by the toolbar
+    // height -- the intended tradeoff of an responsive tab switch.
+    filterContainer->setVisible(false);
 
-    connect(loadCardsTimer, &QTimer::timeout, this, [this]() { loadCurrentPage(); });
-    loadCardsTimer->start(5000);
+    QTimer::singleShot(0, this, [this] {
+        filterContainer->initialize();
+        filterContainer->setVisible(true);
 
-    retranslateUi();
+        databaseDisplayModel->setFilterTree(filterModel->filterTree());
+
+        QTimer::singleShot(5000, this, [this] { loadCurrentPage(); });
+
+        retranslateUi();
+    });
+}
+
+void VisualDatabaseDisplayWidget::showEvent(QShowEvent *event)
+{
+    QWidget::showEvent(event);
+    initializeFilters();
+}
+
+void VisualDatabaseDisplayWidget::setNewZoneCreator(const std::function<QString()> &creator)
+{
+    newZoneCreator = creator;
 }
 
 void VisualDatabaseDisplayWidget::retranslateUi()
 {
     databaseLoadIndicator->setText(tr("Loading database ..."));
-
     clearFilterWidget->setToolTip(tr("Clear all filters"));
+}
 
-    sortByLabel->setText(tr("Sort by:"));
-    filterByLabel->setText(tr("Filter by:"));
-
-    quickFilterSaveLoadWidget->setToolTip(tr("Save and load filters"));
-    quickFilterNameWidget->setToolTip(tr("Filter by exact card name"));
-    quickFilterSubTypeWidget->setToolTip(tr("Filter by card sub-type"));
-    quickFilterSetWidget->setToolTip(tr("Filter by set"));
+void VisualDatabaseDisplayWidget::highlightAllSearchEdit()
+{
+    searchEdit->setSelection(0, searchEdit->text().length());
 }
 
 void VisualDatabaseDisplayWidget::resizeEvent(QResizeEvent *event)
@@ -297,9 +295,9 @@ void VisualDatabaseDisplayWidget::onDisplayModeChanged(bool checked)
     }
 }
 
-void VisualDatabaseDisplayWidget::onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance)
+void VisualDatabaseDisplayWidget::onClick(QMouseEvent *event, const ExactCard &card)
 {
-    emit cardClickedDatabaseDisplay(event, instance);
+    emit cardClickedDatabaseDisplay(event, card);
 }
 
 void VisualDatabaseDisplayWidget::onHover(const ExactCard &hoveredCard)
@@ -307,37 +305,32 @@ void VisualDatabaseDisplayWidget::onHover(const ExactCard &hoveredCard)
     emit cardHoveredDatabaseDisplay(hoveredCard);
 }
 
-void VisualDatabaseDisplayWidget::addCard(const ExactCard &cardToAdd)
+void VisualDatabaseDisplayWidget::addCardToDisplay(const ExactCard &cardToAdd)
 {
     cards->append(cardToAdd);
     auto *display = new CardInfoPictureWithTextOverlayWidget(flowWidget, false);
     display->setScaleFactor(cardSizeWidget->getSlider()->value());
     display->setCard(cardToAdd);
     flowWidget->addWidget(display);
-    connect(display, &CardInfoPictureWithTextOverlayWidget::imageClicked, this, &VisualDatabaseDisplayWidget::onClick);
+    connect(display, &CardInfoPictureWithTextOverlayWidget::cardClicked, this, &VisualDatabaseDisplayWidget::onClick);
     connect(display, &CardInfoPictureWithTextOverlayWidget::hoveredOnCard, this, &VisualDatabaseDisplayWidget::onHover);
     connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, display, &CardInfoPictureWidget::setScaleFactor);
 }
 
-void VisualDatabaseDisplayWidget::updateSearch(const QString &search) const
+bool VisualDatabaseDisplayWidget::isVisualDisplayMode() const
 {
-    databaseDisplayModel->setStringFilter(search);
-    QModelIndexList sel = databaseView->selectionModel()->selectedRows();
-    if (sel.isEmpty() && databaseDisplayModel->rowCount())
-        databaseView->selectionModel()->setCurrentIndex(databaseDisplayModel->index(0, 0),
-                                                        QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
+    return !displayModeButton->isChecked();
 }
 
-void VisualDatabaseDisplayWidget::searchModelChanged()
+void VisualDatabaseDisplayWidget::onSearchModelChanged()
 {
     if (flowWidget->isVisible()) {
         // Clear the current page and prepare for new data
         flowWidget->clearLayout(); // Clear existing cards
         cards->clear();            // Clear the card list
         // Reset scrollbar position to the top after loading new cards
-        if (QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar()) {
-            scrollBar->setValue(0); // Reset scrollbar to top
-        }
+        QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar();
+        scrollBar->setValue(0); // Reset scrollbar to top
 
         currentPage = 0;
         loadCurrentPage();
@@ -345,14 +338,60 @@ void VisualDatabaseDisplayWidget::searchModelChanged()
     }
 }
 
+void VisualDatabaseDisplayWidget::onSelectedCardChanged(const QString &cardName)
+{
+    emit cardHoveredDatabaseDisplay(CardDatabaseManager::query()->getPreferredCard(cardName));
+}
+
+void VisualDatabaseDisplayWidget::actAddCard(const QString &cardName, const QString &zoneName)
+{
+    highlightAllSearchEdit();
+    ExactCard exactCard = CardDatabaseManager::query()->getPreferredCard(cardName);
+    emit cardAdded(exactCard, zoneName);
+}
+
+void VisualDatabaseDisplayWidget::actDecrementCard(const QString &cardName, const QString &zoneName)
+{
+    ExactCard exactCard = CardDatabaseManager::query()->getPreferredCard(cardName);
+    emit cardDecremented(exactCard, zoneName);
+}
+
+void VisualDatabaseDisplayWidget::onRelatedCardClicked(const QString &relatedCard)
+{
+    ExactCard exactCard = CardDatabaseManager::query()->guessCard({relatedCard});
+    emit cardInfoRequested(exactCard);
+}
+
+bool VisualDatabaseDisplayWidget::nearEndOfPage() const
+{
+    if (!flowWidget->isVisible()) {
+        return false;
+    }
+
+    QScrollBar *scrollBar = flowWidget->scrollArea->verticalScrollBar();
+    if (scrollBar->value() + scrollBar->pageStep() * 2 < scrollBar->maximum()) {
+        return false; // there is at least two pages of space to scroll remaining
+    }
+
+    return true;
+}
+
 void VisualDatabaseDisplayWidget::loadCurrentPage()
 {
     // Ensure only the initial page is loaded
     if (currentPage == 0) {
-        // Only load the first page initially
-        qCDebug(VisualDatabaseDisplayLog) << "Loading the first page";
-        populateCards();
-    } else {
+        if (!initialLoadScheduled) {
+            initialLoadScheduled = true;
+            qCDebug(VisualDatabaseDisplayLog) << "Loading the first page";
+            // Defer the first page so the tab switch stays responsive. The card
+            // grid builds one event loop turn later. This also applies to
+            // search-driven reloads, which reset currentPage back to 0.
+            QTimer::singleShot(0, this, [this] {
+                initialLoadScheduled = false;
+                populateCards();
+            });
+        }
+    } else if (nearEndOfPage()) {
         // If not the first page, just load the next page and append to the flow widget
         loadNextPage();
     }
@@ -377,7 +416,9 @@ void VisualDatabaseDisplayWidget::loadNextPage()
     }
 
     // Load the next page of cards and add them to the flow widget
+    flowWidget->setUpdatesEnabled(false);
     loadPage(start, end);
+    flowWidget->setUpdatesEnabled(true);
 }
 
 void VisualDatabaseDisplayWidget::loadPage(int start, int end)
@@ -395,12 +436,12 @@ void VisualDatabaseDisplayWidget::loadPage(int start, int end)
                 for (const CardFilter *setFilter : setFilters) {
                     if (setMap.contains(setFilter->term())) {
                         for (PrintingInfo printing : setMap[setFilter->term()]) {
-                            addCard(ExactCard(info, printing));
+                            addCardToDisplay(ExactCard(info, printing));
                         }
                     }
                 }
             } else {
-                addCard(CardDatabaseManager::query()->getPreferredCard(info));
+                addCardToDisplay(CardDatabaseManager::query()->getPreferredCard(info));
             }
         } else {
             qCDebug(VisualDatabaseDisplayLog) << "Card not found in database!";
@@ -429,23 +470,3 @@ void VisualDatabaseDisplayWidget::databaseDataChanged(const QModelIndex &topLeft
     (void)bottomRight;
     qCDebug(VisualDatabaseDisplayLog) << "Database Data changed";
 }
-
-void VisualDatabaseDisplayWidget::wheelEvent(QWheelEvent *event)
-{
-    int totalCards = databaseDisplayModel->rowCount(); // Total number of cards
-    int loadedCards = currentPage * cardsPerPage;
-
-    // Handle scrolling down
-    if (event->angleDelta().y() < 0) {
-        // Check if the next page has any cards to load
-        if (loadedCards < totalCards) {
-            loadCurrentPage(); // Load the next page
-            event->accept();   // Accept the event as valid
-            return;
-        }
-        qCDebug(VisualDatabaseDisplayLog) << loadedCards << ":" << totalCards;
-    }
-
-    // Prevent overscrolling when there's no more data to load
-    event->ignore();
-}
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 5cab2ca9b..9771e55c1 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
@@ -1,34 +1,44 @@
 /**
  * @file visual_database_display_widget.h
  * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef VISUAL_DATABASE_DISPLAY_WIDGET_H
 #define VISUAL_DATABASE_DISPLAY_WIDGET_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_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 "libcockatrice/card/card_info.h"
 
 #include <QLoggingCategory>
-#include <QVBoxLayout>
-#include <QWheelEvent>
+#include <QMouseEvent>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
-#include <libcockatrice/models/database/card_database_model.h>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <qscrollarea.h>
+#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;
 
 inline Q_LOGGING_CATEGORY(VisualDatabaseDisplayLog, "visual_database_display");
 
@@ -38,9 +48,8 @@ class VisualDatabaseDisplayWidget : public QWidget
 
 public:
     explicit VisualDatabaseDisplayWidget(QWidget *parent,
-                                         AbstractTabDeckEditor *deckEditor,
                                          CardDatabaseModel *database_model,
-                                         CardDatabaseDisplayModel *database_display_model);
+                                         DeckListModel *deckListModel = nullptr);
     void retranslateUi();
 
     void adjustCardsPerPage();
@@ -51,55 +60,73 @@ public:
     void sortCardList(const QStringList &properties, Qt::SortOrder order) const;
     void setDeckList(const DeckList &new_deck_list_model);
 
-    QWidget *searchContainer;
-    QHBoxLayout *searchLayout;
+    /**
+     * @brief Sets the callback used to create a custom zone from the add-to-zone menu.
+     * The callback returns the name of the created zone, or an empty string if creation was cancelled.
+     */
+    void setNewZoneCreator(const std::function<QString()> &creator);
+
+    CardDatabaseDisplayModel *getDatabaseDisplayModel()
+    {
+        return databaseDisplayModel;
+    }
+
+    CardDatabaseView *getDatabaseView()
+    {
+        return databaseView;
+    }
+
+    FilterTreeModel *getFilterModel()
+    {
+        return filterModel;
+    }
+
+    /**
+     * @return False if the widget is in database display mode and true if it's in visual display mode
+     */
+    bool isVisualDisplayMode() const;
+
+public slots:
+    void onSearchModelChanged();
+
+signals:
+    void cardClickedDatabaseDisplay(QMouseEvent *event, const ExactCard &card);
+    void cardHoveredDatabaseDisplay(const ExactCard &hoveredCard);
+
+    void cardAdded(const ExactCard &card, const QString &zoneName);
+    void cardDecremented(const ExactCard &card, const QString &zoneName);
+    void edhrecRequested(const CardInfoPtr &cardInfo, bool isCommander);
+    void printingSelectorRequested();
+    void cardInfoRequested(const ExactCard &cardName);
+
+protected slots:
+    void initialize();
+    void onClick(QMouseEvent *event, const ExactCard &card);
+    void onHover(const ExactCard &hoveredCard);
+    void addCardToDisplay(const ExactCard &cardToAdd);
+    void databaseDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+    void modelDirty() const;
+    void onDisplayModeChanged(bool checked);
+
+    void onSelectedCardChanged(const QString &cardName);
+    void actAddCard(const QString &cardName, const QString &zoneName);
+    void actDecrementCard(const QString &cardName, const QString &zoneName);
+    void onRelatedCardClicked(const QString &relatedCard);
+
+private:
+    FlowWidget *searchContainer;
     SearchLineEdit *searchEdit;
     QPushButton *displayModeButton;
     FilterTreeModel *filterModel;
     VisualDatabaseDisplayColorFilterWidget *colorFilterWidget;
 
-public slots:
-    void searchModelChanged();
-
-signals:
-    void cardClickedDatabaseDisplay(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
-    void cardHoveredDatabaseDisplay(const ExactCard &hoveredCard);
-
-protected slots:
-    void initialize();
-    void onClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance);
-    void onHover(const ExactCard &hoveredCard);
-    void addCard(const ExactCard &cardToAdd);
-    void databaseDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
-    void wheelEvent(QWheelEvent *event) override;
-    void modelDirty() const;
-    void updateSearch(const QString &search) const;
-    void onDisplayModeChanged(bool checked);
-
-private:
     QLabel *databaseLoadIndicator;
 
-    QLabel *sortByLabel;
-    QComboBox *sortColumnCombo, *sortOrderCombo;
-
-    QLabel *filterByLabel;
     QToolButton *clearFilterWidget;
-    QWidget *filterContainer;
-    QHBoxLayout *filterContainerLayout;
-    SettingsButtonWidget *quickFilterSaveLoadWidget;
-    VisualDatabaseDisplayFilterSaveLoadWidget *saveLoadWidget;
-    SettingsButtonWidget *quickFilterNameWidget;
-    VisualDatabaseDisplayNameFilterWidget *nameFilterWidget;
-    VisualDatabaseDisplayMainTypeFilterWidget *mainTypeFilterWidget;
-    SettingsButtonWidget *quickFilterSubTypeWidget;
-    VisualDatabaseDisplaySubTypeFilterWidget *subTypeFilterWidget;
-    SettingsButtonWidget *quickFilterSetWidget;
-    VisualDatabaseDisplaySetFilterWidget *setFilterWidget;
-    KeySignals searchKeySignals;
-    AbstractTabDeckEditor *deckEditor;
-    CardDatabaseModel *databaseModel;
+    VisualDatabaseDisplayFilterToolbarWidget *filterContainer;
     CardDatabaseDisplayModel *databaseDisplayModel;
-    QTreeView *databaseView;
+    CardDatabaseView *databaseView;
+    std::function<QString()> newZoneCreator;
     QList<ExactCard> *cards;
     QVBoxLayout *mainLayout;
     QScrollArea *scrollArea;
@@ -109,14 +136,20 @@ private:
     OverlapControlWidget *overlapControlWidget;
     CardSizeWidget *cardSizeWidget;
     QTimer *debounceTimer;
-    QTimer *loadCardsTimer;
 
     int debounceTime = 300; // in Ms
     int currentPage = 0;    // Current page index
     int cardsPerPage = 100; // Number of cards per page
+    bool filtersInitialized = false;
+    bool initialLoadScheduled = false;
+
+    void initializeFilters();
+    void highlightAllSearchEdit();
+    bool nearEndOfPage() const;
 
 protected:
     void resizeEvent(QResizeEvent *event) override;
+    void showEvent(QShowEvent *event) override;
 };
 
 #endif // VISUAL_DATABASE_DISPLAY_WIDGET_H
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 5364fa813..0f6ac51ec 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,12 +2,18 @@
 
 #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)
@@ -68,7 +74,7 @@ void FilterDisplayWidget::deleteFilter()
         QMessageBox::Yes | QMessageBox::No);
     if (reply == QMessageBox::Yes) {
         // If confirmed, delete the filter
-        QString filePath = SettingsCache::instance().getFiltersPath() + QDir::separator() + filterFilename;
+        QString filePath = SettingsCache::instance().paths().getFiltersPath() + QDir::separator() + filterFilename;
         QFile file(filePath);
         if (file.remove()) {
             emit filterDeleted(filterFilename); // Emit signal for deletion
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 05bf43118..6d051bcf7 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
@@ -1,18 +1,18 @@
 /**
  * @file visual_database_filter_display_widget.h
  * @ingroup VisualCardDatabaseWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 c190038a5..25ba41aa9 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,33 +1,52 @@
 #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"
 
-VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent)
+#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)
 {
     groupAndSortLayout = new QHBoxLayout(this);
+    groupAndSortLayout->setContentsMargins(0, 0, 0, 0);
+    groupAndSortLayout->setSpacing(3);
     groupAndSortLayout->setAlignment(Qt::AlignLeft);
     this->setLayout(groupAndSortLayout);
 
     groupByLabel = new QLabel(this);
 
     groupByComboBox = new QComboBox(this);
-    if (auto visualDeckEditorWidget = qobject_cast<VisualDeckEditorWidget *>(parent)) {
-        if (auto tabWidget = qobject_cast<TabDeckEditorVisualTabWidget *>(visualDeckEditorWidget)) {
-            // Inside a central widget QWidget container inside TabDeckEditorVisual
-            if (auto tab = qobject_cast<TabDeckEditorVisual *>(tabWidget->parent()->parent())) {
-                auto originalBox = tab->getDeckDockWidget()->getGroupByComboBox();
-                groupByComboBox->setModel(originalBox->model());
-                groupByComboBox->setModelColumn(originalBox->modelColumn());
 
-                // Original -> clone
-                connect(originalBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
-                        [this](int index) { groupByComboBox->setCurrentIndex(index); });
+    if (auto tab = QtUtils::findParentOfType<TabDeckEditorVisual>(this)) {
+        auto originalBox = tab->getDeckDockWidget()->getGroupByComboBox();
+        groupByComboBox->setModel(originalBox->model());
+        groupByComboBox->setModelColumn(originalBox->modelColumn());
 
-                // Clone -> original
-                connect(groupByComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
-                        [originalBox](int index) { originalBox->setCurrentIndex(index); });
-            }
-        }
+        // Original -> clone
+        connect(originalBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                [this](int index) { groupByComboBox->setCurrentIndex(index); });
+
+        // Clone -> original
+        connect(groupByComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+                [originalBox](int index) { originalBox->setCurrentIndex(index); });
     } else {
         groupByComboBox->addItem(
             tr(qPrintable(DeckListModelGroupCriteria::toString(DeckListModelGroupCriteria::MAIN_TYPE))),
@@ -47,6 +66,7 @@ VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent)
     sortByLabel = new QLabel(this);
 
     sortCriteriaButton = new SettingsButtonWidget(this);
+    sortCriteriaButton->setButtonIcon(themePixmap(QStringLiteral("icons/sort_arrow_down")));
 
     sortLabel = new QLabel(sortCriteriaButton);
     sortLabel->setWordWrap(true);
@@ -71,7 +91,7 @@ VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent)
     sortCriteriaButton->addSettingsWidget(sortLabel);
     sortCriteriaButton->addSettingsWidget(sortByListWidget);
 
-    displayTypeButton = new QPushButton(this);
+    displayTypeButton = new CompactPushButton(this);
     connect(displayTypeButton, &QPushButton::clicked, this, &VisualDeckDisplayOptionsWidget::updateDisplayType);
 
     groupAndSortLayout->addWidget(groupByLabel);
@@ -90,7 +110,8 @@ void VisualDeckDisplayOptionsWidget::retranslateUi()
     sortByLabel->setText(tr("Sort by:"));
     sortLabel->setText(tr("Click and drag to change the sort order within the groups"));
     sortCriteriaButton->setToolTip(tr("Configure how cards are sorted within their groups"));
-    displayTypeButton->setText(tr("Toggle Layout: Overlap"));
+    displayTypeButton->setButtonText(tr("Toggle Layout: Overlap"));
+    displayTypeButton->setButtonIcon(themePixmap(QStringLiteral("icons/scales")));
     displayTypeButton->setToolTip(
         tr("Change how cards are displayed within zones (i.e. overlapped or fully visible.)"));
 }
@@ -114,11 +135,32 @@ void VisualDeckDisplayOptionsWidget::updateDisplayType()
     // Update UI and emit signal
     switch (currentDisplayType) {
         case DisplayType::Flat:
-            displayTypeButton->setText(tr("Toggle Layout: Flat"));
+            displayTypeButton->setButtonText(tr("Toggle Layout: Flat"));
+            displayTypeButton->setButtonIcon(themePixmap(QStringLiteral("icons/scroll")));
             break;
         case DisplayType::Overlap:
-            displayTypeButton->setText(tr("Toggle Layout: Overlap"));
+            displayTypeButton->setButtonText(tr("Toggle Layout: Overlap"));
+            displayTypeButton->setButtonIcon(themePixmap(QStringLiteral("icons/scales")));
             break;
     }
     emit displayTypeChanged(currentDisplayType);
 }
+
+void VisualDeckDisplayOptionsWidget::updateCompactMode(bool mode)
+{
+    displayTypeButton->setCompact(mode);
+}
+
+int VisualDeckDisplayOptionsWidget::expandedWidth() const
+{
+    return groupByLabel->sizeHint().width() + groupByComboBox->sizeHint().width() + sortByLabel->sizeHint().width() +
+           sortCriteriaButton->sizeHint().width() + displayTypeButton->expandedWidth() +
+           (groupAndSortLayout->spacing() * 4);
+}
+
+int VisualDeckDisplayOptionsWidget::compactWidth() const
+{
+    return groupByLabel->sizeHint().width() + groupByComboBox->sizeHint().width() + sortByLabel->sizeHint().width() +
+           sortCriteriaButton->sizeHint().width() + displayTypeButton->compactWidth() +
+           (groupAndSortLayout->spacing() * 4);
+}
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 7a447753f..96600c587 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,12 +3,18 @@
 
 #include "visual_deck_editor_widget.h"
 
-#include <QComboBox>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QListWidget>
-#include <QPushButton>
+#include <QList>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class CompactPushButton;
+class QComboBox;
+class QHBoxLayout;
+class QLabel;
+class QListWidget;
+class SettingsButtonWidget;
 
 /**
  * @class VisualDeckDisplayOptionsWidget
@@ -53,6 +59,9 @@ public slots:
      * Called when the application language changes.
      */
     void retranslateUi();
+    void updateCompactMode(bool mode);
+    int expandedWidth() const;
+    int compactWidth() const;
 
 public:
     /**
@@ -101,37 +110,37 @@ private slots:
     void updateDisplayType();
 
 private:
-    /// Layout for grouping and sorting UI elements.
+    /** @brief Layout for grouping and sorting UI elements. */
     QHBoxLayout *groupAndSortLayout;
 
-    /// Current deck display type.
+    /** @brief Current deck display type. */
     DisplayType currentDisplayType = DisplayType::Overlap;
 
-    /// Button used to toggle the display layout.
-    QPushButton *displayTypeButton;
+    /** @brief Button used to toggle the display layout. */
+    CompactPushButton *displayTypeButton;
 
-    /// Label for the group-by selector.
+    /** @brief Label for the group-by selector. */
     QLabel *groupByLabel;
 
-    /// Combo box listing group-by criteria.
+    /** @brief Combo box listing group-by criteria. */
     QComboBox *groupByComboBox;
 
-    /// Currently active group-by criterion.
+    /** @brief Currently active group-by criterion. */
     QString activeGroupCriteria = "maintype";
 
-    /// Encapsulates the sort settings widgets (label + list).
+    /** @brief Encapsulates the sort settings widgets (label + list). */
     SettingsButtonWidget *sortCriteriaButton;
 
-    /// Label for “Sort by”.
+    /** @brief Label for "Sort by". */
     QLabel *sortByLabel;
 
-    /// Descriptive label inside the sort criteria button.
+    /** @brief Descriptive label inside the sort criteria button. */
     QLabel *sortLabel;
 
-    /// Draggable list of sort criteria.
+    /** @brief Draggable list of sort criteria. */
     QListWidget *sortByListWidget;
 
-    /// Ordered list of current sort criteria.
+    /** @brief Ordered list of current sort criteria. */
     QStringList activeSortCriteria = {"name", "cmc", "colors", "maintype"};
 };
 
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
new file mode 100644
index 000000000..76c3d0908
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp
@@ -0,0 +1,45 @@
+#include "visual_deck_editor_placeholder_widget.h"
+
+#include <QLabel>
+#include <QVBoxLayout>
+#include <qnamespace.h>
+
+VisualDeckEditorPlaceholderWidget::VisualDeckEditorPlaceholderWidget(QWidget *parent) : QWidget(parent)
+{
+    mainLayout = new QVBoxLayout(this);
+    mainLayout->setAlignment(Qt::AlignCenter);
+    setLayout(mainLayout);
+
+    // Image label with the background image
+    imageLabel = new QLabel(this);
+    imageLabel->setAlignment(Qt::AlignCenter);
+    imageLabel->setStyleSheet(R"(
+        QLabel {
+            background-image: url(theme:backgrounds/card_triplet.svg);
+            background-repeat: no-repeat;
+            background-position: center;
+        }
+    )");
+    imageLabel->setFixedSize(300, 300);
+
+    textLabel = new QLabel(this);
+    textLabel->setAlignment(Qt::AlignCenter);
+    textLabel->setWordWrap(true);
+    textLabel->setStyleSheet(R"(
+        QLabel {
+            color: palette(mid);
+            font-size: 14px;
+            padding: 10px;
+        }
+    )");
+
+    mainLayout->addWidget(imageLabel);
+    mainLayout->addWidget(textLabel);
+
+    retranslateUi();
+}
+
+void VisualDeckEditorPlaceholderWidget::retranslateUi()
+{
+    textLabel->setText(tr("Add cards using the search bar or database tab to have them appear here"));
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..84a3142d8
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.h
@@ -0,0 +1,24 @@
+#ifndef COCKATRICE_VISUAL_DECK_EDITOR_PLACEHOLDER_WIDGET_H
+#define COCKATRICE_VISUAL_DECK_EDITOR_PLACEHOLDER_WIDGET_H
+
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class QLabel;
+class QVBoxLayout;
+
+class VisualDeckEditorPlaceholderWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit VisualDeckEditorPlaceholderWidget(QWidget *parent = nullptr);
+    void retranslateUi();
+
+private:
+    QVBoxLayout *mainLayout;
+    QLabel *imageLabel;
+    QLabel *textLabel;
+};
+
+#endif // COCKATRICE_VISUAL_DECK_EDITOR_PLACEHOLDER_WIDGET_H
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 b1db1cf37..1554dceb8 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,20 +1,53 @@
 #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 <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>
 
-VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *parent, DeckListModel *_deckListModel)
-    : QWidget(parent), deckListModel(_deckListModel)
+class DeckListStatisticsAnalyzer;
+
+VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *parent,
+                                                                   DeckListModel *_deckListModel,
+                                                                   DeckListStatisticsAnalyzer *_statsAnalyzer)
+    : QWidget(parent), deckListModel(_deckListModel), statsAnalyzer(_statsAnalyzer)
 {
     layout = new QVBoxLayout(this);
+    layout->setSpacing(0);
     setLayout(layout);
 
+    auto upperLayout = new QVBoxLayout();
+    upperLayout->setContentsMargins(0, 0, 0, 0);
+    upperLayout->setSpacing(0);
+
     resetAndHandSizeContainerWidget = new QWidget(this);
     resetAndHandSizeLayout = new QHBoxLayout(resetAndHandSizeContainerWidget);
+    resetAndHandSizeLayout->setContentsMargins(11, 0, 11, 0);
     resetAndHandSizeContainerWidget->setLayout(resetAndHandSizeLayout);
 
     resetButton = new QPushButton(this);
@@ -22,28 +55,36 @@ VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *pare
     resetAndHandSizeLayout->addWidget(resetButton);
 
     handSizeSpinBox = new QSpinBox(this);
-    handSizeSpinBox->setValue(SettingsCache::instance().getVisualDeckEditorSampleHandSize());
+    handSizeSpinBox->setValue(SettingsCache::instance().cardsDisplay().getSampleHandSize());
     handSizeSpinBox->setMinimum(1);
-    connect(handSizeSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckEditorSampleHandSize);
-    connect(handSizeSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this,
+    connect(handSizeSpinBox, qOverload<int>(&QSpinBox::valueChanged), &SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::setSampleHandSize);
+    connect(handSizeSpinBox, qOverload<int>(&QSpinBox::valueChanged), this,
             &VisualDeckEditorSampleHandWidget::updateDisplay);
     resetAndHandSizeLayout->addWidget(handSizeSpinBox);
 
-    layout->addWidget(resetAndHandSizeContainerWidget);
+    upperLayout->addWidget(resetAndHandSizeContainerWidget);
 
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
-    layout->addWidget(flowWidget);
+    upperLayout->addWidget(flowWidget);
 
     cardSizeWidget = new CardSizeWidget(this, flowWidget);
-    layout->addWidget(cardSizeWidget);
+    cardSizeWidget->enableCtrlScrollResize(flowWidget);
+    upperLayout->addWidget(cardSizeWidget);
 
-    for (const ExactCard &card : getRandomCards(handSizeSpinBox->value())) {
-        auto displayWidget = new CardInfoPictureWidget(this);
-        displayWidget->setCard(card);
-        displayWidget->setScaleFactor(cardSizeWidget->getSlider()->value());
-        flowWidget->addWidget(displayWidget);
-    }
+    auto upperLayoutWidget = new QWidget(this);
+    upperLayoutWidget->setLayout(upperLayout);
+
+    drawProbabilityWidget = new DrawProbabilityWidget(this, statsAnalyzer);
+
+    auto *splitter = new QSplitter(this);
+    splitter->setObjectName("splitter");
+    splitter->setOrientation(Qt::Vertical);
+
+    splitter->addWidget(upperLayoutWidget);
+    splitter->addWidget(drawProbabilityWidget);
+
+    layout->addWidget(splitter);
 
     retranslateUi();
 }
@@ -74,30 +115,35 @@ void VisualDeckEditorSampleHandWidget::updateDisplay()
     }
 }
 
-QList<ExactCard> VisualDeckEditorSampleHandWidget::getRandomCards(int amountToGet)
+static QList<ExactCard> cardNodesToExactCards(QList<const DecklistCardNode *> nodes)
 {
-    QList<ExactCard> mainDeckCards;
-    QList<ExactCard> randomCards;
-    if (!deckListModel)
-        return randomCards;
-    DeckList *decklist = deckListModel->getDeckList();
-    if (!decklist)
-        return randomCards;
-
-    QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes({DECK_ZONE_MAIN});
-
-    // Collect all cards in the main deck, allowing duplicates based on their count
-    for (auto currentCard : cardsInDeck) {
-        for (int k = 0; k < currentCard->getNumber(); ++k) {
-            ExactCard card = CardDatabaseManager::query()->getCard(currentCard->toCardRef());
-            if (card) {
-                mainDeckCards.append(card);
+    QList<ExactCard> cards;
+    for (auto node : nodes) {
+        ExactCard card = CardDatabaseManager::query()->getCard(node->toCardRef());
+        if (card) {
+            for (int k = 0; k < node->getNumber(); ++k) {
+                cards.append(card);
             }
+        } else {
+            qDebug() << "Card not found in database!";
         }
     }
 
-    if (mainDeckCards.isEmpty())
+    return cards;
+}
+
+QList<ExactCard> VisualDeckEditorSampleHandWidget::getRandomCards(int amountToGet)
+{
+    QList<ExactCard> randomCards;
+    if (!deckListModel) {
         return randomCards;
+    }
+
+    QList<ExactCard> mainDeckCards = cardNodesToExactCards(deckListModel->getCardNodesForZone(DECK_ZONE_MAIN));
+
+    if (mainDeckCards.isEmpty()) {
+        return randomCards;
+    }
 
     // Shuffle the deck
     std::random_device rd;
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 751e16a3c..16f343b75 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
@@ -1,25 +1,35 @@
 /**
  * @file visual_deck_editor_sample_hand_widget.h
  * @ingroup DeckEditorAnalyticsWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H
 #define VISUAL_DECK_EDITOR_SAMPLE_HAND_WIDGET_H
 
-#include "../cards/card_size_widget.h"
-#include "../general/layout_containers/flow_widget.h"
+#include "libcockatrice/card/printing/exact_card.h"
 
-#include <QPushButton>
-#include <QSpinBox>
+#include <QList>
 #include <QWidget>
-#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qtmetamacros.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
 public:
-    VisualDeckEditorSampleHandWidget(QWidget *parent, DeckListModel *deckListModel);
+    VisualDeckEditorSampleHandWidget(QWidget *parent,
+                                     DeckListModel *deckListModel,
+                                     DeckListStatisticsAnalyzer *statsAnalyzer);
     QList<ExactCard> getRandomCards(int amountToGet);
 
 public slots:
@@ -29,12 +39,14 @@ public slots:
 
 private:
     DeckListModel *deckListModel;
+    DeckListStatisticsAnalyzer *statsAnalyzer;
     QVBoxLayout *layout;
     QWidget *resetAndHandSizeContainerWidget;
     QHBoxLayout *resetAndHandSizeLayout;
     QPushButton *resetButton;
     QSpinBox *handSizeSpinBox;
     FlowWidget *flowWidget;
+    DrawProbabilityWidget *drawProbabilityWidget;
     CardSizeWidget *cardSizeWidget;
 };
 
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 76cfe8c8e..74b940586 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,35 +1,55 @@
 #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 "../cards/card_info_picture_with_text_overlay_widget.h"
+#include "../../pixel_map_generator.h"
+#include "../cards/card_size_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 <QCheckBox>
+#include <QAbstractItemModel>
+#include <QAbstractItemView>
 #include <QCompleter>
+#include <QDebug>
 #include <QHBoxLayout>
+#include <QItemSelection>
+#include <QItemSelectionModel>
+#include <QItemSelectionRange>
+#include <QLayout>
 #include <QLineEdit>
+#include <QList>
+#include <QModelIndex>
 #include <QPushButton>
-#include <QResizeEvent>
-#include <libcockatrice/card/card_info_comparator.h>
-#include <libcockatrice/card/database/card_database.h>
+#include <QRegularExpression>
+#include <QScrollArea>
+#include <QSharedPointer>
+#include <QSize>
+#include <QSizePolicy>
+#include <QSortFilterProxyModel>
+#include <QStringLiteral>
+#include <QTimer>
+#include <QVBoxLayout>
+#include <QVariant>
+#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/models/database/card_database_model.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
-#include <qscrollarea.h>
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <qnamespace.h>
 
 VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent,
                                                DeckListModel *_deckListModel,
-                                               QItemSelectionModel *_selectionModel)
-    : QWidget(parent), deckListModel(_deckListModel), selectionModel(_selectionModel)
+                                               QItemSelectionModel *_selectionModel,
+                                               CardDatabaseModel *_cardDatabaseModel)
+    : QWidget(parent), deckListModel(_deckListModel), selectionModel(_selectionModel),
+      cardDatabaseModel(_cardDatabaseModel)
 {
     // The Main Widget and Main Layout, which contain a single Widget: The Scroll Area
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
@@ -38,49 +58,69 @@ VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent,
     mainLayout->setContentsMargins(9, 0, 9, 5);
     mainLayout->setSpacing(0);
 
-    searchBar = new QLineEdit(this);
-    connect(searchBar, &QLineEdit::returnPressed, this, [=, this]() {
-        if (!searchBar->hasFocus())
-            return;
+    initializeDisplayOptionsAndSearchWidget();
 
-        ExactCard card = CardDatabaseManager::query()->getCard({searchBar->text()});
-        if (card) {
-            emit cardAdditionRequested(card);
+    initializeScrollAreaAndZoneContainer();
+
+    cardSizeWidget =
+        new CardSizeWidget(this, nullptr, SettingsCache::instance().cardsDisplay().getVisualDeckEditorCardSize());
+    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::setVisualDeckEditorCardSize);
+
+    mainLayout->addWidget(displayOptionsAndSearch);
+    mainLayout->addWidget(scrollArea);
+    mainLayout->addWidget(cardSizeWidget);
+
+    connectDeckListModel();
+
+    constructZoneWidgetsFromDeckListModel();
+
+    if (selectionModel) {
+        connect(selectionModel, &QItemSelectionModel::selectionChanged, this,
+                &VisualDeckEditorWidget::onSelectionChanged);
+    }
+
+    updatePlaceholderVisibility();
+    retranslateUi();
+}
+
+// =====================================================================================================================
+//                                                  Constructor helpers
+// =====================================================================================================================
+
+void VisualDeckEditorWidget::initializeSearchBarAndCompleter()
+{
+    searchContainer = new QWidget(this);
+    searchContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    searchLayout = new QHBoxLayout(searchContainer);
+    searchContainer->setLayout(searchLayout);
+
+    searchBar = new QLineEdit(searchContainer);
+    searchContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    connect(searchBar, &QLineEdit::returnPressed, this, [=, this]() {
+        if (searchBar->hasFocus()) {
+            addCardFromSearch();
         }
     });
 
+    searchLayout->addWidget(searchBar);
+
     setFocusProxy(searchBar);
     setFocusPolicy(Qt::ClickFocus);
 
-    cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this);
+    if (!cardDatabaseModel) {
+        cardDatabaseModel = new CardDatabaseModel(CardDatabaseManager::getInstance(), false, this);
+    }
     cardDatabaseDisplayModel = new CardDatabaseDisplayModel(this);
     cardDatabaseDisplayModel->setSourceModel(cardDatabaseModel);
-    CardSearchModel *searchModel = new CardSearchModel(cardDatabaseDisplayModel, this);
 
-    proxyModel = new CardCompleterProxyModel(this);
-    proxyModel->setSourceModel(searchModel);
-    proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
-    proxyModel->setFilterRole(Qt::DisplayRole);
-
-    completer = new QCompleter(proxyModel, this);
-    completer->setCompletionRole(Qt::DisplayRole);
-    completer->setCompletionMode(QCompleter::PopupCompletion);
-    completer->setCaseSensitivity(Qt::CaseInsensitive);
-    completer->setFilterMode(Qt::MatchContains);
-    completer->setMaxVisibleItems(15);
+    const CardCompleterSetup cardSetup = createCardCompleter(cardDatabaseDisplayModel, this, 15);
+    proxyModel = cardSetup.proxyModel;
+    completer = cardSetup.completer;
     searchBar->setCompleter(completer);
 
     // Update suggestions dynamically
-    connect(searchBar, &QLineEdit::textEdited, searchModel, &CardSearchModel::updateSearchResults);
-    connect(searchBar, &QLineEdit::textEdited, this, [=, this](const QString &text) {
-        // Ensure substring matching
-        QString pattern = ".*" + QRegularExpression::escape(text) + ".*";
-        proxyModel->setFilterRegularExpression(QRegularExpression(pattern, QRegularExpression::CaseInsensitiveOption));
-
-        if (!text.isEmpty()) {
-            completer->complete(); // Force the dropdown to appear
-        }
-    });
+    connectCardCompleterSearch(searchBar, cardSetup);
 
     connect(completer, static_cast<void (QCompleter::*)(const QString &)>(&QCompleter::activated), this,
             [=, this](const QString &completion) {
@@ -102,19 +142,28 @@ VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent,
     });
 
     // Search button functionality
-    searchPushButton = new QPushButton(this);
-    connect(searchPushButton, &QPushButton::clicked, this, [=, this]() {
-        ExactCard card = CardDatabaseManager::query()->getCard({searchBar->text()});
-        if (card) {
-            emit cardAdditionRequested(card);
-        }
-    });
+    searchPushButton = new CompactPushButton(searchContainer);
+    searchPushButton->setButtonIcon(themePixmap(QStringLiteral("icons/search")));
+    connect(searchPushButton, &QPushButton::clicked, this, [this] { addCardFromSearch(); });
 
-    displayOptionsAndSearch = new QWidget(this);
-    displayOptionsAndSearchLayout = new QHBoxLayout(displayOptionsAndSearch);
-    displayOptionsAndSearchLayout->setAlignment(Qt::AlignLeft);
-    displayOptionsAndSearch->setLayout(displayOptionsAndSearchLayout);
+    searchLayout->addWidget(searchPushButton);
+}
 
+void VisualDeckEditorWidget::addCardFromSearch()
+{
+    ExactCard card = CardDatabaseManager::query()->getCard({searchBar->text()});
+    if (!card) {
+        return;
+    }
+
+    emit cardAdditionRequested(card);
+
+    searchBar->setFocus();
+    QTimer::singleShot(0, searchBar, [this] { searchBar->setSelection(0, searchBar->text().length()); });
+}
+
+void VisualDeckEditorWidget::initializeDisplayOptionsWidget()
+{
     displayOptionsWidget = new VisualDeckDisplayOptionsWidget(this);
     connect(displayOptionsWidget, &VisualDeckDisplayOptionsWidget::displayTypeChanged, this,
             &VisualDeckEditorWidget::displayTypeChanged);
@@ -122,11 +171,23 @@ VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent,
             &VisualDeckEditorWidget::activeGroupCriteriaChanged);
     connect(displayOptionsWidget, &VisualDeckDisplayOptionsWidget::sortCriteriaChanged, this,
             &VisualDeckEditorWidget::activeSortCriteriaChanged);
+}
 
-    displayOptionsAndSearchLayout->addWidget(displayOptionsWidget);
-    displayOptionsAndSearchLayout->addWidget(searchBar);
-    displayOptionsAndSearchLayout->addWidget(searchPushButton);
+void VisualDeckEditorWidget::initializeDisplayOptionsAndSearchWidget()
+{
+    initializeSearchBarAndCompleter();
+    initializeDisplayOptionsWidget();
 
+    displayOptionsAndSearch = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff);
+
+    // We split into two sub-widgets here so that the searchBar and button wrap together. At this point, we've done
+    // pretty much all we can and have reached our minimum size.
+    displayOptionsAndSearch->addWidget(displayOptionsWidget);
+    displayOptionsAndSearch->addWidget(searchContainer); // Expanding — fills remainder of its row
+}
+
+void VisualDeckEditorWidget::initializeScrollAreaAndZoneContainer()
+{
     scrollArea = new QScrollArea(this);
     scrollArea->setWidgetResizable(true);
     scrollArea->setMinimumSize(0, 0);
@@ -136,39 +197,229 @@ VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent,
     scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 
     zoneContainer = new QWidget(scrollArea);
+    zoneContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+    zoneContainer->setObjectName("zoneContainer");
     zoneContainerLayout = new QVBoxLayout(zoneContainer);
     zoneContainer->setLayout(zoneContainerLayout);
+
+    // Create placeholder widget
+    placeholderWidget = new VisualDeckEditorPlaceholderWidget(zoneContainer);
+    zoneContainerLayout->addWidget(placeholderWidget);
+
     scrollArea->addScrollBarWidget(zoneContainer, Qt::AlignHCenter);
     scrollArea->setWidget(zoneContainer);
+}
 
-    cardSizeWidget = new CardSizeWidget(this, nullptr, SettingsCache::instance().getVisualDeckEditorCardSize());
-    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckEditorCardSize);
-
-    mainLayout->addWidget(displayOptionsAndSearch);
-    mainLayout->addWidget(scrollArea);
-    mainLayout->addWidget(cardSizeWidget);
-
+void VisualDeckEditorWidget::connectDeckListModel()
+{
     connect(deckListModel, &DeckListModel::modelReset, this, &VisualDeckEditorWidget::decklistModelReset);
     connect(deckListModel, &DeckListModel::dataChanged, this, &VisualDeckEditorWidget::decklistDataChanged);
     connect(deckListModel, &QAbstractItemModel::rowsInserted, this, &VisualDeckEditorWidget::onCardAddition);
     connect(deckListModel, &QAbstractItemModel::rowsRemoved, this, &VisualDeckEditorWidget::onCardRemoval);
-    constructZoneWidgetsFromDeckListModel();
-
-    if (selectionModel) {
-        connect(selectionModel, &QItemSelectionModel::selectionChanged, this,
-                &VisualDeckEditorWidget::onSelectionChanged);
-    }
-
-    retranslateUi();
 }
 
 void VisualDeckEditorWidget::retranslateUi()
 {
     searchBar->setPlaceholderText(tr("Type a card name here for suggestions from the database..."));
-    searchPushButton->setText(tr("Quick search and add card"));
+    searchPushButton->setButtonText(tr("Quick search and add card"));
     searchPushButton->setToolTip(tr("Search for closest match in the database (with auto-suggestions) and add "
                                     "preferred printing to the deck on pressing enter"));
+
+    if (placeholderWidget) {
+        placeholderWidget->retranslateUi();
+    }
+}
+
+void VisualDeckEditorWidget::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+    updateCompactMode();
+}
+
+void VisualDeckEditorWidget::updateCompactMode()
+{
+    const int spacing = displayOptionsAndSearch->layout()->spacing();
+
+    const int available = displayOptionsAndSearch->width();
+
+    const int searchExpanded =
+        searchBar->sizeHint().width() + searchPushButton->expandedWidth() + searchLayout->spacing();
+
+    const int fullWidth = displayOptionsWidget->expandedWidth() + spacing + searchExpanded;
+
+    const int displayCompactWidth = displayOptionsWidget->compactWidth() + spacing + searchExpanded;
+
+    // everything expanded
+    if (available >= fullWidth) {
+        displayOptionsWidget->updateCompactMode(false);
+        searchPushButton->setCompact(false);
+        return;
+    }
+
+    // only display compact
+    if (available >= displayCompactWidth) {
+        displayOptionsWidget->updateCompactMode(true);
+        searchPushButton->setCompact(false);
+        return;
+    }
+
+    // both compact
+    displayOptionsWidget->updateCompactMode(true);
+    searchPushButton->setCompact(true);
+}
+
+void VisualDeckEditorWidget::updatePlaceholderVisibility()
+{
+    if (placeholderWidget) {
+        placeholderWidget->setVisible(indexToWidgetMap.isEmpty());
+    }
+}
+
+// =====================================================================================================================
+//                                              Display Widget Management
+// =====================================================================================================================
+
+void VisualDeckEditorWidget::constructZoneWidgetForIndex(QPersistentModelIndex persistent)
+{
+    QString zoneName =
+        persistent.sibling(persistent.row(), DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+    DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget(
+        zoneContainer, deckListModel, selectionModel, persistent, zoneName,
+        displayOptionsWidget->getActiveGroupCriteria(), displayOptionsWidget->getActiveSortCriteria(),
+        displayOptionsWidget->getDisplayType(), 20, 10, cardSizeWidget);
+    connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover);
+    connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::cardClicked);
+    connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this,
+            &VisualDeckEditorWidget::cleanupInvalidZones);
+    connect(this, &VisualDeckEditorWidget::activeSortCriteriaChanged, zoneDisplayWidget,
+            &DeckCardZoneDisplayWidget::onActiveSortCriteriaChanged);
+    connect(this, &VisualDeckEditorWidget::activeGroupCriteriaChanged, zoneDisplayWidget,
+            &DeckCardZoneDisplayWidget::onActiveGroupCriteriaChanged);
+    connect(this, &VisualDeckEditorWidget::displayTypeChanged, zoneDisplayWidget,
+            &DeckCardZoneDisplayWidget::refreshDisplayType);
+    zoneDisplayWidget->refreshDisplayType(displayOptionsWidget->getDisplayType());
+    zoneContainerLayout->addWidget(zoneDisplayWidget);
+
+    indexToWidgetMap.insert(persistent, zoneDisplayWidget);
+}
+
+void VisualDeckEditorWidget::constructZoneWidgetsFromDeckListModel()
+{
+    QSortFilterProxyModel proxy;
+    proxy.setSourceModel(deckListModel);
+    proxy.setSortRole(Qt::EditRole);
+    proxy.sort(DeckListModelColumns::CARD_NAME, Qt::AscendingOrder);
+
+    for (int i = 0; i < proxy.rowCount(); ++i) {
+        QModelIndex proxyIndex = proxy.index(i, 0);
+        QModelIndex sourceIndex = proxy.mapToSource(proxyIndex);
+
+        // Make a persistent index from the *source* model
+        QPersistentModelIndex persistent(sourceIndex);
+
+        if (indexToWidgetMap.contains(persistent)) {
+            continue;
+        }
+
+        constructZoneWidgetForIndex(persistent);
+    }
+    updatePlaceholderVisibility();
+}
+
+void VisualDeckEditorWidget::updateZoneWidgets()
+{
+}
+
+void VisualDeckEditorWidget::clearAllDisplayWidgets()
+{
+    for (auto idx : indexToWidgetMap.keys()) {
+        auto displayWidget = indexToWidgetMap.value(idx);
+        zoneContainerLayout->removeWidget(displayWidget);
+        indexToWidgetMap.remove(idx);
+        delete displayWidget;
+    }
+    updatePlaceholderVisibility();
+}
+
+void VisualDeckEditorWidget::cleanupInvalidZones(DeckCardZoneDisplayWidget *displayWidget)
+{
+    zoneContainerLayout->removeWidget(displayWidget);
+    for (auto idx : indexToWidgetMap.keys()) {
+        if (!idx.isValid()) {
+            indexToWidgetMap.remove(idx);
+        }
+    }
+    delete displayWidget;
+    updatePlaceholderVisibility();
+}
+
+// =====================================================================================================================
+//                                                 DeckModel Signals Management
+// =====================================================================================================================
+
+void VisualDeckEditorWidget::onCardAddition(const QModelIndex &parent, int first, int last)
+{
+    if (parent == deckListModel->getRoot()) {
+        for (int i = first; i <= last; i++) {
+            QPersistentModelIndex index = QPersistentModelIndex(deckListModel->index(i, 0, deckListModel->getRoot()));
+
+            if (indexToWidgetMap.contains(index)) {
+                continue;
+            }
+
+            constructZoneWidgetForIndex(index);
+        }
+    }
+    updatePlaceholderVisibility();
+}
+
+void VisualDeckEditorWidget::onCardRemoval(const QModelIndex &parent, int first, int last)
+{
+    Q_UNUSED(parent);
+    Q_UNUSED(first);
+    Q_UNUSED(last);
+    for (const QPersistentModelIndex &idx : indexToWidgetMap.keys()) {
+        if (!idx.isValid()) {
+            zoneContainerLayout->removeWidget(indexToWidgetMap.value(idx));
+            indexToWidgetMap.value(idx)->deleteLater();
+            indexToWidgetMap.remove(idx);
+        }
+    }
+    updatePlaceholderVisibility();
+}
+
+void VisualDeckEditorWidget::decklistModelReset()
+{
+    clearAllDisplayWidgets();
+    constructZoneWidgetsFromDeckListModel();
+}
+
+void VisualDeckEditorWidget::decklistDataChanged(QModelIndex topLeft, QModelIndex bottomRight)
+{
+    // Might use these at some point.
+    Q_UNUSED(topLeft);
+    Q_UNUSED(bottomRight);
+    // Necessary to delay this in this manner else the updateDisplay will nuke widgets while their onClick event
+    // hasn't returned yet. Interval of 0 means QT will schedule this after the current event loop has finished.
+    updateZoneWidgets();
+}
+
+// =====================================================================================================================
+//                                                 User Interaction
+// =====================================================================================================================
+
+void VisualDeckEditorWidget::onHover(const ExactCard &hoveredCard)
+{
+    // If user has any card selected, ignore hover
+    if (selectionModel->hasSelection()) {
+        return;
+    }
+
+    // If nothing is selected -> this is our "active/preview" card
+    emit activeCardChanged(hoveredCard);
+
+    //! \todo Highlight hovered card visually.
+    // highlightHoveredCard(hoveredCard);
 }
 
 void VisualDeckEditorWidget::setSelectionModel(QItemSelectionModel *model)
@@ -178,7 +429,7 @@ void VisualDeckEditorWidget::setSelectionModel(QItemSelectionModel *model)
     }
 
     if (selectionModel) {
-        // TODO: Possibly disconnect old ones?
+        //! \todo Possibly disconnect old signal connections.
     }
 
     selectionModel = model;
@@ -210,146 +461,4 @@ void VisualDeckEditorWidget::onSelectionChanged(const QItemSelection &selected,
             }
         }
     }
-}
-
-void VisualDeckEditorWidget::clearAllDisplayWidgets()
-{
-    for (auto idx : indexToWidgetMap.keys()) {
-        auto displayWidget = indexToWidgetMap.value(idx);
-        zoneContainerLayout->removeWidget(displayWidget);
-        indexToWidgetMap.remove(idx);
-        delete displayWidget;
-    }
-}
-
-void VisualDeckEditorWidget::cleanupInvalidZones(DeckCardZoneDisplayWidget *displayWidget)
-{
-    zoneContainerLayout->removeWidget(displayWidget);
-    for (auto idx : indexToWidgetMap.keys()) {
-        if (!idx.isValid()) {
-            indexToWidgetMap.remove(idx);
-        }
-    }
-    delete displayWidget;
-}
-
-void VisualDeckEditorWidget::onCardAddition(const QModelIndex &parent, int first, int last)
-{
-    if (parent == deckListModel->getRoot()) {
-        for (int i = first; i <= last; i++) {
-            QPersistentModelIndex index = QPersistentModelIndex(deckListModel->index(i, 0, deckListModel->getRoot()));
-
-            if (indexToWidgetMap.contains(index)) {
-                continue;
-            }
-
-            constructZoneWidgetForIndex(index);
-        }
-    }
-}
-
-void VisualDeckEditorWidget::onCardRemoval(const QModelIndex &parent, int first, int last)
-{
-    Q_UNUSED(parent);
-    Q_UNUSED(first);
-    Q_UNUSED(last);
-    for (const QPersistentModelIndex &idx : indexToWidgetMap.keys()) {
-        if (!idx.isValid()) {
-            zoneContainerLayout->removeWidget(indexToWidgetMap.value(idx));
-            indexToWidgetMap.value(idx)->deleteLater();
-            indexToWidgetMap.remove(idx);
-        }
-    }
-}
-
-void VisualDeckEditorWidget::constructZoneWidgetForIndex(QPersistentModelIndex persistent)
-{
-    DeckCardZoneDisplayWidget *zoneDisplayWidget = new DeckCardZoneDisplayWidget(
-        zoneContainer, deckListModel, selectionModel, persistent,
-        deckListModel->data(persistent.sibling(persistent.row(), 1), Qt::EditRole).toString(),
-        displayOptionsWidget->getActiveGroupCriteria(), displayOptionsWidget->getActiveSortCriteria(),
-        displayOptionsWidget->getDisplayType(), 20, 10, cardSizeWidget);
-    connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardHovered, this, &VisualDeckEditorWidget::onHover);
-    connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::cardClicked, this, &VisualDeckEditorWidget::onCardClick);
-    connect(zoneDisplayWidget, &DeckCardZoneDisplayWidget::requestCleanup, this,
-            &VisualDeckEditorWidget::cleanupInvalidZones);
-    connect(this, &VisualDeckEditorWidget::activeSortCriteriaChanged, zoneDisplayWidget,
-            &DeckCardZoneDisplayWidget::onActiveSortCriteriaChanged);
-    connect(this, &VisualDeckEditorWidget::activeGroupCriteriaChanged, zoneDisplayWidget,
-            &DeckCardZoneDisplayWidget::onActiveGroupCriteriaChanged);
-    connect(this, &VisualDeckEditorWidget::displayTypeChanged, zoneDisplayWidget,
-            &DeckCardZoneDisplayWidget::refreshDisplayType);
-    zoneDisplayWidget->refreshDisplayType(displayOptionsWidget->getDisplayType());
-    zoneContainerLayout->addWidget(zoneDisplayWidget);
-
-    indexToWidgetMap.insert(persistent, zoneDisplayWidget);
-}
-
-void VisualDeckEditorWidget::constructZoneWidgetsFromDeckListModel()
-{
-    QSortFilterProxyModel proxy;
-    proxy.setSourceModel(deckListModel);
-    proxy.setSortRole(Qt::EditRole);
-    proxy.sort(1, Qt::AscendingOrder);
-
-    for (int i = 0; i < proxy.rowCount(); ++i) {
-        QModelIndex proxyIndex = proxy.index(i, 0);
-        QModelIndex sourceIndex = proxy.mapToSource(proxyIndex);
-
-        // Make a persistent index from the *source* model
-        QPersistentModelIndex persistent(sourceIndex);
-
-        if (indexToWidgetMap.contains(persistent)) {
-            continue;
-        }
-
-        constructZoneWidgetForIndex(persistent);
-    }
-}
-
-void VisualDeckEditorWidget::updateZoneWidgets()
-{
-}
-
-void VisualDeckEditorWidget::resizeEvent(QResizeEvent *event)
-{
-    QWidget::resizeEvent(event);
-    zoneContainer->setMaximumWidth(scrollArea->viewport()->width());
-}
-
-void VisualDeckEditorWidget::decklistModelReset()
-{
-    clearAllDisplayWidgets();
-    constructZoneWidgetsFromDeckListModel();
-}
-
-void VisualDeckEditorWidget::decklistDataChanged(QModelIndex topLeft, QModelIndex bottomRight)
-{
-    // Might use these at some point.
-    Q_UNUSED(topLeft);
-    Q_UNUSED(bottomRight);
-    // Necessary to delay this in this manner else the updateDisplay will nuke widgets while their onClick event
-    // hasn't returned yet. Interval of 0 means QT will schedule this after the current event loop has finished.
-    updateZoneWidgets();
-}
-
-void VisualDeckEditorWidget::onHover(const ExactCard &hoveredCard)
-{
-    // If user has any card selected, ignore hover
-    if (selectionModel->hasSelection()) {
-        return;
-    }
-
-    // If nothing is selected -> this is our "active/preview" card
-    emit activeCardChanged(hoveredCard);
-
-    // TODO: highlight hovered card visually:
-    // highlightHoveredCard(hoveredCard);
-}
-
-void VisualDeckEditorWidget::onCardClick(QMouseEvent *event,
-                                         CardInfoPictureWithTextOverlayWidget *instance,
-                                         QString zoneName)
-{
-    emit cardClicked(event, instance, zoneName);
-}
+}
\ No newline at end of file
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 3a60d09a7..0b8ff19fb 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
@@ -1,30 +1,41 @@
 /**
  * @file visual_deck_editor_widget.h
  * @ingroup DeckEditors
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef VISUAL_DECK_EDITOR_H
 #define VISUAL_DECK_EDITOR_H
 
-#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 <QCheckBox>
-#include <QListWidget>
-#include <QPushButton>
+#include <QHash>
+#include <QMouseEvent>
+#include <QPersistentModelIndex>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
-#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>
+#include <qtmetamacros.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,
@@ -36,15 +47,19 @@ class VisualDeckEditorWidget : public QWidget
     Q_OBJECT
 
 public:
-    explicit VisualDeckEditorWidget(QWidget *parent, DeckListModel *deckListModel, QItemSelectionModel *selectionModel);
+    explicit VisualDeckEditorWidget(QWidget *parent,
+                                    DeckListModel *deckListModel,
+                                    QItemSelectionModel *selectionModel,
+                                    CardDatabaseModel *_cardDatabaseModel = nullptr);
     void retranslateUi();
+    void updateCompactMode();
     void clearAllDisplayWidgets();
-    void resizeEvent(QResizeEvent *event) override;
 
     void setDeckList(const DeckList &_deckListModel);
 
     void setSelectionModel(QItemSelectionModel *model);
     void onSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+    void updatePlaceholderVisibility();
     QItemSelectionModel *getSelectionModel() const
     {
         return selectionModel;
@@ -66,32 +81,43 @@ signals:
     void activeCardChanged(const ExactCard &activeCard);
     void activeGroupCriteriaChanged(QString activeGroupCriteria);
     void activeSortCriteriaChanged(QStringList activeSortCriteria);
-    void cardClicked(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
+    void cardClicked(QMouseEvent *event, const ExactCard &card, const QString &zoneName);
     void cardAdditionRequested(const ExactCard &card);
     void displayTypeChanged(DisplayType displayType);
 
+protected:
+    void initializeSearchBarAndCompleter();
+    void addCardFromSearch();
+    void initializeDisplayOptionsWidget();
+    void initializeDisplayOptionsAndSearchWidget();
+    void initializeScrollAreaAndZoneContainer();
+    void connectDeckListModel();
+
 protected slots:
     void onHover(const ExactCard &hoveredCard);
-    void onCardClick(QMouseEvent *event, CardInfoPictureWithTextOverlayWidget *instance, QString zoneName);
     void decklistModelReset();
+    void resizeEvent(QResizeEvent *event) override;
 
 private:
+    int expandedWidthAll = -1;
+    int expandedWidthDisplayCompact = -1;
     DeckListModel *deckListModel;
     QItemSelectionModel *selectionModel;
     QVBoxLayout *mainLayout;
     CardDatabaseModel *cardDatabaseModel;
     CardDatabaseDisplayModel *cardDatabaseDisplayModel;
     CardCompleterProxyModel *proxyModel;
+    QWidget *searchContainer;
+    QHBoxLayout *searchLayout;
     QCompleter *completer;
-    QWidget *displayOptionsAndSearch;
-    QHBoxLayout *displayOptionsAndSearchLayout;
+    FlowWidget *displayOptionsAndSearch;
     VisualDeckDisplayOptionsWidget *displayOptionsWidget;
-    QPushButton *searchPushButton;
+    CompactPushButton *searchPushButton;
     QScrollArea *scrollArea;
     QWidget *zoneContainer;
     QVBoxLayout *zoneContainerLayout;
+    VisualDeckEditorPlaceholderWidget *placeholderWidget;
     // OverlapControlWidget *overlapControlWidget;
-    QWidget *container;
     QHash<QPersistentModelIndex, QWidget *> indexToWidgetMap;
 };
 
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 575632724..1ac4c856c 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,11 +1,15 @@
 #include "deck_preview_color_identity_filter_widget.h"
 
 #include "../../cards/additional_info/mana_symbol_widget.h"
-#include "deck_preview_widget.h"
+#include "../visual_deck_storage_sort_filter_proxy_model.h"
 
-#include <QMouseEvent>
+#include <QHBoxLayout>
+#include <QPushButton>
+#include <QSet>
+#include <QSharedPointer>
+#include <QString>
 
-DeckPreviewColorIdentityFilterWidget::DeckPreviewColorIdentityFilterWidget(VisualDeckStorageWidget *parent)
+DeckPreviewColorIdentityFilterWidget::DeckPreviewColorIdentityFilterWidget(QWidget *parent)
     : QWidget(parent), layout(new QHBoxLayout(this))
 {
     setLayout(layout);
@@ -28,15 +32,10 @@ DeckPreviewColorIdentityFilterWidget::DeckPreviewColorIdentityFilterWidget(Visua
     }
 
     toggleButton = new QPushButton(this);
-    toggleButton->setCheckable(true);
     layout->addWidget(toggleButton);
 
-    // Connect the button's toggled signal
-    connect(toggleButton, &QPushButton::toggled, this, &DeckPreviewColorIdentityFilterWidget::updateFilterMode);
-    connect(this, &DeckPreviewColorIdentityFilterWidget::activeColorsChanged, parent,
-            &VisualDeckStorageWidget::updateColorFilter);
-    connect(this, &DeckPreviewColorIdentityFilterWidget::filterModeChanged, parent,
-            &VisualDeckStorageWidget::updateColorFilter);
+    // Connect the button's clicked signal
+    connect(toggleButton, &QPushButton::clicked, this, &DeckPreviewColorIdentityFilterWidget::updateFilterMode);
 
     // Call retranslateUi to set the initial text
     retranslateUi();
@@ -45,76 +44,55 @@ DeckPreviewColorIdentityFilterWidget::DeckPreviewColorIdentityFilterWidget(Visua
 void DeckPreviewColorIdentityFilterWidget::retranslateUi()
 {
     // Set the toggle button text based on the current mode
-    toggleButton->setText(exactMatchMode ? tr("Mode: Exact Match") : tr("Mode: Includes"));
+    switch (filterMode) {
+        case VisualDeckStorageSortFilterProxyModel::FilterMode::ExactMatch:
+            toggleButton->setText(tr("Mode: Exact Match"));
+            break;
+        case VisualDeckStorageSortFilterProxyModel::FilterMode::Includes:
+            toggleButton->setText(tr("Mode: Includes"));
+            break;
+        case VisualDeckStorageSortFilterProxyModel::FilterMode::Excludes:
+            toggleButton->setText(tr("Mode: Excludes"));
+            break;
+    }
     toggleButton->setToolTip(tr("Color identity filter mode (AND/OR/NOT conjunctions of filters)"));
 }
 
+/**
+ * @brief The colors that are currently toggled on.
+ */
+QSet<QChar> DeckPreviewColorIdentityFilterWidget::getActiveColors() const
+{
+    QSet<QChar> activeColorSet;
+    for (auto it = activeColors.constBegin(); it != activeColors.constEnd(); ++it) {
+        if (it.value()) {
+            activeColorSet.insert(it.key());
+        }
+    }
+    return activeColorSet;
+}
+
 void DeckPreviewColorIdentityFilterWidget::handleColorToggled(QChar color, bool active)
 {
     activeColors[color] = active;
     emit activeColorsChanged();
 }
 
-void DeckPreviewColorIdentityFilterWidget::updateFilterMode(bool checked)
+void DeckPreviewColorIdentityFilterWidget::updateFilterMode()
 {
-    exactMatchMode = checked; // Toggle between modes
-    retranslateUi();          // Update the button text
-    emit filterModeChanged(exactMatchMode);
-}
-
-void DeckPreviewColorIdentityFilterWidget::filterWidgets(QList<DeckPreviewWidget *> widgets)
-{
-    // Check if no colors are active
-    bool noColorsActive = true;
-    for (auto it = activeColors.constBegin(); it != activeColors.constEnd(); ++it) {
-        if (it.value()) {
-            noColorsActive = false;
+    // Cycle through the modes
+    switch (filterMode) {
+        case VisualDeckStorageSortFilterProxyModel::FilterMode::ExactMatch:
+            filterMode = VisualDeckStorageSortFilterProxyModel::FilterMode::Includes;
+            break;
+        case VisualDeckStorageSortFilterProxyModel::FilterMode::Includes:
+            filterMode = VisualDeckStorageSortFilterProxyModel::FilterMode::Excludes;
+            break;
+        case VisualDeckStorageSortFilterProxyModel::FilterMode::Excludes:
+            filterMode = VisualDeckStorageSortFilterProxyModel::FilterMode::ExactMatch;
             break;
-        }
     }
 
-    // If no colors are active, return the unfiltered list of widgets
-    if (noColorsActive) {
-        for (DeckPreviewWidget *previewWidget : widgets) {
-            previewWidget->filteredByColor = false;
-        }
-    }
-
-    for (const auto &widget : widgets) {
-        QString colorIdentity = widget->getColorIdentity();
-
-        bool matchesFilter = true;
-        if (exactMatchMode) {
-            // Exact match mode: active colors must exactly match colorIdentity
-
-            // Create a set of active colors
-            QSet<QChar> activeColorSet;
-            for (auto it = activeColors.constBegin(); it != activeColors.constEnd(); ++it) {
-                if (it.value()) {
-                    activeColorSet.insert(it.key().toUpper()); // Use uppercase for uniformity
-                }
-            }
-
-            // Create a set of colors from the color identity string
-            QSet<QChar> colorIdentitySet;
-            for (const QChar &color : colorIdentity) {
-                colorIdentitySet.insert(color.toUpper()); // Ensure case uniformity
-            }
-
-            // Compare the sets: the sets must match exactly
-            if (activeColorSet != colorIdentitySet) {
-                matchesFilter = false;
-            }
-        } else {
-            // Includes mode: colorIdentity must contain all active colors
-            for (auto it = activeColors.constBegin(); it != activeColors.constEnd(); ++it) {
-                if (it.value() && !colorIdentity.contains(it.key())) {
-                    matchesFilter = false;
-                    break;
-                }
-            }
-        }
-
-        widget->filteredByColor = !matchesFilter;
-    }
+    retranslateUi(); // Update the button text
+    emit filterModeChanged(filterMode);
 }
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 551dbb35c..e0c90034c 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
@@ -1,43 +1,64 @@
 /**
  * @file deck_preview_color_identity_filter_widget.h
  * @ingroup VisualDeckPreviewWidgets
- * @brief TODO: Document this.
  */
 
 #ifndef DECK_PREVIEW_COLOR_IDENTITY_FILTER_WIDGET_H
 #define DECK_PREVIEW_COLOR_IDENTITY_FILTER_WIDGET_H
 
-#include "../visual_deck_storage_widget.h"
+#include "../visual_deck_storage_sort_filter_proxy_model.h"
 
-#include <QHBoxLayout>
-#include <QPushButton>
+#include <QChar>
+#include <QMap>
+#include <QSet>
 #include <QWidget>
+#include <qtmetamacros.h>
 
-class DeckPreviewWidget;
-class VisualDeckStorageWidget;
+class QHBoxLayout;
+class QPushButton;
 
 class DeckPreviewColorIdentityFilterWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit DeckPreviewColorIdentityFilterWidget(VisualDeckStorageWidget *parent);
+    explicit DeckPreviewColorIdentityFilterWidget(QWidget *parent = nullptr);
     void retranslateUi();
-    void filterWidgets(QList<DeckPreviewWidget *> widgets);
+
+    /**
+     * @brief The currently active color identity filter mode.
+     */
+    [[nodiscard]] VisualDeckStorageSortFilterProxyModel::FilterMode getFilterMode() const
+    {
+        return filterMode;
+    }
+
+    /**
+     * @brief The colors that are currently toggled on.
+     */
+    [[nodiscard]] QSet<QChar> getActiveColors() const;
 
 signals:
-    void filterModeChanged(bool exactMatchMode);
+    /**
+     * Emitted when the set of active colors changed due to user interaction.
+     */
     void activeColorsChanged();
 
+    /**
+     * Emitted when the user cycles the color identity filter mode.
+     * @param mode The new filter mode.
+     */
+    void filterModeChanged(VisualDeckStorageSortFilterProxyModel::FilterMode mode);
+
 private slots:
     void handleColorToggled(QChar color, bool active);
-    void updateFilterMode(bool checked);
+    void updateFilterMode();
 
 private:
     QHBoxLayout *layout;
     QPushButton *toggleButton;
     QMap<QChar, bool> activeColors;
-    bool exactMatchMode = false; // Default to "includes" mode
+    VisualDeckStorageSortFilterProxyModel::FilterMode filterMode = VisualDeckStorageSortFilterProxyModel::Includes;
 };
 
 #endif // DECK_PREVIEW_COLOR_IDENTITY_FILTER_WIDGET_H
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 a29f3bfc4..dc619e9fa 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,20 +1,26 @@
 #include "deck_preview_deck_tags_display_widget.h"
 
 #include "../../../../client/settings/cache_settings.h"
-#include "../../../../interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h"
-#include "../../../../interface/widgets/tabs/tab_deck_editor.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 "deck_preview_widget.h"
+#include "libcockatrice/deck_list/deck_list.h"
 
+#include <QDialog>
+#include <QDir>
 #include <QDirIterator>
 #include <QHBoxLayout>
-#include <QMessageBox>
+#include <QSizePolicy>
+#include <libcockatrice/settings/paths_settings.h>
+#include <optional>
+#include <qnamespace.h>
 
-DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, DeckList *_deckList)
-    : QWidget(_parent), deckList(nullptr)
+DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, const QStringList &_tags)
+    : QWidget(_parent), currentTags(_tags)
 {
 
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
@@ -27,16 +33,14 @@ DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_par
 
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
 
-    if (_deckList) {
-        setDeckList(_deckList);
-    }
-
     layout->addWidget(flowWidget);
+
+    refreshTags();
 }
 
-void DeckPreviewDeckTagsDisplayWidget::setDeckList(DeckList *_deckList)
+void DeckPreviewDeckTagsDisplayWidget::setTags(const QStringList &_tags)
 {
-    deckList = _deckList;
+    currentTags = _tags;
     refreshTags();
 }
 
@@ -44,7 +48,7 @@ void DeckPreviewDeckTagsDisplayWidget::refreshTags()
 {
     flowWidget->clearLayout();
 
-    for (const QString &tag : deckList->getTags()) {
+    for (const QString &tag : currentTags) {
         flowWidget->addWidget(new DeckPreviewTagDisplayWidget(this, tag));
     }
 
@@ -54,6 +58,16 @@ void DeckPreviewDeckTagsDisplayWidget::refreshTags()
     flowWidget->addWidget(tagAdditionWidget);
 }
 
+void DeckPreviewDeckTagsDisplayWidget::setKnownTagsProvider(const std::function<QStringList()> &provider)
+{
+    knownTagsProvider = provider;
+}
+
+void DeckPreviewDeckTagsDisplayWidget::setConversionPromptHandler(const std::function<bool()> &handler)
+{
+    conversionPromptHandler = handler;
+}
+
 /**
  * Gets the filepath of all files (no directories) in target directory and all subdirectories
  */
@@ -71,113 +85,44 @@ static QStringList getAllFiles(const QString &filePath)
     return allFiles;
 }
 
-bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath)
+/**
+ * Gets all tags that appear in the deck folder
+ */
+static QStringList findAllKnownTags()
 {
-    QFileInfo fileInfo(filePath);
-    QString newFileName = QDir::toNativeSeparators(fileInfo.path() + "/" + fileInfo.completeBaseName() + ".cod");
+    QStringList allFiles = getAllFiles(SettingsCache::instance().paths().getDeckPath());
 
-    if (QFile::exists(newFileName)) {
-        QMessageBox::StandardButton reply =
-            QMessageBox::question(parent, QObject::tr("Overwrite Existing File?"),
-                                  QObject::tr("A .cod version of this deck already exists. Overwrite it?"),
-                                  QMessageBox::Yes | QMessageBox::No);
-        return reply == QMessageBox::Yes;
+    QStringList knownTags;
+    for (const QString &file : allFiles) {
+        std::optional<LoadedDeck> deckOpt =
+            DeckLoader::loadFromFile(file, DeckFileFormat::getFormatFromName(file), false);
+        QStringList tags = deckOpt.has_value() ? deckOpt->deckList.getTags() : QStringList();
+        knownTags.append(tags);
+        knownTags.removeDuplicates();
     }
-    return true; // Safe to proceed
+
+    return knownTags;
 }
 
 void DeckPreviewDeckTagsDisplayWidget::openTagEditDlg()
 {
-    if (qobject_cast<DeckPreviewWidget *>(parentWidget())) {
-        auto *deckPreviewWidget = qobject_cast<DeckPreviewWidget *>(parentWidget());
-        QStringList knownTags = deckPreviewWidget->visualDeckStorageWidget->tagFilterWidget->getAllKnownTags();
-        QStringList activeTags = deckList->getTags();
+    // The deck editor path has no conversion prompt; the VDS path registers one.
+    if (conversionPromptHandler && !conversionPromptHandler()) {
+        return;
+    }
 
-        bool canAddTags = true;
+    const QStringList knownTags = knownTagsProvider ? knownTagsProvider() : findAllKnownTags();
+    execTagDialog(knownTags);
+}
 
-        if (DeckLoader::getFormatFromName(deckPreviewWidget->filePath) != DeckLoader::CockatriceFormat) {
-            canAddTags = false;
-            // Retrieve saved preference if the prompt is disabled
-            if (!SettingsCache::instance().getVisualDeckStoragePromptForConversion()) {
-                if (SettingsCache::instance().getVisualDeckStorageAlwaysConvert()) {
-
-                    if (!confirmOverwriteIfExists(this, deckPreviewWidget->filePath))
-                        return;
-
-                    deckPreviewWidget->deckLoader->convertToCockatriceFormat(deckPreviewWidget->filePath);
-                    deckPreviewWidget->filePath = deckPreviewWidget->deckLoader->getLastLoadInfo().fileName;
-                    deckPreviewWidget->refreshBannerCardText();
-                    canAddTags = true;
-                }
-            } else {
-                // Show the dialog to the user
-                DialogConvertDeckToCodFormat conversionDialog(parentWidget());
-                if (conversionDialog.exec() == QDialog::Accepted) {
-
-                    if (!confirmOverwriteIfExists(this, deckPreviewWidget->filePath))
-                        return;
-
-                    deckPreviewWidget->deckLoader->convertToCockatriceFormat(deckPreviewWidget->filePath);
-                    deckPreviewWidget->filePath = deckPreviewWidget->deckLoader->getLastLoadInfo().fileName;
-                    deckPreviewWidget->refreshBannerCardText();
-                    canAddTags = true;
-
-                    if (conversionDialog.dontAskAgain()) {
-                        SettingsCache::instance().setVisualDeckStoragePromptForConversion(false);
-                        SettingsCache::instance().setVisualDeckStorageAlwaysConvert(true);
-                    }
-                } else {
-                    SettingsCache::instance().setVisualDeckStorageAlwaysConvert(false);
-
-                    if (conversionDialog.dontAskAgain()) {
-                        SettingsCache::instance().setVisualDeckStoragePromptForConversion(false);
-                    } else {
-                        SettingsCache::instance().setVisualDeckStoragePromptForConversion(true);
-                    }
-                }
-            }
-        }
-
-        if (canAddTags) {
-            DeckPreviewTagDialog dialog(knownTags, activeTags);
-            if (dialog.exec() == QDialog::Accepted) {
-                QStringList updatedTags = dialog.getActiveTags();
-                deckList->setTags(updatedTags);
-                deckPreviewWidget->deckLoader->saveToFile(deckPreviewWidget->filePath, DeckLoader::CockatriceFormat);
-                refreshTags();
-            }
-        }
-    } else if (parentWidget()) {
-        // If we're the child of an AbstractTabDeckEditor, we are buried under a ton of childWidgets in the
-        // DeckInfoDock.
-        QWidget *currentParent = parentWidget();
-        while (currentParent) {
-            if (qobject_cast<AbstractTabDeckEditor *>(currentParent)) {
-                break;
-            }
-            currentParent = currentParent->parentWidget();
-        }
-        if (qobject_cast<AbstractTabDeckEditor *>(currentParent)) {
-            auto *deckEditor = qobject_cast<AbstractTabDeckEditor *>(currentParent);
-            QStringList knownTags;
-            QStringList allFiles = getAllFiles(SettingsCache::instance().getDeckPath());
-            DeckLoader loader(this);
-            for (const QString &file : allFiles) {
-                loader.loadFromFile(file, DeckLoader::getFormatFromName(file), false);
-                QStringList tags = loader.getDeckList()->getTags();
-                knownTags.append(tags);
-                knownTags.removeDuplicates();
-            }
-
-            QStringList activeTags = deckList->getTags();
-
-            DeckPreviewTagDialog dialog(knownTags, activeTags);
-            if (dialog.exec() == QDialog::Accepted) {
-                QStringList updatedTags = dialog.getActiveTags();
-                deckList->setTags(updatedTags);
-                deckEditor->setModified(true);
-                refreshTags();
-            }
+void DeckPreviewDeckTagsDisplayWidget::execTagDialog(const QStringList &knownTags)
+{
+    DeckPreviewTagDialog dialog(knownTags, currentTags);
+    if (dialog.exec() == QDialog::Accepted) {
+        QStringList updatedTags = dialog.getActiveTags();
+        if (updatedTags != currentTags) {
+            setTags(updatedTags);
+            emit tagsChanged(updatedTags);
         }
     }
 }
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 b1b1117ae..a12f6ec3c 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
@@ -1,32 +1,57 @@
 /**
  * @file deck_preview_deck_tags_display_widget.h
  * @ingroup VisualDeckPreviewWidgets
- * @brief TODO: Document this.
  */
 
 #ifndef DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H
 #define DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H
 
-#include "../../../deck_loader/deck_loader.h"
-#include "deck_preview_widget.h"
-
+#include <QList>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <functional>
+#include <qtmetamacros.h>
 
-inline bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath);
+class FlowWidget;
 
-class DeckPreviewWidget;
 class DeckPreviewDeckTagsDisplayWidget : public QWidget
 {
     Q_OBJECT
 
-public:
-    explicit DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, DeckList *_deckList);
-    void setDeckList(DeckList *_deckList);
-    void refreshTags();
-    DeckList *deckList;
+    QStringList currentTags;
     FlowWidget *flowWidget;
+    std::function<QStringList()> knownTagsProvider;
+    std::function<bool()> conversionPromptHandler;
+
+public:
+    explicit DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, const QStringList &_tags = {});
+    void setTags(const QStringList &_tags);
+    void refreshTags();
+
+    /**
+     * @brief Sets a provider for the tags shown in the edit dialog.
+     * Defaults to scanning all deck files in the deck folder.
+     */
+    void setKnownTagsProvider(const std::function<QStringList()> &provider);
+
+    /**
+     * @brief Sets a handler run before opening the tag dialog. Returning false
+     * cancels the dialog. Defaults to no handler (the deck editor path).
+     */
+    void setConversionPromptHandler(const std::function<bool()> &handler);
 
 public slots:
     void openTagEditDlg();
+
+signals:
+    /**
+     * Emitted when the tags have changed due to user interaction.
+     * @param tags The new list of tags.
+     */
+    void tagsChanged(const QStringList &tags);
+
+private:
+    void execTagDialog(const QStringList &knownTags);
 };
 #endif // DECK_PREVIEW_DECK_TAGS_DISPLAY_WIDGET_H
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 fdf4b2a28..82ed6191c 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,12 +1,19 @@
 #include "deck_preview_tag_addition_widget.h"
 
-#include "../../../../client/settings/cache_settings.h"
-#include "../../../../interface/widgets/tabs/abstract_tab_deck_editor.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>
 #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 c0fa86d19..30ce46249 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
@@ -1,13 +1,15 @@
 /**
  * @file deck_preview_tag_addition_widget.h
  * @ingroup VisualDeckPreviewWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DECK_PREVIEW_TAG_ADDITION_WIDGET_H
 #define DECK_PREVIEW_TAG_ADDITION_WIDGET_H
 
-#include "deck_preview_deck_tags_display_widget.h"
+#include <QString>
+#include <QWidget>
+#include <qtmetamacros.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 e8a399fe5..2a6a42e9d 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,9 +8,17 @@
 #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,
@@ -19,7 +27,7 @@ DeckPreviewTagDialog::DeckPreviewTagDialog(const QStringList &knownTags,
 {
     resize(400, 500);
 
-    QStringList defaultTags = SettingsCache::instance().getVisualDeckStorageDefaultTagsList();
+    QStringList defaultTags = SettingsCache::instance().visualDeckStorage().getVisualDeckStorageDefaultTagsList();
 
     // Merge knownTags with defaultTags, ensuring no duplicates
     QStringList combinedTags = defaultTags + knownTags + activeTags;
@@ -90,7 +98,8 @@ DeckPreviewTagDialog::DeckPreviewTagDialog(const QStringList &knownTags,
     connect(okButton, &QPushButton::clicked, this, &DeckPreviewTagDialog::accept);
     connect(cancelButton, &QPushButton::clicked, this, &DeckPreviewTagDialog::reject);
 
-    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageDefaultTagsListChanged, this,
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDeckStorageDefaultTagsListChanged, this,
             &DeckPreviewTagDialog::refreshTagList);
 
     retranslateUi();
@@ -114,7 +123,7 @@ void DeckPreviewTagDialog::refreshTagList()
     tagListView->clear();
 
     // Get the updated list of tags from SettingsCache
-    QStringList defaultTags = SettingsCache::instance().getVisualDeckStorageDefaultTagsList();
+    QStringList defaultTags = SettingsCache::instance().visualDeckStorage().getVisualDeckStorageDefaultTagsList();
     QStringList combinedTags = defaultTags + knownTags_ + activeTags;
     combinedTags.removeDuplicates();
 
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 59b330a65..80d5560a0 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
@@ -2,17 +2,25 @@
  * @file deck_preview_tag_dialog.h
  * @ingroup VisualDeckPreviewWidgets
  * @ingroup Dialogs
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DECK_PREVIEW_TAG_DIALOG_H
 #define DECK_PREVIEW_TAG_DIALOG_H
 
 #include <QDialog>
-#include <QLabel>
-#include <QLineEdit>
-#include <QListWidget>
-#include <QVBoxLayout>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class QHBoxLayout;
+class QLabel;
+class QLineEdit;
+class QListWidget;
+class QPushButton;
+class QVBoxLayout;
+class QWidget;
 
 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 db466b77a..e62570241 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,9 +1,19 @@
 #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)
@@ -48,6 +58,7 @@ QSize DeckPreviewTagDisplayWidget::sizeHint() const
 
 void DeckPreviewTagDisplayWidget::mousePressEvent(QMouseEvent *event)
 {
+    const TagState previousState = state;
     switch (event->button()) {
         case Qt::LeftButton:
             setState(state != TagState::Selected ? TagState::Selected : TagState::NotSelected);
@@ -62,7 +73,12 @@ void DeckPreviewTagDisplayWidget::mousePressEvent(QMouseEvent *event)
             break;
     }
 
-    emit tagClicked();
+    // Only announce a change when the state was actually toggled, so a click that falls
+    // through the switch (e.g. a button the widget does not react to) does not drive a
+    // full tag-filter update and layout pass for nothing.
+    if (state != previousState) {
+        emit tagClicked();
+    }
     QWidget::mousePressEvent(event);
 }
 
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 a868aa4f1..d3f5e7326 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
@@ -1,16 +1,18 @@
 /**
  * @file deck_preview_tag_display_widget.h
  * @ingroup VisualDeckPreviewWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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
 {
@@ -48,7 +50,10 @@ public:
 
 signals:
     /**
-     * @brief Emitted when the tag is clicked.
+     * @brief Emitted when a click toggles the chip's selection/exclusion state.
+     *
+     * Not emitted for clicks that leave the state unchanged. Connected handlers use
+     * this as the trigger to update filters built from selectedTags()/excludedTags().
      */
     void tagClicked();
 
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 d9ea9fc30..7796f893b 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,5 +1,8 @@
 #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 5caae90a1..a09eb7501 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
@@ -1,15 +1,17 @@
 /**
  * @file deck_preview_tag_item_widget.h
  * @ingroup VisualDeckPreviewWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DECK_PREVIEW_TAG_ITEM_WIDGET_H
 #define DECK_PREVIEW_TAG_ITEM_WIDGET_H
 
-#include <QCheckBox>
-#include <QHBoxLayout>
+#include <QString>
 #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 2735b4856..220c55788 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
@@ -1,55 +1,141 @@
 #include "deck_preview_widget.h"
 
 #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 <QClipboard>
-#include <QDir>
+#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,
+                                     VisualDeckStorageModel *_model,
                                      const QString &_filePath)
-    : QWidget(_parent), visualDeckStorageWidget(_visualDeckStorageWidget), filePath(_filePath),
-      colorIdentityWidget(nullptr), deckTagsDisplayWidget(nullptr)
+    : QWidget(_parent), filePath(_filePath), visualDeckStorageWidget(_visualDeckStorageWidget), model(_model)
 {
     layout = new QVBoxLayout(this);
     setLayout(layout);
 
-    deckLoader = new DeckLoader(this);
-    connect(deckLoader, &DeckLoader::loadFinished, this, &DeckPreviewWidget::initializeUi);
-    /* TODO: We shouldn't update the tags on *every* deck load, since it's kinda expensive. We should instead count how
-     many deck loads have finished already and if we've loaded all decks and THEN load all the tags at once. */
-    connect(deckLoader, &DeckLoader::loadFinished, visualDeckStorageWidget->tagFilterWidget,
-            &VisualDeckStorageTagFilterWidget::refreshTags);
-    deckLoader->loadFromFileAsync(filePath, DeckLoader::getFormatFromName(filePath), false);
-
-    bannerCardDisplayWidget =
+    auto *pictureWidget =
         new DeckPreviewCardPictureWidget(this, false, visualDeckStorageWidget->deckPreviewSelectionAnimationEnabled);
-
-    connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageClicked, this,
-            &DeckPreviewWidget::imageClickedEvent);
-    connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageDoubleClicked, this,
+    pictureWidget->setFontSize(24);
+    connect(pictureWidget, &DeckPreviewCardPictureWidget::imageClicked, this, &DeckPreviewWidget::imageClickedEvent);
+    connect(pictureWidget, &DeckPreviewCardPictureWidget::imageSingleClicked, this,
+            &DeckPreviewWidget::imageSingleClicked);
+    connect(pictureWidget, &DeckPreviewCardPictureWidget::imageDoubleClicked, this,
             &DeckPreviewWidget::imageDoubleClickedEvent);
+    bannerCardDisplayWidget = pictureWidget;
 
-    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageShowTagsOnDeckPreviewsChanged, this,
+    colorIdentityWidget = new ColorIdentityWidget(this);
+    deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this);
+    connect(deckTagsDisplayWidget, &DeckPreviewDeckTagsDisplayWidget::tagsChanged, this, &DeckPreviewWidget::setTags);
+    deckTagsDisplayWidget->setKnownTagsProvider(
+        [this] { return visualDeckStorageWidget->tagFilterWidget->getAllKnownTags(); });
+    deckTagsDisplayWidget->setConversionPromptHandler([this] { return promptFileConversionIfRequired(); });
+
+    bannerCardLabel = new QLabel(this);
+    bannerCardLabel->setObjectName("bannerCardLabel");
+    bannerCardComboBox = new QComboBox(this);
+    bannerCardComboBox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+    bannerCardComboBox->setObjectName("bannerCardComboBox");
+    bannerCardComboBox->installEventFilter(new NoScrollFilter(bannerCardComboBox));
+    connect(bannerCardComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &DeckPreviewWidget::setBannerCard);
+
+    // Apply the initial visibility settings and keep them in sync while they change.
+    updateColorIdentityVisibility(
+        SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowColorIdentity());
+    updateBannerCardComboBoxVisibility(
+        SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowBannerCardComboBox());
+    updateTagsVisibility(SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowTagsOnDeckPreviews());
+
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDeckStorageShowColorIdentityChanged, this,
+            &DeckPreviewWidget::updateColorIdentityVisibility);
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDeckStorageShowTagsOnDeckPreviewsChanged, this,
             &DeckPreviewWidget::updateTagsVisibility);
-    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageShowBannerCardComboBoxChanged, this,
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDeckStorageShowBannerCardComboBoxChanged, this,
             &DeckPreviewWidget::updateBannerCardComboBoxVisibility);
     connect(visualDeckStorageWidget->settings(), &VisualDeckStorageQuickSettingsWidget::deckPreviewTooltipChanged, this,
             &DeckPreviewWidget::refreshBannerCardToolTip);
 
     layout->addWidget(bannerCardDisplayWidget);
+    layout->addWidget(colorIdentityWidget);
+    layout->addWidget(deckTagsDisplayWidget);
+    layout->addWidget(bannerCardLabel);
+    layout->addWidget(bannerCardComboBox);
+
+    // Only re-sync when this widget's own row changed. Without the row check, every
+    // finished deck load would trigger a full resync (card db lookup + combo rebuild)
+    // in every preview widget.
+    connect(model, &QAbstractItemModel::dataChanged, this,
+            [this](const QModelIndex &topLeft, const QModelIndex &bottomRight) {
+                const int r = row();
+                if (r >= topLeft.row() && r <= bottomRight.row()) {
+                    syncFromModel();
+                }
+            });
+
+    retranslateUi();
+    syncFromModel();
+
+    // resizeEvent clamps every child to the picture's width, so collect them once here
+    // to keep the resize handler from searching the widget tree on every layout pass.
+    fixedWidthChildren = {bannerCardDisplayWidget, colorIdentityWidget, deckTagsDisplayWidget, bannerCardLabel,
+                          bannerCardComboBox};
+
+    // Child of the banner widget so the frame tracks the banner's selection animation
+    // (which animates the banner's position) instead of staying at a stale static offset.
+    selectionFrame = new QFrame(bannerCardDisplayWidget);
+    selectionFrame->setAttribute(Qt::WA_TransparentForMouseEvents);
+    selectionFrame->setStyleSheet(QStringLiteral(
+        "QFrame { border: 2px solid palette(highlight); border-radius: 4px; background: transparent; }"));
+    selectionFrame->setVisible(false);
+    bannerCardDisplayWidget->installEventFilter(this);
 }
 
 void DeckPreviewWidget::retranslateUi()
@@ -63,63 +149,147 @@ void DeckPreviewWidget::resizeEvent(QResizeEvent *event)
     if (bannerCardDisplayWidget == nullptr) {
         return;
     }
-    QList<QWidget *> widgets = findChildren<QWidget *>();
-    for (QWidget *widget : widgets) {
-        widget->setMaximumWidth(bannerCardDisplayWidget->width());
-    }
-}
 
-void DeckPreviewWidget::initializeUi(const bool deckLoadSuccess)
-{
-    if (!deckLoadSuccess) {
+    const int width = bannerCardDisplayWidget->width();
+    if (width == lastKnownBannerWidth) {
         return;
     }
-    auto bannerCard = deckLoader->getDeckList()->getBannerCard().name.isEmpty()
-                          ? ExactCard()
-                          : CardDatabaseManager::query()->getCard(deckLoader->getDeckList()->getBannerCard());
+    lastKnownBannerWidth = width;
+
+    for (QWidget *widget : fixedWidthChildren) {
+        widget->setMaximumWidth(width);
+    }
+    updateSelectionFrameGeometry();
+}
+
+bool DeckPreviewWidget::eventFilter(QObject *watched, QEvent *event)
+{
+    if (watched == bannerCardDisplayWidget && (event->type() == QEvent::Resize || event->type() == QEvent::Move)) {
+        updateSelectionFrameGeometry();
+    }
+    return QWidget::eventFilter(watched, event);
+}
+
+void DeckPreviewWidget::setShareSelectable(bool selectable)
+{
+    shareSelectable = selectable;
+    if (!selectable) {
+        setShareSelected(false);
+    }
+    updateSelectionStyle();
+}
+
+void DeckPreviewWidget::setShareSelected(bool selected)
+{
+    if (shareSelected == selected) {
+        return;
+    }
+    shareSelected = selected;
+    updateSelectionStyle();
+    emit shareSelectionToggled(selected);
+}
+
+bool DeckPreviewWidget::isShareSelected() const
+{
+    return shareSelected;
+}
+
+bool DeckPreviewWidget::isShareSelectable() const
+{
+    return shareSelectable;
+}
+
+void DeckPreviewWidget::updateSelectionFrameGeometry()
+{
+    if (selectionFrame == nullptr || bannerCardDisplayWidget == nullptr) {
+        return;
+    }
+    // Frame is a child of the banner, so it is positioned in banner coordinates and
+    // tracks the banner's selection animation automatically. A small inset keeps the
+    // highlight visible around the card art without occluding it.
+    selectionFrame->setGeometry(bannerCardDisplayWidget->rect().adjusted(1, 1, -1, -1));
+    selectionFrame->raise();
+}
+
+void DeckPreviewWidget::updateSelectionStyle()
+{
+    if (selectionFrame != nullptr) {
+        selectionFrame->setVisible(shareSelectable && isShareSelected());
+    }
+}
+
+void DeckPreviewWidget::enterEvent(QEnterEvent *event)
+{
+    QWidget::enterEvent(event);
+
+    // Don't do reloads until the deck has actually been loaded once.
+    reloadIfModified();
+}
+
+/**
+ * @brief The row of this deck in the source model, or -1 if it no longer exists.
+ */
+int DeckPreviewWidget::row() const
+{
+    return model->rowForFilePath(filePath);
+}
+
+/**
+ * @brief The display name is given by the deck name, or the filename if the deck name is not set.
+ */
+QString DeckPreviewWidget::getDisplayName() const
+{
+    const int r = row();
+    if (r == -1) {
+        return {};
+    }
+    return model->dataForRow(r).displayName;
+}
+
+/**
+ * @brief Reloads the deck if the file's last modified time has increased since we last checked.
+ */
+void DeckPreviewWidget::reloadIfModified()
+{
+    const int r = row();
+    if (r == -1 || !model->dataForRow(r).loadSucceeded) {
+        return;
+    }
+
+    model->reloadIfModified(r);
+}
+
+/**
+ * @brief Syncs the contents of the child widgets with the current row's data.
+ */
+void DeckPreviewWidget::syncFromModel()
+{
+    const int r = row();
+    if (r == -1) {
+        return;
+    }
+
+    const DeckPreviewData &data = model->dataForRow(r);
+    filePath = data.filePath;
+
+    const CardRef bannerCardRef = data.deck.deckList.getBannerCard();
+    const ExactCard bannerCard =
+        bannerCardRef.name.isEmpty() ? ExactCard() : CardDatabaseManager::query()->getCard(bannerCardRef);
 
     bannerCardDisplayWidget->setCard(bannerCard);
-    bannerCardDisplayWidget->setFontSize(24);
-    setFilePath(deckLoader->getLastLoadInfo().fileName);
-
-    colorIdentityWidget = new ColorIdentityWidget(this, getColorIdentity());
-    deckTagsDisplayWidget = new DeckPreviewDeckTagsDisplayWidget(this, deckLoader->getDeckList());
-
-    bannerCardLabel = new QLabel(this);
-    bannerCardLabel->setObjectName("bannerCardLabel");
-    bannerCardComboBox = new QComboBox(this);
-    bannerCardComboBox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-    bannerCardComboBox->setObjectName("bannerCardComboBox");
-    bannerCardComboBox->setCurrentText(deckLoader->getDeckList()->getBannerCard().name);
-    bannerCardComboBox->installEventFilter(new NoScrollFilter());
-    connect(bannerCardComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
-            &DeckPreviewWidget::setBannerCard);
-
-    updateBannerCardComboBox();
-    updateBannerCardComboBoxVisibility(SettingsCache::instance().getVisualDeckStorageShowBannerCardComboBox());
-    updateTagsVisibility(SettingsCache::instance().getVisualDeckStorageShowTagsOnDeckPreviews());
-
-    layout->addWidget(colorIdentityWidget);
-    layout->addWidget(deckTagsDisplayWidget);
-    layout->addWidget(bannerCardLabel);
-    layout->addWidget(bannerCardComboBox);
-
     refreshBannerCardText();
-
-    retranslateUi();
+    updateBannerCardComboBox(bannerCardRef.name);
+    colorIdentityWidget->setColorIdentity(data.colorIdentity);
+    deckTagsDisplayWidget->setTags(data.tags);
 }
 
-void DeckPreviewWidget::updateVisibility()
+void DeckPreviewWidget::updateColorIdentityVisibility(bool visible)
 {
-    setHidden(!checkVisibility());
-}
-
-bool DeckPreviewWidget::checkVisibility() const
-{
-    if (filteredBySearch || filteredByColor || filteredByTags) {
-        return false;
+    if (colorIdentityWidget == nullptr) {
+        return;
     }
-    return true;
+
+    colorIdentityWidget->setVisible(visible);
 }
 
 void DeckPreviewWidget::updateBannerCardComboBoxVisibility(bool visible)
@@ -150,51 +320,6 @@ void DeckPreviewWidget::updateTagsVisibility(bool visible)
     }
 }
 
-QString DeckPreviewWidget::getColorIdentity()
-{
-    QStringList cardList = deckLoader->getDeckList()->getCardList();
-    if (cardList.isEmpty()) {
-        return {};
-    }
-
-    QSet<QChar> colorSet; // A set to collect unique color symbols (e.g., W, U, B, R, G)
-
-    for (const QString &cardName : cardList) {
-        CardInfoPtr currentCard = CardDatabaseManager::query()->getCardInfo(cardName);
-        if (currentCard) {
-            QString colors = currentCard->getColors(); // Assuming this returns something like "WUB"
-            for (const QChar &color : colors) {
-                colorSet.insert(color);
-            }
-        }
-    }
-
-    // Ensure the color identity is in WUBRG order
-    QString colorIdentity;
-    const QString wubrgOrder = "WUBRG";
-    for (const QChar &color : wubrgOrder) {
-        if (colorSet.contains(color)) {
-            colorIdentity.append(color);
-        }
-    }
-
-    return colorIdentity;
-}
-
-/**
- * The display name is given by the deck name, or the filename if the deck name is not set.
- */
-QString DeckPreviewWidget::getDisplayName() const
-{
-    return deckLoader->getDeckList()->getName().isEmpty() ? QFileInfo(deckLoader->getLastLoadInfo().fileName).fileName()
-                                                          : deckLoader->getDeckList()->getName();
-}
-
-void DeckPreviewWidget::setFilePath(const QString &_filePath)
-{
-    filePath = _filePath;
-}
-
 /**
  * Refreshes the banner card text.
  * This also calls `refreshBannerCardToolTip`, since those two often need to be updated together.
@@ -219,11 +344,8 @@ void DeckPreviewWidget::refreshBannerCardToolTip()
     }
 }
 
-void DeckPreviewWidget::updateBannerCardComboBox()
+void DeckPreviewWidget::updateBannerCardComboBox(const QString &currentText)
 {
-    // Store the current text of the combo box
-    QString currentText = bannerCardComboBox->currentText();
-
     // Block signals temporarily
     bool wasBlocked = bannerCardComboBox->blockSignals(true);
     bannerCardComboBox->setUpdatesEnabled(false);
@@ -234,11 +356,15 @@ void DeckPreviewWidget::updateBannerCardComboBox()
     // Prepare the new items with deduplication
     QSet<QPair<QString, QString>> bannerCardSet;
 
-    QList<DecklistCardNode *> cardsInDeck = deckLoader->getDeckList()->getCardNodes();
+    const int r = row();
+    if (r != -1) {
+        const DeckList &deckList = model->dataForRow(r).deck.deckList;
+        const QList<const DecklistCardNode *> cardsInDeck = deckList.getCardNodes();
 
-    for (auto currentCard : cardsInDeck) {
-        for (int k = 0; k < currentCard->getNumber(); ++k) {
-            bannerCardSet.insert(QPair<QString, QString>(currentCard->getName(), currentCard->getCardProviderId()));
+        for (auto currentCard : cardsInDeck) {
+            for (int k = 0; k < currentCard->getNumber(); ++k) {
+                bannerCardSet.insert(QPair<QString, QString>(currentCard->getName(), currentCard->getCardProviderId()));
+            }
         }
     }
 
@@ -251,16 +377,16 @@ void DeckPreviewWidget::updateBannerCardComboBox()
 
     // This is *slightly* more performant than using addItem in a loop.
 
-    QStandardItemModel *model = new QStandardItemModel(pairList.size(), 1, bannerCardComboBox);
+    QStandardItemModel *comboModel = new QStandardItemModel(pairList.size(), 1, bannerCardComboBox);
 
     int row = 0;
     for (const auto &pair : pairList) {
         QStandardItem *item = new QStandardItem(pair.first);
         item->setData(QVariant::fromValue(pair), Qt::UserRole);
-        model->setItem(row++, 0, item);
+        comboModel->setItem(row++, 0, item);
     }
 
-    bannerCardComboBox->setModel(model);
+    bannerCardComboBox->setModel(comboModel);
 
     // Try to restore the previous selection by finding the currentText
     int restoredIndex = bannerCardComboBox->findText(currentText);
@@ -268,7 +394,9 @@ void DeckPreviewWidget::updateBannerCardComboBox()
         bannerCardComboBox->setCurrentIndex(restoredIndex);
     } else {
         // Add a placeholder "-" and set it as the current selection
-        int bannerIndex = bannerCardComboBox->findText(deckLoader->getDeckList()->getBannerCard().name);
+        const QString currentBannerCardName =
+            r == -1 ? QString() : model->dataForRow(r).deck.deckList.getBannerCard().name;
+        int bannerIndex = bannerCardComboBox->findText(currentBannerCardName);
         if (bannerIndex != -1) {
             bannerCardComboBox->setCurrentIndex(bannerIndex);
         } else {
@@ -286,8 +414,11 @@ void DeckPreviewWidget::setBannerCard(int /* changedIndex */)
 {
     auto [name, id] = bannerCardComboBox->currentData().value<QPair<QString, QString>>();
     CardRef cardRef = {name, id};
-    deckLoader->getDeckList()->setBannerCard(cardRef);
-    deckLoader->saveToFile(filePath, DeckLoader::getFormatFromName(filePath));
+    const int r = row();
+    if (r == -1) {
+        return;
+    }
+    model->setBannerCard(r, cardRef);
     bannerCardDisplayWidget->setCard(CardDatabaseManager::query()->getCard(cardRef));
 }
 
@@ -300,20 +431,46 @@ void DeckPreviewWidget::imageClickedEvent(QMouseEvent *event, DeckPreviewCardPic
     }
 }
 
+void DeckPreviewWidget::imageSingleClicked()
+{
+    if (isShareSelectable()) {
+        setShareSelected(!isShareSelected());
+    }
+}
+
 void DeckPreviewWidget::imageDoubleClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance)
 {
     Q_UNUSED(event);
     Q_UNUSED(instance);
+    if (isShareSelectable()) {
+        return; // in share mode a double click would just toggle a single selection
+    }
     emit deckLoadRequested(filePath);
 }
 
+void DeckPreviewWidget::setTags(const QStringList &tags)
+{
+    const int r = row();
+    if (r != -1) {
+        model->setTags(r, tags);
+    }
+}
+
 QMenu *DeckPreviewWidget::createRightClickMenu()
 {
+    const int r = row();
+
     auto *menu = new QMenu(this);
     menu->setAttribute(Qt::WA_DeleteOnClose);
 
-    connect(menu->addAction(tr("Open in deck editor")), &QAction::triggered, this,
-            [this] { emit openDeckEditor(deckLoader); });
+    connect(menu->addAction(tr("Open in deck editor")), &QAction::triggered, this, [this, r] {
+        if (r != -1) {
+            emit openDeckEditor(model->deckForRow(r));
+        }
+    });
+
+    connect(menu->addAction(tr("Share deck...")), &QAction::triggered, this,
+            [this] { emit shareDeckRequested(filePath); });
 
     connect(menu->addAction(tr("Edit Tags")), &QAction::triggered, deckTagsDisplayWidget,
             &DeckPreviewDeckTagsDisplayWidget::openTagEditDlg);
@@ -326,14 +483,26 @@ QMenu *DeckPreviewWidget::createRightClickMenu()
 
     auto saveToClipboardMenu = menu->addMenu(tr("Save Deck to Clipboard"));
 
-    connect(saveToClipboardMenu->addAction(tr("Annotated")), &QAction::triggered, this,
-            [this] { DeckLoader::saveToClipboard(deckLoader->getDeckList(), true, true); });
-    connect(saveToClipboardMenu->addAction(tr("Annotated (No set info)")), &QAction::triggered, this,
-            [this] { DeckLoader::saveToClipboard(deckLoader->getDeckList(), true, false); });
-    connect(saveToClipboardMenu->addAction(tr("Not Annotated")), &QAction::triggered, this,
-            [this] { DeckLoader::saveToClipboard(deckLoader->getDeckList(), false, true); });
-    connect(saveToClipboardMenu->addAction(tr("Not Annotated (No set info)")), &QAction::triggered, this,
-            [this] { DeckLoader::saveToClipboard(deckLoader->getDeckList(), false, false); });
+    connect(saveToClipboardMenu->addAction(tr("Annotated")), &QAction::triggered, this, [this, r] {
+        if (r != -1) {
+            DeckLoader::saveToClipboard(model->dataForRow(r).deck.deckList, true, true);
+        }
+    });
+    connect(saveToClipboardMenu->addAction(tr("Annotated (No set info)")), &QAction::triggered, this, [this, r] {
+        if (r != -1) {
+            DeckLoader::saveToClipboard(model->dataForRow(r).deck.deckList, true, false);
+        }
+    });
+    connect(saveToClipboardMenu->addAction(tr("Not Annotated")), &QAction::triggered, this, [this, r] {
+        if (r != -1) {
+            DeckLoader::saveToClipboard(model->dataForRow(r).deck.deckList, false, true);
+        }
+    });
+    connect(saveToClipboardMenu->addAction(tr("Not Annotated (No set info)")), &QAction::triggered, this, [this, r] {
+        if (r != -1) {
+            DeckLoader::saveToClipboard(model->dataForRow(r).deck.deckList, false, false);
+        }
+    });
 
     menu->addSeparator();
 
@@ -368,58 +537,58 @@ void DeckPreviewWidget::addSetBannerCardMenu(QMenu *menu)
 
 void DeckPreviewWidget::actRenameDeck()
 {
+    const int r = row();
+    if (r == -1) {
+        return;
+    }
+
     // read input
-    const QString oldName = deckLoader->getDeckList()->getName();
+    const QString oldName = model->dataForRow(r).deckName;
 
     bool ok;
-    QString newName = QInputDialog::getText(this, "Rename deck", tr("New name:"), QLineEdit::Normal, oldName, &ok);
+    QString newName = QInputDialog::getText(this, tr("Rename deck"), tr("New name:"), QLineEdit::Normal, oldName, &ok);
     if (!ok || oldName == newName) {
         return;
     }
 
     // write change
-    deckLoader->getDeckList()->setName(newName);
-    deckLoader->saveToFile(filePath, DeckLoader::getFormatFromName(filePath));
+    model->renameDeck(r, newName);
 
-    // update VDS
-    refreshBannerCardText();
+    // The banner card text updates via the model's dataChanged signal.
 }
 
 void DeckPreviewWidget::actRenameFile()
 {
+    const int r = row();
+    if (r == -1) {
+        return;
+    }
+
     // read input
     const auto info = QFileInfo(filePath);
     const QString oldName = info.baseName();
 
     bool ok;
-    QString newName = QInputDialog::getText(this, "Rename file", tr("New name:"), QLineEdit::Normal, oldName, &ok);
+    QString newName = QInputDialog::getText(this, tr("Rename file"), tr("New name:"), QLineEdit::Normal, oldName, &ok);
     if (!ok || newName.isEmpty() || oldName == newName) {
         return;
     }
 
-    QString newFileName = newName;
-    if (!info.suffix().isEmpty()) {
-        newFileName += "." + info.suffix();
-    }
-
     // write change
-    const QString newFilePath = QFileInfo(info.dir(), newFileName).filePath();
-    if (!QFile::rename(info.filePath(), newFilePath)) {
+    if (!model->renameFile(r, newName)) {
         QMessageBox::critical(this, tr("Error"), tr("Rename failed"));
-        return;
     }
 
-    DeckLoader::LoadInfo lastLoadInfo = deckLoader->getLastLoadInfo();
-    lastLoadInfo.fileName = newFilePath;
-    deckLoader->setLastLoadInfo(lastLoadInfo);
-
-    // update VDS
-    setFilePath(newFilePath);
-    refreshBannerCardText();
+    // The file path and banner card text update via the model's signals.
 }
 
 void DeckPreviewWidget::actDeleteFile()
 {
+    const int r = row();
+    if (r == -1) {
+        return;
+    }
+
     // read input
     auto res = QMessageBox::warning(this, tr("Delete file"), tr("Are you sure you want to delete the selected file?"),
                                     QMessageBox::Yes | QMessageBox::No);
@@ -428,11 +597,22 @@ void DeckPreviewWidget::actDeleteFile()
     }
 
     // write change
-    if (!QFile::remove(QFileInfo(filePath).filePath())) {
+    if (!model->deleteFile(r)) {
         QMessageBox::critical(this, tr("Error"), tr("Delete failed"));
-        return;
     }
 
-    // update VDS
-    this->deleteLater();
+    // The folder widget removes this preview once the row is gone.
+}
+
+/**
+ * Checks if the deck's file format supports tags.
+ * If not, then prompt the user for file conversion.
+ * @return whether the resulting file can support adding tags
+ */
+bool DeckPreviewWidget::promptFileConversionIfRequired()
+{
+    return DialogConvertDeckToCodFormat::promptIfRequired(this, filePath, [this] {
+        model->convertToCockatriceFormat(row());
+        return true;
+    });
 }
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 76db9e569..cdeed87c7 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
@@ -1,85 +1,128 @@
 /**
  * @file deck_preview_widget.h
  * @ingroup VisualDeckPreviewWidgets
- * @brief TODO: Document this.
  */
 
 #ifndef DECK_PREVIEW_WIDGET_H
 #define DECK_PREVIEW_WIDGET_H
 
-#include "../../../deck_loader/deck_loader.h"
-#include "../../cards/additional_info/color_identity_widget.h"
-#include "../../cards/deck_preview_card_picture_widget.h"
-#include "../visual_deck_storage_widget.h"
-#include "deck_preview_deck_tags_display_widget.h"
-
 #include <QAbstractItemView>
+#include <QAbstractScrollArea>
 #include <QApplication>
 #include <QComboBox>
 #include <QEvent>
-#include <QVBoxLayout>
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <QStringList>
 #include <QWidget>
+#include <qtmetamacros.h>
 
+class QFrame;
+class QLabel;
 class QMenu;
-class VisualDeckStorageWidget;
+class QMouseEvent;
+class ColorIdentityWidget;
+class DeckPreviewCardPictureWidget;
 class DeckPreviewDeckTagsDisplayWidget;
+class VisualDeckStorageModel;
+class VisualDeckStorageWidget;
+class QVBoxLayout;
+struct LoadedDeck;
 
 class DeckPreviewWidget final : public QWidget
 {
     Q_OBJECT
 public:
-    explicit DeckPreviewWidget(QWidget *_parent,
+    explicit DeckPreviewWidget(QWidget *parent,
                                VisualDeckStorageWidget *_visualDeckStorageWidget,
+                               VisualDeckStorageModel *_model,
                                const QString &_filePath);
     void retranslateUi();
-    QString getColorIdentity();
-    [[nodiscard]] QString getDisplayName() const;
 
-    VisualDeckStorageWidget *visualDeckStorageWidget;
-    QVBoxLayout *layout;
+    /**
+     * @brief The banner card picture; the parent widget wires its size to the card size setting.
+     */
+    DeckPreviewCardPictureWidget *bannerCardDisplayWidget;
+
+    /** @brief The path of the deck file backing this preview. */
     QString filePath;
-    DeckLoader *deckLoader;
-    DeckPreviewCardPictureWidget *bannerCardDisplayWidget = nullptr;
-    ColorIdentityWidget *colorIdentityWidget = nullptr;
-    DeckPreviewDeckTagsDisplayWidget *deckTagsDisplayWidget = nullptr;
-    QLabel *bannerCardLabel = nullptr;
-    QComboBox *bannerCardComboBox = nullptr;
-    bool filteredBySearch = false;
-    bool filteredByColor = false;
-    bool filteredByTags = false;
-    [[nodiscard]] bool checkVisibility() const;
+
+    void setShareSelectable(bool selectable);
+    void setShareSelected(bool selected);
+    [[nodiscard]] bool isShareSelected() const;
+    [[nodiscard]] bool isShareSelectable() const;
 
 signals:
     void deckLoadRequested(const QString &filePath);
-    void openDeckEditor(DeckLoader *deck);
+    void openDeckEditor(const LoadedDeck &deck);
+    void shareDeckRequested(const QString &filePath);
+    void shareSelectionToggled(bool selected);
 
 public slots:
-    void setFilePath(const QString &filePath);
-    void refreshBannerCardText();
+    /**
+     * @brief Re-reads the row's data from the model and syncs every child widget.
+     * Connected to the model's dataChanged signal.
+     */
+    void syncFromModel();
+
+    /**
+     * @brief Reloads the deck file if its modification time is newer than the stored one.
+     */
+    void reloadIfModified();
     void refreshBannerCardToolTip();
-    void updateBannerCardComboBox();
-    void setBannerCard(int);
-    void imageClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
-    void imageDoubleClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
-    void initializeUi(bool deckLoadSuccess);
-    void updateVisibility();
+    void updateColorIdentityVisibility(bool visible);
     void updateBannerCardComboBoxVisibility(bool visible);
     void updateTagsVisibility(bool visible);
+    void setBannerCard(int);
+    void setTags(const QStringList &tags);
+
+protected:
+    void enterEvent(QEnterEvent *event) override;
     void resizeEvent(QResizeEvent *event) override;
+    bool eventFilter(QObject *watched, QEvent *event) override;
 
 private:
+    [[nodiscard]] int row() const;
+    [[nodiscard]] QString getDisplayName() const;
+    void refreshBannerCardText();
+    void updateBannerCardComboBox(const QString &currentText);
+    bool promptFileConversionIfRequired();
     QMenu *createRightClickMenu();
     void addSetBannerCardMenu(QMenu *menu);
+    void imageClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
+    void imageSingleClicked();
+    void imageDoubleClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
 
-private slots:
     void actRenameDeck();
     void actRenameFile();
     void actDeleteFile();
+
+    VisualDeckStorageWidget *visualDeckStorageWidget;
+    VisualDeckStorageModel *model;
+    QVBoxLayout *layout;
+    ColorIdentityWidget *colorIdentityWidget;
+    DeckPreviewDeckTagsDisplayWidget *deckTagsDisplayWidget;
+    QLabel *bannerCardLabel;
+    QComboBox *bannerCardComboBox;
+    QList<QWidget *> fixedWidthChildren; ///< Children clamped to the picture width on resize.
+    int lastKnownBannerWidth = -1;       ///< The picture width last applied to the children.
+    QFrame *selectionFrame = nullptr;
+    bool shareSelectable = false;
+    bool shareSelected = false;
+
+    void updateSelectionStyle();
+    void updateSelectionFrameGeometry();
 };
 
 class NoScrollFilter : public QObject
 {
     Q_OBJECT
+public:
+    explicit NoScrollFilter(QObject *parent = nullptr) : QObject(parent)
+    {
+    }
+
 protected:
     bool eventFilter(QObject *obj, QEvent *event) override
     {
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
new file mode 100644
index 000000000..361747423
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp
@@ -0,0 +1,171 @@
+#include "public_deck_preview_widget.h"
+
+#include "../../../../client/settings/cache_settings.h"
+#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 <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)
+{
+    bannerCardDisplayWidget = new DeckPreviewCardPictureWidget(this);
+    bannerCardDisplayWidget->setFontSize(24);
+
+    // The whole tile is a single focusable, keyboard-operable control: Tab lands
+    // on it and Space/Enter opens the deck, mirroring the shared-deck preview tile.
+    setFocusPolicy(Qt::StrongFocus);
+
+    uploadTimeLabel = new QLabel(this);
+    uploadTimeLabel->setAlignment(Qt::AlignHCenter);
+
+    colorIdentityWidget = new ColorIdentityWidget(this);
+
+    tagsFlowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
+    tagsFlowWidget->setSpacing(3, 3);
+
+    auto *layout = new QVBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->addWidget(bannerCardDisplayWidget);
+    layout->addWidget(uploadTimeLabel);
+    layout->addWidget(colorIdentityWidget);
+    layout->addWidget(tagsFlowWidget);
+    setLayout(layout);
+
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDeckStorageShowColorIdentityChanged, this,
+            &PublicDeckPreviewWidget::updateColorIdentityVisibility);
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDeckStorageShowTagsOnDeckPreviewsChanged, this,
+            &PublicDeckPreviewWidget::updateTagsVisibility);
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDeckStorageShowUploadTimeChanged, this,
+            &PublicDeckPreviewWidget::updateUploadTimeVisibility);
+
+    setEntry(entry);
+
+    connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageClicked, this,
+            &PublicDeckPreviewWidget::imageClickedEvent);
+    connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageDoubleClicked, this,
+            &PublicDeckPreviewWidget::imageDoubleClickedEvent);
+
+    // resizeEvent clamps every child to the banner picture's width, so collect them
+    // once here to keep the resize handler from searching the widget tree on every pass.
+    fixedWidthChildren = {bannerCardDisplayWidget, uploadTimeLabel, colorIdentityWidget, tagsFlowWidget};
+}
+
+void PublicDeckPreviewWidget::resizeEvent(QResizeEvent *event)
+{
+    QWidget::resizeEvent(event);
+    if (bannerCardDisplayWidget == nullptr) {
+        return;
+    }
+
+    const int width = bannerCardDisplayWidget->width();
+    if (width == lastKnownBannerWidth) {
+        return;
+    }
+    lastKnownBannerWidth = width;
+
+    for (QWidget *widget : fixedWidthChildren) {
+        widget->setMaximumWidth(width);
+    }
+}
+
+void PublicDeckPreviewWidget::setEntry(const RemotePublicDecksModel::DeckEntry &entry)
+{
+    deckId = entry.id;
+
+    hasColorIdentity = !entry.colorIdentity.isEmpty();
+    colorIdentityWidget->setColorIdentity(entry.colorIdentity);
+    updateColorIdentityVisibility();
+
+    const ExactCard bannerCard =
+        entry.bannerCardName.isEmpty()
+            ? ExactCard()
+            : CardDatabaseManager::query()->getCard(CardRef{entry.bannerCardName, entry.bannerCardProvider});
+    bannerCardDisplayWidget->setCard(bannerCard);
+
+    // The deck name is the overlay text on the banner, like the local preview.
+    bannerCardDisplayWidget->setOverlayText(entry.name);
+    // The deck name comes from another user's record, and Qt tooltips are
+    // rendered as AutoText, so escape and bound it to keep it readable text
+    // (the overlay painted onto the banner is already a plain painter draw).
+    setToolTip(entry.name.left(200).toHtmlEscaped());
+    setBaseAccessibleName(entry.name);
+
+    tagsFlowWidget->clearLayout();
+    for (const QString &tag : entry.tags) {
+        auto *chip = new DeckPreviewTagDisplayWidget(tagsFlowWidget, tag);
+        chip->setAttribute(Qt::WA_TransparentForMouseEvents);
+        tagsFlowWidget->addWidget(chip);
+    }
+    hasTags = !entry.tags.isEmpty();
+    updateTagsVisibility();
+
+    uploadTimeLabel->setText(tr("Uploaded %1").arg(entry.uploadTime.toString(Qt::TextDate)));
+    hasUploadTime = !entry.uploadTime.isNull();
+    updateUploadTimeVisibility();
+}
+
+void PublicDeckPreviewWidget::updateColorIdentityVisibility()
+{
+    colorIdentityWidget->setVisible(
+        hasColorIdentity && SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowColorIdentity());
+}
+
+void PublicDeckPreviewWidget::updateTagsVisibility()
+{
+    tagsFlowWidget->setVisible(
+        hasTags && SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowTagsOnDeckPreviews());
+}
+
+void PublicDeckPreviewWidget::updateUploadTimeVisibility()
+{
+    uploadTimeLabel->setVisible(hasUploadTime &&
+                                SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowUploadTime());
+}
+
+void PublicDeckPreviewWidget::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_Space || event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) {
+        event->accept();
+        emit openDeckRequested(deckId);
+        return;
+    }
+    QWidget::keyPressEvent(event);
+}
+
+void PublicDeckPreviewWidget::setBaseAccessibleName(const QString &name)
+{
+    baseAccessibleName = name;
+    setAccessibleName(name);
+}
+
+void PublicDeckPreviewWidget::setScaleFactor(int scale)
+{
+    bannerCardDisplayWidget->setScaleFactor(scale);
+}
+
+void PublicDeckPreviewWidget::imageClickedEvent(QMouseEvent * /*event*/, DeckPreviewCardPictureWidget * /*instance*/)
+{
+    // Reserved: clicking could show a card popup for the banner card.
+}
+
+void PublicDeckPreviewWidget::imageDoubleClickedEvent(QMouseEvent * /*event*/,
+                                                      DeckPreviewCardPictureWidget * /*instance*/)
+{
+    emit openDeckRequested(deckId);
+}
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
new file mode 100644
index 000000000..103120c7f
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.h
@@ -0,0 +1,74 @@
+/**
+ * @file public_deck_preview_widget.h
+ * @ingroup VisualDeckPreviewWidgets
+ */
+
+#ifndef PUBLIC_DECK_PREVIEW_WIDGET_H
+#define PUBLIC_DECK_PREVIEW_WIDGET_H
+
+#include "../remote_public_decks_model.h"
+
+#include <QList>
+#include <QMouseEvent>
+#include <QString>
+#include <QWidget>
+#include <qtmetamacros.h>
+
+class ColorIdentityWidget;
+class DeckPreviewCardPictureWidget;
+class FlowWidget;
+class QLabel;
+
+/**
+ * @brief A preview tile for a public deck published by another user.
+ *
+ * Renders the banner card picture (looked up by name/provider in the card
+ * database) with the deck name overlaid, the color identity, the deck's tags
+ * (read-only) and its upload time, all from the metadata the server stores for
+ * the deck, so no deck list is downloaded until the user actually opens the
+ * deck. Double-clicking the banner requests opening it.
+ */
+class PublicDeckPreviewWidget final : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit PublicDeckPreviewWidget(QWidget *parent, const RemotePublicDecksModel::DeckEntry &entry);
+
+    void setEntry(const RemotePublicDecksModel::DeckEntry &entry);
+
+    /** @brief Sets the accessible name announced to assistive technologies. */
+    void setBaseAccessibleName(const QString &name);
+
+    /** @brief Scales the banner card picture, mirroring the Visual Deck Storage. */
+    void setScaleFactor(int scale);
+
+signals:
+    void openDeckRequested(int deckId);
+
+protected:
+    void resizeEvent(QResizeEvent *event) override;
+    void keyPressEvent(QKeyEvent *event) override;
+
+private slots:
+    void imageClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
+    void imageDoubleClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance);
+    void updateColorIdentityVisibility();
+    void updateTagsVisibility();
+    void updateUploadTimeVisibility();
+
+private:
+    int deckId = 0;
+    QString baseAccessibleName;
+    bool hasColorIdentity = false;
+    bool hasTags = false;
+    bool hasUploadTime = false;
+    int lastKnownBannerWidth = 0;
+    QList<QWidget *> fixedWidthChildren;
+    DeckPreviewCardPictureWidget *bannerCardDisplayWidget;
+    ColorIdentityWidget *colorIdentityWidget;
+    FlowWidget *tagsFlowWidget;
+    QLabel *uploadTimeLabel;
+};
+
+#endif // PUBLIC_DECK_PREVIEW_WIDGET_H
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
new file mode 100644
index 000000000..9b8daf87c
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp
@@ -0,0 +1,226 @@
+#include "remote_public_decks_model.h"
+
+#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>
+#include <libcockatrice/protocol/pb/response_deck_list.pb.h>
+#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)
+{
+    // The ping sweep can drop a pending command without ever emitting finished,
+    // so loading must not be a latch: time it out and clear it when the client
+    // goes away, or the tab is stuck on the loading state for the session.
+    loadingTimeoutTimer = new QTimer(this);
+    loadingTimeoutTimer->setSingleShot(true);
+    loadingTimeoutTimer->setInterval(
+        static_cast<int>((static_cast<qint64>(SettingsCache::instance().network().getTimeOut()) + 1) *
+                         SettingsCache::instance().network().getKeepAlive() * 1000));
+    connect(loadingTimeoutTimer, &QTimer::timeout, this, &RemotePublicDecksModel::onLoadingTimeout);
+    connect(client, &AbstractClient::statusChanged, this, [this](ClientStatus status) {
+        if (status == StatusDisconnected) {
+            loadingTimeoutTimer->stop();
+            setLoading(false);
+        }
+    });
+}
+
+int RemotePublicDecksModel::rowCount(const QModelIndex &parent) const
+{
+    return parent.isValid() ? 0 : visibleIndices.size();
+}
+
+QVariant RemotePublicDecksModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= visibleIndices.size()) {
+        return QVariant();
+    }
+    if (role == Qt::DisplayRole || role == Qt::ToolTipRole) {
+        return decks.at(visibleIndices.at(index.row())).name;
+    }
+    return QVariant();
+}
+
+RemotePublicDecksModel::DeckEntry RemotePublicDecksModel::entryAt(int row) const
+{
+    if (row < 0 || row >= visibleIndices.size()) {
+        return DeckEntry{};
+    }
+    return decks.at(visibleIndices.at(row));
+}
+
+void RemotePublicDecksModel::setSearchText(const QString &text)
+{
+    searchText = text.trimmed();
+    rebuildVisibleIndices();
+}
+
+void RemotePublicDecksModel::setColorFilter(VisualDeckStorageSortFilterProxyModel::FilterMode mode,
+                                            const QSet<QChar> &colors)
+{
+    colorFilterMode = mode;
+    activeColors = colors;
+    rebuildVisibleIndices();
+}
+
+void RemotePublicDecksModel::setTagFilter(const QSet<QString> &selected, const QSet<QString> &excluded)
+{
+    includedTags = selected;
+    excludedTags = excluded;
+    rebuildVisibleIndices();
+}
+
+QSet<QString> RemotePublicDecksModel::allTags() const
+{
+    QSet<QString> all;
+    for (const DeckEntry &entry : decks) {
+        all.unite(QSet<QString>(entry.tags.cbegin(), entry.tags.cend()));
+    }
+    return all;
+}
+
+void RemotePublicDecksModel::rebuildVisibleIndices()
+{
+    QList<int> newIndices;
+    newIndices.reserve(decks.size());
+    for (int row = 0; row < decks.size(); ++row) {
+        const DeckEntry &entry = decks.at(row);
+
+        if (!searchText.isEmpty() && !entry.name.contains(searchText, Qt::CaseInsensitive)) {
+            continue;
+        }
+
+        if (!activeColors.isEmpty()) {
+            const QString &identity = entry.colorIdentity;
+            if (!colorIdentityMatches(colorFilterMode, activeColors, identity)) {
+                continue;
+            }
+        }
+
+        if (!includedTags.isEmpty()) {
+            const QSet<QString> entryTags(entry.tags.cbegin(), entry.tags.cend());
+            bool hasAll = std::all_of(includedTags.begin(), includedTags.end(),
+                                      [&entryTags](const QString &tag) { return entryTags.contains(tag); });
+            if (!hasAll) {
+                continue;
+            }
+        }
+
+        if (!excludedTags.isEmpty() && std::any_of(excludedTags.begin(), excludedTags.end(),
+                                                   [&entry](const QString &tag) { return entry.tags.contains(tag); })) {
+            continue;
+        }
+
+        newIndices.append(row);
+    }
+
+    beginResetModel();
+    visibleIndices = newIndices;
+    endResetModel();
+}
+
+void RemotePublicDecksModel::refresh(const QString &userName)
+{
+    if (loading) {
+        return;
+    }
+    // Every refresh captures its own request id so a reply that lands after its
+    // loading timeout (the reverse of the ping sweep dropping the command) is
+    // recognised as stale: it must not stop the newer request's timer or paint
+    // the grid with out-of-date data.
+    const int seq = ++requestSequence;
+    setLoading(true);
+    loadingTimeoutTimer->start();
+    Command_DeckListOtherUser cmd;
+    cmd.set_user_name(userName.toStdString());
+    PendingCommand *pend = client->prepareSessionCommand(cmd);
+    connect(pend, &PendingCommand::finished, this,
+            [this, seq](const Response &response, const CommandContainer &commandContainer) {
+                if (seq != requestSequence) {
+                    return; // a newer refresh superseded this one
+                }
+                decksReceived(response, commandContainer);
+            });
+    client->sendCommand(pend);
+}
+
+void RemotePublicDecksModel::onLoadingTimeout()
+{
+    setLoading(false);
+    emit loadFailed(tr("The server did not respond in time. Try again."));
+}
+
+void RemotePublicDecksModel::clear()
+{
+    decks.clear();
+    rebuildVisibleIndices();
+}
+
+void RemotePublicDecksModel::setLoading(bool value)
+{
+    if (loading == value) {
+        return;
+    }
+    loading = value;
+    emit loadingChanged(loading);
+}
+
+void RemotePublicDecksModel::decksReceived(const Response &response, const CommandContainer & /*commandContainer*/)
+{
+    setLoading(false);
+    loadingTimeoutTimer->stop();
+    if (response.response_code() != Response::RespOk) {
+        emit loadFailed(tr("Failed to load the user's public decks (server response code %1).")
+                            .arg(QString::number(static_cast<int>(response.response_code()))));
+        return;
+    }
+
+    const Response_DeckList &resp = response.GetExtension(Response_DeckList::ext);
+    decks.clear();
+    addFolder(resp.root());
+    rebuildVisibleIndices();
+}
+
+void RemotePublicDecksModel::addFolder(const ServerInfo_DeckStorage_Folder &folder)
+{
+    const int itemCount = folder.items_size();
+    for (int i = 0; i < itemCount; ++i) {
+        addTreeItem(folder.items(i));
+    }
+}
+
+void RemotePublicDecksModel::addTreeItem(const ServerInfo_DeckStorage_TreeItem &item)
+{
+    if (item.has_folder()) {
+        addFolder(item.folder());
+        return;
+    }
+
+    const ServerInfo_DeckStorage_File &file = item.file();
+    DeckEntry entry;
+    entry.id = item.id();
+    entry.name = QString::fromStdString(item.name());
+    entry.uploadTime = QDateTime::fromSecsSinceEpoch(file.creation_time());
+    entry.bannerCardName = QString::fromStdString(file.banner_card_name());
+    entry.bannerCardProvider = QString::fromStdString(file.banner_card_provider());
+    entry.colorIdentity = QString::fromStdString(file.color_identity());
+    QStringList tags;
+    for (const auto &tag : file.tags()) {
+        tags.append(QString::fromStdString(tag));
+    }
+    entry.tags = tags;
+    decks.append(entry);
+}
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
new file mode 100644
index 000000000..cb1f786e4
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.h
@@ -0,0 +1,135 @@
+/**
+ * @file remote_public_decks_model.h
+ * @ingroup DeckStorageWidgets
+ */
+
+#ifndef REMOTE_PUBLIC_DECKS_MODEL_H
+#define REMOTE_PUBLIC_DECKS_MODEL_H
+
+#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;
+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.
+ *
+ * Fetches the target user's public decks via Command_DeckListOtherUser and
+ * flattens the response tree into entries carrying the preview metadata stored
+ * on the server (banner card name/provider and color identity). No deck list is
+ * downloaded until the user actually opens a deck.
+ *
+ * Name and color-identity filtering is applied against this metadata, mirroring
+ * the Visual Deck Storage's filter semantics, so the grid can be narrowed like
+ * the local deck storage.
+ */
+class RemotePublicDecksModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+public:
+    struct DeckEntry
+    {
+        int id = 0;
+        QString name;
+        QDateTime uploadTime;
+        QString bannerCardName;
+        QString bannerCardProvider;
+        QString colorIdentity;
+        QStringList tags;
+    };
+
+    /**
+     * @brief The color identity filter mode, shared with the Visual Deck Storage.
+     */
+    using FilterMode = VisualDeckStorageSortFilterProxyModel::FilterMode;
+
+    explicit RemotePublicDecksModel(AbstractClient *client, QObject *parent = nullptr);
+
+    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+
+    /** @brief Fetches the public decks of another user, replacing the current contents. */
+    void refresh(const QString &userName);
+    void clear();
+
+    /** @brief Sets a case-insensitive substring filter on the deck name. */
+    void setSearchText(const QString &text);
+
+    /** @brief Sets the active color identity filter and mode. */
+    void setColorFilter(FilterMode mode, const QSet<QChar> &colors);
+
+    /** @brief Filters decks by required (`selected`) and forbidden (`excluded`) tags. */
+    void setTagFilter(const QSet<QString> &selected, const QSet<QString> &excluded);
+
+    /** @brief All tags present across all loaded decks, for building filter chips. */
+    [[nodiscard]] QSet<QString> allTags() const;
+
+    /** @brief The number of decks after filtering. */
+    [[nodiscard]] int filteredCount() const
+    {
+        return visibleIndices.size();
+    }
+
+    /** @brief The number of decks before filtering. */
+    [[nodiscard]] int totalCount() const
+    {
+        return decks.size();
+    }
+
+    /** @brief True while a refresh request is in flight and the grid has no data yet. */
+    [[nodiscard]] bool isLoading() const
+    {
+        return loading;
+    }
+
+    [[nodiscard]] DeckEntry entryAt(int row) const;
+
+signals:
+    /** @brief Emitted when a refresh starts, completes, or fails (see loading()). */
+    void loadingChanged(bool loading);
+
+    /** @brief Emitted when the last refresh failed; contains a user-facing message. */
+    void loadFailed(const QString &message);
+
+private slots:
+    void decksReceived(const Response &response, const CommandContainer &commandContainer);
+    void onLoadingTimeout();
+
+private:
+    void addFolder(const ServerInfo_DeckStorage_Folder &folder);
+    void addTreeItem(const ServerInfo_DeckStorage_TreeItem &item);
+    void rebuildVisibleIndices();
+    void setLoading(bool value);
+
+    AbstractClient *client;
+    QTimer *loadingTimeoutTimer;
+    QList<DeckEntry> decks;
+    QList<int> visibleIndices; ///< Row indices into `decks` that pass the current filters.
+    bool loading = false;
+    int requestSequence = 0; ///< Monotonically increases per refresh; only the newest request may update the grid.
+
+    QString searchText;
+    VisualDeckStorageSortFilterProxyModel::FilterMode colorFilterMode = VisualDeckStorageSortFilterProxyModel::Includes;
+    QSet<QChar> activeColors;
+    QSet<QString> includedTags;
+    QSet<QString> excludedTags;
+};
+
+#endif // REMOTE_PUBLIC_DECKS_MODEL_H
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 883682749..44b7a1a06 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
@@ -1,19 +1,39 @@
 #include "visual_deck_storage_folder_display_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
+#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"
+#include "visual_deck_storage_model.h"
+#include "visual_deck_storage_quick_settings_widget.h"
+#include "visual_deck_storage_sort_filter_proxy_model.h"
 #include "visual_deck_storage_widget.h"
 
-#include <QDirIterator>
-#include <QMouseEvent>
+#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,
     VisualDeckStorageWidget *_visualDeckStorageWidget,
-    QString _filePath,
+    const QString &_folderPath,
     bool canBeHidden,
     bool _showFolders)
-    : QWidget(parent), showFolders(_showFolders), visualDeckStorageWidget(_visualDeckStorageWidget), filePath(_filePath)
+    : QWidget(parent), showFolders(_showFolders), folderPath(_folderPath),
+      visualDeckStorageWidget(_visualDeckStorageWidget)
 {
     layout = new QVBoxLayout(this);
     setLayout(layout);
@@ -21,6 +41,9 @@ VisualDeckStorageFolderDisplayWidget::VisualDeckStorageFolderDisplayWidget(
     header = new BannerWidget(this, "");
     header->setClickable(canBeHidden);
     header->setHidden(!showFolders);
+
+    const QString bannerText = folderPath.isEmpty() ? tr("Deck Storage") : folderPath;
+    header->setText(bannerText);
     layout->addWidget(header);
 
     container = new QWidget(this);
@@ -34,192 +57,307 @@ VisualDeckStorageFolderDisplayWidget::VisualDeckStorageFolderDisplayWidget(
     flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAlwaysOff);
     containerLayout->addWidget(flowWidget);
 
-    createWidgetsForFiles();
-    createWidgetsForFolders();
+    visualDeckStorageWidget->settings()->getCardSizeWidget()->enableCtrlScrollResize(this);
 
-    refreshUi();
+    auto *proxy = visualDeckStorageWidget->proxyModel();
+    // A burst of proxy changes (one dataChanged per finished deck load, plus the filter
+    // invalidations) coalesces into a single reconcile, so a scan of many decks doesn't
+    // rebuild the flow layout once per deck.
+    connect(proxy, &QAbstractItemModel::modelReset, this, &VisualDeckStorageFolderDisplayWidget::scheduleReconcile);
+    connect(proxy, &QAbstractItemModel::rowsInserted, this, &VisualDeckStorageFolderDisplayWidget::scheduleReconcile);
+    connect(proxy, &QAbstractItemModel::rowsRemoved, this, &VisualDeckStorageFolderDisplayWidget::scheduleReconcile);
+    connect(proxy, &QAbstractItemModel::dataChanged, this, &VisualDeckStorageFolderDisplayWidget::scheduleReconcile);
+    connect(proxy, &QAbstractItemModel::layoutChanged, this, &VisualDeckStorageFolderDisplayWidget::scheduleReconcile);
+
+    reconcileTimer = new QTimer(this);
+    reconcileTimer->setSingleShot(true);
+    reconcileTimer->setInterval(150);
+    connect(reconcileTimer, &QTimer::timeout, this, &VisualDeckStorageFolderDisplayWidget::reconcile);
+
+    // Building the whole folder subtree synchronously here would stall the ui thread on large
+    // collections, so the first reconcile runs as a chunked pass on later event loop turns.
+    scheduleReconcile();
 }
 
-void VisualDeckStorageFolderDisplayWidget::refreshUi()
+void VisualDeckStorageFolderDisplayWidget::scheduleReconcile()
 {
-    QString bannerText = tr("Deck Storage");
-    QString deckPath = SettingsCache::instance().getDeckPath();
-    if (filePath != deckPath) {
-        QString relativePath = filePath;
-
-        if (filePath.startsWith(deckPath)) {
-            relativePath = filePath.mid(deckPath.length()); // Remove the deckPath prefix
-            if (relativePath.startsWith('/')) {
-                relativePath.remove(0, 1); // Remove leading '/' if it exists
-            }
-        }
-
-        bannerText = relativePath;
+    if (deckPassActive) {
+        // The active pass may be scanning stale model state, so restart it from a clean
+        // slate once the current chunk yields.
+        deckPassRestartRequested = true;
+        return;
     }
-    header->setText(bannerText);
+    reconcileTimer->start();
 }
 
 /**
- * Gets all files in the directory that have an accepted decklist file extension
- *
- * @param filePath The directory to search through
- * @param recursive Whether to search through subdirectories
+ * @brief Starts a new chunked scan of the source model, yielding to the event loop between chunks.
  */
-static QStringList getAllFiles(const QString &filePath, bool recursive)
+void VisualDeckStorageFolderDisplayWidget::reconcile()
 {
-    QStringList allFiles;
-
-    // QDirIterator with QDir::Files ensures only files are listed (no directories)
-    auto flags =
-        recursive ? QDirIterator::Subdirectories | QDirIterator::FollowSymlinks : QDirIterator::NoIteratorFlags;
-    QDirIterator it(filePath, DeckLoader::ACCEPTED_FILE_EXTENSIONS, QDir::Files, flags);
-
-    while (it.hasNext()) {
-        allFiles << it.next(); // Add each file path to the list
-    }
-
-    return allFiles;
+    beginDeckPass();
 }
 
-void VisualDeckStorageFolderDisplayWidget::createWidgetsForFiles()
+void VisualDeckStorageFolderDisplayWidget::beginDeckPass()
 {
-    QList<DeckPreviewWidget *> allDecks;
-    for (const QString &file : getAllFiles(filePath, !showFolders)) {
-        auto *display = new DeckPreviewWidget(flowWidget, visualDeckStorageWidget, file);
+    deckPassActive = true;
+    deckPassRestartRequested = false;
+    deckPassRow = 0;
+    visibleDeckCount = 0;
+    deckPassPresentPaths.clear();
 
-        connect(display, &DeckPreviewWidget::deckLoadRequested, visualDeckStorageWidget,
-                &VisualDeckStorageWidget::deckLoadRequested);
-        connect(display, &DeckPreviewWidget::openDeckEditor, visualDeckStorageWidget,
-                &VisualDeckStorageWidget::openDeckEditor);
-        connect(visualDeckStorageWidget->settings(), &VisualDeckStorageQuickSettingsWidget::cardSizeChanged,
-                display->bannerCardDisplayWidget, &CardInfoPictureWidget::setScaleFactor);
-        display->bannerCardDisplayWidget->setScaleFactor(visualDeckStorageWidget->settings()->getCardSize());
-        allDecks.append(display);
+    continueDeckPass();
+}
+
+void VisualDeckStorageFolderDisplayWidget::continueDeckPass()
+{
+    if (!deckPassActive) {
+        return;
     }
 
-    flowWidget->clearLayout(); // Clear existing widgets in the flow layout
+    QElapsedTimer passTimer;
+    passTimer.start();
 
-    for (DeckPreviewWidget *deck : allDecks) {
-        flowWidget->addWidget(deck);
+    auto *proxy = visualDeckStorageWidget->proxyModel();
+    const int proxyRowCount = proxy->rowCount();
+
+    // Scan rows of this folder, creating missing previews, until the time budget for this
+    // event loop turn runs out. The rest continues on the next turn.
+    while (deckPassRow < proxyRowCount) {
+        const int row = deckPassRow++;
+        const QModelIndex index = proxy->index(row, 0);
+        if (showFolders && index.data(VisualDeckStorageRoles::FolderPathRole).toString() != folderPath) {
+            continue;
+        }
+        const QString filePath = index.data(VisualDeckStorageRoles::FilePathRole).toString();
+        deckPassPresentPaths.insert(filePath);
+
+        DeckPreviewWidget *deckPreviewWidget = deckWidgets.value(filePath, nullptr);
+        if (!deckPreviewWidget) {
+            deckPreviewWidget = createDeckPreviewWidget(filePath);
+            flowWidget->addWidget(deckPreviewWidget);
+        }
+
+        const bool matches = index.data(VisualDeckStorageRoles::FilterMatchRole).toBool();
+        deckPreviewWidget->setVisible(matches);
+        if (!matches) {
+            // A deck that no longer matches the filters is dropped from the selection so its
+            // highlight cannot linger on an invisible preview or be counted in the share.
+            deckPreviewWidget->setShareSelected(false);
+        }
+        if (matches) {
+            ++visibleDeckCount;
+        }
+
+        if (passTimer.elapsed() >= DECK_PASS_TIME_BUDGET_MS) {
+            break;
+        }
+    }
+
+    if (deckPassRestartRequested) {
+        beginDeckPass();
+        return;
+    }
+
+    if (deckPassRow < proxyRowCount) {
+        QMetaObject::invokeMethod(this, &VisualDeckStorageFolderDisplayWidget::continueDeckPass, Qt::QueuedConnection);
+        return;
+    }
+
+    finishDeckPass();
+}
+
+void VisualDeckStorageFolderDisplayWidget::finishDeckPass()
+{
+    auto *proxy = visualDeckStorageWidget->proxyModel();
+
+    // Drop previews of decks that no longer exist in the model.
+    for (auto it = deckWidgets.begin(); it != deckWidgets.end();) {
+        if (!deckPassPresentPaths.contains(it.key())) {
+            flowWidget->removeWidget(it.value());
+            it.value()->deleteLater();
+            it = deckWidgets.erase(it);
+        } else {
+            ++it;
+        }
+    }
+
+    // Order the flow layout like the proxy sorts its rows. Filtered-out decks stay part of
+    // the layout, hidden in their sorted place until a filter lets them through again.
+    QStringList orderedFilePaths;
+    orderedFilePaths.reserve(proxy->rowCount());
+    for (int proxyRow = 0; proxyRow < proxy->rowCount(); ++proxyRow) {
+        const QString filePath = proxy->index(proxyRow, 0).data(VisualDeckStorageRoles::FilePathRole).toString();
+        if (deckWidgets.contains(filePath)) {
+            orderedFilePaths.append(filePath);
+        }
+    }
+
+    // Re-add all widgets so the flow layout order matches the proxy order. Skipped when the
+    // order is unchanged so that data-only updates don't invalidate the flow layout.
+    if (orderedFilePaths != lastOrderedFilePaths) {
+        for (const QString &filePath : orderedFilePaths) {
+            flowWidget->removeWidget(deckWidgets.value(filePath));
+        }
+        for (const QString &filePath : orderedFilePaths) {
+            flowWidget->addWidget(deckWidgets.value(filePath));
+        }
+        lastOrderedFilePaths = orderedFilePaths;
+    }
+
+    createSubFolderWidgets();
+
+    // Mark completion before evaluating visibility so this pass's own numbers decide whether
+    // the folder has content. The flag only guards evaluations made *during* a build.
+    deckPassActive = false;
+    initialPassCompleted = true;
+
+    refreshVisibility();
+}
+
+/**
+ * @brief Creates a deck preview widget and wires it up to the storage widget.
+ *
+ * @param filePath The absolute path of the deck file to preview.
+ */
+DeckPreviewWidget *VisualDeckStorageFolderDisplayWidget::createDeckPreviewWidget(const QString &filePath)
+{
+    auto *deckPreviewWidget =
+        new DeckPreviewWidget(flowWidget, visualDeckStorageWidget, visualDeckStorageWidget->model(), filePath);
+    connect(deckPreviewWidget, &DeckPreviewWidget::deckLoadRequested, visualDeckStorageWidget,
+            &VisualDeckStorageWidget::deckLoadRequested);
+    connect(deckPreviewWidget, &DeckPreviewWidget::openDeckEditor, visualDeckStorageWidget,
+            &VisualDeckStorageWidget::openDeckEditor);
+    connect(deckPreviewWidget, &DeckPreviewWidget::shareDeckRequested, visualDeckStorageWidget,
+            &VisualDeckStorageWidget::shareDeckRequested);
+    connect(deckPreviewWidget, &DeckPreviewWidget::shareSelectionToggled, visualDeckStorageWidget,
+            &VisualDeckStorageWidget::shareSelectionChanged);
+    deckPreviewWidget->setShareSelectable(visualDeckStorageWidget->isShareSelectable());
+    connect(visualDeckStorageWidget->settings(), &VisualDeckStorageQuickSettingsWidget::cardSizeChanged,
+            deckPreviewWidget->bannerCardDisplayWidget, &CardInfoPictureWidget::setScaleFactor);
+    deckPreviewWidget->bannerCardDisplayWidget->setScaleFactor(visualDeckStorageWidget->settings()->getCardSize());
+    deckWidgets.insert(filePath, deckPreviewWidget);
+    return deckPreviewWidget;
+}
+
+void VisualDeckStorageFolderDisplayWidget::setShareSelectable(bool selectable)
+{
+    const auto previews = flowWidget->findChildren<DeckPreviewWidget *>();
+    for (DeckPreviewWidget *preview : previews) {
+        preview->setShareSelectable(selectable);
+    }
+    const auto subFolders = findChildren<VisualDeckStorageFolderDisplayWidget *>();
+    for (VisualDeckStorageFolderDisplayWidget *subFolder : subFolders) {
+        subFolder->setShareSelectable(selectable);
     }
 }
 
 /**
- * Updates the visibility of this folder and all its DeckPreviewWidgets
+ * @brief Creates, removes and keeps in sync the subfolder widgets of this folder.
  *
- * @param recursive Also update the visibility of all subfolders and their DeckPreviewWidgets.
+ * Only direct child folders are created here; each child manages its own
+ * children, mirroring the folder tree on disk.
  */
-void VisualDeckStorageFolderDisplayWidget::updateVisibility(bool recursive)
-{
-    bool atLeastOneWidgetVisible = checkVisibility();
-    if (atLeastOneWidgetVisible) {
-        setVisible(true);
-        for (DeckPreviewWidget *display : flowWidget->findChildren<DeckPreviewWidget *>()) {
-            display->updateVisibility();
-        }
-        if (recursive) {
-            for (auto *subFolder : findChildren<VisualDeckStorageFolderDisplayWidget *>()) {
-                subFolder->updateVisibility(false);
-            }
-        }
-    } else {
-        setVisible(false);
-    }
-}
-
-bool VisualDeckStorageFolderDisplayWidget::checkVisibility()
-{
-    bool atLeastOneWidgetVisible = false;
-    if (flowWidget) {
-        // Iterate through all DeckPreviewWidgets
-        for (DeckPreviewWidget *display : flowWidget->findChildren<DeckPreviewWidget *>()) {
-            if (display->checkVisibility()) {
-                atLeastOneWidgetVisible = true;
-            }
-        }
-    }
-    for (VisualDeckStorageFolderDisplayWidget *subFolder : findChildren<VisualDeckStorageFolderDisplayWidget *>()) {
-        if (subFolder->checkVisibility()) {
-            atLeastOneWidgetVisible = true;
-        }
-    }
-    return atLeastOneWidgetVisible;
-}
-
-static QStringList getAllSubFolders(const QString &filePath)
-{
-    QStringList allFolders;
-
-    // QDirIterator with QDir::Files ensures only files are listed (no directories)
-    QDirIterator it(filePath, QDir::Dirs | QDir::NoDotAndDotDot);
-
-    while (it.hasNext()) {
-        allFolders << it.next(); // Add each file path to the list
-    }
-
-    return allFolders;
-}
-
-void VisualDeckStorageFolderDisplayWidget::createWidgetsForFolders()
+void VisualDeckStorageFolderDisplayWidget::createSubFolderWidgets()
 {
     if (!showFolders) {
         return;
     }
 
-    for (const QString &dir : getAllSubFolders(filePath)) {
-        auto *display = new VisualDeckStorageFolderDisplayWidget(this, visualDeckStorageWidget, dir, true, showFolders);
-        containerLayout->addWidget(display);
+    const QStringList children = childFolderPaths();
+
+    for (auto it = subFolderWidgets.begin(); it != subFolderWidgets.end();) {
+        if (!children.contains(it.key())) {
+            containerLayout->removeWidget(it.value());
+            it.value()->deleteLater();
+            it = subFolderWidgets.erase(it);
+        } else {
+            ++it;
+        }
+    }
+
+    for (const QString &child : children) {
+        if (subFolderWidgets.contains(child)) {
+            continue;
+        }
+
+        auto *subFolderWidget =
+            new VisualDeckStorageFolderDisplayWidget(this, visualDeckStorageWidget, child, true, showFolders);
+        connect(subFolderWidget, &VisualDeckStorageFolderDisplayWidget::contentVisibilityChanged, this,
+                &VisualDeckStorageFolderDisplayWidget::refreshVisibility);
+        containerLayout->addWidget(subFolderWidget);
+        subFolderWidgets.insert(child, subFolderWidget);
     }
 }
 
 void VisualDeckStorageFolderDisplayWidget::updateShowFolders(bool enabled)
 {
     showFolders = enabled;
+    header->setHidden(!showFolders);
 
     if (!showFolders) {
-        flattenFolderStructure();
-    } else {
-        // if setting was switched from disabled to enabled, we assume that there aren't any existing subfolders
-        createWidgetsForFiles();
-        createWidgetsForFolders();
+        for (auto it = subFolderWidgets.begin(); it != subFolderWidgets.end(); ++it) {
+            containerLayout->removeWidget(it.value());
+            it.value()->deleteLater();
+        }
+        subFolderWidgets.clear();
     }
 
-    header->setHidden(!showFolders);
+    scheduleReconcile();
 }
 
 /**
- * Steals all DeckPreviewWidgets from this widget's nested subfolders, and deletes those subfolders
+ * @brief Hides the folder when it contains nothing visible, and reports the change upward.
  */
-void VisualDeckStorageFolderDisplayWidget::flattenFolderStructure()
+void VisualDeckStorageFolderDisplayWidget::refreshVisibility()
 {
-    for (auto *subFolder : findChildren<VisualDeckStorageFolderDisplayWidget *>()) {
-        // steal all DeckPreviewWidgets from the subfolder
-        for (auto *deck : subFolder->getFlowWidget()->findChildren<DeckPreviewWidget *>()) {
-            flowWidget->addWidget(deck);
-        }
-
-        // delete the subfolder
-        subFolder->deleteLater();
+    const bool shouldBeVisible = hasContent();
+    if (isHidden() == !shouldBeVisible) {
+        return;
     }
+    setHidden(!shouldBeVisible);
+    emit contentVisibilityChanged();
 }
 
-QStringList VisualDeckStorageFolderDisplayWidget::gatherAllTagsFromFlowWidget() const
+/**
+ * @brief Whether this folder shows any deck previews or has any visible subfolder.
+ *
+ * While the first pass is still building, the folder counts as having content so it
+ * doesn't flicker or hide prematurely before its previews have been created.
+ */
+bool VisualDeckStorageFolderDisplayWidget::hasContent() const
 {
-    QStringList allTags;
+    if (!initialPassCompleted || visibleDeckCount > 0) {
+        return true;
+    }
 
-    if (flowWidget) {
-        // Iterate through all DeckPreviewWidgets
-        for (DeckPreviewWidget *display : flowWidget->findChildren<DeckPreviewWidget *>()) {
-            // Get tags from each DeckPreviewWidget
-            QStringList tags = display->deckLoader->getDeckList()->getTags();
-
-            // Add tags to the list while avoiding duplicates
-            allTags.append(tags);
+    for (VisualDeckStorageFolderDisplayWidget *subFolderWidget : subFolderWidgets) {
+        if (subFolderWidget->hasContent()) {
+            return true;
         }
     }
 
-    // Remove duplicates by calling 'removeDuplicates'
-    allTags.removeDuplicates();
+    return false;
+}
 
-    return allTags;
-}
\ No newline at end of file
+/**
+ * @brief The direct child folder paths of this folder, sorted by name.
+ */
+QStringList VisualDeckStorageFolderDisplayWidget::childFolderPaths() const
+{
+    QStringList children;
+    const QString prefix = folderPath.isEmpty() ? QString() : folderPath + "/";
+
+    for (const QString &candidate : visualDeckStorageWidget->model()->getFolderPaths()) {
+        if (!candidate.startsWith(prefix)) {
+            continue;
+        }
+        const QString rest = candidate.mid(prefix.length());
+        if (rest.isEmpty() || rest.contains('/')) {
+            continue;
+        }
+        children.append(candidate);
+    }
+
+    return children;
+}
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 d76fb0497..998619c0b 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
@@ -1,49 +1,109 @@
 /**
  * @file visual_deck_storage_folder_display_widget.h
  * @ingroup VisualDeckStorageWidgets
- * @brief TODO: Document this.
+ * @brief Renders the decks of one folder of the Visual Deck Storage.
+ *
+ * This is a pure view: it keeps one persistent DeckPreviewWidget alive per deck
+ * in its folder, and shows or hides those widgets according to each row's
+ * FilterMatchRole in the VisualDeckStorageSortFilterProxyModel. Subfolders are
+ * shown as nested VisualDeckStorageFolderDisplayWidgets when the "show folders"
+ * setting is enabled.
+ *
+ * Reconciling runs as a time-budgeted chunked pass that yields to the event loop
+ * between chunks, so scanning a large collection never stalls the ui thread.
  */
 
 #ifndef VISUAL_DECK_STORAGE_FOLDER_DISPLAY_WIDGET_H
 #define VISUAL_DECK_STORAGE_FOLDER_DISPLAY_WIDGET_H
 
-#include "../general/display/banner_widget.h"
-#include "../general/layout_containers/flow_widget.h"
+#include <QHash>
+#include <QList>
+#include <QSet>
+#include <QString>
+#include <QStringList>
+#include <QWidget>
+#include <qtmetamacros.h>
 
+class BannerWidget;
+class DeckPreviewWidget;
+class FlowWidget;
+class QTimer;
+class QVBoxLayout;
 class VisualDeckStorageWidget;
+
 class VisualDeckStorageFolderDisplayWidget : public QWidget
 {
     Q_OBJECT
 public:
     VisualDeckStorageFolderDisplayWidget(QWidget *parent,
-                                         VisualDeckStorageWidget *_visualDeckStorageWidget,
-                                         QString _filePath,
+                                         VisualDeckStorageWidget *visualDeckStorageWidget,
+                                         const QString &folderPath,
                                          bool canBeHidden,
-                                         bool _showFolders);
-    void refreshUi();
-    void createWidgetsForFiles();
-    void createWidgetsForFolders();
-    void flattenFolderStructure();
-    [[nodiscard]] QStringList gatherAllTagsFromFlowWidget() const;
-    [[nodiscard]] FlowWidget *getFlowWidget() const
-    {
-        return flowWidget;
-    }
+                                         bool showFolders);
 
 public slots:
-    void updateVisibility(bool recursive = true);
-    bool checkVisibility();
+    /**
+     * @brief Starts a new chunked reconcile pass that re-reads the proxy and rebuilds
+     * the deck previews and subfolder widgets to match.
+     */
+    void reconcile();
+
+    /**
+     * @brief Coalesces proxy change signals (a burst of deck loads or filter
+     * invalidations) into a single reconcile on the next event loop turn.
+     */
+    void scheduleReconcile();
     void updateShowFolders(bool enabled);
+    void setShareSelectable(bool selectable);
+
+signals:
+    /**
+     * @brief Emitted whenever this folder's visible content changes, so parent
+     * folders can re-evaluate their own visibility.
+     */
+    void contentVisibilityChanged();
 
 private:
+    void beginDeckPass();
+    void continueDeckPass();
+    void finishDeckPass();
+    [[nodiscard]] DeckPreviewWidget *createDeckPreviewWidget(const QString &filePath);
+    void createSubFolderWidgets();
+    void refreshVisibility();
+    [[nodiscard]] bool hasContent() const;
+    [[nodiscard]] QStringList childFolderPaths() const;
+
+    /**
+     * @brief The maximum time in milliseconds spent creating deck previews per event loop turn.
+     *
+     * Creating all previews of a large folder at once blocks the ui thread for hundreds of
+     * milliseconds, so the pass is split into chunks that yield to the event loop instead.
+     */
+    static constexpr int DECK_PASS_TIME_BUDGET_MS = 20;
+
     bool showFolders;
+    QString folderPath;       ///< Path relative to the deck folder, empty for the root folder.
+    int visibleDeckCount = 0; ///< The number of this folder's deck previews not filtered out.
     QVBoxLayout *layout;
-    VisualDeckStorageWidget *visualDeckStorageWidget;
-    QString filePath;
-    BannerWidget *header;
     QWidget *container;
     QVBoxLayout *containerLayout;
     FlowWidget *flowWidget;
+    BannerWidget *header;
+    VisualDeckStorageWidget *visualDeckStorageWidget;
+    QHash<QString, DeckPreviewWidget *> deckWidgets;                         ///< Deck file path -> preview widget.
+    QHash<QString, VisualDeckStorageFolderDisplayWidget *> subFolderWidgets; ///< Folder path -> subfolder widget.
+    QTimer *reconcileTimer = nullptr;                                        ///< Coalesces proxy change bursts.
+    QStringList lastOrderedFilePaths; ///< The deck order last applied to the flow layout.
+
+    /// Whether a chunked reconcile pass is currently running.
+    bool deckPassActive = false;
+    /// Set when the model changes mid-pass. Discards progress and restarts the scan once
+    /// the current chunk finishes so the pass always converges on the latest model state.
+    bool deckPassRestartRequested = false;
+    /// Whether the first reconcile pass has run to completion at least once.
+    bool initialPassCompleted = false;
+    int deckPassRow = 0;                ///< Next proxy row to scan in the active pass.
+    QSet<QString> deckPassPresentPaths; ///< File paths seen so far in the active pass.
 };
 
 #endif // VISUAL_DECK_STORAGE_FOLDER_DISPLAY_WIDGET_H
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
new file mode 100644
index 000000000..e84631e52
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp
@@ -0,0 +1,573 @@
+#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
+{
+/**
+ * @brief The result of a background directory scan: the deck rows in scan order
+ * plus the sorted list of subfolder paths.
+ */
+struct DeckScanResult
+{
+    QList<DeckPreviewData> decks; ///< Deck rows in scan order.
+    QStringList folderPaths;      ///< Sorted list of subfolder paths.
+};
+
+/**
+ * @brief The result of a background deck file load: the parsed deck plus the
+ * file's modification time, so the disk stat happens off the UI thread.
+ */
+struct DeckLoadResult
+{
+    LoadedDeck deck;        ///< The parsed deck.
+    QDateTime lastModified; ///< File modification time at load.
+    QString colorIdentity;  ///< WUBRG color identity, computed off the UI thread.
+};
+
+/**
+ * @brief How long per event loop turn the pending-load drain applies finished loads.
+ *
+ * Applying a load updates the row and wakes up the proxies and views, which is
+ * not free. A time budget instead of a fixed count lets fast machines apply
+ * many loads in one turn while keeping the ui thread responsive everywhere.
+ */
+constexpr int LOAD_DRAIN_TIME_BUDGET_MS = 8;
+
+/**
+ * @brief The path of \a path relative to the deck root, or empty if \a path
+ * is not below it.
+ */
+QString relativePathFromDeckRoot(const QString &path, const QString &deckPath)
+{
+    if (!path.startsWith(deckPath)) {
+        return {};
+    }
+    QString relativePath = path.mid(deckPath.length());
+    if (relativePath.startsWith('/')) {
+        relativePath.remove(0, 1);
+    }
+    return relativePath;
+}
+
+/**
+ * @brief The path of \a filePath relative to \a deckPath, or the bare file name
+ * if \a filePath is not below \a deckPath.
+ */
+QString relativeFilePathFor(const QString &filePath, const QString &deckPath)
+{
+    if (filePath.startsWith(deckPath)) {
+        return filePath.mid(deckPath.length());
+    }
+
+    return QFileInfo(filePath).fileName();
+}
+
+/**
+ * @brief The directory of \a filePath relative to \a deckPath, or empty if the
+ * file sits directly in the deck root.
+ */
+QString folderPathFor(const QString &filePath, const QString &deckPath)
+{
+    return relativePathFromDeckRoot(QFileInfo(filePath).absolutePath(), deckPath);
+}
+
+/**
+ * @brief Scans a deck directory on a worker thread, returning discovered deck
+ * files and subfolder paths.
+ */
+DeckScanResult scanDeckDirectory(const QString &deckPath)
+{
+    DeckScanResult result;
+
+    QDirIterator fileIt(deckPath, DeckLoader::ACCEPTED_FILE_EXTENSIONS, QDir::Files,
+                        QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+    while (fileIt.hasNext()) {
+        const QString filePath = fileIt.next();
+        DeckPreviewData data;
+        data.filePath = filePath;
+        data.relativeFilePath = relativeFilePathFor(filePath, deckPath);
+        data.folderPath = folderPathFor(filePath, deckPath);
+        data.lastModified = QFileInfo(filePath).lastModified();
+        result.decks.append(std::move(data));
+    }
+
+    QSet<QString> seenFolders;
+    QDirIterator folderIt(deckPath, QDir::Dirs | QDir::NoDotAndDotDot,
+                          QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+    while (folderIt.hasNext()) {
+        const QString folderPath = relativePathFromDeckRoot(folderIt.next(), deckPath);
+        if (!folderPath.isEmpty() && !seenFolders.contains(folderPath)) {
+            seenFolders.insert(folderPath);
+            result.folderPaths.append(folderPath);
+        }
+    }
+    result.folderPaths.sort();
+
+    return result;
+}
+} // namespace
+
+VisualDeckStorageModel::VisualDeckStorageModel(QObject *parent) : QAbstractListModel(parent)
+{
+}
+
+int VisualDeckStorageModel::rowCount(const QModelIndex &parent) const
+{
+    return parent.isValid() ? 0 : decks.size();
+}
+
+QVariant VisualDeckStorageModel::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid() || index.row() < 0 || index.row() >= decks.size()) {
+        return {};
+    }
+
+    const DeckPreviewData &data = decks.at(index.row());
+    switch (role) {
+        case Qt::DisplayRole:
+        case VisualDeckStorageRoles::DisplayNameRole:
+            return data.displayName;
+        case VisualDeckStorageRoles::FilePathRole:
+            return data.filePath;
+        case VisualDeckStorageRoles::RelativeFilePathRole:
+            return data.relativeFilePath;
+        case VisualDeckStorageRoles::FolderPathRole:
+            return data.folderPath;
+        case VisualDeckStorageRoles::TagsRole:
+            return data.tags;
+        case VisualDeckStorageRoles::ColorIdentityRole:
+            return data.colorIdentity;
+        case VisualDeckStorageRoles::LastModifiedRole:
+            return data.lastModified;
+        case VisualDeckStorageRoles::LastLoadedRole:
+            return data.lastLoaded;
+        case VisualDeckStorageRoles::BannerCardNameRole:
+            return data.bannerCard.name;
+        case VisualDeckStorageRoles::BannerCardProviderIdRole:
+            return data.bannerCard.providerId;
+        default:
+            return {};
+    }
+}
+
+void VisualDeckStorageModel::setDeckPath(const QString &path)
+{
+    QString cleanedPath = QDir::cleanPath(path);
+    if (cleanedPath == ".") {
+        cleanedPath.clear();
+    }
+    deckPath = cleanedPath;
+    startScan();
+}
+
+void VisualDeckStorageModel::refresh()
+{
+    startScan();
+}
+
+const DeckPreviewData &VisualDeckStorageModel::dataForRow(int row) const
+{
+    static const DeckPreviewData emptyData;
+    if (row < 0 || row >= decks.size()) {
+        return emptyData;
+    }
+    return decks.at(row);
+}
+
+const LoadedDeck &VisualDeckStorageModel::deckForRow(int row) const
+{
+    return dataForRow(row).deck;
+}
+
+int VisualDeckStorageModel::rowForFilePath(const QString &filePath) const
+{
+    return rowByFilePath.value(filePath, -1);
+}
+
+/**
+ * @brief Rebuilds the file path -> row index from scratch after bulk changes.
+ */
+void VisualDeckStorageModel::reindexFilePaths()
+{
+    rowByFilePath.clear();
+    for (int row = 0; row < decks.size(); ++row) {
+        const QString &filePath = decks.at(row).filePath;
+        // First row wins, mirroring what a linear scan would return for duplicates.
+        if (!rowByFilePath.contains(filePath)) {
+            rowByFilePath.insert(filePath, row);
+        }
+    }
+}
+
+void VisualDeckStorageModel::startScan()
+{
+    ++scanGeneration;
+    beginResetModel();
+    decks.clear();
+    rowByFilePath.clear();
+    folderPaths.clear();
+    pendingLoads.clear();
+    endResetModel();
+
+    if (deckPath.isEmpty()) {
+        return;
+    }
+
+    const QString currentDeckPath = deckPath;
+    const int generation = scanGeneration;
+
+    // The scan (directory walk + one stat per file) runs on a worker thread so that
+    // constructing the widget never stalls the UI thread on a large deck folder.
+    auto *watcher = new QFutureWatcher<DeckScanResult>(this);
+    connect(watcher, &QFutureWatcher<DeckScanResult>::finished, this, [this, watcher, generation] {
+        watcher->deleteLater();
+
+        if (generation != scanGeneration) {
+            return; // A newer scan started while this one was running; drop the stale result.
+        }
+
+        const DeckScanResult result = watcher->result();
+        folderPaths = result.folderPaths;
+
+        if (result.decks.isEmpty()) {
+            return;
+        }
+
+        beginInsertRows(QModelIndex(), 0, result.decks.size() - 1);
+        decks = result.decks;
+        reindexFilePaths();
+        endInsertRows();
+
+        for (int row = 0; row < decks.size(); ++row) {
+            beginLoad(row);
+        }
+    });
+
+    watcher->setFuture(
+        QtConcurrent::run([currentDeckPath]() -> DeckScanResult { return scanDeckDirectory(currentDeckPath); }));
+}
+
+void VisualDeckStorageModel::beginLoad(int row)
+{
+    if (row < 0 || row >= decks.size() || decks.at(row).loadInProgress) {
+        return;
+    }
+
+    DeckPreviewData &data = decks[row];
+    data.loadInProgress = true;
+
+    const QString filePath = data.filePath;
+    const DeckFileFormat::Format fmt = DeckFileFormat::getFormatFromName(filePath);
+    const int generation = scanGeneration;
+
+    auto *watcher = new QFutureWatcher<std::optional<DeckLoadResult>>(this);
+    connect(watcher, &QFutureWatcher<std::optional<DeckLoadResult>>::finished, this,
+            [this, watcher, filePath, generation] {
+                watcher->deleteLater();
+
+                if (generation != scanGeneration) {
+                    return; // The deck list was re-scanned while this load was running; drop the stale result.
+                }
+
+                // Queue the result and apply a bounded number per event loop turn so that
+                // finishing hundreds of loads at once cannot stall the UI thread.
+                const std::optional<DeckLoadResult> result = watcher->result();
+                PendingDeckLoad pending;
+                pending.filePath = filePath;
+                pending.generation = generation;
+                if (result) {
+                    pending.ok = true;
+                    pending.deck = std::move(result->deck);
+                    pending.lastModified = result->lastModified;
+                    pending.colorIdentity = std::move(result->colorIdentity);
+                }
+                pendingLoads.append(std::move(pending));
+                schedulePendingLoadDrain();
+            });
+
+    watcher->setFuture(QtConcurrent::run([filePath, fmt]() -> std::optional<DeckLoadResult> {
+        std::optional<LoadedDeck> deck = DeckLoader::loadFromFile(filePath, fmt, false);
+        if (!deck) {
+            return std::nullopt;
+        }
+        // Color identity walks every card through the database, so compute it here to
+        // keep the completion handler on the UI thread cheap.
+        const QString colorIdentity = getDeckColorIdentity(deck->deckList, CardDatabaseManager::query());
+        return DeckLoadResult{std::move(*deck), QFileInfo(filePath).lastModified(), colorIdentity};
+    }));
+}
+
+void VisualDeckStorageModel::schedulePendingLoadDrain()
+{
+    if (drainScheduled) {
+        return;
+    }
+    drainScheduled = true;
+    QMetaObject::invokeMethod(this, &VisualDeckStorageModel::drainPendingLoads, Qt::QueuedConnection);
+}
+
+void VisualDeckStorageModel::drainPendingLoads()
+{
+    drainScheduled = false;
+
+    QElapsedTimer timer;
+    timer.start();
+
+    while (!pendingLoads.isEmpty()) {
+        PendingDeckLoad pending = pendingLoads.takeFirst();
+
+        if (pending.generation != scanGeneration) {
+            continue;
+        }
+
+        const int row = rowForFilePath(pending.filePath);
+        if (row == -1) {
+            continue;
+        }
+
+        DeckPreviewData &data = decks[row];
+        data.loadInProgress = false;
+
+        if (!pending.ok) {
+            continue; // Leave the row unloaded so it stays visible without deck data.
+        }
+
+        data.deck = std::move(pending.deck);
+        data.loadSucceeded = true;
+        data.lastModified = pending.lastModified;
+        recomputeDeckMetadata(data, false);
+        data.colorIdentity = std::move(pending.colorIdentity);
+
+        emit dataChanged(index(row), index(row));
+        emit deckLoaded(row);
+
+        // Checked after applying at least one load, so a single slow application
+        // still makes progress instead of starving the queue.
+        if (timer.elapsed() >= LOAD_DRAIN_TIME_BUDGET_MS) {
+            break;
+        }
+    }
+
+    if (!pendingLoads.isEmpty()) {
+        schedulePendingLoadDrain();
+    }
+}
+
+/**
+ * @brief Recomputes all derived metadata of a row from its loaded deck.
+ */
+void VisualDeckStorageModel::recomputeDeckMetadata(DeckPreviewData &data, bool recomputeColorIdentity)
+{
+    const DeckList &deckList = data.deck.deckList;
+
+    data.deckName = deckList.getName();
+    data.displayName = !data.deckName.isEmpty() ? data.deckName : QFileInfo(data.deck.lastLoadInfo.fileName).fileName();
+    data.tags = deckList.getTags();
+    data.lastLoaded = QDateTime::fromString(deckList.getLastLoadedTimestamp());
+    data.bannerCard = deckList.getBannerCard();
+    if (recomputeColorIdentity) {
+        data.colorIdentity = getDeckColorIdentity(data.deck.deckList, CardDatabaseManager::query());
+    }
+}
+
+void VisualDeckStorageModel::setFilePathForRow(int row, const QString &newFilePath)
+{
+    if (row < 0 || row >= decks.size()) {
+        return;
+    }
+
+    DeckPreviewData &data = decks[row];
+    rowByFilePath.remove(data.filePath);
+    data.filePath = newFilePath;
+    data.relativeFilePath = relativeFilePathFor(newFilePath, deckPath);
+    data.folderPath = folderPathFor(newFilePath, deckPath);
+    if (!rowByFilePath.contains(newFilePath)) {
+        rowByFilePath.insert(newFilePath, row);
+    }
+}
+
+bool VisualDeckStorageModel::renameDeck(int row, const QString &newName)
+{
+    if (row < 0 || row >= decks.size() || decks.at(row).deck.isEmpty()) {
+        return false;
+    }
+
+    DeckPreviewData &data = decks[row];
+    data.deck.deckList.setName(newName);
+    if (!DeckLoader::saveToFile(data.deck)) {
+        return false;
+    }
+
+    recomputeDeckMetadata(data);
+    emit dataChanged(index(row), index(row), {VisualDeckStorageRoles::DisplayNameRole});
+    return true;
+}
+
+bool VisualDeckStorageModel::renameFile(int row, const QString &newBaseName)
+{
+    if (row < 0 || row >= decks.size() || newBaseName.isEmpty()) {
+        return false;
+    }
+
+    DeckPreviewData &data = decks[row];
+    const QFileInfo info(data.filePath);
+    if (newBaseName == info.baseName()) {
+        return false;
+    }
+
+    QString newFileName = newBaseName;
+    if (!info.suffix().isEmpty()) {
+        newFileName += "." + info.suffix();
+    }
+
+    const QString newFilePath = QFileInfo(info.dir(), newFileName).filePath();
+    if (!QFile::rename(info.filePath(), newFilePath)) {
+        return false;
+    }
+
+    const QString oldFilePath = data.filePath;
+    data.deck.lastLoadInfo.fileName = newFilePath;
+    setFilePathForRow(row, newFilePath);
+    data.lastModified = QFileInfo(newFilePath).lastModified();
+
+    emit dataChanged(index(row), index(row));
+    emit deckFilePathChanged(oldFilePath, newFilePath);
+    return true;
+}
+
+bool VisualDeckStorageModel::deleteFile(int row)
+{
+    if (row < 0 || row >= decks.size()) {
+        return false;
+    }
+
+    const QString filePath = decks.at(row).filePath;
+    if (!QFile::remove(QFileInfo(filePath).filePath())) {
+        return false;
+    }
+
+    beginRemoveRows(QModelIndex(), row, row);
+    rowByFilePath.remove(filePath);
+    decks.removeAt(row);
+    // Rows after the deleted one shift down by one.
+    for (auto it = rowByFilePath.begin(); it != rowByFilePath.end(); ++it) {
+        if (it.value() > row) {
+            --it.value();
+        }
+    }
+    endRemoveRows();
+    return true;
+}
+
+bool VisualDeckStorageModel::setTags(int row, const QStringList &tags)
+{
+    if (row < 0 || row >= decks.size() || decks.at(row).deck.isEmpty()) {
+        return false;
+    }
+
+    DeckPreviewData &data = decks[row];
+    data.deck.deckList.setTags(tags);
+    if (!DeckLoader::saveToFile(data.deck)) {
+        return false;
+    }
+
+    data.tags = tags;
+    emit dataChanged(index(row), index(row), {VisualDeckStorageRoles::TagsRole});
+    return true;
+}
+
+bool VisualDeckStorageModel::setBannerCard(int row, const CardRef &cardRef)
+{
+    if (row < 0 || row >= decks.size() || decks.at(row).deck.isEmpty()) {
+        return false;
+    }
+
+    DeckPreviewData &data = decks[row];
+    data.deck.deckList.setBannerCard(cardRef);
+    if (!DeckLoader::saveToFile(data.deck)) {
+        return false;
+    }
+
+    data.bannerCard = cardRef;
+    emit dataChanged(index(row), index(row),
+                     {VisualDeckStorageRoles::BannerCardNameRole, VisualDeckStorageRoles::BannerCardProviderIdRole});
+    return true;
+}
+
+bool VisualDeckStorageModel::convertToCockatriceFormat(int row)
+{
+    if (row < 0 || row >= decks.size() || decks.at(row).deck.isEmpty()) {
+        return false;
+    }
+
+    DeckPreviewData &data = decks[row];
+    const QString oldFilePath = data.filePath;
+    if (!DeckLoader::convertToCockatriceFormat(data.deck)) {
+        return false;
+    }
+
+    setFilePathForRow(row, data.deck.lastLoadInfo.fileName);
+    data.lastModified = QFileInfo(data.filePath).lastModified();
+    recomputeDeckMetadata(data);
+
+    emit dataChanged(index(row), index(row));
+    if (oldFilePath != data.filePath) {
+        emit deckFilePathChanged(oldFilePath, data.filePath);
+    }
+    return true;
+}
+
+bool VisualDeckStorageModel::reloadIfModified(int row)
+{
+    if (row < 0 || row >= decks.size()) {
+        return false;
+    }
+
+    DeckPreviewData &data = decks[row];
+    QFileInfo fileInfo(data.filePath);
+    const QDateTime newLastModified = fileInfo.lastModified();
+    if (!newLastModified.isValid() || newLastModified <= data.lastModified) {
+        return false;
+    }
+
+    std::optional<LoadedDeck> result =
+        DeckLoader::loadFromFile(data.filePath, DeckFileFormat::getFormatFromName(data.filePath), false);
+    if (!result) {
+        return false;
+    }
+
+    data.deck = *result;
+    data.loadSucceeded = true;
+    data.lastModified = fileInfo.lastModified();
+    recomputeDeckMetadata(data);
+
+    emit dataChanged(index(row), index(row));
+    emit deckLoaded(row);
+    return true;
+}
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
new file mode 100644
index 000000000..57eaebacf
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h
@@ -0,0 +1,194 @@
+/**
+ * @file visual_deck_storage_model.h
+ * @ingroup VisualDeckStorageWidgets
+ * @brief Source model for the Visual Deck Storage: the deck files on disk.
+ *
+ * The model owns the deck metadata (name, tags, color identity, banner card,
+ * modification times) and the parsed deck list, loading each deck file in the
+ * background. Views read through the roles or the direct accessors, and all
+ * mutations (rename, tags, banner card, delete, conversion) go through this
+ * class so the view layer never touches the filesystem directly.
+ */
+
+#ifndef VISUAL_DECK_STORAGE_MODEL_H
+#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;
+
+namespace VisualDeckStorageRoles
+{
+/**
+ * @brief Custom roles exposed by the VisualDeckStorageModel.
+ */
+enum
+{
+    FilePathRole = Qt::UserRole + 1, /**< Absolute file path of the deck. */
+    RelativeFilePathRole,            /**< File path relative to the deck folder. */
+    FolderPathRole,                  /**< Directory of the deck relative to the deck folder ("" for root). */
+    DisplayNameRole,                 /**< Deck name, or the file name if the deck has no name. */
+    TagsRole,                        /**< The deck's tags. */
+    ColorIdentityRole,               /**< The deck's color identity (WUBRG order). */
+    LastModifiedRole,                /**< QDateTime of the deck file's last modification. */
+    LastLoadedRole,                  /**< QDateTime when the deck was last loaded from the file. */
+    BannerCardNameRole,              /**< Name of the deck's banner card. */
+    BannerCardProviderIdRole,        /**< Provider id of the deck's banner card. */
+    /**
+     * @brief Whether the row passes the proxy's current search / tag / color filters.
+     *
+     * Not served by this model, but by VisualDeckStorageSortFilterProxyModel on top
+     * of it. Declared here so every role read through a proxy index stays unique.
+     */
+    FilterMatchRole
+};
+} // namespace VisualDeckStorageRoles
+
+/**
+ * @brief One deck file as seen by the Visual Deck Storage.
+ *
+ * The metadata is computed once when the deck loads and refreshed on reloads
+ * and mutations, so filters and sorts never re-read the file from disk.
+ */
+struct DeckPreviewData
+{
+    QString filePath;            ///< Absolute file path.
+    QString relativeFilePath;    ///< File path relative to the deck folder.
+    QString folderPath;          ///< Directory relative to the deck folder ("" for the deck folder itself).
+    QString deckName;            ///< The deck name as stored in the file (may be empty).
+    QString displayName;         ///< Deck name, or the file name if the deck has no name.
+    QStringList tags;            ///< The deck's tags.
+    QString colorIdentity;       ///< The deck's color identity in WUBRG order.
+    QDateTime lastModified;      ///< File modification time at last check.
+    QDateTime lastLoaded;        ///< When the deck was last loaded from the file.
+    CardRef bannerCard;          ///< The deck's banner card (name + provider id).
+    LoadedDeck deck;             ///< The parsed deck; empty until the file has been loaded.
+    bool loadSucceeded = false;  ///< Whether the deck file finished loading successfully.
+    bool loadInProgress = false; ///< Whether the deck file is currently being loaded.
+};
+
+/**
+ * @brief One finished background deck load that has not been applied to the model yet.
+ */
+struct PendingDeckLoad
+{
+    QString filePath;       ///< Identifies the row the result belongs to.
+    int generation;         ///< Scan generation the load was started in.
+    bool ok = false;        ///< Whether the file parsed successfully.
+    LoadedDeck deck;        ///< The parsed deck, valid when ok.
+    QDateTime lastModified; ///< File modification time at load, valid when ok.
+    QString colorIdentity;  ///< WUBRG color identity computed off the UI thread, valid when ok.
+};
+
+/**
+ * @brief The list model backing the Visual Deck Storage widget tree.
+ *
+ * Rows are in filesystem scan order; ordering and filtering are handled by
+ * VisualDeckStorageSortFilterProxyModel on top of this model. The proxy keeps
+ * every row and exposes each row's filter result through its FilterMatchRole.
+ */
+class VisualDeckStorageModel : public QAbstractListModel
+{
+    Q_OBJECT
+public:
+    explicit VisualDeckStorageModel(QObject *parent = nullptr);
+
+    /// @name Qt model overrides
+    ///@{
+    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
+    ///@}
+
+    /**
+     * @brief Sets the folder to scan for deck files and starts (re)loading.
+     * Clears the model immediately (modelReset), then populates it asynchronously
+     * as the background scan discovers deck files.
+     */
+    void setDeckPath(const QString &path);
+
+    /**
+     * @brief Re-scans the current deck folder, reloading every deck file.
+     */
+    void refresh();
+
+    [[nodiscard]] QString getDeckPath() const
+    {
+        return deckPath;
+    }
+
+    /**
+     * @brief The relative paths of all subdirectories of the deck folder, one level at a time.
+     * Used by the view to build the folder tree. Sorted for deterministic order.
+     */
+    [[nodiscard]] QStringList getFolderPaths() const
+    {
+        return folderPaths;
+    }
+
+    /// @name Data accessors
+    ///@{
+    [[nodiscard]] const DeckPreviewData &dataForRow(int row) const;
+    [[nodiscard]] const LoadedDeck &deckForRow(int row) const;
+    [[nodiscard]] int rowForFilePath(const QString &filePath) const;
+    ///@}
+
+    /// @name Mutations (persist to disk and update the row)
+    ///@{
+    bool renameDeck(int row, const QString &newName);
+    bool renameFile(int row, const QString &newBaseName);
+    bool deleteFile(int row);
+    bool setTags(int row, const QStringList &tags);
+    bool setBannerCard(int row, const CardRef &cardRef);
+    bool convertToCockatriceFormat(int row);
+    bool reloadIfModified(int row);
+    ///@}
+
+signals:
+    /**
+     * @brief Emitted when a deck file finishes loading.
+     * @param row The row of the deck that finished loading.
+     */
+    void deckLoaded(int row);
+
+    /**
+     * @brief Emitted when a deck's file path changes (rename file, conversion).
+     * @param oldFilePath The previous file path.
+     * @param newFilePath The new file path.
+     */
+    void deckFilePathChanged(const QString &oldFilePath, const QString &newFilePath);
+
+private:
+    void startScan();
+    void beginLoad(int row);
+    static void recomputeDeckMetadata(DeckPreviewData &data, bool recomputeColorIdentity = true);
+    void reindexFilePaths();
+    void schedulePendingLoadDrain();
+
+private slots:
+    void drainPendingLoads();
+
+private:
+    void setFilePathForRow(int row, const QString &newFilePath);
+
+    QString deckPath;
+    QList<DeckPreviewData> decks;
+    QHash<QString, int> rowByFilePath;     ///< Maps each deck's file path to its row for O(1) lookups.
+    QStringList folderPaths;               ///< All subdirectories of the deck folder, sorted.
+    int scanGeneration = 0;                ///< Bumped on every scan so stale results are ignored.
+    QVector<PendingDeckLoad> pendingLoads; ///< Finished background loads waiting to be applied.
+    bool drainScheduled = false;           ///< Whether a queued drain pass is already pending.
+};
+
+#endif // VISUAL_DECK_STORAGE_MODEL_H
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 c1e9bfa6a..9bb6e0fae 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
@@ -1,55 +1,92 @@
 #include "visual_deck_storage_quick_settings_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "visual_deck_storage_widget.h"
+#include "../cards/card_size_widget.h"
+#include "../quick_settings/settings_button_widget.h"
+#include "libcockatrice/utility/macros.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)
 {
     // show folders checkbox
     showFoldersCheckBox = new QCheckBox(this);
-    showFoldersCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowFolders());
+    showFoldersCheckBox->setChecked(SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowFolders());
     connect(showFoldersCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
             &VisualDeckStorageQuickSettingsWidget::showFoldersChanged);
-    connect(showFoldersCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageShowFolders);
+    connect(showFoldersCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::setVisualDeckStorageShowFolders);
 
     // show tag filter widget checkbox
     showTagFilterCheckBox = new QCheckBox(this);
-    showTagFilterCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowTagFilter());
+    showTagFilterCheckBox->setChecked(
+        SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowTagFilter());
     connect(showTagFilterCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
             &VisualDeckStorageQuickSettingsWidget::showTagFilterChanged);
-    connect(showTagFilterCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageShowTagFilter);
+    connect(showTagFilterCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::setVisualDeckStorageShowTagFilter);
+
+    // show color identity on DeckPreviewWidget checkbox
+    showColorIdentityCheckBox = new QCheckBox(this);
+    showColorIdentityCheckBox->setChecked(
+        SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowColorIdentity());
+    connect(showColorIdentityCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
+            &VisualDeckStorageQuickSettingsWidget::showColorIdentityChanged);
+    connect(showColorIdentityCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::setVisualDeckStorageShowColorIdentity);
 
     // show tags on DeckPreviewWidget checkbox
     showTagsOnDeckPreviewsCheckBox = new QCheckBox(this);
-    showTagsOnDeckPreviewsCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowTagsOnDeckPreviews());
+    showTagsOnDeckPreviewsCheckBox->setChecked(
+        SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowTagsOnDeckPreviews());
     connect(showTagsOnDeckPreviewsCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
             &VisualDeckStorageQuickSettingsWidget::showTagsOnDeckPreviewsChanged);
-    connect(showTagsOnDeckPreviewsCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageShowTagsOnDeckPreviews);
+    connect(showTagsOnDeckPreviewsCheckBox, &QCheckBox::QT_STATE_CHANGED,
+            &SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::setVisualDeckStorageShowTagsOnDeckPreviews);
+
+    // show upload time on DeckPreviewWidget checkbox
+    showUploadTimeCheckBox = new QCheckBox(this);
+    showUploadTimeCheckBox->setChecked(
+        SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowUploadTime());
+    connect(showUploadTimeCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
+            &VisualDeckStorageQuickSettingsWidget::showUploadTimeChanged);
+    connect(showUploadTimeCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::setVisualDeckStorageShowUploadTime);
 
     // show banner card selector checkbox
     showBannerCardComboBoxCheckBox = new QCheckBox(this);
-    showBannerCardComboBoxCheckBox->setChecked(SettingsCache::instance().getVisualDeckStorageShowBannerCardComboBox());
+    showBannerCardComboBoxCheckBox->setChecked(
+        SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowBannerCardComboBox());
     connect(showBannerCardComboBoxCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
             &VisualDeckStorageQuickSettingsWidget::showBannerCardComboBoxChanged);
-    connect(showBannerCardComboBoxCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageShowBannerCardComboBox);
+    connect(showBannerCardComboBoxCheckBox, &QCheckBox::QT_STATE_CHANGED,
+            &SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::setVisualDeckStorageShowBannerCardComboBox);
 
     // draw unused color identities checkbox
     drawUnusedColorIdentitiesCheckBox = new QCheckBox(this);
     drawUnusedColorIdentitiesCheckBox->setChecked(
-        SettingsCache::instance().getVisualDeckStorageDrawUnusedColorIdentities());
+        SettingsCache::instance().visualDeckStorage().getVisualDeckStorageDrawUnusedColorIdentities());
     connect(drawUnusedColorIdentitiesCheckBox, &QCheckBox::QT_STATE_CHANGED, this,
             &VisualDeckStorageQuickSettingsWidget::drawUnusedColorIdentitiesChanged);
-    connect(drawUnusedColorIdentitiesCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageDrawUnusedColorIdentities);
+    connect(drawUnusedColorIdentitiesCheckBox, &QCheckBox::QT_STATE_CHANGED,
+            &SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::setVisualDeckStorageDrawUnusedColorIdentities);
 
     // color identity opacity selector
     auto unusedColorIdentityOpacityWidget = new QWidget(this);
@@ -60,11 +97,12 @@ VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidg
     unusedColorIdentitiesOpacitySpinBox->setMinimum(0);
     unusedColorIdentitiesOpacitySpinBox->setMaximum(100);
     unusedColorIdentitiesOpacitySpinBox->setValue(
-        SettingsCache::instance().getVisualDeckStorageUnusedColorIdentitiesOpacity());
-    connect(unusedColorIdentitiesOpacitySpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this,
+        SettingsCache::instance().visualDeckStorage().getVisualDeckStorageUnusedColorIdentitiesOpacity());
+    connect(unusedColorIdentitiesOpacitySpinBox, qOverload<int>(&QSpinBox::valueChanged), this,
             &VisualDeckStorageQuickSettingsWidget::unusedColorIdentitiesOpacityChanged);
-    connect(unusedColorIdentitiesOpacitySpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
-            &SettingsCache::instance(), &SettingsCache::setVisualDeckStorageUnusedColorIdentitiesOpacity);
+    connect(unusedColorIdentitiesOpacitySpinBox, qOverload<int>(&QSpinBox::valueChanged),
+            &SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::setVisualDeckStorageUnusedColorIdentitiesOpacity);
 
     unusedColorIdentitiesOpacityLabel->setBuddy(unusedColorIdentitiesOpacitySpinBox);
 
@@ -74,7 +112,7 @@ VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidg
     unusedColorIdentityOpacityLayout->addWidget(unusedColorIdentitiesOpacitySpinBox);
 
     // tooltip selector
-    auto deckPreviewTooltipWidget = new QWidget(this);
+    deckPreviewTooltipWidget = new QWidget(this);
 
     deckPreviewTooltipLabel = new QLabel(deckPreviewTooltipWidget);
     deckPreviewTooltipComboBox = new QComboBox(deckPreviewTooltipWidget);
@@ -82,11 +120,13 @@ VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidg
     deckPreviewTooltipComboBox->addItem("", TooltipType::None);
     deckPreviewTooltipComboBox->addItem("", TooltipType::Filepath);
 
-    deckPreviewTooltipComboBox->setCurrentIndex(SettingsCache::instance().getVisualDeckStorageTooltipType());
+    deckPreviewTooltipComboBox->setCurrentIndex(
+        SettingsCache::instance().visualDeckStorage().getVisualDeckStorageTooltipType());
     connect(deckPreviewTooltipComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
             [this] { emit deckPreviewTooltipChanged(getDeckPreviewTooltip()); });
-    connect(deckPreviewTooltipComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageTooltipType);
+    connect(deckPreviewTooltipComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged),
+            &SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::setVisualDeckStorageTooltipType);
 
     auto deckPreviewTooltipLayout = new QHBoxLayout(deckPreviewTooltipWidget);
     deckPreviewTooltipLayout->setContentsMargins(11, 0, 11, 0);
@@ -94,23 +134,26 @@ VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidg
     deckPreviewTooltipLayout->addWidget(deckPreviewTooltipComboBox);
 
     // card size slider
-    cardSizeWidget = new CardSizeWidget(this, nullptr, SettingsCache::instance().getVisualDeckStorageCardSize());
+    cardSizeWidget =
+        new CardSizeWidget(this, nullptr, SettingsCache::instance().cardsDisplay().getVisualDeckStorageCardSize());
     connect(cardSizeWidget->getSlider(), &QSlider::valueChanged, this,
             &VisualDeckStorageQuickSettingsWidget::cardSizeChanged);
-    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance(),
-            &SettingsCache::setVisualDeckStorageCardSize);
+    connect(cardSizeWidget, &CardSizeWidget::cardSizeSettingUpdated, &SettingsCache::instance().cardsDisplay(),
+            &CardsDisplaySettings::setVisualDeckStorageCardSize);
 
     // putting everything together
     this->addSettingsWidget(showFoldersCheckBox);
     this->addSettingsWidget(showTagFilterCheckBox);
+    this->addSettingsWidget(showColorIdentityCheckBox);
     this->addSettingsWidget(showTagsOnDeckPreviewsCheckBox);
+    this->addSettingsWidget(showUploadTimeCheckBox);
     this->addSettingsWidget(showBannerCardComboBoxCheckBox);
     this->addSettingsWidget(drawUnusedColorIdentitiesCheckBox);
     this->addSettingsWidget(unusedColorIdentityOpacityWidget);
     this->addSettingsWidget(deckPreviewTooltipWidget);
     this->addSettingsWidget(cardSizeWidget);
 
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this,
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this,
             &VisualDeckStorageQuickSettingsWidget::retranslateUi);
     retranslateUi();
 }
@@ -119,7 +162,9 @@ void VisualDeckStorageQuickSettingsWidget::retranslateUi()
 {
     showFoldersCheckBox->setText(tr("Show Folders"));
     showTagFilterCheckBox->setText(tr("Show Tag Filter"));
+    showColorIdentityCheckBox->setText(tr("Show Color Identity"));
     showTagsOnDeckPreviewsCheckBox->setText(tr("Show Tags On Deck Previews"));
+    showUploadTimeCheckBox->setText(tr("Show Upload Time"));
     showBannerCardComboBoxCheckBox->setText(tr("Show Banner Card Selection Option"));
     drawUnusedColorIdentitiesCheckBox->setText(tr("Draw unused Color Identities"));
     unusedColorIdentitiesOpacityLabel->setText(tr("Unused Color Identities Opacity"));
@@ -130,6 +175,14 @@ void VisualDeckStorageQuickSettingsWidget::retranslateUi()
     deckPreviewTooltipComboBox->setItemText(1, tr("Filepath"));
 }
 
+void VisualDeckStorageQuickSettingsWidget::setPublicDecksMode(bool enabled)
+{
+    const bool hidden = enabled;
+    showFoldersCheckBox->setVisible(!hidden);
+    showBannerCardComboBoxCheckBox->setVisible(!hidden);
+    deckPreviewTooltipWidget->setVisible(!hidden);
+}
+
 bool VisualDeckStorageQuickSettingsWidget::getShowFolders() const
 {
     return showFoldersCheckBox->isChecked();
@@ -140,6 +193,11 @@ bool VisualDeckStorageQuickSettingsWidget::getDrawUnusedColorIdentities() const
     return drawUnusedColorIdentitiesCheckBox->isChecked();
 }
 
+bool VisualDeckStorageQuickSettingsWidget::getShowColorIdentity() const
+{
+    return showColorIdentityCheckBox->isChecked();
+}
+
 bool VisualDeckStorageQuickSettingsWidget::getShowBannerCardComboBox() const
 {
     return showBannerCardComboBoxCheckBox->isChecked();
@@ -155,6 +213,11 @@ bool VisualDeckStorageQuickSettingsWidget::getShowTagsOnDeckPreviews() const
     return showTagsOnDeckPreviewsCheckBox->isChecked();
 }
 
+bool VisualDeckStorageQuickSettingsWidget::getShowUploadTime() const
+{
+    return showUploadTimeCheckBox->isChecked();
+}
+
 int VisualDeckStorageQuickSettingsWidget::getUnusedColorIdentitiesOpacity() const
 {
     return unusedColorIdentitiesOpacitySpinBox->value();
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 5bb7e4110..7bce34d8c 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,25 +11,31 @@
 
 #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
 {
     Q_OBJECT
 
     QCheckBox *showFoldersCheckBox;
+    QCheckBox *showColorIdentityCheckBox;
     QCheckBox *drawUnusedColorIdentitiesCheckBox;
     QCheckBox *showBannerCardComboBoxCheckBox;
     QCheckBox *showTagFilterCheckBox;
     QCheckBox *showTagsOnDeckPreviewsCheckBox;
+    QCheckBox *showUploadTimeCheckBox;
     QLabel *unusedColorIdentitiesOpacityLabel;
     QSpinBox *unusedColorIdentitiesOpacitySpinBox;
     QLabel *deckPreviewTooltipLabel;
     QComboBox *deckPreviewTooltipComboBox;
+    QWidget *deckPreviewTooltipWidget;
     CardSizeWidget *cardSizeWidget;
 
 public:
@@ -45,23 +51,45 @@ public:
 
     explicit VisualDeckStorageQuickSettingsWidget(QWidget *parent = nullptr);
 
+    /**
+     * @brief Hides the controls that do not apply to the public decks tab.
+     *
+     * The public decks tab reuses this widget for its quick settings menu but
+     * has no folders, banner selection or per-deck tooltip, so those controls
+     * are hidden while every shared key keeps syncing with SettingsCache.
+     */
+    void setPublicDecksMode(bool enabled);
+
     void retranslateUi();
 
     [[nodiscard]] bool getShowFolders() const;
     [[nodiscard]] bool getDrawUnusedColorIdentities() const;
+    [[nodiscard]] bool getShowColorIdentity() const;
     [[nodiscard]] bool getShowBannerCardComboBox() const;
     [[nodiscard]] bool getShowTagFilter() const;
     [[nodiscard]] bool getShowTagsOnDeckPreviews() const;
+    [[nodiscard]] bool getShowUploadTime() const;
     [[nodiscard]] int getUnusedColorIdentitiesOpacity() const;
     [[nodiscard]] TooltipType getDeckPreviewTooltip() const;
     [[nodiscard]] int getCardSize() const;
 
+    /**
+     * @return The card size widget, so card display hosts can resize the cards on
+     * Ctrl + scroll even though the slider itself lives inside this menu.
+     */
+    [[nodiscard]] CardSizeWidget *getCardSizeWidget() const
+    {
+        return cardSizeWidget;
+    }
+
 signals:
     void showFoldersChanged(bool enabled);
     void drawUnusedColorIdentitiesChanged(bool enabled);
+    void showColorIdentityChanged(bool enabled);
     void showBannerCardComboBoxChanged(bool enabled);
     void showTagFilterChanged(bool enabled);
     void showTagsOnDeckPreviewsChanged(bool enabled);
+    void showUploadTimeChanged(bool enabled);
     void unusedColorIdentitiesOpacityChanged(int opacity);
     void deckPreviewTooltipChanged(TooltipType tooltip);
     void cardSizeChanged(int scale);
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 70b438232..2c03666c1 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
@@ -1,22 +1,24 @@
 #include "visual_deck_storage_search_widget.h"
 
-#include "../../../client/settings/cache_settings.h"
-#include "../../../filters/deck_filter_string.h"
 #include "../../../filters/syntax_help.h"
 #include "../../pixel_map_generator.h"
 
 #include <QAction>
-#include <QFileInfo>
+#include <QHBoxLayout>
+#include <QIcon>
+#include <QLineEdit>
+#include <QStringLiteral>
+#include <QTimer>
 
 /**
- * @brief Constructs a PrintingSelectorCardSearchWidget for searching cards by set name or set code.
+ * @brief Constructs a search bar for filtering decks in the Visual Deck Storage.
  *
- * This widget provides a search bar that allows users to search for cards by either their set name
- * or set code. It uses a debounced timer to trigger the search action after the user stops typing.
+ * Provides a search bar that allows users to search decks by filename or search
+ * expression, with a debounced timer to trigger the search after the user stops typing.
  *
- * @param parent The parent PrintingSelector widget that will handle the search results.
+ * @param parent The parent widget.
  */
-VisualDeckStorageSearchWidget::VisualDeckStorageSearchWidget(VisualDeckStorageWidget *parent) : parent(parent)
+VisualDeckStorageSearchWidget::VisualDeckStorageSearchWidget(QWidget *parent) : QWidget(parent)
 {
     layout = new QHBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
@@ -27,7 +29,7 @@ VisualDeckStorageSearchWidget::VisualDeckStorageSearchWidget(VisualDeckStorageWi
     searchBar->setClearButtonEnabled(true);
     searchBar->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition);
 
-    auto help = searchBar->addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition);
+    auto help = searchBar->addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition);
     connect(help, &QAction::triggered, this, [this] { createDeckSearchSyntaxHelpWindow(searchBar); });
 
     layout->addWidget(searchBar);
@@ -39,43 +41,5 @@ VisualDeckStorageSearchWidget::VisualDeckStorageSearchWidget(VisualDeckStorageWi
         searchDebounceTimer->start(300); // 300ms debounce
     });
 
-    connect(searchDebounceTimer, &QTimer::timeout, parent, &VisualDeckStorageWidget::updateSearchFilter);
-}
-
-/**
- * @brief Retrieves the current text in the search bar.
- *
- * @return The text entered by the user in the search bar.
- */
-QString VisualDeckStorageSearchWidget::getSearchText()
-{
-    return searchBar->text();
-}
-
-/**
- * Converts the filepath into a relative filepath starting from the deck folder.
- * If the file isn't in the deck folder, then this will just return the filename.
- *
- * @param filePath The filepath to convert into a relative filepath
- */
-static QString toRelativeFilepath(const QString &filePath)
-{
-    QString deckPath = SettingsCache::instance().getDeckPath();
-    if (filePath.startsWith(deckPath)) {
-        return filePath.mid(deckPath.length());
-    }
-
-    QFileInfo fileInfo(filePath);
-    QString fileName = fileInfo.fileName();
-    return fileName;
-}
-
-void VisualDeckStorageSearchWidget::filterWidgets(QList<DeckPreviewWidget *> widgets, const QString &searchText)
-{
-    auto filterString = DeckFilterString(searchText);
-
-    for (auto widget : widgets) {
-        QString relativeFilePath = toRelativeFilepath(widget->filePath);
-        widget->filteredBySearch = !filterString.check(widget, {relativeFilePath});
-    }
+    connect(searchDebounceTimer, &QTimer::timeout, this, [this] { emit searchTextChanged(searchBar->text()); });
 }
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 67d260b21..87a8dc9f8 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
@@ -1,31 +1,35 @@
 /**
  * @file visual_deck_storage_search_widget.h
  * @ingroup VisualDeckStorageWidgets
- * @brief TODO: Document this.
  */
 
 #ifndef VISUAL_DECK_STORAGE_SEARCH_WIDGET_H
 #define VISUAL_DECK_STORAGE_SEARCH_WIDGET_H
 
-#include "deck_preview/deck_preview_widget.h"
-
-#include <QHBoxLayout>
-#include <QLineEdit>
+#include <QString>
 #include <QWidget>
+#include <qtmetamacros.h>
+
+class QTimer;
+class QHBoxLayout;
+class QLineEdit;
 
-class VisualDeckStorageWidget;
 class VisualDeckStorageSearchWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit VisualDeckStorageSearchWidget(VisualDeckStorageWidget *parent);
-    QString getSearchText();
-    void filterWidgets(QList<DeckPreviewWidget *> widgets, const QString &searchText);
+    explicit VisualDeckStorageSearchWidget(QWidget *parent);
+
+signals:
+    /**
+     * Emitted once the debounce timer fires after the user stopped typing.
+     * @param text The current contents of the search bar.
+     */
+    void searchTextChanged(const QString &text);
 
 private:
     QHBoxLayout *layout;
-    VisualDeckStorageWidget *parent;
     QLineEdit *searchBar;
     QTimer *searchDebounceTimer;
 };
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
new file mode 100644
index 000000000..abe3327af
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp
@@ -0,0 +1,309 @@
+#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>
+
+VisualDeckStorageSortFilterProxyModel::VisualDeckStorageSortFilterProxyModel(QObject *parent)
+    : QSortFilterProxyModel(parent)
+{
+    setDynamicSortFilter(false);
+}
+
+bool colorIdentityMatches(VisualDeckStorageSortFilterProxyModel::FilterMode mode,
+                          const QSet<QChar> &colors,
+                          const QString &identity)
+{
+    switch (mode) {
+        case VisualDeckStorageSortFilterProxyModel::ExactMatch: {
+            QSet<QChar> activeColorSet;
+            for (const QChar &color : colors) {
+                activeColorSet.insert(color.toUpper());
+            }
+
+            QSet<QChar> colorIdentitySet;
+            for (const QChar &color : identity) {
+                colorIdentitySet.insert(color.toUpper());
+            }
+
+            return activeColorSet == colorIdentitySet;
+        }
+        case VisualDeckStorageSortFilterProxyModel::Includes:
+            return std::all_of(colors.begin(), colors.end(),
+                               [&identity](const QChar &color) { return identity.contains(color); });
+        case VisualDeckStorageSortFilterProxyModel::Excludes:
+            return std::none_of(colors.begin(), colors.end(),
+                                [&identity](const QChar &color) { return identity.contains(color); });
+    }
+    return false;
+}
+
+void VisualDeckStorageSortFilterProxyModel::setSourceModel(QAbstractItemModel *model)
+{
+    if (QAbstractItemModel *oldModel = sourceModel()) {
+        disconnect(oldModel, &QAbstractItemModel::modelReset, this,
+                   &VisualDeckStorageSortFilterProxyModel::resizeMatchLists);
+        disconnect(oldModel, &QAbstractItemModel::rowsInserted, this,
+                   &VisualDeckStorageSortFilterProxyModel::resizeMatchLists);
+        disconnect(oldModel, &QAbstractItemModel::rowsRemoved, this,
+                   &VisualDeckStorageSortFilterProxyModel::resizeMatchLists);
+    }
+
+    QSortFilterProxyModel::setSourceModel(model);
+
+    if (model) {
+        connect(model, &QAbstractItemModel::modelReset, this, &VisualDeckStorageSortFilterProxyModel::resizeMatchLists);
+        connect(model, &QAbstractItemModel::rowsInserted, this,
+                &VisualDeckStorageSortFilterProxyModel::resizeMatchLists);
+        connect(model, &QAbstractItemModel::rowsRemoved, this,
+                &VisualDeckStorageSortFilterProxyModel::resizeMatchLists);
+    }
+
+    resizeMatchLists();
+}
+
+void VisualDeckStorageSortFilterProxyModel::setSearchText(const QString &text)
+{
+    if (searchText == text) {
+        return;
+    }
+
+    searchText = text;
+    updateSearchMatches();
+    invalidate();
+}
+
+void VisualDeckStorageSortFilterProxyModel::setTagFilter(const QSet<QString> &newSelectedTags,
+                                                         const QSet<QString> &newExcludedTags)
+{
+    if (selectedTags == newSelectedTags && excludedTags == newExcludedTags) {
+        return;
+    }
+
+    selectedTags = newSelectedTags;
+    excludedTags = newExcludedTags;
+    updateTagMatches();
+    invalidate();
+}
+
+void VisualDeckStorageSortFilterProxyModel::setColorFilter(FilterMode mode, const QSet<QChar> &colors)
+{
+    if (colorFilterMode == mode && activeColors == colors) {
+        return;
+    }
+
+    colorFilterMode = mode;
+    activeColors = colors;
+    updateColorMatches();
+    invalidate();
+}
+
+void VisualDeckStorageSortFilterProxyModel::setSortOrder(SortOrder order)
+{
+    // No equality guard: the initial reapply (with the default order) must still
+    // trigger sort(0), since without a sort the proxy would show scan order.
+    sortOrder = order;
+    sort(0);
+}
+
+void VisualDeckStorageSortFilterProxyModel::reapplyFilters()
+{
+    const QList<bool> oldSearchMatches = searchMatches;
+    const QList<bool> oldTagMatches = tagMatches;
+    const QList<bool> oldColorMatches = colorMatches;
+
+    updateSearchMatches();
+    updateTagMatches();
+    updateColorMatches();
+
+    if (searchMatches != oldSearchMatches || tagMatches != oldTagMatches || colorMatches != oldColorMatches) {
+        invalidate();
+    }
+
+    if (sortOrder == ByName || sortOrder == ByLastLoaded) {
+        // These orders depend on data that only becomes available when a deck finishes loading.
+        sort(0);
+    }
+}
+
+void VisualDeckStorageSortFilterProxyModel::resort()
+{
+    sort(0);
+}
+
+QVariant VisualDeckStorageSortFilterProxyModel::data(const QModelIndex &index, int role) const
+{
+    if (role == VisualDeckStorageRoles::FilterMatchRole) {
+        if (!index.isValid()) {
+            return true;
+        }
+        const QModelIndex sourceIndex = mapToSource(index);
+        return rowMatches(sourceIndex.row());
+    }
+
+    return QSortFilterProxyModel::data(index, role);
+}
+
+bool VisualDeckStorageSortFilterProxyModel::rowMatches(int sourceRow) const
+{
+    // If the match lists aren't sized to the current model yet, don't hide anything.
+    if (sourceRow < 0 || sourceRow >= searchMatches.size() || sourceRow >= tagMatches.size() ||
+        sourceRow >= colorMatches.size()) {
+        return true;
+    }
+
+    return searchMatches.at(sourceRow) && tagMatches.at(sourceRow) && colorMatches.at(sourceRow);
+}
+
+bool VisualDeckStorageSortFilterProxyModel::filterAcceptsRow(int /*sourceRow*/,
+                                                             const QModelIndex & /*sourceParent*/) const
+{
+    // Rows are never dropped: the filter result is exposed per row through
+    // FilterMatchRole, so views can keep their widgets alive and just hide them.
+    return true;
+}
+
+bool VisualDeckStorageSortFilterProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+{
+    const auto *source = deckSourceModel();
+    if (!source) {
+        return false;
+    }
+
+    const DeckPreviewData &leftData = source->dataForRow(left.row());
+    const DeckPreviewData &rightData = source->dataForRow(right.row());
+
+    switch (sortOrder) {
+        case ByName:
+            return leftData.deckName < rightData.deckName;
+        case Alphabetical:
+            return QString::localeAwareCompare(QFileInfo(leftData.filePath).fileName(),
+                                               QFileInfo(rightData.filePath).fileName()) < 0;
+        case ByLastModified:
+            return leftData.lastModified > rightData.lastModified;
+        case ByLastLoaded:
+            return leftData.lastLoaded > rightData.lastLoaded;
+    }
+
+    return false;
+}
+
+void VisualDeckStorageSortFilterProxyModel::resizeMatchLists()
+{
+    const int count = sourceModel() ? sourceModel()->rowCount() : 0;
+    searchMatches.resize(count);
+    searchMatches.fill(true);
+    tagMatches.resize(count);
+    tagMatches.fill(true);
+    colorMatches.resize(count);
+    colorMatches.fill(true);
+}
+
+void VisualDeckStorageSortFilterProxyModel::updateSearchMatches()
+{
+    const auto *source = deckSourceModel();
+    if (!source) {
+        searchMatches.clear();
+        return;
+    }
+
+    const int count = source->rowCount();
+    searchMatches.resize(count);
+    if (searchText.isEmpty()) {
+        searchMatches.fill(true);
+        return;
+    }
+
+    const auto &cardsDisplay = SettingsCache::instance().cardsDisplay();
+    DeckFilterString filterString(
+        searchText, CardSearchLanguage{cardsDisplay.getCardLang(),
+                                       static_cast<SearchLanguageMode>(cardsDisplay.getCardSearchLanguage())});
+    for (int row = 0; row < count; ++row) {
+        const DeckPreviewData &data = source->dataForRow(row);
+
+        // isEmpty() is intentional: if a deck fails to load, loadInProgress becomes false
+        // but the deck remains empty. Using loadInProgress alone would pass failed decks
+        // to DeckFilterString::check, which requires a non-empty deck.
+        if (data.deck.isEmpty()) {
+            searchMatches[row] = true;
+            continue;
+        }
+
+        DeckSearchData searchData{
+            .deck = &data.deck,
+            .filePath = data.filePath,
+            .displayName = data.displayName,
+            .relativeFilePath = data.relativeFilePath,
+        };
+        searchMatches[row] = filterString.check(searchData);
+    }
+}
+
+void VisualDeckStorageSortFilterProxyModel::updateTagMatches()
+{
+    const auto *source = deckSourceModel();
+    if (!source) {
+        tagMatches.clear();
+        return;
+    }
+
+    const int count = source->rowCount();
+    tagMatches.resize(count);
+
+    if (selectedTags.isEmpty() && excludedTags.isEmpty()) {
+        tagMatches.fill(true);
+        return;
+    }
+
+    for (int row = 0; row < count; ++row) {
+        const QStringList deckTags = source->dataForRow(row).tags;
+
+        const bool hasAllSelected = std::all_of(selectedTags.begin(), selectedTags.end(),
+                                                [&deckTags](const QString &tag) { return deckTags.contains(tag); });
+        const bool hasAnyExcluded = std::any_of(excludedTags.begin(), excludedTags.end(),
+                                                [&deckTags](const QString &tag) { return deckTags.contains(tag); });
+
+        tagMatches[row] = hasAllSelected && !hasAnyExcluded;
+    }
+}
+
+void VisualDeckStorageSortFilterProxyModel::updateColorMatches()
+{
+    const auto *source = deckSourceModel();
+    if (!source) {
+        colorMatches.clear();
+        return;
+    }
+
+    const int count = source->rowCount();
+    colorMatches.resize(count);
+
+    if (activeColors.isEmpty()) {
+        colorMatches.fill(true);
+        return;
+    }
+
+    for (int row = 0; row < count; ++row) {
+        const QString colorIdentity = source->dataForRow(row).colorIdentity;
+        colorMatches[row] = colorIdentityMatches(colorFilterMode, activeColors, colorIdentity);
+    }
+}
+
+const VisualDeckStorageModel *VisualDeckStorageSortFilterProxyModel::deckSourceModel() const
+{
+    return qobject_cast<const VisualDeckStorageModel *>(sourceModel());
+}
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
new file mode 100644
index 000000000..51732adc8
--- /dev/null
+++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.h
@@ -0,0 +1,119 @@
+/**
+ * @file visual_deck_storage_sort_filter_proxy_model.h
+ * @ingroup VisualDeckStorageWidgets
+ * @brief Sorting and filtering proxy on top of VisualDeckStorageModel.
+ *
+ * Owns all search / tag / color filter state and the sort order. Filtering is
+ * evaluated against the model's data (never against widgets), so it can run
+ * before any view exists and re-evaluate whenever deck data finishes loading.
+ *
+ * Rows are never removed by filtering. Instead, every row carries the
+ * FilterMatchRole, which views read to show or hide their widgets while keeping
+ * them alive; all rows stay in the proxy so they keep their sorted position.
+ */
+
+#ifndef VISUAL_DECK_STORAGE_SORT_FILTER_PROXY_MODEL_H
+#define VISUAL_DECK_STORAGE_SORT_FILTER_PROXY_MODEL_H
+
+#include <QChar>
+#include <QList>
+#include <QSet>
+#include <QSortFilterProxyModel>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
+class VisualDeckStorageModel;
+
+class VisualDeckStorageSortFilterProxyModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+public:
+    /**
+     * @brief The order in which decks are sorted. Values must match the
+     * entries of the sort widget's combo box and the stored settings value.
+     */
+    enum SortOrder
+    {
+        ByName,
+        Alphabetical,
+        ByLastModified,
+        ByLastLoaded,
+    };
+    Q_ENUM(SortOrder)
+
+    /**
+     * @brief How the color identity filter is applied.
+     */
+    enum FilterMode
+    {
+        ExactMatch,
+        Includes,
+        Excludes
+    };
+    Q_ENUM(FilterMode)
+
+    explicit VisualDeckStorageSortFilterProxyModel(QObject *parent = nullptr);
+
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
+
+    void setSourceModel(QAbstractItemModel *model) override;
+
+    /// @name Filter input setters (each re-evaluates the affected matches)
+    ///@{
+    void setSearchText(const QString &text);
+    void setTagFilter(const QSet<QString> &newSelectedTags, const QSet<QString> &newExcludedTags);
+    void setColorFilter(FilterMode mode, const QSet<QChar> &colors);
+    ///@}
+
+    /**
+     * @brief Sets the sort order and applies it immediately.
+     */
+    void setSortOrder(SortOrder order);
+
+    /**
+     * @brief Re-evaluates all matches against the current model data and
+     * re-applies filtering and sorting. Called after deck data changes.
+     */
+    void reapplyFilters();
+
+    /**
+     * @brief Re-applies the current sort order without touching the filters.
+     */
+    void resort();
+
+protected:
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
+
+private:
+    [[nodiscard]] bool rowMatches(int sourceRow) const;
+    void resizeMatchLists();
+    void updateSearchMatches();
+    void updateTagMatches();
+    void updateColorMatches();
+    [[nodiscard]] const VisualDeckStorageModel *deckSourceModel() const;
+
+    QString searchText;
+    QSet<QString> selectedTags;
+    QSet<QString> excludedTags;
+    FilterMode colorFilterMode = ExactMatch;
+    QSet<QChar> activeColors;
+    SortOrder sortOrder = Alphabetical;
+
+    QList<bool> searchMatches; ///< Per-row search match, sized like the source model.
+    QList<bool> tagMatches;    ///< Per-row tag match.
+    QList<bool> colorMatches;  ///< Per-row color identity match.
+};
+
+/**
+ * @brief Whether an identity string matches the active color-identity filter.
+ *
+ * The single source of truth for the color identity matching rule, shared by
+ * the Visual Deck Storage proxy and the remote public decks model.
+ */
+[[nodiscard]] bool colorIdentityMatches(VisualDeckStorageSortFilterProxyModel::FilterMode mode,
+                                        const QSet<QChar> &colors,
+                                        const QString &identity);
+
+#endif // VISUAL_DECK_STORAGE_SORT_FILTER_PROXY_MODEL_H
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 cbc78ba50..f798a72a9 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
@@ -1,19 +1,14 @@
 #include "visual_deck_storage_sort_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "visual_deck_storage_widget.h"
 
-#include <QFileInfo>
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QtGlobal>
+#include <libcockatrice/settings/visual_deck_storage_settings.h>
 
-/**
- * @brief Constructs a PrintingSelectorCardSortWidget for searching cards by set name or set code.
- *
- * This widget provides a search bar that allows users to search for cards by either their set name
- * or set code. It uses a debounced timer to trigger the search action after the user stops typing.
- *
- * @param parent The parent PrintingSelector widget that will handle the search results.
- */
-VisualDeckStorageSortWidget::VisualDeckStorageSortWidget(VisualDeckStorageWidget *parent)
-    : parent(parent), sortOrder(Alphabetical)
+VisualDeckStorageSortWidget::VisualDeckStorageSortWidget(VisualDeckStorageWidget *parent) : QWidget(parent)
 {
     layout = new QHBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
@@ -28,13 +23,11 @@ VisualDeckStorageSortWidget::VisualDeckStorageSortWidget(VisualDeckStorageWidget
     retranslateUi();
 
     // Set the current sort order
-    sortComboBox->setCurrentIndex(SettingsCache::instance().getVisualDeckStorageSortingOrder());
-    sortOrder = static_cast<SortOrder>(sortComboBox->currentIndex());
+    sortComboBox->setCurrentIndex(SettingsCache::instance().visualDeckStorage().getVisualDeckStorageSortingOrder());
 
-    // Connect sorting change signal to refresh the file list
+    // Connect sorting change signal to persist the order and refresh the file list
     connect(sortComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this,
             &VisualDeckStorageSortWidget::updateSortOrder);
-    connect(this, &VisualDeckStorageSortWidget::sortOrderChanged, parent, &VisualDeckStorageWidget::updateSortOrder);
 }
 
 void VisualDeckStorageSortWidget::retranslateUi()
@@ -46,10 +39,13 @@ void VisualDeckStorageSortWidget::retranslateUi()
 
     // Clear and repopulate the ComboBox with translated items
     sortComboBox->clear();
-    sortComboBox->addItem(tr("Sort Alphabetically (Deck Name)"), ByName);
-    sortComboBox->addItem(tr("Sort Alphabetically (Filename)"), Alphabetical);
-    sortComboBox->addItem(tr("Sort by Last Modified"), ByLastModified);
-    sortComboBox->addItem(tr("Sort by Last Loaded"), ByLastLoaded);
+    sortComboBox->addItem(tr("Sort Alphabetically (Deck Name)"),
+                          VisualDeckStorageSortFilterProxyModel::SortOrder::ByName);
+    sortComboBox->addItem(tr("Sort Alphabetically (Filename)"),
+                          VisualDeckStorageSortFilterProxyModel::SortOrder::Alphabetical);
+    sortComboBox->addItem(tr("Sort by Last Modified"),
+                          VisualDeckStorageSortFilterProxyModel::SortOrder::ByLastModified);
+    sortComboBox->addItem(tr("Sort by Last Loaded"), VisualDeckStorageSortFilterProxyModel::SortOrder::ByLastLoaded);
 
     // Restore the current index
     sortComboBox->setCurrentIndex(oldIndex);
@@ -58,57 +54,13 @@ void VisualDeckStorageSortWidget::retranslateUi()
     sortComboBox->blockSignals(false);
 }
 
+VisualDeckStorageSortFilterProxyModel::SortOrder VisualDeckStorageSortWidget::currentSortOrder() const
+{
+    return static_cast<VisualDeckStorageSortFilterProxyModel::SortOrder>(sortComboBox->currentIndex());
+}
+
 void VisualDeckStorageSortWidget::updateSortOrder()
 {
-    sortOrder = static_cast<SortOrder>(sortComboBox->currentIndex());
-    SettingsCache::instance().setVisualDeckStorageSortingOrder(sortComboBox->currentIndex());
+    SettingsCache::instance().visualDeckStorage().setVisualDeckStorageSortingOrder(sortComboBox->currentIndex());
     emit sortOrderChanged();
 }
-
-void VisualDeckStorageSortWidget::sortFolder(VisualDeckStorageFolderDisplayWidget *folderWidget)
-{
-    auto children =
-        folderWidget->getFlowWidget()->findChildren<QWidget *>(QString(), Qt::FindChildOption::FindDirectChildrenOnly);
-    for (auto widget : children) {
-        auto deckPreviewWidgets =
-            widget->findChildren<DeckPreviewWidget *>(QString(), Qt::FindChildOption::FindDirectChildrenOnly);
-        auto newOrder = filterFiles(deckPreviewWidgets);
-        for (DeckPreviewWidget *previewWidget : newOrder) {
-            folderWidget->getFlowWidget()->removeWidget(previewWidget);
-        }
-        for (DeckPreviewWidget *previewWidget : newOrder) {
-            folderWidget->getFlowWidget()->addWidget(previewWidget);
-        }
-    }
-}
-
-QList<DeckPreviewWidget *> VisualDeckStorageSortWidget::filterFiles(QList<DeckPreviewWidget *> widgets)
-{
-    // Sort the widgets list based on the current sort order
-    std::sort(widgets.begin(), widgets.end(), [this](DeckPreviewWidget *widget1, DeckPreviewWidget *widget2) {
-        if (!widget1 || !widget2) {
-            return false; // Handle null pointers gracefully
-        }
-
-        QFileInfo info1(widget1->filePath);
-        QFileInfo info2(widget2->filePath);
-
-        switch (sortOrder) {
-            case ByName:
-                return widget1->deckLoader->getDeckList()->getName() < widget2->deckLoader->getDeckList()->getName();
-            case Alphabetical:
-                return QString::localeAwareCompare(info1.fileName(), info2.fileName()) <= 0;
-            case ByLastModified:
-                return info1.lastModified() > info2.lastModified();
-            case ByLastLoaded: {
-                QDateTime time1 = QDateTime::fromString(widget1->deckLoader->getDeckList()->getLastLoadedTimestamp());
-                QDateTime time2 = QDateTime::fromString(widget2->deckLoader->getDeckList()->getLastLoadedTimestamp());
-                return time1 > time2;
-            }
-        }
-
-        return false; // Default case, no sorting applied
-    });
-
-    return widgets;
-}
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 1ea06aba4..df3f39eb5 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
@@ -1,20 +1,20 @@
 /**
  * @file visual_deck_storage_sort_widget.h
  * @ingroup VisualDeckStorageWidgets
- * @brief TODO: Document this.
  */
 
 #ifndef VISUAL_DECK_STORAGE_SORT_WIDGET_H
 #define VISUAL_DECK_STORAGE_SORT_WIDGET_H
 
-#include "visual_deck_storage_widget.h"
+#include "visual_deck_storage_sort_filter_proxy_model.h"
 
-#include <QComboBox>
-#include <QHBoxLayout>
 #include <QWidget>
+#include <qtmetamacros.h>
 
 class VisualDeckStorageWidget;
-class VisualDeckStorageFolderDisplayWidget;
+class QComboBox;
+class QHBoxLayout;
+
 class VisualDeckStorageSortWidget : public QWidget
 {
     Q_OBJECT
@@ -22,25 +22,23 @@ class VisualDeckStorageSortWidget : public QWidget
 public:
     explicit VisualDeckStorageSortWidget(VisualDeckStorageWidget *parent);
     void retranslateUi();
-    void updateSortOrder();
-    void sortFolder(VisualDeckStorageFolderDisplayWidget *folderWidget);
-    QString getSearchText();
-    QList<DeckPreviewWidget *> filterFiles(QList<DeckPreviewWidget *> widgets);
+
+    /**
+     * @brief The currently selected sort order.
+     */
+    [[nodiscard]] VisualDeckStorageSortFilterProxyModel::SortOrder currentSortOrder() const;
 
 signals:
+    /**
+     * @brief Emitted when the user picks a different sort order.
+     */
     void sortOrderChanged();
 
+private slots:
+    void updateSortOrder();
+
 private:
-    enum SortOrder
-    {
-        ByName,
-        Alphabetical,
-        ByLastModified,
-        ByLastLoaded,
-    };
     QHBoxLayout *layout;
-    VisualDeckStorageWidget *parent;
-    SortOrder sortOrder; // Current sorting option
     QComboBox *sortComboBox;
 };
 
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 1686de054..d6b7aedbb 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
@@ -2,12 +2,17 @@
 
 #include "../general/layout_containers/flow_widget.h"
 #include "deck_preview/deck_preview_tag_display_widget.h"
-#include "visual_deck_storage_widget.h"
 
 #include <QHBoxLayout>
+#include <QSet>
+#include <QSharedPointer>
+#include <QSizePolicy>
+#include <QString>
+#include <algorithm>
+#include <compare>
+#include <qnamespace.h>
 
-VisualDeckStorageTagFilterWidget::VisualDeckStorageTagFilterWidget(VisualDeckStorageWidget *_parent)
-    : QWidget(_parent), parent(_parent)
+VisualDeckStorageTagFilterWidget::VisualDeckStorageTagFilterWidget(QWidget *parent) : QWidget(parent)
 {
 
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
@@ -18,147 +23,99 @@ VisualDeckStorageTagFilterWidget::VisualDeckStorageTagFilterWidget(VisualDeckSto
 
     setFixedHeight(100);
 
-    auto *flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
+    flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded);
 
     layout->addWidget(flowWidget);
 }
 
+void VisualDeckStorageTagFilterWidget::setAllTagsProvider(const std::function<QSet<QString>()> &provider)
+{
+    allTagsProvider = provider;
+}
+
 void VisualDeckStorageTagFilterWidget::showEvent(QShowEvent *event)
 {
     QWidget::showEvent(event);
     refreshTags();
 }
 
-void VisualDeckStorageTagFilterWidget::filterDecksBySelectedTags(const QList<DeckPreviewWidget *> &deckPreviews) const
-{
-    QStringList selectedTags;
-    QStringList excludedTags;
-
-    // Collect selected and excluded tags
-    for (DeckPreviewTagDisplayWidget *tagWidget : findChildren<DeckPreviewTagDisplayWidget *>()) {
-        switch (tagWidget->getState()) {
-            case TagState::Selected:
-                selectedTags.append(tagWidget->getTagName());
-                break;
-            case TagState::Excluded:
-                excludedTags.append(tagWidget->getTagName());
-                break;
-            default:
-                break;
-        }
-    }
-
-    // If no tags are selected or excluded, show all
-    if (selectedTags.isEmpty() && excludedTags.isEmpty()) {
-        for (DeckPreviewWidget *deckPreview : deckPreviews) {
-            deckPreview->filteredByTags = false;
-        }
-        return;
-    }
-
-    for (DeckPreviewWidget *deckPreview : deckPreviews) {
-        QStringList deckTags = deckPreview->deckLoader->getDeckList()->getTags();
-
-        bool hasAllSelected = std::all_of(selectedTags.begin(), selectedTags.end(),
-                                          [&deckTags](const QString &tag) { return deckTags.contains(tag); });
-
-        bool hasAnyExcluded = std::any_of(excludedTags.begin(), excludedTags.end(),
-                                          [&deckTags](const QString &tag) { return deckTags.contains(tag); });
-
-        // Filter out if any excluded tag is present or if any selected tag is missing
-        deckPreview->filteredByTags = !(hasAllSelected && !hasAnyExcluded);
-    }
-}
-
 void VisualDeckStorageTagFilterWidget::refreshTags()
 {
-    QSet<QString> allTags = gatherAllTags();
-    removeTagsNotInList(allTags);
-    addTagsIfNotPresent(allTags);
-    sortTags();
-}
-
-void VisualDeckStorageTagFilterWidget::removeTagsNotInList(const QSet<QString> &tags)
-{
-    auto *flowWidget = findChild<FlowWidget *>();
+    const QSet<QString> allTags = allTagsProvider ? allTagsProvider() : QSet<QString>();
 
+    // Existing chips survive if their tag is still part of the deck set, or if the chip
+    // is currently selected/excluded. Everything else is dropped. Dropped chips must NOT
+    // be re-added to the layout afterwards: they are reparented to nullptr and scheduled
+    // for a deferred delete (QWidget::setParent(nullptr) also hides them), and the flow
+    // layout would keep a dangling reference to them once the deletion runs on the next
+    // event-loop cycle.
+    QList<DeckPreviewTagDisplayWidget *> chips;
     for (DeckPreviewTagDisplayWidget *tagWidget : findChildren<DeckPreviewTagDisplayWidget *>()) {
-        const QString &tagName = tagWidget->getTagName();
-
-        // Keep the tag widget if it is either selected or excluded
-        if (!tags.contains(tagName) && tagWidget->getState() == TagState::NotSelected) {
+        if (tagWidget->getState() != TagState::NotSelected || allTags.contains(tagWidget->getTagName())) {
+            chips.append(tagWidget);
+        } else {
             flowWidget->removeWidget(tagWidget);
+            tagWidget->setParent(nullptr);
             tagWidget->deleteLater();
         }
     }
-}
 
-void VisualDeckStorageTagFilterWidget::addTagsIfNotPresent(const QSet<QString> &tags)
-{
-    for (const QString &tag : tags) {
-        addTagIfNotPresent(tag);
+    // Add chips for tags that are not shown yet.
+    QSet<QString> existingTags;
+    for (DeckPreviewTagDisplayWidget *tagWidget : chips) {
+        existingTags.insert(tagWidget->getTagName());
     }
-}
-
-void VisualDeckStorageTagFilterWidget::addTagIfNotPresent(const QString &tag)
-{
-    // Check if the tag already exists in the flow widget
-    bool tagExists = false;
-    for (DeckPreviewTagDisplayWidget *tagWidget : findChildren<DeckPreviewTagDisplayWidget *>()) {
-        if (tagWidget->getTagName() == tag) {
-            tagExists = true;
-            break;
+    for (const QString &tag : allTags) {
+        if (!existingTags.contains(tag)) {
+            auto *newTagWidget = new DeckPreviewTagDisplayWidget(this, tag);
+            connect(newTagWidget, &DeckPreviewTagDisplayWidget::tagClicked, this,
+                    &VisualDeckStorageTagFilterWidget::filterChanged);
+            flowWidget->addWidget(newTagWidget);
+            chips.append(newTagWidget);
         }
     }
 
-    // If the tag doesn't exist, add a new DeckPreviewTagDisplayWidget
-    if (!tagExists) {
-        auto *newTagWidget = new DeckPreviewTagDisplayWidget(this, tag);
-        connect(newTagWidget, &DeckPreviewTagDisplayWidget::tagClicked, parent,
-                &VisualDeckStorageWidget::updateTagFilter);
-        connect(newTagWidget, &DeckPreviewTagDisplayWidget::tagClicked, this,
-                &VisualDeckStorageTagFilterWidget::refreshTags);
-        auto *flowWidget = findChild<FlowWidget *>();
-        flowWidget->addWidget(newTagWidget);
-    }
-}
-
-void VisualDeckStorageTagFilterWidget::sortTags()
-{
-    auto *flowWidget = findChild<FlowWidget *>();
-    if (!flowWidget)
-        return;
-
-    // Get all tag widgets
-    QList<DeckPreviewTagDisplayWidget *> tagWidgets = findChildren<DeckPreviewTagDisplayWidget *>();
-
-    // Sort widgets by tag name
-    std::sort(tagWidgets.begin(), tagWidgets.end(), [](DeckPreviewTagDisplayWidget *a, DeckPreviewTagDisplayWidget *b) {
-        return a->getTagName().toLower() < b->getTagName().toLower();
+    // Sort, but skip the full remove/re-add when the order already matches the layout.
+    // FlowWidget inherits QLayout::removeWidget's linear scan, so rebuilding an unchanged
+    // order would be quadratic plus a full relayout on every chip click and load batch.
+    std::sort(chips.begin(), chips.end(), [](DeckPreviewTagDisplayWidget *a, DeckPreviewTagDisplayWidget *b) {
+        const QString aName = a->getTagName();
+        const QString bName = b->getTagName();
+        const int compared = aName.compare(bName, Qt::CaseInsensitive);
+        return compared != 0 ? compared < 0 : aName < bName;
     });
-
-    // Clear and re-add widgets in sorted order
-    for (DeckPreviewTagDisplayWidget *tagWidget : tagWidgets) {
+    if (chips == currentChipOrder) {
+        return;
+    }
+    for (DeckPreviewTagDisplayWidget *tagWidget : chips) {
         flowWidget->removeWidget(tagWidget);
     }
-    for (DeckPreviewTagDisplayWidget *tagWidget : tagWidgets) {
+    for (DeckPreviewTagDisplayWidget *tagWidget : chips) {
         flowWidget->addWidget(tagWidget);
     }
+    currentChipOrder = chips;
 }
 
-QSet<QString> VisualDeckStorageTagFilterWidget::gatherAllTags() const
+QStringList VisualDeckStorageTagFilterWidget::selectedTags() const
 {
-    QSet<QString> allTags;
-    QList<DeckPreviewWidget *> deckWidgets = parent->findChildren<DeckPreviewWidget *>();
-
-    for (DeckPreviewWidget *widget : deckWidgets) {
-        if (widget->checkVisibility()) {
-            for (const QString &tag : widget->deckLoader->getDeckList()->getTags()) {
-                allTags.insert(tag);
-            }
+    QStringList selected;
+    for (DeckPreviewTagDisplayWidget *tagWidget : findChildren<DeckPreviewTagDisplayWidget *>()) {
+        if (tagWidget->getState() == TagState::Selected) {
+            selected.append(tagWidget->getTagName());
         }
     }
-    return allTags;
+    return selected;
+}
+
+QStringList VisualDeckStorageTagFilterWidget::excludedTags() const
+{
+    QStringList excluded;
+    for (DeckPreviewTagDisplayWidget *tagWidget : findChildren<DeckPreviewTagDisplayWidget *>()) {
+        if (tagWidget->getState() == TagState::Excluded) {
+            excluded.append(tagWidget->getTagName());
+        }
+    }
+    return excluded;
 }
 
 QStringList VisualDeckStorageTagFilterWidget::getAllKnownTags() const
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 ada94a244..13a27c10a 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
@@ -1,35 +1,62 @@
 /**
  * @file visual_deck_storage_tag_filter_widget.h
  * @ingroup VisualDeckStorageWidgets
- * @brief TODO: Document this.
  */
 
 #ifndef VISUAL_DECK_STORAGE_TAG_FILTER_WIDGET_H
 #define VISUAL_DECK_STORAGE_TAG_FILTER_WIDGET_H
 
-#include "deck_preview/deck_preview_widget.h"
-
+#include <QList>
+#include <QStringList>
 #include <QWidget>
+#include <functional>
+#include <qtmetamacros.h>
+
+class DeckPreviewTagDisplayWidget;
+class FlowWidget;
+class QString;
+template <class T> class QSet;
 
-class VisualDeckStorageWidget;
 class VisualDeckStorageTagFilterWidget : public QWidget
 {
     Q_OBJECT
 
-    VisualDeckStorageWidget *parent;
-
-    [[nodiscard]] QSet<QString> gatherAllTags() const;
-    void removeTagsNotInList(const QSet<QString> &tags);
-    void addTagsIfNotPresent(const QSet<QString> &tags);
-    void addTagIfNotPresent(const QString &tag);
-    void sortTags();
+    FlowWidget *flowWidget;
+    std::function<QSet<QString>()> allTagsProvider;
+    QList<DeckPreviewTagDisplayWidget *> currentChipOrder;
 
 public:
-    explicit VisualDeckStorageTagFilterWidget(VisualDeckStorageWidget *_parent);
+    explicit VisualDeckStorageTagFilterWidget(QWidget *parent = nullptr);
     [[nodiscard]] QStringList getAllKnownTags() const;
-    void filterDecksBySelectedTags(const QList<DeckPreviewWidget *> &deckPreviews) const;
+
+    /**
+     * @brief Sets a provider for the full set of tags to draw chips from.
+     */
+    void setAllTagsProvider(const std::function<QSet<QString>()> &provider);
+
+    /**
+     * @brief The tags currently in "selected" state.
+     */
+    [[nodiscard]] QStringList selectedTags() const;
+
+    /**
+     * @brief The tags currently in "excluded" state.
+     */
+    [[nodiscard]] QStringList excludedTags() const;
+
+signals:
+    /**
+     * Emitted when a chip's selection or exclusion state changes.
+     *
+     * The chip only emits when its state actually changed, so this fires once per
+     * effective toggle rather than on every click.
+     */
+    void filterChanged();
 
 public slots:
+    /**
+     * @brief Rebuilds the tag chips from the currently available tags.
+     */
     void refreshTags();
     void showEvent(QShowEvent *event) override;
 };
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 bfc425993..51e9c70e7 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
@@ -1,23 +1,48 @@
 #include "visual_deck_storage_widget.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../quick_settings/settings_button_widget.h"
+#include "../../pixel_map_generator.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 <QComboBox>
-#include <QDirIterator>
-#include <QMouseEvent>
+#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), folderWidget(nullptr)
+VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(parent)
 {
-    deckListModel = new DeckListModel(this);
-    deckListModel->setObjectName("visualDeckModel");
+    // The model and proxy own all deck data, sorting and filtering. The view widgets below
+    // only display the proxy's rows and their FilterMatchRole, so nothing touches the
+    // filesystem outside the model.
+    storageModel = new VisualDeckStorageModel(this);
+    storageProxyModel = new VisualDeckStorageSortFilterProxyModel(this);
+    storageProxyModel->setSourceModel(storageModel);
 
     layout = new QVBoxLayout(this);
     layout->setSpacing(0);
@@ -36,10 +61,16 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
     searchWidget = new VisualDeckStorageSearchWidget(this);
 
     refreshButton = new QToolButton(this);
-    refreshButton->setIcon(QPixmap("theme:icons/reload"));
+    refreshButton->setIcon(themePixmap(QStringLiteral("icons/reload")));
     refreshButton->setFixedSize(32, 32);
     connect(refreshButton, &QPushButton::clicked, this, &VisualDeckStorageWidget::refreshIfPossible);
 
+    shareButton = new QToolButton(this);
+    shareButton->setIcon(themePixmap(QStringLiteral("icons/share")));
+    shareButton->setFixedSize(32, 32);
+    shareButton->setVisible(false);
+    connect(shareButton, &QPushButton::clicked, this, &VisualDeckStorageWidget::shareRequested);
+
     quickSettingsWidget = new VisualDeckStorageQuickSettingsWidget(this);
     connect(quickSettingsWidget, &VisualDeckStorageQuickSettingsWidget::showFoldersChanged, this,
             &VisualDeckStorageWidget::updateShowFolders);
@@ -50,14 +81,20 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
     searchAndSortLayout->addWidget(sortWidget);
     searchAndSortLayout->addWidget(searchWidget);
     searchAndSortLayout->addWidget(refreshButton);
+    searchAndSortLayout->addWidget(shareButton);
     searchAndSortLayout->addWidget(quickSettingsWidget);
 
     // tag filter box
     tagFilterWidget = new VisualDeckStorageTagFilterWidget(this);
-    updateTagsVisibility(SettingsCache::instance().getVisualDeckStorageShowTagFilter());
+    tagFilterWidget->setAllTagsProvider([this] { return gatherVisibleTags(); });
+    connect(tagFilterWidget, &VisualDeckStorageTagFilterWidget::filterChanged, this,
+            &VisualDeckStorageWidget::updateTagFilter);
+    updateTagsVisibility(SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowTagFilter());
 
-    deckPreviewSelectionAnimationEnabled = SettingsCache::instance().getVisualDeckStorageSelectionAnimation();
-    connect(&SettingsCache::instance(), &SettingsCache::visualDeckStorageSelectionAnimationChanged, this,
+    deckPreviewSelectionAnimationEnabled =
+        SettingsCache::instance().visualDeckStorage().getVisualDeckStorageSelectionAnimation();
+    connect(&SettingsCache::instance().visualDeckStorage(),
+            &VisualDeckStorageSettings::visualDeckStorageSelectionAnimationChanged, this,
             &VisualDeckStorageWidget::updateSelectionAnimationEnabled);
 
     // deck area
@@ -71,6 +108,40 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare
     layout->addWidget(tagFilterWidget);
     layout->addWidget(scrollArea);
 
+    // The deck data changed (a load finished, or a mutation happened): re-evaluate the filters,
+    // since search/tag/color matches are computed against the data. Debounced so that a burst of
+    // load completions triggers a single re-application instead of one O(n) pass per deck.
+    refreshTimer = new QTimer(this);
+    refreshTimer->setSingleShot(true);
+    refreshTimer->setInterval(150);
+    connect(refreshTimer, &QTimer::timeout, this, [this] {
+        storageProxyModel->reapplyFilters();
+        // A batch of decks finished loading: re-gather the tag chips from the visible decks once
+        // the burst settles instead of on every individual load.
+        tagFilterWidget->refreshTags();
+    });
+    connect(storageModel, &QAbstractItemModel::dataChanged, this, [this] { refreshTimer->start(); });
+    connect(storageModel, &VisualDeckStorageModel::deckLoaded, this, [this] { refreshTimer->start(); });
+    // A deck's file path changed: re-apply the sort, since orders like "filename" depend on it.
+    connect(storageModel, &VisualDeckStorageModel::deckFilePathChanged, this, [this] { storageProxyModel->resort(); });
+    connect(sortWidget, &VisualDeckStorageSortWidget::sortOrderChanged, this,
+            &VisualDeckStorageWidget::updateSortOrder);
+    // The filter widgets only own their ui state. Pushing it into the proxy model
+    // happens here, so the children stay decoupled from the model layer.
+    connect(deckPreviewColorIdentityFilterWidget, &DeckPreviewColorIdentityFilterWidget::activeColorsChanged, this,
+            &VisualDeckStorageWidget::updateColorFilter);
+    connect(deckPreviewColorIdentityFilterWidget, &DeckPreviewColorIdentityFilterWidget::filterModeChanged, this,
+            &VisualDeckStorageWidget::updateColorFilter);
+    connect(searchWidget, &VisualDeckStorageSearchWidget::searchTextChanged, this,
+            &VisualDeckStorageWidget::updateSearchFilter);
+
+    // The deck content search matches card names in the configured card language;
+    // re-run it whenever that setting changes so active searches follow immediately.
+    CardsDisplaySettings *cardsDisplay = &SettingsCache::instance().cardsDisplay();
+    const auto reapplySearchForLanguage = [this] { storageProxyModel->reapplyFilters(); };
+    connect(cardsDisplay, &CardsDisplaySettings::cardLangChanged, this, reapplySearchForLanguage);
+    connect(cardsDisplay, &CardsDisplaySettings::cardSearchLanguageChanged, this, reapplySearchForLanguage);
+
     connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this,
             &VisualDeckStorageWidget::createRootFolderWidget);
 
@@ -118,7 +189,69 @@ void VisualDeckStorageWidget::retranslateUi()
     databaseLoadIndicator->setText(tr("Loading database ..."));
 
     refreshButton->setToolTip(tr("Refresh loaded files"));
+    shareButton->setToolTip(tr("Select decks to share"));
     quickSettingsWidget->setToolTip(tr("Visual Deck Storage Settings"));
+
+    sortWidget->retranslateUi();
+}
+
+void VisualDeckStorageWidget::setShareSelectable(bool selectable)
+{
+    if (shareSelectable == selectable) {
+        return;
+    }
+    shareSelectable = selectable;
+    if (folderWidget != nullptr) {
+        folderWidget->setShareSelectable(selectable);
+    }
+    emit shareSelectionChanged();
+}
+
+bool VisualDeckStorageWidget::isShareSelectable() const
+{
+    return shareSelectable;
+}
+
+QStringList VisualDeckStorageWidget::selectedFilePaths() const
+{
+    QStringList selectedPaths;
+    if (folderWidget != nullptr) {
+        const auto previews = folderWidget->findChildren<DeckPreviewWidget *>();
+        for (DeckPreviewWidget *preview : previews) {
+            // Filtered-out previews stay alive hidden in their sorted place, so only decks the
+            // user can actually see are part of the share.
+            if (preview->isVisible() && preview->isShareSelected()) {
+                selectedPaths.append(preview->filePath);
+            }
+        }
+    }
+    return selectedPaths;
+}
+
+void VisualDeckStorageWidget::clearShareSelection()
+{
+    if (folderWidget != nullptr) {
+        const auto previews = folderWidget->findChildren<DeckPreviewWidget *>();
+        for (DeckPreviewWidget *preview : previews) {
+            preview->setShareSelected(false);
+        }
+    }
+}
+
+void VisualDeckStorageWidget::setShareAvailable(bool available)
+{
+    shareButton->setVisible(available);
+    shareButton->setEnabled(available);
+}
+
+void VisualDeckStorageWidget::setShareSelectedFiles(const QStringList &paths)
+{
+    if (folderWidget != nullptr) {
+        const auto previews = folderWidget->findChildren<DeckPreviewWidget *>();
+        for (DeckPreviewWidget *preview : previews) {
+            preview->setShareSelected(paths.contains(preview->filePath));
+        }
+    }
 }
 
 /**
@@ -130,72 +263,88 @@ const VisualDeckStorageQuickSettingsWidget *VisualDeckStorageWidget::settings()
 }
 
 /**
- * Reapplies all sort and filter options by calling the appropriate update methods.
+ * Reapplies all sort and filter options by updating the proxy model.
  */
 void VisualDeckStorageWidget::reapplySortAndFilters()
 {
-    updateSortOrder();
-    updateTagFilter();
-    updateColorFilter();
-    updateSearchFilter();
+    storageProxyModel->setSortOrder(sortWidget->currentSortOrder());
+    storageProxyModel->reapplyFilters();
 }
 
+/**
+ * @brief Scans the deck folder and rebuilds the folder tree of deck previews.
+ */
 void VisualDeckStorageWidget::createRootFolderWidget()
 {
-    folderWidget = new VisualDeckStorageFolderDisplayWidget(this, this, SettingsCache::instance().getDeckPath(), false,
-                                                            quickSettingsWidget->getShowFolders());
+    storageModel->setDeckPath(SettingsCache::instance().paths().getDeckPath());
+
+    folderWidget =
+        new VisualDeckStorageFolderDisplayWidget(this, this, QString(), false, quickSettingsWidget->getShowFolders());
 
     scrollArea->setWidget(folderWidget); // this automatically destroys the old folderWidget
     scrollArea->widget()->setMaximumWidth(scrollArea->viewport()->width());
     scrollArea->widget()->adjustSize();
 
-    /* We have to schedule a QTimer here so that the sorting logic doesn't try to access widgets that haven't been
-     * processed by the event loop yet. Otherwise, deck sorting will intermittently segfault on some systems.
-     */
-    QTimer::singleShot(0, this, &VisualDeckStorageWidget::reapplySortAndFilters);
+    // Sort and filter runs against the model data, so it is safe to apply immediately.
+    reapplySortAndFilters();
 }
 
 void VisualDeckStorageWidget::updateShowFolders(bool enabled)
 {
     if (folderWidget) {
         folderWidget->updateShowFolders(enabled);
-        QTimer::singleShot(0, this, &VisualDeckStorageWidget::reapplySortAndFilters);
     }
 }
 
 void VisualDeckStorageWidget::updateSortOrder()
 {
-    if (folderWidget) {
-        sortWidget->sortFolder(folderWidget);
-        for (VisualDeckStorageFolderDisplayWidget *subFolderWidget :
-             folderWidget->findChildren<VisualDeckStorageFolderDisplayWidget *>()) {
-            sortWidget->sortFolder(subFolderWidget);
-        }
-    }
+    storageProxyModel->setSortOrder(sortWidget->currentSortOrder());
 }
 
 void VisualDeckStorageWidget::updateTagFilter()
 {
-    if (folderWidget) {
-        tagFilterWidget->filterDecksBySelectedTags(folderWidget->findChildren<DeckPreviewWidget *>());
-        folderWidget->updateVisibility();
-    }
+    const QStringList selected = tagFilterWidget->selectedTags();
+    const QStringList excluded = tagFilterWidget->excludedTags();
+    storageProxyModel->setTagFilter(QSet<QString>(selected.cbegin(), selected.cend()),
+                                    QSet<QString>(excluded.cbegin(), excluded.cend()));
+    // The visible deck set changed, so the chips are re-gathered from it.
+    tagFilterWidget->refreshTags();
 }
 
+/**
+ * @brief The tags of all decks currently accepted by the proxy model.
+ */
+QSet<QString> VisualDeckStorageWidget::gatherVisibleTags() const
+{
+    QSet<QString> allTags;
+    for (int proxyRow = 0; proxyRow < storageProxyModel->rowCount(); ++proxyRow) {
+        const QModelIndex index = storageProxyModel->index(proxyRow, 0);
+        if (!index.data(VisualDeckStorageRoles::FilterMatchRole).toBool()) {
+            continue;
+        }
+        const QStringList deckTags = index.data(VisualDeckStorageRoles::TagsRole).toStringList();
+        for (const QString &tag : deckTags) {
+            allTags.insert(tag);
+        }
+    }
+    return allTags;
+}
+
+/**
+ * Pushes the color identity filter widget's state into the proxy model.
+ */
 void VisualDeckStorageWidget::updateColorFilter()
 {
-    if (folderWidget) {
-        deckPreviewColorIdentityFilterWidget->filterWidgets(folderWidget->findChildren<DeckPreviewWidget *>());
-        folderWidget->updateVisibility();
-    }
+    storageProxyModel->setColorFilter(deckPreviewColorIdentityFilterWidget->getFilterMode(),
+                                      deckPreviewColorIdentityFilterWidget->getActiveColors());
 }
 
-void VisualDeckStorageWidget::updateSearchFilter()
+/**
+ * Pushes the search bar's text into the proxy model.
+ */
+void VisualDeckStorageWidget::updateSearchFilter(const QString &text)
 {
-    if (folderWidget) {
-        searchWidget->filterWidgets(folderWidget->findChildren<DeckPreviewWidget *>(), searchWidget->getSearchText());
-        folderWidget->updateVisibility();
-    }
+    storageProxyModel->setSearchText(text);
 }
 
 void VisualDeckStorageWidget::updateTagsVisibility(const bool visible)
@@ -211,4 +360,4 @@ void VisualDeckStorageWidget::updateTagsVisibility(const bool visible)
 void VisualDeckStorageWidget::updateSelectionAnimationEnabled(const bool enabled)
 {
     deckPreviewSelectionAnimationEnabled = enabled;
-}
\ No newline at end of file
+}
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 b205cb67e..b512dd87c 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
@@ -1,30 +1,33 @@
 /**
  * @file visual_deck_storage_widget.h
  * @ingroup VisualDeckStorageWidgets
- * @brief TODO: Document this.
  */
 
 #ifndef VISUAL_DECK_STORAGE_WIDGET_H
 #define VISUAL_DECK_STORAGE_WIDGET_H
 
-#include "../../deck_loader/deck_loader.h"
-#include "../cards/card_size_widget.h"
-#include "../quick_settings/settings_button_widget.h"
-#include "deck_preview/deck_preview_color_identity_filter_widget.h"
-#include "visual_deck_storage_folder_display_widget.h"
-#include "visual_deck_storage_quick_settings_widget.h"
-#include "visual_deck_storage_search_widget.h"
-#include "visual_deck_storage_sort_widget.h"
-#include "visual_deck_storage_tag_filter_widget.h"
+#include <QSet>
+#include <QString>
+#include <QStringList>
+#include <QWidget>
+#include <qtmetamacros.h>
 
-#include <libcockatrice/models/deck_list/deck_list_model.h>
-
-class QSpinBox;
+class QLabel;
+class QTimer;
+class DeckPreviewColorIdentityFilterWidget;
+class VisualDeckStorageFolderDisplayWidget;
+class VisualDeckStorageQuickSettingsWidget;
 class VisualDeckStorageSearchWidget;
 class VisualDeckStorageSortWidget;
 class VisualDeckStorageTagFilterWidget;
-class VisualDeckStorageFolderDisplayWidget;
-class DeckPreviewColorIdentityFilterWidget;
+class QHBoxLayout;
+class QScrollArea;
+class QToolButton;
+class QVBoxLayout;
+class VisualDeckStorageModel;
+class VisualDeckStorageSortFilterProxyModel;
+struct LoadedDeck;
+
 class VisualDeckStorageWidget final : public QWidget
 {
     Q_OBJECT
@@ -32,44 +35,71 @@ public:
     explicit VisualDeckStorageWidget(QWidget *parent);
     void refreshIfPossible();
     void retranslateUi();
+    void setShareSelectable(bool selectable);
+    [[nodiscard]] bool isShareSelectable() const;
+    [[nodiscard]] QStringList selectedFilePaths() const;
+    void setShareSelectedFiles(const QStringList &paths);
+    void clearShareSelection();
+    void setShareAvailable(bool available);
 
     VisualDeckStorageTagFilterWidget *tagFilterWidget;
     bool deckPreviewSelectionAnimationEnabled;
 
     [[nodiscard]] const VisualDeckStorageQuickSettingsWidget *settings() const;
+    [[nodiscard]] VisualDeckStorageModel *model() const
+    {
+        return storageModel;
+    }
+    [[nodiscard]] VisualDeckStorageSortFilterProxyModel *proxyModel() const
+    {
+        return storageProxyModel;
+    }
 
 public slots:
-    void createRootFolderWidget(); // Refresh the display of cards based on the current sorting option
+    /**
+     * @brief Starts scanning the deck folder and rebuilds the folder tree and previews.
+     */
+    void createRootFolderWidget();
     void updateShowFolders(bool enabled);
-    void updateTagFilter();
-    void updateColorFilter();
-    void updateSearchFilter();
     void updateTagsVisibility(bool visible);
     void updateSelectionAnimationEnabled(bool enabled);
     void updateSortOrder();
+    void updateTagFilter();
+    void updateColorFilter();
+    void updateSearchFilter(const QString &text);
+
+signals:
+    void deckLoadRequested(const QString &filePath);
+    void openDeckEditor(const LoadedDeck &deck);
+    void shareDeckRequested(const QString &filePath);
+    void shareSelectionChanged();
+    void shareRequested();
+
+protected:
     void resizeEvent(QResizeEvent *event) override;
     void showEvent(QShowEvent *event) override;
 
-signals:
-    void bannerCardsRefreshed();
-    void deckLoadRequested(const QString &filePath);
-    void openDeckEditor(DeckLoader *deck);
+private:
+    void reapplySortAndFilters();
+    [[nodiscard]] QSet<QString> gatherVisibleTags() const;
 
 private:
     QVBoxLayout *layout;
     QWidget *searchAndSortContainer;
     QHBoxLayout *searchAndSortLayout;
-    DeckListModel *deckListModel;
     QLabel *databaseLoadIndicator;
     VisualDeckStorageSortWidget *sortWidget;
     VisualDeckStorageSearchWidget *searchWidget;
     DeckPreviewColorIdentityFilterWidget *deckPreviewColorIdentityFilterWidget;
     QToolButton *refreshButton;
+    QToolButton *shareButton;
     VisualDeckStorageQuickSettingsWidget *quickSettingsWidget;
     QScrollArea *scrollArea;
-    VisualDeckStorageFolderDisplayWidget *folderWidget;
-
-    void reapplySortAndFilters();
+    VisualDeckStorageFolderDisplayWidget *folderWidget = nullptr;
+    VisualDeckStorageModel *storageModel = nullptr;
+    VisualDeckStorageSortFilterProxyModel *storageProxyModel = nullptr;
+    QTimer *refreshTimer = nullptr; ///< Coalesces the re-apply/refresh burst following a batch of deck loads.
+    bool shareSelectable = false;
 };
 
 #endif // VISUAL_DECK_STORAGE_WIDGET_H
diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp
index 4c9922c80..815cec1d2 100644
--- a/cockatrice/src/interface/window_main.cpp
+++ b/cockatrice/src/interface/window_main.cpp
@@ -19,62 +19,108 @@
  ***************************************************************************/
 #include "window_main.h"
 
+#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 "../interface/widgets/dialogs/dlg_connect.h"
+#include "../client/settings/shortcuts_settings.h"
 #include "../interface/widgets/dialogs/dlg_edit_tokens.h"
-#include "../interface/widgets/dialogs/dlg_forgot_password_challenge.h"
-#include "../interface/widgets/dialogs/dlg_forgot_password_request.h"
-#include "../interface/widgets/dialogs/dlg_forgot_password_reset.h"
+#include "../interface/widgets/dialogs/dlg_local_game_options.h"
 #include "../interface/widgets/dialogs/dlg_manage_sets.h"
-#include "../interface/widgets/dialogs/dlg_register.h"
 #include "../interface/widgets/dialogs/dlg_settings.h"
 #include "../interface/widgets/dialogs/dlg_startup_card_check.h"
 #include "../interface/widgets/dialogs/dlg_tip_of_the_day.h"
 #include "../interface/widgets/dialogs/dlg_update.h"
 #include "../interface/widgets/dialogs/dlg_view_log.h"
-#include "../interface/widgets/tabs/tab_game.h"
+#include "../interface/widgets/onboarding/first_run_wizard.h"
+#include "../interface/widgets/settings_page/general_settings_page.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/utility/get_text_with_max.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 <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 <QInputDialog>
+#include <QFileInfo>
+#include <QFlags>
+#include <QFutureWatcher>
+#include <QIODevice>
+#include <QLocalSocket>
 #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 <QWindow>
-#include <QtConcurrent>
-#include <QtNetwork>
+#include <QWidget>
+#include <QtConcurrentRun>
+#include <QtGlobal>
+#include <functional>
+#include <google/protobuf/stubs/port.h>
 #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/event_connection_closed.pb.h>
-#include <libcockatrice/protocol/pb/event_server_shutdown.pb.h>
 #include <libcockatrice/protocol/pb/game_replay.pb.h>
 #include <libcockatrice/protocol/pb/room_commands.pb.h>
+#include <libcockatrice/settings/cache_storage_settings.h>
+#include <libcockatrice/settings/debug_settings.h>
+#include <libcockatrice/settings/download_settings.h>
+#include <libcockatrice/settings/interface_settings.h>
+#include <libcockatrice/settings/layouts_settings.h>
+#include <libcockatrice/settings/network_settings.h>
+#include <libcockatrice/settings/paths_settings.h>
+#include <libcockatrice/settings/personal_settings.h>
+#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?type=c"
-#define GITHUB_CONTRIBUTE_URL "https://github.com/Cockatrice/Cockatrice#cockatrice"
+#define GITHUB_CONTRIBUTORS_URL "https://github.com/Cockatrice/Cockatrice/graphs/contributors"
+#define GITHUB_CONTRIBUTE_URL "https://github.com/Cockatrice/Cockatrice#"
 #define GITHUB_TRANSIFEX_TRANSLATORS_URL "https://github.com/Cockatrice/Cockatrice/wiki/Translator-Hall-of-Fame"
 #define GITHUB_TRANSLATOR_FAQ_URL "https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ"
 #define GITHUB_ISSUES_URL "https://github.com/Cockatrice/Cockatrice/issues"
@@ -84,6 +130,7 @@
 const QString MainWindow::appName = "Cockatrice";
 const QStringList MainWindow::fileNameFilters = QStringList() << QObject::tr("Cockatrice card database (*.xml)")
                                                               << QObject::tr("All files (*.*)");
+inline Q_LOGGING_CATEGORY(MainWindowLog, "main_window");
 
 /**
  * Replaces the tab-specific menus that are shown in the menuBar.
@@ -92,66 +139,18 @@ const QStringList MainWindow::fileNameFilters = QStringList() << QObject::tr("Co
  */
 void MainWindow::updateTabMenu(const QList<QMenu *> &newMenuList)
 {
-    for (auto &tabMenu : tabMenus)
+    for (auto &tabMenu : tabMenus) {
         menuBar()->removeAction(tabMenu->menuAction());
-    tabMenus = newMenuList;
-    for (auto &tabMenu : tabMenus)
-        menuBar()->insertMenu(helpMenu->menuAction(), tabMenu);
-}
-
-void MainWindow::processConnectionClosedEvent(const Event_ConnectionClosed &event)
-{
-    client->disconnectFromServer();
-    QString reasonStr;
-    switch (event.reason()) {
-        case Event_ConnectionClosed::USER_LIMIT_REACHED:
-            reasonStr = tr("The server has reached its maximum user capacity, please check back later.");
-            break;
-        case Event_ConnectionClosed::TOO_MANY_CONNECTIONS:
-            reasonStr = tr("There are too many concurrent connections from your address.");
-            break;
-        case Event_ConnectionClosed::BANNED: {
-            reasonStr = tr("Banned by moderator");
-            if (event.has_end_time())
-                reasonStr.append(
-                    "\n" + tr("Expected end time: %1").arg(QDateTime::fromSecsSinceEpoch(event.end_time()).toString()));
-            else
-                reasonStr.append("\n" + tr("This ban lasts indefinitely."));
-            if (event.has_reason_str())
-                reasonStr.append("\n\n" + QString::fromStdString(event.reason_str()));
-            break;
-        }
-        case Event_ConnectionClosed::SERVER_SHUTDOWN:
-            reasonStr = tr("Scheduled server shutdown.");
-            break;
-        case Event_ConnectionClosed::USERNAMEINVALID:
-            reasonStr = tr("Invalid username.");
-            break;
-        case Event_ConnectionClosed::LOGGEDINELSEWERE:
-            reasonStr = tr("You have been logged out due to logging in at another location.");
-            break;
-        default:
-            reasonStr = QString::fromStdString(event.reason_str());
     }
-    QMessageBox::critical(this, tr("Connection closed"),
-                          tr("The server has terminated your connection.\nReason: %1").arg(reasonStr));
-}
-
-void MainWindow::processServerShutdownEvent(const Event_ServerShutdown &event)
-{
-    serverShutdownMessageBox.setInformativeText(tr("The server is going to be restarted in %n minute(s).\nAll running "
-                                                   "games will be lost.\nReason for shutdown: %1",
-                                                   "", event.minutes())
-                                                    .arg(QString::fromStdString(event.reason())));
-    serverShutdownMessageBox.setIconPixmap(QPixmap("theme:cockatrice").scaled(64, 64));
-    serverShutdownMessageBox.setText(tr("Scheduled server shutdown"));
-    serverShutdownMessageBox.setWindowModality(Qt::ApplicationModal);
-    serverShutdownMessageBox.setVisible(true);
+    tabMenus = newMenuList;
+    for (auto &tabMenu : tabMenus) {
+        menuBar()->insertMenu(helpMenu->menuAction(), tabMenu);
+    }
 }
 
 void MainWindow::statusChanged(ClientStatus _status)
 {
-    setClientStatusTitle();
+    connectionController->refreshWindowTitle();
     switch (_status) {
         case StatusDisconnected:
             tabSupervisor->stop();
@@ -176,65 +175,29 @@ void MainWindow::statusChanged(ClientStatus _status)
     }
 }
 
-void MainWindow::userInfoReceived(const ServerInfo_User &info)
-{
-    tabSupervisor->start(info);
-}
-
-void MainWindow::registerAccepted()
-{
-    QMessageBox::information(this, tr("Success"), tr("Registration accepted.\nWill now login."));
-}
-
-void MainWindow::registerAcceptedNeedsActivate()
-{
-    // nothing
-}
-
-void MainWindow::activateAccepted()
-{
-    QMessageBox::information(this, tr("Success"), tr("Account activation accepted.\nWill now login."));
-}
-
 // Actions
 
 void MainWindow::actConnect()
 {
-    dlgConnect = new DlgConnect(this);
-    connect(dlgConnect, &DlgConnect::sigStartForgotPasswordRequest, this, &MainWindow::actForgotPasswordRequest);
-
-    if (dlgConnect->exec()) {
-        client->connectToServer(dlgConnect->getHost(), static_cast<unsigned int>(dlgConnect->getPort()),
-                                dlgConnect->getPlayerName(), dlgConnect->getPassword());
-    }
-}
-
-void MainWindow::actRegister()
-{
-    DlgRegister dlg(this);
-    if (dlg.exec()) {
-        client->registerToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()), dlg.getPlayerName(),
-                                 dlg.getPassword(), dlg.getEmail(), dlg.getCountry(), dlg.getRealName());
-    }
+    connectionController->connectToServer();
 }
 
 void MainWindow::actDisconnect()
 {
-    client->disconnectFromServer();
+    connectionController->disconnectFromServer();
 }
 
 void MainWindow::actSinglePlayer()
 {
-    bool ok;
-    int numberPlayers =
-        QInputDialog::getInt(this, tr("Number of players"), tr("Please enter the number of players."), 1, 1, 8, 1, &ok);
-    if (!ok)
+    DlgLocalGameOptions dlg(this);
+    if (dlg.exec() != QDialog::Accepted) {
         return;
+    }
 
-    startLocalGame(numberPlayers);
+    startLocalGame(dlg.getOptions());
 }
 
-void MainWindow::startLocalGame(int numberPlayers)
+void MainWindow::startLocalGame(const LocalGameOptions &options)
 {
     aConnect->setEnabled(false);
     aRegister->setEnabled(false);
@@ -248,7 +211,7 @@ void MainWindow::startLocalGame(int numberPlayers)
     QList<AbstractClient *> localClients;
     localClients.append(mainClient);
 
-    for (int i = 0; i < numberPlayers - 1; ++i) {
+    for (int i = 0; i < options.numberPlayers - 1; ++i) {
         LocalServerInterface *slaveLsi = localServer->newConnection();
         LocalClient *slaveClient =
             new LocalClient(slaveLsi, tr("Player %1").arg(i + 2), SettingsCache::instance().getClientID(), this);
@@ -257,29 +220,34 @@ void MainWindow::startLocalGame(int numberPlayers)
     tabSupervisor->startLocal(localClients);
 
     Command_CreateGame createCommand;
-    createCommand.set_max_players(static_cast<google::protobuf::uint32>(numberPlayers));
+    createCommand.set_max_players(static_cast<google::protobuf::uint32>(options.numberPlayers));
+    createCommand.set_starting_life_total(options.startingLifeTotal);
     mainClient->sendCommand(LocalClient::prepareRoomCommand(createCommand, 0));
 }
 
 void MainWindow::actWatchReplay()
 {
     QFileDialog dlg(this, tr("Load replay"));
-    dlg.setDirectory(SettingsCache::instance().getReplaysPath());
+    dlg.setDirectory(SettingsCache::instance().paths().getReplaysPath());
     dlg.setNameFilters(QStringList() << QObject::tr("Cockatrice replays (*.cor)"));
-    if (!dlg.exec())
+    if (!dlg.exec()) {
         return;
+    }
 
     QString fileName = dlg.selectedFiles().at(0);
     QFile file(fileName);
-    if (!file.open(QIODevice::ReadOnly))
+    if (!file.open(QIODevice::ReadOnly)) {
         return;
+    }
     QByteArray buf = file.readAll();
     file.close();
 
     replay = new GameReplay;
-    replay->ParseFromArray(buf.data(), buf.size());
-
-    tabSupervisor->openReplay(replay);
+    if (replay->ParseFromArray(buf.data(), buf.size())) {
+        tabSupervisor->openReplay(replay);
+    } else {
+        qCWarning(MainWindowLog) << "failed to parse replay!";
+    }
 }
 
 void MainWindow::localGameEnded()
@@ -295,15 +263,18 @@ void MainWindow::localGameEnded()
 
 void MainWindow::actFullScreen(bool checked)
 {
-    if (checked)
+    if (checked) {
         setWindowState(windowState() | Qt::WindowFullScreen);
-    else
+    } else {
         setWindowState(windowState() & ~Qt::WindowFullScreen);
+    }
 }
 
 void MainWindow::actSettings()
 {
     DlgSettings dlg(this);
+    auto *generalPage = qobject_cast<GeneralSettingsPage *>(dlg.page(DlgSettings::GeneralPage));
+    connect(generalPage, &GeneralSettingsPage::cardDatabaseUpdateRequested, this, &MainWindow::actCheckCardUpdates);
     dlg.exec();
 }
 
@@ -330,7 +301,8 @@ void MainWindow::actAbout()
                 GITHUB_TROUBLESHOOTING_URL + "'>" + tr("Troubleshooting") + "</a><br>" + "<a href='" + GITHUB_FAQ_URL +
                 "'>" + tr("F.A.Q.") + "</a><br>"),
         QMessageBox::Ok, this);
-    mb.setIconPixmap(QPixmap("theme:cockatrice").scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    mb.setIconPixmap(
+        themePixmap(QStringLiteral("cockatrice")).scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation));
     mb.setTextInteractionFlags(Qt::TextBrowserInteraction);
     mb.exec();
 }
@@ -370,296 +342,9 @@ void MainWindow::actOpenSettingsFolder()
     QDesktopServices::openUrl(QUrl::fromLocalFile(dir));
 }
 
-void MainWindow::serverTimeout()
-{
-    QMessageBox::critical(this, tr("Error"), tr("Server timeout"));
-    actConnect();
-}
-
-void MainWindow::loginError(Response::ResponseCode r,
-                            QString reasonStr,
-                            quint32 endTime,
-                            QList<QString> missingFeatures)
-{
-    switch (r) {
-        case Response::RespClientUpdateRequired: {
-            QString formattedMissingFeatures;
-            formattedMissingFeatures = "Missing Features: ";
-            for (int i = 0; i < missingFeatures.size(); ++i)
-                formattedMissingFeatures.append(QString("\n     %1").arg(QChar(0x2022)) + " " +
-                                                missingFeatures.value(i));
-
-            QMessageBox msgBox;
-            msgBox.setIcon(QMessageBox::Critical);
-            msgBox.setWindowTitle(tr("Failed Login"));
-            msgBox.setText(tr("Your client seems to be missing features this server requires for connection.") +
-                           "\n\n" + tr("To update your client, go to 'Help -> Check for Client Updates'."));
-            msgBox.setDetailedText(formattedMissingFeatures);
-            msgBox.exec();
-            break;
-        }
-        case Response::RespWrongPassword:
-            QMessageBox::critical(
-                this, tr("Error"),
-                tr("Incorrect username or password. Please check your authentication information and try again."));
-            break;
-        case Response::RespWouldOverwriteOldSession:
-            QMessageBox::critical(this, tr("Error"),
-                                  tr("There is already an active session using this user name.\nPlease close that "
-                                     "session first and re-login."));
-            break;
-        case Response::RespUserIsBanned: {
-            QString bannedStr;
-            if (endTime)
-                bannedStr = tr("You are banned until %1.").arg(QDateTime::fromSecsSinceEpoch(endTime).toString());
-            else
-                bannedStr = tr("You are banned indefinitely.");
-            if (!reasonStr.isEmpty())
-                bannedStr.append("\n\n" + reasonStr);
-
-            QMessageBox::critical(this, tr("Error"), bannedStr);
-            break;
-        }
-        case Response::RespUsernameInvalid: {
-            QMessageBox::critical(this, tr("Error"), extractInvalidUsernameMessage(reasonStr));
-            break;
-        }
-        case Response::RespRegistrationRequired:
-            if (QMessageBox::question(this, tr("Error"),
-                                      tr("This server requires user registration. Do you want to register now?"),
-                                      QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
-                actRegister();
-            }
-            break;
-        case Response::RespClientIdRequired:
-            QMessageBox::critical(
-                this, tr("Error"),
-                tr("This server requires client IDs. Your client is either failing to generate an ID or you are "
-                   "running a modified client.\nPlease close and reopen your client to try again."));
-            break;
-        case Response::RespContextError:
-            QMessageBox::critical(this, tr("Error"),
-                                  tr("An internal error has occurred, please close and reopen Cockatrice before trying "
-                                     "again.\nIf the error persists, ensure you are running the latest version of the "
-                                     "software and if needed contact the software developers."));
-            break;
-        case Response::RespAccountNotActivated: {
-            bool ok = false;
-            QString token = getTextWithMax(this, tr("Account activation"),
-                                           tr("Your account has not been activated yet.\nYou need to provide "
-                                              "the activation token received in the activation email."),
-                                           QLineEdit::Normal, QString(), &ok);
-            if (ok && !token.isEmpty()) {
-                client->activateToServer(token);
-                return;
-            }
-            client->disconnectFromServer();
-            break;
-        }
-        case Response::RespServerFull: {
-            QMessageBox::critical(this, tr("Server Full"),
-                                  tr("The server has reached its maximum user capacity, please check back later."));
-            break;
-        }
-        default:
-            QMessageBox::critical(this, tr("Error"),
-                                  tr("Unknown login error: %1").arg(static_cast<int>(r)) +
-                                      tr("\nThis usually means that your client version is out of date, and the server "
-                                         "sent a reply your client doesn't understand."));
-            break;
-    }
-    actConnect();
-}
-
-QString MainWindow::extractInvalidUsernameMessage(QString &in)
-{
-    QString out = tr("Invalid username.") + "<br/>";
-    QStringList rules = in.split(QChar('|'));
-    if (rules.size() == 7 || rules.size() == 9) {
-        out += tr("Your username must respect these rules:") + "<ul>";
-
-        out += "<li>" + tr("is %1 - %2 characters long").arg(rules.at(0)).arg(rules.at(1)) + "</li>";
-        out += "<li>" + tr("can %1 contain lowercase characters").arg((rules.at(2).toInt() > 0) ? "" : tr("NOT")) +
-               "</li>";
-        out += "<li>" + tr("can %1 contain uppercase characters").arg((rules.at(3).toInt() > 0) ? "" : tr("NOT")) +
-               "</li>";
-        out +=
-            "<li>" + tr("can %1 contain numeric characters").arg((rules.at(4).toInt() > 0) ? "" : tr("NOT")) + "</li>";
-
-        if (rules.at(6).size() > 0)
-            out += "<li>" + tr("can contain the following punctuation: %1").arg(rules.at(6).toHtmlEscaped()) + "</li>";
-
-        out += "<li>" +
-               tr("first character can %1 be a punctuation mark").arg((rules.at(5).toInt() > 0) ? "" : tr("NOT")) +
-               "</li>";
-
-        if (rules.size() == 9) {
-            if (rules.at(7).size() > 0) {
-                QString words = rules.at(7).toHtmlEscaped();
-                if (words.startsWith("\n")) {
-                    out += tr("no unacceptable language as specified by these server rules:",
-                              "note that the following lines will not be translated");
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
-                    for (QString &line : words.split("\n", Qt::SkipEmptyParts)) {
-#else
-                    for (QString &line : words.split("\n", QString::SkipEmptyParts)) {
-#endif
-                        out += "<li>" + line + "</li>";
-                    }
-                } else {
-                    out += "<li>" + tr("can not contain any of the following words: %1").arg(words) + "</li>";
-                }
-            }
-
-            if (rules.at(8).size() > 0)
-                out += "<li>" +
-                       tr("can not match any of the following expressions: %1").arg(rules.at(8).toHtmlEscaped()) +
-                       "</li>";
-        }
-
-        out += "</ul>";
-    } else {
-        out += tr("You may only use A-Z, a-z, 0-9, _, ., and - in your username.");
-    }
-
-    return out;
-}
-
-void MainWindow::registerError(Response::ResponseCode r, QString reasonStr, quint32 endTime)
-{
-    switch (r) {
-        case Response::RespRegistrationDisabled:
-            QMessageBox::critical(this, tr("Registration denied"),
-                                  tr("Registration is currently disabled on this server"));
-            break;
-        case Response::RespUserAlreadyExists:
-            QMessageBox::critical(this, tr("Registration denied"),
-                                  tr("There is already an existing account with the same user name."));
-            break;
-        case Response::RespEmailRequiredToRegister:
-            QMessageBox::critical(this, tr("Registration denied"),
-                                  tr("It's mandatory to specify a valid email address when registering."));
-            break;
-        case Response::RespEmailBlackListed:
-            if (reasonStr.isEmpty()) {
-                reasonStr =
-                    "The email address provider used during registration has been blocked from use on this server.";
-            }
-            QMessageBox::critical(this, tr("Registration denied"), reasonStr);
-            break;
-        case Response::RespTooManyRequests:
-            QMessageBox::critical(
-                this, tr("Registration denied"),
-                tr("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."));
-            break;
-        case Response::RespPasswordTooShort:
-            QMessageBox::critical(this, tr("Registration denied"), tr("Password too short."));
-            break;
-        case Response::RespUserIsBanned: {
-            QString bannedStr;
-            if (endTime)
-                bannedStr = tr("You are banned until %1.").arg(QDateTime::fromSecsSinceEpoch(endTime).toString());
-            else
-                bannedStr = tr("You are banned indefinitely.");
-            if (!reasonStr.isEmpty())
-                bannedStr.append("\n\n" + reasonStr);
-
-            QMessageBox::critical(this, tr("Error"), bannedStr);
-            break;
-        }
-        case Response::RespUsernameInvalid: {
-            QMessageBox::critical(this, tr("Error"), extractInvalidUsernameMessage(reasonStr));
-            break;
-        }
-        case Response::RespRegistrationFailed:
-            QMessageBox::critical(this, tr("Error"), tr("Registration failed for a technical problem on the server."));
-            break;
-        case Response::RespNotConnected:
-            QMessageBox::critical(this, tr("Error"), tr("The connection to the server has been lost."));
-            break;
-        default:
-            QMessageBox::critical(this, tr("Error"),
-                                  tr("Unknown registration error: %1").arg(static_cast<int>(r)) +
-                                      tr("\nThis usually means that your client version is out of date, and the server "
-                                         "sent a reply your client doesn't understand."));
-    }
-    actRegister();
-}
-
-void MainWindow::activateError()
-{
-    QMessageBox::critical(this, tr("Error"), tr("Account activation failed"));
-    client->disconnectFromServer();
-    actConnect();
-}
-
-void MainWindow::socketError(const QString &errorStr)
-{
-    QMessageBox::critical(this, tr("Error"), tr("Socket error: %1").arg(errorStr));
-    actConnect();
-}
-
-void MainWindow::protocolVersionMismatch(int localVersion, int remoteVersion)
-{
-    if (localVersion > remoteVersion)
-        QMessageBox::critical(this, tr("Error"),
-                              tr("You are trying to connect to an obsolete server. Please downgrade your Cockatrice "
-                                 "version or connect to a suitable server.\nLocal version is %1, remote version is %2.")
-                                  .arg(localVersion)
-                                  .arg(remoteVersion));
-    else
-        QMessageBox::critical(this, tr("Error"),
-                              tr("Your Cockatrice client is obsolete. Please update your Cockatrice version.\nLocal "
-                                 "version is %1, remote version is %2.")
-                                  .arg(localVersion)
-                                  .arg(remoteVersion));
-}
-
-void MainWindow::setClientStatusTitle()
-{
-    switch (client->getStatus()) {
-        case StatusConnecting:
-            setWindowTitle(appName + " - " + tr("Connecting to %1...").arg(client->peerName()));
-            break;
-        case StatusRegistering:
-            setWindowTitle(appName + " - " +
-                           tr("Registering to %1 as %2...").arg(client->peerName()).arg(client->getUserName()));
-            break;
-        case StatusDisconnected:
-            setWindowTitle(appName + " - " + tr("Disconnected"));
-            break;
-        case StatusLoggingIn:
-            setWindowTitle(appName + " - " + tr("Connected, logging in at %1").arg(client->peerName()));
-            break;
-        case StatusLoggedIn:
-            setWindowTitle(client->getUserName() + "@" + client->peerName());
-            break;
-        case StatusRequestingForgotPassword:
-            setWindowTitle(
-                appName + " - " +
-                tr("Requesting forgotten password to %1 as %2...").arg(client->peerName()).arg(client->getUserName()));
-            break;
-        case StatusSubmitForgotPasswordChallenge:
-            setWindowTitle(
-                appName + " - " +
-                tr("Requesting forgotten password to %1 as %2...").arg(client->peerName()).arg(client->getUserName()));
-            break;
-        case StatusSubmitForgotPasswordReset:
-            setWindowTitle(
-                appName + " - " +
-                tr("Requesting forgotten password to %1 as %2...").arg(client->peerName()).arg(client->getUserName()));
-            break;
-        default:
-            setWindowTitle(appName);
-    }
-}
-
 void MainWindow::retranslateUi()
 {
-    setClientStatusTitle();
+    connectionController->refreshWindowTitle();
 
     aConnect->setText(tr("&Connect..."));
     aDisconnect->setText(tr("&Disconnect"));
@@ -669,7 +354,7 @@ void MainWindow::retranslateUi()
     aRegister->setText(tr("&Register to server..."));
     aForgotPassword->setText(tr("&Restore password..."));
     aSettings->setText(tr("&Settings..."));
-    aSettings->setIcon(QPixmap("theme:icons/settings"));
+    aSettings->setIcon(themePixmap(QStringLiteral("icons/settings")));
     aExit->setText(tr("&Exit"));
 
 #if defined(__APPLE__) /* For OSX */
@@ -697,6 +382,7 @@ void MainWindow::retranslateUi()
     aStatusBar->setText(tr("Show Status Bar"));
     aViewLog->setText(tr("View &Debug Log"));
     aOpenSettingsFolder->setText(tr("Open Settings Folder"));
+    aFirstRunWizard->setText(tr("Re-run Onboarding Wizard..."));
 
     aShow->setText(tr("Show/Hide"));
 
@@ -718,9 +404,9 @@ void MainWindow::createActions()
     aFullScreen->setCheckable(true);
     connect(aFullScreen, &QAction::toggled, this, &MainWindow::actFullScreen);
     aRegister = new QAction(this);
-    connect(aRegister, &QAction::triggered, this, &MainWindow::actRegister);
+    connect(aRegister, &QAction::triggered, connectionController, &ConnectionController::registerToServer);
     aForgotPassword = new QAction(this);
-    connect(aForgotPassword, &QAction::triggered, this, &MainWindow::actForgotPasswordRequest);
+    connect(aForgotPassword, &QAction::triggered, connectionController, &ConnectionController::forgotPasswordRequest);
     aSettings = new QAction(this);
     connect(aSettings, &QAction::triggered, this, &MainWindow::actSettings);
     aExit = new QAction(this);
@@ -751,12 +437,15 @@ void MainWindow::createActions()
     connect(aCheckCardUpdatesBackground, &QAction::triggered, this, &MainWindow::actCheckCardUpdatesBackground);
     aStatusBar = new QAction(this);
     aStatusBar->setCheckable(true);
-    aStatusBar->setChecked(SettingsCache::instance().getShowStatusBar());
-    connect(aStatusBar, &QAction::triggered, &SettingsCache::instance(), &SettingsCache::setShowStatusBar);
+    aStatusBar->setChecked(SettingsCache::instance().userInterface().getShowStatusBar());
+    connect(aStatusBar, &QAction::triggered, &SettingsCache::instance().userInterface(),
+            &InterfaceSettings::setShowStatusBar);
     aViewLog = new QAction(this);
     connect(aViewLog, &QAction::triggered, this, &MainWindow::actViewLog);
     aOpenSettingsFolder = new QAction(this);
     connect(aOpenSettingsFolder, &QAction::triggered, this, &MainWindow::actOpenSettingsFolder);
+    aFirstRunWizard = new QAction(this);
+    connect(aFirstRunWizard, &QAction::triggered, this, [this] { runFirstRunWizard(); });
 
     aShow = new QAction(this);
     connect(aShow, &QAction::triggered, this, &MainWindow::actShow);
@@ -835,55 +524,44 @@ void MainWindow::createMenus()
     helpMenu->addAction(aStatusBar);
     helpMenu->addAction(aViewLog);
     helpMenu->addAction(aOpenSettingsFolder);
+    helpMenu->addSeparator();
+    helpMenu->addAction(aFirstRunWizard);
 }
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent), localServer(nullptr), bHasActivated(false), askedForDbUpdater(false),
       cardUpdateProcess(nullptr), logviewDialog(nullptr)
 {
-    connect(&SettingsCache::instance(), &SettingsCache::pixmapCacheSizeChanged, this,
+    connect(&SettingsCache::instance().cacheStorage(), &CacheStorageSettings::pixmapCacheSizeChanged, this,
             &MainWindow::pixmapCacheSizeChanged);
-    pixmapCacheSizeChanged(SettingsCache::instance().getPixmapCacheSize());
+    pixmapCacheSizeChanged(SettingsCache::instance().cacheStorage().getPixmapCacheSize());
 
-    client = new RemoteClient(nullptr, &SettingsCache::instance());
-    connect(client, &RemoteClient::connectionClosedEventReceived, this, &MainWindow::processConnectionClosedEvent);
-    connect(client, &RemoteClient::serverShutdownEventReceived, this, &MainWindow::processServerShutdownEvent);
-    connect(client, &RemoteClient::loginError, this, &MainWindow::loginError);
-    connect(client, &RemoteClient::socketError, this, &MainWindow::socketError);
-    connect(client, &RemoteClient::serverTimeout, this, &MainWindow::serverTimeout);
-    connect(client, &RemoteClient::statusChanged, this, &MainWindow::statusChanged);
-    connect(client, &RemoteClient::protocolVersionMismatch, this, &MainWindow::protocolVersionMismatch);
-    connect(client, &RemoteClient::userInfoChanged, this, &MainWindow::userInfoReceived, Qt::BlockingQueuedConnection);
-    connect(client, &RemoteClient::notifyUserAboutUpdate, this, &MainWindow::notifyUserAboutUpdate);
-    connect(client, &RemoteClient::registerAccepted, this, &MainWindow::registerAccepted);
-    connect(client, &RemoteClient::registerAcceptedNeedsActivate, this, &MainWindow::registerAcceptedNeedsActivate);
-    connect(client, &RemoteClient::registerError, this, &MainWindow::registerError);
-    connect(client, &RemoteClient::activateAccepted, this, &MainWindow::activateAccepted);
-    connect(client, &RemoteClient::activateError, this, &MainWindow::activateError);
-    connect(client, &RemoteClient::sigForgotPasswordSuccess, this, &MainWindow::forgotPasswordSuccess);
-    connect(client, &RemoteClient::sigForgotPasswordError, this, &MainWindow::forgotPasswordError);
-    connect(client, &RemoteClient::sigPromptForForgotPasswordReset, this, &MainWindow::promptForgotPasswordReset);
-    connect(client, &RemoteClient::sigPromptForForgotPasswordChallenge, this,
-            &MainWindow::promptForgotPasswordChallenge);
-
-    clientThread = new QThread(this);
-    client->moveToThread(clientThread);
-    clientThread->start();
+    connectionController = new ConnectionController(this, this);
+    urlParser = new IntentUrlParser(this, this);
+    connect(urlParser, &IntentUrlParser::urlChainFinished, this, &MainWindow::onUrlChainFinished);
 
     createActions();
     createMenus();
 
-    tabSupervisor = new TabSupervisor(client, tabsMenu, this);
+    connect(connectionController, &ConnectionController::windowTitleChanged, this, &MainWindow::setWindowTitle);
+    connect(connectionController, &ConnectionController::statusChanged, this, &MainWindow::statusChanged);
+
+    tabSupervisor = new TabSupervisor(connectionController->client(), tabsMenu, this);
     connect(tabSupervisor, &TabSupervisor::setMenu, this, &MainWindow::updateTabMenu);
     connect(tabSupervisor, &TabSupervisor::localGameEnded, this, &MainWindow::localGameEnded);
     connect(tabSupervisor, &TabSupervisor::showWindowIfHidden, this, &MainWindow::showWindowIfHidden);
+    connect(tabSupervisor, &TabSupervisor::cockatriceLinkActivated, this, &MainWindow::handleCockatriceLink);
+    connect(connectionController, &ConnectionController::tabSupervisorStartRequested, tabSupervisor,
+            &TabSupervisor::start);
+    connect(connectionController, &ConnectionController::tabSupervisorStopRequested, tabSupervisor,
+            &TabSupervisor::stop);
     tabSupervisor->initStartupTabs();
 
     setCentralWidget(tabSupervisor);
 
     retranslateUi();
 
-    if (!restoreGeometry(SettingsCache::instance().getMainWindowGeometry())) {
+    if (!restoreGeometry(SettingsCache::instance().layouts().getMainWindowGeometry())) {
         setWindowState(Qt::WindowMaximized);
     }
     aFullScreen->setChecked(static_cast<bool>(windowState() & Qt::WindowFullScreen));
@@ -893,9 +571,22 @@ MainWindow::MainWindow(QWidget *parent)
     }
 
     // status bar
-    connect(&SettingsCache::instance(), &SettingsCache::showStatusBarChanged, this,
+    connect(&SettingsCache::instance().userInterface(), &InterfaceSettings::showStatusBarChanged, this,
             [this](bool show) { statusBar()->setVisible(show); });
-    statusBar()->setVisible(SettingsCache::instance().getShowStatusBar());
+    statusBar()->setVisible(SettingsCache::instance().userInterface().getShowStatusBar());
+
+    latencyStatus = new LatencyStatusWidget(this);
+    statusBar()->addPermanentWidget(latencyStatus);
+
+    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);
@@ -912,46 +603,116 @@ MainWindow::MainWindow(QWidget *parent)
 
     // run startup check async
     QTimer::singleShot(0, this, &MainWindow::startupConfigCheck);
+    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()
 {
-    if (SettingsCache::instance().debug().getLocalGameOnStartup()) {
-        startLocalGame(SettingsCache::instance().debug().getLocalGamePlayerCount());
+    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.
+    // 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.
+    if (!isCleanInstall) {
+        CardDatabaseManager::getInstance()->checkUnknownSets();
     }
 
-    if (SettingsCache::instance().getCheckUpdatesOnStartup()) {
+    if (SettingsCache::instance().debug().getLocalGameOnStartup()) {
+        LocalGameOptions options;
+        options.numberPlayers = SettingsCache::instance().debug().getLocalGamePlayerCount();
+        startLocalGame(options);
+    }
+
+    if (SettingsCache::instance().updates().getCheckUpdatesOnStartup()) {
         actCheckClientUpdates();
     }
 
-    if (SettingsCache::instance().getClientVersion() == CLIENT_INFO_NOT_SET) {
+    actCheckCommanderBracketDefinitionUpdates();
+
+    if (isCleanInstall) {
         // no config found, 99% new clean install
         qCInfo(WindowMainStartupVersionLog)
             << "Startup: old client version empty, assuming first start after clean install";
-        alertForcedOracleRun(VERSION_STRING, false);
         SettingsCache::instance().downloads().resetToDefaultURLs(); // populate the download urls
-        SettingsCache::instance().setClientVersion(VERSION_STRING);
-    } else if (SettingsCache::instance().getClientVersion() != VERSION_STRING) {
+        SettingsCache::instance().network().setClientVersion(VERSION_STRING);
+        actCheckServerUpdates();
+        runFirstRunWizard(true);
+
+        if (QString(VERSION_STRING).contains("custom", Qt::CaseInsensitive)) {
+            SettingsCache::instance().updates().setCheckUpdatesOnStartup(false);
+        } else if (QString(VERSION_STRING).contains("beta", Qt::CaseInsensitive)) {
+            SettingsCache::instance().updates().setUpdateReleaseChannelIndex(1);
+        }
+    } else if (SettingsCache::instance().network().getClientVersion() != VERSION_STRING) {
         // config found, from another (presumably older) version
         qCInfo(WindowMainStartupVersionLog)
-            << "Startup: old client version" << SettingsCache::instance().getClientVersion()
+            << "Startup: old client version" << SettingsCache::instance().network().getClientVersion()
             << "differs, assuming first start after update";
-        if (SettingsCache::instance().getNotifyAboutNewVersion()) {
+        if (SettingsCache::instance().updates().getNotifyAboutNewVersion()) {
             alertForcedOracleRun(VERSION_STRING, true);
-        } else {
-            const auto reloadOk0 = QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); });
         }
 
-        qCInfo(WindowMainStartupShortcutsLog) << "[MainWindow] Migrating shortcuts after update detected.";
+        qCInfo(WindowMainStartupShortcutsLog) << "Migrating shortcuts after update detected.";
         SettingsCache::instance().shortcuts().migrateShortcuts();
 
-        SettingsCache::instance().setClientVersion(VERSION_STRING);
+        if (SettingsCache::instance().updates().getCheckUpdatesOnStartup()) {
+            if (QString(VERSION_STRING).contains("custom", Qt::CaseInsensitive)) {
+                qCInfo(WindowMainStartupShortcutsLog) << "Update has changed to custom version, disabling auto update";
+                SettingsCache::instance().updates().setCheckUpdatesOnStartup(false);
+            } else {
+                int channel = 0;
+                if (QString(VERSION_STRING).contains("beta", Qt::CaseInsensitive)) {
+                    channel = 1;
+                }
+                if (SettingsCache::instance().getUpdateReleaseChannelIndex() != channel) {
+                    qCInfo(WindowMainStartupShortcutsLog) << "Update has changed beta state, updating release channel.";
+                    SettingsCache::instance().updates().setUpdateReleaseChannelIndex(channel);
+                }
+            }
+        }
+
+        SettingsCache::instance().network().setClientVersion(VERSION_STRING);
     } else {
         // previous config from this version found
         qCInfo(WindowMainStartupVersionLog) << "Startup: found config with current version";
 
-        if (SettingsCache::instance().getCardUpdateCheckRequired()) {
-            if (SettingsCache::instance().getStartupCardUpdateCheckPromptForUpdate()) {
+        if (SettingsCache::instance().updates().getCardUpdateCheckRequired()) {
+            if (SettingsCache::instance().updates().getStartupCardUpdateCheckPromptForUpdate()) {
                 auto startupCardCheckDialog = new DlgStartupCardCheck(this);
 
                 if (startupCardCheckDialog->exec() == QDialog::Accepted) {
@@ -963,34 +724,145 @@ void MainWindow::startupConfigCheck()
                             actCheckCardUpdatesBackground();
                             break;
                         case 2: // background + always
-                            SettingsCache::instance().setStartupCardUpdateCheckPromptForUpdate(false);
-                            SettingsCache::instance().setStartupCardUpdateCheckAlwaysUpdate(true);
+                            SettingsCache::instance().updates().setStartupCardUpdateCheckPromptForUpdate(false);
+                            SettingsCache::instance().updates().setStartupCardUpdateCheckAlwaysUpdate(true);
                             actCheckCardUpdatesBackground();
                             break;
                         case 3: // don't prompt again + don't run
-                            SettingsCache::instance().setStartupCardUpdateCheckPromptForUpdate(false);
-                            SettingsCache::instance().setStartupCardUpdateCheckAlwaysUpdate(false);
+                            SettingsCache::instance().updates().setStartupCardUpdateCheckPromptForUpdate(false);
+                            SettingsCache::instance().updates().setStartupCardUpdateCheckAlwaysUpdate(false);
                             break;
                         default:
                             break;
                     }
                 }
-            } else if (SettingsCache::instance().getStartupCardUpdateCheckAlwaysUpdate()) {
+            } else if (SettingsCache::instance().updates().getStartupCardUpdateCheckAlwaysUpdate()) {
                 actCheckCardUpdatesBackground();
             }
         }
 
-        const auto reloadOk1 = QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); });
-
         // Run the tips dialog only on subsequent startups.
         // On the first run after an install/update the startup is already crowded enough
-        if (tip->successfulInit && SettingsCache::instance().getShowTipsOnStartup() && tip->newTipsAvailable) {
+        if (tip->successfulInit && SettingsCache::instance().personal().getShowTipsOnStartup() &&
+            tip->newTipsAvailable) {
             tip->raise();
             tip->show();
         }
     }
 }
 
+void MainWindow::runFirstRunWizard(bool firstRun)
+{
+    auto *wizard = new FirstRunWizard(this);
+    wizard->setAttribute(Qt::WA_DeleteOnClose);
+
+    connect(wizard, &FirstRunWizard::cardDatabaseUpdateRequested, this, &MainWindow::actCheckCardUpdatesBackground);
+    connect(wizard, &FirstRunWizard::manualCardDatabaseSetupRequested, this, &MainWindow::actCheckCardUpdates);
+    connect(this, &MainWindow::cardDatabaseUpdateFinished, wizard, &FirstRunWizard::onCardDatabaseUpdateFinished);
+    connect(this, &MainWindow::cardDatabaseUpdateProgress, wizard, &FirstRunWizard::onCardDatabaseUpdateProgress);
+    connect(wizard, &FirstRunWizard::registerRequested, connectionController, &ConnectionController::registerToServer);
+    connect(wizard, &FirstRunWizard::connectRequested, connectionController, &ConnectionController::connectToServer);
+
+    if (firstRun) {
+        // The onboarding wizard owns set handling for a clean install. Suppress
+        // the legacy set dialogs while it's open and run checkUnknownSets() once
+        // it closes so the sets end up enabled in the right order.
+        firstRunWizardActive = true;
+        connect(wizard, &QDialog::finished, this, [this] {
+            QTimer::singleShot(0, this, [this] {
+                CardDatabaseManager::getInstance()->checkUnknownSets();
+                firstRunWizardActive = false;
+            });
+        });
+    }
+
+    wizard->setModal(true);
+    wizard->show();
+}
+
+/**
+ * Drives the server-based startup destinations (Server lobby, Server Room) through the intent
+ * system: fetch saved credentials, connect to the configured server, then land on the Lobby or
+ * join the configured room by name.
+ */
+void MainWindow::applyStartupDestination()
+{
+    // An explicit command-line connect takes precedence over the startup destination.
+    if (!connectTo.isEmpty()) {
+        return;
+    }
+
+    // A cockatrice:// link owns the startup connection while its chain runs;
+    // connecting here would race (and tear down) the link's own connection.
+    if (skipStartupAutoConnect) {
+        return;
+    }
+
+    const int destination = SettingsCache::instance().tabs().getStartupTabIndex();
+    if (destination != StartupTab::StartupTabServer && destination != StartupTab::StartupTabServerRoom) {
+        return;
+    }
+
+    const QString host = SettingsCache::instance().tabs().getStartupServerHost();
+    const QString port = SettingsCache::instance().tabs().getStartupServerPort();
+    if (host.isEmpty() || port.isEmpty()) {
+        qCWarning(WindowMainStartupLog) << "Startup destination needs a configured server";
+        return;
+    }
+
+    auto serverContext = std::make_shared<ContextConnectToServer>();
+    serverContext->hostname = host;
+    serverContext->port = port;
+
+    auto *credentials = new IntentGetLoginCredentials(serverContext.get());
+    auto *connector = new IntentConnectToServer(getRemoteClient(), serverContext.get());
+
+    connect(credentials, &Intent::finished, connector, &Intent::execute);
+    connect(credentials, &Intent::failed, this, &MainWindow::startupDestinationFailed);
+    connect(credentials, &Intent::cancelled, this, [this]() { startupDestinationFailed(tr("Sign-in cancelled")); });
+    connect(connector, &Intent::finished, this,
+            [this, destination, serverContext]() { onStartupDestinationConnected(destination, *serverContext); });
+    connect(connector, &Intent::failed, this, &MainWindow::startupDestinationFailed);
+
+    credentials->execute();
+}
+
+void MainWindow::onStartupDestinationConnected(int destination, const ContextConnectToServer &serverContext)
+{
+    // The server tab must exist: it is what requests the room list.
+    if (!tabSupervisor->getTabServer()) {
+        tabSupervisor->openTabServer();
+    }
+
+    if (destination == StartupTab::StartupTabServerRoom) {
+        auto roomContext = std::make_unique<ContextJoinRoom>();
+        roomContext->serverContext = serverContext;
+        auto *roomIntent = new IntentOpenServerRoomByName(tabSupervisor, getRemoteClient(), std::move(roomContext),
+                                                          SettingsCache::instance().tabs().getStartupRoomName());
+        roomIntent->setParent(this);
+        connect(roomIntent, &Intent::failed, this, &MainWindow::startupDestinationFailed);
+        roomIntent->execute();
+        return;
+    }
+
+    if (tabSupervisor->getTabServer()) {
+        tabSupervisor->setCurrentWidget(tabSupervisor->getTabServer());
+    } else {
+        qCWarning(WindowMainStartupLog) << "Startup destination: server tab could not be opened";
+    }
+}
+
+void MainWindow::startupDestinationFailed(const QString &reason)
+{
+    qCWarning(WindowMainStartupLog) << "Startup destination failed:" << reason;
+}
+
+bool MainWindow::startupDestinationConnectsToServer() const
+{
+    const int destination = SettingsCache::instance().tabs().getStartupTabIndex();
+    return destination == StartupTab::StartupTabServer || destination == StartupTab::StartupTabServerRoom;
+}
+
 void MainWindow::alertForcedOracleRun(const QString &version, bool isUpdate)
 {
     if (isUpdate) {
@@ -1007,6 +879,7 @@ void MainWindow::alertForcedOracleRun(const QString &version, bool isUpdate)
 
     actCheckCardUpdates();
     actCheckServerUpdates();
+    actCheckCommanderBracketDefinitionUpdates();
 }
 
 MainWindow::~MainWindow()
@@ -1026,9 +899,6 @@ MainWindow::~MainWindow()
         cardUpdateProcess->waitForFinished(1000);
         cardUpdateProcess = nullptr;
     }
-
-    client->deleteLater();
-    clientThread->wait();
 }
 
 void MainWindow::createTrayIcon()
@@ -1044,7 +914,7 @@ void MainWindow::createTrayIcon()
 
     trayIcon = new QSystemTrayIcon(this);
     trayIcon->setContextMenu(trayIconMenu);
-    trayIcon->setIcon(QPixmap("theme:cockatrice"));
+    trayIcon->setIcon(themePixmap(QStringLiteral("cockatrice")));
     trayIcon->show();
 }
 
@@ -1062,22 +932,30 @@ void MainWindow::actShow()
     });
 }
 
-void MainWindow::promptForgotPasswordChallenge()
-{
-    DlgForgotPasswordChallenge dlg(this);
-    if (dlg.exec())
-        client->submitForgotPasswordChallengeToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
-                                                      dlg.getPlayerName(), dlg.getEmail());
-}
-
 void MainWindow::closeEvent(QCloseEvent *event)
 {
     // workaround Qt bug where closeEvent gets called twice
-    static bool bClosingDown = false;
-    if (bClosingDown)
+    if (bClosingDown) {
         return;
+    }
     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) {
+            event->ignore();
+            bClosingDown = false;
+            return;
+        }
+    }
+
     if (!tabSupervisor->close()) {
         event->ignore();
         bClosingDown = false;
@@ -1086,27 +964,30 @@ void MainWindow::closeEvent(QCloseEvent *event)
     tip->close();
 
     event->accept();
-    SettingsCache::instance().setMainWindowGeometry(saveGeometry());
+    SettingsCache::instance().layouts().setMainWindowGeometry(saveGeometry());
     tabSupervisor->deleteLater();
 }
 
+bool MainWindow::closeForUpdate()
+{
+    // A shutdown is already being handled (e.g. this is reached from a nested event loop while
+    // closeEvent() is blocked on a user prompt). close() would hit the re-entrancy guard and return
+    // true without any shutdown having happened, so report faithfully instead: the caller must keep
+    // the process alive until the user resolves whatever is blocking the close.
+    if (bClosingDown) {
+        return false;
+    }
+    return close();
+}
+
 void MainWindow::changeEvent(QEvent *event)
 {
-    if (event->type() == QEvent::LanguageChange)
+    if (event->type() == QEvent::LanguageChange) {
         retranslateUi();
-    else if (event->type() == QEvent::ActivationChange) {
+    } else if (event->type() == QEvent::ActivationChange) {
         if (isActiveWindow() && !bHasActivated) {
             bHasActivated = true;
-            if (!connectTo.isEmpty()) {
-                qCInfo(WindowMainStartupAutoconnectLog) << "Command line connect to " << connectTo;
-                client->connectToServer(connectTo.host(), connectTo.port(), connectTo.userName(), connectTo.password());
-            } else if (SettingsCache::instance().servers().getAutoConnect() &&
-                       !SettingsCache::instance().debug().getLocalGameOnStartup()) {
-                qCInfo(WindowMainStartupAutoconnectLog) << "Attempting auto-connect...";
-                DlgConnect dlg(this);
-                client->connectToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()), dlg.getPlayerName(),
-                                        dlg.getPassword());
-            }
+            attemptStartupAutoConnect();
         }
     }
 
@@ -1127,6 +1008,64 @@ void MainWindow::showWindowIfHidden()
     show();
 }
 
+void MainWindow::handleCockatriceLink(const QString &url)
+{
+    urlParser->handle(url);
+}
+
+void MainWindow::attemptStartupAutoConnect()
+{
+    if (startupAutoConnectAttempted || skipStartupAutoConnect) {
+        return;
+    }
+    startupAutoConnectAttempted = true;
+
+    if (!connectTo.isEmpty()) {
+        qCInfo(WindowMainStartupAutoconnectLog) << "Command line connect to " << connectTo;
+        connectionController->connectToServerDirect(connectTo.host(), connectTo.port(), connectTo.userName(),
+                                                    connectTo.password());
+    } else if (SettingsCache::instance().servers().getAutoConnect() &&
+               !SettingsCache::instance().debug().getLocalGameOnStartup() && !startupDestinationConnectsToServer()) {
+        qCInfo(WindowMainStartupAutoconnectLog) << "Attempting auto-connect...";
+        DlgConnect dlg(this);
+        connectionController->connectToServerDirect(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
+                                                    dlg.getPlayerName(), dlg.getPassword());
+    }
+}
+
+void MainWindow::onUrlChainFinished(bool connected)
+{
+    // A cockatrice:// link owns the startup connection while it runs. When its
+    // chain ended without connecting (declined, invalid, offline), fall back to
+    // the startup connection so the activation launch still behaves like a
+    // normal launch.
+    if (connected) {
+        // The launch link connected, so the startup fallback has served its
+        // purpose: drop the skip so a later mid-session link that ends declined
+        // or offline cannot silently fire auto-connect or applyStartupDestination
+        // again.
+        skipStartupAutoConnect = false;
+        return;
+    }
+
+    if (!skipStartupAutoConnect || getRemoteClient()->getStatus() != StatusDisconnected) {
+        return;
+    }
+
+    if (startupDestinationConnectsToServer()) {
+        // Users whose startup tab is a Server / Server Room connect through the
+        // startup destination, not through auto-connect; retry that instead.
+        qCInfo(WindowMainStartupAutoconnectLog) << "URL chain ended without a connection; retrying startup destination";
+        skipStartupAutoConnect = false;
+        applyStartupDestination();
+        return;
+    }
+
+    qCInfo(WindowMainStartupAutoconnectLog) << "URL chain ended without a connection; retrying startup connect";
+    skipStartupAutoConnect = false;
+    attemptStartupAutoConnect();
+}
+
 void MainWindow::cardDatabaseLoadingFailed()
 {
     if (askedForDbUpdater) {
@@ -1156,6 +1095,13 @@ void MainWindow::cardDatabaseLoadingFailed()
 
 void MainWindow::cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknownSetsNames)
 {
+    if (firstRunWizardActive || SettingsCache::instance().updates().getAlwaysEnableNewSets()) {
+        CardDatabaseManager::getInstance()->enableAllUnknownSets();
+        const auto reloadOk1 =
+            QtConcurrent::run([] { CardDatabaseManager::getInstance()->reloadCardDatabasesAndNotify(); });
+        return;
+    }
+
     QMessageBox msgBox(this);
     msgBox.setWindowTitle(tr("New sets found"));
     msgBox.setIcon(QMessageBox::Question);
@@ -1166,6 +1112,7 @@ void MainWindow::cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknow
                        .arg(unknownSetsNames.join(", ")));
 
     QPushButton *yesButton = msgBox.addButton(tr("Yes"), QMessageBox::YesRole);
+    QPushButton *yesAlwaysButton = msgBox.addButton(tr("Yes, always enable"), QMessageBox::YesRole);
     QPushButton *noButton = msgBox.addButton(tr("No"), QMessageBox::NoRole);
     QPushButton *settingsButton = msgBox.addButton(tr("View sets"), QMessageBox::ActionRole);
     msgBox.setDefaultButton(yesButton);
@@ -1174,7 +1121,13 @@ void MainWindow::cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknow
 
     if (msgBox.clickedButton() == yesButton) {
         CardDatabaseManager::getInstance()->enableAllUnknownSets();
-        const auto reloadOk1 = QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); });
+        const auto reloadOk1 =
+            QtConcurrent::run([] { CardDatabaseManager::getInstance()->reloadCardDatabasesAndNotify(); });
+    } else if (msgBox.clickedButton() == yesAlwaysButton) {
+        CardDatabaseManager::getInstance()->enableAllUnknownSets();
+        const auto reloadOk1 =
+            QtConcurrent::run([] { CardDatabaseManager::getInstance()->reloadCardDatabasesAndNotify(); });
+        SettingsCache::instance().updates().setAlwaysEnableNewSets(true);
     } else if (msgBox.clickedButton() == noButton) {
         CardDatabaseManager::getInstance()->markAllSetsAsKnown();
     } else if (msgBox.clickedButton() == settingsButton) {
@@ -1185,12 +1138,35 @@ void MainWindow::cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknow
 
 void MainWindow::cardDatabaseAllNewSetsEnabled()
 {
-    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();
+    auto *cardDatabase = CardDatabaseManager::getInstance();
+
+    // With no card data there is nothing to have enabled and nothing to reparse.
+    if (cardDatabase->getCardList().isEmpty()) {
+        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(); }));
 }
 
 /* CARD UPDATER */
@@ -1207,16 +1183,28 @@ void MainWindow::actCheckCardUpdatesBackground()
 void MainWindow::createCardUpdateProcess(bool background)
 {
     if (cardUpdateProcess) {
-        QMessageBox::information(this, tr("Information"), tr("A card database update is already running."));
+        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."));
         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;
@@ -1250,7 +1238,7 @@ void MainWindow::createCardUpdateProcess(bool background)
 
     if (dir.exists(binaryName)) {
         updaterCmd = dir.absoluteFilePath(binaryName);
-    } else { // try and find the directory oracle is stored in the build directory
+    } else { // try and find the directory Oracle is stored in the build directory
         QDir findLocalDir(dir);
         findLocalDir.cdUp();
         findLocalDir.cd(getCardUpdaterBinaryName());
@@ -1261,27 +1249,109 @@ 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();
+        emit cardDatabaseUpdateFinished(false);
         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 {
         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."));
+        }
+    }
+}
+
+void MainWindow::cardUpdateProgressOutput()
+{
+    if (!cardUpdateProcess) {
+        return;
+    }
+    cardUpdateOutputBuffer.append(cardUpdateProcess->readAllStandardOutput());
+    while (true) {
+        const int newline = cardUpdateOutputBuffer.indexOf('\n');
+        if (newline < 0) {
+            break;
+        }
+        const QByteArray line = cardUpdateOutputBuffer.left(newline);
+        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()) {
+            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();
+        }
+        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;
+        }
     }
 }
 
 void MainWindow::exitCardDatabaseUpdate()
 {
+    if (!cardUpdateProcess) {
+        return;
+    }
     cardUpdateProcess->deleteLater();
     cardUpdateProcess = nullptr;
     statusBar()->clearMessage();
 
-    const auto reloadOk1 = QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); });
+    // 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(); }));
 }
 
 void MainWindow::cardUpdateError(QProcess::ProcessError err)
@@ -1293,7 +1363,6 @@ 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.");
@@ -1312,16 +1381,67 @@ 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);
 }
 
-void MainWindow::cardUpdateFinished(int, QProcess::ExitStatus exitStatus)
+void MainWindow::cardUpdateFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
-    if (exitStatus == QProcess::NormalExit) {
-        SettingsCache::instance().setLastCardUpdateCheck(QDateTime::currentDateTime().date());
+    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()
@@ -1346,6 +1466,16 @@ void MainWindow::checkClientUpdatesFinished(bool needToUpdate, bool /* isCompati
     }
 }
 
+void MainWindow::actCheckCommanderBracketDefinitionUpdates()
+{
+    auto *handler = new HandleCommanderBrackets(this);
+
+    connect(handler, &HandleCommanderBrackets::sigBracketDefinitionsDownloaded, this,
+            []() { qDebug() << "Bracket definitions loaded"; });
+
+    handler->downloadBracketDefinitions();
+}
+
 void MainWindow::refreshShortcuts()
 {
     ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
@@ -1364,18 +1494,9 @@ void MainWindow::refreshShortcuts()
     aStatusBar->setShortcuts(shortcuts.getShortcut("MainWindow/aStatusBar"));
 }
 
-void MainWindow::notifyUserAboutUpdate()
-{
-    QMessageBox::information(
-        this, tr("Information"),
-        tr("This server supports additional features that your client doesn't have.\nThis 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.\n\nTo update your client, go to Help -> Check for Updates."));
-}
-
 void MainWindow::actOpenCustomFolder()
 {
-    QString dir = SettingsCache::instance().getCustomPicsPath();
+    QString dir = SettingsCache::instance().paths().getCustomPicsPath();
     QDesktopServices::openUrl(QUrl::fromLocalFile(dir));
 }
 
@@ -1432,7 +1553,8 @@ 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."));
-        const auto reloadOk1 = QtConcurrent::run([] { CardDatabaseManager::getInstance()->loadCardDatabases(); });
+        // Imported files can introduce sets the config has never seen.
+        reloadCardDatabaseAndCheckSets();
     } else {
         QMessageBox::warning(this, tr("Load sets/cards"), tr("Sets/cards failed to import."));
     }
@@ -1446,8 +1568,9 @@ int MainWindow::getNextCustomSetPrefix(QDir dataDir)
     QStringList::const_iterator filesIterator;
     for (filesIterator = files.constBegin(); filesIterator != files.constEnd(); ++filesIterator) {
         int fileIndex = (*filesIterator).split(".").at(0).toInt();
-        if (fileIndex > maxIndex)
+        if (fileIndex > maxIndex) {
             maxIndex = fileIndex;
+        }
     }
 
     return maxIndex + 1;
@@ -1456,7 +1579,7 @@ int MainWindow::getNextCustomSetPrefix(QDir dataDir)
 void MainWindow::actReloadCardDatabase()
 {
     const auto reloadOk1 = QtConcurrent::run([] {
-        CardDatabaseManager::getInstance()->loadCardDatabases();
+        CardDatabaseManager::getInstance()->reloadCardDatabasesAndNotify();
         SettingsCache::instance().downloads().sync();
     });
 }
@@ -1473,42 +1596,3 @@ void MainWindow::actEditTokens()
     dlg.exec();
     CardDatabaseManager::getInstance()->saveCustomTokensToFile();
 }
-
-void MainWindow::actForgotPasswordRequest()
-{
-    DlgForgotPasswordRequest dlg(this);
-    if (dlg.exec())
-        client->requestForgotPasswordToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
-                                              dlg.getPlayerName());
-}
-
-void MainWindow::forgotPasswordSuccess()
-{
-    QMessageBox::information(
-        this, tr("Reset Password"),
-        tr("Your password has been reset successfully, you can now log in using the new credentials."));
-    SettingsCache::instance().servers().setFPHostName("");
-    SettingsCache::instance().servers().setFPPort("");
-    SettingsCache::instance().servers().setFPPlayerName("");
-}
-
-void MainWindow::forgotPasswordError()
-{
-    QMessageBox::warning(
-        this, tr("Reset Password"),
-        tr("Failed to reset user account password, please contact the server operator to reset your password."));
-    SettingsCache::instance().servers().setFPHostName("");
-    SettingsCache::instance().servers().setFPPort("");
-    SettingsCache::instance().servers().setFPPlayerName("");
-}
-
-void MainWindow::promptForgotPasswordReset()
-{
-    QMessageBox::information(this, tr("Reset Password"),
-                             tr("Activation request received, please check your email for an activation token."));
-    DlgForgotPasswordReset dlg(this);
-    if (dlg.exec()) {
-        client->submitForgotPasswordResetToServer(dlg.getHost(), static_cast<unsigned int>(dlg.getPort()),
-                                                  dlg.getPlayerName(), dlg.getToken(), dlg.getPassword());
-    }
-}
diff --git a/cockatrice/src/interface/window_main.h b/cockatrice/src/interface/window_main.h
index 75b0f5062..ee8873000 100644
--- a/cockatrice/src/interface/window_main.h
+++ b/cockatrice/src/interface/window_main.h
@@ -20,42 +20,66 @@
 /**
  * @file window_main.h
  * @ingroup Core
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 #ifndef WINDOW_H
 #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 <QByteArray>
+#include <QDir>
+#include <QElapsedTimer>
 #include <QList>
+#include <QLoggingCategory>
 #include <QMainWindow>
-#include <QMessageBox>
-#include <QSystemTrayIcon>
-#include <QtNetwork>
+#include <QMenu>
+#include <QProcess>
+#include <QString>
+#include <QStringList>
+#include <QUrl>
+#include <QtGlobal>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
+#include <qtmetamacros.h>
+
+class QAction;
+class QWidget;
+struct LocalGameOptions;
 
 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 QThread;
+class LatencyStatusWidget;
+class CardDatabaseUpdateStatusBar;
 class RemoteClient;
-class ServerInfo_User;
 class TabSupervisor;
 class WndSets;
 class DlgTipOfTheDay;
+struct ContextConnectToServer;
+class IntentUrlParser;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
+signals:
+    /** @brief Emitted after the 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);
+
 public slots:
     void actCheckCardUpdates();
     void actCheckCardUpdatesBackground();
@@ -63,51 +87,37 @@ public slots:
     void actCheckClientUpdates();
     void actConnect();
     void actExit();
+    void handleCockatriceLink(const QString &url);
 private slots:
     void updateTabMenu(const QList<QMenu *> &newMenuList);
     void statusChanged(ClientStatus _status);
-    void processConnectionClosedEvent(const Event_ConnectionClosed &event);
-    void processServerShutdownEvent(const Event_ServerShutdown &event);
-    void serverTimeout();
-    void loginError(Response::ResponseCode r, QString reasonStr, quint32 endTime, QList<QString> missingFeatures);
-    void registerError(Response::ResponseCode r, QString reasonStr, quint32 endTime);
-    void activateError();
-    void socketError(const QString &errorStr);
-    void protocolVersionMismatch(int localVersion, int remoteVersion);
-    void userInfoReceived(const ServerInfo_User &userInfo);
-    void registerAccepted();
-    void registerAcceptedNeedsActivate();
-    void activateAccepted();
     void localGameEnded();
     void pixmapCacheSizeChanged(int newSizeInMBs);
-    void notifyUserAboutUpdate();
     void actDisconnect();
     void actSinglePlayer();
     void actWatchReplay();
     void actFullScreen(bool checked);
-    void actRegister();
     void actSettings();
-    void actForgotPasswordRequest();
     void actAbout();
     void actTips();
     void actUpdate();
     void actViewLog();
     void actOpenSettingsFolder();
-    void forgotPasswordSuccess();
-    void forgotPasswordError();
-    void promptForgotPasswordReset();
     void actShow();
-    void promptForgotPasswordChallenge();
     void showWindowIfHidden();
+    void onUrlChainFinished(bool connected);
 
     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);
     void cardDatabaseAllNewSetsEnabled();
 
     void checkClientUpdatesFinished(bool needToUpdate, bool isCompatible, Release *release);
+    void actCheckCommanderBracketDefinitionUpdates();
 
     void actOpenCustomFolder();
     void actOpenCustomsetsFolder();
@@ -120,24 +130,53 @@ private slots:
     void startupConfigCheck();
     void alertForcedOracleRun(const QString &version, bool isUpdate);
 
+    void applyStartupDestination();
+    void onStartupDestinationConnected(int destination, const ContextConnectToServer &serverContext);
+    void startupDestinationFailed(const QString &reason);
+    [[nodiscard]] bool startupDestinationConnectsToServer() const;
+
+    void attemptStartupAutoConnect();
+
 private:
     static const QString appName;
     static const QStringList fileNameFilters;
-    void setClientStatusTitle();
     void retranslateUi();
     void createActions();
     void createMenus();
 
     void createTrayIcon();
     int getNextCustomSetPrefix(QDir dataDir);
+
+    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(int numberPlayers);
+    void startLocalGame(const LocalGameOptions &options);
 
     QList<QMenu *> tabMenus;
     QMenu *cockatriceMenu, *dbMenu, *tabsMenu, *helpMenu, *trayIconMenu;
@@ -145,19 +184,29 @@ private:
     QAction *aConnect, *aDisconnect, *aRegister, *aForgotPassword, *aSinglePlayer, *aWatchReplay, *aFullScreen;
     QAction *aManageSets, *aEditTokens, *aOpenCustomFolder, *aOpenCustomsetsFolder, *aAddCustomSet,
         *aReloadCardDatabase;
-    QAction *aTips, *aUpdate, *aCheckCardUpdates, *aCheckCardUpdatesBackground, *aStatusBar, *aViewLog,
-        *aOpenSettingsFolder;
+    QAction *aTips, *aUpdate, *aCheckCardUpdates, *aCheckCardUpdatesBackground, *aFirstRunWizard, *aStatusBar,
+        *aViewLog, *aOpenSettingsFolder;
 
     TabSupervisor *tabSupervisor;
+    IntentUrlParser *urlParser;
     WndSets *wndSets;
-    RemoteClient *client;
-    QThread *clientThread;
+    ConnectionController *connectionController;
     LocalServer *localServer;
+    LagMonitor lagMonitor;                        ///< watches the main thread for event loop stalls
+    LatencyStatusWidget *latencyStatus = nullptr; ///< status bar widget with live round-trip stats and history graph
     bool bHasActivated, askedForDbUpdater;
-    QMessageBox serverShutdownMessageBox;
+    bool bClosingDown = false; ///< guards closeEvent() against re-entrancy
+    bool skipStartupAutoConnect = false;
+    bool startupAutoConnectAttempted = false;
+    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;
-    DlgConnect *dlgConnect;
     GameReplay *replay;
     DlgTipOfTheDay *tip;
     QUrl connectTo;
@@ -168,17 +217,38 @@ public:
     {
         connectTo = QUrl(QString("cockatrice://%1").arg(url));
     }
+    // When set, the window's own startup connection (--connect or auto-connect
+    // on first activation) is skipped. Used for activation launches: the intent
+    // chain triggered by a cockatrice:// URL owns the connection, and letting
+    // auto-connect race against it caused two connectToServer calls to tear
+    // each other down. onUrlChainFinished() clears this and retries the startup
+    // connection when the link's chain ended without connecting.
+    void setSkipStartupAutoConnect(bool skip)
+    {
+        skipStartupAutoConnect = skip;
+    }
     ~MainWindow() override;
 
+    RemoteClient *getRemoteClient() const
+    {
+        return connectionController->client();
+    }
+
     TabSupervisor *getTabSupervisor() const
     {
         return tabSupervisor;
     }
 
+    /**
+     * @brief Closes the window so an update installer can replace the running binaries.
+     *        Returns true only if the shutdown actually ran (settings flushed, tabs shut down);
+     *        false if the close was vetoed by the user or is already in progress.
+     */
+    bool closeForUpdate();
+
 protected:
     void closeEvent(QCloseEvent *event) override;
     void changeEvent(QEvent *event) override;
-    QString extractInvalidUsernameMessage(QString &in);
 };
 
 #endif
diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp
index 29dacee74..3f63efc3b 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -23,24 +23,57 @@
 #include "client/network/update/card_spoiler/spoiler_background_updater.h"
 #include "client/settings/cache_settings.h"
 #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/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 <QLibraryInfo>
+#include <QFileInfo>
+#include <QGuiApplication>
+#include <QIcon>
+#include <QList>
 #include <QLocale>
-#include <QSystemTrayIcon>
+#include <QMessageBox>
+#include <QMessageLogger>
+#include <QNetworkInterface>
+#include <QObject>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
+#include <QStringLiteral>
 #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/card_database_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;
@@ -77,6 +110,7 @@ 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
 
@@ -125,32 +159,15 @@ LONG WINAPI CockatriceUnhandledExceptionFilter(EXCEPTION_POINTERS *exceptionPoin
 
 void installNewTranslator()
 {
-    QString lang = SettingsCache::instance().getLang();
+    QString lang = SettingsCache::instance().personal().getLang();
 
-    QString qtNameHint = "qt_" + lang;
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-    QString qtTranslationPath = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
-#else
-    QString qtTranslationPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-#endif
-
-    bool qtTranslationLoaded = qtTranslator->load(qtNameHint, qtTranslationPath);
-    if (!qtTranslationLoaded) {
-        qCWarning(QtTranslatorDebug) << "Unable to load qt translation" << qtNameHint << "at" << qtTranslationPath;
-    } else {
-        qCInfo(QtTranslatorDebug) << "Loaded qt translation" << qtNameHint << "at" << qtTranslationPath;
-    }
+    // Qt's own strings and ours need a translator each: QTranslator discards its previous contents
+    // on every load, so loading both files into one translator silently drops the first of them.
+    TranslationLoader::loadQt(*qtTranslator, lang);
     qApp->installTranslator(qtTranslator);
 
-    QString appNameHint = translationPrefix + "_" + lang;
-    bool appTranslationLoaded = qtTranslator->load(appNameHint, translationPath);
-    if (!appTranslationLoaded) {
-        qCWarning(QtTranslatorDebug) << "Unable to load" << translationPrefix << "translation" << appNameHint << "at"
-                                     << translationPath;
-    } else {
-        qCInfo(QtTranslatorDebug) << "Loaded" << translationPrefix << "translation" << appNameHint << "at"
-                                  << translationPath;
-    }
+    TranslationLoader::loadApplication(*translator, translationPrefix, lang,
+                                       TranslationLoader::applicationTranslationPaths(translationPath));
     qApp->installTranslator(translator);
 }
 
@@ -158,20 +175,35 @@ QString const generateClientID()
 {
     QString macList;
     for (const QNetworkInterface &networkInterface : QNetworkInterface::allInterfaces()) {
-        if (networkInterface.hardwareAddress() != "")
-            if (networkInterface.hardwareAddress() != "00:00:00:00:00:00:00:E0")
+        if (networkInterface.hardwareAddress() != "") {
+            if (networkInterface.hardwareAddress() != "00:00:00:00:00:00:00:E0") {
                 macList += networkInterface.hardwareAddress() + ".";
+            }
+        }
     }
     QString strClientID = QCryptographicHash::hash(macList.toUtf8(), QCryptographicHash::Sha1).toHex().right(15);
     return strClientID;
 }
 
+static QString redactActivationUrl(const QString &url)
+{
+    // Activation URLs carry secrets in their query string (e.g. the deck share
+    // token); log only the scheme and the action (cockatrice://opendeck), never
+    // the parameters.
+    if (!url.startsWith(QStringLiteral("cockatrice://"))) {
+        return url;
+    }
+    const QUrl parsed(url);
+    return parsed.scheme() + "://" + parsed.host();
+}
+
 int main(int argc, char *argv[])
 {
 #ifdef Q_OS_WIN
     SetUnhandledExceptionFilter(CockatriceUnhandledExceptionFilter);
 #endif
 
+    // Logging setup
 #ifdef Q_OS_APPLE
     // <build>/cockatrice/cockatrice.app/Contents/MacOS/cockatrice
     const QByteArray configPath = "../../../qtlogging.ini";
@@ -189,15 +221,29 @@ int main(int argc, char *argv[])
         // Set the QT_LOGGING_CONF environment variable
         qputenv("QT_LOGGING_CONF", configPath);
     }
+
     qSetMessagePattern(
         "\033[0m[%{time yyyy-MM-dd h:mm:ss.zzz} "
         "%{if-debug}\033[36mD%{endif}%{if-info}\033[32mI%{endif}%{if-warning}\033[33mW%{endif}%{if-critical}\033[31mC%{"
         "endif}%{if-fatal}\033[1;31mF%{endif}\033[0m] [%{function}] - %{message} [%{file}:%{line}]");
     QApplication app(argc, argv);
 
+#ifdef Q_OS_MAC
+    UrlSchemeEventFilter cockatriceFilter(QStringList{QStringLiteral("cockatrice")});
+
+    QStringList pendingMacUrls;
+
+    const auto cocoaBufferConn =
+        QObject::connect(&cockatriceFilter, &UrlSchemeEventFilter::urlReceived,
+                         [&pendingMacUrls](const QString &url) { pendingMacUrls.append(url); });
+
+    app.installEventFilter(&cockatriceFilter);
+#endif
+
     QObject::connect(&app, &QApplication::lastWindowClosed, &app, &QApplication::quit);
 
     qInstallMessageHandler(CockatriceLogger);
+
 #ifdef Q_OS_WIN
     app.addLibraryPath(app.applicationDirPath() + "/plugins");
 #endif
@@ -205,7 +251,7 @@ int main(int argc, char *argv[])
     // These values are only used by the settings loader/saver
     // Wrong or outdated values are kept to not break things
     QCoreApplication::setOrganizationName("Cockatrice");
-    QCoreApplication::setOrganizationDomain("cockatrice.de");
+    QCoreApplication::setOrganizationDomain("cockatrice.github.io");
     QCoreApplication::setApplicationName("Cockatrice");
     QCoreApplication::setApplicationVersion(VERSION_STRING);
 
@@ -213,6 +259,7 @@ int main(int argc, char *argv[])
     qApp->setAttribute(Qt::AA_DontShowIconsInMenus, true);
 #endif
 
+    // Translations
 #ifdef Q_OS_MAC
     translationPath = qApp->applicationDirPath() + "/../Resources/translations";
 #elif defined(Q_OS_WIN)
@@ -221,8 +268,9 @@ int main(int argc, char *argv[])
     translationPath = qApp->applicationDirPath() + "/../share/cockatrice/translations";
 #endif
 
+    // Command-line parser
     QCommandLineParser parser;
-    parser.setApplicationDescription("Cockatrice");
+    parser.setApplicationDescription("Cockatrice Client");
     parser.addHelpOption();
     parser.addVersionOption();
 
@@ -236,7 +284,43 @@ int main(int argc, char *argv[])
         Logger::getInstance().logToFile(true);
     }
 
-    rng = new RNG_SFMT;
+    // --- Handle files or URLs passed at startup ---
+    // Only positional arguments are treated as files/URLs, so options like
+    // --connect are never handed off to another instance.
+    const QStringList startupFiles = parser.positionalArguments();
+    const bool hasActivationFiles = !startupFiles.isEmpty();
+
+    SingleInstanceManager instance;
+
+    if (hasActivationFiles) {
+        QStringList redactedFiles;
+        redactedFiles.reserve(startupFiles.size());
+        for (const QString &file : startupFiles) {
+            redactedFiles.append(redactActivationUrl(file));
+        }
+        qCInfo(MainLog) << "Activation launch, files:" << redactedFiles;
+        // Activation launch: hand off to the primary instance if one is
+        // running, otherwise become the primary ourselves. Do this before
+        // constructing the main window so a hand-off exits cheaply.
+        if (!instance.tryRun(startupFiles)) {
+            qInfo() << "Handed off to a running instance, exiting";
+            // Sent successfully → exit
+            return 0;
+        }
+        // No primary instance → become server
+        qInfo() << "No existing instance found, becoming primary instance";
+    } else {
+        // Plain launch: if another instance is running, run independently
+        // instead of handing off and exiting.
+        if (!instance.tryRun(QStringList())) {
+            // Another instance is already running → just run independently
+            qInfo() << "Another instance exists, running independently";
+        } else {
+            qInfo() << "No existing instance found, starting server";
+        }
+    }
+
+    rng = new RNG_SFMT(CryptoUtil::randomUInt64());
     themeManager = new ThemeManager;
     soundEngine = new SoundEngine;
 
@@ -249,23 +333,78 @@ int main(int argc, char *argv[])
     // Dependency Injections
     CardDatabaseManager::setCardPreferenceProvider(new SettingsCardPreferenceProvider());
     CardDatabaseManager::setCardDatabasePathProvider(&SettingsCache::instance());
-    CardDatabaseManager::setCardSetPriorityController(SettingsCache::instance().cardDatabase());
+    CardDatabaseManager::setCardSetPriorityController(&SettingsCache::instance().cardDatabase());
 
     qCInfo(MainLog) << "Starting main program";
 
+    // Front-load the card database before constructing the main window. The
+    // binary-cache read is cheap when uncontended (~1s); doing it here -- while no
+    // GUI work yet competes for CPU -- avoids the multi-second, GUI-freezing
+    // 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.
+    CardDatabaseManager::getInstance()->loadCardDatabases();
+
     MainWindow ui;
+
+    // A URL launch must own the connection: the intent chain triggered by the
+    // URL connects to the server named in the URL, so the window's own startup
+    // auto-connect must not race against it (two connectToServer calls tear
+    // each other down via doDisconnectFromServer).
+    bool hasUrlActivation = std::any_of(startupFiles.begin(), startupFiles.end(), [](const QString &file) {
+        return file.startsWith(QStringLiteral("cockatrice://"));
+    });
+#ifdef Q_OS_MAC
+    // On macOS the launch can arrive through the URL scheme instead of as a
+    // positional argument (captured in pendingMacUrls); count those too or the
+    // window would auto-connect into the link's own connection attempt.
+    hasUrlActivation = hasUrlActivation ||
+                       std::any_of(pendingMacUrls.cbegin(), pendingMacUrls.cend(),
+                                   [](const QString &url) { return url.startsWith(QStringLiteral("cockatrice://")); });
+#endif
+    ui.setSkipStartupAutoConnect(hasUrlActivation);
+
+    auto handleActivation = [&ui](const QString &file) {
+        if (file.startsWith("cockatrice://")) {
+            qCInfo(MainLog) << "Handling URL activation:" << redactActivationUrl(file);
+            // Route through the window's persistent url parser: it serializes
+            // link chains so activations handed over while another chain is
+            // still connecting do not connect concurrently.
+            ui.handleCockatriceLink(file);
+        } else if (QFileInfo(file).exists()) {
+            auto openDeckIntent = new IntentOpenLocalDeck(ui.getTabSupervisor(), file);
+            QObject::connect(openDeckIntent, &Intent::failed, &ui, [&ui](const QString &reason) {
+                QMessageBox::warning(&ui, QObject::tr("Open deck"), reason);
+            });
+            openDeckIntent->execute();
+        }
+    };
+
+#ifdef Q_OS_MAC
+    QObject::disconnect(cocoaBufferConn);
+
+    QObject::connect(&cockatriceFilter, &UrlSchemeEventFilter::urlReceived,
+                     [&handleActivation](const QString &url) { handleActivation(url); });
+#endif
     if (parser.isSet("connect")) {
         ui.setConnectTo(parser.value("connect"));
     }
     qCInfo(MainLog) << "MainWindow constructor finished";
 
-    ui.setWindowIcon(QPixmap("theme:cockatrice"));
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
-    // set name of the app desktop file; used by wayland to load the window icon
+    ui.setWindowIcon(themePixmap(QStringLiteral("cockatrice")));
+    // Base name of the desktop file installed next to the binary, without the ".desktop"
+    // extension. Wayland reads the window icon from it, and xdg-desktop-portal looks up
+    // org.freedesktop.host.portal.Registry by this app ID, so it has to match the file name
+    // exactly, down to the case.
     QGuiApplication::setDesktopFileName("cockatrice");
-#endif
 
-    SettingsCache::instance().setClientID(generateClientID());
+    SettingsCache::instance().network().setClientID(generateClientID());
 
     // If spoiler mode is enabled, we will download the spoilers
     // then reload the DB. otherwise just reload the DB
@@ -275,18 +414,35 @@ int main(int argc, char *argv[])
     qCInfo(MainLog) << "ui.show() finished";
 
     // force shortcuts to be shown/hidden in right-click menus, regardless of system defaults
-    qApp->setAttribute(Qt::AA_DontShowShortcutsInContextMenus, !SettingsCache::instance().getShowShortcuts());
+    qApp->setAttribute(Qt::AA_DontShowShortcutsInContextMenus,
+                       !SettingsCache::instance().userInterface().getShowShortcuts());
 
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-    app.setAttribute(Qt::AA_UseHighDpiPixmaps);
+#ifdef Q_OS_MAC
+    for (const QString &url : pendingMacUrls) {
+        handleActivation(url);
+    }
+    pendingMacUrls.clear();
 #endif
-    app.exec();
+
+    for (const QString &file : startupFiles) {
+        handleActivation(file);
+    }
+
+    // Connect to future file/URL events from other instances
+    QObject::connect(&instance, &SingleInstanceManager::filesReceived, [&handleActivation](const QStringList &files) {
+        for (const QString &file : files) {
+            handleActivation(file);
+        }
+    });
+
+    int ret = app.exec();
 
     qCInfo(MainLog) << "Event loop finished, terminating...";
     delete rng;
     PingPixmapGenerator::clear();
     CountryPixmapGenerator::clear();
     UserLevelPixmapGenerator::clear();
+    ManaSymbolPixmapGenerator::clear();
 
-    return 0;
+    return ret;
 }
diff --git a/cockatrice/src/main.h b/cockatrice/src/main.h
index b6e086744..3d772915b 100644
--- a/cockatrice/src/main.h
+++ b/cockatrice/src/main.h
@@ -1,8 +1,8 @@
 /**
  * @file main.h
  * @ingroup Core
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef MAIN_H
 #define MAIN_H
@@ -10,13 +10,11 @@
 #include <QLoggingCategory>
 
 inline Q_LOGGING_CATEGORY(MainLog, "main");
-inline Q_LOGGING_CATEGORY(QtTranslatorDebug, "qt_translator");
 
 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
new file mode 100644
index 000000000..08294d72c
--- /dev/null
+++ b/cockatrice/src/single_instance_manager.cpp
@@ -0,0 +1,199 @@
+#include "single_instance_manager.h"
+
+#include <QByteArray>
+#include <QDataStream>
+#include <QIODevice>
+#include <QList>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QPointer>
+#include <QSharedPointer>
+#include <QtGlobal>
+#include <libcockatrice/utility/local_server_name.h>
+
+namespace
+{
+// Sent by the primary instance after it has read a forwarded payload. Without
+// an acknowledgment, a second instance cannot tell a live primary apart from a
+// stale socket left behind by a process that is still shutting down.
+const QByteArray ACK_MESSAGE = QByteArrayLiteral("COCKATRICE_ACK");
+} // namespace
+
+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
+    // hijack another user's session.
+    serverName = scopedLocalServerName(QStringLiteral("CockatriceSingleInstance"));
+
+    // 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.
+    switch (forwardToPrimary(filesToSend)) {
+        case ForwardResult::Delivered:
+            return false;
+        case ForwardResult::PrimaryBusy:
+            return false;
+        case ForwardResult::NoPrimary:
+            break;
+    }
+
+    // No primary instance is currently reachable, so become the primary.
+    server = new QLocalServer(this);
+    connect(server, &QLocalServer::newConnection, this, &SingleInstanceManager::handleNewConnection);
+
+    if (server->listen(serverName)) {
+        return true;
+    }
+
+    // Another instance may have started while we were probing; hand off to it
+    // instead of stealing its socket.
+    switch (forwardToPrimary(filesToSend)) {
+        case ForwardResult::Delivered:
+            return false;
+        case ForwardResult::PrimaryBusy:
+            return false;
+        case ForwardResult::NoPrimary:
+            break;
+    }
+
+    // The socket is stale (left over by a crashed instance), so no primary is
+    // holding it: remove it and retry. If that still fails, another instance
+    // just took the name.
+    QLocalServer::removeServer(serverName);
+    if (server->listen(serverName)) {
+        return true;
+    }
+
+    forwardToPrimary(filesToSend);
+    return false;
+}
+
+SingleInstanceManager::ForwardResult SingleInstanceManager::forwardToPrimary(const QStringList &filesToSend)
+{
+    QLocalSocket socket;
+    socket.connectToServer(serverName);
+    if (!socket.waitForConnected(200)) {
+        return ForwardResult::NoPrimary;
+    }
+
+    // Serialize payload with length prefix
+    QByteArray payload;
+    QDataStream out(&payload, QIODevice::WriteOnly);
+    out << filesToSend;
+
+    QByteArray message;
+    QDataStream msgStream(&message, QIODevice::WriteOnly);
+    msgStream << quint32(payload.size());
+    message.append(payload);
+
+    socket.write(message);
+    socket.flush();
+    socket.waitForBytesWritten(1000);
+
+    // A plain launch has nothing for the primary to act on, so there is nothing
+    // to acknowledge. Waiting here would block the new instance for seconds if
+    // the primary is busy in a modal dialog, so only the activation path (which
+    // needs the ACK to avoid stealing a live primary's socket) waits below.
+    if (filesToSend.isEmpty()) {
+        return ForwardResult::Delivered;
+    }
+
+    // Only report a successful hand-off once the primary has acknowledged that
+    // it actually read the payload. A socket that connects but is still working
+    // on an earlier payload is alive but busy, not dead: give it more room
+    // before giving up, so a slow handler does not make a live primary look
+    // dead (which would lead to stealing its socket).
+    if (!socket.waitForReadyRead(1000) && !socket.waitForReadyRead(4000)) {
+        return ForwardResult::PrimaryBusy;
+    }
+    return socket.readAll() == ACK_MESSAGE ? ForwardResult::Delivered : ForwardResult::PrimaryBusy;
+}
+
+void SingleInstanceManager::handleNewConnection()
+{
+    QLocalSocket *socket = server->nextPendingConnection();
+
+    // Per-connection state. QSharedPointer keeps the buffers alive for as long
+    // as the connection handler is attached to the socket.
+    auto buffer = QSharedPointer<QByteArray>::create();
+    auto expectedSize = QSharedPointer<quint32>::create(0);
+
+    connect(socket, &QLocalSocket::readyRead, this, [this, socket, buffer, expectedSize]() {
+        buffer->append(socket->readAll());
+
+        QDataStream stream(buffer.data(), QIODevice::ReadOnly);
+
+        while (true) {
+            // Step 1: read size
+            if (*expectedSize == 0) {
+                if (buffer->size() < static_cast<int>(sizeof(quint32))) {
+                    return;
+                }
+
+                stream >> *expectedSize;
+            }
+
+            // Step 2: wait for full payload
+            if (buffer->size() < static_cast<int>(sizeof(quint32) + *expectedSize)) {
+                return;
+            }
+
+            // Step 3: extract payload
+            QByteArray payload = buffer->mid(sizeof(quint32), *expectedSize);
+
+            QDataStream payloadStream(&payload, QIODevice::ReadOnly);
+            QStringList files;
+            payloadStream >> files;
+
+            // Acknowledge receipt as soon as the payload is parsed, before the
+            // primary starts handling it. The handlers run synchronously and can
+            // take longer than the sender's readiness timeout (e.g. a modal
+            // confirmation box), which would otherwise make a live primary look
+            // dead and cause duplicate handling.
+            socket->write(ACK_MESSAGE);
+            socket->flush();
+
+            // Drop the payload from the buffer before handing it off, so a
+            // re-entrant event loop cannot re-parse and re-emit the same files.
+            buffer->clear();
+            *expectedSize = 0;
+
+            // Take the guard while the socket is still alive: QPointer has to be
+            // built from a live pointer, and by the time the handlers below return
+            // the socket may already be gone.
+            QPointer<QLocalSocket> guardedSocket(socket);
+
+            // Hand the payload over synchronously, exactly as before, so the
+            // "Join game?" confirmation still appears. A handler can spin a nested
+            // event loop (that modal box is one), and the sending instance exits as
+            // soon as it has the ACK above, so while that loop runs the peer closes
+            // and this socket is disconnected.
+            emit filesReceived(files);
+
+            // The handlers run synchronously, so returning from the emit means the
+            // readyRead frame has unwound and it is safe to touch the socket again.
+            // This teardown must therefore NOT be queued: a queued call would be
+            // picked up by the nested loop above while the frame is still on the
+            // stack, which is precisely the use-after-free this guards against.
+            // The guard covers the one remaining way the socket can die under us --
+            // the primary being torn down (e.g. quit) while the dialog was open --
+            // since QLocalServer owns and destroys its pending connections.
+            if (guardedSocket) {
+                guardedSocket->disconnectFromServer();
+                guardedSocket->deleteLater();
+            }
+            return;
+        }
+    });
+
+    // Deliberately no `disconnected -> deleteLater()` here. The handlers above run
+    // synchronously and may spin a nested event loop, during which the sender exits
+    // and this socket is disconnected. A deleteLater() triggered from there is not
+    // deferred to the outer loop: Qt frees the object as soon as that nested loop
+    // unwinds, which is still inside this readyRead emission, so Qt's own signal
+    // dispatch is left holding a freed socket. The socket is instead closed and
+    // deleted once the handlers have returned, on the code path above.
+}
diff --git a/cockatrice/src/single_instance_manager.h b/cockatrice/src/single_instance_manager.h
new file mode 100644
index 000000000..727994208
--- /dev/null
+++ b/cockatrice/src/single_instance_manager.h
@@ -0,0 +1,41 @@
+#ifndef COCKATRICE_SINGLE_INSTANCE_MANAGER_H
+#define COCKATRICE_SINGLE_INSTANCE_MANAGER_H
+
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class QLocalServer;
+
+class SingleInstanceManager : public QObject
+{
+    Q_OBJECT
+public:
+    explicit SingleInstanceManager(QObject *parent = nullptr);
+
+    // Returns true if this process became the primary instance, false if
+    // another instance is already running (and received our files).
+    bool tryRun(const QStringList &initialFiles);
+
+signals:
+    void filesReceived(const QStringList &files);
+
+private slots:
+    void handleNewConnection();
+
+private:
+    enum class ForwardResult
+    {
+        Delivered,  // a live primary acknowledged the payload
+        NoPrimary,  // no connectable primary socket exists
+        PrimaryBusy // a primary exists but did not acknowledge in time
+    };
+
+    ForwardResult forwardToPrimary(const QStringList &filesToSend);
+
+    QString serverName;
+    QLocalServer *server = nullptr;
+};
+
+#endif // COCKATRICE_SINGLE_INSTANCE_MANAGER_H
diff --git a/cockatrice/themes/CMakeLists.txt b/cockatrice/themes/CMakeLists.txt
index 3e07c54dd..70344d95a 100644
--- a/cockatrice/themes/CMakeLists.txt
+++ b/cockatrice/themes/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # add themes subfolders
 
-set(defthemes Fabric Leather Plasma VelvetMarble)
+set(defthemes Fabric Fusion Leather Plasma VelvetMarble System)
 
 if(UNIX)
   if(APPLE)
diff --git a/cockatrice/themes/Fabric/backgrounds/home-dark.jpg b/cockatrice/themes/Fabric/backgrounds/home-dark.jpg
new file mode 100644
index 000000000..f69e5923e
Binary files /dev/null and b/cockatrice/themes/Fabric/backgrounds/home-dark.jpg differ
diff --git a/cockatrice/themes/Fabric/backgrounds/home-light.jpg b/cockatrice/themes/Fabric/backgrounds/home-light.jpg
new file mode 100644
index 000000000..800e369e7
Binary files /dev/null and b/cockatrice/themes/Fabric/backgrounds/home-light.jpg differ
diff --git a/cockatrice/themes/Fabric/palette-default-dark.toml b/cockatrice/themes/Fabric/palette-default-dark.toml
new file mode 100644
index 000000000..cad18921a
--- /dev/null
+++ b/cockatrice/themes/Fabric/palette-default-dark.toml
@@ -0,0 +1,74 @@
+# Fabric — dark identity palette (navy-cloth chrome)
+[Palette]
+WindowText           = #e8ecf2
+Button               = #2b374a
+Light                = #3a4759
+Midlight             = #333f50
+Dark                 = #141a23
+Mid                  = #252c38
+Text                 = #e8ecf2
+BrightText           = #8ec2ff
+ButtonText           = #f2f4f8
+Base                 = #222c3d
+Window               = #18202e
+Shadow               = #0b0f15
+Highlight            = #4a82e6
+HighlightedText      = #ffffff
+Link                 = #7fb0f2
+LinkVisited          = #a98ad9
+AlternateBase        = #1d2636
+ToolTipBase          = #2b3546
+ToolTipText          = #f2f4f8
+PlaceholderText      = #6ee8ecf2
+Accent               = #4a82e6
+
+[Palette.Disabled]
+WindowText           = #9d9d9d
+Button               = #18202e
+Light                = #3a4759
+Midlight             = #333f50
+Dark                 = #141a23
+Mid                  = #252c38
+Text                 = #9d9d9d
+BrightText           = #8ec2ff
+ButtonText           = #787878
+Base                 = #18202e
+Window               = #18202e
+Shadow               = #0b0f15
+Highlight            = #222d40
+HighlightedText      = #9d9d9d
+Link                 = #308cc6
+LinkVisited          = #b450ff
+AlternateBase        = #1d2636
+ToolTipBase          = #2b3546
+ToolTipText          = #f2f4f8
+PlaceholderText      = #6ee8ecf2
+Accent               = #9d9d9d
+
+[Palette.Inactive]
+WindowText           = #e8ecf2
+Button               = #2b374a
+Light                = #3a4759
+Midlight             = #333f50
+Dark                 = #141a23
+Mid                  = #252c38
+Text                 = #e8ecf2
+BrightText           = #8ec2ff
+ButtonText           = #f2f4f8
+Base                 = #222c3d
+Window               = #18202e
+Shadow               = #0b0f15
+Highlight            = #222d40
+HighlightedText      = #ffffff
+Link                 = #7fb0f2
+LinkVisited          = #a98ad9
+AlternateBase        = #1d2636
+ToolTipBase          = #2b3546
+ToolTipText          = #f2f4f8
+PlaceholderText      = #6ee8ecf2
+Accent               = #4a82e6
+
+[AppColors]
+AccentStrong         = #3a6fd6
+AccentSoft           = #8fb8f2
+
diff --git a/cockatrice/themes/Fabric/palette-default-light.toml b/cockatrice/themes/Fabric/palette-default-light.toml
new file mode 100644
index 000000000..f5151af3e
--- /dev/null
+++ b/cockatrice/themes/Fabric/palette-default-light.toml
@@ -0,0 +1,74 @@
+# Fabric — light identity palette (navy-cloth chrome)
+[Palette]
+WindowText           = #1c2330
+Button               = #c8d6ea
+Light                = #ffffff
+Midlight             = #b9c6dc
+Dark                 = #8fa0bd
+Mid                  = #a3b3cd
+Text                 = #1c2330
+BrightText           = #1d4fa0
+ButtonText           = #141c29
+Base                 = #f6f8fc
+Window               = #dbe3ef
+Shadow               = #5a6a85
+Highlight            = #2f6fd6
+HighlightedText      = #ffffff
+Link                 = #2555b0
+LinkVisited          = #6a4bb8
+AlternateBase        = #e9eef7
+ToolTipBase          = #e9eff8
+ToolTipText          = #141c29
+PlaceholderText      = #7a1c2330
+Accent               = #2f6fd6
+
+[Palette.Disabled]
+WindowText           = #787878
+Button               = #dbe3ef
+Light                = #ffffff
+Midlight             = #b9c6dc
+Dark                 = #8fa0bd
+Mid                  = #a3b3cd
+Text                 = #787878
+BrightText           = #1d4fa0
+ButtonText           = #969696
+Base                 = #dbe3ef
+Window               = #dbe3ef
+Shadow               = #5a6a85
+Highlight            = #cdd8e9
+HighlightedText      = #787878
+Link                 = #0000ff
+LinkVisited          = #ff00ff
+AlternateBase        = #e9eef7
+ToolTipBase          = #e9eff8
+ToolTipText          = #141c29
+PlaceholderText      = #7a1c2330
+Accent               = #787878
+
+[Palette.Inactive]
+WindowText           = #1c2330
+Button               = #c8d6ea
+Light                = #ffffff
+Midlight             = #b9c6dc
+Dark                 = #8fa0bd
+Mid                  = #a3b3cd
+Text                 = #1c2330
+BrightText           = #1d4fa0
+ButtonText           = #141c29
+Base                 = #f6f8fc
+Window               = #dbe3ef
+Shadow               = #5a6a85
+Highlight            = #cdd8e9
+HighlightedText      = #000000
+Link                 = #2555b0
+LinkVisited          = #6a4bb8
+AlternateBase        = #e9eef7
+ToolTipBase          = #e9eff8
+ToolTipText          = #141c29
+PlaceholderText      = #7a1c2330
+Accent               = #2f6fd6
+
+[AppColors]
+AccentStrong         = #3a6fd6
+AccentSoft           = #8fb8f2
+
diff --git a/cockatrice/themes/Fabric/theme.cfg b/cockatrice/themes/Fabric/theme.cfg
new file mode 100644
index 000000000..55b916e71
--- /dev/null
+++ b/cockatrice/themes/Fabric/theme.cfg
@@ -0,0 +1,5 @@
+[Appearance]
+ColorScheme = System
+
+[Style]
+Name = Fusion
\ No newline at end of file
diff --git a/cockatrice/themes/Fabric/zones/handzone-light.png b/cockatrice/themes/Fabric/zones/handzone-light.png
new file mode 100644
index 000000000..a87f9e292
Binary files /dev/null and b/cockatrice/themes/Fabric/zones/handzone-light.png differ
diff --git a/cockatrice/themes/Fabric/zones/handzone.png b/cockatrice/themes/Fabric/zones/handzone.png
index 25d22b070..a5b72286c 100644
Binary files a/cockatrice/themes/Fabric/zones/handzone.png and b/cockatrice/themes/Fabric/zones/handzone.png differ
diff --git a/cockatrice/themes/Fabric/zones/playerzone-light.png b/cockatrice/themes/Fabric/zones/playerzone-light.png
new file mode 100644
index 000000000..05da3ea9b
Binary files /dev/null and b/cockatrice/themes/Fabric/zones/playerzone-light.png differ
diff --git a/cockatrice/themes/Fabric/zones/playerzone.png b/cockatrice/themes/Fabric/zones/playerzone.png
index 728fccdfa..7fa977249 100644
Binary files a/cockatrice/themes/Fabric/zones/playerzone.png and b/cockatrice/themes/Fabric/zones/playerzone.png differ
diff --git a/cockatrice/themes/Fabric/zones/stackzone-light.png b/cockatrice/themes/Fabric/zones/stackzone-light.png
new file mode 100644
index 000000000..dcd6dc045
Binary files /dev/null and b/cockatrice/themes/Fabric/zones/stackzone-light.png differ
diff --git a/cockatrice/themes/Fabric/zones/stackzone.png b/cockatrice/themes/Fabric/zones/stackzone.png
index 89e2080f8..9046aa049 100644
Binary files a/cockatrice/themes/Fabric/zones/stackzone.png and b/cockatrice/themes/Fabric/zones/stackzone.png differ
diff --git a/cockatrice/themes/Fabric/zones/tablezone-light.png b/cockatrice/themes/Fabric/zones/tablezone-light.png
new file mode 100644
index 000000000..cb297e7e1
Binary files /dev/null and b/cockatrice/themes/Fabric/zones/tablezone-light.png differ
diff --git a/cockatrice/themes/Fabric/zones/tablezone.png b/cockatrice/themes/Fabric/zones/tablezone.png
index 6a2ce68e1..8048a4cc1 100644
Binary files a/cockatrice/themes/Fabric/zones/tablezone.png and b/cockatrice/themes/Fabric/zones/tablezone.png differ
diff --git a/cockatrice/themes/Fusion/palette-default-dark.toml b/cockatrice/themes/Fusion/palette-default-dark.toml
new file mode 100644
index 000000000..b180e9b63
--- /dev/null
+++ b/cockatrice/themes/Fusion/palette-default-dark.toml
@@ -0,0 +1,73 @@
+[Palette]
+WindowText           = #ffffffff
+Button               = #ff3c3c3c
+Light                = #ff787878
+Midlight             = #ff5a5a5a
+Dark                 = #ff1e1e1e
+Mid                  = #ff282828
+Text                 = #ffffffff
+BrightText           = #ff00f652
+ButtonText           = #ffffffff
+Base                 = #ff2d2d2d
+Window               = #ff1e1e1e
+Shadow               = #ff000000
+Highlight            = #ff139740
+HighlightedText      = #ffffffff
+Link                 = #ffc9fd62
+LinkVisited          = #ff9ad43e
+AlternateBase        = #ff353535
+ToolTipBase          = #ff3c3c3c
+ToolTipText          = #ffd4d4d4
+PlaceholderText      = #80ffffff
+Accent               = #ffc9fd62
+
+[Palette.Disabled]
+WindowText           = #ff9d9d9d
+Button               = #ff3c3c3c
+Light                = #ff787878
+Midlight             = #ff5a5a5a
+Dark                 = #ff1e1e1e
+Mid                  = #ff282828
+Text                 = #ff9d9d9d
+BrightText           = #ff00f652
+ButtonText           = #ff9d9d9d
+Base                 = #ff1e1e1e
+Window               = #ff1e1e1e
+Shadow               = #ff000000
+Highlight            = #ff139740
+HighlightedText      = #ffffffff
+Link                 = #ff308cc6
+LinkVisited          = #ffff00ff
+AlternateBase        = #ff353535
+ToolTipBase          = #ffffffdc
+ToolTipText          = #ff000000
+PlaceholderText      = #80ffffff
+Accent               = #ff9d9d9d
+
+[Palette.Inactive]
+WindowText           = #ffffffff
+Button               = #ff3c3c3c
+Light                = #ff787878
+Midlight             = #ff5a5a5a
+Dark                 = #ff1e1e1e
+Mid                  = #ff282828
+Text                 = #ffffffff
+BrightText           = #ff00f652
+ButtonText           = #ffffffff
+Base                 = #ff2d2d2d
+Window               = #ff1e1e1e
+Shadow               = #ff000000
+Highlight            = #ff1e1e1e
+HighlightedText      = #ffffffff
+Link                 = #ffc9fd62
+LinkVisited          = #ff9ad43e
+AlternateBase        = #ff353535
+ToolTipBase          = #ff3c3c3c
+ToolTipText          = #ffd4d4d4
+PlaceholderText      = #80ffffff
+Accent               = #ff1e1e1e
+
+
+[AppColors]
+AccentStrong        = #ff139740
+AccentSoft          = #ffc9fd62
diff --git a/cockatrice/themes/Fusion/palette-default-light.toml b/cockatrice/themes/Fusion/palette-default-light.toml
new file mode 100644
index 000000000..5a1163a2b
--- /dev/null
+++ b/cockatrice/themes/Fusion/palette-default-light.toml
@@ -0,0 +1,73 @@
+[Palette]
+WindowText           = #ff000000
+Button               = #fff0f0f0
+Light                = #ffffffff
+Midlight             = #ffe3e3e3
+Dark                 = #ffa0a0a0
+Mid                  = #ffa0a0a0
+Text                 = #ff000000
+BrightText           = #ffffffff
+ButtonText           = #ff000000
+Base                 = #ffffffff
+Window               = #fff0f0f0
+Shadow               = #ff696969
+Highlight            = #ff139740
+HighlightedText      = #ffffffff
+Link                 = #ff0e6b31
+LinkVisited          = #ff0a521f
+AlternateBase        = #ffe9e7e3
+ToolTipBase          = #ffffffdc
+ToolTipText          = #ff000000
+PlaceholderText      = #80000000
+Accent               = #ff139740
+
+[Palette.Disabled]
+WindowText           = #ff787878
+Button               = #fff0f0f0
+Light                = #ffffffff
+Midlight             = #fff7f7f7
+Dark                 = #ffa0a0a0
+Mid                  = #ffa0a0a0
+Text                 = #ff787878
+BrightText           = #ffffffff
+ButtonText           = #ff787878
+Base                 = #fff0f0f0
+Window               = #fff0f0f0
+Shadow               = #ff000000
+Highlight            = #ff139740
+HighlightedText      = #ffffffff
+Link                 = #ff0000ff
+LinkVisited          = #ffff00ff
+AlternateBase        = #fff7f7f7
+ToolTipBase          = #ffffffdc
+ToolTipText          = #ff000000
+PlaceholderText      = #80000000
+Accent               = #ff787878
+
+[Palette.Inactive]
+WindowText           = #ff000000
+Button               = #fff0f0f0
+Light                = #ffffffff
+Midlight             = #ffe3e3e3
+Dark                 = #ffa0a0a0
+Mid                  = #ffa0a0a0
+Text                 = #ff000000
+BrightText           = #ffffffff
+ButtonText           = #ff000000
+Base                 = #ffffffff
+Window               = #fff0f0f0
+Shadow               = #ff696969
+Highlight            = #fff0f0f0
+HighlightedText      = #ff000000
+Link                 = #ff0e6b31
+LinkVisited          = #ff0a521f
+AlternateBase        = #ffe9e7e3
+ToolTipBase          = #ffffffdc
+ToolTipText          = #ff000000
+PlaceholderText      = #80000000
+Accent               = #fff0f0f0
+
+
+[AppColors]
+AccentStrong        = #ff139740
+AccentSoft          = #ffc9fd62
diff --git a/cockatrice/themes/Fusion/theme.cfg b/cockatrice/themes/Fusion/theme.cfg
new file mode 100644
index 000000000..9b38e505e
--- /dev/null
+++ b/cockatrice/themes/Fusion/theme.cfg
@@ -0,0 +1,5 @@
+[Appearance]
+ColorScheme = Dark
+
+[Style]
+Name = Fusion
diff --git a/cockatrice/themes/Leather/backgrounds/home-dark.jpg b/cockatrice/themes/Leather/backgrounds/home-dark.jpg
new file mode 100644
index 000000000..8c2c3d1df
Binary files /dev/null and b/cockatrice/themes/Leather/backgrounds/home-dark.jpg differ
diff --git a/cockatrice/themes/Leather/backgrounds/home-light.jpg b/cockatrice/themes/Leather/backgrounds/home-light.jpg
new file mode 100644
index 000000000..3fb49538a
Binary files /dev/null and b/cockatrice/themes/Leather/backgrounds/home-light.jpg differ
diff --git a/cockatrice/themes/Leather/palette-default-dark.toml b/cockatrice/themes/Leather/palette-default-dark.toml
new file mode 100644
index 000000000..b0db0e90a
--- /dev/null
+++ b/cockatrice/themes/Leather/palette-default-dark.toml
@@ -0,0 +1,74 @@
+# Leather — dark identity palette (black-brown chrome with brass accents)
+[Palette]
+WindowText           = #eee9e2
+Button               = #332d26
+Light                = #4a4239
+Midlight             = #3d3730
+Dark                 = #131009
+Mid                  = #26221c
+Text                 = #eee9e2
+BrightText           = #e3c27e
+ButtonText           = #f5f1ea
+Base                 = #26221d
+Window               = #1d1a16
+Shadow               = #0d0b07
+Highlight            = #4a5f8f
+HighlightedText      = #ffffff
+Link                 = #cfa263
+LinkVisited          = #9a7db8
+AlternateBase        = #211d19
+ToolTipBase          = #37302a
+ToolTipText          = #f5f1ea
+PlaceholderText      = #6eeee9e2
+Accent               = #c9995a
+
+[Palette.Disabled]
+WindowText           = #9d9d9d
+Button               = #1d1a16
+Light                = #4a4239
+Midlight             = #3d3730
+Dark                 = #131009
+Mid                  = #26221c
+Text                 = #9d9d9d
+BrightText           = #e3c27e
+ButtonText           = #787878
+Base                 = #1d1a16
+Window               = #1d1a16
+Shadow               = #0d0b07
+Highlight            = #2d2822
+HighlightedText      = #9d9d9d
+Link                 = #308cc6
+LinkVisited          = #b450ff
+AlternateBase        = #211d19
+ToolTipBase          = #37302a
+ToolTipText          = #f5f1ea
+PlaceholderText      = #6eeee9e2
+Accent               = #9d9d9d
+
+[Palette.Inactive]
+WindowText           = #eee9e2
+Button               = #332d26
+Light                = #4a4239
+Midlight             = #3d3730
+Dark                 = #131009
+Mid                  = #26221c
+Text                 = #eee9e2
+BrightText           = #e3c27e
+ButtonText           = #f5f1ea
+Base                 = #26221d
+Window               = #1d1a16
+Shadow               = #0d0b07
+Highlight            = #2d2822
+HighlightedText      = #ffffff
+Link                 = #cfa263
+LinkVisited          = #9a7db8
+AlternateBase        = #211d19
+ToolTipBase          = #37302a
+ToolTipText          = #f5f1ea
+PlaceholderText      = #6eeee9e2
+Accent               = #c9995a
+
+[AppColors]
+AccentStrong         = #b7823b
+AccentSoft           = #e4c58f
+
diff --git a/cockatrice/themes/Leather/palette-default-light.toml b/cockatrice/themes/Leather/palette-default-light.toml
new file mode 100644
index 000000000..ff122db76
--- /dev/null
+++ b/cockatrice/themes/Leather/palette-default-light.toml
@@ -0,0 +1,74 @@
+# Leather — light identity palette (black-brown chrome with brass accents)
+[Palette]
+WindowText           = #2a2114
+Button               = #dfcbb0
+Light                = #ffffff
+Midlight             = #c6b08c
+Dark                 = #a18a64
+Mid                  = #b29a74
+Text                 = #2a2114
+BrightText           = #7a531c
+ButtonText           = #1f1710
+Base                 = #fdf8ee
+Window               = #f0e2cb
+Shadow               = #5d4d33
+Highlight            = #34508c
+HighlightedText      = #ffffff
+Link                 = #8a5e1e
+LinkVisited          = #6b5190
+AlternateBase        = #f5ebd7
+ToolTipBase          = #fff7e8
+ToolTipText          = #1f1710
+PlaceholderText      = #7a2a2114
+Accent               = #a5712f
+
+[Palette.Disabled]
+WindowText           = #787878
+Button               = #f0e2cb
+Light                = #ffffff
+Midlight             = #c6b08c
+Dark                 = #a18a64
+Mid                  = #b29a74
+Text                 = #787878
+BrightText           = #7a531c
+ButtonText           = #969696
+Base                 = #f0e2cb
+Window               = #f0e2cb
+Shadow               = #5d4d33
+Highlight            = #ecd9bb
+HighlightedText      = #787878
+Link                 = #0000ff
+LinkVisited          = #ff00ff
+AlternateBase        = #f5ebd7
+ToolTipBase          = #fff7e8
+ToolTipText          = #1f1710
+PlaceholderText      = #7a2a2114
+Accent               = #787878
+
+[Palette.Inactive]
+WindowText           = #2a2114
+Button               = #dfcbb0
+Light                = #ffffff
+Midlight             = #c6b08c
+Dark                 = #a18a64
+Mid                  = #b29a74
+Text                 = #2a2114
+BrightText           = #7a531c
+ButtonText           = #1f1710
+Base                 = #fdf8ee
+Window               = #f0e2cb
+Shadow               = #5d4d33
+Highlight            = #ecd9bb
+HighlightedText      = #000000
+Link                 = #8a5e1e
+LinkVisited          = #6b5190
+AlternateBase        = #f5ebd7
+ToolTipBase          = #fff7e8
+ToolTipText          = #1f1710
+PlaceholderText      = #7a2a2114
+Accent               = #a5712f
+
+[AppColors]
+AccentStrong         = #b7823b
+AccentSoft           = #e4c58f
+
diff --git a/cockatrice/themes/Leather/theme.cfg b/cockatrice/themes/Leather/theme.cfg
new file mode 100644
index 000000000..55b916e71
--- /dev/null
+++ b/cockatrice/themes/Leather/theme.cfg
@@ -0,0 +1,5 @@
+[Appearance]
+ColorScheme = System
+
+[Style]
+Name = Fusion
\ No newline at end of file
diff --git a/cockatrice/themes/Leather/zones/handzone-light.png b/cockatrice/themes/Leather/zones/handzone-light.png
new file mode 100644
index 000000000..b2c9bba34
Binary files /dev/null and b/cockatrice/themes/Leather/zones/handzone-light.png differ
diff --git a/cockatrice/themes/Leather/zones/handzone.png b/cockatrice/themes/Leather/zones/handzone.png
index aba879683..5f803df74 100644
Binary files a/cockatrice/themes/Leather/zones/handzone.png and b/cockatrice/themes/Leather/zones/handzone.png differ
diff --git a/cockatrice/themes/Leather/zones/playerzone-light.png b/cockatrice/themes/Leather/zones/playerzone-light.png
new file mode 100644
index 000000000..a26f96a5e
Binary files /dev/null and b/cockatrice/themes/Leather/zones/playerzone-light.png differ
diff --git a/cockatrice/themes/Leather/zones/playerzone.png b/cockatrice/themes/Leather/zones/playerzone.png
index 4f42ee41d..cccbb3fd3 100644
Binary files a/cockatrice/themes/Leather/zones/playerzone.png and b/cockatrice/themes/Leather/zones/playerzone.png differ
diff --git a/cockatrice/themes/Leather/zones/stackzone-light.png b/cockatrice/themes/Leather/zones/stackzone-light.png
new file mode 100644
index 000000000..117c738f7
Binary files /dev/null and b/cockatrice/themes/Leather/zones/stackzone-light.png differ
diff --git a/cockatrice/themes/Leather/zones/stackzone.png b/cockatrice/themes/Leather/zones/stackzone.png
index c02e2284a..d9cff892b 100644
Binary files a/cockatrice/themes/Leather/zones/stackzone.png and b/cockatrice/themes/Leather/zones/stackzone.png differ
diff --git a/cockatrice/themes/Leather/zones/tablezone-light.png b/cockatrice/themes/Leather/zones/tablezone-light.png
new file mode 100644
index 000000000..912cbfb94
Binary files /dev/null and b/cockatrice/themes/Leather/zones/tablezone-light.png differ
diff --git a/cockatrice/themes/Leather/zones/tablezone.png b/cockatrice/themes/Leather/zones/tablezone.png
index 152f4f7e9..8af4c853d 100644
Binary files a/cockatrice/themes/Leather/zones/tablezone.png and b/cockatrice/themes/Leather/zones/tablezone.png differ
diff --git a/cockatrice/themes/Plasma/backgrounds/home-dark.jpg b/cockatrice/themes/Plasma/backgrounds/home-dark.jpg
new file mode 100644
index 000000000..230d78e8e
Binary files /dev/null and b/cockatrice/themes/Plasma/backgrounds/home-dark.jpg differ
diff --git a/cockatrice/themes/Plasma/backgrounds/home-light.jpg b/cockatrice/themes/Plasma/backgrounds/home-light.jpg
new file mode 100644
index 000000000..2552325eb
Binary files /dev/null and b/cockatrice/themes/Plasma/backgrounds/home-light.jpg differ
diff --git a/cockatrice/themes/Plasma/palette-default-dark.toml b/cockatrice/themes/Plasma/palette-default-dark.toml
new file mode 100644
index 000000000..222456f4f
--- /dev/null
+++ b/cockatrice/themes/Plasma/palette-default-dark.toml
@@ -0,0 +1,74 @@
+# Plasma — dark identity palette (electric violet chrome with cyan sparks)
+[Palette]
+WindowText           = #eeebff
+Button               = #2a2440
+Light                = #453d63
+Midlight             = #383252
+Dark                 = #0e0c16
+Mid                  = #211e31
+Text                 = #eeebff
+BrightText           = #7fd7ff
+ButtonText           = #f6f4ff
+Base                 = #1e1a2e
+Window               = #151220
+Shadow               = #08070e
+Highlight            = #6a4df0
+HighlightedText      = #ffffff
+Link                 = #37c7e8
+LinkVisited          = #9b7aff
+AlternateBase        = #1a1726
+ToolTipBase          = #2c2745
+ToolTipText          = #f6f4ff
+PlaceholderText      = #6eeeebff
+Accent               = #6a4df0
+
+[Palette.Disabled]
+WindowText           = #9d9d9d
+Button               = #151220
+Light                = #453d63
+Midlight             = #383252
+Dark                 = #0e0c16
+Mid                  = #211e31
+Text                 = #9d9d9d
+BrightText           = #7fd7ff
+ButtonText           = #787878
+Base                 = #151220
+Window               = #151220
+Shadow               = #08070e
+Highlight            = #211c32
+HighlightedText      = #9d9d9d
+Link                 = #308cc6
+LinkVisited          = #b450ff
+AlternateBase        = #1a1726
+ToolTipBase          = #2c2745
+ToolTipText          = #f6f4ff
+PlaceholderText      = #6eeeebff
+Accent               = #9d9d9d
+
+[Palette.Inactive]
+WindowText           = #eeebff
+Button               = #2a2440
+Light                = #453d63
+Midlight             = #383252
+Dark                 = #0e0c16
+Mid                  = #211e31
+Text                 = #eeebff
+BrightText           = #7fd7ff
+ButtonText           = #f6f4ff
+Base                 = #1e1a2e
+Window               = #151220
+Shadow               = #08070e
+Highlight            = #211c32
+HighlightedText      = #ffffff
+Link                 = #37c7e8
+LinkVisited          = #9b7aff
+AlternateBase        = #1a1726
+ToolTipBase          = #2c2745
+ToolTipText          = #f6f4ff
+PlaceholderText      = #6eeeebff
+Accent               = #6a4df0
+
+[AppColors]
+AccentStrong         = #5b3ee0
+AccentSoft           = #a28bf7
+
diff --git a/cockatrice/themes/Plasma/palette-default-light.toml b/cockatrice/themes/Plasma/palette-default-light.toml
new file mode 100644
index 000000000..d54db31d2
--- /dev/null
+++ b/cockatrice/themes/Plasma/palette-default-light.toml
@@ -0,0 +1,74 @@
+# Plasma — light identity palette (electric violet chrome with cyan sparks)
+[Palette]
+WindowText           = #1d1830
+Button               = #cfc6f0
+Light                = #ffffff
+Midlight             = #b7adde
+Dark                 = #9589c8
+Mid                  = #a49ad2
+Text                 = #1d1830
+BrightText           = #10406e
+ButtonText           = #120d26
+Base                 = #f9f7ff
+Window               = #e3dcf7
+Shadow               = #554c85
+Highlight            = #5a3ee2
+HighlightedText      = #ffffff
+Link                 = #0f8fb5
+LinkVisited          = #6a45d6
+AlternateBase        = #ece8fa
+ToolTipBase          = #f5f3ff
+ToolTipText          = #120d26
+PlaceholderText      = #7a1d1830
+Accent               = #5a3ee2
+
+[Palette.Disabled]
+WindowText           = #787878
+Button               = #e3dcf7
+Light                = #ffffff
+Midlight             = #b7adde
+Dark                 = #9589c8
+Mid                  = #a49ad2
+Text                 = #787878
+BrightText           = #10406e
+ButtonText           = #969696
+Base                 = #e3dcf7
+Window               = #e3dcf7
+Shadow               = #554c85
+Highlight            = #d6ccf3
+HighlightedText      = #787878
+Link                 = #0000ff
+LinkVisited          = #ff00ff
+AlternateBase        = #ece8fa
+ToolTipBase          = #f5f3ff
+ToolTipText          = #120d26
+PlaceholderText      = #7a1d1830
+Accent               = #787878
+
+[Palette.Inactive]
+WindowText           = #1d1830
+Button               = #cfc6f0
+Light                = #ffffff
+Midlight             = #b7adde
+Dark                 = #9589c8
+Mid                  = #a49ad2
+Text                 = #1d1830
+BrightText           = #10406e
+ButtonText           = #120d26
+Base                 = #f9f7ff
+Window               = #e3dcf7
+Shadow               = #554c85
+Highlight            = #d6ccf3
+HighlightedText      = #000000
+Link                 = #0f8fb5
+LinkVisited          = #6a45d6
+AlternateBase        = #ece8fa
+ToolTipBase          = #f5f3ff
+ToolTipText          = #120d26
+PlaceholderText      = #7a1d1830
+Accent               = #5a3ee2
+
+[AppColors]
+AccentStrong         = #5b3ee0
+AccentSoft           = #a28bf7
+
diff --git a/cockatrice/themes/Plasma/theme.cfg b/cockatrice/themes/Plasma/theme.cfg
new file mode 100644
index 000000000..55b916e71
--- /dev/null
+++ b/cockatrice/themes/Plasma/theme.cfg
@@ -0,0 +1,5 @@
+[Appearance]
+ColorScheme = System
+
+[Style]
+Name = Fusion
\ No newline at end of file
diff --git a/cockatrice/themes/Plasma/zones/handzone-light.png b/cockatrice/themes/Plasma/zones/handzone-light.png
new file mode 100644
index 000000000..89fa7e6d4
Binary files /dev/null and b/cockatrice/themes/Plasma/zones/handzone-light.png differ
diff --git a/cockatrice/themes/Plasma/zones/handzone.png b/cockatrice/themes/Plasma/zones/handzone.png
index 543571d8a..82debb405 100644
Binary files a/cockatrice/themes/Plasma/zones/handzone.png and b/cockatrice/themes/Plasma/zones/handzone.png differ
diff --git a/cockatrice/themes/Plasma/zones/playerzone-light.png b/cockatrice/themes/Plasma/zones/playerzone-light.png
new file mode 100644
index 000000000..9034818f2
Binary files /dev/null and b/cockatrice/themes/Plasma/zones/playerzone-light.png differ
diff --git a/cockatrice/themes/Plasma/zones/playerzone.png b/cockatrice/themes/Plasma/zones/playerzone.png
index eebcd1f84..4623524f6 100644
Binary files a/cockatrice/themes/Plasma/zones/playerzone.png and b/cockatrice/themes/Plasma/zones/playerzone.png differ
diff --git a/cockatrice/themes/Plasma/zones/stackzone-light.png b/cockatrice/themes/Plasma/zones/stackzone-light.png
new file mode 100644
index 000000000..2607b3389
Binary files /dev/null and b/cockatrice/themes/Plasma/zones/stackzone-light.png differ
diff --git a/cockatrice/themes/Plasma/zones/stackzone.png b/cockatrice/themes/Plasma/zones/stackzone.png
index 1845c7091..144d991f3 100644
Binary files a/cockatrice/themes/Plasma/zones/stackzone.png and b/cockatrice/themes/Plasma/zones/stackzone.png differ
diff --git a/cockatrice/themes/Plasma/zones/tablezone-light.png b/cockatrice/themes/Plasma/zones/tablezone-light.png
new file mode 100644
index 000000000..dcf2ef95e
Binary files /dev/null and b/cockatrice/themes/Plasma/zones/tablezone-light.png differ
diff --git a/cockatrice/themes/Plasma/zones/tablezone.png b/cockatrice/themes/Plasma/zones/tablezone.png
index 8f998d4bb..4dc36ec2d 100644
Binary files a/cockatrice/themes/Plasma/zones/tablezone.png and b/cockatrice/themes/Plasma/zones/tablezone.png differ
diff --git a/cockatrice/themes/System/palette-default-dark.toml b/cockatrice/themes/System/palette-default-dark.toml
new file mode 100644
index 000000000..9dfe6e19f
--- /dev/null
+++ b/cockatrice/themes/System/palette-default-dark.toml
@@ -0,0 +1,7 @@
+# The System theme derives all of its colors from the platform palette
+# (e.g. qt6ct's custom color scheme on Linux), so it must NOT ship palette
+# overrides. Only the identity app colors are provided here, so buttons keep
+# their classic greens while the actual palette stays native to the OS.
+[AppColors]
+AccentStrong        = #ff148c3c
+AccentSoft          = #ff78c850
diff --git a/cockatrice/themes/System/palette-default-light.toml b/cockatrice/themes/System/palette-default-light.toml
new file mode 100644
index 000000000..9dfe6e19f
--- /dev/null
+++ b/cockatrice/themes/System/palette-default-light.toml
@@ -0,0 +1,7 @@
+# The System theme derives all of its colors from the platform palette
+# (e.g. qt6ct's custom color scheme on Linux), so it must NOT ship palette
+# overrides. Only the identity app colors are provided here, so buttons keep
+# their classic greens while the actual palette stays native to the OS.
+[AppColors]
+AccentStrong        = #ff148c3c
+AccentSoft          = #ff78c850
diff --git a/cockatrice/themes/System/theme.cfg b/cockatrice/themes/System/theme.cfg
new file mode 100644
index 000000000..23fffccbb
--- /dev/null
+++ b/cockatrice/themes/System/theme.cfg
@@ -0,0 +1,5 @@
+[Appearance]
+ColorScheme = System
+
+[Style]
+Name = System
diff --git a/cockatrice/themes/VelvetMarble/backgrounds/home-dark.jpg b/cockatrice/themes/VelvetMarble/backgrounds/home-dark.jpg
new file mode 100644
index 000000000..b55f2524e
Binary files /dev/null and b/cockatrice/themes/VelvetMarble/backgrounds/home-dark.jpg differ
diff --git a/cockatrice/themes/VelvetMarble/backgrounds/home-light.jpg b/cockatrice/themes/VelvetMarble/backgrounds/home-light.jpg
new file mode 100644
index 000000000..12a2fd2cc
Binary files /dev/null and b/cockatrice/themes/VelvetMarble/backgrounds/home-light.jpg differ
diff --git a/cockatrice/themes/VelvetMarble/palette-default-dark.toml b/cockatrice/themes/VelvetMarble/palette-default-dark.toml
new file mode 100644
index 000000000..496943931
--- /dev/null
+++ b/cockatrice/themes/VelvetMarble/palette-default-dark.toml
@@ -0,0 +1,74 @@
+# VelvetMarble — dark identity palette (charcoal-velvet chrome with slate marble)
+[Palette]
+WindowText           = #e8eaee
+Button               = #262a31
+Light                = #3a3f47
+Midlight             = #31363d
+Dark                 = #0e1013
+Mid                  = #1f2329
+Text                 = #e8eaee
+BrightText           = #c3d8f2
+ButtonText           = #f2f3f6
+Base                 = #1b1e23
+Window               = #131519
+Shadow               = #08090b
+Highlight            = #8fa6c0
+HighlightedText      = #101318
+Link                 = #a9c6e8
+LinkVisited          = #b9a8d9
+AlternateBase        = #171a1f
+ToolTipBase          = #2d323a
+ToolTipText          = #f2f3f6
+PlaceholderText      = #6ee8eaee
+Accent               = #8fa6c0
+
+[Palette.Disabled]
+WindowText           = #9d9d9d
+Button               = #131519
+Light                = #3a3f47
+Midlight             = #31363d
+Dark                 = #0e1013
+Mid                  = #1f2329
+Text                 = #9d9d9d
+BrightText           = #c3d8f2
+ButtonText           = #787878
+Base                 = #131519
+Window               = #131519
+Shadow               = #08090b
+Highlight            = #1f2229
+HighlightedText      = #9d9d9d
+Link                 = #308cc6
+LinkVisited          = #b450ff
+AlternateBase        = #171a1f
+ToolTipBase          = #2d323a
+ToolTipText          = #f2f3f6
+PlaceholderText      = #6ee8eaee
+Accent               = #9d9d9d
+
+[Palette.Inactive]
+WindowText           = #e8eaee
+Button               = #262a31
+Light                = #3a3f47
+Midlight             = #31363d
+Dark                 = #0e1013
+Mid                  = #1f2329
+Text                 = #e8eaee
+BrightText           = #c3d8f2
+ButtonText           = #f2f3f6
+Base                 = #1b1e23
+Window               = #131519
+Shadow               = #08090b
+Highlight            = #1f2229
+HighlightedText      = #ffffff
+Link                 = #a9c6e8
+LinkVisited          = #b9a8d9
+AlternateBase        = #171a1f
+ToolTipBase          = #2d323a
+ToolTipText          = #f2f3f6
+PlaceholderText      = #6ee8eaee
+Accent               = #8fa6c0
+
+[AppColors]
+AccentStrong         = #54687e
+AccentSoft           = #9db0c4
+
diff --git a/cockatrice/themes/VelvetMarble/palette-default-light.toml b/cockatrice/themes/VelvetMarble/palette-default-light.toml
new file mode 100644
index 000000000..5323fd320
--- /dev/null
+++ b/cockatrice/themes/VelvetMarble/palette-default-light.toml
@@ -0,0 +1,74 @@
+# VelvetMarble — light identity palette (charcoal-velvet chrome with slate marble)
+[Palette]
+WindowText           = #1b1d21
+Button               = #c7d1dd
+Light                = #ffffff
+Midlight             = #b3becb
+Dark                 = #93a0b1
+Mid                  = #a1adbc
+Text                 = #1b1d21
+BrightText           = #26465f
+ButtonText           = #121418
+Base                 = #f7f9fb
+Window               = #d9e0ea
+Shadow               = #57626f
+Highlight            = #54687e
+HighlightedText      = #ffffff
+Link                 = #2e4d6b
+LinkVisited          = #5d4a78
+AlternateBase        = #e6ebf2
+ToolTipBase          = #f2f4f6
+ToolTipText          = #121418
+PlaceholderText      = #7a1b1d21
+Accent               = #54687e
+
+[Palette.Disabled]
+WindowText           = #787878
+Button               = #d9e0ea
+Light                = #ffffff
+Midlight             = #b3becb
+Dark                 = #93a0b1
+Mid                  = #a1adbc
+Text                 = #787878
+BrightText           = #26465f
+ButtonText           = #969696
+Base                 = #d9e0ea
+Window               = #d9e0ea
+Shadow               = #57626f
+Highlight            = #ccd5e3
+HighlightedText      = #787878
+Link                 = #0000ff
+LinkVisited          = #ff00ff
+AlternateBase        = #e6ebf2
+ToolTipBase          = #f2f4f6
+ToolTipText          = #121418
+PlaceholderText      = #7a1b1d21
+Accent               = #787878
+
+[Palette.Inactive]
+WindowText           = #1b1d21
+Button               = #c7d1dd
+Light                = #ffffff
+Midlight             = #b3becb
+Dark                 = #93a0b1
+Mid                  = #a1adbc
+Text                 = #1b1d21
+BrightText           = #26465f
+ButtonText           = #121418
+Base                 = #f7f9fb
+Window               = #d9e0ea
+Shadow               = #57626f
+Highlight            = #ccd5e3
+HighlightedText      = #000000
+Link                 = #2e4d6b
+LinkVisited          = #5d4a78
+AlternateBase        = #e6ebf2
+ToolTipBase          = #f2f4f6
+ToolTipText          = #121418
+PlaceholderText      = #7a1b1d21
+Accent               = #54687e
+
+[AppColors]
+AccentStrong         = #54687e
+AccentSoft           = #9db0c4
+
diff --git a/cockatrice/themes/VelvetMarble/theme.cfg b/cockatrice/themes/VelvetMarble/theme.cfg
new file mode 100644
index 000000000..55b916e71
--- /dev/null
+++ b/cockatrice/themes/VelvetMarble/theme.cfg
@@ -0,0 +1,5 @@
+[Appearance]
+ColorScheme = System
+
+[Style]
+Name = Fusion
\ No newline at end of file
diff --git a/cockatrice/themes/VelvetMarble/zones/handzone-light.png b/cockatrice/themes/VelvetMarble/zones/handzone-light.png
new file mode 100644
index 000000000..b21e78e61
Binary files /dev/null and b/cockatrice/themes/VelvetMarble/zones/handzone-light.png differ
diff --git a/cockatrice/themes/VelvetMarble/zones/handzone.jpg b/cockatrice/themes/VelvetMarble/zones/handzone.jpg
deleted file mode 100644
index 2ec9b37fe..000000000
Binary files a/cockatrice/themes/VelvetMarble/zones/handzone.jpg and /dev/null differ
diff --git a/cockatrice/themes/VelvetMarble/zones/handzone.png b/cockatrice/themes/VelvetMarble/zones/handzone.png
new file mode 100644
index 000000000..3e2b7ebea
Binary files /dev/null and b/cockatrice/themes/VelvetMarble/zones/handzone.png differ
diff --git a/cockatrice/themes/VelvetMarble/zones/playerzone-light.png b/cockatrice/themes/VelvetMarble/zones/playerzone-light.png
new file mode 100644
index 000000000..630aac6eb
Binary files /dev/null and b/cockatrice/themes/VelvetMarble/zones/playerzone-light.png differ
diff --git a/cockatrice/themes/VelvetMarble/zones/playerzone.jpg b/cockatrice/themes/VelvetMarble/zones/playerzone.jpg
deleted file mode 100644
index dd13cab78..000000000
Binary files a/cockatrice/themes/VelvetMarble/zones/playerzone.jpg and /dev/null differ
diff --git a/cockatrice/themes/VelvetMarble/zones/playerzone.png b/cockatrice/themes/VelvetMarble/zones/playerzone.png
new file mode 100644
index 000000000..dcf21ba38
Binary files /dev/null and b/cockatrice/themes/VelvetMarble/zones/playerzone.png differ
diff --git a/cockatrice/themes/VelvetMarble/zones/stackzone-light.png b/cockatrice/themes/VelvetMarble/zones/stackzone-light.png
new file mode 100644
index 000000000..62027827c
Binary files /dev/null and b/cockatrice/themes/VelvetMarble/zones/stackzone-light.png differ
diff --git a/cockatrice/themes/VelvetMarble/zones/stackzone.jpg b/cockatrice/themes/VelvetMarble/zones/stackzone.jpg
deleted file mode 100644
index b63aa0902..000000000
Binary files a/cockatrice/themes/VelvetMarble/zones/stackzone.jpg and /dev/null differ
diff --git a/cockatrice/themes/VelvetMarble/zones/stackzone.png b/cockatrice/themes/VelvetMarble/zones/stackzone.png
new file mode 100644
index 000000000..a47f7bf9d
Binary files /dev/null and b/cockatrice/themes/VelvetMarble/zones/stackzone.png differ
diff --git a/cockatrice/themes/VelvetMarble/zones/tablezone-light.png b/cockatrice/themes/VelvetMarble/zones/tablezone-light.png
new file mode 100644
index 000000000..5a9014f9d
Binary files /dev/null and b/cockatrice/themes/VelvetMarble/zones/tablezone-light.png differ
diff --git a/cockatrice/themes/VelvetMarble/zones/tablezone.jpg b/cockatrice/themes/VelvetMarble/zones/tablezone.jpg
deleted file mode 100644
index 9f511491a..000000000
Binary files a/cockatrice/themes/VelvetMarble/zones/tablezone.jpg and /dev/null differ
diff --git a/cockatrice/themes/VelvetMarble/zones/tablezone.png b/cockatrice/themes/VelvetMarble/zones/tablezone.png
new file mode 100644
index 000000000..1523d0821
Binary files /dev/null and b/cockatrice/themes/VelvetMarble/zones/tablezone.png differ
diff --git a/cockatrice/translations/cockatrice_cs.ts b/cockatrice/translations/cockatrice_cs.ts
index 604ea1ce9..aa15c6fcc 100644
--- a/cockatrice/translations/cockatrice_cs.ts
+++ b/cockatrice/translations/cockatrice_cs.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Nastavit žeton...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Nová hodnota pro žeton &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,79 +36,81 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -116,202 +118,253 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>Nastavení vzhledu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>Aktuální vzhled</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>Vykreslování karet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>Zobrazit jména karet na kartách s obrázky</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>Zvětšovat karty při najetí myši</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>Rozvržení ruky</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Zobrazit ruku horizontálně (plýtvá místem)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>Zapnout </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>Rozložení herní mřížky</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>Převrátit vertikální souřadnice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Minimální počet hráčů pro víceřádkové rozvržení:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maximální velikost písma pro informace na kartách</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -333,112 +386,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>Blokovat &amp; Uživatelské jméno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>Blokovat &amp; IP Adresu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>Banovat I&amp;D klienta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>Typ banu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;trvalý ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;dočasný ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>&amp;Dní:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Hodin:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minut:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>Trvání banu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>Uveďte prosím důvod pro ban.
 Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>Uveďte prosám důvod pro ban, který uvidí banovaná osoba.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Zrušit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>Zabanovat uživatele ze serveru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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"/>
     </message>
@@ -446,152 +499,221 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>Edice</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>Sesílací cena</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>Typ karty</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>S/O</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>Barva(y)</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>A</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>NEBO</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>A NE</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>NEBO NE</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>Barva</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation>Edice</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>Sesílací cena</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation>Počet Many</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>Vzácnost</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>Síla</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>Obrana</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>Oddanost</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>Formát</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -599,22 +721,22 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -622,22 +744,22 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -650,12 +772,22 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
@@ -663,132 +795,150 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
@@ -796,133 +946,133 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -931,7 +1081,7 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -939,29 +1089,470 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -969,47 +1560,17 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <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"/>
     </message>
@@ -1017,87 +1578,97 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <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"/>
     </message>
@@ -1123,114 +1694,114 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </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="162"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </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="166"/>
+        <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"/>
     </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="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </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="168"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="172"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </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="174"/>
         <source>Load deck from online service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1238,7 +1809,7 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1246,194 +1817,171 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>Aktualizovat spoilery</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>Úspěch</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>Stáhnuté obrázky karet byly resetovány.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>Chyba</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation>Některé stáhnuté obrázky karet nemohli být vymazány.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>Aktualizuji...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>Vyberte cestu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>Spoilery</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>Stahovat spoilery automaticky</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>Poslední změna</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>Automaticky stahovat spoilery při spuštění</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>Manuálně aktualizovat bez restartování</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>Smazat stáhnuté obrázky</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>Počet</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>Karta</translation>
     </message>
@@ -1441,12 +1989,12 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1454,17 +2002,17 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -1472,7 +2020,7 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <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"/>
     </message>
@@ -1480,62 +2028,62 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <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"/>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </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="104"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </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="105"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </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="106"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </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="107"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <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"/>
     </message>
@@ -1543,98 +2091,156 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1652,74 +2258,74 @@ Toto je uloženo pouze pro moderátory a banovaná osoba to neuvidí.</translati
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>Načíst balíček...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Načíst balíček ze serveru...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>Připraven začít</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>Chyba</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>Vybraný soubor se nepodařilo načíst.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1752,143 +2358,143 @@ This will kick all non-ready players from the game.</source>
         <translation>Stahuji...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>Známí hostitelé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Znovu načíst seznam serverů se známými veřejnými servery</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>Nový hostitel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>Jméno:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;Hostitel:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>Jméno &amp;hráče:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>H&amp;eslo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>&amp;Uložit heslo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>A&amp;utomatické připojení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Automaticky se připojit k poslednímu přihlášení při otevření Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>Jestli máte potíže se připájením nebo registrací, kontaktujte pracovníky servery pro pomoc! Pouze Anglicky</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>Webová stránka</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>&amp;Připojit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>Přihlášení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>Připojit k serveru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation>Komunikační port</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>Varování přihlášení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Jméno hráče nemůže být prázdné</translation>
     </message>
@@ -1896,117 +2502,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>Pamatovat si nastavení</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>&amp;Popis:</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>H&amp;ráči:</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>Obecné</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>Typ hry</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>&amp;Heslo:</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>Jen pro &amp;přátele</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>Jen pro &amp;registrované</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>Omezení připojení</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>&amp;Diváci se mohou dívat</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>Diváci &amp;potřebují ke sledování heslo</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>Diváci mohou &amp;chatovat</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>Diváci mohou vidět do &amp;rukou</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"/>
     </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>Diváci</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>&amp;Smazat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>Vytvořit hru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>Informace o hře</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>Chyba serveru.</translation>
     </message>
@@ -2014,97 +2625,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Jméno:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Token</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>B&amp;arva:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>bílá</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>modrá</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>černá</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>červená</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>zelená</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>vícebarevný</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>bezbarvý</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;S/O:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Poznámka:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Token se při odchodu z bojiště zničí</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Data tokenů</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Ukázat &amp;všechny tokeny</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Ukázat tokeny z tohto &amp;balíčku</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>Vybrat token ze seznamu.</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>Vytvořit token</translation>
     </message>
@@ -2112,53 +2723,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2166,40 +2777,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>Nebyl vybrán obrázek.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Pro změnu avatara vyberte nový obrázek.
 Pro odstranění současného avatara potvrďte bez vybrání nového obrázku.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>Prohlížet...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>Změnit avatara</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>Otevřít obrázek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Soubory obrázků (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>Vybrán neplatný obrázek</translation>
     </message>
@@ -2207,17 +2818,17 @@ Pro odstranění současného avatara potvrďte bez vybrání nového obrázku.<
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2225,38 +2836,38 @@ Pro odstranění současného avatara potvrďte bez vybrání nového obrázku.<
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Staré heslo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nové heslo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Potvrdit nové heslo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Změnit heslo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Nová hesla nejsou stejná.</translation>
     </message>
@@ -2264,93 +2875,93 @@ Pro odstranění současného avatara potvrďte bez vybrání nového obrázku.<
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;Jméno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>B&amp;arva</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="34"/>
         <source>white</source>
         <translation>bílá</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="35"/>
         <source>blue</source>
         <translation>modrá</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="36"/>
         <source>black</source>
         <translation>černá</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="37"/>
         <source>red</source>
         <translation>červená</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="38"/>
         <source>green</source>
         <translation>zelená</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="39"/>
         <source>multicolor</source>
         <translation>vícebarevná</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>bezbarvá</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;S/O</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Poznámka:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Data k tokenu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>Přidat token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Odstranit token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation>Upravit vlastní tokeny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Zadejte prosím jméno pro token:</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>Chyba</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>Vybrané jméno se nemůže shodovat s již existující kartou nebo tokenem.
@@ -2375,12 +2986,12 @@ Pro správné zobrazení si aktivujte si edici &apos;Token&apos; v &quot;Nastavi
         <translation>Nespecifikováno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Skutečné jméno:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Upravit uživatelský profil</translation>
     </message>
@@ -2418,112 +3029,113 @@ Pro správné zobrazení si aktivujte si edici &apos;Token&apos; v &quot;Nastavi
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Popis hry:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>Jméno &amp;tvůrce:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>Typ &amp;hry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>&amp;minimálně:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>&amp;maximálně:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>Maximální počet hráčů</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>Omezení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>Filtrovat hry</translation>
     </message>
@@ -2531,52 +3143,52 @@ Pro správné zobrazení si aktivujte si edici &apos;Token&apos; v &quot;Nastavi
 <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"/>
     </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"/>
     </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"/>
     </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>&amp;Hostitel:</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>&amp;Port:</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>Jméno &amp;hráče:</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>Email:</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"/>
     </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"/>
     </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>Emailová adresa musí být vyplněna.</translation>
     </message>
@@ -2584,37 +3196,37 @@ Pro správné zobrazení si aktivujte si edici &apos;Token&apos; v &quot;Nastavi
 <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"/>
     </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>&amp;Hostitel:</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>&amp;Port:</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>&amp;Jméno hráče:</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"/>
     </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"/>
     </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>Jméno hráče musí být vyplněno.</translation>
     </message>
@@ -2622,86 +3234,86 @@ Pro správné zobrazení si aktivujte si edici &apos;Token&apos; v &quot;Nastavi
 <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"/>
     </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"/>
     </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"/>
     </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>&amp;Hostitel:</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>&amp;Port:</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>&amp;Jméno hráče:</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>Token:</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>Nové Heslo:</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"/>
     </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>Vyplňte jméno hráče.</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"/>
     </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>Vyplňte token.</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>Vyplňte nové heslo.</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"/>
     </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"/>
     </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>Hesla se neshodují.</translation>
     </message>
@@ -2717,17 +3329,17 @@ Pro správné zobrazení si aktivujte si edici &apos;Token&apos; v &quot;Nastavi
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>Nahrát balíček ze schránky</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>Neplatný formát balíčku.</translation>
     </message>
@@ -2735,43 +3347,43 @@ Pro správné zobrazení si aktivujte si edici &apos;Token&apos; v &quot;Nastavi
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2785,45 +3397,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>Nahrát balíček</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
@@ -2831,53 +3476,53 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>&amp;Hostitel:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>Jméno &amp;hráče:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>H&amp;eslo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>Heslo (znovu):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>Email (znovu):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>Země:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>Neznámý</translation>
     </message>
@@ -2923,17 +3568,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
@@ -2941,40 +3586,55 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>Neznámý error při nahrávání databáze karet.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -2991,7 +3651,7 @@ Je možné že bude nutné znovu spustit Oracle pro obnovení databáze karet.
 Chtěl/a by jste změnit nastavení lokace databáze?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3008,7 +3668,7 @@ Je možné to spravit spuštěním Oracle pro aktualizaci vaší databáze karet
 Chcete změnit nastavení lokace databáze?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3017,7 +3677,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3026,7 +3686,7 @@ Would you like to change your database location setting?</source>
 Chcete změnit nastavení lokace databáze?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3035,7 +3695,7 @@ Would you like to change your database location setting?</source>
 Chcete změnit nastavení lokace databáze?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3044,59 +3704,64 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>Cesta k adresáři s balíčky je neplatná. Chcete se vrátit a nastavit správnou?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>Cesta k adresáři s obrázky je neplatná. Chcete se vrátit a nastavit správnou?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>Vzhled</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>Rozhraní</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>Zvuk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>Skratky</translation>
     </message>
@@ -3104,39 +3769,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </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="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </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="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3144,17 +3809,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>Další</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>Předchozí</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>Tip</translation>
     </message>
@@ -3162,164 +3827,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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>Znovu instalovat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>Přerušit stahování</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>Hledám aktualizace...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>Aktualizace byly skontrolovány</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>Žádná dostupná aktualizace</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice je v aktuální verzi!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>Aktuální verze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>Dostupná aktualizace</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Je dostupná nová verze Cockatrice!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Nová verze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>Chcete aktualizovat nyní?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>Chyba aktualizace</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Došlo k chybě při kontrole aktualizací:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Došlo k chybě při stahování aktualizace:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>Instaluji...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation type="unfinished"/>
     </message>
@@ -3327,21 +3992,153 @@ 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="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3411,33 +4208,39 @@ You may have to manually download the new version.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <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"/>
     </message>
@@ -3445,7 +4248,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>Zde napište svůj filtr:</translation>
     </message>
@@ -3453,22 +4256,22 @@ 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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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"/>
     </message>
@@ -3476,22 +4279,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation type="unfinished"/>
     </message>
@@ -3499,155 +4302,208 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>Špatné heslo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Do této hry je divákům přístup zakázán.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>Hra je plná.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>Hra již neexistuje.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>Hra je určena jen pro registrované.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>Hra je dostupná jen pro přátele zakládajícícho.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Zakladatel hry vás ignoruje.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>Připojit ke hře</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>Heslo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filtrovat hry:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>Z&amp;rušit filtr:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>V&amp;ytvořit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>&amp;Připojit se</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>P&amp;řipojit se jako divák</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>Hry</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>heslo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>jen pro přátele</translation>
     </message>
@@ -3657,68 +4513,68 @@ You may have to manually download the new version.</source>
         <translation>jen pro registrované</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>může chatovat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>vidět do rukou</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>může vidět do rukou</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>nepovolené</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>Místnost</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>Doba od otevření</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>Zakladatel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>Omezení</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>Hráči</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>Diváci</translation>
     </message>
@@ -3726,143 +4582,158 @@ You may have to manually download the new version.</source>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>Vyberte cestu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>Osobní nastavení</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>Jazyk:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>Cesty</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>Adresář s balíčky:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>Adresář se záznamy her</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>Adresář s obrázky:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>Databáze karet:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>Databáze tokenů:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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>Automaticky spustit Oracle při spouštění nové verze Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>Ukázat tip při spuštění</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <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"/>
     </message>
@@ -3870,47 +4741,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -3918,111 +4789,141 @@ You may have to manually download the new version.</source>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4030,193 +4931,213 @@ You may have to manually download the new version.</source>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4224,1420 +5145,1223 @@ You may have to manually download the new version.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>Na serveru je maximální počet uživatelů, skuste později.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>Z vaší adresy jde mnoho současných připojení.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>Neplatné uživatelské jméno.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>Připojení uzavřeno</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>Server přerušil spojení.
-Důvod: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>Počet hráčů</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>Vložte počet hráčů.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>Hráč %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>O Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>Překlad:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>Vypršel časový limit</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>S tímto uživatelským jménem jste již připojeni.
-Přerušte spojení a znovu se přihlašte.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>Chyba socketu: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>Snažíte se připojit na zastaralý server. Prosíme, stáhněte si nižší verzi Cockatrice, nebo se připojte k odpovídajícímu serveru.
-Lokální verze je %1, verze serveru je %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>Váš klient je zastaralý. Prosíme, aktualizujte Cockatrice na vyšší verzi.
-Lokální verze je %1, verze serveru je %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>Připojování k %1...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>Odpojeno</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Připojit...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Odpojit</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>Spustit &amp;lokální hru...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Celá obrazovka</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Nastavení...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>&amp;Konec</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>&amp;Nápověda</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;O Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation> z exilnutých karet</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation> ze sideboardu</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation> ze stacku</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>kartu</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1 předává kontrolu hráči %2 karty %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1 dává kartu %2 %3 do hry.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 exiluje %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 přesouvá %2%3 do sideboardu.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 sesílá %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>Hra byla ukončena.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>Hra začíná.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 nyní sleduje hru.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <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><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <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><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -5645,110 +6369,115 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>Přidat zprávu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>Zpráva:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <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"/>
     </message>
@@ -5756,37 +6485,42 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -5799,47 +6533,47 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
@@ -5862,65 +6596,211 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -5928,57 +6808,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>Odtapovací fáze</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>Upkeep</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>Lízací fáze</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>První hlavní fáze</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>Začátek bojové fáze</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>Oznámení útočníků</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>Oznámení blokujících</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>Udělení bojového zranění</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>Konec bojové fáze</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>Druhá hlavní fáze</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>Konec kola</translation>
     </message>
@@ -5986,7 +6866,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
@@ -5995,183 +6875,195 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6187,17 +7079,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6205,86 +7097,94 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"/>
     </message>
@@ -6292,37 +7192,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation type="unfinished"/>
     </message>
@@ -6330,153 +7230,247 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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"/>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>Jméno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>Průběh nahrávání</translation>
     </message>
@@ -6484,32 +7478,32 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation type="unfinished"/>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation type="unfinished"/>
     </message>
@@ -6517,37 +7511,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -6555,41 +7549,49 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>Místnosti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>&amp;Připojit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>Místnost</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>Hráči</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>Hry</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6626,27 +7628,27 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>Dlouhý název</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation type="unfinished"/>
     </message>
@@ -6654,53 +7656,53 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -6708,12 +7710,12 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -6721,13 +7723,13 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -6754,12 +7756,12 @@ Please check your shortcut settings!</source>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -6767,27 +7769,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -6795,48 +7797,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="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -6859,16 +7861,146 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7000,56 +8132,227 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation type="unfinished"/>
+    </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="262"/>
+        <source>Any</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </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="82"/>
         <source>Deck: %1</source>
         <translation type="unfinished"/>
     </message>
@@ -7057,61 +8360,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="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7119,22 +8410,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="43"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <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"/>
     </message>
@@ -7175,8 +8466,8 @@ Please check your shortcut settings!</source>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Nová složka</translation>
     </message>
@@ -7192,84 +8483,84 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>Vložit jméno balíčku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>Tentobalíček nemá jméno.
 Prosím vložte jméno:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>Bezejmenný balíček</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Název nové složky:</translation>
     </message>
@@ -7282,17 +8573,17 @@ Prosím vložte jméno:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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"/>
     </message>
@@ -7333,7 +8624,7 @@ Prosím vložte jméno:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation type="unfinished"/>
     </message>
@@ -7341,197 +8632,191 @@ Prosím vložte jméno:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>&amp;Fáze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>&amp;Hra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>Další &amp;fáze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>Další &amp;kolo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>&amp;Odstranit všechny lokální šipky</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>&amp;Ukončit hru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Opustit hru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>&amp;Chat:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>Ukončit hru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>Opravdu chcete ukončit tuto hru?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>Opustit hru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>Opravdu chcete opustit tuto hru?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
@@ -7539,7 +8824,7 @@ Prosím vložte jméno:</translation>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
@@ -7547,157 +8832,157 @@ Prosím vložte jméno:</translation>
 <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"/>
     </message>
@@ -7715,27 +9000,27 @@ The more information you put in, the more specific your results will be.</source
         <translation>&amp;Odejít</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1 opustil server.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1 se připojil k serveru.</translation>
     </message>
@@ -7743,180 +9028,180 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation type="unfinished"/>
     </message>
@@ -7929,47 +9214,62 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>&amp;Chat:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>Chatovat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>&amp;Místnost</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Opustit místnost</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>Píšete příliš intenzivně. Počkejte pár sekund.</translation>
     </message>
@@ -7982,30 +9282,30 @@ The more information you put in, the more specific your results will be.</source
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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"/>
     </message>
@@ -8013,92 +9313,97 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8106,38 +9411,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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"/>
@@ -8145,6 +9450,11 @@ Please refrain from engaging in this activity or further actions may be taken ag
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8183,42 +9493,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -8226,151 +9536,209 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation type="unfinished"/>
     </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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation type="unfinished"/>
     </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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation type="unfinished"/>
     </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="67"/>
         <source>Warn user</source>
         <translation type="unfinished"/>
     </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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"/>
     </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="69"/>
         <source>Ban from &amp;server</source>
         <translation type="unfinished"/>
     </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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"/>
     </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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation type="unfinished"/>
     </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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </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="74"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </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="75"/>
         <source>View admin notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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"/>
     </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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation type="unfinished"/>
     </message>
@@ -8385,55 +9753,65 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </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="249"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation type="unfinished"/>
     </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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -8441,311 +9819,554 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>Místo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>Administrátor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>Registrovaný</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>Neregistrovaný</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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></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="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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
-        <source>This server does not permit you to update your user informations.</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <source>Password changed.</source>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <source>This server does not permit you to change your password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <source>The new password is too short.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <source>The old password is incorrect.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
-        <source>Avatar updated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <source>This server does not permit you to update your avatar.</source>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
+        <source>This server does not permit you to update your user informations.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
+        <source>Password changed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
+        <source>The new password is too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
+        <source>The old password is incorrect.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
+        <source>Avatar updated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>&amp;Pro zahraní karty je třeba dvojklik</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>Animace</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;Animace tapnutí/odtapnutí</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <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"/>
     </message>
@@ -8753,22 +10374,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
@@ -8776,124 +10397,256 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8901,7 +10654,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="41"/>
+        <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"/>
     </message>
@@ -8909,19 +10662,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="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
@@ -8929,27 +10682,37 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -8957,50 +10720,93 @@ 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="53"/>
+        <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"/>
     </message>
     <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -9008,46 +10814,25 @@ 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="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -9055,47 +10840,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="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9103,7 +10893,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="25"/>
+        <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"/>
     </message>
@@ -9111,22 +10901,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="47"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -9134,17 +10924,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="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9152,43 +10942,43 @@ 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_widget.cpp" line="135"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>Chyba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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"/>
     </message>
@@ -9196,133 +10986,133 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation type="unfinished"/>
     </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="70"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </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"/>
     </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="107"/>
         <source>Enable all sets</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Disable all sets</source>
         <translation type="unfinished"/>
     </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="109"/>
         <source>Enable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation type="unfinished"/>
     </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="126"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation type="unfinished"/>
     </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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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"/>
     </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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9330,72 +11120,72 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>zamíchat po zavření</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -9403,7 +11193,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>Česky (Czech)</translation>
     </message>
@@ -9411,12 +11201,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -9424,1005 +11214,1078 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>Síla a obrana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>Herní fáze</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>Herní oblast</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>Pohled</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>Průběh hry</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>Odtapnutí</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>Upkeep</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>Lízání</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>Útok</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>Bránění</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>Zranění</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>Exil</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>Hřbitov</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>Ruka</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>Knihovna</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>Vzdát hru</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_de.ts b/cockatrice/translations/cockatrice_de.ts
index fbf984aea..51bee3cd4 100644
--- a/cockatrice/translations/cockatrice_de.ts
+++ b/cockatrice/translations/cockatrice_de.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>Zähler &amp;setzen...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>Zähler setzen</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Neuer Wert für den Zähler &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation>&amp;aktualisieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Setnamen und -Nummer parsen (falls verfügbar)</translation>
     </message>
@@ -36,81 +36,83 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation>In neuem Reiter öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation>Sind Sie sicher?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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>Die Deckliste wurde bearbeitet.
 Änderungen speichern?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation>Deck an Stelle %1 konnte nicht geöffnet werden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation>Remote-Deck konnte nicht gespeichert werden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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>Das Deck konnte nicht abgespeichert werden.
 Bitte überprüfen Sie, ob das Verzeichnis bearbeitet werden kann und versuchen Sie es erneut.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation>Deck speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation>Das Deck konnte nicht abgespeichert werden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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>Es gibt keine Karten in Ihrem Deck zum Exportieren</translation>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
-        <translation>Es wurde kein Deck zum Exportieren ausgewählt.</translation>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
+        <translation>Analysepanel hinzufügen</translation>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation>Aktualisierungsnotizen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation>Administrator Notizen für %1</translation>
     </message>
@@ -118,202 +120,253 @@ Bitte überprüfen Sie, ob das Verzeichnis bearbeitet werden kann und versuchen
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation>Hauptdeck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation>Nebendeck</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation>Sekunden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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>Das Themeverzeichnis &apos;%1&apos; konnte nicht erstellt werden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>Darstellungseinstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>Aktuelles Theme:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation>Öffne Themeverzeichnis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation>Startseitenhintergrund-Quelle:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation>Startseitenhintergrund Wechselfrequenz:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation>Deaktiviert</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation>Einstellungsmenü</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="415"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>Tastatur-Kürzel anzeigen bei Rechtsklickmenü</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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>Spiel-Filter Symbolleiste über der Liste im Raum-Tab anzeigen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>Kartendarstellung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>Kartennamen auch bei Karten mit Bildern darstellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>Automatisches Drehen von Karten mit Seitwärts-Ausrichtung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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>Überschreiben aller Kartenbilder mit persönlichen Set-Präferenzen (Vor-AnbieterID Wechselverhalten) </translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Priorisieren von Sets, in welchen Karten des ausgewählten Decks vorhanden sind, nach oben in der Druckauswahl</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>Karten beim Darüberfahren mit der Maus vergrößern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation>Abgerundete Kartenecken verwenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Minimaler Überschneidungsanteil der Karten auf dem Stapel und in der vertikalen Hand</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="434"/>
         <source>Maximum initial height for card view window:</source>
         <translation>Maximale Starthöhe für das Kartenansichtsfenster</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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>Reihen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="436"/>
         <source>Maximum expanded height for card view window:</source>
         <translation>Maximale ausgeklappte Höhe für das Kartenansichtsfenster:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation>Kartenzähler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation>Zähler %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>Handdarstellung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Hand horizontal anzeigen (verschwendet Platz)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>Linksbündige Ausrichtung aktivieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>Spielfeldraster</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>Vertikale Koordinate umkehren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Mindestspieleranzahl für mehrspaltige Anordnung:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maximale Schriftgröße für die Anzeige von Informationen auf Karten:</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="136"/>
+        <source>Back to results</source>
+        <translation>Zurück zu den Ergebnissen</translation>
+    </message>
+    <message>
+        <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>Deck im Deck-Editor öffnen</translation>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -335,112 +388,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>&amp;Benutzername</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>&amp;IP-Adresse</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>Client I&amp;D bannen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>Art des Banns</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;permanenter Bann</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;temporärer Bann</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>&amp;Tage:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Stunden:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minuten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>Länge des Banns</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>Bitte geben Sie den Grund für den Bann ein.
 Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nicht gesehen werden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>Bitte geben Sie den Grund ein, den die gebannte Person sehen kann.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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>Entferne alle Nachrichten dieses Nutzers in allen Räumen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>Benutzer vom Server bannen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>Bitte wählen Sie einen Namens-, Adress- oder Client-ID-Bann oder eine Kombination aus diesen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>Wenn Sie das Namensbannkästchen auswählen, muss ein Wert für den Namen eingegeben werden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>Wenn Sie das Adressbannkästchen auswählen, muss ein Wert für die IP eingegeben werden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>Wenn Sie das Client-ID-Kästchen auswählen, muss ein Wert für die Client-ID eingegeben werden.</translation>
     </message>
@@ -448,152 +501,221 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation>Beta</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation>Keine Antwort vom Veröffentlichungsaktualisierungsserver erhalten.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Ungültige Antwort vom Veröffentlichungsaktualisierungsserver erhalten.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation>Keine Antwort vom Dateiaktualisierungsserver erhalten.</translation>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>Editionen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>Manakosten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>Kartentyp</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>S/W</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>Farbe(n)</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>UND</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>ODER</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>UND NICHT</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>ODER NICHT</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation>Name (Exakt)</translation>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>Farbe</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation>Edition</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>Manakosten</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation>Manawert</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>Seltenheit</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>Stärke</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>Widerstandskraft</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>Loyalität</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation>Haupttyp</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation>Untertyp</translation>
     </message>
@@ -601,22 +723,22 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <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>Bild</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>Beschreibung</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>Beide</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>Transformation anzeigen</translation>
     </message>
@@ -624,22 +746,22 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation>Zugehörige Karten ansehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation>Karte zum Deck hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation>Mainboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
@@ -652,12 +774,22 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
         <translation>Name:</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>Set:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation>Sammlernummer:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation>Zugehörige Karten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation>Unbekannte Karte:</translation>
     </message>
@@ -665,132 +797,150 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation>Zeigen an....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation>&amp;Alle Spieler</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation>Verwandte Karten ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation>Spielstein:</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation>Alle Spielsteine</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation>&amp;Alles auswählen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation>Reihe auswählen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation>Spalte auswählen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation>&amp;Spielen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation>&amp;Verstecken</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation>Verdeckt ausspielen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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>&amp;Tappen/ Enttappen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
-        <translation>Normales Enttapen umschalten</translation>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
+        <translation>Enttappen überspringen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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>Umdrehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation>%Kartenvorderseite ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation>An Karte anhängen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation>Lösen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation>&amp;Pfeil zeichnen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation>&amp;Anmerkung setzen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation>Kartenzähler</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation>&amp;Zähler hinzufügen (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation>&amp;Zähler entfernen (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation>&amp;Zähler setzen (%1)...</translation>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation>Kartengröße</translation>
     </message>
@@ -798,133 +948,133 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation>ihrer Hand</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation>%1&apos;s Hand</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation>ihrer Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation>%1&apos;s Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation>von ihrer Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation>von %1&apos;s Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation>ihrer Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation>%1&apos;s Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation>ihrer Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation>%1&apos;s Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation>ihrer Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation>%1&apos;s Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation>ihres Friedhofs</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation>%1&apos;s Friedhof</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation>ihres Exils</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation>%1&apos;s Exil</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation>ihres Nebendecks</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation>%1&apos;s Nebendeck</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation>ihres Nebendecks</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation>%1&apos;s Nebendeck</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation>ihrer individuellen Zone &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation>%1&apos;s individuelle Zone &apos;%2&apos;</translation>
@@ -933,7 +1083,7 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Parsingfehler in Zeile %1 Spalte %2:</translation>
     </message>
@@ -941,29 +1091,470 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Parsingfehler in Zeile %1 Spalte %2:</translation>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation>Individuelle Zonen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation>Individuelle Zone &apos;%1&apos; ansehen</translation>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation>Feld hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation>Feld entfernen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation>Layout speichern</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation>Layout laden</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation>Kartendatenbank</translation>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation>Karteninformation</translation>
     </message>
@@ -971,47 +1562,17 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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>Suche nach Kartennamen (oder Suchausdrücken)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation>Zum Deck hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation>Zum Sideboard hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation>Auswahl der Auflage</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation>Auf EDHRec ansehen (Als Commander)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation>Auf EDHRec ansehen (Als Karte)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation>Zeige ähnliche Karten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="127"/>
         <source>Add card to &amp;maindeck</source>
         <translation>Karte zum &amp;Hauptdeck hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="128"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Karte zum &amp;Sideboard hinzufügen</translation>
     </message>
@@ -1019,87 +1580,97 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation>Datenbank wird geladen...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation>Bannerkarte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation>Haupttyp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation>Manakosten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation>Farben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation>Auswahl der Auflage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation>Deck&amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation>Bannerkarte/Sichtbarkeitseinstellungen von Tags</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
         <source>Show banner card selection menu</source>
         <translation>Bannerkartenauswahlmenü anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation>Tagauswahlmenü anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation>&amp;Kommentare:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation>Gruppieren nach:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation>Format:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation>Hash:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation>&amp;Zahl erhöhen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation>&amp;Zahl verringern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation>&amp;Reihe entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="752"/>
         <source>Swap card to/from sideboard</source>
         <translation>Karte ins/aus dem Sideboard tauschen</translation>
     </message>
@@ -1125,114 +1696,114 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation>&amp;Deckeditor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation>&amp;Neues Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation>&amp;Deck laden...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation>Laden der letzten Decks...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation>Alles entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation>&amp;Deck speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation>&amp;Deck speichern unter...</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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation>Deck aus &amp;Zwischenablage laden...</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="162"/>
         <source>Edit deck in clipboard</source>
         <translation>Deck in Zwischenablage bearbeiten</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="166"/>
+        <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>Kommentiert</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="168"/>
+        <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>Nicht kommentiert</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation>Deck in Zwischenablage speichern</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="168"/>
         <source>Annotated (No set info)</source>
         <translation>Komentiert (keine Setinformationen)</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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation>Nicht kommentiert (keine Setinformationen)</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="172"/>
         <source>&amp;Print deck...</source>
         <translation>&amp;Deck drucken...</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="174"/>
         <source>Load deck from online service...</source>
         <translation>Deck von Onlineservice laden....</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation>&amp;Deck an Onlineservice senden</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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation>Deckliste erstellen (decklist.org)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation>Deckliste erstellen (decklist.xyz)</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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation>Deck analysieren (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation>Deck analysieren (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation>&amp;Schließen</translation>
     </message>
@@ -1240,7 +1811,7 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation>Auflagenauswahl</translation>
     </message>
@@ -1248,194 +1819,171 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>Spoiler aktualisieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>Erfolgreich</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation>Download-URLs wurden zurückgesetzt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>Heruntergeladene Kartenbilder wurden zurückgesetzt.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation>Eines oder mehrere Kartenbilder konnten nicht gelöscht werden.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>URL hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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>URL bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation>Größe des Netzwerkzwischenspeichers:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation>Umleitungszwischenspeicher TTL:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation>Wie lange gespeicherte Umleitungen für URLS gültig sind.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation>Größe des Bilderzwischenspeichers:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation>Neue URL hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation>URL entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation>Tag(e)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>Aktualisiere...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>Pfad auswählen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation>URL Downloadpriorität</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>Spoiler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>Lade Spoiler automatisch herunter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation>Spoiler Verzeichnis:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>Letzte Änderung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>Spoiler werden beim Start automatisch heruntergeladen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>Drücke den Knopf um manuell zu aktualisieren ohne neu zu starten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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>Schließen Sie die Einstellungen nicht solange die manuelle Aktualisierung nicht abgeschlossen ist.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation>Kartenbilder dynamisch herunterladen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation>Wie eine benutzerdefinierte URL hinzugefügt wird</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>Heruntergeladene Bilder löschen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation>Download-URLs zurücksetzen</translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
-        <translation>Festplatten-Cache für heruntergeladene Bilder</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
+        <translation>Rückgängig machen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
-        <translation>Arbeitsspeicher-Cache für Bilder die gerade nicht angezeigt werden</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation>Wiederholen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation>Rückgängig machen/Wiederholen Verlauf</translation>
+    </message>
+    <message>
+        <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>Einen Eintrag anklicken um zu diesem Zeitpunkt im Verlauf zurückzukehren</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation>[wiederholen] </translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
+        <translation>[rückgängig machen] </translation>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation>Anzahl</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation>Festlegen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation>ID des Anbieters</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>Karte</translation>
     </message>
@@ -1443,12 +1991,12 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation>Standarddeckformate (%1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation>Alle Dateien (*.*)</translation>
     </message>
@@ -1456,17 +2004,17 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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>Modus: Exakte Übereinstimmung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
         <source>Mode: Includes</source>
         <translation>Modus: Enthält</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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>Farbidentitätsfiltermodus (UND/ODER/NICHT Verknüpfungen der Filter)</translation>
     </message>
@@ -1474,7 +2022,7 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
         <source>Edit tags ...</source>
         <translation>Tags bearbeiten ...</translation>
     </message>
@@ -1482,62 +2030,62 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
         <source>Deck Tags Manager</source>
         <translation>Decktagsmanager</translation>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation>Verwalte Decktags. Wähle Tags nach Bedarf aus oder füge neue hinzu:</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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation>Neuen Tag hinzufügen (bspw. Aggro)</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="104"/>
         <source>Add Tag</source>
         <translation>Tag hinzufügen</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="105"/>
         <source>Filter tags...</source>
         <translation>Tags filtern...</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="106"/>
         <source>OK</source>
         <translation>OK</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="107"/>
         <source>Edit default tags</source>
         <translation>Standardtags bearbeiten</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="108"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation>Ungültige Eingabe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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>Tagname kann nicht leer sein!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation>Tag duplizieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>This tag already exists.</source>
         <translation>Dieser Tag existiert bereits.</translation>
     </message>
@@ -1545,98 +2093,156 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation>Bannerkarte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
         <source>Open in deck editor</source>
         <translation>Im Deckeditor öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation>Tags bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation>Deck umbenennen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
         <source>Save Deck to Clipboard</source>
         <translation>Deck in die Zwischenablage speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation>Kommentiert</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
         <source>Annotated (No set info)</source>
         <translation>Komentiert (keine Setinformationen)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation>Nicht kommentiert</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
         <source>Not Annotated (No set info)</source>
         <translation>Nicht kommentiert (keine Setinformationen)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation>Datei umbenennen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation>Datei löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation>Bannerkarte setzen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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>Neuer Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation>Umbenennen fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation>Datei löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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>Sind Sie sicher, dass die ausgewählte Datei gelöscht werden soll?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation>Löschen fehlgeschlagen</translation>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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>Deck umbenennen von &quot;%1&quot; zu &quot;%2&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
+        <source>Updated comments (was %1 chars, now %2 chars)</source>
+        <translation>Kommentare aktualisiert (davor %1 Zeichen, jetzt %2 Zeichen)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation>Bannerkarte setzen als %1 (%2)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation>Tags geändert</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation>Format setzen zu %1</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation>(%1): %2 (%3) %4 hinzugefügt</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="264"/>
+        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
+        <translation>Nach %1 1 × &quot;%2&quot; (%3) bewegt</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation>&quot;%1&quot; entfernt (alle Kopien)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation>%1 1 × &quot;%2&quot; (%3)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation>Hinzugefügt</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation>Entfernt</translation>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1654,75 +2260,75 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>Deck laden...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Deck vom Server laden...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation>Aus der Zwischenablage laden...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation>Von Internetseite laden....</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation>Deck entladen</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>Bereit zum Start</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation>Zwangsstart</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation>Sideboard entsperrt</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation>Sideboard gesperrt</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>Fehler</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>Die gewählte Datei konnte nicht geladen werden.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation>Deck übersteigt die maximale Dateigröße.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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>Sind Sie sicher, dass sie den Start erzwingen wollen?
 Dies wirft alle nicht bereiten Spieler aus dem Spiel.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -1757,143 +2363,143 @@ Möchten sie das Deck ins .cod Format konvertieren?</translation>
         <translation>Lade herunter...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>Bekannte Hosts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation>Den derzeit gespeicherten Server löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Aktualisiere die Serverliste der bekannten öffentlichen Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>Neuer Host</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;Server:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>Spieler&amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;asswort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>Passwort &amp;speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>a&amp;utomatisch verbinden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Automatisch mit dem letzten Login verbinden, wenn sich Cockatrice öffnet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>Falls Probleme mit der Verbindung oder Registrierung bestehen, kontaktieren Sie das Personal für Hilfe!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>Webseite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation>Passwort zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation>Passwort vergessen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>&amp;Verbinden...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation>Serverkontakt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>Verbinde zum Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation>Server URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation>Kommunikationsport</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation>Einzigartiger Servername</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>Verbindungswarnung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>Sie müssen Ihr neues Verbindungsprofil benennen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>Verbindungswarnung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Der Spielername kann nicht leer sein.</translation>
     </message>
@@ -1901,117 +2507,122 @@ Möchten sie das Deck ins .cod Format konvertieren?</translation>
 <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>Einstellungen speichern</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>&amp;Beschreibung:</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>&amp;Spieler:</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>Allgemeines</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>Spieltyp</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>&amp;Passwort:</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>Nur &amp;Freunde können teilnehmen</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>Nur &amp;registrierte Benutzer können teilnehmen</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>Teilnahmebedingungen</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>Zuschauer erlauben</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>Zuschauer benötigen das Passwort</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>Zuschauer können &amp;chatten</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>Zuschauer sehen die Hände</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>Spiel als Zuschauer erstellen</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>Zuschauer</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>Anfangslebenspunktzahl</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>Offene Decklisten in Lobby</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation>Spiel als Richter erstellen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation>Spielaufsetzungsoptionen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>Spiel erstellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>&amp;Spielinformationen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>Serverfehler.</translation>
     </message>
@@ -2019,97 +2630,97 @@ Möchten sie das Deck ins .cod Format konvertieren?</translation>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Name:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Spielstein</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Farbe:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>weiß</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>blau</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>schwarz</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>rot</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>grün</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>mehrfarbig</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>farblos</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;Kampfwerte:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Hinweis:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>Spielstein &amp;zerstören, wenn er das Spielfeld verlässt</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation>Verdeckt erstellen (versteckt nur den Namen)</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Spielstein-Daten</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>&amp;Alle möglichen Spielsteine zeigen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Spielsteine dieses &amp;Decks zeigen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>Spielstein aus Liste auswählen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>Spielstein erstellen</translation>
     </message>
@@ -2117,53 +2728,53 @@ Möchten sie das Deck ins .cod Format konvertieren?</translation>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation>Tags bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation>Bestätigen</translation>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation>Abbrechen</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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation>Tag eingeben und Eingabetaste drücken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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>✖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation>Ungültige Eingabe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation>Tagname kann nicht leer sein!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation>Tag duplizieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation>Dieser Tag existiert bereits</translation>
     </message>
@@ -2171,40 +2782,40 @@ Möchten sie das Deck ins .cod Format konvertieren?</translation>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>Kein Bild gewählt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Um Ihren Avatar zu wechseln, wählen Sie ein neues Bild.
 Um Ihren derzeitigen Avatar zu entfernen, bestätigen Sie, ohne ein neues Bild zu wählen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>Durchsuchen...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>Avatar wechseln</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>Bild öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Bild-Dateien (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>Ungültiges Bild gewählt.</translation>
     </message>
@@ -2212,17 +2823,17 @@ Um Ihren derzeitigen Avatar zu entfernen, bestätigen Sie, ohne ein neues Bild z
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation>Deck in Zwischenablage bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation>Ungültige Deckliste.</translation>
     </message>
@@ -2230,38 +2841,38 @@ Um Ihren derzeitigen Avatar zu entfernen, bestätigen Sie, ohne ein neues Bild z
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Altes Passwort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Neues Passwort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Bestätige neues Passwort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Passwort ändern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Das Passwort ist zu kurz.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Die neuen Passwörter stimmen nicht überein.</translation>
     </message>
@@ -2269,93 +2880,93 @@ Um Ihren derzeitigen Avatar zu entfernen, bestätigen Sie, ohne ein neues Bild z
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Farbe:</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="34"/>
         <source>white</source>
         <translation>weiß</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="35"/>
         <source>blue</source>
         <translation>blau</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="36"/>
         <source>black</source>
         <translation>schwarz</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="37"/>
         <source>red</source>
         <translation>rot</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="38"/>
         <source>green</source>
         <translation>grün</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="39"/>
         <source>multicolor</source>
         <translation>mehrfarbig</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>farblos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;Kampfwerte:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Hinweis:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Spielstein-Daten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>Spielstein hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Spielstein entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation>Benutzerdefinierte Spielsteine bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Bitte geben Sie den Namen des Spielsteins ein:</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>Fehler</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>Es existiert bereits eine Karte oder ein Spielstein mit dem gewählten Namen.
@@ -2380,12 +2991,12 @@ Aktivieren Sie die Edition „Token&quot; im „Editionen verwalten...“ Menü
         <translation>Undefiniert</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Echter Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Benutzerprofil bearbeiten</translation>
     </message>
@@ -2423,112 +3034,113 @@ Aktivieren Sie die Edition „Token&quot; im „Editionen verwalten...“ Menü
         <translation>2 Stunden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation>„Nur Freunde“ Spiele ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation>Volle Spiele ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation>Bereits begonnene Spiele ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation>Passwortgeschützte Spiele ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation>Spiele von „Ignorierten Benutzern“ ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
         <translation>Nicht von Freunden erstellte Spiele verstecken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation>Spiele mit erzwungenen offenen Decklisten verstecken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Neuer als:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Spielbeschreibung:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;Name des Erstellers:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>Allgemeines</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>Spiel&amp;typen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>&amp;mindestens:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>&amp;höchstens:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>Maximale Spielerzahl</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>Einschränkungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Zeige Spiele nur, wenn &amp;Zuschauer erlaubt sind</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Zeige für Zuschauer passwo&amp;rtgeschützte Spiele</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Zeige nur, wenn Zuschauer den &amp;Chat nutzen können</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Zeige nur, wenn Zuschauer die &amp;Hände sehen können</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation>Zuschauer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>Spiele filtern</translation>
     </message>
@@ -2536,52 +3148,52 @@ Aktivieren Sie die Edition „Token&quot; im „Editionen verwalten...“ Menü
 <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>Setze Passwortherausforderungswarnung zurück</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>Ein Problem ist aufgetreten. Bitte erneut ein neues Passwort anfordern.</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>Gebe die Informationen des Servers und Kontos, für das ein neues Passwort angefordert werden soll, an.</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>&amp;Host:</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>&amp;Port:</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>Spieler&amp;name:</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>E-Mail:</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>Setze Passwortherausforderung zurück</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>Setze Passwortherausforderungsfehler zurück</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>Die E-Mail-Adresse kann nicht leer sein.</translation>
     </message>
@@ -2589,37 +3201,37 @@ Aktivieren Sie die Edition „Token&quot; im „Editionen verwalten...“ Menü
 <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>Gebe die Informationen des Servers, für den ein neues Passwort angefordert werden soll, an.</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>&amp;Host:</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>&amp;Port:</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>Spieler&amp;name:</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>Passwortrücksetzungsanfrage</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>Passwortrücksetzungsfehler</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>Der Spielername kann nicht leer sein.</translation>
     </message>
@@ -2627,86 +3239,86 @@ Aktivieren Sie die Edition „Token&quot; im „Editionen verwalten...“ Menü
 <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>Passwortrücksetzungswarnung</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>Ein Problem ist aufgetreten. Bitte erneut ein neues Passwort anfordern.</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>Gebe den erhaltenen Token und das neue Passwort ein, um das neue Passwort zu setzen.</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>&amp;Host:</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>&amp;Port:</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>Spieler&amp;name:</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>Spielstein:</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>Neues Passwort:</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>Passwort zurücksetzen</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>Der Spielername kann nicht leer sein.</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>Passwortrücksetzungsfehler</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>Der Spielstein kann nicht leer sein.</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>Das neue Passwort kann nicht leer sein.</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>Fehler</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>Das Passwort ist zu kurz.</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>Die Passwörter stimmen nicht überein.</translation>
     </message>
@@ -2722,17 +3334,17 @@ Aktivieren Sie die Edition „Token&quot; im „Editionen verwalten...“ Menü
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>Deck aus der Zwischenablage laden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>Ungültige Deckliste.</translation>
     </message>
@@ -2740,45 +3352,45 @@ Aktivieren Sie die Edition „Token&quot; im „Editionen verwalten...“ Menü
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation>Hier einen Link einer Decklistenseite einfügen um ihn zu importieren.
 (Archidekt, Deckstats, Moxfield und TappedOut sind unterstützt.)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation>Deck von Internetseite laden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation>Kein Parset verfügbar für diesen Deckanbieter.
 (Archidekt, Deckstats, Moxfield und TappedOut sind unterstützt.)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation>Netzwerkfehler: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation>Leere Deckdaten erhalten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation>Fehler beim parsen der Deckdaten: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2798,45 +3410,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>Deck laden</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation>Spieler:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation>Allgemein</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation>Lebenspunkte zum Spielstart:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation>Spieleinstellungen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation>Einstellungen merken</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation>Lokale Spieleinstellungen</translation>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation>Kartenname (oder Suchbezeichnung)</translation>
     </message>
     <message>
-        <location filename="src/game/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>Anzahl der Treffer:</translation>
     </message>
     <message>
-        <location filename="src/game/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>Automatisches Ausspielen von Treffern</translation>
     </message>
     <message>
-        <location filename="src/game/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>Oberste Karten auf den Stapel legen bis...</translation>
     </message>
     <message>
-        <location filename="src/game/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>Keine Karten, die den Suchbezeichnungen entsprechen, existieren in der Kartendatenbank. Trotzdem fortfahren?</translation>
     </message>
     <message>
-        <location filename="src/game/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>Basilisk</translation>
     </message>
     <message>
-        <location filename="src/game/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>Ungültiger Filter</translation>
     </message>
@@ -2844,54 +3489,54 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Geben Sie Ihre Informationen und die Informationen des Servers, bei dem Sie sich registrieren wollen, an.
 Die E-Mail-Adresse wird zur Accountverifikation genutzt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>Spieler&amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;asswort</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>Passwort (Wiederholung)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>E-Mail:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>E-Mail (Wiederholung)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>Land:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>Undefiniert</translation>
     </message>
@@ -2937,17 +3582,17 @@ Die E-Mail-Adresse wird zur Accountverifikation genutzt.</translation>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation>Anzahl der Seiten:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation>Anzahl der Würfel:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation>Würfeln</translation>
     </message>
@@ -2955,40 +3600,55 @@ Die E-Mail-Adresse wird zur Accountverifikation genutzt.</translation>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation>Ungeänderte Karten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation>Geänderte Karten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation>Sets auswählen, um sie zu aktivieren. Per Drag-and-Drop kann die Reihenfolge und damit die Priorität geändert werden. Karten verwenden die Druckversion des aktivierten Sets mit der höchsten Priorität.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation>Alle Setinformationen löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation>Alle auf bevorzugt setzen</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation>Drucke in Masse modifizieren.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation>Alle Druckinformation gelöscht.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation>Alle Drucke auf bevorzugt setzen.</translation>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>Unbekannter Fehler beim Laden der Kartendatenbank</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -3005,7 +3665,7 @@ Sie müssen Oracle unter Umständen nochmals ausführen um Ihre Kartendatenbank
 Möchten Sie Ihren Speicherort der Datenbank aktualisieren??</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3022,7 +3682,7 @@ Normalerweise kann dies durch einen erneuten Start von Oracle, um die Kartendate
 Möchten Sie Ihren Speicherort der Datenbank aktualisieren?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3035,7 +3695,7 @@ Bitte erstellen Sie ein Ticket auf https://github.com/Cockatrice/Cockatrice/issu
 Möchten Sie die Einstellung des Datenbankspeicherorts ändern?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3044,7 +3704,7 @@ Would you like to change your database location setting?</source>
 Möchten Sie Ihren Speicherort der Datenbank aktualisieren?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3053,7 +3713,7 @@ Would you like to change your database location setting?</source>
 Möchten Sie Ihren Speicherort der Datenbank aktualisieren?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3066,59 +3726,64 @@ Bitte erstellen Sie ein Ticket auf https://github.com/Cockatrice/Cockatrice/issu
 Möchten Sie die Einstellung des Datenbankspeicherorts ändern?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>Der Pfad zu Ihrem Deckordner ist ungültig. Möchten Sie zurückgehen und den korrekten Pfad einstellen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>Der Pfad zu Ihrem Kartenbilderordner ist ungültig. Möchten Sie zurückgehen und den korrekten Pfad einstellen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>Allgemeines</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>Erscheinungsbild</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>Benutzeroberfläche</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation>Kartenquellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>Töne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>Tastaturkürzel</translation>
     </message>
@@ -3126,12 +3791,12 @@ Möchten Sie die Einstellung des Datenbankspeicherorts ändern?</translation>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation>Kartenaktualisierungsüberprüfung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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>
@@ -3140,27 +3805,27 @@ Bitte wählen Sie aus, wie der Kartendatenbankaktualisierer ausgeführt werden s
 Sie können das Verhalten jederzeit im &quot;Allgemein&quot;-Tab der Einstellungen ändern.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation>Im Vordergrund ausführen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation>Im Hintergrund ausführen</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="27"/>
         <source>Run in background and always from now on</source>
         <translation>Immer im Hintergrund ausführen</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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation>Nicht erneut fragen und nicht ausführen</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="29"/>
         <source>Don&apos;t run this time</source>
         <translation>Dieses Mal nicht ausführen</translation>
     </message>
@@ -3168,17 +3833,17 @@ Sie können das Verhalten jederzeit im &quot;Allgemein&quot;-Tab der Einstellung
 <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>Vor</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>Zurück</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>Tipp des Tages</translation>
     </message>
@@ -3186,166 +3851,166 @@ Sie können das Verhalten jederzeit im &quot;Allgemein&quot;-Tab der Einstellung
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>Momentaner Veröffentlichungskanal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>Neu installieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>Download abbrechen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>Downloadseite öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation>Auf Clientaktualisierungen prüfen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>Ihre Version von Cockatrice hat keine SSL-Unterstützung, dadurch können Sie keine Aktualisierungen automatisch herunterladen!
 Bitte besuchen Sie die Downloadseite, um Cockatrice manuell zu aktualisieren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation>Lade Aktualisierung herunter: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>Suche nach Aktualisierungen...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>Suche nach Aktualisierungen abgeschlossen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>Keine Aktualisierung verfügbar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice ist aktuell!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>Sie verwenden bereits die aktuellste Version des gewählten Veröffentlichungskanals.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>Momentane Version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>Ausgewählter Veröffentlichungskanal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>Aktualisierung verfügbar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Eine neue Cockatrice-Version ist verfügbar!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Neue Version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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>Veröffentlicht</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>Änderungsprotokoll</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>Möchten Sie jetzt aktualisieren?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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>Leider hat der automatische Updater keinen kompatiblen Download gefunden.
 Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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>Bitte prüfen Sie die &lt;a href=&apos;%1&apos;&gt;Veröffentlichungsseite&lt;/a&gt; auf unserer Github-Seite und laden Sie die Version für Ihr Betriebssystem herunter.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>Aktualisierungsfehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Während der Suche nach Aktualisierungen ist ein Fehler aufgetreten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Während des Herunterladens der Aktualisierung ist ein Fehler aufgetreten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>Installiere...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice kann das Installationsprogramm nicht öffnen. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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>Versuchen Sie manuell zu aktualisieren, indem Sie Cockatrice beenden und das Installationsprogramm aufrufen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation>Downloadverzeichnis</translation>
     </message>
@@ -3353,21 +4018,153 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Lösche den Log beim Schließen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation>In die Zwischenablage kopieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Fehlerprotokoll</translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation>Zieh-Wahrscheinlichkeitseinstellungen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation>Kriterien:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation>Kartenname</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation>Untertyp</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation>Manawert</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation>Genauheit:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation>mindestens</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation>genau</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation>Menge (N):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation>Karten die gezogen wurden (M):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation>Karten</translation>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation>Zieh-Wahrscheinlichkeit</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation>Wahrscheinlichkeit des Ziehens</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation>Kartenname</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation>Untertyp</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation>Manawert</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation>mindestens</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation>genau</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation>Karte(n) gezogen haben mindestens</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation>Karten</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation>Kategorie</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation>Menge</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation>Wahrscheinlichkeit (%)</translation>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3438,32 +4235,38 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
     </message>
 </context>
 <context>
-    <name>EdhrecCommanderApiResponseNavigationWidget</name>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
-        <source>Combos</source>
-        <translation>Kombos</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
-        <source>Average Deck</source>
-        <translation>Durchschnittliches Deck</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
         <source>Game Changers</source>
-        <translation>Game Changer</translation>
+        <translation>Spielwechsler</translation>
     </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
         <source>Budget</source>
         <translation>Budget</translation>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <source>Combos</source>
+        <translation>Kombos</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <source>Average Deck</source>
+        <translation>Durchschnittliches Deck</translation>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
         <source>Salt: </source>
         <translation>Salz:</translation>
     </message>
@@ -3471,7 +4274,7 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>Gib hier deine Filter ein</translation>
     </message>
@@ -3479,22 +4282,22 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation>Löschen bestätigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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>Sind Sie sicher, dass Sie den Filter &apos;%1&apos; löschen wollen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation>Löschen fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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>Löschen des Filters &apos;%1&apos; fehlgeschlagen.</translation>
     </message>
@@ -3502,22 +4305,22 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation>Von Spielhost oder Moderator gekickt</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation>Spieler hat das Spiel verlassen</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation>Spieler hat die Verbindung zum Server getrennt</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation>Grund unbekannt</translation>
     </message>
@@ -3525,155 +4328,208 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>Bitte betreten Sie erst den entsprechenden Raum.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>Falsches Passwort.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>In diesem Spiel sind keine Zuschauer zugelassen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>Das Spiel ist bereits voll.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>Dieses Spiel gibt es nicht mehr.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>Dieses Spiel kann nur von registrierten Benutzern betreten werden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>Dieses Spiel kann nur von Freunden des Erstellers betreten werden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Der Ersteller dieses Spiels ignoriert Sie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation>Spiel beitreten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation>Spiel beobachten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation>Spielinformationen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation>Spiel als Richter beitreten</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation>Spiel als Richter zuschauen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>Spiel beitreten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>Bitte betreten Sie zuerst den entsprechenden Raum.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>Spiele &amp;filtern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>Filter &amp;zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>E&amp;rstellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>&amp;Beitreten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation>Als Richter beitreten</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>Als Zuschauer beitreten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation>Als Richter-Zuschauer beitreten</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation>Angezeigte Spiele: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>Spiele</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation>Alle Typen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation>Nach Spielnamen filtern...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation>Nach Spieltyp/Format filtern</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation>Nicht von Freunden erstellte Spiele ausblenden</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation>Volle Spiele ausblenden</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation>Gestartete Spiele ausblenden</translation>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 Tag</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="43"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 h</numerusform><numerusform>%1%2 h</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation>neu</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="48"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>nur Freunde</translation>
     </message>
@@ -3683,68 +4539,68 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
         <translation>nur reg. Benutzer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation>Offene Decklisten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>können chatten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>sehen Hände</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>können Hände sehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>nicht erlaubt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>Raum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>Alter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>Ersteller</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>Bedingungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>Spieler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>Zuschauer</translation>
     </message>
@@ -3752,143 +4608,158 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation>Alle Pfade zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation>Alle Pfade wurden zurückgesetzt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>Pfad auswählen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>Persönliche Einstellungen</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>Sprache:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>Pfade (Anpassungen im portablen Modus deaktiviert)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>Pfade</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation>Wie man beim Übersetzen helfen kann</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>Verzeichnis mit Decklisten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation>Filterverzeichnis:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>Verzeichnis mit aufgezeichneten Spielen:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>Verzeichnis mit Bilddateien:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>Kartendatenbank:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation>Verzeichnis für benutzerdefinierte Datenbank:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>Spielsteindatenbank:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation>Aktualisierungskanal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation>Nach Aktualisierungen des Klienten beim Start der Anwendung suchen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="379"/>
         <source>Check for card database updates on startup</source>
         <translation>Auf Kartendatenbankaktualisierungen beim Anwendungsstart prüfen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation>Nicht überprüfen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation>Zu Aktualisierungen auffordern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation>Immer im Hintergrund aktualisieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation>Auf Kartendatenbankaktualisierung prüfen alle</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation>Tage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>Benachrichtigung wenn ein vom Server unterstütze Funktion in meinem Client fehlt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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>Starte Oracle automatisch, wenn eine neue Version von Cockatrice gestartet wird</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>Zeige Tipps beim Start</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="398"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation>Letzte Aktualisierungsprüfung am %1 (vor %2 Tagen)</translation>
     </message>
@@ -3896,47 +4767,47 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Friedhof</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation>&amp;Friedhof ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation>&amp; Friedhof nach ... bewegen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Oben in der Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Unten in der Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Alle Spieler</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exil</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation>Zufällige Karte vorzeigen für ...</translation>
     </message>
@@ -3944,111 +4815,141 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation>&amp;Hand ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
-        <translation>&amp;Hand sortieren</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
+        <translation>Hand nach ... sortieren</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
-        <translation>Mulligan nehmen</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
+        <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation>Manawert</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation>&amp;Mulligan nehmen (Handgröße wählen)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation>Mulligan nehmen (Gleiche Handgröße)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation>Mulligan nehmen (Handgröße -1)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation>&amp;Hand nach ... bewegen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Oben in der Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Unten in der Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Friedhof</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exil</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation>&amp;Hand an ... vorzeigen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation>Zufällige Karten an ... vorzeigen</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
+        <translation>Alle Spieler</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>Zufällige Karten an ... vorzeigen</translation>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation>Neues Deck erstellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation>Decks durchsuchen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation>Kartendatenbank durchsuchen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation>EDHRec durchsuchen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation>Archidekt durchsuchen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation>Wiederholung ansehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation>Verlassen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation>Verbinden...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation>Verbinden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation>Spielen</translation>
     </message>
@@ -4056,843 +4957,487 @@ Eventuell müssen sie manuell eine neue Version herunterladen.</translation>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation>&amp;Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation>&amp;Bibliothek ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation>Die obersten Karten der Bibliothek ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation>Die untersten Karten der Bibliothek ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation>Bibliothek an ... vorzeigen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation>Bibliothek ... leihen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation>Die obersten Karten ... zeigen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation>&amp;Oben auf die Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation>&amp;Unter die Bibliothek...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation>&amp;Immer die oberste Karte vorzeigen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation>&amp;Immer die oberste Karte ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation>&amp;Deck in Deckeditor öffnen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation>&amp;Karte ziehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation>Karten ziehen...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation>&amp;Letztes Ziehen rückgängig machen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation>Mischen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation>&amp;Oberste Karte spielen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation>Oberste Karte verdeckt ausspielen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation>Oberste Karte nach unten legen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation>Oberste Karte in den Friedhof bewegen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation>Oberste Karte ins Exil bewegen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation>Die obersten Karten in den Friedhof bewegen...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation>Die obersten Karten verdeckt in den Friedhof bewegen...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation>Die obersten Karten ins Exil bewegen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation>Die obersten Karten verdeckt ins Exil bewegen...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation>Die obersten Karten auf den Stapel packen bis...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation>Oberste Karten mischeln...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation>&amp;Unterste Karte ziehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation>Untere Karten ziehen...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation>&amp;Unterste Karte ausspielen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation>Unterste Karte verdeckt spielen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation>Unterste Karte in den Friedhof bewegen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation>Unterste Karte ins Exil bewegen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation>Unterste Karten in den Friedhof bewegen...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation>Die untersten Karten verdeckt in den Friedhof bewegen...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation>Unterste Karten ins Exil bewegen...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation>Die untersten Karten verdeckt ins Exil bewegen...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation>Unterste Karte nach oben bewegen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation>Unterste Karten mischen...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Alle Spieler</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
+        <translation>Oberste Karten der Bibliothek vorzeigen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
+        <translation>Anzahl der Karten: (max. %1)</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>Der Server hat seine maximale Benutzeranzahl erreicht. Bitte versuchen Sie es später noch einmal.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>Es gibt zu viele gleichzeitige Verbindungen von Ihrer Adresse.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>Gebannt von einem Moderator</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>Voraussichtliches Ende: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>Dieser Bann ist unbefristet.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>Planmäßige Serverabschaltung.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>Ungültiger Benutzername.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>Sie wurden abgemeldet, da Sie sich an einer anderen Stelle angemeldet haben.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>Verbindung geschlossen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>Der Server hat Ihre Verbindung beendet.
-Grund: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>Der Server wird in %n Minute neu gestartet.
-Alle laufenden Spiele werden beendet.
-Grund für die Abschaltung: %1</numerusform><numerusform>Der Server wird in %n Minuten neu gestartet.
-Alle laufenden Spiele werden beendet.
-Grund für die Abschaltung: %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>Planmäßige Serverabschaltung</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>Erfolgreich</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>Registrierung angenommen.
-Login läuft.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>Accountaktivierung angenommen.
-Login läuft.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>Spieleranzahl</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>Bitte die Spieleranzahl eingeben:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>Spieler %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>Aufgezeichnetes Spiel laden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>Über Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatrice Webseite</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>Projektmanager:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>frühere Projektmanager:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>Entwickler:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>unsere Entwickler</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>Hilf bei der Entwicklung!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>Übersetzer:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>Unsere Übersetzer</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>Hilf bei der Übersetzung!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>Unterstützung:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>Problem melden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>Fehlersuche</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>F.A.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>Server Zeitüberschreitung</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>Anmeldung fehlgeschlagen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation>Ihrem Client scheinen Funktionen, die der Server für die Verbindung benötigt, zu fehlen.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation>Um Ihren Client zu aktualisieren, gehen Sie auf &apos;Hilfe -&gt; Auf Clientaktualisierungen prüfen&apos;.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>Falscher Benutzername oder Passwort. Bitte überprüfe deine Login Informationen und versuche es erneut.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>Es gibt bereits eine aktive Verbindung mit diesem Benutzernamen.
-Bitte schließen Sie diese Verbindung zuerst und versuchen Sie es dann erneut.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>Sie sind gebannt bis: %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>Sie sind auf unbestimmte Zeit gebannt.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>Diese Server benötigt eine Benutzerregistrierung. Möchten Sie sich jetzt registrieren?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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>Dieser Server verlangt Client-IDs. Entweder das Erzeugen der ID schlägt fehl oder Sie verwenden einen modifizierten Client.
-Bitte starten Sie ihren Client neu, um es erneut zu versuchen.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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>Ein interner Fehler ist aufgetreten, bitte starten Sie Cockatrice neu, bevor Sie es erneut versuchen.
-Falls der Fehler erneut auftritt, versichern Sie sich, dass Sie die neuste Softwareversion verwenden, und kontaktieren Sie falls nötig die Softwareentwickler.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>Accountaktivierung</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>Ihr Account wurde noch nicht aktiviert.
-Sie müssen den Aktivierungstoken aus der Aktivierungsemail verwenden</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation>Server voll</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>Unbekannter Login-Fehler: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>
-Dies bedeutet normalerweise, dass Ihre Clientversion veraltet ist und der Server eine Antwort geschickt hat, die Ihr Client nicht versteht.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>Ihr Benutzername muss diesen Regeln entsprechen:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>%1 - %2 Zeichen lang</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>kann %1 Kleinbuchstaben beinhalten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>NICHT</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>kann %1 Großbuchstaben beinhalten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>kann %1 Zahlen beinhalten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>kann folgende Sonderzeichen beinhalten: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>Das erste Zeichen kann %1 ein Sonderzeichen sein</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <source>no unacceptable language as specified by these server rules:</source>
-        <comment>note that the following lines will not be translated</comment>
-        <translation>Keine inakzeptable Sprache wie durch folgende Serverregeln festgelegt:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation>kann keines der folgenden Wörter enthalten: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation>kann keinem der folgenden Ausdrücke entsprechen: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>Sie können nur A-Z, a-z, 0-9, _, ., und - in Ihrem Benutzernamen verwenden.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>Registrierung verweigert</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>Momentan ist die Registrierung auf diesem Server deaktiviert</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>Es existiert bereits ein Account mit dem gleichen Benutzernamen.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>Es ist erforderlich, eine korrekte Emailadresse während der Registrierung anzugeben.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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>Scheinbar versuchen Sie, ein neues Benutzerkonto auf diesem Server zu registrieren, obwohl Sie bereits ein Konto mit der verwendeten E-Mailadresse haben. Dieser Server beschränkt die Anzahl an Benutzerkonten, die ein Nutzer pro E-Mailadresse registrieren kann. Bitte kontaktieren Sie den Server-Betreiber für weitere Hilfe oder um Ihre Zugangsinformationen zu erhalten.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>Passwort zu kurz.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>Registrierung aufgrund eines technischen Problems des Servers fehlgeschlagen.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation>Verbindung zum Server verloren.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>Unbekannter Registrierungsfehler: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>Accountaktivierung fehlgeschlagen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>Netzwerkfehler: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>Sie versuchen sich an einem veralteten Server anzumelden. Bitte verwenden Sie eine ältere Cockatrice-Version oder melden Sie sich an einem aktuellen Server an.
-Lokale Version ist %1, Serverversion ist %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>Ihr Cockatrice-Client ist veraltet. Bitte laden Sie sich die neueste Version herunter.
-Lokale Version ist %1, Serverversion ist %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>Verbinde zu %1...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>Registrierung bei %1 als %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>nicht verbunden</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>Verbunden, Anmeldung bei %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>Fordere vergessenes Password von %1 als %2 an...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Verbinden...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>Verbindung &amp;trennen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>&amp;Lokales Spiel starten...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Aufgezeichnetes Spiel abspielen...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Vollbild</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>Auf Server &amp;registrieren...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation>Passwort wiede&amp;rherstellen...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Einstellungen...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>&amp;Beenden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>Aktionen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>K&amp;artendatenbank</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation>Editionen &amp;verwalten...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Bearbeite benutzerdefinierte Spiels&amp;teine...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>Öffne den Ordner für benutzerdefinierte Kartenbilder</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>Öffne den Ordner für benutzerdefinierte Sets</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>Benutzerdefinierte Karten/Sets hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation>Neu laden der Kartendatenbank</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation>Reiter</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;Über Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Tipp des Tages</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation>Auf Clientaktualisierungen prüfen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation>Nach Kartenaktualisierungen suchen...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation>Prüfe auf Kartenaktualisierungen (automatisch)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation>Statuszeile anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation>Fehlerprotokoll ansehen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation>Einstellungsordner öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation>Ein-/Ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation>Neue Version</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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>Herzlichen Glückwunsch zur Aktualisierung auf Cockatrice %1!
 Oracle wird gestartet um ihre Kartendatenbank zu aktualisieren.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice wurde installiert</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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>Herzlichen Glückwunsch, dass Sie Cockatrice %1 installiert haben!
 Oracle wird jetzt gestartet und installiert die initiale Kartendatenbank.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>Kartendatenbank</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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>
@@ -4901,29 +5446,29 @@ Möchten Sie Ihre Kartendatenbank jetzt aktualisieren?
 Falls Sie unsicher sind oder Cockatrice das erste Mal nutzen, wählen Sie „Ja“</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>Einstellungen öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>Neue Editionen gefunden</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
@@ -4934,17 +5479,22 @@ Setcode(s): %1
 Möchten Sie es/sie aktivieren?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>Editionen ansehen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>Willkommen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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>
@@ -4953,742 +5503,903 @@ Alle Editionen der Kartendatenbank wurden aktiviert.
 Lesen Sie mehr über das Ändern der Editionsreihenfolge oder die Deaktivierung bestimmter Editionen im „Editionen verwalten...“ Fenster.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>Eine Datenbankaktualisierung wird bereits durchgeführt.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>Kartendatenbankaktualisierung nicht ausführbar:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation>Kartendatenbankaktualisierung läuft.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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>Starten fehlgeschlagen. Die Datei könnte fehlen oder die Berechtigung fehlen.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation>Der Prozess ist einige Zeit nach erfolgreichem Start abgestürzt.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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>Zeitüberschreitung. Der Prozess hat zu lange nicht geantwortet. Zeitüberschreitung bei letzter waitFor...() Funktion.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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>Ein Fehler ist beim Schreiben an den Prozess aufgetreten. Beispielsweise könnte der Prozess derzeit nicht ausgeführt werden oder er hat seinen Eingabekanal geschlossen.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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>Ein Fehler ist beim Lesen vom Prozess aufgetreten. Beispielsweise könnte der Prozess derzeit nicht ausgeführt werden.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation>Unbekannter Fehler aufgetreten.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation>Die Kartendatenbankaktualisierung brach mit einem Fehler ab:
 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>Diese Server unterstützt zusätzliche Funktionen, über die Ihr Client nicht verfügt.
-Dies stellt wahrscheinlich kein Problem dar, allerdings könnte dies bedeuten, dass eine neue Version von Cockatrice verfügbar ist oder dieser Server eine angepasste oder unveröffentlichte Version verwendet.
-
-Um Ihren Client zu aktualisieren, navigieren Sie zu Hilfe -&gt; Auf Aktualisierungen prüfen.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>Lade Sets/Karten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>Die ausgewählte Datei wurde nicht gefunden.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation>Im Moment ist es nur möglich XML Datenbanken zu importieren.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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>Die neuen Sets/Karten wurden erfolgreich hinzugefügt.
 Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>Set-/Kartenimport fehlgeschlagen.</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
-        <translation>Passwort zurücksetzen</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
+        <translation>Mana-Basis Konfiguration</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
-        <translation>Ihr Passwort wurde erfolgreich zurückgesetzt, Sie können sich jetzt mit den neuen Anmeldedaten anmelden.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
+        <translation>Anzeigetyp:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>Passwortzurücksetzung fehlgeschlagen. Bitte kontaktieren Sie den Serverbetreiber, um Ihr Passwort zurücksetzen zu lassen.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
+        <translation>Torte</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
-        <translation>Aktivierungsanfrage erhalten. Bitte prüfen Sie Ihre E-Mails nach einem Aktivierungstoken.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation>Leiste</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation>kombinierteLeiste</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation>Farben filtern (optional):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation>Manabasis</translation>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation>Gruppieren nach:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation>Farbe</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation>Untertyp</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation>Stärke</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation>Widerstandskraft</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation>Filter (optional):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation>Anzeigen der Hauptleistenreihe</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation>Anzeige der per-Kategoriereihen</translation>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation>Manakurve</translation>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation>Anzeigetyp:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation>Torte</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation>Leiste</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation>kombinierteLeiste</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation>Farben filtern (optional):</translation>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation>Manahingabe</translation>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation>Oberster Anzeigetyp:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation>Torte</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation>Leiste</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation>Farben:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation>Anzeige der per-Farbenreihen</translation>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation>%1 Pips (%2 Karten)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation>%1 Mana (%2 Karten)</translation>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation>Manaerzeugung + Hingabe </translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation>Manaverteilungseinstellungen</translation>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation>vom Spielfeld</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation>von ihrem Friedhof</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation> aus dem Exil</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation>von ihrer Hand</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>die oberste Karte von %1s Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation>die oberste Karte ihrer Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation> oben von %1s Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation>von ihrer Bibliothek von oben</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>die unterste Karte von %1s Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation>die unterste Karte ihrer Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation> von der Unterseite von %1s Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation>von ihrer Bibliothek von unten</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation>aus %1s Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation>von ihrer Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation> aus dem Sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation> vom Stapel</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation>von der benutzerdefinierten Zone &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1 lässt nun die oberste Karte %2 aufgedeckt.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1 lässt die oberste Karte %2 nicht mehr aufgedeckt.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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>%1 kann nun die oberste Karte %2 jederzeit betrachten.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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>%1 kann die oberste Karte %2 nicht mehr jederzeit betrachten.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1 legt %2 an %3s %4 an.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 hat das Spiel aufgegeben.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 hat das Spiel doch nicht aufgegeben.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1 ist wieder mit dem Spiel verbunden.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 hat die Verbindung zum Spiel verloren.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation>%1 zeigt von ihrem %2 auf sich selbst.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation>%1 zeigt von ihrem %2 auf %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation>%1 zeigt von %2s %3 auf sich selbst.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation>%1 zeigt von %2s %3 auf %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1 zeigt von ihrem %2 auf ihren %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1 zeigt von ihrem %2 auf %3s %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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>%1 zeigt von %2s %3 auf ihr %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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>%1 zeigt von %2s %3 auf %4s %5.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation>%1 erzeugt einen umgedrehten Spielstein.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 erstellt Spielstein: %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 hat ein Deck geladen (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>%1 hat ein Deck mit %2 Sideboardkarten geladen (%3).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation>%1 zerstört %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>eine Karte</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1 überlässt %2 die Kontrolle über %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="308"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation>%1 bringt %2%3 verdeckt ins Spiel.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1 bringt %2%3 ins Spiel.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="314"/>
+        <source>%1 puts %2%3 into their graveyard face down.</source>
+        <translation>%1 legt %2%3 verdeckt in ihren Friedhof</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation>%1 legt %2%3 in ihren Friedhof.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation>%1 schickt %2%3 verdeckt ins Exil.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 schickt %2%3 ins Exil.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation>%1 bewegt %2%3 in ihre Hand.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation>%1 legt %2%3 in ihre Bibliothek.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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>%1 legt %2%3 unter die Bibliothek.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation>%1 legt %2%3 auf ihre Bibliothek.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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>%1 legt %2%3 in die Bibliothek an %4 Stelle von oben.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 legt %2%3 in sein Sideboard.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation>%1 bringt %2%3 verdeckt ins Spiel.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 spielt %2%3 aus.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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>%1 bewegt %2%3 verdeckt zur benutzerdefinierten Zone &apos;%4&apos;.</translation>
+    </message>
+    <message>
+        <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>%1 bewegt %2%3 zur benutzerdefinierten Zone &apos;%4&apos;.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="373"/>
         <source>%1 tries to draw from an empty library</source>
         <translation>%1 versucht von einer leeren Bibliothek zu ziehen</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation><numerusform>%1 zieht %2 Karte(n).</numerusform><numerusform>%1 zieht %2 Karte(n).</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 sieht sich %2 an.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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><numerusform>%1 sieht sich die %4 %3 Karte(n) %2 an.</numerusform><numerusform>%1 sieht sich die %4 %3 Karte(n) %2 an.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation>untersten</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation>obersten</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1 wendet %2 auf die Rückseite.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1 wendet %2 auf die Vorderseite.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>Das Spiel wurde geschlossen.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>Das Spiel hat begonnen.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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>Du überschwemmst das Spiel. Warte bitte einige Sekunden.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1 ist dem Spiel beigetreten.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 schaut nun dem Spiel zu.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>Sie wurden aus dem Spiel geworfen.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 hat das Spiel verlassen (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation>%1 schaut dem Spiel nicht mehr zu (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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>%1 ist nicht mehr bereit, das Spiel zu starten.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform>%1 mischt sein Deck und zieht eine Hand mit %2 Karte(n).</numerusform><numerusform>%1 mischt sein Deck und zieht eine neue Hand mit %2 Karte(n).</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="473"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation>%1 mischt sein Deck und zieht eine neue Hand.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation>Sie sehen eine Aufzeichnung des Spiels #%1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1 ist bereit, das Spiel zu starten.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="510"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation>Karten</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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><numerusform>%1 Karte(n)</numerusform><numerusform>%1 Karte(n)</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation>%1 verleiht %2 an %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1 zeigt %3 %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1 zeigt %2 offen vor.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation>%1 zeigt %4 zufällig %2%3 vor.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1 zeigt zufällig %2%3 offen vor.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation>%1 schaut sich die umgedrehte Karte #%2 an.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation>%1 schaut sich die umgedrehte Karte #%2 an: %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation>%1 zeigt %4 %2%3 vor.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 zeigt %2%3 offen vor.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="576"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation>%1 kehrte die Zugreihenfolge um, nun ist es %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation>umgekehrt</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation>normal</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>Kopf</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>Zahl</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation>%1 warf eine Münze. Es fiel %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1 würfelt eine %2 mit einem %3-seitigen Würfel.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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>%1 wirft %2 Münzen. Es ergab %3 mal Kopf und %4 mal Zahl.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="608"/>
         <source>%1 rolls a %2-sided dice %3 times: %4.</source>
         <translation>%1 wirft einen %2-seitigen Würfel %3 mal: %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>%1 ist am Zug.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation>%1 versieht %2 mit dem Hinweis %3.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
-        <translation><numerusform>%1 platziert %2 &quot;%3&quot; Zähler auf %4 (jetzt %5).</numerusform><numerusform>%1 platziert %2 &quot;%3&quot; Zähler auf %4 (jetzt %5).</numerusform></translation>
+        <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><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
-        <translation><numerusform>%1 entfernt %2 &quot;%3&quot; Marke(n) von %4 (jetzt %5).</numerusform><numerusform>%1 entfernt %2 &quot;%3&quot; Zähler von %4 (jetzt %5).</numerusform></translation>
+        <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><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation>%1 setzt Zähler %2 auf %3 (%4%5).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%1 setzt %2 auf explizites Enttappen.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 setzt %2 auf normales Enttappen.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 entfernt die Kampfwerte von %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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>%1 ändert die Kampfwerte von %2 von nichts auf %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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>%1 ändert die Kampfwerte von %2 von %3 auf %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1 hat ihr Sideboard gesperrt.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 hat ihr Sideboard entsperrt.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 tappt ihre bleibenden Karten.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 enttappt ihre bleibenden Karten.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1 tappt %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1 enttappt %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 mischt %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="769"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation>%1 mischt die untersten %3 Karten von %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="774"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation>%1 mischt die obersten %3 Karten von %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation>%1 mischt die Karten %3 - %4 von %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 löst %2 ab.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 legt die zuletzt gezogene Karte zurück.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 legt die zuletzt gezogene Karte zurück (%2)</translation>
     </message>
@@ -5696,110 +6407,115 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation>Wort1 Wort2 Wort3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation>Neue Nachricht hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation>Nachricht bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation>Nachricht entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>Nachricht hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>Nachricht:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation>Nachricht bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>Chat Einstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>Benutzerdefinierte Benachrichtigungswörter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>Chat Erwähnungen aktivieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>Autovervollständigung aktivieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>Makros für Nachrichten in Spielen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="243"/>
         <source>How to use in-game message macros</source>
         <translation>Anleitung zum Verwenden der Makros für Nachrichten in Spielen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>Nachrichten von unregistrierten Benutzern im Chatroom ignorieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>Private Nachrichten von unregistrierten Benutzern ignorieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>Textfarbe invertieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>Desktop Benachrichtigungen für private Nachrichten aktivieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>Desktop Benachrichtigungen für Erwähnungen aktivieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>Nachrichtenverlauf beim Betreten eines Raumes aktivieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>(Farbcode in hexadezimal)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Wörter durch Leerzeichen trennen, nur alphanumerische Zeichen</translation>
     </message>
@@ -5807,37 +6523,42 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation>Bewegen nach</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation>&amp;Oben auf der Bibliothek in zufälliger Reihenfolge</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation>X Karten von oben in der Bibliothek...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation>&amp;Unter die Bibliothek in zufälliger Reihenfolge</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation>T&amp;isch</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Friedhof</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exil</translation>
     </message>
@@ -5850,47 +6571,47 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
         <translation>Kartentyp</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation>Manawert</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation>Farbe(n)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation>Loyalität</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation>Hauptkartentyp</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation>Manakosten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation>S/W</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation>Seite</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation>Layout</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation>Farbidentität</translation>
     </message>
@@ -5913,65 +6634,211 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
         <translation>Richtung der Überschreitung:</translation>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation>Unbekannte Phase</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation>Enttappen</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation>Versorgung</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation>Ziehen</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation>Erste Hauptphase</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation>Anfangssegment des Kampfes</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation>Angreifer deklarieren</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation>Blocker deklarieren</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation>Kampfschaden</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation>Ende des Kampfes</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation>Zweite Hauptphase</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation>Ende/Aufräumen</translation>
     </message>
@@ -5979,57 +6846,57 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>Enttappsegment</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>Versorgungssegment</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>Ziehsegment</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>erste Hauptphase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>Anfangssegment der Kampfphase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>Angreifer-Deklarieren-Segment</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>Blocker-Deklarieren-Segment</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>Kampfschadenssegment</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>Endsegment der Kampfphase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>zweite Hauptphase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>Ende-des-Zuges-Segment</translation>
     </message>
@@ -6037,7 +6904,7 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>de</translation>
@@ -6046,183 +6913,198 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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>Friedhof</translation>
+    </message>
+    <message>
+        <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>Exil</translation>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
-        <translation>Oberste Karten der Bibliothek ansehen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
-        <translation>Anzahl der Karten: (max. %1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
-        <translation>Unterste Karten der Bibliothek ansehen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
-        <translation>Oberste Karten der Bibliothek mischen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
-        <translation>Unterste Karten der Bibliothek mischen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
-        <translation>Hand ziehen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
-        <translation>0 und kleiner sind im Vergleich zur jetzigen Handgröße</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
-        <translation>Karten ziehen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
-        <translation>Oberste Karten in den Friedhof bewegen</translation>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
-        <translation>Oberste Karten ins Exil bewegen</translation>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation>Unterste Karten in den Friedhof bewegen</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation>Unterste Karten ins Exil bewegen</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
-        <translation>Unterste Karten ziehen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation>Einen weiteren %1 Spielstein erzeugen</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
-        <translation>Spielsteine erzeugen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
-        <translation>Anzahl:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
-        <translation>Karte X Karten von oben in der Bibliothek plazieren</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
-        <translation>In welcher Position sollte diese Karte platziert werden:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
-        <translation>(max. %1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
-        <translation>Stärke/Widerstandskraft ändern</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
-        <translation>Ändere Werte auf:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
-        <translation>Anmerkung setzen</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
-        <translation>Bitte die neue Anmerkung eingeben:</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation>Zähler setzen</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation>Spieler &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation>&amp;Zähler</translation>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
-        <translation>S&amp;agen</translation>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation>Die Druckauswahl ist deaktiviert, da sie momentan die Einstellung zur Überschreibung aller ausgewählten Drucke mit ihren persönlichen Setpräferenzen aktiviert ist.
+
+Diese Einstellung bedeutet, dass sie nur den Standarddruck für jede Karte sehen, anstatt einen bestimmten Druck auszuwählen, und sie werden auch nicht die von anderen Personen ausgewählten Drucke sehen können.
+</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
+        <translation>Drucke wieder aktivieren</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation>Navigationstasten anzeigen</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation>Druckauswahl</translation>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation>Preferenz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation>Version festsetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation>Version lösen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation>Zugehörige Karten anzeigen</translation>
     </message>
@@ -6238,17 +7120,17 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation>Vorherige Karte im Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation>Massenauswahl</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation>Nächste Karte im Deck</translation>
     </message>
@@ -6256,86 +7138,94 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation>Alphabetisch</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation>Präferenz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation>Erscheinungsdatum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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>Absteigend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation>Aufsteigend</translation>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation>Wählen sie eine Karte aus, um ihre verfügbaren Drucke anzusehen</translation>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation>Stärke/Widerstandskraft</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation>&amp;Stärke erhöhen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation>&amp;Stärke verringern</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation>&amp;Widerstandskraft erhöhen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation>&amp;Widerstandskraft verringern</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation>Stärke und Widerstandskraft erhöhen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation>Stärke und Widerstandskraft verringern</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation>Erhöhe Stärke und verringere Widerstandskraft</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation>Verringere Stärke und erhöhe Widerstandskraft</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation>Stärke und Widerstandskraft setzen...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation>Stärke und Widerstandskraft zurücksetzen</translation>
     </message>
@@ -6343,37 +7233,37 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>Dienste</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>%1 ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>Andere ausblenden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>Alle anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>Schließe %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>Über %1</translation>
     </message>
@@ -6381,153 +7271,259 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Cockatrice Kartendatenbank (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>Alle Dateien (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Aufgezeichnete Cockatrice-Spiele (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>Hauptdeck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>Spielsteine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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>Existierende Datei überschreiben?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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>Eine .cod Version dieses Decks existiert bereits. Überschreiben?</translation>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation>Diese Funktion zu aktivieren wird die Nutzung der Druckauswahl deaktivieren.
+
+Es wird ihnen nicht möglich sein ihre Druckeinstellungen auf einer Per-Deck Basis zu verwalten, oder die Drucke, die andere Personen für ihre Decks ausgewählt haben, zu sehen.
+
+Sie werden den Set-Manager verwenden müssen, der über Kartendatenbank -&gt; Sets verwalten verfügbar ist.
+
+Sind sie sicher, dass diese Funktion aktiviert werden soll?</translation>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation>Diese Funktion zu deaktivieren wird die Nutzung der Druckauswahl aktivieren.
+
+Es wird ihnen nun möglich sein ihre Druckeinstellungen auf einer Per-Deck Basis im Deck-Editor zu verwalten und zu konfigurieren, welcher Druck standardmäßig in ein Deck hinzugefügt wird, indem sie es anheften in der Druckauswahl
+
+Sie können auch den Set-Manager verwenden, um selbstständig die Sortierungsreihenfolge für Drucke in der Druckauswahl festzulegen (andere Sortierungsoptionen wie alphabetisch oder Veröffentlichkeitsdatum sind verfügbar).
+
+Sind sie sicher, dass diese Funktion deaktiviert werden soll?</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation>Änderung bestätigen</translation>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation>Alle speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation>Ja zu &amp;Allem</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation>&amp;Nein</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation>Nein zu Allem</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation>Erneut versuchen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation>Ignorieren</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation>Verwerfen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation>Anwenden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation>Zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation>Standard wiederherstellen</translation>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>Änderungsdatum</translation>
     </message>
@@ -6535,32 +7531,32 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>Spieler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>Behalten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>Startzeit</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>Länge (Sekunden)</translation>
     </message>
@@ -6568,37 +7564,37 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exil</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation>&amp;Exil ansehen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation>&amp;Exil nach ... bewegen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Oben in der Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Unten in der Bibliothek</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Friedhof</translation>
     </message>
@@ -6606,41 +7602,49 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>Räume</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>Teil&amp;nehmen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>Raum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>Berechtigungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>Spieler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>Spiele</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation>S&amp;agen</translation>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6677,27 +7681,27 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>Aktiviert</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>Editionsart</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>Editionscode</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>Langer Name</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>Veröffentlichung</translation>
     </message>
@@ -6705,53 +7709,53 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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>Alle Standard-Tastaturkürzel wiederherstellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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>Möchten Sie wirklich alle Standard-Tastaturkürzel wiederherstellen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation>Alle Standard-Tastaturkürzel entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="111"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>Möchten Sie wirklich alle Tastaturkürzel entfernen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation>Abschnitt:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation>Aktion:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation>Tastaturkürzel:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation>Wie werden benutzerdefinierte Tastaturkürzel gesetzt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation>Alle Tastaturkürzel entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation>Suchen nach Name des Tastenkürzels</translation>
     </message>
@@ -6759,12 +7763,12 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>Aktion</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>Abkürzung</translation>
     </message>
@@ -6772,14 +7776,14 @@ Cockatrice wird jetzt die Kartendatenbank neu laden.</translation>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Ihre Konfigurationsdatei enthielt ungültige Verknüpfungen.
 Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>Die folgenden Verknüpfungen wurden auf den Standard gesetzt:
@@ -6807,12 +7811,12 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation>&amp;Nebendeck</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation>&amp;Nebendeck ansehen</translation>
     </message>
@@ -6820,27 +7824,27 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>Töne aktivieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>Aktuelles Ton-Theme:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>Systemsound testen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>Toneinstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>Masterlautstärke</translation>
     </message>
@@ -6848,48 +7852,48 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation>Spoiler Saison ist beendet</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>spoiler.xml gelöscht. Bitte führe Oracle aus</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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>Spoiler Download fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation>Keine Internetverbindung</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation>Spoiler bereits aktuell</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation>Keine neuen Spoiler hinzugefügt</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation>Spoiler wurden aktualisiert!</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation>Letzte Änderung:</translation>
     </message>
@@ -6912,16 +7916,146 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
         <translation>Ungültige Antwort vom Veröffentlichungsaktualisierungsserver erhalten.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="177"/>
         <source>No reply received from the tag update server.</source>
         <translation>Keine Antwort vom Kennzeichnungsaktualisierungsserver.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="184"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Ungültige Antwort vom Kennzeichungsaktualisierungsserver.</translation>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7053,56 +8187,227 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
         <translation>Benutzer nicht freischaltbar. Interner Fehler</translation>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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>Beschreibung.</translation>
+    </message>
+    <message>
+        <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>UND</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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation>Benötigt ALLE ausgewählten Farben</translation>
+    </message>
+    <message>
+        <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>Deckname...</translation>
+    </message>
+    <message>
+        <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>Besitzer...</translation>
+    </message>
+    <message>
+        <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>Pakete</translation>
+    </message>
+    <message>
+        <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>Erweiterte Filter</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation>Kategorie:</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="262"/>
+        <source>Any</source>
+        <translation>Beliebig</translation>
+    </message>
+    <message>
+        <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>Enthält Karte...</translation>
+    </message>
+    <message>
+        <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>Kommandant...</translation>
+    </message>
+    <message>
+        <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>Etikett...</translation>
+    </message>
+    <message>
+        <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>Deckgröße</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation>Karten:</translation>
+    </message>
+    <message>
+        <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>Aufsteigend.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation>Sortieren nach:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation>Filtern nach:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation>Anzeigeeinstellungen</translation>
+    </message>
+    <message>
+        <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>Suche</translation>
+    </message>
+    <message>
+        <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>Formate</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation>Archidekt:</translation>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>Karteninformationen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation>Kartendatenbank</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation>Auflage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>Sichtbar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>Schwebend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation>Darstellung zurücksetzen</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="82"/>
         <source>Deck: %1</source>
         <translation>Deck: %1</translation>
     </message>
@@ -7110,61 +8415,49 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <context>
     <name>TabDeckEditorVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation>Visuelles Deck: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="294"/>
         <source>&amp;Visual Deck Editor</source>
         <translation>&amp;Visueller Deckeditor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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>Karteninformation</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation>&amp;Ansehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation>Auflage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation>Sichtbar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation>Schwebend</translation>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation>Anordnung zurücksetzen</translation>
     </message>
@@ -7172,22 +8465,22 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="62"/>
         <source>Visual Deck View</source>
         <translation>Visuelle Deckansicht</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="63"/>
         <source>Visual Database Display</source>
         <translation>Visuelle Datenbankanzeige</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="64"/>
         <source>Deck Analytics</source>
         <translation>Deckanalysen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="65"/>
         <source>Sample Hand</source>
         <translation>Probehand</translation>
     </message>
@@ -7228,8 +8521,8 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Neuer Ordner</translation>
     </message>
@@ -7245,84 +8538,84 @@ Bitte überprüfen Sie die Verknüpfungseinstellungen!</translation>
         <translation>Deckordner öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation>Lokalen Ordner umbenennen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation>Lokale Datei umbenennen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation>Neuer Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation>Umbenennen fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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>Ungültige Deckdatei</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>Decknamen eingeben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>Diese Deckliste hat keinen Namen.
 Bitte geben Sie einen Namen ein:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>Unbenanntes Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation>Hochladen des Decks zum Server fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>Lokale Datei löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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>Sind sie sicher, dass die ausgewählten Dateien gelöscht werden sollen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation>Löschen der online gespeicherten Decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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>Sind sie sicher, dass sie die ausgewählten Decks löschen wollen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Name für den neuen Ordner:</translation>
     </message>
@@ -7335,17 +8628,17 @@ Bitte geben Sie einen Namen ein:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation>Visuelle Deckablage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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>Deck an Stelle %1 konnte nicht geöffnet werden</translation>
     </message>
@@ -7386,7 +8679,7 @@ Bitte geben Sie einen Namen ein:</translation>
         <translation>Suche</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation>EDHRec:</translation>
     </message>
@@ -7394,197 +8687,191 @@ Bitte geben Sie einen Namen ein:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>Wiederholung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>Spiel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>Spielerliste</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>Karteninformationen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>Nachrichten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>Zeitleiste der Aufzeichnung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>&amp;Phasen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>Spi&amp;el</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>Nächste &amp;Phase</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation>Nächste Phase mit &amp;Aktion</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>Nächster &amp;Zug</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation>Kehre Zugreihenfolge um</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>&amp;Lokale Pfeile entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>Ansicht im Uhrzeigesinn drehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>Ansicht gegen den Uhrzeigersinn drehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>&amp;Spielinformationen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation>Aufgabe zurückziehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>&amp;Aufgeben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>Spiel ver&amp;lassen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>Wiederholung sch&amp;ließen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation>Chat &amp;fokussieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>&amp;Sagen:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation>Ausgewählte Karten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>Sichtbar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>Schwebend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation>Darstellung zurücksetzen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>Aufgeben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>Sind Sie sicher, dass Sie das Spiel aufgeben möchten?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation>Doch nicht aufgeben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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>Sie haben bereits aufgegeben. Möchten Sie zu diesem Spiel zurückkehren?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>Spiel verlassen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>Sind Sie sicher, dass Sie das Spiel verlassen möchten?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation>Ein Spieler ist Spiel #%1 beigetreten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation>%1 ist dem Spiel beigetreten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>Sie wurden aus dem Spiel geworfen.</translation>
     </message>
@@ -7592,7 +8879,7 @@ Bitte geben Sie einen Namen ein:</translation>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation>Zuhause</translation>
     </message>
@@ -7600,158 +8887,158 @@ Bitte geben Sie einen Namen ein:</translation>
 <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>Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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>Zeit;SenderName;SenderIP;Nachricht;ZielID;ZielName</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation>Raumlogs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>Spielelogs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>Chatlogs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>Sie müssen mindestens einen Filter auswählen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Sie müssen eine gültige Anzahl an zu lokalisierenden Tagen auswählen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>Benutzername:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>IP-Adresse:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>Spielname:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>Spiel-ID:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>Nachricht:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>Hauptraum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>Spielraum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>Privater Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>Die letzten X Tage:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>Letzte Stunde</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation>Maximale Ergebnisse:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>Mindestens ein Filter ist notwendig.
 Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation>Benutzerlogs anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation>Filter entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation>Logstandorte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation>Datumsbereich</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation>Maximale Ergebnisse</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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>Nachrichtenverlauf</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation>Das Sammeln von Nachrichtenverlaufsinformationen ist fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Keine Nachrichten für die gewählten Filter.</translation>
     </message>
@@ -7769,27 +9056,27 @@ Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus.
         <translation>Ver&amp;lassen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - privater Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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>Dieser Benutzer ignoriert dich. Er kann deine Nachrichten im Hauptchat nicht sehen und du kannst seinen Spielen nicht beitreten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation>Private Nachricht von</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1 hat den Server verlassen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1 hat den Server betreten.</translation>
     </message>
@@ -7797,181 +9084,181 @@ Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus.
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>Lokales Dateisystem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>Wiederholungsablage auf dem Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>Wiederholung abspielen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation>Umbenennen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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>Neuer Ordner</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>Löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation>Wiederholungsorder öffnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>Wiederholung herunterladen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>automatische Löschung umschalten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation>Wiederholungscode zum Teilen erhalten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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>Wiederholung durch einen Code zum Teilen nachschauen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation>Umbenennen des lokalen Ordners</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation>Umbenennen der lokalen Datei</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation>Neuer Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation>Umbenennen fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation>Name des neuen Ordners:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>Lokale Datei löschen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Sind sie sicher, dass die ausgewählten Dateien gelöscht werden sollen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="505"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>Sind sie sicher, dass die ausgewählten Wiederholungen gelöscht werden sollen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation>Erhalten des Codes fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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>Entweder unterstützt dieser Server das Teilen von Wiederholungen nicht, oder erlaubt dir das Teilen von Wiederholungen nicht.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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>Fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation>Wiederholungs-Code konnte nicht erhalten werden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation>Wiederholungscode zum Teilen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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>Andere können diesen Code benutzen um diese Wiederholung zu ihrer Liste von Fremd-Wiederholungen hinzuzufügen:
 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation>In die Zwischenablage kopieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation>Wiederholungscode zum Teilen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation>Wiederholungscode gefunden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="604"/>
         <source>Replay was added, or you already had access to it.</source>
         <translation>Wiederholung wurde hinzugefügt, oder du hattest bereits Zugang dazu.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation>Wiederholungscode nicht gefunden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation>Einreichen des Codes fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation>Unerwarteter Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>Wiederholung vom Server löschen</translation>
     </message>
@@ -7984,47 +9271,62 @@ Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus.
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>&amp;Sagen:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>&amp;Raum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>Raum ver&amp;lassen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>Chat leeren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>Chat Einstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation>hat dich erwähnt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation>Zum Anzeigen klicken.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>Sie überfluten den Chatraum. Bitte warten Sie ein paar Sekunden.</translation>
     </message>
@@ -8037,30 +9339,30 @@ Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus.
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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>Serverraumbeitritt fehlgeschlagen: der Raum existiert auf dem Server nicht.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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>Der Server denkt Sie seien im Serverraum, allerdings kann Ihr Client diesen nicht anzeigen. Versuchen Sie, Ihren Client neu zu starten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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>Sie haben nicht die erforderlichen Berechtigungen, um diesem Serverraum beizutreten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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>Beitritt des Serverraums aufgrund eines unbekannten Fehlers fehlgeschlagen: %1.</translation>
     </message>
@@ -8068,92 +9370,97 @@ Je mehr Informationen Sie angeben, desto spezifischer fallen die Ergebnisse aus.
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation>Deckeditor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation>Visueller Deckeditor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation>EDHRec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation>Archidekt</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation>Zuhause</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation>&amp;Visuelle Deckablage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation>Visuelle Datenbankanzeige</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation>Benutzerkonto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation>Deckablage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation>Aufgezeichnete Spiele</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation>Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>Sind Sie sicher?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>Es sind noch Spiele offen. Wollen Sie das Programm trotzdem beenden?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation>Zum Anzeigen klicken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Dein Freund %1 hat sich eingeloggt!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation>Unbekanntes Ereignis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8164,39 +9471,39 @@ Dies könnte bedeuten, dass eine neue Version von Cockatrice verfügbar ist oder
 Um Ihren Client zu aktualisieren, navigieren Sie zu Hilfe -&gt; Auf Aktualisierungen prüfen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation>Inaktivitätszeitüberschreitung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Sie werden wegen Inaktivität abgemeldet.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>Beförderung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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>Sie wurden befördert. Bitte loggen Sie sich aus und wieder ein, damit die Änderungen in Kraft treten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>Gewarnt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>Sie haben eine Warnung erhalten aufgrund von %1.
 Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie eingeleitet. Sollten Sie Fragen haben, stellen Sie diese bitte über eine private Nachricht an einen Moderator.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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>Sie haben die folgende Nachricht vom Server erhalten.
@@ -8205,6 +9512,11 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation>Datenbankanzeige</translation>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8245,42 +9557,42 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Leben</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Weiß</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Blau</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Schwarz</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Rot</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Grün</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Farblos</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Andere</translation>
     </message>
@@ -8288,151 +9600,209 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation>Datei konnte nicht zum Lesen geöffnet werden.</translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>Benutzer&amp;details</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>Privater &amp;Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Spiele dieses &amp;Benutzers anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>Zur &amp;Freundesliste hinzufügen</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Von &amp;Freundesliste entfernen</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>&amp;Ignorieren</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Nicht mehr &amp;ignorieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>Aus dem &amp;Spiel werfen</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="67"/>
         <source>Warn user</source>
         <translation>Nutzer warnen</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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Verwar&amp;nungsverlauf des Nutzers ansehen</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="69"/>
         <source>Ban from &amp;server</source>
         <translation>Vom &amp;Server bannen</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>&amp;Bannverlauf des Nutzers ansehen</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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>Nutzer zum Moderator befördern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>Moderator degradieren</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation>Nutzer zum Richter befördern</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="74"/>
         <source>Demote user from judge</source>
         <translation>Richter degradieren</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="75"/>
         <source>View admin notes</source>
         <translation>Administratornotizen ansehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation>Dieser Benutzer existiert nicht.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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>Du wirst ignoriert von %1 und kannst ihre Spiele nicht sehen.</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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation>Konnte Spiele von %1 nicht erhalten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>%1s Spiele</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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>Bannverlauf</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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>Bannzeit;Moderator;Banndauer;Banngrund;Sichtbarer Grund</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation>Nutzer wurde bisher nie gebannt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation>Sammeln von Informationen über Bans fehlgeschlagen.</translation>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation>Warnungsverlauf</translation>
     </message>
@@ -8447,55 +9817,65 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
         <translation>Nutzer wurde bisher nie gewarnt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation>Sammeln von Informationen über Verwarnungen fehlgeschlagen.</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="249"/>
         <source>Failed to get admin notes.</source>
         <translation>Administratornotizen konnten nicht abgerufen werden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>Erfolgreich</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>Nutzer erfolgreich befördert.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>Nutzer erfolgreich degradiert.</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>Beförderung des Nutzers fehlgeschlagen.</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>Degradierung des Nutzers fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation>Kopiere Hash in die Zwischenablage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Nachrichten dieses Nutzers entfernen</translation>
     </message>
@@ -8503,311 +9883,554 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>Accountalter:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>Passwort ändern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>Avatar wechseln</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>Administrator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>Moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>Registrierter Benutzer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>Unregistrierter Benutzer</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>Richter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="371"/>
         <source>The entered password does not match your account.</source>
         <translation>Das eingegebene Passwort stimmt nicht mit dem Konto überein.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>Information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>Benutzerinformationen aktualisiert.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation>Benutzerinformationen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation>Echter Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation>Nutzerlevel:</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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><numerusform>%n Jahre,</numerusform><numerusform>%n Jahre,</numerusform></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="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><numerusform>%10%n Tage %20</numerusform><numerusform>%10%n Tage %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation>Passwort eingeben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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>Passwortverifikation benötigt, um die E-Mail-Adresse zu ändern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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>Ein Fehler ist während der Aktualisierung Ihrer Benutzerinformationen aufgetreten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>Dieser Server erlaubt Ihnen nicht, Ihre Benutzerinformationen zu aktualisieren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>Passwort geändert.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>Dieser Server erlaubt Ihnen nicht, Ihr Passwort zu ändern.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>Das neue Passwort ist zu kurz.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>Altes Passwort inkorrekt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>Avatar gewechselt.</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Dieser Server erlaubt Ihnen nicht, Ihren Avatar zu ändern.</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>Ein Fehler ist während des Wechselns Ihres Avatars aufgetreten.</translation>
+        <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>Dieser Server erlaubt Ihnen nicht, Ihre Benutzerinformationen zu aktualisieren.</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>Allgemeine Bedienung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>Karten durch &amp;Doppelklick ausspielen (statt Einzelklick)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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>&amp;Anklicken spielt alle ausgewählten Karten aus (anstatt nur der angeklickten Karte)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>Alle Nichtländer standardmäßig über den Stapel spielen (anstatt direkt auf das Spielfeld)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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>Keine &amp;Pfeile löschen in Unterphasen</translation>
+    </message>
+    <message>
+        <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>Schließe Kartenanzeigefenster, wenn die letzte Karte entfernt wird</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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>Sucheingabe automatisch in den Fokus nehmen, wenn das Kartenansichtsfenster geöffnet wird</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>Kartentext auf Spielsteinen anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Benutze Abreißmenüs, erlaubt Kontextmenüs auf dem Bildschirm zu verbleiben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation>Benachrichtigungseinstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>Benachrichtigungen in der Taskleiste aktivieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>Benachrichtigungen für Spielereignisse auch beim Zuschauen anderer Spiele in der Taskbar anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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>Benachrichtige in der Taskleiste wenn sich Benutzer aus der Freundesliste anmelden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>Animationseinstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>Animiertes &amp;Tappen/Enttappen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation>Deckeditor/-ablage Einstellungen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="231"/>
         <source>Open deck in new tab by default</source>
         <translation>Decks in neuem Tab öffnen als Standard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="232"/>
         <source>Use visual deck storage in game lobby</source>
         <translation>Visuelle Deckablage in der Spielelobby verwenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="233"/>
         <source>Use selection animation for Visual Deck Storage</source>
         <translation>Auswahlanimation für Visuellen Deckspeicher verwenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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>Wenn ein Tag im Visuellen Deckspeicher zu einem .txt Deck hinzugefügt wird:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation>tue nichts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation>frage, ob zu .cod konvertiert werden soll</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation>immer nach .cod konvertieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation>Standarddeckeditortyp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation>Klassischer Deckeditor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation>Visueller Deckeditor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation>Wiederholungsoptionen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="246"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Pufferzeit für Rückwärtsüberspringen durch Tastenkürzel</translation>
     </message>
@@ -8815,22 +10438,22 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation>Mit dem Server verbundene Nutzer: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation>Benutzer in diesem Raum: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation>Freunde online: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation>Ignorierte Benutzer online: %1 / %2</translation>
     </message>
@@ -8838,96 +10461,228 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation>Alle Kartenzähler erhöhen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation>&amp;Enttappe alle bleibenden Karten</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation>&amp;Würfeln...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation>&amp;Spielstein erzeugen...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation>Einen weiteren Spielstein erzeugen</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation>&amp;Vordefinierten Spielstein erzeugen</translation>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
-        <translation>Modus: Exakte Übereinstimmung</translation>
+        <source>Exact match</source>
+        <translation>Exakte Übereinstimmung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
-        <translation>Modus: Enthält</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
+        <translation>Enthält</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
-        <translation>Modus: Inkludieren/Exkludieren</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
+        <translation>Inkludieren / Exkludieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation>Filtermodus (UND/ODER/NICHT Verknüpfungen der Filter)</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
+        <translation>Wie ausgewählte und nicht ausgewählte Farben im Filter kombiniert werden</translation>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
+        <source>Search filter...</source>
+        <translation>Suchfilter....</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
         <source>Save Filter</source>
         <translation>Filter speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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>Alle derzeit aktiven Filter in einer Datei speichern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
         <source>Enter filename...</source>
         <translation>Dateinamen eingeben...</translation>
     </message>
 </context>
 <context>
-    <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
-        <source>Do not display card main-types with less than this amount of cards in the database</source>
-        <translation>Kartenhaupttypen mit weniger als dieser Anzahl Karten in der Datenbank nicht anzeigen</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation>Sortieren nach</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation>Filtern nach</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
+        <source>Save and load filters</source>
+        <translation>Filter speichern und laden</translation>
+    </message>
+    <message>
+        <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>Nach exaktem Kartennamen filtern</translation>
+    </message>
+    <message>
+        <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>Nach Kartenhaupttyp filtern</translation>
+    </message>
+    <message>
+        <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>Nach Kartenuntertyp filtern</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="151"/>
+        <source>Filter by set</source>
+        <translation>Nach Set filtern</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
+        <source>Filter by format legality</source>
+        <translation>Nach Formatslegalität filtern</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation>Speichern/Laden</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation>Haupttyp</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation>Untertyp</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation>Editionen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation>Formate</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation>Formate anzeigen mit mindestens:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation>Karten</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation>Keine Formate mit weniger als dieser Anzahl an Karten in der Datenbank anzeigen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation>Filtermodus (UND/ODER/NICHT Verknüpfungen der Filter)</translation>
+        <translation>Filtermodus (UND/ODER/NICHT Verbindungen von Filtern)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
         <source>Mode: Exact Match</source>
         <translation>Modus: Exakte Übereinstimmung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation>Modus: Enthält</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation>Haupttypen anzeigen mit mindestens:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation>Karten</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <source>Do not display card main-types with less than this amount of cards in the database</source>
+        <translation>Kartenhaupttypen mit weniger als dieser Anzahl Karten in der Datenbank nicht anzeigen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation>Filtermodus (UND/ODER/NICHT Verknüpfungen der Filter)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
+        <source>Mode: Exact Match</source>
+        <translation>Modus: Exakte Übereinstimmung</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation>Modus: Enthält</translation>
     </message>
@@ -8935,27 +10690,27 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation>Nach Namen filtern</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <source>Filter by name... (Exact match)</source>
+        <translation>Nach Namen filtern... (Exakte Übereinstimmung)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Deck</source>
         <translation>Aus Deck laden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation>Alle Kartennamen im momentan geladenen Deck als Filter mit exakter Übereinstimmung anwenden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
         <source>Load from Clipboard</source>
         <translation>Aus der Zwischenablage laden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation>Alle Kartennamen aus der Zwischenablage als Filter mit exakter Übereinstimmung anwenden</translation>
     </message>
@@ -8963,7 +10718,7 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDatabaseDisplayRecentSetFilterSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
+        <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>Filtern nach aktuellsten Sets</translation>
     </message>
@@ -8971,19 +10726,19 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDatabaseDisplaySetFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation>Sets durchsuchen...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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>Modus: Exakte Übereinstimmung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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>Modus: Enthält</translation>
     </message>
@@ -8991,27 +10746,37 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation>Untertypen durchsuchen...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation>Untertypen anzeigen mit mindestens:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation>Karten</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation>Kartenuntertypen mit weniger als dieser Anzahl Karten in der Datenbank nicht anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation>Filtermodus (UND/ODER/NICHT Verknüpfungen der Filter)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation>Modus: Exakte Übereinstimmung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation>Modus: Enthält</translation>
     </message>
@@ -9019,50 +10784,93 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
+        <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>Suche nach Kartennamen (oder Suchausdrücken)</translation>
     </message>
     <message>
+        <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>Visuell</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation>Datenbank wird geladen...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation>Alle Filter entfernen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
-        <translation>Filter speichern und laden</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation>Tisch</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
+        <translation>Gruppieren nach:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
-        <translation>Nach exaktem Kartennamen filtern</translation>
+        <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>Wie Karten innerhalb ihrer Kategorien/Gruppierungen sortiert werden ändern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
-        <translation>Nach Kartenuntertyp filtern</translation>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
+        <translation>Sortieren nach:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
-        <translation>Nach Set filtern</translation>
+        <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>Klicken und ziehen, um die Sortierungsreihenfolge innerhalb von Gruppen zu ändern</translation>
+    </message>
+    <message>
+        <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>Wie Karten innerhalb ihrer Gruppierung sortiert werden einstellen</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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation>Umschalten des Layouts: Überlappung</translation>
+    </message>
+    <message>
+        <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>Wie Karten innerhalb von Zonen angezeigt werden ändern ( z.B. überlappend oder vollständig sichtbar)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation>Umschalten des Layouts: Flach</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <translation>Karten über die Suchleiste oder den Datenbanktab hinzufügen, damit sie hier angezeigt werden</translation>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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>Eine neue Probehand ziehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="72"/>
         <source>Sample hand size</source>
         <translation>Probehandgröße</translation>
     </message>
@@ -9070,46 +10878,25 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
-        <translation>Klicken und ziehen, um die Sortierungsreihenfolge innerhalb von Gruppen zu ändern</translation>
+        <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>Hier einen Kartennahmen eingeben für Vorschläge aus der Datenbank...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="217"/>
         <source>Quick search and add card</source>
         <translation>Schnellsuche und Karte hinzufügen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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>Nach bester Entsprechung in der Datenbank suchen (mit automatischen Vorschlägen) und die bevorzugte Auflage beim Betätigen der Eingabetaste dem Deck hinzufügen</translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation>Wie Karten innerhalb ihrer Gruppierung sortiert werden einstellen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation>Überlappungsdarstellung</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation>Wie Karten innerhalb von Zonen angezeigt werden ändern (überlappend oder vollständig sichtbar)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation>Flache Darstellung</translation>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation>Deckablage</translation>
     </message>
@@ -9117,47 +10904,52 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDeckStorageQuickSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation>Ordner anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Show Tag Filter</source>
         <translation>Tagfilter anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="131"/>
+        <source>Show Color Identity</source>
+        <translation>Farbidentität anzeigen</translation>
+    </message>
+    <message>
+        <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>Tags auf Deckvorschauen anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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>Bannerkartenauswahloption anzeigen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="134"/>
         <source>Draw unused Color Identities</source>
         <translation>Ungenutzte Farbidentitäten ziehen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="135"/>
         <source>Unused Color Identities Opacity</source>
         <translation>Deckkraft ungenutzter Farbidentitäten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation>Decktooltip:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation>Dateipfad</translation>
     </message>
@@ -9165,7 +10957,7 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
+        <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>Suche nach Dateinamen (oder Suchausdruck)</translation>
     </message>
@@ -9173,22 +10965,22 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation>Alphabetisch sortieren (Deckname)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation>Alphabetisch sortieren (Dateiname)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
         <source>Sort by Last Modified</source>
         <translation>Nach Änderungsdatum sortieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
         <source>Sort by Last Loaded</source>
         <translation>Nach letztem Laden sortieren</translation>
     </message>
@@ -9196,17 +10988,17 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation>Datenbank wird geladen ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation>Geladene Dateien aktualisieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation>Einstellungen des Visuellen Deckeditors</translation>
     </message>
@@ -9214,43 +11006,43 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>Welche Warnung möchten Sie versenden?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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>Entferne alle Nachrichten dieses Nutzers in allen Räumen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>Abbre&amp;chen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>Nutzer aufgrund von Fehlverhalten warnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>Fehler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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>Der zu warnende Nutzername kann nicht leer gelassen werden, bitte geben Sie einen Nutzernamen an.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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>Warnungsart kann nicht leer gelassen werden, bitte wählen Sie die zu sendende Warnungsart.</translation>
     </message>
@@ -9258,133 +11050,133 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <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>Ausgewählte Edition an die Spitze verschieben</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>nach oben verschieben</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>nach unten verschieben</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>Ausgewählte Edition ans Ende verschieben</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation>Suche nach Setname, Code oder Typ</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="70"/>
         <source>Default order</source>
         <translation>Standardreihenfolge</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>Stelle die ursprüngliche Reihenfolge für Bilderprioritäten wieder her</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="107"/>
         <source>Enable all sets</source>
         <translation>Alle Editionen aktivieren</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="108"/>
         <source>Disable all sets</source>
         <translation>Alle Editionen deaktivieren</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="109"/>
         <source>Enable selected set(s)</source>
         <translation>Ausgewählte Edition(en) aktivieren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation>Ausgewählte Edition(en) deaktivieren</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="126"/>
         <source>Deck Editor</source>
         <translation>Deckeditor</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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation>Benutzen Sie Strg+A, um alle Sets in der Ansicht auszuwählen.</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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation>Nur Karten aus aktivierten Sets werden in der Kartenliste des Deckeditors angezeigt.</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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation>Bildpriorität wird auf folgende Reihenfolge festgelegt:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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>zuerst der BENUTZERDEFINIERTE Ordner (%1), dann die aktivierten Sets aus diesem Dialog (von oben nach unten)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation>Karten, die für Alchemy augeglichen wurden, einschließen [erfordert Neustart]</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="128"/>
         <source>Card Art</source>
         <translation>Kartenzeichnung</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation>Wie benutzerdefinierte Kartenbilder verwendet werden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation>Tipps</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation>Notiz</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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation>Nach einer Spalte sortieren erlaubt, eine Edition zu finden, ohne die Editionspriorität zu verändern.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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>Um die Sortierung erneut zu aktivieren, klicken Sie auf den Spaltenkopf bis diese Nachricht verschwindet.</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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation>Benutze die momentane Sortierung als Editionspriorität.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
         <source>Sorts the set priority using the same column</source>
         <translation>Sortiert die Editionspriorität mit der selben Spalte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation>Editionen verwalten</translation>
     </message>
@@ -9392,72 +11184,72 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation>Suche nach Kartennamen (oder Suchausdrücken)</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation>Ungruppiert</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation>Gruppieren nach Kartentyp</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation>Gruppieren nach Manabetrag</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation>Gruppieren nach Farbe</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation>Unsortiert</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation>Sortieren nach Name</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation>Sortieren nach Kartentyp</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation>Sortieren nach Manakosten</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation>Sortieren nach Farben</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation>Sortieren nach P/T</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation>Sortieren nach Auflage</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>beim Schließen mischen</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>Stapelansicht</translation>
     </message>
@@ -9465,7 +11257,7 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>Deutsch (German)</translation>
     </message>
@@ -9473,12 +11265,12 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation>Verbinde beim Start</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation>Debugge in Datei</translation>
     </message>
@@ -9486,1005 +11278,1078 @@ Bitte unterlassen Sie diese Aktivitäten oder weitere Schritte werden gegen Sie
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>Hauptfenster</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation>Deckeditor</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>Spielelobby</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation>Kartenmarken</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation>Spielermarken</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>Stärke und Widerstandskraft</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>Spielphasen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>Spielebereich</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation>Ausgewählte Karte verschieben</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>Ansehen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation>Oberste Karte verschieben</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation>Unterste Karte verschieben</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>Spielmechanik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation>Ziehen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation>Chatraum</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation>Spielfenster</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation>Deck aus der Zwischenablage laden</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation>Wiederholungen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation>Reiter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation>Nach Kartenaktualisierungen suchen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation>Verbinden...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>Getrennt</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation>Registrieren...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation>Lokales Spiel starten...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation>Aufgezeichnetes Spiel ansehen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation>Deck analysieren (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation>Deck analysieren (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation>Alle Filter entfernen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation>Ausgewählten Filter entfernen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation>Karte entfernen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation>Editionen verwalten...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation>Benutzerdefinierte Spielsteine bearbeiten...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation>Deck exportieren (decklist.org)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation>Deck exportieren (decklist.xyz)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation>Karte hinzufügen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation>Deck laden...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Deck aus der Zwischenablage laden...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation>Deck in Zwischenablage bearbeiten, kommentiert</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation>Deck in Zwischenablage bearbeiten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation>Neues Deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Benutzerdefinierten Bilderordner öffnen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation>Deck drucken...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation>Karte löschen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation>Darstellung zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation>Deck speichern</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation>Deck speichern unter...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Deck kommentiert in die Zwischenablage speichern</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation>Deck in die Zwischenablage speichern, kommentiert (keine Setinformationen)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation>Deck in die Zwischenablage speichern</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation>Deck in die Zwischenablage speichern (keine Setinformationen)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation>Lokales Deck laden...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation>Deck vom Server laden...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation>Bereit zum Start setzen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Sideboardsperre umschalten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation>Grüne Marke hinzufügen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation>Grüne Marke entfernen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation>Grüne Marken setzen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation>Rote Marke hinzufügen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation>Rote Marke entfernen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation>Rote Marken setzen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation>Lebensmarke hinzufügen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation>Statuszeile anzeigen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation>Deck entladen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation>Zwangsstart</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation>Kartenmarke hinzufügen (F)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation>Kartenmarke entfernen (F)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation>Kartenmarke setzen (F)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation>Kartenmarke hinzufügen (E)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation>Kartenmarke entfernen (E)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation>Kartenmarke setzen (E)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation>Kartenmarke hinzufügen (D)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation>Kartenmarke entfernen (D)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation>Kartenmarke setzen (D)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation>Kartenmarke hinzufügen (C)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation>Kartenmarke entfernen (C)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation>Kartenmarke setzen (C)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation>Kartenmarke hinzufügen (B)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation>Kartenmarke entfernen (B)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation>Kartenmarke setzen (B)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation>Kartenmarke hinzufügen (A)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation>Kartenmarke entfernen (A)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation>Kartenmarke setzen (A)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation>Lebensmarke entfernen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation>Lebensmarken setzen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation>Weiße Marke hinzufügen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation>Weiße Marke entfernen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation>Weiße Marken setzen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation>Blaue Marke hinzufügen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation>Blaue Marke entfernen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation>Blaue Marken setzen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation>Schwarze Marke hinzufügen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation>Schwarze Marke entfernen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation>Schwarze Marken setzen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation>Farblose Marke hinzufügen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation>Farblose Marke entfernen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation>Farblose Marken setzen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation>Andere Marke hinzufügen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation>Andere Marke entfernen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation>Andere Marke setzen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation>Alle Kartenzähler erhöhen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation>Stärke hinzufügen (+1/+0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Stärke entfernen (-1/-0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Widerstandskraft nach Stärke verschieben (+1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Widerstandskraft hinzufügen (+0/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Widerstandskraft entfernen (-0/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Stärke nach Widerstandskraft verschieben (-1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Stärke und Widerstandskraft hinzufügen (+1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Stärke und Widerstandskraft entfernen (-1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation>Stärke und Widerstandskraft setzen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation>Stärke und Widerstandskraft zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>Enttappen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>Versorgung</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>Ziehen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation>Erste Hauptphase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation>Beginn des Kampfes</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>Angriff</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>Blocken</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>Schaden</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation>Ende des Kampfes</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation>Zweite Hauptphase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>Endsegment</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation>Nächste Phase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation>Nächste Phasenaktion</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation>Nächster Zug</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation>Karte im Enthüllungsfenster verstecken</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation>Tappe / Enttappe Karte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation>Alle enttappen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
-        <translation>Enttappen umschalten</translation>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
+        <translation>Enttapen überspringen umschalten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation>Karte herumdrehen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation>Karte ansehen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation>Karte spielen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation>Karte spielen, verdeckt</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation>Karte anlegen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation>Karte lösen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation>Karte klonen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation>Spielstein erstellen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation>Alle zugehörigen Spielsteine erstellen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation>Einen weiter Spielstein erstellen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation>Notiz setzen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation>Alle Karten in der Zone auswählen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation>Alle Karten in der Reihe auswählen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation>Alle Karten in der Spalte auswählen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation>Ausgewählte Karten allen Spielern vorzeigen</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation>Untere Karte der Bibliothek</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>Exil</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>Friedhof</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>Hand</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation>Obere Karte der Bibliothek</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation>Spielfeld, verdeckt</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation>Spielfeld</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation>Hand sortieren</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>Bibliothek</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation>Oberste Karten der Bibliothek</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation>Unterste Karten der Bibliothek</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation>Schließe letzte Ansicht</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation>Stapel</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation>Friedhof (mehrere)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation>Friedhof (mehrere), verdeckt</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation>Exil (mehrere)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation>Exil (mehrere), verdeckt</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation>Stapel bis gefunden</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation>Unterste Karte ziehen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Mehrere Karten von unten ziehen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation>Pfeil zeichnen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation>Lokale Pfeile entfernen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation>Spiel verlassen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>Aufgeben</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation>Würfeln...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation>Bibliothek mischen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation>Oberste Karten der Bibliothek mischen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation>Unterste Karten der Bibliothek mischen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation>Mulligan nehmen (Gleiche Handgröße)</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation>Mulligan nehmen (Handgröße -1)</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation>Eine Karte ziehen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation>Mehrere Karten ziehen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation>Ziehen rückgängig machen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation>Oberste Karte aufgedeckt lassen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation>Oberste Karte immer betrachten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation>Hand sortieren nach Name</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation>Hand sortieren nach Typ</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation>Hand sortieren nach Manawert</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation>Hand allen Spielern vorzeigen</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation>Zufällige Karte allen Spielern vorzeigen</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation>Ansicht im Uhrzeigersinn drehen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Ansicht gegen den Uhrzeigersinn drehen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation>Textboxfokus aufheben</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation>Chat fokussieren</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation>Chat leeren</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation>Aktualisieren</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation>Vorspulen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation>Zurückspulen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation>Sehr weit vorspulen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation>Sehr weit zurückspulen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation>Abspielen/Pausieren</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation>Schnelldurchlauf umschalten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation>Zuhause</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation>Visuelle Deckablage</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation>Deckablage</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation>Benutzerkonto</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation>Logs</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_el.ts b/cockatrice/translations/cockatrice_el.ts
index 8755f6502..be66756d9 100644
--- a/cockatrice/translations/cockatrice_el.ts
+++ b/cockatrice/translations/cockatrice_el.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Ρύθμιση μετρητή...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>Ρύθμιση μετρητή</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Νέα τιμή για τον μετρητή &apos;%1&apos;</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,79 +36,81 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -116,202 +118,253 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>Ρυθμίσεις θέματος</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>Τρέχον θέμα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation>Άνοιγμα φακέλου θεμάτων</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>Απόδοση κάρτας</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>Εμφανίστε τα ονόματα καρτών σε κάρτες με εικόνα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>Αύξηση της κλίμακας των καρτών με την επιλογή του ποντικιού</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>Διάταξη χειρός</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Εμφάνιση χεριού οριζόντια (σπατάλη χώρου)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>Ενεργοποιήστε την αριστερή αιτιολόγηση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>Διάταξη πλέγματος πίνακα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>Ανατροπή κάθετης συντεταγμένης</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Ελάχιστος αριθμός παικτών για διάταξη πολλαπλών στηλών:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Μέγιστο μέγεθος γραμματοσειράς για πληροφορίες που εμφανίζονται στις κάρτες:</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -333,112 +386,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>απαγόρευση και όνομα χρήστη</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>απαγόρευση &amp; διεύθυνση IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>απαγόρευση εξυπηρετητή I&amp;D</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>Τύπος απαγόρευσης</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;μόνιμη απαγόρευση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;προσωρινή απαγόρευση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>&amp;Μέρες:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Ώρες:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Λεπτά:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>Διάρκεια της απαγόρευσης</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>Παρακαλώ καταχωρίστε τον λόγο της απαγόρευσης.
 Αυτό αποθηκεύεται μόνο για τους επόπτες και δεν μπορεί να το δει το αποκλεισμένο άτομο.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>Παρακαλώ καταχωρίστε τον λόγο της απαγόρευσης που θα είναι ορατή στο αποκλεισμένο άτομο.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>&amp;Εντάξει</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Άκυρο</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>Απαγόρευση χρήστη από τον διακομιστή</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>Για την απαγόρευση πρέπει να επιλέξετε ένα όνομα, μία IP, ένα clientId, ή κάποιο συνδυασμό των τριών.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>Πρέπει να έχετε μια τιμή στην απαγόρευση ονόματος όταν επιλέγετε το πλαίσιο ελέγχου απαγόρευσης ονόματος.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>Πρέπει να έχετε μια τιμή στην απαγόρευση ip όταν επιλέγετε το πλαίσιο ελέγχου απαγόρευσης ip.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>Πρέπει να έχετε μια τιμή στην απαγόρευση clientid όταν επιλέγετε το πλαίσιο ελέγχου απαγόρευσης clientid.</translation>
     </message>
@@ -446,152 +499,221 @@ 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="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>Σετς</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>Το κόστος του Μάνα</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>Είδος κάρτας</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>Χρώμα(τα)</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Όνομα</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>Τύπος</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>Χρώμα</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>Κείμενο</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>Σπανιότητα</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>Δύναμη</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>Σκληρότητα</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -599,22 +721,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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -622,22 +744,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="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -650,12 +772,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
@@ -663,132 +795,150 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
@@ -796,133 +946,133 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -931,7 +1081,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -939,29 +1089,470 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -969,47 +1560,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <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"/>
     </message>
@@ -1017,87 +1578,97 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <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"/>
     </message>
@@ -1123,114 +1694,114 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </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="162"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </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="166"/>
+        <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"/>
     </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="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </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="168"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="172"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </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="174"/>
         <source>Load deck from online service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1238,7 +1809,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1246,194 +1817,171 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>Επιτυχία</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>Σφάλμα</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>Αριθμός</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>Κάρτα</translation>
     </message>
@@ -1441,12 +1989,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1454,17 +2002,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -1472,7 +2020,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <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"/>
     </message>
@@ -1480,62 +2028,62 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <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"/>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </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="104"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </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="105"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </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="106"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </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="107"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <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"/>
     </message>
@@ -1543,98 +2091,156 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1652,74 +2258,74 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>Φόρτωση deck...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Φόρτωση απομακρυσμένου deck...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>Δεν ήταν δυνατή η φόρτωση του επιλεγμένου αρχείου.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1752,143 +2358,143 @@ This will kick all non-ready players from the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>Γνωστοί Hosts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>Νέος Host</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>Όνομα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;Θύρα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>Όνομα &amp;παίχτη:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>Κωδικός:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>&amp;Αποθήκευση Κωδικού</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>Α&amp;υτόματη σύνδεση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Συνδεθείτε αυτόματα στην πιο πρόσφατη σύνδεση όταν ανοίγει το Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>Διακομιστής</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>Σύνδεση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>Προειδοποίηση σύνδεσης</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>Πρέπει να ονομάσετε το νέο προφίλ σύνδεσης.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>Προειδοποίηση σύνδεσης</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Το όνομα παίκτη δεν μπορεί να είναι άδειο.</translation>
     </message>
@@ -1896,117 +2502,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>Θυ&amp;μηθείτε τις ρυθμίσεις</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>&amp;Περιγραφή:</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>Π&amp;αίχτες:</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"/>
     </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>Είδος παιχνιδιού</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>&amp;Κωδικός:</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>Μόνο &amp;φίλοι μπορούν να συμμετάσχουν</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>Μόνο &amp;εγγεγραμμένοι χρήστες μπορούν να συμμετάσχουν</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>Περιορισμοί συμμετοχής</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>Οι &amp;θεατές μπορούν να παρακολουθήσουν</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>Οι θεατές &amp;χρειάζονται κωδικό για να παρακολουθήσουν</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>Οι θεατές μπορούν να &amp;συζητήσουν</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>Οι θεατές μπορούν να δουν τα &amp;χέρια</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"/>
     </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>Θεατές</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>&amp;Καθάρισε</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>Δημιουργία παιχνιδιού</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>Πληροφορίες παιχνιδιού</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>Σφάλμα Διακομιστή.</translation>
     </message>
@@ -2014,97 +2625,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Όνομα:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Token</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>Χ&amp;ρώμα:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>άσπρο</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>μπλε</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>μαύρο</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>κόκκινο</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>πράσινο</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>πολύχρωμο</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>άχρωμο</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Σχόλιο:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;κατέστρεψε το token όταν φύγει από το τραπέζι</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Στοιχεία token</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Εμφάνισε &amp;όλα τα tokens</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Εμφάνιση tokens από αυτό το &amp;deck</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>Επέλεξε token από τη λίστα</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>Δημιουργία token</translation>
     </message>
@@ -2112,53 +2723,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2166,40 +2777,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>Δεν έχει επιλεγεί εικόνα.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Για να αλλάξετε το avatar σας, επιλέξτε μια νέα εικόνα
 Για να καταργήσετε το τρέχον avatar, επιβεβαιώστε χωρίς να επιλέξετε μια νέα εικόνα.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>Εξέτασε...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>Αλλαγή avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>Άνοιγμα εικόνας</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Αρχεία εικόνας (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>Επιλέχθηκε μη έγκυρη εικόνα.</translation>
     </message>
@@ -2207,17 +2818,17 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2225,38 +2836,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="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Παλιός κωδικός:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Νέος κωδικός:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Επιβεβαιώστε τον καινούριο σας κωδικό:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Αλλαγή κωδικού</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Ο κωδικός σας είναι πολύ μικρός.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Οι νέοι κωδικοί πρόσβασης δεν ταιριάζουν.</translation>
     </message>
@@ -2264,93 +2875,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="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;Όνομα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>Χ&amp;ρώμα:</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="34"/>
         <source>white</source>
         <translation>άσπρο</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="35"/>
         <source>blue</source>
         <translation>μπλε</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="36"/>
         <source>black</source>
         <translation>μαύρο</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="37"/>
         <source>red</source>
         <translation>κόκκινο</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="38"/>
         <source>green</source>
         <translation>πράσινο</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="39"/>
         <source>multicolor</source>
         <translation>πολύχρωμο</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>άχρωμο</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Σχόλιο:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Στοιχεία token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>Προσθήκη token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Αφαίρεση token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Παρακαλώ εισάγετε το όνομα του token:</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>Σφάλμα</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"/>
@@ -2374,12 +2985,12 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>Απροσδιόριστο</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Πραγματικό όνομα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Επεξεργασία προφίλ χρήστη</translation>
     </message>
@@ -2417,112 +3028,113 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>Παιχνίδι και &amp;περιγραφή:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;Όνομα δημιουργού:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>&amp;Είδη παιχνιδιού</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>το &amp;λιγότερο:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>το &amp;περισσότερο:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>Μέγιστος αριθμός παικτών</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>Περιορισμοί</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>Φίλτρο παιχνιδιών</translation>
     </message>
@@ -2530,52 +3142,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"/>
     </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"/>
     </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"/>
     </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>&amp;Host:</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>&amp;Θύρα:</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>Όνομα &amp;παίχτη:</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>Email:</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"/>
     </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"/>
     </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>Η διεύθυνση e-mail δεν μπορεί να είναι άδεια</translation>
     </message>
@@ -2583,37 +3195,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"/>
     </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>&amp;Host:</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>&amp;Θύρα:</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>Όνομα &amp;παίχτη:</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"/>
     </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"/>
     </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>Το όνομα παίκτη δεν μπορεί να είναι άδειο.</translation>
     </message>
@@ -2621,86 +3233,86 @@ 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"/>
     </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"/>
     </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"/>
     </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>&amp;Host:</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>&amp;Θύρα:</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>Όνομα &amp;παίχτη:</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>Token:</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>Νέος κωδικός:</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"/>
     </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>Το όνομα παίκτη δεν μπορεί να είναι άδειο.</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"/>
     </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"/>
     </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"/>
     </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>Σφάλμα</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"/>
     </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>Οι κωδικοί πρόσβασης δεν ταιριάζουν.</translation>
     </message>
@@ -2716,17 +3328,17 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>Φόρτωση deck από το clipboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>Μη έγκυρο deck list</translation>
     </message>
@@ -2734,43 +3346,43 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2784,45 +3396,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>Φόρτωση deck</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
@@ -2830,53 +3475,53 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>&amp;Θύρα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>Όνομα &amp;παίχτη:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>Κωδικός (ξανά):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>Διεύθυνση e-mail (ξανά):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>Χώρα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>Απροσδιόριστο</translation>
     </message>
@@ -2922,17 +3567,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
@@ -2940,40 +3585,55 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -2984,7 +3644,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3001,7 +3661,7 @@ Would you like to change your database location setting?</source>
 Θα θέλατε να αλλάξετε τη ρυθμισμένη θέση της βάσης δεδομένων σας;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3010,21 +3670,21 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3033,59 +3693,64 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>Ρυθμίσεις</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>Γενικά</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>Εμφάνιση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>Διεπαφή Χρήστη</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>Ήχος</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>Συντομεύσεις</translation>
     </message>
@@ -3093,39 +3758,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </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="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </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="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3133,17 +3798,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"/>
     </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"/>
     </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"/>
     </message>
@@ -3151,164 +3816,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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>Τρέχον κανάλι έκδοσης</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>Επανεγκατάσταση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>Ακύρωση Κατεβάσματος</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>Άνοιγμα Σελίδας Κατεβάσματος</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>Ο έλεγχος για ενημερώσεις ολοκληρώθηκε</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>Καμία Διαθέσιμη Ενημέρωση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Το Cockatrice είναι πλήρως ενημερωμένο!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>Ήδη τρέχετε την πιό πρόσφατη έκδοση διαθέσιμη σε αυτό το κανάλι.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>Τρέχουσα έκδοση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>Επιλεγμένο κανάλι έκδοσης</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>Υπάρχει Διαθέσιμη Ενημέρωση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Μία νέα έκδοση του Cockatrice είναι διαθέσιμη!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Νέα έκδοση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>Αρχείο Αλλαγών</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>Θέλετε να ενημερώσετε τώρα;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation type="unfinished"/>
     </message>
@@ -3316,21 +3981,153 @@ 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="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3400,33 +4197,39 @@ You may have to manually download the new version.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <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"/>
     </message>
@@ -3434,7 +4237,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation type="unfinished"/>
     </message>
@@ -3442,22 +4245,22 @@ 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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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"/>
     </message>
@@ -3465,22 +4268,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation type="unfinished"/>
     </message>
@@ -3488,155 +4291,208 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>Λάθος κωδικός.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>Κωδικός:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>Καθάρισμα Φίλτρου</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>Δημιουργία</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>Είσοδος</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>Είσοδος ως θεατής</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>κωδικός</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>μόνο φίλοι</translation>
     </message>
@@ -3646,68 +4502,68 @@ You may have to manually download the new version.</source>
         <translation>μόνο εγγεγραμμένοι χρήστες</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>μπορούν να συνομιλήσουν</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>βλέπουν τα χέρια</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>μπορούν να δούν τα χέρια</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>δεν επιτρέπεται</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>Δωμάτιο</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>Ηλικία</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>Περιγραφή</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>Δημιουργός</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>Τύπος</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>Περιορισμοί</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>Παίκτες</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>Θεατές</translation>
     </message>
@@ -3715,143 +4571,158 @@ You may have to manually download the new version.</source>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>Επιλέξτε θέση</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>Γλώσσα:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>Φάκελος deck:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>Φάκελος replay:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>Φάκελος εικόνων:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>Βάση δεδομένων καρτών</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>Βάση δεδομένων token:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <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"/>
     </message>
@@ -3859,47 +4730,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -3907,111 +4778,141 @@ You may have to manually download the new version.</source>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4019,193 +4920,213 @@ You may have to manually download the new version.</source>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4213,1416 +5134,1223 @@ You may have to manually download the new version.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation>Έκδοση</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>Οι μεταφραστές μας</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>Υποστήριξη:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>Αναφορά Προβλήματος</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>Αντιμετώπιση Προβλημάτων</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>Συχνές Ερωτήσεις</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>Αποτυχημένη Σύνδεση</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>Είστε αποκλεισμένος μέχρι %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>Είστε αποκλεισμένος επ&apos; αόριστον.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>Ο σέρβερ απαιτεί εγγραφή. Θέλετε να εγγραφείτε τώρα;</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>Ενεργοποίηση λογαριασμού</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation>Σέρβερ Πλήρης</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>Άγνωστο σφάλμα σύνδεσης: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>Ο κωδικός είναι πολύ μικρός.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>Σύνδεση...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>Αποσύνδεση</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>Έναρξη τοπικού παιχνιδιού...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>Πλήρης οθόνη</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>Εγγραφή σε σέρβερ...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>Ρυθμίσεις...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>Έξοδος</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>Βάση δεδομένων καρτών</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>Βοήθεια</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>Σχετικά με το Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation>Έλεγχος για ενημερώσεις</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>Βάση δεδομένων καρτών</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>Ναι</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>Όχι</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>Άνοιγμα ρυθμίσεων</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>Βρέθηκαν νέα σετ</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>Εμφάνιση σετ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>Καλωσήρθατε</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>Πληροφορίες</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>Φόρτωση σετ/καρτών</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>Το επιλεγμένο αρχείο δε βρέθηκε.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation>από το παιχνίδι</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation>από την εξορία</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>την πρώτη κάρτα της βιβλιοθήκης του/της %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation>από την κορυφή της βιβλιοθήκης του/της %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>την τελευταία κάρτα της βιβλιοθήκης του/της %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation>από το τέλος της βιβλιοθήκης του/της %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation>από τη βιβλιοθήκη του/της %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation>από το sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation>από το stack</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>Ο/Η %1 φόρτωσε ένα deck (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>Ο/Η %1 φόρτωσε ένα deck με %2 κάτρες στο sideboard (%3).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>μία κάρτα</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>ο/η %1 δίνει στον/στην %2 τον έλεγχο του %3 .</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>ο/η %1 βάζει στο παιχνίδι το %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>ο/η %1 εξορίζει το %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>Το παιχνίδι έχει κλείσει</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>Το παιχνίδι ξεκίνησε.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>Ο/Η %1 παρακολουθεί το παιχνίδι.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>Σας απέβαλαν από το παιχνίδι.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <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><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <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><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -5630,110 +6358,115 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <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"/>
     </message>
@@ -5741,37 +6474,42 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -5784,47 +6522,47 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
@@ -5847,65 +6585,211 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -5913,57 +6797,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation type="unfinished"/>
     </message>
@@ -5971,7 +6855,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
@@ -5980,183 +6864,195 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6172,17 +7068,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6190,86 +7086,94 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"/>
     </message>
@@ -6277,37 +7181,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation type="unfinished"/>
     </message>
@@ -6315,153 +7219,247 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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"/>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation type="unfinished"/>
     </message>
@@ -6469,32 +7467,32 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation type="unfinished"/>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation type="unfinished"/>
     </message>
@@ -6502,37 +7500,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -6540,41 +7538,49 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6611,27 +7617,27 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation type="unfinished"/>
     </message>
@@ -6639,53 +7645,53 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -6693,12 +7699,12 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -6706,13 +7712,13 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -6739,12 +7745,12 @@ Please check your shortcut settings!</source>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -6752,27 +7758,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -6780,48 +7786,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="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -6844,16 +7850,146 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -6985,56 +8121,227 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation type="unfinished"/>
+    </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="262"/>
+        <source>Any</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </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="82"/>
         <source>Deck: %1</source>
         <translation type="unfinished"/>
     </message>
@@ -7042,61 +8349,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="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7104,22 +8399,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="43"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <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"/>
     </message>
@@ -7160,8 +8455,8 @@ Please check your shortcut settings!</source>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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"/>
     </message>
@@ -7177,83 +8472,83 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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"/>
     </message>
@@ -7266,17 +8561,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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"/>
     </message>
@@ -7317,7 +8612,7 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation type="unfinished"/>
     </message>
@@ -7325,197 +8620,191 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
@@ -7523,7 +8812,7 @@ Please enter a name:</source>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
@@ -7531,157 +8820,157 @@ Please enter a name:</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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"/>
     </message>
@@ -7699,27 +8988,27 @@ The more information you put in, the more specific your results will be.</source
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation type="unfinished"/>
     </message>
@@ -7727,180 +9016,180 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation type="unfinished"/>
     </message>
@@ -7913,47 +9202,62 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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"/>
     </message>
@@ -7966,30 +9270,30 @@ The more information you put in, the more specific your results will be.</source
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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"/>
     </message>
@@ -7997,92 +9301,97 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8090,38 +9399,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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"/>
@@ -8129,6 +9438,11 @@ Please refrain from engaging in this activity or further actions may be taken ag
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8167,42 +9481,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -8210,151 +9524,209 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation type="unfinished"/>
     </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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation type="unfinished"/>
     </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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation type="unfinished"/>
     </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="67"/>
         <source>Warn user</source>
         <translation type="unfinished"/>
     </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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"/>
     </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="69"/>
         <source>Ban from &amp;server</source>
         <translation type="unfinished"/>
     </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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"/>
     </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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation type="unfinished"/>
     </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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </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="74"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </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="75"/>
         <source>View admin notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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"/>
     </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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation type="unfinished"/>
     </message>
@@ -8369,55 +9741,65 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </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="249"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation type="unfinished"/>
     </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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -8425,311 +9807,554 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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"/>
     </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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></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="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"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation>Εισάγετε κωδικό</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
-        <source>This server does not permit you to update your user informations.</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <source>Password changed.</source>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <source>This server does not permit you to change your password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <source>The new password is too short.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <source>The old password is incorrect.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
-        <source>Avatar updated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <source>This server does not permit you to update your avatar.</source>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
+        <source>This server does not permit you to update your user informations.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
+        <source>Password changed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
+        <source>The new password is too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
+        <source>The old password is incorrect.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
+        <source>Avatar updated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <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"/>
     </message>
@@ -8737,22 +10362,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
@@ -8760,124 +10385,256 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8885,7 +10642,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="41"/>
+        <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"/>
     </message>
@@ -8893,19 +10650,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="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
@@ -8913,27 +10670,37 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -8941,50 +10708,93 @@ 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="53"/>
+        <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"/>
     </message>
     <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -8992,46 +10802,25 @@ 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="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -9039,47 +10828,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="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9087,7 +10881,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="25"/>
+        <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"/>
     </message>
@@ -9095,22 +10889,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="47"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -9118,17 +10912,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="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9136,43 +10930,43 @@ 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_widget.cpp" line="135"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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"/>
     </message>
@@ -9180,133 +10974,133 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation type="unfinished"/>
     </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="70"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </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"/>
     </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="107"/>
         <source>Enable all sets</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Disable all sets</source>
         <translation type="unfinished"/>
     </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="109"/>
         <source>Enable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation type="unfinished"/>
     </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="126"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation type="unfinished"/>
     </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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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"/>
     </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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9314,72 +11108,72 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -9387,7 +11181,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>Ελληνικά (Greek)</translation>
     </message>
@@ -9395,12 +11189,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -9408,1005 +11202,1078 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_en_US.ts b/cockatrice/translations/cockatrice_en_US.ts
index be8a7818b..00075c8c3 100644
--- a/cockatrice/translations/cockatrice_en_US.ts
+++ b/cockatrice/translations/cockatrice_en_US.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Set counter...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>Set counter</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>New value for counter &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Refresh</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Parse Set Name and Number (if available)</translation>
     </message>
@@ -36,81 +36,83 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation>Open in new tab</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation>Are you sure?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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>The decklist has been modified.
 Do you want to save the changes?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation>Could not open deck at %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation>Could not save remote deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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>The deck could not be saved.
 Please check that the directory is writable and try again.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation>Save deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation>The deck could not be saved.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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>There are no cards in your deck to be exported</translation>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
-        <translation>No deck was selected to be exported.</translation>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
+        <translation>Add Analytics Panel</translation>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation>Update Notes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation>Admin Notes for %1</translation>
     </message>
@@ -118,214 +120,253 @@ Please check that the directory is writable and try again.</translation>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation>Mainboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation> seconds</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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>Could not create themes directory at &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation>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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation>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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation>Confirm Change</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>Theme settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>Current theme:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation>Open themes folder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation>Home tab background source:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation>Home tab background shuffle frequency:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation>Disabled</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation>Menu settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="415"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>Show keyboard shortcuts in right-click menus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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>Show game filter toolbar above list in room tab</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>Card rendering</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>Display card names on cards having a picture</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>Auto-Rotate cards with sideways layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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>Override all card art with personal set preference (Pre-ProviderID change behavior)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Bump sets that the deck contains cards from to the top in the printing selector</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>Scale cards on mouse over</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation>Use rounded card corners</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Minimum overlap percentage of cards on the stack and in vertical hand</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="434"/>
         <source>Maximum initial height for card view window:</source>
         <translation>Maximum initial height for card view window:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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> rows</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="436"/>
         <source>Maximum expanded height for card view window:</source>
         <translation>Maximum expanded height for card view window:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation>Card counters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation>Counter %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>Hand layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Display hand horizontally (wastes space)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>Enable left justification</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>Table grid layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>Invert vertical coordinate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Minimum player count for multi-column layout:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maximum font size for information displayed on cards:</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="136"/>
+        <source>Back to results</source>
+        <translation>Back to results</translation>
+    </message>
+    <message>
+        <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>Open Deck in Deck Editor</translation>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -347,112 +388,112 @@ Are you sure you would like to disable this feature?</translation>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>ban &amp;user name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>ban &amp;IP address</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>ban client I&amp;D</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>Ban type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;permanent ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;temporary ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>&amp;Days:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Hours:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minutes:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>Duration of the ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>Please enter the reason for the ban that will be visible to the banned person.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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>Redact all messages from this user in all rooms</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>Ban user from server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>You must have a value in the name ban when selecting the name ban checkbox.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>You must have a value in the ip ban when selecting the ip ban checkbox.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>You must have a value in the clientid ban when selecting the clientid ban checkbox.</translation>
     </message>
@@ -460,152 +501,221 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation>Beta</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation>No reply received from the release update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Invalid reply received from the release update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation>No reply received from the file update server.</translation>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>Sets</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>Mana cost</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>Card type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>Color(s)</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>AND</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>OR</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>AND NOT</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>OR NOT</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation>Name (Exact)</translation>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>Color</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>Mana Cost</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation>Mana Value</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>Rarity</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>Power</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>Toughness</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>Loyalty</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation>Main Type</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation>Sub Type</translation>
     </message>
@@ -613,22 +723,22 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <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>Image</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>Description</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>Both</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>View transformation</translation>
     </message>
@@ -636,22 +746,22 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation>View related cards</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation>Add card to deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation>Mainboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
@@ -664,12 +774,22 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
         <translation>Name:</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>Set:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation>Collector Number:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation>Related cards:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation>Unknown card:</translation>
     </message>
@@ -677,132 +797,150 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation>Re&amp;veal to...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation>&amp;All players</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation>View related cards</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation>Token: </translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation>All tokens</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation>&amp;Select All</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation>S&amp;elect Row</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation>S&amp;elect Column</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation>&amp;Play</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation>&amp;Hide</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation>Play &amp;Face Down</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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>&amp;Tap / Untap</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
-        <translation>Toggle &amp;normal untapping</translation>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
+        <translation>Skip &amp;untapping</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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>T&amp;urn Over</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation>&amp;Peek at card face</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation>&amp;Clone</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation>Attac&amp;h to card...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation>Unattac&amp;h</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation>&amp;Draw arrow...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation>&amp;Set annotation...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation>Ca&amp;rd counters</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation>&amp;Add counter (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation>&amp;Remove counter (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation>&amp;Set counters (%1)...</translation>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation>Card Size</translation>
     </message>
@@ -810,133 +948,133 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation>their hand</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation>%1&apos;s hand</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation>their library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation>%1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation>of their library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation>of %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation>their library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation>%1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation>their library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation>%1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation>their library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation>%1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation>their graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation>%1&apos;s graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation>their exile</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation>%1&apos;s exile</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation>their sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation>%1&apos;s sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation>their sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation>%1&apos;s sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation>their custom zone &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation>%1&apos;s custom zone &apos;%2&apos;</translation>
@@ -945,7 +1083,7 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Parse error at line %1 col %2:</translation>
     </message>
@@ -953,29 +1091,470 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Parse error at line %1 col %2:</translation>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation>C&amp;ustom Zones</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation>View custom zone &apos;%1&apos;</translation>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation>Add Panel</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation>Remove Panel</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation>Save Layout</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation>Load Layout</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation>Card Database</translation>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation>Card Info</translation>
     </message>
@@ -983,47 +1562,17 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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>Search by card name (or search expressions)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation>Add to Deck</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation>Add to Sideboard</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation>Select Printing</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation>Show on EDHRec (Commander)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation>Show on EDHRec (Card)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation>Show Related cards</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="127"/>
         <source>Add card to &amp;maindeck</source>
         <translation>Add card to &amp;maindeck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="128"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Add card to &amp;sideboard</translation>
     </message>
@@ -1031,87 +1580,97 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation>Loading Database...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation>Banner Card</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation>Main Type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation>Mana Cost</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation>Colors</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation>Select Printing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation>Deck &amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation>Banner Card/Tags Visibility Settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
         <source>Show banner card selection menu</source>
         <translation>Show banner card selection menu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation>Show tags selection menu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation>&amp;Comments:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation>Group by:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation>Format:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation>Hash:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation>&amp;Increment number</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation>&amp;Decrement number</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation>&amp;Remove row</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="752"/>
         <source>Swap card to/from sideboard</source>
         <translation>Swap card to/from sideboard</translation>
     </message>
@@ -1137,114 +1696,114 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation>&amp;Deck Editor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation>&amp;New deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation>&amp;Load deck...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation>Load recent deck...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation>Clear</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation>&amp;Save deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation>Save deck &amp;as...</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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation>Load deck from cl&amp;ipboard...</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="162"/>
         <source>Edit deck in clipboard</source>
         <translation>Edit deck in clipboard</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="166"/>
+        <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>Annotated</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="168"/>
+        <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>Not Annotated</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation>Save deck to clipboard</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="168"/>
         <source>Annotated (No set info)</source>
         <translation>Annotated (No set info)</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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation>Not Annotated (No set info)</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="172"/>
         <source>&amp;Print deck...</source>
         <translation>&amp;Print deck...</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="174"/>
         <source>Load deck from online service...</source>
         <translation>Load deck from online service...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation>&amp;Send deck to online service</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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation>Create decklist (decklist.org)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation>Create decklist (decklist.xyz)</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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation>Analyze deck (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation>Analyze deck (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation>&amp;Close</translation>
     </message>
@@ -1252,7 +1811,7 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation>Printing Selector</translation>
     </message>
@@ -1260,194 +1819,171 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>Update Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>Success</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation>Download URLs have been reset.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>Downloaded card pictures have been reset.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation>One or more downloaded card pictures could not be cleared.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>Add URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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>Edit URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation>Network Cache Size:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation>Redirect Cache TTL:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation>How long cached redirects for urls are valid for.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation>Picture Cache Size:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation>Add New URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation>Remove URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation>Day(s)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>Updating...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>Choose path</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation>URL Download Priority</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>Download Spoilers Automatically</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation>Spoiler Location:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>Last Change</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>Spoilers download automatically on launch</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>Press the button to manually update without relaunching</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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>Do not close settings until manual update is complete</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation>Download card pictures on the fly</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation>How to add a custom URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>Delete Downloaded Images</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation>Reset Download URLs</translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
-        <translation>On-disk cache for downloaded pictures</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
+        <translation>Undo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
-        <translation>In-memory cache for pictures not currently on screen</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation>Redo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation>Undo/Redo history</translation>
+    </message>
+    <message>
+        <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>Click on an entry to revert to that point in the history.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation>[redo] </translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
+        <translation>[undo] </translation>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation>Count</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>Number</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation>Provider ID</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>Card</translation>
     </message>
@@ -1455,12 +1991,12 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation>Common deck formats (%1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation>All files (*.*)</translation>
     </message>
@@ -1468,17 +2004,17 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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>Mode: Exact Match</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
         <source>Mode: Includes</source>
         <translation>Mode: Includes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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>Color identity filter mode (AND/OR/NOT conjunctions of filters)</translation>
     </message>
@@ -1486,7 +2022,7 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
         <source>Edit tags ...</source>
         <translation>Edit tags ...</translation>
     </message>
@@ -1494,62 +2030,62 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
         <source>Deck Tags Manager</source>
         <translation>Deck Tags Manager</translation>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation>Add a new tag (e.g., Aggro️)</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="104"/>
         <source>Add Tag</source>
         <translation>Add Tag</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="105"/>
         <source>Filter tags...</source>
         <translation>Filter tags...</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="106"/>
         <source>OK</source>
         <translation>OK</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="107"/>
         <source>Edit default tags</source>
         <translation>Edit default tags</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="108"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation>Invalid Input</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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>Tag name cannot be empty!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation>Duplicate Tag</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>This tag already exists.</source>
         <translation>This tag already exists.</translation>
     </message>
@@ -1557,98 +2093,156 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation>Banner Card</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
         <source>Open in deck editor</source>
         <translation>Open in deck editor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation>Edit Tags</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation>Rename Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
         <source>Save Deck to Clipboard</source>
         <translation>Save Deck to Clipboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation>Annotated</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
         <source>Annotated (No set info)</source>
         <translation>Annotated (No set info)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation>Not Annotated</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
         <source>Not Annotated (No set info)</source>
         <translation>Not Annotated (No set info)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation>Rename File</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation>Delete File</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation>Set Banner Card</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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>New name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation>Rename failed</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation>Delete file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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>Are you sure you want to delete the selected file?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation>Delete failed</translation>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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>Rename deck to &quot;%1&quot; from &quot;%2&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
+        <source>Updated comments (was %1 chars, now %2 chars)</source>
+        <translation>Updated comments (was %1 chars, now %2 chars)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation>Set banner card to %1 (%2)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation>Tags changed</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation>Set format to %1</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation>Added (%1): %2 (%3) %4</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="264"/>
+        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
+        <translation>Moved to %1 1 × &quot;%2&quot; (%3)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation>Removed &quot;%1&quot; (all copies)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation>%1 1 × &quot;%2&quot; (%3)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation>Added</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation>Removed</translation>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1666,75 +2260,75 @@ This is only saved for moderators and cannot be seen by the banned person.</tran
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>Load deck...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Load remote deck...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation>Load from clipboard...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation>Load from website...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation>Unload deck</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>Ready to start</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation>Force start</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation>Sideboard unlocked</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation>Sideboard locked</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>The selected file could not be loaded.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation>Deck is greater than maximum file size.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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>Are you sure you want to force start?
 This will kick all non-ready players from the game.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -1769,143 +2363,143 @@ This will kick all non-ready players from the game.</translation>
         <translation>Downloading...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>Known Hosts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation>Delete the currently selected saved server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Refresh the server list with known public servers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>New Host</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>Player &amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;assword:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>&amp;Save password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>A&amp;uto connect</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Automatically connect to the most recent login when Cockatrice opens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>If you have any trouble connecting or registering then contact the server staff for help!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>Webpage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation>Reset Password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation>Forgot password?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>&amp;Connect</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation>Server Contact</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>Connect to Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation>Server URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation>Communication Port</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation>Unique Server Name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>Connection Warning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>You need to name your new connection profile.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>Connect Warning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>The player name can&apos;t be empty.</translation>
     </message>
@@ -1913,117 +2507,122 @@ This will kick all non-ready players from the game.</translation>
 <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>Re&amp;member settings</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>&amp;Description:</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>P&amp;layers:</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>General</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>Game type</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>&amp;Password:</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>Only &amp;buddies can join</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>Only &amp;registered users can join</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>Joining restrictions</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>&amp;Spectators can watch</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>Spectators &amp;need a password to watch</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>Spectators can &amp;chat</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>Spectators can see &amp;hands</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>Create game as spectator</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>Spectators</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>Starting life total:</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>Open decklists in lobby</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation>Create game as judge</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation>Game setup options</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>&amp;Clear</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>Create game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>Game information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>Server error.</translation>
     </message>
@@ -2031,97 +2630,97 @@ This will kick all non-ready players from the game.</translation>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Name:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Token</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;olor:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>white</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>blue</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>black</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>red</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>green</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>multicolor</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>colorless</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotation:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Destroy token when it leaves the table</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation>Create face-down (Only hides name)</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Token data</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Show &amp;all tokens</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Show tokens from this &amp;deck</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>Choose token from list</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>Create token</translation>
     </message>
@@ -2129,53 +2728,53 @@ This will kick all non-ready players from the game.</translation>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation>Edit Tags</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation>Add</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation>Confirm</translation>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation>Cancel</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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation>Enter a tag and press Enter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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>✖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation>Invalid Input</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation>Tag name cannot be empty!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation>Duplicate Tag</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation>This tag already exists.</translation>
     </message>
@@ -2183,40 +2782,40 @@ This will kick all non-ready players from the game.</translation>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>No image chosen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>Browse...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>Change avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>Open Image</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Image Files (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>Invalid image chosen.</translation>
     </message>
@@ -2224,17 +2823,17 @@ To remove your current avatar, confirm without choosing a new image.</translatio
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation>Edit deck in clipboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation>Invalid deck list.</translation>
     </message>
@@ -2242,38 +2841,38 @@ To remove your current avatar, confirm without choosing a new image.</translatio
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Old password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>New password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Confirm new password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Change password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Your password is too short.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>The new passwords don&apos;t match.</translation>
     </message>
@@ -2281,93 +2880,93 @@ To remove your current avatar, confirm without choosing a new image.</translatio
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;olor:</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="34"/>
         <source>white</source>
         <translation>white</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="35"/>
         <source>blue</source>
         <translation>blue</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="36"/>
         <source>black</source>
         <translation>black</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="37"/>
         <source>red</source>
         <translation>red</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="38"/>
         <source>green</source>
         <translation>green</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="39"/>
         <source>multicolor</source>
         <translation>multicolor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>colorless</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotation:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Token data</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>Add token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Remove token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation>Edit custom tokens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Please enter the name of the token:</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>Error</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>The chosen name conflicts with an existing card or token.
@@ -2392,12 +2991,12 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>Undefined</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Real name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Edit user profile</translation>
     </message>
@@ -2435,112 +3034,113 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>2 hours</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation>Hide &apos;buddies only&apos; games</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation>Hide full games</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation>Hide games that have started</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation>Hide password protected games</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation>Hide &apos;ignored user&apos; games</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
-        <translation>Hide games not created by buddy</translation>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
+        <translation>Hide games not created by buddies</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation>Hide games with forced open decklists</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Newer than:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>Game &amp;description:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;Creator name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>&amp;Game types</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>at &amp;least:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>at &amp;most:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>Maximum player count</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>Restrictions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Show games only if &amp;spectators can watch</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Show spectator password p&amp;rotected games</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Show only if spectators can ch&amp;at</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Show only if spectators can see &amp;hands</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation>Spectators</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>Filter games</translation>
     </message>
@@ -2548,52 +3148,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>Reset Password Challenge Warning</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>A problem has occurred. Please try to request a new password again.</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>Enter the information of the server and the account you&apos;d like to request a new password for.</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>&amp;Host:</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>&amp;Port:</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>Player &amp;name:</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>Email:</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>Reset Password Challenge</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>Reset Password Challenge Error</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>The email address can&apos;t be empty.</translation>
     </message>
@@ -2601,37 +3201,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>Enter the information of the server you&apos;d like to request a new password for.</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>&amp;Host:</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>&amp;Port:</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>Player &amp;name:</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>Reset Password Request</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>Reset Password Error</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>The player name can&apos;t be empty.</translation>
     </message>
@@ -2639,86 +3239,86 @@ 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>Reset Password Warning</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>A problem has occurred. Please try to request a new password again.</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>Enter the received token and the new password in order to set your new password.</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>&amp;Host:</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>&amp;Port:</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>Player &amp;name:</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>Token:</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>New Password:</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>Reset Password</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>The player name can&apos;t be empty.</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>Reset Password Error</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>The token can&apos;t be empty.</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>The new password can&apos;t be empty.</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>Error</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>Your password is too short.</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>The passwords do not match.</translation>
     </message>
@@ -2734,17 +3334,17 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>Load deck from clipboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>Invalid deck list.</translation>
     </message>
@@ -2752,45 +3352,45 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation>Load Deck from Website</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation>Network error: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation>Received empty deck data.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation>Failed to parse deck data: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2810,45 +3410,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>Load deck</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation>Players:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation>Starting life total:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation>Game setup options</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation>Remember settings</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation>Local game options</translation>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation>Card name (or search expressions):</translation>
     </message>
     <message>
-        <location filename="src/game/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>Number of hits:</translation>
     </message>
     <message>
-        <location filename="src/game/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>Auto play hits</translation>
     </message>
     <message>
-        <location filename="src/game/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>Put top cards on stack until...</translation>
     </message>
     <message>
-        <location filename="src/game/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>No cards matching the search expression exists in the card database. Proceed anyways?</translation>
     </message>
     <message>
-        <location filename="src/game/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>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/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>Invalid filter</translation>
     </message>
@@ -2856,54 +3489,54 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>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.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>Player &amp;name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;assword:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>Password (again):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>Email (again):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>Country:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>Undefined</translation>
     </message>
@@ -2949,17 +3582,17 @@ Your email will be used to verify your account.</translation>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation>Number of sides:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation>Number of dice:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation>Roll Dice</translation>
     </message>
@@ -2967,40 +3600,55 @@ Your email will be used to verify your account.</translation>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation>Unmodified Cards:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation>Modified Cards:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation>Clear all set information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation>Set all to preferred</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation>Bulk modified printings.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation>Cleared all printing information.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation>Set all printings to preferred.</translation>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>Unknown Error loading card database</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -3017,7 +3665,7 @@ You may need to rerun oracle to update your card database.
 Would you like to change your database location setting?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3034,7 +3682,7 @@ Usually this can be fixed by rerunning oracle to to update your card database.
 Would you like to change your database location setting?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3047,7 +3695,7 @@ Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with you
 Would you like to change your database location setting?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3056,7 +3704,7 @@ Would you like to change your database location setting?</source>
 Would you like to change your database location setting?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3065,7 +3713,7 @@ Would you like to change your database location setting?</source>
 Would you like to change your database location setting?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3078,59 +3726,64 @@ Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
 Would you like to change your database location setting?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>The path to your deck directory is invalid. Would you like to go back and set the correct path?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>The path to your card pictures directory is invalid. Would you like to go back and set the correct path?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>Settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>Appearance</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>User Interface</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation>Card Sources</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>Sound</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>Shortcuts</translation>
     </message>
@@ -3138,12 +3791,12 @@ Would you like to change your database location setting?</translation>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation>Card Update Check</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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>
@@ -3152,27 +3805,27 @@ Choose how you would like to run the card database updater.
 You can always change this behavior in the &apos;General&apos; settings tab.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation>Run in foreground</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation>Run in background</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="27"/>
         <source>Run in background and always from now on</source>
         <translation>Run in background and always from now on</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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation>Don&apos;t prompt again and don&apos;t run</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="29"/>
         <source>Don&apos;t run this time</source>
         <translation>Don&apos;t run this time</translation>
     </message>
@@ -3180,17 +3833,17 @@ You can always change this behavior in the &apos;General&apos; settings tab.</tr
 <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>Next</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>Previous</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>Tip of the Day</translation>
     </message>
@@ -3198,166 +3851,166 @@ You can always change this behavior in the &apos;General&apos; settings tab.</tr
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>Current release channel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>Reinstall</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>Cancel Download</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>Open Download Page</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation>Check for Client Updates</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>Cockatrice was not built with SSL support, therefore you cannot download updates automatically! 
 Please visit the download page to update manually.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation>Downloading update: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>Checking for updates...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>Finished checking for updates</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>No Update Available</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice is up to date!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>You are already running the latest version available in the chosen release channel.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>Current version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>Selected release channel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>Update Available</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>A new version of Cockatrice is available!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>New version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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>Released</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>Changelog</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>Do you want to update now?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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>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.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>Update Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>An error occurred while checking for updates:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>An error occurred while downloading an update:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>Installing...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice is unable to open the installer.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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>Try to update manually by closing Cockatrice and running the installer.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation>Download location</translation>
     </message>
@@ -3365,21 +4018,153 @@ You may have to manually download the new version.</translation>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Clear log when closing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation>Copy to clipboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Debug Log</translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation>Draw Probability Settings</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation>Criteria:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation>Card Name</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation>Subtype</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation>Mana Value</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation>Exactness:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation>At least</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation>Exactly</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation>Quantity (N):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation>Cards drawn (M):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation> cards</translation>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation>Draw Probability</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation>Probability of drawing</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation>Card Name</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation>Subtype</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation>Mana Value</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation>At least</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation>Exactly</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation>card(s) having drawn at least</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation>cards</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation>Category</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation>Qty</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation>Odds (%)</translation>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3450,32 +4235,38 @@ You may have to manually download the new version.</translation>
     </message>
 </context>
 <context>
-    <name>EdhrecCommanderApiResponseNavigationWidget</name>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
-        <source>Combos</source>
-        <translation>Combos</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
-        <source>Average Deck</source>
-        <translation>Average Deck</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
         <source>Game Changers</source>
         <translation>Game Changers</translation>
     </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
         <source>Budget</source>
         <translation>Budget</translation>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <source>Combos</source>
+        <translation>Combos</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <source>Average Deck</source>
+        <translation>Average Deck</translation>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
         <source>Salt: </source>
         <translation>Salt: </translation>
     </message>
@@ -3483,7 +4274,7 @@ You may have to manually download the new version.</translation>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>Type your filter here</translation>
     </message>
@@ -3491,22 +4282,22 @@ You may have to manually download the new version.</translation>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation>Confirm Delete</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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>Are you sure you want to delete the filter &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation>Delete Failed</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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>Failed to delete filter &apos;%1&apos;.</translation>
     </message>
@@ -3514,22 +4305,22 @@ You may have to manually download the new version.</translation>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation>kicked by game host or moderator</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation>player left the game</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation>player disconnected from server</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation>reason unknown</translation>
     </message>
@@ -3537,155 +4328,208 @@ You may have to manually download the new version.</translation>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>Please join the appropriate room first.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>Wrong password.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Spectators are not allowed in this game.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>The game is already full.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>The game does not exist any more.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>This game is only open to registered users.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>This game is only open to its creator&apos;s buddies.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>You are being ignored by the creator of this game.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation>Join Game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation>Spectate Game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation>Game Information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation>Join Game as Judge</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation>Spectate Game as Judge</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>Join game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>Please join the respective room first.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filter games</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>C&amp;lear filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>C&amp;reate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>&amp;Join</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation>Join as judge</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>J&amp;oin as spectator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation>Join as judge spectator</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation>Games shown: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>Games</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation>All types</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation>Filter by game name...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation>Filter by game type/format</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation>Hide games not created by buddies</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation>Hide full games</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation>Hide started games</translation>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 day</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="43"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 hr</numerusform><numerusform>%1%2 hrs</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation>new</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="48"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 mins</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>buddies only</translation>
     </message>
@@ -3695,68 +4539,68 @@ You may have to manually download the new version.</translation>
         <translation>reg. users only</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation>open decklists</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>can chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>see hands</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>can see hands</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>not allowed</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>Room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>Age</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>Creator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>Restrictions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>Players</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>Spectators</translation>
     </message>
@@ -3764,143 +4608,158 @@ You may have to manually download the new version.</translation>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation>Reset all paths</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation>All paths have been reset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>Choose path</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>Personal settings</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>Language:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>Paths (editing disabled in portable mode)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>Paths</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation>How to help with translations</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>Decks directory:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation>Filters directory:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>Replays directory:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>Pictures directory:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>Card database:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation>Custom database directory:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>Token database:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation>Update channel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation>Check for client updates on startup</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="379"/>
         <source>Check for card database updates on startup</source>
         <translation>Check for card database updates on startup</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation>Don&apos;t check</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation>Prompt for update</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation>Always update in the background</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation>Check for card database updates every</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation> days</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>Notify if a feature supported by the server is missing in my client</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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>Automatically run Oracle when running a new version of Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>Show tips on startup</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="398"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation>Last update check on %1 (%2 days ago)</translation>
     </message>
@@ -3908,47 +4767,47 @@ You may have to manually download the new version.</translation>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation>&amp;View graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation>&amp;Move graveyard to...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Top of library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Bottom of library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
         <translation>&amp;All players</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exile</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation>Reveal random card to...</translation>
     </message>
@@ -3956,111 +4815,141 @@ You may have to manually download the new version.</translation>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation>&amp;View hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
-        <translation>&amp;Sort hand</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
+        <translation>Sort hand by...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
-        <translation>Take &amp;mulligan</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
+        <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation>Mana Value</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation>Take &amp;mulligan (Choose hand size)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation>Take mulligan (Same hand size)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation>Take mulligan (Hand size - 1)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation>&amp;Move hand to...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Top of library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Bottom of library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exile</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation>&amp;Reveal hand to...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation>Reveal r&amp;andom card to...</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
+        <translation>All players</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
-        <translation>&amp;All players</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>Reveal r&amp;andom card to...</translation>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation>Create New Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation>Browse Decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation>Browse Card Database</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation>Browse EDHRec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation>Browse Archidekt</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation>View Replays</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation>Quit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation>Connecting...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation>Connect</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation>Play</translation>
     </message>
@@ -4068,193 +4957,213 @@ You may have to manually download the new version.</translation>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation>&amp;Library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation>&amp;View library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation>View &amp;top cards of library...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation>View bottom cards of library...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation>Reveal &amp;library to...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation>Lend library to...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation>Reveal &amp;top cards to...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation>&amp;Top of library...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation>&amp;Bottom of library...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation>&amp;Always reveal top card</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation>&amp;Always look at top card</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation>&amp;Open deck in deck editor</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation>&amp;Draw card</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation>D&amp;raw cards...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation>&amp;Undo last draw</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation>Shuffle</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation>&amp;Play top card</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation>Play top card &amp;face down</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation>Put top card on &amp;bottom</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation>Move top card to grave&amp;yard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation>Move top card to e&amp;xile</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation>Move top cards to &amp;graveyard...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation>Move top cards to graveyard face down...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation>Move top cards to &amp;exile...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation>Move top cards to exile face down...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation>Put top cards on stack &amp;until...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation>Shuffle top cards...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation>&amp;Draw bottom card</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation>D&amp;raw bottom cards...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation>&amp;Play bottom card</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation>Play bottom card &amp;face down</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation>Move bottom card to grave&amp;yard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation>Move bottom card to e&amp;xile</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation>Move bottom cards to &amp;graveyard...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation>Move bottom cards to graveyard face down...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation>Move bottom cards to &amp;exile...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation>Move bottom cards to exile face down...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation>Put bottom card on &amp;top</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation>Shuffle bottom cards...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
         <translation>&amp;All players</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation>Reveal top cards of library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation>Number of cards: (max. %1)</translation>
     </message>
@@ -4262,649 +5171,273 @@ You may have to manually download the new version.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>The server has reached its maximum user capacity, please check back later.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>There are too many concurrent connections from your address.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>Banned by moderator</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>Expected end time: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>This ban lasts indefinitely.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>Scheduled server shutdown.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>Invalid username.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>You have been logged out due to logging in at another location.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>Connection closed</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>The server has terminated your connection.
-Reason: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>The server is going to be restarted in %n minute.
-All running games will be lost.
-Reason for shutdown: %1</numerusform><numerusform>The server is going to be restarted in %n minutes.
-All running games will be lost.
-Reason for shutdown: %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>Scheduled server shutdown</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>Success</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>Registration accepted.
-Will now login.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>Account activation accepted.
-Will now login.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>Number of players</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>Please enter the number of players.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>Player %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>Load replay</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>About Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatrice Webpage</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>Project Manager:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>Past Project Managers:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>Developers:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>Our Developers</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>Help Develop!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>Translators:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>Our Translators</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>Help Translate!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>Support:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>Report an Issue</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>Troubleshooting</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>F.A.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>Server timeout</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>Failed Login</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation>Your client seems to be missing features this server requires for connection.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>Incorrect username or password. Please check your authentication information and try again.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>There is already an active session using this user name.
-Please close that session first and re-login.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>You are banned until %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>You are banned indefinitely.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>This server requires user registration. Do you want to register now?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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>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.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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>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.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>Account activation</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation>Server Full</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>Unknown login error: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>
-This usually means that your client version is out of date, and the server sent a reply your client doesn&apos;t understand.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>Your username must respect these rules:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>is %1 - %2 characters long</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>can %1 contain lowercase characters</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>NOT</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>can %1 contain uppercase characters</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>can %1 contain numeric characters</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>can contain the following punctuation: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>first character can %1 be a punctuation mark</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <source>no unacceptable language as specified by these server rules:</source>
-        <comment>note that the following lines will not be translated</comment>
-        <translation>no unacceptable language as specified by these server rules:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation>can not contain any of the following words: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation>can not match any of the following expressions: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>Registration denied</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>Registration is currently disabled on this server</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>There is already an existing account with the same user name.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>It&apos;s mandatory to specify a valid email address when registering.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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>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.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>Password too short.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>Registration failed for a technical problem on the server.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation>The connection to the server has been lost.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>Unknown registration error: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>Account activation failed</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>Socket error: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>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.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>Connecting to %1...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>Registering to %1 as %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>Disconnected</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>Connected, logging in at %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>Requesting forgotten password to %1 as %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Connect...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Disconnect</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>Start &amp;local game...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Watch replay...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Full screen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Register to server...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;Restore password...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Settings...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>&amp;Exit</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>A&amp;ctions</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>C&amp;ard Database</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;Manage sets...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Edit custom &amp;tokens...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>Open custom image folder</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>Open custom sets folder</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>Add custom sets/cards</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation>Reload card database</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation>Tabs</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;About Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Tip of the Day</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation>Check for Client Updates</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation>Check for Card Updates...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation>Check for Card Updates (Automatic)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation>Show Status Bar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation>View &amp;Debug Log</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation>Open Settings Folder</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation>Show/Hide</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation>New Version</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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>Congratulations on updating to Cockatrice %1!
 Oracle will now launch to update your card database.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice installed</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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>Congratulations on installing Cockatrice %1!
 Oracle will now launch to install the initial card database.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>Card database</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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>
@@ -4913,29 +5446,29 @@ Do you want to update your card database now?
 If unsure or first time user, choose &quot;Yes&quot;</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>Open settings</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>New sets found</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
@@ -4946,17 +5479,22 @@ Set codes: %1
 Do you want to enable them?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>View sets</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>Welcome</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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>
@@ -4965,742 +5503,903 @@ 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.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>A card database update is already running.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>Unable to run the card database updater: </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation>Card database update running.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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>Failed to start. The file might be missing, or permissions might be incorrect.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation>The process crashed some time after starting successfully.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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>Timed out. The process took too long to respond. The last waitFor...() function timed out.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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>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.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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>An error occurred when attempting to read from the process. For example, the process may not be running.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation>Unknown error occurred.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation>The card database updater exited with an error:
 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>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.
-
-To update your client, go to Help -&gt; Check for Updates.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>Load sets/cards</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>Selected file cannot be found.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation>You can only import XML databases at this time.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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>The new sets/cards have been added successfully.
 Cockatrice will now reload the card database.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>Sets/cards failed to import.</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
-        <translation>Reset Password</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
+        <translation>Mana Base Configuration</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
-        <translation>Your password has been reset successfully, you can now log in using the new credentials.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
+        <translation>Display type:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>Failed to reset user account password, please contact the server operator to reset your password.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
+        <translation>pie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
-        <translation>Activation request received, please check your email for an activation token.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation>combinedBar</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation>Filter Colors (optional):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
+        <translation>Cancel</translation>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation>Mana Base</translation>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation>Group By:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation>type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation>color</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation>subtype</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation>power</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation>toughness</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation>Filters (optional):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation>Show main bar row</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation>Show per-category rows</translation>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation>Mana Curve</translation>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation>Display type:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation>pie</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation>combinedBar</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation>Filter Colors (optional):</translation>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation>Mana Devotion</translation>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation>Top display type:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation>pie</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation>bar</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation>Colors:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation>Show per-color rows</translation>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation>%1 pips (%2 cards)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation>%1 mana (%2 cards)</translation>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation>Mana Production + Devotion</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation>Mana Distribution Settings</translation>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation> from play</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation> from their graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation> from exile</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation> from their hand</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>the top card of %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation>the top card of their library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation> from the top of %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation> from the top of their library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>the bottom card of %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation>the bottom card of their library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation> from the bottom of %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation> from the bottom of their library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation> from %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation> from their library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation> from sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation> from the stack</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation> from custom zone &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1 is now keeping the top card %2 revealed.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1 is not revealing the top card %2 any longer.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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>%1 can now look at top card %2 at any time.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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>%1 no longer can look at top card %2 at any time.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1 attaches %2 to %3&apos;s %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 has conceded the game.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 has unconceded the game.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1 has restored connection to the game.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 has lost connection to the game.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation>%1 points from their %2 to themselves.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation>%1 points from their %2 to %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation>%1 points from %2&apos;s %3 to themselves.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation>%1 points from %2&apos;s %3 to %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1 points from their %2 to their %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1 points from their %2 to %3&apos;s %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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>%1 points from %2&apos;s %3 to their own %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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>%1 points from %2&apos;s %3 to %4&apos;s %5.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation>%1 creates a face down token.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 creates token: %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 has loaded a deck (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>%1 has loaded a deck with %2 sideboard cards (%3).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation>%1 destroys %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>a card</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1 gives %2 control over %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="308"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation>%1 puts %2 into play%3 face down.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1 puts %2 into play%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="314"/>
+        <source>%1 puts %2%3 into their graveyard face down.</source>
+        <translation>%1 puts %2%3 into their graveyard face down.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation>%1 puts %2%3 into their graveyard.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation>%1 exiles %2%3 face down.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 exiles %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation>%1 moves %2%3 to their hand.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation>%1 puts %2%3 into their library.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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>%1 puts %2%3 onto the bottom of their library.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation>%1 puts %2%3 on top of their library.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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>%1 puts %2%3 into their library %4 cards from the top.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 moves %2%3 to sideboard.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation>%1 plays %2%3 face down.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 plays %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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>%1 moves %2%3 to custom zone &apos;%4&apos; face down.</translation>
+    </message>
+    <message>
+        <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>%1 moves %2%3 to custom zone &apos;%4&apos;.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="373"/>
         <source>%1 tries to draw from an empty library</source>
         <translation>%1 tries to draw from an empty library</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation><numerusform>%1 draws %2 card.</numerusform><numerusform>%1 draws %2 cards.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 is looking at %2.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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><numerusform>%1 is looking at the %4 %3 card %2.</numerusform><numerusform>%1 is looking at the %4 %3 cards %2.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation>bottom</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation>top</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1 turns %2 face-down.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1 turns %2 face-up.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>The game has been closed.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>The game has started.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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>You are flooding the game. Please wait a couple of seconds.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1 has joined the game.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 is now watching the game.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>You have been kicked out of the game.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 has left the game (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation>%1 is not watching the game any more (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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>%1 is not ready to start the game any more.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform>%1 shuffles their deck and draws a card.</numerusform><numerusform>%1 shuffles their deck and draws a new hand of %2 cards.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="473"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation>%1 shuffles their deck and draws a new hand.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation>You are watching a replay of game #%1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1 is ready to start the game.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="510"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation>cards</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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><numerusform>one card</numerusform><numerusform>%1 cards</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation>%1 lends %2 to %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1 reveals %2 to %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1 reveals %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation>%1 randomly reveals %2%3 to %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1 randomly reveals %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation>%1 peeks at face down card #%2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation>%1 peeks at face down card #%2: %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation>%1 reveals %2%3 to %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 reveals %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="576"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation>%1 reversed turn order, now it&apos;s %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation>reversed</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation>normal</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>Heads</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>Tails</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation>%1 flipped a coin. It landed as %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1 rolls a %2 with a %3-sided die.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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>%1 flips %2 coins. There are %3 heads and %4 tails.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="608"/>
         <source>%1 rolls a %2-sided dice %3 times: %4.</source>
         <translation>%1 rolls a %2-sided dice %3 times: %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>%1&apos;s turn.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation>%1 sets annotation of %2 to %3.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
-        <translation><numerusform>%1 places %2 &quot;%3&quot; counter on %4 (now %5).</numerusform><numerusform>%1 places %2 &quot;%3&quot; counters on %4 (now %5).</numerusform></translation>
+        <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><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
-        <translation><numerusform>%1 removes %2 &quot;%3&quot; counter from %4 (now %5).</numerusform><numerusform>%1 removes %2 &quot;%3&quot; counters from %4 (now %5).</numerusform></translation>
+        <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><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation>%1 sets counter %2 to %3 (%4%5).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%1 sets %2 to not untap normally.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 sets %2 to untap normally.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 removes the PT of %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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>%1 changes the PT of %2 from nothing to %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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>%1 changes the PT of %2 from %3 to %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1 has locked their sideboard.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 has unlocked their sideboard.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 taps their permanents.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 untaps their permanents.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1 taps %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1 untaps %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 shuffles %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="769"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation>%1 shuffles the bottom %3 cards of %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="774"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation>%1 shuffles the top %3 cards of %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation>%1 shuffles cards %3 - %4 of %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 unattaches %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 undoes their last draw.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 undoes their last draw (%2).</translation>
     </message>
@@ -5708,110 +6407,115 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation>Word1 Word2 Word3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation>Add New Message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation>Edit Message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation>Remove Message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>Add message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>Message:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation>Edit message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>Chat settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>Custom alert words</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>Enable chat mentions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>Enable mention completer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>In-game message macros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="243"/>
         <source>How to use in-game message macros</source>
         <translation>How to use in-game message macros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>Ignore chat room messages sent by unregistered users</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>Ignore private messages sent by unregistered users</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>Invert text color</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>Enable desktop notifications for private messages</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>Enable desktop notification for mentions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>Enable room message history on join</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>(Color is hexadecimal)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Separate words with a space, alphanumeric characters only</translation>
     </message>
@@ -5819,37 +6523,42 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation>Move to</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation>&amp;Top of library in random order</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation>X cards from the top of library...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation>&amp;Bottom of library in random order</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation>T&amp;able</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exile</translation>
     </message>
@@ -5862,47 +6571,47 @@ Cockatrice will now reload the card database.</translation>
         <translation>Card Type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation>Mana Value</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation>Color(s)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation>Loyalty</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation>Main Card Type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation>Mana Cost</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation>Side</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation>Layout</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation>Color Identity</translation>
     </message>
@@ -5925,65 +6634,211 @@ Cockatrice will now reload the card database.</translation>
         <translation>Overlap direction:</translation>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation>Unknown Phase</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation>Untap</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation>Upkeep</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation>Draw</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation>First Main</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation>Beginning of Combat</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation>Declare Attackers</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation>Declare Blockers</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation>Combat Damage</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation>End of Combat</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation>Second Main</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation>End/Cleanup</translation>
     </message>
@@ -5991,57 +6846,57 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>Untap step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>Upkeep step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>Draw step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>First main phase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>Beginning of combat step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>Declare attackers step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>Declare blockers step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>Combat damage step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>End of combat step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>Second main phase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>End of turn step</translation>
     </message>
@@ -6049,7 +6904,7 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>en</translation>
@@ -6058,183 +6913,199 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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>grave</translation>
+    </message>
+    <message>
+        <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>exile</translation>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
-        <translation>View top cards of library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
-        <translation>Number of cards: (max. %1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
-        <translation>View bottom cards of library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
-        <translation>Shuffle top cards of library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
-        <translation>Shuffle bottom cards of library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
-        <translation>Draw hand</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
-        <translation>0 and lower are in comparison to current hand size</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
-        <translation>Draw cards</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
-        <translation>Move top cards to grave</translation>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
-        <translation>Move top cards to exile</translation>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation>Move bottom cards to grave</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation>Move bottom cards to exile</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
-        <translation>Draw bottom cards</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation>C&amp;reate another %1 token</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
-        <translation>Create tokens</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
-        <translation>Number:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
-        <translation>Place card X cards from top of library</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
-        <translation>Which position should this card be placed:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
-        <translation>(max. %1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
-        <translation>Change power/toughness</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
-        <translation>Change stats to:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
-        <translation>Set annotation</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
-        <translation>Please enter the new annotation:</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation>Set counters</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation>Player &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation>&amp;Counters</translation>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
-        <translation>S&amp;ay</translation>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you&apos;ll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
+        <translation>Enable printings again</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation>Display Navigation Buttons</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation>Printing Selector</translation>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation>Preference</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation>Pin Printing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation>Unpin Printing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation>Show Related cards</translation>
     </message>
@@ -6250,17 +7121,17 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation>Previous Card in Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation>Bulk Selection</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation>Next Card in Deck</translation>
     </message>
@@ -6268,86 +7139,94 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation>Alphabetical</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation>Preference</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation>Release Date</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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>Descending</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation>Ascending</translation>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation>Select a card to view its available printings</translation>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation>Power / toughness</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation>&amp;Increase power</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation>&amp;Decrease power</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation>I&amp;ncrease toughness</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation>D&amp;ecrease toughness</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation>In&amp;crease power and toughness</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation>Dec&amp;rease power and toughness</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation>Increase power and decrease toughness</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation>Decrease power and increase toughness</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation>Set &amp;power and toughness...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation>Reset p&amp;ower and toughness</translation>
     </message>
@@ -6355,37 +7234,37 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>Services</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>Hide %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>Hide Others</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>Show All</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>Preferences...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>Quit %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>About %1</translation>
     </message>
@@ -6393,153 +7272,259 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Cockatrice card database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>All files (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatrice replays (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>Maindeck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>Tokens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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>Overwrite Existing File?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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>A .cod version of this deck already exists. Overwrite it?</translation>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation>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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</translation>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation>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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation>Confirm Change</translation>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation>Save</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation>Save All</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation>&amp;Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation>Yes to &amp;All</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation>&amp;No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation>N&amp;o to All</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation>Abort</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation>Retry</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation>Ignore</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation>Close</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation>Discard</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation>Help</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation>Apply</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation>Restore Defaults</translation>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>Upload time</translation>
     </message>
@@ -6547,32 +7532,32 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>Players</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>Keep</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>Time started</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>Duration (sec)</translation>
     </message>
@@ -6580,37 +7565,37 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exile</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation>&amp;View exile</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation>&amp;Move exile to...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Top of library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Bottom of library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Graveyard</translation>
     </message>
@@ -6618,41 +7603,49 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>Rooms</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>Joi&amp;n</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>Room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>Permissions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>Players</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>Games</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation>S&amp;ay</translation>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6689,27 +7682,27 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>Enabled</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>Set type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>Set code</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>Long name</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>Release date</translation>
     </message>
@@ -6717,53 +7710,53 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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>Restore all default shortcuts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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>Do you really want to restore all default shortcuts?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation>Clear all default shortcuts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="111"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>Do you really want to clear all shortcuts?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation>Section:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation>Action:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation>Shortcut:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation>How to set custom shortcuts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation>Clear all shortcuts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation>Search by shortcut name</translation>
     </message>
@@ -6771,12 +7764,12 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>Action</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>Shortcut</translation>
     </message>
@@ -6784,14 +7777,14 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>The following shortcuts have been set to default:
@@ -6819,12 +7812,12 @@ Please check your shortcut settings!</translation>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation>&amp;Sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation>&amp;View sideboard</translation>
     </message>
@@ -6832,27 +7825,27 @@ Please check your shortcut settings!</translation>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>Enable &amp;sounds</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>Current sounds theme:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>Test system sound engine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>Sound settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>Master volume</translation>
     </message>
@@ -6860,48 +7853,48 @@ Please check your shortcut settings!</translation>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation>Spoilers season has ended</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>Deleting spoiler.xml. Please run Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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>Spoilers download failed</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation>No internet connection</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation>Spoilers already up to date</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation>No new spoilers added</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation>Spoilers have been updated!</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation>Last change:</translation>
     </message>
@@ -6924,16 +7917,146 @@ Please check your shortcut settings!</translation>
         <translation>Invalid reply received from the release update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="177"/>
         <source>No reply received from the tag update server.</source>
         <translation>No reply received from the tag update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="184"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Invalid reply received from the tag update server.</translation>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7065,56 +8188,227 @@ Please check your shortcut settings!</translation>
         <translation>Unable to activate user. Internal error</translation>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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>Desc.</translation>
+    </message>
+    <message>
+        <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>AND</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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation>Require ALL selected colors</translation>
+    </message>
+    <message>
+        <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>Deck name...</translation>
+    </message>
+    <message>
+        <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>Owner...</translation>
+    </message>
+    <message>
+        <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>Packages</translation>
+    </message>
+    <message>
+        <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>Advanced Filters</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation>Bracket:</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="262"/>
+        <source>Any</source>
+        <translation>Any</translation>
+    </message>
+    <message>
+        <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>Contains card...</translation>
+    </message>
+    <message>
+        <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>Commander...</translation>
+    </message>
+    <message>
+        <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>Tag...</translation>
+    </message>
+    <message>
+        <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>Deck Size</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation>Cards:</translation>
+    </message>
+    <message>
+        <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>Asc.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation>Sort by:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation>Filter by:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation>Display Settings</translation>
+    </message>
+    <message>
+        <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>Search</translation>
+    </message>
+    <message>
+        <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>Formats</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation>Archidekt: </translation>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>Card Info</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation>Card Database</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation>Printing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>Floating</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation>Reset layout</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="82"/>
         <source>Deck: %1</source>
         <translation>Deck: %1</translation>
     </message>
@@ -7122,61 +8416,49 @@ Please check your shortcut settings!</translation>
 <context>
     <name>TabDeckEditorVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation>Visual Deck: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="294"/>
         <source>&amp;Visual Deck Editor</source>
         <translation>&amp;Visual Deck Editor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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>Card Info</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation>Filters</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation>Printing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation>Floating</translation>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation>Reset layout</translation>
     </message>
@@ -7184,22 +8466,22 @@ Please check your shortcut settings!</translation>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="62"/>
         <source>Visual Deck View</source>
         <translation>Visual Deck View</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="63"/>
         <source>Visual Database Display</source>
         <translation>Visual Database Display</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="64"/>
         <source>Deck Analytics</source>
         <translation>Deck Analytics</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="65"/>
         <source>Sample Hand</source>
         <translation>Sample Hand</translation>
     </message>
@@ -7240,8 +8522,8 @@ Please check your shortcut settings!</translation>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>New folder</translation>
     </message>
@@ -7257,84 +8539,84 @@ Please check your shortcut settings!</translation>
         <translation>Open decks folder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation>Rename local folder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation>Rename local file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation>New name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation>Rename failed</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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>Invalid deck file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>Enter deck name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>This decklist does not have a name.
 Please enter a name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>Unnamed deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation>Failed to upload deck to server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>Delete local file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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>Are you sure you want to delete the selected files?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation>Delete remote decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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>Are you sure you want to delete the selected decks?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Name of new folder:</translation>
     </message>
@@ -7347,17 +8629,17 @@ Please enter a name:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation>Visual Deck Storage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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>Could not open deck at %1</translation>
     </message>
@@ -7398,7 +8680,7 @@ Please enter a name:</translation>
         <translation>Search</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation>EDHRec: </translation>
     </message>
@@ -7406,197 +8688,191 @@ Please enter a name:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>Replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>Game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>Player List</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>Card Info</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>Messages</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>Replay Timeline</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>&amp;Phases</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>&amp;Game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>Next &amp;phase</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation>Next phase with &amp;action</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>Next &amp;turn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation>Reverse turn order</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>&amp;Remove all local arrows</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>Rotate View Cl&amp;ockwise</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>Rotate View Co&amp;unterclockwise</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>Game &amp;information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation>Un&amp;concede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>&amp;Concede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Leave game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>C&amp;lose replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;Focus Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>&amp;Say:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation>Selected cards</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>Floating</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation>Reset layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>Concede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>Are you sure you want to concede this game?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation>Unconcede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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>You have already conceded.  Do you want to return to this game?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>Leave game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>Are you sure you want to leave this game?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation>A player has joined game #%1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation>%1 has joined the game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>You have been kicked out of the game.</translation>
     </message>
@@ -7604,7 +8880,7 @@ Please enter a name:</translation>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation>Home</translation>
     </message>
@@ -7612,158 +8888,158 @@ Please enter a name:</translation>
 <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>Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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>Time;SenderName;SenderIP;Message;TargetID;TargetName</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation>Room Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>Game Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>Chat Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>You must select at least one filter.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>You have to select a valid number of days to locate.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>Username: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>IP Address: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>Game Name: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>GameID: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>Message: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>Main Room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>Game Room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>Private Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>Past X Days: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>Today</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>Last Hour</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation>Maximum Results: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>At least one filter is required.
 The more information you put in, the more specific your results will be.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation>Get User Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation>Clear Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation>Log Locations</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation>Date Range</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation>Maximum Results</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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>Message History</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation>Failed to collect message history information.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation>There are no messages for the selected filters.</translation>
     </message>
@@ -7781,27 +9057,27 @@ The more information you put in, the more specific your results will be.</transl
         <translation>&amp;Leave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Private chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation>Private message from</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1 has left the server.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1 has joined the server.</translation>
     </message>
@@ -7809,181 +9085,181 @@ The more information you put in, the more specific your results will be.</transl
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>Local file system</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>Server replay storage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>Watch replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation>Rename</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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>New folder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>Delete</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation>Open replays folder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>Download replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>Toggle expiration lock</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation>Get replay share code</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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>Look up replay by share code</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation>Rename local folder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation>Rename local file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation>New name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation>Rename failed</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation>Name of new folder:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>Delete local file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Are you sure you want to delete the selected files?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="505"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>Are you sure you want to delete the selected replays?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation>Failed to get code</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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>Either this server does not support replay sharing, or does not permit replay sharing for you.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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>Failed</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation>Could not get replay code</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation>Replay Share Code</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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>Others can use this code to add the replay to their list of remote replays:
 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation>Copy to clipboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation>Replay share code</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation>Replay code found</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="604"/>
         <source>Replay was added, or you already had access to it.</source>
         <translation>Replay was added, or you already had access to it.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation>Replay code not found</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation>Failed to submit code</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation>Unexpected error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>Delete remote replay</translation>
     </message>
@@ -7996,47 +9272,62 @@ The more information you put in, the more specific your results will be.</transl
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>&amp;Say:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>&amp;Room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Leave room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>&amp;Clear chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>Chat Settings...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation> mentioned you.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation>Click to view</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>You are flooding the chat. Please wait a couple of seconds.</translation>
     </message>
@@ -8049,30 +9340,30 @@ The more information you put in, the more specific your results will be.</transl
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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>Failed to join the server room: it doesn&apos;t exist on the server.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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>The server thinks you are in the server room but your client is unable to display it. Try restarting your client.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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>You do not have the required permission to join this server room.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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>Failed to join the server room due to an unknown error: %1.</translation>
     </message>
@@ -8080,92 +9371,97 @@ The more information you put in, the more specific your results will be.</transl
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation>Deck Editor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation>Visual Deck Editor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation>EDHRec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation>Archidekt</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation>Home</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation>&amp;Visual Deck Storage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation>Visual Database Display</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation>Deck Storage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation>Game Replays</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation>Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>Are you sure?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>There are still open games. Are you sure you want to quit?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation>Click to view</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Your buddy %1 has signed on!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation>Unknown Event</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8176,39 +9472,39 @@ This message might mean there is a new version of Cockatrice available or this s
 To update your client, go to Help -&gt; Check for Updates.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation>Idle Timeout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>You are about to be logged out due to inactivity.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>Promotion</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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>You have been promoted. Please log out and back in for changes to take effect.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>Warned</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>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.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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>You have received the following message from the server.
@@ -8217,6 +9513,11 @@ Please refrain from engaging in this activity or further actions may be taken ag
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation>Database Display</translation>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8257,42 +9558,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Life</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>White</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Blue</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Black</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Green</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Colorless</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Other</translation>
     </message>
@@ -8300,151 +9601,209 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation>Could not open the file for reading.</translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>User &amp;details</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>Private &amp;chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Show this user&apos;s &amp;games</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>Add to &amp;buddy list</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Remove from &amp;buddy list</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>Add to &amp;ignore list</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Remove from &amp;ignore list</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>Kick from &amp;game</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="67"/>
         <source>Warn user</source>
         <translation>Warn user</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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>View user&apos;s war&amp;n history</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="69"/>
         <source>Ban from &amp;server</source>
         <translation>Ban from &amp;server</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>View user&apos;s &amp;ban history</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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Promote user to moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>Dem&amp;ote user from moderator</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation>Promote user to &amp;judge</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="74"/>
         <source>Demote user from judge</source>
         <translation>Demote user from judge</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="75"/>
         <source>View admin notes</source>
         <translation>View admin notes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation>This user does not exist.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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>You are being ignored by %1 and can&apos;t see their games.</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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation>Could not get %1&apos;s games.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>%1&apos;s games</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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>Ban History</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation>User has never been banned.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation>Failed to collect ban information.</translation>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation>Warning History</translation>
     </message>
@@ -8459,55 +9818,65 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation>User has never been warned.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation>Failed to collect warning information.</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="249"/>
         <source>Failed to get admin notes.</source>
         <translation>Failed to get admin notes.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>Success</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>Successfully promoted user.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>Successfully demoted user.</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Failed</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>Failed to promote user.</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>Failed to demote user.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation>Copy hash to clipboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Remove this user&apos;s messages</translation>
     </message>
@@ -8515,311 +9884,554 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>Location:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>Account Age:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>Edit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>Change password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>Change avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>Administrator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>Moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>Registered user</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>Unregistered user</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>Judge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>Unknown</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="371"/>
         <source>The entered password does not match your account.</source>
         <translation>The entered password does not match your account.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>Information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>User information updated.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation>User Information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation>Real Name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation>User Level:</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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><numerusform>%n Year, </numerusform><numerusform>%n Years, </numerusform></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="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><numerusform>%10%n Day %20</numerusform><numerusform>%10%n Days %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation>Enter Password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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>Password verification is required in order to change your email address</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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>An error occurred while trying to update your user information.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>This server does not permit you to update your user informations.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>Password changed.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>This server does not permit you to change your password.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>The new password is too short.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>The old password is incorrect.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>Avatar updated.</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>This server does not permit you to update your avatar.</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>An error occured while trying to updater your avatar.</translation>
+        <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>This server does not permit you to update your user informations.</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>General interface settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>&amp;Double-click cards to play them (instead of single-click)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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>&amp;Clicking plays all selected cards (instead of just the clicked card)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>&amp;Play all nonlands onto the stack (not the battlefield) by default</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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>Do not delete &amp;arrows inside of subphases</translation>
+    </message>
+    <message>
+        <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>Close card view window when last card is removed</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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>Auto focus search bar when card view window is opened</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>Annotate card text on tokens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Use tear-off menus, allowing right click menus to persist on screen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation>Notifications settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>Enable notifications in taskbar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>Notify in the taskbar for game events while you are spectating</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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>Notify in the taskbar when users in your buddy list connect</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>Animation settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;Tap/untap animation</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation>Deck editor/storage settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="231"/>
         <source>Open deck in new tab by default</source>
         <translation>Open deck in new tab by default</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="232"/>
         <source>Use visual deck storage in game lobby</source>
         <translation>Use visual deck storage in game lobby</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="233"/>
         <source>Use selection animation for Visual Deck Storage</source>
         <translation>Use selection animation for Visual Deck Storage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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>When adding a tag in the visual deck storage to a .txt deck:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation>do nothing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation>ask to convert to .cod</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation>always convert to .cod</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation>Default deck editor type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation>Classic Deck Editor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation>Visual Deck Editor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation>Replay settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="246"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Buffer time for backwards skip via shortcut:</translation>
     </message>
@@ -8827,22 +10439,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation>Users connected to server: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation>Users in this room: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation>Buddies online: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation>Ignored users online: %1 / %2</translation>
     </message>
@@ -8850,96 +10462,228 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation>Increment all card counters</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation>&amp;Untap all permanents</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation>R&amp;oll die...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation>&amp;Create token...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation>C&amp;reate another token</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation>Cr&amp;eate predefined token</translation>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
-        <translation>Mode: Exact Match</translation>
+        <source>Exact match</source>
+        <translation>Exact match</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
-        <translation>Mode: Includes</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
+        <translation>Includes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
-        <translation>Mode: Include/Exclude</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
+        <translation>Include / Exclude</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation>Filter mode (AND/OR/NOT conjunctions of filters)</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
+        <translation>How selected and unselected colors are combined in the filter</translation>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
+        <source>Search filter...</source>
+        <translation>Search filter...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
         <source>Save Filter</source>
         <translation>Save Filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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>Save all currently applied filters to a file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
         <source>Enter filename...</source>
         <translation>Enter filename...</translation>
     </message>
 </context>
 <context>
-    <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
-        <source>Do not display card main-types with less than this amount of cards in the database</source>
-        <translation>Do not display card main-types with less than this amount of cards in the database</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation>Sort by</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation>Filter by</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
+        <source>Save and load filters</source>
+        <translation>Save and load filters</translation>
+    </message>
+    <message>
+        <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>Filter by exact card name</translation>
+    </message>
+    <message>
+        <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>Filter by card main-type</translation>
+    </message>
+    <message>
+        <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>Filter by card sub-type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="151"/>
+        <source>Filter by set</source>
+        <translation>Filter by set</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
+        <source>Filter by format legality</source>
+        <translation>Filter by format legality</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation>Save/Load</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation>Main Type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation>Sub Type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation>Sets</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation>Formats</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation>Show formats with at least:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation> cards</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation>Do not display formats with less than this amount of cards in the database</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation>Filter mode (AND/OR/NOT conjunctions of filters)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
         <source>Mode: Exact Match</source>
         <translation>Mode: Exact Match</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation>Mode: Includes</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation>Show main types with at least:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation> cards</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <source>Do not display card main-types with less than this amount of cards in the database</source>
+        <translation>Do not display card main-types with less than this amount of cards in the database</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation>Filter mode (AND/OR/NOT conjunctions of filters)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
+        <source>Mode: Exact Match</source>
+        <translation>Mode: Exact Match</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation>Mode: Includes</translation>
     </message>
@@ -8947,27 +10691,27 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation>Filter by name...</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <source>Filter by name... (Exact match)</source>
+        <translation>Filter by name... (Exact match)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Deck</source>
         <translation>Load from Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation>Apply all card names in currently loaded deck as exact match name filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
         <source>Load from Clipboard</source>
         <translation>Load from Clipboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation>Apply all card names in clipboard as exact match name filters</translation>
     </message>
@@ -8975,7 +10719,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="41"/>
+        <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>Filter to most recent sets</translation>
     </message>
@@ -8983,19 +10727,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="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation>Search sets...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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>Mode: Exact Match</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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>Mode: Includes</translation>
     </message>
@@ -9003,27 +10747,37 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation>Search subtypes...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation>Show sub types with at least:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation> cards</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation>Do not display card sub-types with less than this amount of cards in the database</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation>Filter mode (AND/OR/NOT conjunctions of filters)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation>Mode: Exact Match</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation>Mode: Includes</translation>
     </message>
@@ -9031,50 +10785,93 @@ 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="53"/>
+        <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>Search by card name (or search expressions)</translation>
     </message>
     <message>
+        <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>Visual</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation>Loading database ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation>Clear all filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
-        <translation>Save and load filters</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation>Table</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
+        <translation>Group by:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
-        <translation>Filter by exact card name</translation>
+        <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>Change how cards are divided into categories/groups.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
-        <translation>Filter by card sub-type</translation>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
+        <translation>Sort by:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
-        <translation>Filter by set</translation>
+        <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>Click and drag to change the sort order within the groups</translation>
+    </message>
+    <message>
+        <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>Configure how cards are sorted within their groups</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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation>Toggle Layout: Overlap</translation>
+    </message>
+    <message>
+        <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>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation>Toggle Layout: Flat</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <translation>Add cards using the search bar or database tab to have them appear here</translation>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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>Draw a new sample hand</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="72"/>
         <source>Sample hand size</source>
         <translation>Sample hand size</translation>
     </message>
@@ -9082,46 +10879,25 @@ 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="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
-        <translation>Click and drag to change the sort order within the groups</translation>
+        <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 a card name here for suggestions from the database...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="217"/>
         <source>Quick search and add card</source>
         <translation>Quick search and add card</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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>Search for closest match in the database (with auto-suggestions) and add preferred printing to the deck on pressing enter</translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation>Configure how cards are sorted within their groups</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation>Overlap Layout</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation>Flat Layout</translation>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation>Deck Storage</translation>
     </message>
@@ -9129,47 +10905,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="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation>Show Folders</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Show Tag Filter</source>
         <translation>Show Tag Filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="131"/>
+        <source>Show Color Identity</source>
+        <translation>Show Color Identity</translation>
+    </message>
+    <message>
+        <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>Show Tags On Deck Previews</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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>Show Banner Card Selection Option</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="134"/>
         <source>Draw unused Color Identities</source>
         <translation>Draw unused Color Identities</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="135"/>
         <source>Unused Color Identities Opacity</source>
         <translation>Unused Color Identities Opacity</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation>Deck tooltip:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation>None</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation>Filepath</translation>
     </message>
@@ -9177,7 +10958,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="25"/>
+        <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>Search by filename (or search expression)</translation>
     </message>
@@ -9185,22 +10966,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="47"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation>Sort Alphabetically (Deck Name)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation>Sort Alphabetically (Filename)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
         <source>Sort by Last Modified</source>
         <translation>Sort by Last Modified</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
         <source>Sort by Last Loaded</source>
         <translation>Sort by Last Loaded</translation>
     </message>
@@ -9208,17 +10989,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="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation>Loading database ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation>Refresh loaded files</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation>Visual Deck Storage Settings</translation>
     </message>
@@ -9226,43 +11007,43 @@ 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_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>Which warning would you like to send?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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>Redact all messages from this user in all rooms</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>Warn user for misconduct</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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>User name to send a warning to can not be blank, please specify a user to warn.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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>Warning to use can not be blank, please select a valid warning to send.</translation>
     </message>
@@ -9270,133 +11051,133 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <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>Move selected set to the top</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>Move selected set up</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>Move selected set down</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>Move selected set to the bottom</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation>Search by set name, code, or type</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="70"/>
         <source>Default order</source>
         <translation>Default order</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>Restore original art priority order</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="107"/>
         <source>Enable all sets</source>
         <translation>Enable all sets</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="108"/>
         <source>Disable all sets</source>
         <translation>Disable all sets</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="109"/>
         <source>Enable selected set(s)</source>
         <translation>Enable selected set(s)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation>Disable selected set(s)</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="126"/>
         <source>Deck Editor</source>
         <translation>Deck Editor</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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation>Use CTRL+A to select all sets in the view.</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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation>Only cards in enabled sets will appear in the card list of the deck editor.</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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation>Image priority is decided in the following order:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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>first the CUSTOM Folder (%1), then the Enabled Sets in this dialog (Top to Bottom)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation>Include cards rebalanced for Alchemy [requires restart]</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="128"/>
         <source>Card Art</source>
         <translation>Card Art</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation>How to use custom card art</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation>Hints</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation>Note</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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation>Sorting by column allows you to find a set while not changing set priority.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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>To enable ordering again, click the column header until this message disappears.</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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation>Use the current sorting as the set priority instead</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
         <source>Sorts the set priority using the same column</source>
         <translation>Sorts the set priority using the same column</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation>Manage sets</translation>
     </message>
@@ -9404,72 +11185,72 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation>Search by card name (or search expressions)</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation>Ungrouped</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation>Group by Type</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation>Group by Mana Value</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation>Group by Color</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation>Unsorted</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation>Sort by Name</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation>Sort by Type</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation>Sort by Mana Cost</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation>Sort by Colors</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation>Sort by P/T</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation>Sort by Set</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>shuffle when closing</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>pile view</translation>
     </message>
@@ -9477,7 +11258,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>English</translation>
     </message>
@@ -9485,12 +11266,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation>Connect on startup</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation>Debug to file</translation>
     </message>
@@ -9498,1005 +11279,1078 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>Main Window</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation>Deck Editor</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>Game Lobby</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation>Card Counters</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation>Player Counters</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>Power and Toughness</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>Game Phases</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>Playing Area</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation>Move Selected Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>View</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation>Move Top Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation>Move Bottom Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>Gameplay</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation>Drawing</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation>Chat Room</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation>Game Window</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation>Load Deck from Clipboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation>Replays</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation>Tabs</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation>Check for Card Updates...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation>Connect...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>Disconnect</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>Exit</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>Full screen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation>Register...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation>Settings...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation>Start a Local Game...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation>Watch Replay...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation>Analyze Deck (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation>Analyze Deck (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation>Clear All Filters</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation>Clear Selected Filter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>Close</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation>Remove Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation>Manage Sets...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation>Edit Custom Tokens...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation>Export Deck (decklist.org)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation>Export Deck (decklist.xyz)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation>Add Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation>Load Deck...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Load Deck from Clipboard...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation>Edit Deck in Clipboard, Annotated</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation>Edit Deck in Clipboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation>New Deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Open Custom Pictures Folder</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation>Print Deck...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation>Delete Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation>Reset Layout</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation>Save Deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation>Save Deck as...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Save Deck to Clipboard, Annotated</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation>Save Deck to Clipboard, Annotated (No Set Info)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation>Save Deck to Clipboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation>Save Deck to Clipboard (No Set Info)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation>Load Local Deck...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation>Load Remote Deck...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation>Set Ready to Start</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Toggle Sideboard Lock</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation>Add Green Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation>Remove Green Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation>Set Green Counters...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation>Add Red Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation>Remove Red Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation>Set Red Counters...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation>Add Life Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation>Show Status Bar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation>Unload Deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation>Force Start</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation>Add Card Counter (F)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation>Remove Card Counter (F)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation>Set Card Counters (F)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation>Add Card Counter (E)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation>Remove Card Counter (E)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation>Set Card Counters (E)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation>Add Card Counter(D)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation>Remove Card Counter (D)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation>Set Card Counters (D)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation>Add Card Counter (C)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation>Remove Card Counter (C)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation>Set Card Counters (C)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation>Add Card Counter (B)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation>Remove Card Counter (B)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation>Set Card Counters (B)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation>Add Card Counter (A)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation>Remove Card Counter (A)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation>Set Card Counters (A)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation>Remove Life Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation>Set Life Counters...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation>Add White Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation>Remove White Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation>Set White Counters...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation>Add Blue Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation>Remove Blue Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation>Set Blue Counters...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation>Add Black Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation>Remove Black Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation>Set Black Counters...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation>Add Colorless Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation>Remove Colorless Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation>Set Colorless Counters...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation>Add Other Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation>Remove Other Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation>Set Other Counters...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation>Increment all card counters</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation>Add Power (+1/+0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Remove Power (-1/-0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Move Toughness to Power (+1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Add Toughness (+0/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Remove Toughness (-0/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Move Power to Toughness (-1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Add Power and Toughness (+1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Remove Power and Toughness (-1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation>Set Power and Toughness...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation>Reset Power and Toughness</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>Untap</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>Upkeep</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>Draw</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation>First Main Phase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation>Start Combat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>Attack</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>Block</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>Damage</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation>End Combat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation>Second Main Phase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>End</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation>Next Phase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation>Next Phase Action</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation>Next Turn</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation>Hide Card in Reveal Window</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation>Tap / Untap Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation>Untap All</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
-        <translation>Toggle Untap</translation>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
+        <translation>Toggle Skip Untapping</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation>Turn Card Over</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation>Peek Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation>Play Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation>Play Card, Face Down</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation>Attach Card...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation>Unattach Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation>Clone Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation>Create Token...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation>Create All Related Tokens</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation>Create Another Token</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation>Set Annotation...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation>Select All Cards in Zone</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation>Select All Cards in Row</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation>Select All Cards in Column</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation>Reveal Selected Cards to All Players</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation>Bottom of Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>Exile</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>Graveyard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>Hand</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation>Top of Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation>Battlefield, Face Down</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation>Battlefield</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation>Sort Hand</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation>Top Cards of Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation>Bottom Cards of Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation>Close Recent View</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation>Stack</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation>Graveyard (Multiple)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation>Graveyard (Multiple), Face Down</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation>Exile (Multiple)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation>Exile (Multiple), Face Down</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation>Stack Until Found</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation>Draw Bottom Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Draw Multiple Cards from Bottom...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation>Draw Arrow...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation>Remove Local Arrows</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation>Leave Game</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>Concede</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation>Roll Dice...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation>Shuffle Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation>Shuffle Top Cards of Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation>Shuffle Bottom Cards of Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation>Mulligan (Same hand size)</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation>Mulligan (Hand size - 1)</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation>Draw a Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation>Draw Multiple Cards...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation>Undo Draw</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation>Always Reveal Top Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation>Always Look At Top Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation>Sort Hand by Name</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation>Sort Hand by Type</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation>Sort Hand by Mana Value</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation>Reveal Hand to All Players</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation>Reveal Random Card to All Players</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation>Rotate View Clockwise</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Rotate View Counterclockwise</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation>Unfocus Text Box</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation>Focus Chat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation>Clear Chat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation>Refresh</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation>Skip Forward</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation>Skip Backward</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation>Skip Forward by a lot</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation>Skip Backward by a lot</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation>Play/Pause</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation>Toggle Fast Forward</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation>Home</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation>Visual Deck Storage</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation>Deck Storage</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation>Logs</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_es.ts b/cockatrice/translations/cockatrice_es.ts
index bd9f01d5d..2a0e479c3 100644
--- a/cockatrice/translations/cockatrice_es.ts
+++ b/cockatrice/translations/cockatrice_es.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Establecer contador...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>Establecer contador</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Nuevo valor para el contador &apos;%1&apos;:</translation>
     </message>
@@ -23,92 +23,94 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Actualizar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
-        <translation type="unfinished"/>
+        <translation>Interpretar nombre del expansión y numero (si disponible)</translation>
     </message>
 </context>
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation>Abrir en nueva pestaña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation>¿Estás seguro?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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>La lista del mazo ha sido modificada. ¿Deseas guardar los cambios?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <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>No se pudo abrir mazo en %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
-        <translation type="unfinished"/>
+        <translation>No se pudo guardar mazo remoto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation>Guardar mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation>El mazo no puede ser guardado.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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>No hay cartas en tu mazo para exportar</translation>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
-        <translation>No se ha seleccionado ningún mazo para ser exportado.</translation>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
+        <translation>Añadir panel de análisis</translation>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation>Notas de actualización</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -116,208 +118,259 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation>Mazo principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation>Banquillo</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation>segundos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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>No se pudo crear directorio de temas en &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>Preferencias del tema</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>Tema actual:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation>Abrir carpeta de temas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
-        <translation type="unfinished"/>
+        <translation>Fuente de segundo plano de pestaña de incio:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation>Deshabilitado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
-        <translation type="unfinished"/>
+        <translation>Preferencias del menú</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>Representación de las cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>Mostrar nombre de las cartas en aquellas que tengan imagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>Cambiar tamaño de las cartas al pasar el ratón por encima</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
+        <translation>Usar esquinas redondeadas de las cartas</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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>filas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation>Contadores de carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
-        <translation type="unfinished"/>
+        <translation>Contador %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>Disposición de la mano</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Mostrar la mano horizontalmente (desperdicia espacio)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>Habilitar justificación a la izquierda</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>Diseño de la cuadrícula de la mesa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>Invertir coordenada vertical</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Número minimo de jugadores para usar la cuadrícula multicolumna:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Tamaño de fuente máxima para la información presentada en las cartas:</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="136"/>
+        <source>Back to results</source>
+        <translation>Regressar a los resultados</translation>
+    </message>
+    <message>
+        <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>Abrir mazo en editor de mazos</translation>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
         <source>Theme</source>
-        <translation type="unfinished"/>
+        <translation>Tema</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
@@ -333,112 +386,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>banear &amp;usuario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>banear dirección IP &amp;IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>banear por I&amp;D de cliente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>Tipo de ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>acceso prohibido &amp;permanentemente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>acceso prohibido &amp;temporalmente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>&amp;Días:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Horas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minutos:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>Duración del ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>Por favor, introduce el motivo de la restricción de acceso
 Se almacenará unicamente para moderadores y no podrá ser visto por la persona restringida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>Por favor, introduce el motivo de la restricción que será visible para la persona restringida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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>Redactar todos los mensajes de este usuario en todas las salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>Aceptar (&amp;O)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>Banear usuario del servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>Debes seleccionar baneo por nombre, por IP, por id de cliente, o cualquier combinación de los tres.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>Debes introducir un nombre cuando la casilla de baneo por nombre está activada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>Debes introducir una IP cuando la casilla de baneo por IP está activada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>Debes introducir un id de cliente cuando la casilla de baneo por id de cliente está activada.</translation>
     </message>
@@ -446,152 +499,221 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation>Beta</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation>No se recibió respuesta del servidor de actualización.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Respuesta inválida del servidor de actualización.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation>Sin respuesta por parte del servidor de actualización de archivos</translation>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>Ediciones</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>Coste de maná</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>Tipo de carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>F/R</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>Color(es)</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>Y</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>Y NO</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>O NO</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation>Nombre (exacto)</translation>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>Color</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation>Expansión</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>Coste de maná</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation>Valor de maná</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>Rareza</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>Poder</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>Resistencia </translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>Lealtad</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>Formato</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation>Tipo principal de carta</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation>Subtipo de carta</translation>
     </message>
@@ -599,45 +721,45 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <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>Imagen</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>Descripción</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>Ambos</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>Ver transformación</translation>
     </message>
 </context>
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation>Ver cartas relacionadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation>Añadir carta al mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation>Mazo principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation>Banquillo</translation>
     </message>
@@ -650,12 +772,22 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
         <translation>Nombre:</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>Expansión</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation>Cartas relacionadas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation>Carta desconocida:</translation>
     </message>
@@ -663,132 +795,150 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation>&amp;Todos los jugadores</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation>Ver cartas relacionadas</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation>Ficha:</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation>Todas las fichas</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation>&amp;Seleccionar todo</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation>&amp;Seleccionar fila</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation>&amp;Seleccionar columna</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation>&amp;Jugar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation>&amp;Ocultar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation>Jugar boca abajo</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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>&amp;Girar / Enderezar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation>&amp;Clonar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
+        <translation>Anexar a carta...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
+        <translation>Desanexar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
+        <translation>Dibujar flecha...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
+        <translation>Escribir anotación...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
+        <translation>Contadores de carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation>&amp;Añadir contador (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation>&amp;Quitar contador (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation>&amp;Establecer contadores (%1)</translation>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation>Tamaño de carta</translation>
     </message>
@@ -796,142 +946,142 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation>su mano</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>el mano de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation>su biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>la biblioteca de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation>de su biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
+        <translation>de la biblioteca de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation>su biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>la biblioteca de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation>su biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>la biblioteca de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation>su biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>la biblioteca de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation>su cementerio</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>el cementerio de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation>su zona de exilio</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>exilio de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation>su banquillo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>el banquillo de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation>su banquillo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>el banquillo de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>su zona personalizada &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>la zona personalizada de %1 &apos;%2&apos;</translation>
     </message>
 </context>
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -939,29 +1089,470 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
+        <translation>Zonas Personalizadas</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
+        <translation>Ver la zona personalizada &apos;%1&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation>Añadir panel</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation>Borrar panel</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation>Guardar diseño</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation>Cargar diseño</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation>Base de datos de cartas</translation>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation>Información de la carta</translation>
     </message>
@@ -969,47 +1560,17 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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>Buscar por nombre de carta (o buscar expresiones)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation>Añadir al Mazo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation>Añadir al Banquillo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation>Mostrar cartas Relacionadas</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="127"/>
         <source>Add card to &amp;maindeck</source>
         <translation>Añadir carta al &amp;mazo principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="128"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Añadir carta al &amp;banquillo</translation>
     </message>
@@ -1017,87 +1578,97 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation>Cargando la base de datos...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation>Tipo principal de carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation>Coste de maná</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation>Mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation>&amp;Nombre del mazo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation>&amp;Comentarios:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation>Agrupar por:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
-        <source>Hash:</source>
-        <translation type="unfinished"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation>Formato:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
+        <source>Hash:</source>
+        <translation>Hash:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation>&amp;Incrementar número</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation>&amp;Reducir número</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation>&amp;Quitar fila</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <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"/>
     </message>
@@ -1123,114 +1694,114 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation>&amp;Editor de mazos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation>&amp;Nuevo mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation>&amp;Cargar mazo...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation>Cargar mazo reciente...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation>Borrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation>&amp;Guardar mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation>Guardar mazo &amp;como...</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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation>Cargar mazo desde el &amp;portapapeles...</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="162"/>
         <source>Edit deck in clipboard</source>
         <translation>Editar mazo en el portapapeles</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="166"/>
+        <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>Anotado</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="168"/>
+        <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>No Anotado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation>Guardar mazo al portapapeles</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="168"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="172"/>
         <source>&amp;Print deck...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="173"/>
-        <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
+        <translation>Imprimir mazo...</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <source>Load deck from online service...</source>
+        <translation>Cargar mazo desde el servicio en línea...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation>&amp;Cerrar</translation>
     </message>
@@ -1238,7 +1809,7 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1246,194 +1817,171 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>Actualizar Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>Éxito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation>Las URL de descarga se han reiniciado.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>Las imágenes de las cartas descargadas se han reiniciado.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation>Una o más imágenes descargadas pueden no ser claras</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>Añadir URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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>Editar URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation>Añadir URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation>Borrar URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation>Día(s)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>Actualizando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>Elegir camino</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation>Prioridad de descarga de URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>Descargar Spoilers automáticamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation>Localización del Spoiler:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>Último cambio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>Spoilers se descargan automáticamente en lanzamiento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>Presione el botón para actualizar manualmente sin reiniciar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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>No cierre la ventana de configuración hasta que la actualización manual este completa.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation>Descargar imagenes de las cartas rapidamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation>Cómo agregar una URL personalizada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>Eliminar imágenes descargadas</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation>Reiniciar descarga de URLs</translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
+        <translation>Deshacer</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation>Rehacer</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation>Historial de deshacer/rehacer</translation>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
-        <translation type="unfinished"/>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation>[rehacer]</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
+        <translation>[deshacer]</translation>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
-        <translation type="unfinished"/>
+        <translation>Conteo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
-        <translation type="unfinished"/>
+        <translation>Expansión</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>Número</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>Carta</translation>
     </message>
@@ -1441,30 +1989,30 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
-        <translation type="unfinished"/>
+        <translation>Todos los archivos (*.*)</translation>
     </message>
 </context>
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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>Modo: Coincidencia Exacta</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
+        <source>Mode: Includes</source>
+        <translation>Modo: Incluye</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
-        <source>Mode: Includes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
         <source>Color identity filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
@@ -1472,7 +2020,7 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
         <source>Edit tags ...</source>
         <translation>Editar etiquetas</translation>
     </message>
@@ -1480,62 +2028,62 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
         <source>Deck Tags Manager</source>
         <translation>Gestor de etiquetas de mazos</translation>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation>Añadir una nueva etiqueta (p.e., Aggro)</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="104"/>
         <source>Add Tag</source>
         <translation>Añadir etiqueta</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="105"/>
         <source>Filter tags...</source>
         <translation>Filtrar etiquetas...</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="106"/>
         <source>OK</source>
         <translation>OK</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="107"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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>¡Nombre de etiqueta no puede estar vacío!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <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>Etiqueta Duplicada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>This tag already exists.</source>
         <translation>Esta etiqueta ya existe.</translation>
     </message>
@@ -1543,98 +2091,156 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <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>Abrir en editor de mazos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation>Editar etiquetas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation>Renombrar mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <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>Guardar mazo al portapapeles</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation>Anotado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation>No Anotado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation>Renombrar archivo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation>Eliminar archivo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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>Nuevo nombre:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation>Eliminar archivo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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>¿Estás seguro de que quieres eliminar el archivo seleccionado?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation>Borrado fallido</translation>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation>Añadido (%1): %2 (%3) %4</translation>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation>Añadido</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation>Borrado</translation>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1652,74 +2258,74 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>Cargar mazo...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Cargar mazo remoto...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation>Cargar desde el portapapeles...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
-        <translation type="unfinished"/>
+        <translation>Cargar desde el sitio web...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>Listo para empezar</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation>Forzar inicio</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation>Banquillo desbloqueado</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation>Banquillo bloqueado</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>El fichero seleccionado no pudo cargarse.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -1752,143 +2358,143 @@ This will kick all non-ready players from the game.</source>
         <translation>Descargando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>Hospedajes Conocidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Actualizar la lista con servidores públicos conocidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>Nueva dirección</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;Dirección:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;Puerto:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nombre del jugador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>&amp;Contraseña:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>&amp;Guardar contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>Conectarse a&amp;utomáticamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Conectar automáticamente al servidor más reciente cuando se inicie Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>¡Si tiene algún problema en conectarse o registrarse puede contactar a nuestro equipo!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>Página web</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation>Reiniciar Contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation>¿Olvidó la contraseña?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>&amp;Conectar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>Iniciar sesión</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation>Contacto del Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>Conectar al Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation>dirección URL del servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation>Puerto de comunicación </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation>Nombre único para el servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>Advertencia de Conexión </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>Necesita dar nombre a su nuevo perfil de conexión.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>Advertencia de conexión</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>El nombre del jugador no puede estar vacío.</translation>
     </message>
@@ -1896,117 +2502,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>Recordar preferencias (&amp;M)</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>&amp;Descripción:</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>&amp;Jugadores:</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>General</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>Tipo de partida</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>&amp;Contraseña:</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>Sólo los &amp;amigos pueden participar</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>Sólo los usuarios &amp;registrados pueden participar</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>Restricciones de participación</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>Los e&amp;spectadores pueden observar</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>Los espectadores &amp;necesitan contraseña para unirse</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>Los espectadores pueden &amp;chatear</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>Los espectadores pueden ver las &amp;manos</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>Crear una partida como espectador</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>Espectadores</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>Vida inicial total:</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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>Limpiar (&amp;C)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>Crear partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>Información de la partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>Error del servidor.</translation>
     </message>
@@ -2014,97 +2625,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nombre:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Ficha</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Color:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>blanco</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>azul</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>negro</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>rojo</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>verde</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>multicolor</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>incoloro</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;F/R:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Anotación:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Destruir la ficha cuando deje la mesa</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Datos de la ficha</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Mostrar &amp;todas las fichas</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Mostrar todas las fichas de este &amp;mazo</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>Elegir ficha de la lista</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>Crear ficha</translation>
     </message>
@@ -2112,53 +2723,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation>Editar etiquetas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation>Confirmar</translation>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation>Cancelar</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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation>Introduce una etiqueta y pulsa Enter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation>El nombre de la etiqueta no puede estar vacío!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation>Duplicar etiqueta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation>Esta etiqueta ya existe.</translation>
     </message>
@@ -2166,40 +2777,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>Ninguna imagen seleccionada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Para cambiar tu avatar, elige una nueva imagen.
 Para eliminar tu avatar actual, confirma sin elegir una nueva imagen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>Buscar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>Cambiar avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>Abrir imagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Archivos de imagen (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>La imagen seleccionada no es válida.</translation>
     </message>
@@ -2207,17 +2818,17 @@ Para eliminar tu avatar actual, confirma sin elegir una nueva imagen.</translati
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Editar mazo en el portapapeles</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation>Lista de mazo inválida.</translation>
     </message>
@@ -2225,38 +2836,38 @@ Para eliminar tu avatar actual, confirma sin elegir una nueva imagen.</translati
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Contraseña anterior:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nueva contraseña:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Confirmar la nueva contraseña:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Cambiar contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Su contraseña es muy corta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Las nuevas contraseñas no coinciden.</translation>
     </message>
@@ -2264,93 +2875,93 @@ Para eliminar tu avatar actual, confirma sin elegir una nueva imagen.</translati
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nombre:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Color:</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="34"/>
         <source>white</source>
         <translation>blanco</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="35"/>
         <source>blue</source>
         <translation>azul</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="36"/>
         <source>black</source>
         <translation>negro</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="37"/>
         <source>red</source>
         <translation>rojo</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="38"/>
         <source>green</source>
         <translation>verde</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="39"/>
         <source>multicolor</source>
         <translation>multicolor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>incoloro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;F/R:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Anotación:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Información de la ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>Añadir ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Eliminar ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation>Editar fichas personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Por favor, introduzca el nombre de la ficha:</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>Error</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>El nombre elegido ya existe y está siendo usado por una carta o ficha.
@@ -2375,12 +2986,12 @@ Asegúrese de habilitar la edición &apos;Fichas&apos; en la opción &quot;Mante
         <translation>Indefinido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Nombre real:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Editar perfil de usuario</translation>
     </message>
@@ -2418,112 +3029,113 @@ Asegúrese de habilitar la edición &apos;Fichas&apos; en la opción &quot;Mante
         <translation>2 horas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
-        <translation type="unfinished"/>
+        <translation>Esconder los partidos de solo amigos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
-        <translation type="unfinished"/>
+        <translation>Esconder los partidos llenos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
-        <translation type="unfinished"/>
+        <translation>Esconder los partidos de usuarios ignorados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
-        <translation type="unfinished"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
+        <translation>Esconder los partidos no creados por amigos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Más nuevo que:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Descipción de la partida:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;Nombre del creador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>Tipos de &amp;partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>al &amp;menos:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>&amp;como máximo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>Número máximo de jugadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>Restricciones</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Mostrar partidas solo si &amp;espectadores pueden ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Mostrar contraseña de espectador para juegos p&amp;rotegidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Mostrar solo si los espectadores pueden ha&amp;blar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Mostrar solo si los espectadores pueden ver &amp;manos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation>Espectadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>Filtrar partidas</translation>
     </message>
@@ -2531,52 +3143,52 @@ Asegúrese de habilitar la edición &apos;Fichas&apos; en la opción &quot;Mante
 <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>Reiniciar contraseña de desafíos con advertencia</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>Ha ocurrido un problema. Por favor intenta solicitar una nueva contraseña.</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>Introduce la información del servidor y de la cuenta para la que deseas solicitar una nueva contraseña.</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>&amp;Dirección:</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>&amp;Puerto:</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>&amp;Nombre del jugador:</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>Correo electrónico:</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>Reiniciar contraseña de desafío</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>Error al reiniciar contraseña de desafío</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>La dirección de correo electrónico no puede estar vacía.</translation>
     </message>
@@ -2584,37 +3196,37 @@ Asegúrese de habilitar la edición &apos;Fichas&apos; en la opción &quot;Mante
 <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>Introduce la información del servidor para la que deseas solicitar una nueva contraseña.</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>&amp;Dirección:</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>&amp;Puerto:</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>&amp;Nombre del jugador:</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>Error al reiniciar la petición para una contraseña</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>Error al reiniciar la contraseña</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>El nombre del jugador no puede estar vacío.</translation>
     </message>
@@ -2622,86 +3234,86 @@ Asegúrese de habilitar la edición &apos;Fichas&apos; en la opción &quot;Mante
 <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>Reinicia la contraseña de advertencia</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>Ha ocurrido un problema. Por favor intenta solicitar de nuevo una nueva contraseña.</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>Introduce el token recibido y la nueva contraseña para establecer tu nueva contraseña.</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>&amp;Dirección:</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>&amp;Puerto:</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>&amp;Nombre del jugador:</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>Ficha:</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>Nueva contraseña:</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>Reiniciar contraseña</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>El nombre del jugador no puede estar vacío.</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>Error al reiniciar contraseña</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>La ficha no puede estar vacía.</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>La nueva contraseña no puede estar vacía.</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>Error</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>Tu contraseña es demasiado corta.</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>Las contraseñas no coinciden.</translation>
     </message>
@@ -2717,17 +3329,17 @@ Asegúrese de habilitar la edición &apos;Fichas&apos; en la opción &quot;Mante
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>Cargar mazo del portapapeles</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>Lista de mazo inválida.</translation>
     </message>
@@ -2735,43 +3347,43 @@ Asegúrese de habilitar la edición &apos;Fichas&apos; en la opción &quot;Mante
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
+        <translation>Cargar mazo desde el sitio web</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2785,45 +3397,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>Cargar mazo</translation>
     </message>
 </context>
 <context>
-    <name>DlgMoveTopCardsUntil</name>
+    <name>DlgLocalGameOptions</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
-        <source>Card name (or search expressions):</source>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation>Jugadores:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation>Total de vidas inicial:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation>Recordar preferencias</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DlgMoveTopCardsUntil</name>
+    <message>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
+        <source>Card name (or search expressions):</source>
+        <translation>Nombre de carta (o buscar expresiones):</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
         <source>Number of hits:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/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>Filtro no válido</translation>
     </message>
@@ -2831,54 +3476,54 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Introduce tu información y la información del servidor en el que deseas registrarte.
 Tu correo electrónico se utilizará para verificar tu cuenta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>&amp;Dirección:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>&amp;Puerto:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nombre del jugador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>&amp;Contraseña:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>Contraseña (de nuevo):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>Correo electrónico:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>Correo electrónico (de nuevo):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>País:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>Indefinido</translation>
     </message>
@@ -2924,17 +3569,17 @@ Tu correo electrónico se utilizará para verificar tu cuenta.</translation>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation>Número de dado:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation>Lanzar dados</translation>
     </message>
@@ -2942,40 +3587,55 @@ Tu correo electrónico se utilizará para verificar tu cuenta.</translation>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation>Cartas no modificadas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation>Cartas modificadas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>Error desconocido al cargar la base de datos de cartas.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -2992,7 +3652,7 @@ Podrías necesitar volver a ejecutar oracle para actualizar tu base de datos de
 ¿Quieres cambiar la ubicación de tu base de datos?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3009,7 +3669,7 @@ Normalmente esto se soluciona volviendo a ejecutar oracle para actualizar tu bas
 ¿Quieres cambiar la ubicación de tu base de datos?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3022,7 +3682,7 @@ Por favor, envía un ticket en https://github.com/Cockatrice/Cockatrice/issues c
 ¿Te gustaría cambiar la configuración de la ubicación de tu base de datos?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3031,7 +3691,7 @@ Would you like to change your database location setting?</source>
 ¿Quieres cambiar la ubicación de tu base de datos?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3040,7 +3700,7 @@ Would you like to change your database location setting?</source>
 ¿Quieres cambiar la ubicación de tu base de datos?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3053,59 +3713,64 @@ Por favor, envía un ticket en https://github.com/Cockatrice/Cockatrice/issues
 ¿Te gustaría cambiar la configuración de la ubicación de tu base de datos?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>La ruta a tu directorio de mazos no es válida. ¿Deseas volver y seleccionar la ruta correcta?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>La ruta a tu directorio de imágenes de las cartas no es válida. ¿Deseas volver y seleccionar la ruta correcta?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>Apariencia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>Interfaz de usuario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation>Origen de la carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>Sonido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>Atajos de teclado</translation>
     </message>
@@ -3113,39 +3778,39 @@ Por favor, envía un ticket en https://github.com/Cockatrice/Cockatrice/issues
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation>Ejecutar en primer plano</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation>Ejecutar en segundo plano</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="27"/>
         <source>Run in background and always from now on</source>
-        <translation type="unfinished"/>
+        <translation>Ejecutar en segundo plano y siempre a partir de ahora</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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </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="29"/>
         <source>Don&apos;t run this time</source>
         <translation>No ejecutar esta vez</translation>
     </message>
@@ -3153,17 +3818,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>Siguiente</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>Anterior</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>Tip del día</translation>
     </message>
@@ -3171,165 +3836,165 @@ 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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>Canal de lanzamiento actual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>Reinstalar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>Cancelar Descarga</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>Abrir página de descarga</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation>Comprobar actualizaciones del cliente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>Cockatrice no fue creado con soporte para SSL, ¡por lo que no se pueden descargar actualizaciones automáticamente!
 Por favor, visita la página de descargas para actualizarlo manualmente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation>Descargando actualización: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>Buscando actualizaciones...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>Comprobación de actualizaciones finalizada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>Actualización no disponible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>¡Cockatrice se ha actualizado!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>Actualmente está ejecutando la última versión disponible en el canal de distribución.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>Versión actual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>Seleccionado canal de lanzamiento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>Actualización disponible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>¡Una nueva version de Cockatrice está disponible!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Nueva versión</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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>Lanzado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>Registro de cambios</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>¿Quieres actualizar ahora?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>Error en la actualización</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Ha ocurrido un error mientras se buscaban actualizaciones:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Ha ocurrido un error mientras se descargaba una actualización:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>Instalando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice es incapaz de abrir el instalador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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>Intente actualizar manualmente cerrando Cockatrice y ejecutando el instalador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation>Ubicación de descarga</translation>
     </message>
@@ -3337,19 +4002,151 @@ 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="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Limpiar el historial al cerrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
+        <translation>Copiar al portapapeles</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <source>Debug Log</source>
+        <translation>Registro de depuración</translation>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
-        <source>Debug Log</source>
-        <translation>Registro de depuración</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation>Nombre de la carta</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation>Subtipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation>Al menos</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation>cartas</translation>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation>Nombre de la carta</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation>Subtipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation>Al menos</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation>cartas</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3410,7 +4207,7 @@ You may have to manually download the new version.</source>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="65"/>
         <source>Tcgplayer</source>
-        <translation type="unfinished"/>
+        <translation>TCGplayer</translation>
     </message>
 </context>
 <context>
@@ -3421,33 +4218,39 @@ You may have to manually download the new version.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation>Presupuesto</translation>
-    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <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"/>
     </message>
@@ -3455,7 +4258,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>Escriba su filtro aquí</translation>
     </message>
@@ -3463,22 +4266,22 @@ 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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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>¿Estás seguro/a de que quieres eliminar el filtro &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation>Borrado fallido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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"/>
     </message>
@@ -3486,22 +4289,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation>expulsado por el anfitrión del juego o moderador</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation>jugador ha dejado la partida</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation>jugador se ha desconectado del servidor</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation>razón desconocida</translation>
     </message>
@@ -3509,155 +4312,208 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>Por favor, entre a la sala adecuada primero.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>Contraseña incorrecta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>No se permiten espectadores en esta partida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>La partida no tiene plazas libres.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>La partida ya no existe.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>Esta partida está abierta sólo a usuarios registrados.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>Esta partida está abierta sólo a los amigos del creador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Estás siendo ignorado por el creador de la partida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation>Unirse a partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation>Espectar partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation>Información de la partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>Entrar en la partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>Por favor, entre primero en la sala respectiva.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filtrar partidas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>&amp;Limpiar filtro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>C&amp;rear</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>Unirse (&amp;J)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>Entrar como e&amp;spectador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation>Juegos mostrados: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>Partidas</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation>Todos los tipos</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation>Filtrar por nombre de partida...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation>Esconder los partidos no creados por amigos</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 day</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="43"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 hora</numerusform><numerusform>%1%2 horas</numerusform><numerusform>%1%2 horas</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation>nuevo</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="48"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>solo amigos</translation>
     </message>
@@ -3667,68 +4523,68 @@ You may have to manually download the new version.</source>
         <translation>solo usuarios registrados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>pueden usar el chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>ver manos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>puede ver manos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>no permitidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>Edad</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>Creador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>Restricciones</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>Jugadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>Espectadores</translation>
     </message>
@@ -3736,143 +4592,158 @@ You may have to manually download the new version.</source>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation>Reiniciar todos los caminos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation>Todos los caminos se han reiniciado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>Elija ruta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>Preferencias personales</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>Idioma:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>Rutas (edición deshabilitada en modo portatil)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>Rutas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation>Cómo ayudar con las traducciones</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>Directorio de mazos:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation>Directorio de filtros:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>Directorio de repeticiones:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>Directorio de imágenes:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>Base de datos de cartas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation>Directorio de base de datos personalizado:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>Base de datos de tokens:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation>Actualizar canal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation>Comprobar actualizaciones del cliente al arrancar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="379"/>
         <source>Check for card database updates on startup</source>
         <translation>Comprobar actualizaciones de la base de datos de cartas al arrancar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation>No comprobar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation>Siempre actualizar en segundo plano</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation>Comprobar actualizaciones de la base de datos de cartas cada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation>días</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>Notificar si hace falta en mi cliente alguna característica soportada por el servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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>Oracle se ejecutará automáticamente cuando se ejecuté una nueva versión de Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>Mostrar tips al inicio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <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"/>
     </message>
@@ -3880,47 +4751,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cementerio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation>Ver &amp;cementerio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation>&amp;Mover cementerio a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Parte superior de la biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Parte inferior de la biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <translation>Todos los jugadores</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation>&amp;Mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation>Mostrar una carta al azar a...</translation>
     </message>
@@ -3928,111 +4799,141 @@ You may have to manually download the new version.</source>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation>&amp;Mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation>&amp;Ver mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
-        <translation>&amp;Ordenar mano</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
-        <translation>Hacer &amp;mulligan</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
+        <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation>&amp;Mover mano a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Parte superior de la biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Parte inferior de la biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cementerio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation>&amp;Mostrar mano a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation>Mostrar una carta al azar a...</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
+        <translation>Todos los jugadores</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>Mostrar una carta al azar a...</translation>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation>Crear nuevo mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation>Buscar mazos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation>Buscar base de datos de cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
+        <translation>Buscar EDHRec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation>Buscar Archidekt</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation>Ver repeticiones</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation>Quitar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation>Conectando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation>Conectar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation>Jugar</translation>
     </message>
@@ -4040,193 +4941,213 @@ You may have to manually download the new version.</source>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation>&amp;Biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation>&amp;Ver biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation>Ver cartas de la parte superior de la biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation>Ver cartas de la parte inferior de la biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation>Mostrar &amp;biblioteca a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
-        <translation type="unfinished"/>
+        <translation>Prestar la biblioteca a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation>Mostrar &amp;cartas de la parte superior a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation>&amp;Parte superior de la biblioteca...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation>&amp;Parte inferior de la biblioteca...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
-        <translation type="unfinished"/>
+        <translation>Mostrar siempre la carta superior</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
+        <translation>Ver siempre la carta superior</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
+        <translation>Abrir mazo en editor de mazos</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation>&amp;Robar carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
-        <translation type="unfinished"/>
+        <translation>Deshacer último robo</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation>Barajar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation>&amp;Jugar carta de la parte superior</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
-        <translation type="unfinished"/>
+        <translation>Jugar carta de la parte superior boca abajo</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
+        <translation>Mover la carta superior al cementario</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
+        <translation>Mover la carta superior al exilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
-        <translation type="unfinished"/>
+        <translation>Mover las cartas superiores al cementario...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation>Mover las cartas superiores al cementario boca abajo...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
-        <translation type="unfinished"/>
+        <translation>Mover las cartas superiores al exilio...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation>Mover las cartas superiores al exilio boca abajo...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation>Barajar cartas de la parte superior...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
-        <translation>&amp;Robar carta de la parte inferior</translation>
+        <translation>&amp;Robar carta inferior</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
+        <translation>Robar cartas inferiores...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
-        <translation>&amp;Jugar carta de la parte inferior</translation>
+        <translation>&amp;Jugar carta inferior</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
+        <translation>Jugar carta inferior boca abajo</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
+        <translation>Mover la carta inferior al cementario</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
+        <translation>Mover la carta inferior al exilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
-        <translation type="unfinished"/>
+        <translation>Mover las cartas inferiores al cementario...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation>Mover las cartas inferiores al cementario boca abajo...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
-        <translation type="unfinished"/>
+        <translation>Mover las cartas inferiores al exilio...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation>Mover las cartas inferiores al exilio boca abajo...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
-        <translation>Poner carta de la parte inferior en la parte superior</translation>
+        <translation>Poner carta inferior en la parte superior</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation>Barajar cartas de la parte inferior...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <translation>Todos los jugadores</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4234,650 +5155,273 @@ You may have to manually download the new version.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>Este servidor ha alcanzado su capacidad máxima de usuarios, por favor inténtalo más tarde.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>Hay demasiadas conexiones simultaneas desde tu dirección.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>Baneado por el moderador</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>Tiempo de finalización estimado: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>Este ban permanecerá indefinidamente.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>Apagado programado del servidor.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>El nombre de usuario no es válido.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>Se ha cerrado tu sesión debido a que se ha iniciado en otra ubicación.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>Conexión cerrada</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>El servidor ha finalizado tu conexión.
-Motivo: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>El servidor será reiniciado en un minuto.
-Todas las partidas en curso se cerraran.
-Motivo para el apagado: %1</numerusform><numerusform>El servidor será reiniciado en %n minuto(s).
-Todas las partidas en curso se cerraran.
-Motivo para el apagado: %1</numerusform><numerusform>El servidor será reiniciado en %n minuto(s).
-Todas las partidas en curso se cerraran.
-Motivo para el apagado: %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>Apagado programado del servidor</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>Éxito</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>Registro aceptado.
-Iniciando sesión.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>Activación de la cuenta aceptada.
-Iniciando sesión.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>Número de jugadores</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>Por favor, introduzca el número de jugadores.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>Jugador %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>Cargar repetición</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>Acerca de Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation>Versión</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>Página de Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>Jefe de Proyecto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>Antiguos Jefes de Proyecto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>Desarrolladores:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>Nuestros desarrolladores</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>¡Ayuda a desarrollar!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>Traductores:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>Nuestros Traductores</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>¡Ayuda a traducir!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>Soporte:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>Informa de un problema</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>Problemas frecuentes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>Preguntas frecuentes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>Tiempo de espera del servidor agotado</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>Inicio de sesión fallido</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation>Tu cliente parece no tener las características requeridas para la conexión de este servidor.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation>Para actualizar tu cliente, ir a &apos;Ayuda-&gt;Marcar para Actualizaciones del Cliente&apos;</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>Nombre de usuario o contraseña incorrecto. Por favor, verifica tu información de autentificación y vuelve a intentarlo.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>Ya existe una sesión activa usando ese nombre de usuario.
-Por favor, cierra esa sesión primero y reintentalo.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>Estás baneado hasta %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>Estás baneado indefinidamente.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>Este servidor requiere el registro de usuarios. ¿Quieres registrarte ahora?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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>Este servidor exige IDs de cliente. Tu cliente no está generando un ID o estás ejecutando un cliente modificado. Cierra y vuelve a abrir el cliente para intentarlo de nuevo. </translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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>Ha ocurrido un error interno. Cierra y vuelve a abrir Cockatrice antes de intentar de nuevo.
-Si el error persiste, asegúrate de que estás ejecutando la versión más reciente del software y contacta a los desarrolladores del software si es necesario.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>Activación de cuenta</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>Tu cuenta aún no ha sido activada.
-Tienes que proporcionar el código recibido en el email de activación</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation>Servidor Lleno</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>Error de inicio de sesión desconocido: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>
-Esto suele ser debido a que tu versión del cliente está desfasada y el servidor ha enviado una respuesta que tu cliente no comprende.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>Tu nombre de usuario debe:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>Tener de %1 a %2 caracteres de longitud.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>%1 Puede tener minúsculas.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>NO</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>%1 Puede tener mayúsculas.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation> %1 Puede tener caracteres númericos.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>Puede tener los siguientes signos de puntuación: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>El primer caracter %1 puede ser un signo de puntuación.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation>No puede contener ninguna de las siguientes palabras: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation>No puede coincidir ninguna de las siguientes expresiones: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>Sólo puedes usar A-Z, a-z, 0-9, _, ., y - en tu nombre de usuario.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>Registro denegado</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>El registro está actualmente deshabilitado en este servidor</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>Ya existe una cuenta con ese nombre.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>Es obligatorio especificar una dirección de correo válida al registrarse.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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>Parece ser que usted está intentando registrar una cuenta nueva en este servidor; sin embargo usted ya tiene una cuetna registrada con el correo provisto. Este servidor restringe el número de cuentas que un usuario puede registrar por correo electrónico. Por favor contacte al operador del servidor para asistencia o para obtener la información de sus credenciales.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>La contraseña es demasiado corta.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>El registro falló debido a un problema técnico en el servidor.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation>Se ha perdido la conexión con el servidor.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>Error de registro desconocido: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>La activación de cuenta falló.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>Error del Socket: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>Estás intentando conectar a un servidor obsoleto. Por favor, usa una versión anterior de Cockatrice o conecta a un servidor apropiado.
-La versión local es %1, la versión remota es %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>Tu cliente de Cockatrice está obsoleto. Por favor, actualiza tu versión de Cockatrice.
-La versión local es %1, la versión remota es %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>Conectando a %1...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>Registrando en %1 como %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>Desconectado</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>Conectado, hora de inicio de sesión: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>Solicitando contraseña olvidada de %1 como %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Conectar...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Desconectar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>Empezar partida &amp;local...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Ver repetición...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Pantalla completa</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Registrarse en el servidor...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;Restaurar contraseña...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Preferencias...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>A&amp;cciones</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>Base de datos de c&amp;artas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;Mantenedor de ediciones...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Editar &amp;fichas personalizadas...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>Abrir carpeta de imágenes personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>Abrir carpeta de ediciones personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>Agregar cartas/ediciones personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation>Recargar la base de datos de cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation>Pestañas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>A&amp;yuda</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;Acerca de Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Tip del Día</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation>Buscar Actualizaciones de Cliente</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation>Comprobar actualizaciones de cartas...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation>Comprobar actualizaciones de cartas (Automático)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation>Mostrar barra de estatus</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation>Ver &amp;registro de debugs</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation>Abrir carpeta de preferencias</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation>Mostrar/Ocultar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation>Nueva Versión</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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>Felicitaciones se ha actualizado Cockatrice %1!
 Oracle actualizará tu base de datos de cartas.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice está instalado.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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>¡Felicitaciones! Se ha instalado Cockatrice %1
 Ahora se ejecutará Oracle para instalar la base de datos de cartas inicial.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>Base de datos de cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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>
@@ -4886,29 +5430,29 @@ If unsure or first time user, choose &quot;Yes&quot;</source>
 Si no está seguro o es su primera vez, seleccione &quot;Sí&quot;</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>Si</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>Abrir preferencias</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>Nuevas ediciones encontradas</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
@@ -4921,17 +5465,22 @@ Códigos de sets: %1
 ¿Quieres habilitarlos?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>Ver ediciones</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>Bienvenido/a</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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>
@@ -4940,741 +5489,903 @@ Todas las ediciones en la base de datos de cartas han sido habilitadas.
 Aprenda más sobre cambiar el orden de la edición o deshabilitando ediciones especificas y otras preferencias en la opción &quot;Mantenedor de ediciones&quot;.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>Información</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>La actualización de la base de datos de cartas ya está en marcha.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>Imposible iniciar el actualizador de la base de datos de cartas: </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation>Ocurrió un error desconocido.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>Este servidor soporta características adicionales que tu cliente no tiene.
-Esto no debería ser un problema, pero este mensaje podría significar que hay una nueva versión de Cockatrice disponible o este servidor está usando una versión personalizada o de prelanzamiento.
-Para actualizar tu cliente, ve a Ayuda -&gt; Buscar Actualizaciones.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>Cargar ediciones/cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>El archivo seleccionado no fue encontrado.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation>Solo puedes importar bases de datos en XML en este momento.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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>Las nuevas ediciones/cartas se han agregado correctamente.
 Cockatrice está recargando la base de datos de cartas.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>Las ediciones/cartas fallaron al ser importadas.</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
-        <translation>Reiniciar contraseña</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
-        <translation>Tu contraseña se ha reiniciado con éxito, ahora puedes conectarte con las nuevas credenciales.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>No se pudo reiniciar la contraseña, por favor contacte con el operador del servidor para reiniciar su contraseña.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
-        <translation>Petición de activación recibida, por favor comprueba tu email para el código de activación.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation>Base de maná</translation>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation>tipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation>color</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation>subtipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation>fuerza</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation>resistencia</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation>Curva de maná</translation>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation>Devoción de maná</translation>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation> del juego</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation> de su cementerio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation> del exilio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation> de su mano</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>la carta superior de la biblioteca de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation>la parte superior de su biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation> desde la parte superior de la biblioteca de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation>Desde la parte superior de su biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>la carta de la parte inferior de la biblioteca de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation>La carta de la parte inferior de su biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation> desde la parte inferior de la biblioteca de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation>Desde la parte inferior de su biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation> desde la biblioteca de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation>desde su biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation> desde el banquillo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation> desde la pila</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>desde la zona personalizada &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1 está manteniendo la carta superior %2 revelada.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1 ya no mantiene revelada la carta superior %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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>%1 ahora puede ver la carta superior de %2 en cualquier momento.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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>%1 ya no puede ver la carta superior de %2 en cualquier momento.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1 anexa %2 a %3&apos;s %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 ha concedido la partida.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 ha concedido la partida</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1 ha recuperado la conexión a la partida.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 ha perdido la conexión a la partida.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation>%1 apunta desde su %2 a si mismo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation>%1 apunta desde su %2 a %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation>%1 apunta desde el %3 de %2 a si mismo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation>%1 apunta desde el %3 de %2 a %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1 apunta de su %2 a su %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1 apunta desde su %2 al %4 de %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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>%1 apunta desde el %3 de %2 a su %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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>%1 apunta desde el %3 de %2 al %5 de %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 crea una ficha: %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 ha cargado un mazo (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>%1 ha cargado un mazo con %2 cartas en el banquillo (%3).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation>%1 destruye %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>una carta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1 entrega a %2 el control sobre %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="308"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation>%1 pone %2 en juego %3 bocabajo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1 pone %2 en juego %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="314"/>
+        <source>%1 puts %2%3 into their graveyard face down.</source>
+        <translation>%1 pone %2%3 en su cementerio boca abajo.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation>%1 pone %2%3 en su cementerio.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation>%1 exilia %2%3 boca abajo.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 exilia %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation>%1 mueve %2%3 a su mano.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation>%1 pone %2%3 en su biblioteca.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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>%1 pone %2%3 al fondo de su biblioteca.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation>%1 pone %2%3 en la parte superior de su biblioteca.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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>%1 pone %2%3 en la biblioteca de su propietario en el %4 lugar desde la parte superior</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 mueve %2%3 al banquillo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation>%1 juga %2%3 boca abajo.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 juega %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
-        <source>%1 moves %2%3 to custom zone &apos;%4&apos;.</source>
-        <translation type="unfinished"/>
+        <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>%1 mueve %2%3 a la zona personalizada &apos;%4&apos; boca abajo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <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>%1 mueve %2%3 a la zona personalizada &apos;%4&apos;</translation>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation><numerusform>%1 roba %2 carta(s).</numerusform><numerusform>%1 roba %2 c</numerusform><numerusform>%1 roba %2 c</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 está mirando a %2.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation>parte inferior</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation>parte superior</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1 pone %2 boca abajo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1 pone %2 boca arriba.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>La partida ha sido cerrada.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>La partida ha comenzado.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1 se ha unido a la partida.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 está ahora observando la partida.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>Has sido expulsado de la partida.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 ha dejado la partida (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation>%1 ya no está viendo el juego (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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>%1 está preparado/a para empezar la partida.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform>%1 barajea su mazo y roba una nueva mano de %2 carta(s).</numerusform><numerusform>%1 barajea su mazo y roba una nueva mano de %2 carta(s)</numerusform><numerusform>%1 barajea su mazo y roba una nueva mano de %2 carta(s)</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="473"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation>%1 Baraja su maso y robas una nueva mano.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation>Estás viendo una repetición de la partida #%1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1 está preparado/a para empezar la partida.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="510"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation>cartas</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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><numerusform>%1 carta(s)</numerusform><numerusform>%1 cars</numerusform><numerusform>%1 cars</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
-        <translation type="unfinished"/>
+        <translation>%1 presta %2 a %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1 revela %2 a %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1 revela %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation>%1 revela al azar %2%3 a %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1 revela al azar %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation>%1 está mirando la carta #%2 boca abajo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation>%1 mira la carta boca abajo #%2: %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation>%1 revela %2%3 a %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 revela %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="576"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation>%1 Orden del turno invertido, ahora es %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation>Invertido.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation>Normal.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>Cara</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>Cruz</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation>%1 tira una moneda. Ha salido %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1 sacó un %2 con un dado de %3 caras.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>Turno %1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation>%1 sets annotation of %2 to %3.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation>%1 establece el contador %2 a %3 (%4%5).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%1 establece que %2 no se endereze normalmente.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 establece que %2 se endereze normalmente.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 elimina la F/R de %2</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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>%1 cambia la F/R de %2 de nada a %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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>%1 cambia la F/R de %2 de %3 a %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1 ha bloqueado su banquillo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 ha desbloqueado su banquillo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>
 %1 gira sus permanentes.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 ha enderezado sus permanentes.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1 gira %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1 endereza %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 baraja %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="769"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation>%1 barajea las últimas %3 cartas de %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="774"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation>%1 barajea las primeras %3 cartas de %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation>%1 barajea las cartas %3 - %4 de %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 desanexa %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 deshace su último robo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 deshace su último robo (%2).</translation>
     </message>
@@ -5682,110 +6393,115 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation>Palabra1 Palabra2 Palabra3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation>Añadir nuevo mensaje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation>Editar mensaje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation>Borrar mensaje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>Añadir mensaje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>Mensaje:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation>Editar mensaje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>Preferencias de Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>Palabras de alerta personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>Habilitar las menciones en el chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>Habilitar completado de menciones</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>Macros para mensajes durante la partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>Ignorar mensajes de sala de usuarios sin registrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>Ignorar mensajes privados de usuarios sin registrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>Invertir el color del texto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>Habilitar notificaciones de escritorio para los mensajes privados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>Habilitar notificaciones de escritorio para menciones</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>Habilitar historial de mensajes de sala al unirse</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>(El color es hexadecimal)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Separa las palabras con un espacio, solo caracteres alfanuméricos</translation>
     </message>
@@ -5793,37 +6509,42 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation>Mover a</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation>Tabla</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation>&amp;Mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cementerio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exilio</translation>
     </message>
@@ -5836,47 +6557,47 @@ Cockatrice está recargando la base de datos de cartas.</translation>
         <translation>Tipo de carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation>Valor de maná</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation>Color(es)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation>Lealtad</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation>Tipo principal de carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation>Coste de maná</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation>F/R</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation>Lado</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation>Diseño</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation>Identidad de color</translation>
     </message>
@@ -5899,65 +6620,211 @@ Cockatrice está recargando la base de datos de cartas.</translation>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation>Fase Desconocida</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation>Endereza</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation>Mantenimiento</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation>Dibuja</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation>Primero Principal</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation>Comienzo del Combate</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation>Declarar atacantes</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation>Declarar bloqueadores</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation>Daño de combate</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation>Fin del Combate</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation>Segundo Principal</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation>Paso Final/Limpieza</translation>
     </message>
@@ -5965,57 +6832,57 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>Paso de enderezar</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>Paso de mantenimiento</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>Paso de robar</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>Primera fase principal</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>Paso de inicio del combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>Paso de declarar atacantes</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>Paso de declarar bloqueadores</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>Paso de daño de combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>Paso de final del combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>Segunda fase principal</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>Paso final</translation>
     </message>
@@ -6023,7 +6890,7 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>es</translation>
@@ -6032,183 +6899,195 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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>cementerio</translation>
+    </message>
+    <message>
+        <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>exilio</translation>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
-        <translation>Ver cartas de la parte superior de la biblioteca</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
-        <translation>Número de cartas: (máx. %1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
-        <translation>Ver cartas de la parte inferior de la biblioteca</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
-        <translation>Robar mano</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
-        <translation>Robar cartas</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
+        <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <source>Create tokens</source>
-        <translation>Crear fichas</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
-        <translation>Número:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
-        <translation>Cambiar fuerza/resistencia</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation>Establecer contadores</translation>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation>Jugador(a) &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
+        <translation>Contadores</translation>
+    </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
-        <translation type="unfinished"/>
+        <translation>Preferencia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6224,17 +7103,17 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation>Siguiente carta en el mazo</translation>
     </message>
@@ -6242,86 +7121,94 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
-        <translation type="unfinished"/>
+        <translation>Preferencia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation>Fecha de lanzamiento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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>Descendente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation>Ascendente</translation>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation>Fuerza / resistencia</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation>&amp;Incrementar fuerza</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation>&amp;Reducir fuerza</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation>I&amp;ncrementar resistencia</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation>R&amp;educir resistencia</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation>In&amp;crementar fuerza y resistencia</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation>Red&amp;ucir fuerza y resistencia</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation>Incrementa fuerza y reducir resistencia</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation>Reducir fuerza e incrementar resistencia</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation>Establecer &amp;fuerza y resistencia...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation>Reiniciar f&amp;uerza y resistencia</translation>
     </message>
@@ -6329,37 +7216,37 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>Servicios</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>Ocultar %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>Ocultar otros</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>Mostrar todo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>Preferencias...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>Salir %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>Sobre %1</translation>
     </message>
@@ -6367,153 +7254,247 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Base de datos de cartas de Cockatrice (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>Todos los archivos (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Repeticiones de Cockatrice (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>Mazo principal</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>Banquillo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>Fichas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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>Sobrescribir archivo existente?</translation>
+        <translation>¿Sobrescribir archivo existente?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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>Ya existe una versión .cod de este mazo. Sobrescribirla?</translation>
+        <translation>Ya existe una versión .cod de este mazo. ¿Sobrescribirla?</translation>
+    </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation>Guardar todo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation>&amp;Sí</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation>Sí a &amp;Todo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation>&amp;No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation>N&amp;o a todo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation>Volver a intentar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation>Descartar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation>Aplicar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation>Restaurar predeterminados</translation>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>Tiempo de subida</translation>
     </message>
@@ -6521,32 +7502,32 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>Jugadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>Mantener</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>Tiempo de inicio</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>Duración (seg.)</translation>
     </message>
@@ -6554,37 +7535,37 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation>&amp;Exilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation>Ver &amp;exilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation>&amp;Mover exilio a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Parte superior de la biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Parte inferior de la biblioteca</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation>&amp;Mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cementerio</translation>
     </message>
@@ -6592,41 +7573,49 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>Salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>E&amp;ntrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>Permisos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>Jugadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>Partidas</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation>Decir</translation>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6663,27 +7652,27 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>Activado</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>Tipo de set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>Código de set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>Nombre largo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>Fecha de lanzamiento</translation>
     </message>
@@ -6691,53 +7680,53 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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>Restaurar atajos por defecto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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>¿Realmente quieres restablecer los atajos predeterminados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation>Limpiar todos los atajos predeterminados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="111"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>¿Realmente quieres limpiar los atajos predeterminados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation>Sección:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation>Acción:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation>Atajo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation>Cómo fijar atajos personalizados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -6745,12 +7734,12 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>Acción</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>Atajo</translation>
     </message>
@@ -6758,14 +7747,14 @@ Cockatrice está recargando la base de datos de cartas.</translation>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Su archivo de configuración contiene atajos inválidos.
 Por favor, revise su configuración de atajos.</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>Los siguientes atajos han sido ajustados a como eran por defecto:</translation>
@@ -6792,40 +7781,40 @@ Por favor, revise su configuración de atajos.</translation>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation>&amp;Banquillo</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
+        <translation>Ver banquillo</translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>Activar &amp;sonidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>Tema de sonidos actual:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>Probar el audio del sistema</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>Preferencias de sonido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>Volumen maestro</translation>
     </message>
@@ -6833,48 +7822,48 @@ Por favor, revise su configuración de atajos.</translation>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation>La temporada de Spoilers ha terminado</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>Eliminando spoiler.xml Por favor, ejecute Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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>Error al descargar Spoilers</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation>No hay conexión a internet</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation>Los spoilers ya están actualizados</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation>No se han añadido nuevos spoilers</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation>Los Spoilers han sido actualizados!</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation>Último cambio:</translation>
     </message>
@@ -6897,16 +7886,146 @@ Por favor, revise su configuración de atajos.</translation>
         <translation>Respuesta invalida del servidor de lanzamiento de actualizaciones.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="177"/>
         <source>No reply received from the tag update server.</source>
         <translation>No se recibe respuesta del servidor de etiquetas de actualizaciones.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="184"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Respuesta invalida del servidor de etiquetas de actualizaciones.</translation>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -6917,7 +8036,7 @@ Por favor, revise su configuración de atajos.</translation>
     <message>
         <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
-        <translation type="unfinished"/>
+        <translation>Añadir a la Lista de Ignorados</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
@@ -6960,7 +8079,7 @@ Por favor, revise su configuración de atajos.</translation>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
         <source>Replay ID</source>
-        <translation type="unfinished"/>
+        <translation>ID de repetición</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
@@ -7038,56 +8157,227 @@ Por favor, revise su configuración de atajos.</translation>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Y</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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Nombre del mazo...</translation>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation type="unfinished"/>
+    </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="262"/>
+        <source>Any</source>
+        <translation>Alguno</translation>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Comandante...</translation>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Tamaño de mazo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation>Cartas:</translation>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation>Filtrar por:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Formatos</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>Información de la carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>Mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation>Base de datos de cartas</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>Flotante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation>Reinicializar la disposición</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="82"/>
         <source>Deck: %1</source>
         <translation>Mazo: %1</translation>
     </message>
@@ -7095,61 +8385,49 @@ Por favor, revise su configuración de atajos.</translation>
 <context>
     <name>TabDeckEditorVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="149"/>
+        <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>Mazo visual: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <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>Editor de mazos visual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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>Información de la carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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>Mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
-        <translation type="unfinished"/>
+        <translation>Ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7157,22 +8435,22 @@ Por favor, revise su configuración de atajos.</translation>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
+        <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>Vista de mazos visual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <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>Análisis de mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <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"/>
     </message>
@@ -7198,7 +8476,7 @@ Por favor, revise su configuración de atajos.</translation>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
-        <translation type="unfinished"/>
+        <translation>Renombrar mazo o carpeta</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
@@ -7213,8 +8491,8 @@ Por favor, revise su configuración de atajos.</translation>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Nueva carpeta</translation>
     </message>
@@ -7227,112 +8505,112 @@ Por favor, revise su configuración de atajos.</translation>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
-        <translation type="unfinished"/>
+        <translation>Abrir carpeta de mazos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
-        <translation type="unfinished"/>
+        <translation>Renombrar carpeta local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
-        <translation type="unfinished"/>
+        <translation>Nombre nuevo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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>Archivo de baraja inválido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>Introduzca el nombre del mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>Esta lista de mazo no tiene un nombre.
 Por favor, introduce un nombre:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>Mazo sin nombre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation>Fallo al subir baraja al servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>Borrar fichero local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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>¿Estás seguro/a de que quieres eliminar los archivos seleccionados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
-        <translation type="unfinished"/>
+        <translation>Borrar mazos remotos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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>¿Estás seguro/a de que quieres eliminar los mazos seleccionados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Nombre de la nueva carpeta:</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
         <source>Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>Almacén de mazos</translation>
     </message>
 </context>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <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>Almacén de mazos visual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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>No se pudo abrir mazo en %1</translation>
     </message>
 </context>
 <context>
@@ -7340,7 +8618,7 @@ Por favor, introduce un nombre:</translation>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
         <source>EDHREC: </source>
-        <translation type="unfinished"/>
+        <translation>EDHREC:</translation>
     </message>
 </context>
 <context>
@@ -7371,205 +8649,199 @@ Por favor, introduce un nombre:</translation>
         <translation>Buscar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
-        <translation type="unfinished"/>
+        <translation>EDHRec:</translation>
     </message>
 </context>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>Repetir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>Partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>Lista de jugadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>Información de la carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>Mensajes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>Historial de partidas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>&amp;Fases</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>&amp;Partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>Próxima &amp;fase</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation>Próxima fase con &amp;acción</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>Próximo &amp;turno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation>Orden del turno invertido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>&amp;Retirar todas las flechas locales</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>Girar en sentido horario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>Girar en sentido antih&amp;orario (&amp;U)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>&amp;Información de la partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>&amp;Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Abandonar la partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>&amp;Cerrar repetición</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;Resaltar chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>&amp;Decir:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation>Cartas seleccionadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>Flotante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation>Resetear la distribución </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>¿Estás seguro de que quieres conceder esta partida?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation>Revertir rendición</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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>Ya te rendiste. ¿Quieres regresar a este juego?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>Abandonar la partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>¿Estás seguro de que quieres abandonar la partida?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation>Un jugador se ha unido a la partida #%1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation>%1 se ha unido a la partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>Has sido expulsado de la partida.</translation>
     </message>
@@ -7577,7 +8849,7 @@ Por favor, introduce un nombre:</translation>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation>Inicio</translation>
     </message>
@@ -7585,158 +8857,158 @@ Por favor, introduce un nombre:</translation>
 <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>Historial</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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>Time;SenderName;SenderIP;Message;TargetID;TargetName</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation>Registros de sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>Registros de partidas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>Registros de chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>Debes seleccionar como mínimo un filtro.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Debes seleccionar un número de días válido para buscar.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>Nombre de usuario:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>Dirección IP:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>Nombre de partida:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>ID de partida:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>Mensaje:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>Sala Principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>Sala de Partida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>Chat privado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>Pasados X días:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>Última hora</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation>Resultados máximos:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>Se requiere un filtro como mínimo.
 Cuando más información introduzcas, más específicos serán los resultados.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation>Ver registros de usuario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation>Borrar filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation>Localización de registro.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation>Alcance de fecha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation>Resultados máximos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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>Historial de mensajes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation>Error al recopilar información del historial de mensajes.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation>No hay mensajes con los filtros seleccionados</translation>
     </message>
@@ -7754,27 +9026,27 @@ Cuando más información introduzcas, más específicos serán los resultados.</
         <translation>&amp;Cerrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Chat privado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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>El usuario te esta ignorando, los usuarios no podrán ver tus mensajes en el chat principal y no podrás unirte a sus partidas.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation>Mensaje privado de</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1 ha abandonado el servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1 se ha unido al servidor.</translation>
     </message>
@@ -7782,180 +9054,180 @@ Cuando más información introduzcas, más específicos serán los resultados.</
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>Sistema de archivos local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>Almacén de repeticiones del servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>Ver repetición</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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>Nueva carpeta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>Borrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
-        <translation type="unfinished"/>
+        <translation>Abrir carpeta de repeticiones</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>Descargar repetición</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>Alternar expiración del bloqueo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
-        <translation type="unfinished"/>
+        <translation>Renombrar carpeta local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
-        <translation type="unfinished"/>
+        <translation>Nombre de nueva carpeta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>Borrar fichero local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <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>¿Estás seguro/a de que quieres eliminar los archivos seleccionados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <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>¿Estás seguro/a de que quieres eliminar los repeticiones seleccionados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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>Fallido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Copiar al portapapeles</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>Borrar repetición remota</translation>
     </message>
@@ -7968,47 +9240,62 @@ Cuando más información introduzcas, más específicos serán los resultados.</
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>&amp;Decir:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>&amp;Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Dejar sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>&amp;Limpiar chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>Preferencias del Chat...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation> te ha mencionado.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation>Click para ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>Estás saturando el chat. Por favor, espera unos segundos.</translation>
     </message>
@@ -8021,30 +9308,30 @@ Cuando más información introduzcas, más específicos serán los resultados.</
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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>Fallo al unirse a la sala del servidor: no existe en el servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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>El servidor cree que estás en la sala del servidor pero tu cliente es incapaz de mostrarlo. Intenta reiniciar tu cliente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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>No tienes los permisos requeridos para unirte a esta sala del servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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>Fallo al unirse a la sala del servidor debido a un error desconocido: %1.</translation>
     </message>
@@ -8052,92 +9339,97 @@ Cuando más información introduzcas, más específicos serán los resultados.</
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation>Editor de mazos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>Editor de mazos visual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
+        <translation>EDHRec</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation>Inicio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>Almacén de mazos visual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation>Cuenta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>Almacén de mazos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
-        <translation type="unfinished"/>
+        <translation>Repetición de partidas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation>Administración</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>¿Estás seguro?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>Todavía hay partidas abiertas. ¿Estás seguro/a de que quieres salir?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation>Click para ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Tu amigo %1 se ha conectado!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation>Evento desconocido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8147,39 +9439,39 @@ Este mensaje podría significar que hay una nueva versión de Cockatrice disponi
 Para actualizar tu cliente, ve a Ayuda -&gt; Buscar Actualizaciones.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation>Tiempo de ausencia agotado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Va a ser desconectado por inactividad.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>Promoción</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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>Has sido promocionado. Por favor cierra la sesión y vuelve a iniciarla para que los cambios surtan efecto.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>Advertido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>Has recibido una advertencia debido a %1
 Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas contra usted. Si tiene alguna pregunta, por favor envíe un mensaje privado a un moderador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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>Ha recibido los siguientes mensajes del servidor.
@@ -8188,6 +9480,11 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8226,42 +9523,42 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Vida</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Blanco</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Azul</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Negro</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Rojo</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Verde</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Sin Color</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Otro</translation>
     </message>
@@ -8269,151 +9566,209 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation>No se pudo abrir el archivo para su lectura.</translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>&amp;Detalles del usuario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>&amp;Chat privado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Mostrar &amp;partidas de este usuario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>Añadir a la lista de &amp;amigos</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Quitar de la lista de &amp;amigos</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>Añadir a la lista de &amp;ignorados</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Quitar de la lista de &amp;ignorados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>Expulsar de la &amp;partida</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="67"/>
         <source>Warn user</source>
         <translation>Usuario advertido</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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Ver historial de advertencias del usuario</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="69"/>
         <source>Ban from &amp;server</source>
         <translation>Banear del &amp;servidor</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Ver historial historial de baneo del usuario.</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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Promocionar usuario a moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>Degradar usuario de m&amp;oderador</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation>Usuario promovido a &amp;juez</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="74"/>
         <source>Demote user from judge</source>
         <translation>Degradar usuario de juez</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="75"/>
         <source>View admin notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
-        <translation type="unfinished"/>
+        <translation>Este usuario no existe.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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>Estás siendo ignorado por %1 y no puedes ver sus partidos.</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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>Partidas de %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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>Historial de baneo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation>El usuario nunca ha sido baneado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation>Error al recopilar informacion de baneos.</translation>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation>Historial de advertencias</translation>
     </message>
@@ -8428,55 +9783,65 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
         <translation>El usuario nunca ha sido advertido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation>Error al recopilar información de advertencias.</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="249"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>Éxito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>Usuario promocionado con éxito.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>Usuario degradado con éxito.</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Fallo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>Fallo al promocionar usuario.</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>Fallo al degradar usuario.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation>Copiar al portapapeles</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Borrar mensajes de este usuario</translation>
     </message>
@@ -8484,311 +9849,554 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>Localización:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>Tiempo de la cuenta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>Cambiar contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>Cambiar avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>Administrador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>Moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>Usuario registrado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>Usuario no registrado</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>Juez</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="371"/>
         <source>The entered password does not match your account.</source>
         <translation>La contraseña introducida no coincide con tu cuenta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>Información</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>Información del usuario actualizada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation>Información de usuario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation>Nombre real:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation>Nivel de usuario:</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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><numerusform>%n año,</numerusform><numerusform>%n años,</numerusform><numerusform>%n año(s),</numerusform></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="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><numerusform>%10%n día %20</numerusform><numerusform>%10%n días %20</numerusform><numerusform>%10%n días %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation>Introducir contraseña</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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>Se requiere verificación de la contraseña para cambiar tu dirección de correo electrónico</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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>Un error ha ocurrido mientras intentaba actualizarse tu información de usuario.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>Este servidor no permite actualizar su información de usuario.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>Tu contraseña ha sido cambiada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>Este servidor no permite cambiar tu contraseña.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>La nueva contraseña es muy corta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>La contraseña anterior no es correcta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>Avatar actualizado</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Este servidor no permite actualizar avatar.</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>Ocurrió un error mientras se actualizaba tu avatar.</translation>
+        <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>Este servidor no permite actualizar su información de usuario.</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>Preferencias generales de la interfaz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>&amp;Doble click en las cartas para jugarlas (en lugar de un solo click)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>&amp;Jugar todas las cartas que no sean tierras en la pila (en lugar de en el campo de batalla) por defecto.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>Anotar en las fichas.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Usar menus flotantes, permitir click derecho para anclar menus en la pantalla</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation>Ajustes de notificaciones</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>Habilitar notificaciones en la barra de tareas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>Notificar en la barra de tareas los eventos de la partida mientras estás como espectador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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>Recibir una notificación  en la barra de tareas cuando alguien de tu lista de amigos se conecte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>Preferencias de animación</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>Animación de &amp;girar/enderezar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
-        <translation type="unfinished"/>
+        <translation>Preferencias de editor/almacén de mazos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <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>Usar almacén de mazos visual en el vestíbulo de juego</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation>no hacer nada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>Editor de mazos visual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
-        <translation type="unfinished"/>
+        <translation>Preferencias de repetición</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <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"/>
     </message>
@@ -8796,56 +10404,66 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
-        <translation type="unfinished"/>
+        <translation>Amigos en línea: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
-        <translation type="unfinished"/>
+        <translation>Usuarios ignorados en línea: %1 / %2</translation>
     </message>
 </context>
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation>&amp;Lanzar dado...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
+        <translation>Crear ficha...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
+        <translation>Crear otra ficha</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
+        <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
-        <source>Cr&amp;eate predefined token</source>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -8853,90 +10471,212 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
+        <translation>Coincidencia exacta</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
         <source>Save Filter</source>
         <translation>Guardar filtro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
 <context>
-    <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
-        <source>Do not display card main-types with less than this amount of cards in the database</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation>Filtrar por</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
+        <source>Save and load filters</source>
+        <translation>Guardar y cargar filtros</translation>
+    </message>
+    <message>
+        <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>Filtrar por nombre de carta exacto</translation>
+    </message>
+    <message>
+        <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>Filtrar por tipo principal de carta</translation>
+    </message>
+    <message>
+        <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>Filtrar por subtipo de carta</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="151"/>
+        <source>Filter by set</source>
+        <translation>Filtrar por expansión</translation>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation>Guardar/Cargar</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation>Tipo principal</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation>Subtipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation>Ediciones</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation>Formatos</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation>Mostrar formatos con al menos:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation>cartas</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
         <source>Mode: Exact Match</source>
+        <translation>Modo: Coincidencia Exacta</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation>Modo: Incluye</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation>cartas</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
+        <source>Mode: Exact Match</source>
+        <translation>Modo: Coincidencia Exacta</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
+        <source>Mode: Includes</source>
+        <translation>Modo: Incluye</translation>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <source>Filter by name... (Exact match)</source>
+        <translation>Filtrar por nombre de partida... (Coincidencia exacta)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Deck</source>
         <translation>Cargar desde mazo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
         <source>Load from Clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Cargar desde el portapapeles</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8944,7 +10684,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDatabaseDisplayRecentSetFilterSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
+        <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"/>
     </message>
@@ -8952,98 +10692,151 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDatabaseDisplaySetFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
+        <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>Buscar ediciones...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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>Modo: Coincidencia Exacta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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>Modo: Incluye</translation>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
+        <translation>Buscar subtipos...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation>cartas</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
-        <translation type="unfinished"/>
+        <translation>Modo: Coincidencia Exacta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
-        <translation type="unfinished"/>
+        <translation>Modo: Incluye</translation>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
+        <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>Buscar por nombre de carta (o buscar expresiones)</translation>
     </message>
     <message>
+        <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>Loading database ...</source>
-        <translation type="unfinished"/>
+        <source>Visual</source>
+        <translation>Visual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
+        <source>Loading database ...</source>
+        <translation>Cargando la base de datos...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation>Limpiar todos los filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation>Tabla</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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>Robar una nueva mano de muestra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -9051,94 +10844,78 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <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>Almacén de mazos</translation>
     </message>
 </context>
 <context>
     <name>VisualDeckStorageQuickSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
+        <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>Mostrar las carpetas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9146,7 +10923,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
+        <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"/>
     </message>
@@ -9154,22 +10931,22 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -9177,61 +10954,61 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
-        <translation type="unfinished"/>
+        <translation>Cargando la base de datos...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <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>Preferencias de almacén de mazos visual</translation>
     </message>
 </context>
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>¿Qué advertencia quieres enviar?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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>Redactar todos los mensajes de este usuario en todas las salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>Usuario advertido por conducta inadecuada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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>El nombre de usuario no puede quedarse en blanco, por favor especifique un usuario al que advertir.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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>La advertencia no puede quedarse en blanco, por favor seleccione una advertencia válida.</translation>
     </message>
@@ -9239,133 +11016,133 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <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>Mover el set seleccionado al principio</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>Mover arriba el set seleccionado</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>Mover abajo el set seleccionado</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>Mover el set seleccionado al final</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation>Buscar por nombre de edición, código, o tipo</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="70"/>
         <source>Default order</source>
         <translation>Orden por defecto</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>Restaurar orden predeterminado de arte original</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="107"/>
         <source>Enable all sets</source>
         <translation>Seleccionar todos los sets</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="108"/>
         <source>Disable all sets</source>
         <translation>Deseleccionar todos los sets</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="109"/>
         <source>Enable selected set(s)</source>
         <translation>Habilitar set(s) seleccionados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation>Deshabilitar set(s) seleccionados</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="126"/>
         <source>Deck Editor</source>
         <translation>Editor de mazo</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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation>Usa CTRL+A para seleccionar todas las colecciones aquí mostradas.</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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation>Solo las cartas en las colecciones permitidas aparecerán en la lista de cartas del editor de mazos.</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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation>La prioridad de las imágenes es decidida en el siguiente orden:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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>primero la Carpeta PERSONALIZADA (%1), luego las Ediciones Habilitadas en este mensaje (de Arriba a Abajo)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Card Art</source>
         <translation>Arte de carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation>Cómo usar arte de carta personalizada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation>Consejos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation>Nota</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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation>Ordenar por columna te permite encontrar una edición sin cambiar la prioridad de edición.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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>Para habilitar el orden de nuevo, haga click en el encabezado de la columna hasta que este mensaje deje de aparecer.</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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation>Usa el filtro actual como la prioridad de edición</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
         <source>Sorts the set priority using the same column</source>
         <translation>Ordena la prioridad de edición usando la misma columna</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation>Mantenedor de ediciones</translation>
     </message>
@@ -9373,72 +11150,72 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <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>Buscar por nombre de carta (o buscar expresiones)</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation>Desagrupado</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation>Agrupar por tipo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation>Agrupar por valor de maná</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation>Agrupar por color</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation>Desordenado</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation>Ordenar por nombre</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation>Ordenar por tipo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation>Ordenar por coste de maná</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation>Ordenar por colores</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>barajar al cerrar</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>vista de la pila</translation>
     </message>
@@ -9446,7 +11223,7 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>Español (Spanish)</translation>
     </message>
@@ -9454,12 +11231,12 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation>Conectar al inicio</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation>Depurar a archivo</translation>
     </message>
@@ -9467,1005 +11244,1078 @@ Por favor, absténgase de realizar de nuevo esta actividad o se tomarán medidas
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>Ventana principal</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation>Editor de mazos</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>Vestíbulo de juego</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation>Contadores de carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation>Contadores de jugador</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>Fuerza y resistencia</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>Fases del juego</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>Area de juego</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation>Mover la carta seleccionada</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation>Mover la carta superior</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation>Mover la carta inferior</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>Gameplay</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation>Robar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation>Sala de chat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation>Ventana de juego</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation>Cargar deck desde el portapapeles</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation>Repeticiones</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation>Pestañas</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation>Buscar actualizaciones de cartas ...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation>Conectar...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation>Registrar...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation>Ajustes...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation>Empezar una partida local...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation>Ver repetición...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation>Eliminar filtros</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation>Eleminar filtro seleccionado</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation>Quitar carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation>Administrar ediciones</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation>Editar fichas personalizadas</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation>Añadir carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation>Cargar mazo...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Cargar mazo desde el portapapeles</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
-        <translation type="unfinished"/>
+        <translation>Editar mazo en el portapapeles, Comentado</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Editar mazo en el portapapeles</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation>Nuevo mazo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Abrir carpeta de imágenes personalizadas</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation>Imprimir mazo...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation>Borrar carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation>Restablecer disposición</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation>Guardar mazo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation>Guarda mazo como...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Guarda mazo al portapapeles, Comentado</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation>Guardar mazo al portapapeles</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation>Cargar mazo local...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation>Carga mazo remoto...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation>Marcar listo para empezar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Permitir bloqueo de banquillo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation>Añadir contador verde</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation>Retirar un contador verde</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation>Establecer contadores verdes...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation>Agregar contador rojo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation>Retirar un contador rojo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation>Establecer contadores rojos...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation>Añadir contador de vida</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation>Forzar inicio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
-        <translation type="unfinished"/>
+        <translation>Añadir contador de carta (F)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
-        <translation type="unfinished"/>
+        <translation>Retirar un contador de carta (F)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
-        <translation type="unfinished"/>
+        <translation>Establecer contadores de carta (F)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
-        <translation type="unfinished"/>
+        <translation>Añadir contador de carta (E)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
-        <translation type="unfinished"/>
+        <translation>Retirar un contador de carta (E)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
-        <translation type="unfinished"/>
+        <translation>Establecer contadores de carta (E)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
-        <translation type="unfinished"/>
+        <translation>Añadir contador de carta (D)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
-        <translation type="unfinished"/>
+        <translation>Retirar un contador de carta (D)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
-        <translation type="unfinished"/>
+        <translation>Establecer contadores de carta (D)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
-        <translation type="unfinished"/>
+        <translation>Añadir contador de carta (D)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
-        <translation type="unfinished"/>
+        <translation>Retirar un contador de carta (C)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
-        <translation type="unfinished"/>
+        <translation>Establecer contadores de carta (C)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
-        <translation type="unfinished"/>
+        <translation>Añadir contador de carta (B)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
-        <translation type="unfinished"/>
+        <translation>Retirar un contador de carta (B)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
-        <translation type="unfinished"/>
+        <translation>Establecer contadores de carta (B)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
-        <translation type="unfinished"/>
+        <translation>Añadir contador de carta (A)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
-        <translation type="unfinished"/>
+        <translation>Retirar un contador de carta (A)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
-        <translation type="unfinished"/>
+        <translation>Establecer contadores de carta (A)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation>Retirar un contador de vida</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation>Establecer contadores de vida...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation>Agregar contador blanco</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation>Retirar un contador blanco...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation>Establecer contadores blancos...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation>Agregar contador azul</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation>Retirar un contador azul...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation>Establecer contadores azules...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation>Agregar contador negro</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation>Quitar contador negro</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation>Establecer contadores negros...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation>Agregar contador incoloro</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation>Retirar contador incoloro</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation>Establecer contadores incoloros...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation>Añadir otro contador</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation>Borrar otro contador</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation>Colocar otros contadores...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation>Agregar fuerza (+1/+0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Reducir fuerza (-1/-0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Pasar de resistencia a fuerza (+1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Agregar resistencia (+0/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Reducir resistencia (-0/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Pasar de fuerza a resistencia (-1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Agregar fuerza y resistencia (+1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Reducir fuerza y resistencia (-1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation>Establecer fuerza y resistencia...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation>Restablecer fuerza y resistencia</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>Enderezar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>Mantenimiento</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>Robo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation>Primera fase principal</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation>Comenzar combate</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>Ataque</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>Bloqueo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>Daño</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation>Terminar combate</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation>Segunda fase principal</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>Final</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation>Próxima fase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation>Próxima fase de acción</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation>Próximo turno</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation>Girar / Enderezar Carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation>Enderezar todas</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
-        <translation>Alternar enderezamiento</translation>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation>Girar carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation>Mirar carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation>Jugar carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation>Jugar Carta, Boca Abajo</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation>Anexar carta...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation>Desanexar carta...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation>Clonar carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation>Crear ficha...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation>Crear todas las fichas relacionadas</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation>Crear otra ficha</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation>Escribir anotación...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation>Parte inferior de la biblioteca</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>Exilio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>Cementerio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>Mano</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation>Parte superior de la biblioteca</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation>Campo de batalla, boca abajo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation>Campo de batalla</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation>Ordenar mano</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>Biblioteca</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>Banquillo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation>Carta de la parte superior de la biblioteca</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation>Cerrar vista reciente</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation>Apilar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation>Cementerio (Multiple)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation>Cementerio (Multiple), Boca Abajo</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation>Exiliar (Multiple)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation>Exilio (Multiple), Boca Abajo</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation>Robar carta de la parte inferior</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Robar múltiples cartas de la parte inferior...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation>Dibujar flecha</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation>Eliminar flechas</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation>Abandonar partida</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>Conceder</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation>Lanzar dado...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation>Barajar biblioteca</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation>Robar una carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation>Robar múltiples cartas...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation>Deshacer último robo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation>Mostrar siempre la carta superior</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation>Mirar siempre la carta superior</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation>Rotar vista en sentido horario</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Rotar vista en sentido antihorario</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation>No resaltar la caja de texto</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation>Resaltar el chat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation>Borrar chat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation>Actualizar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation>Inicio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>Almacén de mazos visual</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation>Almacenamiento de mazos</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation>Cuenta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation>Administración</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation>Historial</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_fi.ts b/cockatrice/translations/cockatrice_fi.ts
index 74056982f..c317d967a 100644
--- a/cockatrice/translations/cockatrice_fi.ts
+++ b/cockatrice/translations/cockatrice_fi.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Lisää countteri... </translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>Lisää countteri</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Countterin uusi arvo &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,79 +36,81 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -116,202 +118,253 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>Teeman asetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>Nykyinen teema:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>Kortin renderöinti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>Näytä kortin nimi korteissa, joissa on kuva</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>Suurenna kortti kun hiiri on kortin päällä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>Käden layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Näytä käsikortit vierekkäin vaakatasossa (vie enemmän tilaa)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>Järjestä vasemmalta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>Pöydän grid-asetelma</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>Käänteiset pystykoordinaatit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Pelaajien vähimmäismäärä moniosaisessa layoutissa:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Suurin fonttikoko korteissa näkyville infoteksteille:</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -333,112 +386,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>Bännää &amp;käyttäjä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>Bännää &amp;IP osoite </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>Bännää client I&amp;D</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>Bännäyksen tyyppi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>Bännätty pysyvästi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>Bännätty väliaikaisesti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>Päivät:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>Tunnit:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>Minuutit:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>Bännin kesto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>Kerro bännäyksen syy. 
 Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>Kerro bännäyksen syy. Tämä näkyy bännätylle henkilölle. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Peruuta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>Bännää pelaaja serveriltä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>Valitse nimi, IP -osoite, clientid tai joku näiden yhdistelmä asettaaksesi bännin. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>Bännää nimi kentässä pitää olla arvo ennen valintaruudun valitsemista</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>Bännää ip kentässä pitää olla arvo ennen valintaruudun valitsemista. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>Bännää ClientID kentässä pitää olla arvo ennen valintaruudun valitsemista. </translation>
     </message>
@@ -446,152 +499,221 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation>Ei vastausta päivitysserveriltä.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Päivitysserveri vastasi virheellisesti</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation>Ei vastausta tiedoston päivitysserveriltä.</translation>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>Setit</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>Mana cost</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>Korttityyppi</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>Väri(t) </translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>JA</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>TAI</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>JA EI</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>TAI EI</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>Muoto</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>Väri</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>Teksti</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation>Setti</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>Manacosti</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>Harvinaisuus</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>Power</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>Toughness</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>Loyalty</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>Formaatti</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -599,22 +721,22 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -622,22 +744,22 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -650,12 +772,22 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
@@ -663,132 +795,150 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
@@ -796,133 +946,133 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -931,7 +1081,7 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -939,29 +1089,470 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -969,47 +1560,17 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <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"/>
     </message>
@@ -1017,87 +1578,97 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <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"/>
     </message>
@@ -1123,114 +1694,114 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </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="162"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </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="166"/>
+        <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"/>
     </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="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </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="168"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="172"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </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="174"/>
         <source>Load deck from online service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1238,7 +1809,7 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1246,194 +1817,171 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>Päivitä spoilerit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>Onnistui</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation>Latauksen URL:t on resetoitu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>Ladattujen korttien kuvat on resetoitu.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>Virhe</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation>Ei voitu poistaa yhtä tai useampaa kortin kuvaa</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>Lisää URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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>Muokkaa URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>Päivitetään...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>Valitse polku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation>URL Latausprioriteetti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>Spoilerit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>Lataa spoilerit automaattisesti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation>Spoilerien sijainti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>Muokattu viimeksi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>Lataa spoilerit latauksen yhteydessä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>Lataa spoilerit manuaalisesti ilman uudelleenkäynnistystä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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>Älä sulje asetuksia, ennen kuin manuaalinen päivitys on valmis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation>Lataa korttikuvat kun niitä tarvitaan</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation>Miten lisään oman URL:n</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>Poista ladatut kuvat</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation>Resetoi latausten URL:t</translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>Numero</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>Kortti</translation>
     </message>
@@ -1441,12 +1989,12 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1454,17 +2002,17 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -1472,7 +2020,7 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <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"/>
     </message>
@@ -1480,62 +2028,62 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <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"/>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </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="104"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </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="105"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </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="106"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </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="107"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <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"/>
     </message>
@@ -1543,98 +2091,156 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1652,74 +2258,74 @@ Tallennetaan moderaattoreita varten. Bännätty henkilö ei näe tätä. </trans
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>Lataa pakka... </translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Lataa remote pakka... </translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>Ready to start</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation>Sideboard unlocked</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation>Sideboard locked</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>Virhe</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>Valittua tiedostoa ei voi avata. </translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1752,143 +2358,143 @@ This will kick all non-ready players from the game.</source>
         <translation>Ladataan...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>Tunnetut Isännät</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Päivitä servereiden lista tunnetuilla julkisilla servereillä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>Lisää Isäntä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>Nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;Portti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>Pelaajan &amp;nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>&amp;Salasana:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>&amp;Tallenna salasana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>Yhdistä &amp;Automaattisesti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Kirjaudu sisään automaattisesti kun Cockatrice käynnistyy </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>Jos sinulla on ongelmia yhdistämisessä tai rekisteröinnissä ota yhteyttä serverin henkilökuntaan!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>Websivu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>&amp;Yhdistä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>Serveri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>Kirjaudu sisään</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation>Serverin yhteystiedot</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>Yhdistä serveriin</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation>Serverin URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation>Tietoliikenneportti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation>Uniikki serverin nimi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>Yhteysvaroitus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>Anna nimi uudelle yhteysprofiilillesi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>Yhdistämisvaroitus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Pelaajan nimi ei voi olla tyhjä. </translation>
     </message>
@@ -1896,117 +2502,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>&amp;Muista asetukset</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>&amp;Kuvaus:</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>&amp;Pelaajat:</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>Yleinen</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>Pelimuoto</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>&amp;Salasana:</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>Vain &amp;Kaverit voivat liittyä</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>Vain &amp;Rekisteröityneet käyttäjät voivat liittyä</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>Liittymisehdot</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>&amp;Salli katsojat</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>Katsojilta &amp;vaaditaan salasana</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>Katsojat voivat &amp;keskustella</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>Katsojat &amp;näkevät käsikortit</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"/>
     </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>Katsojat</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>&amp;Tyhjennä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>Luo peli</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>Tietoa pelistä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>Serverivirhe.</translation>
     </message>
@@ -2014,97 +2625,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nimi:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Tokeni</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Väri</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>valkoinen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>sininen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>musta</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>punainen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>vihreä</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>monivärinen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>väritön</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>P/T:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Kommentti:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Tuhoa tokeni kun se lähtee pöydästä</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Tokenin  data</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Näytä &amp;kaikki tokenit</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Näytä kaikki tämän &amp;pakan tokenit</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>Valitse tokeni listasta</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>Luo token</translation>
     </message>
@@ -2112,53 +2723,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2166,40 +2777,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>Ei valittua kuvaa.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Valitse kuva vaihtaaksesi avataria.
 Poistaaksesi nykyisen avatarisi: Hyväksy valitsematta uutta kuvaa.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>Selaa...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>Vaihda avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>Avaa Kuva</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Kuvatiedostot (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>Kuva ei kelpaa. </translation>
     </message>
@@ -2207,17 +2818,17 @@ Poistaaksesi nykyisen avatarisi: Hyväksy valitsematta uutta kuvaa.</translation
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2225,38 +2836,38 @@ Poistaaksesi nykyisen avatarisi: Hyväksy valitsematta uutta kuvaa.</translation
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Vanha salasana:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Uusi salasana:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Vahvista uusi salasana:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Vaihda salasana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Uusi salasana ei täsmää</translation>
     </message>
@@ -2264,93 +2875,93 @@ Poistaaksesi nykyisen avatarisi: Hyväksy valitsematta uutta kuvaa.</translation
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Väri</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="34"/>
         <source>white</source>
         <translation>valkoinen</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="35"/>
         <source>blue</source>
         <translation>sininen</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="36"/>
         <source>black</source>
         <translation>musta</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="37"/>
         <source>red</source>
         <translation>punainen</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="38"/>
         <source>green</source>
         <translation>vihreä</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="39"/>
         <source>multicolor</source>
         <translation>monivärinen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>väritön</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>P/T:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Kommentti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Tokenin  data</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>Lisää token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Poista token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation>Muokkaa tokeneita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Anna tokenin nimi:</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>Virhe</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>Nimi on ristiriidassa olemassaolevan kortin tai tokenin kanssa.
@@ -2375,12 +2986,12 @@ Varmista että &apos;Token&apos; setti on asetettu näkyväksi &apos;Muokkaa set
         <translation>Ei määritelty</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Oikea nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Muokkaa käyttäjäprofiilia</translation>
     </message>
@@ -2418,112 +3029,113 @@ Varmista että &apos;Token&apos; setti on asetettu näkyväksi &apos;Muokkaa set
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>Pelin &amp;kuvaus:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;Tekijän nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>Yleinen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>&amp;Pelimuodot</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>&amp;vähintään:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>&amp;enintään:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>Suurin pelaajamäärä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>Ehdot</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>Suodata pelit</translation>
     </message>
@@ -2531,52 +3143,52 @@ Varmista että &apos;Token&apos; setti on asetettu näkyväksi &apos;Muokkaa set
 <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"/>
     </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"/>
     </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"/>
     </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>&amp;Host:</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>&amp;Portti:</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>Pelaajan &amp;nimi:</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>Email:</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"/>
     </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"/>
     </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>Email -osoite ei voi olla tyhjä</translation>
     </message>
@@ -2584,37 +3196,37 @@ Varmista että &apos;Token&apos; setti on asetettu näkyväksi &apos;Muokkaa set
 <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"/>
     </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>&amp;Host:</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>&amp;Portti:</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>Pelaajan &amp;nimi:</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"/>
     </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"/>
     </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>Pelaajan nimi ei voi olla tyhjä. </translation>
     </message>
@@ -2622,86 +3234,86 @@ Varmista että &apos;Token&apos; setti on asetettu näkyväksi &apos;Muokkaa set
 <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"/>
     </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"/>
     </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"/>
     </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>&amp;Host:</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>&amp;Portti:</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>Pelaajan &amp;nimi:</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>Tokeni</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>Uusi Salasana:</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"/>
     </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>Pelaajan nimi ei voi olla tyhjä. </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"/>
     </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>Tokeni ei voi olla tyhjä</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>Uusi salasana ei voi olla tyhjä</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"/>
     </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"/>
     </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>Salasanat eivät täsmää</translation>
     </message>
@@ -2717,17 +3329,17 @@ Varmista että &apos;Token&apos; setti on asetettu näkyväksi &apos;Muokkaa set
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>Avaa pakka leikepöydältä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>Pakka ei ole kelvollinen. </translation>
     </message>
@@ -2735,43 +3347,43 @@ Varmista että &apos;Token&apos; setti on asetettu näkyväksi &apos;Muokkaa set
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2785,45 +3397,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>Lataa pakka</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
@@ -2831,53 +3476,53 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>&amp;Portti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>Pelaajan &amp;nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>&amp;Salasana:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>&amp;Salasana (uudelleen):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>Email (uudelleen):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>Maa:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>Ei määritelty</translation>
     </message>
@@ -2923,17 +3568,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
@@ -2941,40 +3586,55 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>Tuntematon virhe ladattaessa korttitietokantaa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -2991,7 +3651,7 @@ Voit joutua ajamaan Oraclen ja päivittämään korttitietokannan uudelleen
 Haluatko vaihtaa tietokantasi sijaintia?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3008,7 +3668,7 @@ Yleensä tämä voidaan korjata palaamalla oracleen päivittämään korttitieto
 Haluatko vaihtaa tietokantasi sijaintia?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3017,7 +3677,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3026,7 +3686,7 @@ Would you like to change your database location setting?</source>
 Haluatko vaihtaa tietokantasi sijaintia?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3035,7 +3695,7 @@ Would you like to change your database location setting?</source>
 Haluatko vaihtaa tietokantasi sijaintia?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3044,59 +3704,64 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>Pakkojen tiedostosijainti on väärä. Haluatko palata takaisin ja asettaa oikean sijainnin pakat -kansiolle? </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>Kuvien tiedostosijainti on väärä. Haluatko palata takaisin ja asettaa oikean sijainnin kuvat -kansiolle? </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>Yleinen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>Ulkonäkö</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>Käyttöliittymä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation>Korttien lähteet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>Äänet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>Pikanäppäimet</translation>
     </message>
@@ -3104,39 +3769,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </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="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </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="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3144,17 +3809,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>Seuraava</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>Edellinen</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>Päivän vinkki</translation>
     </message>
@@ -3162,165 +3827,165 @@ 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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>Tämänhetkinen julkaisukanava</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>Asenna uudelleen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>Peruuta Lataus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>Avaa Lataussivu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>Cockatricessä ei ole SSL tukea, joten päivityksiä ei voi ladata automaattisesti!
 Vieraile lataussivulla päivittääksesi ohjelman manuaalisesti. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>Etsitään päivityksiä...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>Päivitysten haku on päättynyt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>Ei uusia päivityksiä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice on ajan tasalla!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>Sinulla on käytössä viimeisin versio, joka on saatavilla valitussa julkaisukanavassa.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>Nykyinen versio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>Valitse julkaisukanava</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>Päivitys Saatavilla</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Uusi versio Cockatricesta on saatavilla!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Uusi versio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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>Julkaistu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>Muutosloki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>Haluatko päivittää nyt?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>Päivitysvirhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Virhe päivityksiä tarkistettaessa:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Virhe tiedostoa ladatessa:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>Asennetaan...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice ei voi avata asennustiedostoa.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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>Yritä asentaa manuaalisesti sulkemalla Cockatrice ja käynnistämällä asennusohjelma. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation>Latausten sijainti</translation>
     </message>
@@ -3328,21 +3993,153 @@ 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="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Tyhjennä loki sammutuksen yhteydessä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Debug loki</translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3412,33 +4209,39 @@ You may have to manually download the new version.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <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"/>
     </message>
@@ -3446,7 +4249,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>Anna suodatin tähän</translation>
     </message>
@@ -3454,22 +4257,22 @@ 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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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"/>
     </message>
@@ -3477,22 +4280,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation type="unfinished"/>
     </message>
@@ -3500,155 +4303,208 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>Liity ensin oikeaan huoneeseen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>Väärä salasana.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Tähän peliin ei päästetä katsojia.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>Peli on jo täynnä.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>Peliä ei enää ole.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>Peli on tarkoitettu vain rekisteröityneille käyttäjille.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>Peli on tarkoitettu vain sen tekijän kavereille.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Pelin luoja ei huomioi sinua.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>Liity peliin</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>Salasana:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>Liity ensin asianmukaiseen huoneeseen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Suodata pelit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>&amp;Poista suodattimet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>&amp;Luo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>&amp;Liity</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>Liity &amp;katsojana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation>Games shown: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>Pelit</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>salasana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>vain kaverit</translation>
     </message>
@@ -3658,68 +4514,68 @@ You may have to manually download the new version.</source>
         <translation>vain rekisteröityneet käyttäjät</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>voi jutella</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>katso käsikortit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>voi nähdä käsikortit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>ei sallittu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>Huone</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>Ikä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>Kuvaus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>Luoja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>Muoto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>Ehdot</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>Pelaajat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>Katsojat</translation>
     </message>
@@ -3727,143 +4583,158 @@ You may have to manually download the new version.</source>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>Valitse polku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>Henkilökohtaiset asetukset</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>Kieli:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>Polut (editoiminen poistettu käytöstä kannettavassa versiossa)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>Polut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>Pakkojen kansio:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>Replay kansio:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>Kuvakansio:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>Korttitietokanta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>Tokenitietokanta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation>Päivitykset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>Ilmoita jos ohjelmastani puuttuu jokin serverin tarjoama ominaisuus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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>Suorita Oracle automaattisesti kun Cockatricen uusi versio on asennettu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>Näytä vinkit käynnistyksen yhteydessä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <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"/>
     </message>
@@ -3871,47 +4742,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -3919,111 +4790,141 @@ You may have to manually download the new version.</source>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4031,193 +4932,213 @@ You may have to manually download the new version.</source>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4225,648 +5146,273 @@ You may have to manually download the new version.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>Serveri on täynnä, yritä myöhemmin uudelleen. </translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>Liian monta samanaikaista yhteyttä osoitteestasi.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>Bännätty moderaattorin toimesta</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>Arvioitu päättymisaika: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>Bänni kestää loputtomasti.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>Ajastettu serverin sammutus.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>Väärä käyttäjänimi.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>Sinut kirjattiin ulos koska kirjauduit sisään toisesta paikasta. </translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>Yhteys suljettu</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>Serveri katkaisi yhteyden.
-Syy: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>Serveri käynnistetään uudelleen minuutin kuluttua( )
-Kaikki pelit joudutaan lopettamaan
-Syy: %1</numerusform><numerusform>Serveri käynnistetään uudelleen %n minuutin kuluttua( )
-Kaikki pelit joudutaan lopettamaan
-Syy: %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>Ajastettu serverin sammutus.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>Onnistui</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>Rekisteröinti hyväksytty
-Kirjautuu.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>Tilin aktivointi hyväksytty.
-Kirjautuu.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>Pelaajien lukumäärä</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>Anna pelaajien lukumäärä.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>Pelaaja %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>Lataa replay</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>Tieto sovelluksesta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation>Versio</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatricen Webbsivut</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>Projektipäällikkö:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>Edelliset projektipäälliköt:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>Kehittäjät:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>Kehittäjämme</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>Auta kehittämään!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>Kääntäjät:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>Kääntäjät</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>Auta Kääntämään!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>Tuki:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>Ilmoita puute</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>Vianhaku</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>F.A.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>Serverin aikakatkaisu</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>Kirjautuminen epäonnistui</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation>Sovelluksestasi puuttuu ominaisuuksia, joita serveri vaatii yhteyden muodostamiseksi.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation>Päivitä sovellus: &apos;Apua&apos; -&gt; &apos;Tarkasta onko päivityksiä&apos;.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>Väärä käyttäjänimi tai salasana. Tarkista todennustietosi ja yritä uudelleen.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>Tällä käyttäjänimellä on jo aktiivinen sessio käynnissä. Sulje se ensin ja kirjaudu sisään uudelleen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>Sinut on bännätty %1 saakka.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>Sinut on bännätty lopullisesti</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>Serveri vaatii rekisteröitymisen. Haluatko rekisteröityä nyt? </translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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>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.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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>Sisäinen virhe! Sulje ja käynnistä Cockatrice uudelleen ennenkuin yrität uudestaan.
-Jos ongelma jatkuu, tarkasta että käytössäsi on sovelluksen uusin versio ja tarvittaessa ota yhteyttä sovelluksen kehittäjiin.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>Tilin aktivointi</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>Tiliäsi ei ole vielä aktivoitu
-Ole hyvä ja anna aktivointikoodi, jonka sait sähköpostiisi.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation>Serveri on täynnä</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>Tuntematon kirjautumisvirhe: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>
-Yleensä tämä tarkoittaa, että sovelluksesi on päivittämättä ja serveri lähetti vastauksen, jota sovellus ei ymmärrä.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>Käyttäjänimesi täytyy olla näiden sääntöjen mukainen:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>%1 - %2 merkkiä pitkä</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>voi sisältää %1 pientä kirjainta</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>EI</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>voi sisältää %1 isoa kirjainta</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>voi sisältää %1 numeroa</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>voi sisältää seuraavat merkit: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>ensimmäinen kirjain ei voi olla %1 merkki</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation>ei voi sisältää näitä sanoja: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation>ei voi sisältää seuraavia asioita: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>Voit käyttää käyttäjänimessä merkkejä A-Z, a-z, 0-9, _, ., ja - </translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>Rekisteröinti evätty</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>Tämä serveri ei ota tällä hetkellä vastaan rekisteröintejä</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>Käyttäjänimi on jo olemassa</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>Rekisteröintiin on annettava toimiva sähköpostiosoite.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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>Näyttää siltä että yrität rekisteröidä uutta tiliä tälle serverille, vaikka sinulla on tällä sähköpostilla jo olemassaoleva tili. Tämä serveri rajoittaa tilien määrää, jotka tulevat samasta osoitteesta. Ota yhteyttä serverin tukeen pyytääksesi apua tai saadaksesi kirjautumistietosi.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>Salasana on liian lyhyt.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>Rekisteröinti epäonnistui serverin vian vuoksi.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>Tuntematon rekisteröintivirhe: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>Tilin aktivointi epäonnistui</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>Pistokevirhe: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>Yritit yhdistää vanhentuneeseen palvelimeen. Käytä vanhempaa versiota Cockatricesta tai yhdistä sopivaan palvelimeen.
-Paikallinen versio on %1, etäversio on %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>Cockatrice-ohjelmasi on vanhentunut. Päivitä Cockatrice-versiosi.
-Paikallinen versio on %1, etäversio on %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>Yhdistetään: %1...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>Rekisteröidytään %1:een %2:na</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>Yhteys katkaistu</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>Yhteys luotu, kirjaudutaan %1:n</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>Requesting forgotten password to %1 as %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Yhdistä...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Katkaise yhteys</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>Aloita &amp;paikallinen peli...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Katso replay...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>K&amp;oko näyttö</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Rekisteröidy serverille...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Asetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>&amp;Exit</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>&amp;Toiminnot</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>&amp;Korttitietokanta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;Manage sets...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Edit custom &amp;tokens...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>Avaa mukautettu kuvakansio</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>Avaa mukautettu setit -kansio</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>Lisää mukautettuja settejä/kortteja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>&amp;Apua</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;Tietoa Cockatricesta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Päivän vinkki</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation>Etsi päivityksiä</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation>Uusi versio</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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>Congratulations on updating to Cockatrice %1!
 Oracle will now launch to update your card database.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice asennettu</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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>Congratulations on installing Cockatrice %1!
 Oracle will now launch to install the initial card database.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>Korttitietokanta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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>
@@ -4875,46 +5421,51 @@ Do you want to update your card database now?
 If unsure or first time user, choose &quot;Yes&quot;</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>Kyllä</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>Ei</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>Avaa asetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>Löytyi uusia settejä!</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>Näytä setit</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>Tervetuloa</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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>
@@ -4923,741 +5474,902 @@ 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.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>Tietoa</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>Korttitietokannan päivitys on jo käynnissä</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>Unable to run the card database updater: </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>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.
-
-To update your client, go to Help -&gt; Check for Updates.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>Lataa setit/kortit</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>Selected file cannot be found.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation>You can only import XML databases at this time.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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>The new sets/cards have been added successfully.
 Cockatrice will now reload the card database.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>Sets/cards failed to import.</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
-        <translation>Salasanasi on muutettu, voit nyt kirjautua sisään uudella salasanallasi.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>Failed to reset user account password, please contact the server operator to reset your password.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
-        <translation>Activation request received, please check your email for an activation token.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation>pelistä</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation>Graveyardilta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation>exilestä</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation>kädestään</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>%1n pakan päällimmäinen kortti</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation>pakan päällimmäisen kortin</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation>%1n pakan päältä</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation>Pakkansa päältä</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>%1n pakan alimmainen kortti</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation>pakan alimmaisen kortin</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation>%1n pakan pohjalta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation>pakan alta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation>%1n pakasta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation>pakasta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation>sideboardilta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation>stäkistä</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1 pelaa pakan päällimmäinen kortti %2 esillä.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1 ei pelaa enää pakan päällimmäinen kortti %2 esillä,</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1 attaches %2 to %3&apos;s %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 luovutti.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 has unconceded the game.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1 on jälleen yhteydessä peliin.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 menetti yhteyden peliin.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation>%1 osoittaa kortista %2 itseensä.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation>%1 osoittaa kortista %2 korttiin %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation>%1 osoittaa %2n kortista %3 itseensä.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation>%1 osoittaa %2n kortista %3 korttiin %4</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1 osoittaa kortistaan %2 korttiin %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1 osoittaa kortistaan %2 pelaajan %3 korttiin %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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>%1 osoittaa pelaajan %2 kortista %3 korttiin %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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>%1 points from %2&apos;s %3 to %4&apos;s %5.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 tekee tokenin: %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 on ladannut pakan (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>%1 on ladannut pakan, jossa on %2 sideboard korttia (%3)</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation>%1 tuhoaa kortin %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>kortti</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1 antaa pelaajalle %2 kontrollin korttiin %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1 laittaa kortin %2 peliin%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation>%1 laittaa kortin %2%3 graveyardille</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 laittaa exileen kortin %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation>%1 laittaa kortin %2%3 käteen.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation>%1 laittaa kortin %2%3 pakkaan.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation>%1 laittaa kortin %2%3 pakan päälle.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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>%1 laittaa kortin %2%3 pakkaansa %4 kortiksi päältä lukien.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 siirtää kortin %2%3 sideboardille.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 pelaa kortin %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 is looking at %2.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1 turns %2 face-down.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1 turns %2 face-up.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>Peli on suljettu.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>Peli alkaa.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1 on liittynyt peliin.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 seuraa peliä.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>Sinut on kickattu pois pelistä.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 on lähtenyt pelistä. (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation>%1 ei enää seuraa peliä (%2)</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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>%1 ei ole enää valmis aloittamaan peliä.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="473"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation>%1 sekoittaa pakkansa ja nostaa uuden käden.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation>Katsot pelin #%1 replayta.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1 on valmis aloittamaan pelin.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="510"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation>cards</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1 reveals %2 to %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1 reveals %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation>%1 randomly reveals %2%3 to %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1 randomly reveals %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation>%1 peeks at face down card #%2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation>%1 peeks at face down card #%2: %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation>%1 reveals %2%3 to %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 reveals %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="576"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation>%1 käänsi vuorojärjestyksen; nyt se on %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation>käänteinen</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation>normaali</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>Kruuna</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>Klaava</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation>%1 heitti kolikkoa ja tulokseksi tuli %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1 heitti tuloksen %2. %3 -sivuisella nopalla</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>%1n vuoro.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation>%1 sets annotation of %2 to %3.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <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><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <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><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation>%1 asettaa countterin %2 arvoon %3 (%4%5).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%1 sets %2 to not untap normally.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 sets %2 to untap normally.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 removes the PT of %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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>%1 changes the PT of %2 from nothing to %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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>%1 changes the PT of %2 from %3 to %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1 on lukinnut sideboardinsa.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 on avannut sideboardinsa.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 täppää kaikki permanentit.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 untäppää kaikki permanentit.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1 täppää kortin %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1 untäppää kortin %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 sekoittaa %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="769"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation>%1 shuffles the bottom %3 cards of %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="774"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation>%1 shuffles the top %3 cards of %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation>%1 shuffles cards %3 - %4 of %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 irrottaa kortin %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 peruuttaa viimeisimmän kortinnostonsa.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 peruuttaa viimeisimmän kortinnostonsa. (%2).</translation>
     </message>
@@ -5665,110 +6377,115 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation>Word1 Word2 Word3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>Lisää viesti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>Viesti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation>Edit message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>Keskusteluasetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>Custom alert words</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>Salli keskustelumaininnat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>Enable mention completer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>Pelinsisäiset viestimakrot</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>Ignore chat room messages sent by unregistered users</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>Ignore private messages sent by unregistered users</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>Käänteinen tekstin väri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>Enable desktop notifications for private messages</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>Enable desktop notification for mentions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>Enable room message history on join</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>(Väri on heksadesimaaliluku)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Separate words with a space, alphanumeric characters only</translation>
     </message>
@@ -5776,37 +6493,42 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -5819,47 +6541,47 @@ Cockatrice will now reload the card database.</translation>
         <translation>Card Type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation>Color(s)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation>Loyalty</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation>Main Card Type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation>Mana Cost</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation>Side</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation>Layout</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation>Color Identity</translation>
     </message>
@@ -5882,65 +6604,211 @@ Cockatrice will now reload the card database.</translation>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation>Unknown Phase</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation>Untap</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation>Upkeep</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation>Draw</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation>First Main</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation>Beginning of Combat</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation>Declare Attackers</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation>Declare Blockers</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation>Combat Damage</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation>End of Combat</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation>Second Main</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation>End/Cleanup</translation>
     </message>
@@ -5948,57 +6816,57 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>Untap-kohta</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>Upkeep-kohta</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>Nostokohta</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>First main phase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>Beginning of combat step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>Declare attackers step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>Declare blockers step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>Combat damage step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>End of combat step</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>Second main phase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>End of turn step</translation>
     </message>
@@ -6006,7 +6874,7 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
@@ -6015,183 +6883,195 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6207,17 +7087,17 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6225,86 +7105,94 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"/>
     </message>
@@ -6312,37 +7200,37 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>Services</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>Hide %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>Hide Others</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>Show All</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>Preferences...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>Quit %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>About %1</translation>
     </message>
@@ -6350,153 +7238,247 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Cockatrice card database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>All files (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatrice replays (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>Maindeck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>Tokens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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"/>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation>Save</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation>Save All</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation>Avaa</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation>&amp;Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation>Yes to &amp;All</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation>&amp;Ei</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation>N&amp;o to All</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation>Abort</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation>Retry</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation>Sivuuta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation>Close</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation>Discard</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation>Help</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation>Apply</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation>Nollaa</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation>Restore Defaults</translation>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>Upload time</translation>
     </message>
@@ -6504,32 +7486,32 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>Nimi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>Players</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>Keep</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>Time started</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>Duration (sec)</translation>
     </message>
@@ -6537,37 +7519,37 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -6575,41 +7557,49 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>Rooms</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>Joi&amp;n</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>Room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>Permissions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>Players</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>Games</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6646,27 +7636,27 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>Enabled</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>Set type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>Set code</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>Long name</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>Release date</translation>
     </message>
@@ -6674,53 +7664,53 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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>Restore all default shortcuts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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>Do you really want to restore all default shortcuts?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation>Clear all default shortcuts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="111"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>Do you really want to clear all shortcuts?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation>Section:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation>Action:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation>Shortcut:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation>How to set custom shortcuts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -6728,12 +7718,12 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -6741,14 +7731,14 @@ Cockatrice will now reload the card database.</translation>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>The following shortcuts have been set to default:
@@ -6776,12 +7766,12 @@ Please check your shortcut settings!</translation>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -6789,27 +7779,27 @@ Please check your shortcut settings!</translation>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>Enable &amp;sounds</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>Current sounds theme:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>Test system sound engine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>Sound settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>Master volume</translation>
     </message>
@@ -6817,48 +7807,48 @@ Please check your shortcut settings!</translation>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation>Spoilers season has ended</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>Deleting spoiler.xml. Please run Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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>Spoilers download failed</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation>No internet connection</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation>Spoilers already up to date</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation>No new spoilers added</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation>Spoilers have been updated!</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation>Last change:</translation>
     </message>
@@ -6881,16 +7871,146 @@ Please check your shortcut settings!</translation>
         <translation>Invalid reply received from the release update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="177"/>
         <source>No reply received from the tag update server.</source>
         <translation>No reply received from the tag update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="184"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Invalid reply received from the tag update server.</translation>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7022,56 +8142,227 @@ Please check your shortcut settings!</translation>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation type="unfinished"/>
+    </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="262"/>
+        <source>Any</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>Card Info</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>Floating</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation>Reset layout</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="82"/>
         <source>Deck: %1</source>
         <translation>Deck: %1</translation>
     </message>
@@ -7079,61 +8370,49 @@ Please check your shortcut settings!</translation>
 <context>
     <name>TabDeckEditorVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7141,22 +8420,22 @@ Please check your shortcut settings!</translation>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <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"/>
     </message>
@@ -7197,8 +8476,8 @@ Please check your shortcut settings!</translation>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>New folder</translation>
     </message>
@@ -7214,84 +8493,84 @@ Please check your shortcut settings!</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>Enter deck name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>This decklist does not have a name.
 Please enter a name:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>Unnamed deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>Delete local file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Name of new folder:</translation>
     </message>
@@ -7304,17 +8583,17 @@ Please enter a name:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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"/>
     </message>
@@ -7355,7 +8634,7 @@ Please enter a name:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation type="unfinished"/>
     </message>
@@ -7363,197 +8642,191 @@ Please enter a name:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>Replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>Game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>Player List</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>Card Info</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>Messages</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>Replay Timeline</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>&amp;Phases</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>&amp;Game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>Next &amp;phase</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation>Next phase with &amp;action</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>Next &amp;turn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation>Käännä vuorojärjestys</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>&amp;Remove all local arrows</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>Rotate View Cl&amp;ockwise</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>Rotate View Co&amp;unterclockwise</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>Game &amp;information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>&amp;Concede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Leave game</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>C&amp;lose replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;Focus Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>&amp;Say:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>&amp;View</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>Floating</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation>Reset layout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>Concede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>Are you sure you want to concede this game?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation>Unconcede</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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>You have already conceded.  Do you want to return to this game?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>Poistu pelistä</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>Haluatko varmasti poistua pelistä?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation>Pelaaja on littynyt peliin #%1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>You have been kicked out of the game.</translation>
     </message>
@@ -7561,7 +8834,7 @@ Please enter a name:</translation>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
@@ -7569,158 +8842,158 @@ Please enter a name:</translation>
 <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>Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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>Time;SenderName;SenderIP;Message;TargetID;TargetName</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation>Room Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>Game Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>Chat Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>You must select at least one filter.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>You have to select a valid number of days to locate.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>Käyttäjätunnus:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>IP-osoite:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>Pelin Nimi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>Peli-ID:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>Viesti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>Main Room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>Game Room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>Private Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>Past X Days: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>Tänään</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>Last Hour</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation>Maximum Results: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>At least one filter is required.
 The more information you put in, the more specific your results will be.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation>Get User Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation>Clear Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation>Log Locations</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation>Date Range</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation>Maximum Results</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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>Message History</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation>Failed to collect message history information.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation>There are no messages for the selected filters.</translation>
     </message>
@@ -7738,27 +9011,27 @@ The more information you put in, the more specific your results will be.</transl
         <translation>&amp;Leave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Private chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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>This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation>Private message from</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1 has left the server.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1 has joined the server.</translation>
     </message>
@@ -7766,180 +9039,180 @@ The more information you put in, the more specific your results will be.</transl
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>Local file system</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>Server replay storage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>Watch replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>Delete</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>Download replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>Toggle expiration lock</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>Delete local file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>Delete remote replay</translation>
     </message>
@@ -7952,47 +9225,62 @@ The more information you put in, the more specific your results will be.</transl
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>&amp;Say:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>&amp;Room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Leave room</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>&amp;Clear chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>Chat Settings...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation> mentioned you.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation>Click to view</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>You are flooding the chat. Please wait a couple of seconds.</translation>
     </message>
@@ -8005,30 +9293,30 @@ The more information you put in, the more specific your results will be.</transl
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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"/>
     </message>
@@ -8036,92 +9324,97 @@ The more information you put in, the more specific your results will be.</transl
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>Oletko varma?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>There are still open games. Are you sure you want to quit?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation>Click to view</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Your buddy %1 has signed on!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation>Tuntematon Tapahtuma</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8132,39 +9425,39 @@ This message might mean there is a new version of Cockatrice available or this s
 To update your client, go to Help -&gt; Check for Updates.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation>Idle Timeout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>You are about to be logged out due to inactivity.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>Promotion</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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>You have been promoted. Please log out and back in for changes to take effect.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>Warned</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>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.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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>You have received the following message from the server.
@@ -8173,6 +9466,11 @@ Please refrain from engaging in this activity or further actions may be taken ag
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8213,42 +9511,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Life</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Valkoinen</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Sininen</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Musta</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Punainen</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Vihreä</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Väritön</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Muu</translation>
     </message>
@@ -8256,151 +9554,209 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation>Could not open the file for reading.</translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>User &amp;details</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>Private &amp;chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Show this user&apos;s &amp;games</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>Add to &amp;buddy list</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Remove from &amp;buddy list</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>Add to &amp;ignore list</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Remove from &amp;ignore list</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>Kick from &amp;game</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="67"/>
         <source>Warn user</source>
         <translation>Warn user</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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>View user&apos;s war&amp;n history</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="69"/>
         <source>Ban from &amp;server</source>
         <translation>Ban from &amp;server</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>View user&apos;s &amp;ban history</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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Promote user to moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>Dem&amp;ote user from moderator</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </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="74"/>
         <source>Demote user from judge</source>
         <translation>Demote user from judge</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="75"/>
         <source>View admin notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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"/>
     </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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>%1&apos;s games</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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>Ban History</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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>Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation>User has never been banned.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation>Failed to collect ban information.</translation>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation>Warning History</translation>
     </message>
@@ -8415,55 +9771,65 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation>User has never been warned.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation>Failed to collect warning information.</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="249"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>Success</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>Successfully promoted user.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>Successfully demoted user.</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Failed</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>Failed to promote user.</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>Failed to demote user.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation>Copy hash to clipboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -8471,311 +9837,554 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>Location:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>Account Age:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>Muokkaa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>Vaihda Salasana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>Vaihda avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>Administrator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>Moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>Registered user</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>Unregistered user</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>Judge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>Unknown</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>Information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>User information updated.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></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="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"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>This server does not permit you to update your user informations.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>Password changed.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>This server does not permit you to change your password.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>The new password is too short.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>The old password is incorrect.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>Avatar updated.</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>This server does not permit you to update your avatar.</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>An error occured while trying to updater your avatar.</translation>
+        <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>This server does not permit you to update your user informations.</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>General interface settings</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>&amp;Double-click cards to play them (instead of single-click)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>&amp;Play all nonlands onto the stack (not the battlefield) by default</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>Annotate card text on tokens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Use tear-off menus, allowing right click menus to persist on screen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation>Ilmoitusasetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>Ota tehtäväpalkin ilmoitukset käyttöön</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>Notify in the taskbar for game events while you are spectating</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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>Notify in the taskbar when users in your buddy list connect</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>Animaatioasetukset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;Tap/untap animation</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <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"/>
     </message>
@@ -8783,22 +10392,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
@@ -8806,124 +10415,256 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8931,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="41"/>
+        <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"/>
     </message>
@@ -8939,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="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
@@ -8959,27 +10700,37 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -8987,50 +10738,93 @@ 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="53"/>
+        <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"/>
     </message>
     <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -9038,46 +10832,25 @@ 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="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -9085,47 +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="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9133,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="25"/>
+        <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"/>
     </message>
@@ -9141,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="47"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -9164,17 +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="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9182,43 +10960,43 @@ 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_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>Which warning would you like to send?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>Warn user for misconduct</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>Virhe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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>User name to send a warning to can not be blank, please specify a user to warn.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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>Warning to use can not be blank, please select a valid warning to send.</translation>
     </message>
@@ -9226,133 +11004,133 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <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>Move selected set to the top</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>Move selected set up</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>Move selected set down</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>Move selected set to the bottom</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation>Search by set name, code, or type</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="70"/>
         <source>Default order</source>
         <translation>Default order</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>Restore original art priority order</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="107"/>
         <source>Enable all sets</source>
         <translation>Enable all sets</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="108"/>
         <source>Disable all sets</source>
         <translation>Disable all sets</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="109"/>
         <source>Enable selected set(s)</source>
         <translation>Enable selected set(s)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation>Disable selected set(s)</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="126"/>
         <source>Deck Editor</source>
         <translation>Deck Editor</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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation type="unfinished"/>
     </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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Card Art</source>
         <translation>Card Art</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation>How to use custom card art</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation>Hints</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation>Note</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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation>Sorting by column allows you to find a set while not changing set priority.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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>To enable ordering again, click the column header until this message disappears.</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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation>Use the current sorting as the set priority instead</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
         <source>Sorts the set priority using the same column</source>
         <translation>Sorts the set priority using the same column</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation>Manage sets</translation>
     </message>
@@ -9360,72 +11138,72 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>shuffle when closing</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>pile view</translation>
     </message>
@@ -9433,7 +11211,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>Suomi (Finnish)</translation>
     </message>
@@ -9441,12 +11219,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation>Connect on startup</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation>Debug to file</translation>
     </message>
@@ -9454,1005 +11232,1078 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>Main Window</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation>Deck Editor</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>Game Lobby</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation>Card Counters</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation>Player Counters</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>Power and Toughness</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>Game Phases</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>Playing Area</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation>Move Selected Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>View</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation>Move Top Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation>Move Bottom Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>Gameplay</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation>Drawing</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation>Chat Room</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation>Game Window</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation>Load Deck from Clipboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation>Check for Card Updates...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation>Connect...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>Katkaise yhteys</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>Exit</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>Full screen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation>Register...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation>Settings...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation>Start a Local Game...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation>Watch Replay...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation>Clear All Filters</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation>Clear Selected Filter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>Close</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation>Remove Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation>Manage Sets...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation>Edit Custom Tokens...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation>Add Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation>Load Deck...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Load Deck from Clipboard...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation>New Deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Open Custom Pictures Folder</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation>Print Deck...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation>Delete Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation>Reset Layout</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation>Tallenna Pakka</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation>Save Deck as...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Save Deck to Clipboard, Annotated</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation>Save Deck to Clipboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation>Load Local Deck...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation>Load Remote Deck...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation>Set Ready to Start</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Toggle Sideboard Lock</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation>Add Green Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation>Remove Green Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation>Set Green Counters...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation>Add Red Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation>Remove Red Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation>Set Red Counters...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation>Add Life Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation>Remove Life Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation>Set Life Counters...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation>Add White Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation>Remove White Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation>Set White Counters...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation>Add Blue Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation>Remove Blue Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation>Set Blue Counters...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation>Add Black Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation>Remove Black Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation>Set Black Counters...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation>Add Colorless Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation>Remove Colorless Counter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation>Set Colorless Counters...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation>Add Power (+1/+0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Remove Power (-1/-0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Move Toughness to Power (+1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Add Toughness (+0/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Remove Toughness (-0/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Move Power to Toughness (-1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Add Power and Toughness (+1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Remove Power and Toughness (-1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation>Set Power and Toughness...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation>Reset Power and Toughness</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>Untap</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>Upkeep</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>Draw</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation>First Main Phase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation>Start Combat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>Attack</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>Block</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>Damage</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation>End Combat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation>Second Main Phase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>End</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation>Next Phase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation>Next Phase Action</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation>Next Turn</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation>Tap / Untap Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation>Untap All</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
-        <translation>Toggle Untap</translation>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation>Turn Card Over</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation>Peek Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation>Play Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation>Attach Card...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation>Unattach Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation>Clone Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation>Create Token...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation>Create All Related Tokens</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation>Create Another Token</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation>Set Annotation...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation>Bottom of Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>Exile</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>Graveyard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>Hand</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation>Top of Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation>Battlefield, Face Down</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation>Battlefield</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation>Top Cards of Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation>Close Recent View</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation>Stack</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation>Graveyard (Multiple)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation>Exile (Multiple)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation>Draw Arrow...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation>Remove Local Arrows</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation>Leave Game</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>Concede</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation>Roll Dice...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation>Shuffle Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation>Draw a Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation>Draw Multiple Cards...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation>Undo Draw</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation>Always Reveal Top Card</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation>Rotate View Clockwise</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Rotate View Counterclockwise</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation>Unfocus Text Box</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation>Focus Chat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation>Clear Chat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation>Refresh</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_fr.ts b/cockatrice/translations/cockatrice_fr.ts
index 5cd205a48..c85b6fbdd 100644
--- a/cockatrice/translations/cockatrice_fr.ts
+++ b/cockatrice/translations/cockatrice_fr.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>Nombre de marqueur&amp;s…</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>Nombre de marqueurs</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Nouvelle valeur des marqueurs « %1 » :</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Rafraîchir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Analyser le nom et le numéro de l&apos;extension (si disponibles)</translation>
     </message>
@@ -36,81 +36,83 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation>Ouvrir dans un nouvel onglet</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation>Êtes-vous sûr ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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>La liste de deck a été modifiée.
 Voulez-vous enregistrer les modifications ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation>N&apos;a pas pu ouvrir le deck à %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation>N&apos;a pas pu sauvegarder le deck distant</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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>Le deck n&apos;a pas pu être enregistré.
 Vérifiez que le répertoire ne soit pas en lecture seule et réessayez.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation>Sauvegarder le deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation>Le deck n&apos;a pas pu être enregistré.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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>Il n&apos;y a pas de cartes dans le deck à exporter</translation>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
-        <translation>Aucun deck n&apos;a été sélectionné pour être exporté.</translation>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
+        <translation>Ajouter un panneau d&apos;analyse</translation>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation>Notes de mises à jour</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation>Notes d&apos;administrateur pour %1</translation>
     </message>
@@ -118,329 +120,380 @@ Vérifiez que le répertoire ne soit pas en lecture seule et réessayez.</transl
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation>Deck principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation>Réserve</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation>Jetons</translation>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
-        <translation type="unfinished"/>
+        <translation>secondes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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>N&apos;a pas pu créer le dossier Thèmes à &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>Paramètres du thème</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>Thème actuel :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation>Ouvrir le dossier des thèmes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
-        <translation type="unfinished"/>
+        <translation>Source d&apos;arrière-plan de l&apos;onglet Accueil:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
+        <translation>Fréquence de mélange de l&apos;arrière-plan de l&apos;onglet Accueil:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
-        <translation type="unfinished"/>
+        <translation>Désactivé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation>Options du Menu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="415"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>Montrer les raccourcis clavier dans les menus clic-droit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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>Afficher les barres d&apos;outil et de recherche au-dessus de la liste des parties dans l&apos;onglet salon.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>Rendu des cartes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>Afficher les noms des cartes ayant une image</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>Rotation automatique des cartes avec disposition horizontale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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>Remplacer toutes les illustrations de cartes par les préférences personnelles (comportement avant modification du ProviderID)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation>Système</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="409"/>
+        <source>Display card name of background in bottom right</source>
+        <translation>Afficher le nom de la carte d&apos;arrière-plan en bas à droite</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation>Images de la carte</translation>
+    </message>
+    <message>
+        <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>Mettre en avant que ce deck contient des cartes depuis le sommet, dans le sélecteur d&apos;impression</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>Agrandir les cartes lors du survol du curseur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation>Utiliser des bords de cartes arrondis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation>Disposition de la carte</translation>
+    </message>
+    <message>
+        <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>Pourcentage minimum de chevauchement des cartes dans la pile et dans la main verticale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="434"/>
         <source>Maximum initial height for card view window:</source>
         <translation>Hauteur initiale maximale pour la fenêtre d&apos;affichage des cartes :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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>lignes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="436"/>
         <source>Maximum expanded height for card view window:</source>
         <translation>Hauteur étendue maximale pour la fenêtre d&apos;affichage des cartes :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation>Marqueurs sur la carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation>Marqueur %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>Disposition de la main</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Afficher la main horizontalement (perte d&apos;espace)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>Activer la justification à gauche</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>Disposition en forme de grille</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>Inverser la disposition du champ de bataille</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Nombre minimum de joueurs pour la disposition multi-colonnes :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Taille maximale de la police pour les informations affichées sur les cartes  :</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="136"/>
+        <source>Back to results</source>
+        <translation>Retour aux résultats</translation>
+    </message>
+    <message>
+        <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>Ouvrir le deck dans l&apos;éditeur de deck</translation>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
         <source>Theme</source>
-        <translation type="unfinished"/>
+        <translation>Thème</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
         <source>Art crop of random card</source>
-        <translation type="unfinished"/>
+        <translation>Recadrage d&apos;image d&apos;une carte aléatoire</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
         <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
+        <translation>Recadrage d&apos;image du fichier background.cod</translation>
     </message>
 </context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>bannir &amp;nom d&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>bannir &amp;adresse IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>bannir &amp;ID du client</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>Type du bannissement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;bannissement permanent</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>bannissement &amp;temporaire</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>&amp;Jours :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Heures :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minutes :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>Durée du bannissement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>Veuillez expliquer la raison du bannissement.
 Cette information sera consultable uniquement par les modérateurs et ne sera pas visible par la personne bannie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>Veuillez expliquer la raison du bannissement. Cette information sera visible par la personne bannie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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>Censurer tous les messages de cet utilisateur dans toutes les salles</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>Bannir le joueur du serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>Vous devez choisir un bannissement à partir du nom, de l&apos;adresse IP, de l&apos;ID du client, ou une combinaison des trois.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>Vous devez remplir le champ du nom du banni en le choisissant dans la liste.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>Vous devez saisir l&apos;adresse IP du banni en le choisissant dans la liste.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>Vous devez saisir l&apos;ID du client banni en le choisissant dans la liste.</translation>
     </message>
@@ -448,152 +501,221 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation>Beta</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation>Le serveur de mise à jour ne répond pas.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Réponse reçue du serveur de mise à jour de version invalide .</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation>Le serveur de mise à jour de fichier ne répond pas.</translation>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation>Aucune carte sélectionné</translation>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation>Carte</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation>Mode</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation>Raison</translation>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>Éditions</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>Coût de mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>Type de carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>F/E</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>Couleur(s)</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation>Ajouter au deck</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation>Choisir l&apos;image</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>ET</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>OU</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>ET PAS</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>OU PAS</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation>Nom (Exact)</translation>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>Couleur</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation>Édition</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>Coût de mana</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation>Valeur de Mana</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>Rareté</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>Force</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>Endurance</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>Loyauté</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation>Type principal</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation>Sous-type</translation>
     </message>
@@ -601,22 +723,22 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <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>Image</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>Description</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>Les deux</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>Voir la transformation</translation>
     </message>
@@ -624,22 +746,22 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation>Voir les cartes associées</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation>Ajouter la carte au deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation>Deck principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation>Réserve</translation>
     </message>
@@ -652,12 +774,22 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
         <translation>Nom:</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>Édition :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation>Cartes associées :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation>Carte inconnue :</translation>
     </message>
@@ -665,132 +797,150 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <translation>Révéler à...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Tous les joueurs</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
-        <translation type="unfinished"/>
+        <translation>Voir les cartes associées</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
-        <translation type="unfinished"/>
+        <translation>Jeton :</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
-        <translation type="unfinished"/>
+        <translation>Tout les jetons</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Sélectionner Tout</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
+        <translation>Sél&amp;ectionne une ligne</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
+        <translation>Sél&amp;ectionne une colonne</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Jouer</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Cacher</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
+        <translation>Jouer &amp;Face Cachée</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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>&amp;Engager / Dégager</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
-        <translation type="unfinished"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
+        <translation>Ne pas dégager</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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>Reto&amp;urner</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Regarder furtivement la carte face cachée</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Cloner</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
+        <translation>Attac&amp;her à une carte...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
+        <translation>Détac&amp;her</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Tracer une flèche...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
+        <translation>&amp;Annoter...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
+        <translation>Ma&amp;rqueurs sur la carte</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Ajouter un marqueur (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
+        <translation>&amp;Retirer un marqueur (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation>&amp;Changer le nombre de marqueurs (%1)...</translation>
+    </message>
+</context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
-        <source>&amp;Set counters (%1)...</source>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation>Taille de la Carte</translation>
     </message>
@@ -798,142 +948,142 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>sa main</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>main de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>sa bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>bibliothèque de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
-        <translation type="unfinished"/>
+        <translation>de sa bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
+        <translation>de la bibliothèque de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>sa bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>bibliothèque de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>sa bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>bibliothèque de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>sa bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>bibliothèque de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>son cimetière</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>le cimetière de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>sa zone d&apos;exil</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>la zone d&apos;exil de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>sa réserve</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>la réserve de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>sa réserve</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>la réserve de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>sa zone personnalisée &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>La zone personnalisée &apos;%2&apos; de %1</translation>
     </message>
 </context>
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Erreur de lecture à la ligne %1 (colonne %2)</translation>
     </message>
@@ -941,29 +1091,470 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Erreur de lecture à la ligne %1 (colonne %2)</translation>
     </message>
 </context>
 <context>
-    <name>CustomZoneMenu</name>
+    <name>ColorButton</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
-        <source>C&amp;ustom Zones</source>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
-        <source>View custom zone &apos;%1&apos;</source>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation>Choisir la couleur</translation>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
     </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation>Banni par le modérateur</translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation>Heure de fin estimé: %1</translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation>Ce bannissement dure indéfiniment.</translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation>Information</translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Réinitialiser le mot de passe</translation>
+    </message>
+    <message>
+        <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>Votre mot de passe à été réinitialisé avec succes, vous pouvez maintenant vous connecter avec le nouveau mot de passe.</translation>
+    </message>
+    <message>
+        <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>Échec de la réinitialisation du mot de passe. Veuillez contacter l&apos;administrateur du serveur pour réinitialiser votre mot de passe.</translation>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>CustomZoneMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
+        <source>C&amp;ustom Zones</source>
+        <translation>Zones pe&amp;rsonnalisés</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
+        <source>View custom zone &apos;%1&apos;</source>
+        <translation>Voir la zone personnalisée &apos;%1&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation>Ajouter un panneau</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation>Enlever un Panneau</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation>Sauver cette disposition</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation>Charger une disposition</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation>Base de données de cartes</translation>
+    </message>
 </context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation>Infos de la carte</translation>
     </message>
@@ -971,47 +1562,17 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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>Rechercher par nom de carte (ou expression de recherche)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation>Ajouter au deck</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation>Ajouter à la réserve</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation>Choisir l&apos;impression</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation>Afficher les cartes associées</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="127"/>
         <source>Add card to &amp;maindeck</source>
         <translation>Ajouter la carte au &amp;deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="128"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Ajouter carte à la ré&amp;serve</translation>
     </message>
@@ -1019,87 +1580,97 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation>Chargement de la base de données...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation>Carte bannière</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation>Type principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation>Coût de mana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation>Choisir l&apos;impression</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation>&amp;Nom du deck :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation>Paramètres de visibilité de la carte bannière et des étiquettes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
         <source>Show banner card selection menu</source>
         <translation>Montrer le menu de sélection de carte bannière</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation>Montrer le menu de sélection d&apos;étiquettes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation>&amp;Commentaires :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation>Grouper par :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation>Format :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation>Empreinte :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation>Augmenter quant&amp;ité</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation>&amp;Diminuer quantité</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation>&amp;Retirer la ligne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="752"/>
         <source>Swap card to/from sideboard</source>
         <translation>Échanger la carte vers/depuis la réserve</translation>
     </message>
@@ -1125,114 +1696,114 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation>&amp;Éditeur de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation>&amp;Nouveau deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation>&amp;Charger un deck...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation>Charger un deck récent...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation>&amp;Sauvegarder le deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation>S&amp;auvegarder le deck sous...</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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation>Charger un deck depuis le presse-pap&amp;ier...</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="162"/>
         <source>Edit deck in clipboard</source>
         <translation>Éditer le deck dans le presse-papier</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="166"/>
+        <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>Avec annotations</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="168"/>
+        <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>Sans annotation</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation>Copier le deck dans le presse-papier</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="168"/>
         <source>Annotated (No set info)</source>
         <translation>Annoté (pas d&apos;info sur l&apos;extension)</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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation>Pas annoté (pas d&apos;info sur l&apos;extension)</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="172"/>
         <source>&amp;Print deck...</source>
         <translation>Im&amp;primer le deck...</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="174"/>
         <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
+        <translation>Charger un deck depuis un service en ligne...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation>Envoyer le deck au service en &amp;ligne</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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation>Créer une liste de deck (decklist.org)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation>Créer une liste de deck (decklist.xyz)</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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation>&amp;Analyser le deck sur deckstats.net</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation>Analyser le deck (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation>&amp;Fermer</translation>
     </message>
@@ -1240,7 +1811,7 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation>Sélection d&apos;impression</translation>
     </message>
@@ -1248,194 +1819,171 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>Mettre à jour les spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>Réussite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation>Les URLs de téléchargement ont été réinitialisées.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>Les images des cartes téléchargées ont été supprimées.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>Erreur</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation>Une ou plusieurs images de cartes téléchargées n&apos;ont pas pu être supprimées.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>Ajouter une URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>URL :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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>Modifier l&apos;URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation>Taille du cache du réseau :</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation>Rediriger le TTL du cache :</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation>Combien de temps les redirections mises en cache pour les URL sont-elles valides.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation>Taille du cache des images :</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation>Ajouter Nouveau Lien</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation>Effacer Lien</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation>Jour(s)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>Mise à jour...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>Choisir le chemin</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation>URL de téléchargement prioritaire</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>Télécharger automatiquement les spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation>Emplacement des spoilers :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>Dernier changement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>Télécharger automatiquement les spoilers au lancement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>Appuyez sur le bouton pour mettre à jour manuellement sans redémarrer.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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>Ne pas fermer la fenêtre des paramètres avant la mise à jour manuelle complète.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation>Télécharger les images des cartes à la volée</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation>Comment ajouter une URL personnalisée</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>Supprimer les images téléchargées</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation>Réinitialiser les URL de téléchargement </translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
-        <translation>Cache pour les images téléchargées</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
+        <translation>Défaire</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
-        <translation>Cache en mémoire pour les imges non affichées actuellement</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation>Refaire</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation>Historique</translation>
+    </message>
+    <message>
+        <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>Clickez sur une ligne pour retourner à ce point dans l&apos;historique.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation>[refaire]</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
+        <translation>[défaire]</translation>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation>Compter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation>Édition</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>Nombre</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation>Provider ID</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>Carte</translation>
     </message>
@@ -1443,12 +1991,12 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation>Formats de decks courants (%1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation>Tous les fichiers (*.*)</translation>
     </message>
@@ -1456,17 +2004,17 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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>Mode : correspondance exacte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
         <source>Mode: Includes</source>
         <translation>Mode : inclure</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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>Mode de filtre par identité de couleur (conjonctions AND/OR/NOT de filtres)</translation>
     </message>
@@ -1474,7 +2022,7 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
         <source>Edit tags ...</source>
         <translation>Éditer les étiquettes...</translation>
     </message>
@@ -1482,62 +2030,62 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
         <source>Deck Tags Manager</source>
         <translation>Gestionnaire d&apos;étiquettes de decks</translation>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation>Gérer vos étiquettes de decks. Ajouter ou retirer les étiquettes comme nécessaire, ou en créer de nouveaux :</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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation>Ajouter une nouvelle étiquette (e.g., Elfes)</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="104"/>
         <source>Add Tag</source>
         <translation>Ajouter Étiquette</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="105"/>
         <source>Filter tags...</source>
         <translation>Filtrer les étiquettes...</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="106"/>
         <source>OK</source>
         <translation>OK</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="107"/>
         <source>Edit default tags</source>
         <translation>Éditer les étiquettes par défaut</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="108"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation>Entrée invalide</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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>Le nom de l&apos;étiquette ne peut pas être vide !</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation>Étiquette dupliquée</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>This tag already exists.</source>
         <translation>Cette étiquette existe déjà.</translation>
     </message>
@@ -1545,98 +2093,156 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation>Carte bannière</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
         <source>Open in deck editor</source>
         <translation>Ouvrir dans l&apos;éditeur de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation>Éditer les étiquettes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation>Renommer le deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
         <source>Save Deck to Clipboard</source>
         <translation>Copier le deck dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation>Avec annotations</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
         <source>Annotated (No set info)</source>
         <translation>Avec annotations (pas d&apos;info sur l&apos;extension)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation>Sans annotation</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
         <source>Not Annotated (No set info)</source>
         <translation>Sans annotation (pas d&apos;info sur l&apos;extension)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation>Renommer le fichier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation>Supprimer le fichier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation>Choisir la carte bannière</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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>Nouveau nom :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation>Renommage échoué</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation>Supprimer le fichier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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>Êtes-vous certain de vouloir supprimer le fichier sélectionné ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation>Suppression échouée</translation>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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>Renommer le deck de &quot;%2&quot; à &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
+        <source>Updated comments (was %1 chars, now %2 chars)</source>
+        <translation>Mis à jour les commentaires (étaient %1 caractères, maintenant %2)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation>Définir %1 (%2) comme carte de couverture</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation>Tags modifiés</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation>Changer le format à %1</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation>Ajouté (%1): %2 (%3) %4</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="264"/>
+        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
+        <translation>Bougé %1 1 × &quot;%2&quot; (%3)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation>Retiré &quot;%1&quot; (toutes les copies)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation>%1 1 × &quot;%2&quot; (%3)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation>Ajoutée</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation>Retirée</translation>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1654,75 +2260,75 @@ Cette information sera consultable uniquement par les modérateurs et ne sera pa
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>Charger un deck...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Charger un deck distant...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation>Charger depuis le presse-papier...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
-        <translation type="unfinished"/>
+        <translation>Charger depuis un site web...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation>Annuler le chargement du deck</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>Prêt à démarrer</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation>Forcer le démarrage</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation>Réserve déverrouillée</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation>Réserve verrouillée</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>Erreur</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>Le fichier sélectionné n&apos;a pas pu être chargé.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation>Le deck est plus grand que la taille maximum de fichier.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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>Êtes-vous sûr de vouloir forcer le démarrage ?
 Cela va éjecter de la partie tous les joueurs non prêts à démarrer.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -1757,143 +2363,143 @@ Voulez-vous convertir le deck au format .cod ?</translation>
         <translation>Téléchargement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>Hôtes connus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation>Supprimer le serveur enregistré actuellement sélectionné</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Actualiser la liste de serveurs avec des serveurs publics connus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>Nouvel hôte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>Nom  :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;Hôte :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nom du joueur :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>Mot de p&amp;asse :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>&amp;Se souvenir du mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>Connexion a&amp;utomatique</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Se connecter automatiquement avec les identifiants les plus récents à l&apos;ouverture de Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>Si vous rencontrez des difficultés pour vous connecter ou vous inscrire, contactez le personnel du serveur pour obtenir de l&apos;aide !</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>Page web</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation>Réinitialiser le mot de masse</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation>Mot de passe oublié ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>&amp;Connecter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>Identifiants</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation>Contact du serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>Se connecter au serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation>URL du serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation>Port de communication</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation>Nom de serveur unique</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>Avertissement de connexion</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>Vous devez attribuer un nom à votre nouveau profil de connexion.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>Avertissement de connexion</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Le nom du joueur ne peut être vide.</translation>
     </message>
@@ -1901,117 +2507,122 @@ Voulez-vous convertir le deck au format .cod ?</translation>
 <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>Conserver les para&amp;mètres</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>&amp;Description :</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>&amp;Joueurs :</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>Général</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 de partie</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>Mot de &amp;passe :</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>Seuls les &amp;amis peuvent rejoindre</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>Seuls les joueurs en&amp;registrés peuvent rejoindre</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>Conditions pour rejoindre</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>Les &amp;spectateurs peuvent observer</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>Les spectateurs ont besoin d&apos;un &amp;mot de passe pour observer</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>Les spectateurs peuvent dis&amp;cuter</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>Les spectateurs peuvent voir les &amp;mains des joueurs</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>Créer la partie en tant que spectateur</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>Spectateurs</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>Total initial de point de vie</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>Ouvrir les listes de deck dans le lobby</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation>Créer une partie en tant que juge</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation>Options de configuration de la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>Effa&amp;cer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>Créer une partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>Informations sur la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>Erreur serveur.</translation>
     </message>
@@ -2019,97 +2630,97 @@ Voulez-vous convertir le deck au format .cod ?</translation>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nom :</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Jeton</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;ouleur :</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>blanc</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>bleu</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>noir</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>rouge</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>vert</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>multicolore</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>incolore</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;F/E :</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotation :</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Detruire le jeton lorsqu&apos;il quitte le champ de bataille</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation>Créer face-cachée (cache seulement le nom)</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Données du jeton</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Afficher &amp;tous les jetons</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Afficher les jetons présents dans ce &amp;deck</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>Choisir un jeton dans la liste</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>Créer un jeton</translation>
     </message>
@@ -2117,53 +2728,53 @@ Voulez-vous convertir le deck au format .cod ?</translation>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation>Éditer les étiquettes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation>Confirmer</translation>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation>Annuler</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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation>Entrer une étiquette et valider avec Entrée</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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>✖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation>Entrée invalide</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation>Le nom de l&apos;étiquette ne peut pas être vide !</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation>Étiquette dupliquée</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation>Cette étiquette existe déjà.</translation>
     </message>
@@ -2171,40 +2782,40 @@ Voulez-vous convertir le deck au format .cod ?</translation>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>Aucune image choisie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Pour changer votre avatar, choisissez une nouvelle image.
 Pour enlever votre avatar actuel, confirmez sans choisir une nouvelle image.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>Parcourir...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>Changer d&apos;avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>Ouvrir l&apos;image</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Fichiers image (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>L&apos;image choisie est invalide.</translation>
     </message>
@@ -2212,17 +2823,17 @@ Pour enlever votre avatar actuel, confirmez sans choisir une nouvelle image.</tr
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation>Éditer le deck dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation>Liste de deck invalide.</translation>
     </message>
@@ -2230,38 +2841,38 @@ Pour enlever votre avatar actuel, confirmez sans choisir une nouvelle image.</tr
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Ancien mot de passe :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nouveau mot de passe :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Confirmer le nouveau mot de passe :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Changer le mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Mot de passe trop court</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Les nouveaux mots de passe ne correspondent pas.</translation>
     </message>
@@ -2269,93 +2880,93 @@ Pour enlever votre avatar actuel, confirmez sans choisir une nouvelle image.</tr
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nom :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;ouleur :</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="34"/>
         <source>white</source>
         <translation>blanc</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="35"/>
         <source>blue</source>
         <translation>bleu</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="36"/>
         <source>black</source>
         <translation>noir</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="37"/>
         <source>red</source>
         <translation>rouge</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="38"/>
         <source>green</source>
         <translation>vert</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="39"/>
         <source>multicolor</source>
         <translation>multicolore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>incolore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;F/E :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotation :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Données du jeton</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>Ajouter un jeton</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Retirer le jeton</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation>Éditer les jetons personnalisés</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Entrez le nom du jeton :</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>Erreur</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>Le nom choisi est en conflit avec une carte ou un jeton existant.
@@ -2380,12 +2991,12 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
         <translation>Indéfini</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Nom réel :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Modifier le profil utilisateur</translation>
     </message>
@@ -2423,112 +3034,113 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
         <translation>2 heures</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation>Ne pas afficher les parties « amis uniquement »</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation>Cacher les parties pleines</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation>Cacher les parties qui ont commencées</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation>Cacher les parties protégées par un mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation>Cacher les parties des utilisateurs ignorés</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
-        <translation>Cacher les parties non créées par des amis.</translation>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
+        <translation>Cacher les parties non-crées par vos amis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
-        <translation type="unfinished"/>
+        <translation>Masquer les parties avec les listes de decks ouvertes forcées</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Créées avant :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Description de la partie :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>Nom du &amp;créateur :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>Types de &amp;partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>au &amp;moins :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>au &amp;plus :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>Nombre de joueurs maximum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>Restrictions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Montrer les parties uniquement si les %spectateurs peuvent observer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Montrer les parties où les spectateurs doivent ent&amp;rer un mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Montrer uniquement si les spectateurs peuvent p&amp;arler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Montrer uniquement si les spectateurs peuvent voir les &amp;mains</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation>Spectateurs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>Flitrer les parties</translation>
     </message>
@@ -2536,52 +3148,52 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
 <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>Avertissement Réinitialisation du mot de passe Challenge</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>Un probleme est survenu. Veuillez réessayer de demander un nouveau mot de passe.</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>Veuillez entrer les informations du serveur et du compte pour lesquels vous voulez demander un nouveau mot de passe.</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>&amp;Hôte :</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>&amp;Port :</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>&amp;Nom du joueur :</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>Adresse e-mail :</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>Réinitialisation du mot de passe Challenge</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>Erreur Réinitialisation du mot de passe Challenge</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>L&apos;adresse e-mail ne peut être vide.</translation>
     </message>
@@ -2589,37 +3201,37 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
 <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>Entrez les informations du serveur pour lequel vous souhaitez demander un nouveau mot de passe</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>&amp;Hôte :</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>&amp;Port :</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>&amp;Nom du joueur :</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>Demande de réinitialisation du mot de passe</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>Erreur lors de la réinitialisation du mot de passe</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>Le nom du joueur ne peut être vide.</translation>
     </message>
@@ -2627,86 +3239,86 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
 <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>Avertissement lors de la réinitialisation du mot de passe</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>Un problème est survenu. Veuillez demander un nouveau mot de passe.</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>Entrez le code reçu et le nouveau mot de passe afin d&apos;initialiser le nouveau mot de passe</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>&amp;Hôte :</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>&amp;Port :</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>&amp;Nom du joueur :</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>Jeton :</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>Nouveau mot de passe :</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>Réinitialiser le mot de passe</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>Le nom du joueur ne peut être vide.</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>Erreur de réinitialisation du mot de passe</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>Le jeton ne peut pas être vide.</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>Le nouveau mot de passe ne peut être vide.</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>Erreur</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>Mot de passe trop court</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>Les mots de passe ne correspondent pas.</translation>
     </message>
@@ -2722,17 +3334,17 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>Charger le deck depuis le presse-papier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>Liste de Deck invalide.</translation>
     </message>
@@ -2740,43 +3352,43 @@ Assurez-vous d&apos;activer l&apos;édition « Fausse édition contenant les je
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
+        <translation>Collez ici un lien vers un site de liste de deck pour l&apos;importer.(Archidekt, Deckstats, Moxfield et TappedOut sont supportés.)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
+        <translation>Charger un deck depuis un site web</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
-        <translation type="unfinished"/>
+        <translation>Aucun analyseur disponible pour ce fournisseur de deck.(Archidekt, Deckstats, Moxfield et TappedOut sont supportés.)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Erreur réseau : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
+        <translation>Données de deck vide reçues.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
+        <translation>Échec de l&apos;analyse des données du deck : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2784,51 +3396,90 @@ https://archidekt.com/decks/9999999
 https://deckstats.net/decks/99999/9999999-your-deck-name/en
 https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
 https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
+        <translation>L&apos;URL fournie n&apos;est pas reconnue comme une URL de deck valide.
+Les URL de deck valides ressemblent à ceci:
+
+https://archidekt.com/decks/9999999
+https://deckstats.net/decks/99999/9999999-your-deck-name/en
+https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
+https://tappedout.net/mtg-decks/your-deck-name/</translation>
     </message>
 </context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>Charger Deck</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation>Joueurs :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation>Général</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation>Total de vie initial :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation>Options de configuration de la partie</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation>Conserver les paramètres</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation>Options de configuration de partie locale</translation>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation>Nom de la carte (ou expression de recherche) :</translation>
     </message>
     <message>
-        <location filename="src/game/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>Nombre de cartes trouvées :</translation>
     </message>
     <message>
-        <location filename="src/game/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>Jouer les cartes trouvées automatiquement</translation>
     </message>
     <message>
-        <location filename="src/game/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>Placer la carte du dessus sur la pile jusqu&apos;à...</translation>
     </message>
     <message>
-        <location filename="src/game/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>Aucune carte ne correspondant à l&apos;expression recherchée n&apos;existe dans la base de données de cartes. Continuer malgré tout ?</translation>
     </message>
     <message>
-        <location filename="src/game/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>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/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>Filtre invalide</translation>
     </message>
@@ -2836,53 +3487,53 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Entrez votre identifiant et l&apos;identifiant du serveur auquel vous voulez vous connecter. Un e-mail va vous être envoyé pour vérifier votre compte. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>&amp;Hôte :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nom du joueur :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>Mot de p&amp;asse :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>Mot de passe (encore) :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>Adresse mail :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>Adresse mail (encore) :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>Pays :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>Indéfini</translation>
     </message>
@@ -2928,17 +3579,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation>Nombre de faces:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation>Nombre de dés:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation>Lancer les dés</translation>
     </message>
@@ -2946,40 +3597,55 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation>Cartes non modifiées :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation>Cartes modifiées :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation>Cliquer sur des Extensions pour les activer. Glisser-et-déposer pour les réarranger et changer leur priorité. Les cartes utiliseront la version de l&apos;extension activée ayant la plus haut priorité.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation>Nettoyer toutes les informations sur les extensions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation>Tout régler selon vos préférences</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation>Impressions modifiées en groupe.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation>Toutes les informations d&apos;impressions ont été supprimées.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation>Définir toutes les impressions comme préférées.</translation>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>Erreur inconnue lors du chargement de la base de données de cartes.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -2996,7 +3662,7 @@ Vous devrez peut-être redémarrer Oracle pour mettre à jour votre base de donn
 Voulez-vous changer l&apos;emplacement de votre base de données ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3013,7 +3679,7 @@ Généralement, il suffit de redémarrer oracle pour mettre à jour votre base d
 Voulez-vous changer l&apos;emplacement de votre base de données ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3026,7 +3692,7 @@ Veuillez ouvrir un ticket sur https://github.com/Cockatrice/Cockatrice/issues av
  Voulez-vous changer l&apos;emplacement des données ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3035,7 +3701,7 @@ Would you like to change your database location setting?</source>
 Voulez-vous changer l&apos;emplacement de votre base de données ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3044,7 +3710,7 @@ Would you like to change your database location setting?</source>
 Voulez-vous changer l&apos;emplacement de votre base de données ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3057,59 +3723,64 @@ Veuillez ouvrir un ticket sur https://github.com/Cockatrice/Cockatrice/issues
 Voulez-vous changer l&apos;emplacement de votre base de données ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>Le chemin d&apos;accès vers votre répertoire de decks est invalide. Voulez-vous redéfinir le chemin d&apos;accès ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>Le chemin d&apos;accès vers votre répertoire d&apos;illustrations de cartes est invalide. Voulez-vous redéfinir le chemin d&apos;accès ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>Apparence</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>Interface utilisateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation>Origine de carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>Son</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>Raccourcis</translation>
     </message>
@@ -3117,12 +3788,12 @@ Voulez-vous changer l&apos;emplacement de votre base de données ?</translation>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation>Vérification de la mise à jour des cartes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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>
@@ -3131,27 +3802,27 @@ Choisissez comment vous souhaitez exécuter le programme de mise à jour de la b
 Vous pouvez toujours modifier ce comportement dans l&apos;onglet « Général » des paramètres.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation>S&apos;exécuter en tâche principale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation>S&apos;exécuter en tâche de fond</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="27"/>
         <source>Run in background and always from now on</source>
         <translation>S&apos;exécuter en tâche de fond, et toujours le faire à partir de maintenant</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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation>Ne pas demander à nouveau et ne pas exécuter</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="29"/>
         <source>Don&apos;t run this time</source>
         <translation>Ne pas exécuter cette fois</translation>
     </message>
@@ -3159,17 +3830,17 @@ Vous pouvez toujours modifier ce comportement dans l&apos;onglet « Général »
 <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>suivant</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>précédent</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>Conseil du jour</translation>
     </message>
@@ -3177,166 +3848,166 @@ Vous pouvez toujours modifier ce comportement dans l&apos;onglet « Général »
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>Branche logicielle actuelle</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>Réinstaller</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>Annuler le téléchargement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>Ouvrir la page de téléchargement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation>Vérification des mises à jour</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>Cockatrice n&apos;as pas été construit avec le support du SSL, donc il n&apos;est pas possible de télécharger les mises à jour automatiquement.
 Veuillez s&apos;il vous plaît visiter la page de téléchargement, pour mettre à jour manuellement.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation>Téléchargement de la mise à jour : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>Vérification des mises à jour...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>Fin de la recherche des mises à jour</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>Pas de mises à jour disponibles</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice est à jour !</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>Vous avez déjà la dernière version correspondant à votre branche.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>Version actuelle</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>Branche logicielle sélectionnée</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>Mise à jour disponible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Une nouvelle version de Cockatrice est disponible !</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Nouvelle version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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>Sortie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>Notes de version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>Voulez-vous mettre à jour maintenant ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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>Malheureusement, la mise à jour automatique n&apos;a pas pu trouver un téléchargement compatible.
 Vous allez peut-être devoir télécharger manuellement la nouvelle version.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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>Veuillez vérifier la &lt;a href=&quot;%1&quot;&gt;page &quot;releases&quot;&lt;/a&gt; sur notre Github et télécharger le programme pour votre système.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>Erreur de mise à jour</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Une erreur est survenur pendant la vérification des mises à jour :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Une erreur est survenue pendant le téléchargement de la mise à jour :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>Installation...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice n&apos;a pas pu ouvrir l&apos;installateur.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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>Essayer de mettre à jour manuellement en fermant Cockatrice et en exécutant l&apos;installateur.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation>Répertoire de téléchargement</translation>
     </message>
@@ -3344,21 +4015,153 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Effacer le journal lors de la fermeture</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation>Charger vers le presse-papier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Journal de debug</translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation>Options de probabilité de pioche</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation>Critère :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation>Nom de la carte</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation>Sous-type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation>Valeur de Mana</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation>Exactitude :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation>Au moins</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation>Exactement</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation>Quantité (N) :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation>Cartes piochées (M) :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation>cartes</translation>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation>Probabilité de pioche</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation>Probabilité de piocher</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation>Nom de la carte</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation>Sous-type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation>Valeur de Mana</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation>Au moins</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation>Exactement</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation>Carte(s) ayant au moins pioché</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation>cartes</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation>Catégorie</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation>Qté</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation>Chances (%)</translation>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3429,32 +4232,38 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
     </message>
 </context>
 <context>
-    <name>EdhrecCommanderApiResponseNavigationWidget</name>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
-        <source>Combos</source>
-        <translation>Combos</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
-        <source>Average Deck</source>
-        <translation>Deck moyen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
         <source>Game Changers</source>
-        <translation>Game Changers</translation>
+        <translation>Cartes à impact</translation>
     </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
         <source>Budget</source>
         <translation>Budget</translation>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <source>Combos</source>
+        <translation>Combos</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <source>Average Deck</source>
+        <translation>Deck moyen</translation>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
         <source>Salt: </source>
         <translation>Sel :</translation>
     </message>
@@ -3462,7 +4271,7 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>Tapez votre filtre ici</translation>
     </message>
@@ -3470,22 +4279,22 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation>Confirmer la suppression</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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>Êtes-vous sûr de vouloir supprimer le filtre &apos;%1&apos; ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation>Suppression échouée</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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>Échec de la suppression du filtre &apos;%1&apos;.</translation>
     </message>
@@ -3493,178 +4302,231 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
+        <translation>Éjecté par l&apos;hôte de la partie ou un modérateur</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
-        <translation type="unfinished"/>
+        <translation>joueur a quitté la partie</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
-        <translation type="unfinished"/>
+        <translation>joueur déconnecté du serveur</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
-        <translation type="unfinished"/>
+        <translation>raison inconnue</translation>
     </message>
 </context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>Veuillez d&apos;abord rejoindre le bon salon.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>Mot de passe incorrect.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Les spectateurs ne sont pas autorisés dans cette partie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>Cette partie est déjà complète.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>La partie n&apos;existe plus.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>Cette partie n&apos;est accessible qu&apos;aux joueurs enregistrés.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>Cette partie n&apos;est accessible qu&apos;aux amis de son créateur.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Vous avez été ignoré par le créateur de la partie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation>Rejoindre la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation>Rejoindre la partie comme spectateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation>Informations sur la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation>Joindre la partie comme juge</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation>Joindre la partie comme juge spectateur</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>Rejoindre partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>Mot de passe :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>Veuillez d&apos;abord rejoindre le bon salon.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filtrer les jeux</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>Effacer les fi&amp;ltres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>C&amp;réer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>Re&amp;joindre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation>Joindre en tant que juge</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>Rej&amp;oindre en tant que spectateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation>Joindre comme juge spectateur</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation>Parties affichées : %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>Parties</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation>Tous les types</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation>Filtrer par nom de partie...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation>Filtrer par type/format de partie....</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation>Cacher les parties non-crées par vos amis</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation>Cacher les parties pleines</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation>Cacher les parties commencées</translation>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation>&gt; 1 jour</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="43"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 h</numerusform><numerusform>%1%2 h</numerusform><numerusform>%1%2 h</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation>Nouveau</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="48"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>amis uniquement</translation>
     </message>
@@ -3674,68 +4536,68 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
         <translation>joueurs enregistrés uniquement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
-        <translation type="unfinished"/>
+        <translation>Ouvrir les listes de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>peut discuter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>voir les mains</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>peut voir les mains</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>non autorisé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>Salon</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>Âge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>Créateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>Restrictions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>Joueurs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>Spectateurs</translation>
     </message>
@@ -3743,143 +4605,158 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation>Réinitialiser tous les chemins</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation>Les chemins ont été réinitialisés</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>Choisir un chemin d&apos;accès</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>Paramètres personnels</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>Langue :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>Chemins (édition impossible en mode portable)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>Chemins d’accès</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation>Comment aider avec les traductions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>Répertoire des decks :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation>Répertoire des filtres :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>Répertoire des replays :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>Répertoire des images :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>Base de données des cartes :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation>Répertoire de la base de données personnalisé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>Bases de données des jetons :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation>Branche de la mise à jour :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation>Vérifier les mises à jour du client au démarrage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="379"/>
         <source>Check for card database updates on startup</source>
         <translation>Vérifier les mises à jour de la base de données des cartes au démarrage...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation>Ne pas vérifier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation>Confirmer les mises à jour</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation>Toujours mettre à jour en tâche de fond</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation>Vérifier les mises à jour de la base de données des cartes tous les</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation>jour(s)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>M&apos;avertir si une fonctionnalité supportée par le serveur est manquante sur mon client.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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>Lancer Oracle automatiquement quand Cockatrice a été mis à jour.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>Afficher les astuces au démarrage.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="398"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation>Dernière vérification de mise à jour le %1 (il y a %2 jours)</translation>
     </message>
@@ -3887,1005 +4764,677 @@ Vous allez peut-être devoir télécharger manuellement la nouvelle version.</tr
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Cimetière</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Voir le cimetière</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Déplacer le cimetière vers...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Dessus de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Dessous de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Tous les joueurs</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Main</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exil</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
+        <translation>Révéler une carte au hasard à...</translation>
     </message>
 </context>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Main</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Voir la main</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
-        <translation type="unfinished"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
+        <translation>Trier la main par...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
-        <translation type="unfinished"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
+        <translation>Nom</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation>Valeur de Mana</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation>Mulligan (choix du nombre de cartes)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation>Mulligan (Même nombre de cartes)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation>Mulligan (-1 carte)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Déplacer la main vers…</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Dessus de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Dessous de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Cimetière</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exil</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Révéler la main à...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
+        <translation>Tous les joueurs</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
         <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <translation>Révéler une c&amp;arte au hasard à...</translation>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
-        <translation type="unfinished"/>
+        <translation>Créer un Nouveau Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
-        <translation type="unfinished"/>
+        <translation>Parcourir les Decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
-        <translation type="unfinished"/>
+        <translation>Parcourir la Base de Carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
+        <translation>Parcourir EDHRec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation>Parcourir Archidekt</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
-        <translation type="unfinished"/>
+        <translation>Voir les replays</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
-        <translation type="unfinished"/>
+        <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
-        <translation type="unfinished"/>
+        <translation>Connection...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
-        <translation type="unfinished"/>
+        <translation>Se connecter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
-        <translation type="unfinished"/>
+        <translation>Jouer</translation>
     </message>
 </context>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Voir la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
-        <translation type="unfinished"/>
+        <translation>Voir les cartes du &amp;dessus de la bibliothèque...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
+        <translation>Voir les cartes du dessous de la bibliothèque...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
-        <translation type="unfinished"/>
+        <translation>Révéler la &amp;bibliothèque à...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
-        <translation type="unfinished"/>
+        <translation>Prêter la bibliothèque à...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
-        <translation type="unfinished"/>
+        <translation>Révéler les cartes du &amp;dessus à...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Dessus de la bibliothèque...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Dessous de la bibliothèque...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Toujours révéler la carte du dessus</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Toujours voir la carte du dessus</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Ouvrir le deck dans l&apos;éditeur</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Piocher une carte</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
-        <translation type="unfinished"/>
+        <translation>P&amp;iocher plusieurs cartes...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Annuler la dernière pioche</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
-        <translation type="unfinished"/>
+        <translation>Mélanger</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Jouer la carte du dessus</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
-        <translation type="unfinished"/>
+        <translation>Jouer la carte du dessus &amp;face cachée</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
+        <translation>Placer la carte du dessus au-&amp;dessous</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
+        <translation>Mettre la carte du dessus dans le cime&amp;tière</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
+        <translation>E&amp;xiler la carte du dessus</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
-        <translation type="unfinished"/>
+        <translation>Mettre les cartes du dessus dans le &amp;cimetière...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation>Mettre les cartes du dessus dans le cimetière face cachées...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exiler les cartes du dessus...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation>Exiler les cartes du dessus face cachées...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
-        <translation type="unfinished"/>
+        <translation>Placer les cartes du dessus sur la pile &amp;jusqu&apos;à...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
+        <translation>Mélanger les cartes du dessus...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Piocher la carte du dessous </translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
+        <translation>P&amp;iocher les cartes du dessous...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Jouer la carte du dessous</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
+        <translation>Jouer la carte du dessous &amp;face cachée</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
+        <translation>Mettre la carte du dessous dans le cime&amp;tière</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
+        <translation>E&amp;xiler la carte du dessous</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
-        <translation type="unfinished"/>
+        <translation>Mettre les cartes du dessus dans le &amp;cimetière...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation>Mettre les cartes du dessous dans le cimetières face cachées...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exiler les cartes du dessous...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation>Exiler les cartes du dessous face cachées...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
-        <translation type="unfinished"/>
+        <translation>Placer la carte du dessous au-&amp;dessus</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
+        <translation>Mélanger les cartes du dessous...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Tous les joueurs</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
+        <translation>Révéler les cartes du dessus de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
+        <translation>Nombre de cartes : (max. %1)</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>Le serveur a atteint sa capacité maximale de joueurs simultanés, veuillez réessayer plus tard.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>Il y a trop de connexions simultanées depuis votre ordinateur.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>Banni par un modérateur</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>Fin théorique : %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>Banni définitivement.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>Fermeture prévue du serveur.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>Nom d&apos;utilisateur non valide.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>Vous avez avez été déconnecté pour avoir changé d&apos;endroit.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>Connexion fermée</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>Le serveur a coupé votre connexion.
-Raison: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>Le serveur redémarrera dans %n minute.
-Aucune partie en cours ne sera sauvegardée.
-Raison de la fermeture : %1</numerusform><numerusform>Le serveur redémarrera dans %n minutes.
-Aucune partie en cours ne sera sauvegardée.
-Raison de la fermeture : %1</numerusform><numerusform>Le serveur redémarrera dans %n minutes.
-Aucune partie en cours ne sera sauvegardée.
-Raison de la fermeture : %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>Fermeture prévue du serveur</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>Réussite</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>Enregistrement accepté.
-Connexion en cours.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>Activation du compte acceptée.
-Connexion en cours.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>Nombre de joueurs</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>Entrez s&apos;il vous plaît le nombre de joueurs.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>Joueur %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>Charger replay</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>À propos de Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>Page web de Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>Chef de projet:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>Anciens chefs de projet:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>Développeurs :</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>Nos développeurs</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>Aidez à développer !</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>Traducteurs :</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>Nos traducteurs</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>Aidez à traduire !</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>Assistance :</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>Signaler un problème</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>Dépannage</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>F.À.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>Délai de la demande dépassé</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>Connexion échouée</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation>Il semble que certaines fonctionnalités nécessaires à la connexion à ce serveur sont absentes de votre client.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation>Pour mettre à jour Cockatrice, allez dans « Aide -&gt; Vérifier les mises à jour&apos; ».</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>Nom d&apos;utilisateur ou mot de passe incorrect. Veuillez vérifier vos identifiants et réessayer.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>Il y a déjà une session ouverte avec le même nom d&apos;utilisateur.
-Fermez cette session puis reconnectez vous.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>Vous êtes banni jusqu&apos;au %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>Vous êtes banni indéfiniment.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>Vous devez être enregistré pour accéder à ce serveur. Voulez-vous vous enregistrer ?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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>Ce serveur requiert un ID de client. Soit votre client a échoué lors de la génération d&apos;un ID, soit vous utilisez un client modifié.
-Veuillez fermer et rouvrir votre client pour réessayer.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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>Une erreur interne est survenue. Veuillez fermer et rouvrir Cockatrice avant de réessayer.
-Si l&apos;erreur persiste, vérifiez que utilisez la dernière version du logiciel, ou contactez les développeurs si nécessaire.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>Activation du compte</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>Votre compte n&apos;a pas encore été activé.
-Vous devez activer le jeton de l&apos;activation reçu dans le mail d&apos;activation.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation>Serveur complet</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>Erreur de connexion inconnue : %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>
-Cela veut généralement dire que votre client n&apos;est plus à jour, et que le serveur a envoyé une réponse que votre client ne comprend pas.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>Votre nom d&apos;utilisateur doit respecter ces règles :</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>est long de %1 - %2 caractères</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>peut %1 contenir des caractères minuscules</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>PAS</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>peut %1 contenir des caractères majuscules</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>peut %1 contenir des caractères numériques</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>peut contenir la ponctuation suivante : %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>le premier caractère peut %1 être une marque de ponctuation</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <source>no unacceptable language as specified by these server rules:</source>
-        <comment>note that the following lines will not be translated</comment>
-        <translation>Pas de langage inacceptable comme spécifié par ces règles du serveur:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation>ne peut contenir les mots suivants : %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation>ne correspond à aucune des expressions suivantes : %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>Vous pouvez utiliser seulement A-Z, a-z, 0-9, _, ., et - dans votre nom d&apos;utilisateur</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>Enregistrement refusé</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>L&apos;enregistrement est désactivé sur ce serveur</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>Il existe déjà un compte avec le même nom d&apos;utilisateur.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>Il est obligatoire de spécifier une adresse e-mail valide lors de l&apos;enregistrement.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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>Il semble que vous essayez d&apos;enregistrer un nouveau compte alors que vous en avez déjà un enregistré avec cet e-mail sur ce serveur. Ce serveur restreint le nombre de comptes par e-mail. Veuillez contacter l&apos;administrateur du serveur pour obtenir vos identifiants ou plus d&apos;informations.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>Mot de passe trop court.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>Enregistrement échoué lié à un problème technique du serveur.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation>La connexion au serveur a été perdue.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>Erreur d&apos;enregistrement inconnue : %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>Activation du compte échouée</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>Erreur de socket : %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>Vous tentez de vous connecter à un serveur obsolète. Veuillez utiliser une ancienne version de Cockatrice, ou connectez-vous à un serveur approprié.
-La version locale est %1, la version distante est %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>Votre client Cockatrice est obsolète. Veuillez mettre à jour votre version de Cockatrice.
-La version locale est %1, la nouvelle version est %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>Connexion à %1...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>Enregistrement de %1 en tant que %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>Déconnecté</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>Connecté, connexion à %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>Envoi de la requête de mot de passe oublié à %1 en tant que %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Connecter...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Déconnecter</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>Démarrer une partie &amp;locale...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Regarder un replay...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Plein écran</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>S&apos;enregistrer sur le serveur...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;Restaurer le mot de passe...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Paramètres...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>Actions</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>B&amp;ase de données de cartes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;Gérer les éditions...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Éditer les &amp;jetons personnalisés…</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>Ouvrir le dossier d&apos;images personnalisées</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>Ouvrir le dossier d&apos;éditions personnalisées</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>Ajouter des éditions / cartes personnalisées</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation>Recharger la base de cartes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation>Onglets</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>A&amp;ide</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>À propos de Cock&amp;atrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Conseil du jour</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation>Vérifier les mises à jour</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation>Vérifier les mises à jour des cartes…</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation>Vérifier les mises à jour des cartes (automatiquement)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation>Montrer la barre de statut</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation>Voir journal de &amp;Debug</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation>Ouvrir le dossier des paramètres</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation>Montrer/Cacher</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation>Nouvelle version</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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>Bravo pour avoir mis à jour Cockatrice %1 !
 Oracle va maintenant se lancer pour mettre à jour votre base de données de cartes.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation>Installation de Cockatrice terminée</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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>Félicitations ! Vous venez d&apos;installer Cockatrice %1 !
 Oracle va maintenant se lancer pour installer la base de données de cartes initiale.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>Base de données de cartes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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>
@@ -4894,29 +5443,29 @@ Voulez-vous la mettre à jour maintenant ?
 Si vous n’êtes pas sûr, ou si c&apos;est la première fois que vous jouez, choisissez « Oui ».</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>Ouvrir les paramètres</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>Nouvelles éditions détectées</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
@@ -4929,17 +5478,22 @@ Code(s) d&apos;édition(s) : %1
 Voulez-vous l&apos;(les) activer ?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>Voir les éditions</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>Bienvenue</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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>
@@ -4948,742 +5502,903 @@ Toutes les éditions de la base de données de cartes ont été activées.
 Pour plus d&apos;informations sur la modification de l&apos;ordre des éditions, la désactivation d&apos;éditions spécifiques, et leurs effets, consultez le menu « Gérer les éditions… ».</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>Informations</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>Une mise à jour de la base de données de cartes est déjà en cours.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>Impossible de lancer la mise à jour de la base de données de cartes :</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation>Une mise à jour de la base de données de cartes est en cours.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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>Échec au démarrage. Le fichier peut être manquant, ou les permissions sont incorrectes.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation>Le processus a échoué quelque temps après avoir démarré avec succès.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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>Temps limite dépassé. Le processus a pris trop longtemps pour répondre. La dernière fonction waitFor...() a terminé.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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>Une erreur a eu lieu en essayant d&apos;écrire vers le processus. Par exemple, le processus pourrait ne pas tourner, ou il pourrait avoir son canal d&apos;entrée fermé.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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>Une erreur a eu lieu en essayant d&apos;écrire vers le processus. Par exemple, le processus pourrait ne pas tourner, ou il pourrait avoir son canal de sortie inactif.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation>Une erreur inconnue est arrivée.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation>L&apos;outil de mise à jour de la base de données de cartes s&apos;est arrêté avec l&apos;erreur :
 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>Le serveur supporte des fonctionnalités que votre client n&apos;a pas.
-Ce n&apos;est probablement pas un problème, mais ce message peut signifier qu&apos;il y a une nouvelle version de Cockatrice disponible, ou que ce serveur utilise une version pre-release ou personnalisée.
-
-Pour mettre à jour votre client, allez dans « Aide -&gt; Vérifier les mises à jour ».</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>Charger des éditions/cartes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>Le fichier sélectionné n&apos;a pas pu être trouvé.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation>Il n&apos;est actuellement possible que d&apos;importer des bases de données XML.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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>Les nouvelles éditions/cartes ont été ajoutées avec succès.
 Cockactrice va maintenant recharger la base de données de cartes.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>Échec de l&apos;importation des éditions/cartes.</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
-        <translation>Réinitialiser le mot de passe</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
-        <translation>Votre mot de passe a été réinitialisé avec succès. Vous pouvez maintenant vous connecter en utilisant vos nouveaux identifiants.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>Échec de la réinitialisation du mot de passe du compte. Veuillez contacter l&apos;administrateur du serveur pour réinitialiser votre mot de passe.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
+        <translation>camembert</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
-        <translation>Demande d&apos;activation reçue, vérifiez votre courrier électronique pour un jeton d&apos;activation.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation>barre</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation>barreCombinée</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation>Filtrer par couleurs (optionnel) :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation>Base de mana</translation>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation>Grouper par :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation>type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation>couleur</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation>sous-type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation>force</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation>endurance</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation>Filtres (optionnel) :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation>Montrer la ligne d&apos;aggrégat principale </translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation>Monter les lignes de chaque catégorie</translation>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation>Courbe de mana</translation>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation>Type de charte :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation>camembert</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation>barre</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation>barre combinée</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation>Filtrer par couleurs (optionnel) :</translation>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation>Dévotion au mana</translation>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation>camembert</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation>barre</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation>Couleurs :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation>Montrer une ligne par couleur</translation>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation>%1 mana (%2 cartes)</translation>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation>Production de Mana + Dévotion</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation>Options pour Distribution de Mana</translation>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation>depuis le jeu</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation> depuis son cimetière</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation> depuis l&apos;exil</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation> depuis sa main</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>la carte du dessus de la bibliothèque de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation>le carte du dessus de sa bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation>à partir du dessus de la bibliothèque de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation>du dessus de sa bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>la carte du dessous de la bibliothèque de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation>la carte du dessous de sa bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation>à partir du dessous de la bibliothèque de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation>du dessous de sa bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation>de la bibliothèque de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation>depuis sa bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation>depuis sa réserve</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation>depuis la pile</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation> depuis la zone personnalisée &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1 garde maintenant la carte du dessus de sa bibliothèque %2 révélée.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1 ne révèle plus la carte du dessus de sa bibliothèque %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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>%1 peut maintenant regarder la carte du dessus de sa bibliothèque %2 à n&apos;importe quel moment.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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>%1 ne peut plus regarder la carte du dessus de sa bibliothèque %2 à n&apos;importe quel moment.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1 attache %2 à %4 de %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 a concédé la partie.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 reste dans la partie.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1 est revenu dans la partie.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 a perdu la connexion à la partie.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation>%1 se cible avec son %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation>%1 cible %3 avec son %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation>%1 se cible avec %3 de %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation>%1 cible %4 avec %3 de %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1 cible de son %3 vers son %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1 cible %3 de %4 avec %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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>%1 cible son %4 avec %3 de %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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>%1 cible %5 de %4 avec %3 de %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation>%1 crée un jeton face-cachée.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 crée un jeton %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 a chargé un deck (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>%1 a chargé un deck avec %2 cartes en réserve (%3).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation>%1 détruit %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>une carte</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1 donne le contrôle de %2 à %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="308"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation>%1 met %2 en jeu%3 face cachée.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1 met %2 en jeu %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="314"/>
+        <source>%1 puts %2%3 into their graveyard face down.</source>
+        <translation>%1 met %2%3 dans leur cimetière face cachée.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation>%1 met %2%3 dans son cimetière.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation>%1 exile %2%3 face cachée.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 exile %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation>%1 met %2%3 dans sa main.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation>%1 met %2%3 dans sa bibliothèque.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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>%1 met %2%3 au-dessous de sa bibliothèque.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation>%1 met %2%3 au-dessus de sa bibliothèque.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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>%1 met %2%3 dans sa bibliothèque %4 cartes depuis le dessus</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 met %2%3 à sa réserve.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation>%1 joue %2%3 face cachée.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 joue %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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>%1 déplace %2%3 vers la zone personnalisée %4 face cachée.</translation>
+    </message>
+    <message>
+        <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>%1 déplace %2%3 vers la zone personnalisée &apos;%4&apos;.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="373"/>
         <source>%1 tries to draw from an empty library</source>
         <translation>%1 essaie de piocher dans une bibliothèque vide</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation><numerusform>%1 pioche %2 carte.</numerusform><numerusform>%1 pioche %2 cartes.</numerusform><numerusform>%1 pioche %2 carte(s).</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 regarde %2.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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><numerusform>%1 regarde la %4 %3 carte %2.</numerusform><numerusform>%1 regarde les %4 %3 cartes %2.</numerusform><numerusform>%1 regarde la / les %4 %3 carte(s) %2.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation>dessous</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation>dessus</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1 retourne %2 face cachée.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1 retourne %2 face visible.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>La partie a été fermée.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>La partie commence.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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>Vous floodez la partie. Veuillez patienter quelques secondes.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1 a rejoint la partie.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 est maintenant spectateur.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>Vous avez été expulsé de la partie.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 a quitté la partie (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation>%1 n&apos;observe plus la partie (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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>%1 n&apos;est plus prêt à démarrer la partie.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform>%1 mélange son deck et pioche une nouvelle main de %2 carte.</numerusform><numerusform>%1 mélange sa bibliothèque et pioche une nouvelle main de %2 cartes.</numerusform><numerusform>%1 mélange sa bibliothèque et pioche une nouvelle main de %2 carte(s).</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="473"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation>%1 mélange sa bibliothèque et pioche une nouvelle main.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation>Vous regardez un replay de la partie n° %1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1 est prêt à démarrer la partie.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="510"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation>cartes</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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><numerusform>%1 carte</numerusform><numerusform>%1 cartes</numerusform><numerusform>%1 carte(s)</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation>%1 prêtes %2 à %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1 révèle %2 à %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1 révèle %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation>%1 révèle au hasard %2%3 à %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1 révèle au hasard %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation>%1 regarde furtivement la carte face cachée n° %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation>%1 regarde furtivement la carte face cachée n° %2 : %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation>%1 révèle %2%3 à %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 révèle %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="576"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation>%1 a inversé l&apos;ordre des tours, c&apos;est maintenant %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation>inversé</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation>normal</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>Face</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>Pile</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation>%1 a lancé une pièce. Il a fait %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1 a fait %2 avec un dé %3 faces.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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>%1 lances %2 pièces. Il y&apos;a %3 faces et %4 piles.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="608"/>
         <source>%1 rolls a %2-sided dice %3 times: %4.</source>
         <translation>%1 lances un dé à %2-faces %3 fois: %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>Tour de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation>%1 met l&apos;annotation %3 à %2.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
-        <translation><numerusform>%1 place %2 &quot;%3&quot; compteur sur %4 (désormais %5).</numerusform><numerusform>%1 place %2 &quot;%3&quot; compteurs sur %4 (désormais %5).</numerusform><numerusform>%1 place %2 &quot;%3&quot; compteur(s) sur %4 (désormais %5).</numerusform></translation>
+        <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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
-        <translation><numerusform>%1 retire %2 &quot;%3&quot; compteur sur %4 (désormais %5).</numerusform><numerusform>%1 retire %2 &quot;%3&quot; compteurs sur %4 (désormais %5).</numerusform><numerusform>%1 retire %2 &quot;%3&quot; compteur(s) sur %4 (désormais %5).</numerusform></translation>
+        <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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation>%1 met les marqueurs %2 à %3 (%4%5).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%2 de %1 ne se dégagera pas lors de l&apos;étape de dégagement.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%2 de %1 se dégagera lors de l&apos;étape de dégagement.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 retire la F/E de %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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>%1 met la F/E de %2 à %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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>%1 passe la F/E de %2 de %3 à %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1 a verrouillé sa réserve.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 a déverrouillé sa réserve.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 engage ses permanents.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 dégage ses permanents.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1 engage %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1 dégage %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 mélange %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="769"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation>%1 mélange les %3 cartes du dessous de la bibliothèque de %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="774"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation>%1 mélange les %3 cartes du dessus de la bibliothèque de %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation>%1 mélange les cartes %3 - %4 de %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 détache %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 annule sa dernière pioche.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 annule sa dernière pioche (%2).</translation>
     </message>
@@ -5691,110 +6406,115 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation>Mot1 Mot2 Mot3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation>Ajouter un message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation>Éditer le message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation>Supprimer le message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>Ajouter message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>Message :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation>Éditer le message</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>Paramètres du chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>Mots d&apos;alertes personnalisées</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>Activer les mentions dans le chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>Activer les mentions dans le chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>Macros de message en jeu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="243"/>
         <source>How to use in-game message macros</source>
         <translation>Comment utiliser les macro pour les messages en jeu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>Ignorer les messages dans le chat principal envoyés par des joueurs non enregistrés.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>Ignorer les messages privés envoyés par des joueurs non enregistrés.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>Inverser la couleur du texte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>Activer les notifications de bureau pour les messages privés.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>Activer les notifications de bureau pour les mentions.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>Activer l&apos;historique des messages du chat principal dès la connexion</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>(La couleur est hexadécimale)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Séparer les mots avec un espace, seulement les caractères alphanumériques</translation>
     </message>
@@ -5802,39 +6522,44 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
-        <translation type="unfinished"/>
+        <translation>Déplacer vers</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <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>&amp;Dessus de la bibliothèque dans un ordre aléatoire</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <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>X cartes du dessus de la bibliothèque...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <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>&amp;Dessous de la bibliothèque dans un ordre aléatoire</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation>Tableau</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Main</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Cimetière</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exil</translation>
     </message>
 </context>
 <context>
@@ -5845,47 +6570,47 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
         <translation>Type de carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation>Valeur de Mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation>Couleur(s)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation>Loyauté</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation>Type de carte principal</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation>Coût de mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation>F/E</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation>Côté</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation>Design</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation>Identité couleur</translation>
     </message>
@@ -5908,65 +6633,211 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
         <translation>Direction de superposition :</translation>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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>Réinitialiser</translation>
+    </message>
+    <message>
+        <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>Appliquer</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>Sauvegarder &amp;&amp; Appliquer</translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation>Actif</translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation>Désactivé</translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation>Inactif</translation>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation>Phase inconnue</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation>Dégagement</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation>Entretien</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation>Pioche</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation>Première phase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation>Début de combat</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation>Déclaration des attaquants</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation>Déclaration des bloqueurs </translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation>Blessures de combat</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation>Fin de combat</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation>Seconde phase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation>Phase de fin</translation>
     </message>
@@ -5974,57 +6845,57 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>Étape de dégagement</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>Étape d&apos;entretien</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>Étape de pioche</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>Première phase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>Étape de début de combat</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>Étape de déclaration des attaquants</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>Étape de déclaration des bloqueurs</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>Étape d&apos;assignation des blessures de combat</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>Étape de fin de combat</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>Seconde phase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>Phase de fin de tour</translation>
     </message>
@@ -6032,7 +6903,7 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>fr</translation>
@@ -6041,183 +6912,199 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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>cimetière</translation>
+    </message>
+    <message>
+        <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>exile</translation>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation>Joueur &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Marqueurs</translation>
+    </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation>Le sélecteur d&apos;impressions est désactivé car l&apos;option d&apos;écraser toutes les impressions avec des éditions personnalisées est activée.
+
+Cette option fait que vous ne verrez que l&apos;impression par défaut pour chaque carte, au lieu de pouvoir sélectionner une impression. Vous ne verrez pas les impressions que les autres joueurs ont sélectionnés pour eux-mêmes.
+
+</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
-        <translation type="unfinished"/>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
+        <translation>Ré-activer les impressions</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation>Afficher les boutons de navigation</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation>Sélection d&apos;impression</translation>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation>Préférence</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation>Épingler Imprimer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation>Désépingler Imprimer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation>Afficher les cartes associées</translation>
     </message>
@@ -6233,17 +7120,17 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation>Carte précédente dans le deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation>Sélection groupée</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation>Carte suivante dans le deck</translation>
     </message>
@@ -6251,124 +7138,132 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation>Alphabétiquement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation>Date de Sortie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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>Descendant</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation>Ascendant</translation>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation>Sélectionnez une carte pour voir ses impressions</translation>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
-        <translation type="unfinished"/>
+        <translation>Force / Endurance</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Augmenter la force</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Diminuer la force</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
+        <translation>A&amp;ugmenter l&apos;endurance</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
-        <translation type="unfinished"/>
+        <translation>D&amp;iminuer l&apos;endurance</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
-        <translation type="unfinished"/>
+        <translation>Au&amp;gmenter la force et l&apos;endurance</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
+        <translation>Dim&amp;inuer la force et l&apos;endurance</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
+        <translation>Augmenter la force et diminuer l&apos;endurance</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
+        <translation>Diminuer la force et augmenter l&apos;endurance</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
-        <translation type="unfinished"/>
+        <translation>Changer la &amp;force et l&apos;endurance...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
-        <translation type="unfinished"/>
+        <translation>Réinitialiser la f&amp;orce et l&apos;endurance</translation>
     </message>
 </context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>Services</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>Cacher %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>Cacher les autres</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>Montrer tout</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>Préférences...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>Quitter %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>À propos %1</translation>
     </message>
@@ -6376,153 +7271,259 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Base de données de cartes Cockatrice (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>Tous les fichiers (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Replays Cockatrice (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>Maindeck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>Jetons</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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>Écraser le fichier existant ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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>Une version en fichier .cod existe déjà pour ce deck. L&apos;écraser ?</translation>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation>L&apos;activation de cette option désactivera l&apos;utilisation du sélecteur d&apos;impression.
+
+Vous ne pourrez plus gérer les préférences d&apos;impression pour chaque deck ni voir les impressions sélectionnées par d&apos;autres joueurs.
+
+Vous devrez utiliser le Gestionnaire d&apos;extensions, accessible via : Base de données de cartes -&gt; Gérer les extensions.
+
+Êtes-vous sûr de vouloir activer cette option ?</translation>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation>Désactiver cette option activera la sélection d&apos;impression.
+
+Vous pouvez désormais choisir les impressions pour chaque deck dans l&apos;éditeur de deck et configurer l&apos;impression ajoutée par défaut en l&apos;épinglant dans la sélection d&apos;impression.
+
+Vous pouvez également utiliser le gestionnaire de d&apos;extension pour personnaliser l&apos;ordre de tri des impressions dans la sélection d&apos;impression (d&apos;autres ordres de tri, comme l&apos;ordre alphabétique ou la date de parution, sont disponibles).
+
+Êtes-vous sûr de vouloir désactiver cette option ?</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation>Confirmer le changement</translation>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation>Sauvegarder tout</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation>&amp;Oui</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation>Dire oui à tout</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation>&amp;Non</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation>Dire non à tout</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation>Abandonner</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation>Réessayer</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation>Effacer</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation>Appliquer</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation>Réinitialiser</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation>Remettre à zéro</translation>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>Temps de chargement</translation>
     </message>
@@ -6530,32 +7531,32 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>Joueurs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>Garder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>Le temps a commencé</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>Durée (sec)</translation>
     </message>
@@ -6563,79 +7564,87 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exil</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Voir la zone d&apos;exil</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Déplacer la zone d&apos;exil vers...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Dessus de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Dessous de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Main</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Cimetière</translation>
     </message>
 </context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>Salons</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>&amp;Rejoindre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>Salon</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>Permissions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>Joueurs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>Parties</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation>Dire</translation>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6672,27 +7681,27 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>Activée</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>Code</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>Nom complet</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>Date de sortie</translation>
     </message>
@@ -6700,53 +7709,53 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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>Réinitialiser tous les raccourcis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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>Êtes-vous sûr de vouloir réinitialiser tous les raccourcis ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation>Effacer tous les raccourcis par défaut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="111"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>Êtes-vous sûr de vouloir effacer tous les raccourcis ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation>Section :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation>Action :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation>Raccourci :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation>Comment assigner des raccourcis personnalisés</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation>Effacer tous les raccourcis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation>Rechercher par nom de raccourci</translation>
     </message>
@@ -6754,12 +7763,12 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>Action</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>Raccourci</translation>
     </message>
@@ -6767,13 +7776,13 @@ Cockactrice va maintenant recharger la base de données de cartes.</translation>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Votre fichier de configuration contenait des raccourcis invalides. Merci de vérifier vos paramètres de raccourci !</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>Les raccourcis suivants ont été définis par défaut:
@@ -6801,40 +7810,40 @@ Please check your shortcut settings!</source>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Réserve</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Voir la réserve</translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>Activer les &amp;sons</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>Thème sonore actuel:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>Tester les effets sonores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>Paramètres de son</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>Volume principal</translation>
     </message>
@@ -6842,48 +7851,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="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation>La saison des spoilers est terminée</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>Suppression de spoiler.xml. S&apos;il vous plaît exécuter Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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>Échec du téléchargement des spoilers</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation>Pas de connexion Internet</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation>Spoilers déjà à jour</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation>Aucun nouveau spoilers ajouté</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation>Les spoilers ont été mis à jour!</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation>Dernier changement:</translation>
     </message>
@@ -6906,16 +7915,146 @@ Please check your shortcut settings!</source>
         <translation>Réponse invalide reçue de la part du serveur de mise à jour.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="177"/>
         <source>No reply received from the tag update server.</source>
         <translation>Aucune réponse reçue de la part du serveur de mise à jour des tags.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="184"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Réponse invalide reçue de la part du serveur de mise à jour des tags.</translation>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation>Jour(s)</translation>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7047,56 +8186,227 @@ Please check your shortcut settings!</source>
         <translation>Incapable d&apos;activer l&apos;utilisateur. Erreur interne</translation>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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>Desc.</translation>
+    </message>
+    <message>
+        <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>ET</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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation>TOUTES les couleurs sélectionnées obligatoires</translation>
+    </message>
+    <message>
+        <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>Nom du deck...</translation>
+    </message>
+    <message>
+        <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>Propriétaire...</translation>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Filtres avancés</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation>Catégorie :</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="262"/>
+        <source>Any</source>
+        <translation>Tous</translation>
+    </message>
+    <message>
+        <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>Contient la carte...</translation>
+    </message>
+    <message>
+        <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>Commandant...</translation>
+    </message>
+    <message>
+        <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>Tag...</translation>
+    </message>
+    <message>
+        <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>Taille du deck</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation>Cartes :</translation>
+    </message>
+    <message>
+        <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>Asc.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation>Trier par :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation>Filtrer par :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation>Options d&apos;affichage</translation>
+    </message>
+    <message>
+        <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>Rechercher</translation>
+    </message>
+    <message>
+        <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>Formats</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation>Archidekt : </translation>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation>Carte:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>Infos de la carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>Bibliothèque</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>Filtres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>&amp;Voir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation>Base de données de cartes</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation>Imprimer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>Flottant</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation>Réinitialiser l&apos;interface</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="82"/>
         <source>Deck: %1</source>
         <translation>Deck : %1</translation>
     </message>
@@ -7104,61 +8414,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="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation>Deck visuel : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="294"/>
         <source>&amp;Visual Deck Editor</source>
         <translation>&amp;Éditeur de deck visuel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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>Infos de la carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation>Filtres</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation>&amp;Voir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation>Imprimer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation>Flottant</translation>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation>Réinitialiser l&apos;interface</translation>
     </message>
@@ -7166,22 +8464,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="43"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="62"/>
         <source>Visual Deck View</source>
         <translation>Vue de deck visuel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="63"/>
         <source>Visual Database Display</source>
         <translation>Affichage visuel de la base de données</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="64"/>
         <source>Deck Analytics</source>
         <translation>Analyse de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="65"/>
         <source>Sample Hand</source>
         <translation>Exemple de main</translation>
     </message>
@@ -7222,8 +8520,8 @@ Please check your shortcut settings!</source>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Nouveau dossier</translation>
     </message>
@@ -7239,84 +8537,84 @@ Please check your shortcut settings!</source>
         <translation>Ouvrir le dossier des decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation>Renommer le dossier local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation>Renommer le fichier local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation>Nouveau nom :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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>Érreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation>Renommage échoué</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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>Fichier de deck invalide</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>Entrez le nom du deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>Ce deck n&apos;a pas de nom.
 Veuillez entrer un nom:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>Deck sans nom</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation>Erreur lors de l&apos;importation du deck sur le serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>Supprimer fichier local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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>Êtes-vous certain de vouloir supprimer les fichiers sélectionnés ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation>Supprimer les decks dinstants</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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>Êtes-vous certain de vouloir supprimer les decks sélectionnés ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Nom du nouveau dossier :</translation>
     </message>
@@ -7329,17 +8627,17 @@ Veuillez entrer un nom:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation>Stockage visuel de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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>N&apos;a pas pu ouvrir le deck à %1</translation>
     </message>
@@ -7380,205 +8678,199 @@ Veuillez entrer un nom:</translation>
         <translation>Rechercher</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
-        <translation type="unfinished"/>
+        <translation>EDHRec :</translation>
     </message>
 </context>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>Replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>Partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>Liste des joueurs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>Infos de la carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>Messages</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>Historique des replays</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>&amp;Phases</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>&amp;Partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>Étape &amp;suivante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation>Étape suivante avec &amp;action</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>&amp;Tour suivant</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation>Inverser l&apos;ordre des tours</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>&amp;Retirer toutes les flèches locales</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>Pivoter la vue dans le sens h&amp;oraire</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>Pivoter la vue dans le sens &amp;anti-horaire</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>&amp;Informations sur la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation>Annuler la &amp;concession</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>&amp;Concéder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Quitter la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>Fermer &amp;le replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;Focus sur le chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>&amp;Dire :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
-        <translation type="unfinished"/>
+        <translation>Cartes sélectionnées</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>&amp;Voir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>Visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>Flottant</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation>Réinitialiser l&apos;interface</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>Concéder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>Êtes-vous sûr de vouloir concéder la partie ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation>Rester dans la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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>Vous avez déjà concédé la partie. Voulez-vous la reprendre ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>Quitter la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>Êtes-vous sûr de vouloir quitter la partie ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation>Un joueur a rejoint la partie #%1.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation>%1 a rejoint la partie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>Vous avez été expulsé de la partie.</translation>
     </message>
@@ -7586,166 +8878,166 @@ Veuillez entrer un nom:</translation>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
-        <translation type="unfinished"/>
+        <translation>Accueil</translation>
     </message>
 </context>
 <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>Journaux</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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>Durée;Expéditeur;IPExpéditeur;Message;IDCible;NomCible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation>Journaux du salon</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>Journaux de la partie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>Journaux du chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>Vous devez sélectionner au moins un filtre.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Vous devez sélectionner un nombre valide de jours à identifier.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>Nom d&apos;utilisateur:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>Adresse IP :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>Nom de la partie :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>ID de la partie :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>Message :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>Salon principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>Salon de jeu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>Chat privé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>Les X derniers jours :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>Aujourd&apos;hui</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>La dernière heure</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation>Résultats maximum :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>Au moins un filtre est requis.
 Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation>Obtenir les journaux de l&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation>Effacer les filtres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>Filtres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation>Emplacement des journaux</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation>Intervalle de dates</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation>Résultats maximum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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>Historique des messages</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation>Impossible de récupérer l&apos;historique des messages.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Il n&apos;y a pas de messages pour les filtres sélectionnés.</translation>
     </message>
@@ -7763,27 +9055,27 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
         <translation>&amp;Quitter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Chat privé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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>Cet utilisateur vous ignore, il ne peut pas voir vos messages dans le chat principal et vous ne pouvez pas rejoindre ses parties.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation>Message privé de</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1 a quitté le serveur.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1 a rejoint le serveur.</translation>
     </message>
@@ -7791,180 +9083,180 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>Système de fichier local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>Stockage du serveur de replays</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>Voir replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation>Renommer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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>Nouveau fichier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>Supprimer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation>Ouvrir le dossier des Replays</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>Télécharger replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>Changer le verrouillage de l&apos;expiration</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
-        <translation type="unfinished"/>
+        <translation>Obtenir le code de partage du replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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>Regarder un replay depuis un code de partage</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation>Renommer le dossier local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation>Renommer le fichier local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation>Nouveau nom:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation>Renommage échoué</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation>Nom du nouveau fichier:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>Supprimer fichier local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Êtes-vous certain de vouloir supprimer les fichiers sélectionnés?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="505"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>Êtes-vous certain de vouloir supprimer cet enregistrement?</translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
-        <source>Failed to get code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Either this server does not support replay sharing, or does not permit replay sharing for you.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
-        <source>Failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
-        <source>Replay Share Code</source>
-        <translation type="unfinished"/>
+        <source>Failed to get code</source>
+        <translation>Echec d&apos;obtention du code</translation>
     </message>
     <message>
         <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>Soit ce serveur ne prend pas en charge le partage de replay, soit il ne vous autorise pas à partager des replays.</translation>
+    </message>
+    <message>
+        <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>Échec</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
+        <source>Could not get replay code</source>
+        <translation>Impossible d&apos;obtenir le code de replay</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
+        <source>Replay Share Code</source>
+        <translation>Code de Partage de Replay</translation>
+    </message>
+    <message>
+        <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>D&apos;autres peuvent utiliser ce code pour ajouter la replay à leur liste de replay distantes :%1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Copier vers le presse-papier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
-        <translation type="unfinished"/>
+        <translation>Code de partage de replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
-        <translation type="unfinished"/>
+        <translation>Code de replay trouvé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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>Le replay a été ajoutée, ou vous y aviez déjà accès.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
-        <translation type="unfinished"/>
+        <translation>Code de replay non trouvé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
-        <translation type="unfinished"/>
+        <translation>Échec de l&apos;envoi du code</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
-        <translation type="unfinished"/>
+        <translation>Erreur inattendue</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>Supprimer le replay distant</translation>
     </message>
@@ -7977,47 +9269,62 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>&amp;Dire :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>&amp;Salon</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Quitter le salon</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>Effacer le &amp;Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>Paramètres du chat...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation>vous a mentionné.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation>Cliquer pour voir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>Vous floodez le chat. Veuillez patienter quelques secondes.</translation>
     </message>
@@ -8030,30 +9337,30 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
         <translation>Serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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>Impossible de rejoindre le salon: il n&apos;existe pas sur le serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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>Le serveur considère que vous êtes dans le salon mais votre client est incapable de l&apos;afficher. Essayez en relançant votre client.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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>Vous n&apos;avez pas la permission requise pour rejoindre ce salon.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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>Impossible de rejoindre le salon à cause d&apos;un erreur inconnue: %1</translation>
     </message>
@@ -8061,92 +9368,97 @@ Plus vous entrez d&apos;informations, meilleurs seront les résultats.</translat
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation>Éditeur de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation>Éditeur de deck visuel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation>EDHrec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation>Archidekt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
+        <source>Home</source>
+        <translation>Accueil</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation>Stockage &amp;visuel de decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation>Affichage visuel de la base de données</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation>Stockage de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation>Replays de parties</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation>Journaux</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>Êtes-vous sûr ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>Il y a encore des parties en cours. Êtes-vous sûr de vouloir quitter ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation>Cliquer pour regarder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Votre ami %1 s&apos;est inscrit !</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation>Événement inconnu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8157,39 +9469,39 @@ Ce message peut signifier qu&apos;il y a une nouvelle version de Cockatrice disp
 Pour mettre à jour votre client, allez dans « Aide -&gt; Vérifier les mises à jour ».</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation>Temporisation inactive</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Vous allez d&apos;être déconnecté en raison de l&apos;inactivité.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>Promotion</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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>Vous avez été promu modérateur. Veuillez vous reloguer pour que les changements prennent effet.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>Averti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>You avez reçu un avertissement pour la raison : %1.
 Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre vous. Si vous avez des questions, veuillez contacter un modérateur en privé.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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>Vous avez reçu le message suivant du serveur.
@@ -8198,6 +9510,11 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation>Affichage visuel de la bade de données</translation>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8238,42 +9555,42 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Points de vie</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Blanc</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Bleu</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Noir</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Rouge</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Vert</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Incolore</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Autre</translation>
     </message>
@@ -8281,151 +9598,209 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation>Impossible d&apos;ouvrir le fichier en lecture.</translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>&amp;Détails utilisateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>&amp;Chat privé</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Voir les parties du &amp;joueur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>Ajouter à la liste d&apos;&amp;amis</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Retirer de la liste d&apos;&amp;amis</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>Ajouter à la l&amp;iste noire</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Retirer de la l&amp;iste noire</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>Exclure de la &amp;partie</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="67"/>
         <source>Warn user</source>
         <translation>Avertir le joueur</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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Voir l&apos;historique des avertisseme&amp;nts du joueur</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="69"/>
         <source>Ban from &amp;server</source>
         <translation>Bannir du &amp;serveur</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Voir l&apos;historique de &amp;bannissement du joueur</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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Promouvoir d&apos;utilisateur à modérateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>Rétr&amp;ograder de modérateur à utilisateur</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation>Promouvoir utilisateur à &amp;arbitre</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="74"/>
         <source>Demote user from judge</source>
         <translation>Destituer arbitre</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="75"/>
         <source>View admin notes</source>
         <translation>Voir les notes d&apos;administrateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
-        <translation type="unfinished"/>
+        <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
-        <translation type="unfinished"/>
+        <translation>Cet utilisateur n&apos;existe pas.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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>Vous avez été ignoré par %1 et ne pouvez pas voir ses parties.</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="91"/>
         <source>Could not get %1&apos;s games.</source>
-        <translation type="unfinished"/>
+        <translation>Impossible d&apos;obtenir les parties de %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>Parties de %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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>Historique des bannissements</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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>Heure de bannissement;Modérateur;Durée de bannissement;Raison du bannissement;Raison visible</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation>Le joueur n&apos;a jamais été banni.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation>Impossible de collecter les informations de bannissement.</translation>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation>Historique des avertissements</translation>
     </message>
@@ -8440,55 +9815,65 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
         <translation>Le joueur n&apos;a jamais reçu d&apos;avertissement.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation>Impossible de collecter les informations d&apos;avertissements.</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="249"/>
         <source>Failed to get admin notes.</source>
         <translation>Impossible de récupérer les notes d&apos;administrateur.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>Succès</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>L&apos;utilisateur a été promu avec succès.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>L&apos;utilisateur a été rétrogradé avec succès.</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Échec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>L&apos;utilisateur n&apos;a pas été promu.</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>L&apos;utilisateur n&apos;a pas été rétrogradé.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation>Copier le hash</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Supprimer les messages de cet utilisateur</translation>
     </message>
@@ -8496,311 +9881,554 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>Localisation :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>Ancienneté du compte :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>Éditer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>Changer le mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>Changer l&apos;avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>Administrateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>Modérateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>Joueur enregistré</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>Joueur non enregistré</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>Arbitre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="371"/>
         <source>The entered password does not match your account.</source>
         <translation>Le mot de passe est incorrect</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>Information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>Informations de l&apos;utilisateur mises à jour.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation>Informations utilisateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation>Nom réel :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation>Rang :</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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><numerusform>%n année.</numerusform><numerusform>%n années.</numerusform><numerusform>%n année(s).</numerusform></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="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><numerusform>%10%n jour %20</numerusform><numerusform>%10%n jours %20</numerusform><numerusform>%10%n jour(s) %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation>Saisir le mot de passe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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>La vérification du mot de passe est requise pour changer votre adresse e-mail</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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>Une erreur est survenue lors de la mise à jour de vos informations personnelles.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>Ce serveur ne vous permet pas de mettre à jour vos informations personnelles.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>Mot de passe changé.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>Ce serveur ne vous permet pas de changer votre mot de passe.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>Le nouveau mot de passe est trop court.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>L&apos;ancien mot de passe est incorrect.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>Avatar mis à jour.</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Ce serveur ne vous permet pas de mettre à jour votre avatar.</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>Une erreur est survenue lors de la mise à jour de votre avatar.</translation>
+        <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>Ce serveur ne vous permet pas de mettre à jour vos informations personnelles.</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation>Voir l&apos;historique de bannissements</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation>Voir l&apos;historique d&apos;avertissements</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>Paramètres généraux de l&apos;interface</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>&amp;Double cliquer sur les cartes pour les jouer (au lieu d&apos;un simple clic)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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>&amp;Cliquer joue toutes les cartes sélectionnées (à la place de seulement la carte cliquée)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>&amp;Jouer toutes les cartes non terrain dans la pile (pas sur le champ de bataille) par défaut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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>Ne pas effacer les flèches lors de sous-phases</translation>
+    </message>
+    <message>
+        <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>Fermer la fenêtre d&apos;affichage des cartes lorsque la dernière carte est supprimée</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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>Focalise automatiquement la barre de recherche lorsque la fenêtre d&apos;affichage des cartes est ouverte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>Annoter le texte des cartes sur les jetons</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Utiliser les menus détachables, permettant les clics droits sur les rendre persistants</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation>Paramètres des notifications</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>Activer les notifications dans la barre des tâches</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>Notifier dans la barre des tâches pour les évènements des parties quand vous y êtes spectateur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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>Notifier dans la barre des tâches quand un ami se connecte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>Paramètres des animations</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;Animation d&apos;engagement / dégagement</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation>Paramètres d&apos;éditeur et de stockage de deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="231"/>
         <source>Open deck in new tab by default</source>
         <translation>Ouvre le deck dans un nouvel onglet par défaut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="232"/>
         <source>Use visual deck storage in game lobby</source>
         <translation>Utiliser le stockage visuel de decks dans le lobby des parties</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="233"/>
         <source>Use selection animation for Visual Deck Storage</source>
         <translation>Utilisez l&apos;animation de sélection pour le stockage visuel des deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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>Lorsque vous ajoutez une étiquette dans le stockage visuel du deck à un deck stocké comme un fichier .txt :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation>ne rien faire</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation>demander à convertir en fichier .cod</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation>toujours convertir en fichier .cod</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation>Type d&apos;éditeur de deck par défaut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation>Éditeur de deck classique</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation>Éditeur de deck visuel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation>Paramètres du replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="246"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Temps de tampon pour les sauts en arrière via un raccourci :</translation>
     </message>
@@ -8808,22 +10436,22 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation>Joueurs connectés au serveur : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation>Joueurs dans ce salon : %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation>Amis connectés : %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation>Joueurs sur liste noire connectés : %1 / %2</translation>
     </message>
@@ -8831,33 +10459,43 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
-        <translation type="unfinished"/>
+        <translation>Incrémenter tous les marqueurs de la carte</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Dégager tous les permanents</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
+        <translation>L&amp;ancer un dé...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Créer un jeton...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
-        <translation type="unfinished"/>
+        <translation>C&amp;réer un autre jeton</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
+        <translation>C&amp;réer un jeton prédéfini</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -8865,62 +10503,184 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
-        <translation>Mode : correspondance exacte</translation>
+        <source>Exact match</source>
+        <translation>Correspondance exacte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
-        <translation>Mode : inclure</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
+        <translation>Inclus</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
-        <translation>Mode : inclure / exclure</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
+        <translation>Inclure / Exclure</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation>Mode de filtre (conjonctions AND/OR/NOT de filtres)</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
+        <translation>Comment les couleurs sélectionnées ou non sont combinées dans le filtre</translation>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
+        <source>Search filter...</source>
+        <translation>Filtre de recherche...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
         <source>Save Filter</source>
         <translation>Sauvegarder le filtre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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>Sauvegarder tous les filtres actuellement appliqués dans un fichier</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
         <source>Enter filename...</source>
         <translation>Entrer le nom du fichier...</translation>
     </message>
 </context>
 <context>
-    <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
-        <source>Do not display card main-types with less than this amount of cards in the database</source>
-        <translation>Ne pas afficher les types principaux de cartes dont le nombre est inférieur à ce montant dans la base de données</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation>Trier par</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation>Filtrer par</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
+        <source>Save and load filters</source>
+        <translation>Sauvegarder et charger les filtres</translation>
+    </message>
+    <message>
+        <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>Filtrer par nom exact de carte</translation>
+    </message>
+    <message>
+        <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>Filtrer par type principal de carte</translation>
+    </message>
+    <message>
+        <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>Filtrer par sous-type de carte</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="151"/>
+        <source>Filter by set</source>
+        <translation>Filtrer par extension</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
+        <source>Filter by format legality</source>
+        <translation>Filtrer par légalité dans le format</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation>Sauvegarder/Charger</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation>Type Principal</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation>Sous-type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation>Éditions</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation>Formats</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation>Montrer les formats avec au moins :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation>cartes</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation>Ne pas afficher les formats dont le nombre est inférieur à ce nombre dans la base de données</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation>Mode de filtre (conjonctions AND/OR/NOT de filtres)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
         <source>Mode: Exact Match</source>
         <translation>Mode : correspondance exacte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation>Mode : inclure</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation>Montrer les types principaux avec au moins :</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation>cartes</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <source>Do not display card main-types with less than this amount of cards in the database</source>
+        <translation>Ne pas afficher les types principaux de cartes dont le nombre est inférieur à ce montant dans la base de données</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation>Mode de filtre (conjonctions AND/OR/NOT de filtres)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
+        <source>Mode: Exact Match</source>
+        <translation>Mode : correspondance exacte</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation>Mode : inclure</translation>
     </message>
@@ -8928,27 +10688,27 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation>Filtrer par nom...</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <source>Filter by name... (Exact match)</source>
+        <translation>Filtrer par nom... (Correspondance exacte)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Deck</source>
         <translation>Charger depuis un deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation>Appliquer tous les noms de cartes du deck actuellement chargé comme filtres de nom exacts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
         <source>Load from Clipboard</source>
         <translation>Charger depuis le presse-papier...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation>Appliquer tous les noms de cartes du presse-papier comme filtres de nom exacts</translation>
     </message>
@@ -8956,7 +10716,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDatabaseDisplayRecentSetFilterSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
+        <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>Filtrer par extensions récentes</translation>
     </message>
@@ -8964,19 +10724,19 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDatabaseDisplaySetFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation>Rechercher les extensions...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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>Mode : correspondance exacte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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>Mode : inclure</translation>
     </message>
@@ -8984,27 +10744,37 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation>Rechercher par sous-types...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation>Montrer les sous-types avec au moins : </translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation>cartes</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation>Ne pas afficher les sous-types de cartes dont le nombre est inférieur à ce montant dans la base de données</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation>Mode de filtre (conjonctions AND/OR/NOT de filtres)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation>Mode : correspondance exacte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation>Mode : inclure</translation>
     </message>
@@ -9012,50 +10782,93 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
+        <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>Rechercher par nom de carte (ou expression de recherche)</translation>
     </message>
     <message>
+        <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>Loading database ...</source>
-        <translation type="unfinished"/>
+        <source>Visual</source>
+        <translation>Visuel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
+        <source>Loading database ...</source>
+        <translation>Chargement de la base de données...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation>Effacer tous les filtres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
-        <translation>Sauvegarder et charger des filtres</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation>Tableau</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
+        <translation>Grouper par :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
-        <translation>Filtrer par nom exact de carte</translation>
+        <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>Configurez comment les cartes sont divisées en groupes/catégories.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
-        <translation>Filtrer par sous-type de carte</translation>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
+        <translation>Trier par :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
-        <translation>Filtrer par extension</translation>
+        <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>Cliquer et glisser pour changer l&apos;ordre de tri dans les groupes.</translation>
+    </message>
+    <message>
+        <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>Configurez le mode de tri des cartes dans leurs groupes</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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation>Mode d&apos;affichage : Superposé</translation>
+    </message>
+    <message>
+        <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>Modifier l&apos;affichage des cartes dans les zones (i.e. superposées ou entièrement visibles).</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation>Mode d&apos;affichage : Plat</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <translation>Ajouter des cartes via la barre de recherche ou l&apos;onglet base de données pour qu&apos;elles apparaissent ici</translation>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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>Piocher un nouvel exemple de main</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="72"/>
         <source>Sample hand size</source>
         <translation>Taille de l&apos;exemple de main</translation>
     </message>
@@ -9063,46 +10876,25 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
-        <translation>Cliquer et glisser pour changer l&apos;ordre dans les groupes</translation>
+        <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>Tapez un nom de carte ici pour des suggestions de la base de données...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="217"/>
         <source>Quick search and add card</source>
         <translation>Recherche et ajout rapide d&apos;une carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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>Recherchez la correspondance la plus proche dans la base de données (avec suggestions automatiques) et ajoutez l&apos;impression souhaitée au deck en appuyant sur Entrée</translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation>Configurez le mode de tri des cartes dans leurs groupes.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation>Interface de superposition</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation>Modifier l&apos;affichage des cartes dans les zones (i.e. superposées ou entièrement visibles).</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation>Interface plate</translation>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation>Stockage de deck</translation>
     </message>
@@ -9110,47 +10902,52 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDeckStorageQuickSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation>Montrer les dossiers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Show Tag Filter</source>
         <translation>Montrer le filtre à étiquette</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="131"/>
+        <source>Show Color Identity</source>
+        <translation>Montrer l&apos;identité de couleur</translation>
+    </message>
+    <message>
+        <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>Montrer les étiquettes sur les aperçus de decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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>Montrer l&apos;option de sélection de carte bannière</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="134"/>
         <source>Draw unused Color Identities</source>
         <translation>Affiche les identités de couleurs non utilisées</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="135"/>
         <source>Unused Color Identities Opacity</source>
         <translation>Opacité des identités de couleur inutilisées</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation>Aide contextuelle du deck :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation>Aucun(e)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation>Chemin de fichier</translation>
     </message>
@@ -9158,7 +10955,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
+        <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>Rechercher par chemin de fichier (ou expressions de recherche)</translation>
     </message>
@@ -9166,22 +10963,22 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation>Trier par ordre alphabétique (nom de deck)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation>Trier par ordre alphabétique (nom de fichier)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
         <source>Sort by Last Modified</source>
         <translation>Trier par date de dernière modification</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
         <source>Sort by Last Loaded</source>
         <translation>Trier par date de dernier chargement</translation>
     </message>
@@ -9189,17 +10986,17 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation>Chargement de la base de données ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation>Recharger les fichiers chargés</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation>Paramètres du stockage visuel des decks</translation>
     </message>
@@ -9207,43 +11004,43 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>Quel avertissement voudriez-vous envoyer ?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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>Censurer tous les messages de cet utilisateur dans toutes les salles</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>Envoyer un avertissement au joueur pour mauvaise conduite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>Erreur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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>Le nom d&apos;utilisateur du joueur à avertir ne peut pas être vide, merci d&apos;entrer un joueur à avertir.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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>L&apos;avertissement à utiliser ne peut pas être vide, merci de sélectionner un avertissement valide à envoyer.</translation>
     </message>
@@ -9251,133 +11048,133 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <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>Déplacer l&apos;édition sélectionnée tout en haut</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>Déplacer l&apos;édition sélectionnée vers le haut</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>Déplacer l&apos;édition sélectionnée vers le bas</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>Déplacer l&apos;édition sélectionnée tout en bas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation>Rechercher par ensemble de nom, code ou type</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="70"/>
         <source>Default order</source>
         <translation>Ordre par défaut</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>Restaurer l&apos;ordre original de priorité artistique</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="107"/>
         <source>Enable all sets</source>
         <translation>Activer toutes les éditions</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="108"/>
         <source>Disable all sets</source>
         <translation>Désactiver toutes les éditions</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="109"/>
         <source>Enable selected set(s)</source>
         <translation>Activer l(es) édition(s) sélectionnée(s)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation>Désactiver l(es) éditions(s) sélectionné(s)</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="126"/>
         <source>Deck Editor</source>
         <translation>Éditeur de deck</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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation>Utiliser Ctrl+A pour sélectionner toutes les éditions dans la vue actuelle.</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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation>Seules les cartes des éditions activées apparaitront dans la liste de cartes de l&apos;éditeur de deck.</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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation>La priorité des images est décidé dans l&apos;ordre suivant:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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>D&apos;abord le dossier PERSONNALISÉ (%1), puis les éditions activées dans cette fenêtre (de haut en bas)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation>Inclure les cartes rééquilibrées pour Alchemy [nécessite un redémarrage]</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="128"/>
         <source>Card Art</source>
         <translation>Images des cartes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation>Comment utiliser une illustration personnalisée de carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation>Astuces</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation>Note</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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation>Trier par colonne vous permet de trouver une édition sans changer la priorité des éditions.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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>Pour trier à nouveau, cliquez sur l&apos;entête de la colonne jusqu&apos;à ce que ce message disparaisse.</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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation>Utiliser le tri actuel comme ordre de priorité des éditions</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
         <source>Sorts the set priority using the same column</source>
         <translation>Sortir la priorité sur la même colonne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation>Gérer les éditions</translation>
     </message>
@@ -9385,72 +11182,72 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation>Rechercher par nom de carte (ou expression de recherche)</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation>Non groupé</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation>Grouper par Types</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation>Grouper par Valeur de Mana</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation>Grouper par Couleurs</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation>Non trié</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation>Trier par Nom</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation>Trier par Type</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation>Trier par Coût de Mana</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation>Trier par Couleurs</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation>Trier par F/E</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation>Trier par extension</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>mélanger en quittant</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>vue de la pile</translation>
     </message>
@@ -9458,7 +11255,7 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>Français (French)</translation>
     </message>
@@ -9466,12 +11263,12 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation>Connecter au démarrage</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation>Débuguer dans journal</translation>
     </message>
@@ -9479,1005 +11276,1078 @@ Merci de ne pas recommencer ou d&apos;autres mesures peuvent être prises contre
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>Fenêtre principale</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation>Éditeur de deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>Hall</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation>Marqueurs sur la carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation>Marqueurs sur le joueur</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>Force et Endurance</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>Phases de jeu</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>Zone de jeu</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation>Déplacer la carte sélectionnée</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation>Déplacer la carte du dessus</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation>Déplacer la carte du dessous</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>Gameplay</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation>Piocher</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation>Salon de discussion</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation>Fenêtre de jeu</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation>Charger un deck depuis le presse-papier</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation>Replays</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation>Onglets</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation>Vérifier les mises à jour des cartes…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation>Se connecter…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>Déconnecter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>Plein écran</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation>S&apos;enregistrer…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation>Paramètres…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation>Démarrer une partie locale…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation>Regarder un replay…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation>Analyser le deck (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation>Analyser le deck (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation>Effacer tous les filtres</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation>Effacer le filtre sélectionné</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation>Retirer la carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation>Gérer les éditions…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation>Éditer les jetons personnalisés…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation>Exporter le deck (decklist.org)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation>Exporter le deck (decklist.xyz)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation>Ajouter une carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation>Charger un deck…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Charger un deck depuis le presse-papier…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation>Éditer le deck dans le presse-papier, avec annotations</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation>Éditer le deck dans le presse-papier</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation>Nouveau deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Ouvrir le dossier d&apos;images personnalisées</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation>Imprimer le deck…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation>Supprimer la carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation>Réinitialiser l&apos;interface</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation>Sauvegarder le deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation>Sauvegarder le deck sous…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Copier le deck annoté</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation>Copier le deck, avec annotations (sans information d&apos;extension)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation>Copier le deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation>Copier le deck (sans information d&apos;extension)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation>Charger un deck local…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation>Charger un deck distant…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation>Marquer prêt à démarrer</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Verrouiller / déverrouiller la réserve</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation>Ajouter un marqueur vert</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation>Retirer un marqueur vert</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation>Nombre de marqueurs verts…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation>Ajouter un marqueur rouge</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation>Retirer un marqueur rouge</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation>Nombre de marqueurs rouges…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation>Gagner 1 point de vie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation>Montrer la barre de statut</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation>Annuler le chargement du deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation>Forcer le démarrage</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation>Ajouter un marqueur de carte (F)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation>Retirer un marqueur de carte (F)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation>Nombre de marqueurs de carte (F)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation>Ajouter un marqueur de carte (E)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation>Retirer un marqueur de carte (E)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation>Nombre de marqueurs de carte (E)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation>Ajouter un marqueur de carte (D)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation>Retirer un marqueur de carte (D)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation>Nombre de marqueurs de carte (D)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation>Ajouter un marqueur de carte (C)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation>Retirer un marqueur de carte (C)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation>Nombre de marqueurs de carte (C)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation>Ajouter un marqueur de carte (B)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation>Retirer un marqueur de carte (B)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation>Nombre de marqueurs de carte (B)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation>Ajouter un marqueur de carte (A)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation>Retirer un marqueur de carte (A)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation>Nombre de marqueurs de carte (A)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation>Perdre 1 point de vie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation>Nombre de points de vie…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation>Ajouter un marqueur blanc</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation>Retirer un marqueur blanc</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation>Nombre de marqueurs blancs…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation>Ajouter un marqueur bleu</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation>Retirer un marqueur bleu</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation>Nombre de marqueurs bleus…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation>Ajouter un marqueur noir</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation>Retirer un marqueur noir</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation>Nombre de marqueurs noirs…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation>Ajouter un marqueur incolore</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation>Retirer un marqueur incolore</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation>Nombre de marqueurs incolores…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation>Ajouter un autre marqueur</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation>Supprimer un autre marqueur</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation>Mettre d&apos;autres compteurs...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
-        <translation type="unfinished"/>
+        <translation>Incrémenter tous les marqueurs de la carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation>Augmenter la force (+1/+0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Diminuer la force (-1/-0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Endurance vers force (+1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Augmenter l&apos;endurance (+0/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Diminuer l&apos;endurance (-0/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Force vers endurance (-1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Augmenter la force et l&apos;endurance (+1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Diminuer la force et l&apos;endurance (-1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation>Changer la force et l&apos;endurance…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation>Réinitialiser la force et l&apos;endurance</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>Dégager</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>Entretien</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>Piocher</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation>Première phase principale</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation>Début de combat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>Attaquer</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>Bloquer</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>Blessures</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation>Fin de combat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation>Seconde phase principale</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation>Phase suivante</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation>Étape suivante avec action</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation>Tour suivant</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation>Cache la carte dans la fenêtre Révéler</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation>Engage / dégager la carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation>Tout dégager</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
-        <translation>Activer / désactiver le dégagement normal</translation>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
+        <translation>Activer / désactiver le désengagment</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation>Retourner la carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation>Regarder la carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation>Jouer la carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation>Jouer la carte, face cachée</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation>Attacher la carte…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation>Détacher la carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation>Cloner la carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation>Créer un jeton…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation>Créer tous les jetons associés</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation>Créer un autre jeton</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation>Annoter…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation>Sélectionne toutes les cartes dans la zone</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation>Sélectionne toutes les cartes dans la ligne</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation>Sélectionne toutes les cartes dans la colonne</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation>Révéler les cartes sélectionnées à tous les joueurs</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation>Dessous de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>Exil</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>Cimetière</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>Main</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation>Dessus de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation>Champ de bataille, face cachée</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation>Champ de bataille</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>Bibliothèque</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>Réserve</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation>Cartes du dessus de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation>Cartes du dessous de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation>Fermer la vue récente</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation>Pile</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation>Cimetière (plusieurs)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation>Cimetière (plusieurs), faces cachées</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation>Exil (plusieurs)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation>Exiler(plusieurs), faces cachées</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation>Empiler jusqu&apos;à ce que trouvé</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation>Piocher la carte du dessous </translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Piocher plusieurs cartes du dessous...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation>Tracer une flèche…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation>Retirer les flèches locales</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation>Quitter la partie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>Concéder</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation>Lancer un dé…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation>Mélanger la bibliothèque</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation>Mélanger les cartes du dessus de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation>Mélanger les cartes du dessous de la bibliothèque</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation>Mulligan (Même nombre de cartes)</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation>Mulligan (-1 carte)</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation>Piocher une carte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation>Piocher plusieurs cartes…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation>Annuler la dernière pioche</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation>Toujours révéler la carte du dessus</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation>Toujours révéler la carte du dessus</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation>Trier la main par nom</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation>Trier la main par type</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation>Trier la main par Valeur de Mana</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation>Révéler la main à tous les joueurs</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation>Révéler une carte aléatoire à tous les joueurs</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation>Pivoter la vue dans le sens horaire</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Pivoter la vue dans le sens anti-horaire</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation>Lâcher le focus de la boîte de texte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation>Focus sur le chat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation>Effacer le chat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation>Rafraichir</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation>Avance en avant</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation>Avant en arrière</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation>Avance beaucoup en avant</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation>Avance beaucoup en arrière</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation>Jouer/Pause</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation>Activer l&apos;avance rapide</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
-        <translation type="unfinished"/>
+        <translation>Accueil</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation>Stockage visuel de deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation>Stockage de deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation>Administration</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation>Journaux</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_it.ts b/cockatrice/translations/cockatrice_it.ts
index ab2472189..e370878b9 100644
--- a/cockatrice/translations/cockatrice_it.ts
+++ b/cockatrice/translations/cockatrice_it.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>Imposta &amp;contatore...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>Imposta contatore</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Nuovo valore per il contatore &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Ricarica</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Acquisisci set e numero (se disponibili)</translation>
     </message>
@@ -36,81 +36,83 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation>Apri in una nuova scheda</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation>Sei sicuro?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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>La lista del mazzo è stata modificata.
 Vuoi salvare i cambiamenti?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation>Impossibile aprire il mazzo a %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation>Impossibile salvare mazzo remoto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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>Il mazzo non può essere salvato.
 Controlla se la cartella è valida e prova ancora.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation>Salva mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation>Il mazzo non può essere salvato.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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>Non ci sono carte da esportare nel tuo mazzo</translation>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
-        <translation>Nessun mazzo da esportare è stato selezionato.</translation>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
+        <translation>Aggiungi pannello di analisi</translation>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation>Aggiorna note</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation>Note amministratori su %1</translation>
     </message>
@@ -118,202 +120,253 @@ Controlla se la cartella è valida e prova ancora.</translation>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation>Mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation> secondi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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>Impossibile creare la cartella dei temi in &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>Impostazioni temi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>Tema attuale:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation>Apri cartella temi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation>Sorgente dello sfondo della Home:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation>Frequenza di modifica dello sfondo della Home:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation>Disattivato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation>Impostazioni menù</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="415"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>Mostra scorciatoie da tastiera nel menù del tasto destro del mouse</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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>Mostra barra di filtro sopra la lista delle partite</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>Visualizzazione delle carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>Visualizza nome delle carte sopra le immagini</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>Ruota automaticamente carte con disposizione orizzontale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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>Determina l&apos;illustrazione della carta attraverso la priorità dei set (come prima dell&apos;implementazione del ProviderID)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Nel selettore di stampa, mostra per primi i set delle carte che il mazzo contiene</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>Ingrandisci la carta sotto il mouse</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation>Usa i bordi delle carte arrotondati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Sovrapposizione % minima delle carte in pila e nella mano verticale:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="434"/>
         <source>Maximum initial height for card view window:</source>
         <translation>Altezza iniziale massima per la finestra di visualizzazione delle carte:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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> file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="436"/>
         <source>Maximum expanded height for card view window:</source>
         <translation>Altezza massima per la finestra di visualizzazione delle carte:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation>Segnalini della carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation>Segnalino %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>Disposizione della mano</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Disponi la mano orizzontalmente (spreca spazio)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>Allinea a sinistra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>Disposizione delle aree di gioco</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>Inverti disposizione verticale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Numero di giocatori minimo per disposizione multicolonna:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Dimensione massima carattere per le informazioni mostrate sulle carte:</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="136"/>
+        <source>Back to results</source>
+        <translation>Torna ai risultati</translation>
+    </message>
+    <message>
+        <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>Apri mazzo nell&apos;editor dei mazzi</translation>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -335,112 +388,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>Banna &amp;user name</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>Banna indirizzo &amp;IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>Banna client I&amp;D</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>Tipo di ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>Ban &amp;permanente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>Ban &amp;temporaneo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>&amp;Giorni:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Ore:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minuti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>Durata del ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>Per favore inserisci la ragione del ban.
 Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>Per favore inserisci la ragione del ban che sarà visibile alla persona bannata.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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>Elimina tutti i messaggi di questo utente in tutte le stanze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annulla</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>Banna utente dal server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>Seleziona un nome, un IP, un client ID o una combinazione di questi per impostare un ban.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>Devi inserire un valore nel campo nome quando il ban per nome è selezionato.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>Devi inserire un valore nel campo ip quando il ban per ip è selezionato.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>Devi inserire un valore nel campo clientid quando il ban per clientid è selezionato.</translation>
     </message>
@@ -448,152 +501,221 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation>Beta</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation>Nessuna risposta ricevuta dal server degli aggiornamenti.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Risposta non valida ricevuta dal server degli aggiornamenti.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation>Nessuna risposta ricevuta dal server degli aggiornamenti.</translation>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>Costo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>F/C</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>Colore</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>AND</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>OR</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>AND NOT</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>OR NOT</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation>Nome (esatto)</translation>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>Colore</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>Testo</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>Costo di mana</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation>Valore di mana</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>Rarità</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>Forza</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>Costituzione</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>Fedeltà</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>Formato</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation>Sottotipo</translation>
     </message>
@@ -601,22 +723,22 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <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>Immagine</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>Descrizione</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>Entrambi</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>Visualizza trasformazione</translation>
     </message>
@@ -624,22 +746,22 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation>Guarda carte correlate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation>Aggiungi la carta al &amp;mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation>Mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
@@ -652,12 +774,22 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
         <translation>Nome:</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>Set:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation>Numero di collezione:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation>Carte correlate:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation>Carta sconosciuta:</translation>
     </message>
@@ -665,266 +797,284 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation>Ri&amp;vela a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation>&amp;Tutti i giocatori</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation>Guarda carte correlate</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation>Pedina: </translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation>Tutte le pedine</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation>&amp;Seleziona tutto</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation>S&amp;eleziona fila</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation>S&amp;eleziona colonna</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation>&amp;Gioca</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation>&amp;Nascondi</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation>Gioca a &amp;faccia in giù</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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>&amp;TAPpa/STAPpa</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
-        <translation>Blocca/Sblocca &amp;STAP normale</translation>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
+        <translation>Salta lo &amp;STAP</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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>Capovolgi</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation>&amp;Sbircia la faccia della carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation>&amp;Copia</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation>Asse&amp;gna alla carta...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation>Tog&amp;li</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation>&amp;Disegna una freccia...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation>&amp;Imposta note...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation>Segnalini delle ca&amp;rte</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation>&amp;Aggiungi segnalino (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation>&amp;Rimuovi segnalino (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation>Imposta &amp;segnalini (%1)...</translation>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
-        <translation>Dimensioni della carta</translation>
+        <translation>Dimensioni carte</translation>
     </message>
 </context>
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation>la sua mano</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation>Mano di %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation>il suo grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation>Grimorio di %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation>del suo grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation>del grimorio di %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation>il suo grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation>Grimorio di %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation>il suo grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation>Grimorio di %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation>il suo grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation>Grimorio di %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation>il suo cimitero</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation>Cimitero di %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation>la sua zona di esilio</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation>Esilio di %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation>la sua sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation>Sideboard di %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation>la sua sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation>Sideboard di %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation>la sua zona personalizzata &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation>la zona personalizzata &apos;%2&apos; di %1</translation>
@@ -933,7 +1083,7 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Errore di lettura alla riga %1 posizione %2:</translation>
     </message>
@@ -941,29 +1091,470 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Errore di lettura alla riga %1 posizione %2:</translation>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation>&amp;Zone personalizzate</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation>Visualizza la zona personalizzata &apos;%1&apos;</translation>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation>Aggiungi pannello</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation>Rimuovi pannello</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation>Salva disposizione</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation>Carica disposizione</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation>Database carte</translation>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation>Info carta</translation>
     </message>
@@ -971,47 +1562,17 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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>Cerca per nome della carta (o espressioni di ricerca)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation>Aggiungi al mazzo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation>Aggiungi alla sideboard</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation>Seleziona stampa</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation>Mostra su EDHRec (Commander)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation>Mostra su EDHRec (Carta)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation>Mostra carte correlate</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="127"/>
         <source>Add card to &amp;maindeck</source>
         <translation>Aggiungi carta al &amp;mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="128"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Aggiungi carta alla &amp;sideboard</translation>
     </message>
@@ -1019,87 +1580,97 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation>Caricamento database...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation>Carta copertina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation>Costo di mana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation>Colori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation>Seleziona stampa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation>Mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation>&amp;Nome mazzo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation>Impostazioni carta copertina/etichette</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
         <source>Show banner card selection menu</source>
         <translation>Visualizza menu di selezione carta copertina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation>Visualizza menu di selezione etichette</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation>&amp;Commenti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation>Raggruppa per:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation>Formato:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation>Hash:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation>&amp;Aumenta il numero</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation>&amp;Diminuisci il numero</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation>&amp;Rimuovi carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="752"/>
         <source>Swap card to/from sideboard</source>
         <translation>Sposta carta in maindeck/sideboard</translation>
     </message>
@@ -1125,114 +1696,114 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation>&amp;Editor dei mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation>&amp;Nuovo mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation>&amp;Carica mazzo...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation>Carica mazzo recente...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation>Svuota</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation>&amp;Salva mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation>Salva mazzo &amp;con nome...</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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation>Carica mazzo dagli app&amp;unti...</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="162"/>
         <source>Edit deck in clipboard</source>
         <translation>Modifica mazzo negli appunti</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="166"/>
+        <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>Con annotazioni</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="168"/>
+        <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>Senza annotazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation>Salva il mazzo negli appunti</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="168"/>
         <source>Annotated (No set info)</source>
         <translation>Con annotazioni (senza info set)</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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation>Senza annotazioni (senza info set)</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="172"/>
         <source>&amp;Print deck...</source>
         <translation>Stam&amp;pa mazzo...</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="174"/>
         <source>Load deck from online service...</source>
         <translation>Carica mazzo dal servizio online...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation>&amp;Invia mazzo al servizio online</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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation>Crea una decklist (decklist.org)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation>Crea una decklist (decklist.xyz)</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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation>Analizza mazzo (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation>Analizza mazzo (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation>&amp;Chiudi</translation>
     </message>
@@ -1240,7 +1811,7 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation>Selettore di stampa</translation>
     </message>
@@ -1248,194 +1819,171 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>Aggiorna Spoiler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>Fatto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation>Gli indirizzi di download sono stati resettati.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>Le immagini delle carte scaricate sono state eliminate.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation>Non è stato possibile eliminare alcune delle immagini delle carte scaricate.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>Aggiungi indirizzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>Indirizzo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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>Modifica indirizzo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation>Dimensione cache di rete:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation>TTL cache dei reindirizzamenti:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation>Per quanto tempo sono validi i reindirizzamenti per gli URL memorizzati nella cache.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation>Dimensione cache immagini:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation>Aggiungi indirizzo URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation>Elimina indirizzo URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation>Giorno/i</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>Aggiornando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>Scegli il percorso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation>Ordine di priorità degli indirizzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>Spoiler</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>Scarica spoiler automaticamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation>Indirizzo spoiler:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>Ultima modifica</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>Scarica spoiler automaticamente all&apos;avvio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>Premi il pulsante per aggiornare manualmente senza riavviare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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>Non chiudere le impostazioni fino a che l&apos;aggiornamento manuale sia completato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation>Scarica immagini delle carte in tempo reale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation>Come aggiungere indirizzi personalizzati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>Elimina immagini scaricate</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation>Resetta indirizzi di download</translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
-        <translation>Cache su disco immagini scaricate</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
+        <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
-        <translation>Cache in memoria per immagini non attualmente su schermo</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation>Ripeti</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation>Annulla/Ripeti Storico</translation>
+    </message>
+    <message>
+        <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>Clicca su una riga per ritornare a quel punto nello storico delle modifiche.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation>[ripeti]</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
+        <translation>[annulla]</translation>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation>Quantità</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>Numero</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation>ID Provider</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>Carta</translation>
     </message>
@@ -1443,12 +1991,12 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation>Formati di mazzo comuni (%1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation>Tutti i file (*.*)</translation>
     </message>
@@ -1456,17 +2004,17 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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>Modalità: Corrispondenza esatta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
         <source>Mode: Includes</source>
         <translation>Modalità: Include</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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>Filtraggio identità di colore (utilizzabile con connettivi logici AND/OR/NOT)</translation>
     </message>
@@ -1474,7 +2022,7 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
         <source>Edit tags ...</source>
         <translation>Imposta etichette...</translation>
     </message>
@@ -1482,62 +2030,62 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
         <source>Deck Tags Manager</source>
         <translation>Gestore etichette del mazzo</translation>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation>Gestisci le etichette del mazzo. Assegna o rimuovi etichette, oppure creane di nuove.</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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation>Aggiungi una nuova etichetta (Es.: Aggro️)</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="104"/>
         <source>Add Tag</source>
         <translation>Aggiungi etichetta</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="105"/>
         <source>Filter tags...</source>
         <translation>Filtra etichette...</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="106"/>
         <source>OK</source>
         <translation>Conferma</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="107"/>
         <source>Edit default tags</source>
         <translation>Modifica etichette</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="108"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation>Input non valido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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>Il nome dell&apos;etichetta non può essere vuoto!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation>Duplica Etichetta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>This tag already exists.</source>
         <translation>Questa etichetta esiste già.</translation>
     </message>
@@ -1545,98 +2093,156 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation>Carta copertina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
         <source>Open in deck editor</source>
         <translation>Apri nell&apos;editor dei mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation>Modifica etichette</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation>Rinomina mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
         <source>Save Deck to Clipboard</source>
         <translation>Salva il mazzo negli appunti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation>Con annotazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
         <source>Annotated (No set info)</source>
         <translation>Con annotazioni (senza info set)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation>Senza annotazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
         <source>Not Annotated (No set info)</source>
         <translation>Senza annotazioni (senza info set)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation>Rinomina file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation>Elimina file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation>Imposta carta copertina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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>Nuovo nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation>Rinomina non riuscita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation>Elimina file</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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>Vuoi davvero eliminare il file selezionato?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation>Eliminazione non riuscita</translation>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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>Rinominato mazzo in &quot;%1&quot; da &quot;%2&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
+        <source>Updated comments (was %1 chars, now %2 chars)</source>
+        <translation>Commenti aggiornati (prima %1 caratteri, ora %2 caratteri)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation>Impostata carta copertina a %1 (%2)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation>Etichette modificate</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation>Formato impostato a %1</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation>Aggiunto (%1): %2 (%3) %4</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="264"/>
+        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
+        <translation>Spostato in %1 1 × &quot;%2&quot; (%3)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation>Rimosso &quot;%1&quot; (tutte le copie)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation>%1 1 × &quot;%2&quot; (%3)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation>Aggiunto</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation>Rimosso</translation>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1654,75 +2260,75 @@ Questa è visibile solo ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>Carica mazzo...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Carica mazzo remoto...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation>Carica dagli appunti...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation>Carica dal sito...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation>Deseleziona mazzo</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>Pronto ad iniziare</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation>Forza avvio</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation>Sideboard sbloccata</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation>Sideboard bloccata</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>Errore</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>I file selezionati non posso essere caricati.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation>Il mazzo è più grande della dimensione massima del file consentita.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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>Sicuro di voler forzare l&apos;avvio?
 Ciò espellerà dalla partita tutti i giocatori che non sono pronti.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -1757,143 +2363,143 @@ Vuoi convertire il mazzo al formato .cod?</translation>
         <translation>Scaricamento...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>Host Conosciuti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation>Elimina il server salvato attualmente selezionato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Aggiorna la lista dei server con server pubblici</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>Nuovo indirizzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nome giocatore:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;assword:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>&amp;Salva password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>Connetti a&amp;utomaticamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Connetti automaticamente all&apos;ultimo server utilizzato all&apos;avvio di Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>Se hai problemi a connetterti o registrarti contatta lo staff del server per aiuto!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>Sito web</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation>Resetta Password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation>Hai dimenticato la password?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>&amp;Connetti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation>Contatto server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>Connetti al server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation>URL Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation>Numero porta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation>Nome univoco del server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>Avviso di connessione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>È necessario impostare un nome per il nuovo profilo di connessione.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>Problema di connessione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Il nome del giocatore non può essere vuoto.</translation>
     </message>
@@ -1901,117 +2507,122 @@ Vuoi convertire il mazzo al formato .cod?</translation>
 <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>Ricorda impostazioni</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>&amp;Descrizione:</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>G&amp;iocatori:</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>Generali</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>Formato di gioco</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>&amp;Password:</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>Solo gli &amp;amici possono entrare</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>Solo &amp;utenti registrati possono entrare</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>Restrizioni d&apos;ingresso</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>&amp;Gli spettatori possono osservare</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>Gli spettatori &amp;necessitano di password</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>Gli spettatori possono &amp;chattare</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>Gli spettatori vedono le mani</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>Crea partita come spettatore</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>Spettatori</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>Punti vita iniziali:</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>Apri mazzi nella lobby</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation>Crea partita come arbitro</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation>Configurazione partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>Pulisci</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>Crea partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>Informazioni partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>Errore del server.</translation>
     </message>
@@ -2019,97 +2630,97 @@ Vuoi convertire il mazzo al formato .cod?</translation>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nome:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Pedina</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;olore:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>bianco</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>blu</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>nero</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>rosso</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>verde</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>multicolore</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>incolore</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;F/C:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Note:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Elimina la pedina quando lascia il campo</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation>Crea a faccia in giù (nasconde solo il nome)</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Dati pedina</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Mostra &amp;tutte le pedine</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Mostra pedine di questo &amp;mazzo</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>Scegli pedina dalla lista</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>Crea pedina</translation>
     </message>
@@ -2117,53 +2728,53 @@ Vuoi convertire il mazzo al formato .cod?</translation>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation>Modifica etichette</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation>Conferma</translation>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation>Annulla</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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation>Scrivi il nome dell&apos;etichetta e premi Invio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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>✖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation>Input non valido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation>Il nome dell&apos;etichetta non può essere vuoto!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation>Duplica Etichetta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation>Questa etichetta esiste già.</translation>
     </message>
@@ -2171,40 +2782,40 @@ Vuoi convertire il mazzo al formato .cod?</translation>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>Nessuna immagine selezionata.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Per cambiare il tuo avatar, scegli una nuova immagine.
 Per rimuovere il tuo avatar attuale, conferma senza scegliere una nuova immagine.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>Cerca...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>Cambia avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>Apri immagine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>File immagine (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>Immagine selezionata non valida.</translation>
     </message>
@@ -2212,17 +2823,17 @@ Per rimuovere il tuo avatar attuale, conferma senza scegliere una nuova immagine
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation>Modifica mazzo negli appunti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation>Lista del mazzo non valida.</translation>
     </message>
@@ -2230,38 +2841,38 @@ Per rimuovere il tuo avatar attuale, conferma senza scegliere una nuova immagine
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Vecchia password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nuova password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Conferma nuova password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Cambia password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>La nuova password è troppo corta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Le password non coincidono.</translation>
     </message>
@@ -2269,97 +2880,97 @@ Per rimuovere il tuo avatar attuale, conferma senza scegliere una nuova immagine
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;olore:</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="34"/>
         <source>white</source>
         <translation>bianco</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="35"/>
         <source>blue</source>
         <translation>blu</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="36"/>
         <source>black</source>
         <translation>nero</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="37"/>
         <source>red</source>
         <translation>rosso</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="38"/>
         <source>green</source>
         <translation>verde</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="39"/>
         <source>multicolor</source>
         <translation>multicolore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>incolore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;F/C:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Note:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Dati pedina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>Aggiungi pedina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Rimuovi pedina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation>Modifica pedine personalizzate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Inserisci il nome della pedina:</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>Errore</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>Il nome scelto è in conflitto con una carta o pedina esistente.
-Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Organizza set&quot; per visualizzarle correttamente.</translation>
+Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Gestisci Espansioni&quot; per visualizzarle correttamente.</translation>
     </message>
 </context>
 <context>
@@ -2380,12 +2991,12 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Organizza
         <translation>Non definito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Nome reale:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Modifica profilo utente</translation>
     </message>
@@ -2423,112 +3034,113 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Organizza
         <translation>2 ore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation>Nascondi partite &apos;solo per amici&apos;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation>Nascondi partite al completo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation>Nascondi partite iniziate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation>Nascondi partite protette da password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation>Nascondi partite degli utenti ignorati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
         <translation>Nascondi partite non create dagli amici</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation>Nascondi partite con liste di mazzo rivelate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Più nuovo di:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Descrizione partita:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>Nome &amp;creatore:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>Tipi di &amp;partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>Minimo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>Massimo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>Numero di giocatori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>Restrizioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Mostra le partite solo se &amp;gli spettatori possono guardare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Mostra partite protette da password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Mostra le partite solo se gli spettatori possono guardare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Mostra le partite solo se gli spettatori possono guardare le mani</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation>Spettatori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>Filtro partite</translation>
     </message>
@@ -2536,52 +3148,52 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Organizza
 <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>Avviso di reimpostazione della password di verifica della sfida</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>Si è verificato un problema. Prova a richiedere di nuovo una nuova password.</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>Inserisci le informazioni del server e dell&apos;account per cui desideri richiedere una nuova password.</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>&amp;Host:</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>&amp;Porta:</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>&amp;Nome giocatore:</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>Email:</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>Reimposta password sfida</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>Errore di reimpostazione della password di verifica della sfida</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>L&apos;indirizzo email non può essere vuoto.</translation>
     </message>
@@ -2589,37 +3201,37 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Organizza
 <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>Inserisci le informazioni del server per il quale desideri richiedere una nuova password.</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>&amp;Host:</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>&amp;Porta:</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>&amp;Nome giocatore:</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>Richiesta di reimpostazione della password</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>Errore di ripristino della password</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>Il nome del giocatore non può essere vuoto.</translation>
     </message>
@@ -2627,86 +3239,86 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Organizza
 <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>Avviso di reimpostazione della password</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>Si è verificato un problema. Prova a richiedere di nuovo una nuova password.</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>Inserisci il token ricevuto e la nuova password per impostare la tua nuova password.</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>&amp;Host:</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>&amp;Porta:</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>&amp;Nome giocatore:</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>Token:</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>Nuova password:</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>Resetta la password</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>Il nome del giocatore non può essere vuoto.</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>Errore di ripristino della password</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>Il token non può essere vuoto.</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>La nuova password non può essere vuota.</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>Errore</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>La tua password è troppo corta.</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>Le password non coincidono.</translation>
     </message>
@@ -2722,17 +3334,17 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Organizza
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>Carica mazzo dagli appunti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>Lista del mazzo non valida.</translation>
     </message>
@@ -2740,45 +3352,45 @@ Assicurati di abilitare il set &quot;Pedine&quot; nella finestra &quot;Organizza
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation>Incolla il link a una lista di mazzo online per importarla.
 (Sono supportati Archidekt, Deckstats, Moxfield, e TappedOut).</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation>Carica Mazzo dal Sito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation>Impossibile acquisire lista di mazzo da questo sito.
 (Sono supportati Archidekt, Deckstats, Moxfield, e TappedOut).</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation>Errore di rete: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation>Ricevuta lista di mazzo vuota.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation>Impossibile acquisire i dati del mazzo: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2798,45 +3410,78 @@ https://tappedout.net/mtg-decks/nome-del-tuo-mazzo/</translation>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>Carica mazzo</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation>Giocatori:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation>Generale</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation>Punti vita iniziali:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation>Configurazione partita</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation>Ricorda impostazioni</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation>Configurazione partita locale</translation>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation>Nome della carta (o ricerca espressioni):</translation>
     </message>
     <message>
-        <location filename="src/game/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>Numero di risultati:</translation>
     </message>
     <message>
-        <location filename="src/game/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>Riproduzione automatica dei successi</translation>
     </message>
     <message>
-        <location filename="src/game/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>Metti le carte in cima alla pila fino a...</translation>
     </message>
     <message>
-        <location filename="src/game/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>Non esiste alcuna carta corrispondente agli estremi di ricerca nel database. Procedere comunque?</translation>
     </message>
     <message>
-        <location filename="src/game/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>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/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>Filtro non valido</translation>
     </message>
@@ -2844,54 +3489,54 @@ https://tappedout.net/mtg-decks/nome-del-tuo-mazzo/</translation>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Inserisci le tue informazioni e le informazioni del server a cui desideri registrarti.
 La tua email verrà utilizzata per verificare il tuo account.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nome giocatore:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;assword:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>Password (conferma):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>Email (conferma):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>Stato:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>Non definito</translation>
     </message>
@@ -2937,17 +3582,17 @@ La tua email verrà utilizzata per verificare il tuo account.</translation>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation>Numero di facce:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation>Numero di dadi:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation>Lancia dado</translation>
     </message>
@@ -2955,40 +3600,55 @@ La tua email verrà utilizzata per verificare il tuo account.</translation>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation>Carte non modificate:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation>Carte modificate:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation>Seleziona i set per abilitarli. Trascina per riordinarli e modificare la loro priorità. Le carte useranno la stampa del set abilitato con la priorità massima.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation>Elimina tutte le info sui set</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation>Imposta tutti come preferiti</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation>Stampe modificate massivamente.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation>Informazioni sulle stampe eliminate.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation>Imposta tutte le stampe come preferite.</translation>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>Errore sconosciuto durante il caricamento del database delle carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -3005,7 +3665,7 @@ Ti consigliamo di avviare oracle per aggiornare il tuo database delle carte.
 Vuoi modificare le impostazioni della posizione del database della carte?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3022,7 +3682,7 @@ Ti consigliamo di avviare oracle per aggiornare il tuo database delle carte.
 Vuoi modificare le impostazioni della posizione del database della carte?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3034,7 +3694,7 @@ Per favore crea un ticket di assistenza su https://github.com/Cockatrice/Cockatr
 Desideri modificare l&apos;impostazione della posizione del database?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3043,7 +3703,7 @@ Would you like to change your database location setting?</source>
 Vuoi modificare le impostazioni della posizione del database della carte?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3052,7 +3712,7 @@ Would you like to change your database location setting?</source>
 Vuoi modificare le impostazioni della posizione del database della carte?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3065,59 +3725,64 @@ https://github.com/Cockatrice/Cockatrice/issues
 Desideri modificare l&apos;impostazione della posizione del database?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>Il percorso della cartella del mazzo non è valido. Vuoi tornare in dietro e impostare il percorso corretto?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>Il percorso della cartella delle immagini delle carte è invilido. Vuoi tornare indietro e impostare il percorso corretto?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>Aspetto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>Interfaccia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation>Immagini carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>Suoni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>Scorciatoie</translation>
     </message>
@@ -3125,12 +3790,12 @@ Desideri modificare l&apos;impostazione della posizione del database?</translati
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation>Controllo aggiornamenti carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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>
@@ -3139,27 +3804,27 @@ Seleziona la modalità di esecuzione dell&apos;aggiornamento.
 Potrai comunque cambiarla in seguito dalle impostazioni, nella scheda &apos;Generale&apos;.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation>Esegui in primo piano</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation>Esegui in background</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="27"/>
         <source>Run in background and always from now on</source>
         <translation>Esegui in background da ora in poi</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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation>Non eseguire e non chiedere più</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="29"/>
         <source>Don&apos;t run this time</source>
         <translation>Non eseguire stavolta</translation>
     </message>
@@ -3167,17 +3832,17 @@ Potrai comunque cambiarla in seguito dalle impostazioni, nella scheda &apos;Gene
 <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>Prossimo</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>Precedente</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>Suggerimento del giorno</translation>
     </message>
@@ -3185,40 +3850,40 @@ Potrai comunque cambiarla in seguito dalle impostazioni, nella scheda &apos;Gene
 <context>
     <name>DlgUpdate</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>Canale della versione corrente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>Reinstalla</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>Annulla download</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>Apri pagina di download</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation>Verifica la presenza di aggiornamenti del client</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>Cockatrice non è stato creato con il supporto SSL, quindi gli aggiornamenti non possono essere scaricati automaticamente!
@@ -3226,126 +3891,126 @@ Please visit the download page to update manually.</source>
 Per favore, visitate la pagina di download per aggiornare manualmente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation>Download dell&apos;aggiornamento: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>Ricerca aggiornamenti...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>Controllo aggiornamenti terminato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>Nessun aggiornamento disponibile</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice è aggiornato!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>Hai già la versione più recente nel canale della versione scelto.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>Versione corrente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>Canale della versione selezionato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>Aggiornamento disponibile</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Una nuova versione di Cockatrice è disponibile!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Nuova versione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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>Data di rilascio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>Changelog</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>Vuoi aggiornare adesso?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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>Purtroppo l&apos;aggiornamento automatico non è riuscito a trovare una versione compatibile. 
 Dovrai scaricare la nuova versione manualmente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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>Per favore, controlla la &lt;a href=&quot;%1&quot;&gt;pagina delle release&lt;/a&gt; sul nostro Github e scarica la versione giusta per il tuo sistema.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>Errore durante l&apos;aggiornamento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Errore durante il controllo degli aggiornamenti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Errore durante il download di un aggiornamento:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>Installazione...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice non riesce ad aprire il file di installazione.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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>Prova ad aggiornare manualmente chiudendo Cockatrice ed eseguento il file di installazione.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation>Percorso download</translation>
     </message>
@@ -3353,21 +4018,153 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Pulisci la cronologia al riavvio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation>Copia negli appunti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Registro di debug</translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation>Impostazioni probabilità di pescare</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation>Criterio:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation>Nome carta</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation>Sottotipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation>Valore di mana</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation>Precisione:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation>Almeno</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation>Esattamente</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation>Quantità (N):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation>Carte pescate (M):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation>carte</translation>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation>Probabilità di pescare</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation>Probabilità di pescare</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation>Nome carta</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation>Sottotipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation>Valore di mana</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation>Almeno</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation>Esattamente</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation>carta/e avendo pescato almeno</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation>carte</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation>Categoria</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation>Quantità</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation>Probabilità (%)</translation>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3438,32 +4235,38 @@ Dovrai scaricare la nuova versione manualmente.</translation>
     </message>
 </context>
 <context>
-    <name>EdhrecCommanderApiResponseNavigationWidget</name>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
-        <source>Combos</source>
-        <translation>Combo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
-        <source>Average Deck</source>
-        <translation>Mazzo medio</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
         <source>Game Changers</source>
-        <translation>Game Changer</translation>
+        <translation>Carte decisive</translation>
     </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
         <source>Budget</source>
         <translation>Budget</translation>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <source>Combos</source>
+        <translation>Combo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <source>Average Deck</source>
+        <translation>Mazzo medio</translation>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
         <source>Salt: </source>
         <translation>Sale:</translation>
     </message>
@@ -3471,7 +4274,7 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>Scrivi il filtro qui</translation>
     </message>
@@ -3479,22 +4282,22 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation>Conferma eliminazione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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>Vuoi davvero eliminare il filtro &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation>Eliminazione non riuscita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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>Impossibile eliminare il filtro &apos;%1&apos;.</translation>
     </message>
@@ -3502,22 +4305,22 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation>espulso da proprietario del gioco o moderatore</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation>il giocatore ha lasciato la partita</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation>il giocatore si è disconnesso dal server</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation>ragione sconosciuta</translation>
     </message>
@@ -3525,155 +4328,208 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>Si prega di entrare prima in una stanza adeguata.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>Password errata.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Spettatori non ammessi in questa partita.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>La partita è piena.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>Questa partita non esiste più.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>Questa partita è solo per utenti registrati.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>Questa stanza è aperta solo agli amici del suo creatore.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Sei stato ingnorato dal creatore di questa partita.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation>Entra nella partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation>Osserva partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation>Informazioni partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation>Unisciti a una partita come arbitro</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation>Osserva partita come arbitro</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>Entra nella partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>Si prega di entrare prima nella rispettiva stanza.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filtra partite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>E&amp;limina filtri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>Cr&amp;ea</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>&amp;Entra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation>Unisciti come arbitro</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>Entra c&amp;ome spettatore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation>Unisciti come arbitro spettatore</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation>Partite mostrate: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>Partite</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation>Tutti i tipi</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation>Filtra per nome della partita...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation>Filtra per tipo / formato di partita</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation>Nascondi le partite non create da amici</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation>Nascondi partite al completo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation>Nascondi partite iniziate</translation>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 giorno</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="43"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 ora</numerusform><numerusform>%1%2 ore</numerusform><numerusform>%1%2 ora(e)</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation>nuovo</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="48"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>solo amici</translation>
     </message>
@@ -3683,68 +4539,68 @@ Dovrai scaricare la nuova versione manualmente.</translation>
         <translation>solo utenti registrati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation>Apri impostazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>può chattare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>vede mani</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>può vedere mani</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>non ammessi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>Stanza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>Età</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>Creatore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>Restrizioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>Giocatori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>Spettatori</translation>
     </message>
@@ -3752,143 +4608,158 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation>Reimposta tutti i percorsi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation>I percorsi sono stati resettati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>Seleziona il percorso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>Impostazioni personali</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>Lingua:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>Destinazioni (non si può personalizzare in modalità portatile)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>Percorsi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation>Come aiutare con le traduzioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>Cartella mazzi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation>Cartella filtri:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>Cartella replay:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>Cartella immagini:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>Database carte:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation>Cartella database personalizzata:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>Database pedine:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation>Canale di aggiornamento:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation>Controlla gli aggiornamenti del client all&apos;avvio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="379"/>
         <source>Check for card database updates on startup</source>
         <translation>Controlla gli aggiornamenti delle carte all&apos;avvio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation>Non controllare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation>Chiedi se aggiornare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation>Aggiorna sempre in background</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation>Controlla gli aggiornamenti delle carte ogni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation>giorni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>Avvisami se una funzionalità supportata dal server manca nel mio programma</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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>Avvia automaticamente Oracle se Cockatrice è stato aggiornato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>Mostra suggerimenti all&apos;avvio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="398"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation>Ultimo controllo %1 (%2 giorni fa)</translation>
     </message>
@@ -3896,47 +4767,47 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cimitero</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation>&amp;Guarda il cimitero</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation>&amp;Muovi cimitero in...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Cima al grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Fondo al grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Tutti i giocatori</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation>&amp;Mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation>&amp;Esilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation>Rivela carta casuale a...</translation>
     </message>
@@ -3944,111 +4815,141 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation>&amp;Mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation>&amp;Vedi mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
-        <translation>&amp;Ordina mano</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
+        <translation>Ordina mano per...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
-        <translation>Mu&amp;lliga</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
+        <translation>Nome</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation>Valore di mana</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation>Effettua un &amp;mulligan (Scegli numero di carte)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation>Effettua un mulligan (Stessa dimensione della mano)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation>Effettua un mulligan (Dimensione della mano - 1)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation>&amp;Sposta mano in...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Cima al grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Fondo al grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cimitero</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation>&amp;Esilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation>&amp;Rivela mano a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation>Rivela carta c&amp;asuale a...</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
+        <translation>Tutti i giocatori</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>Rivela carta c&amp;asuale a...</translation>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation>Crea un nuovo mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation>Esplora i mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation>Esplora il database delle carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation>Esplora EDHRec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation>Esplora Archidekt</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation>Guarda i replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation>Esci</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation>Connessione in corso...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation>Connetti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation>Gioca</translation>
     </message>
@@ -4056,845 +4957,487 @@ Dovrai scaricare la nuova versione manualmente.</translation>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation>&amp;Grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation>&amp;Guarda il grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation>Guarda &amp;le carte in cima al grimorio...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation>Guarda le carte in fondo al grimorio...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation>Rive&amp;la grimorio a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation>Presta il grimorio a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation>Rivela le &amp;prime carte a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
-        <translation>&amp;In cima al grimorio...</translation>
+        <translation>&amp;Dalla cima del grimorio...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
-        <translation>&amp;In fondo al grimorio...</translation>
+        <translation>&amp;Dal fondo del grimorio...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation>Rivela &amp;sempre la prima carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation>&amp;Guarda sempre la prima carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation>&amp;Apri il mazzo nell&apos;editor dei mazzi</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation>&amp;Pesca una carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation>P&amp;esca carte...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation>&amp;Annulla l&apos;ultima pescata</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation>Mescola</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation>&amp;Gioca la prima carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation>Gioca la prima carta a &amp;faccia in giù</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation>Metti la prima carta in fondo</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation>Metti la prima carta nel c&amp;imitero</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation>E&amp;silia la prima carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation>Metti le prime carte nel &amp;cimitero...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation>Metti le prime carte nel cimitero a faccia in giù...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation>&amp;Esilia le prime carte...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation>Metti le prime carte in esilio a faccia in giù...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation>Metti le carte in cima alla pila fino a...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation>Mescola le carte in cima...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation>&amp;Pesca l&apos;ultima carta dal fondo</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation>P&amp;esca carte dal fondo...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation>&amp;Gioca la carta in fondo</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation>Gioca la carta in fondo a &amp;faccia in giù</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation>Metti l&apos;ultima carta nel c&amp;imitero</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation>Metti l&apos;ultima carta in esilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation>Metti le ultime carte nel cimitero...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation>Metti le ultime carte nel cimitero a faccia in giù...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation>&amp;Esilia le ultime carte...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation>Metti le ultime carte in esilio a faccia in giù...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation>Metti l&apos;ultima carta in cima</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation>Mescola le carte in fondo...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Tutti i giocatori</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
+        <translation>Rivela le carte in cima al grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
+        <translation>Numero di carte: (max. %1)</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>Il server ha raggiunto la sua massima capacità di utenti, riprova più tardi.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>Ci sono troppe connessioni contemporanee dal tuo indirizzo.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>Bannato dal moderatore</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>Fine prevista: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>Questo ban dura a tempo indeterminato.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>Spegnimento del server in programma.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>Nome utente non valido.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>Sei stato disconnesso: ti sei connesso da un&apos;altra postazione.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>Connessione chiusa</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>Hai perso la connessione con il server.
-Ragione: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>Il server si riavvierà in un minuto.
-Tutti le partite saranno perse.
-Ragione dello spegnimento: %1</numerusform><numerusform>Il server si riavvierà in %n minuti.
-Tutti le partite saranno perse.
-Ragione dello spegnimento: %1</numerusform><numerusform>Il server si riavvierà in %n minuti.
-Tutti le partite saranno perse.
-Ragione dello spegnimento: %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>Spegnimento del server in programma</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>Successo</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>Registrazione accettata.
-Login in corso.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>Attivazione account accettata.
-Login in corso.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>Numero di giocatori</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>Inserisci il numero di giocatori:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>Giocatore %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>Carica replay</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>Info su Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation>Versione</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>Sito di Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>Manager del progetto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>Manager precedenti:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>Sviluppatori:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>I nostri sviluppatori</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>Aiutaci nello sviluppo!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>Traduttori:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>I nostri traduttori</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>Aiutaci nella traduzione!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>Supporto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>Segnala un problema</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>Risoluzione dei problemi</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>F.A.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>Timeout del server</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>Login fallito</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation>La tua versione del programma non supporta funzionalità richieste dal server, aggiorna il programma e riprova.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation>Per aggiornare la tua versione di Cockatrice, vai su &apos;Aiuto -&gt; Controlla aggiornamenti client&apos;</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>Nome utente o password non validi. Ricontrolla i tuoi dati di accesso e riprova.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>Sei già loggato in un&apos;altra sessione con questo username.
-Chiudi prima quella sessione e riprova a loggare.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>Sei bannato fino a %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>Sei stato bannato per tempo indeterminato.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>Questo server richiede la registrazione degli utenti. Vuoi registrarti adesso?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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>Il server richiede un client ID. Il tuo programma non ha generato un client ID.
-Riprova dopo aver chiuso e riaperto il programma.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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>Si è verificato un errore, riprova dopo aver chiuso e riaperto il programma.
-Se l&apos;errore persiste, aggiorna il programma all&apos;ultima versione e se necessario chiedi assistenza agli sviluppatori.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>Attivazione account</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>Il tuo account non è ancora stato attivato.
-Per attivarlo inserisci il codice di attivazione ricevuto tramite email,</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation>Server pieno</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>Errore di login sconosciuto: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>
-Solitamente questo significa che stai usando una vecchia versione del programma, e il server ha inviato un messaggio che il tuo programma non è in grado di comprendere.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>Il nome utente deve seguire queste regole:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>essere lungo %1 - %2 caratteri</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>%1 può contenere caratteri minuscoli</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>NON</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>%1 può contenere caratteri maiuscoli</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>%1 può contenere numeri</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>può contenere la punteggiatura: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>il primo carattere %1 può essere punteggiatura</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <source>no unacceptable language as specified by these server rules:</source>
-        <comment>note that the following lines will not be translated</comment>
-        <translation>non usare un linguaggio inaccettabile, come specificato nelle regole del server:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation>non può contenere le seguenti parole: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation>non può corrispondere alle seguenti espressioni: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>Puoi usare solo i caratteri A-Z, a-z, 0-9, _, ., e - nel tuo nome utente.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>Registrazione negata</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>La registrazione è disabilitata su questo server</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>Esiste già un account con lo stesso nome utente.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>E&apos; obbligatorio specificare un indirizzo email valido per la registrazione.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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>Sembra che tu stia tentando di registrare un nuovo account su questo server ma hai già un account registrato sull&apos;indirizzo email fornito. Questo server restringe il numero di account un utente più avere per indirizzo. Per favore contatta l&apos;amministratore del server per ulteriore assistenza o per ottenere le tue credenziali di accesso.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>Password troppo corta.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>La registrazione è fallita a causa di un problema tecnico sul server.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation>La connessione al server è stata interrotta.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>Errore di registrazione sconosciuto: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>Attivazione account fallita</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>Errore nella connessione: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>Stai cercando di connetterti a un server obsoleto. Declassa la versione di Cockatrice per farlo funzionare o connetti ad un altro server.
-La tua versione è la %1, la versione remota è la %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>La tua versione di Cockatrice è obsoleta. Aggiorna la tua versione di Cockatrice.
-La tua versione è la %1, la versione online è la %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>Connessione a %1...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>Registrazione su %1 come %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>Disconnesso</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>Connesso, login in corso su %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>Richiesta recupero password su %1 come %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Connetti...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Disconnetti</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>Inizia partita in &amp;locale...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Guarda replay...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Schermo intero</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Registrati sul server...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation>Recupera &amp;password...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Impostazioni...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>&amp;Esci</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>A&amp;zioni</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>&amp;Database carte</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
-        <translation>&amp;Organizza set...</translation>
+        <translation>&amp;Gestisci Espansioni...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Modifica pedine personalizzate</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>Apri cartella immagini personalizzate</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>Apri cartella set personalizzati</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>Aggiungi set di carte personalizzato</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation>Ricarica database carte</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation>&amp;Schede</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;Info su Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation>Suggerimento del giorno</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation>Controlla aggiornamenti client</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation>Controlla aggiornamenti carte...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation>Controlla aggiornamenti carte in background</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation>Mostra barra di stato</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation>Vedi Registro di &amp;debug</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation>Apri cartella impostazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation>Mostra/Nascondi</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation>Nuova versione</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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>Congratulazioni per aver aggiornato Cockatrice alla versione %1!
 Oracle verrà avviato per aggiornare anche il database delle carte.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice installata</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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>Congratulazioni per aver installato Cockatrice %1!
 Oracle verrà avviato per installare il database delle carte.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>Database carte</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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>
@@ -4903,29 +5446,29 @@ Vuoi provare ad aggiornare il database adesso?
 Se è la prima volta che usi Cockatrice o non sei sicuro, scegli &quot;Sì&quot;</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>Apri impostazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>Nuovi set trovati</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
@@ -4938,761 +5481,927 @@ Codici dei set: %1
 Desideri attivarli?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>Vedi set</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>Benvenuto</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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>Ciao! Sembra che tu stia usando questa versione di Cockatrice per la prima volta
 Tutti i set nell&apos;archivio delle carte sono stati abilitati.
-Scopri metodi alternativi per visualizzare i set o disabilitare set ed effetti nella finestra &quot;Organizza set&quot;.</translation>
+Scopri metodi alternativi per visualizzare i set o disabilitare set ed effetti nella finestra &quot;Gestisci Espansioni&quot;.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>Informazione</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>L&apos;aggiornamento delle carte è già in corso.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>Impossibile avviare l&apos;aggiornamento delle carte: </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation>Aggiornamento delle carte in corso.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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>Avvio non riuscito. Il file potrebbe essere assente, o i permessi errati.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation>Il processo si è arrestato in modo anomalo poco dopo essersi avviato con successo.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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>Richiesta scaduta. Il processo ci ha messo troppo a rispondere. L&apos;ultima funzione waitFor...() è scaduta.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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>Si è verificato un errore nel cercare di scrivere al processo. Ad esempio, il processo potrebbe non essere in esecuzione, o potrebbe aver chiuso il suo canale di input.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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>Si è verificato un errore nel cercare di leggere dal processo. Ad esempio, il processo potrebbe non essere in esecuzione.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation>Si è verificato un errore sconosciuto.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation>L&apos;aggiornamento del database delle carte è terminato con un errore:
 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>Questo server supporta funzioni aggiuntive non previste dalla tua versione dell&apos;applicazione.
-Solitamente non si dovrebbe incorrere in problemi, ma questo messaggio può significare che è disponibile una nuova versione di Cockatrice o che il server si basi su una versione personalizzata o una non ancora rilasciata.
-
-Per aggiornare il tuo client, vai su Aiuto -&gt; Controlla aggiornamenti client</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>Carica set di carte</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>Il file selezionato non può essere caricato.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation>E&apos; possibile importare solamente database XML.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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>Il nuovo set di carte è stato aggiunto correttamente.
 Il database delle carte verrà ricaricato.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>Il nuovo set di carte non è stato importato a causa di un errore.</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
-        <translation>Reimposta Password</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
+        <translation>Configurazione Base di mana</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
-        <translation>La tua password è stata reimpostata correttamente, ora puoi accedere utilizzando le nuove credenziali.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
+        <translation>Modalità di visualizzazione:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>La reimpostazione della password è fallita, contatta l&apos;amministratore del server per reimpostare la password.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
+        <translation>a torta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
-        <translation>Richiesta di attivazione ricevuta, controlla il tuo indirizzo email per il codice di attivazione.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation>a barre</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation>a barre combinate</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation>Filtra per colori (opzionale):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
+        <translation>Annulla</translation>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation>Base di mana</translation>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation>Raggruppa per:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation>tipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation>colore</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation>sottotipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation>forza</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation>costituzione</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation>Filtri (opzionali):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation>Mostra il grafico principale</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation>Mostra i grafici per categorie</translation>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation>Curva di mana</translation>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation>Modalità di visualizzazione:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation>A torta</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation>A barre</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation>A barra combinata</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation>Filtri per colore (opzionali):</translation>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation>Simboli di mana</translation>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation>Modalità di visualizzazione principale:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation>A torta</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation>A barre</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation>Colori:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation>Mostra grafici per colore</translation>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation>%1 simboli (%2 carte)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation>%1 mana (%2 carte)</translation>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation>Produzione + Devozione di mana</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation>Impostazioni distribuzione di mana</translation>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation> dal campo di battaglia</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation> dal suo cimitero</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation> dall&apos;esilio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation> dalla sua mano</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>la prima carta del grimorio di %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation>la prima carta del suo grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation> dalla cima del grimorio di %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation> dalla cima del suo grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>l&apos;ultima carta del grimorio di %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation>l&apos;ultima carta del suo grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation> dal fondo del grimorio di %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation> dal fondo del suo grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation> dal grimorio di %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation> dal suo grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation> dalla sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation> dalla pila</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation>dalla zona personalizzata &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1 sta tenendo la prima carta %2 rivelata.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1 non sta più rivelando la prima carta %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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>%1 può guardare la prima carta %2 della libreria in qualunque momento.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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>%1 non può più guardare la prima carta %2 del mazzo in qualunque momento.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1 assegna %2 a %4 di %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 ha concesso la partita.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 ha annullato la concessione della partita.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1 ha ripristinato il collegamento alla partita.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 ha perso il collegamento alla partita.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation>%1 disegna una freccia dal suo %2 a sé stesso.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation>%1 disegna una freccia dal suo %2 a %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation>%1 disegna una freccia dal %3 di %2 a sé stesso.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation>%1 disegna una freccia dal %3 di %2 a %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1 disegna una freccia dal suo %2 al suo %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1 disegna una freccia dal suo %2 a %4 di %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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>%1 disegna una freccia da %3 di %2 al suo %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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>%1 disegna una freccia dal %3 di %2 al %5 di %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation>%1 crea una pedina a faccia in giù.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 crea una pedina: %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 ha caricato un mazzo (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>%1 ha caricato un mazzo con %2 carte nella sideboard (%3).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation>%1 distrugge %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>una carta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1 da il controllo di %3 a %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="308"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation>%1 mette %2 sul campo di battaglia %3 a faccia in giù.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1 mette %2 sul campo di battaglia%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="314"/>
+        <source>%1 puts %2%3 into their graveyard face down.</source>
+        <translation>%1 mette %2%3 nel suo cimitero a faccia in giù.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation>%1 mette %2 nel suo cimitero%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation>%1 esilia %2%3 a faccia in giù.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 esilia %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation>%1 mette %2 in mano%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation>%1 mette %2 nel suo grimorio%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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>%1 mette %2%3 in fondo al proprio grimorio.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation>%1 mette %2 in cima al suo grimorio%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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>%1 mette %2%3 nel suo grimorio %4 carte dalla cima.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 mette %2 nella sideboard%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation>%1 gioca %2%3 a faccia in giù.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 gioca %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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>%1 mette %2 nella zona personalizzata &apos;%4&apos;%3 a faccia in giù.</translation>
+    </message>
+    <message>
+        <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>%1 mette %2 nella zona personalizzata &apos;%4&apos;%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="373"/>
         <source>%1 tries to draw from an empty library</source>
         <translation>%1 prova a pescare da un grimorio vuoto</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation><numerusform>%1 pesca una carta.</numerusform><numerusform>%1 pesca %2 carte.</numerusform><numerusform>%1 pesca %2 carte.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 sta guardando %2.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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><numerusform>%1 sta guardando %3 carta %4 %2.</numerusform><numerusform>%1 sta guardando %3 carte %4 %2.</numerusform><numerusform>%1 sta guardando %3 carte %4 %2.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation>in fondo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation>in cima</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1 gira %2 a faccia in giù.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1 gira %2 a faccia in su.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>La partita è stata chiusa.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>La partita è iniziata.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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>Stai spammando la partita. Attendi un paio di secondi.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1 è entrato nella partita.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 sta osservando la partita.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>Sei stato cacciato dalla partita.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 ha abbandonato la partita (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation>%1 non sta più guardando la partita (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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>%1 non è più pronto a iniziare la partita.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform>%1 mischia il proprio mazzo e pesca una nuova mano di %2 carta.</numerusform><numerusform>%1 mischia il proprio mazzo e pesca una nuova mano di %2 carte.</numerusform><numerusform>%1 mischia il proprio mazzo e pesca una nuova mano di %2 carte.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="473"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation>%1 mischia il proprio mazzo e pesca una nuova mano.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation>Stai guardando il replay della partita #%1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1 è pronto a iniziare la partita.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="510"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation>carte</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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><numerusform>una carta</numerusform><numerusform>%1 carte</numerusform><numerusform>%1 carte</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation>%1 presta %2 a %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1 rivela %2 a %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1 rivela %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation>%1 rivela a caso %2%3 a %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1 rivela a caso %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation>%1 sbircia la carta a faccia in giù #%2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation>%1 sbircia la carta a faccia in giù #%2: %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation>%1 rivela %2%3 a %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 rivela %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="576"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation>%1 ha rovesciato l&apos;ordine dei turni, ora è %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation>invertito</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation>normale</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>Testa</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>Croce</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation>%1 ha lanciato una moneta. Il risultato è %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1 lancia un dado a %3 facce e ottiene %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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>%1 lancia %2 monete. Sono uscite %3 teste e %4 croci.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="608"/>
         <source>%1 rolls a %2-sided dice %3 times: %4.</source>
         <translation>%1 lancia un dado a %2 facce %3 volte: %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>Turno di %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation>%1 imposta le note di %2 a %3.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
-        <translation><numerusform>%1 mette %2 segnalino &quot;%3&quot; su %4 (totale %5).</numerusform><numerusform>%1 mette %2 segnalini &quot;%3&quot; su %4 (totale %5).</numerusform><numerusform>%1 mette %2 segnalino(i) &quot;%3&quot; su %4 (totale %5).</numerusform></translation>
+        <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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
-        <translation><numerusform>%1 toglie %2 segnalino &quot;%3&quot; su %4 (totale %5).</numerusform><numerusform>%1 toglie %2 segnalini &quot;%3&quot; su %4 (totale %5).</numerusform><numerusform>%1 toglie %2 segnalino(i) &quot;%3&quot; su %4 (totale %5).</numerusform></translation>
+        <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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation>%1 imposta il contatore %2 a %3 (%4%5).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%1 imposta che %2 non STAPpi normalmente.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 imposta che %2 STAPpi normalmente.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 elimina i valori F/C di %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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>%1 cambia F/C di %2 da vuota a %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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>%1 cambia F/C di %2 da %3 a %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1 ha bloccato la sua sideboard.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 ha sbloccato la sua sideboard.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 TAPpa i suoi permanenti.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 STAPpa i suoi permanenti.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1 TAPpa %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1 STAPpa %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 mescola %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="769"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation>%1 mescola le %3 carte sul fondo da %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="774"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation>%1 mescola le prime %3 carte da %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation>%1 mescola le carte %3 - %4 da %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 toglie %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 annulla la sua ultima pescata.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 annulla la sua ultima pescata (%2).</translation>
     </message>
@@ -5700,110 +6409,115 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation>Parola1 Parola2 Parola3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation>Aggiungi Nuovo Messaggio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation>Modifica Messaggio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation>Rimuovi Messaggio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>Aggiungi messaggio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>Messaggio:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation>Modifica messaggio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>Impostazioni chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>Lista parole evidenziate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>Abilita menzioni in chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>Abilita completamento menzioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>Messaggi rapidi in partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="243"/>
         <source>How to use in-game message macros</source>
         <translation>Come usare i messaggi macro in gioco</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>Ignora i messaggi in chat inviati dagli utenti non registrati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>Ignora i messaggi privati inviati dagli utenti non registrati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>Inverti colore testo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>Abilita notifiche desktop per i messaggi privati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>Abilita notifiche sul desktop per le menzioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>Abilita messaggi recenti all&apos;ingresso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>(Colore in esadecimale)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Separare le parole con uno spazio; solo caratteri alfanumerici</translation>
     </message>
@@ -5811,37 +6525,42 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation>&amp;Metti in</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
-        <translation>&amp;In cima al grimorio in ordine casuale</translation>
+        <translation>&amp;Cima al grimorio in ordine casuale</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation>Posizione X dalla cima del grimorio...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
-        <translation>In &amp;fondo al grimorio in ordine casuale</translation>
+        <translation>&amp;Fondo al grimorio in ordine casuale</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation>Tavolo</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation>&amp;Mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cimitero</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation>&amp;Esilio</translation>
     </message>
@@ -5854,47 +6573,47 @@ Il database delle carte verrà ricaricato.</translation>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation>Valore di Mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation>Colore</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation>Fedeltà</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation>Tipo principale</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation>Costo di mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation>F/C</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation>Lato</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation>Disposizione</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation>Identità di colore</translation>
     </message>
@@ -5917,65 +6636,211 @@ Il database delle carte verrà ricaricato.</translation>
         <translation>Direzione di sovrapposizione:</translation>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation>Fase sconosciuta</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation>STAP</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation>Mantenimento</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation>Acquisizione</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation>Prima fase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation>Inizio combattimento</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation>Dichiarazione attaccanti</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation>Dichiarazione bloccanti</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation>Danno da combattimento</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation>Fine combattimento</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation>Seconda fase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation>Finale / Cancellazione</translation>
     </message>
@@ -5983,57 +6848,57 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>Sottofase di STAP</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>Sottofase di mantenimento</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>Sottofase di acquisizione</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>Prima fase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>Sottofase di inizio combattimento</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>Sottofase di dichiarazione degli attaccanti</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>Sottofase di dichiarazione dei bloccanti</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>Sottofase del danno da combattimento</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>Sottofase di fine combattimento</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>Seconda fase principale</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>Sottofase finale</translation>
     </message>
@@ -6041,7 +6906,7 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>it</translation>
@@ -6050,183 +6915,198 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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>cimitero</translation>
+    </message>
+    <message>
+        <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>esilio</translation>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
-        <translation>Guarda le carte in cima al grimorio</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
-        <translation>Numero di carte: (max %1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
-        <translation>Guarda le carte in fondo al grimorio</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
-        <translation>Mescola le carte in cima al grimorio</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
-        <translation>Mescola le carte in fondo al grimorio</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
-        <translation>Pesca mano</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
-        <translation>0 e inferiore sono relativi al numero attuale di carte in mano</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
-        <translation>Pesca carte</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
-        <translation>Metti le prime carte nel cimitero</translation>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
-        <translation>Esilia le prime carte</translation>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation>Metti le ultime care nel cimitero</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation>Esilia le ultime carte</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
-        <translation>Pesca le ultime carte</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation>C&amp;rea un&apos;altra pedina %1</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
-        <translation>Crea pedine</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
-        <translation>Numero:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
-        <translation>Metti la carta in posizione X dalla cima del grimorio</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
-        <translation>In che posizione dovrebbe essere messa questa carta:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
-        <translation>(max %1)</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
-        <translation>Cambia forza/costituzione</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
-        <translation>Cambia valori a:</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
-        <translation>Imposta note</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
-        <translation>Inserisci le nuove note:</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation>Imposta i segnalini</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation>Giocatore &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation>&amp;Contatori</translation>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
-        <translation>Invi&amp;a</translation>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation>Il selettore di stampa è disabilitato perchè hai abilitato la funzionalità di sovrascrivere le stampe selezionate con le preferenze personali per set.
+
+Questo significa che vedrai solo la stampa predefinita per ciascuna scarta anzichè poterle selezionare e che non vedrai le stampe scelte da altri utenti.
+</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
+        <translation>Abilita il selettore di stampa</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation>Visualizza pulsanti di navigazione</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation>Selettore di stampa</translation>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation>Preferenza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation>Fissa stampa in cima alla lista</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation>Rimuovi stampa dalla cima della lista</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation>Mostra carte correlate</translation>
     </message>
@@ -6242,17 +7122,17 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation>Carta precedente nel mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation>Selezione massiva</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation>Carta successiva nel mazzo</translation>
     </message>
@@ -6260,86 +7140,94 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation>Alfabetico</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation>Preferenza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation>Data di rilascio</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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>Discendente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation>Ascendente</translation>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation>Seleziona una carta per vedere le stampe disponibili.</translation>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation>Forza / costituzione</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation>&amp;Aumenta forza</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation>&amp;Diminuisci forza</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation>A&amp;umenta costituzione</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation>D&amp;iminuisci costituzione</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation>Au&amp;menta forza e costituzione</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation>Dimi&amp;nuisci forza e costituzione</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation>Aumenta forza e diminuisci costituzione</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation>Diminuisci forza e aumenta costituzione</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation>Imposta &amp;forza e costituzione...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation>Resetta f&amp;orza e costituzione</translation>
     </message>
@@ -6347,37 +7235,37 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>Servizi</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>Nascondi %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>Nascondi altre</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>Mostra tutte</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>Preferenze...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>Esci da %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>Informazioni su %1</translation>
     </message>
@@ -6385,153 +7273,259 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Database delle carte di Cockatrice (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>Tutti i file (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Replay di Cockatrice (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>Maindeck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>Token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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>Sovrascrivere il file esistente?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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>Una versione .cod di questo mazzo esiste già. Sovrascriverla?</translation>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation>Abilitare questa funzione disattiverà il Selettore di stampa.
+
+Non potrai gestire le preferenze delle stampe per i singoli mazzi, o vedere le stampe scelte dagli altri giocatori per i loro mazzi.
+
+Dovrai usare il Gestore dei set, raggiungibile tramite Database carte -&gt; Organizza set.
+
+Sicuro di voler abilitare questa funzione?</translation>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation>Disabilitare questa funzione attiverà il Selettore di stampa.
+
+Potrai gestire le preferenze delle stampe per i singoli mazzi nell&apos;Editor, e configurare quale stampa viene aggiunta di default a un mazzo fissandola nel selettore.
+
+Potrai anche usare il Gestore dei set per personalizzare l&apos;ordine delle stampe nel Selettore (sono disponibili anche ordinamenti predefiniti come alfabetico o per data di uscita).
+
+Sicuro di voler disabilitare questa funzione?</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation>Conferma modifica</translation>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation>Conferma</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation>Salva tutto</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation>&amp;Sì</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation>Sì a &amp;tutto</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation>&amp;No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation>N&amp;o a tutto</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation>Interrompi</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation>Riprova</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation>Ignora</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation>Abbandona</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation>Aiuto</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation>Applica</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation>Resetta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation>Ripristina predefiniti</translation>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>Tempo di upload</translation>
     </message>
@@ -6539,32 +7533,32 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>Giocatori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>Tieni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>Inizio</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>Durata (sec)</translation>
     </message>
@@ -6572,37 +7566,37 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation>&amp;Esilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation>&amp;Guarda la zona di esilio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation>&amp;Muovi esilio in...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation>&amp;Cima al grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation>&amp;Fondo al grimorio</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation>&amp;Mano</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation>&amp;Cimitero</translation>
     </message>
@@ -6610,41 +7604,49 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>Stanze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>E&amp;ntra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>Stanza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>Permessi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>Giocatori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>Partite</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation>Invi&amp;a</translation>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6681,27 +7683,27 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>Abilitato</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>Tipo set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>Codice set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>Nome esteso</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>Data di rilascio</translation>
     </message>
@@ -6709,53 +7711,53 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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>Ripristina scorciatoie predefinite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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>Sei scuro di voler ripristinare tutte le scorciatoie predefinite?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation>Rimuovi tutte le scorciatoie predefinite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="111"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>Sei sicuro di voler rimuovere tutte le scorciatoie?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation>Sezione:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation>Azione:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation>Scorciatoia:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation>Come impostare scorciatoie personalizzate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation>Elimina tutte le scorciatoie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation>Cerca per nome della scorciatoia</translation>
     </message>
@@ -6763,12 +7765,12 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>Azione</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>Scorciatoia</translation>
     </message>
@@ -6776,14 +7778,14 @@ Il database delle carte verrà ricaricato.</translation>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Il file di configurazione conteneva scorciatoie non valide.
 Controlla le impostazioni!</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>Le seguenti scorciatoie sono state reimpostate al valore predefinito:
@@ -6811,12 +7813,12 @@ Controlla le impostazioni!</translation>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation>&amp;Sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation>&amp;Guarda la sideboard</translation>
     </message>
@@ -6824,27 +7826,27 @@ Controlla le impostazioni!</translation>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>Abilita &amp;suoni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>Tema sonoro attuale:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>Prova il funzionamento dei suoni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>Impostazioni suoni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>Volume</translation>
     </message>
@@ -6852,48 +7854,48 @@ Controlla le impostazioni!</translation>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation>La stagione degli spoiler è finita</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>Cancellando spoiler.xml. Per favore avviare Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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>Download degli spoiler fallito</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation>Connessione internet assente</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation>Gli spoiler sono aggiornati</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation>Nessun nuovo spoiler aggiunto</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation>Gli spoiler sono stati aggiornati!</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation>Ultima modifica:</translation>
     </message>
@@ -6916,16 +7918,146 @@ Controlla le impostazioni!</translation>
         <translation>Risposta non valida ricevuta dal server degli aggiornamenti di versione.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="177"/>
         <source>No reply received from the tag update server.</source>
         <translation>Nessuna risposta ricevuta dal server dei tag di aggiornamento.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="184"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Risposta non valida ricevuta dal server dei tag di aggiornamento.</translation>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7057,56 +8189,227 @@ Controlla le impostazioni!</translation>
         <translation>Impossibile attivare utente. Errore interno</translation>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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>Decresc.</translation>
+    </message>
+    <message>
+        <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>AND</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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation>Richiede TUTTI i colori selezionati</translation>
+    </message>
+    <message>
+        <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>Nome mazzo...</translation>
+    </message>
+    <message>
+        <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>Proprietario...</translation>
+    </message>
+    <message>
+        <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>Package</translation>
+    </message>
+    <message>
+        <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>Filtri avanzati</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation>Fascia:</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="262"/>
+        <source>Any</source>
+        <translation>Qualsiasi</translation>
+    </message>
+    <message>
+        <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>Contiene carta...</translation>
+    </message>
+    <message>
+        <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>Comandante...</translation>
+    </message>
+    <message>
+        <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>Tag...</translation>
+    </message>
+    <message>
+        <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>Dimensione mazzo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation>Carte:</translation>
+    </message>
+    <message>
+        <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>Cresc.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation>Ordina per:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation>Filtra per:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation>Impostazioni di visualizzazione</translation>
+    </message>
+    <message>
+        <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>Cerca</translation>
+    </message>
+    <message>
+        <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>Formati</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation>Archidekt: </translation>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>Info carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>Mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>Filtri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation>Database carte</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation>Stampa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>Separata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation>Reimposta disposizione</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="82"/>
         <source>Deck: %1</source>
         <translation>Mazzo: %1</translation>
     </message>
@@ -7114,61 +8417,49 @@ Controlla le impostazioni!</translation>
 <context>
     <name>TabDeckEditorVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation>Mazzo visuale: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="294"/>
         <source>&amp;Visual Deck Editor</source>
         <translation>Editor &amp;visuale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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>Info carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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>Mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation>Filtri</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation>Stampa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation>Separata</translation>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation>Reimposta disposizione</translation>
     </message>
@@ -7176,22 +8467,22 @@ Controlla le impostazioni!</translation>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="62"/>
         <source>Visual Deck View</source>
-        <translation>Galleria mazzo</translation>
+        <translation>Mazzo visuale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="63"/>
         <source>Visual Database Display</source>
-        <translation>Galleria database</translation>
+        <translation>Database visuale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="64"/>
         <source>Deck Analytics</source>
         <translation>Analisi mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="65"/>
         <source>Sample Hand</source>
         <translation>Mano di esempio</translation>
     </message>
@@ -7232,8 +8523,8 @@ Controlla le impostazioni!</translation>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Nuova cartella</translation>
     </message>
@@ -7249,83 +8540,83 @@ Controlla le impostazioni!</translation>
         <translation>Apri cartella mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation>Rinomina cartella locale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation>Rinomina file locale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation>Nuovo nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation>Rinomina non riuscita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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>File mazzo non valido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>Inserisci il nome del mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>Questo mazzo non ha un nome. Per favore inserisci un nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>Mazzo senza nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation>Impossibile caricare il mazzo sul server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>Elimina file locali</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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>Vuoi davvero eliminare i file selezionati?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation>Elimina i deck remoti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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>Vuoi davvero eliminare i mazzi selezionati?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Nome della nuova cartella:</translation>
     </message>
@@ -7338,17 +8629,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation>Galleria mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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>Impossibile aprire il mazzo a %1</translation>
     </message>
@@ -7389,7 +8680,7 @@ Please enter a name:</source>
         <translation>Cerca</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation>EDHREC: </translation>
     </message>
@@ -7397,197 +8688,191 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>Replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>Partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>Giocatori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>Info carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>Messaggi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>Replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>&amp;Fasi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>&amp;Partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>Prossima &amp;fase</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation>Prossima sottofase + &amp;azione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>Prossimo &amp;turno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation>Inverti l&apos;ordine dei turni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>&amp;Rimuovi tutte le frecce</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>Ruota vista in senso &amp;orario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>R&amp;uota vista in senso antiorario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>&amp;Informazioni partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation>Rientra in gioco</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>&amp;Concedi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Lascia partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>C&amp;hiudi replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation>Vai alla &amp;chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>&amp;Parla:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation>Carte selezionate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>Separata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation>Reimposta disposizione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>Concedi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>Vuoi veramente concedere la partita?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation>Annulla concedi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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>Hai già concesso. Vuoi ritornare in questa partita?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>Lascia la partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>Sei sicuro di voler lasciare la partita?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation>Un giocatore si è unito alla partita #%1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation>%1 si è unito alla partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>Sei stato kickato fuori dalla partita.</translation>
     </message>
@@ -7595,7 +8880,7 @@ Please enter a name:</source>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation>Home</translation>
     </message>
@@ -7603,158 +8888,158 @@ Please enter a name:</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>Registri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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>Ora;NomeMittente;IPMittente;Messaggio;IDDestinatario;NomeDestinatario</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation>Registri stanze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>Registri partite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>Registri chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>Seleziona almeno un filtro.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Seleziona un numero di giorni valido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>Nome utente: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>Indirizzo IP: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>Nome partita: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>ID Partita: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>Messaggio: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>Stanza principale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>Stanza partita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>Chat privata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>Ultimi X giorni: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>Oggi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>Ultima ora</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation>Massimo numero di risultati:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>E&apos; richiesto perlomeno un filtro.
 Più informazioni inserisci, più specifici saranno i risultati.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation>Ottieni log utente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation>Elimina filtri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>Filtri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation>Posizioni registro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation>Periodo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation>Massimo numero di risultati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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>Storico messaggi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation>Impossibile recuperare la storia dei ban.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Nessun messaggio corrisponde ai filtri selezionati.</translation>
     </message>
@@ -7772,27 +9057,27 @@ Più informazioni inserisci, più specifici saranno i risultati.</translation>
         <translation>&amp;Lascia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Chat privata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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>Questo utente ti sta ignorando, non può vedere i tuoi messaggi nella chat principale e tu non puoi entrare nelle sue partite.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation>Messaggio privato da</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1 è uscito dal server.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1 è entrato nel server.</translation>
     </message>
@@ -7800,181 +9085,181 @@ Più informazioni inserisci, più specifici saranno i risultati.</translation>
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>File locali</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>Replay sul server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>Guarda replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation>Rinomina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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>Nuova cartella</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>Elimina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation>Apri cartella replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>Scarica replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>Metti/togli blocco scadenza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation>Ottieni codice di condivisione replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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>Cerca replay dal codice di condivisione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation>Rinomina cartella locale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation>Rinomina file locale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation>Nuovo nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation>Rinomina non riuscita</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation>Nome della nuova cartella:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>Elimina il file locale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Vuoi davvero eliminare i file selezionati?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="505"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>Vuoi davvero eliminare i replay selezionati?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation>Impossibile ottenere il codice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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>O questo server non supporta la condivisione dei replay, o non consente la condivisione dei replay per te.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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>Fallito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation>Impossibile ottenere il codice replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation>Codice di condivisione replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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>Altre persone possono usare questo codice per aggiungere il replay alla loro lista di replay remoti:
 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation>Copia negli appunti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation>Codice di condivisione replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation>Codice replay trovato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="604"/>
         <source>Replay was added, or you already had access to it.</source>
         <translation>Il replay è stato aggiunto oppure ne avevi già accesso.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation>Codice replay non trovato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation>Impossibile inviare il codice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation>Errore inatteso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>Elimina replay remoto</translation>
     </message>
@@ -7987,47 +9272,62 @@ Più informazioni inserisci, più specifici saranno i risultati.</translation>
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>&amp;Parla:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>&amp;Stanza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Lascia stanza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>Pulisci &amp;chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>Impostazioni chat...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation> ti ha menzionato.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation>Clicca per visualizzare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>Stai spammando la chat. Attendi un paio di secondi.</translation>
     </message>
@@ -8040,30 +9340,30 @@ Più informazioni inserisci, più specifici saranno i risultati.</translation>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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>Impossibile unirsi alla stanza: non esiste sul server.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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>Il server pensa che tu sia nella stanza ma il tuo client non è in grado di mostrarlo. Prova a riavviare il client.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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>Non hai i requisiti necessari per unirti a questa stanza.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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>Impossibile unirsi alla stanza a causa di un errore sconosciuto: %1.</translation>
     </message>
@@ -8071,92 +9371,97 @@ Più informazioni inserisci, più specifici saranno i risultati.</translation>
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation>&amp;Editor dei mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation>Editor visuale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation>EDHRec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation>Archidekt</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation>Home</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation>&amp;Galleria mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation>Galleria database</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation>&amp;Archivio mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation>&amp;Replay partite</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation>Amministrazione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation>Registri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>Sei sicuro?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>Ci sono ancora delle partite aperte. Sei sicuro di voler uscire?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation>Clicca per visualizzare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Il tuo amico %1 si è collegato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation>Evento sconosciuto.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8167,39 +9472,39 @@ Questo messaggio può significare che è disponibile una nuove versione di Cocka
 Per aggiornare il tuo client, vai su Aiuto -&gt; Controlla aggiornamenti client</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation>Timeout inattività</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Stai per essere disconnesso per inattività.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>Promozione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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>Sei stato promosso. Esci e rientra per dare effetto alle modifiche.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>Hai ricevuto un avviso a causa di %1.
 Se pregato di evitare di continuare questa attività o potrebbero venire presi ulteriori provvedimenti nel tuoi confronti. Per qualsiasi domanda, manda un messaggio ad un moderatore.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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>Hai ricevuto il seguente messaggio dal server.
@@ -8208,6 +9513,11 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation>Visualizzazione Database</translation>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8248,42 +9558,42 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Vita</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Bianco</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Blu</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Nero</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Rosso</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Verde</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Incolore</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Altro</translation>
     </message>
@@ -8291,151 +9601,209 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation>Impossibile aprire il file in lettura.</translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>&amp;Dettagli utente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>&amp;Chat privata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Visualizza le &amp;partite dell&apos;utente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>Aggiungi alla lista &amp;amici</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Rimuovi dalla lista &amp;amici</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>Aggiungi alla lista &amp;ignorati</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Rimuovi dalla lista &amp;ignorati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>Caccia dalla &amp;partita</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="67"/>
         <source>Warn user</source>
         <translation>Avvisa utente</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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Mostra storia avvisi ute&amp;nte</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="69"/>
         <source>Ban from &amp;server</source>
         <translation>Banna dal &amp;server</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Mostra storia &amp;ban utente</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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Promuovi utente a moderatore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>Degrada il m&amp;oderatore ad utente</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation>Promuovi utente a &amp;giudice</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="74"/>
         <source>Demote user from judge</source>
         <translation>Degrada utente da giudice</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="75"/>
         <source>View admin notes</source>
         <translation>Visualizza le note degli amministratori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation>L&apos;utente non esiste.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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>Stai venendo ignorato da %1 e non puoi vedere le sue partite.</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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation>Impossibile ottenere le partite di %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>Partite di %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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>Storico ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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>Ora Ban;Moderatore;Durata Ban;Ragione Ban;Ragione Visibile</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation>L&apos;utente non è mai stato bannato.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation>Impossibile recuperare le informazioni sui ban.</translation>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation>Storico avvisi</translation>
     </message>
@@ -8450,55 +9818,65 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
         <translation>L&apos;utente non ha mai ricevuto avvisi.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation>Impossibile recuperare le informazioni sugli avvisi.</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="249"/>
         <source>Failed to get admin notes.</source>
         <translation>Impossibile ottenere le note degli amministratori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>Successo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>Utente promosso.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>Utente degradato.</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Fallito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>Promozione fallita.</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>Degradazione fallita.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation>Copia hash negli appunti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Rimuovi i messaggi di questo utente</translation>
     </message>
@@ -8506,311 +9884,554 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>Posizione:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>Età account:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>Cambia password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>Cambia avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>Amministratore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>Moderatore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>Utente registrato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>Utente non registrato</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>Arbitro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>Sconosciuta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="371"/>
         <source>The entered password does not match your account.</source>
         <translation>La password inserita non corrisponde al tuo accound.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>Informazione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>Informazioni utente aggiornate.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation>Informazioni Utente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation>Nome Reale:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation>Livello dell&apos;Utente:</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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><numerusform>1 Anno.</numerusform><numerusform>%n Anni.</numerusform><numerusform>%n Anno(i).</numerusform></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="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><numerusform>%10%n Giorno %20</numerusform><numerusform>%10%n Giorni %20</numerusform><numerusform>%10%n Giorno(i) %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation>Inserisci Password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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>La verifica della password è necessaria per cambiare il tuo indirizzo email</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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>E&apos; stato riscontrato un errore durante l&apos;aggiornamento delle tue informazioni utente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>Questo server non ti permette di aggiornare le tue informazioni utente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>Password modificata.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>Questo server non ti permette di modificare la password.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>La nuova password è troppo corta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>La vecchia password è sbagliata.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>Avatar modificato.</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Questo server non ti permette di aggiornare il tuo avatar.</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>Si è verificato un errore durante l&apos;aggiornamento del tuo avatar.</translation>
+        <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>Questo server non ti permette di aggiornare le tue informazioni utente.</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>Impostazioni generali di interfaccia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>&amp;Doppio click sulle carte per giocarle (anzichè un solo click)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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>&amp;Cliccare gioca tutte le carte selezionate (anziché solo quella cliccata)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>Gioca tutte le carte non terra nella &amp;pila (invece che sul campo di battaglia)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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>Non eliminare le &amp;freccie al cambio di sottofase</translation>
+    </message>
+    <message>
+        <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>Chiudi la finestra di visualizzazione carte quando l&apos;ultima carta viene rimossa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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>Passa alla barra di ricerca quando si apre la finestra di visualizzazione carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>Annota il testo della carta sulle pedine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Usa menù a strappo, permettendo ai menù del tasto destro del mouse di rimanere sullo schermo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation>Impostazioni notifiche</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>Abilita notifiche nella barra delle applicazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>Notifica anche per le partite in cui si è solo uno spettatore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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>Notifca quando utenti nella tua lista amici si connettono</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>Impostazioni delle animazioni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>Animazioni &amp;TAPpa/STAPpa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation>Impostazioni editor/archivio mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="231"/>
         <source>Open deck in new tab by default</source>
         <translation>Apri il mazzo in una nuova scheda automaticamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="232"/>
         <source>Use visual deck storage in game lobby</source>
         <translation>Usa galleria mazzi nella lobby</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="233"/>
         <source>Use selection animation for Visual Deck Storage</source>
         <translation>Mostra animazione al passaggio del mouse nella galleria mazzi </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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>Quando aggiungi un&apos;etichetta ad un mazzo in formato .txt nella Galleria mazzi:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation>non fare nulla</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation>chiedi se convertire in file .cod</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation>converti sempre in file .cod</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation>Editor dei mazzi predefinito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation>Editor classico</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation>Editor visuale</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation>Impostazioni di riproduzione</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="246"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Tempo di attesa per saltare indietro dopo aver premuto la scorciatoia</translation>
     </message>
@@ -8818,22 +10439,22 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation>Utenti connessi al server: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation>Utenti in questa stanza: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation>Amici online: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation>Utenti ignorati online: %1 / %2</translation>
     </message>
@@ -8841,96 +10462,228 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation>Aumenta tutti i segnalini della carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation>&amp;STAPpa tutti i permanenti</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation>L&amp;ancia un dado...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation>&amp;Crea una pedina...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation>C&amp;rea un&apos;altra pedina</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation>Cr&amp;ea pedina predefinita</translation>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
-        <translation>Modalità: Corrispondenza esatta</translation>
+        <source>Exact match</source>
+        <translation>Corrispondenza esatta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
-        <translation>Modalità: Include</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
+        <translation>Include</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
-        <translation>Modalità: Include/Esclude</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
+        <translation>Include / Esclude</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
-        <translation>Modalità di filtraggio (utilizzabile con connettivi logici AND/OR/NOT)</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
+        <translation>Come vengono combinati colori selezionati e non selezionati nel filtro</translation>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="51"/>
+        <source>Search filter...</source>
+        <translation>Filtro di ricerca...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="52"/>
         <source>Save Filter</source>
         <translation>Salva filtro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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>Salva su file i filtri correnti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="54"/>
         <source>Enter filename...</source>
         <translation>Inserisci il nome del file...</translation>
     </message>
 </context>
 <context>
-    <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
-        <source>Do not display card main-types with less than this amount of cards in the database</source>
-        <translation>Non mostrare i tipi di carta che hanno meno occorrenze nel database di questo numero</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation>Ordina per</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation>Filtra per</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
+        <source>Save and load filters</source>
+        <translation>Salva e carica filtri</translation>
+    </message>
+    <message>
+        <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>Filtra per nome della carta esatto</translation>
+    </message>
+    <message>
+        <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>Filtra per tipo</translation>
+    </message>
+    <message>
+        <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>Filtra per sottotipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="151"/>
+        <source>Filter by set</source>
+        <translation>Filtra per set</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
+        <source>Filter by format legality</source>
+        <translation>Filtra per legalità di formato</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation>Salva/Carica</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation>Sottotipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation>Set</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation>Formati</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation>Mostra formati con almeno:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation> carte</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation>Non mostrare i formati con meno di questo ammontare di carte nel database</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation>Modalità di filtraggio (utilizzabile con connettivi logici AND/OR/NOT)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
         <source>Mode: Exact Match</source>
         <translation>Modalità: Corrispondenza esatta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation>Modalità: Include</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation>Mostra tipi con almeno:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation> carte</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
+        <source>Do not display card main-types with less than this amount of cards in the database</source>
+        <translation>Non mostrare i tipi di carta che hanno meno occorrenze nel database di questo numero</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation>Modalità di filtraggio (utilizzabile con connettivi logici AND/OR/NOT)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
+        <source>Mode: Exact Match</source>
+        <translation>Modalità: Corrispondenza esatta</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation>Modalità: Include</translation>
     </message>
@@ -8938,27 +10691,27 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation>Filtra per nome...</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <source>Filter by name... (Exact match)</source>
+        <translation>Filtra per nome... (Corrispondenza esatta)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
         <source>Load from Deck</source>
         <translation>Carica da mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
         <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation>Usa i nomi delle carte nel mazzo caricato come insieme di filtri a corrispondenza esatta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
         <source>Load from Clipboard</source>
         <translation>Carica dagli appunti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation>Usa i nomi delle carte negli appunti come insieme di filtri a corrispondenza esatta</translation>
     </message>
@@ -8966,7 +10719,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDatabaseDisplayRecentSetFilterSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
+        <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>Filtra per i set più recenti</translation>
     </message>
@@ -8974,19 +10727,19 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDatabaseDisplaySetFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation>Ricerca set...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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>Modalità: Corrispondenza esatta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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>Modalità: Include</translation>
     </message>
@@ -8994,27 +10747,37 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation>Ricerca sottotipi...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation>Mostra sottotipi con almeno:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation> carte</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation>Non mostrare i sottotipi che hanno meno occorrenze nel database di questo numero</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation>Modalità di filtraggio (utilizzabile con connettivi logici AND/OR/NOT)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation>Modalità: Corrispondenza esatta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation>Modalità: Include</translation>
     </message>
@@ -9022,50 +10785,93 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
+        <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>Cerca per nome della carta (o espressioni di ricerca)</translation>
     </message>
     <message>
+        <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>Visuale</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation>Caricamento database...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation>Elimina tutti i filtri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
-        <translation>Salva e carica filtri</translation>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation>Tabella</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
+        <translation>Raggruppa per:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
-        <translation>Filtra per nome della carta esatto</translation>
+        <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>Modifica come le carte sono divise in categorie / gruppi.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
-        <translation>Filtra per sottotipo</translation>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
+        <translation>Ordina per:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
-        <translation>Filtra per set</translation>
+        <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>Clicca e trascina per modificare l&apos;ordinamento interno ai gruppi</translation>
+    </message>
+    <message>
+        <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>Configura come le carte sono ordinate all&apos;interno dei loro gruppi</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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation>Disposizione: Sovrapposta</translation>
+    </message>
+    <message>
+        <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>Modifica come le carte vengono mostrate nelle zone (es. sovrapposte o completamente visibili.)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation>Disposizione: Piatta</translation>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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>Pesca una nuova mano</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="72"/>
         <source>Sample hand size</source>
         <translation>Dimensione della mano</translation>
     </message>
@@ -9073,46 +10879,25 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
-        <translation>Clicca e trascina per modificare i criteri di ordinamento all&apos;interno dei gruppi</translation>
+        <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>Scrivi un nome di carta qui per avere suggerimenti dal database...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="217"/>
         <source>Quick search and add card</source>
         <translation>Cerca e aggiungi carta al mazzo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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>Cerca per la corrispondenza più prossima nel database (con auto-completamento) e premendo Invio, aggiungi la stampa preferita della carta al mazzo.</translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation>Configura l&apos;ordinamento delle carte all&apos;interno dei gruppi</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation>Disposizione sovrapposta</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation>Imposta come le carte vengono mostrate all&apos;interno delle relative sezioni (sovrapposte o affiancate)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation>Disposizione affiancata</translation>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation>Archivio mazzi</translation>
     </message>
@@ -9120,47 +10905,52 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDeckStorageQuickSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation>Mostra cartelle</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
         <source>Show Tag Filter</source>
         <translation>Mostra filtro etichette</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="131"/>
+        <source>Show Color Identity</source>
+        <translation>Mostra identità di colore</translation>
+    </message>
+    <message>
+        <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>Mostra etichette sulle anteprime dei mazzi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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>Mostra opzione per selezione copertina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="134"/>
         <source>Draw unused Color Identities</source>
         <translation>Mostra identità di colore inutilizzate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="135"/>
         <source>Unused Color Identities Opacity</source>
         <translation>Opacità identità di colore inutilizzate</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation>Suggerimento mazzo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation>Percorso file</translation>
     </message>
@@ -9168,7 +10958,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
+        <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>Cerca per nome del file (o espressioni di ricerca)</translation>
     </message>
@@ -9176,22 +10966,22 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation>Ordina alfabeticamente (Nome del mazzo)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation>Ordina alfabeticamente (Nome del file)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
         <source>Sort by Last Modified</source>
         <translation>Ordina per ultima modifica</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
         <source>Sort by Last Loaded</source>
         <translation>Ordina per ultimo caricato</translation>
     </message>
@@ -9199,17 +10989,17 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation>Caricamento database...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation>Aggiorna i file caricati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation>Impostazioni galleria mazzi</translation>
     </message>
@@ -9217,43 +11007,43 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>Che avviso vorresti inviare?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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>Ottieni tutti i messaggi di questo utente in tutte le stanze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annulla</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>Avvisa l&apos;utente per cattivo comportamento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>Errore</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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>Il nome utente a cui inviare l&apos;avviso non può essere vuoto.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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>L&apos;avviso da inviare non può essere vuoto.</translation>
     </message>
@@ -9261,133 +11051,133 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <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>Muovi set selezionato in cima</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>Muovi set selezionato su</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>Muovi set selezionato giù</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>Muovi set selezionato in fondo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation>Cerca per nome, codice o tipo del set</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="70"/>
         <source>Default order</source>
         <translation>Ordine predefinito</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>Ripristina ordine originale priorità immagini</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="107"/>
         <source>Enable all sets</source>
         <translation>Abilita tutti i set</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="108"/>
         <source>Disable all sets</source>
         <translation>Disabilita tutti i set</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="109"/>
         <source>Enable selected set(s)</source>
         <translation>Abilita i set selezionati</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation>Disabilita i set selezionati</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="126"/>
         <source>Deck Editor</source>
         <translation>Editor dei mazzi</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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation>Usa CTRL+A per selezionare le espansioni nella visuale.</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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation>Solo carte in espansioni abilitate appariranno nella lista carte dell&apos;editor di mazzo.</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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation>La priorità di immagine è decisa nell&apos;ordine seguente:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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>innanzitutto la cartella CUSTOM (%1), poi le Espansioni abilitate in questo dialogo (da cima a fondo)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation>Includi carte ribilanciate per Alchemy [richiede riavvio]</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="128"/>
         <source>Card Art</source>
         <translation>Immagine carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation>Come usare immagini personalizzate per le carte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation>Suggerimenti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation>Note</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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation>L&apos;ordinamento per colonne ti permette di trovare un set senza cambiare il loro ordine di priorità.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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>Per riabilitare l&apos;ordinamento, clicca sull&apos;intestazione della colonna finché questo messaggio non scompare.</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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation>Usa l&apos;ordinamento corrente per impostare la priorità dei set</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
         <source>Sorts the set priority using the same column</source>
         <translation>Imposta priorità dei set usando l&apos;ordinamento per colonna</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation>Organizza set</translation>
     </message>
@@ -9395,72 +11185,72 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation>Cerca per nome della carta (o espressioni di ricerca)</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation>Non raggruppare</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation>Raggruppa per tipo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation>Raggruppa per costo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation>Raggruppa per colore</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation>Non ordinato</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation>Ordina per nome</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation>Ordina per tipo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation>Ordina per costo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation>Ordina per colori</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation>Ordina per F/C</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation>Ordina per Set</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>Mescola alla chiusura</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>Raggruppa per tipo</translation>
     </message>
@@ -9468,7 +11258,7 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>Italiano (Italian)</translation>
     </message>
@@ -9476,12 +11266,12 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation>Connetti all&apos;avvio</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation>Debug su file</translation>
     </message>
@@ -9489,1005 +11279,1078 @@ Se pregato di evitare di continuare questa attività o potrebbero venire presi u
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>Finestra principale</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation>Editor dei mazzi</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>Lobby della partita</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation>Segnalini della carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation>Contatori del giocatore</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>Forza e costituzione</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>Fasi di gioco</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>Area di gioco</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation>Muovi la carta selezionata</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>Guarda</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation>Muovi la prima carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation>Muovi l&apos;ultima carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>Partita</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation>Pescare</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation>Chat Room</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation>Finestra di gioco</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation>Carica mazzo dagli appunti</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation>Replay</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation>Schede</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation>Controlla Aggiornamenti Carte...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation>Connetti...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>Disconnetti</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>Esci</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>Schermo Intero</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation>Registrati...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation>Impostazioni...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation>Inizia una Partita in Locale...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation>Guarda Replay...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation>Analizza mazzo (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation>Analizza mazzo (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation>Elimina tutti i filtri</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation>Elimina il filtro selezionato</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation>Rimuovi carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation>Gestisci Espansioni...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation>Modifica pedine personalizzate</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation>Esporta mazzo (decklist.org)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation>Esporta mazzo (decklist.xyz)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation>Aggiungi Carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation>Carica Mazzo...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Carica il Mazzo dagli Appunti...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation>Modifica Mazzo negli Appunti con Annotazioni</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation>Modifica Mazzo negli Appunti</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation>Nuovo Mazzo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Apri Cartella Immagini Personalizzate</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation>Stampa Mazzo...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation>Elimina carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation>Reimposta Disposizione</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation>Salva Mazzo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation>Salva Mazzo con Nome...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Salva Mazzo in Appunti, Annotato</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation>Salva Mazzo negli Appunti con Annotazioni (Senza Info Set)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation>Salva Mazzo in Appunti</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation>Salva Mazzo negli Appunti (Senza Info Set)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation>Carica Mazzo Locale...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation>Carica Mazzo da Remoto...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation>Imposta Pronto a Iniziare</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Attiva Blocco della Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation>Aumenta Segnalino Verde</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation>Riduci Segnalino Verde</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation>Imposta Segnalino Verde...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation>Aumenta Segnalino Rosso</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation>Riduci Segnalino Rosso</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation>Imposta Segnalino Rosso...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation>Aumenta Contatore Vita</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation>Mostra barra di stato</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation>Deseleziona mazzo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation>Forza avvio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation>Aggiungi Segnalino (F)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation>Togli Segnalino (F)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation>Imposta Segnalini (F)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation>Aggiungi Segnalino (E)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation>Togli Segnalino (E)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation>Imposta Segnalini (E)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation>Aggiungi Segnalino(D)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation>Togli Segnalino (D)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation>Imposta Segnalini (D)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation>Aggiungi Segnalino (C)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation>Togli Segnalino (C)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation>Imposta Segnalini (C)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation>Aggiungi Segnalino (B)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation>Togli Segnalino (B)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation>Imposta Segnalini (B)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation>Aggiungi Segnalino (A)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation>Togli Segnalino (A)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation>Imposta Segnalini (A)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation>Riduci Contatore Vita</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation>Imposta Contatore Vita...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation>Aumenta Contatore Bianco</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation>Riduci Contatore Bianco</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation>Imposta Contatore Bianco...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation>Aumenta Contatore Blu</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation>Riduci Contatore Blu</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation>Imposta Contatore Blu...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation>Aumenta Contatore Nero</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation>Riduci Contatore Nero</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation>Imposta Contatore Nero...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation>Aumenta Contatore Incolore</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation>Riduci Contatore Incolore</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation>Imposta Contatore Incolore...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation>Aumenta Contatore Altro</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation>Riduci Contatore Altro</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation>Imposta Contatore Altro...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation>Aumenta tutti i segnalini della carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation>Aumenta Forza (+1/+0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Diminuisci Forza (-1/-0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Sposta Costituzione a Forza (+1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Aumenta Costituzione (+0/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Riduci Costituzione (-0/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Sposta Forza a Costituzione (-1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Aumenta Forza e Costituzione (+1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Diminuisci Forza e Costituzione (-1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation>Imposta Forza e Costituzione...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation>Resetta Forza e Costituzione</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>STAP</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>Mantenimento</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>Acquisizione</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation>Prima Fase Principale</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation>Inizio Combattimento</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>Dichiarazione attaccanti</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>Dichiarazione bloccanti</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>Danno da combattimento</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation>Fine Combattimento</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation>Seconda Fase Principale</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>Finale</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation>Fase Successiva</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation>Azione della Fase Successiva</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation>Turno Successivo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation>Nascondi Carta nella Finestra di Visualizzazione</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation>TAPpa / STAPpa carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation>STAPpa Tutto</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
-        <translation>Abilita STAPpa</translation>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
+        <translation>Salta lo STAP</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation>Gira Carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation>Sbircia Carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation>Gioca Carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation>Gioca la carta a faccia in giù</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation>Assegna Carta...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation>Togli Carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation>Clona Carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation>Crea Pedina...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation>Crea Tutte le Pedine Correlate</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation>Crea un&apos;Altra Pedina</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation>Imposta Note...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation>Seleziona Tutte le Carte nella Zona</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation>Seleziona Tutte le Carte nella Riga</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation>Seleziona Tutte le Carte nella Colonna</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation>Rivela Carta Selezionata a Tutti i Giocatori</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation>Fondo al Grimorio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>Esilio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>Cimitero</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>Mano</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation>Cima al Grimorio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation>Campo di Battaglia, faccia in giù</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation>Campo di Battaglia</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation>Ordina mano</translation>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>Grimorio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation>Carte in Cima al Grimorio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation>Carte in Fondo al Grimorio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation>Chiudi Viste di Recente</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation>Pila</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
-        <translation>Cimitero (multiplo)</translation>
+        <translation>Cimitero (Multiple)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation>Cimitero (Multiple), a faccia in giù</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
-        <translation>Esilia (multiplo)</translation>
+        <translation>Esilia (Multiple)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation>Esilio (Multiple), a faccia in giù</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation>Impila Fino a Trovare</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation>Pesca Carta in Fondo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Pesca Multiple Carte in Fondo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation>Disegna Freccia...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation>Rimuovi Frecce Locali</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation>Abbandona Partita</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>Concedi</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation>Tira un Dado...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation>Mescola il Grimorio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation>Mescola Carte in Cima al Grimorio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation>Mescola Carte in Fondo al Grimorio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation>Mulligan (Come la mano attuale)</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation>Mulligan (Dimensione della mano - 1)</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation>Pesca una Carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation>Pesca più Carte...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation>Annulla Pescata</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation>Rivela Sempre la Carta in Cima</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation>Guarda Sempre la Carta in Cima</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation>Ordina mano per Nome</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation>Ordina mano per Tipo</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation>Ordina mano per Valore di Mana</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation>Rivela Mano a Tutti i Giocatori</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation>Rivela Carta Casuale a Tutti i Giocatori</translation>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation>Ruota Vista in Senso Orario</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Ruota Vista in Senso Antiorario</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation>Togli Focus dalla Casella di Testo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation>Vai alla chat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation>Cancella chat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation>Aggiorna</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation>Salta Avanti</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation>Salta Indietro</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation>Salta Avanti di Molto</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation>Salta Indietro di Molto</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation>Riproduci/Pausa</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation>Attiva/Disattiva Avanzamento Rapido</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation>Home</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation>Galleria mazzi</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation>Archivio mazzi</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation>Amministrazione</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation>Registri</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_ja.ts b/cockatrice/translations/cockatrice_ja.ts
index c1e57ac23..322c70ac3 100644
--- a/cockatrice/translations/cockatrice_ja.ts
+++ b/cockatrice/translations/cockatrice_ja.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>(&amp;S)カウンターの数を決める...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>カウンターの設定</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>&apos;%1&apos;カウンターの新しい値:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation>(&amp;R)更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>可能ならセット名と番号を解析する</translation>
     </message>
@@ -36,80 +36,82 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation>新しいタブで開く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation>よろしいですか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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>デッキリストが変更されています。
 変更を保存しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation>リリースノート</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -117,202 +119,253 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation>メインボード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation>サイドボード</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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>&apos;%1&apos; にテーマディレクトリを作成できませんでした。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>テーマ設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>現在のテーマ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation>テーマフォルダを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation>メニュー設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="415"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>右クリックメニューにキーボードショートカットを表示する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>カードの描画</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>画像のあるカードにカード名を表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>横向きレイアウトのカードを自動回転</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>デッキに含まれるカードを印刷セレクターの一番上に上げる</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>マウスオーバーでカードを拡大</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>スタックと手札垂直配置時の重なり率の最小値</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="434"/>
         <source>Maximum initial height for card view window:</source>
         <translation>カードビューウィンドウの初期高さの最大値</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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>行</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>手札のレイアウト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>手札を横に並べる</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>左揃えを有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>テーブルのレイアウト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>カード配置の垂直反転</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>プレイヤーを複数列レイアウトにする最少人数:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>カードに表示する情報の最大のフォントサイズ:</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -334,112 +387,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>ユーザー名でBAN</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>IPアドレスでBAN</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>クライアントIDでBAN</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>BANタイプ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>永久BAN</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>一時BAN</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>日</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>時間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>分</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>BAN期間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>BANの理由を入力してください。
 これはモデレーターによって保存されBANされた人には見えません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>BANの理由を入力してください。これはBANされる人に通知されます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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>すべてのルームでこのユーザーからのすべてのメッセージを編集します</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>サーバーからBANされたユーザーです</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>BANの理由を3 つの組み合わせを選択する必要があります:不適切な名前、不適切なIPアドレス、クライアントID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>名前BANチェックボックスを選択するときは、名前BANの値を持っている必要があります。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>IP BANチェックボックスを選択するときは、IP BANの値を持っている必要があります。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>クライアントID BANチェックボックスを選択するときは、クライアントID BANに値を持っている必要があります。</translation>
     </message>
@@ -447,152 +500,221 @@ 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="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation>Beta（開発中バージョン）</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation>リリース更新サーバーから応答がありませんでした。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>リリース更新サーバーから無効な応答が受信されました。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation>ファイル更新サーバーからの応答がありませんでした。</translation>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>カード名</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>カードセット</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>マナ・コスト</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>カード・タイプ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>色</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>AND</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>OR</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>AND NOT</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>OR NOT</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>カード名</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>タイプ</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>色</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>ルール文章</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation>カードセット</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>マナ・コスト</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation>マナ総量</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>稀少度</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>パワー</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>タフネス</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>忠誠度</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>フォーマット</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -600,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>カード画像</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>カード文章</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>画像+文章</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>別面を見る</translation>
     </message>
@@ -623,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="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation>関連カードを見る</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation>デッキにカードを追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation>メインボード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation>サイドボード</translation>
     </message>
@@ -651,12 +773,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation>カード名:</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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation>関連カード:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation>謎のカード:</translation>
     </message>
@@ -664,132 +796,150 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation>カードの大きさ</translation>
     </message>
@@ -797,133 +947,133 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -932,7 +1082,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -940,29 +1090,470 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -970,47 +1561,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <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"/>
     </message>
@@ -1018,87 +1579,97 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <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"/>
     </message>
@@ -1124,114 +1695,114 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </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="162"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </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="166"/>
+        <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"/>
     </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="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </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="168"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="172"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </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="174"/>
         <source>Load deck from online service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1239,7 +1810,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1247,194 +1818,171 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>スポイラーを更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>完了</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation>ダウンロードURLをリセットしました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>ダウンロードしたカード画像を削除しました。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>エラー</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation>一部のカード画像が削除できませんでした。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>URLを追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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>URLを編集</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation>ネットワークキャッシュサイズ:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation>リダイレクトキャッシュの有効期限:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation>キャッシュされたURLの転送の有効期間。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation>画像キャッシュサイズ:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation>新しいURLを追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation>URLを削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation>日</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>更新中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>パスを選ぶ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation>ダウンロードURL優先設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>スポイラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>スポイラーを自動的にダウンロード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation>スポイラーの保存場所:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>最新に更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>スポイラーは起動時に自動的にダウンロードされます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>ボタンを押すと再起動せずに手動で更新します。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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>手動更新が完了するまでこのウィンドウを閉じないでください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation>カード画像を自動的にダウンロード（英語）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation>URLの追加方法について（英語）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>ダウンロードした画像を削除</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation>ダウンロードURLをデフォルトに戻す</translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
-        <translation>ダウンロードした画像のディスク上キャッシュ</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
-        <translation>現在画面に表示されていない画像のメモリ内キャッシュ</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation>枚数</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation>セット</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>枚数</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation>プロバイダーID</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>カード名</translation>
     </message>
@@ -1442,12 +1990,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1455,17 +2003,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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>検索モード: 完全一致</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
         <source>Mode: Includes</source>
         <translation>検索モード: 一部に含む</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -1473,7 +2021,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
         <source>Edit tags ...</source>
         <translation>タグを編集...</translation>
     </message>
@@ -1481,62 +2029,62 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
         <source>Deck Tags Manager</source>
         <translation>デッキタグマネージャー</translation>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation>デッキタグの管理ができます。新たなタグを追加することもできます:</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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation>新しいタグを追加する(例: イニシアチブ)</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="104"/>
         <source>Add Tag</source>
         <translation>タグを追加</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="105"/>
         <source>Filter tags...</source>
         <translation>タグをフィルタ...</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="106"/>
         <source>OK</source>
         <translation>OK</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="107"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation>無効な入力</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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>タグ名を入力してください！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation>タグの重複</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>This tag already exists.</source>
         <translation>このタグはすでに存在します。</translation>
     </message>
@@ -1544,98 +2092,156 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1653,74 +2259,74 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>デッキを開く...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>サーバーのデッキを開く...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation>デッキを撤去</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>準備完了！( ･`д･´)</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation>強制開始</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation>サイドボード使用可能</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation>サイドボードロック中</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>エラー</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>選択したファイルが開けませんでした。</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1755,143 +2361,143 @@ This will kick all non-ready players from the game.</source>
         <translation>ダウンロード中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>ホストを選択</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation>選択中のサーバーを削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>デフォルトの公開サーバーリストに更新します</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>新しいホスト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>サーバー名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>ホストアドレス:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>ポート:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>プレイヤーネーム:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>パスワード:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>パスワードを保存</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>起動時に自動的に接続</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Cockatriceを開いた時に自動的に最後のログインに接続</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>接続や登録に問題がある場合は、サーバー管理者にお問い合わせください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>ウェブページ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation>パスワードをリセット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation>パスワード忘れた</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>接続</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>サーバー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>ログイン</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation>サーバーの連絡先</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>サーバーに接続</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation>サーバーURL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation>通信ポート</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation>ユニークサーバー名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>接続の警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>新しい接続プロファイルに名前を付ける必要があります。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>接続の警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>プレイヤー名を入力して下さい。</translation>
     </message>
@@ -1899,117 +2505,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>設定を保存する</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>説明:</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>プレイヤー人数:</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>全般</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>ゲームタイプ</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>パスワード:</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>フレンドのみ</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>登録プレイヤーのみ</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>参加制限</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>観戦を許可</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>観戦にパスワードが必要</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>観戦者はチャットに参加できる</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>観戦者に手札を見せる</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>観戦者としてゲームを作成</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>観戦者</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>開始時のライフ:</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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation>ゲーム準備オプション</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>設定をクリア</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>ゲームを作成</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>ゲーム情報</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>サーバーエラー。</translation>
     </message>
@@ -2017,97 +2628,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>トークン名:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>トークン</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>色:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>白</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>青</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>黒</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>赤</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>緑</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>多色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>無色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>P/T:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>注釈:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>戦場を離れる際に破棄</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>トークン設定</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>すべてのトークンを見る</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>このデッキのトークンを見る</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>一覧からトークンを作成</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>トークンを作成</translation>
     </message>
@@ -2115,53 +2726,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2169,40 +2780,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>画像がありません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>アバターを変更するには、新しい画像を選択してください。
 現在のアバターを削除するには、新しい画像を選ばずにOKを押してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>参照...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>アバター変更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>アバター画像を開く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>画像ファイル (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>この画像は使用できません。</translation>
     </message>
@@ -2210,17 +2821,17 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2228,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="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>前のパスワード:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>新しいパスワード:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>新しいパスワード（確認）:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>パスワード変更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>パスワードが短すぎます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>新しいパスワードが一致しませんでした。</translation>
     </message>
@@ -2267,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="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>トークン名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>色:</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="34"/>
         <source>white</source>
         <translation>白</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="35"/>
         <source>blue</source>
         <translation>青</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="36"/>
         <source>black</source>
         <translation>黒</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="37"/>
         <source>red</source>
         <translation>赤</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="38"/>
         <source>green</source>
         <translation>緑</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="39"/>
         <source>multicolor</source>
         <translation>多色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>無色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>P/T:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>注釈:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>トークンの設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>トークンを追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>トークンを削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation>カスタムトークンを編集</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>トークン名を入力:</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>エラー</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>選択された名前は、既存のカードやトークンと競合しています。
@@ -2378,12 +2989,12 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>指定なし</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>本名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>ユーザー情報編集</translation>
     </message>
@@ -2421,112 +3032,113 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>2時間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation>「フレンドのみ」のゲームを非表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation>満員のゲームを非表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation>進行中のゲームを非表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation>パスワードが必要なゲームを非表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation>無視ユーザーのゲームを非表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation>部屋の経過時間:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>説明でフィルター:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>作成者でフィルター:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>全般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>ゲームタイプ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>最少:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>最大:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>プレイヤー人数:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>制限</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>観戦できるゲームのみを表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>観戦にパスワードが必要なゲームも表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>観戦者がチャットできるゲームのみを表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>手札が閲覧できるゲームのみを表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation>観戦</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>ゲームフィルタ</translation>
     </message>
@@ -2534,52 +3146,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>パスワードリセットの警告</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>問題が発生しました。新しいパスワードのリクエストを再試行してください。</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>新しいパスワードをリクエストしたいサーバーの情報とアカウントを入力してください。</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>ホストアドレス:</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>ポート:</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>プレイヤー名:</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>メールアドレス:</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>パスワードリセットチャレンジ</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>パスワードリセットエラー</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>メールアドレスを入力してください。</translation>
     </message>
@@ -2587,37 +3199,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>新しいパスワードをリクエストするサーバーの情報を入力してください。</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>ホストアドレス:</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>ポート:</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>プレイヤー名:</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>パスワードリセット要求</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>パスワードリセットエラー</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>プレイヤー名を入力して下さい。</translation>
     </message>
@@ -2625,86 +3237,86 @@ 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>パスワードリセットの警告</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>問題が発生しました。新しいパスワードのリクエストを再試行してください。</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>新しいパスワードを設定するには、受け取ったトークンと新しいパスワードを入力します。</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>ホストアドレス:</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>ポート:</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>プレイヤー名:</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>トークン:</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>新しいパスワード:</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>パスワードリセット</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>プレイヤー名を入力して下さい。</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>パスワードリセットエラー</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>トークンを入力してください。</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>新しいパスワードを入力してください。</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>エラー</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>パスワードが短すぎます。</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>パスワードが一致しませんでした。</translation>
     </message>
@@ -2720,17 +3332,17 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>クリップボードからデッキを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>無効なデッキリストです。</translation>
     </message>
@@ -2738,43 +3350,43 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2788,45 +3400,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>デッキを開く</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation>カード名または検索条件:</translation>
     </message>
     <message>
-        <location filename="src/game/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>枚数</translation>
     </message>
     <message>
-        <location filename="src/game/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>自動的にプレイ</translation>
     </message>
     <message>
-        <location filename="src/game/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>見つかるまで上からスタックに置く...</translation>
     </message>
     <message>
-        <location filename="src/game/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>条件に一致するカードはデータベースに存在しません。続行しますか？</translation>
     </message>
     <message>
-        <location filename="src/game/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>悪魔からの助言</translation>
     </message>
     <message>
-        <location filename="src/game/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>不正な条件</translation>
     </message>
@@ -2834,54 +3479,54 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>あなたの情報と登録したいサーバーの情報を入力してください。
 あなたのメールアドレスはアカウントの確認に使用されます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>ホストアドレス:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>ポート:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>プレイヤー名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>パスワード:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>パスワード (確認) :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>メールアドレス:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>メールアドレス (確認) :</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>国籍:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>指定なし</translation>
     </message>
@@ -2927,17 +3572,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation>面の数:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation>ダイスの数</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation>賽は投げられそう</translation>
     </message>
@@ -2945,40 +3590,55 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation>セットを有効にするには、チェックを入れてください。ドラッグ＆ドロップで順序を変更し、優先順位を変更できます。カードは、最も優先度の高い有効なセットの印刷を使用します。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>カードデータベース読み込みの不明なエラー。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -2995,7 +3655,7 @@ Oracle Importerでデータベースを更新する必要があります。
 データベースの場所の設定を変更してみてください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3012,7 +3672,7 @@ Oracle Importerでデータベースを更新する必要があります。
 データベースの場所の設定を変更してみてください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3025,7 +3685,7 @@ Would you like to change your database location setting?</source>
 データベースの場所の設定を変更しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3034,7 +3694,7 @@ Would you like to change your database location setting?</source>
 データベースの場所の設定を変更してみてください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3043,7 +3703,7 @@ Would you like to change your database location setting?</source>
 データベースの場所の設定を変更してみてください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3056,59 +3716,64 @@ Would you like to change your database location setting?</source>
 データベースの場所設定を変更しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>あなたのデッキディレクトリへのパスは無効です。前に戻って正しいパスを設定してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>あなたのカード画像ディレクトリへのパスは無効です。前に戻って正しいパスを設定してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>全般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>外観</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>UI</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation>カードダウンロード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>チャット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>サウンド</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>ショートカット</translation>
     </message>
@@ -3116,12 +3781,12 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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>
@@ -3130,27 +3795,27 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 この動作は「一般」設定タブでいつでも変更できます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </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="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </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="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3158,17 +3823,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>次</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>前</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>今日のヒント</translation>
     </message>
@@ -3176,166 +3841,166 @@ 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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>現在のリリースチャンネル:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>再インストール</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>ダウンロードをキャンセル</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>ダウンロードページを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation>クライアントの更新チェック</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>CockatriceはSSLをサポートしていなかったため、更新を自動ダウンロード出来ません。
 ダウンロードページから手動で更新してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>更新のチェック中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>更新のチェックが完了しました</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>更新がありません</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatriceは最新版です。やったね！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>選択したリリースチャンネルで最新のバージョンを使用しています。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>現在のバージョン</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>選択したリリースチャンネル</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>更新できます！！！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>新しいバージョンのCockatriceが利用できます！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>新しいバージョン</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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>公開日時</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>変更履歴</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>今すぐ更新しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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>残念ながら、自動アップデータは互換性のあるダウンロードを見つけることができませんでした。 
 You may have to manually download the new version.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>更新エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>更新のチェック中にエラーが発生しました:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>更新のダウンロード中にエラーが発生しました:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>インストール中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>インストーラーが開けませんでした。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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>Cockatriceを終了した後、インストーラーから手動で更新してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation>ダウンロード場所</translation>
     </message>
@@ -3343,21 +4008,153 @@ You may have to manually download the new version.</translation>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>閉じるときにログをクリア</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>デバッグログ</translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3427,33 +4224,39 @@ You may have to manually download the new version.</translation>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <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"/>
     </message>
@@ -3461,7 +4264,7 @@ You may have to manually download the new version.</translation>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>ここにフィルタを入力</translation>
     </message>
@@ -3469,22 +4272,22 @@ You may have to manually download the new version.</translation>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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"/>
     </message>
@@ -3492,22 +4295,22 @@ You may have to manually download the new version.</translation>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation type="unfinished"/>
     </message>
@@ -3515,155 +4318,208 @@ You may have to manually download the new version.</translation>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>適切な部屋に参加してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>パスワードが間違っています。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>このゲームは観戦出来ません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>このゲームはすでに満員です。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>このゲームはすでに存在しません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>このゲームは登録済みプレイヤーのみ参加できます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>このゲームは作成者のフレンドのみ参加できます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>あなたはゲームの作成者によって参加拒否されています。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation>参加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation>観戦</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation>ゲーム情報</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>参加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>パスワード:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>最初にルームに参加してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>ゲームフィルタ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>フィルタ解除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>ゲームを作成</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>参加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>観戦</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation>表示されているゲーム: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>ゲーム</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 日</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="43"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 時</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation>できたて</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="48"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 分</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>パスワード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>フレンドのみ</translation>
     </message>
@@ -3673,68 +4529,68 @@ You may have to manually download the new version.</translation>
         <translation>登録ユーザーのみ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>チャット可</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>手札閲覧可</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>手札閲覧可</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>観戦不可</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>ルーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>作成時</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>説明</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>作成者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>タイプ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>制限</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>人数</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>観戦者</translation>
     </message>
@@ -3742,143 +4598,158 @@ You may have to manually download the new version.</translation>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation>すべてのパスをリセット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation>すべてのパスをリセットしました</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>パスを選択</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>個人設定</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>言語:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>パス（ポータブルモードでの編集は無効）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>パス</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>デッキフォルダ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>リプレイフォルダ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>カード画像フォルダ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>カードデータベース:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation>カスタムデータベースフォルダ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>トークンデータベース:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation>更新チャンネル</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation>起動時にクライアントの更新をチェック</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>サーバーでサポートされている機能がクライアントに存在しない場合に通知する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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>新バージョンのCockatriceを起動したら自動的にOracleも起動する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>起動時にヒントを表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <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"/>
     </message>
@@ -3886,47 +4757,47 @@ You may have to manually download the new version.</translation>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -3934,111 +4805,141 @@ You may have to manually download the new version.</translation>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4046,193 +4947,213 @@ You may have to manually download the new version.</translation>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4240,648 +5161,273 @@ You may have to manually download the new version.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>サーバーが満員です。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>あなたのアドレスからの同時接続が多すぎます。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>モデレーターによるBAN</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>予想終了時間: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>永久BANされています。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>サーバーシャットダウン予定時間。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>ユーザー名が無効です。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>別の場所でログインしているため、ログアウトしました。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>通信切断</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>サーバーはあなたの接続を切断しました。
-理由: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>このサーバーは%n分で再起動します。
-全ての進行中のゲームは失われます。
-シャットダウンの理由: %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>サーバーシャットダウン予定時刻</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>成功</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>登録が完了しました。
-ログインします。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>アカウント有効化が完了しました。
-ログインします。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>プレイヤー人数</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>プレイヤーの人数を入れてください.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>プレイヤー %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>リプレイを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>Cockatriceについて</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation>バージョン</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatriceウェブページ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>プロジェクトマネージャ:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>元プロジェクトマネージャ:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>デベロッパ:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>リンク先参照</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>開発者募集中！</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>翻訳者:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>翻訳者一覧</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>翻訳者募集中！</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>サポート:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>問題を報告</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>トラブルシューティング</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>F.A.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>サーバータイムアウト</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>ログイン失敗</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation>あなたのクライアントは、サーバーが必要とする機能をサポートしていません。クライアントを更新して再度お試しください。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation>クライアントをアップデートするには、メニューの「ヘルプ」から「クライアントの更新チェック」をクリックします。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>ユーザー名かパスワードが正しくありません。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>既にこのユーザー名を使用しているアクティブなセッションが存在します。
-アクティブなセッションを閉じて再ログインしてください。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>あなたは%1までBANされています。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>あなたは無期限BANされています。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>このサーバーはユーザー登録が必要です。
-今すぐ登録しますか？</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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>このサーバはクライアントのIDを必要とします。あなたのクライアントはIDの生成に失敗しているか、変更されたクライアントを実行しています。
-クライアントを再起動してもう一度お試し下さい。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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>内部エラーが発生しました。Cockatriceを再起動して再度お試しください。
-エラーが解決しない場合は、ソフトウェアの最新バージョンを実行していることを確認し、必要に応じてソフトウェア開発者にお問い合わせください。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>アカウント有効化</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>このアカウントはまだ有効化されていません。
-登録されたアドレスに送信されているアクティベーショントークンを入力して下さい。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation>サーバーが満員です。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>不明なログインエラー: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>
-これは通常、あなたのクライアントのバージョンが古くなっていて、サーバーがあなたのクライアントを認識できないと返答してきていることを意味しています。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>ユーザー名は、これらの規則を遵守する必要があります：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>文字数は%1～%2文字まで</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>小文字%1可</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>不</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>大文字％1可</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>数字％1可</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>次の記号が使用可：％1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>最初の文字を記号にすることは%1可能</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <source>no unacceptable language as specified by these server rules:</source>
-        <comment>note that the following lines will not be translated</comment>
-        <translation>サーバールールで定められている不適切な言葉は使用できません:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation>次の単語を含めることは不可能：%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation>次の文字列を含めることは不可能：%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>ユーザー名には『半角英数字』、および半角の「_」「.」「-」のみが使えます。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>登録が拒否されました。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>現在このサーバーでは登録が無効になっています。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>既に同じユーザー名のアカウントが登録されています。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>登録時に有効な電子メールアドレスを指定する必要があります。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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>このサーバーに新しいアカウントを登録しようとしていますが、提供されたメールアドレスに登録されているアカウントが既に存在しています。このサーバーは、ユーザーがアドレスごとに登録できるアカウントの数を制限しています。詳細なサポートや資格情報の入手については、サーバーのオペレーターにお問い合わせください。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>パスワードが短すぎます。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>ユーザー登録に失敗しました（サーバーの技術的問題）。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>不明な登録エラー: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>アカウントの有効化に失敗しました。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>ソケットエラー: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>あなたは古いバージョンのサーバーに接続しようとしています。Cockatriceのバージョンをダウングレードするか適切なサーバーに接続してください。
-ローカルVer %1，サーバーVer %2</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>あなたのCockatriceのバージョンがサーバーのバージョンより古いです。Cockatriceをアップデートしてください。
-ローカルVer %1，サーバーVer %2</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>%1へ接続しています...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>%1に%2として登録中...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>切断されました</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>接続完了、%1にログイン中</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>忘れたパスワードを %1 に %2 として要求しています...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>サーバーに接続...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>サーバーから切断</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>ローカルゲームを開始...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>リプレイを見る...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>フルスクリーン</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>サーバーに登録する</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation>パスワードリセット...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>設定...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>終了</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>アクション</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>カードデータベース</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation>セットを管理...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>カスタムトークンを編集...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>カスタム画像フォルダを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>カスタムセットフォルダを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>カスタムセット/カードを追加</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation>カードデータベースを再読み込み</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation>タブ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>ヘルプ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>Cockatriceについて</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation>今日のヒント</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation>クライアントの更新チェック</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation>カードデータベース更新</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation>デバッグログを見る</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation>設定フォルダを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation>表示/非表示</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation>新しいバージョン</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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>Cockatrice %1へのアップデートおめでとうございます！
 Oracleが起動し、カードデータベースが更新されます。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation>Cockatriceがインストールされました</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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>Cockatrice %1のインストールおめでとうございます！
 Oracleを起動して、初期カードデータベースをインストールします。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>カードデータベース</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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>
@@ -4890,29 +5436,29 @@ If unsure or first time user, choose &quot;Yes&quot;</source>
 よくわからない場合、初回起動時などは「はい」を押して下さい。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>はい</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>いいえ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>設定を開く</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>新しいセットが見つかりました</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
@@ -4921,17 +5467,22 @@ Do you want to enable it/them?</source>
 有効にしますか？</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>セットを見る</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>ようこそ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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>
@@ -4940,740 +5491,902 @@ Read more about changing the set order or disabling specific sets and consequent
 「セットの設定」ウィンドウ内の特定のセットを無効にしたり、順序を変更をする方法の詳細をお読みください。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>情報</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>データベース更新は既に起動中です。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>データベース更新が実行できませんでした:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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>プロセスへの書き込み中にエラーが発生しました。プロセスが実行されていないか、入力チャネルが閉じられている等の可能性があります。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>このサーバーは、クライアントにはない追加機能をサポートしています。通常、これは問題ではありませんが、新しいバージョンのCockatriceが使用可能であるか、このサーバーがカスタム版またはプレリリース版を実行している可能性があります。 
-
-クライアントを更新するには、ヘルプ→クライアントの更新のチェックをクリックしてください。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>セット/カードを読み込む</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>選択したファイルが見つかりませんでした。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation>ここではXMLデータベースのみをインポートできます。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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>新しいセット/カードが正常に追加されました。
 データベースが再読込されます。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>セット/カードのインポートに失敗</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
-        <translation>パスワードリセット</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
-        <translation>パスワードをリセットしました。</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>パスワードをリセットできませんでした。サーバー管理者にリセットしてもらってください。</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
-        <translation>アクティベーションリクエストを受信しました。メールでアクティベーショントークンを確認してください。</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation>スタックから</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation>墓地から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation>追放領域から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation>手札から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>%1のライブラリーの一番上のカード</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation>ライブラリーの一番上のカード</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation>%1のライブラリーの一番上から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation>ライブラリーの一番上から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>%1のライブラリーの一番下のカード</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation>ライブラリーの一番下のカード</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation>%1のライブラリーの一番下から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation>ライブラリーの一番下のカード</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation>%1のライブラリーから</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation>ライブラリーから</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation>サイドボードから</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation>スタックから</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1 は%2一番上のカードを公開した状態でゲームをプレイしている。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1 は%2一番上のカードの公開を終えた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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>%1はいつでも%2一番上のカードを見ることができる。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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>%1はもう%2一番上のカードを見ることができない。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1は%3の%4に%2をつけた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 が投了した！！！</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1が投了を撤回した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1 がゲームに再接続した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 はゲームから切断された。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation>%1 は %2 から自分自身へ対象を指定した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation>%1 は %2 から %3 へ対象を指定した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation>%1 は %2 の %3 から自分自身へ対象を指定した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation>%1 は %2 の %3 から %4 へ対象を指定した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1 は %2 から %3 へ対象を指定した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1 は %2 から %3 の %4 へ対象を指定した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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>%1 は %2 の %3 から %4 へ対象を指定した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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>%1 は %2 の %3 から %4 の %5 へ対象を指定した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 はトークン: %2 を%3作成した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 はデッキをロードした。ハッシュ:%2</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>%1 はデッキをロードした。サイドボード数:%2, ハッシュ:%3</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation>%1 は %2 を取り除いた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>カード</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1 は %2 に %3 のコントロールを渡した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="308"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation>%1 は %2 を%3裏向きでプレイした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1 は %2 を%3プレイした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation>%1 は %2 を%3墓地に置いた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 は %2 を%3追放した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation>%1は %2 を%3手札に加えた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation>%1 は %2 を%3ライブラリーに加えた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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>%1 は %2 を%3ライブラリーの一番下に置いた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation>%1 は %2 を%3ライブラリーの一番上に置いた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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>%1 は %2 を%3ライブラリーの一番上から%4枚目に置いた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 は %2 を%3サイドボードに置いた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 は %2 を%3プレイした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="373"/>
         <source>%1 tries to draw from an empty library</source>
         <translation>%1 は……カードがないライブラリーからカードを引こうとした！</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation><numerusform>%1は%2枚カードを引いた。</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 は%2を見ている。</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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><numerusform>%1 は%2%4%3枚のカードを見ている。</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation>下から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation>上から</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1 は %2 を裏向きにした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1 は %2 を表向きにした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>ゲームがクローズされました。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>◇◇ゲーム開始！◇◇</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1 がゲームに参加した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 が観戦に参加した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>ゲームからキックされました。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 はゲームから離脱した（%2）。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation>%1 が観戦から離脱した（%2）。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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>%1 は準備完了を解除した。</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform>％1はライブラリーを切り直し、新たにカードを％2枚引いた。</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="473"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation>％1はライブラリーを切り直し、新たに手札を引いた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation>ゲーム#%1のリプレイを再生しています。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1 はゲーム開始の準備が完了した！！</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="510"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation>カード</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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><numerusform>%1枚のカード</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation>%1 は %3 に%2を貸した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1 は %3 に%2を見せた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1 は%2を公開した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation>%1 は%3無作為に %2 を選び、%4に見せた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1 は%3無作為に %2 を選び、公開した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation>%1 は裏向きのカード#%2の表面を確認した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation>%1 は裏向きのカード#%2の表面を確認した ( %3 ) 。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation>%1 は%3 %2 を %4 に見せた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 は%3 %2 を公開した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="576"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation>%1はターン順を逆にした（%2）。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation>逆転</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation>順転</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>表</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>裏</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation>%1 はコインを投げた。結果は……【%2】だ！</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1 は%3面ダイスをふり、【%2】を出した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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>%1 は%2枚のコインを投げた。表が【%3】枚、裏が【%4】枚出た。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="608"/>
         <source>%1 rolls a %2-sided dice %3 times: %4.</source>
         <translation>%1 は%2面体サイコロを%3個振り、それぞれ【%4】を出した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>■ %1 のターン■</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation>%1 は %2 に注釈をつけた (%3)。</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <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></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <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></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation>%1 は%2カウンターを%3に設定した (%4%5)。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%1 は %2 をアンタップ・ステップの間にアンタップしないようにした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 は %2 を通常どおりアンタップするように設定した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 は %2 のP/Tを取り除いた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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>%1 は %2 のP/Tを%4にした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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>%1 は %2 のP/Tを%3から%4にした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1 はサイドボードをロックした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 はサイドボードを解禁した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 は自分のコントロールするパーマネントをタップした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 は自分のコントロールするパーマネントをアンタップした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1 は %2 をタップした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1 は %2 をアンタップした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 は%2を切り直した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="769"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation>%1 は%2の一番下の%3枚のカードをに無作為の順番で置いた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="774"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation>%1 は%2の一番上の%3枚のカードをに無作為の順番で置いた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation>%1 は%2の %3 - %4 枚を無作為の順番で置いた。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 は %2 をはずした。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 は最後に引いたカードを戻した。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 は最後に引いたカード ( %2 ) を戻した 。</translation>
     </message>
@@ -5681,110 +6394,115 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation>ここに入力してください</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation>定型文を追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation>定型文を編集</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation>定型文を削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>定型文を追加</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>定型文:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation>定型文を編集</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>チャット設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>反応するキーワード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>メンション機能を有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>メンション補完を有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>定型文</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="243"/>
         <source>How to use in-game message macros</source>
         <translation>ゲーム内メッセージマクロの使い方</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>未登録ユーザーのルームメッセージを無視</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>未登録ユーザーの個人チャットを無視</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>反転テキストの色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>個人チャットのデスクトップ通知を有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>メンションのデスクトップ通知を有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>参加時にルームのメッセージ履歴を表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>(色は16進数)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>英数字のみ使用可能。単語を半角スペースで区切って下さい。</translation>
     </message>
@@ -5792,37 +6510,42 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -5835,47 +6558,47 @@ Cockatrice will now reload the card database.</source>
         <translation>カード・タイプ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation>マナ総量</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation>色</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation>忠誠度</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation>メインのカード・タイプ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation>マナ・コスト</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation>表裏</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation>レイアウト</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation>固有色</translation>
     </message>
@@ -5898,65 +6621,211 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation>謎のフェイズ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation>アンタップ・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation>アップキープ・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation>ドロー・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation>戦闘前メイン・フェイズ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation>戦闘開始ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation>攻撃クリーチャー指定ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation>ブロック・クリーチャー指定ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation>戦闘ダメージ・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation>戦闘終了ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation>戦闘後メイン・フェイズ</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation>最終フェイズ</translation>
     </message>
@@ -5964,57 +6833,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>アンタップ・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>アップキープ・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>ドロー・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>戦闘前メイン・フェイズ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>戦闘開始ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>攻撃クリーチャー指定ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>ブロック・クリーチャー指定ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>戦闘ダメージ・ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>戦闘終了ステップ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>戦闘後メイン・フェイズ</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>最終フェイズ</translation>
     </message>
@@ -6022,7 +6891,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>ja</translation>
@@ -6031,183 +6900,195 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation>優先設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation>ピン留めする</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation>ピン留めを外す</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation>関連カードを見る</translation>
     </message>
@@ -6223,17 +7104,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation>デッキの前のカード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation>デッキの次のカード</translation>
     </message>
@@ -6241,86 +7122,94 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation>名前順</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation>提供日時順</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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>降順</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation>昇順</translation>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"/>
     </message>
@@ -6328,37 +7217,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>サービス</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>%1を隠す</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>他を隠す</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>すべて表示</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>設定...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>%1から出る</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>%1について</translation>
     </message>
@@ -6366,153 +7255,247 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Cockatriceカードデータベース(*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>全てのファイル (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatriceリプレイファイル (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>メインデッキ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>サイドボード</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>トークン</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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"/>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation>保存</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation>全て保存</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation>開く</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation>はい</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation>すべてはい</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation>いいえ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation>すべていいえ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation>中止</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation>再試行</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation>無視</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation>カードを捨てる</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation>ヘルプ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation>適用</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation>リセット</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation>デフォルトを復元</translation>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>デッキ名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>アップロード日</translation>
     </message>
@@ -6520,32 +7503,32 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>説明</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>参加プレイヤー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>ロック</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>開始日時</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>期間 (秒)</translation>
     </message>
@@ -6553,37 +7536,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -6591,41 +7574,49 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>ルーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>参加する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>ルーム名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>説明</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>アクセス権限</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>人数</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>ゲーム数</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6662,27 +7653,27 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>可能</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>セットタイプ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>セット略称</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>正式名称</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>公開日時</translation>
     </message>
@@ -6690,53 +7681,53 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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>すべてのショートカットを元に戻す</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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>本当にすべてのショートカットキーを元に戻しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation>すべてのショートカットをクリア</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="111"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>本当にすべてのショートカットキーをクリアしますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation>セクション:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation>アクション:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation>ショートカット:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation>ショートカットキーの設定方法について（英語）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation>すべてのショートカットをクリア</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation>ショートカット名で検索</translation>
     </message>
@@ -6744,12 +7735,12 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>アクション</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>ショートカットキー</translation>
     </message>
@@ -6757,14 +7748,14 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>あなたの設定ファイルには無効なショートカットキーが含まれています。
 ショートカット設定を見直してください！</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>次のショートカットがデフォルトに設定されています:
@@ -6792,12 +7783,12 @@ Please check your shortcut settings!</source>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -6805,27 +7796,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>サウンドを有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>現在のサウンドテーマ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>サウンドテスト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>サウンド設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>音量</translation>
     </message>
@@ -6833,48 +7824,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="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation>スポイラーシーズンが終了しました</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>spoiler.xmlを削除します。Oracleを起動してください。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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>スポイラーのダウンロードに失敗しました。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation>インターネット接続がありません(´・ω・｀)</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation>スポイラーリストは最新です。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation>新たなスポイラーはありません。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation>スポイラーが更新されました！！</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation>最後の変更:</translation>
     </message>
@@ -6897,16 +7888,146 @@ Please check your shortcut settings!</source>
         <translation>リリース更新サーバーから無効な応答が受信されました。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="177"/>
         <source>No reply received from the tag update server.</source>
         <translation>タグ更新サーバーからの応答がありませんでした。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="184"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>タグ更新サーバーから無効な応答が受信されました。</translation>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7038,56 +8159,227 @@ Please check your shortcut settings!</source>
         <translation>ユーザーを有効化できません。内部エラー</translation>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation type="unfinished"/>
+    </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="262"/>
+        <source>Any</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>カード情報</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>デッキ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>フィルタ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>レイアウト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>表示する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>別ウィンドウにする</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation>レイアウトをリセット</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="82"/>
         <source>Deck: %1</source>
         <translation>デッキ: %1</translation>
     </message>
@@ -7095,61 +8387,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="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7157,22 +8437,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="43"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <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"/>
     </message>
@@ -7213,8 +8493,8 @@ Please check your shortcut settings!</source>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>新しいフォルダーを作成する</translation>
     </message>
@@ -7230,84 +8510,84 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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>無効なデッキファイル</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>デッキの名前を入力</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>このデッキリストには名前がありません。
 名前を入力してください:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>無名のデッキ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>ローカルファイルの削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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>選択したデッキを削除してもよろしいですか?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>新しいフォルダの名前:</translation>
     </message>
@@ -7320,17 +8600,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation>ビジュアルデッキストレージ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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"/>
     </message>
@@ -7371,7 +8651,7 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation type="unfinished"/>
     </message>
@@ -7379,197 +8659,191 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>リプレイ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>ゲーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>プレイヤーリスト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>カード情報</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>メッセージ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>リプレイタイムライン</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>フェイズ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>ゲーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>次のフェイズ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation>ターン起因処理をしながら次のフェイズ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>次のターン</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation>ゲームのターン順を逆転する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>全ての対象指定を消す</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>席を時計回りに回転</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>席を反時計回りに回転</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>ゲーム情報</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation>投了を撤回</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>投了する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>ゲームから離脱する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>リプレイを閉じる</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>発言欄:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>レイアウト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>表示する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>別ウィンドウにする</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation>レイアウトをリセット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>投了する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>本当にこのゲームを投了しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation>投了を取り消す</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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>あなたはすでに投了しています！　本当にゲームに復帰しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>ゲームから離脱する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>本当にこのゲームから離脱しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation>プレイヤーがゲーム#%1に参加した。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation>%1 がゲームに参加した</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>ゲームからキックされました。</translation>
     </message>
@@ -7577,7 +8851,7 @@ Please enter a name:</source>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
@@ -7585,158 +8859,158 @@ Please enter a name:</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>ログ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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>時間;送信者名;送信者IP;メッセージ;対象ID;対象名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation>ルームログ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>ゲームログ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>チャットログ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>フィルターを選んで下さい。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>検索するには、有効な日数を選択する必要があります。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>ユーザー名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>IPアドレス:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>ゲーム名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>ゲームID:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>メッセージ:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>メインルーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>ゲームルーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>プライベートチャット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>X日経過:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>今日</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>今</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>少なくとも一つのフィルタが必要です。
 情報を入力すればするほど詳細な検索結果になります。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation>ユーザーログを取得</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation>フィルタ解除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>フィルタ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation>ログの場所</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation>日付指定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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>メッセージ履歴</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation>メッセージ履歴情報の収集に失敗しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation>選択したフィルタのためのメッセージはありません。</translation>
     </message>
@@ -7754,27 +9028,27 @@ The more information you put in, the more specific your results will be.</source
         <translation>退出する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - 個人チャット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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>このユーザーはあなたを無視しています。メインチャットのメッセージは表示されず、ゲームに参加することもできません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation>個人チャット:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1はサーバーから退出しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1がサーバーに参加しました。</translation>
     </message>
@@ -7782,180 +9056,180 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>ローカルのリプレイ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>サーバーに保存されたリプレイ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>リプレイを再生</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation>名前変更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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>新しいフォルダ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation>リプレイフォルダを開く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>リプレイをダウンロード</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>有効期限ロックの切り替え</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation>ローカルフォルダの名前を変更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation>ローカルファイルの名前を変更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation>新しい名前:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation>変更失敗</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation>新しいフォルダの名前:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>ローカルファイルの削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>選択したファイルを削除してもよろしいですか?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="505"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>選択したリプレイを削除してもよろしいですか?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>サーバーファイルの削除</translation>
     </message>
@@ -7968,47 +9242,62 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>発言欄:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>チャット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>ルーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>ルームから出る</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>チャットをクリア</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>チャット設定...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation>あなたにメンションした。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation>クリックで見る</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>あなたはチャットルームから弾かれました。少々お待ちください。</translation>
     </message>
@@ -8021,30 +9310,30 @@ The more information you put in, the more specific your results will be.</source
         <translation>サーバー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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>サーバールームに参加できませんでした: サーバーに存在しません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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>サーバーからサーバールームに入室中の応答がありましたが、クライアントが表示できませんでした。クライアントを再起動してみてください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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>あなたはこのサーバールームに参加するための権限がありません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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>原因不明のエラーによってサーバールームに参加できませんでした: %1。</translation>
     </message>
@@ -8052,92 +9341,97 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation>デッキエディター</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation>ビジュアルデッキストレージ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation>サーバー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation>アカウント</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation>デッキストレージ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation>リプレイ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation>管理</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation>ログ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>よろしいですか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>ゲームがまだ開いています。本当に退出しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation>クリックで見る</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>%1がオンライン！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation>不明なイベント</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8148,39 +9442,39 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 クライアントを更新するには、ヘルプ→更新のチェックをクリックしてください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation>放置タイムアウト</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>非アクティブのためログアウトしています。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>昇格</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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>あなたは昇格されました。変更を有効にするためにログインしなおして下さい。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>以下の理由によって警告を受けました:  %1。
 これらのような行動はご遠慮頂ますようお願い致します。質問がある場合は、モデレーターにプライベートメッセージを送信してください。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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>サーバーから次のメッセージを受け取りました。
@@ -8189,6 +9483,11 @@ Please refrain from engaging in this activity or further actions may be taken ag
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8229,42 +9528,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>ライフ</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>白</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>青</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>黒</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>赤</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>緑</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>無色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>その他</translation>
     </message>
@@ -8272,151 +9571,209 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation>ファイルが開けませんでした。</translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>ユーザー詳細</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>プライベートチャット</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>このユーザーのゲームを表示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>フレンドリストに追加</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>フレンドリストから削除</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>無視リストに追加</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>無視リストから削除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>ゲームからキックする</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="67"/>
         <source>Warn user</source>
         <translation>ユーザーに警告する</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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>ユーザーの警告履歴を見る</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="69"/>
         <source>Ban from &amp;server</source>
         <translation>サーバーからBANする</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>ユーザーのBAN履歴を見る</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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>ユーザーを昇格する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>ユーザーを降格する</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation>ユーザーをジャッジに昇格する</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="74"/>
         <source>Demote user from judge</source>
         <translation>ユーザーをジャッジから降格する</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="75"/>
         <source>View admin notes</source>
         <translation>管理者ノートを見る</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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"/>
     </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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>%1のゲーム</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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>BAN履歴</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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>BAN回数;モデレーター;BAN期間;BAN理由;可視理由</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation>ユーザーはBANされていません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation>BAN情報の収集に失敗しました。</translation>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation>警告履歴</translation>
     </message>
@@ -8431,55 +9788,65 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation>ユーザーは警告されていません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation>警告情報の収集に失敗しました。</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="249"/>
         <source>Failed to get admin notes.</source>
         <translation>管理者ノートの取得に失敗しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>ユーザーを昇格しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>ユーザーを降格しました。</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>失敗</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>昇格に失敗しました。</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>降格に失敗しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation>クリップボードにハッシュをコピー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation>このユーザーのメッセージを削除</translation>
     </message>
@@ -8487,311 +9854,554 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>現在地:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>アカウント年齢:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>編集</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>パスワード変更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>アバター変更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>管理者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>モデレーター</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>登録ユーザー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>未登録ユーザー</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>ジャッジ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>不明</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="371"/>
         <source>The entered password does not match your account.</source>
         <translation>入力されたパスワードはアカウントと一致しません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>情報</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>ユーザー情報が更新されました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation>ユーザー情報</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation>本名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation>ユーザー種別:</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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><numerusform>%n年</numerusform></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="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><numerusform>%10%n日%20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation>パスワードを入力</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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>メールアドレスを変更するには、パスワード認証が必要です</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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>ユーザー情報の更新中にエラーが発生しました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>このサーバーはユーザーの情報を更新することができません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>パスワードが変更されました。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>このサーバーはパスワードを変更することができません。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>新しいパスワードが短すぎます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>前のパスワードが一致しませんでした。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>アバターを更新しました。</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>このサーバーはアバターを更新することができません。</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>アバターの更新中にエラーが発生しました。</translation>
+        <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>このサーバーはユーザーの情報を更新することができません。</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>インターフェース全般設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>ダブルクリックでカードをプレイする (シングルクリックの代わり)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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>クリックしたカードだけでなく、選択したすべてのカードをプレイする。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>土地でないカードをプレイする時、すぐに戦場に出さずにスタックに置く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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"/>
+    </message>
+    <message>
+        <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>最後のカードが削除されたときにカード表示ウィンドウを閉じる</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>トークンのカードテキストを注釈にもつける</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>ティアオフメニューを使用して、右クリックメニューを画面に表示したままにする</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation>通知設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>タスクバーの通知を有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>タスクバーに観戦中のゲームイベントを通知する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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>フレンドリストのユーザーが接続したときにタスクバーで通知する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>アニメーション設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>タップ/アンタップアニメーション</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation>デッキエディタ/ストレージ設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="231"/>
         <source>Open deck in new tab by default</source>
         <translation>デフォルトでデッキを新しいタブで開く</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="232"/>
         <source>Use visual deck storage in game lobby</source>
         <translation>ゲームロビーでビジュアルデッキストレージを使用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation>リプレイ設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <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"/>
     </message>
@@ -8799,22 +10409,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation>ユーザーがサーバーに接続: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation>ルームのユーザー数: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation>フレンドオンライン: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation>無視ユーザーオンライン: %1 / %2</translation>
     </message>
@@ -8822,124 +10432,256 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8947,7 +10689,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="41"/>
+        <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"/>
     </message>
@@ -8955,19 +10697,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="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
@@ -8975,27 +10717,37 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9003,50 +10755,93 @@ 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="53"/>
+        <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"/>
     </message>
     <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -9054,46 +10849,25 @@ 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="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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>データベース内で最も近いものを検索し（自動提案付き）、Enter キーを押すと、優先印刷がデッキに追加されます。</translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation>デッキストレージ</translation>
     </message>
@@ -9101,47 +10875,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="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9149,7 +10928,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="25"/>
+        <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"/>
     </message>
@@ -9157,22 +10936,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="47"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation>デッキ名順</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation>ファイル名順</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
         <source>Sort by Last Modified</source>
         <translation>更新日順</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
         <source>Sort by Last Loaded</source>
         <translation>最近使った順</translation>
     </message>
@@ -9180,17 +10959,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="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation>データベースをロード中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9198,43 +10977,43 @@ 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_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>どの警告を送信しますか？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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>すべてのルームでこのユーザーからのすべてのメッセージを編集します</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>不正行為をユーザーに警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>エラー</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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>ユーザー名は空欄に出来ません。有効なユーザー名を選択して下さい。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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>警告は空欄に出来ません。有効な警告を選択して下さい。</translation>
     </message>
@@ -9242,133 +11021,133 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <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>選択したセットを一番上へ</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>選択中のセットを上へ</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>選択中のセットを下へ</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>選択したセットを一番下へ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation>セット名、略称、タイプで検索</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="70"/>
         <source>Default order</source>
         <translation>初期順に戻す</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>元のアートの優先順位を復元する</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="107"/>
         <source>Enable all sets</source>
         <translation>すべてのセットを有効</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="108"/>
         <source>Disable all sets</source>
         <translation>すべてのセットを無効</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="109"/>
         <source>Enable selected set(s)</source>
         <translation>選択したセットを有効</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation>選択したセットを無効</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="126"/>
         <source>Deck Editor</source>
         <translation>デッキエディター</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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation>Ctrl + A キーですべてのセットを選択します。</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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation>有効にしたセットのカードのみがデッキエディタのカードリストに表示されます。</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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation>画像の優先順位は、次の順序で決定されます:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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>最優先はCUSTOMフォルダ(%1)、以降はこのダイアログで有効化されたセットの並び順</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Card Art</source>
         <translation>カードアート</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation>カスタムカードアートの使い方</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation>ヒント</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation>注意</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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation>列でソートすると、セットの優先度設定を変えずにセットを探すことができます。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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>優先度設定を行うには、このメッセージが消えるまで同じ列見出しをクリックしてください。</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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation>現在のソートを優先度設定として使用する</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
         <source>Sorts the set priority using the same column</source>
         <translation>同じ列を使用して優先度をソートする</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation>セットを管理</translation>
     </message>
@@ -9376,72 +11155,72 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation>グループなし</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation>タイプ別グループ</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation>マナ・コスト別グループ</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation>色別グループ</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation>順不同</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation>名前順</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation>タイプ順</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation>マナ・コスト順</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation>色順</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation>P/T順</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation>セット順</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>閉じる時に切り直す</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>タイプ別に重ねて表示</translation>
     </message>
@@ -9449,7 +11228,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>日本語 (Japanese)</translation>
     </message>
@@ -9457,12 +11236,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation>起動時に接続</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -9470,1005 +11249,1078 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>メインウィンドウ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation>デッキエディター</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>ゲームロビー</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>パワーとタフネス</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>フェイズ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>プレイエリア</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation>選択中のカードを移動</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>場を見る</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation>一番上のカードを移動</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation>一番下のカードを移動</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>ゲームプレイ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation>ドロー</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation>チャットルーム</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation>ゲームウィンドウ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation>クリップボードからデッキを開く</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation>リプレイ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation>タブ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation>カードデータベース更新...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation>接続...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>切断</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>終了</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>フルスクリーン</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation>ユーザー登録...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation>設定...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation>ローカルゲームを開始...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation>リプレイを見る...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation>デッキを分析 (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation>デッキを分析 (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation>全フィルタ解除</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation>選択したフィルタを解除</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation>カードを取り除く</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation>セットを管理...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation>カスタムトークンを編集...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation>カードを追加</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation>デッキを開く...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation>クリップボードからデッキを開く...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation>新しいデッキ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation>カスタム画像フォルダを開く</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation>デッキを印刷...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation>カードを削除</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation>レイアウトをリセット</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation>デッキを保存</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation>名前を付けて保存...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation>クリップボードにデッキをコピー</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation>クリップボードにデッキをコピー（セット情報なし）</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation>デッキ読み込み...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation>サーバーのデッキを開く...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation>準備完了する</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation>サイドボードロックの切り替え</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation>緑カウンターを置く</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation>緑カウンターを取り除く</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation>緑カウンターの数を決める...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation>赤カウンターを置く</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation>赤カウンターを取り除く</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation>赤カウンターの数を決める...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation>ライフを得る</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation>ライフを失う</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation>ライフ総量を決める...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation>白カウンターを置く</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation>白カウンターを取り除く</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>アンタップ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>アップキープ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>ドロー</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation>戦闘前メイン・フェイズ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>攻撃</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>ブロック</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>ダメージ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation>戦闘後メイン・フェイズ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>エンド</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation>次のフェイズ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation>処理しながら次のフェイズ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation>次のターン</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation>タップ / アンタップ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation>カードをプレイ</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation>カードをコピー</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation>トークンを生成する...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation>ライブラリーの一番下</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>追放領域</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>墓地</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>手札</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation>ライブラリーの一番上</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation>戦場</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>自分のライブラリー</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>サイドボード</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation>スタック</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation>ゲームから退出</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>投了</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>マリガン</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation>更新</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_ko.ts b/cockatrice/translations/cockatrice_ko.ts
index 5c9e37b01..4b06f2a5e 100644
--- a/cockatrice/translations/cockatrice_ko.ts
+++ b/cockatrice/translations/cockatrice_ko.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>카운터 설정...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>카운터 설정</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>카운터 &apos;%1&apos;의 값을 지정해 주세요:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,79 +36,81 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -116,202 +118,253 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>테마 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>현재 테마:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>카드 렌더링</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>이미지가 존재하는 카드에도 카드 이름 표시</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>마우스 오버 시 카드 확대</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>손 레이아웃</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>손의 카드를 가로로 정렬</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>손의 카드를 좌측으로 정렬</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>테이블 격자 레이아웃</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>전장의 상하배치를 전환 (대지를 앞에 배치)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>다열 레이아웃를 위한 최소 플레이어 인원 (4명 이상 권장)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>카드 정보에 표시할 폰트의 최대 크기:</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -333,112 +386,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>사용자 계정 추방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>IP 주소 추방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>클라이언트 ID 추방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>추방 유형</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>영구 추방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>기간제 추방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>일:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>시간:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>분:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>추방 기간</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>추방 사유를 적어주세요.
 해당 사유는 관리자들만 볼 수 있고 추방 당한 사용자는 볼 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>추방된 사용자가 보게 될 추방 사유를 적어주세요.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>확인</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>취소</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>사용자를 서버에서 추방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>추방의 유형을 선택해 주세요.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>사용자명 추방을 하기 위해선 사용자명을 입력하셔야 합니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>아이피 추방을 하기 위해선 아이피 주소를 입력하셔야 합니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>클라이언트 ID 추방을 하기 위해선 클라이언트 ID를 입력하셔야 합니다.</translation>
     </message>
@@ -446,152 +499,221 @@ 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="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>카드 이름</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>확장판</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>마나 비용</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>카드 유형</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>공/방</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>색(들)</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>카드 이름</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>색</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>마나 비용</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation>마나 값이</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>공격력</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>방어력</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>충성도</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -599,22 +721,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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -622,22 +744,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="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -650,12 +772,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
@@ -663,132 +795,150 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
@@ -796,133 +946,133 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -931,7 +1081,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -939,29 +1089,470 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -969,47 +1560,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <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"/>
     </message>
@@ -1017,87 +1578,97 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <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"/>
     </message>
@@ -1123,114 +1694,114 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </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="162"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </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="166"/>
+        <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"/>
     </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="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </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="168"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="172"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </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="174"/>
         <source>Load deck from online service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1238,7 +1809,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1246,194 +1817,171 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>성공</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>오류</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>URL 추가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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>URL 수정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation>새 URL 추가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation>URL 제거</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>카드 장수</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>카드 이름</translation>
     </message>
@@ -1441,12 +1989,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1454,17 +2002,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -1472,7 +2020,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <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"/>
     </message>
@@ -1480,62 +2028,62 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <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"/>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </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="104"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </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="105"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </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="106"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </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="107"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <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"/>
     </message>
@@ -1543,98 +2091,156 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1652,74 +2258,74 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>덱 불러오기</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>원격 덱 불러오기</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>시작 준비</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation>사이드보드 카드 교체 가능</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation>사이드보드 카드 교체 불가능</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>오류</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>지정하신 파일을 불러올 수 없었습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1752,143 +2358,143 @@ This will kick all non-ready players from the game.</source>
         <translation>다운로드중...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>기록한 호스트</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>새로운 서버</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>호스트명:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>호스트 IP:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>포트:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>사용자명:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>비밀번호:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>비밀번호 저장</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>자동연결</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>코카트리스를 실행할 때 최근에 로그인한 서버로 연결합니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>서버</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>로그인</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>사용자명은 비어있을 수 없습니다.</translation>
     </message>
@@ -1896,117 +2502,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>설정 기억하기</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>게임 이름:</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>게임 참가 인원:</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"/>
     </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>게임 종류</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>비밀번호:</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>친구만 입장 가능</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>서버에 가입한 사용자만 입장 가능</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>입장 제한</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>관전자 허용</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>관전자 입장 시 비밀번호 필요</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>관전자 대화 가능</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>관전자에게 플레이어의 손 공개</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"/>
     </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>관전자</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>설정 초기화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>게임 만들기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>게임 정보</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>서버 오류.</translation>
     </message>
@@ -2014,97 +2625,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>토큰 이름:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>토큰</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>토큰 색:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>백색</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>청색</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>흑색</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>적색</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>녹색</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>다색</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>무색</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>공/방</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>주석:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>토큰이 전장을 떠나면 게임에서 제거됨</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>토큰 정보</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>모든 토큰 보기</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>이 덱에서 사용하는 토큰 보기</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>목록에서 토큰 선택</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>토큰 생성</translation>
     </message>
@@ -2112,53 +2723,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2166,40 +2777,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>이미지 없음</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>아바타를 변경하려면 새로운 이미지 파일을 선택하여 주십시오.
 현재 아바타를 삭제하시려면 이미지를 선택하지 않고 확인을 하시면 됩니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>찾아보기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>아바타 변경</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>이미지 불러오기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>이미지 파일 (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>잘못된 이미지를 선택하셨습니다.</translation>
     </message>
@@ -2207,17 +2818,17 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2225,38 +2836,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="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>예전 비밀번호:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>새로운 비밀번호:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>새로운 비밀번호 확인:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>비밀번호 변경</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>새로운 비밀번호가 일치하지 않습니다.</translation>
     </message>
@@ -2264,93 +2875,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="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>토큰 이름:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>토큰 색:</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="34"/>
         <source>white</source>
         <translation>백색</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="35"/>
         <source>blue</source>
         <translation>청색</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="36"/>
         <source>black</source>
         <translation>흑색</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="37"/>
         <source>red</source>
         <translation>적색</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="38"/>
         <source>green</source>
         <translation>녹색</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="39"/>
         <source>multicolor</source>
         <translation>다색</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>무색</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>공/방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>주석:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>토큰 정보</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>토큰 추가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>토큰 삭제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>토큰의 이름을 입력해 주세요.</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>오류</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"/>
@@ -2374,12 +2985,12 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>미지정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>본명:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>사용자 프로필 변경</translation>
     </message>
@@ -2417,112 +3028,113 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>2 시간</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>게임 이름:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>방장 이름:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>일반</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>게임 종류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>최소 참가 인원:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>최대 참가 인원:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>최대 플레이어 인원</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation>관전자</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>게임 필터</translation>
     </message>
@@ -2530,52 +3142,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"/>
     </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"/>
     </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"/>
     </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>호스트:</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>포트:</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>사용자명:</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>이메일:</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"/>
     </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"/>
     </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"/>
     </message>
@@ -2583,37 +3195,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"/>
     </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>호스트:</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>포트:</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>사용자명:</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"/>
     </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"/>
     </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"/>
     </message>
@@ -2621,86 +3233,86 @@ 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"/>
     </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"/>
     </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"/>
     </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>호스트:</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>포트:</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>사용자명:</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>토큰:</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>새로운 비밀번호:</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"/>
     </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>사용자명은 비어있을 수 없습니다.</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"/>
     </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"/>
     </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"/>
     </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>오류</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"/>
     </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>비밀번호가 일치하지 않습니다.</translation>
     </message>
@@ -2716,17 +3328,17 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>클립보드에서 덱 가져오기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>클립보드의 덱 리스트를 읽어올 수 없습니다.</translation>
     </message>
@@ -2734,43 +3346,43 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2784,45 +3396,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>덱 불러오기</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
@@ -2830,53 +3475,53 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>호스트 IP:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>포트:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>사용자명:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>비밀번호:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>비밀번호 확인:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>이메일:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>이메일 확인:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>국가:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>미지정</translation>
     </message>
@@ -2922,17 +3567,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
@@ -2940,40 +3585,55 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>데이터베이스를 불러올 때 미상의 오류가 발생하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -2990,7 +3650,7 @@ Would you like to change your database location setting?</source>
 데이터베이스 경로를 다시 설정하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3007,7 +3667,7 @@ Would you like to change your database location setting?</source>
 데이터베이스 경로를 다시 설정하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3016,7 +3676,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3025,7 +3685,7 @@ Would you like to change your database location setting?</source>
 데이터베이스 경로를 다시 설정하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3034,7 +3694,7 @@ Would you like to change your database location setting?</source>
 데이터베이스 경로를 다시 설정하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3043,61 +3703,66 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>덱 파일을 보관하는 디렉토리의 경로가 잘못되었습니다.
 경로를 다시 설정하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>카드 이미지 파일을 보관하는 디렉토리의 경로가 잘못되었습니다.
 경로를 다시 설정하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>환경설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>일반</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>외형</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>인터페이스</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>대화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>소리</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>단축키</translation>
     </message>
@@ -3105,39 +3770,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </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="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </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="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3145,17 +3810,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>다음</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>이전</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"/>
     </message>
@@ -3163,165 +3828,165 @@ 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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>재설치</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>다운로드 취소</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>다운로드 페이지 열기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>코카트리스가 SSL 지원 없이 컴파일되어 자동 업데이트를 할 수 없습니다.
 공식 홈페이지에서 수동으로 다운 받아주세요.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>업데이트 확인중...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice는 최신 버젼입니다!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>현재 버젼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>새로운 버젼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>변경점</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>업데이트 하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>업데이트 오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>설치중...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation>다운로드 위치</translation>
     </message>
@@ -3329,21 +3994,153 @@ 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="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>디버그 로그</translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3413,33 +4210,39 @@ You may have to manually download the new version.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <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"/>
     </message>
@@ -3447,7 +4250,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation type="unfinished"/>
     </message>
@@ -3455,22 +4258,22 @@ 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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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"/>
     </message>
@@ -3478,22 +4281,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation type="unfinished"/>
     </message>
@@ -3501,155 +4304,208 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>해당 게임이 열려있는 채널에 먼저 들어가시기 바랍니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>잘못된 비밀번호를 입력하셨습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>관전이 허용되지 않은 게임입니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>게임 인원이 전부 찼습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>게임이 더 이상 존재하지 않습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>서버에 가입한 사용자만 참가 할 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>방장의 친구 목록에 등록된 사용자만 참가 할 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>방장이 당신을 차단하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>게임 참가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>비밀번호:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>해당 게임이 열려있는 채널에 먼저 들어가시기 바랍니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>게임 필터</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>필터 해제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>게임 생성</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>게임 참가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>관전자로 참가하기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>게임 목록</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 일</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <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"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <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"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>비밀번호 필요</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>친구만</translation>
     </message>
@@ -3659,68 +4515,68 @@ You may have to manually download the new version.</source>
         <translation>가입한 사용자 전용</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>관전자 대화 가능</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>손 공개</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>관전자에게 손 공개</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>허용 안됨</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>게임</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>게임 이름</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>방장</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>입장 제한</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>플레이어</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>관전자</translation>
     </message>
@@ -3728,143 +4584,158 @@ You may have to manually download the new version.</source>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>경로 선택</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>개인 설정</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>언어:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>디렉토리 경로</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>덱 파일 경로:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>리플레이 파일 경로:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>카드 이미지 경로:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>카드 데이터베이스 경로:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>토큰 데이터베이스 경로:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>서버에서 서포트하는 기능이 클라이언트에 존재하지 않을 경우 알림</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <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"/>
     </message>
@@ -3872,47 +4743,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -3920,111 +4791,141 @@ You may have to manually download the new version.</source>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4032,193 +4933,213 @@ You may have to manually download the new version.</source>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4226,1430 +5147,1223 @@ You may have to manually download the new version.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>서버가 꽉 찼습니다. 나중에 다시 접속하여 주십시오.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>해당 IP주소에서 동시에 연결된 회선이 너무 많습니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>관리자에 의해 서버에서 추방 당하였습니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>예상 추방 종료 시간: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>영구적 추방입니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>정기 점검 중입니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>잘못된 사용자명입니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>다른 장소에서 로그인하여 접속이 해제되었습니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>서버와의 연결이 끊어졌습니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>서버에서 연결을 끊었습니다.
-사유: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>서버가 %n분 후 재시작 할 예정입니다.
-진행 중인 게임은 저장되지 않습니다.
-서버 재시작 사유: %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>정기 점검</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>성공</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>가입이 승인되었습니다.
-로그인합니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>계정이 활성화 되었습니다.
-로그인합니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>플레이어 인원</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>최대 플레이어 인원을 입력해 주세요.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>플레이어 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>리플레이 불러오기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>코카트리스에 관하여</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>코카트리스 홈페이지</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>현 프로젝트 매니저:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>전 프로젝트 매니저:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>개발진:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>기여자 목록</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>개발을 도와주세요!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>번역진:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>번역진:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>번역을 도와주세요!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation> 기술 지원:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>문제점 보고</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>문제 해결</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>자주 묻는 질문</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>서버 응답시간 초과</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>로그인 실패</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>잘못된 사용자명이나 비밀번호입니다.
-확인 후 다시 시도해 주세요.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>해당 사용자명으로 연결된 다른 세션이 있습니다.
-해당 세션을 종료 한 후에 다시 시도해 주세요.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>%1까지 추방 당하였습니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>당신은 무기한 추방 당하였습니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>본 서버는 가입이 필요합니다.
-지금 가입하시겠습니까?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>계정 활성화</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>계정이 아직 활성화 되지 않았습니다.
-가입 시 기입한 메일 주소에서 계정 활성화 토큰을 확인하여 주십시오.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>알 수 없는 로그인 오류: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>
-대부분 클라이언트가 오래되어서 서버와 클라이언트가 말이 제대로 통하지 않을때 발생하는 문제입니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>사용자명은 다음 조건을 만족해야 합니다:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>%1에서 %2자 사이</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>소문자 사용 %1가능</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>불</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>대문자 사용 %1가능</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>숫자 사용 %1가능</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>다음 문장 부호를 사용 가능 :</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>첫 글자를 문장 부호로 입력 %1가능</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>사용자명에는 영어 대소문자, 숫자, _(밑줄), .(마침표)나 -(대쉬)만 사용하실 수 있습니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>가입 실패</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>본 서버는 현재 가입을 받지 않습니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>이미 존재하는 사용자명 입니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>사용 가능한 이메일 주소를 작성하셔야 합니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>비밀번호가 너무 짧습니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>서버의 기술적 문제로 가입에 실패하였습니다.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>가입 중 알 수 없는 오류 발생: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>계정 활성화 실패</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>소켓 오류: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>서버 버전이 클라이언트보다 오래되었습니다.
-클라이언트를 다운그레이드하거나 다른 서버에 연결해 주시기 바랍니다.
-클라이언트 버전 %1, 서버 버전 %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>코카트리스 클라이언트 버전이 오래되었습니다.
-클라이언트 업데이트를 해 주세요.
-클라이언트 버전 %1, 서버 버전 %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>%1로 연결 시도 중...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>서버 %1에 %2(으)로 가입 중...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>연결 안됨</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>연결됨, %1로 로그인 시도 중</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>서버로 연결</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>서버와의 연결 해제</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>오프라인 게임 시작</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>리플레이 재생</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>전체 화면</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>서버에 가입</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>환경설정</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>끝내기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>액션</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>코카트리스</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>커스텀 이미지 폴더 열기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>커스텀 셋 폴더 열기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>커스텀 셋/카드 추가</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>도움말</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>코카트리스에 관하여</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation>클라이언트 업데이트 확인</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>카드 데이터베이스</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>예</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>아니오</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>설정 열기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>셋 보기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>환영합니다</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>알림</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>이미 카드 데이터베이스 업데이트가 진행 중입니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>카드 데이터베이스 업데이트를 진행할 수 없습니다:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation>전장에</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation>추방 영역에</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation>자신의 손에</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>%1의 서고 맨 위의 카드</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation>%1의 서고 맨 위에</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>%1의 서고 맨 밑의 카드</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation>%1의 서고 맨 밑에</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation>%1의 서고에</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation>사이드보드에</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation>스택에</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1이(가) %2 맨 위 카드를 공개합니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1이(가) %2 맨 위 카드를 더 이상 공개하지 않습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1님이 자신의 %2에서 자신의 %3을(를) 가리켰습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1님이 자신의 %2에서 %3님의 %4을(를) 가리켰습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1님이 토큰 생성: %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1이(가) 덱을 불러왔습니다. (해시값: %2)</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>%1이(가) %2장의 사이드보드가 있는 덱을 불러왔습니다. (해시값: %3)</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>카드 한 장</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1이(가) %3의 조종권을 %2에게 넘깁니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1이(가) %3서 %2을(를) 전장에 놓았습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1이(가) %3 있던 %2을(를) 추방합니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1이(가) %3 있던 %2을(를) 서고 맨 밑에 넣었습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1이(가) %3서 %2을(를) 플레이 하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>게임이 종료되었습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>게임이 시작되었습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1님이 게임에 입장했습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1이(가) 관전을 시작하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>게임에서 강제 퇴장 당하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1님이 게임 시작 준비를 끝냈습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1님이 %2을(를) 공개.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>앞면</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>뒷면</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>%1의 차례입니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <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></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <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></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>%1님이 자신의 지속물을 탭.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1님이 자신의 지속물을 언탭.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1님이 %2을(를) 탭.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1님이 %2을(를) 언탭.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>%1님이 %2를 셔플했습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1님이 %2을(를) 뗴어냈습니다.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -5657,110 +6371,115 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>메세지 추가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>메세지:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>대화 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>키워드 알림</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>대화 중 본인의 사용자명 멘션 시 해당 문장을 강조</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>멘션 자동완성 기능</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>게임 내 대화 매크로</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>서버에 가입하지 않은 사용자의 채널 대화 차단</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>서버에 가입하지 않은 사용자가 보낸 1:1 대화 차단</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>문장 색 반전</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>1:1 대화를 받을 시 데스크탑 알림 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>자신의 사용자명 멘션 시 데스크탑 알림 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>채널 입장 시 이전 대화 기록 표시</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>(16진수 색상 코드)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>각 단어마다 스페이스바로 띄어써주세요. 문자 및 숫자만 가능합니다.</translation>
     </message>
@@ -5768,37 +6487,42 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -5811,47 +6535,47 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
@@ -5874,65 +6598,211 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -5940,57 +6810,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>언탭단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>유지단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>뽑기단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>첫번째 본단계</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>전투 시작단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>공격자 선언단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>방어자 선언단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>전투 피해단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>전투 종료단</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>두번째 본단계</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>종료단</translation>
     </message>
@@ -5998,7 +6868,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>ko</translation>
@@ -6007,183 +6877,195 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6199,17 +7081,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6217,86 +7099,94 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"/>
     </message>
@@ -6304,37 +7194,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>서비스</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>%1 가리기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>기타 가리기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>모두 보기</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>환경설정...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>%1 종료</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>%1에 관하여</translation>
     </message>
@@ -6342,153 +7232,247 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>코카트리스 카드 데이터베이스 파일 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>모든 파일 (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>코카트리스 리플레이 파일 (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>메인 덱</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>사이드보드</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>토큰</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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"/>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>덱 이름</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>업로드 시간</translation>
     </message>
@@ -6496,32 +7480,32 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>게임 이름</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>플레이어</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>보존</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>게임 시작 시간</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>게임 길이</translation>
     </message>
@@ -6529,37 +7513,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -6567,41 +7551,49 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>채널 목록</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>채널에 참가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>게임</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>설명</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>권한</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>플레이어</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>게임</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6638,27 +7630,27 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>활성화</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>확장판 종류</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>확장판 약자</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>확장판 이름</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>발매 일자</translation>
     </message>
@@ -6666,53 +7658,53 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -6720,12 +7712,12 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -6733,13 +7725,13 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -6766,12 +7758,12 @@ Please check your shortcut settings!</source>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -6779,27 +7771,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>음향 효과 켜기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>현재 소리 테마:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>시스템 사운드 엔진 테스트</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>음향 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>주 음량</translation>
     </message>
@@ -6807,48 +7799,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="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -6871,16 +7863,146 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7012,56 +8134,227 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation type="unfinished"/>
+    </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="262"/>
+        <source>Any</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>카드 정보</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>덱</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>카드 필터</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>&amp;보기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>표시</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>띄우기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation>화면 레이아웃 초기화</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="82"/>
         <source>Deck: %1</source>
         <translation>덱 편집기: %1</translation>
     </message>
@@ -7069,61 +8362,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="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7131,22 +8412,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="43"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <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"/>
     </message>
@@ -7187,8 +8468,8 @@ Please check your shortcut settings!</source>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>새 폴더</translation>
     </message>
@@ -7204,84 +8485,84 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>덱 이름 작성</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>이 덱리스트는 이름이 없습니다.
 이름을 입력해 주세요:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>이름 없는 덱</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>로컬 파일 삭제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>새 폴더의 이름:</translation>
     </message>
@@ -7294,17 +8575,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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"/>
     </message>
@@ -7345,7 +8626,7 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation type="unfinished"/>
     </message>
@@ -7353,197 +8634,191 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>리플레이</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>게임</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>플레이어 목록</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>카드 정보</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>메세지</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>리플레이 타임라인</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>단계</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>게임</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>다음 단계로 진행</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>턴 넘기기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>내가 그린 화살표 제거</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>플레이어 위치 시계방향으로 조정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>플레이어 위치 반시계방향으로 조정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>게임 정보</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>항복</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>게임 나가기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>리플레이 닫기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>말하기:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>&amp;보기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>표시</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>띄우기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation>레이아웃 초기화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>항복</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>정말 게임에서 항복하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>게임 나가기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>정말 게임에서 나가시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>게임에서 강제 퇴장 당하였습니다.</translation>
     </message>
@@ -7551,7 +8826,7 @@ Please enter a name:</source>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
@@ -7559,158 +8834,158 @@ Please enter a name:</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>기록</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>게임 기록</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>대화 기록</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>최소한 한 개 이상의 필터를 선택해주세요.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>사용자명:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>IP 주소:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>게임 이름:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>게임 ID:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>메세지:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>대화 채널</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>게임 방</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>1:1 대화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>~일 전:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>오늘</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>1시간 이내</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>최소한 한개 이상의 필터를 지정해주세요.
 자세히 지정하시면 좀 더 세분화된 결과를 보실 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>필터</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"/>
     </message>
@@ -7728,27 +9003,27 @@ The more information you put in, the more specific your results will be.</source
         <translation>나가기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - 1:1 대화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1이(가) 서버와의 연결을 끊었습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1이(가) 서버에 연결하였습니다.</translation>
     </message>
@@ -7756,180 +9031,180 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>로컬 파일 시스템</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>서버 리플레이 보관함</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>리플레이 보기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>삭제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>리플레이 다운로드</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>자동 삭제 여부 토글</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>로컬 파일 삭제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>서버에 저장된 리플레이 삭제</translation>
     </message>
@@ -7942,47 +9217,62 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>말하기:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>대화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>채널</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>채널에서 나가기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>대화 내용 삭제</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>대화 설정...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation>이(가) 당신에게 멘션을 보냈습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation>여기를 눌러 확인</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>너무 빨리 말하고 있습니다. 조금만 기다려 주세요.</translation>
     </message>
@@ -7995,30 +9285,30 @@ The more information you put in, the more specific your results will be.</source
         <translation>서버</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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"/>
     </message>
@@ -8026,93 +9316,98 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>확실하십니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>참가 중인 게임이 있습니다. 
 정말로 코카트리스를 종료하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8120,32 +9415,32 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>승급</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>경고</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>운영진으로부터 %1의 사유로 경고를 받았습니다.
@@ -8153,7 +9448,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 문의사항은 관리자에게 1:1대화로 물어보시기 바랍니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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"/>
@@ -8161,6 +9456,11 @@ Please refrain from engaging in this activity or further actions may be taken ag
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8199,42 +9499,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -8242,151 +9542,209 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>사용자 정보</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>1:1 대화</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>이 사용자의 게임 보기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>친구 목록에 추가</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>친구 목록에서 삭제</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>차단 목록에 추가</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>차단 목록에서 제거</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>게임에서 강제 퇴장</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="67"/>
         <source>Warn user</source>
         <translation type="unfinished"/>
     </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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"/>
     </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="69"/>
         <source>Ban from &amp;server</source>
         <translation>서버에서 추방</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"/>
     </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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>사용자를 관리자로 승급</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>사용자를 관리자로부터 강등</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </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="74"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </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="75"/>
         <source>View admin notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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"/>
     </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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>%1의 게임</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation type="unfinished"/>
     </message>
@@ -8401,55 +9759,65 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation>경고를 받은 적이 없는 사용자입니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </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="249"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>성공</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>해당 사용자 승급에 성공하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>해당 사용자 강등에 성공하였습니다.</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>실패</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>해당 사용자 승급에 실패하였습니다.</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>해당 사용자 강등에 실패하였습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -8457,311 +9825,554 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>거주지:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>계정 나이:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>프로필 수정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>비밀번호 변경</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>아바타 변경</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>운영자</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>관리자</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>서버에 가입한 사용자</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>서버에 가입하지 않은 사용자</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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>미상</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>사용자 정보</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>사용자 정보가 갱신되었습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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"><numerusform></numerusform></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="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"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>본 서버는 당신의 사용자 정보를 수정 할 수 없게 설정되어 있습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>비밀번호가 변경되었습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>본 서버는 당신의 비밀번호를 수정 할 수 없게 설정되어 있습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>새로운 비밀번호가 너무 짧습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>예전 비밀번호가 잘못되었습니다.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>아바타를 변경하였습니다.</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>본 서버는 당신의 아바타를 변경 할 수 없게 설정되어 있습니다.</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>아바타 변경 중 오류가 발생하였습니다.</translation>
+        <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>본 서버는 당신의 사용자 정보를 수정 할 수 없게 설정되어 있습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>일반 인터페이스 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>카드를 더블 클릭해서 발동 (해제시 한번만 클릭하면 발동 됨)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>모든 대지가 아닌 카드를 발동 시에 스택으로 이동 (해제시 전장으로 바로 이동)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>토큰에 카드 텍스트 주석 자동 추가</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>상태 표시줄 알림 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>관전중인 게임의 상태 표시줄 알림 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>애니메이션 설정</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>탭/언탭 애니메이션</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <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"/>
     </message>
@@ -8769,22 +10380,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
@@ -8792,124 +10403,256 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8917,7 +10660,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="41"/>
+        <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"/>
     </message>
@@ -8925,19 +10668,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="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
@@ -8945,27 +10688,37 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -8973,50 +10726,93 @@ 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="53"/>
+        <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"/>
     </message>
     <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -9024,46 +10820,25 @@ 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="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -9071,47 +10846,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="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9119,7 +10899,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="25"/>
+        <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"/>
     </message>
@@ -9127,22 +10907,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="47"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -9150,17 +10930,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="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9168,43 +10948,43 @@ 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_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>어떤 종류의 경고를 보내시겠습니까?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>확인</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>취소</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>사용자의 부적절한 행동에 경고</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>오류</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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"/>
     </message>
@@ -9212,133 +10992,133 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <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>선택한 확장판을 맨 위로 올리기</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>선택한 확장판을 한 단계 올리기</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>선택한 확장판을 한 단계 내리기</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>선택한 확장판을 맨 아래로 내리기</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation type="unfinished"/>
     </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="70"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </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"/>
     </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="107"/>
         <source>Enable all sets</source>
         <translation>모든 확장판 활성화</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="108"/>
         <source>Disable all sets</source>
         <translation>모든 확장판 비활성화</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="109"/>
         <source>Enable selected set(s)</source>
         <translation>선택한 세트 적용</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation>선택한 세트 미적용</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="126"/>
         <source>Deck Editor</source>
         <translation>덱 편집기</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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation type="unfinished"/>
     </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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Card Art</source>
         <translation>카드 이미지</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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"/>
     </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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9346,72 +11126,72 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>닫은 후 덱 섞기</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>카드 유형별 행 정렬</translation>
     </message>
@@ -9419,7 +11199,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>한국어 (Korean)</translation>
     </message>
@@ -9427,12 +11207,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -9440,1005 +11220,1078 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>메인 화면</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation>덱 편집기</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>게임 로비</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>공격력 및 방어력</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>턴 단계</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>전장</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>보기</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>게임플레이</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>서버와의 연결 해제</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>끝내기</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>전체 화면</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>덱 닫기</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>언탭단</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>유지단</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>뽑기단</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>공격자 선언단</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>방어자 선언단</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>전투 피해단</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>종료단</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>추방 영역</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>무덤</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>손</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>서고</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>사이드보드</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>항복</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>멀리건</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_nl.ts b/cockatrice/translations/cockatrice_nl.ts
index de208b828..882e50dae 100644
--- a/cockatrice/translations/cockatrice_nl.ts
+++ b/cockatrice/translations/cockatrice_nl.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Teller instellen...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>Teller instellen</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Nieuwe waarde voor teller &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Verversen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Interpreteer Setnaam en Nummer (indien beschikbaar)</translation>
     </message>
@@ -36,81 +36,83 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation>Open in nieuw tabblad</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation>Weet je het zeker?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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>De decklijst is gewijzigd.
 Wil je de wijzigingen opslaan?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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>Foutmelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation>Kon het deckbestand niet openen: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation>Kon remote deck niet opslaan</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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>Het deck kon niet opgeslagen worden.
 Kijk na of je schrijfrechten tot de folder hebt, en probeer opnieuw.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation>Deck opslaan</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation>Het deck kon niet opslagen worden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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>Er zijn geen kaarten in je deck om te exporteren.</translation>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
-        <translation>Geen deck geselecteerd om te exporteren.</translation>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
+        <translation>Analyse Paneel Toevoegen</translation>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation>Update Notities</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation>Admin Notities voor %1</translation>
     </message>
@@ -118,214 +120,253 @@ Kijk na of je schrijfrechten tot de folder hebt, en probeer opnieuw.</translatio
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation>Mainboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation>secondes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>Foutmelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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>Kon de themes map niet aanmaken op &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation>Als je deze functie aan zet, wordt het gebruik van de drukselector uitgezet.
-
-Je kan dan geen drukvoorkeuren per deck beheren en je kan niet zien welke drukken anderen voor hun decks hebben geselecteerd.
-
-Je moet dan de Set Manager gebruiken, die beschikbaar is via Card Database -&gt; Manage Sets.
-
-Weet je zeker dat je deze functie wil aanzetten?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation>Als je deze functie uit zet, wordt de drukselector aan gezet.
-
-Je kunt nu per deck drukken kiezen in de Deck Editor en instellen welke druk standaard aan een deck wordt toegevoegd door deze vast te zetten in de drukselector.
-
-Je kunt ook de Set Manager gebruiken om de aangepaste sorteervolgorde voor drukken in de drukselector aan te passen (er zijn ook andere sorteervolgordes beschikbaar, zoals alfabetisch of op datum van uitgave).
-
-Weet je zeker dat je deze functie wilt uitschakelen?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation>Bevestig Wijziging</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>Thema opties</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>Huidige thema:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
-        <translation>Open themafolder</translation>
+        <translation>Themasmap Openen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation>Starttabblad achtergrond bron:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation>Starttabblad achtergrond verversperiode.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation>Uitgeschakeld</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation>Menu instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="415"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>Laat snelkoppelingen in rechtermuisknop menus zien</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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>Spelfilter werkbalk weergeven boven lijst in kamertab</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>Kaartweergave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>Kaartnamen altijd weergeven op kaarten met een afbeelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
-        <translation>Draai kaarten samen met zijwaardse layout</translation>
+        <translation>Zijwaardse kaarten gedraaid weergeven</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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>Overschrijf alle kaart beelden met eigen set voorkeuren (Gedrag van voor implementatie van ProviderID)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Plaats sets van andere kaarten in het deck bovenin de drukselector</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>Kaarten schalen met de muis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation>Ronde kaarthoekjes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Minimum overlap percentage van kaarten op de stack en in verticale handweergave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="434"/>
         <source>Maximum initial height for card view window:</source>
         <translation>Grootste begingrootte voor kaartbekijkvenster</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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>rijen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="436"/>
         <source>Maximum expanded height for card view window:</source>
         <translation>Grootste uitgebreide grootte voor kaartbekijkvenster</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation>Kaart-counters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation>Counter %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>Handweergave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Hand horizontaal weergeven (gebruikt extra ruimte)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>Linker justificatie inschakelen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>Tafelindeling</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>Verticale coördinaat omkeren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Minimaal aantal spelers voor kolommenindeling:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maximale lettergrootte voor informatie die op kaarten wordt weergegeven:</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="136"/>
+        <source>Back to results</source>
+        <translation>Terug naar resultaten</translation>
+    </message>
+    <message>
+        <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>Open Deck in Deckbewerker</translation>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -347,112 +388,112 @@ Weet je zeker dat je deze functie wilt uitschakelen?</translation>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>ban &amp;gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>ban &amp;IP-adres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>ban gebruiker I&amp;D</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>Ban type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;definitieve ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;tijdelijke ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>&amp;Dagen:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Uur:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minuten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>Duur van de ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>Voer een reden voor de ban in.
 Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de verbannen persoon.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>Voer een reden in die zichtbaar zal zijn voor de verbannen persoon.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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>Verwijder alle berichten van deze gebruiker in alle kamers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuleren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>Ban gebruiker van server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>U moet een ban gebaseerd op IP, naam, gebruikers ID of een combinatie van de drie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>U moet een naam meegeven als u een naam gebaseerde ban wilt uitvoeren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>U moet een IP meegeven als u een IP gebaseerde ban wilt uitvoeren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>U moet een gebruikers ID meegeven als u een gebruikers ID gebaseerde ban wilt uitvoeren.</translation>
     </message>
@@ -460,152 +501,221 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation>Beta</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation>Geen antwoord ontvangen van de release update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Ongeldig antwoord ontvangen van de release update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation>Geen antwoord ontvangen van de bestandsupdateserver.</translation>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>Sets</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>Manakosten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>Kaarttype</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>Kleur(en)</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>EN</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>OF</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>EN NIET</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>OF NIET</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation>Naam (Exact)</translation>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>Kleur</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>Mana Kosten</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation>Mana Waarde</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>Zeldzaamheid</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>Kracht</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>Hardheid</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>Loyaliteit</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation>Hoofdtype</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation>Subtype</translation>
     </message>
@@ -613,22 +723,22 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <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>Plaatje</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>Beschrijving</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>Beide</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>Bekijk gedaanteverandering</translation>
     </message>
@@ -636,22 +746,22 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation>Bekijk gerelateerde kaarten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation>Voeg kaart aan deck toe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation>Mainboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
@@ -664,12 +774,22 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
         <translation>Naam:</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>Set:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation>Verzamelnummer:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation>Gerelateerde kaarten:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation>Onbekende kaart:</translation>
     </message>
@@ -677,132 +797,150 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation>&amp;Onthul aan....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation>&amp;Alle spelers</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation>Bekijk gerelateerde kaarten</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation>Token: </translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation>Alle tokens</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation>&amp;Selecteer Alle</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation>S&amp;electeer Rij</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation>S&amp;electeer Kolom</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation>&amp;Speel</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation>&amp;Verberg</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation>Speel kaart &amp;verdekt</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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>&amp;Tap / Ontap</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
-        <translation>&amp;Normal ontappen schakelen</translation>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
+        <translation>&amp;Ontappen overslaan</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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>&amp;Draai om</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation>&amp;Gluren naar de voorkant van kaart</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation>&amp;Kloneer</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation>Aan de kaart &amp;bevestigen....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation>&amp;Losmaken</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation>&amp;Teken pijl....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation>Aantekeningen &amp;zetten....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation>Kaart-&amp;counters</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation>Voeg counter &amp;toe (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation>&amp;Verwijder counter (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation>Counters &amp;instellen (%1)...</translation>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation>Kaartgrootte</translation>
     </message>
@@ -810,133 +948,133 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation>hun hand</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation>%1s hand</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation>hun library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation>%1s library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation>van hun library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation>van %1s library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation>hun library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation>%1s library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation>hun library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation>%1s library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation>hun library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation>%1s library</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation>hun kerkhof</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation>%1s kerkhof</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation>hun verbannen</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation>%1s verbannen</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation>hun sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation>%1s sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation>hun sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation>%1s sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation>hun aangepaste zone &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation>%1s aangepaste zone &apos;%2&apos;</translation>
@@ -945,7 +1083,7 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Parseerfout op regel %1 kolom %2:</translation>
     </message>
@@ -953,29 +1091,470 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Parseerfout op regel %1 kolom %2:</translation>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation>&amp;Aangepaste Zone</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation>Aangepaste zone &apos;%1&apos; bekijken</translation>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation>Paneel Toevoegen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation>Paneel Verwijderen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation>Indeling Opslaan</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation>Indeling Laden</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation>Kaartdatabase</translation>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation>Kaartinfo</translation>
     </message>
@@ -983,47 +1562,17 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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>Zoek op kaartnaam (of zoekexpressies)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation>Toevoegen aan deck</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation>Toevoegen aan sideboard</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation>Selecteer Druk</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation>Bekijk op EDHRec (Commander)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation>Bekijk op EDHRec (Kaart)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation>Gerelateerde kaarten tonen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="127"/>
         <source>Add card to &amp;maindeck</source>
         <translation>Kaart aan deck &amp;toevoegen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="128"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Kaart aan &amp;sideboard toevoegen</translation>
     </message>
@@ -1031,87 +1580,97 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation>Database Laden...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation>Vaandelkaart</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation>Hoofdtype</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation>Mana Kosten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation>Kleuren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation>Selecteer Druk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation>Deck&amp;naam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation>Vaandelkaart/Tags zichtbaarheidsinstellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
         <source>Show banner card selection menu</source>
         <translation>Selectiemenu van vaandelkaarten weergeven</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation>Selectiemenu van tags weergeven</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation>&amp;Opmerkingen:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation>Groepeer op:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation>Format:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation>Hash:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation>Ver&amp;hoog getal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation>Ver&amp;laag getal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation>Ver&amp;wijder rij</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="752"/>
         <source>Swap card to/from sideboard</source>
         <translation>Wissel kaart van/naar sideboard</translation>
     </message>
@@ -1137,114 +1696,114 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
-        <translation>&amp;Deck Editor</translation>
+        <translation>&amp;Deckbewerker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation>&amp;Nieuw deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation>&amp;Laad deck...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation>Laad recent deck...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation>Wis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation>&amp;Bewaar deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation>Bewaar deck &amp;als...</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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation>Laad deck van &amp;klembord....</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="162"/>
         <source>Edit deck in clipboard</source>
         <translation>Deck in klembord aanpassen...</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="166"/>
+        <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>Geannoteerd</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="168"/>
+        <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>Niet Geannoteerd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation>Deck opslaan op klembord</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="168"/>
         <source>Annotated (No set info)</source>
         <translation>Geannoteerd (Geen set info)</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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation>Niet Geannoteerd (Geen set info)</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="172"/>
         <source>&amp;Print deck...</source>
         <translation>&amp;Print deck...</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="174"/>
         <source>Load deck from online service...</source>
         <translation>Deck van online service laden...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation>Deck naar online service &amp;sturen</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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation>Maak decklist aan (decklist.org)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation>Maak decklist aan (decklist.xyz)</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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation>Analyseer deck (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation>Analyseer deck (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation>&amp;Sluiten</translation>
     </message>
@@ -1252,7 +1811,7 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation>Drukselector</translation>
     </message>
@@ -1260,194 +1819,171 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>Update Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>Succes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation>Download URL&apos;s zijn gereset.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>Gedownloade kaartafbeeldingen&apos;s zijn gereset.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>Fout</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation>Een of meer gedownloade kaartafbeeldingen konden niet worden gewist.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>URL toevoegen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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>URL bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation>Netwerk Cache Grootte:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation>Redirect Cache TTL:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation>Hoe lang cached redirects voor urls geldig zijn</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation>Afbeeldingen Cache Grootte:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation>Nieuwe URL toevoegen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation>URL verwijderen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation>Dag(en)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>Bijwerken...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>Kies locatie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation>URL Download Prioriteit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>Spoilers Automatisch Downloaden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation>Spoiler Locatie:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>Laatste Wijziging</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>Spoilers downloaden automatisch bij opstarten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>Druk op de knop om handmatig bij te werken zonder opnieuw te starten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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>Sluit de instellingen niet af voordat de handmatige update is voltooid</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation>Kaartafbeeldingen on the fly downloaden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation>Hoe een aangepaste URL toe te voegen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>Gedownloade Afbeeldingen Verwijderen</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation>Reset Download URL&apos;s</translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
-        <translation>Cache op schijf voor gedownloade afbeeldingen</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
+        <translation>Ontdoen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
-        <translation>Cache in geheugen voor afbeeldingen die momenteel niet op het scherm staan</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation>Herdoen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation>Ontdoe/Herdoe geschiedenis</translation>
+    </message>
+    <message>
+        <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>Klik een regel om terug te gaan naar dat punt in de geschiedenis.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation>[herdoen]</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
+        <translation>[ontdoen]</translation>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation>Hoeveelheid</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation>Provider ID</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>Kaart</translation>
     </message>
@@ -1455,12 +1991,12 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation>Algemene deckformaten (%1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation>Alle bestanden (*.*)</translation>
     </message>
@@ -1468,17 +2004,17 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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>Modus: Exacte Overeenkomst</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
         <source>Mode: Includes</source>
         <translation>Modus: Bevat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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>Kleur-identiteit filtermodus (AND/OR/NOT samenvoegingen van filters)</translation>
     </message>
@@ -1486,7 +2022,7 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
         <source>Edit tags ...</source>
         <translation>Bewerk tags ...</translation>
     </message>
@@ -1494,62 +2030,62 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
         <source>Deck Tags Manager</source>
         <translation>Deck Tags Beheren</translation>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation>Beheer je deck-tags. Vink tags aan of uit naar behoefte, of voeg nieuwe toe:</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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation>Nieuwe tag toevoegen (e.g., Aggro)</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="104"/>
         <source>Add Tag</source>
         <translation>Tag Toevoegen</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="105"/>
         <source>Filter tags...</source>
         <translation>Tags filteren...</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="106"/>
         <source>OK</source>
         <translation>OK</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="107"/>
         <source>Edit default tags</source>
         <translation>Standaardtags bewerken</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="108"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation>Ongeldige Invoer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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>Naam van tag mog niet leeg zijn!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation>Tag Dupliceren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>This tag already exists.</source>
         <translation>Deze tag bestaat al.</translation>
     </message>
@@ -1557,98 +2093,156 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation>Vaandelkaart</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
         <source>Open in deck editor</source>
         <translation>In deckbewerker openen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation>Tags Aanpassen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation>Deck Hernoemen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
         <source>Save Deck to Clipboard</source>
         <translation>Bewaar Deck op Klembord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation>Geannoteerd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
         <source>Annotated (No set info)</source>
         <translation>Geannoteerd (Geen set info)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation>Niet Geannoteerd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
         <source>Not Annotated (No set info)</source>
         <translation>Niet Geannoteerd (Geen set info)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation>Bestand Hernoemen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation>Bestand Verwijderen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation>Vaandelkaart Instellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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>Nieuwe naam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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>Foutmelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation>Hernoemen mislukt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation>Bestand Verwijderen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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>Weet je zeker dat je het opgeslagen bestand wilt verwijderen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation>Verwijderen mislukt</translation>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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>Hernoem deck naar &quot;%1&quot; van &quot;%2&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
+        <source>Updated comments (was %1 chars, now %2 chars)</source>
+        <translation>Opmerkingen bijgewerkt (van %1 karakters naar %2 karakters)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation>Vaandelkaart veranderd naar %1 (%2)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation>Tags veranderd</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation>Format veranderd naar %1</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation>Toegevoegd (%1): %2 (%3) %4</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="264"/>
+        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
+        <translation>Verplaatst naar %1 1 × &quot;%2&quot; (%3)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation>Verwijderd &quot;%1&quot; (alle exemplaren)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation>%1 1 × &quot;%2&quot; (%3)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation>Toegevoegd</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation>Verwijderd</translation>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1666,75 +2260,75 @@ Dit wordt opgeslagen voor het moderatorteam en zal niet zichtbaar zijn voor de v
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>Deck laden...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Laad extern deck...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation>Van klembord laden....</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation>Van website laden...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation>Deck uitladen</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>Gereed voor begin</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation>Geforceerd starten</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation>Sideboard ontgrendeld</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation>Sideboard vergrendeld</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>Fout</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>Het geselecteerde bestand kon niet geladen worden.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation>Deck is groter dan maximum bestandsgrootte.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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>Weet je zeker dat je geforceerd beginnen wil?
 Dit zal alle spelers die niet gereed zijn van het spel verwijderen.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -1769,143 +2363,143 @@ Wil je het deck omzetten naar het .cod-formaat?</translation>
         <translation>Downloaden...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>Bekende Hosts</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation>Verwijder de geselecteerde opgeslagen server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Hernieuw de serverlijst met bekende publieke servers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>Nieuwe Eigenaar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;Gastheer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;Poort</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>Spelers&amp;naam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>W&amp;achtwoord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>Wachtwoord &amp;Opslaan</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>A&amp;utomatisch verbinden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Maak automatisch verbinding met de meest recente login wanneer Cockatrice wordt geopend.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>Als u problemen ondervindt bij het aansluiten of registreren, neem dan contact op met het serverteam voor hulp!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>Website</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation>Wachtwoord veranderen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation>Wachtwoord vergeten?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>&amp;Verbinden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation>Servercontact</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>Verbinding maken met server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation>Server URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation>Communicatiepoort</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation>Unieke Servernaam</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>Verbindingswaarschuwing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>U moet het nieuwe verbindingsprofiel een naam geven.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>Verbindingswaarschuwing</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>De naam van de speler mag niet leeg zijn.</translation>
     </message>
@@ -1913,117 +2507,122 @@ Wil je het deck omzetten naar het .cod-formaat?</translation>
 <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>Instellingen &amp;Onthouden</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>&amp;Omschrijving:</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>Spe&amp;lers:</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>Algemeen</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>Spel type</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>&amp;Wachtwoord:</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>Alleen &amp;vrienden kunnen meedoen</translation>
+        <translation>Alleen &amp;maatjes kunnen aansluiten</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>Alleen ge&amp;registreerde gebruikers kunnen meedoen</translation>
+        <translation>Alleen ge&amp;registreerde gebruikers kunnen aansluiten</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>Restricties voor meedoen</translation>
+        <translation>Restricties voor aansluiten</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>Toe&amp;schouwers kunnen meekijken</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>Toeschouwers hebben een wachtwoord &amp;nodig om mee te kijken</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>Toeschouwers kunnen &amp;chatten</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>Toeschouwers kunnen &amp;handen zien</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>Maak spel aan als toeschouwer</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>Toeschouwers</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>Beginnend levenstotaal:</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>Open decklijsten in lobby</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation>Maak spel aan als judge</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation>Spel opzet opties</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>&amp;Opschonen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>Spel aanmaken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>Spelgegevens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>Server Fout</translation>
     </message>
@@ -2031,97 +2630,97 @@ Wil je het deck omzetten naar het .cod-formaat?</translation>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Naam:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Token</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>Kle&amp;ur:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>wit</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>blauw</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>zwart</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>rood</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>groen</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>veelkleurig</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>kleurloos</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotatie:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Vernietig token als het de tafel verlaat</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation>Verdekt aanmaken (Verbergt alleen naam)</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Token data</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Laat &amp;alle tokens zien</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Laat tokens van dit &amp;dek zien</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>Kies token uit lijst</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>Maak token</translation>
     </message>
@@ -2129,53 +2728,53 @@ Wil je het deck omzetten naar het .cod-formaat?</translation>
 <context>
     <name>DlgDefaultTagsEditor</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation>Tags Aanpassen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation>Toevoegen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation>Bevestig</translation>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation>Annuleren</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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation>Vul tag in en druk Enter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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>✖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation>Ongeldige Invoer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation>Naam van tag mog niet leeg zijn!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation>Tag Dupliceren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation>Deze tag bestaat al.</translation>
     </message>
@@ -2183,40 +2782,40 @@ Wil je het deck omzetten naar het .cod-formaat?</translation>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>Geen afbeelding gekozen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Om je avatar te veranderen, kies een nieuwe afbeelding.
 Om je avatar te verwijderen, accepteer zonder een nieuwe afbeelding te kiezen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>Zoeken...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>Verander Icoon</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>Afbeelding openen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Afbeeldingen (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>Geen geldige afbeelding gekozen</translation>
     </message>
@@ -2224,17 +2823,17 @@ Om je avatar te verwijderen, accepteer zonder een nieuwe afbeelding te kiezen.</
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation>Deck in klembord aanpassen...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation>Foutmelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation>Niet geldige deck lijst.</translation>
     </message>
@@ -2242,38 +2841,38 @@ Om je avatar te verwijderen, accepteer zonder een nieuwe afbeelding te kiezen.</
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Oud wachtwoord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nieuw wachtwoord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Herhaal nieuw wachtwoord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Verander wachtwoord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Je wachtwoord is te kort.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Nieuwe wachtwoorden komen niet overeen.</translation>
     </message>
@@ -2281,93 +2880,93 @@ Om je avatar te verwijderen, accepteer zonder een nieuwe afbeelding te kiezen.</
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;Naam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>Kle&amp;ur:</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="34"/>
         <source>white</source>
         <translation>wit</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="35"/>
         <source>blue</source>
         <translation>blauw</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="36"/>
         <source>black</source>
         <translation>zwart</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="37"/>
         <source>red</source>
         <translation>rood</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="38"/>
         <source>green</source>
         <translation>groen</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="39"/>
         <source>multicolor</source>
         <translation>veelkleurig</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>kleurloos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotatie:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Token data</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>Voeg token toe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Verwijder token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation>Aangepaste tokens bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Gelieve de naam van de token in te voeren:</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>Fout</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>De gekozen naam is al in gebruik door een bestaande kaart of token.
@@ -2392,12 +2991,12 @@ Zorg ervoor dat u de &apos;Token&apos; set in het &quot; Beheer sets&quot; dialo
         <translation>Onbekend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Echte naam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Gebruikers profiel aanpassen</translation>
     </message>
@@ -2435,112 +3034,113 @@ Zorg ervoor dat u de &apos;Token&apos; set in het &quot; Beheer sets&quot; dialo
         <translation>2 uur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
-        <translation>Verberg &apos;alleen vrienden&apos; spellen</translation>
+        <translation>Verberg &apos;alleen maatjes&apos; spellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation>Verberg volle spellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation>Verberg spellen die al begonnen zijn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation>Verberg met wachtwoord vergrendelde spellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation>Verberg spellen door &apos;genegeerde&apos; gebruikers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
-        <translation>Verberg spellen die niet door vrienden zijn aangemaakt</translation>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
+        <translation>Verberg spellen niet aangemaakt door maatjes</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation>Verberg spellen met gedwongen open decklijsten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Nieuwer dan:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>Spel &amp;omschrijving:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>Naam van &amp;maker:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>&amp;Spel types</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>ten&amp;minste:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>op zijn &amp;hoogst:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>Maximale aantal spelers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>Restricties</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Laat alleen spellen zien als &amp;toeschouwers kunnen kijken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Laat spellen zien met &amp;wachtwoord voor toeschouwers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Laat alleen spellen zien als toeschouwers kunnen &amp;chatten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Laat alleen spellen zien als toeschouwers &amp;handen kunnen zien</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation>Toeschouwers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>Spellen filteren</translation>
     </message>
@@ -2548,52 +3148,52 @@ Zorg ervoor dat u de &apos;Token&apos; set in het &quot; Beheer sets&quot; dialo
 <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>Wachtwoord Vergeten Challenge Waarschuwing</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>Een probleem heeft zich opgetreden. Gelieve opnieuw een wachtwoord aan te vragen.</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>Vul de gegevens in van de server en het account waar je een nieuw wachtwoord aan voor wil vragen.</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>&amp;Host:</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>&amp;Poort:</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>&amp;Spelernaam:</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>E-mail:</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>Wachtwoord Vergeten Challenge</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>Foutmelding Wachtwoord Vergeten Challenge</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>Het e-mailadres mag niet leeg zijn.</translation>
     </message>
@@ -2601,37 +3201,37 @@ Zorg ervoor dat u de &apos;Token&apos; set in het &quot; Beheer sets&quot; dialo
 <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>Vul de gegevens in van de server waar je een nieuw wachtwoord aan voor wil vragen.</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>&amp;Host:</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>&amp;Poort:</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>&amp;Spelernaam:</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>Wachtwoord Vergeten Aanvraag</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>Foutmelding Wachtwoord Resetten</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>De spelernaam kan niet leeg zijn.</translation>
     </message>
@@ -2639,86 +3239,86 @@ Zorg ervoor dat u de &apos;Token&apos; set in het &quot; Beheer sets&quot; dialo
 <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>Waarschuwing Wachtwoord Resetten</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>Een probleem heeft zich opgetreden. Gelieve opnieuw een wachtwoord aan te vragen.</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>Vul het ontvangen token en het nieuwe wachtwoord in om je wachtwoord in te stellen.</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>&amp;Host:</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>&amp;Poort:</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>&amp;Spelernaam:</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>Token:</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>Nieuw Wachtwoord:</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>Reset Wachtwoord</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>De spelernaam kan niet leeg zijn.</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>Foutmelding Resetten Wachtwoord</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>De token mag niet leeg zijn.</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>Het nieuwe wachtwoord mag niet leeg zijn.</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>Fout</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>Uw wachtwoord is te kort.</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>De wachtwoorden komen niet overeen.</translation>
     </message>
@@ -2734,17 +3334,17 @@ Zorg ervoor dat u de &apos;Token&apos; set in het &quot; Beheer sets&quot; dialo
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>Laad dek van klembord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>Niet geldige deck lijst.</translation>
     </message>
@@ -2752,45 +3352,45 @@ Zorg ervoor dat u de &apos;Token&apos; set in het &quot; Beheer sets&quot; dialo
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation>Plak hier een link naar een decklijst site om deze te importeren.
 (Archidekt, Deckstats, Moxfield, en TappedOut worden ondersteund.)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation>Deck van Website Laden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation>Geen lezer beschikbaar voor deze deck-leveraar.
 (Archidekt, Deckstats, Moxfield, en TappedOut worden ondersteund.)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation>Netwerk fout: %1.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
-        <translation type="unfinished"/>
+        <translation>Lege deckinformatie ontvangen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
-        <translation type="unfinished"/>
+        <translation>Parsen deckinformatie mislukt: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2798,51 +3398,90 @@ https://archidekt.com/decks/9999999
 https://deckstats.net/decks/99999/9999999-your-deck-name/en
 https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
 https://tappedout.net/mtg-decks/your-deck-name/</source>
-        <translation type="unfinished"/>
+        <translation>De opgegeven URL is niet herkend als geldige deck URL.
+Geldige deck URLs zien er zo uit:
+
+https://archidekt.com/decks/9999999
+https://deckstats.net/decks/99999/9999999-your-deck-name/en
+https://moxfield.com/decks/XYZxx-XYZ99Yyy-xyzXzzz
+https://tappedout.net/mtg-decks/your-deck-name/</translation>
     </message>
 </context>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>Laad dek</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation>Spelers:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation>Algemeen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation>Beginnend levenstotaal:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation>Spel opzet opties</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation>Instellingen onthouden</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation>Opties plaatselijk spel</translation>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation>Kaart naam (of zoekexpressies)</translation>
     </message>
     <message>
-        <location filename="src/game/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>Hoeveelheid resultaten:</translation>
     </message>
     <message>
-        <location filename="src/game/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>Speel resultaten automatisch</translation>
     </message>
     <message>
-        <location filename="src/game/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>Plaats bovenste kaart op stack totdat...</translation>
     </message>
     <message>
-        <location filename="src/game/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>Er zijn geen kaarten die bij deze zoekopdracht passen in de kaartendatabase. Toch doorgaan?</translation>
     </message>
     <message>
-        <location filename="src/game/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>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/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>Ongeldige filter</translation>
     </message>
@@ -2850,54 +3489,54 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Vul je gegevens en de gegevens van de server waar je wil registreren.
 Je email zal gebruikt worden om je account te controleren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>&amp;Eigenaar:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>&amp;Poort:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Naam van speler:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>W&amp;achtwoord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>Wachtwoord (opnieuw):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>Email (opnieuw):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>Land:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>Onbekend</translation>
     </message>
@@ -2943,17 +3582,17 @@ Je email zal gebruikt worden om je account te controleren.</translation>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation>Aantal zijden:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation>Aantal dobbelstenen:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation>Werp Dobbelstenen</translation>
     </message>
@@ -2961,40 +3600,55 @@ Je email zal gebruikt worden om je account te controleren.</translation>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
-        <source>Modified Cards:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
-        <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
-        <translation type="unfinished"/>
+        <translation>Onaangepaste Kaarten:</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
-        <source>Clear all set information</source>
-        <translation type="unfinished"/>
+        <source>Modified Cards:</source>
+        <translation>Aangepaste Kaarten:</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
+        <translation>Vink Sets aan om deze in te schakelen. Versleep om ze te herordenen en hun prioriteit te veranderen. Kaarten zullen de druk gebruiken van de set met de hoogste prioriteit.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
+        <source>Clear all set information</source>
+        <translation>Wis alle set informatie</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
-        <translation type="unfinished"/>
+        <translation>Alle naar voorkeur instellen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation>Drukken aangepast als groep</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation>Alle drukinformatie gewist</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation>Alle drukken naar voorkeur instellen</translation>
     </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>Onbekende Fout in het lezen van de kaart database</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -3011,7 +3665,7 @@ U zou oracle moeten herstarten om uw database te updaten.
 Zou u de locatie van uw database willen veranderen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3028,7 +3682,7 @@ Dit zou mogelijk opgelost worden door oracle opnieuw te starten en je kaart data
 Wil je de locatie van je database veranderen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3041,7 +3695,7 @@ Plaats een klacht op https://github.com/Cockatrice/Cockatrice/issues met uw card
 Wilt u uw database lokatie aanpassen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3050,7 +3704,7 @@ Would you like to change your database location setting?</source>
 Wilt u uw database lokatie aanpassen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3059,7 +3713,7 @@ Would you like to change your database location setting?</source>
 Wilt u uw database lokatie aanpassen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3072,59 +3726,64 @@ Plaats een klacht op https://github.com/Cockatrice/Cockatrice/issues asltublieft
 Wilt u uw database lokatie aanpassen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>Het pad naar uw deck map is niet geldig. Wilt u terug gaan en de correcte pad invullen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>Het pad naar uw kaart afbeelding map is niet geldig. Wil je terug gaan en het juiste pad invullen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>Weergave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>Gebruikersomgeving</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation>Kaart Bronnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>Geluid</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>Sneltoetsen</translation>
     </message>
@@ -3132,57 +3791,59 @@ Wilt u uw database lokatie aanpassen?</translation>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
-        <translation type="unfinished"/>
+        <translation>Kaartbewerkingscontrole</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
-        <source>Run in foreground</source>
-        <translation type="unfinished"/>
+        <translation>Het is meer dan %2 dagen geleden sinds je het laatst je kaartendatabase hebt gecontroleerd op bewerkingen.
+Kies hoe je de kaartendatabasebewerker wil uitvoeren.
+Je kan altijd dit gedrag aanpassen in de &quot;Algemeen&quot; instellingtab.</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
-        <source>Run in background</source>
-        <translation type="unfinished"/>
+        <source>Run in foreground</source>
+        <translation>In voorgrond uitvoeren</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
-        <source>Run in background and always from now on</source>
-        <translation type="unfinished"/>
+        <source>Run in background</source>
+        <translation>In achtergrond uitvoeren</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="27"/>
-        <source>Don&apos;t prompt again and don&apos;t run</source>
-        <translation type="unfinished"/>
+        <source>Run in background and always from now on</source>
+        <translation>Altijd in achtergrond uitvoeren vanaf nu</translation>
     </message>
     <message>
         <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>Niet opniew vragen en niet uitvoeren</translation>
+    </message>
+    <message>
+        <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>Niet nu uitvoeren</translation>
     </message>
 </context>
 <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>Volgende</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>Vorige</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>Tip van de Dag</translation>
     </message>
@@ -3190,165 +3851,166 @@ 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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>Huidig releasekanaal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>Herinstalleer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>Annuleer Downloaden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>Open de downloadpagina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation>Controleren op Client-updates</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>Cockatrice is niet gebouwd met SSL-ondersteuning, daarom kunt u niet automatisch updates downloaden! 
 Ga naar de downloadpagina om handmatig bij te werken.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
-        <translation type="unfinished"/>
+        <translation>Bewerkingen downloaden: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>Controleren op updates...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>Controle op updates voltooid</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>Geen Update Beschikbaar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice is up to date!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>U draait al de laatste versie die beschikbaar is in het gekozen releasekanaal.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>Huidige versie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>Geselecteerd releasekanaal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>Update Beschikbaar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Een nieuwe versie van Cockatrice is beschikbaar!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Nieuwe versie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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>Released</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>Changelog</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>Wilt u nu updaten?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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>Helaas, de automatische bewerker is niet geslaagd in het vinden van een toepasselijke download.
+Je moet misschien handmatig de nieuwe versie downloaden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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>Controleer alsjeblieft de &lt;a href=&quot;%1&quot;&gt;releases pagina&lt;/a&gt;op onze Github en download de versie voor jouw systeem.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>Update Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Er is een fout opgetreden bij het controleren op updates:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Er is een fout opgetreden tijdens het downloaden van een update:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>Installeren...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice kan het installatieprogramma niet openen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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>Probeer handmatig bij te werken door Cockatrice te sluiten en het installatieprogramma uit te voeren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation>Download locatie</translation>
     </message>
@@ -3356,32 +4018,164 @@ 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="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Wis log bij sluiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation>Kopieer naar klembord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Debug Log</translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation>Raapkansinstellingen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation>Criteria:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation>Kaartnaam</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation>Subtype</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation>Manawaarde</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation>Precisie:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation>Minstens</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation>Precies</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation>Kwantiteit (N):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation>Kaarten getrokken (M):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation>kaarten</translation>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation>Raapkans</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation>Kans op rapen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation>Kaartnaam</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation>Subtype</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation>Manawaarde</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation>Minstens</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation>Precies</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation>kaart(en) na het rapen van</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation>kaarten</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation>Kategorie</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation>Hoeveel</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation>Kans (%)</translation>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="37"/>
         <source>In %1 decks</source>
-        <translation type="unfinished"/>
+        <translation>In %1 decks</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_inclusion_display_widget.cpp" line="38"/>
         <source>%1% of %2 decks</source>
-        <translation type="unfinished"/>
+        <translation>%1 van %2 decks</translation>
     </message>
 </context>
 <context>
@@ -3437,44 +4231,50 @@ You may have to manually download the new version.</source>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/display/cards/edhrec_api_response_card_synergy_display_widget.cpp" line="27"/>
         <source>%1% Synergy</source>
-        <translation type="unfinished"/>
+        <translation>%1% Synergie</translation>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation>Game Changers</translation>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation>Budget</translation>
     </message>
 </context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
-        <translation type="unfinished"/>
+        <translation>Combos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
+        <translation>Gemiddeld Deck</translation>
     </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <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>Zoutigheid:</translation>
     </message>
 </context>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>Typ hier uw filter in</translation>
     </message>
@@ -3482,45 +4282,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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation>Bevestig Verwijderen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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>Weet je zeker dat je de filter &apos;%1&apos; wil verwijderen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
-        <translation type="unfinished"/>
+        <translation>Verwijderen Mislukt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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>Verwijderen van filter &apos;%1&apos; mislukt.</translation>
     </message>
 </context>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
-        <translation type="unfinished"/>
+        <translation>er uit geschopt door spelmaker of moderator</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation>speler heeft het spel verlaten</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
-        <translation type="unfinished"/>
+        <translation>speler verbrak verbinding van server</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation>reden onbekend</translation>
     </message>
@@ -3528,157 +4328,210 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>Gelieve eerst naar de juiste kamer te gaan.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>Verkeerd wachtwoord.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Toeschouwers zijn niet toegelaten in dit spel.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>Dit spel is reeds vol.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>Het spel bestaat niet meer.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>Dit spel is alleen toegankelijk voor geregistreerde gebruikers.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>Dit spel staat alleen open voor de vrienden van de maker van dit spel.</translation>
+        <translation>Dit spel is alleen toegankelijk voor de maatjes van de maker van dit spel.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Je wordt genegeerd door de maker van dit spel.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation>Aansluiten bij spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation>Spel Toeschouwen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation>Spelgegevens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation>Bij Spel Aansluiten als Judge</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation>Spel Toeschouwen als Judge</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>Aansluiten bij spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>Wachtwoord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>Gelieve eerst bij de betreffende kamer aan te sluiten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filter spellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>W&amp;is filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>C&amp;reëer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>&amp;Aansluiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation>Aansluiten als judge</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>&amp;Aansluiten als toeschouwer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation>Aansluiten als judge toeschouwer</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation>Spellen weergegeven: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>Spellen</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation>Alle types</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation>Filter op spelnaam...</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation>Filter op speltype/format</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation>Verberg spellen niet gemaakt door maatjes</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation>Verberg volle spellen</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation>Verberg begonnen spellen</translation>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 dag</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="43"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 uur</numerusform><numerusform>%1%2 uur</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation>nieuw</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="48"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>wachtwoord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
-        <translation>enkel vrienden</translation>
+        <translation>alleen maatjes</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/server/games_model.cpp" line="155"/>
@@ -3686,68 +4539,68 @@ You may have to manually download the new version.</source>
         <translation>enkel geregistreerde gebruikers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
-        <translation type="unfinished"/>
+        <translation>decklijsten gedeeld</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>kan praten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>zie handen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>kan handen zien</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>niet toegelaten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>Kamer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>Ouderdom</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>Omschrijving</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>Maker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>Restricties</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>Spelers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>Toeschouwers</translation>
     </message>
@@ -3755,1176 +4608,865 @@ You may have to manually download the new version.</source>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation>Reset alle bestandspaden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation>Alle bestandspaden zijn gereset</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>Kies pad</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>Persoonlijke instellingen</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>Taal:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>Locaties (bewerken uitgeschakeld in &quot;portable mode&quot;)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>Paden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
-        <translation type="unfinished"/>
+        <translation>Hoe met vertalen te helpen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>Map voor decks:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
-        <translation type="unfinished"/>
+        <translation>Filters map:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>Map voor replays:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>Map voor afbeeldingen:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>Kaartdatabase:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation>Custom database map:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>Token-database</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation>Updatekanaal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <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>Controleren op client-updates bij opstarten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <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>Controleren op kaartendatabasebewerkingen bij opstarten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
-        <translation type="unfinished"/>
+        <translation>Niet controleren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
-        <translation type="unfinished"/>
+        <translation>Vragen om bewerking</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
-        <translation type="unfinished"/>
+        <translation>Altijd in achtergrond bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <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>Controleren op kaartendatabasebewerkingen iedere</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation>dagen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>Waarschuw als een functie die is ondersteund door de server mist in mijn client</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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>Oracle automatisch uitvoeren bij het opstarten van een nieuwe versie van Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>Toon tips bij het opstarten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <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>Laatste controle op %1 (%2 dagen geleden)</translation>
     </message>
 </context>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Bekijk graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Verplaats graveyard naar...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Bovenkant van library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Onderkant van library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Alle spelers</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exile</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
-        <translation type="unfinished"/>
+        <translation>Onthul willekeurige kaart aan...</translation>
     </message>
 </context>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Bekijk hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
-        <translation type="unfinished"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
+        <translation>Sorteer hand op...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
-        <translation type="unfinished"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
+        <translation>Naam</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation>Manawaarde</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation>Neem &amp;mulligan (Kies handgrootte)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation>Neem mulligan (Dezelfde handgrootte)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation>Neem mulligan (Handgrootte - 1)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Verplaats hand naar....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Bovenkant van library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Onderkant van library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exile</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Onthul hand aan....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
+        <translation>Alle spelers</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
         <source>Reveal r&amp;andom card to...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <translation>Onthul &amp;willekeurige kaart aan....</translation>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
-        <translation type="unfinished"/>
+        <translation>Maak Nieuw Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
-        <translation type="unfinished"/>
+        <translation>Decks Doorbladeren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
-        <translation type="unfinished"/>
+        <translation>Kaartendatabase Doorbladeren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
-        <translation type="unfinished"/>
+        <translation>EDHRec Doorbladeren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation>Archidekt Doorbladeren</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
-        <translation type="unfinished"/>
+        <translation>Replays Inzien</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
-        <translation type="unfinished"/>
+        <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
-        <translation type="unfinished"/>
+        <translation>Verbinden...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
-        <translation type="unfinished"/>
+        <translation>Verbinden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
-        <translation type="unfinished"/>
+        <translation>Spelen</translation>
     </message>
 </context>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Bekijk library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
-        <translation type="unfinished"/>
+        <translation>Bekijk &amp;bovenste kaarten van library....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
-        <translation type="unfinished"/>
+        <translation>Bekijk onderste kaarten van library...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
-        <translation type="unfinished"/>
+        <translation>Onthul &amp;library aan...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
-        <translation type="unfinished"/>
+        <translation>Leen library aan...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Onthul bovenste kaarten aan....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Bovenkant van library...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Onderkant van library...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
-        <translation type="unfinished"/>
+        <translation>Toon &amp;altijd bovenste kaart</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Altijd bovenste kaart bekijken</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Open deck in deckbewerker</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Raap kaart</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
-        <translation type="unfinished"/>
+        <translation>R&amp;aap kaarten...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Ontdoe laatste raap</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
-        <translation type="unfinished"/>
+        <translation>Schudden</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Speel bovenste kaart</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
-        <translation type="unfinished"/>
+        <translation>Speel bovenste kaart &amp;verdekt</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
-        <translation type="unfinished"/>
+        <translation>Leg bovenste kaart aan de &amp;onderkant</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
-        <translation type="unfinished"/>
+        <translation>Verplaats bovenste kaart naar grave&amp;yard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
-        <translation type="unfinished"/>
+        <translation>Verplaats bovenste kaart naar exile</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
-        <translation type="unfinished"/>
+        <translation>Verplaats bovenste kaarten naar &amp;graveyard....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation>Verplaats bovenste kaarten naar &amp;graveyard verdekt....</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
-        <translation type="unfinished"/>
+        <translation>Verplaats bovenste kaarten naar &amp;exile....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation>Verplaats bovenste kaarten naar exile verdekt....</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
-        <translation type="unfinished"/>
+        <translation>Plaats bovenste kaart op stack &amp;totdat...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
-        <translation type="unfinished"/>
+        <translation>Schud bovenste kaarten...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Raap onderste kaart</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
-        <translation type="unfinished"/>
+        <translation>R&amp;aap onderste kaarten...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Speel onderste kaart</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
-        <translation type="unfinished"/>
+        <translation>Speel onderste kaart &amp;verdekt</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
-        <translation type="unfinished"/>
+        <translation>Verplaats onderste kaart naar grave&amp;yard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
-        <translation type="unfinished"/>
+        <translation>Verplaats onderste kaart naar e&amp;xile</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
-        <translation type="unfinished"/>
+        <translation>Verplaats onderste kaarten naar &amp;graveyard....</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation>Verplaats onderste kaarten naar graveyard verdekt....</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
-        <translation type="unfinished"/>
+        <translation>Verplaats onderste kaarten naar &amp;exile...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation>Verplaats onderste kaarten naar exile verdekt...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
-        <translation type="unfinished"/>
+        <translation>Leg onderste kaart &amp;bovenop</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
-        <translation type="unfinished"/>
+        <translation>Schud onderste kaarten...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Alle spelers</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
-        <translation type="unfinished"/>
+        <translation>Onthul bovenste kaarten van library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
-        <translation type="unfinished"/>
+        <translation>Aantal kaarten: (max. %1)</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>De server heeft zijn maximale gebruikerscapaciteit bereikt, controleer later nogmaals.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>Er zijn te veel gelijktijdige verbindingen vanaf uw adres.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>Verbannen door moderator</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>Verwachte eindtijd: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>Deze verbanning duurt voor onbepaalde tijd.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>Geplande stillegging van de server.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>Ongeldige spelersnaam.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>U bent uitgelogd omdat u op een andere locatie bent ingelogd.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>Connectie verbroken</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>De server heeft uw verbinding beëindigd.
-Reden: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>De server wordt binnen een minuut opnieuw opgestart.
-Alle lopende spellen zullen verloren gaan.
-Reden voor de sluiting: %1</numerusform><numerusform>De server wordt binnen %n minuten opnieuw opgestart.
-Alle lopende spellen zullen verloren gaan.
-Reden voor de sluiting: %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>Geplande stillegging server</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>Succesvol</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>Registratie geaccepteerd.
-Logt nu in.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>Account activering geaccepteerd.
-Logt nu in.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>Aantal spelers</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>Voer het aantal spelers in.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>Speler %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>Laad replay</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>Over Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation>Versie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatrice Webpagina</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>Project Manager:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>Vroegere projectmanagers:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>Ontwikkelaars:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>Onze ontwikkelaars</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>Help ontwikkelen!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>Vertalers:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>Onze Vertalers</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>Help Vertalen!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>Steun:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>Een probleem melden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>Probleemoplossing</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>F.A.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>Time-out van de server</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>Gefaalde Login</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation>Uw client lijkt functies te missen die deze server nodig heeft voor de verbinding.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation>Om uw client bij te werken, gaat u naar &apos;Hulp -&gt; Controleer op Client Updates&apos;.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>Onjuiste gebruikersnaam of wachtwoord. Controleer uw verificatiegegevens en probeer het opnieuw.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>Er is al een actieve sessie bezig met deze gebruikersnaam.
-Gelieve die sessie eerst af te sluiten en opnieuw in te loggen.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>Je bent banned tot %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>Je bent voor onbepaalde tijd banned.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>Deze server vereist een gebruikersregistratie. Wilt u zich nu registreren?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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>Deze server vereist client ID&apos;s. Uw client slaagt er niet in een ID te genereren of u heeft een aangepaste client.
-Gelieve uw client te sluiten en te heropenen om het opnieuw te proberen.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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>Er is een interne fout opgetreden, gelieve uw client te sluiten en te heropenen alvorens het opnieuw te proberen.
-Als de fout zich blijft voordoen, controleer dan of u de laatste versie van de software gebruikt en neem indien nodig contact op met de softwareontwikkelaars.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>Account activering</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>Uw account is nog niet geactiveerd.
-U moet de activeringscode die u in de activeringsmail hebt ontvangen, invullen.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation>Server Vol</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>Onbekende aanmeldingsfout: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>
-Dit betekent meestal dat uw clientversie verouderd is en dat de server een antwoord heeft gestuurd dat uw client niet begrijpt.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>Uw gebruikersnaam moet aan deze regels voldoen:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>is %1 - %2 karakters lang</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>kan %1 kleine letters bevatten.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>NIET</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>kan %1 hoofdletters bevatten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>kan %1 numerieke tekens bevatten</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>kan de volgende leestekens bevatten: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>eerste teken kan %1 een leesteken zijn.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <source>no unacceptable language as specified by these server rules:</source>
-        <comment>note that the following lines will not be translated</comment>
-        <translation>geen onacceptabel taalgebruik als aangegeven door deze server regels:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation>mag niet een van de volgende woorden bevatten: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation>mag niet overeenkomen met een van de volgende expressies: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>U mag alleen A-Z, a-z, 0-9, _, ., en - in uw gebruikersnaam gebruiken.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>Registratie geweigerd</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>Registratie is momenteel uitgeschakeld op deze server.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>Er bestaat al een bestaand account met dezelfde gebruikersnaam.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>Het is verplicht om een geldig e-mailadres op te geven bij de registratie.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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>Het lijkt erop dat u probeert een nieuw account te registreren op deze server, maar dat u al een account hebt geregistreerd met de verstrekte e-mail. Deze server beperkt het aantal accounts dat een gebruiker per adres kan registreren. Neem contact op met de serverbeheerder voor verdere hulp of om uw gegevens te verkrijgen.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>Wachtwoord te kort.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>De registratie is mislukt wegens een technisch probleem op de server.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>Onbekende registratiefout: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>Account activering mislukt</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>Socket error: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>U probeert verbinding te maken met een verouderde server. Gelieve uw Cockatrice versie te downgraden of verbinding te maken met een geschikte server.
-Lokale versie is %1, externe versie is %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>Uw Cockatrice klant is verouderd. Gelieve uw Cockatrice versie bij te werken.
-Lokale versie is %1, externe versie is %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>Verbinding maken met %1....</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>Registreren bij %1 als %2....</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>Verbinding verbroken</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>Verbonden, inloggen bij %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>Aanvragen van vergeten wachtwoord tot %1 als %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Verbinden....</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>V&amp;erbinding verbreken</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
-        <translation>Start &amp;lokaal spel....</translation>
+        <translation>Start &amp;plaatselijk spel....</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Bekijk replay...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Volledig scherm</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Registreer bij server...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;Reset wachtwoord...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Instellingen....</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>&amp;Afsluiten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>Act&amp;ies</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>&amp;Kaartdatabase:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;Beheer sets...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Aangepaste &amp;tokens bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>Open map voor aangepaste afbeeldingen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>Open aangepaste sets map</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>Aangepaste sets/kaarten toevoegen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
-        <translation type="unfinished"/>
+        <translation>Kaartendatabase opniew laden</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
-        <translation type="unfinished"/>
+        <translation>Tabs</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>&amp;Hulp</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;Over Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Tip van de Dag</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation>Controleren op Client-updates</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation>Kijk of er kaartupdates zijn...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
-        <translation type="unfinished"/>
+        <translation>Controleren op kaartbewerkingen (Automatisch)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
-        <translation type="unfinished"/>
+        <translation>Statusbalk Weergeven</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation>Bekijk &amp;debug log</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
-        <translation type="unfinished"/>
+        <translation>Instellingsmap Openen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation>Tonen/Verbergen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation>Niewe Versie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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>Gefeliciteerd met de update naar Cockatrice %1!
 Oracle zal nu starten om uw kaartendatabase bij te werken.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice geinstalleerd</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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>Gefeliciteerd met het installeren van Cockatrice %1!
 Oracle zal nu starten om uw kaartendatabase bij te werken.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>Kaartdatabase</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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>Cockatrice kan de kaartendatabase niet laden.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>Open instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>Nieuwe sets gevonden</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
@@ -4935,17 +5477,22 @@ Set codes: %1
 Wilt u deze inschakelen?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>Bekijk sets</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>Welkom</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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>
@@ -4954,741 +5501,903 @@ Alle sets in de kaartendatabase zijn ingeschakeld.
 Lees meer over het wijzigen van de setvolgorde of het uitschakelen van specifieke sets en de daaruit voortvloeiende effecten in het &quot;Beheer sets&quot; dialoogvenster.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>Een update van de kaartendatabase is al aan de gang.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>Kan het updateprogramma van de kaartendatabase niet uitvoeren: </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
-        <translation type="unfinished"/>
+        <translation>Kaartendatabasebewerking in uitvoering.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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>Opstarten mislukt. Het bestand mist misschien, of toestemmingen zijn misschien incorrect.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
-        <translation type="unfinished"/>
+        <translation>Het proces crashte nadat deze geslaagd is opgestart.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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>Tijd verlopen. Het proces nam te lang met antwoorden. De laatste waitfor...() functie verliep.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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>Een fout heeft zich voorgedaan tijdens een poging om te schrijven naar het proces. Bijvoorbeeld, het proces is niet in uitvoering misschien, of het heeft misschien het invoerkanaal gesloten.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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>Een fout heeft zich voorgedaan tijdens een poging om te lezen van het proces. Bijvoorbeeld, het proces is niet in uitvoering misschien.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
-        <translation type="unfinished"/>
+        <translation>Een onbekende fout heeft zich voorgedaan.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>De kaartendatabasebewerker sloot af met foutmelding.
+%1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>Deze server ondersteunt extra functies die uw client niet heeft.
-Dit is waarschijnlijk geen probleem, maar dit bericht kan betekenen dat er een nieuwe versie van Cockatrice beschikbaar is of dat deze server een aangepaste of pre-release versie draait.
-
-Om uw client bij te werken, ga naar Hulp -&gt; Controleer op updates.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>Laad sets/kaarten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>Geselecteerd bestand kan niet worden gevonden.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation>U kunt op dit moment alleen XML-databases importeren.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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>De nieuwe sets/kaarten zijn succesvol toegevoegd.
 Cockatrice zal nu de kaartendatabase herladen.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>Sets/kaarten zijn niet geïmporteerd.</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
-        <translation>Reset Wachtwoord</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
+        <translation>Manabasis Configuratie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
-        <translation>Uw wachtwoord is succesvol gereset, u kunt nu inloggen met de nieuwe gegevens.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
+        <translation>Soort weergave:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>Het opnieuw instellen van het wachtwoord voor uw gebruikersaccount is mislukt, neem contact op met de serverbeheerder om uw wachtwoord opnieuw in te stellen.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
+        <translation>taart</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
-        <translation>Activeringsaanvraag ontvangen, kijk in uw e-mail voor een activeringscode.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation>balk</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation>combinatieBalk</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation>Filter Kleuren (optioneel):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
-        <translation type="unfinished"/>
+        <translation>Manabasis</translation>
+    </message>
+</context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation>Groepeer Op:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation>type</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation>kleur</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation>subtype</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation>kracht</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation>hardheid</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation>Filters (optioneel):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation>Hoofdbalk rij weergeven</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation>Rij per kategorie weergeven</translation>
     </message>
 </context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
-        <translation type="unfinished"/>
+        <translation>Manacurve</translation>
+    </message>
+</context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation>Soort weergave:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation>taart</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation>balk</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation>combinatieBalk</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation>Filter Kleuren (optioneel):</translation>
     </message>
 </context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
-        <translation type="unfinished"/>
+        <translation>Manatoewijding</translation>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation>Bovenste soort weergave:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation>taart</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation>balk</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation>Kleuren:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation>Rij per kleur weergeven</translation>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation>%1 stipjes (%2 kaarten)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation>%1 mana (%2 kaarten)</translation>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation>Manaproductie/toewijding</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation>Manadistributieinstellingen</translation>
     </message>
 </context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation>vanuit spel</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation> vanuit hun graveyard.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation> vanuit exile</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation> vanuit hun hand.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>de bovenste kaart %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation>de bovenste kaart van hun library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation> van de top van %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation> van de bovenkant van hun library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>de onderste kaart van %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation>de onderste kaart van hun library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation> van de onderkant van %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation> van de onderkant van hun library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation> van %1&apos;s library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation> van hun library</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation> van sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation> van de stack</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>vanaf aangepaste zone &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1 houdt nu de bovenste kaart %2 onthuld.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1 geeft de bovenste kaart %2 niet meer weer.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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>%1 kan nu altijd de bovenste kaart %2 bekijken.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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>%1 kan nu niet meer de bovenste kaart %2 bekijken.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1 bevestigt %2 aan %3s %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 heeft het spel opgegeven.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 is terug in het spel.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1 heeft de verbinding met het spel hersteld.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 heeft de verbinding met het spel verloren.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation>%1 wijst van hun %2 naar zichzelf.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation>%1 wijst van hun %2 naar %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation>%1 wijst van %2s %3 naar zichzelf.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation>%1 wijst van %2s %3 naar %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1 wijst van hun %2 naar hun %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1 wijst van hun %2 naar %3s %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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>%1 wijst van %2s %3 naar hun eigen %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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>%1 wijst van %2s %3 naar %4s %5.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
-        <translation type="unfinished"/>
+        <translation>%1 creëert een token verdekt.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 creëert een token: %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 heeft een deck geladen (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>%1 heeft een deck met %2 sideboard kaarten geladen (%3).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation>%1 vernietigt %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>een kaart</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1 geeft %2 controle over %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="308"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation>%1 zet %2 gesloten in het spel%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1 zet %2 in het spel%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="314"/>
+        <source>%1 puts %2%3 into their graveyard face down.</source>
+        <translation>%1 legt %2%3 in hun graveyard verdekt.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation>%1 legt %2%3 in hun graveyard.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
-        <source>%1 exiles %2%3.</source>
-        <translation>%1 exiled %2%3.</translation>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation>%1 legt %2%3 in exile verdekt.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
+        <source>%1 exiles %2%3.</source>
+        <translation>%1 legt %2%3 in exile.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation>%1 verplaatst %2%3 naar hun hand.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation>%1 legt %2%3 in hun library.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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>%1 legt %2%3 aan de onderkant van hun library.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation>%1 legt %2%3 op de bovenkant van hun library.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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>%1 plaatst %2%3 in hun library %4 kaarten vanaf de bovenkant.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 verplaatst %2%3 naar het sideboard.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation>%1 speelt %2%3 verdekt.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 speelt %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
-        <source>%1 moves %2%3 to custom zone &apos;%4&apos;.</source>
-        <translation type="unfinished"/>
+        <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>%1 verplaatst %2%3 naar aangepaste zone &apos;%4&apos; verdekt.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <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>%1 verplaatst %2%3 naar aangepaste zone &apos;%4&apos;.</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="373"/>
         <source>%1 tries to draw from an empty library</source>
         <translation>%1 probeert een kaart te nemen van een lege library</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation><numerusform>%1 trekt een kaart</numerusform><numerusform>%1 trekt %2 kaarten</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 is aan het kijken naar %2.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 kijkt naar de %4 %3 kaart %2.</numerusform><numerusform>%1 kijkt naar de %4 %3 kaarten %2.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
-        <translation type="unfinished"/>
+        <translation>onderkant</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
-        <translation type="unfinished"/>
+        <translation>bovenkant</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1 draait %2 om met de voorkant naar beneden.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1 draait %2 om met de voorkant naar boven.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>Het spel is afgesloten.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>Het spel is begonnen.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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>Je bent het spel aan het overstelpen. Wacht een paar seconden.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1 heeft zich bij het spel aangesloten.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 kijkt nu naar het spel.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>Je bent uit het spel geschopt.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 heeft het spel verlaten (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation>%1 kijkt niet meer naar het spel (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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>%1 is niet meer klaar om het spel te starten.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform>%1 schudt zijn of haar deck en raapt een nieuwe hand van %2 kaart.</numerusform><numerusform>%1 schudt zijn of haar deck en raapt een nieuwe hand van %2 kaarten.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="473"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation>%1 schudt zijn of haar deck en trekt een nieuwe hand.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation>Je kijkt naar een replay van spel #%1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1 is klaar om het spel te starten.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="510"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation>kaarten</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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><numerusform>één kaart</numerusform><numerusform>%1 kaarten</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation>%1 leent %2 aan %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1 onthult %2 naar %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1 onthult %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation>%1 onthult %2%3 aan %4 gebaseerd op willekeur.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1 onthult %2%3 gebaseerd op willekeur.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation>%1 bekijkt verdekte kaart #%2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation>%1 bekijkt verdekte kaart #%2: %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation>%1 onthult %2%3 aan %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 onthult %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="576"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation>%1 keert de beurtvolgorde om, deze is nu %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation>omgekeerd</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation>normaal</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>Kop</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>Munt</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation>%1 gooit een muntje om. Het landde %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1 rolt een %2 met een %3-zijdige dobbelsteen.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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>%1 werpt %2 munten. Er zijn %3 koppen en %4 munten.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="608"/>
         <source>%1 rolls a %2-sided dice %3 times: %4.</source>
         <translation>%1 werpt een %2-zijdige dobbelsteen %3 keer: %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>%1s beurt.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation>%1 verandert de annotatie van %2 naar %3.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <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><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <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><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation>%1 verandert teller %2 naar %3 (%4%5).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%1 zet %2 op niet tegelijk ontappen.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 zet %2 op tegelijk ontappen.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 verwijdert de stats van %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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>%1 verandert de stats van %2 van niks naar %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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>%1 verandert de stats van %2 van %3 naar %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1 heeft hun sideboard vergrendeld.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 heeft hun sideboard ontgrendeld.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 tapt alles.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 ontapt alles.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1 tapt %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1 ontapt %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 schudt %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="769"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation>%1 schudt de onderste %3 kaarten van %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="774"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation>%1 schudt de bovenste %3 kaarten van %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation>%1 schudt kaarten %3 - %4 van %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 maakt %2 los.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 legt hun laatst getrekte kaart terug.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 legt hun laats getrekte kaart terug (%2).</translation>
     </message>
@@ -5696,110 +6405,115 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation>Woord1 Woord2 Woord3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation>Bericht toevoegen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation>Bericht bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation>Bericht Verwijderen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>Bericht toevoegen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>Bericht:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation>Bericht bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>Chat instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>Aanpasbare alerteringswoorden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>Schakel chat vermeldingen in</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>Vermeldings aanvuller inschakelen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>In-game bericht macro&apos;s</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="243"/>
         <source>How to use in-game message macros</source>
         <translation>Uitleg gebruik van in-game bericht macro&apos;s</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>Chatroomberichten van niet-geregistreerde gebruikers negeren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>Privéberichten van niet-geregistreerde gebruikers negeren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>Text kleur inverteren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>Desktopmeldingen voor privéberichten inschakelen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>Desktopmelding voor vermeldingen inschakelen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>Kamerboodschapsgeschiedenis op aansluiting inschakelen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>(Kleur is hexadecimaal)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Woorden scheiden met een spatie, alleen alfanumerieke tekens</translation>
     </message>
@@ -5807,39 +6521,44 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
-        <translation type="unfinished"/>
+        <translation>Verplaats naar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <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>%bovenkant library in willekeurige volgorde</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <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>X kaarten van bovenkant library...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <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>&amp;Onderkant library in willekeurige volgorde</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation>&amp;Tafel</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Graveyard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exile</translation>
     </message>
 </context>
 <context>
@@ -5850,47 +6569,47 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
         <translation>Kaart type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation>Mana Waarde</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation>Kleur(en)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation>Loyaliteit</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation>Hoofd Kaarttype</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation>Mana Kosten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation>Kant</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
-        <translation>Lay-out</translation>
+        <translation>Indeling</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation>Color Identity</translation>
     </message>
@@ -5900,78 +6619,224 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
     <message>
         <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="24"/>
         <source>Cards to overlap:</source>
-        <translation type="unfinished"/>
+        <translation>Kaarten overlap:</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="26"/>
         <source>Overlap percentage:</source>
-        <translation type="unfinished"/>
+        <translation>Overlap percentage:</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/general/layout_containers/overlap_control_widget.cpp" line="28"/>
         <source>Overlap direction:</source>
+        <translation>Overlap richting:</translation>
+    </message>
+</context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation>Onbekende fase</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation>Untap</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation>Upkeep</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation>Rapen</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation>Eerste Hoofdfase</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation>Begin Gevecht</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation>Aanvallers Aangeven</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation>Verdedigers Aangeven</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation>Gevecht Schade</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation>Einde Gevecht</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation>Tweede Hoofdfase</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation>Einde/Opruimen</translation>
     </message>
@@ -5979,57 +6844,57 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>Untap fase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>Upkeep fase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>Draw fase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>Eerste hoofdfase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>Begin vechtfase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>Aanvallers aangeven fase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>Verdedigers aangeven fase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>Gevechtsschade fase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>Einde vechtfase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>Tweede hoofdfase</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>Einde van de beurt fase</translation>
     </message>
@@ -6037,7 +6902,7 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>en</translation>
@@ -6046,185 +6911,201 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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>graveyard</translation>
+    </message>
+    <message>
+        <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>exile</translation>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation>Speler &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Counters</translation>
+    </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation>De Drukkiezer is uitgeschakeld omdat je op het moment de instelling om alle gekozen drukken te overschrijven met persoonlijke setvoorkeuren is ingeschakeld.
+
+Deze instelling betekend dat je alleen de geprioritiseerde druk van iedere kaart zal zien in plaats van een druk te kiezen, en je zal drukken die anderen gekozen hebben niet zien.
+
+</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
-        <translation type="unfinished"/>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
+        <translation>Drukkiezer opnieuw inschakelen</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
-        <translation type="unfinished"/>
+        <translation>Navigatieknoppen weergeven</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation>Drukkiezer</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
-        <translation type="unfinished"/>
+        <translation>Voorkeur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
-        <translation type="unfinished"/>
+        <translation>Druk Vastpinnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
-        <translation type="unfinished"/>
+        <translation>Druk Lospinnen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
-        <translation type="unfinished"/>
+        <translation>Gerelateerde kaarten weergeven</translation>
     </message>
 </context>
 <context>
@@ -6232,148 +7113,156 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
     <message>
         <location filename="src/interface/widgets/printing_selector/printing_selector_card_search_widget.cpp" line="18"/>
         <source>Search by set name or set code</source>
-        <translation type="unfinished"/>
+        <translation>Zoeken op setnaam of setcode</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
-        <source>Bulk Selection</source>
-        <translation type="unfinished"/>
+        <translation>Vorige Kaart in Deck</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <source>Bulk Selection</source>
+        <translation>Massaselectie</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
-        <translation type="unfinished"/>
+        <translation>Volgende Kaart in Deck</translation>
     </message>
 </context>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
-    <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
-        <source>Alphabetical</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
-        <source>Preference</source>
-        <translation type="unfinished"/>
+        <source>Alphabetical</source>
+        <translation>Alphabetisch</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <source>Preference</source>
+        <translation>Voorkeur</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
-        <translation type="unfinished"/>
+        <translation>Datum van Uitgave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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>Omlaag</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
-        <translation type="unfinished"/>
+        <translation>Omhoog</translation>
+    </message>
+</context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation>Selekteer een kaar om diens drukken te weergeven</translation>
     </message>
 </context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
-        <translation type="unfinished"/>
+        <translation>Kracht / hardheid</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
-        <translation type="unfinished"/>
+        <translation>Ver&amp;hoog kracht</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
-        <translation type="unfinished"/>
+        <translation>Ver&amp;laag kracht</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
-        <translation type="unfinished"/>
+        <translation>Verh&amp;oog hardheid</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
-        <translation type="unfinished"/>
+        <translation>Verl&amp;aag hardheid</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
-        <translation type="unfinished"/>
+        <translation>Verhoo&amp;g kracht en hardheid</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
-        <translation type="unfinished"/>
+        <translation>Verlaa&amp;g kracht en hardheid</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
-        <translation type="unfinished"/>
+        <translation>Verhoog kracht en verlaag hardheid</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
-        <translation type="unfinished"/>
+        <translation>Verlaag kracht en verhoog hardheid</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
-        <translation type="unfinished"/>
+        <translation>Kracht en hardheid &amp;instellen...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Herstel kracht en hardheid</translation>
     </message>
 </context>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>Diensten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>Verberg %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>Verberg Anderen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>Toon Alle</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>Voorkeuren...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>Stop %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>Over %1</translation>
     </message>
@@ -6381,153 +7270,259 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Cockatrice kaartendatabase (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>Alle bestanden (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatrice replays (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>Maindeck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>Tokens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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>Bestaand Bestand Overschrijven?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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>Een .cod versie van dit deck bestaat al. Deze overschrijven?</translation>
+    </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation>Het inschakelen van deze functie zal het gebruik van de drukkiezer uitschakelen.
+
+Je zal niet meer kunnen kiezen welke druk in gebruk is voor verschillende decks, of kunnen zien welke drukken anderen hebben gekozen voor hun decks.
+
+Je zal de Setbeheerder moeten gebruiken, te vinden bij Kaartendatabase -&gt; Beheer Sets.
+
+Weet je zeker dat je deze functie wil inschakelen?</translation>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation>Het uitschakelen van deze functie zal de Drukkiezer inschakelen.
+
+Je kan nu drukken kiezen voor verschillende decks in de Deckbewerker en instellen welke druk standaard wordt toegevoegd door deze vast te pinnen in de Drukkiezer.
+
+Je ook de Setbeheerder gebruiken om de sorteervolgorde voor de drukken in de Drukkiezer aan te passen (andere soorteervolgorden zoals alphabetisch of datum van uitgave zijn beschikbaar).
+
+Weet je zeker dat je deze functie wil uitschakelen?</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation>Bevestig Wijziging</translation>
     </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation>Opslaan</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation>Alles Opslaan</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation>Ja op A&amp;lle</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation>&amp;Nee</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation>Nee op &amp;Alle</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation>Afbreken</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation>Opnieuw proberen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation>Negeren</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation>Afleggen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation>Hulp</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation>Toepassen</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation>Resetten</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation>Standaardinstellingen herstellen</translation>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>Upload tijd</translation>
     </message>
@@ -6535,32 +7530,32 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>Spelers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>Bewaar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>Tijd begonnen</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>Duur (sec)</translation>
     </message>
@@ -6568,79 +7563,87 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exile</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Bekijk exile</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Verplaats exile naar...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Bovenkant library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Onderkant library</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Hand</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Graveyard</translation>
     </message>
 </context>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>Kamers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>&amp;Deelnemen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>Kamer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>Omschrijving</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>Toestemmingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>Spelers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>Spellen</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation>&amp;Zeg</translation>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6661,7 +7664,7 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
     <message>
         <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="182"/>
         <source>Shortcut already in use by:</source>
-        <translation type="unfinished"/>
+        <translation>Sneltoets reeds in gebruik door:</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/utility/sequence_edit.cpp" line="216"/>
@@ -6677,27 +7680,27 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>Ingeschakeld</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>Set type</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>Set code</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>Lange naam</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>releasedatum</translation>
     </message>
@@ -6705,81 +7708,81 @@ Cockatrice zal nu de kaartendatabase herladen.</translation>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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>Alle standaard snelkoppelingen herstellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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>Wilt u echt alle standaard snelkoppelingen herstellen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation>Alle standaard snelkoppelingen wissen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="111"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>Wil je echt alle snelkoppelingen vrijmaken?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation>Sectie:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation>Functie:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation>Sneltoets:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation>Hoe aangepaste snelkoppelingen in te stellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation>Alle sneltoetsen wissen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
-        <translation type="unfinished"/>
+        <translation>Zoek op sneltoetsnaam</translation>
     </message>
 </context>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
-        <translation type="unfinished"/>
+        <translation>Functie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
-        <translation type="unfinished"/>
+        <translation>Sneltoets</translation>
     </message>
 </context>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Uw configuratiebestand bevatte ongeldige snelkoppelingen.
 Controleer uw snelkoppelingsinstellingen!</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>De volgende snelkoppelingen zijn op de standaardinstelling ingesteld:
@@ -6807,40 +7810,40 @@ Controleer uw snelkoppelingsinstellingen!</translation>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Bekijk sideboard</translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>&amp;Geluiden inschakelen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>Huidige geluiden thema:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>Test geluid engine van systeem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>Geluidsinstellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>Hoofdvolume</translation>
     </message>
@@ -6848,48 +7851,48 @@ Controleer uw snelkoppelingsinstellingen!</translation>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation>Spoilers seizoen is afgelopen</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>Verwijdert spoiler.xml. Gelieve Oracle te draaien</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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>Spoilers downloaden mislukt</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation>Geen internetverbinding</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation>Spoilers reeds up-to-date</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation>Geen nieuwe spoilers toegevoegd</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation>Spoilers zijn bijgewerkt!</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation>Laatste Wijziging:</translation>
     </message>
@@ -6899,7 +7902,7 @@ Controleer uw snelkoppelingsinstellingen!</translation>
     <message>
         <location filename="src/client/network/update/client/release_channel.cpp" line="104"/>
         <source>Default</source>
-        <translation type="unfinished"/>
+        <translation>Standaard</translation>
     </message>
     <message>
         <location filename="src/client/network/update/client/release_channel.cpp" line="120"/>
@@ -6912,32 +7915,162 @@ Controleer uw snelkoppelingsinstellingen!</translation>
         <translation>Ongeldig antwoord ontvangen van de release update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="177"/>
         <source>No reply received from the tag update server.</source>
         <translation>Geen antwoord ontvangen van de tag update server.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="184"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Ongeldig antwoord ontvangen van de tag update server.</translation>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
         <location filename="src/interface/widgets/tabs/tab_account.cpp" line="57"/>
         <source>Add to Buddy List</source>
-        <translation type="unfinished"/>
+        <translation>Aan Maatjeslijst toevoegen</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_account.cpp" line="67"/>
         <source>Add to Ignore List</source>
-        <translation type="unfinished"/>
+        <translation>Voeg toe aan Negeerlijst</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_account.h" line="60"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>Account</translation>
     </message>
 </context>
 <context>
@@ -6970,27 +8103,27 @@ Controleer uw snelkoppelingsinstellingen!</translation>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="134"/>
         <source>Server moderator functions</source>
-        <translation type="unfinished"/>
+        <translation>Servermoderatiefuncties</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="136"/>
         <source>Replay ID</source>
-        <translation type="unfinished"/>
+        <translation>Replay ID</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="137"/>
         <source>Grant Replay Access</source>
-        <translation type="unfinished"/>
+        <translation>Geef Toegang Replay</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="139"/>
         <source>Username to Activate</source>
-        <translation type="unfinished"/>
+        <translation>Te Activeren Gebruikersnaam</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="140"/>
         <source>Force Activate User</source>
-        <translation type="unfinished"/>
+        <translation>Forceer Activeren Gebruiker</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="142"/>
@@ -7006,12 +8139,12 @@ Controleer uw snelkoppelingsinstellingen!</translation>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
         <source>Success</source>
-        <translation type="unfinished"/>
+        <translation>Succesvol</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="208"/>
         <source>Replay access granted</source>
-        <translation type="unfinished"/>
+        <translation>Toegang replay toegekend</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
@@ -7020,89 +8153,260 @@ Controleer uw snelkoppelingsinstellingen!</translation>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
         <source>Error</source>
-        <translation type="unfinished"/>
+        <translation>Foutmelding</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="211"/>
         <source>Unable to grant replay access. Replay ID invalid</source>
-        <translation type="unfinished"/>
+        <translation>Niet mogelijk om toegang tot replay te geven. Replay ID ongeldig</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="214"/>
         <source>Unable to grant replay access. Internal error</source>
-        <translation type="unfinished"/>
+        <translation>Niet mogelijk om toegang tot replay te geven. Interne fout</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="223"/>
         <source>User successfully activated</source>
-        <translation type="unfinished"/>
+        <translation>Gebruiker succesvol geactiveerd</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="226"/>
         <source>Unable to activate user. Username invalid</source>
-        <translation type="unfinished"/>
+        <translation>Niet mogelijk om gebruiker te activeren. Gebruikersnaam ongeldig</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="229"/>
         <source>Unable to activate user. User already active</source>
-        <translation type="unfinished"/>
+        <translation>Niet mogelijk om gebruiker te activeren. Gebruiker reeds geactiveerd</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_admin.cpp" line="232"/>
         <source>Unable to activate user. Internal error</source>
+        <translation>Niet mogelijk om gebruiker te activeren. Interne fout</translation>
+    </message>
+</context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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>Afl.</translation>
+    </message>
+    <message>
+        <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>EN</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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation>Vereis ALLE gekozen kleuren</translation>
+    </message>
+    <message>
+        <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>Decknaam...</translation>
+    </message>
+    <message>
+        <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>Eigenaar...</translation>
+    </message>
+    <message>
+        <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>Pakketten</translation>
+    </message>
+    <message>
+        <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>Geavanceerde Filters</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation>Bracket:</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="262"/>
+        <source>Any</source>
+        <translation>Geen Voorkeur</translation>
+    </message>
+    <message>
+        <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>Bevat kaart...</translation>
+    </message>
+    <message>
+        <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>Commander...</translation>
+    </message>
+    <message>
+        <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>Tag...</translation>
+    </message>
+    <message>
+        <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>Deckgrootte</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation>Kaarten:</translation>
+    </message>
+    <message>
+        <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>Opl.</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation>Sorteer op:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation>Filter op:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation>Weergavensinstellingen</translation>
+    </message>
+    <message>
+        <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>Zoeken</translation>
+    </message>
+    <message>
+        <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>Formats</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation>Archidekt:</translation>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>Kaart info</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>&amp;Bekijk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
-        <source>Printing</source>
-        <translation type="unfinished"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation>Kaartendatabase</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
+        <source>Printing</source>
+        <translation>Druk</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>Zichtbaar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>Zwevend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
-        <translation>Layout resetten</translation>
+        <translation>Indeling resetten</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="82"/>
         <source>Deck: %1</source>
         <translation>Dek: %1</translation>
     </message>
@@ -7110,86 +8414,74 @@ Controleer uw snelkoppelingsinstellingen!</translation>
 <context>
     <name>TabDeckEditorVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="149"/>
+        <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>Visueel Deck: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <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>&amp;Visuele Deckbewerker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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>Kaarteninfo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Bekijk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
-        <translation type="unfinished"/>
+        <translation>Druk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
-        <translation type="unfinished"/>
+        <translation>Zichtbaar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
-        <translation type="unfinished"/>
+        <translation>Zwevend</translation>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
-        <translation type="unfinished"/>
+        <translation>Herstel indeling</translation>
     </message>
 </context>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
+        <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>Visuele Deckweergave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <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>Visuele Databaseweergave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <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>Deckanalyses</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <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>Proefhand</translation>
     </message>
 </context>
 <context>
@@ -7197,7 +8489,7 @@ Controleer uw snelkoppelingsinstellingen!</translation>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Local file system</source>
-        <translation>Lokaal bestandssysteem</translation>
+        <translation>Plaatselijk bestandssysteem</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="168"/>
@@ -7208,12 +8500,12 @@ Controleer uw snelkoppelingsinstellingen!</translation>
         <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>Open dek in editor</translation>
+        <translation>Open deck in bewerker</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Rename deck or folder</source>
-        <translation type="unfinished"/>
+        <translation>Hernoem deck of map</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
@@ -7228,10 +8520,10 @@ Controleer uw snelkoppelingsinstellingen!</translation>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Nieuwe folder</translation>
+        <translation>Nieuwe map</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="177"/>
@@ -7242,111 +8534,111 @@ Controleer uw snelkoppelingsinstellingen!</translation>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="179"/>
         <source>Open decks folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
-        <source>Rename local folder</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
-        <source>Rename local file</source>
-        <translation type="unfinished"/>
+        <translation>Deckmap openen</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
-        <source>New name:</source>
-        <translation type="unfinished"/>
+        <source>Rename local folder</source>
+        <translation>Hernoem plaatselijke map</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <source>Rename local file</source>
+        <translation>Hernoem plaatselijk bestand</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
+        <source>New name:</source>
+        <translation>Nieuwe naam:</translation>
+    </message>
+    <message>
+        <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>Foutmelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
-        <translation type="unfinished"/>
+        <translation>Hernoemen mislukt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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>Ongeldig deck bestand</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>Geeft dek naam in</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>De deklijst heeft geen naam. Geef een naam in aub.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>Onbenoemd dek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation>Uploaded van deck naar server mislukt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
-        <translation>Verwijder lokaal bestand</translation>
+        <translation>Verwijder plaatselijk bestand</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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>Weet je zeker dat je de opgeslagen bestanden wil verwijderen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
-        <translation type="unfinished"/>
+        <translation>Verwijder deck van server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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>Weet je zeker dat je de geselekteerde decks wil verwijderen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Naam van de folder:</translation>
+        <translation>Naam van de map:</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_deck_storage.h" line="87"/>
         <source>Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>Deckopslag</translation>
     </message>
 </context>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <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>Visuele Deckopslag</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
-        <translation type="unfinished"/>
+        <translation>Foutmelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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>Kon deck op %1 niet openen</translation>
     </message>
 </context>
 <context>
@@ -7354,7 +8646,7 @@ Please enter a name:</source>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec.h" line="26"/>
         <source>EDHREC: </source>
-        <translation type="unfinished"/>
+        <translation>EDHREC:</translation>
     </message>
 </context>
 <context>
@@ -7362,228 +8654,222 @@ Please enter a name:</source>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="130"/>
         <source>&amp;Cards</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Kaarten</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="131"/>
         <source>Top Commanders</source>
-        <translation type="unfinished"/>
+        <translation>Top Commanders</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="132"/>
         <source>Tags</source>
-        <translation type="unfinished"/>
+        <translation>Tags</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="133"/>
         <source>Search for a card ...</source>
-        <translation type="unfinished"/>
+        <translation>Zoeken op kaart...</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp" line="134"/>
         <source>Search</source>
-        <translation type="unfinished"/>
+        <translation>Zoeken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
-        <translation type="unfinished"/>
+        <translation>EDHRec:</translation>
     </message>
 </context>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>Replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>Spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>Spelerslijst</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>Kaartinfo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>Berichten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>Replay Tijdslijn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>Fases</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>Spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>Volgende fase</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation>Volgende fase met &amp;handeling</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>Volgende beurt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation>Keer beurtvolgorde om</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
-        <translation>Verwijder alle lokale pijlen</translation>
+        <translation>Verwijder alle plaatselijke pijlen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>Draai de weergave met de klok &amp;mee</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>Draai de weergave &amp;tegen de klok in</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>Spelgegevens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
-        <translation type="unfinished"/>
+        <translation>Opgeven &amp;terugdraaien</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>&amp;Geef op</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>Verlaat spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>Sluit opgeslagen spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;Focus Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>Zeg:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
-        <translation type="unfinished"/>
+        <translation>Geselecteerde kaarten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>&amp;Bekijk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>Zichtbaar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>Zwevend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
-        <translation>Reset lay-out</translation>
+        <translation>Reset indeling</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>Opgeven</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>Ben je zeker dat je wilt opgeven voor dit spel?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation>Opgeven ongedaan maken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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>Je hebt al opgegeven. Wil je nar dit spel terugkeren?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>Verlaat spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>Ben je zeker dat je dit spel wilt verlaten?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation>Een speler sluitte aan bij spel #%1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation>%1 sluitte bij het spel aan</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>Je bent uit het spel gegooid.</translation>
     </message>
@@ -7591,166 +8877,166 @@ Please enter a name:</source>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
-        <translation type="unfinished"/>
+        <translation>Thuis</translation>
     </message>
 </context>
 <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>Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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>Tijd;Afzendernaam;AfzenderIP; Bericht;DoelID;DoelNaam</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation>Kamerlogboeken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>Spellogboeken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>Chat Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>U moet ten minste één filter selecteren.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>U moet een geldig aantal dagen selecteren om te zoeken.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>Gebruikersnaam: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>IP-adres: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>Spelnaam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>GameID: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>Boodschap: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>Hoofdkamer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>Spelkamer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>Privéchat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>Afgelopen X dagen: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>Vandaag</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>Afgelopen uur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation>Maximale resultaten: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>Er is minstens één filter nodig.
 Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation>Gebruikerslogboeken ontvangen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation>Wis filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>Filters</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation>Loglokaties</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation>Datumbereik</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation>Maximale resultaten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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>Bericht Geschiedenis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation>Het is mislukt om informatie over de berichtgeschiedenis te verzamelen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Er zijn geen berichten voor de geselecteerde filters.</translation>
     </message>
@@ -7768,27 +9054,27 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</tra
         <translation>Verlaat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Privaat gesprek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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>Deze gebruiker negeert u, ze kunnen uw berichten niet zien in de hoofdchat en u kunt niet deelnemen aan hun spelletjes.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation>Privé bericht van</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1 heeft zich afgemeld van de server.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1 heeft zich aangemeld op de server</translation>
     </message>
@@ -7796,233 +9082,249 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</tra
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
-        <translation>Lokaal bestandssysteem</translation>
+        <translation>Plaatselijk bestandssysteem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>Opslag gespeelde spellen op server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>Bekijk opgeslagen spel</translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
-        <source>Rename</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
-        <source>New folder</source>
-        <translation type="unfinished"/>
+        <source>Rename</source>
+        <translation>Hernoemen</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
+        <source>New folder</source>
+        <translation>Nieuwe map</translation>
+    </message>
+    <message>
+        <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>Verwijder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
-        <translation type="unfinished"/>
+        <translation>Open replays map</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>Download opgeslagen spel.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>Schakel expiratieslot om</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
-        <translation type="unfinished"/>
+        <translation>Ontvang replay-deelcode</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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>Replay opzoeken met replay-deelcode</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
-        <translation type="unfinished"/>
+        <translation>Hernoem plaatselijke map</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
-        <translation type="unfinished"/>
+        <translation>Hernoem plaatselijk bestand</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
-        <translation type="unfinished"/>
+        <translation>Nieuwe naam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
-        <translation type="unfinished"/>
+        <translation>Foutmelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
-        <translation type="unfinished"/>
+        <translation>Hernoemen mislukt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
-        <translation type="unfinished"/>
+        <translation>Naam van nieuwe map:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
-        <translation>Verwijder lokaal opgeslagen spel</translation>
+        <translation>Verwijder plaatselijk bestand</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <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>Weet je zeker dat je de geselecteerde bestanden wil verwijderen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
-        <source>Failed to get code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
-        <source>Either this server does not support replay sharing, or does not permit replay sharing for you.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
-        <source>Failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <source>Could not get replay code</source>
-        <translation type="unfinished"/>
+        <translation>Weet je zeker dat je de geselecteerde replays wil verwijderen?</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
-        <source>Replay Share Code</source>
-        <translation type="unfinished"/>
+        <source>Failed to get code</source>
+        <translation>Ontvangen code mislukt</translation>
     </message>
     <message>
         <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>Deze server ondersteund het delen van replays niet of deze staat het niet toe aan jou.</translation>
+    </message>
+    <message>
+        <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>Mislukt</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
+        <source>Could not get replay code</source>
+        <translation>Ontvangen replay-code niet gelukt</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
+        <source>Replay Share Code</source>
+        <translation>Replay-deelcode</translation>
+    </message>
+    <message>
+        <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>Anderen kunnen deze code gebruiken om de replay aan hun lijst van serverreplays toe te voegen:
+%1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Kopieer naar klembord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
-        <translation type="unfinished"/>
+        <translation>Replay-deelcode</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
-        <translation type="unfinished"/>
+        <translation>Replay-code gevonden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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>Replay toegevoegd, of je had misschien al toegang tot deze.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
-        <translation type="unfinished"/>
+        <translation>Replay-code niet gevonden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
-        <translation type="unfinished"/>
+        <translation>Versturen code mislukt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
-        <translation type="unfinished"/>
+        <translation>Onverwachte foutmelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>Verwijder op server opgeslagen spel</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_replays.h" line="89"/>
         <source>Game Replays</source>
-        <translation type="unfinished"/>
+        <translation>Spel-replays</translation>
     </message>
 </context>
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>Zeg:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>Gesprek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>Kamer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>Verlaat kamer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>Maak gespreksgeschiedenis leeg</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>Gespreksinstellingen...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation> heeft je genoemd.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
-        <translation>Click om weer te geven</translation>
+        <translation>Klik om weer te geven</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>Je bent de chat aan het overstelpen. Wacht enkele seconden a.u.b.</translation>
     </message>
@@ -8035,30 +9337,30 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</tra
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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>Aansluiten bij kamer mislukt: deze bestaat niet op de server.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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>De server denkt dat je in de kamer bent, maar de client is niet in staat om deze te tonen. Probeer de client opnieuw te starten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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>U heeft niet de vereiste toestemming om bij deze kamer aan te sluiten.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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>Mislukt om bij de kamer aan te sluiten door een onbekende fout: %1.</translation>
     </message>
@@ -8066,92 +9368,97 @@ Hoe meer informatie je inbrengt, hoe specifieker je resultaten zullen zijn.</tra
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>Deckbewerker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>Visuele Deckbewerker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
-        <translation type="unfinished"/>
+        <translation>EDHRec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation>Archidekt</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
-        <translation type="unfinished"/>
+        <translation>Thuis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Visuele Deckopslag</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
-        <translation type="unfinished"/>
+        <translation>Visuele Databaseweergave</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
-        <translation type="unfinished"/>
+        <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>Account</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
-        <translation type="unfinished"/>
+        <translation>Deckopslag</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
-        <translation type="unfinished"/>
+        <translation>Spel-replays</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
-        <translation type="unfinished"/>
+        <translation>Beheer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
-        <translation type="unfinished"/>
+        <translation>Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>Weet je het zeker?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>Er staan nog spellen open. Ben je zeker dat je wilt afsluiten?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation>Klik om weer te geven</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Je maatje %1 heeft in gelogd!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation>Onbekend Event</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8162,39 +9469,39 @@ Dit bericht kan betekenen dat er een nieuwe versie van Cockatrice beschikbaar is
 Om uw client bij te werken, ga naar Hulp -&gt; Controleer op updates. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation>Inactiviteit Time-out</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>U staat op het punt uitgelogd te worden wegens inactiviteit.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>Promotie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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>Je bent bevorderd. Gelieve uit te loggen en weer in te loggen om de wijzigingen in werking te laten treden.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>Gewaarschuwd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>U heeft een waarschuwing ontvangen wegens %1.
 Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties tegen u worden ondernomen. Als u vragen heeft, kunt u een privé-bericht sturen naar een moderator.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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>U heeft het volgende bericht van de server ontvangen.
@@ -8203,10 +9510,15 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation>Databaseweergave</translation>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
-        <translation type="unfinished"/>
+        <translation>Visuele Databaseweergave</translation>
     </message>
 </context>
 <context>
@@ -8243,42 +9555,42 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Leven</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Wit</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Blauw</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Zwart</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Rood</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Groen</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Kleurloos</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Overig</translation>
     </message>
@@ -8286,151 +9598,209 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation>Kon het bestand niet openen om te lezen.</translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>Gebruikersdetails</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>Privaat gesprek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Toon spellen van deze gebruiker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
-        <translation>Voeg toe aan vriendenlijst</translation>
+        <translation>Voeg toe aan maatjeslijst</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
-        <translation>Verwijder uit vriendenlijst</translation>
+        <translation>Verwijder uit maatjeslijst</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>Voeg toe aan negatielijst</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Verwijder uit negatielijst</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>Gooi uit spel</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="67"/>
         <source>Warn user</source>
         <translation>Waarschuw gebruiker</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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Bekijk waarschuwings&amp;geschiedenis van gebruiker</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="69"/>
         <source>Ban from &amp;server</source>
         <translation>Verban van de &amp;server</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Bekijk &amp;bangeschiedenis van gebruiker</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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Bevorder gebruiker tot moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>Demoteer gebruiker van moderator</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation>Bevorder gebruiker tot &amp;judge</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="74"/>
         <source>Demote user from judge</source>
         <translation>Demoteer gebruiker van judge</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="75"/>
         <source>View admin notes</source>
-        <translation type="unfinished"/>
+        <translation>Bekijk adminnotities</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
-        <translation type="unfinished"/>
+        <translation>Foutmelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
-        <translation type="unfinished"/>
+        <translation>Deze gebruiker bestaat niet.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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>Je wordt genegeerd door %1 en je kan diens spellen niet zien.</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="91"/>
         <source>Could not get %1&apos;s games.</source>
-        <translation type="unfinished"/>
+        <translation>Kon %1&apos;s spellen niet ophalen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>%1&apos;s spellen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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>Ban Geschiedenis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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>Ban Tijd;Moderator;Ban Lengte; Ban Reden; Zichtbare Reden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation>De gebruiker is nog nooit gebant.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation>Mislukt in het verzamelen van gegevens over ban.</translation>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation>Waarschuwingsgeschiedenis</translation>
     </message>
@@ -8445,55 +9815,65 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
         <translation>De gebruiker is nog nooit gewaarschuwd.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation>Mislukt in het verzamelen van gegevens over waarschuwing.</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="249"/>
         <source>Failed to get admin notes.</source>
-        <translation type="unfinished"/>
+        <translation>Ontvangen adminnotities mislukt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>Succesvol</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>Succesvolle promotie van gebruiker.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>Succesvolle demotie van gebruiker.</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Mislukt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>Mislukt in het bevorderen van gebruiker.</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>De gebruiker is niet gedemoteerd.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation>Kopieer hash naar klembord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Verwijder de berichten van deze gebruiker</translation>
     </message>
@@ -8501,311 +9881,554 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>Locatie:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>Leeftijd lidmaatschap</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>Bewerken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>Verander wachtwoord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>Verander Icoon</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>Administrator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>Moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>Geregistreerde gebruiker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>Ongeregistreerde gebruiker</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>Judge</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="371"/>
         <source>The entered password does not match your account.</source>
         <translation>Het opgegeven wachtwoord komt niet overeen met jouw account.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>Gegevens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>Gebruikersgegevens bijgewerkt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation>Gebruikersgegevens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation>Echte Naam:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation>Gebruikersniveau:</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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><numerusform>%n jaar, </numerusform><numerusform>%n jaar, </numerusform></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="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><numerusform>%10%n dag %20</numerusform><numerusform>%10%n Dagen %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation>Wachtwoord Invoeren</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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>Wachtwoord controle is vereist om je e-mailadres te veranderen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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>Er is een fout opgetreden bij het bijwerken van uw gebruikersgegevens.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>Deze server staat jou niet toe om je gebruikersgegevens bij te werken.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>Wachtwoord gewijzigd.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>Deze server staat u niet toe uw wachtwoord te wijzigen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>Het nieuwe wachtwoord is te kort.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>Het oude wachtwoord is onjuist.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>Avatar bijgewerkt.</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Deze server laat je niet toe om je avatar bij te werken.</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>Er is een fout opgetreden bij het updaten van uw avatar.</translation>
+        <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>Deze server staat jou niet toe om je gebruikersgegevens bij te werken.</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>Algemene weergave-instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>Dubbel-klik op kaarten om ze te spelen (in plaats van enkele klik)</translation>
+        <translation>Dubbelklik op kaarten om ze te spelen (in plaats van enkele klik)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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>&amp;Klikken speelt alle geselecteerde kaarten (in plaats van allen de geklikte kaart)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>Speel standaard alle niet-landen op de stapel (niet op het slagveld)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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>Verwijder &amp;pijlen niet binnen subphases</translation>
+    </message>
+    <message>
+        <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>Sluit kaartenweergavevenster wanner laatste kaart verwijderd is</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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>Focus zoekbalk onmiddelijk wanneer kaartenweergavevenster is geopent</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>Maak aantekeningen bij de kaarttekst op tokens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Gebruik tear-off menus, laat rechtermuisknopmenu&apos;s op het scherm staan</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation>Notificatie instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>Activeer meldingen in de taakbalk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>Meld spelgebeurtenissen in de taakbalk terwijl je toekijkt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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>Notificatie in de taakbalk wanneer gebruikers in je buddy lijst verbinding maken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>Animatie-instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;Tap/Untap animatie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
-        <translation type="unfinished"/>
+        <translation>Deckbewerker/opslag instellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <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>Deck standaard in niewe tab openen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <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>Visuele deckopslag gebruiken in spelontvangstscherm</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <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>Gebruik selectieanimatie voor Visuele Deckopslag</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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>Wanner een tag aan een .txt deck wordt toegevoegd in de visuele deckopslag:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
-        <translation type="unfinished"/>
+        <translation>niks doen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <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>vragen om naar .cod om te zetten</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
-        <translation type="unfinished"/>
+        <translation>altijd omzetten naar .cod</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
-        <translation type="unfinished"/>
+        <translation>Standaard deckbewerker soort</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>Klassieke Deckbewerker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
-        <translation type="unfinished"/>
+        <translation>Visuele Deckbewerker</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
-        <translation type="unfinished"/>
+        <translation>Replayinstellingen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <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"/>
     </message>
@@ -8813,22 +10436,22 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
@@ -8836,124 +10459,256 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8961,7 +10716,7 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDatabaseDisplayRecentSetFilterSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
+        <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"/>
     </message>
@@ -8969,19 +10724,19 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDatabaseDisplaySetFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
@@ -8989,27 +10744,37 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9017,50 +10782,93 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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>Klik en sleep om de sorteervolgorde binnen de groepen aan te passen</translation>
+    </message>
+    <message>
+        <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"/>
+    </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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -9068,46 +10876,25 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -9115,47 +10902,52 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDeckStorageQuickSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9163,7 +10955,7 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
+        <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"/>
     </message>
@@ -9171,22 +10963,22 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -9194,17 +10986,17 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9212,43 +11004,43 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>Welke waarschuwing wilt u sturen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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>Verwijder alle berichten van deze gebruiker in alle kamers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>Waarschuw gebruiker voor wangedrag</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>Fout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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>Gebruikersnaam om een waarschuwing naar te sturen kan niet leeg zijn, geef een gebruiker op om te waarschuwen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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>Te gebruiken waarschuwing kan niet leeg zijn, selecteer een geldige waarschuwing om te verzenden.</translation>
     </message>
@@ -9256,133 +11048,133 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <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>Verplaats de geselecteerde set naar boven</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>Verplaats de geselecteerde set naar boven</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>Verplaats de geselecteerde set naar beneden</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>Verplaats de geselecteerde set naar beneden</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation>Zoeken op setnaam, -code of -type</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="70"/>
         <source>Default order</source>
         <translation>Standaard volgorde</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>Herstel oorspronkelijke volgorde prioriteit afbeeldingen</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="107"/>
         <source>Enable all sets</source>
         <translation>Alle sets inschakelen</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="108"/>
         <source>Disable all sets</source>
         <translation>Alle sets uitschakelen</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="109"/>
         <source>Enable selected set(s)</source>
         <translation>Geselecteerde set(s) inschakelen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation>Geselecteerde set(s) uitschakelen</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="126"/>
         <source>Deck Editor</source>
-        <translation>Deck Editor</translation>
+        <translation>Deckbewerker</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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation>Gebruik CTRL+A om alle sets in de lijst te selecteren.</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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
-        <translation>Alleen kaarten in de ingeschakelde sets zullen verschijnen in de kaartlijst van de deck editor.</translation>
+        <translation>Alleen kaarten in de ingeschakelde sets zullen verschijnen in de kaartlijst van de deckbewerker.</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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation>De prioriteit voor afbeeldingen wordt in de volgende volgorde vastgesteld:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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>eerst de CUSTOM Map (%1), daarna de Ingeschakelde Sets in deze dialoog (Boven naar Beneden)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Card Art</source>
         <translation>Afbeelding</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation>Hoe aangepaste kaart afbeeldingen te gebruiken</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation>Tips</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation>Opmerking</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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation>Sorteren op kolom stelt u in staat om een set te vinden zonder de ingestelde prioriteit te wijzigen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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>Om de orderen weer mogelijk te maken, klikt u op de kop van de kolom totdat dit bericht verdwijnt.</translation>
+        <translation>Om rangschikken weer mogelijk te maken, klik op de kop van de kolom totdat dit bericht verdwijnt.</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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation>Gebruik de huidige sortering als de ingestelde prioriteit</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
         <source>Sorts the set priority using the same column</source>
         <translation>Sorteert de prioriteit van sets met behulp van dezelfde kolom</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation>Beheer sets</translation>
     </message>
@@ -9390,72 +11182,72 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>Schudden bij afsluiten</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>Stapelweergave</translation>
     </message>
@@ -9463,7 +11255,7 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>Nederlands (Dutch)</translation>
     </message>
@@ -9471,12 +11263,12 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation>Verbinding maken bij het opstarten</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation>Debug naar bestand</translation>
     </message>
@@ -9484,1005 +11276,1078 @@ Gelieve af te zien van deelname aan deze activiteit of er kunnen verdere acties
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>Hoofdscherm</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
-        <translation>Deck Editor</translation>
+        <translation>Deckbewerker</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>Spel Lobby</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation>Kaart-counters</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation>Tellers</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>Kracht en Hardheid</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>Spelfasen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>Speelruimte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation>Verplaats Geselecteerde Kaart</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>View</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation>Verplaats Bovenste Kaart</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation>Verplaats Onderste Kaart</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>Spelverloop</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation>Kaarten Trekken</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation>Chatkamer</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation>Spel Venster</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation>Laad Deck van Klembord</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation>Replays</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation>Controleren op Kaart Updates...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation>Verbinden...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>De verbinding verbreken</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>Verlaten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>Volledig scherm</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation>Registreer...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation>Instellingen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
-        <translation>Start een Lokaal Spel...</translation>
+        <translation>Start een Plaatselijk Spel...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation>Bekijk Replay...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation>Wis Alle Filters</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation>Wis Geselecteerde Filter</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation>Verwijder Kaart</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation>Beheer Sets...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation>Aangepaste Tokens Bewerken...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation>Voeg Kaart Toe</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation>Deck Inladen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Deck Inladen van Klembord...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation>Nieuw Deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Open Custom Afbeeldingen Map</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation>Print Deck...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation>Verwijder Kaart</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
-        <translation>Reset Lay-out</translation>
+        <translation>Reset Indeling</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation>Bewaar Deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation>Bewaar Deck Als...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Bewaar Deck op Klembord, Geannoteerd</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation>Bewaar Deck op Klembord</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
-        <translation>Lokaal Deck Inladen...</translation>
+        <translation>Plaatselijk Deck Inladen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation>Remote Deck Inladen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation>Gereed om te Beginnen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Sideboard Vergrendeling Omschakelen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation>Groene Counters Omhoog</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation>Groene Counters Omlaag</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation>Groene Tellers Instellen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation>Rode Counters Omhoog</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation>Rode Counters Omlaag</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation>Rode Counters Instellen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation>Levensteller Omhoog</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation>Levensteller Omlaag</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation>Levensteller Instellen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation>Witte Teller Omhoog</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation>Witte Teller Omlaag</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation>Witte Teller Instellen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation>Blauwe Teller Omhoog</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation>Blauwe Teller Omlaag</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation>Blauwe Teller Instellen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation>Zwarte Teller Omhoog</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation>Zwarte Teller Omlaag</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation>Zwarte Teller Instellen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation>Kleurloze Teller Omhoog</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation>Kleurloze Teller Omlaag</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation>Kleurloze Teller Instellen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation>Overige Teller Omhoog</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation>Overige Teller Omlaag</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation>Overige Teller Instellen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation>Kracht Verhogen (+1/+0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Kracht Verlagen (-1/-0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Verplaats Hardheid Naar Kracht (+1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Hardheid Verhogen (+0/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Hardheid Verlagen (-0/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Verplaats Kracht Naar Hardheid (-1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Kracht en Hardheid Verhogen (+1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Kracht en Hardheid Verlagen (-1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation>Kracht en Hardheid Instellen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation>Kracht en Hardheid Resetten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>Ontap</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>Upkeep</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>Trek</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation>Eerste Hoofdfase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation>Start Gevechtfase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>Aanval</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>Blokkeren</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>Schade</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation>Einde Gevechtfase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation>Tweede Hoofdfase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>Einde</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation>Volgende Fase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation>Volgende Fase Handeling</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation>Volgende Beurt</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation>Tap / Ontap Kaart</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation>Untap Alles</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
-        <translation>Untap Omschakelen</translation>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation>Draai Kaart Om</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation>Bekijk Kaart</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation>Speel Kaart</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation>Kaart Bevestigen Aan...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation>Kaart Losmaken</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation>Copieer Kaart</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation>Maak Token...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation>Maak Alle Gerelateerde Tokens</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation>Maak Nog een Token</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation>Zet Annotatie...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation>Onderkant van Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>Exile</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>Graveyard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>Hand</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation>Bovenkant van Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation>Speelveld, Gesloten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation>Speelveld</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation>Bovenste Kaarten van Library</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation>Recent Overzicht Sluiten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation>Stack</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation>Graveyard (Meerdere)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation>Exile (Meerdere)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation>Stack Totdat Gevonden</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation>Trek Onderste Kaart</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Trek Meerdere Kaarten van Onderkant...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation>Trek Pijl...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
-        <translation>Verwijder Lokale Pijlen</translation>
+        <translation>Verwijder Plaatselijke Pijlen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation>Verlaat Spel</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>Opgeven</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation>Werp Dobbelstenen...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation>Library Schudden</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation>Trek een Kaart</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation>Trek Meerdere Kaarten...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation>Kaart Trekken Ongedaan Maken</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation>Altijd Bovenste Kaart Onthullen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation>Altijd Bovenste Kaart Bekijken</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation>Draai Weergave Met de Klok Mee</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Draai Weergave Tegen de Klok In</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation>Textvak Verlaten</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation>Focus Naar Chat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation>Wis Chat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation>Verversen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation>Start/Stop</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation>Versnelling Schakelen</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_pl.ts b/cockatrice/translations/cockatrice_pl.ts
index 35ded5e99..29b7b3896 100644
--- a/cockatrice/translations/cockatrice_pl.ts
+++ b/cockatrice/translations/cockatrice_pl.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Ustaw znacznik…</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>Ustaw znacznik</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Nowa wartość dla znacznika &apos;%1&apos;</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,79 +36,81 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation>Aktualności</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation>Notatki Administracyjne dla %1</translation>
     </message>
@@ -116,202 +118,253 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation>Mainboard</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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>Nie można stworzyć folderu motywów w &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>Ustawienia motywu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>Obecny motyw:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation>Otwórz folder motywów</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation>Ustawienia menu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="415"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>Pokazuj skróty klawiszowe w menu kontekstowym</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>Rendering kart</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>Wyświetl nazwy kart na kartach z obrazkami</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>Automatycznie obracaj karty horyzontalne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Podbijaj dodatki z których karty są w talii.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>Skaluj karty po najechaniu kursorem myszy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Minimalny procent zachodzenia kart na siebie na stosie oraz w ręce pionowej</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="434"/>
         <source>Maximum initial height for card view window:</source>
         <translation>Maksymalna podstawowa wysokość okna podglądu karty</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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>rzędy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>Układ ręki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Wyświetl karty na ręce poziomo (marnuje miejsce)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>Wyrównuj karty do lewej strony pola</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>Układ stołu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>Odwróć współrzędne pionowe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Minimalna liczba graczy dla widoku wielokolumnowego</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maksymalny rozmiar czcionki dla informacji wyświetlanych na kartach</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -333,112 +386,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>zbanuj nazwę &amp;użytkownika</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>zbanuj adres &amp;IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>ID zablokowanego konta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>Rodzaj bana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>ban &amp;permanentny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>ban &amp;tymczasowy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>&amp;Dni:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Godziny:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minuty:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>Czas trwania bana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>Podaj przyczynę bana.
 Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowanej osoby.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>Podaj przyczynę bana do wglądu dla banowanej osoby.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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>Redaguj wiadomości od tego użytkownika we wszystkich pokojach</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>Zbanuj użytkownika z serwera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>Aby ustawić bana, musisz wybrać nazwę, IP, ID klienta lub dowolną kombinację tej trójki.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>Pole imienia musi być wypełnione dla opcji ban imienia.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>Pole ip musi być wypełnione dla opcji ban ip.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>Pole id klienta musi być wypełnione dla opcji ban id klienta.</translation>
     </message>
@@ -446,152 +499,221 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation>Brak odpowiedzi z serwera uaktualnień wersji.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Nieprawidłowa odpowiedź serwera uaktualnień wersji.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation>Brak odpowiedzi z serwera uaktualnień plików.</translation>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>Dodatki</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>Koszt many</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>Typ karty</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>S/W</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>Kolor(y)</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>ORAZ</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>LUB</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>ORAZ NIE</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>LUB NIE</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Imię</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>Kolor</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation>Ustaw</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>Koszt Many</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation>Wartość Many</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>Rzadkość</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>Siła</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>Wytrzymałość</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>Lojalność</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -599,22 +721,22 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <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>Ilustracja</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>Opis</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>Karta + opis</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"/>
     </message>
@@ -622,22 +744,22 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -650,12 +772,22 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
         <translation>Nazwa:</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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation>Powiązane karty:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation>Nieznana karta:</translation>
     </message>
@@ -663,132 +795,150 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation>Rozmiar Karty</translation>
     </message>
@@ -796,133 +946,133 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -931,7 +1081,7 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -939,29 +1089,470 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -969,47 +1560,17 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <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"/>
     </message>
@@ -1017,87 +1578,97 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <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"/>
     </message>
@@ -1123,114 +1694,114 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </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="162"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </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="166"/>
+        <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"/>
     </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="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </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="168"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="172"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </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="174"/>
         <source>Load deck from online service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1238,7 +1809,7 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1246,194 +1817,171 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>Uaktualnij Spoilery</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>Sukces</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation>Pobrane URL zostały zresetowane.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>Pobrane obrazy kart zostały zresetowane</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>Błąd</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation>Jedno lub więcej pobranych ilustracji kart nie mogło zostać wyczyszczonych.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>Dodaj URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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>Edytuj URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation>Rozmiar sieciowej pamięci podręcznej:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation>TTL przekierowania w pamięci podręcznej: </translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation>Jak długo zapisane przekierowania są ważne.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation>Rozmiar Pamięci Podręcznej dla Obrazków:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation>Dodaj Nowy URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation>Usuń URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation>Dni</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>Trwa aktualizacja...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>Wybierz ścieżkę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation>Priorytet Pobierania URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>Spoilery</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>Pobierz spoilery automatycznie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation>Lokalizacja spoilera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>Ostatnia zmiana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>Spoilery są pobierane automatycznie w czasie premiery.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>Wciśnij przycisk żeby ręcznie uaktualnić bez restartu.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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>Nie zamykaj ustawień dopóki aktualizacja manualna się nie skończy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation>Pobierz ilustracje kart w locie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation>Jak dodać niestandardowe URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>Usuń Pobrane Ilustracje</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation>Resetuj Pobieranie URLi</translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
-        <translation>Pamięć podręczna na dysku dla pobranych obrazków</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
-        <translation>Pamięć podręczna w pamięci fizycznej dla obrazków które nie są na ekranie</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation>Ilość</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation>Dodatek</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>Ilość</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation>Provider ID</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>Karta</translation>
     </message>
@@ -1441,12 +1989,12 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1454,17 +2002,17 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -1472,7 +2020,7 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <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"/>
     </message>
@@ -1480,62 +2028,62 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <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"/>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </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="104"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </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="105"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </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="106"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </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="107"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <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"/>
     </message>
@@ -1543,98 +2091,156 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1652,74 +2258,74 @@ Informacja ta zachowywana jest dla moderatorów i nie jest widoczna dla zbanowan
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>Wczytaj talię...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Wczytaj zdalną talię...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>Gotowe do rozpoczęcia</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation>Wymuś rozpoczęcie</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation>Biblioteka poboczna odblokowana</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation>Biblioteka poboczna zablokowana</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>Błąd</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>Wybrany plik nie mógł zostać wczytany.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1752,143 +2358,143 @@ This will kick all non-ready players from the game.</source>
         <translation>Pobieranie...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>Znane Hosty</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation>Usuń zaznaczony zapisany serwer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Odśwież listę serwerów ze znanymi serwerami publicznymi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>Nowy Host</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nazwa gracza:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>H&amp;asło:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>Zapi&amp;sz hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>Połącz a&amp;utomatycznie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Automatycznie połącz ostatnim loginem przy otwarciu Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>Jeżeli masz problem z połączeniem lub rejestracją, skontaktuj się z obsługą serwera!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>Strona internetowa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation>Zresetuj hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation>Zapomniałeś hasła?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>&amp;Połącz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>Serwer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation>Kontakt z Serwerem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>Połącz z Serwerem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation>Serwer URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation>Port Komunikacyjny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation>Unikalna Nazwa Serwera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>Ostrzeżenie o połączeniu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>Musisz nazwać swój nowy profil połączenia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>Ostrzeżenie połączenia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Nazwa użytkownika nie może być pusta</translation>
     </message>
@@ -1896,117 +2502,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>Zapa&amp;miętaj ustawienia</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>&amp;Opis:</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>&amp;Liczba graczy:</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>Ogólne</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>Format</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>&amp;Hasło:</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>Tylko dla zn&amp;ajomych</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>Tylko dla &amp;zarejestrowanych użytkowników</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>Ograniczenia dostępu</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>&amp;Widzowie dozwoleni</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>Widzowie muszą z&amp;nać hasło</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>Widzowie mogą korzystać z &amp;czatu</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>Widzowie mogą oglądać &amp;ręce</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>Stwórz grę jako widz</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>Widzowie</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>Początkowa ilość życia:</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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation>Opcje tworzenia gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>&amp;Wyczyść</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>Stwórz grę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>Informacje o grze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>Błąd serwera.</translation>
     </message>
@@ -2014,97 +2625,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nazwa:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Token</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Kolor:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>biały</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>niebieski</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>czarny</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>czerwony</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>zielony</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>wielokolorowy</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>bezkolorowy</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;S/W:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Adnotacja:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Zniszcz tokena kiedy opuści stół</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Dane tokena</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Pok&amp;azuj wszystkie tokeny</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Pokazuj tokeny z tej &amp;talii</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>Wybierz token z listy:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>Tworzenie tokena</translation>
     </message>
@@ -2112,53 +2723,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2166,40 +2777,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>Nie wybrano obrazu.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>By zmienić twojego awatara wybierz nowy obrazek.
 By usunąć twojego bieżącego awatara potwierdź bez wybierania nowego obrazka.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>Przeglądaj...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>Zmień awatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>Otwórz plik obrazu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Obrazy (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>Nieprawidłowy obraz.</translation>
     </message>
@@ -2207,17 +2818,17 @@ By usunąć twojego bieżącego awatara potwierdź bez wybierania nowego obrazka
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2225,38 +2836,38 @@ By usunąć twojego bieżącego awatara potwierdź bez wybierania nowego obrazka
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Bieżące hasło:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nowe hasło:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Potwierdź nowe hasło:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Zmień hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Twoje hasło jest za krótkie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Hasła nie są zgodne.</translation>
     </message>
@@ -2264,93 +2875,93 @@ By usunąć twojego bieżącego awatara potwierdź bez wybierania nowego obrazka
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nazwa:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>K&amp;olor:</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="34"/>
         <source>white</source>
         <translation>biały</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="35"/>
         <source>blue</source>
         <translation>niebieski</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="36"/>
         <source>black</source>
         <translation>czarny</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="37"/>
         <source>red</source>
         <translation>czerwony</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="38"/>
         <source>green</source>
         <translation>zielony</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="39"/>
         <source>multicolor</source>
         <translation>multikolorowy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>bezkolorowy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;S/W:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Adnotacja:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Dane tokena</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>Dodaj token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Usuń token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation>Edytuj niestandardowe żetony</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Wprowadź nazwę tokena:</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>Błąd</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>Wybrana nazwa koliduje z istniejącą kartą lub tokenem.
@@ -2375,12 +2986,12 @@ Upewnij się że aktywowano &apos;Token&apos; w oknie &quot;Zarządzaj dodatkami
         <translation>Niezdefiniowane</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Prawdziwe imię:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Edycja profilu użytkownika</translation>
     </message>
@@ -2418,112 +3029,113 @@ Upewnij się że aktywowano &apos;Token&apos; w oknie &quot;Zarządzaj dodatkami
         <translation>2 godziny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Nowsze niż: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Opis gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>Założy&amp;ciel gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>Generalne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>Typy roz&amp;grywki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>co &amp;najmniej</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>co naj&amp;wyżej</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>Maksymalna liczba graczy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>Ograniczenia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Pokazuj gry tylko jeśli &amp;widzowie mogą oglądać</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Pokazuj gry wymagające hasła dla widzów</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Pokazuj gry tylko jeśli widzowie mogą rozm&amp;awiać</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Pokazuj gry tylko jeśli widzowie mogą oglądać &amp;ręce</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation>Widzowie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>Filtruj gry</translation>
     </message>
@@ -2531,52 +3143,52 @@ Upewnij się że aktywowano &apos;Token&apos; w oknie &quot;Zarządzaj dodatkami
 <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>Ostrzeżenie w procesie przypominania hasła</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>Wystąpił problem. Poproś o nowe hasło ponownie.</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>Wpisz informacje serwera oraz konta, do którego chciał(a)byś stworzyć nowe hasło.</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>&amp;Host:</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>&amp;Port:</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>&amp;Nazwa gracza:</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>Email:</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>Proces przypominania hasła</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>Błąd w procesie przypominania hasła</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>Adres email nie może być pusty.</translation>
     </message>
@@ -2584,37 +3196,37 @@ Upewnij się że aktywowano &apos;Token&apos; w oknie &quot;Zarządzaj dodatkami
 <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>Wpisz informacje serwera na którym chciał(a)byś stworzyć nowe hasło.</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>&amp;Host:</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>&amp;Port:</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>&amp;Nazwa gracza:</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>Żądanie Resetu Hasła</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>Błąd Resetu Hasła</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>Nazwa gracza nie może być pusta.</translation>
     </message>
@@ -2622,86 +3234,86 @@ Upewnij się że aktywowano &apos;Token&apos; w oknie &quot;Zarządzaj dodatkami
 <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>Ostrzeżenie Resetu Hasła</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>Wystąpił problem. Poproś o nowe hasło ponownie.</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>Wpisz otrzymany token oraz nowe hasło aby je ustawić.</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>&amp;Host:</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>&amp;Port:</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>&amp;Nazwa gracza:</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>Token:</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>Nowe Hasło:</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>Zresetuj hasło</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>Nazwa gracza nie może być pusta.</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>Błąd Resetu Hasła</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>Token nie może być pusty.</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>Nowe hasło nie może być puste.</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>Błąd</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>Twoje hasło jest za krótkie.</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>Hasła nie są zgodne.</translation>
     </message>
@@ -2717,17 +3329,17 @@ Upewnij się że aktywowano &apos;Token&apos; w oknie &quot;Zarządzaj dodatkami
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>Wczytaj talię ze schowka</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>Nieprawidłowa lista talii.</translation>
     </message>
@@ -2735,43 +3347,43 @@ Upewnij się że aktywowano &apos;Token&apos; w oknie &quot;Zarządzaj dodatkami
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2785,45 +3397,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>Wczytaj talię</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation>Nazwa karty (lub wyrażenie wyszukiwania):  </translation>
     </message>
     <message>
-        <location filename="src/game/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>Ilość trafień:</translation>
     </message>
     <message>
-        <location filename="src/game/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>Automatycznie graj trafienia</translation>
     </message>
     <message>
-        <location filename="src/game/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>Kładź karty z wierzchu na stosie dopóki...</translation>
     </message>
     <message>
-        <location filename="src/game/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>W bazie kart nie znaleziono kart które spełniają twoje wyrażenie. Kontynuować mimo to?</translation>
     </message>
     <message>
-        <location filename="src/game/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>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/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>Nieprawidłowy filtr</translation>
     </message>
@@ -2831,54 +3476,54 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Wpisz swoje informacje oraz informacje serwera do którego chciałbyś się zarejestrować.
 Twój email zostanie użyty aby zweryfikować twoje konto.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>&amp;Host:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nazwa gracza:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>H&amp;asło:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>Hasło (ponownie):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>Email (ponownie):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>Kraj:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>Nie wiadomo</translation>
     </message>
@@ -2924,17 +3569,17 @@ Twój email zostanie użyty aby zweryfikować twoje konto.</translation>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation>Liczba ścian:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation>Liczba kości:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation>Rzuć kośćmi</translation>
     </message>
@@ -2942,40 +3587,55 @@ Twój email zostanie użyty aby zweryfikować twoje konto.</translation>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>W trakcie wczytywania bazy kart wystąpił nieznany błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -2992,7 +3652,7 @@ Może istnieć potrzeba uruchomienia Oracle w celu uaktualnienia bazy kart.
 Czy chcesz zmienić ustawienia położenia bazy kart?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3009,7 +3669,7 @@ Zwykle można temu zaradzić poprzez uruchomienie narzędzia Oracle i uaktualnie
 Czy chcesz zmienić ustawienia położenia bazy kart?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3022,7 +3682,7 @@ Proszę wypełnić zgłoszenie błędu pod adresem https://github.com/Cockatrice
 Czy chcesz zmienić ustawienia położenia bazy kart?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3031,7 +3691,7 @@ Would you like to change your database location setting?</source>
 Czy chcesz ustawić nową lokalizację bazy kart?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3040,7 +3700,7 @@ Would you like to change your database location setting?</source>
 Czy chcesz ustawić nową lokalizację bazy kart?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3053,59 +3713,64 @@ Proszę wypełnić zgłoszenie błędu pod adresem https://github.com/Cockatrice
 Czy chcesz zmienić ustawienia położenia bazy kart?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>Ścieżka dostępu do twojego katalogu z taliami jest nieprawidłowa. Czy chcesz wrócić i ustawić poprawną ścieżkę?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>Ścieżka dostępu do twojego katalogu z obrazkami jest nieprawidłowa. Czy chcesz wrócić i ustawić poprawną ścieżkę?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>Ogólne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>Wygląd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>Interfejs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation>Źródło Karty</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>Czat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>Dźwięk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>Skróty</translation>
     </message>
@@ -3113,39 +3778,39 @@ Czy chcesz zmienić ustawienia położenia bazy kart?</translation>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </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="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </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="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3153,17 +3818,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>Następna</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>Poprzednia</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>Wskazówka na Dziś</translation>
     </message>
@@ -3171,165 +3836,165 @@ 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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>Kanał obecnej wersji</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>Przeinstaluj</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>Anuluj Pobieranie </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>Otwórz stronę pobierań</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation>Sprawdź aktualizacje klienta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>Cockatrice nie wspiera SSL, dlatego automatyczne pobieranie uaktualnień nie jest możliwe!
 Odwiedź stronę pobierania żeby uaktualnić ręcznie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>Sprawdzam aktualizacje...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>Skończyłem sprawdzać aktualizacje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>Brak nowych aktualizacji</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice jest aktualny!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>Używasz obecnie najnowszej dostępnęj wersji w wybranym kanale wydania</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>Obecna wersja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>Wybierz kanał wydania</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>Dostępna aktualizacja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Nowa wersja Cockatrice jest dostępna!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Nowa wersja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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>Wydania</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>Zmiany</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>Chcesz teraz zaktualizować?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>Błąd aktualizacji</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Wystąpił błąd podczas sprawdzania aktualizacji:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Wystąpił błąd podczas pobierania aktualizacji:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>Instaluję...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice nie może otworzyć instalatora.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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>Spróbuj zaktualizować ręcznie poprzez zamknięcie Cockatrice i włączenie instalatora.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation>Lokalizacja pobierania</translation>
     </message>
@@ -3337,21 +4002,153 @@ 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="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Wyczyść logi przy zamykaniu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Log Debugera</translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3421,33 +4218,39 @@ You may have to manually download the new version.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <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"/>
     </message>
@@ -3455,7 +4258,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>Podaj swój filtr</translation>
     </message>
@@ -3463,22 +4266,22 @@ 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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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"/>
     </message>
@@ -3486,22 +4289,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation type="unfinished"/>
     </message>
@@ -3509,155 +4312,208 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>Proszę najpierw dołączyć do właściwego pokoju.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>Nieprawidłowe hasło.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Ta rozgrywka nie dopuszcza widzów.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>Ta rozgrywka jest już pełna.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>Ta rozgrywka już nie istnieje.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>Ta rozgrywka jest dostępna tylko dla zarejestrowanych użytkowników.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>Ta rozgrywka jest dostępna tylko dla znajomych jej twórcy.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Twórca tej rozgrywki cię ignoruje.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>Dołącz do gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>Hasło:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>Proszę najpierw dołączyć do odpowiedniego pokoju. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filtr rozgrywek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>Usuń fi&amp;ltr</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>Utwó&amp;rz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>&amp;Dołącz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>D&amp;ołącz jako widz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation>Gra pokazana: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>Gry</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 dzień</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="43"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 godz</numerusform><numerusform>%1%2 godz</numerusform><numerusform>%1%2 godz</numerusform><numerusform>%1%2 godz</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation>Nowa</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="48"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>tylko znajomi</translation>
     </message>
@@ -3667,68 +4523,68 @@ You may have to manually download the new version.</source>
         <translation>tylko zarejestrowani użytkownicy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>mogą rozmawiać</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>widzą ręce</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>widzą ręce</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>niedozwoleni</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>Pokój</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>Wiek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>Twórca</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>Ograniczenia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>Gracze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>Widzowie</translation>
     </message>
@@ -3736,143 +4592,158 @@ You may have to manually download the new version.</source>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation>Resetuj wszystkie ścieżki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation>Wszystkie ścieżki zostały zresetowane</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>Wybierz ścieżkę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>Ustawienia osobiste</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>Język:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>Scieżki (edytowanie wyłączone w trybie przenośnym)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>Ścieżki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>Katalog z taliami:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>Katalog z powtórkami:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>Katalog z obrazkami:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>Baza kart:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation>Niestandardowy folder z bazą:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>Baza tokenów:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation>Aktualizuj kanał</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation>Sprawdzaj aktualizacje klienta przy uruchomieniu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>Powiadom jeśli właściwości wspierane przez serwer, brakują w kliencie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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>Automatycznie uruchom Oracle kiedy uruchomiona jest nowa wersja Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>Pokazuj wskazówki po uruchomieniu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <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"/>
     </message>
@@ -3880,47 +4751,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -3928,111 +4799,141 @@ You may have to manually download the new version.</source>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4040,193 +4941,213 @@ You may have to manually download the new version.</source>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4234,652 +5155,273 @@ You may have to manually download the new version.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>Ten serwer osiągnął maksymalną liczbę użytkowników, proszę sprawdzić później.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>Trwa zbyt wiele równoległych połączeń z twojego adresu.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>Zbanowany przez moderatora.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>Oczekiwany czas zakończenia: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>Ten ban jest bezterminowy.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>Planowe wyłączenie serwera.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>Nieprawidłowa nazwa użytkownika.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>Zostałeś wylogowany ze względu inny proces logowania.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>Połączenie zakończone</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>Serwer zakończył twoje połączenie.
-Przyczyna: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>Serwer zostanie wyłączony za jedną minutę.
-Wszystkie trwające gry zostaną utracone.
-Przyczyna zamknięcia: %1</numerusform><numerusform>Serwer zostanie wyłączony za %n minut.
-Wszystkie trwające gry zostaną utracone.
-Przyczyna zamknięcia: %1</numerusform><numerusform>Serwer zostanie wyłączony za minut: %n.
-Wszystkie trwające gry zostaną utracone.
-Przyczyna zamknięcia: %1</numerusform><numerusform>Serwer zostanie wyłączony za minut: %n.
-Wszystkie trwające gry zostaną utracone.
-Przyczyna zamknięcia: %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>Planowe wyłączenie serwera</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>Operacja zakończona pomyślnie</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>Rejestracja zaakceptowana.
-Rozpocznij logowanie.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>Aktywacja konta zakończona pomyślnie.
-Rozpocznij logowanie.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>Liczba graczy</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>Wprowadź liczbę graczy.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>Gracz %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>Wczytaj powtórkę</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>O Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation>Wersja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>Oficjalna strona Cocatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>Menadżer projektu:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>Poprzedni menadżerowie projektu:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>Twórcy:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>Lista współpracowników</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>Dołącz do grona twórców!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>Tłumacze:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>Nasi Tłumacze:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>Pomóż w tłumaczeniu!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>Wsparcie:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>Zgłoś problem</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>Rozwiązywanie problemów</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>Najczęściej zadawane pytania</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>Upłynął limit czasu odpowiedzi serwera</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>Nie udało się zalogować</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation>Twój klient prawdopodobnie nie spełnia wymagań połączenia z tym serwerem.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation>Aby zaktualizować twojego klienta, pójdź do &apos;Pomoc -&gt; Sprawdź ustawienia klienta&apos;.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>Nieprawidłowa nazwa użytkownika lub hasło. Sprawdź swoje dane weryfikacyjne i spróbuj ponownie.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>Istnieje już aktywna sesja dla tej nazwy użytkownika.
-Zakończ tamtą sesję i zaloguj się ponownie.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>Twój ban trwa do: %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>Zostałeś zbanowany bezterminowo.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>Ten serwer wymaga rejestracji użytkownika. Chcesz się teraz zarejestrować?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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>Ten serwer potrzebuje ID klienta. Twój klient nie może wygenerować ID lub używasz zmodyfikowanego klienta.
-Proszę zamknij i otwórz ponownie swojego klienta aby spróbować ponownie.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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>Doszło do wewnętrznego błędu, proszę zamknąć i ponownie otworzyć Cockatrice przed ponowną próbą.
-Jeśli błąd będzie się utrzymywać, upewnij się, że używasz najnowszej wersji programu oraz jeśli potrzebne skontaktuj się z deweloperami programu.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>Aktywacja konta</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>Twoje konto nie zostało jeszcze aktywowane.
-Musisz podać token aktywujący, otrzymany w wiadomości email.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation>Serwer pełny</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>Nieznany błąd logowania: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>To zwykle oznacza że wersja klienta jest nieaktualna i serwer wysłał odpowiedź, której twój klient nie rozpoznaje.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>Twoja nazwa użytkownika musi być zgodna z poniższymi regułami:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>%1 jest o %2 znaków za długi</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>może zawierać 1% małych liter</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>NIE</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>może zawierać %1 dużych liter</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>może zawierać %1 cyfr</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>Może zawierać następujące interpunkcje: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>Pierwszy znak może zawierać %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <source>no unacceptable language as specified by these server rules:</source>
-        <comment>note that the following lines will not be translated</comment>
-        <translation>zasady serwera nie pozwalają na takie słownictwo:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation>Nie można używać żadnego z podanych wyrazów: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation>Nie pasuje to żadnego z podanych wyrażeń: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>Możesz użyć tylko tych znaków: A-Z, a-z, 0-9, _, ., i - w nazwie użytkownika.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>Rejestracja nieudana</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>Rejestracja jest obecnie wyłączona na tym serwerze.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>Istnieje już konto o tej nazwie.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>Podanie poprawnego adresu email jest wymagane przy rejestracji.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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>Zdaje się że próbujesz zarejestrować nowe konto na tym serwerze, posiadając już zarejestrowane konto dla tego adresu. Ten serwer ogranicza liczbę kont, które można zarejestrować dla pojedynczego adresu. Skontaktuj się z operatorem serwera w celu uzyskania pomocy lub otrzymania twoich poufnych danych.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>Hasło jest zbyt krótkie.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>Rejestracja nie powiodła się z powodów technicznych na serwerze.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>Nieznany błąd rejestracji: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>Aktywacja konta zakończona niepowodzeniem</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>Błąd gniazda: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>Próbujesz połączyć się z nieaktualnym serwerem. Zainstaluj starszą wersję Cockatrice lub wybierz odpowiedni serwer.
-Lokalna wersja to %1, wersja zdalna to %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>Twój klient Cockatrice jest nieaktualny. Uaktualnij Cockatrice do nowszej wersji.
-Lokalna wersja to %1, wersja zdalna to %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>%1 — łączenie…</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>Rejestrowanie do %1 jako %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>Rozłączony</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>Połączenie ustanowione; logowanie jako %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>Proszenie o zapomniane hasło do %1 jako %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Połącz…</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Rozłącz</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>Rozpocznij &amp;lokalną grę…</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Obejrzyj powtórkę…</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>Pełny ekra&amp;n</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Zarejestruj się...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;Przywróć hasło...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Ustawienia…</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>&amp;Wyjdź</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>Ak&amp;cje</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>B&amp;aza kart</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;Zarządzaj dodatkami...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Edytuj niestandardowe %tokens...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>Otwórz folder ze spersonalizowanymi obrazkami</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>Otwórz folder ze spersonalizowanymi setami</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>Dodaj spersonalizowane sety/karty</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation>Przeładuj bazę kart</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>Po&amp;moc</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;O Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Wskazówka na Dziś</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation>Sprawdź uaktualnienia klienta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation>Uaktualnij bazę kart...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation>Pokaż log &amp;debugowania</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation>Pokaż/Ukryj</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation>Nowa Wersja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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>Gratulacje z powodu aktualizacji do Cockatrice %1!
 Oracle uruchomi się teraz aby zaktualizować bazę danych kart.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice zainstalowany</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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>Gratulacje z powodu instalacji Cockatrice %1!
 Oracle uruchomi się teraz aby zainstalować początkowe bazy danych kart.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>Baza kart</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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>
@@ -4888,29 +5430,29 @@ Czy chcesz teraz uaktualnić bazę kart?
 Jeżeli nie masz pewności lub jesteś nowym użytkownikiem, wybierz &quot;Tak&quot;</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>Otwórz ustawienia </translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>Znaleziono nowe dodatki</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
@@ -4925,17 +5467,22 @@ Kody dodatków: %1
 Czy chcesz je teraz uaktywnić?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>Pokaż dodatki</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>Witaj</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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>
@@ -4944,741 +5491,902 @@ Wszystkie dodatki w bazie kart zostały aktywowane.
 Przeczytaj więcej na temat zmiany kolejności czy wyłączania poszczególnych dodatków i tym podobnych w oknie &quot;Zarządzaj Dodatkami&quot;.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>Informacja</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>Aktualizacja bazy kart jest w trakcie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>Nie można uruchomić aktualizacji bazy kart:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>Ten serwer wspiera dodatkowe funkcje, których nie posiada twój klient.
-Prawdopodobnie nie jest to problem, ale ta wiadomośc może oznaczać że jest dostępna nowa wersja Cockatrice, lub że na tym serwerze działa zmodyfikowana albo nieopublikowana wersja.
-
-Aby aktualizować klienta, otwórz okno Pomoc -&gt; Sprawdź Aktualizacje</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>Wczytaj dodatki/karty</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>Wybrany plik nie został znaleziony.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation>Możesz zaimportować jedynie bazy danych XML w tym momencie.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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>Nowe dodatki/karty dodane pomyślnie.
 Cockatrice ponownie załaduje teraz bazę danych.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>Dodatki/karty nie mogły być zaimportowane.</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
-        <translation>Zresetuj hasło</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
-        <translation>Twoje hasło zostały pomyślnie zresetowane, możesz teraz zalogować się używając nowego uwierzytelniania.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>Nie udało się zresetować hasła użytkownika, skontaktuj się z operatorem serwera w celu wykonania resetu.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
-        <translation>Otrzymano żądanie aktywacji, odbierz token aktywujący w swojej skrzynce email.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation>z gry</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation>z jego grobu</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation>ze strefy wygnania</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation>z jego ręki</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>karta z wierzchu biblioteki gracza %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation>pierwsza karta jego biblioteki</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation>z wierzchu biblioteki gracza %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation>z wierzchu jego biblioteki</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>karta z wierzchu biblioteki gracza %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation>ostatnia karta jego biblioteki</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation>z dna biblioteki gracza %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation>z dna jego biblioteki</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation>z biblioteki gracza %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation>z jego biblioteki</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation>z talii pobocznej</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation>ze stosu</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1 od teraz gra z odwróconą kartą z wierzchu %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1 już nie gra z odwróconą kartą z wierzchu %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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>%1 może teraz patrzeć na kartę z wierzchu %2 w każdej chwili.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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>%1 nie może już patrzeć na kartę z wierzchu %2 w każdej chwili.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1 przyłącza %2 do %4 %3</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 poddał grę.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 nie poddał gry.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1 odzyskał połączenie z grą.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 utracił połączenie z grą.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation>%1 wskazuje z jego karty %2 na samego siebie.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation>%1 wskazuje z jego karty %2 na kartę %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation>%1 wskazuje z karty gracza %2 %3 na samą siebie.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation>%1 wskazuje z karty gracza %2 %3 na kartę %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1 wskazuje z jego karty %2 na jego kartę %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1 wskazuje z jego karty %2 na karty %3&apos;s %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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>%1 wskazuje z kart %2&apos;s %3 na swoją kartę %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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>%1 wskazuje z karty gracza %2 %3 na kartę gracza %4 (%5).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 stworzył token: %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>Gracz %1 wczytał talię (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>Gracz %1 wczytał talię oraz %2 kart talii pobocznej (hash: %3).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation>%1 niszczy %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>kartę</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1 oddaje %3 pod kontrolę gracza %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="308"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation>%1 zagrywa kartę %2 na pole bitwy%3 koszulką do góry.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1 zagrywa kartę %2 na pole bitwy %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation>%1 kładzie %2 %3 na cmentarz.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 przenosi kartę %2 do strefy wygnania %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation>%1 bierze %2 %3 do ręki.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation>%1 wkłada %2 %3 do biblioteki.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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>%1 przenosi %2 %3 na dno swojej biblioteki.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation>%1 przenosi %2 %3 na wierzch swojej bibliotek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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>%1 kładzie %2 %3 na jego biblioteke %4 kart z góry.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 przenosi kartę %2 %3 do talii pobocznej.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 zagrywa kartę %2 %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="373"/>
         <source>%1 tries to draw from an empty library</source>
         <translation>%1 próbuje dobrać z pustej biblioteki</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation><numerusform>%1 dobiera %2 kartę.</numerusform><numerusform>%1 dobiera %2 kart.</numerusform><numerusform>%1 dobiera %2 kart.</numerusform><numerusform>%1 dobiera %2 kart.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 przegląda %2.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1 kładzie %2 grzbietem do góry.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1 kładzie %2 grzbietem do dołu.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>Gra została zakończona.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>Gra została rozpoczęta.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1 dołączył do gry.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 obserwuje grę.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>Wyrzucono cię z gry.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 opuścił grę (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation>%1 przestał oglądać grę (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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>%1 nie jest już gotowy do rozpoczęcia gry.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform>%1 tasuje swoją talie i dobiera nową rękę z %2 kartą.</numerusform><numerusform>%1 tasuje swoją talie i dobiera nową rękę z %2 kartami.</numerusform><numerusform>%1 tasuje swoją talie i dobiera nową rękę z %2 kartami.</numerusform><numerusform>%1 tasuje swoją talie i dobiera nową rękę z %2 kartami.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="473"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation>%1 tasuje swoją talie i dobiera nową rękę.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation>Oglądasz powtórkę gry #%1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1 jest gotowy do rozpoczęcia gry.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="510"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation>karty</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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><numerusform>jedną kartę</numerusform><numerusform>%1 kart</numerusform><numerusform>%1 kart</numerusform><numerusform>%1 kart</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation>%1 pożycza %2 graczowi %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1 pokazuję kartę %2 graczowi %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1 pokazuję kartę %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation>%1 pokazuje losowo kartę %2 %3 graczowi %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1 pokazuje losowo kartę %2 %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation>%1 spogląda na kartę odwróconą koszulką do góry #%2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation>%1 spogląda na kartę odwróconą koszulką do góry #%2: %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation>%1 pokazuje kartę %2 %3 graczowi %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 pokazuje kartę %2 %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="576"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation>%1 odwrócona kolejność tur, teraz %2</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation>odwrócone</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation>normalne</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>Orzeł</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>Reszka</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation>%1 podrzucił monetą. Wylądowała na %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1 rzuca %2 kostką %3-ścienną.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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>%1 rzuca %2 monetami. Wypadło %3 orłów i %4 reszek.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="608"/>
         <source>%1 rolls a %2-sided dice %3 times: %4.</source>
         <translation>%1 rzuca %2-ścienną kostką %3 razy: %4. </translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>Tura gracza %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation>%1 ustala adnotację karty %2 na %3.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <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><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <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><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation>%1 ustawia licznik %2 na %3 (%4%5).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%1 blokuje karcie %2 normalne odtapowywanie.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 umożliwia karcie %2 normalne odtapowywanie.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 usuwa PT %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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>%1 zmienia PT %2 z niczego na %4</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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>%1 zmienia PT %2 z %3 na %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1 zablokował jego bibliotekę poboczną</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 odblokował jego bibliotekę poboczną</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 tapuje swoje permanenty.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 odtapowuje swoje permanenty.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1 tapuje kartę %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1 odtapowuje kartę %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 tasuje %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="769"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation>%1 tasuje %3 dolne karty z %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="774"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation>%1 tasuje %3 górne karty z %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation>%1 tasuje %3 - %4 z %2 kart.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 odczepia kartę %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 cofa ostatnią dobraną kartę</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 cofa ostatnią dobraną kartę (%2)</translation>
     </message>
@@ -5686,110 +6394,115 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation>Wyraz1 Wyraz2 Wyraz3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation>Dodaj Nową Wiadomość</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation>Edytuj Wiadomość</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation>Usuń Wiadomość</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>Dodaj wiadomość</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>Wiadomość:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation>Edytuj wiadomość</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>Ustawienia czatu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>Niestandardowy tekst alertu.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>Włącz wywołania na czacie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>Włącz autouzupełnianie wywołania</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>Makra wiadomości w trakcie gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="243"/>
         <source>How to use in-game message macros</source>
         <translation>Jak korzystać z makr wiadomości w trakcie gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>Ignoruj wiadomości na czacie od niezarejestrowanych użytkowników</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>Ignoruj prywatne wiadomości od niezarejestrowanych użytkowników</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>Odwróć kolor tekstu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>Włącz desktopowe notyfikacje dla prywatnych wiadomości</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>Włącz desktopowe notyfikacje dla wywołań</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>Włącz historię wiadomości w pokoju po dołączeniu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>(Kolor w kodzie heksadecymalnym)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Rozdziel słowa spacją, tylko alfanumeryczne znaki</translation>
     </message>
@@ -5797,37 +6510,42 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -5840,47 +6558,47 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
         <translation>Typ Karty</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation>Wartość Many</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation>Kolor(y)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation>Lojalność</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation>Główny Typ Karty</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation>Koszt Many</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation>S/W</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation>Strona</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation>Ułożenie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation>Tożsamość Koloru</translation>
     </message>
@@ -5903,65 +6621,211 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
         <translation>Kierunek przykrycia:</translation>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation>Nieznana Faza</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation>Odtapuj</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation>Utrzymanie</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation>Dobieranie</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation>Pierwsza Główna</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation>Początek Walki</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation>Wyznacz Atakujących</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation>Wyznacz Broniących</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation>Obrażenia</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation>Koniec Walki</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation>Druga Główna</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation>Koniec/Czyszczenie</translation>
     </message>
@@ -5969,57 +6833,57 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>Krok odtapowania</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>Krok utrzymania</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>Krok dobierania</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>Pierwsza faza główna</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>Krok początku walki</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>Krok deklaracji atakujących</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>Krok deklaracji broniących</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>Krok obrażeń bitewnych</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>Krok zakończenia walki</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>Druga faza główna</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>Krok końca tury</translation>
     </message>
@@ -6027,7 +6891,7 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
@@ -6036,183 +6900,195 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation>Przypnij wersję</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation>Odepnij wersję</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation>Pokaż powiązane karty</translation>
     </message>
@@ -6228,17 +7104,17 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation>Poprzednia karta w talii</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation>Następna karta w talii</translation>
     </message>
@@ -6246,86 +7122,94 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation>Alfabetycznie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation>Data wydania</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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>Malejąco</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation>Rosnąco</translation>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"/>
     </message>
@@ -6333,37 +7217,37 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>Usługi</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>Ukryj %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>Ukryj pozostałe</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>Pokaż wszystkie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>Preferencje…</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>Zakończ %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>O programie %1</translation>
     </message>
@@ -6371,153 +7255,247 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Baza kart Cockatrice (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>Wszystkie pliki (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Powtórki Cockatrice (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>Maindeck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>Tokeny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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"/>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation>Zapisz Wszystko</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation>Tak</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation>Tak - wszystko</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation>Nie - wszystko</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation>Przerwij</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation>Powtórz</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation>Ignoruj</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation>Odrzuć</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation>Aplikuj</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation>Przywróć domyślne</translation>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>Data dodania</translation>
     </message>
@@ -6525,32 +7503,32 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>Gracze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>Zachowaj</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>Czas rozpoczęcia</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>Czas trwania (sek)</translation>
     </message>
@@ -6558,37 +7536,37 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -6596,41 +7574,49 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>Pokoje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>&amp;Dołącz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>Pokój</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>Zezwolenia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>Gracze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>Gry</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6667,27 +7653,27 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>Włączone</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>Rodzaj dodatku</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>Kod dodatku</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>Pełna nazwa</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>Data wydania</translation>
     </message>
@@ -6695,53 +7681,53 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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>Przywróć domyślne skróty</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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>Czy na pewno chcesz przywrócić wszystkie domyślne skróty?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation>Wyczyść wszystkie domyślne skróty</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="111"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>Czy na pewno chcesz wyczyścić wszystkie skróty?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation>Sekcja:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation>Akcja:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation>Skrót:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation>Jak ustawić niestandardowe skróty klawiszowe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation>Wyczyść wszystkie skróty</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation>Szukaj po nazwie skrótu</translation>
     </message>
@@ -6749,12 +7735,12 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>Akcja</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>Skrót</translation>
     </message>
@@ -6762,14 +7748,14 @@ Cockatrice ponownie załaduje teraz bazę danych.</translation>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Twój plik konfiguracyjny zawierał nieprawidłowe skróty.
 Sprawdź ustawienia skrótów!</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>Następujące skróty zostały zamienione na domyślne:
@@ -6797,12 +7783,12 @@ Sprawdź ustawienia skrótów!</translation>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -6810,27 +7796,27 @@ Sprawdź ustawienia skrótów!</translation>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>Włącz &amp;efekty dźwiękowe</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>Aktualny zestaw dźwięków:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>Testuj silnik dźwiękowy systemu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>Ustawienia dźwięku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>Główne ustawienia głośności</translation>
     </message>
@@ -6838,48 +7824,48 @@ Sprawdź ustawienia skrótów!</translation>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation>Sezon spoilerów zakończony</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>Usuwanie spoiler.xml. Uruchom Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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>Pobieranie spoilerów nieudane</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation>Brak połączenia z internetem</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation>Spoilery są już aktualne</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation>Nie dodano nowych spoilerów</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation>Spoilery zostały zaktualizowane.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation>Ostatnia zmiana:</translation>
     </message>
@@ -6902,16 +7888,146 @@ Sprawdź ustawienia skrótów!</translation>
         <translation>Nieprawidłowa odpowiedź serwera uaktualnień wersji.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="177"/>
         <source>No reply received from the tag update server.</source>
         <translation>Brak odpowiedzi z serwera uaktualnień tagów.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="184"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Nieprawidłowa odpowiedź serwera uaktualnień tagów.</translation>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7043,56 +8159,227 @@ Sprawdź ustawienia skrótów!</translation>
         <translation>Nie można aktywować użytkownika. Błąd wewnętrzny</translation>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation type="unfinished"/>
+    </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="262"/>
+        <source>Any</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>Informacje o karcie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>Talia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>Filtry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>&amp;Widok</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation>Wersja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>Widoczne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>Pływające</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation>Resetuj układ</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="82"/>
         <source>Deck: %1</source>
         <translation>Talia: %1</translation>
     </message>
@@ -7100,61 +8387,49 @@ Sprawdź ustawienia skrótów!</translation>
 <context>
     <name>TabDeckEditorVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7162,22 +8437,22 @@ Sprawdź ustawienia skrótów!</translation>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <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"/>
     </message>
@@ -7218,8 +8493,8 @@ Sprawdź ustawienia skrótów!</translation>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Nowy folder</translation>
     </message>
@@ -7235,84 +8510,84 @@ Sprawdź ustawienia skrótów!</translation>
         <translation>Otwórz folder talii</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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>Nieprawidłowy plik talii</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>Podaj nazwę talii</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>Talia nie posiada nazwy.
 Wprowadź nazwę:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>Nienazwana talia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation>Nie udało się wysłać talii na serwer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>Usuń plik lokalny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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>Czy na pewno chcesz usunąć wybrane pliki?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation>Usuń zdalną talię</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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>Czy na pewno chcesz usunąć wybrane talie?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Nazwa nowego folderu:</translation>
     </message>
@@ -7325,17 +8600,17 @@ Wprowadź nazwę:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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"/>
     </message>
@@ -7376,7 +8651,7 @@ Wprowadź nazwę:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation type="unfinished"/>
     </message>
@@ -7384,197 +8659,191 @@ Wprowadź nazwę:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>Powtórka</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>Gra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>Lista Graczy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>Informacje o karcie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>Wiadomości</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>Oś czasu powtórki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>&amp;Fazy</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>&amp;Gra</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>Następna &amp;faza</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation>Następna faza z akcją</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>Następna &amp;tura</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation>Odwróć kolejność tur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>Usuń wszystkie &amp;wskaźniki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>Obróć widok &amp;zgodnie z ruchem wskazówek zegara</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>Obróć widok &amp;przeciwnie do ruchu wskazówek zegara</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>&amp;Informacje o grze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation>Powróć do gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>&amp;Poddaj grę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Opuść grę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>&amp;Zamknij powtórkę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation>Skup czat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>&amp;Powiedz:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>&amp;Widok</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>Widoczne</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>Pływające</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation>Resetuj układ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>Poddaj grę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>Czy na pewno chcesz poddać tę grę?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation>Powróć do gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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>Poddałeś już się. Czy chcesz powrócić do tej gry?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>Opuść grę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>Czy na pewno chcesz zakończyć tę rozgrywkę?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation>Gracz dołączył do gry #%1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation>%1 dołączył(a) do gry.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>Wyrzucono cię z gry.</translation>
     </message>
@@ -7582,7 +8851,7 @@ Wprowadź nazwę:</translation>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
@@ -7590,158 +8859,158 @@ Wprowadź nazwę:</translation>
 <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>Logi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation>Logi Pokoju</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>Logi Gry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>Logi Czatu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>Musisz wybrać przynajmniej jeden filtr.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Musisz wybrać poprawną liczbę dni żeby zlokalizować.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>Nazwa użytkownika:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>Adres IP:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>Nazwa rozgrywki:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>ID Gry:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>Wiadomość:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>Pokój Główny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>Pokój</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>Rozmowa Prywatna</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>Ostatnie X Dni:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>Dziś</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>Ostatnia godzina</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation>Maksymalny Wynik:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>Wymagany jest co najmniej jeden filtr.
 Im więcej podanych informacji, tym bardziej sprecyzowany wynik.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation>Pobierz Logi Użytkownika</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation>Wyczyść Filtry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>Filtry</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation>Loguj Połóżenia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation>Okres</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation>Maksymalny Wynik</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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>Historia wiadomości</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation>Nie udało się zebrać informacji o historii wiadomości.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Brak wiadomości dla wybranych filtrów.</translation>
     </message>
@@ -7759,27 +9028,27 @@ Im więcej podanych informacji, tym bardziej sprecyzowany wynik.</translation>
         <translation>&amp;Opuść</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Prywatny chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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>Ten użytkownik Cię ignoruje, nie może zobaczyć twoich wiadomości w głównym czacie oraz nie możesz dołączyć do jego gier.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation>Prywatna wiadomość od</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>Gracz %1 opuścił serwer.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>Gracz %1 pojawił się na serwerze.</translation>
     </message>
@@ -7787,180 +9056,180 @@ Im więcej podanych informacji, tym bardziej sprecyzowany wynik.</translation>
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>Lokalny system plików</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>Powtórki na serwerze</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>Obejrzyj powtórkę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation>Zmień nazwę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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>Nowy folder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>Usuń</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation>Otwórz folder powtórek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>Pobierz powtórkę</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>Wł./Wył. ochronę przed automatycznym usunięciem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation>Zmień nazwę lokalnego folderu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation>Zmień nazwę lokalnego pliku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation>Nowa nazwa:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation>Zmiana nazwy nie powiodła się</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation>Nazwa nowego folderu:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>Usuń plik lokalny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Czy na pewno chcesz usunąć wybrane pliki?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="505"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>Czy na pewno chcesz usunąć wybrane powtórki?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>Usuń przechowywaną powtórkę</translation>
     </message>
@@ -7973,47 +9242,62 @@ Im więcej podanych informacji, tym bardziej sprecyzowany wynik.</translation>
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>&amp;Powiedz:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>Czat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>P&amp;okój</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>Op&amp;uść pokój</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>Wyczyść &amp;czat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>Ustawienia czatu…</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation>wspomniał o tobie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation>Kliknij aby podglądnąć</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>Spamujesz. Poczekaj chwilę.</translation>
     </message>
@@ -8026,30 +9310,30 @@ Im więcej podanych informacji, tym bardziej sprecyzowany wynik.</translation>
         <translation>Serwer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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>Błąd podczas próby dołączenia do pokoju: nie istnieje na serwerze.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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>Serwer myśli że jesteś w pokoju ale twój klient nie może tego wyświetlić. Spróbuj zrestartować twojego klienta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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>Nie masz uprawnień do dołączenia do tego pokoju.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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>Błąd podczas próby dołączenia do pokoju z powodu nieznanego błędu: %1</translation>
     </message>
@@ -8057,92 +9341,97 @@ Im więcej podanych informacji, tym bardziej sprecyzowany wynik.</translation>
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>Czy na pewno?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>Ciągle masz otwarte gry. Czy na pewno chcesz wyjść?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation>Kliknij aby podglądnąć</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Twój znajomy %1 zalogował się!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation>Nieznane zdarzenie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8153,39 +9442,39 @@ Ta wiadomośc może oznaczać że jest dostępna nowa wersja Cockatrice, lub że
 Aby aktualizować klienta, otwórz okno Pomoc -&gt; Sprawdź Aktualizacje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation>Przekroczono czas bezczynności</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Zostaniesz wylogowany ze względu na nieaktywność.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>Awans</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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>Zostałeś awansowany. Proszę wyloguj się i zaloguj ponownie aby zmiany zostały wprowadzone.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>Ostrzeżony</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>Otrzymałeś ostrzeżenie z powodu %1.
 Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności. Jeżeli masz pytania, wyślij prywatną wiadomość do moderatora.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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>Otrzymałeś następującą wiadomość od serwera.
@@ -8194,6 +9483,11 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8232,42 +9526,42 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Życie</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Biały</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Niebieski</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Czarny</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Czerwony</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Zielony</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Bezkolorowy</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Inne</translation>
     </message>
@@ -8275,151 +9569,209 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation>Nie można było otworzyć pliku do odczytu.</translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>&amp;Dane użytkownika</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>Prywatny &amp;chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Wyświetl &amp;gry użytkownika</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>&amp;Dodaj do listy znajomych</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>&amp;Usuń z listy znajomych</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>Dodaj do listy &amp;ignorowanych</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Usuń z listy &amp;ignorowanych</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>Wyrzuć z &amp;gry</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="67"/>
         <source>Warn user</source>
         <translation>Daj ostrzeżenie użytkownikowi</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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Zobacz historie ostrzeżeń użytkownika</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="69"/>
         <source>Ban from &amp;server</source>
         <translation>Zbanuj z &amp;serwera</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Zobacz historie blokad użytkownika</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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Daj użytkownikowi uprawnienia moderatora</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>&amp;Zabierz użytkownikowi uprawnienia moderatora</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation>&amp;Daj użytkownikowi uprawnienia sędziego</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="74"/>
         <source>Demote user from judge</source>
         <translation>&amp;Zabierz użytkownikowi uprawnienia sędziego</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="75"/>
         <source>View admin notes</source>
         <translation>Sprawdź notatki administratorskie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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"/>
     </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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>Gry gracza %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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>Historia blokad</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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>Blokada Czas;Moderator;Czas Blokady;Powód Blokady;Widoczny Powód</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation>Użytkownik nigdy nie został zablokowany</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation>Błąd podczas zbierania informacji o blokadach.</translation>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation>Historia ostrzeżeń</translation>
     </message>
@@ -8434,55 +9786,65 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
         <translation>Użytkownik nigdy nie dostał ostrzeżenia.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation>Błąd podczas zbierania informacji o ostrzeżeniach.</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="249"/>
         <source>Failed to get admin notes.</source>
         <translation>Błąd podczas zbierania notatek administratorskich.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>Operacja zakończona pomyślnie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>Pomyślny awans gracza.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>Pomyślna degradacja gracza.</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Wystąpił błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>Błąd podczas awansu gracza.</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>Błąd podczas degradacji gracza.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation>Zapisz hash do schowka</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Usuń wiadomości tego użytkownika</translation>
     </message>
@@ -8490,311 +9852,554 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>Lokacja:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>Wiek konta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>Zmień hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>Zmień awatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>Administrator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>Moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>Zarejestrowany użytkownik</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>Niezarejestrowany użytkownik</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>Sędzia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>Nieznany</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="371"/>
         <source>The entered password does not match your account.</source>
         <translation>Wpisane hasło nie pasuje do twojego konta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>Informacje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>Informacje o użytkowniku zaktualizowane.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation>Informacje o użytkowniku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation>Prawdziwe imię:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation>Rodzaj użytkownika:</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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><numerusform>%n Rok</numerusform><numerusform>%n Lat</numerusform><numerusform>%n Lat</numerusform><numerusform>%n Lat</numerusform></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="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><numerusform>%10%n Dzień %20</numerusform><numerusform>%10%n Dni %20</numerusform><numerusform>%10%n Dni %20</numerusform><numerusform>%10%n Dni %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation>Wpisz hasło</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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>Weryfikacja hasłem jest wymagana aby zmienić twój adres email.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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>Wystąpił błąd podczas aktualizacji informacji o użytkowniku.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>Ten serwer nie pozwala na aktualizację twoich informacji o użytkowniku.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>Hasło zmienione.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>Ten serwer nie pozwala na zmianę twojego hasła.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>Nowe hasło jest za krótkie.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>Stare hasło jest niepoprawne.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>Awatar zaktualizowany</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Ten serwer nie pozwala na aktualizację twojego awatara.</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>Wystąpił błąd podczas aktualizowania twojego awatara.</translation>
+        <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>Ten serwer nie pozwala na aktualizację twoich informacji o użytkowniku.</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>Ogólne ustawienia interfejsu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>Zagrywaj karty po&amp;dwójnym kliknięciem (zamiast pojedynczym)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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>Kliknięcie zagrywa wszystkie wybrane karty (zamiast tylko klikniętej karty)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>Karty nie będące lądami zagrywaj domyślnie na stos (zamiast na &amp;pole bitwy)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>Dodaj tekst karty na tokenach</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Użycie odczepianych menu, pozwalające na zatrzymanie menu kontekstowego na ekranie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation>Ustawienia powiadomień</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>Włącz &amp;powiadomienia na pasku zadań</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>Powiadomienia na pasku zadań dla gier, które &amp;obserwujesz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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>Powiadamiaj na pasku zadań kiedy użytkownik z twojej listy znajomych zaloguje się.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>Ustawienia animacji</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>Animacja &amp;tapowania/odtapowania</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="231"/>
         <source>Open deck in new tab by default</source>
         <translation>Domyślnie otwórz talię w nowej karcie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation>Ustawienia powtórek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="246"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Buforuj czas do przeskoku w tył wywołane przez skrót:</translation>
     </message>
@@ -8802,22 +10407,22 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
@@ -8825,124 +10430,256 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8950,7 +10687,7 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDatabaseDisplayRecentSetFilterSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
+        <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"/>
     </message>
@@ -8958,19 +10695,19 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDatabaseDisplaySetFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
@@ -8978,27 +10715,37 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9006,50 +10753,93 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -9057,46 +10847,25 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -9104,47 +10873,52 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDeckStorageQuickSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9152,7 +10926,7 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
+        <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"/>
     </message>
@@ -9160,22 +10934,22 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -9183,17 +10957,17 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9201,43 +10975,43 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>Jakie ostrzeżenie chciałbyś wysłać?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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>Redaguj wiadomości od tego użytkownika we wszystkich pokojach</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>Ostrzeż gracza za złe zachowanie</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>Błąd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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>Nazwa gracza do wysłania ostrzeżenia nie może być pusta, prosze podać gracza.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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>Ostrzeżenie nie może być puste, zaznacz poprawne ostrzeżenie do wysłania.</translation>
     </message>
@@ -9245,133 +11019,133 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <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>Przesuń zaznaczony set do góry</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>Przesuć wybrany dodatek w górę</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>Przesuń wybrany dodatek w dół</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>Przesuń zaznaczony set na dół</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation>Szukaj po nazwie dodatku, kodzie lub typie</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="70"/>
         <source>Default order</source>
         <translation>Domyślna kolejność</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>Przywróć oryginalny priorytet obrazów kart</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="107"/>
         <source>Enable all sets</source>
         <translation>Włącz wszystkie dodatki</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="108"/>
         <source>Disable all sets</source>
         <translation>Wyłącz wszystkie dodatki</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="109"/>
         <source>Enable selected set(s)</source>
         <translation>Włącz zaznaczony/e set(y)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation>Wyłącz zaznaczony/e set(y)</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="126"/>
         <source>Deck Editor</source>
         <translation>Edycja Talii</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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation>Użyj CTRL+A aby wybrać wszystkie dodatki w widoku.</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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation>Tylko karty z odblokowanych dodatków pojawią się w edytorze talii kart</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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation>Priorytet obrazów jest ustalany w następujący sposób:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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>najpierw folder NIESTANDARDOWYCH (%1), potem Włączone Dodatki w tym oknie dialogowym (Z góry na dół)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Card Art</source>
         <translation>Obraz karty</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation>Jak ustawić niestandardowe obrazy do kart</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation>Wskazówki</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation>Notatka</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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation>Sortowane kolumnami pozwala ci znaleźć dodatek nie zmieniając ich priorytetów.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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>Aby wyłączyć sortowanie klikaj ponownie na ten sam nagłówek kolumny aż zniknie ten komunikat.</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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation>Użyj tymczasowego sortowania jako priorytet dodatków</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
         <source>Sorts the set priority using the same column</source>
         <translation>Sortuje priorytet dodatków korzystając z tej samej kolumny</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation>Zarządzaj dodatkami</translation>
     </message>
@@ -9379,72 +11153,72 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation>Niepogrupowane</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation>Grupuj po typie</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation>Grupuj po wartości many</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation>Grupuj po kolorze</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation>Nieposortowane</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation>Sortuj według nazwy</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation>Sortuj według typu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation>Sortuj według wartości many</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation>Sortuj według koloru</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation>Sortuj według P/T</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation>Sortuj według dodatku</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>przetasuj przy zamykaniu</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>widok sterty</translation>
     </message>
@@ -9452,7 +11226,7 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>Polski (Polish)</translation>
     </message>
@@ -9460,12 +11234,12 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation>Zaloguj po uruchowmieniu</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation>Debuguj do pliku</translation>
     </message>
@@ -9473,1005 +11247,1078 @@ Unikaj tego zachowania, w przeciwnym mogą zostać pozwięte dalsze czynności.
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>Główne okno</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation>Edycja Talii</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>Poczekalnia gier</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation>Znaczniki kart</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation>Znaczniki graczy</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>Siła i wytrzymałość</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>Fazy gry</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>Teren gry</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation>Przenieś wybraną kartę</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation>Przenieś kartę z wierzchu</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation>Przenieś kartę z dołu</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>Rozgrywka</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation>Dobieranie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation>Pokój czatu</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation>Okno gry</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation>Wczytaj talię ze schowka</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation>Powtórki</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation>Uaktualnij bazę kart...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation>Połącz…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>Rozłącz</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>Wyjście</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>Pełny ekran</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation>Zarejestruj się...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation>Ustawienia...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation>Rozpocznij lokalną grę…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation>Obejrzyj powtórkę…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation>Wyczyść wszystkie filtry</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation>Wyczyść zaznaczone filtry</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation>Usuń kartę</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation>Zarządzaj dodatkami...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation>Edytuj niestandardowe tokeny...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation>Dodaj kartę</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation>Wczytaj talię...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Wczytaj talię ze schowka…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation>Nowa talia</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Otwórz folder z niestandardowymi obrazkami</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation>Drukuj talię</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation>Usuń kartę</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation>Zresetuj wygląd</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation>Zapisz talię</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation>Zapisz talię jako…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Zapisz talię, anotowaną, do schowka</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation>Zapisz talię do schowka</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation>Wczytaj talię lokalną...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation>Wczytaj zdalną talię...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation>Ustaw gotowość do rozpoczęcia</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Przełącz blokadę sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation>Dodaj Zielony Znacznik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation>Odejmij Zielony Znacznik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation>Ustaw Zielony Znacznik...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation>Dodaj Czerwony Znacznik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation>Odejmij Czerwony Znacznik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation>Ustaw Czerwony Znacznik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation>Dodaj do Znacznika Życia</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation>Odejmij od Znacznika Życia</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation>Ustaw Znacznik Życia...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation>Dodaj Biały Znacznik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation>Odejmij Biały Znacznik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation>Ustaw Biały Znacznik...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation>Dodaj Niebieski Znacznik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation>Odejmij Niebieski Znacznik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation>Ustaw Niebieski Znacznik...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation>Dodaj Czarny Znacznik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation>Odejmij Czarny Znacznik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation>Ustaw Czarny Znacznik...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation>Dodaj Bezkolorowy Znacznik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation>Odejmij Bezkolorowy Znacznik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation>Ustaw Bezkolorowy Znacznik...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation>Dodaj Inny Znacznik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation>Odejmij Inny Znacznik</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation>Ustaw Inny Znacznik...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation>Dodaj Power (+1/+0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Odejmij Power (-1/-0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Przesuń Toughness do Power (+1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Dodaj Toughness (+0/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Odejmij Toughness (-0/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Przesuń Power do Toughness (-1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Dodaj Power i Toughness (+1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Odejmij Power i Toughness (-1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation>Ustaw Power i Toughness...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation>Resetuj Power i Toughness</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>Odtapuj</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>Utrzymanie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>Dobranie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation>Pierwsza Faza Główna</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation>Początek Walki</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>Atak</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>Blok</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>Obrażenia</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation>Koniec Walki</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation>Druga Faza Główna</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>Koniec</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation>Następna Faza</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation>Następna Akcja Fazowa</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation>Następna Tura</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation>Zatapuj / Odtapuj kartę</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation>Odtapuj Wszystkie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
-        <translation>Odtapuj</translation>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation>Obróć Kartę</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation>Podglądnij Kartę</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation>Zagraj Kartę</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation>Dołącz Kartę..</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation>Odłącz Kartę</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation>Sklonuj Kartę</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation>Utwórz token…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation>Stwórz Wszystkie Pokrewne Tokeny</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation>Stwórz Kolejny Token</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation>Ustaw Adnotację…</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation>Zaznacz Wszystkie Karty w Strefie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation>Zaznacz Wszystkie Karty w Rzędzie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation>Zaznacz Wszystkie Karty w Kolumnie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation>Dno biblioteki</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>Wygnanie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>Grób</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>Ręka</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation>Wierzch biblioteki</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation>Pole Bitwy, Koszulką do Góry</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation>Pole Bitwy</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>Biblioteka</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>Biblioteka poboczna</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation>Karty z Wierzchu Biblioteki</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation>Zamknij Ostatni Widok</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation>Stos</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation>Cmentarz (Wiele)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation>Wygnanie (Wiele)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation>Stos aż do Znalezienia</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation>Dobierz Kartę z Dna</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Dobierz Wiele Kart z Dna...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation>Narysuj wskaźnik...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation>Usuń Lokalne Wskaźniki</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation>Opuść Grę</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>Poddanie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation>Rzuć Kośćmi...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation>Potasuj Bibliotekę</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation>Dobierz Kartę</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation>Dobierz Wiele Kart...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation>Cofnij Dobranie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation>Zawsze Odkrywaj Górną Kartę</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation>Zawsze Patrz na Górną Kartę</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation>Obróć widok zgodnie z ruchem wskazówek zegara</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Obróć widok przeciwnie do ruchu wskazówek zegara</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation>Nie skupiaj Tekstu</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation>Skup Czat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation>Wyczyść czat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation>Odśwież</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation>Przeskocz do Przodu</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation>Przeskocz do Tyłu</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation>Bardzo Przeskocz do Przodu </translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation>Bardzo Przeskocz do Tyłu</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation>Odtwórz/Pauza</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation>Przełącz przyspieszenie</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_pt.ts b/cockatrice/translations/cockatrice_pt.ts
index 7c0a03033..912ee09d0 100644
--- a/cockatrice/translations/cockatrice_pt.ts
+++ b/cockatrice/translations/cockatrice_pt.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>Definir marcador</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation type="unfinished"/>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,79 +36,81 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -116,202 +118,253 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>Definições do Tema</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>Tema actual:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>Rendering da carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>Mostrar o nome em cartas com imagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>Aumentar as cartas ao passar o rato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>Disposição da Mão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Mostrar mão horizontalmente (desperdiça espaço)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>Permitir justificação de texto à esquerda</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>Esquema da mesa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>Inverter coordenada vertical</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Número mínimo de kogadores para layout com múltiplas colunas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -333,112 +386,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>Banir nome de &amp;utilizador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>Banir endereço de &amp;IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>banir I&amp;D do cliente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>Tipo de Ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>Ban &amp;permanente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>Ban &amp;temporário</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>&amp;Dias:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Horas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minutos:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>Duração do ban</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>Por favor introduza o motivo do ban.
 Isto apenas é guardado para os moderadores e não é visível para a pessoa banida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>Por favor introduza o motivo do ban que será visível à pessoa banida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>Banir utilizador do servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>Tem de seleccionar um banimento baseado no nome, no IP ou ambos.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>Deve preencher o campo de nome a banir quando selecciona a caixa de verificação para banir um nome.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>Deve preencher o campo de IP a banir quando selecciona a caixa de verificação para banir um IP.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>Deve preencher o campo de identificação de cliente quando selecciona a caixa de verificação para banir uma identificação de cliente.</translation>
     </message>
@@ -446,152 +499,221 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>Expansões</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>Custo de mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>Tipo de carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>P/R</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>Cor(es)</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -599,22 +721,22 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -622,22 +744,22 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -650,12 +772,22 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
@@ -663,132 +795,150 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
@@ -796,133 +946,133 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -931,7 +1081,7 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -939,29 +1089,470 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -969,47 +1560,17 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <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"/>
     </message>
@@ -1017,87 +1578,97 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <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"/>
     </message>
@@ -1123,114 +1694,114 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </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="162"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </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="166"/>
+        <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"/>
     </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="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </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="168"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="172"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </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="174"/>
         <source>Load deck from online service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1238,7 +1809,7 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1246,194 +1817,171 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>Número</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>Carta</translation>
     </message>
@@ -1441,12 +1989,12 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1454,17 +2002,17 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -1472,7 +2020,7 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <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"/>
     </message>
@@ -1480,62 +2028,62 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <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"/>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </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="104"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </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="105"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </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="106"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </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="107"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <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"/>
     </message>
@@ -1543,98 +2091,156 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1652,74 +2258,74 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>&amp;Carregar deck...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Carregar deck remoto...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>O ficheiro seleccionado não pôde ser carregado.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1752,143 +2358,143 @@ This will kick all non-ready players from the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>Novo anfitrião</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;Servidor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nome do jogador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;assword:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>&amp;Guardar password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>Conectar a&amp;utomaticamente no arranque</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Conectar automaticamente ao mais recente login ao abrir o Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>Aviso de conexão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>O nome de utilizador tem de ser inserido.</translation>
     </message>
@@ -1896,117 +2502,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>Re&amp;lembrar definições.</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>&amp;Descrição:</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>&amp;Jogadores:</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"/>
     </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>Tipo de jogo</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>&amp;Password:</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>Apenas &amp;amigos podem entrar</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>Apenas utilizadores &amp;registados podem entrar</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>Restrições para ligar</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>E&amp;spectadores podem ver</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>Espectadores &amp;necessitam de palavra-passe</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>Espectadores podem c&amp;onversar</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>&amp;Espectadores podem ver as mãos</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"/>
     </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>Espectadores</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>&amp;Limpar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>Criar jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>Informação do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>Erro do servidor.</translation>
     </message>
@@ -2014,97 +2625,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nome:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Ficha</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;or:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>branco</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>azul</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>preto</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>vermelho</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>verde</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>multicolor</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>incolor</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/R:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Nota:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Destruir ficha quando ela deixar a mesa</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Informação de ficha</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Mostrar &amp;todas as fichas</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Mostrar &amp;fichas deste deck</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>Escolha ficha da lista</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>Criar ficha</translation>
     </message>
@@ -2112,53 +2723,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2166,40 +2777,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>Não escolheu nenhuma imagem.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Para alterar o seu avatar, escolha uma nova imagem.
 Para remover o seu avatar actual, confirme SEM escolher uma nova imagem.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>Procurar...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>Alterar avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>Abrir Imagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Ficheiros de Imagem (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>Escolheu uma imagem inválida.</translation>
     </message>
@@ -2207,17 +2818,17 @@ Para remover o seu avatar actual, confirme SEM escolher uma nova imagem.</transl
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2225,38 +2836,38 @@ Para remover o seu avatar actual, confirme SEM escolher uma nova imagem.</transl
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Password antiga:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nova password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Confirme a nova password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Alterar a password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>As novas passwords que digitou não coincidem.</translation>
     </message>
@@ -2264,93 +2875,93 @@ Para remover o seu avatar actual, confirme SEM escolher uma nova imagem.</transl
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;or:</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="34"/>
         <source>white</source>
         <translation>branco</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="35"/>
         <source>blue</source>
         <translation>azul</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="36"/>
         <source>black</source>
         <translation>preto</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="37"/>
         <source>red</source>
         <translation>vermelho</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="38"/>
         <source>green</source>
         <translation>verde</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="39"/>
         <source>multicolor</source>
         <translation>multicolor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>incolor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/R:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Nota:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Informação de ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>Adicionar ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Remover ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Por favor introduza o nome da ficha:</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>Erro</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"/>
@@ -2374,12 +2985,12 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>Indefinido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Nome real:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Fazer alterações no seu perfil:</translation>
     </message>
@@ -2417,112 +3028,113 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Descrição de jogo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;Nome do criador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>&amp;Tipo de jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>no &amp;mínimo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>no m&amp;áximo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>Limite máximo de jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>Restrições</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>Filtrar jogos</translation>
     </message>
@@ -2530,52 +3142,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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -2583,37 +3195,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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -2621,86 +3233,86 @@ 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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -2716,17 +3328,17 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>Carregar baralho da memória</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>Lista de deck inválida.</translation>
     </message>
@@ -2734,43 +3346,43 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2784,45 +3396,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>Carregar baralho</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
@@ -2830,53 +3475,53 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>&amp;Servidor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nome do jogador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>P&amp;assword:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>Password (novamente):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>Email (novamente):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>País:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>Indefinido</translation>
     </message>
@@ -2922,17 +3567,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
@@ -2940,40 +3585,55 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>Erro desconhecido ao carregar a base de dados das cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -2990,7 +3650,7 @@ Poderá necessitar de correr o Oracle para actualizar a base de dados.
 Gostaria de alterar a localização da base de dados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3007,7 +3667,7 @@ Pode ser reparado correndo o Oracle de novo para actualizar a base de dados das
 Gostaria de alterar a localização da base de dados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3016,7 +3676,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3025,7 +3685,7 @@ Would you like to change your database location setting?</source>
 Gostaria de alterar a localização da base de dados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3034,7 +3694,7 @@ Would you like to change your database location setting?</source>
 Gostaria de alterar a localização da base de dados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3043,59 +3703,64 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>O directório do seu deck é inválido. Gostaria de voltar atrás e corrigir o directório?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>O directório das imagens das cartas  é inválido. Gostaria de voltar atrás e corrigir o directório?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>Definições</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>Aparência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>Interface do utilizador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>Som</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>Atalhos</translation>
     </message>
@@ -3103,39 +3768,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </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="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </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="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3143,17 +3808,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"/>
     </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"/>
     </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"/>
     </message>
@@ -3161,164 +3826,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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>Abrir a página de downloads</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>A procurar actualizações...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>Erro na actualização</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>A instalar...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation type="unfinished"/>
     </message>
@@ -3326,21 +3991,153 @@ 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="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Registo de erros</translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3410,33 +4207,39 @@ You may have to manually download the new version.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <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"/>
     </message>
@@ -3444,7 +4247,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation type="unfinished"/>
     </message>
@@ -3452,22 +4255,22 @@ 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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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"/>
     </message>
@@ -3475,22 +4278,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation type="unfinished"/>
     </message>
@@ -3498,155 +4301,208 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>Por favor entre na sala apropriada primeiro.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>Password incorrecta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Não são permitidos espectadores neste jogo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>O jogo já se encontra cheio.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>O jogo já não existe.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>Este jogo só está aberto a utilizadores registados.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>Este jogo só está aberto aos amigos do seu criador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Você está a ser ignorado pelo criador deste jogo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>Entrar no jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>Por favor entre na sala respectiva primeiro.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filtrar jogos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>&amp;Limpar filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>C&amp;riar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>&amp;Entrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>Entrar como &amp;espectador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>Jogos</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>amigos apenas</translation>
     </message>
@@ -3656,68 +4512,68 @@ You may have to manually download the new version.</source>
         <translation>utilizadores registados apenas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>pode falar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>ver mãos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>pode ver as mãos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>não permitidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>Idade</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>Criador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>Restrições</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>Jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>Espectadores</translation>
     </message>
@@ -3725,143 +4581,158 @@ You may have to manually download the new version.</source>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>Escolher directório</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>Defenições pessoais</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>Língua:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>Diretórios (edição desativada em modo portátil)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>Directórios</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>Directório dos decks:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>Directório de replays:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>Directório das imagens:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>Base de dados das cartas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>Base de dados das fichas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <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"/>
     </message>
@@ -3869,47 +4740,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -3917,111 +4788,141 @@ You may have to manually download the new version.</source>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4029,193 +4930,213 @@ You may have to manually download the new version.</source>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4223,646 +5144,271 @@ You may have to manually download the new version.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>O servidor atingiu a máxima capacidade de utilizadores, por favor verifique de novo mais tarde.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>Há demasiadas ligações concorrentes do seu endereço.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>Banido por moderador</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>Tempo previsto para o final:%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>Este banimento dura indefinidamente.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>Encerramento do servidor agendado.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>Nome de utilizador invalido.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>Você deslogado por ter entrado numa outra localização.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>Ligação terminada</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>O servidor terminou a sua ligação.
-Motivo: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>O servidor vai ser reiniciado em %n minuto(s).
-Todos os jogos a decorrer serão perdidos.
-Motivo para o encerramento: %1</numerusform><numerusform>O servidor vai ser reiniciado em %n minuto(s).
-Todos os jogos a decorrer serão perdidos.
-Motivo para o encerramento: %1</numerusform><numerusform>O servidor vai ser reiniciado em %n minuto(s).
-Todos os jogos a decorrer serão perdidos.
-Motivo para o encerramento: %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>Encerramento do servidor agendado</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>Sucesso</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>Registo aceite.%s
-Entrará agora.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>Activação da conta aceite. %s
-Entrará agora.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>Número de jogadores</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>Por favor introduza o número de jogadores.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>Jogador %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>Carregar replay</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>Sobre o Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>Website Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>Gestor do projecto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>Anteriores gestores do projecto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>Desenvolvedores:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>Os nossos desenvolvedores</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>Ajuda Desenvolvimento!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>Tradutores:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>Ajude a traduzir!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>Ajuda técnica:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>Reportar um Problema</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>Solução de problemas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>Perguntas frequentes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>Tempo do servidor esgotado</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>Tentativa falhada de entrada</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>Nome de utilizador ou palavra-passe incorrecta. Por favor verifique as suas informações e tente de novo.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>Já existe uma sessão activa com este nome de utilizador.
-Por favor termine essa sessão e volte a ligar-se.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>Está banido até %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>Está banido indefinidamente.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>Este servidor requer registo de utilizador. Gostaria de se registar agora?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>Activação de conta</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>Erro de login desconhecido:%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>
-Normalmente isto significa que a sua versão de cliente está desactualizada e que o servidor enviou uma resposta que o seu cliente não percebe.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>O seu nome de utilizador deve respeitar as seguintes regras:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>tem %1 - %2 caracteres</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>%1 pode conter caracteres em minúsculas</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>NÃO</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>%1 pode conter caracteres em maiúsculas</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>%1 pode conter caracteres numéricos</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>pode conter a seguinte pontuação: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>o primeiro caracter %1 pode ser pontuação </translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>Apenas A-Z, a-z, 0-9, _, ., e - são permitidos.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>Registo recusado</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>Os registos encontram-se indisponívels para este servidor de momento.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>Já existe uma conta com o mesmo nome de utilizador.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>É obrigatório especificar um endereço de e-mail válido quando se regista.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>A password que inseriu é demasiado curta.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>Falha no registo devido a um problema técnico com o servidor</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>Erro de registo desconhecido: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>Falha na activação de conta</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>Erro de ligação:%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>Está a tentar ligar-se a um servidor obsoleto. Por favor faça downgrade à sua versão do Cockatrice ou ligue-se a servidor adequado.
-Versão local é %1, versão remota é %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>A sua versão do Cockatrice é obsoleta. Por favor actualize-a.
-Versão local é %1, versão remota é %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>Ligando a %1...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>Registando em %1 como %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>Desligado</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>Conectado, logando em %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Ligar...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Desligar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>Começar &amp;jogo local...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Ver replay...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>Ecrã &amp;inteiro</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;A registar no servidor...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Configurações...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>&amp;Sair</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>A&amp;cções</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>B&amp;ase de dados de cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>Abrir a pasta de imagens personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>Abrir a pasta de expansões personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>Adicione cartas/expansões personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>S&amp;obre o Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>Base de dados de cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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>
@@ -4871,784 +5417,953 @@ Deseja actualizar a sua base de dados agora?%s
 Se não tem a certeza ou é a primeira vez que está a utilizar o Cockatrice, escolha &quot;Sim&quot;</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>Abrir definições</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>Novas expansões foram encontradas</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>Ver expansões</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>Bem-vindo/a</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>A actualização da base de dados das cartas já está a correr.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>Incapaz de correr o actualizador da base de dados das cartas:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>Carregar expansões/cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>O ficheiro escolhido não foi encontrado.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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>Actualização completa com sucesso. %s
 O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>Falha na importação de expansões/cartas.</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation>do jogo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation>do seu cemitério</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation> vindo do exílio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation>da sua mão</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>a carta do topo do grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation>a carta do topo dos seus grimórios</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation>do topo do grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation>do topo dos seus grimórios</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>a carta do fundo do grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation>a carta do fundo dos seus grimórios</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation>do fundo do grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation>do fundo dos seus grimórios</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation>do grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation>dos seus grimórios</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation> do sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation> da pilha</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1 está agora a manter a carta do topo %2 revelada.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1 já não está a manter a carta do topo %2 revelada.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1 anexa %2 a %4 de %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 concedeu o jogo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1 restabeleceu a ligação ao jogo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 perdeu a ligação ao jogo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation>%1 aponta do seu %2 para si próprio.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation>%1 aponta do seu %2 para %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation>%1 aponta do %3 de %2 para si própria.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation>%1 aponta de %3 de %2 para %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1 aponta do seu %2 para %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1 aponta do seu %2 para o %4 de %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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>%1 aponta de %3 de %2  para o seu %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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>%1 aponta de %3 de %2 para %5 de %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 cria ficha: %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 carregou um deck (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>%1 carregou um deck com %2 cartas na sideboard (%3).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation>%1 destrói %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>uma carta</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1 dá controlo sobre %3 a %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1 coloca %2 em jogo %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation>%1 coloca %2%3 no seu grimório.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 exila %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation>%1 move %2%3 para a sua mão.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation>%1 coloca %2%3 no seu grimório.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation>%1 coloca %2%3 no topo do seu grimório.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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>%1 põe %2%3 no seu grimório, %4 cartas a contar do topo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 move %2%3 para o sideboard.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 joga %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 está a olhar para %2.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>Este jogo foi encerrado.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>O jogo começou.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1 entrou no jogo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 está agora a ver o jogo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>Você foi expulso do jogo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 abandonou o jogo (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation>%1  não está mais a observar o jogo (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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>%1 já não está pronto a começar o jogo.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation>Está a ver um replay do jogo #%1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1 está pronto a começar o jogo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1 revela %2 a %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1 revela %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation>%1 revela aleatoreamente %2%3. a %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1 revela aleatoreamente %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation>%1 espreita a carta virada para baixo #%2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation>%1 espreita a carta virada para baixo #%2: %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation>%1 revela %2%3 a %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 revela %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>Cara</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>Coroa</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation>%1 atirou uma moeda ao ar. Calhou %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1 obteve %2 com um dado de %3 faces.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>Turno de %1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation>%1 coloca uma nota de %2 em%3.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation>%1 altera o número de marcadores %2 para %3(%4%5).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%1 define %2 para não desvirar normalmente.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 define %2 para desvirar normalmente.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1 bloqueou o seu sideboard.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 desbloqueou o seu sideboard.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 vira as suas permanentes.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 desvira as suas permanentes.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1 vira %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1 desvira %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 baralha %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 desanexa %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 desfaz a sua última compra.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 desfaz a sua última compra (%2).</translation>
     </message>
@@ -5656,110 +6371,115 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>Adicionar mensagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>Mensagem:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>Definições do Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>Palavras alerta personalizáveis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>Permitir menções no chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>Permitir complementação de menções</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>Macros de mensagem no decorrer do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>Ignorar mensagens de chat enviadas por utilizadores não registados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>Ignorar mensagens privadas enviadas por utilizadores não registados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>Inverter cor do texto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>Permitir notificações de mensagens privadas no Ambiente de Trabalho</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>Permitir notificações de menções no ambiente de trabalho</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>Permitir o histórico de mensagens de uma sala ao entrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>(A cor é hexadecimal)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Palavras separadas com espaço, apenas caracteres alfanuméricos</translation>
     </message>
@@ -5767,37 +6487,42 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -5810,47 +6535,47 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
@@ -5873,65 +6598,211 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -5939,57 +6810,57 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>Etapa de Desvirar</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>Etapa de manutenção</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>Etapa de compra</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>1ª Fase Principal (pré-combate)</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>Etapa de Início de Combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>Etapa de Declaração de Atacantes</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>Etapa de Declaração de Bloqueadores</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>Etapa de Dano de Combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>Etapa de Fim de Combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>2ª Fase Principal (pós-combate)</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>Fase Final</translation>
     </message>
@@ -5997,7 +6868,7 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>pt</translation>
@@ -6006,183 +6877,195 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6198,17 +7081,17 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6216,86 +7099,94 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"/>
     </message>
@@ -6303,37 +7194,37 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>Serviços</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>Ocultar %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>Ocultar outros</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>Mostrar tudo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>Preferências...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>Sair %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>Cerca %1</translation>
     </message>
@@ -6341,153 +7232,247 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Base de dados de cartas Cockatrice (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>Todos os ficheiros (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Replays do Cockatrice (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>Baralho</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>Tokens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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"/>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>Hora de upload</translation>
     </message>
@@ -6495,32 +7480,32 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>Jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>Keep</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>Tempo de começo</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>Duração (seg)</translation>
     </message>
@@ -6528,37 +7513,37 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -6566,41 +7551,49 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>Salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>E&amp;ntrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>Permissões</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>Jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>Jogos</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6637,27 +7630,27 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>Activado</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>Tipo de expansão</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>Código da expansão</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>Nome longo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>Data de lançamento</translation>
     </message>
@@ -6665,53 +7658,53 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -6719,12 +7712,12 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -6732,13 +7725,13 @@ O Cockatrice irá agora recarregar a base de dados das cartas.</translation>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -6765,12 +7758,12 @@ Please check your shortcut settings!</source>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -6778,27 +7771,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>Permitir &amp;sons</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>Tema sonoro actual:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>Teste motor de sistema de som</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>Definições de Som</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>Volume mestre</translation>
     </message>
@@ -6806,48 +7799,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="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -6870,16 +7863,146 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7011,56 +8134,227 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation type="unfinished"/>
+    </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="262"/>
+        <source>Any</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>Informação da carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>Baralho</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>&amp;Vista</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>Visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>Flutuando</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation>Repor disposição</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="82"/>
         <source>Deck: %1</source>
         <translation>Deck:%1</translation>
     </message>
@@ -7068,61 +8362,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="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7130,22 +8412,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="43"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <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"/>
     </message>
@@ -7186,8 +8468,8 @@ Please check your shortcut settings!</source>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Nova pasta</translation>
     </message>
@@ -7203,84 +8485,84 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>Introduza o nome do deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>Este deck nao tem um nome
 Por favor introduza um nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>Deck sem nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>Apagar ficheiro local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Nome da nova pasta:</translation>
     </message>
@@ -7293,17 +8575,17 @@ Por favor introduza um nome:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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"/>
     </message>
@@ -7344,7 +8626,7 @@ Por favor introduza um nome:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation type="unfinished"/>
     </message>
@@ -7352,197 +8634,191 @@ Por favor introduza um nome:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>Repetição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>Jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>Informação da carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>Mensagens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>Repetir Cronologia</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>Fa&amp;ses</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>&amp;Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>Próxima &amp;fase</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>Próximo &amp;turno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>&amp;Remover todas as setas locais</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>Rodar a vista no se&amp;ntido dos ponteiros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>rodar a vista no se&amp;ntido contrário aos ponteiros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>&amp;Informação do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>&amp;Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>Sair do &amp;jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>&amp;Fechar replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>&amp;Dizer:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>&amp;Vista</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>Visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>Flutuando</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation>Repor disposição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>Tem a certeza que deseja conceder este jogo?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>Sair do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>Tem a certeza que deseja sair deste jogo?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>Foi expulso do jogo.</translation>
     </message>
@@ -7550,7 +8826,7 @@ Por favor introduza um nome:</translation>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
@@ -7558,158 +8834,158 @@ Por favor introduza um nome:</translation>
 <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>Registos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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>Tempo;NomeEnviador;IPEnviador;Mensagem;IDAlvo;NomeAlvo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation>Registos das salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>Registos dos jogos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>Registos das conversas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>Deve seleccionar pelo menos um filtro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Deve seleccionar um número válido de dias para localizar.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>Nome de utilizador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>Morada IP:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>Nome do Jogo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>ID do Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>Mensagem:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>Sala principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>Sala de Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>Chat Privado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>Últimos X Dias:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>Última Hora</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation>Resultados Máximos:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>É requerido pelo menos um filtro. %s
 Quanta mais informação der, mais específicos serão os resultados.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation>Obter registos dos utilizadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation>Limpar Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>Filtros:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation>Localização dos Registos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation>Alcance de dados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation>Resultados máximos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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>Histórico de mensagens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation>Falha na obtenção do histórico de mensagens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Não há mensagens para os filtros seleccionados</translation>
     </message>
@@ -7727,27 +9003,27 @@ Quanta mais informação der, mais específicos serão os resultados.</translati
         <translation>&amp;Abandonar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Chat privado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1 abandonou o servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1 entrou no servidor.</translation>
     </message>
@@ -7755,180 +9031,180 @@ Quanta mais informação der, mais específicos serão os resultados.</translati
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>Ficheiros locais</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>Armazenamento de replays no servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>Ver replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>Apagar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>Download replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>Alternar bloqueio de expiração</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>Apagar ficheiro local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>Apagar replay remoto</translation>
     </message>
@@ -7941,47 +9217,62 @@ Quanta mais informação der, mais específicos serão os resultados.</translati
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>&amp;Dizer:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>&amp;Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Abandonar a sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>&amp;Limpar chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>Definições do chat...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation>mencionou-o.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation>Clicar para ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>Estás a inundar o chat .Por favor aguarde alguns segundos.</translation>
     </message>
@@ -7994,30 +9285,30 @@ Quanta mais informação der, mais específicos serão os resultados.</translati
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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"/>
     </message>
@@ -8025,92 +9316,97 @@ Quanta mais informação der, mais específicos serão os resultados.</translati
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>Tem a certeza?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>Ainda estão a decorrer alguns jogos. Tem a certeza que quer sair?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8118,39 +9414,39 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>Promoção</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>Avisado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>Recebeu um aviso devido a %1. %s
 Por favor evite continuar essa actividade ou acções serão tomadas contra si futuramente. Se tem alguma questão, por favor envie uma mensagem privada a um moderador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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"/>
@@ -8158,6 +9454,11 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8196,42 +9497,42 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -8239,151 +9540,209 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation>Incapaz de abrir o ficheiro para leitura.</translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>Detalhes do &amp;utilizador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>Chat &amp;privado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Mostrar os &amp;jogos deste utilizador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>Adicionar à &amp;lista de amigos</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Remover da lista de &amp;amigos</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>Adicionar a lista a i&amp;gnorar</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Remover da lista a &amp;ignorar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>Expulsar do &amp;jogo</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="67"/>
         <source>Warn user</source>
         <translation>Avisar utilizador</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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Ver o histórico de avi&amp;sos do utilizador</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="69"/>
         <source>Ban from &amp;server</source>
         <translation>Banir do &amp;servidor</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Ver o histórico de &amp;bans do utilizador</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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Promover utilizador a moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>&amp;Despromover utilizador do cargo de moderador</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </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="74"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </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="75"/>
         <source>View admin notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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"/>
     </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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>jogos de %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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>Histórico de banições</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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>Hora de Banição; Moderador; Duração da Banição; Razão da Banição; Razão visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation>O utilizador nunca foi banido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation>Histórico de avisos</translation>
     </message>
@@ -8398,55 +9757,65 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
         <translation>O utilizador nunca foi avisado.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </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="249"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>Sucesso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>Utilizador promovido com sucesso.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>Utilizador despromovido com sucesso.</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Falhou</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>Falha na promoção do utilizador.</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>Falha na despromoção do utilizador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -8454,311 +9823,554 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>Idade da Conta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>Alterar password</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>Alterar avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>Administrador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>Moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>Utilizador registado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>Utilizador não registado</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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>Desconhecido </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>Informação</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>Informação do utilizador actualizada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></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="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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>Este servidor não permite a actualização da sua informação pessoal.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>Password alterada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>Este servidor não permite a actualização da sua password.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>A password nova é demasiado curta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>A password antiga está incorrecta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>Avatar actualizado.</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Este servidor não permite a actualização do seu avatar.</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>Um erro ocorreu ao tentar actualizar o seu avatar.</translation>
+        <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>Este servidor não permite a actualização da sua informação pessoal.</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>Configurações gerais da interface</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>Clicar &amp;duas vezes nas cartas para as jogar (ao invés de clicar apenas uma vez)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>&amp;Jogar todos os não-terrenos para a pilha (em vez de para o campo de batalha) por definição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>Permitir anotações em tokens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>Permitir notificações na barra de tarefas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>Notificar eventos de jogos na barra de tarefas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>Configurações de Animações</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>Animação de &amp;virar/desvirar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <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"/>
     </message>
@@ -8766,22 +10378,22 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
@@ -8789,124 +10401,256 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8914,7 +10658,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDatabaseDisplayRecentSetFilterSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
+        <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"/>
     </message>
@@ -8922,19 +10666,19 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDatabaseDisplaySetFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
@@ -8942,27 +10686,37 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -8970,50 +10724,93 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -9021,46 +10818,25 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -9068,47 +10844,52 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDeckStorageQuickSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9116,7 +10897,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
+        <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"/>
     </message>
@@ -9124,22 +10905,22 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -9147,17 +10928,17 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9165,43 +10946,43 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>Que aviso gostaria de enviar?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>Aviso por má conduta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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>O nome de utilizador não se pode encontrar vazio, por favor especifique o utilizador que deseja avisar.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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>O aviso a enviar não se pode encontrar vazio, por favor seleccione um aviso válido para enviar.</translation>
     </message>
@@ -9209,133 +10990,133 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <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>Mover expansão seleccionada para o topo</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>Mover expansão seleccionada para cima</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>Mover expansão seleccionada para baixo</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>Mover expansão seleccionada para o fundo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation type="unfinished"/>
     </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="70"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </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"/>
     </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="107"/>
         <source>Enable all sets</source>
         <translation>Permitir todas as expansões</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="108"/>
         <source>Disable all sets</source>
         <translation>Inactivar todas as expansões</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="109"/>
         <source>Enable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation type="unfinished"/>
     </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="126"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation type="unfinished"/>
     </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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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"/>
     </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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9343,72 +11124,72 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>baralhar quando terminar</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>vista em pilha</translation>
     </message>
@@ -9416,7 +11197,7 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>Português (Portuguese)</translation>
     </message>
@@ -9424,12 +11205,12 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -9437,1005 +11218,1078 @@ Por favor evite continuar essa actividade ou acções serão tomadas contra si f
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>Janela Principal</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation>Editor de Baralhos</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>Lobby de jogo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>Poder e Resistência</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>Etapas de jogo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>Área de jogo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>Área de jogo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>Ecrã Inteiro</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>Desvirar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>Etapa de Upkeep</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>Etapa de compra de cartas</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>Etapa de Ataque</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>Etapa de Bloqueio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>Etapa de atribuição de dano</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>Fim de turno</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>Exílio</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>Cemitério</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>Mão</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>Baralho</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>Desistir</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_pt_BR.ts b/cockatrice/translations/cockatrice_pt_BR.ts
index 765d8491b..422ed5a4b 100644
--- a/cockatrice/translations/cockatrice_pt_BR.ts
+++ b/cockatrice/translations/cockatrice_pt_BR.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Definir marcador...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>Definir marcador</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Novo valor para marcador &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation>&amp;Atualizar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Analisar nome e número do conjunto (se disponível)</translation>
     </message>
@@ -36,81 +36,83 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation>Abrir em uma nova aba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation>Você tem certeza?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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>A lista foi modificada.
 Gostaria de salvar as alterações?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation>Não foi possível abrir o deck em %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation>O deck não pode ser salvo remotamente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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>O deck não pôde ser salvo.
 Por favor, verifique se a pasta não é somente leitura e tente novamente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation>Salvar deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation>O deck não pôde ser salvo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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>Não há cartas em seu deck a serem exportadas</translation>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
-        <translation>Nenhum deck selecionado para ser exportado.</translation>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
+        <translation>Adicionar ao Painel de Métricas</translation>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation>Notas de Atualização</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation>Notas do Administrador para %1</translation>
     </message>
@@ -118,329 +120,380 @@ Por favor, verifique se a pasta não é somente leitura e tente novamente.</tran
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation>Main</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
-        <translation>Side</translation>
+        <translation>Reserva</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
-        <translation type="unfinished"/>
+        <translation>segundos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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>Não foi possível criar o diretório de temas em &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>Configurações de Tema</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>Tema atual:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation>Abra a pasta de temas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
-        <translation type="unfinished"/>
+        <translation>Fonte do background da tab Home:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
-        <translation type="unfinished"/>
+        <translation>Frequência de escolha aleatória de background da tab Home:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
-        <translation type="unfinished"/>
+        <translation>Desabilitado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation>Configurações do Menu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="415"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>Mostrar atalhos de teclado nos menus de clique com o botão direito</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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>Mostrar o filtro de jogos acima da lista da tab de sala</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>Renderização das cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>Mostrar nome nas cartas que possuem imagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>Rotacionar automaticamente cartas com layout horizontal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Priorizar conjuntos que o deck contém no topo do seletor de impressão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>Redimensionar cartas ao passar o mouse</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation>Usar cantos de cartas arredondados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Porcentagem mínima de sobreposição de cartas na pilha e na mão vertical</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="434"/>
         <source>Maximum initial height for card view window:</source>
         <translation>Altura inicial máxima para a janela de visualização de cartas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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>linhas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="436"/>
         <source>Maximum expanded height for card view window:</source>
         <translation>Altura expandida máxima para a janela de visualização de cartas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
-        <translation type="unfinished"/>
+        <translation>Marcadores de carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
-        <translation type="unfinished"/>
+        <translation>Marcador %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>Organização da mão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Mostrar a mão na horizontal (desperdiça espaço)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>Habilitada justificação à esquerda</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>Organização do campo de batalha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>Inverter a coordenada vertical</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Número mínimo de jogadores para o layout de multi-colunas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Tamanho máximo da fonte para informações nas cartas:</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Abrir no Editor de Decks</translation>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
         <source>Theme</source>
-        <translation type="unfinished"/>
+        <translation>Tema</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
         <source>Art crop of random card</source>
-        <translation type="unfinished"/>
+        <translation>Arte de uma carta aleatória</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
         <source>Art crop of background.cod deck file</source>
-        <translation type="unfinished"/>
+        <translation>Arte de um arquivo de deck backround.cod</translation>
     </message>
 </context>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>banir &amp;usuário pelo nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>banir endereço &amp;IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>banir cliente por I&amp;D:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>Tipo de banimento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;banir permanentemente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;banir temporariamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>&amp;Dias:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Horas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minutos:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>Duração do banimento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>Por favor, entre com o motivo do banimento.
 Isto será visto somente por moderadores e não pode ser visto pela pessoa banida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>Por favor, entre com o motivo para o banimento que será visível pela pessoa banida.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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>Remover todas mensagens deste usuário em todas as salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>Banir usuário do servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>Você deve selecionar um nome, IP, cliente ou alguma combinação desses três itens para banir.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>Você têm que colocar um nome válido quando seleciona a caixa de banimento por nome.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>Você têm que colocar um IP válido quando seleciona a caixa de banimento por IP.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>Você têm que colocar um ID de cliente válido quando seleciona a caixa de banimento por ID de cliente.</translation>
     </message>
@@ -448,175 +501,244 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation>Beta</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation>Nenhuma resposta recebida do servidor de atualização.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Resposta inválida recebida do servidor de atualização.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation>Nenhuma resposta recebida do servidor de atualização.</translation>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>Expansões</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>Custo de mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>Tipo de carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>P/R</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>Cor(es)</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>OU</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>E NÃO</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>OU NÃO</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation>Nome (Exatamente)</translation>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>Cor</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation>Coleção</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>Custo de Mana</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation>Valor de Mana</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>Raridade</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>Poder</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>Resistência</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>Lealdade</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>Formato</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
-        <translation type="unfinished"/>
+        <translation>Tipo Principal</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
-        <translation type="unfinished"/>
+        <translation>Sub-Tipo</translation>
     </message>
 </context>
 <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>Imagem</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>Descrição</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>Ambos</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>Ver transformação</translation>
     </message>
@@ -624,22 +746,22 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation>Visualizar cartas relacionadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation>Adicionar carta ao deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation>Main</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation>Side</translation>
     </message>
@@ -652,12 +774,22 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
         <translation>Nome:</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>Coleção:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation>Número de Colecionador:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation>Cartas relacionadas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation>Carta desconhecida:</translation>
     </message>
@@ -665,132 +797,150 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <translation>Revelar para...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <translation>Todos os &amp;jogadores</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
-        <translation type="unfinished"/>
+        <translation>Visualizar cartas relacionadas</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
-        <translation type="unfinished"/>
+        <translation>Ficha:</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
-        <translation type="unfinished"/>
+        <translation>Todas as fichas</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Marque todos</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
+        <translation>Selecionar Linha</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
+        <translation>Selecionar Coluna</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Jogar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Ocultar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
+        <translation>Jogue &amp;virada para baixo</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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>&amp;Virar / Desvirar</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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>&amp;Virar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Olhar a face da carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Clonar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
-        <translation type="unfinished"/>
+        <translation>Ane&amp;xar na carta...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
-        <translation type="unfinished"/>
+        <translation>De&amp;sanexar</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Desenhar seta...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
+        <translation>Colocar &amp;nota...</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
-        <translation type="unfinished"/>
+        <translation>Marcadores de carta</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Adicionar marcador(%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
+        <translation>&amp;Remover marcador (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
+        <source>&amp;Set counters (%1)...</source>
+        <translation>&amp;Definir marcadores (%1)...</translation>
+    </message>
+</context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
-        <source>&amp;Set counters (%1)...</source>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation>Tamanho da Carta</translation>
     </message>
@@ -798,172 +948,613 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>sua mão</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>mão de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
-        <translation type="unfinished"/>
+        <translation>do seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
+        <translation>do grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>seu cemitério</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>cemitério de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>seu exílio</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>exílio de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>seu sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>sideboard de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>seu sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>sideboard de %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>sua zona customizada &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>zona customizada &apos;%2&apos; de %1</translation>
     </message>
 </context>
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
-        <translation type="unfinished"/>
+        <translation>Erro na linha %1 coluna %2:</translation>
     </message>
 </context>
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
+        <translation>Erro na linha %1 coluna %2:</translation>
+    </message>
+</context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
 </context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
-        <translation type="unfinished"/>
+        <translation>Zonas Customizadas</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
+        <translation>Ver zona customizada &apos;%1&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation>Adicionar Painel</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation>Remover Painel</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation>Salvar Layout</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation>Carregar Layout</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation>Banco de Dados de Cartas</translation>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation>Informações da carta</translation>
     </message>
@@ -971,47 +1562,17 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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>Pesquisar pelo nome da carta (ou expressões de busca)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation>Adicionar ao deck</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation>Adicionar ao Sideboard</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation>Escolher Impressão</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation>Mostrar cartas Relacionadas</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="127"/>
         <source>Add card to &amp;maindeck</source>
         <translation>Adicionar carta ao &amp;baralho principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="128"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Adicionar carta ao &amp;sideboard</translation>
     </message>
@@ -1019,87 +1580,97 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation>Carta em Destaque</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
-        <translation type="unfinished"/>
+        <translation>Cores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation>Escolher Impressão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation>&amp;Nome do Deck:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation>&amp;Comments:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
-        <translation type="unfinished"/>
+        <translation>Agrupar por:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation>Formato:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation>Hash:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation>&amp;Aumentar número</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation>&amp;Diminuir número</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation>&amp;Remover linha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="752"/>
         <source>Swap card to/from sideboard</source>
         <translation>Mover carta para/do Side</translation>
     </message>
@@ -1125,114 +1696,114 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation>&amp;Editor de Decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation>&amp;Novo deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation>&amp;Carregar deck...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation>Carregar deck recente...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation>&amp;Salvar deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation>Salvar deck &amp;como...</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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation>Carregar deck da área de &amp;transferência...</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="162"/>
         <source>Edit deck in clipboard</source>
         <translation>Editar deck na área de transferência</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="166"/>
+        <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>Anotado</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="168"/>
+        <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>Não anotado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation>Salvar deck para a área de transferência</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="168"/>
         <source>Annotated (No set info)</source>
         <translation>Anotado (Sem informação de expansão)</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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation>Não Anotado (Sem informação de expansão)</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="172"/>
         <source>&amp;Print deck...</source>
         <translation>&amp;Imprimir deck...</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="174"/>
         <source>Load deck from online service...</source>
-        <translation type="unfinished"/>
+        <translation>Carregar baralho de serviço online...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation>&amp;Enviar deck para serviço online</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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation>Criar decklist (decklist.org)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation>Criar decklist (decklist.xyz)</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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation>&amp;Analisar deck (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation>&amp;Analisar deck (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation>&amp;Fechar</translation>
     </message>
@@ -1240,7 +1811,7 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation>Seletor de Impressão</translation>
     </message>
@@ -1248,194 +1819,171 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>Atualizar Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>Sucesso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation>As URLs de download foram redefinidas.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>As imagens de cartas baixadas foram redefinidas.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>Erro</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation>Uma ou mais imagens de cartas baixadas não puderam ser apagadas.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>Adicionar URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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>Editar URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation>Tamanho do Cache de Rede:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation>TTL do Cache de Redirecionamento:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation>Por quanto tempo os redirecionamentos em cache para URLs são válidos.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation>Tamanho do Cache de Imagens:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation>Adicionar nova URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation>Remover URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation>Dia(s)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>Atualizando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>Selecione o caminho</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation>Prioridade de download de URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>&apos;Spoilers&apos;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>Baixar &apos;spoilers&apos; automaticamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation>Localização do &apos;spoiler&apos;:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>Última Alteração</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>Baixar automaticamente &apos;spoilers&apos; ao iniciar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>Pressione o botão para atualizar manualmente sem reinicializar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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>Não feche as configurações até que a atualização manual termine</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation>Baixar imagens de cartas em tempo real</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation>Como adicionar uma URL customizada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>Deletar imagens baixadas</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation>Resetar URLs de download</translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
-        <translation>Cache em disco para imagens baixadas</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
+        <translation>Desfazer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
-        <translation>Cache em memória para imagens que não estão atualmente na tela</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation>Refazer</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation>Histórico Desfazer/Refazer</translation>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation>[refazer]</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
+        <translation>[desfazer]</translation>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation>Contagem</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation>Conjunto</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>Número</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation>ID do Provedor</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>Card</translation>
     </message>
@@ -1443,12 +1991,12 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation>Formatos de decks comuns (%1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation>Todos arquivos (*.*)</translation>
     </message>
@@ -1456,17 +2004,17 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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>Modo: Correspondência Exata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
         <source>Mode: Includes</source>
         <translation>Modo: Inclui</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -1474,7 +2022,7 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
         <source>Edit tags ...</source>
         <translation>Editar tags ...</translation>
     </message>
@@ -1482,62 +2030,62 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
         <source>Deck Tags Manager</source>
         <translation>Gerenciador de Tags de Deck</translation>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation>Gerencie suas tags de deck. Marque ou desmarque as tags conforme necessário ou adicione novas:</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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation>Adicionar uma nova tag (ex.: Aggro)</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="104"/>
         <source>Add Tag</source>
         <translation>Adicionar Tag</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="105"/>
         <source>Filter tags...</source>
         <translation>Filtrar tags...</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="106"/>
         <source>OK</source>
         <translation>OK</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="107"/>
         <source>Edit default tags</source>
-        <translation type="unfinished"/>
+        <translation>Editar tags padrão</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="108"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation>Entrada Inválida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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>O nome da tag não pode estar vazio!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation>Tag Duplicada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>This tag already exists.</source>
         <translation>Essa tag já existe.</translation>
     </message>
@@ -1545,98 +2093,156 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation>Carta em Destaque</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
         <source>Open in deck editor</source>
         <translation>Abrir no editor de decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation>Editar Tags</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation>Renomear Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
         <source>Save Deck to Clipboard</source>
         <translation>Salvar deck na área de transferência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation>Anotado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
         <source>Annotated (No set info)</source>
         <translation>Anotado (Sem informação de expansão)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation>Não Anotado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
         <source>Not Annotated (No set info)</source>
         <translation>Não Anotado (Sem informação de expansão)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation>Renomear Arquivo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation>Deletar Arquivo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation>Escolher Carta em Destaque</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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>Novo nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation>Falha ao renomear</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation>Deletar Arquivo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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>Tem certeza de que deseja excluir o arquivo selecionado?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation>Falha ao deletar</translation>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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>Renomear baralho de &quot;%1&quot; para &quot;%2&quot;</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="126"/>
+        <source>Updated comments (was %1 chars, now %2 chars)</source>
+        <translation>Comentários atualizados (eram %1 caracteres, agora são %2 caracteres)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation>Tags alteradas</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation>Definir formato para %1</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation>Adicionado (%1): %2 (%3) %4</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="264"/>
+        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
+        <translation>Movido para %1 1 × &quot;%2&quot; (%3)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation>Removido &quot;%1&quot; (todas as cópias)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation>%1 1 × &quot;%2&quot; (%3)</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation>Adicionado</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation>Removido</translation>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1654,76 +2260,77 @@ Isto será visto somente por moderadores e não pode ser visto pela pessoa banid
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>Carregar deck...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Carregar deck remoto...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
-        <translation type="unfinished"/>
+        <translation>Carregado da área de transferência...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
-        <translation type="unfinished"/>
+        <translation>Carregado do website...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation>Descarregar deck</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>Preparadx para começar</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation>Forçar início</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation>Sideboard aberto</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation>Sideboard fechado</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>O arquivo selecionado não pode ser carregado</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>O baralho é maior que o tamanho máximo de arquivo.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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>Tem certeza que deseja forçar o início?
+Isso irá expulsar todos os jogadores não preparados do jogo.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
-        <translation type="unfinished"/>
+        <translation>Cockatrice</translation>
     </message>
 </context>
 <context>
@@ -1756,143 +2363,143 @@ Deseja converter o deck para .cod?</translation>
         <translation>Baixando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>Servidores conhecidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation>Excluir o servidor salvo atualmente selecionado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Atualizar a lista de servidores com servidores públicos conhecidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>Novo servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;Servidor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Nome do jogador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>S&amp;enha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>&amp;Salvar senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>&amp;Conectar automaricamente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Conectar automaticamente com o login mais recente quando Cockatrice for iniciado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>Se você tiver problemas ao se conectar ou registar entre em contato com os responsáveis pelo servidor!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>Página da Web</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation>Resetar Senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation>Esqueceu a senha?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>&amp;Conectar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation>Salvar Contato</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>Conectar ao Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation>URL do Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation>Porta de comunicação</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation>Nome Único de Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>Aviso de conexão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>Você deve nomear seu novo perfil de conexão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>Aviso de conexão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>O nome do jogador é obrigatório.</translation>
     </message>
@@ -1900,117 +2507,122 @@ Deseja converter o deck para .cod?</translation>
 <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>Le&amp;mbrar configurações.</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>&amp;Descrição:</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>&amp;Jogadores:</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>Geral</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>Tipo de jogo</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>&amp;Senha:</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>Apenas &amp;amigos podem entrar</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>Apenas usuários &amp;registrados podem entrar</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>Restrições para entrar</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>&amp;Espectadores podem assistir</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>&amp;Espectadores precisam de uma senha para assistir</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>Visitantes podem &amp;conversar</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>Espectadores podem ver &amp;mãos</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>Criar jogo como espectador</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>Visitantes</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>Total de vida inicial:</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>Abrir lista de baralhos no lobby</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation>Criar jogo como juíz</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation>Opções de configuração do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>&amp;Limpar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>Criar jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>Informação de jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>Erro do servidor.</translation>
     </message>
@@ -2018,192 +2630,192 @@ Deseja converter o deck para .cod?</translation>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nome:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Ficha</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>C&amp;or:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>branco</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>azul</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>preto</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>vermelho</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>verde</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>multicolorido</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>incolor</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/R:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Nota:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>Destruir a &amp;ficha quando ela sair do campo de batalha</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Informação de ficha</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Mostre &amp;todas fichas</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Mostre fichas deste &amp;deck</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>Mostre fichas da lista</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>Criar ficha</translation>
     </message>
 </context>
 <context>
     <name>DlgDefaultTagsEditor</name>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="45"/>
-        <source>Edit Tags</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
-        <source>Add</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
-        <source>Confirm</source>
-        <translation type="unfinished"/>
+        <source>Edit Tags</source>
+        <translation>Editar Tags</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
-        <source>Cancel</source>
-        <translation type="unfinished"/>
+        <source>Add</source>
+        <translation>Adicionar</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
+        <source>Confirm</source>
+        <translation>Confirmar</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="50"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <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>Insira a tag e aperte Enter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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>✖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
-        <translation type="unfinished"/>
+        <translation>Valor Inválido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
-        <translation type="unfinished"/>
+        <translation>Nomes de tags não podem ser vazios!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
-        <translation type="unfinished"/>
+        <translation>Tag Duplicada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
-        <translation type="unfinished"/>
+        <translation>Essa tag já existe.</translation>
     </message>
 </context>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>Nenhuma imagem selecionada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Para mudar seu avatar, escolha uma nova imagem
 Para remover o avatar atual, confirme sem escolher uma nova imagem.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>Procurar...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>Mudar avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>Abrir imagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Arquivos de imagem (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>Imagem inválida.</translation>
     </message>
@@ -2211,17 +2823,17 @@ Para remover o avatar atual, confirme sem escolher uma nova imagem.</translation
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation>Editar deck na área de transferência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation>Decklist inválida.</translation>
     </message>
@@ -2229,38 +2841,38 @@ Para remover o avatar atual, confirme sem escolher uma nova imagem.</translation
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Senha antiga:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nova senha: </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Confirmar senha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Trocar senha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Sua senha é muito curta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>As novas senhas não coincidem.</translation>
     </message>
@@ -2268,93 +2880,93 @@ Para remover o avatar atual, confirme sem escolher uma nova imagem.</translation
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;Nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Cor:</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="34"/>
         <source>white</source>
         <translation>branco</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="35"/>
         <source>blue</source>
         <translation>azul</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="36"/>
         <source>black</source>
         <translation>preto</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="37"/>
         <source>red</source>
         <translation>vermelho</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="38"/>
         <source>green</source>
         <translation>verde</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="39"/>
         <source>multicolor</source>
         <translation>multicor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>incolor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/R:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Anotação</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Informação da ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>Adicionar ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Remover ficha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation>Editar fichas personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Por favor, entre com o nome da ficha:</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>Erro</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>O nome escolhido está em conflito com uma carta ou ficha existente. 
@@ -2379,12 +2991,12 @@ Certifique-se de habilitar a expansão &apos;Fichas&apos; em &quot;Gerenciar exp
         <translation>Indefinido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Nome real:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Editar perfil</translation>
     </message>
@@ -2422,112 +3034,113 @@ Certifique-se de habilitar a expansão &apos;Fichas&apos; em &quot;Gerenciar exp
         <translation>2 horas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation>Ocultar jogos &apos;apenas amigos&apos;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation>Ocultar jogos cheios</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation>Ocultar jogos já iniciados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation>Ocultar jogos com senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation>Ocultar &apos;jogos de usuários ignorados&apos;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
-        <translation type="unfinished"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
+        <translation>Esconder jogos não criados por amigos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Mais novos que:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Descrição do jogo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>Nome do &amp;criador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>Tipos de &amp;jogos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>&amp;ao menos:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>no &amp;máximo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>Quantidade máxima de jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>Restrições</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Mostrar jogos apenas se &amp;espectadores puderem assistir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Mostrar jogos p&amp;rotegidos por senha para espectador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Mostrar apenas se espectadores puderem interagir com o chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Mostrar apenas se as mãos forem visíveis para os espectadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation>Espectadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>Filtrar jogos</translation>
     </message>
@@ -2535,52 +3148,52 @@ Certifique-se de habilitar a expansão &apos;Fichas&apos; em &quot;Gerenciar exp
 <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>Aviso de redefinição de desafio de senha</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>Houve um problema. Por favor, tente solicitar uma nova senha novamente.</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>Coloque a informação do servidor e a conta que você gostaria de solicitar uma nova senha.</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>&amp;Servidor:</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>&amp;Porta:</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>Jogador &amp;nome</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>Email:</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>Desafio de redefinir senha</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>Erro no desafio de redefinir senha</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>O endereço de email não pode estar vazio.</translation>
     </message>
@@ -2588,37 +3201,37 @@ Certifique-se de habilitar a expansão &apos;Fichas&apos; em &quot;Gerenciar exp
 <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>Coloque a informação do servidor que você gostaria de solicitar uma nova senha.</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>&amp;Servidor:</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>&amp;Porta:</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>Nome do &amp;jogador</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>Pedido de redefinição de senha.</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>Erro de redefinição de senha</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>O nome do jogador não pode ficar vazio.</translation>
     </message>
@@ -2626,86 +3239,86 @@ Certifique-se de habilitar a expansão &apos;Fichas&apos; em &quot;Gerenciar exp
 <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>Aviso de Redefinição de Senha</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>Um problema ocorreu. Por favor tente requisitar uma nova senha novamente.</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>Insira o código recebido e a nova senha para definir sua nova senha.</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>&amp;Servidor:</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>&amp;Porta:</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>Jogador &amp;nome:</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>Ficha:</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>Nova senha:</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>Redefinir Senha</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>O nome do jogador não pode estar vazio.</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>Erro de Redefinição de Senha</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>O código não pode estar vazia.</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>A nova senha não pode estar vazia.</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>Erro</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>Sua senha é muito curta.</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>As senhas não correspondem.</translation>
     </message>
@@ -2721,17 +3334,17 @@ Certifique-se de habilitar a expansão &apos;Fichas&apos; em &quot;Gerenciar exp
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>Carregar deck da área de transferência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>Lista de deck inválida.</translation>
     </message>
@@ -2739,43 +3352,43 @@ Certifique-se de habilitar a expansão &apos;Fichas&apos; em &quot;Gerenciar exp
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
-        <translation type="unfinished"/>
+        <translation>Carregar Baralho de Website</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Erro de rede: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2789,45 +3402,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>Carregar deck</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation>Jogadores:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation>Vida inicial total:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation>Lembrar configurações</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation>Opções de jogo local</translation>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation>Nome da carta (ou expressões de busca):</translation>
     </message>
     <message>
-        <location filename="src/game/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>Número de resultados:</translation>
     </message>
     <message>
-        <location filename="src/game/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>Reproduzir resultados automaticamente</translation>
     </message>
     <message>
-        <location filename="src/game/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>Colocar as cartas do topo na pilha até...</translation>
     </message>
     <message>
-        <location filename="src/game/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>Nenhuma carta correspondente à expressão de busca existe no banco de dados de cartas. Deseja continuar assim mesmo?</translation>
     </message>
     <message>
-        <location filename="src/game/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>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/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>Filtro inválido</translation>
     </message>
@@ -2835,54 +3481,54 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Insira seus dados e os do servidor que você gostaria de se registrar.
 Seu e-mail será utilizado para verificar sua conta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>&amp;Servidor:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>&amp;Porta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>Nome do &amp;jogador:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>S&amp;enha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>Senha (novamente):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>Email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>Email (novamente):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>País:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>Indefinido</translation>
     </message>
@@ -2928,17 +3574,17 @@ Seu e-mail será utilizado para verificar sua conta.</translation>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation>Número de lados:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation>Número de dados:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation>Rolar dados</translation>
     </message>
@@ -2946,40 +3592,55 @@ Seu e-mail será utilizado para verificar sua conta.</translation>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
-        <translation type="unfinished"/>
+        <translation>Cartas não modificadas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
-        <translation type="unfinished"/>
+        <translation>Cartas Modificadas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>Erro desconhecido ao carregar bando de dados de cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -2996,7 +3657,7 @@ Você pode precisar rodar o Oracle novamente para atualizar o banco de dados de
 Você gostaria de mudar o local da configuração de seu banco de dados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3013,7 +3674,7 @@ Usualmente isto pode ser consertado rodando novamente o Oracle para atualizar se
 Você gostaria de alterar o local da configuração de seu banco de dados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3026,7 +3687,7 @@ Por favor, envie um ticket para https://github.com/Cockatrice/Cockatrice/issues
 Gostaria de mudar a definição da localização da sua base de dados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3035,7 +3696,7 @@ Would you like to change your database location setting?</source>
 Você gostaria de alterar seu local de configuração de seu banco de dados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3044,7 +3705,7 @@ Would you like to change your database location setting?</source>
 Você gostaria de alterar seu local de configuração de banco de dados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3057,59 +3718,64 @@ Por favor, crie um ticket em https://github.com/Cockatrice/Cockatrice/issues
 Você gostaria de alterar seu local de configuração do banco de dados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>O caminho para a sua pasta de decks é inválido. Você gostaria de voltar e corrigir o caminho?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>O caminho para a sua pasta de imagens de cards é inválido. Você gostaria de voltar e corrigir o caminho?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>Aparência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>Interface do usuário</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation>Fonte de Cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>Conversa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>Som</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>Atalhos</translation>
     </message>
@@ -3117,57 +3783,57 @@ Você gostaria de alterar seu local de configuração do banco de dados?</transl
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
-        <translation type="unfinished"/>
+        <translation>Checar Atualização de Carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </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="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </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="29"/>
         <source>Don&apos;t run this time</source>
-        <translation type="unfinished"/>
+        <translation>Não executar desta vez</translation>
     </message>
 </context>
 <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>Próximo</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>Anterior</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>Dica do Dia</translation>
     </message>
@@ -3175,165 +3841,165 @@ 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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>Canal de lançamento atual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>Reinstalar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>Cancelar Download</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>Abrir página de download</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation>Procurar por atualizações do cliente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>Cockatrice não possui suporte a SSL, por causa disso você não pode baixar updates automaticamente! Por favor visite a página de downloads para atualizar manualmente. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation>Baixando atualização: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>Verificando atualizações...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>Busca por atualizações concluída</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>Sem atualização disponível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice está atualizado!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>Você já está executando a última versão disponível no canal de lançamento escolhido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>Versão atual</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>Canal de lançamento selecionado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>Atualização disponível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Uma nova versão do Cockatrice está disponível!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Nova versão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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>Lançado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>Log de mudanças</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>Você quer atualizar agora?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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>Infelizmente, o atualizador automática não encontrou um download compatível.
 Talvez você tenha que baixar a nova versão manualmente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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>Por favor confira a &lt;a href=&quot;%1&quot;&gt;página de releases&lt;/a&gt; no nosso repositório do Github e baixe o programa para o seu sistema.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>Erro na atualização</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Ocorreu um erro enquanto procurávamos por atualizações:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Um erro ocorreu enquanto uma atualização era baixada:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>Instalando...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice está incapaz de abrir o instalador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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>Tente atualizar o Cockatrice manualmente fechando-o e rodando o instalador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation>Localização do download</translation>
     </message>
@@ -3341,19 +4007,151 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
 <context>
     <name>DlgViewLog</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Limpar log ao fechar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
+        <translation>Copiar para área de transferência</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
+        <source>Debug Log</source>
+        <translation>Registro de Depuração</translation>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
-        <source>Debug Log</source>
-        <translation>Registro de Depuração</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation>Critério:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation>Nome da Carta</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation>Subtipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation>Valor de mana</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation>Exatidão</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation>Pelo menos</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation>Exatamente</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation>Quantidade (N):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation>Cartas compradas (M):</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation>cartas</translation>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation>Probabilidade de compra</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation>Nome da Carta</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation>Subtipo</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation>Valor de Mana</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation>Pelo menos</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation>Exatamente</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation>cartas</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation>Categoria</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation>Qtd</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation>Chances (%)</translation>
     </message>
 </context>
 <context>
@@ -3384,7 +4182,7 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="59"/>
         <source>Card Market</source>
-        <translation type="unfinished"/>
+        <translation>Mercado de Cartas</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/api/edhrec/display/card_prices/edhrec_api_response_card_prices_display_widget.cpp" line="60"/>
@@ -3426,32 +4224,38 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
     </message>
 </context>
 <context>
-    <name>EdhrecCommanderApiResponseNavigationWidget</name>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
-        <source>Combos</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
-        <source>Average Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
         <source>Game Changers</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
         <source>Budget</source>
+        <translation>Orçamento</translation>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
+        <source>Combos</source>
+        <translation>Combos</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
+        <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
         <source>Salt: </source>
         <translation>Sal:</translation>
     </message>
@@ -3459,7 +4263,7 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>Digite seu filtro aqui</translation>
     </message>
@@ -3467,201 +4271,254 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
 <context>
     <name>FilterDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
-        <translation type="unfinished"/>
+        <translation>Confirmar Exclusão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
-        <translation type="unfinished"/>
+        <translation>Falha na Exclusão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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>Falha ao remover filtro &apos;%1&apos;.</translation>
     </message>
 </context>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
-        <translation type="unfinished"/>
+        <translation>jogador saiu do jogo</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
-        <translation type="unfinished"/>
+        <translation>jogador desconectado do servidor</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
-        <translation type="unfinished"/>
+        <translation>motivo desconhecido</translation>
     </message>
 </context>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>Por favor, entre na sala apropriada primeiramente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>Senha incorreta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Não são permitidos visitantes neste jogo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>O jogo está cheio.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>O jogo não existe mais.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>Este jogo é aberto apenas para usuários registrados.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>Este jogo é aberto apenas para os amigos de quem criou o jogo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Você está sendo ignorado pelo criador deste jogo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation>Entrar no jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation>Assistir ao jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation>Informações do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation>Entrar no Jogo como Juíz</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>Entrar no jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>Senha:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>Por favor, entre na respectiva sala primeiro.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Filtrar jogos.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>L&amp;impar Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>C&amp;riar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>&amp;Entrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>E&amp;ntrar como visitante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation>Jogos mostrados: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>Jogos</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation>&gt;1 dia</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="43"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 h</numerusform><numerusform>%1%2 h</numerusform><numerusform>%1%2 h</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation>novo</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="48"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform><numerusform>%1%2 min</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>apenas amigos</translation>
     </message>
@@ -3671,68 +4528,68 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
         <translation>usuários reg. apenas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>pode conversar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>ver mãos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>pode ver mãos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>não permitidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>Idade</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>Criador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>Restrições</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>Jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>Visitantes</translation>
     </message>
@@ -3740,143 +4597,158 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation>Redefinir todos os diretórios</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation>Todos os caminhos para diretórios foram redefinidos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>Escolher caminho</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>Configurações pessoais</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>Idioma:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>Caminhos (edição desabilitada no modo portátil)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>Caminhos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation>Como ajudar com as traduções</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>Pasta de decks:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>Pasta de replays:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>Pasta de imagens:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>Banco de dados de cartas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation>Diretório do banco de dados de cartas customizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>Banco de dados de fichas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation>Canal de atualização</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation>Verificar atualizações do cliente ao iniciar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>Notificar se uma função suportada pelo servidor está faltando em meu programa.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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>Rodar Oracle automaticamente quando rodar uma nova versão de Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>Exibir dicas ao iniciar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <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"/>
     </message>
@@ -3884,47 +4756,47 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -3932,111 +4804,141 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4044,193 +4946,213 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4238,651 +5160,273 @@ Talvez você tenha que baixar a nova versão manualmente.</translation>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>O servidor atingiu a capacidade maxima de usuarios, tente novamente mais tarde.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>Há conexões concorrentes demais vinds do seu endereço.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>Banido pelo moderador</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>Esperado tempo para fim: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>Este banimento dura indefinidamente.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>Servidor de eventos fora do ar.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>Usuário inválido</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>Você foi desconectado devido a um acesso em outra localidade.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>Conexão fechada</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>O servidor terminou sua conexão.
-Razão: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>O servidor será reiniciado em %n minuto(s).
-Todos os jogos serão perdidos.
-Motivo para desligar: %1</numerusform><numerusform>O servidor será reiniciado em %n minuto(s).
-Todos os jogos serão perdidos.
-Motivo para desligar: %1</numerusform><numerusform>O servidor será reiniciado em %n minuto(s).
-Todos os jogos serão perdidos.
-Motivo para desligar: %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>Servidor de eventos fora do ar</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>Sucesso</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>Registro aceito
-Irá entrar agora</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>Ativação da conta aceita.
-Irá entrar agora.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>Número de jogadores</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>Por favor, entre o número de jogadores.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>Jogador %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>Carregar replay</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>Sobre o Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>Pagina da Web do Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>Diretor do projeto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>Antigos diretores do projeto:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>Desenvolvedores:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>Nossos desenvolvedores</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>Ajude a desenvolver!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>Tradutores:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>Nossos tradutores.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>Ajude a traduzir!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>Suporte:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>Reporte um problema:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>Solução de problemas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>F.A.Q.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>Tempo esgotado do servidor</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>Login falhou</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation>Seu cliente parece estar faltando recursos que este servidor requer para conexão.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation>Para atualizar seu cliente, vá para &apos;Ajuda -&gt; Procurar por atualizações do cliente&apos;.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>Usuário ou senha incorretos. Por favor, verifique suas informações de autenticação e tente novamente.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>Já existe uma sessão ativa usando este nome de usuário.
-Por favor, feche a sessão primeiro e logue novamente.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>Você está banido até %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>Você está banido indefinidamente.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>Este servidor exige registro de usuário. Você gostaria de registrar agora?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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>Este servidor requer ID de cliente. Seu cliente ou não está conseguindo gerar um ID ou você está executando um cliente modificado.
-Por favor feche e abra seu cliente para tentar novamente. </translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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>Ocorreu um erro interno, por favor, feche e reabra o Cockatrice antes de tentar novamente.
-Se o erro persistir, verifique se você está executando a versão mais recente do software e, se necessário, entre em contato com os desenvolvedores de software.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>Ativação da conta</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>Sua conta não foi ativada ainda
-Você precisa fornecer o código de ativação recebido por email.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation>Servidor cheio.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>Erro de login desconhecido: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>
-Isso geralmente significa que seu cliente está obsoleto, e o servidor enviou uma resposta que seu cliente não entende.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>Seu nome de usuário precesia seguir essas regras:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>tem entre %1 e %2 caracteres</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>%1 pode conter caracteres minúsculos.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>NÃO</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>%1 pode conter caracteres maiúsculos.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>%1 pode conter caracteres numéricos.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>Pode conter a seguinte pontuação: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>Primeiro caractere pode %1 ser um sinal de pontuação</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <source>no unacceptable language as specified by these server rules:</source>
-        <comment>note that the following lines will not be translated</comment>
-        <translation>Nenhuma linguagem inaceitável, conforme especificado por estas regras do servidor:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation>Não pode conter nenhuma das seguintes palavras: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation>Não pode corresponder a nenhuma das seguintes expressões: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>Você pode usar apenas A-Z, a-z, 0-9, _, ., e - em seu nome de usuário.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>Registro negado</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>Registro está atualmente desabilitado neste servidor</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>Já existe uma conta com este nome de usuário.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>É obrigatório especificar um endereço de email válido para registrar.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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>Aparentemente você está tentando registrar uma nova conta nesse servidor, porém você já tem uma conta registrada com o e-mail fornecido. Este servidor restringe a quantidade de contas que podem ser registradas por endereço. Por favor contate o operador do servidor para assistência posterior ou para obter informações das suas credenciais.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>Senha muito curta</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>Registro falhou devido a um problema tecnico no servidor.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>Erro de registro desconhecido: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>A ativação de conta falhou</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>Erro de ligação:%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>Você está tentando conectar a um servidor obsoleto. Por favor, faça um downgrade na versão do seu Cockatrice ou conecte-se ao servidor correto.
-A versão local é %1 e a versão remota é %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>A versão do seu Cockatrice é obsoleta. Por favor, atualize a sua versão.
-A versão local é %1 e a versão remota é %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>Conectando a %1...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>Registrando em %1 como %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>Desconectado</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>Conectado, logando em %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>Solicitando senha esquecida para %1 como %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Conectar...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Desconectar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>Iniciar jogo &amp;local...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Assistir replay...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>Tela &amp;cheia</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Registrar ao servidor:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;Recuperar senha...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Configurações...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>&amp;Sair</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>Açõ&amp;es</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>Base de Cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;Gerenciar expansões...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Editar &amp;fichas personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>Abrir pasta customizada de imagens.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>Abrir pasta de sets personalizados</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>Adicionar sets/cartas personalizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation>Recarregar banco de dados de cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation>Abas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>So&amp;bre o Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;Dica do Dia</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation>Procurar por atualizações do cliente</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation>Procurar por atualizações de cartas...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation>Ver registro de &amp;depuração</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation>Abrir Pasta de Configurações</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation>Mostrar/Ocultar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation>Nova Versão</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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>Parabéns por atualizar o Cockatrice %1!
 Oracle será inicializado agora para atualizar sua base de cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice instalado</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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>Parabéns pela instalação do Cockatrice %1!
 O Oracle agora será iniciado para instalar o banco de dados inicial de cartas.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>Base de cartas</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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>
@@ -4891,29 +5435,29 @@ Gostaria de atualizar seu banco de dados de cartas agora?
 Se estiver em dúvida ou for um novo usuário selecione &quot;Sim&quot;</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>Abrir configurações</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>Novas expansões encontradas</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
@@ -4926,17 +5470,22 @@ Códigos das coleções: %1
 Deseja ativá-las?</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>Visualizar expansões</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>Bem vindo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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>
@@ -4945,741 +5494,902 @@ Todas as expansões do banco de dados de cartas foram habilitadas.
 Leia mais sobre mudar a ordem das expansões ou desabilitando expansões específicas na aba &quot;Gerenciar Expansões&quot;.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>Uma atualização da base de dados de cartas já está em andamento.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>Não foi possível executar a atualização da base de dados de cartas.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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>Falha ao começar. O arquivo pode não existir ou as permissões estão incorretas.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>Esse servidor oferece suporte a recursos adicionais que seu cliente não possui.
-Provavelmente não é um problema, mas esta mensagem pode significar que existe uma nova versão do Cockatrice disponível ou este servidor está executando uma versão personalizada ou pré-lançamento.
-
-Para atualizar seu cliente, vá para Ajuda -&gt; Verificar atualizações.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>Carregar expansões/cards</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>Arquivo selecionado não pode ser encontrado</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation>Você só pode importar bancos de dados XML neste momento.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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>As novas cartas/coleções foram adicionadas com sucesso.
 O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>Falha ao importar expansões/cartas.</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
-        <translation>Redefinir Senha</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
-        <translation>Sua senha foi alterada com sucesso, você pode se conectar usando suas novas credenciais </translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>Falha ao redefinir a senha da conta do usuário, entre em contato com o operador do servidor para redefinir sua senha.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
-        <translation>Solicitação de ativação recebida, verifique seu e-mail para um token de ativação.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation>do jogo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation>do seu cemitério</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation> vindo do exílio</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation>da sua mão</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>a carta do topo do grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation>a carta do topo do seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation>do topo do grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation>do topo do seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>a carta do fundo do grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation>a carta do fundo do seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation>do fundo do grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation>do fundo do seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation>do grimório de %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation>do seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation> vindo do sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation> vindo da pilha</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1 está mantendo as carta do topo %2 reveladas.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1 não está mais revelando as cartas do topo %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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>%1 agora pode olhar a carta do topo de %2 a qualquer momento.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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>%1 não pode mais olhar a carta do topo de %2 a qualquer momento.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1 vincula %2 a %4 de %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 concedeu o jogo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 desfez a concessão do jogo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1 restaurou a conexão com o jogo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 perdeu conexão com o jogo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation>%1 aponta de sua %2 para si</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation>%1 aponta de sua %2 para %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation>%1 aponta da %3 de %2 para si</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation>%1 aponta da %3 de %2 para %4</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1 aponta da sua %2 para sua %3</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1 aponta de sua %2 para %4 de %3</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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>%1 aponta da %3 de %2 para seu próprio %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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>%1 aponta da %3 de %2 para a %5 de %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 cria uma ficha: %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 carregou um deck (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>%1 carregou um deck com %2 cartas no sideboard (%3).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation>%1 destrói %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>um card</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1 dá controle para %2 sobre %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="308"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation>%1 coloca %2 em jogo%3 com a face voltada para baixo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1 põe %2 no campo de batalha %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation>%1 coloca %2%3 em seu cemitério.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 exila %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation>%1 moveu %2%3 para sua mão.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation>%1 coloca %2%3 em seu grimório</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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>%1 coloca %2%3 no fundo de seu grimório.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation>%1 coloca %2%3 no topo de seu grimório.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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>%1 coloca %2%3 do seu grimório %4 cartas abaixo do topo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 move %2%3 para o sideboard.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 põe %2 na pilha%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="373"/>
         <source>%1 tries to draw from an empty library</source>
         <translation>%1 tenta comprar de uma biblioteca vazia</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation><numerusform>%1 comprou %2 carta(s).</numerusform><numerusform>%1 comprou %2 carta(s).</numerusform><numerusform>%1 comprou %2 carta(s).</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 está olhando para %2.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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><numerusform>%1 está olhando para a(s) %3 carta(s) %4 %2.</numerusform><numerusform>%1 está olhando para a(s) %3 carta(s) %4 %2.</numerusform><numerusform>%1 está olhando para a(s) %3 carta(s) %4 %2.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation>de fundo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation>de topo</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1 turnos %2 cartas viradas para baixo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1 turnos %2 cartas viradas para cima.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>O jogo foi fechado.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>O jogo começou.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1 entrou no jogo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 está assistindo o jogo agora.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>Você foi &apos;chutado&apos; do jogo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 deixou o jogo (%2)</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation>%1 não está mais assistindo o jogo (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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>%1 não está mais pronto para inciar o jogo.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform>%1 embaralhou seu grimório e comprou uma nova mão com %2 card.</numerusform><numerusform>%1 embaralhou seu grimório e comprou uma nova mão com %2 cards.</numerusform><numerusform>%1 embaralhou seu grimório e comprou uma nova mão com %2 cards.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="473"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation>%1 embaralhou seu grimório e comprou uma nova mão.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation>Você está assistindo o replay do jogo #%1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1 está pronto para inciar o jogo.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="510"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation>cartas</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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><numerusform>%1 carta</numerusform><numerusform>%1 carta(s)</numerusform><numerusform>%1 carta(s)</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation>%1 empresta %2 para %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1 revela %2 para %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1 revela %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation>%1 revela aleatoriamente %2%3 para %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1 revela aleatoriamente %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation>%1 olha a carta virada para baixo #%2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation>%1 espia a face para baixo da carta #%2: %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation>%1 revela %2 %3 para %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 revela %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="576"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation>%1 reverteu a ordem dos turnos, agora é a vez de %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation>revertido</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation>normal</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>Cara</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>Coroa</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation>%1 jogou uma moeda. Saiu %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1 tirou %2 em um D%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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>%1 joga %2 moedas. São %3 caras e %4 coroas.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="608"/>
         <source>%1 rolls a %2-sided dice %3 times: %4.</source>
         <translation>%1 rola um dado de %2 lados %3 vezes: %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>Turno de %1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation>%1 altera a anotação de %2 para %3.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <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><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation>%1 ajusta o marcador %2 para %3 (%4%5).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%1 determina que %2 não desvira normalmente.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 determina que %2 desvira normalmente.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 remove o P/R de %2</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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>%1 alterar o PR de %2 de nada para %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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>%1 alterar o P/R de %2 de %3 para %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1 bloqueou seu sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 desbloqueou seu sideboard</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 vira suas permanentes.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 desvira suas permanentes.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1 vira %2</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1 desvira %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 embaralha %2</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="769"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation>%1 embaralha as %3 cartas do fundo de %2</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="774"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation>%1 embaralha as %3 cartas do topo de %2</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation>%1 embaralha as cartas %3 - %4 de %2</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 desanexa %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 desfaz sua última compra.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 desfaz sua última compra (%2).</translation>
     </message>
@@ -5687,110 +6397,115 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation>Palavra1 Palavra2 Palavra3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation>Adicionar nova mensagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation>Editar mensagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation>Remover mensagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>Adicionar mensagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>Mensagem:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation>Editar mensagem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>Configurações de Conversa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>Palavras de alertas customizadas.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>Habilitar menções em conversa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>Habilitar completador de menções.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>Mensagem no jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="243"/>
         <source>How to use in-game message macros</source>
         <translation>Como usar macros de mensagens no jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>Ignorar mensagens na sala enviadas por usuários não registrados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>Ignorar mensagens privadas enviadas por usuários não registrados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>Inverter cor do texto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>Ativar notificações da área de trabalho para mensagens privadas.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>Habilitar notificações de desktop para menções.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>Ativar histórico de mensagens da sala ao entrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>(Cor em hexadecimal)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Separar palavras com um espaço, apenas caracteres alfanuméricos</translation>
     </message>
@@ -5798,37 +6513,42 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -5841,47 +6561,47 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
         <translation>Tipo de Carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation>Valor de Mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation>Cor(es)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation>Lealdade</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation>Tipo de Carta Principal</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation>Custo de Mana</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation>P/R</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation>Side</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation>Layout</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation>Identidade de Cor</translation>
     </message>
@@ -5904,65 +6624,211 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
         <translation>Direção da sobreposição:</translation>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation>Frase desconhecida</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation>Desvirar</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation>Manutenção</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation>Compra</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation>Primeira fase principal</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation>Início do combate</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation>Declaração de atacantes</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation>Declaração de bloqueadores</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation>Dano de combate</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation>Fim do combate</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation>Segunda fase principal</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation>Fim do turno</translation>
     </message>
@@ -5970,57 +6836,57 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>Etapa de desvirar</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>Etapa de manutenção</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>Etapa de compra</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>Primeira fase principal</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>Etapa de início de combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>Etapa de declaracão de atacantes</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>Etapa de declaração de bloqueadores</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>Etapa de dano de combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>Etapa de fim de combate</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>Segunda fase principal</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>Etapa de fim de combate</translation>
     </message>
@@ -6028,7 +6894,7 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>pt</translation>
@@ -6037,183 +6903,195 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation>Preferência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation>Fixar Impressão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation>Desafixar Impressão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation>Mostrar Cartas Relacionadas</translation>
     </message>
@@ -6229,17 +7107,17 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation>Carta Anterior no Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation>Próxima Carta no Deck</translation>
     </message>
@@ -6247,86 +7125,94 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation>Alfabética</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation>Preferência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation>Data de Lançamento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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>Decrescente</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation>Crescente</translation>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"/>
     </message>
@@ -6334,37 +7220,37 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>Serviços</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>Esconder %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>Esconder outros</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>Mostrar tudo</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>Sair %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>Sobre %1</translation>
     </message>
@@ -6372,153 +7258,247 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Banco de dados de cartas do Cockatrice (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>Todos arquivos (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatrice replays (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>Main</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>Side</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>Fichas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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"/>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation>Salvar Todos</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation>&amp;Sim</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation>Sim para &amp;Todos</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation>&amp;Não</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation>Não para &amp;Todos</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation>Tentar Novamente</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation>Descartar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation>Ajuda</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation>Aplicar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation>Resetar</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation>Restaurar Padrão</translation>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>Hora do upload</translation>
     </message>
@@ -6526,32 +7506,32 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>Código</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>Jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>Manter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>Tempo iniciado</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>Duração (seg)</translation>
     </message>
@@ -6559,37 +7539,37 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -6597,41 +7577,49 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>Salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>&amp;Entrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>Permissões</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>Jogadores</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>Jogos</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6668,27 +7656,27 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>Ativado</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>Selecione tipo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>Selecione código</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>Nome longo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>Data lançamento</translation>
     </message>
@@ -6696,53 +7684,53 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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>Restaurar todos atalhos padrões</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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>Você tem certeza que deseja restaurar todos atalhos padrões?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation>Limpar todos os atalhos padrão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="111"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>Você realmente quer limpar todos os atalhos?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation>Seção:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation>Ação:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation>Atalho:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation>Como definir atalhos personalizados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation>Limpar todos os atalhos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation>Pesquisar pelo nome do atalho</translation>
     </message>
@@ -6750,12 +7738,12 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>Ação</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>Atalho</translation>
     </message>
@@ -6763,14 +7751,14 @@ O Cockatrice reiniciará imediatamente o banco de dados de cartas.</translation>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>Seu arquivo de configurações contém atalhos inválidos.
 Por favor, verifique suas configurações de atalho!</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>Os seguintes atalhos foram configurados como padrão:
@@ -6798,12 +7786,12 @@ Por favor, verifique suas configurações de atalho!</translation>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -6811,27 +7799,27 @@ Por favor, verifique suas configurações de atalho!</translation>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>Habilitar &amp;sons</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>Tema sonoro atual:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>Testar sistema de som</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>Configurações de som</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>Volume principal</translation>
     </message>
@@ -6839,48 +7827,48 @@ Por favor, verifique suas configurações de atalho!</translation>
 <context>
     <name>SpoilerBackgroundUpdater</name>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation>Temporada de &apos;spoilers&apos; encerrada</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>Deletando spoiler.xml. Favor rodar o Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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>Falha no download de &apos;spoilers&apos;</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation>Sem conexão com a internet</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation>&apos;Spoilers&apos; já atualizados</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation>Nenhum &apos;spoiler&apos; novo adicionado</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation>&apos;Spoilers&apos; foram adicionados!</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation>Última alteração:</translation>
     </message>
@@ -6903,16 +7891,146 @@ Por favor, verifique suas configurações de atalho!</translation>
         <translation>Resposta inválida do servidor de atualização</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="177"/>
         <source>No reply received from the tag update server.</source>
         <translation>Nenhuma resposta recebida do servidor de atualização de tags.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="184"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Resposta inválida recebida do servidor de atualização de tags.</translation>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7044,56 +8162,227 @@ Por favor, verifique suas configurações de atalho!</translation>
         <translation>Não foi possível ativar o usuário. Erro interno</translation>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation type="unfinished"/>
+    </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="262"/>
+        <source>Any</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>Informação da carta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation>Impressão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>Visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>Flutuante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation>Reiniciar layout</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="82"/>
         <source>Deck: %1</source>
         <translation>Deck: %1</translation>
     </message>
@@ -7101,61 +8390,49 @@ Por favor, verifique suas configurações de atalho!</translation>
 <context>
     <name>TabDeckEditorVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7163,22 +8440,22 @@ Por favor, verifique suas configurações de atalho!</translation>
 <context>
     <name>TabDeckEditorVisualTabWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="43"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <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"/>
     </message>
@@ -7219,8 +8496,8 @@ Por favor, verifique suas configurações de atalho!</translation>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Nova pasta</translation>
     </message>
@@ -7236,84 +8513,84 @@ Por favor, verifique suas configurações de atalho!</translation>
         <translation>Abrir pasta de decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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>Arquivo de deck inválido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>Entre o nome do deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>Este deck não tem um nome.
 Por favor, entre um nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>Deck sem nome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation>Falha ao enviar deck ao servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>Excluir arquivo local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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>Tem certeza de que deseja excluir os arquivos selecionados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation>Excluir decks remotos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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>Tem certeza de que deseja excluir os decks selecionados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Nome da nova pasta:</translation>
     </message>
@@ -7326,17 +8603,17 @@ Por favor, entre um nome:</translation>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation>Decks Visuais</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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"/>
     </message>
@@ -7377,7 +8654,7 @@ Por favor, entre um nome:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation type="unfinished"/>
     </message>
@@ -7385,197 +8662,191 @@ Por favor, entre um nome:</translation>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>Replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>Lista de jogadores.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>Informação da carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>Mensagens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>Linha do tempo do Replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>&amp;Etapas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>&amp;Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>Próxima &amp;etapa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation>Próxima etapa com &amp;acao</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>Próximo &amp;turno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation>Ordem dos turnos revertida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>&amp;Apagar todas as setas locais</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>Girar visualização em sentido h&amp;orário</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>Girar visualização em sentido a&amp;nti-horário</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>&amp;Informação de jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation>Cancelar Rendição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>&amp;Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Sair do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>&amp;Fechar replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;Focar no chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>&amp;Falar:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>&amp;Visualizar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>Visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>Flutuante</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation>Reiniciar layout </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>Conceder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>Você tem certeza que deseja conceder este jogo?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation>Defazer concessão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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>Você já concedeu. Quer retornar a esse jogo?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>Sair do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>Você tem certeza que deseja sair deste jogo?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation>Um jogador entrou no jogo #%1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation>%1 entrou no jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>Você foi &apos;chutado&apos; do jogo.</translation>
     </message>
@@ -7583,7 +8854,7 @@ Por favor, entre um nome:</translation>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
@@ -7591,158 +8862,158 @@ Por favor, entre um nome:</translation>
 <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>Logs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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>Tempo;RemetenteNome;RemetenteIP;Mensagem;AlvoID;AlvoNome</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation>Logs de salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>Logs de jogos</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>Logs de conversas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>Você precisa selecionar pelo menos um filtro.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Você precisa selecionar um número de dias válido para localizar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>Nome de usuário.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>Endereço de IP:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>Nome do jogo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>ID do Jogo:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>Mensagem:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>Sala Principal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>Sala de Jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>Chat Privado.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>X dias anteriores:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>Última hora</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation>Máximo de resultados:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>Ao menos um filtro deve ser selecionado.
 Quanto mais informação você inserir, mais específicos seus resultados serão.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation>Obter logs de usuário</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation>Limpar Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation>Logs de localização</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation>Intervalo de data</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation>Máximo de resultados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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>Histórico de Mensagens</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation>Falha ao coletar informação do histórico de mensagens. </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Não existe mensagem que corresponda aos filtros selecionados.</translation>
     </message>
@@ -7760,27 +9031,27 @@ Quanto mais informação você inserir, mais específicos seus resultados serão
         <translation>&amp;Sair</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Conversa privada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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>Este usuário esta ignorando você, ele não pode ver suas mensagens no chat principal e você não pode entrar nos jogos dele.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation>Mensagem privada de</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1 saiu do servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1 entrou no servidor.</translation>
     </message>
@@ -7788,180 +9059,180 @@ Quanto mais informação você inserir, mais específicos seus resultados serão
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>Sistema de arquivos local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>Servidor de armazenamento de replays</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>Assistir replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation>Renomear</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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>Nova pasta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>Excluir</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation>Abrir pasta de repetições</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>Baixar replay</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>Trocar expiração da trava</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation>Renomear pasta local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation>Renomear arquivo local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation>Novo nome:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation>Falha ao renomear</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation>Nome da nova pasta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>Excluir arquivo local</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>Tem certeza de que deseja excluir os arquivos selecionados?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="505"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>Tem certeza de que deseja excluir as repetições selecionadas?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>Excluir replay remoto</translation>
     </message>
@@ -7974,47 +9245,62 @@ Quanto mais informação você inserir, mais específicos seus resultados serão
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>&amp;Falar:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>&amp;Sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>S&amp;air da sala</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>Limpar conversa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>Configurações de Conversa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation>mencionou você.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation>Clique para ver</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>Você está flodando o chat. Por favor, espere alguns segundos.</translation>
     </message>
@@ -8027,30 +9313,30 @@ Quanto mais informação você inserir, mais específicos seus resultados serão
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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>Falha ao entrar na sala: ela não existe no servidor.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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>O servidor pensa que você está na sala, mas seu cliente não consegue exibi-la. Tente reiniciar o seu cliente.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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>Você não tem permissão para entrar nesta sala.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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>Falha ao entrar na sala devido a um erro desconhecido: %1.</translation>
     </message>
@@ -8058,92 +9344,97 @@ Quanto mais informação você inserir, mais específicos seus resultados serão
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation>Editor de Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation>&amp;Decks Visuais</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation>Conta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation>Armazenamento de Deck</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation>Repetições de jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation>Administração</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation>Registros</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>Você tem certeza?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>Ainda existem jogos abertos. Você tem certeza que deseja sair?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation>Clique para visualizar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>Seu amigo %1 entrou no servidor!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation>Evento desconhecido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8154,39 +9445,39 @@ Esta mensagem pode significar que existe uma nova versão do Cockatrice disponí
 Para atualizar seu cliente, vá para Ajuda -&gt; Verificar atualizações.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation>Tempo esgotado de inatividade</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Você irá ser desconectado por inatividade</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>Promoção</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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>Você foi promovido a moderador(a). Por favor faça logout e depois acesse novamente para que as mudanças sejam efetivadas.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>Advertido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>Você recebeu uma advertência por %1.
 Por favor evite tais ações ou outras medidas poderão ser tomadas contra você. Se você tem qualquer dúvida, por favor envie uma mensagem privada um dos moderadores.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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>Você recebeu a seguinte mensagem do servidor.
@@ -8195,6 +9486,11 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8235,42 +9531,42 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>Vida</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>Branco</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>Azul</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>Preto</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>Vermelho</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>Verde</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>Incolor</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>Outro</translation>
     </message>
@@ -8278,151 +9574,209 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation>Não foi possível abrir o arquivo para leitura.</translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>&amp;Detalhes do usuário</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>Conversa privada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Mostrar este usuário de jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>Adicionar à &amp;lista de amigos</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Remover da li&amp;sta de amigos</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>Adicionar à li&amp;sta dos ignorados</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Remover da lista dos i&amp;gnorados</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>C&amp;hutar do jogo</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="67"/>
         <source>Warn user</source>
         <translation>Advertir usuário</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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Visualizar o histórico de advertê&amp;ncias do usuário.</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="69"/>
         <source>Ban from &amp;server</source>
         <translation>Ban&amp;ir do servidor</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Visualizar o histórico de %banimento do usuário.</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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Promover usuário a moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>Rev&amp;ogar as permissões de moderação do usuário</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation>Promover usuário a &amp;juiz</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="74"/>
         <source>Demote user from judge</source>
         <translation>Remover usuário da posição de juiz</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="75"/>
         <source>View admin notes</source>
         <translation>Visualizar notas do administrador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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"/>
     </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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>Jogos de %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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>Histórico de banimento</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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>Tempo de banimento;Moderador;Duração do Banimento;Razão do Banimento;Razão Visível</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation>O usuário nunca foi banido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation>Falha ao coletar informações de banidas.</translation>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation>Histórico de advertências</translation>
     </message>
@@ -8437,55 +9791,65 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
         <translation>Usuário nunca foi advertido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation>Falha ao coletar informações de aviso.</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="249"/>
         <source>Failed to get admin notes.</source>
         <translation>Falha ao obter as notas do administrador.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>Sucesso</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>Usuário promovido com sucesso.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>Permissões de moderação revogadas com sucesso.</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Falha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>Falha ao promover usuário.</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>Falha ao revogar permissões de moderação do usuário.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation>Copiar hash para área de transferência</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation>Remover mensagens deste usuário</translation>
     </message>
@@ -8493,311 +9857,554 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>Idade conta:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>Alterar senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>Alterar avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>Administrador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>Moderador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>Usuário registrado</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>Usuário não registrado</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>Juíz</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="371"/>
         <source>The entered password does not match your account.</source>
         <translation>A senha inserida não coincide com de sua conta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>Informação</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>Informações do usuário atualizadas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation>Informação do usuário</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation>Nome real:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation>Nível do usuário:</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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><numerusform>%n ano(s),</numerusform><numerusform>%n ano(s),</numerusform><numerusform>%n ano(s),</numerusform></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="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><numerusform>%10%n dia(s) %20</numerusform><numerusform>%10%n dia(s) %20</numerusform><numerusform>%10%n dia(s) %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation>Insira a senha</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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>Uma verificação de senha é obrigatória para alterar seu endereço de e-mail</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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>Ocorreu um erro ao tentar atualizar suas informações de usuário.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>Este servidor não permite que você atualize suas informações de usuário.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>Senha alterada.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>Este servidor não permite que você altere sua senha.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>A nova senha é muito curta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>A senha antiga está incorreta.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>Avatar alterado.</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Este servidor não permite que você altere seu avatar.</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>Um erro ocorreu enquanto seu avatar era atualizado.</translation>
+        <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>Este servidor não permite que você atualize suas informações de usuário.</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>Configurações gerais de interface</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>&amp;Duplo clique nos cards para jogá-los (ao invés de clique simples)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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>Clicar reproduz todas as cartas selecionadas (em vez de apenas a carta clicada)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>&amp;Jogar todos não terrenos na pilha (não campo de batalha) por padrão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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"/>
+    </message>
+    <message>
+        <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>Fechar janela de visualização ao remover a última carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>Anotar texto de card nas fichas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Usar menus tear-off, permitindo que menus de clique com botão direito persistam na tela</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation>Configurações de Notificações</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>Habilitar notificações na barra de tarefas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>Notificar na barra de tarefas para eventos do jogo enquanto você está como espectador</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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>Notificar na barra de tarefas quando usuários na sua lista de amigos se conectar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>Configurações de animação</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>Animação de &amp;virar/desvirar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation>Configurações do editor/armazenamento de decks</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="231"/>
         <source>Open deck in new tab by default</source>
         <translation>Abrir deck em uma nova aba por padrão</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="232"/>
         <source>Use visual deck storage in game lobby</source>
         <translation>Usar decks visuais no lobby do jogo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation>Configurações de repetição</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="246"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Tempo de buffer para retroceder usando atalho:</translation>
     </message>
@@ -8805,22 +10412,22 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation>Usuários conectados ao servidor: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation>Usuários nesta sala: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation>Amigos online: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation>Usuários ignorados online: %1 / %2</translation>
     </message>
@@ -8828,124 +10435,256 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8953,7 +10692,7 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDatabaseDisplayRecentSetFilterSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="41"/>
+        <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"/>
     </message>
@@ -8961,19 +10700,19 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDatabaseDisplaySetFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
@@ -8981,27 +10720,37 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9009,50 +10758,93 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -9060,46 +10852,25 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDeckEditorWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation>Decks Visuais</translation>
     </message>
@@ -9107,47 +10878,52 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDeckStorageQuickSettingsWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9155,7 +10931,7 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDeckStorageSearchWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp" line="25"/>
+        <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"/>
     </message>
@@ -9163,22 +10939,22 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDeckStorageSortWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="47"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
         <source>Sort Alphabetically (Deck Name)</source>
         <translation>Ordenar Alfabeticamente (Nome do Deck)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation>Ordenar Alfabeticamente (Nome do Arquivo)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="51"/>
         <source>Sort by Last Modified</source>
         <translation>Ordenar por Última Modificação</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="52"/>
         <source>Sort by Last Loaded</source>
         <translation>Ordenar por Último Carregamento</translation>
     </message>
@@ -9186,17 +10962,17 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>VisualDeckStorageWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation>Carregando banco de dados ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9204,43 +10980,43 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>WarningDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>Qual advertência você gostaria de enviar?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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>Remover todas mensagens deste usuário em todas salas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>%OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>Advertir usuario por mau comportamento.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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>O campo &quot;nome de usuário&quot; ao qual se deseja enviar uma advertência não pode permanecer em branco, por favor especifique um usuário para ser advertido.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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>O campo &quot;advertência&quot; não pode permanecer em branco, por favor selecione uma advertência para ser enviada.</translation>
     </message>
@@ -9248,133 +11024,133 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <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>Mover o selecionado para o topo</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>Mover o selecionado para cima</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>Mover o selecionado para baixo</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>Mover o selecionado para o fundo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation>Procurar por expansão, código ou tipo</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="70"/>
         <source>Default order</source>
         <translation>Ordem padrão</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>Restaurar prioridade da ordem de arte original</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="107"/>
         <source>Enable all sets</source>
         <translation>Habilitar todas expansões</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="108"/>
         <source>Disable all sets</source>
         <translation>Desabilitar todas expansões</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="109"/>
         <source>Enable selected set(s)</source>
         <translation>Habilitar expansão/expansões selecionada(s)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation>Desabilitar expansão/expansões selecionada(s)</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="126"/>
         <source>Deck Editor</source>
         <translation>Editor de Deck</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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation>Use CTRL+A para selecionar todas expansões visíveis.</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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation>Apenas cartas em expansões ativadas irão aparecer na lista de cartas do editor de deck.</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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation>Prioridade da imagem é decidida na seguinte ordem:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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>primeiro a pasta de PERSONALIDADAS (%1), depois as expansões habilitadas neste diálogo (de cima para baixo)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Card Art</source>
         <translation>Arte da Carta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation>Como usar arte de carta personalizada</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation>Dicas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation>Nota</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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation>Classificar por coluna te permite encontrar um set sem mudar a prioridade de sets</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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>Para reabilitar a ordenação, clique no cabeçalho da coluna até que esta mensagem desapareça</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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation>Usar a classificação atual como a prioridade de sets</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
         <source>Sorts the set priority using the same column</source>
         <translation>Classificar a prioridade de sets usando a mesma coluna</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation>Gerenciar expansões</translation>
     </message>
@@ -9382,72 +11158,72 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation>Não agrupado</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation>Agrupar por Tipo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation>Agrupar por Valor de Mana</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation>Agrupar por Cor</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation>Não ordenado</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation>Ordenar por Nome</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation>Ordenar por Tipo</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation>Ordenar por Custo de Mana</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation>Ordenar por Cores</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation>Ordenar por P/T</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation>Ordenar por Conjunto</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>embaralhar quando fechar</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>visualização da pilha</translation>
     </message>
@@ -9455,7 +11231,7 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>Português do Brasil (Brazilian Portuguese)</translation>
     </message>
@@ -9463,12 +11239,12 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation>Conectar ao iniciar</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation>Depurar para um arquivo</translation>
     </message>
@@ -9476,1005 +11252,1078 @@ Por favor evite tais ações ou outras medidas poderão ser tomadas contra você
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>Janela Principal</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation>Editor de Deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>Saguão de jogo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation>Marcadores de carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation>Marcadores de jogador</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>Poder e Resistência</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>Etapas de Jogo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>Área de jogo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation>Mover Carta Selecionada</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>Visualizar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation>Mover A Carta Do Topo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation>Mover A Carta Do Fundo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>Jogabilidade</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation>Comprando</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation>Sala de Conversa</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation>Janela de Jogo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation>Carregar deck da área de transferência</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation>Repetições</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation>Abas</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation>Procurar por atualizações de cartas...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation>Conectar...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>Tela cheia</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation>Registrar...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation>Configurações...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation>Iniciar um Jogo Local...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation>Assistir Replay...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation>Limpar todos os FIltros</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation>Limpar Filtro Selecionado</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation>Remover Carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation>Gerenciar expansões...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation>Editar fichas customizadas...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation>Adicionar Carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation>Carregar Deck...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation>Carregar deck da área de transferência...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation>Novo Deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation>Abrir pasta de imagens customizadas</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation>Imprimir Deck...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation>Deletar carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation>Redefinir layout</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation>Salvar Deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation>Salvar Deck Como...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>Salvar deck na área de transferência, anotado</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation>Salvar deck na área de transferência</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation>Carregar deck local...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation>Carregar deck remoto...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation>Preparade para começar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation>Alternar trava de sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation>Adicionar marcador verde</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation>Remover marcador verde</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation>Definir marcadores verde...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation>Adicionar marcador vermelho</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation>Remover marcador vermelho</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation>Definir marcadores vermelhos</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation>Adicionar ponto de vida</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation>Remover ponto de vida</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation>Definir pontos de vida...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation>Adicionar marcador branco</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation>Remover marcador branco</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation>Definir marcadores brancos...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation>Adicionar marcador azul</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation>Remover marcador azul</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation>Definir marcadores azul</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation>Adicionar marcador preto</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation>Remover marcador preto</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation>Definir marcadores pretos...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation>Adicionar marcador incolor</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation>Remover marcador incolor</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation>Definir marcadores incolor...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation>Adicionar outro marcador</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation>Remover outro marcador</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation>Definir outros marcadores...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation>adicionar Poder (+1/+0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation>Remover Poder (-1/-0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>Mover Resistência Para Poder (+1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>Adicionar Resistência (+0/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>Remover Resistência (-0/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>Mover Poder Para Resistência (-1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>Adicionar Poder e Resistência (+1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>Remover Poder e Resistência (-1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation>Definir poder e resistência...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation>Redefinir poder e resistência</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>Desvirar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>Manutenção</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>Compra</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation>Primeira Fase Principal</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation>Iniciar Combate</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>Atacar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>Bloquear</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>Dano</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation>Terminar Combate</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation>Segunda Fase Principal</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>Fim</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation>Próxima Fase</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation>Ação de Próxima Etapa</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation>Próximo Turno</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation>Ocultar Carta na Janela de Revelação</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation>Virar / Desvirar Carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation>Desvirar Tudo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
-        <translation>Alternar modo de desvirar</translation>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation>Virar carta para cima</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation>Olhar carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation>Jogar Carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation>Anexar carta...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation>Desanexar carta...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation>Duplicar Carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation>Criar Ficha</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation>Criar todas as fichas relacionadas</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation>Criar Outra Ficha</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation>Definir anotação</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation>Selecionar Todas as Cartas na Zona</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation>Selecionar Todas as Cartas na Linha</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation>Selecionar Todas as Cartas na Coluna</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation>Fundo do Grimório</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>Exilar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>Cemitério</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>Mão</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation>Topo do Grimório</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation>Campo de batalha, Voltada para baixo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation>Campo de Batalha</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>Grimório</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>Sideboard</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation>Cartas do topo do grimório</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation>Cartas do Fundo da Biblioteca</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation>Fechar visualização recente</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation>Pilha</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation>Cemitério (Vários)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation>Exílio (Vários)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation>Empilhar Até Encontrar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation>Comprar carta do fundo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Comprar várias cartas do fundo...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation>Desenhar seta...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation>Remover setas locais</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation>Sair do jogo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>Conceder</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation>Rolar dados...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation>Embaralhar grimório</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>Mulligan</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation>Comprar uma carta</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation>Comprar várias cartas</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation>Desfazer compra</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation>Sempre revelar a carta do topo do grimório</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation>Sempre olhar para a carta do topo do grimório</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation>Rotacionar visão no sentido horário</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation>Rotacionar visão no sentido anti-horário</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation>Desfocar caixa de texto</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation>Focar no chat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation>Limpar chat</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation>Atualizar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation>Avançar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation>Retroceder</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation>Avançar Bastante</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation>Retroceder Bastante</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation>Reproduzir/Pausar</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation>Ativar/Desativar Avanço Rápido</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation>Decks Visuais</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation>Armazenamento de Deck</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation>Administração</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation>Registros</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_ru.ts b/cockatrice/translations/cockatrice_ru.ts
index 319905695..26d95fe1c 100644
--- a/cockatrice/translations/cockatrice_ru.ts
+++ b/cockatrice/translations/cockatrice_ru.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Установить жетоны...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>Установить жетоны</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Новое значение жетонов &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation>Обновить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation>Распознать имя сета и номер (если есть)</translation>
     </message>
@@ -36,81 +36,83 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation>Открыть в новой вкладке</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation>Вы уверены?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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>Деклист был изменен.
 Вы хотите сохранить изменения?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation>Не удалось открыть колоду по пути «%1»</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation>Не удалось сохранить сетевую колоду</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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>Колода не может быть сохранена.
 Проверьте что директория доступна для записи и попробуйте снова.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation>Сохранить колоду</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation>Не удалось сохранить колоду.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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>В колоде нет карт для экспорта</translation>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
-        <translation>Не выбрана колода для экспорта.</translation>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation>Список изменений</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation>Примечания администратора для %1</translation>
     </message>
@@ -118,214 +120,253 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation>Основная колода</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation>Сайдборд</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation>секунд</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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>Не удалость создать папку для тем в &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation>Включение этой опции приведет к невозможности выбора изданий для карт
-
-Вы не сможете выбирать предпочтительные издания для колод или смотреть какие издания предпочитают другие игроки
-
-Менеджер изданий будет доступен в меню База карт -&gt; Менеджер изданий
-
-Уверены что хотите включить эту опцию?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation>Включение этой опции приведет к возможности выбора изданий для карт
-
-Вы сможете выбирать предпочтительные издания для колод или смотреть какие издания предпочитают другие игроки
-
-Также, будет доступен Менеджер Изданий чтобы сортировать порядок изданий в меню выбора изданий (также доступны другие порядки сортировки, такие как алфавитный или по дате выпуска)
-
-Уверены что хотите выключить эту опцию?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation>Подтвердить изменения</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>Настройки темы</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>Текущая тема:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation>Открыть папку с темами</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation>Путь до обоев на домашней вкладке:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation>Частота смены обоев:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation>Отключено</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation>Настройки меню</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="415"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>Отображать сочетания клавиш в контекстном меню</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>Отрисовка карт</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>Отображать название карты поверх изображения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>Автоматически поворачивать карты альбомной ориентации </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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>Перезаписать все арты в соответствии с выбранными изданиями (Pre-ProviderID меняет это поведение)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Перемещать в начало списка выбора издания те выпуски, из которых в колоде есть карты.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>Увеличивать карты при наведении мыши</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation>Использовать скругленные углы карт</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>Минимальный процент наложения карт в стеке и вертикальной руке</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="434"/>
         <source>Maximum initial height for card view window:</source>
         <translation>Максимальная начальная высота для окна просмотра карты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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>строки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="436"/>
         <source>Maximum expanded height for card view window:</source>
         <translation>Макс. высота окна для просмотра карт</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation>Жетоны на картах</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation>Жетон %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>Раскладка руки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Отображать руку горизонтально (требует места)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>Выравнивание по левому краю</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>Сетка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>Инвертировать вертикальные координаты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Минимальное количество игроков для столбчатого расположения:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Максимальный размер шрифта для текста карт:</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -347,112 +388,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>Забанить по &amp;Имени игрока</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>Забанить по &amp;адресу IP</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>Забанить по I&amp;D клиента</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>Тип бана</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;постоянный бан</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;временный бан</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>&amp;Дни</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Часы</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Минуты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>Длительность бана</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>Пожалуйста, назовите причину бана.
 Эта информация сохраняется для модераторов и не будет видна забаненному игроку</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>Пожалуйста, назовите причину бана, которая будет видна забаненному игроку.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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>Отредактировать все сообщения от этого пользователя во всех комнатах</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>Забанить игрока на этом сервере</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>Необходимо выбрать тип бана: по имени, по адресу IP, по ID клиента или комбинацию этих трех типов.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>Необходимо ввести имя игрока при выборе опции бана по имени.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>Необходимо ввести адрес IP при выборе опции бана по IP.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>Необходимо ввести ID клиента при выборе опции бана по ID.</translation>
     </message>
@@ -460,152 +501,221 @@ 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="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation>Бета</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation>Нет ответа от сервера обновления версий.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Неправильный ответ от сервера обновления версий.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation>Нет ответа от сервера обновления файлов.</translation>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>Издания</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>Мана-стоимость</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>Сила/Выносливость:</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>Цвет(а)</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>И</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>ИЛИ</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>И НЕ</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>ИЛИ НЕ</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>Текст</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation>Издание</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>Мана-стоимость</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation>Количество маны</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>Редкость</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>Сила</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>Выносливость</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>Преданность</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>Формат</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation>Подтип</translation>
     </message>
@@ -613,22 +723,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>Изображение</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>Описание</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>Оба</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>Обратная сторона</translation>
     </message>
@@ -636,22 +746,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="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation>Посмотреть связанные карты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation>Добавить карту в колоду</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation>Колода</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation>Сайд</translation>
     </message>
@@ -664,12 +774,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation>Название:</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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation>Связанные карты:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation>Неизвестная карта:</translation>
     </message>
@@ -677,132 +797,150 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation>Показать...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation>Всем игрокам</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation>Посмотреть связанные карты</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation>Фишка:</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation>Все фишки:</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation>Выбрать все</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation>Выбрать строку</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation>Выбрать колонку</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation>Разыграть</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation>Спрятать</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation>Разыграть лицом вниз</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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>Повернуть / Развернуть</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
-        <translation>Выключить разворот в фазе разворота</translation>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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>Перевернуть</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation>Посмотреть лицевую сторону</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation>Клонировать</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation>Прикрепить к карте...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation>Открепить</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation>Нарисовать стрелку</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation>Добавить заметку</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation>Жетоны на карте</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation>&amp;Добавить жетон (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation>&amp;Убрать жетон (%1)</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation>&amp;Установить жетоны (%1)...</translation>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation>Размер карты</translation>
     </message>
@@ -810,133 +948,133 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation>своей руки</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation>%1 руки</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation>своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation>библиотеки %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation>своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation>библиотеки %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation>своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation>библиотеки %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation>своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation>библиотеки %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation>своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation>библиотеки %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation>своего кладбища</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation>кладбища %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation>своего изгнания</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation>изгнание %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation>своего сайда</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation>сайда %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation>своего сайда</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation>сайда %1</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation>кастомной зоны &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation>кастомной зоны &apos;%2&apos; игрока &apos;%1&apos;</translation>
@@ -945,7 +1083,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Ошибка распознавания, строка %1 колонка %2:</translation>
     </message>
@@ -953,29 +1091,470 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation>Ошибка распознавания, строка %1 колонка %2:</translation>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation>Плановый перерыв в работе сервера</translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation>Не удалось подключиться</translation>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation>Ошибка</translation>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation>Кастомная зона</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation>Посмотреть кастомную зону &apos;%1&apos;</translation>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation>Информация о карте</translation>
     </message>
@@ -983,47 +1562,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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>Искать по названию карты (или по поисковому запросу)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation>Добавить в колоду</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation>Добавить в сайд</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation>Выбрать издание</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation>Посмотреть на EDHRec (Командир)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation>Посмотреть на EDHRec (карта)</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation>Посмотреть связанные карты</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="127"/>
         <source>Add card to &amp;maindeck</source>
         <translation>Добавить карту в колоду</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="128"/>
         <source>Add card to &amp;sideboard</source>
         <translation>Добавить карту в сайд</translation>
     </message>
@@ -1031,87 +1580,97 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation>Обложка колоды</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation>Мана-стоимость</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation>Выбрать издание</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation>Колода</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation>Название колоды:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation>Настройки отоборажение обложки и тегов</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
         <source>Show banner card selection menu</source>
         <translation>Показать меню выбора обложки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation>Показать меню выбора тегов</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation>Комментарий:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation>Группировать по:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation>Хэш-сумма</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation>Увеличить количество</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation>Уменьшить количество</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation>Удалить строку</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="752"/>
         <source>Swap card to/from sideboard</source>
         <translation>Переместить карту в/из сайда</translation>
     </message>
@@ -1137,114 +1696,114 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation>Редактор колоды</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation>Новая колода</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation>Загрузить колоду</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation>Загрузить недавнюю колоду</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation>Сохранить колоду</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation>Сохранить колоду как...</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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation>Загрузить колоду из буфера обмена</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="162"/>
         <source>Edit deck in clipboard</source>
         <translation>Редактировать колоду из буфера обмена</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="166"/>
+        <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>Аннотировано</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="168"/>
+        <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>Не аннотировано</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation>Сохранить колоду в буфер обмена</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="168"/>
         <source>Annotated (No set info)</source>
         <translation>Аннотировано (нет информации об издании)</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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation>Не аннотировано (нет информации об издании)</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="172"/>
         <source>&amp;Print deck...</source>
         <translation>Распечатать колоду...</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="174"/>
         <source>Load deck from online service...</source>
         <translation>Загрузить колоду из онлайн-сервиса</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation>Сохранить колоду в онлайн-сервис</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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation>Создать деклист (decklist.org)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation>Создать деклист (decklist.xyz)</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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation>Анализировать колоду (deckstats.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation>Анализировать колоду (tappedout.net)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -1252,7 +1811,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation>Выбрать издание</translation>
     </message>
@@ -1260,194 +1819,171 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>Обновить спойлеры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>Успешно</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation>Адреса URL загрузки были сброшены.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>Загруженные изображения карт были сброшены.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>Ошибка</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation>Одно или более загруженных изображений карт не может быть удалено.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>Добавить URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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>Изменить URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation>Размер сетевого кеша:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation>TTL кеша перенаправлений:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation>Время жизни кеша редиректов</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation>Размер кеша изображений:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation>Добавить новый URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation>Удалить URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation>Дней</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>Обновление...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>Выбрать путь</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation>Приоритет загрузки URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>Спойлеры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>Скачивать спойлеры автоматически</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation>Расположение спойлеров:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>Последние изменения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>Спойлеры скачиваются автоматически при запуске</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>Нажмите, чтобы обновить вручную без перезапуска</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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> Не закрывать настройки до завершения ручного обновления</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation>Синхронная загрузка изображений карт</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation>Как добавить пользовательский URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>Удалить загруженные изображения</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation>Обнулить загруженные URL</translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
-        <translation>Размер кеша для загруженных артов</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
-        <translation>Размер кеша в памяти для загруженных артов</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation>Количество</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation>Издание</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>Номер</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation>Provider ID</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>Название</translation>
     </message>
@@ -1455,12 +1991,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation>Формат колоды (%1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation>Все файлы (*.*)</translation>
     </message>
@@ -1468,17 +2004,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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>Режим: полное совпадение</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="48"/>
         <source>Mode: Includes</source>
         <translation>Режим: частичное совпадение</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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>Фильтра совпадения цветов (И/ИЛИ/НЕ фильтр)</translation>
     </message>
@@ -1486,7 +2022,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="49"/>
         <source>Edit tags ...</source>
         <translation>Редактировать теги ...</translation>
     </message>
@@ -1494,62 +2030,62 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="101"/>
         <source>Deck Tags Manager</source>
         <translation>Управление тегами колоды</translation>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation>Редактируйте теги в колоде. Выберите нужные теги или добавьте новый:</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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation>Новый тег (например, Aggro)</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="104"/>
         <source>Add Tag</source>
         <translation>Добавить тег</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="105"/>
         <source>Filter tags...</source>
         <translation>Фильтр тегов...</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="106"/>
         <source>OK</source>
         <translation>ОК</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="107"/>
         <source>Edit default tags</source>
         <translation>Редактировать теги по умолчанию</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="108"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation>Неправильный ввод</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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>Название тега не может быть пустым!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation>Копировать тег</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>This tag already exists.</source>
         <translation>Этот тег уже существует</translation>
     </message>
@@ -1557,98 +2093,156 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation>Обложка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="395"/>
         <source>Open in deck editor</source>
         <translation>Открыть в редакторе колоды</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation>Редактировать теги</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation>Переименовать колоду</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="407"/>
         <source>Save Deck to Clipboard</source>
         <translation>Сохранить колоду в буфер обмена</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation>Аннотировано</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="411"/>
         <source>Annotated (No set info)</source>
         <translation>Аннотировано (нет информации об издании)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation>Не аннотировано</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="415"/>
         <source>Not Annotated (No set info)</source>
         <translation>Не аннотировано (нет информации об издании)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation>Переименовать файл</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation>Удалить файл</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation>Установить обложку колоды</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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>Новое название:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation>Не удалось переименовать</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation>Удалить файл</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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>Уверены, что хотите удалить выбранный файл?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation>Не удалось удалить</translation>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation>Добавлено</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation>Удалено</translation>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1666,75 +2260,75 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>Загрузить колоду...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Загрузить колоду удаленно...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation>Загрузить из буфера обмена...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation>Загрузить из интернета...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation>Выгрузить колоду</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>&amp;Готов</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation>Принудительный старт</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation>Сайдборд разблокирован</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation>Сайдборд заблокирован</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>Выбранный файл не может быть загружен</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation>Колода больше максимально возможного размера файла</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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>Уверены что хотите принудительно начать?
 Это кикнет всех неготовых игроков из игры</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation>Cockatrice</translation>
     </message>
@@ -1769,143 +2363,143 @@ This will kick all non-ready players from the game.</source>
         <translation>Загрузка...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>Известные Хосты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation>Удалить текущий выбранный сервер</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Обновить список известных публичных серверов</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>Новый хост</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>Название:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;Хост:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;Порт:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Имя пользователя:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>П&amp;ароль:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>&amp;Сохранить пароль</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>Присоединяться автоматически</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Автоматически подключится с последним логином при открытии Кокатрис</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>Если у вас появилась проблема при присоединении или регистрации - свяжитесь с сотрудниками для помощи!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>Веб-страница</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation>Обнулить пароль</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation>Забыли пароль?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>&amp;Подключиться</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>Логин</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation>Соединение с сервером</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>Подключиться к серверу</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation>URL сервера</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation>Порт связи</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation>Уникальное имя сервера</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>Предупреждение при соединении</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>Назовите ваш профиль для соединения.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>Ошибка при соединении</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Необходимо указать имя пользователя.</translation>
     </message>
@@ -1913,117 +2507,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>&amp;Запомнить настройки</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>&amp;Описание:</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>&amp;Игроки:</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>Основные</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>Формат игры</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>&amp;Пароль:</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>Только для &amp;друзей</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>Только для &amp;зарегистрированных пользователей</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>Ограничения</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>&amp;Зрители могут наблюдать за игрой</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>Зрителям &amp;необходим пароль для просмотра игры</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>Позволить зрителям &amp;комментировать</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>Зрители могут видеть &amp;руки игроков</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>Создать игру как зритель</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>Зрители</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>Начальное количество жизней:</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>Открыть деклист в лобби</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation>Настройки игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>&amp;Очистить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>Создать игру</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>Информация об игре </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>Ошибка сервера.</translation>
     </message>
@@ -2031,97 +2630,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Название:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Фишка</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Цвет:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>белый</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>синий</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>черный</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>красный</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>зеленый</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>многоцветный</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>бесцветный</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;Сила/Выносливость:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Примечание:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Уничтожить фишку, когда она покинет поле битвы</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation>Создать лицом вниз (скроет только название)</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Описание фишки</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Показать &amp;все фишки</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Показать фишки из указанной &amp;колоды</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>Выбрать фишку из списка</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>Создать фишку</translation>
     </message>
@@ -2129,53 +2728,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation>Редактировать теги</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation>Подтвердить</translation>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation>Отменить</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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation>Введите тег и нажмите Enter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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>✖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation>Неправильный ввод</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation>Название тега не может быть пустым!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation>Копировать тег</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation>Этот тег уже существует</translation>
     </message>
@@ -2183,40 +2782,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>Изображение не выбрано.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Чтобы сменить аватар, выберите новое изображение.
 Чтобы удалить текущий аватар, нажмите &quot;Сменить аватар&quot;, оставив поле выбора изображения пустым.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>Поиск...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>Сменить аватар</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>Открыть изображение</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Файлы изображений (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>Выбрано не подходящее изображение.</translation>
     </message>
@@ -2224,17 +2823,17 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation>Редактировать колоду из буфера обмена</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation>Неправильный деклист</translation>
     </message>
@@ -2242,38 +2841,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="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Старый пароль:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Новый пароль:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Подтверждение пароля:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Сменить пароль</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>Пароль слишком короткий</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Введенные пароли не совпадают.</translation>
     </message>
@@ -2281,93 +2880,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="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;Название</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Цвет</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="34"/>
         <source>white</source>
         <translation>белый</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="35"/>
         <source>blue</source>
         <translation>синий</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="36"/>
         <source>black</source>
         <translation>чёрный</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="37"/>
         <source>red</source>
         <translation>красный</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="38"/>
         <source>green</source>
         <translation>зелёный</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="39"/>
         <source>multicolor</source>
         <translation>мультицветный</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>бесцветный</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;Сила/Выносливость:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Примечание:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Описание фишки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>Добавить фишку</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Удалить фишку</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation>Редактировать пользовательские фишки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Введите имя фишки:</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>Ошибка </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>Выбранное имя конфликтует с существующей картой или токеном.
@@ -2392,12 +2991,12 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>Не указано</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Настоящее имя:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Редактировать профиль</translation>
     </message>
@@ -2435,112 +3034,113 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>2 часа</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation>Скрывать игры &quot;только для друзей&quot;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation>Скрыть заполненные игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation>Скрыть уже начавшиеся игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation>Скрыть игры, защищенные паролем</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation>Скрыть игры от игнорируемых пользователей</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
-        <translation>Скрыть игры, не созданные друзьями</translation>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation>Скрыть игры &quot;только с открытыми деклистами&quot;</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;Новее чем:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>&amp;Описание игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>Имя &amp;создателя</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>Основные</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>Форматы &amp;игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>не &amp;менее</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>не &amp;более</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>Максимальное количество игроков</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>Ограничения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>Показывать игры со &amp;зрителями</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>Показывать &amp;игры с паролем для зрителей</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>Показывать игры где зрители могут &amp;писать в чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>Показывать игры где зрители могут видеть &amp;руки игроков</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation>Зрители</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>Фильтровать игры</translation>
     </message>
@@ -2548,52 +3148,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>Предупреждение при проверке сброса пароля</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>Возникла проблема. Попробуй запросить новый пароль еще раз</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>Введите информации о сервере и учетной записи, для которой нужен новый пароль</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>&amp;Хост:</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>&amp;Порт:</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>&amp;Имя игрока:</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>Электронная почта:</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>Сбросить пароль</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>Предупреждение при проверке сброса пароля</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>Необходимо указать ваш e-mail</translation>
     </message>
@@ -2601,37 +3201,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>Введите информации о сервере и учетной записи, для которой нужен новый пароль</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>&amp;Хост:</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>&amp;Порт:</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>&amp;Имя игрока:</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>Забыл пароль</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>Ошибка сброса пароля</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>Необходимо указать имя игрока.</translation>
     </message>
@@ -2639,86 +3239,86 @@ 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>Сбросить предупреждение о пароле</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>Возникла проблема. Попробуй запросить новый пароль еще раз</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>Введите полученный токен и новый пароль</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>&amp;Хост:</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>&amp;Порт:</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>&amp;Имя игрока:</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>Жетон:</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>Новый пароль:</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>Сбросить пароль</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>Необходимо указать имя игрока.</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>Ошибка сброса пароля</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>Необходимо указать код активации.</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>Необходимо ввести новый пароль.</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>Ошибка</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>Пароль слишком короткий</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>Введенные пароли не совпадают.</translation>
     </message>
@@ -2734,17 +3334,17 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>Загрузить колоду из буфера</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>Неверный деклист.</translation>
     </message>
@@ -2752,45 +3352,45 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation>Вставьте ссылку на сайт с деклистом для импорта
 (Поддерживаются Archidekt, Deckstats, Moxfield, and TappedOut)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation>Загрузить колоду из интернета</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation>Недоступен парсер для данного источника
 (Поддерживаются Archidekt, Deckstats, Moxfield, and TappedOut)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation>Ошибка сети: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation>Получен пустой ответ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation>Ошибка парсинга колоды: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2810,45 +3410,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>Загрузить колоду</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation>Игроки</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation>Название карты (или поисковый запрос)</translation>
     </message>
     <message>
-        <location filename="src/game/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>Количество:</translation>
     </message>
     <message>
-        <location filename="src/game/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>Автоматически разыгрывать найденные карты</translation>
     </message>
     <message>
-        <location filename="src/game/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>Поместить вернюю карту в стек, пока...</translation>
     </message>
     <message>
-        <location filename="src/game/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>В базе данных карт ничего не найдено. Все равно продолжить?</translation>
     </message>
     <message>
-        <location filename="src/game/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>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/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>Неправильный фильтр</translation>
     </message>
@@ -2856,54 +3489,54 @@ https://tappedout.net/mtg-decks/your-deck-name/</translation>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>Введите информацию о себе и о сервере, на котором хотите зарегистрироваться.
 На электронную почту будет отправлено письмо активации учетной записи.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>&amp;Хост</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>&amp;Порт:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>&amp;Имя пользователя:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>Подтверждение пароля:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>Адрес email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>Подтверждение email:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>Страна:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>Не определено</translation>
     </message>
@@ -2949,17 +3582,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation>Количество граней:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation>Количество кубов:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation>Бросить кубик</translation>
     </message>
@@ -2967,40 +3600,55 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation>Карты без изменений:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation>Карты с изменениями:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation>Выделите издания для их включения. Перетаскиваете для изменения их порядка и приоритета. Для карт будут использованы арты с наибольшим приоритетом.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation>Очистить информацию об издании</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation>Поменять все на предпочтительный</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>Неизвестная ошибка при загрузке базы карт.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -3014,7 +3662,7 @@ Cockatrice не может корректно работать с испорче
 Вы хотите сменить расположение файла базы карт?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3028,7 +3676,7 @@ Would you like to change your database location setting?</source>
 Вы хотите сменить расположение файла базы карт?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3041,7 +3689,7 @@ Would you like to change your database location setting?</source>
 Вы хотите изменить путь до локальной базы карт?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3049,7 +3697,7 @@ Would you like to change your database location setting?</source>
 Вы хотите сменить расположение файла базы карт?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3057,7 +3705,7 @@ Would you like to change your database location setting?</source>
 Вы хотите сменить расположение файла базы карт?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3070,59 +3718,64 @@ Would you like to change your database location setting?</source>
 Вы хотите изменить путь до локальной базы карт?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>Ваши колоды отсутствуют в указанной папке. Вернуться и задать правильный путь?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>Изображения карт не найдены. Вернуться и задать правильный путь?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>Основные</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>Интерфейс</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation>Источник карт</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>Чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>Горячие клавиши</translation>
     </message>
@@ -3130,12 +3783,12 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation>База карт:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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>
@@ -3144,27 +3797,27 @@ You can always change this behavior in the &apos;General&apos; settings tab.</so
 Вы сможете изменить выбранный способ позднее во кладке настроке &quot;Основные&quot;.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation>Запустить на переднем плане</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation>Запустить в фоне</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="27"/>
         <source>Run in background and always from now on</source>
         <translation>Запустить в фоне сейчас и всегда а будущем</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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation>Не спрашивать снова и не запускать</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="29"/>
         <source>Don&apos;t run this time</source>
         <translation>Не запускать в этот раз</translation>
     </message>
@@ -3172,17 +3825,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>Следующий</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>Предыдущий</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>Совет дня</translation>
     </message>
@@ -3190,40 +3843,40 @@ 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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>Канал актуального обновления</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>Переустановить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>Отменить загрузку</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>Открыть страницу загрузки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation>Проверить обновления клиента</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>В Cockatrice нет поддержки SSL и вы не можете обновиться автоматически!
@@ -3231,125 +3884,125 @@ Please visit the download page to update manually.</source>
 Пожалуйста, посетите страницу загрузки для получения обновления.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation>Скачивание обновлений: %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>Проверка обновлений...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>Закончена проверка обновлений</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>Нет доступных обновлений</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Установлена последняя версия Cockatrice!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>Уже установлена последняя версия, доступная в выбранной ветке обновлений.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>Текущая версия</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>Выбранная ветка обновлений</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>Обновление доступно</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Доступна новая версия Cockatrice!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Новая версия</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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>Выпущена</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>Список изменений</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>Вы хотите обновить сейчас?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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>Автообновление не удалось - подходящая версия не найдена. Скачайте новую версию вручную.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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>Проверьте &lt;a href=&quot;%1&quot;&gt;страницу релиза&lt;/a&gt; в нашем репозитории на Github и скачайте сборку для своей системы.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>Ошибка при оновлении</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>В процессе проверки обновлений произошла ошибка:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>В процессе загрузки обновления произошла ошибка:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>Установка...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Невозможно открыть установщик.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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>Попробуйте обновить вручную, закрыв Cockatrice и запустив инсталлятор.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation type="unfinished"/>
     </message>
@@ -3357,21 +4010,153 @@ 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="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Очистить лог при закрытии</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation>Скопировать в буфер обмена</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Лог</translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3441,33 +4226,39 @@ You may have to manually download the new version.</source>
         <translation>%1% Сенергии</translation>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
         <translation>Комбо</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
         <translation>Средняя сборка</translation>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation>Карты, переворачивающие стол</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation>Бюджетные</translation>
-    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="81"/>
         <source>Salt: </source>
         <translation>Цена:</translation>
     </message>
@@ -3475,7 +4266,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>Укажите свой фильтр</translation>
     </message>
@@ -3483,22 +4274,22 @@ 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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation>Подтвердить удаление</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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>Вы уверены что хотите удалить фильтр &apos;%1&apos;?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation>Не удалось удалить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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>Не удалось удалить фильтр &apos;%1&apos;.</translation>
     </message>
@@ -3506,22 +4297,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation>кикнут из игры хостом или модератором</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation>игрок покинул игру</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation>игрок отсоединился от сервера</translation>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation>причина неизвестна</translation>
     </message>
@@ -3529,155 +4320,208 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>Пожалуйста, сперва войдите в соответствующую комнату.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>Неверный пароль.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Зрители не допускаются в эту игру.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>Все места уже заняты!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>Эта игра больше не существует.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>Доступно только для зарегистрированных.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>Доступно только для друзей.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Вы добавлены в игнор-лист данного игрока.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation>Присоединиться</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation>Наблюдать</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation>Информация об игре </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>Присоединиться</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>Пожалуйста, сначала присоединитесь к соответствующей комнате.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>&amp;Фильтр игр</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>О&amp;чистить фильтр</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>&amp;Создать</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>&amp;Присоединиться</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>Присоединиться как &amp;зритель</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation>Показано игр: %1 / %2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>Игры</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation>&gt; 1 дня</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="43"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 час</numerusform><numerusform>%1%2 часа</numerusform><numerusform>%1%2 часов</numerusform><numerusform>%1%2 часов</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation>создать</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="48"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 минута</numerusform><numerusform>%1%2 минут</numerusform><numerusform>%1%2 минут</numerusform><numerusform>%1%2 минут</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>пароль</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>только друзья</translation>
     </message>
@@ -3687,68 +4531,68 @@ You may have to manually download the new version.</source>
         <translation>только для зарегистрированных пользователей</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation>открыть деклист</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>зрители могут комментировать в чате</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>видеть руки игроков</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>могут видеть руки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>не допускаются</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>Комната</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>Возраст</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>Создатель</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>Ограничения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>Количество игроков</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>Зрители</translation>
     </message>
@@ -3756,143 +4600,158 @@ You may have to manually download the new version.</source>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation>Сбросить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation>Все пути были сброшены</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>Путь</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>Настройки пользователя</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation>Выбор языка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>Язык:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>Путь (в портативном режиме редактирование недоступно)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>Пути расположения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation>Как помочь с переводом</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>Колоды:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation>Фильтровать директории:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>Повторы:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>Изображения карт:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>База данных карт:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation>Пользовательские сеты:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>База данных токенов:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation>Обновить канал</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation>Проверять обновления при запуске</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="379"/>
         <source>Check for card database updates on startup</source>
         <translation>Проверять обновления базы карт при запуске</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation>Не проверять</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation>Поиск обновлений</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation>Всегда обновлять на фоне</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation>Проверять обновления каждые</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation> дней</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>Предупреждать, если функции, используемые сервером, отсутствуют в этом клиенте.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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>Автоматически запускать Oracle в новой версии Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>Показывать советы при запуске клиента</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="398"/>
         <source>Last update check on %1 (%2 days ago)</source>
         <translation>Последнее проверка обновлений была %1 (%2 дней назад)</translation>
     </message>
@@ -3900,47 +4759,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation>Кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation>Посмотреть кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation>Переместить кладбище в...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation>Верх библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation>Низ библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
         <translation>Всем игрокам</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation>Рука</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation>Изгнание</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation>Показать случайно карту...</translation>
     </message>
@@ -3948,111 +4807,141 @@ You may have to manually download the new version.</source>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation>Рука</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation>Посмотреть руку</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
-        <translation>Сортировать руку</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
-        <translation>Взять муллиган</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation>Переместить руку...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation>Верх библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation>Низ библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation>Кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation>Изгнание</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation>Показать руку...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
-        <translation>Показать случайную карту...</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
-        <translation>Все игроки</translation>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
+        <translation>Показать случайную карту...</translation>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation>Создать новую колоду</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation>Посмотреть колоды</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation>Посмотреть базу карт</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation>Посмотреть EDHRec</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation>Посмотреть повтор</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation>Подключение...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation>Подключиться</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation>Играть</translation>
     </message>
@@ -4060,193 +4949,213 @@ You may have to manually download the new version.</source>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation>Библиотека</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation>Посмотреть библиотеку</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation>Посмотреть топдек</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation>Посмотреть нижнюю карту библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation>Показать библиотеку...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation>Предоставить доступ к библиотеке...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation>Показать топдек...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation>Топдек</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation>Низ библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation>&amp;Всегда показывать верхюю карту</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation>&amp;Всегда смотреть верхнюю карту</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation>Открыть колоду в редакторе</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation>Взять карту</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation>Взять карты</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation>Отменить последнее взятие карты</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation>Перемешать</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation>Сыграть топдек</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation>Сыграть топдек лицом вниз</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation>Положить топдек на низ библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation>Положить топдек в кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation>Положить топдек в изгнание</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation>Положить верхние карты в кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation>Положить верхние карты в кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation>Поместить вернюю карту в стек, пока...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation>Перемешать верхние карты</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation>&amp;Взять нижнюю карту</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation>Взять нижнюю карту библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation>Разыграть нижнюю карту библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation>Разыграть нижнюю карту библиотеки лицом вниз</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation>Положить нижнюю карту библиотеки в кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation>Положить нижнюю карту библиотеки в кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation>Положить нижние карты библиотеки в кладбище</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation>Положить нижние карты в изгнание...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation>Переместить нижнюю карту на топдек</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation>Перемешать нижние карты...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
         <translation>Все игроки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation>Показать верхние карты библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation>Количество карт: (макс. %1)</translation>
     </message>
@@ -4254,1435 +5163,1224 @@ You may have to manually download the new version.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>Этот сервер достиг максимального количества пользователей, попробуйте позже.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>Слишком много одновременных подключений с Вашего адреса.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>Забанен модератором</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>Ожидаемое время: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>Этот бан не ограничен по времени.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>Плановый перерыв в работе сервера.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>Неверное имя пользователя.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>Вы вышли из аккаунта, так как был выполнен вход из другого расположения.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>Соединение прервано</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>Ваше подключение было прервано сервером.
-Причина: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>Сервер будет перезагружен через %n минут(ы).
-Все незавершенные игры будут потеряны.
-Причина перезагрузки: %1</numerusform><numerusform>Сервер будет перезагружен через %n минут(ы).
-Все незавершенные игры будут потеряны.
-Причина перезагрузки: %1</numerusform><numerusform>Сервер будет перезагружен через %n минут(ы).
-Все незавершенные игры будут потеряны.
-Причина перезагрузки: %1</numerusform><numerusform>Сервер будет перезагружен через %n минут(ы).
-Все незавершенные игры будут потеряны.
-Причина перезагрузки: %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>Плановый перерыв в работе сервера</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>Успешно</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>Регистрация прошла успешно.
-Идет соединение.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>Активация аккаунта прошла успешно.
-Идет соединение.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>Количество игроков</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>Введите количество игроков.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>Игрок %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>Загрузить повтор</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation>Версия</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>Страница Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>Руководитель проекта:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>Предыдущие руководители проекта:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>Разработчики:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>Наши разработчики</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>Помочь в разработке!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>Переводчики:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>Наши переводчики</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>Помочь с переводом!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>Поддержать проект:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>Сообщить о проблеме</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>Устранение неполадок</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>ЧАВо</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>Нет связи с сервером</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>Не могу подключиться</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation>Ваш клиент не поддерживает некоторые функции, необходимые для соединения с сервером. </translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>Неверное имя пользователя или пароль. Пожалуйста, уточните регистрационные данные и попробуйте снова.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>Пользователь с таким именем уже подключен.
-Пожалуйста, закройте это подключение и войдите заново.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>Вы забанены до %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>Вы забанены бессрочно.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>На этом сервере требуется регистрация. Вы хотите зарегистрироваться сейчас?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>Активация аккаунта</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>Ваш аккаунт ещё не активирован. Вам нужно предоставить жетон/код активации, полученный по электронной почте.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation>Сервер заполнен</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>Неизвестная ошибка входа: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>
-Обычно это означает, что Вы используете устаревшую версию клиента, и тот не отвечает запросам сервера.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>Имя пользователя должно удовлетворять следующим условиям:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>длиной в %1 - %2 символов</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>%1 может содержать строчные буквы</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>НЕ</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>%1 может содержать заглавные буквы</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>%1 может содержать цифры</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>Может содержать следующие символы: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>Первый знак %1 может быть знаком пунктуации</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation>не может содержать следующие слова: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation>не может соответствовать следующим выражениям: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>Имя пользователя может включать только следующие символы: A-Z, a-z, 0-9, &quot;_&quot;, &quot;.&quot; и &quot;-&quot;</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>Запрос на регистрацию отклонен</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>Регистрация на данном сервере в настоящий момент недоступна</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>Аккаунт с таким именем уже существует.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>При регистрации необходимо указать действующий e-mail.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>Слишком короткий пароль.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>Регистрация не удалась из-за технических неполадок на сервере.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>Неизвестная ошибка при регистрации: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>Не удалось активировать аккаунт</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>Ошибка сокета: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>Вы пытаетесь подключиться к несуществующему серверу. Пожалуйста, обновите Cockatrice или выберите другой сервер.
-Локальная версия %1, удаленная версия %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>Ваш клиент Cockatrice устарел. Пожалуйста, обновите Cockatrice.
-Локальная версия %1, удаленная версия %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>Подключение к %1...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>Регистрация на %1 как %2...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>Подключение прервано</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>Соединение установлено, выполняется вход на %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>Подключение... &amp;С</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>П&amp;рервать подключение</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>&amp;Начать локальную игру...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Смотреть повтор...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>Полный экран &amp;F</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;Регистрация на сервере...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Настройки</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>&amp;Выход</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>&amp;Действия</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>&amp;База карт</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>Открыть папку с изображениями</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>Открыть папку с изданиями</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>Добавить издания/карты</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
-        <translation type="unfinished"/>
+        <translation>Быстрый доступ</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>О про&amp;грамме</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>База карт</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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>Cockatrice не может загрузить базу карт. Обновить вашу базу карт сейчас? Если Вы не уверены, или впервые запустили программу, нажмите &quot;Да&quot;</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>Открыть настройки</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>Найдены новые издания</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>Просмотреть издания</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>Добро пожаловать</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>Обновление базы карт уже идет.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>Не удалось запустить обновление базы карт:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>Этот сервер использует функции, отсутствующие в вашем клиенте.
-Вероятно, это не вызовет затруднений, а это сообщение означает, что доступна новая версия Cockatrice или сервер использует неофициальную пре-релизную версию.
-
-Чтобы обновить клиент, перейдите в Справка-&gt; Проверка обновлений.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>Загрузить издания/карты</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>Выбранный файл не найден.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation>На данный момент вы только можете предостовлять базы данных в формате XML.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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>Новые издания/карты успешно добавлены.
 Сейчас Cockatrice перезагрузит базу карт.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>Не удалось импортировать издания/карты.</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>Невозможно сбросить пароль. Пожалуйста, свяжитесь с оператором сервера.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
-        <translation>Запрос активации получен. Вам отправлен код активации. Пожалуйста, проверьте свой e-mail.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation>из игры</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation>из их кладбищ</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation> из изгнания</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation>из их рук</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>верхняя карта библиотеки %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation>верхнюю карту своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation>с верха библиотеки %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation>с верха своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>нижняя карта библиотеки %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation>нижнюю карту своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation>Со дна библиотеки %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation>с низа своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation>из библиотеки %1</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation>из своей библиотеки</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation> из сайдборда</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation> из стека</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1 оставляет верхнюю карту %2 открытой.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>Верхняя карта %2 %1 больше не остается открытой.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1 прикрепляет %2 к %4 под контролем %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 сдался.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1 восстановил связь с игрой.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 потерял связь с игрой.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation>%1 указывает с их %2 на себя.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation>%1 указывает с их %2  на %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation>%1 указывает с %3 под контролем %2 на себя.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation>%1 указывает с %3, контролируемого %2, на %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1 указывает с их %2  на их %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1 указывает с их %2  на %4 под контролем %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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>%1 указывает с %3 под контролем %2 на %4, владельцем которого они являются.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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>%1 указывает с %3 контролируемого %2 на %5 под контролем %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 создает фишку: %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 загрузил колоду (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>%1 загрузил колоду с %2 картами из сайдборда (%3).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation>%1 уничтожает  %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>карту</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1 передает %2 контроль над %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1 поместил %2 на поле битвы %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation>%1 кладет %2%3 на своё кладбище.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 изгоняет %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation>%1 кладет %2%3 в свою руку.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation>%1 кладет %2%3 в свою библиотеку.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation>%1 кладет %2%3 на верх своей библиотеки.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 поместил %2%3 в сайд.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 разыгрывает %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation><numerusform>%1 берет %2 карту.</numerusform><numerusform>%1 берет %2 карты.</numerusform><numerusform>%1 берет %2 карт.</numerusform><numerusform>%1 берет %2 карты.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 просматривает %2.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>Игра закрыта.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>Игра началась.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1 присоединился к игре.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 вошел как зритель.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>Вы были отключены от игры</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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>%1 пока не готов начать игру.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform>%1 тасует колоду и берет новую руку из %2 карты</numerusform><numerusform>%1 тасует колоду и берет новую руку из %2 карт</numerusform><numerusform>%1 тасует колоду и берет новую руку из %2 карт</numerusform><numerusform>%1 тасует колоду и берет новую руку из %2 карт</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation>Вы просматриваете запись игры #%1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1 готов начать игру.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1 открывает %2 для %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1 открывает %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation>%1 случайным образом открывает %2%3 для %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1 случайным образом открывает %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation>%1 указывает на перевернутую рубашкой вверх карту #%2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation>%1 указывает на перевернутую рубашкой вверх карту #%2: %3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation>%1 открывает %2%3 для %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1 открывает %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>Орел</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>Решка</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation>%1 подбросил монету. Выпал(а) %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1 выбросил %2 на %3-гранном кубике.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation>%1 помечает %2 &quot;%3&quot;.</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
-        <translation><numerusform>%1 разместил %2 &quot;%3&quot; жетон на %4 (теперь %5).</numerusform><numerusform>%1 разместил %2 &quot;%3&quot; жетонов на %4 (теперь %5).</numerusform><numerusform>%1 разместил %2 &quot;%3&quot; жетонов на %4 (теперь %5).</numerusform><numerusform>%1 разместил %2 &quot;%3&quot; жетонов на %4 (теперь %5).</numerusform></translation>
+        <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><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
-        <translation><numerusform>%1 удалил %2 &quot;%3&quot; жетон на %4 (теперь %5).</numerusform><numerusform>%1 удалил %2 &quot;%3&quot; жетона на %4 (теперь %5).</numerusform><numerusform>%1 удалил %2 &quot;%3&quot; жетонов на %4 (теперь %5).</numerusform><numerusform>%1 удалил %2 &quot;%3&quot; жетона на %4 (теперь %5).</numerusform></translation>
+        <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><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation>%1 устанавливает жетон %2 на %3 (%4%5).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%2 теперь не разворачивается как обычно (%1).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%2 теперь разворачивается как обычно (%1).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1 заблокировал(а) свой сайдборд.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 разблокировал(а) свой сайдборд.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 поворачивает свои перманенты.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 разворачивает свои перманенты.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1 поворачивает %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1 разворачивает %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 размешал %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 открепляет %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 отменяет последние взятия.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1 отменяет последние взятия (%2).</translation>
     </message>
@@ -5690,110 +6388,115 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>Добавить сообщение</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>Сообщение:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>Настройки чата</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>Пользовательские предупреждения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>Включить упоминания в чате</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>Включить автозавершение упоминаний</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>Макросы сообщений игрового чата</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="243"/>
         <source>How to use in-game message macros</source>
         <translation>Как использовать внутриигровые макросы для сообщений</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>Не уведомлять о сообщениях в чате от незарегистрированных пользователей</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>Не уведомлять о личных сообщениях от незарегистрированных пользователей</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>Инвертировать цвет текста</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>Включить оповещения о личных сообщениях</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>Включить оповещения об упоминаниях</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>Отображать историю сообщений при присоединении к комнате.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>(Шестнадцатеричный цвет)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>Разделять слова пробелом, только для букв и цифр</translation>
     </message>
@@ -5801,37 +6504,42 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -5844,47 +6552,47 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
@@ -5907,65 +6615,211 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -5973,57 +6827,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>Шаг разворота</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>Шаг поддержки</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>Шаг взятия карты</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>Первая главная фаза</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>Шаг начала боя</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>Шаг назначения атакующих</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>Шаг назначения блокирующих</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>Шаг нанесения повреждений</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>Шаг завершения боя</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>Вторая главная фаза</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>Заключительный шаг</translation>
     </message>
@@ -6031,7 +6885,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>ru</translation>
@@ -6040,183 +6894,195 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
-        <translation>Взять карты</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
-        <translation>Взять карты с низа библиотеки</translation>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation>Установить жетоны</translation>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation>&amp;Жетоны</translation>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6232,17 +7098,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6250,86 +7116,94 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"/>
     </message>
@@ -6337,37 +7211,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>Сервисы</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>Скрыть %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>Скрыть остальные</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>Показать все</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>Параметры...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>Выйти %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>О %1</translation>
     </message>
@@ -6375,153 +7249,247 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>База карт Cockatrice (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>Все файлы (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Записи игр Cockatrice (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>Основная колода</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>Сайдборд</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>Фишки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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"/>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>Дата загрузки</translation>
     </message>
@@ -6529,32 +7497,32 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>Игроки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>Хранение</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>Время начала</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>Длительность (сек)</translation>
     </message>
@@ -6562,37 +7530,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -6600,41 +7568,49 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>Комнаты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>&amp;Присоединиться</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>Комната</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>Пометка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>Разрешения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>Игроки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>Игры</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6671,27 +7647,27 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>Включено</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>Установить тип</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>Установить код</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>Полное название</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>Дата релиза</translation>
     </message>
@@ -6699,53 +7675,53 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -6753,12 +7729,12 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -6766,13 +7742,13 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -6799,12 +7775,12 @@ Please check your shortcut settings!</source>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -6812,27 +7788,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>Включить &amp;звуки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>Звуковая тема:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>Протестировать системный звук</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>Настройки звука</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>Громкости</translation>
     </message>
@@ -6840,48 +7816,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="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
-        <translation type="unfinished"/>
+        <translation>Нет подключения к Интернету</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -6904,16 +7880,146 @@ Please check your shortcut settings!</source>
         <translation>Ошибка отклика сервера обновлений версии.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="177"/>
         <source>No reply received from the tag update server.</source>
         <translation>Сервер обновлений меток не отвечает.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="184"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>Ошибка отклика сервера обновлений меток.</translation>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7045,56 +8151,227 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation type="unfinished"/>
+    </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="262"/>
+        <source>Any</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>Информация о карте</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>Колода</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>Фильтры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>Видимый</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>Плавающий</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation>Сбросить слой</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="82"/>
         <source>Deck: %1</source>
         <translation>Колода: %1</translation>
     </message>
@@ -7102,61 +8379,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="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7164,22 +8429,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="43"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <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"/>
     </message>
@@ -7220,8 +8485,8 @@ Please check your shortcut settings!</source>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Новая папка</translation>
     </message>
@@ -7237,84 +8502,84 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>Введите название колоды</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>У этой колоды нет названия.
 Пожалуйста, введите имя:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>Безымянная колода</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>Удалить файл</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Название новой папки:</translation>
     </message>
@@ -7327,17 +8592,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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"/>
     </message>
@@ -7378,7 +8643,7 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation type="unfinished"/>
     </message>
@@ -7386,197 +8651,191 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>Запись игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>Игра</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>Список игроков</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>Информация о карте</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>Сообщения</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>Полоса прокрутки записи</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>&amp;Фазы</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>&amp;Игра</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>Следующая &amp;фаза</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>Следующий &amp;ход</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>&amp;Удалить все указатели</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>Повернуть вид по часовой стрелке</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>Повернуть вид против часовой стрелки</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>Информация &amp;об игре</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>&amp;Сдаться...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>Покинуть и&amp;гру</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>З&amp;акрыть повтор</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;Установить фокус на чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>Ска&amp;зать:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>Видимый</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>Плавающий</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation>Сбросить слой</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>Сдаться</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>Вы точно хотите сдаться?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>Покинуть игру</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>Вы уверены, что хотите уйти?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>Вы были отключены от игры</translation>
     </message>
@@ -7584,7 +8843,7 @@ Please enter a name:</source>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
@@ -7592,158 +8851,158 @@ Please enter a name:</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>Логи</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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>Время;ИмяОтправителя;IPОтправителя;Сообщение;IDПолучателя;ИмяПолучателя</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation>Логи Комнаты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>Логи Игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>Логи Чата</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>Вы должны выбрать хотя бы один фильтр</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>Вы должны указать верное количество дней для размещения.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>Имя пользователя:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>IP адрес</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>Имя игры:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>ID Игры:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>Сообщение:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>Основная комната</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>Игровая комната</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>Приватный чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>Последние X Дней:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>Сегодня</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>За последний час</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation>Максимальный результат:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>Должен быть как минимум один фильтр.
 Чем больше информации Вы укажете, тем точнее будет результат.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation>Получить логи пользователя</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation>Очистить фильтры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>Фильтры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation>Размещение логов</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation>Интервал дат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation>Максимальный результат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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>История сообщений</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation>Не удалось собрать историю сообщений.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation>Нет сообщений для указанных фильтров.</translation>
     </message>
@@ -7761,27 +9020,27 @@ The more information you put in, the more specific your results will be.</source
         <translation>&amp;Покинуть</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - Приватный чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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>Это пользователь добавил Вас в игнор-лист и не видит ваши сообщения в главном чате, а Вы не можете присоединяться к созданным им (ею) играм.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation>Личное сообщение от</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1 отключился.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1 зашел на сервер.</translation>
     </message>
@@ -7789,180 +9048,180 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>Локальная файловая система</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>Хранилище записей игр на сервере</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>Посмотреть повтор</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>Удалить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>Скачать запись игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>Переключить блокировку срока</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>Удалить локальный файл</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>Удалить запись игры</translation>
     </message>
@@ -7975,47 +9234,62 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>&amp;Сказать:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>Чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>&amp;Комната</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Покинуть комнату</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>&amp; Обновить чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>Установки чата</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation>упомянул(а) Вас.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation>Нажмите для просмотра</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>Кажется, Вы нафлудили. Пожалуйста, подождите пару секунд.</translation>
     </message>
@@ -8028,30 +9302,30 @@ The more information you put in, the more specific your results will be.</source
         <translation>Сервер</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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"/>
     </message>
@@ -8059,92 +9333,97 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>Вы уверены?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>У вас все еще есть активные игры. Уверены, что хотите выйти?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation>Неопознанное событие</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8155,38 +9434,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 Чтобы обновить клиент, перейдите в Справка-&gt; Проверка обновлений.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation>Исчерпано время бездействия</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Вы были отключены из-за отсутствия активности.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>Повышение</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>Предупрежден</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>Вы получили предупреждение по причине %1. Пожалуйста, воздержитесь от подобных действий, иначе в ваш адрес будут применены дальнейшие меры. При возникновении каких-либо вопросов напишите личное сообщение любому модератору.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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>Вы получили сообщение от сервера.
@@ -8195,6 +9474,11 @@ Please refrain from engaging in this activity or further actions may be taken ag
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8233,42 +9517,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -8276,151 +9560,209 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation>Невозможно открыть файл для чтения.</translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>&amp;Детали пользователя</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>&amp;Приватный чат</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Показать &amp;игры этого пользователя</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>Добавить в &amp;список друзей</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Удалить из &amp;списка друзей</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>Добавить в &amp;игнор-лист</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Удалить из &amp;игнор-листа</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>Выкинуть из &amp;игры</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="67"/>
         <source>Warn user</source>
         <translation>Дать предупреждение пользователю</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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>Просмотреть &amp;историю предупреждений пользователя</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="69"/>
         <source>Ban from &amp;server</source>
         <translation>Забанить на &amp;сервере</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>Просмотреть &amp;историю банов пользователя</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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>&amp;Повысить пользователя до модератора</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>&amp;Разжаловать пользователя из модератора</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </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="74"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </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="75"/>
         <source>View admin notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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"/>
     </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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>Игры %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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>История банов</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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>ВремяБана;Модератор;ПродолжительностьБана;ПричинаБана;ВидимаяПричина</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation>Пользователя никогда не банили.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation>История предупреждений</translation>
     </message>
@@ -8435,55 +9777,65 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation>Пользователя никогда не предупреждали.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </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="249"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>Успешно</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>Пользователь успешно повышен.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>Пользователь успешно понижен.</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Не удалось</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>Не удалось повысить пользователя.</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>Не удалось понизить пользователя.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -8491,311 +9843,554 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>Местонахождение:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>Возраст учетной записи:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>Редактировать</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>Сменить пароль</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>Сменить аватар</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>Администратор</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>Модератор</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>Зарегистрированный пользователь</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>Рандом</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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>Неизвестный</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>Информация</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>Информация о пользователе обновлена.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></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="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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>Этот сервер не позволяет обновить пользовательскую информацию.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>Пароль изменен.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>Этот сервер не позволяет Вам сменить пароль.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>Новый пароль слишком короткий.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>Предыдущий пароль неверен.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>Аватар изменен.</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>Этот сервер не позволяет Вам изменить аватар.</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>При изменении аватара произошла ошибка.</translation>
+        <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>Этот сервер не позволяет обновить пользовательскую информацию.</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>Основные настройки интерфейса</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>&amp;Двойной клик, чтобы разыграть карту (вместо одинарного)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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>&amp;Клик для разыгрывания всех выбранных карт (вместо только выбранной)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>&amp;Помещать все заклинания в стек при разыгрывании (вместо поля боя)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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"/>
+    </message>
+    <message>
+        <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>Закрыть окно просмотра карт когда последняя карта удалена из него</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>Изменить текст карты на токенах</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>Разрешить закрепление контекстных меню на экране</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>Включить оповещения в панели задач.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>Уведомлять об игровых событиях в панели задач, когда вы наблюдаете за игрой</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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>Уведомлять при заходе в игру друга</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>Настройки анимации</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;Анимировать поворот/разворот карты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation>Редактор колод/Настройки хранилища</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="231"/>
         <source>Open deck in new tab by default</source>
         <translation>Открывать колоду в новой вкладке</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="232"/>
         <source>Use visual deck storage in game lobby</source>
         <translation>Использовать графическое представление карт в лобби игры</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="233"/>
         <source>Use selection animation for Visual Deck Storage</source>
         <translation>Использовать анимацию при выборе карты в графическом хранилище</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation>всегда конвертировать в .cod</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="246"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>Время отката назад при нажатии шортката</translation>
     </message>
@@ -8803,22 +10398,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
@@ -8826,124 +10421,256 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation>Добавить по одному каждого жетона</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8951,7 +10678,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="41"/>
+        <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"/>
     </message>
@@ -8959,19 +10686,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="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
@@ -8979,27 +10706,37 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -9007,50 +10744,93 @@ 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="53"/>
+        <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"/>
     </message>
     <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -9058,46 +10838,25 @@ 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="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -9105,47 +10864,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="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9153,7 +10917,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="25"/>
+        <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"/>
     </message>
@@ -9161,22 +10925,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="47"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -9184,17 +10948,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="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9202,43 +10966,43 @@ 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_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>Какое предупреждение Вы бы хотели отправить?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отменить</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>Дать предупреждение пользователю за проступок</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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>Поле не может быть пустым. Пожалуйста, уточните имя пользователя для выдачи предупреждения.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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>Поле предупреждения не может быть пустым. Пожалуйста, выберите корректную причину.</translation>
     </message>
@@ -9246,133 +11010,133 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <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>Переместить выбранное издание наверх</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>Переместить выбранное издание вверх</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>Переместить выбранное издание вниз</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>Переместить выбранное издание в конец.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation type="unfinished"/>
     </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="70"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </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"/>
     </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="107"/>
         <source>Enable all sets</source>
         <translation>Включить все издания</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="108"/>
         <source>Disable all sets</source>
         <translation>Отключить все издания</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="109"/>
         <source>Enable selected set(s)</source>
         <translation>Включить выбранные издания</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation>Отключить выбранные издания</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="126"/>
         <source>Deck Editor</source>
         <translation>Редактор колод</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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation type="unfinished"/>
     </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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation>Как использовать кастомный арт для карты</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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"/>
     </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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9380,72 +11144,72 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>Перемешать после просмотра</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>просмотр вразнобой</translation>
     </message>
@@ -9453,7 +11217,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>Русский (Russian)</translation>
     </message>
@@ -9461,12 +11225,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -9474,1005 +11238,1078 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>Главное окно</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation>Редактор колоды</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>Вкладка игры</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation>Жетоны на картах</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation>Жетоны игрока</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>Сила и Выносливость</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>Игровые фазы</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>Игровое поле</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>Процесс игры</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation>Чат</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>Прервать подключение</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>На весь экран</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation>Добавить зелёный жетон</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation>Удалить зелёный жетон</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation>Установить зелёные жетоны</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation>Добавить красный жетон</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation>Убрать красный жетон</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation>Установить кол-во красных жетонов...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation>Добавить 1 ед. жизни</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation>Добавить жетон (F)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation>Удалить жетон (F)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation>Установить жетоны (F)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation>Добавить жетон (E)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation>Удалить жетон (E)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation>Установить жетоны (E)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation>Добавить жетон(D)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation>Удалить жетон (D)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation>Установить жетоны (D)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation>Добавить жетон (C)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation>Удалить жетон (C)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation>Установить жетоны (C)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation>Добавить жетон (B)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation>Удалить жетон (B)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation>Установить жетоны (B)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation>Добавить жетон (A)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation>Удалить жетон (A)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation>Установить жетоны (A)...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation>Убрать 1 ед. жизни</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation>Установить кол-во жизней</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation>Добавить белый жетон</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation>Убрать белый жетон</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation>Установить белые жетоны...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation>Добавить синий жетон</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation>Убрать синие жетоны</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation>Установить синие жетоны...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation>Добавить черные жетон</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation>Удалить черные жетон</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation>Установить черные жетоны...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation>Добавить бесцветные жетон</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation>Удалить бесцветные жетон</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation>Установить бесцветные жетоны</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation>Добавить другие жетоны</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation>Удалить другие жетоны</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation>Установить другие жетоны...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation>Добавить по одному каждого жетона</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>Шаг разворота</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>Шаг поддержки</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>Шаг взятия карты</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>Атака</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>Блок</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>Повреждения</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>Конец хода</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation>Повернуть / развернуть карту</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>Изгнание</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>Кладбище</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>Рука</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>Библиотека</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>Сайдборд</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation>Взять карту с низа библиотеки</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>Взять несколько карт с низа библиотеки...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>Сдаться</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>Муллиган</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation>Взять карту</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation>Взять несколько карт</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation>Всегда показывать верхнюю карту</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation>Всегда смотреть верхнюю карту</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation>Убрать фокус с окна ввода</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation>Установить фокус на чат</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation>Очистить чат</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
-        <translation type="unfinished"/>
+        <translation>Обновить</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation>Логи</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_sr.ts b/cockatrice/translations/cockatrice_sr.ts
index 1aa21336a..c04d16f16 100644
--- a/cockatrice/translations/cockatrice_sr.ts
+++ b/cockatrice/translations/cockatrice_sr.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="81"/>
         <source>&amp;Set counter...</source>
         <translation>Podesi brojač...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="207"/>
         <source>Set counter</source>
         <translation>Podesi brojač</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game/board/abstract_counter.cpp" line="208"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>Nova vrednost za brojač &apos;%1&apos;:</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,79 +36,81 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="243"/>
         <source>Open in new tab</source>
         <translation>Otvori u novoj kartici</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="267"/>
         <source>Are you sure?</source>
         <translation>Da li ste sigurni?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="268"/>
         <source>The decklist has been modified.
 Do you want to save the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="390"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="409"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="532"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="322"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="338"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="391"/>
         <source>The deck could not be saved.
 Please check that the directory is writable and try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="374"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="409"/>
         <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="532"/>
         <source>There are no cards in your deck to be exported</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="286"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="299"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -116,12 +118,12 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -129,189 +131,185 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="446"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="659"/>
         <source>Could not create themes directory at &apos;%1&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
         <source>Theme settings</source>
         <translation>Podešavanja teme</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
         <source>Current theme:</source>
         <translation>Sadašnja tema:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
         <source>Open themes folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
         <source>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="728"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
-        <source>Menu settings</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
-        <source>Show keyboard shortcuts in right-click menus</source>
+        <source>Display card name of background in bottom right:</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
-        <source>Card rendering</source>
+        <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
-        <source>Display card names on cards having a picture</source>
-        <translation>Pokazuj imena karti na kartama koje imaju sliku</translation>
+        <source>Show keyboard shortcuts in right-click menus</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
-        <source>Auto-Rotate cards with sideways layout</source>
+        <source>Show game filter toolbar above list in room tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
-        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
+        <source>Card rendering</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="737"/>
+        <source>Display card names on cards having a picture</source>
+        <translation>Pokazuj imena karti na kartama koje imaju sliku</translation>
+    </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
-        <source>Bump sets that the deck contains cards from to the top in the printing selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
-        <source>Scale cards on mouse over</source>
+        <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
-        <source>Use rounded card corners</source>
+        <source>Override all card art with personal set preference (Pre-ProviderID change behavior)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
-        <source>Minimum overlap percentage of cards on the stack and in vertical hand</source>
+        <source>Bump sets that the deck contains cards from to the top in the printing selector</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
-        <source>Maximum initial height for card view window:</source>
+        <source>Scale cards on mouse over</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
-        <source> rows</source>
+        <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
-        <source>Maximum expanded height for card view window:</source>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <source>Minimum overlap percentage of cards on the stack and in vertical hand</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="747"/>
+        <source>Maximum initial height for card view window:</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
-        <source>Card counters</source>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="750"/>
+        <source> rows</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="749"/>
+        <source>Maximum expanded height for card view window:</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <source>Card counters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
         <source>Hand layout</source>
         <translation>Raspored ruke</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Prikazuj ruku horizontalno (troši prostor)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
         <source>Enable left justification</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="763"/>
         <source>Table grid layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="764"/>
         <source>Invert vertical coordinate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="765"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="766"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="92"/>
+        <source>Back to results</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="93"/>
+        <source>Open Deck in Deck Editor</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -333,112 +331,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="31"/>
         <source>ban &amp;user name</source>
         <translation>zabrani ime igrača</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="35"/>
         <source>ban &amp;IP address</source>
         <translation>zabrani IP adresa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban client I&amp;D</source>
         <translation>zabranite ID klijenta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="53"/>
         <source>Ban type</source>
         <translation>Tip zabrane</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="56"/>
         <source>&amp;permanent ban</source>
         <translation>stalna zabrana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="57"/>
         <source>&amp;temporary ban</source>
         <translation>privremena zabrana</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
         <source>&amp;Days:</source>
         <translation>Dani:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;Hours:</source>
         <translation>Sati:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="72"/>
         <source>&amp;Minutes:</source>
         <translation>Minuti:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="87"/>
         <source>Duration of the ban</source>
         <translation>Dužina trajanja zabrane</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="90"/>
         <source>Please enter the reason for the ban.
 This is only saved for moderators and cannot be seen by the banned person.</source>
         <translation>Molimo Vas ukucajte razlog zabrane.
 Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene osobe.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="95"/>
         <source>Please enter the reason for the ban that will be visible to the banned person.</source>
         <translation>Molimo Vas ukucajte razlog zabrane koji će biti vidljiv zabranjenoj osobi.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="98"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="100"/>
         <source>&amp;OK</source>
         <translation>U redu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="103"/>
         <source>&amp;Cancel</source>
         <translation>Poništi</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="122"/>
         <source>Ban user from server</source>
         <translation>Zabranite ulaz korisniku u server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
         <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="205"/>
         <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="213"/>
         <source>You must have a value in the name ban when selecting the name ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
         <source>You must have a value in the ip ban when selecting the ip ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="228"/>
         <source>You must have a value in the clientid ban when selecting the clientid ban checkbox.</source>
         <translation type="unfinished"/>
     </message>
@@ -469,32 +467,32 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="65"/>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="67"/>
         <source>Sets</source>
         <translation>Setovi</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="69"/>
         <source>Mana cost</source>
         <translation>Cena mane</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="71"/>
         <source>Card type</source>
         <translation>Tip karte</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="73"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="75"/>
         <source>Color(s)</source>
         <translation>Boja (boje)</translation>
     </message>
@@ -502,96 +500,101 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -599,22 +602,22 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -622,22 +625,22 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="375"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="420"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="433"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="439"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -650,12 +653,22 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="85"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="101"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
@@ -663,124 +676,124 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="276"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="452"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="357"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="405"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="422"/>
         <source>All tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
         <source>&amp;Select All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="447"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="449"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="450"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="451"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="454"/>
         <source>&amp;Tap / Untap</source>
         <extracomment>Turn sideways or back again</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
+        <location filename="src/game/player/menu/card_menu.cpp" line="455"/>
+        <source>Skip &amp;untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="457"/>
         <source>T&amp;urn Over</source>
         <extracomment>Turn face up/face down</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="460"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="461"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="462"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="463"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="464"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="465"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="467"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="472"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="475"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game/player/menu/card_menu.cpp" line="478"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
@@ -788,7 +801,7 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
@@ -796,133 +809,133 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="179"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="186"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="187"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="189"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="192"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
-        <source>%1&apos;s library</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
-        <source>their graveyard</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
-        <source>%1&apos;s graveyard</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
-        <source>their exile</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
-        <source>%1&apos;s exile</source>
-        <comment>nominative</comment>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
-        <source>their sideboard</source>
-        <comment>look at zone</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
-        <source>%1&apos;s sideboard</source>
-        <comment>look at zone</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
-        <source>their sideboard</source>
+        <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
-        <source>%1&apos;s sideboard</source>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <source>their graveyard</source>
+        <comment>nominative</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <source>%1&apos;s graveyard</source>
+        <comment>nominative</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <source>their exile</source>
+        <comment>nominative</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="199"/>
+        <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <source>their sideboard</source>
+        <comment>look at zone</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <source>%1&apos;s sideboard</source>
+        <comment>look at zone</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="206"/>
+        <source>their sideboard</source>
+        <comment>nominative</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="207"/>
+        <source>%1&apos;s sideboard</source>
+        <comment>nominative</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="212"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="213"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -931,7 +944,7 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -939,7 +952,7 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -958,10 +971,41 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="65"/>
+        <source>Add Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="66"/>
+        <source>Remove Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="67"/>
+        <source>Save Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="68"/>
+        <source>Load Layout</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="49"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -969,47 +1013,47 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="35"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="188"/>
         <source>Add to Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="189"/>
         <source>Add to Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="190"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="193"/>
         <source>Show on EDHRec (Commander)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="197"/>
         <source>Show on EDHRec (Card)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="241"/>
         <source>Add card to &amp;maindeck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="242"/>
         <source>Add card to &amp;sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1017,87 +1061,97 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="718"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="734"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="736"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Banner Card/Tags Visibility Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="738"/>
         <source>Show banner card selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="740"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="741"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
+        <source>Format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="746"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="748"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>Swap card to/from sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -1105,17 +1159,17 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckEditorFilterDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="139"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="137"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <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>&amp;Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="142"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp" line="140"/>
         <source>Delete selected</source>
         <translation type="unfinished"/>
     </message>
@@ -1123,114 +1177,114 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </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="162"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </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="166"/>
+        <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"/>
     </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="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </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="168"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="172"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </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="174"/>
         <source>Load deck from online service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1238,7 +1292,7 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1246,194 +1300,227 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1250"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1313"/>
         <source>Update Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1144"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1180"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1183"/>
         <source>One or more downloaded card pictures could not be cleared.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
         <source>Add URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1190"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
         <source>URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1210"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1315"/>
         <source>Edit URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1307"/>
         <source>Network Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1309"/>
         <source>Redirect Cache TTL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1310"/>
         <source>How long cached redirects for urls are valid for.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1311"/>
         <source>Picture Cache Size:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1314"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1316"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1317"/>
         <source>Day(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1239"/>
         <source>Updating...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1269"/>
         <source>Choose path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1296"/>
         <source>Spoilers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1297"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1298"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1299"/>
         <source>Last Change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1300"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1301"/>
         <source>Press the button to manually update without relaunching</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1302"/>
         <source>Do not close settings until manual update is complete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1303"/>
         <source>Download card pictures on the fly</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1304"/>
         <source>How to add a custom URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1305"/>
         <source>Delete Downloaded Images</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1306"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1308"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1312"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>Broj</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>Karta</translation>
     </message>
@@ -1441,12 +1528,12 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="27"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1454,17 +1541,17 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -1472,7 +1559,7 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <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"/>
     </message>
@@ -1480,62 +1567,62 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <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"/>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </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="104"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </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="105"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </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="106"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </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="107"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <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"/>
     </message>
@@ -1543,98 +1630,156 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="257"/>
+        <source>Moved to %1 1 × &quot;%2&quot; (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="275"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="299"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <source>Added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="300"/>
+        <source>Removed</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1652,74 +1797,74 @@ Ovo je samo sačuvano za moderatore i ne može biti viđeno od strane zabranjene
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>Učitaj špil...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Učitaj daljinski špil...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="267"/>
         <source>The selected file could not be loaded.</source>
         <translation>Izabrani fajl nije mogao biti učitan.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="279"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="342"/>
         <source>Are you sure you want to force start?
 This will kick all non-ready players from the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game/deckview/deck_view_container.cpp" line="344"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1752,143 +1897,143 @@ This will kick all non-ready players from the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>Novi Domaćin</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>Domaćin:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>Ime igrača:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>Lozinka:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>Sačuvajte lozinku:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>Automatsko povezivanje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Automatski se poveži na najskoriju prijavu kada se Cockatrice otvori</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="287"/>
         <source>Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>Prijava</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="301"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="304"/>
         <source>Communication Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="309"/>
         <source>Unique Server Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
         <source>Connection Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="335"/>
         <source>You need to name your new connection profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
         <source>Connect Warning</source>
         <translation>Upozorenje o povezivanju</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="350"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Ime igrača ne može biti prazno.</translation>
     </message>
@@ -1896,117 +2041,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>Za&amp;pamti podešavanja</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>Opis:</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>Igrači:</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"/>
     </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>Tip igre</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>Lozinka:</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>Samo prijatelji mogu da se pridruže</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>Samo &amp;registrovani korisnici mogu da se pridruže</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>Ograničenja pridruživanja</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>Posmatrači mogu da gledaju</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>Posmatračima &amp;je potrebna lozinka da gledaju</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>Posmatrači mogu &amp;da ćaskaju</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>Posmatrači mogu da &amp;vide ruke </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"/>
     </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>Posmatrači</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>Očisti</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>Započni igru</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="232"/>
         <source>Game information</source>
         <translation>Informacije o igri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="322"/>
         <source>Server error.</source>
         <translation>Greška servera.</translation>
     </message>
@@ -2014,97 +2164,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Žeton</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>Boja:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>belo</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>plavo</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>crno</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>crveno</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>zeleno</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>višebojno</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>bezbojno</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>M/I:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>Anotacija:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>Uništi token kada napusti sto</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Podaci o tokenima</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Prikaži sve tokene</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Prikaži tokene iz ovog špila</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="128"/>
         <source>Choose token from list</source>
         <translation>Izaberi token iz liste</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game/dialogs/dlg_create_token.cpp" line="146"/>
         <source>Create token</source>
         <translation>Napravi token</translation>
     </message>
@@ -2112,53 +2262,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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="119"/>
         <source>✖</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="102"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2166,40 +2316,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>Slika nije izabrana.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>Da promenite svoj avatar, izaberite novu sliku
 Da izbrišete vaš sadašnji avatar, potvrdite bez biranja nove slike.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>Pretraži...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>Promeni avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>Otvori sliku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Fajlovi Slika (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>Neispravna slika izabrana.</translation>
     </message>
@@ -2207,17 +2357,17 @@ Da izbrišete vaš sadašnji avatar, potvrdite bez biranja nove slike.</translat
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2225,38 +2375,38 @@ Da izbrišete vaš sadašnji avatar, potvrdite bez biranja nove slike.</translat
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Stara lozinka:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nova lozinka:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Potvrdi novu lozinku:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Promeni lozinku</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Nove lozinke se ne podudaraju</translation>
     </message>
@@ -2264,93 +2414,93 @@ Da izbrišete vaš sadašnji avatar, potvrdite bez biranja nove slike.</translat
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>Boja:</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="34"/>
         <source>white</source>
         <translation>belo</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="35"/>
         <source>blue</source>
         <translation>plavo</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="36"/>
         <source>black</source>
         <translation>crno</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="37"/>
         <source>red</source>
         <translation>crveno</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="38"/>
         <source>green</source>
         <translation>zeleno</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="39"/>
         <source>multicolor</source>
         <translation>višebojno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>bezbojno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>M/I:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>Anotacija:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Podaci o tokenima</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>Dodaj token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Uklonite token</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Molim Vas, ukucajte ime tokena:</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="155"/>
         <source>Error</source>
         <translation>Greška</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="156"/>
         <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"/>
@@ -2443,7 +2593,8 @@ 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="40"/>
-        <source>Hide games not created by buddy</source>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2530,52 +2681,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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -2583,37 +2734,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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -2621,86 +2772,86 @@ 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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -2716,17 +2867,17 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2734,43 +2885,43 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2784,45 +2935,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>Učitaj špil</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="28"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="26"/>
         <source>Number of hits:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="38"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="36"/>
         <source>Auto play hits</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="53"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="51"/>
         <source>Put top cards on stack until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
+        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="86"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="84"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="98"/>
+        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="96"/>
         <source>Invalid filter</source>
         <translation type="unfinished"/>
     </message>
@@ -2830,91 +3014,91 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>Domaćin:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>Ime igrača:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>Lozinka:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>Lozinka (ponovo):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>I-mejl:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>I-mejl (ponovo):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>Država:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>Neodređeno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="318"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="317"/>
         <source>Real name:</source>
         <translation>Pravo ime:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="353"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="352"/>
         <source>Register to server</source>
         <translation>Registruj se na server</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="367"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
         <source>Registration Warning</source>
         <translation>Upozorenje o registraciji</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="362"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="361"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="365"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="364"/>
         <source>Your passwords do not match, please try again.</source>
         <translation>Vaše lozinke se ne podudaraju, molim Vas, pokušajte ponovo</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="369"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="368"/>
         <source>Your email addresses do not match, please try again.</source>
         <translation>Vaše i-mejl adrese se ne podudaraju, molimo Vas, pokušajte ponovo.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="373"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="372"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Ime igrača ne može biti prazno.</translation>
     </message>
@@ -2940,40 +3124,55 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1883"/>
         <source>Unknown Error loading card database</source>
         <translation>Nepoznata Greška učitavanja baze podataka karte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -2984,7 +3183,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1897"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -2995,7 +3194,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -3004,14 +3203,14 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1909"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
@@ -3020,7 +3219,7 @@ Would you like to change your database location setting?</source>
 Da li bi ste želeli da promenite vaše podešavanje lokacije baze podataka?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1917"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -3029,59 +3228,59 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1925"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1935"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1945"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
         <source>The path to your deck directory is invalid. Would you like to go back and set the correct path?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1946"/>
         <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1958"/>
         <source>Settings</source>
         <translation>Podešavanja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1960"/>
         <source>General</source>
         <translation>Opšto</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1961"/>
         <source>Appearance</source>
         <translation>Izgled</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1962"/>
         <source>User Interface</source>
         <translation>Korisnički interfejs</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1963"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1964"/>
         <source>Chat</source>
         <translation>Ćaskanje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1965"/>
         <source>Sound</source>
         <translation>Zvuk</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1966"/>
         <source>Shortcuts</source>
         <translation>Prečice</translation>
     </message>
@@ -3089,39 +3288,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </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="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </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="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3129,17 +3328,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"/>
     </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"/>
     </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"/>
     </message>
@@ -3147,164 +3346,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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>Otvori Stranicu Za Preuzimanje</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="205"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="212"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="227"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>Provera za ažuriranja...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="150"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="161"/>
+        <source>Update Available</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <source>A new version of Cockatrice is available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="151"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="162"/>
+        <source>New version</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
         <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
-        <source>Update Available</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
-        <source>A new version of Cockatrice is available!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
-        <source>New version</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
         <source>Released</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
         <source>Changelog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
         <source>Unfortunately, the automatic updater failed to find a compatible download. 
 You may have to manually download the new version.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="169"/>
         <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="206"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="228"/>
         <source>Update Error</source>
         <translation>Greška Ažuriranja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
         <source>An error occurred while checking for updates:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="215"/>
         <source>An error occurred while downloading an update:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="220"/>
         <source>Installing...</source>
         <translation>Instalacija...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
         <source>Try to update manually by closing Cockatrice and running the installer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
         <source>Download location</source>
         <translation type="unfinished"/>
     </message>
@@ -3312,21 +3511,153 @@ 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="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Draw Probability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="106"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="109"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="112"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
+        <source>Category</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
+        <source>Qty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="115"/>
+        <source>Odds (%)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3396,33 +3727,39 @@ You may have to manually download the new version.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <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"/>
     </message>
@@ -3438,22 +3775,22 @@ 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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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"/>
     </message>
@@ -3461,22 +3798,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="412"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="415"/>
         <source>player left the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="418"/>
         <source>player disconnected from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="422"/>
         <source>reason unknown</source>
         <translation type="unfinished"/>
     </message>
@@ -3484,226 +3821,279 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
         <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
         <source>Please join the appropriate room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
         <source>Wrong password.</source>
         <translation>Pogrešna lozinka.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Posmatrači nisu dozvoljeni u ovoj igri.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="245"/>
         <source>The game is already full.</source>
         <translation>Igra je već puna.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="248"/>
         <source>The game does not exist any more.</source>
         <translation>Ova igra više ne postoji.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="251"/>
         <source>This game is only open to registered users.</source>
         <translation>Ova igra je samo otvorena za registrovane korisnike.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="254"/>
         <source>This game is only open to its creator&apos;s buddies.</source>
         <translation>Ova igra je samo otvorena za prijatelje njenog kreatora.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="257"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Vi ste ignorisani od strane kreatore ove igre.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="298"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="301"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="304"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="317"/>
+        <source>Join Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="322"/>
+        <source>Spectate Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
         <source>Join game</source>
         <translation>Pridruži se igri</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="351"/>
         <source>Password:</source>
         <translation>Lozinka:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
         <source>Please join the respective room first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="409"/>
         <source>&amp;Filter games</source>
         <translation>Filtriraj igre</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="410"/>
         <source>C&amp;lear filter</source>
         <translation>Očisti filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="412"/>
         <source>C&amp;reate</source>
         <translation>Kreiraj</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="413"/>
         <source>&amp;Join</source>
         <translation>Pridruži se</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>J&amp;oin as spectator</source>
         <translation>Pridruži se kao posmatrač</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="416"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="437"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="439"/>
         <source>Games</source>
         <translation>Igre</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="52"/>
+        <source>All types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="104"/>
+        <source>Filter by game name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="105"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="106"/>
+        <source>Hide games not created by buddies</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="107"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="108"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="38"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="47"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="49"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="148"/>
         <source>password</source>
         <translation>lozinka</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="150"/>
         <source>buddies only</source>
         <translation>samo prijatelji</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="155"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>reg. users only</source>
         <translation>samo reg. korisnici</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="154"/>
         <source>open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="186"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
         <source>can chat</source>
         <translation>može da ćaska</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="188"/>
         <source>see hands</source>
         <translation>vidi ruke</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>can see hands</source>
         <translation>može da vidi ruke</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>not allowed</source>
         <translation>nije dozvoljeno</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="216"/>
         <source>Room</source>
         <translation>Soba</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="220"/>
         <source>Age</source>
         <translation>Starost</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="228"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="230"/>
         <source>Creator</source>
         <translation>Kreator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="232"/>
         <source>Type</source>
         <translation>Tip</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Restrictions</source>
         <translation>Ograničenja</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Players</source>
         <translation>Igrači</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="246"/>
         <source>Spectators</source>
         <translation>Posmatrači</translation>
     </message>
@@ -3903,111 +4293,141 @@ You may have to manually download the new version.</source>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="111"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="113"/>
+        <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="114"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="115"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="116"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="118"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="119"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="120"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="122"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="123"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="124"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="125"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="132"/>
+        <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
+        <location filename="src/game/player/menu/hand_menu.cpp" line="131"/>
+        <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="200"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="215"/>
+        <source>Browse Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="218"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="237"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="247"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4015,193 +4435,213 @@ You may have to manually download the new version.</source>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
         <source>&amp;Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="212"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
         <source>View bottom cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
         <source>Reveal &amp;library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
         <source>Lend library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
         <source>Reveal &amp;top cards to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
         <source>&amp;Top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
         <source>&amp;Bottom of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
         <source>&amp;Always reveal top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Always look at top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Open deck in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
         <source>&amp;Undo last draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
         <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
         <source>&amp;Play top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
         <source>Play top card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="233"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="234"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="235"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="236"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="237"/>
+        <source>Move top cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="238"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="239"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="241"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="242"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="243"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="244"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="245"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="246"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="247"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="248"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="250"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/library_menu.cpp" line="251"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="252"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="260"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="294"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="329"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game/player/menu/library_menu.cpp" line="330"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4209,743 +4649,733 @@ You may have to manually download the new version.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
+        <location filename="src/interface/window_main.cpp" line="108"/>
+        <location filename="src/interface/window_main.cpp" line="461"/>
         <source>The server has reached its maximum user capacity, please check back later.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
+        <location filename="src/interface/window_main.cpp" line="111"/>
         <source>There are too many concurrent connections from your address.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
+        <location filename="src/interface/window_main.cpp" line="114"/>
         <source>Banned by moderator</source>
         <translation>Zabranjen od strane moderatora</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
+        <location filename="src/interface/window_main.cpp" line="117"/>
         <source>Expected end time: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
+        <location filename="src/interface/window_main.cpp" line="119"/>
         <source>This ban lasts indefinitely.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
+        <location filename="src/interface/window_main.cpp" line="125"/>
         <source>Scheduled server shutdown.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
+        <location filename="src/interface/window_main.cpp" line="128"/>
+        <location filename="src/interface/window_main.cpp" line="476"/>
         <source>Invalid username.</source>
         <translation>Nevažeće korisničko ime.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
+        <location filename="src/interface/window_main.cpp" line="131"/>
         <source>You have been logged out due to logging in at another location.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
+        <location filename="src/interface/window_main.cpp" line="136"/>
         <source>Connection closed</source>
         <translation>Povezanost prekinuta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
+        <location filename="src/interface/window_main.cpp" line="137"/>
         <source>The server has terminated your connection.
 Reason: %1</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
+        <location filename="src/interface/window_main.cpp" line="142"/>
         <source>The server is going to be restarted in %n minute(s).
 All running games will be lost.
 Reason for shutdown: %1</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
+        <location filename="src/interface/window_main.cpp" line="147"/>
         <source>Scheduled server shutdown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
+        <location filename="src/interface/window_main.cpp" line="186"/>
+        <location filename="src/interface/window_main.cpp" line="196"/>
         <source>Success</source>
         <translation>Uspeh</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
+        <location filename="src/interface/window_main.cpp" line="186"/>
         <source>Registration accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
+        <location filename="src/interface/window_main.cpp" line="196"/>
         <source>Account activation accepted.
 Will now login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
+        <location filename="src/interface/window_main.cpp" line="253"/>
         <source>Player %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="266"/>
         <source>Load replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>About Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="321"/>
         <source>Cockatrice Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="321"/>
         <source>Project Manager:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>Past Project Managers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>Developers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>Our Developers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Help Develop!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Translators:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Our Translators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Help Translate!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Support:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>Report an Issue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Troubleshooting</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="331"/>
         <source>F.A.Q.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="375"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
+        <location filename="src/interface/window_main.cpp" line="407"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
+        <location filename="src/interface/window_main.cpp" line="428"/>
+        <location filename="src/interface/window_main.cpp" line="436"/>
+        <location filename="src/interface/window_main.cpp" line="441"/>
+        <location filename="src/interface/window_main.cpp" line="465"/>
+        <location filename="src/interface/window_main.cpp" line="566"/>
+        <location filename="src/interface/window_main.cpp" line="570"/>
+        <location filename="src/interface/window_main.cpp" line="574"/>
+        <location filename="src/interface/window_main.cpp" line="577"/>
+        <location filename="src/interface/window_main.cpp" line="580"/>
+        <location filename="src/interface/window_main.cpp" line="590"/>
+        <location filename="src/interface/window_main.cpp" line="597"/>
+        <location filename="src/interface/window_main.cpp" line="604"/>
+        <location filename="src/interface/window_main.cpp" line="610"/>
+        <location filename="src/interface/window_main.cpp" line="1278"/>
+        <location filename="src/interface/window_main.cpp" line="1330"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
+        <location filename="src/interface/window_main.cpp" line="375"/>
         <source>Server timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
+        <location filename="src/interface/window_main.cpp" line="394"/>
         <source>Failed Login</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
+        <location filename="src/interface/window_main.cpp" line="395"/>
         <source>Your client seems to be missing features this server requires for connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
+        <location filename="src/interface/window_main.cpp" line="396"/>
         <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Incorrect username or password. Please check your authentication information and try again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
+        <location filename="src/interface/window_main.cpp" line="408"/>
         <source>There is already an active session using this user name.
 Please close that session first and re-login.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
+        <location filename="src/interface/window_main.cpp" line="560"/>
         <source>You are banned until %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
+        <location filename="src/interface/window_main.cpp" line="562"/>
         <source>You are banned indefinitely.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
+        <location filename="src/interface/window_main.cpp" line="429"/>
         <source>This server requires user registration. Do you want to register now?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
+        <location filename="src/interface/window_main.cpp" line="437"/>
         <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
+        <location filename="src/interface/window_main.cpp" line="442"/>
         <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
+        <location filename="src/interface/window_main.cpp" line="448"/>
         <source>Account activation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
+        <location filename="src/interface/window_main.cpp" line="449"/>
         <source>Your account has not been activated yet.
 You need to provide the activation token received in the activation email.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
+        <location filename="src/interface/window_main.cpp" line="460"/>
         <source>Server Full</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
+        <location filename="src/interface/window_main.cpp" line="466"/>
         <source>Unknown login error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
+        <location filename="src/interface/window_main.cpp" line="467"/>
+        <location filename="src/interface/window_main.cpp" line="582"/>
         <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
+        <location filename="src/interface/window_main.cpp" line="479"/>
         <source>Your username must respect these rules:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/interface/window_main.cpp" line="481"/>
         <source>is %1 - %2 characters long</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
+        <location filename="src/interface/window_main.cpp" line="482"/>
         <source>can %1 contain lowercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
+        <location filename="src/interface/window_main.cpp" line="482"/>
+        <location filename="src/interface/window_main.cpp" line="484"/>
+        <location filename="src/interface/window_main.cpp" line="487"/>
+        <location filename="src/interface/window_main.cpp" line="493"/>
         <source>NOT</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
+        <location filename="src/interface/window_main.cpp" line="484"/>
         <source>can %1 contain uppercase characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
+        <location filename="src/interface/window_main.cpp" line="487"/>
         <source>can %1 contain numeric characters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
+        <location filename="src/interface/window_main.cpp" line="490"/>
         <source>can contain the following punctuation: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
+        <location filename="src/interface/window_main.cpp" line="493"/>
         <source>first character can %1 be a punctuation mark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
+        <location filename="src/interface/window_main.cpp" line="500"/>
         <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
+        <location filename="src/interface/window_main.cpp" line="506"/>
         <source>can not contain any of the following words: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
+        <location filename="src/interface/window_main.cpp" line="512"/>
         <source>can not match any of the following expressions: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
+        <location filename="src/interface/window_main.cpp" line="518"/>
         <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/interface/window_main.cpp" line="528"/>
+        <location filename="src/interface/window_main.cpp" line="532"/>
+        <location filename="src/interface/window_main.cpp" line="536"/>
+        <location filename="src/interface/window_main.cpp" line="544"/>
+        <location filename="src/interface/window_main.cpp" line="548"/>
+        <location filename="src/interface/window_main.cpp" line="555"/>
         <source>Registration denied</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
+        <location filename="src/interface/window_main.cpp" line="529"/>
         <source>Registration is currently disabled on this server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
+        <location filename="src/interface/window_main.cpp" line="533"/>
         <source>There is already an existing account with the same user name.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
+        <location filename="src/interface/window_main.cpp" line="537"/>
         <source>It&apos;s mandatory to specify a valid email address when registering.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
+        <location filename="src/interface/window_main.cpp" line="549"/>
         <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
+        <location filename="src/interface/window_main.cpp" line="555"/>
         <source>Password too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
+        <location filename="src/interface/window_main.cpp" line="574"/>
         <source>Registration failed for a technical problem on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
+        <location filename="src/interface/window_main.cpp" line="577"/>
         <source>The connection to the server has been lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
+        <location filename="src/interface/window_main.cpp" line="581"/>
         <source>Unknown registration error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
+        <location filename="src/interface/window_main.cpp" line="590"/>
         <source>Account activation failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
+        <location filename="src/interface/window_main.cpp" line="597"/>
         <source>Socket error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
+        <location filename="src/interface/window_main.cpp" line="605"/>
         <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
+        <location filename="src/interface/window_main.cpp" line="611"/>
         <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
 Local version is %1, remote version is %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
+        <location filename="src/interface/window_main.cpp" line="621"/>
         <source>Connecting to %1...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
+        <location filename="src/interface/window_main.cpp" line="625"/>
         <source>Registering to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
+        <location filename="src/interface/window_main.cpp" line="628"/>
         <source>Disconnected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
+        <location filename="src/interface/window_main.cpp" line="631"/>
         <source>Connected, logging in at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="src/interface/window_main.cpp" line="639"/>
         <location filename="src/interface/window_main.cpp" line="644"/>
         <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
         <source>Requesting forgotten password to %1 as %2...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="660"/>
         <source>&amp;Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="661"/>
         <source>&amp;Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="662"/>
         <source>Start &amp;local game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="663"/>
         <source>&amp;Watch replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="664"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="665"/>
         <source>&amp;Register to server...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="666"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="667"/>
         <source>&amp;Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="669"/>
         <source>&amp;Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="672"/>
         <source>A&amp;ctions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="674"/>
         <source>&amp;Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="677"/>
         <source>C&amp;ard Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="678"/>
         <source>&amp;Manage sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="679"/>
         <source>Edit custom &amp;tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="680"/>
         <source>Open custom image folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="681"/>
         <source>Open custom sets folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="682"/>
         <source>Add custom sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="683"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="685"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="687"/>
         <source>&amp;Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="688"/>
         <source>&amp;About Cockatrice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="689"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="690"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="691"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="692"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="693"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="694"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="695"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="697"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="1011"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <location filename="src/interface/window_main.cpp" line="1012"/>
         <source>Congratulations on updating to Cockatrice %1!
 Oracle will now launch to update your card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="1016"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <location filename="src/interface/window_main.cpp" line="1017"/>
         <source>Congratulations on installing Cockatrice %1!
 Oracle will now launch to install the initial card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="1151"/>
         <source>Card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <location filename="src/interface/window_main.cpp" line="1153"/>
         <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="1157"/>
+        <location filename="src/interface/window_main.cpp" line="1182"/>
         <source>Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="1158"/>
+        <location filename="src/interface/window_main.cpp" line="1183"/>
         <source>No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="1159"/>
         <source>Open settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="1174"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <location filename="src/interface/window_main.cpp" line="1176"/>
         <source>%n new set(s) found in the card database
 Set code(s): %1
 Do you want to enable it/them?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="1184"/>
         <source>View sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="1203"/>
         <source>Welcome</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="1204"/>
         <source>Hi! It seems like you'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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="1224"/>
+        <location filename="src/interface/window_main.cpp" line="1384"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="1224"/>
         <source>A card database update is already running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="1279"/>
         <source>Unable to run the card database updater: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="1288"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <location filename="src/interface/window_main.cpp" line="1306"/>
         <source>Failed to start. The file might be missing, or permissions might be incorrect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="1309"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <location filename="src/interface/window_main.cpp" line="1313"/>
         <source>Timed out. The process took too long to respond. The last waitFor...() function timed out.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <location filename="src/interface/window_main.cpp" line="1316"/>
         <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <location filename="src/interface/window_main.cpp" line="1320"/>
         <source>An error occurred when attempting to read from the process. For example, the process may not be running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="1325"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="1330"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
+        <location filename="src/interface/window_main.cpp" line="1385"/>
         <source>This server supports additional features that your client doesn'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.
 
@@ -4953,672 +5383,862 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1404"/>
+        <location filename="src/interface/window_main.cpp" line="1413"/>
+        <location filename="src/interface/window_main.cpp" line="1419"/>
+        <location filename="src/interface/window_main.cpp" line="1447"/>
+        <location filename="src/interface/window_main.cpp" line="1451"/>
         <source>Load sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1413"/>
         <source>Selected file cannot be found.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1419"/>
         <source>You can only import XML databases at this time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <location filename="src/interface/window_main.cpp" line="1448"/>
         <source>The new sets/cards have been added successfully.
 Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1451"/>
         <source>Sets/cards failed to import.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
+        <location filename="src/interface/window_main.cpp" line="1502"/>
+        <location filename="src/interface/window_main.cpp" line="1512"/>
+        <location filename="src/interface/window_main.cpp" line="1521"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
+        <location filename="src/interface/window_main.cpp" line="1503"/>
         <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
+        <location filename="src/interface/window_main.cpp" line="1513"/>
         <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
+        <location filename="src/interface/window_main.cpp" line="1522"/>
         <source>Activation request received, please check your email for an activation token.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaBaseConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="46"/>
+        <source>Mana Base Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="48"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="51"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="53"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="55"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="46"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="51"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="111"/>
         <source>%1 is not revealing the top card %2 any longer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="118"/>
         <source>%1 can now look at top card %2 at any time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
         <source>%1 no longer can look at top card %2 at any time.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="126"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="137"/>
         <source>%1 has conceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
         <source>%1 has unconceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="156"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="160"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="176"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="184"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="189"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="197"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="201"/>
         <source>%1 points from their %2 to %3&apos;s %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="207"/>
         <source>%1 points from %2&apos;s %3 to their own %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="213"/>
         <source>%1 points from %2&apos;s %3 to %4&apos;s %5.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="227"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="229"/>
         <source>%1 creates token: %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="240"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="242"/>
         <source>%1 has loaded a deck with %2 sideboard cards (%3).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="252"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="287"/>
         <source>a card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="293"/>
         <source>%1 gives %2 control over %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="305"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="307"/>
         <source>%1 puts %2 into play%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="311"/>
+        <source>%1 puts %2%3 into their graveyard face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/log/message_log_widget.cpp" line="313"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="317"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
         <source>%1 exiles %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="322"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="325"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="327"/>
         <source>%1 puts %2%3 onto the bottom of their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="329"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="333"/>
         <source>%1 puts %2%3 into their library %4 cards from the top.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="336"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/log/message_log_widget.cpp" line="342"/>
         <source>%1 plays %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="347"/>
+        <source>%1 moves %2%3 to custom zone &apos;%4&apos; face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/log/message_log_widget.cpp" line="349"/>
         <source>%1 moves %2%3 to custom zone &apos;%4&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="370"/>
         <source>%1 tries to draw from an empty library</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="372"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="382"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="387"/>
         <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"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="391"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="399"/>
         <source>%1 turns %2 face-down.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-up.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="408"/>
         <source>The game has been closed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="413"/>
         <source>The game has started.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="418"/>
         <source>You are flooding the game. Please wait a couple of seconds.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="424"/>
         <source>%1 has joined the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="430"/>
         <source>%1 is now watching the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="435"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="441"/>
         <source>%1 has left the game (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="456"/>
         <source>%1 is not ready to start the game any more.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="465"/>
         <source>%1 shuffles their deck and draws a new hand of %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="470"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="476"/>
         <source>You are watching a replay of game #%1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="481"/>
         <source>%1 is ready to start the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="507"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="509"/>
         <source>%1 card(s)</source>
         <comment>a card for singular, %1 cards for plural</comment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="518"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="523"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="529"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="535"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="541"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="549"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="553"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
         <source>%1 reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="573"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="575"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="583"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="584"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="595"/>
         <source>%1 flips %2 coins. There are %3 heads and %4 tails.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="605"/>
         <source>%1 rolls a %2-sided dice %3 times: %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="633"/>
         <source>%1&apos;s turn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="639"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="650"/>
         <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="652"/>
         <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="670"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="682"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="684"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="703"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="708"/>
         <source>%1 changes the PT of %2 from nothing to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="711"/>
         <source>%1 changes the PT of %2 from %3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="720"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="723"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
         <source>%1 taps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="741"/>
         <source>%1 untaps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="744"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="760"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="764"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="769"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="774"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="789"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="797"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game/log/message_log_widget.cpp" line="800"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -5626,110 +6246,110 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1556"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1557"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1558"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1559"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
         <source>Add message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1508"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
         <source>Message:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1539"/>
         <source>Chat settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1540"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1541"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1542"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1543"/>
         <source>In-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1545"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1546"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1547"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1548"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1549"/>
         <source>Invert text color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1550"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1551"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1552"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1553"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1554"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1555"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"/>
     </message>
@@ -5742,32 +6362,37 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="63"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="64"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="65"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="66"/>
+        <source>T&amp;able</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game/player/menu/move_menu.cpp" line="67"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="68"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game/player/menu/move_menu.cpp" line="69"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -5846,62 +6471,62 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -5909,57 +6534,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game/phases_toolbar.cpp" line="155"/>
         <source>Untap step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game/phases_toolbar.cpp" line="157"/>
         <source>Upkeep step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game/phases_toolbar.cpp" line="159"/>
         <source>Draw step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game/phases_toolbar.cpp" line="161"/>
         <source>First main phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game/phases_toolbar.cpp" line="163"/>
         <source>Beginning of combat step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game/phases_toolbar.cpp" line="165"/>
         <source>Declare attackers step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game/phases_toolbar.cpp" line="167"/>
         <source>Declare blockers step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game/phases_toolbar.cpp" line="169"/>
         <source>Combat damage step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game/phases_toolbar.cpp" line="171"/>
         <source>End of combat step</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game/phases_toolbar.cpp" line="173"/>
         <source>Second main phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game/phases_toolbar.cpp" line="175"/>
         <source>End of turn step</source>
         <translation type="unfinished"/>
     </message>
@@ -5967,7 +6592,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="254"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
@@ -5976,134 +6601,138 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <location filename="src/game/player/player_actions.cpp" line="175"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game/player/player_actions.cpp" line="176"/>
+        <location filename="src/game/player/player_actions.cpp" line="189"/>
+        <location filename="src/game/player/player_actions.cpp" line="249"/>
+        <location filename="src/game/player/player_actions.cpp" line="278"/>
+        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game/player/player_actions.cpp" line="358"/>
+        <location filename="src/game/player/player_actions.cpp" line="450"/>
+        <location filename="src/game/player/player_actions.cpp" line="645"/>
+        <location filename="src/game/player/player_actions.cpp" line="768"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game/player/player_actions.cpp" line="188"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game/player/player_actions.cpp" line="248"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game/player/player_actions.cpp" line="277"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game/player/player_actions.cpp" line="312"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game/player/player_actions.cpp" line="314"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game/player/player_actions.cpp" line="357"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game/player/player_actions.cpp" line="423"/>
+        <location filename="src/game/player/player_actions.cpp" line="428"/>
+        <location filename="src/game/player/player_actions.cpp" line="618"/>
+        <location filename="src/game/player/player_actions.cpp" line="623"/>
+        <source>grave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game/player/player_actions.cpp" line="433"/>
+        <location filename="src/game/player/player_actions.cpp" line="438"/>
+        <location filename="src/game/player/player_actions.cpp" line="628"/>
+        <location filename="src/game/player/player_actions.cpp" line="633"/>
+        <source>exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
+        <location filename="src/game/player/player_actions.cpp" line="449"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
+        <location filename="src/game/player/player_actions.cpp" line="644"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game/player/player_actions.cpp" line="767"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
+        <location filename="src/game/player/player_actions.cpp" line="871"/>
+        <location filename="src/game/player/player_actions.cpp" line="917"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game/player/player_actions.cpp" line="1045"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game/player/player_actions.cpp" line="1045"/>
+        <location filename="src/game/player/player_actions.cpp" line="1583"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game/player/player_actions.cpp" line="1209"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game/player/player_actions.cpp" line="1210"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game/player/player_actions.cpp" line="1210"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game/player/player_actions.cpp" line="1369"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game/player/player_actions.cpp" line="1369"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game/player/player_actions.cpp" line="1489"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game/player/player_actions.cpp" line="1490"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game/player/player_actions.cpp" line="1583"/>
         <source>Set counters</source>
         <translation type="unfinished"/>
     </message>
@@ -6111,48 +6740,65 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="90"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game/player/menu/player_menu.cpp" line="97"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="155"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="199"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="207"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="214"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="222"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6168,17 +6814,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6186,32 +6832,40 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
@@ -6273,37 +6927,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="765"/>
         <source>Services</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="766"/>
         <source>Hide %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
         <source>Hide Others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
         <source>Show All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Preferences...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="770"/>
         <source>Quit %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="771"/>
         <source>About %1</source>
         <translation type="unfinished"/>
     </message>
@@ -6311,135 +6965,162 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="85"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="86"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="268"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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"/>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="774"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="775"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="776"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="777"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="778"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="779"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="780"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="781"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="782"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="783"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="784"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="785"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="786"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="787"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="788"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="789"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="790"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
@@ -6498,37 +7179,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="62"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -6536,41 +7217,49 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game/player/menu/say_menu.cpp" line="16"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6607,27 +7296,27 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="84"/>
         <source>Enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="86"/>
         <source>Set type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="88"/>
         <source>Set code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="90"/>
         <source>Long name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="92"/>
         <source>Release date</source>
         <translation type="unfinished"/>
     </message>
@@ -6635,53 +7324,53 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1754"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
         <source>Do you really want to restore all default shortcuts?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1739"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1740"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1749"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1750"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1751"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1753"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1755"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1756"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -6689,12 +7378,12 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -6702,13 +7391,13 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -6735,12 +7424,12 @@ Please check your shortcut settings!</source>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game/player/menu/sideboard_menu.cpp" line="21"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -6748,27 +7437,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1633"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1634"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1635"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1636"/>
         <source>Sound settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1637"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -6776,48 +7465,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="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -6981,56 +7670,179 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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="333"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
+        <source>Desc.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="104"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="391"/>
+        <source>AND</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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="392"/>
+        <source>Require ALL selected colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="109"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="394"/>
+        <source>Deck name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="113"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="395"/>
+        <source>Owner...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="120"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="396"/>
+        <source>Packages</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="127"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="397"/>
+        <source>Advanced Filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="205"/>
+        <source>Bracket:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="261"/>
+        <source>Any</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="241"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="399"/>
+        <source>Contains card...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="245"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="400"/>
+        <source>Commander...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="249"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="401"/>
+        <source>Tag...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="254"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="404"/>
+        <source>Deck Size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="269"/>
+        <source>Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="387"/>
+        <source>Asc.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="386"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="408"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="123"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="406"/>
+        <source>Search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="403"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </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="83"/>
         <source>Deck: %1</source>
         <translation type="unfinished"/>
     </message>
@@ -7038,61 +7850,55 @@ 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="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="118"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="297"/>
         <source>&amp;Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="306"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="301"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="307"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="303"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="308"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="311"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="312"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="315"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7100,22 +7906,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="43"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="56"/>
         <source>Visual Deck View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="57"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="58"/>
         <source>Deck Analytics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="59"/>
         <source>Sample Hand</source>
         <translation type="unfinished"/>
     </message>
@@ -7123,133 +7929,133 @@ Please check your shortcut settings!</source>
 <context>
     <name>TabDeckStorage</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="166"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="168"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="167"/>
         <source>Server deck storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
         <source>Open in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="170"/>
         <source>Rename deck or folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="172"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="171"/>
         <source>Upload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="173"/>
         <source>Download deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="174"/>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="374"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="176"/>
         <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="178"/>
         <source>Open decks folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="259"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="262"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="277"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="312"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="334"/>
         <source>Invalid deck file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
         <source>Enter deck name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="321"/>
         <source>This decklist does not have a name.
 Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="326"/>
         <source>Unnamed deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="351"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="389"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="546"/>
         <source>Are you sure you want to delete the selected decks?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="374"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="510"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
@@ -7262,17 +8068,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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"/>
     </message>
@@ -7313,7 +8119,7 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation type="unfinished"/>
     </message>
@@ -7321,197 +8127,191 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="266"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="903"/>
         <source>Replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="266"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="276"/>
         <source>Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
         <source>Player List</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="280"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="342"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="281"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>Messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Replay Timeline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="288"/>
         <source>&amp;Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
         <source>&amp;Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="293"/>
         <source>Next &amp;phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
         <source>Next phase with &amp;action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
         <source>Next &amp;turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>&amp;Remove all local arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>Game &amp;information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="319"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="816"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="837"/>
         <source>&amp;Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="326"/>
         <source>&amp;Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="324"/>
         <source>C&amp;lose replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="330"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
         <source>&amp;Say:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="337"/>
         <source>Selected cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
         <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
         <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="487"/>
         <source>Are you sure you want to concede this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="492"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="493"/>
         <source>You have already conceded.  Do you want to return to this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
         <source>Leave game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="510"/>
         <source>Are you sure you want to leave this game?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="626"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="627"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
@@ -7519,7 +8319,7 @@ Please enter a name:</source>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
@@ -7527,157 +8327,157 @@ Please enter a name:</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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="146"/>
         <source>Username: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>IP Address: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>Game Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>GameID: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>Message: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="167"/>
         <source>Main Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="168"/>
         <source>Game Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
         <source>Private Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Past X Days: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Last Hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>At least one filter is required.
 The more information you put in, the more specific your results will be.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="184"/>
         <source>Get User Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Clear Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="204"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="214"/>
         <source>Log Locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="223"/>
         <source>Date Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="230"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="267"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="273"/>
         <source>Message History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="268"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="274"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"/>
     </message>
@@ -7723,180 +8523,180 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="198"/>
         <source>Local file system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
         <source>Server replay storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
         <source>Watch replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
         <source>New folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Download replay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
         <source>Toggle expiration lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
         <source>Look up replay by share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="281"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="284"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="299"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="317"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
         <source>Delete local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="332"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="492"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
         <source>Failed to get code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="541"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="602"/>
         <source>Either this server does not support replay sharing, or does not permit replay sharing for you.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
         <source>Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="547"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
         <source>Others can use this code to add the replay to their list of remote replays:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="559"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="568"/>
         <source>Replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="589"/>
         <source>Replay code found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="590"/>
         <source>Replay was added, or you already had access to it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="595"/>
         <source>Replay code not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="607"/>
         <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="491"/>
         <source>Delete remote replay</source>
         <translation type="unfinished"/>
     </message>
@@ -7962,30 +8762,30 @@ The more information you put in, the more specific your results will be.</source
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="200"/>
         <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
         <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
         <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="201"/>
         <source>Failed to join the server room: it doesn&apos;t exist on the server.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
         <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
         <source>You do not have the required permission to join this server room.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
         <source>Failed to join the server room due to an unknown error: %1.</source>
         <translation type="unfinished"/>
     </message>
@@ -7993,92 +8793,97 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
-        <source>Home</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
-        <source>&amp;Visual Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
-        <source>Visual Database Display</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
-        <source>Server</source>
+        <source>Archidekt</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
-        <source>Account</source>
+        <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
-        <source>Deck Storage</source>
+        <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
-        <source>Game Replays</source>
+        <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
-        <source>Administration</source>
+        <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <source>Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
+        <source>Deck Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
+        <source>Game Replays</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
+        <source>Administration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="279"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="280"/>
         <source>There are still open games. Are you sure you want to quit?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1007"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1035"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1076"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1077"/>
         <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.
 
@@ -8086,38 +8891,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1082"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1086"/>
         <source>Promotion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1087"/>
         <source>You have been promoted. Please log out and back in for changes to take effect.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1091"/>
         <source>Warned</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1092"/>
         <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1106"/>
         <source>You have received the following message from the server.
 (custom messages like these could be untranslated)</source>
         <translation type="unfinished"/>
@@ -8126,7 +8931,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TabVisualDatabaseDisplay</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="26"/>
+        <source>Database Display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="27"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
@@ -8206,7 +9016,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="51"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"/>
     </message>
@@ -8214,206 +9024,206 @@ 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="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation type="unfinished"/>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation type="unfinished"/>
     </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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation type="unfinished"/>
     </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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation type="unfinished"/>
     </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="67"/>
         <source>Warn user</source>
         <translation type="unfinished"/>
     </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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"/>
     </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="69"/>
         <source>Ban from &amp;server</source>
         <translation type="unfinished"/>
     </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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"/>
     </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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation type="unfinished"/>
     </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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </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="74"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </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="75"/>
         <source>View admin notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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"/>
     </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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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="200"/>
         <source>Ban History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="201"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="211"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="232"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="236"/>
         <source>Warning History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="218"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="216"/>
         <source>Warning Time;Moderator;User Name;Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="233"/>
         <source>User has never been warned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="237"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </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="245"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="262"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="263"/>
         <source>Successfully promoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
         <source>Successfully demoted user.</source>
         <translation type="unfinished"/>
     </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="245"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
         <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="270"/>
         <source>Failed to promote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="272"/>
         <source>Failed to demote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="358"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="378"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -8595,137 +9405,152 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
         <source>General interface settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="961"/>
         <source>&amp;Double-click cards to play them (instead of single-click)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
         <source>&amp;Clicking plays all selected cards (instead of just the clicked card)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="963"/>
         <source>&amp;Play all nonlands onto the stack (not the battlefield) by default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <source>Do not delete &amp;arrows inside of subphases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="965"/>
         <source>Close card view window when last card is removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
         <source>Auto focus search bar when card view window is opened</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
-        <source>Use tear-off menus, allowing right click menus to persist on screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
-        <source>Notifications settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
-        <source>Enable notifications in taskbar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
-        <source>Notify in the taskbar for game events while you are spectating</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
-        <source>Notify in the taskbar when users in your buddy list connect</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
-        <source>Animation settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
-        <source>&amp;Tap/untap animation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
-        <source>Deck editor/storage settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
-        <source>Open deck in new tab by default</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
-        <source>Use visual deck storage in game lobby</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
-        <source>Use selection animation for Visual Deck Storage</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
-        <source>When adding a tag in the visual deck storage to a .txt deck:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
-        <source>do nothing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
-        <source>ask to convert to .cod</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
-        <source>always convert to .cod</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
-        <source>Default deck editor type</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
-        <source>Classic Deck Editor</source>
+        <source>Show selection counter during drag selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
-        <source>Visual Deck Editor</source>
+        <source>Show total selection counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
-        <source>Replay settings</source>
+        <source>Use tear-off menus, allowing right click menus to persist on screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <source>Notifications settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="972"/>
+        <source>Enable notifications in taskbar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="973"/>
+        <source>Notify in the taskbar for game events while you are spectating</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="974"/>
+        <source>Notify in the taskbar when users in your buddy list connect</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="975"/>
+        <source>Animation settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="976"/>
+        <source>&amp;Tap/untap animation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="977"/>
+        <source>Deck editor/storage settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="978"/>
+        <source>Open deck in new tab by default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="979"/>
+        <source>Use visual deck storage in game lobby</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="980"/>
+        <source>Use selection animation for Visual Deck Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="982"/>
+        <source>When adding a tag in the visual deck storage to a .txt deck:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="984"/>
+        <source>do nothing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="986"/>
+        <source>ask to convert to .cod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="988"/>
+        <source>always convert to .cod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="989"/>
+        <source>Default deck editor type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="990"/>
+        <source>Classic Deck Editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="991"/>
+        <source>Visual Deck Editor</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="992"/>
+        <source>Replay settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="993"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation type="unfinished"/>
     </message>
@@ -8733,22 +9558,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="445"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="448"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="451"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="454"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
@@ -8756,32 +9581,32 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="92"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="93"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game/player/menu/utility_menu.cpp" line="94"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
@@ -8790,90 +9615,212 @@ Please refrain from engaging in this activity or further actions may be taken ag
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="142"/>
+        <source>Sort by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="143"/>
+        <source>Filter by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Save and load filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="146"/>
+        <source>Filter by exact card name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="147"/>
+        <source>Filter by card main-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="148"/>
+        <source>Filter by card sub-type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="149"/>
+        <source>Filter by set</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="150"/>
+        <source>Filter by format legality</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="152"/>
+        <source>Save/Load</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="153"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Sub Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Sets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="71"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="66"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="177"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="177"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8881,7 +9828,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="41"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="43"/>
         <source>Filter to most recent sets</source>
         <translation type="unfinished"/>
     </message>
@@ -8889,19 +9836,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="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="57"/>
         <source>Search sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="87"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="87"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="256"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -8909,27 +9856,37 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="26"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="71"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="185"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="185"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -8937,50 +9894,93 @@ 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="53"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="55"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="65"/>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="200"/>
+        <source>Visual</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="179"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="180"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="121"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="96"/>
+        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="118"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -8988,46 +9988,25 @@ 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="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="207"/>
+        <source>Type a card name here for suggestions from the database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="208"/>
         <source>Quick search and add card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="209"/>
         <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"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -9035,47 +10014,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="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9083,7 +10067,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="25"/>
+        <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"/>
     </message>
@@ -9091,22 +10075,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="47"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -9114,17 +10098,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="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9132,43 +10116,43 @@ 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_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="128"/>
         <source>Which warning would you like to send?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="136"/>
         <source>Redact all messages from this user in all rooms</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="138"/>
         <source>&amp;OK</source>
         <translation>U redu</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="141"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="156"/>
         <source>Warn user for misconduct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="162"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="168"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
         <source>User name to send a warning to can not be blank, please specify a user to warn.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
         <source>Warning to use can not be blank, please select a valid warning to send.</source>
         <translation type="unfinished"/>
     </message>
@@ -9176,133 +10160,133 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <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="35"/>
         <source>Move selected set to the top</source>
         <translation type="unfinished"/>
     </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="42"/>
         <source>Move selected set up</source>
         <translation type="unfinished"/>
     </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="49"/>
         <source>Move selected set down</source>
         <translation type="unfinished"/>
     </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="56"/>
         <source>Move selected set to the bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="64"/>
         <source>Search by set name, code, or type</source>
         <translation type="unfinished"/>
     </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="69"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </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="70"/>
         <source>Restore original art priority order</source>
         <translation type="unfinished"/>
     </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="106"/>
         <source>Enable all sets</source>
         <translation type="unfinished"/>
     </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="107"/>
         <source>Disable all sets</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Enable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="109"/>
         <source>Disable selected set(s)</source>
         <translation type="unfinished"/>
     </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="125"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </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="125"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation type="unfinished"/>
     </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="126"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation type="unfinished"/>
     </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="127"/>
         <source>Image priority is decided in the following order:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="128"/>
         <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="157"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="127"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="132"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="136"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="139"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </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="143"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="144"/>
         <source>To enable ordering again, click the column header until this message disappears.</source>
         <translation type="unfinished"/>
     </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="147"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="148"/>
         <source>Sorts the set priority using the same column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="187"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9310,72 +10294,72 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="229"/>
         <source>Ungrouped</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
         <source>Group by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
         <source>Group by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="239"/>
         <source>Unsorted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
         <source>Sort by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="242"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="243"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="244"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="249"/>
         <source>shuffle when closing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game/zones/view_zone_widget.cpp" line="250"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -9383,7 +10367,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="175"/>
         <source>English</source>
         <translation>Srpski (Serbian)</translation>
     </message>
@@ -9391,12 +10375,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="230"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="231"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -9404,1005 +10388,1058 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="756"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>Moć i Izdržljivost</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>Faze Igre</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="765"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>Izađite</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>Ceo ekran</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>Zatvorite</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="238"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="245"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="248"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="731"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="254"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="257"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="276"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="279"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="289"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="293"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="398"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="401"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="404"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="389"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="392"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="395"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="353"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="286"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="296"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="299"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="302"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="305"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="308"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="311"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="314"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="317"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="320"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="323"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="326"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="329"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="332"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="335"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="338"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="341"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="344"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="347"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="350"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="356"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="359"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="362"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="365"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="368"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="371"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="374"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="377"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="380"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="383"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="386"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="407"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="410"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="413"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="416"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="419"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="422"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="426"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="429"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="432"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="435"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="438"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="441"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="444"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="447"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="450"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="453"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="456"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="459"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="463"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="465"/>
         <source>Draw</source>
         <translation>Izvlačenje</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="466"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="469"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Attack</source>
         <translation>Napad</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="475"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="478"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>End</source>
         <translation>Kraj</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="492"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="495"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="498"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="501"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
+        <location filename="src/client/settings/shortcuts_settings.h" line="504"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="507"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="510"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="513"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="516"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="519"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="522"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="525"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="528"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="531"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="534"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="537"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="540"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="543"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="546"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="549"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="552"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="555"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="576"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Exile</source>
         <translation>Izgnanstvo</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="558"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="572"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="595"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Graveyard</source>
         <translation>Groblje</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="562"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="570"/>
         <source>Hand</source>
         <translation>Ruka</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="644"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="592"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
         <source>Library</source>
         <translation>Špil</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="580"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="586"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="589"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="621"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="598"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="602"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="607"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="637"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="641"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="614"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="650"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="653"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="656"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="659"/>
         <source>Leave Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="663"/>
         <source>Concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Roll Dice...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="673"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="676"/>
         <source>Mulligan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="679"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="682"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="685"/>
         <source>Draw a Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="688"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="691"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="694"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="697"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="700"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="703"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="706"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="709"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="713"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="716"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="719"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="722"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="725"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="728"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="734"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="737"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="740"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="743"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="746"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="749"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="752"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="758"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="759"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="767"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="769"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="774"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_sv.ts b/cockatrice/translations/cockatrice_sv.ts
index 6464f1edb..2f9eb911b 100644
--- a/cockatrice/translations/cockatrice_sv.ts
+++ b/cockatrice/translations/cockatrice_sv.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;Placera polett...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation type="unfinished"/>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,79 +36,81 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -116,202 +118,253 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>Temainställningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>Aktuellt tema:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>Kortrendering</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>Visa kortnamn på kort som har bilder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>Skala kort på musen över</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>Handlayout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>Visa hand horisontellt (slösar plats)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>Aktivera vänsterjustering</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>Bordets rutnätlayout</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>Invertera vertikal koordinat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>Minst antal spelare för multi-kolumnlayout:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>Maximal teckenstorlek för information som visas på kort:</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -333,112 +386,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>bannlys användar&amp;namn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>bannlys &amp;IP address</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>förbjuda klienten I &amp; D</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>Typ av bannlysning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;permanent bannlysning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;temporär bannlysning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>&amp;Dagar:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>&amp;Timmar:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;Minuter:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>Bannlysningens längd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>Vänligen ange anledningen till bannlysningen.
 Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>Vänligen ange en anledning för bannlysningen som kommer att visas för den bannlysta personen.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Avbryt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>Bannlys användaren från servern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>Du måste välja en namnbaserad, IP-baserad, clientId-baserad eller en kombination av de tre för att lägga ett förbud.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>Du måste ha ett värde i namnförbudet när du markerar kryssrutan för namnförbud.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>Du måste ha ett värde i ip-förbudet när du markerar kryssrutan ip-banan.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>Du måste ha ett värde i clientidförbudet när du markerar kryssrutan för klientidförbud.</translation>
     </message>
@@ -446,152 +499,221 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>BetaReleaseChannel</name>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation>Inget svar mottaget från uppdateringsservern.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>Ogiltigt svar mottaget från uppdateringsserveren.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation>Inget svar mottaget från filuppdateringsservern.</translation>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>Utgåvor</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>Manakostnad</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>Korttyp</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>P/T</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>Färg(er)</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>OCH</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>ELLER</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>OCH INTE</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>ELLER INTE</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>Färg</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>Manakostnad</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>Raritet</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>Styrka</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>Lojalitet</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -599,22 +721,22 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -622,22 +744,22 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -650,12 +772,22 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
@@ -663,132 +795,150 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
@@ -796,133 +946,133 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -931,7 +1081,7 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -939,29 +1089,470 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -969,47 +1560,17 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <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"/>
     </message>
@@ -1017,87 +1578,97 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <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"/>
     </message>
@@ -1123,114 +1694,114 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </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="162"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </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="166"/>
+        <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"/>
     </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="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </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="168"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="172"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </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="174"/>
         <source>Load deck from online service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1238,7 +1809,7 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1246,194 +1817,171 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>Uppdatera Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>Fel</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>Lägg till webbadress</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>Uppdaterar ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>Välj sökväg</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>Spoilers</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>Ladda ner Spoilers automatiskt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation>Spoiler Plats:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>Senaste ändring</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>Spoilers laddas ner automatiskt vid lanseringen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>Tryck på knappen för att manuellt uppdatera utan omstart</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation>Ladda enkelt ned bilder på kort</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation>Hur man lägger till en valfri webbadress</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>Ta bort nedladdade bilder</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation>Återställ nedladdnings-webbadresser</translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>Kort</translation>
     </message>
@@ -1441,12 +1989,12 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1454,17 +2002,17 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -1472,7 +2020,7 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <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"/>
     </message>
@@ -1480,62 +2028,62 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <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"/>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </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="104"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </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="105"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </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="106"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </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="107"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <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"/>
     </message>
@@ -1543,98 +2091,156 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1652,74 +2258,74 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>Ladda lek...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>Ladda remote lek...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>Fel</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>Den valda filen kunde ej laddas.</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1752,143 +2358,143 @@ This will kick all non-ready players from the game.</source>
         <translation>Hämtar ...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>Kända värdar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>Uppdatera servern listan med kända offentliga servrar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>Ny värd</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>Namn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;Värd:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>Spelar&amp;namn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>&amp;Lösenord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>&amp;Spara lösenord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>Anslut automatiskt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>Koppla automatiskt till den senaste inloggningen när Cockatrice öppnas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>Om du har problem med att ansluta eller registrera kontaktar du serverns personal för hjälp!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>Webbsida</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>&amp;Ansluta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>Logga in</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation>Serverkontakt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>Anslut till servern</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation>Server webbadress</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation>Unikt servernamn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>Anslutningsvarning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>Du måste ange din nya anslutningsprofil.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>Anslutningsvarning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>Fältet för spelarnamn kan inte lämnas tomt.</translation>
     </message>
@@ -1896,117 +2502,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>Kom ihåg inställningar</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>&amp;Beskrivning:</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>&amp;Spelare:</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>Allmän</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>Speltyp</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>&amp;Lösenord:</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>Endast &amp;vänner kan ansluta</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>Endast &amp;registerade användare kan ansluta</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>Anslutingsbegränsningar</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>Åskådare tillåtna</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>Åskådare behöver lösenord</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>Åskådare kan &amp;chatta</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>Åskådare kan se spelares händer</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"/>
     </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>Åskådare</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>Tydlig</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>Skapa spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>Spelinformation</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>Serverfel.</translation>
     </message>
@@ -2014,97 +2625,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;Namn:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>Jetong</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Färg:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>vit</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>blå</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>svart</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>röd</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>grön</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>multifärgad</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>färglös</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotering:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;Förstör jetong när den lämnar bordet</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>Jetongdata</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>Visa alla &amp;jetonger</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>Visa jetonger från denna &amp;lek</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>Välj jetong från lista</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>Skapa jetong</translation>
     </message>
@@ -2112,53 +2723,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2166,40 +2777,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>Ingen bild vald.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>För att ändra din avatar, välj en ny bild.
 För att radera din nuvarande avatar, klicka &quot;bekräfta&quot; utan att välja en ny bild.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>Leta...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>Ändra avatar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>Öppna bild</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>Bildfiler (*.png *.jpg *.bmp)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>Ogiltigt val av bild.</translation>
     </message>
@@ -2207,17 +2818,17 @@ För att radera din nuvarande avatar, klicka &quot;bekräfta&quot; utan att väl
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2225,38 +2836,38 @@ För att radera din nuvarande avatar, klicka &quot;bekräfta&quot; utan att väl
 <context>
     <name>DlgEditPassword</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>Ditt gamla lösenord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>Nytt lösenord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>Bekräfta ditt nya lösenord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>Ändra lösenord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>Dina nya lösenord matchar inte.</translation>
     </message>
@@ -2264,93 +2875,93 @@ För att radera din nuvarande avatar, klicka &quot;bekräfta&quot; utan att väl
 <context>
     <name>DlgEditTokens</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;Namn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>&amp;Färg:</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="34"/>
         <source>white</source>
         <translation>vit</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="35"/>
         <source>blue</source>
         <translation>blå</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="36"/>
         <source>black</source>
         <translation>svart</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="37"/>
         <source>red</source>
         <translation>röd</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="38"/>
         <source>green</source>
         <translation>grön</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="39"/>
         <source>multicolor</source>
         <translation>multifärgad</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>färglös</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;P/T:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;Annotering:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>Jetongdata</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>Lägg till jetong</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>Ta bort jetong</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>Vänligen ange namnet på jetongen:</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>Fel</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>Det valda namnet står i konflikt med ett befintligt kort eller token.
@@ -2375,12 +2986,12 @@ Se till att du aktiverar &quot;Token&quot; i dialogrutan &quot;Hantera uppsättn
         <translation>Odefinierat</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>Riktiga namn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>Justera användarprofil</translation>
     </message>
@@ -2418,112 +3029,113 @@ Se till att du aktiverar &quot;Token&quot; i dialogrutan &quot;Hantera uppsättn
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>Spel&amp;beskrivning:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>S&amp;kaparens namn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>&amp;Speltyper</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>&amp;Minst:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>M&amp;ax:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>Maximalt antal spelare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>begränsningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>Filtrera spel</translation>
     </message>
@@ -2531,52 +3143,52 @@ Se till att du aktiverar &quot;Token&quot; i dialogrutan &quot;Hantera uppsättn
 <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"/>
     </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"/>
     </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"/>
     </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>&amp;Värd:</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>&amp;Hamn:</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"/>
     </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>E-post:</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"/>
     </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"/>
     </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>E-postadressen kan inte vara tom.</translation>
     </message>
@@ -2584,37 +3196,37 @@ Se till att du aktiverar &quot;Token&quot; i dialogrutan &quot;Hantera uppsättn
 <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"/>
     </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>&amp;Värd:</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>&amp;Hamn:</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"/>
     </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"/>
     </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"/>
     </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>Spelarens namn kan inte vara tomt.</translation>
     </message>
@@ -2622,86 +3234,86 @@ Se till att du aktiverar &quot;Token&quot; i dialogrutan &quot;Hantera uppsättn
 <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"/>
     </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"/>
     </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"/>
     </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>&amp;Värd:</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>&amp;Hamn:</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"/>
     </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>Tecken:</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>Nytt lösenord:</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"/>
     </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>Spelarens namn kan inte vara tomt.</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"/>
     </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>Token kan inte vara tomt.</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>Det nya lösenordet kan inte vara tomt.</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"/>
     </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"/>
     </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>Lösenorden stämmer inte överens.</translation>
     </message>
@@ -2717,17 +3329,17 @@ Se till att du aktiverar &quot;Token&quot; i dialogrutan &quot;Hantera uppsättn
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>Ladda lek från urklipp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>Ogiltig leklista.</translation>
     </message>
@@ -2735,43 +3347,43 @@ Se till att du aktiverar &quot;Token&quot; i dialogrutan &quot;Hantera uppsättn
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2785,45 +3397,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>Ladda lek</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
@@ -2831,53 +3476,53 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>Värd:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>Spelarnamn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>Lösenord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>Lösenord (igen):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>E-post:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>E-post (igen):</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>Land:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>Odefinierad</translation>
     </message>
@@ -2923,17 +3568,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
@@ -2941,40 +3586,55 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>Ett okänt fel har inträffat vid laddande av kortdatabasen</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -2991,7 +3651,7 @@ Möjligen kan du behöva starta om oracle för att uppdatera din kortdatabas.
 Vill du ändra dina databaslokaliseringsinställningar?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3008,7 +3668,7 @@ Detta kan oftast fixas genom att starta om oracle för att uppdatera din kortdat
 Vill du ändra dina kortdatabaslokaliseringsinställningar?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3017,7 +3677,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3026,7 +3686,7 @@ Would you like to change your database location setting?</source>
 Vill du ändra dina kortdatabaslokaliseringsinställningar?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3035,7 +3695,7 @@ Would you like to change your database location setting?</source>
 Vill du ändra dina kortdatabaslokaliseringsinställningar?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3044,59 +3704,64 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>Sökvägen till din lekkatalog är ogiltig. Vill du gå tillbaka och ange den korrekta sökvägen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>Sökvägen till din kortbildsdatabas är ogiltig. Vill du gå tillbaka och ange den korrekta sökvägen?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>Allmänt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>Utseende</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>Gränssnitt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>Chatt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>Ljud</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>Genvägar</translation>
     </message>
@@ -3104,39 +3769,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </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="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </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="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3144,17 +3809,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>Nästa</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>Tidigare</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>Dagens Tips</translation>
     </message>
@@ -3162,165 +3827,165 @@ 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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>Nuvarande släppkanal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>Installera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>Avbryt Ladda ner</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>Öppna nedladdningssidan</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>Cockatrice byggdes inte med SSL-stöd, därför kan du inte ladda ner uppdateringar automatiskt!
 Besök sidan för nedladdning för att uppdatera manuellt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>Letar efter nya uppdateringar...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>Slutfört efter uppdateringar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>Ingen uppdatering tillgänglig</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatris är aktuell!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>Du kör redan den senaste versionen i den valda utgåvan.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>Aktuell version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>Vald utgivningskanal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>Uppdatering tillgänglig</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>En ny version av Cockatrice är tillgänglig!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Ny version</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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>Släppte</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>Ändringslogg</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>Vill du uppdatera nu?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>Uppdateringsfel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>Ett fel uppstod när du letade efter uppdateringar:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>Ett fel uppstod när du hämtade en uppdatering:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>Installerar...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice kan inte öppna installatören.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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>Försök att uppdatera manuellt genom att stänga Cockatrice och köra installationsprogrammet.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation>Hämta plats</translation>
     </message>
@@ -3328,21 +3993,153 @@ 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="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>Tydlig logg vid stängning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>Felsökningslogg</translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3412,33 +4209,39 @@ You may have to manually download the new version.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <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"/>
     </message>
@@ -3446,7 +4249,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>Skriv ditt filter här</translation>
     </message>
@@ -3454,22 +4257,22 @@ 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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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"/>
     </message>
@@ -3477,22 +4280,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation type="unfinished"/>
     </message>
@@ -3500,155 +4303,208 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>Vänligen anslut till det lämpliga rummet först.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>Fel lösenord.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>Åskådare är ej tillåtna i detta spelet.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>Spelet är redan fullt.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>Det här spelet finns inte längre.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>Det här spelet är bara öppet för registrerade användare.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>Det här spelet är bara öppet för skaparens vänner.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>Spelets skapare ignorerar dig.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>Anslut till spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>Lösenord:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>Vänligen anslut till respektive rum först.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>Specificera speltyp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>Rensa filter</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>Skapa</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>Anslut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>Anslut som &amp;åskådare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>Spel</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>lösenord</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>endast vänner</translation>
     </message>
@@ -3658,68 +4514,68 @@ You may have to manually download the new version.</source>
         <translation>endast reg. användare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>kan chatta</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>visa händer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>Tillåts se händer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>ej tillåtna</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>Rum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>Ålder</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>Skapare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>Begränsningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>Spelare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>Åskådare</translation>
     </message>
@@ -3727,143 +4583,158 @@ You may have to manually download the new version.</source>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>Välj sökväg</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>Personliga inställningar</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>Språk:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>Sökvägar (redigering inaktiverad i bärbart läge)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>Sökvägar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>Lekkatalog:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>Repriskatalog:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>Bildkatalog:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>Kortdatabas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>Token-databas:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation>Uppdatera kanal</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>Meddela om en funktion som stöds av servern saknas i min klient</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>Visa tips vid uppstart</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <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"/>
     </message>
@@ -3871,47 +4742,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -3919,111 +4790,141 @@ You may have to manually download the new version.</source>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4031,193 +4932,213 @@ You may have to manually download the new version.</source>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4225,1429 +5146,1223 @@ You may have to manually download the new version.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>Servern har nått sin maximala kapacitet för användare, var god försök igen vid ett senare tillfälle.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>Din adress har för många uppkopplingar samtidigt.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>Bannlyst av moderator</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>Förväntad sluttid: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>Denna bannlysning varar för evigt.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>Schemalagd serverstängning.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>Ogiltigt användarnamn.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>Du loggades ut på grund av att du loggade in via en annan plats.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>Uppkoppling avslutad</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>Servern har avslutat din uppkoppling.
-Anledning: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>Servern kommer att starts om om %n minut.
-Alla pågående spel kommer att gå förlorade.
-Anledning till nedstängning: %1</numerusform><numerusform>Servern kommer att starts om om %n minuter.
-Alla pågående spel kommer att gå förlorade.
-Anledning till nedstängning: %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>Schemalagd serverstängning</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>Framgång</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>Registrering lyckad.
-Inloggning påbörjad.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>Aktivering tillåten.
-Inloggning påbörjad.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>Antal spelare</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>Vänligen ange antal spelare.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>Spelare %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>Ladda repris</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>Om Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>Projektledare:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>Tidigare projektledare:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>utvecklare:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>Våra utvecklare</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>Översättare:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>Server timeout</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>Det finns redan en aktiv session med det användarnamnet.
-Vänligen stäng den sessionen först och försök igen.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>Du är bannlyst till %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>Du är bannlyst för evigt.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>Okänt inloggningsfel: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>Socketfel: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>Du försöker koppla upp dig till en föråldrad server. Vänligen nergradera din version av Cockatrice eller koppla upp dig till en lämplig server.
-Lokal version är %1, avlägsen version är %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>Din version av Cockatrice är föråldrad. Vänligen uppdatera din version av Cockatrice.
-Lokal version är %1, avlägsen version är %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>Ansluter till %1...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>Frånkopplad</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>Uppkopplad, loggar in hos %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>Begär att få glömt lösenord skickat till %1 som %2</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>&amp;Anslut...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;Frånkoppla</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>Starta &amp;lokalt spel...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;Titta på repris...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Fullskärmsläge</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>&amp;Inställningar...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>A&amp;vsluta</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;Hantera utgåvor...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>Redigera egna &amp;tokens...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;Om Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>Den här servern stöder funktioner din version av Cockatrice inte har.
-Det  behöver inte innebära problem men det kan vara ett tecken på att det finns en ny version av Cockatrice tillgänglig eller att servern kör en anpassad eller förhandsutgiven version.
-
-För att uppdatera din klient, gå till Hjälp -&gt; Leta efter uppdateringar.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>Ladda utgåvor/kort</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>Den valda filen kunde inte laddas.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation>För tillfället går det bara att importera XML-databaser.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>Det gick inte att importera utgåvor/kort.</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>Det gick inte att återställa kontots lösenord. Kontakta serveroperatören för att få hjälp att återställa lösenordet.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation> från exil</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>det översta kortet av %1&apos;s lek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation> från toppen av %1&apos;s lek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>det sista kortet i %1&apos;s lek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation> från botten av %1&apos;s lek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation> från %1&apos;a lek</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation> från sidbrädan</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation> från stapeln</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1 håller nu det översta kortet %2 avslöjat.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1 håller inte längre det översta kortet %2 avslöjat.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1 fäster %2 på %3s %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 har ångrat att ge upp spelet.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>ett kort</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1 ger kontroll över %3 till %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1 sätter %2 i spel%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 sätter %2%3 i exil.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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>%1 lägger %2%3 i sitt bibliotek %4 kort från toppen.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 flyttar %2%3 till sidbrädan.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1 spelar %2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1 vänder %2 nedåt.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1 vänder %2 uppåt.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>Spelet har stängts.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>Spelet har börjat.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 kollar nu på spelet.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>Du har blivit utsparkad från spelet.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 har lämnat spelet (%2)</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation>%1 tittar inte längre på spelet (%2).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="473"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation>%1 blandar sin lek och drar en ny hand.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="510"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation>kort</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>%1&apos;s tur</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <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><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <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><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation type="unfinished"/>
     </message>
@@ -5655,110 +6370,115 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>Lägg till meddelande</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>Meddelande:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <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"/>
     </message>
@@ -5766,37 +6486,42 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -5809,47 +6534,47 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation type="unfinished"/>
     </message>
@@ -5872,65 +6597,211 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation type="unfinished"/>
     </message>
@@ -5938,57 +6809,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>Uptappningssteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>Underhållssteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>Dragsteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>Första huvudfasen</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>Början av stridssteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>Attacksteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>Blockeringssteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>Skadesteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>Slutet av stridssteget</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>Andra huvudfasen</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>Slutsteget</translation>
     </message>
@@ -5996,7 +6867,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
@@ -6005,183 +6876,195 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6197,17 +7080,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6215,86 +7098,94 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"/>
     </message>
@@ -6302,37 +7193,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation type="unfinished"/>
     </message>
@@ -6340,153 +7231,247 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>Alla filer (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatricerepriser (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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"/>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>Uppladdningstidpunkt</translation>
     </message>
@@ -6494,32 +7479,32 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>Spelare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>Behåll</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>Tid startad</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>Varaktighet (sek)</translation>
     </message>
@@ -6527,37 +7512,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -6565,41 +7550,49 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>Rum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>&amp;Anslut</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>Rum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>Spelare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>Spel</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6636,27 +7629,27 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>Långt namna</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation type="unfinished"/>
     </message>
@@ -6664,53 +7657,53 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -6718,12 +7711,12 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -6731,13 +7724,13 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation type="unfinished"/>
@@ -6764,12 +7757,12 @@ Please check your shortcut settings!</source>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -6777,27 +7770,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation type="unfinished"/>
     </message>
@@ -6805,48 +7798,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="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation type="unfinished"/>
     </message>
@@ -6869,16 +7862,146 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7010,56 +8133,227 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation type="unfinished"/>
+    </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="262"/>
+        <source>Any</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </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="82"/>
         <source>Deck: %1</source>
         <translation>Lek: %1</translation>
     </message>
@@ -7067,61 +8361,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="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7129,22 +8411,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="43"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <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"/>
     </message>
@@ -7185,8 +8467,8 @@ Please check your shortcut settings!</source>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Ny mapp</translation>
     </message>
@@ -7202,83 +8484,83 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>Ange leknamn</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>Denna leklista har inget namn. Vänligen ange ett namn:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>Namnlös lek</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>Radera lokal fil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>Namn på den nya mappen:</translation>
     </message>
@@ -7291,17 +8573,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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"/>
     </message>
@@ -7342,7 +8624,7 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation type="unfinished"/>
     </message>
@@ -7350,197 +8632,191 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>&amp;Faser</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>&amp;Spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>Nästa &amp;fas</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>Nästa &amp;tur</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>Ta &amp;bort alla lokala pilar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>Spel&amp;information</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>&amp;Ge upp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>&amp;Lämna spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>S&amp;täng repris</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>S&amp;äg:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>Ge upp</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>Är du säker på att du vill ge upp detta spel?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>Lämna spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>Är du säker på att du vill lämna detta spel?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation type="unfinished"/>
     </message>
@@ -7548,7 +8824,7 @@ Please enter a name:</source>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
@@ -7556,157 +8832,157 @@ Please enter a name:</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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation type="unfinished"/>
     </message>
@@ -7724,27 +9000,27 @@ The more information you put in, the more specific your results will be.</source
         <translation>&amp;Lämna</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1 har lämnat servern.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1 har anslutit sig till servern.</translation>
     </message>
@@ -7752,180 +9028,180 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>Lokalt filsystem</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>Serverns reprislagring</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>Titta på repris</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>Radera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>Ladda ner repris</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>Växla utgångslås</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>Radera lokal fil</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>Radera avlägsen repris</translation>
     </message>
@@ -7938,47 +9214,62 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>&amp;Säg:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>Chatt</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>&amp;Rum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>&amp;Lämna rum</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>Du översvämmar chatten. Var vänlig vänta ett par sekunder.</translation>
     </message>
@@ -7991,30 +9282,30 @@ The more information you put in, the more specific your results will be.</source
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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"/>
     </message>
@@ -8022,92 +9313,97 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8115,38 +9411,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
         <translation>Servern har skickat dig ett meddelande som din klient inte förstår. Det här meddelandet kan betyda att det finns en ny version av Cockatrice tillgänglig eller så kör den här servern en användarinställd eller förhandsutgiven version. För att uppdatera din klient, gå till Hjälp -&gt; Leta efter uppdateringar.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>Du kommer snart loggas ut på grund av inaktivitet.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>Varnad</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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"/>
@@ -8154,6 +9450,11 @@ Please refrain from engaging in this activity or further actions may be taken ag
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8192,42 +9493,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation type="unfinished"/>
     </message>
@@ -8235,151 +9536,209 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>Användar&amp;detaljer</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>Visa denna användarens &amp;spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>Lägg till som &amp;vän</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>Ta bort som &amp;vän</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>&amp;Ignorera</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>Sluta &amp;ignorera</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>&amp;Sparka från spelet</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="67"/>
         <source>Warn user</source>
         <translation type="unfinished"/>
     </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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation type="unfinished"/>
     </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="69"/>
         <source>Ban from &amp;server</source>
         <translation>&amp;Bannlys från servern</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation type="unfinished"/>
     </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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation type="unfinished"/>
     </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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </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="74"/>
         <source>Demote user from judge</source>
         <translation type="unfinished"/>
     </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="75"/>
         <source>View admin notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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"/>
     </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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>%1&apos;s spel</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation type="unfinished"/>
     </message>
@@ -8394,55 +9753,65 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation type="unfinished"/>
     </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="249"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation type="unfinished"/>
     </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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -8450,311 +9819,554 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>Plats:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>Administratör</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>Moderator</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>Registrerad användare</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>Oregistrerad användare</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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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"><numerusform></numerusform><numerusform></numerusform></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="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"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
-        <source>This server does not permit you to update your user informations.</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <source>Password changed.</source>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <source>This server does not permit you to change your password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <source>The new password is too short.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <source>The old password is incorrect.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
-        <source>Avatar updated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
-        <source>This server does not permit you to update your avatar.</source>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
+        <source>This server does not permit you to update your user informations.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
+        <source>Password changed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
+        <source>The new password is too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
+        <source>The old password is incorrect.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
+        <source>Avatar updated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>Allmänna gränssnittsinställningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>&amp;Dubbelklicka på kort för att spela dem (istället för enkelklick)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>Animationsinställningar</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;Tappnings/Upptappningsanimation</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <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"/>
     </message>
@@ -8762,22 +10374,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
@@ -8785,124 +10397,256 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8910,7 +10654,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="41"/>
+        <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"/>
     </message>
@@ -8918,19 +10662,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="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
@@ -8938,27 +10682,37 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -8966,50 +10720,93 @@ 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="53"/>
+        <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"/>
     </message>
     <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -9017,46 +10814,25 @@ 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="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -9064,47 +10840,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="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9112,7 +10893,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="25"/>
+        <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"/>
     </message>
@@ -9120,22 +10901,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="47"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -9143,17 +10924,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="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9161,43 +10942,43 @@ 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_widget.cpp" line="135"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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"/>
     </message>
@@ -9205,133 +10986,133 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation type="unfinished"/>
     </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="70"/>
         <source>Default order</source>
         <translation type="unfinished"/>
     </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"/>
     </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="107"/>
         <source>Enable all sets</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Disable all sets</source>
         <translation type="unfinished"/>
     </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="109"/>
         <source>Enable selected set(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation type="unfinished"/>
     </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="126"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation type="unfinished"/>
     </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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Card Art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation type="unfinished"/>
     </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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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"/>
     </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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation type="unfinished"/>
     </message>
@@ -9339,72 +11120,72 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>blanda när du stänger</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation type="unfinished"/>
     </message>
@@ -9412,7 +11193,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>Svenska (Swedish)</translation>
     </message>
@@ -9420,12 +11201,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation type="unfinished"/>
     </message>
@@ -9433,1005 +11214,1078 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>Se</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>Gameplay</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>Exil</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>Kyrkogård</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>Bibliotek</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>Skänk</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation>Lämna spelet</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>Medge</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation>Kasta tärning</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation>Dra ett kort</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation>Visuell Leklagring</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation>Leklagring</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation>Administratör</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation>Loggar</translation>
     </message>
diff --git a/cockatrice/translations/cockatrice_yue.ts b/cockatrice/translations/cockatrice_yue.ts
index 69541f3b7..f20b9ea1d 100644
--- a/cockatrice/translations/cockatrice_yue.ts
+++ b/cockatrice/translations/cockatrice_yue.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;設置指示物</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>設置指示物</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>數值物新價值為 &apos;%1&apos;</translation>
     </message>
@@ -23,92 +23,94 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
-        <translation type="unfinished"/>
+        <translation>&amp;刷新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
-        <translation type="unfinished"/>
+        <translation>解析組名及編號(如果有) </translation>
     </message>
 </context>
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
-        <translation type="unfinished"/>
+        <translation>你確定嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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>出錯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation>更新後筆記</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation>%1 的管理筆記</translation>
     </message>
@@ -116,208 +118,259 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation>主牌庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation>副牌庫</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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>不能在&apos;%1&apos;創造主題目錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>主題設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>現在主題</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation>打開主題文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation>選單設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="415"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>在右擊選單中顯示鍵盤快速鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>卡面算繪</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>最有圖片的牌上顯示牌名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>將打橫佈局卡片自動向上旋轉</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>將牌庫中包含的牌組推到藝術選擇視窗之頂</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>卡牌隨遊標縮放</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>在疊區中和直行手牌中,盡量減少交重疊百分點</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="434"/>
         <source>Maximum initial height for card view window:</source>
         <translation>卡望框最高開頭高度</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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>橫列</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
-        <translation type="unfinished"/>
+        <translation>牌指示物</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
-        <translation type="unfinished"/>
+        <translation>指示物  %1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>手牌佈局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>打棟顯示手牌(浪費空間)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>啟用向左對齊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>表格布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>反轉垂直坐標</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>界面佈局之內能夠容納的最少玩家數量：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>卡牌上顯示的最大字體大小</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp" line="136"/>
+        <source>Back to results</source>
+        <translation>返去結果</translation>
+    </message>
+    <message>
+        <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>在套牌編輯&amp;打開牌庫檔案</translation>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
         <source>Theme</source>
-        <translation type="unfinished"/>
+        <translation>卡牌主题</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
@@ -333,112 +386,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>禁用 &amp;用家名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>禁用&amp;IP地址</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>禁用客户ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>禁用類型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;永久禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;暫時禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>&amp;日</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>&amp;小時</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;分鐘</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>禁用時間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>請記載禁用原因
 這項只保留為版主, 被禁用戶不能看到.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>請記載被禁用戶能看到的被禁原因.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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>將這用戶所有室中打出的訊息完全移除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;取消</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>把用戶從本伺服器禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>若要對用戶實施禁用,請你選擇以下三種的拼合:名字,IP,或用戶id.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>若用用戶名字施行禁用,必須要填寫姓名.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>若用ip地址施行禁用,必須要寫下IP地址.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>若用用戶ID施行禁用,必須要寫下用戶ID.</translation>
     </message>
@@ -446,200 +499,269 @@ 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="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation>測試版</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation>從發佈更新伺服器收不到回覆.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>從發佈更新伺服器收不到有效的回覆.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation>從檔案更新伺服器收不到有效的回覆.</translation>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>名字</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>牌組</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>法力費用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>卡牌類別</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>力量/防御力</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>顏色</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>和</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>或</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>和不是</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>或不是</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>名稱</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation>名稱(確切）</translation>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>種類</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>顏色</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>詞語</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation>卡組</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>法力費用</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation>法力數值</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>稀有度</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>力量</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>防御力</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>忠诚值</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>賽制</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
-        <translation type="unfinished"/>
+        <translation>主要類型</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
-        <translation type="unfinished"/>
+        <translation>副類型</translation>
     </message>
 </context>
 <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>卡圖</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>描述</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>兩個都顯示</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>查看轉化</translation>
     </message>
 </context>
 <context>
     <name>CardInfoPictureWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation>查看關聯卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
-        <source>Mainboard</source>
-        <translation type="unfinished"/>
+        <translation>添加卡牌到牌庫</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <source>Mainboard</source>
+        <translation>主牌庫</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
-        <translation type="unfinished"/>
+        <translation>副牌庫</translation>
     </message>
 </context>
 <context>
@@ -650,12 +772,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation>名稱:</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>牌組:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation>收藏號碼:</translation>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation>有關牌名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation>不知名的牌</translation>
     </message>
@@ -663,132 +795,150 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;展示给...</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
-        <translation type="unfinished"/>
+        <translation>&amp;所有玩家</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
-        <translation type="unfinished"/>
+        <translation>查看關聯卡牌</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
-        <translation type="unfinished"/>
+        <translation>令牌:</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
-        <translation type="unfinished"/>
+        <translation>所有令牌</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
-        <translation type="unfinished"/>
+        <translation>&amp;全選</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
-        <translation type="unfinished"/>
+        <translation>&amp;選擇橫行</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
-        <translation type="unfinished"/>
+        <translation>&amp;選擇直行</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
-        <translation type="unfinished"/>
+        <translation>&amp;使出</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
-        <translation type="unfinished"/>
+        <translation>&amp;隱藏</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
-        <translation type="unfinished"/>
+        <translation>&amp;面朝下使出</translation>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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>&amp;横置/重置</translation>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation>卡牌大小</translation>
     </message>
@@ -796,142 +946,142 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它們的手牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的手牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>它們的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
-        <translation type="unfinished"/>
+        <translation>它們的牌庫中</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1的牌庫中</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>它們的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>它們的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
-        <translation type="unfinished"/>
+        <translation>%1的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它們的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它們的墳場</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的的墳場</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它們的放逐區</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的放逐區</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>它們的備牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
-        <translation type="unfinished"/>
+        <translation>%1的備牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它們的備牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的備牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>它們的自定區域 &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
-        <translation type="unfinished"/>
+        <translation>%1的自定區域&apos;%2&apos;</translation>
     </message>
 </context>
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -939,29 +1089,470 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -969,47 +1560,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <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"/>
     </message>
@@ -1017,87 +1578,97 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <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"/>
     </message>
@@ -1123,114 +1694,114 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </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="162"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </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="166"/>
+        <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"/>
     </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="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </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="168"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="172"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </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="174"/>
         <source>Load deck from online service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1238,7 +1809,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1246,194 +1817,171 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>更新預覽卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation>下載URL已重置。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>下載的卡牌圖片已被重置。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>出現錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation>一幅或以上的卡牌圖片未能被清除。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>添加URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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>更改URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation>圖片網路緩存大小：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation>網路緩處再定向生存時間</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation>再定向緩處有效時間</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation>圖片緩存大小：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation>添置新 URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation>移除 URL.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation>日</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>更新中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>選擇路徑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation>URL下載優先次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>預覽</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>自動下載預覽</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation>預覽位置:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>最後變更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>開啟時自動下載預覽</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>免重新啟動人手按制更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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>人手更新完成前,不能關掉设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation>即時下載卡牌圖片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation>如何添加自定URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>刪除已下載的圖片</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation>重置下載URL</translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
-        <translation>下載圖片專用硬盤緩儲</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
-        <translation>現不在螢光幕上記憶中圖片緩儲</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation>數目</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation>牌組</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>號碼</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation>提供者 id</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>卡牌</translation>
     </message>
@@ -1441,12 +1989,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1454,17 +2002,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -1472,7 +2020,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <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"/>
     </message>
@@ -1480,62 +2028,62 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <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"/>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </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="104"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </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="105"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </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="106"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </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="107"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <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"/>
     </message>
@@ -1543,98 +2091,156 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1652,74 +2258,74 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>載入牌庫...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>載入伺服器上的牌庫...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>準備好</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation>強迫開始</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation>備牌解鎖</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation>解鎖鎖上</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>選擇的檔案不能再入</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1752,143 +2358,143 @@ This will kick all non-ready players from the game.</source>
         <translation>下載中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>已知主辦機</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation>刪除現選儲藏伺服器.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>從已知的伺服器更新伺服器列表</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>新主辦</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>名稱:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;主辦機:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;端口:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>玩家 &amp;名字:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>&amp;密碼:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>&amp;儲存密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>&amp;自動連接</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>當Cockatrice啓動時自動連接到最近的登錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>如在連接或註冊誰中遇到問題,請聯絡伺服器職員尋求援助!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>網頁</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation>重設密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation>密碼忘記了?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>連接</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>登錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation>伺服器聯絡人</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>連接伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation>伺服器URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation>通信端口</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation>獨特伺服器名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>連接警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>你必須將你的連接簡介命名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>連接警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>玩家名稱不能空置</translation>
     </message>
@@ -1896,117 +2502,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>&amp;記住設定</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>&amp;描述:</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>玩家:</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>一般</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>遊戲類型</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>&amp;密碼:</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>只容許&amp;好友加入</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>只容許&amp;註冊用戶加入</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>加入條件</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>允許觀看者</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>觀看者&amp;需要密碼</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>觀看者可以&amp;聊天</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>觀看者可見&amp;手牌</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>以旁觀者的身份創建遊戲</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>觀看者</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>開始生命總數</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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation>遊戲設定選擇</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>&amp;清除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>創建遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>遊戲資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>伺服器出現錯誤.</translation>
     </message>
@@ -2014,97 +2625,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;名稱：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;顏色：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>白色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>藍色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>黑色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>紅色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>綠色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>多色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>無色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;力量/防御力:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;註釋：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;此令牌離場時會被摧毀</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>令牌資料</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>顯示&amp;所有令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>顯示本牌庫所有令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>從清單中選擇令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>派出令牌</translation>
     </message>
@@ -2112,53 +2723,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2166,40 +2777,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>未選擇圖像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>若要改變頭著,請選擇新的圖片.
 若要移除現有頭像, 請不要選擇新的圖片,直接確認.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>瀏覽...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>更改頭像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>打開圖片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>圖片文件（*.png *.jpg *.bmp格式）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>所選圖片不能使用。</translation>
     </message>
@@ -2207,17 +2818,17 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2225,38 +2836,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="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>舊密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>新密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>確認新密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>更改密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>你的密碼太短。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>新舊密碼不一致</translation>
     </message>
@@ -2264,93 +2875,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="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;名稱：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>&amp;顏色：</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="34"/>
         <source>white</source>
         <translation>白色</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="35"/>
         <source>blue</source>
         <translation>藍色</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="36"/>
         <source>black</source>
         <translation>黑色</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="37"/>
         <source>red</source>
         <translation>红色</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="38"/>
         <source>green</source>
         <translation>綠色</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="39"/>
         <source>multicolor</source>
         <translation>多色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>無色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;力量/防御力:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;註釋：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>令牌資料</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>添加令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>移除令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation>編輯自定令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>請輸入令牌名稱:</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>出現錯誤</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>現時選擇的名字跟現有的卡牌或令牌出現衝突.請從&quot;牌組管理&quot;中啟動&apos;令牌牌組&apos;,保持正確顯示.</translation>
@@ -2374,12 +2985,12 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>未定義</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>實名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>更改用戶資料</translation>
     </message>
@@ -2417,112 +3028,113 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>2小時</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;新過:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>遊戲 &amp;描述:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;創建者名稱:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>&amp;遊戲類型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>&amp;至少:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>&amp;最多：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>可容納玩家最高數量</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>限制</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>只顯示容許&amp;觀看者 觀看的遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>顯示有觀看者&amp;密碼保護的遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>只顯示容許觀看者&amp;聊天的遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>只顯示容許觀看者看&amp;手牌 的遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation>觀看者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>篩選遊戲</translation>
     </message>
@@ -2530,52 +3142,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>重設密碼驗證警告</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>程序出現故障,請再要求新的密碼.</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>請輸入需要新密碼的伺服器和相關戶口資料.</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>&amp;主辦機:</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>&amp;端口:</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>玩家 &amp;名字:</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>電郵：</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>重設密碼驗證</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>重設密碼驗證錯誤</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>電郵不能空置.</translation>
     </message>
@@ -2583,37 +3195,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>請輸入需要新密碼的伺服器資料.</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>&amp;主辦機:</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>&amp;端口:</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>玩家 &amp;名字:</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>重設密碼要求</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>重設密碼錯誤</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>玩家名稱不能空置</translation>
     </message>
@@ -2621,86 +3233,86 @@ 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>重設密碼警告</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>程序出現故障,請再要求新的密碼.</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>請輸入收到驗證碼和新的密碼,以便定立新的密碼.</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>&amp;主辦機:</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>&amp;端口:</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>玩家 &amp;名字:</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>驗證碼</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>新密碼：</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>重設密碼</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>玩家名稱不能空置</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>重設密碼錯誤</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>驗證碼不能為空白</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>新密碼不能為空白</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>出現錯誤</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>你的新密碼太短。</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>新舊密碼不一致.</translation>
     </message>
@@ -2716,17 +3328,17 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>從剪貼板載入牌庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>牌表不能載入</translation>
     </message>
@@ -2734,43 +3346,43 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2784,45 +3396,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>載入牌庫</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation>卡牌名稱(或搜尋表達式)</translation>
     </message>
     <message>
-        <location filename="src/game/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>因為cockatrice原生沒有ssl支援, 所以你不能自動下載更新. 請瀏覽到我們的下載網頁,進行人手更新.</translation>
     </message>
     <message>
-        <location filename="src/game/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>開關副牌上鎖</translation>
     </message>
     <message>
-        <location filename="src/game/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>把頂牌放在重疊區, 直到...</translation>
     </message>
     <message>
-        <location filename="src/game/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>在卡牌資料庫中找不到符合搜尋表達式的卡牌.你想繼續嗎?</translation>
     </message>
     <message>
-        <location filename="src/game/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>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/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>篩選無效</translation>
     </message>
@@ -2830,7 +3475,7 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>輸入你, 和你想登記的伺服器的資料.
@@ -2838,47 +3483,47 @@ Your email will be used to verify your account.</source>
 我們會使用你的電郵來核實你的戶口.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>&amp;主辦機:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>&amp;端口:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>玩家 &amp;名字:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>&amp;密碼:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>(再次)輸入密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>電郵：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>(再次)輸入電郵：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>國家：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>未定義</translation>
     </message>
@@ -2924,17 +3569,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation>骰子面數:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation>骰子數目:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation>擲骰</translation>
     </message>
@@ -2942,40 +3587,55 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>讀取卡牌資料庫時出現不知名錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -2992,7 +3652,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌資料庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3009,7 +3669,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌資料庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3022,7 +3682,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌資料庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3030,7 +3690,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌資料庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3039,7 +3699,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌資料庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3055,59 +3715,64 @@ https://github.com/Cockatrice/Cockatrice/issues
 你想不想更改你的資料庫位置設定?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>你的牌庫目錄路徑現在無效. 你想要重新設置套牌路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>你的卡牌圖片目錄路徑現在無效. 你想要重新設置卡牌圖片資料庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>外觀</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>用戶界面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation>卡牌來源</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>聲音</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>快捷键</translation>
     </message>
@@ -3115,39 +3780,39 @@ https://github.com/Cockatrice/Cockatrice/issues
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </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="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </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="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3155,17 +3820,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>下一個</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>上一個</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>每日提示</translation>
     </message>
@@ -3173,165 +3838,165 @@ 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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>現在發行渠道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>重新安裝</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>取消下載</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>打開下載頁面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation>檢查客戶端更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>因為Cockatrice不設立ssl支援,所以你不能自動下載更新!
 請你瀏覽到我們的下載網頁進行人手更新.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>正在檢查更新...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>更新檢查已完成</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>沒有更新可用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice 已經達到最新版本!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>你運行的已經是最新的發行版本了。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>現行版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>現選發行渠道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>現有更新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Cockatrice有新版本可用！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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>已發行</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>變更記載</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>你打算現在更新嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>更新出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>檢測更新時出現錯誤:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>下載更新時出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>安裝中</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice 不能啟動安裝程式</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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>請你嘗試人手更新, 關掉cockatrice, 然後重開安裝程式.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation>下載位置</translation>
     </message>
@@ -3339,21 +4004,153 @@ 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="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>關閉時清除紀錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>偵錯紀錄</translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3423,33 +4220,39 @@ You may have to manually download the new version.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <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"/>
     </message>
@@ -3457,7 +4260,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>輸入你的篩選類型</translation>
     </message>
@@ -3465,22 +4268,22 @@ 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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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"/>
     </message>
@@ -3488,22 +4291,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation type="unfinished"/>
     </message>
@@ -3511,155 +4314,208 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>請先參加合適房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>密碼錯誤.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>這個遊戲不允許觀眾加入.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>這個遊戲已經滿了.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>這個遊戲已經不存在了。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>這個遊戲只開放給註冊用戶.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>這個遊戲只開放給房間主辦的好友。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>你被這個房間的主辦屏蔽了.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>加入遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>密碼:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>請先參加相關的房間.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>&amp;篩選遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>&amp;清除篩選項目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>&amp;創建</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>&amp;加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>&amp;作為觀看者加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation>顯示遊戲：%1/%2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>遊戲</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation>＞1日</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="43"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 小時</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation>新建</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="48"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 分鐘</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>僅限好友</translation>
     </message>
@@ -3669,68 +4525,68 @@ You may have to manually download the new version.</source>
         <translation>僅限註冊用户</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>允許聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>查看手牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>允許查看手牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>不允許</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>時長</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>描述:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>創建者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>限制</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>玩家</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>觀看者</translation>
     </message>
@@ -3738,143 +4594,158 @@ You may have to manually download the new version.</source>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation>重置所有路徑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation>重置所有路徑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>選擇路徑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>個人設定</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>語言:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>路徑(在便攜模式下不能編輯)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>路徑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>牌庫路徑:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>遊戲錄像目錄:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>圖片目錄:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>卡牌資料庫：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation>自主資料庫目錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>令牌資料庫:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation>更新渠道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation>啟動時檢查客戶更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>如果客戶端缺少伺服器支持的更功能時,請提示我</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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>啟動新版本Cockatrice時,自動運行Oracle.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>顯示啓動時提示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <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"/>
     </message>
@@ -3882,47 +4753,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -3930,111 +4801,141 @@ You may have to manually download the new version.</source>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4042,193 +4943,213 @@ You may have to manually download the new version.</source>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4236,643 +5157,273 @@ You may have to manually download the new version.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>伺服器已達到最最高用戶限額，請另外選擇吉時再試.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>你的網路地址擁有太多同時連繫.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>你已被版主禁用</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>預計結束時間: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>這是無限期禁用</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>排期伺服器關機</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>不可用的用戶名。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>因為你已在另外的位置登入, 所以你現有的聯繫已被登出.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>連繫已被關閉</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>伺服器已經中斷你的聯繫/
-原因: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>伺服器將會在 %n 分鐘內重新啟動. 所有進行中的遊戲都會報銷.伺服器關閉原因: %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>排期伺服器關機</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>成功</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>註冊已成功。
-現在登入。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>戶口啟動已經成功
-現在登入.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>玩家人數</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>請輸入玩家人數</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>玩家 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>載入遊戲錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>關於Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation>版本</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatrice 網頁</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>項目經理：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>前項目經理：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>開發者：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>我們的開發者：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>協助開發！</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>翻譯者：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>翻譯者名單</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>協助翻譯!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>支援:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>報告問題</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>排除故障</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>問答</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>伺服器超時</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>登入失敗</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation>你的客戶端似乎脫小本伺服器需要用來達成連繫的功能.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation>請去&quot;求助-&gt;檢查客戶端更新&quot; 內更新你的客戶.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>用户名或密碼錯誤。請檢查賬號信息,然後重試。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>已經有在線用户正在使用這用户名.請先關閉連線,然後重新登入.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>你被禁止直到: %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>你已被永久封禁.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>本伺服器要求用戶註冊. 你想不想現在登記?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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>本伺服器要求用戶擁有客戶id. 你的客戶端現在不能造成客戶id,或是你正在使用修改過的客戶端.
-請你關掉現有的客戶端,然後重新啟動, 擇吉日再試。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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>因為內部出現故障, 請關閉,重開Cockatrice 然後再次嘗試.
-如果故障繼續出現,請將客戶端軟件升級為最新版本, 有需要時請聯絡軟件開發人士.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>戶口啟動</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>你的戶口還未嘗啟動.
-你需要提供從啟動電郵得來的驗證碼.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation>伺服器載滿</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>不知名登入錯誤: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>
-這通常意味住你的客戶端版本已經過期,引起你的客戶端不能明曉伺服器的回覆.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>您的用戶名字必須遵守以下規則：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>在%1 - %2个字符之间。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>可以 $1 包含細楷/小寫字母</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>並否</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>可以 $1 包含大楷/大寫字母</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>可以 $1 包含數字</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>可以包含以下符號：%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>第一個字符可以 %1 是標點符號</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <source>no unacceptable language as specified by these server rules:</source>
-        <comment>note that the following lines will not be translated</comment>
-        <translation>在以下伺服器規矩中,道明不能接受的語言:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation>不能含有以下字眼: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation>不能含有以下語句: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>你的用戶名字只可以用以下的字符: A-Z, a-z, 0-9, _, ., 和 - .</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>註冊被拒絕</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>這伺服器暫時謝絕登記</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>這個用戶名字已經被使用.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>登記時必要指明合能用的電郵地址.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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>你看來好像在本伺服器嘗試申請新戶口, 但是你已經有跟你電郵掛鉤的戶口名字.我們的伺服器限制每用戶在每個地址可以有多少個戶口. 如果需要更多援助或是得取你的登入資料,請聯絡伺服器辦事人.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>密碼太短。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>由於伺服器出現技術問題, 你的登記暫時失敗.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>不知名登記錯誤: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>戶口啟動失敗</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>接口錯誤: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>你正在嘗試跟過時的伺服器連繫. 請把你的 Cockatrice 版本降級,或是連繫於合適的伺服器. 當地/離線版本維 %1, 遙距/上線版本維 %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>你的 Cockatrice 版本現已過時.請把你的版本更新. 
-當地/離線版本維 %1, 遙距/上線版本維 %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>向 %1 連接中...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>正在用%2的身份登記到%1伺服器...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>已經斷線了</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>連線成功, 在%1登入</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>正在用%2的身份對%1要求遺忘密碼.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>&amp;連線...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;斷線</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>開始&amp;離線遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;觀看遊戲錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>&amp;全屏</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;註冊加入伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;弄回密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>設置⋯</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>&amp;退出</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>&amp;動作</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>&amp;卡牌資料庫</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;管理牌組</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>編輯自定 &amp;令牌...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>打開自定圖片文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>打開自定牌组文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>添加自定卡组/卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation>刷新卡牌資料庫</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>&amp;求助</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;關於Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;每日提示</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation>檢查客戶端更新</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation>檢查卡牌更新</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation>查看&amp;偵錯紀錄</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation>打開設置文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation>顯示/隱藏</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation>新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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>恭喜你將Cockatrice升級為%1.
 現在會幫你啟動oracle, 更新你的卡牌資料庫.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice 已被安裝</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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>恭喜你成功安裝Cockatrice%1.
 現在會幫你啟動oracle, 安裝你的卡牌資料庫.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>卡牌資料庫</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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>
@@ -4881,29 +5432,29 @@ If unsure or first time user, choose &quot;Yes&quot;</source>
 如果不確定, 或者是第一次使用，請選擇“是/Yes”</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>是/Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>否/No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>打開設置</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>發現新卡组</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
@@ -4912,17 +5463,22 @@ Do you want to enable it/them?</source>
 要啟用它們嗎？</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>查看卡组</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>歡迎</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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>
@@ -4931,741 +5487,901 @@ Read more about changing the set order or disabling specific sets and consequent
 請閱讀,了解更多在“卡组设置”對話框裡.更改卡组顺序或者禁用某些卡组的功能.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>資料庫更新現已進行.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>不能運行卡牌資料附更新程式:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>本伺服器支持你現在客戶端軟件欠缺的額外功能. 
-
-這信息不是大問題, 但此信息可能意會現在已有新版本的 Cockatrice, 或是本伺服器運用自設或預先釋放版本.
-
-請到&quot;援助-&gt;檢查更新&quot;去更新你的客戶端.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>载入卡组/卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>找不到選擇的文件。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation>你暫時只能導入xml資料庫.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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>已經成功添加新的卡組/卡牌. Cockatrice會重新載入卡牌資料庫.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>卡組/卡牌導入失敗.</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
-        <translation>重設密碼</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
-        <translation>你的密碼已經成功重置, 你可以用新密碼重新登入。</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>重置用戶密碼失敗, 請聯絡伺服器管責人重置密碼.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
-        <translation>已經收到啟動要求,   請從你的電郵獲取啟動驗證碼.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation>從戰場上</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation>從它們的墳場</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation>從放逐區</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation>從它們的手牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>%1牌庫的頂牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation>它們的頂牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation>從%1牌庫的頂</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation>從它們1牌庫頂</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>%1牌庫的底牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation>它們牌庫的底牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation>從%1的牌庫底</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation>從它們的牌庫底</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation>從%1的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation>從它們的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation>從備牌中</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation>從疊區中</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1現在保持%2頂牌顯現.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1不再展示牌庫頂牌%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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>%1可以隨時查看牌庫頂牌 %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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>%1再不可以隨時查看牌庫頂牌 %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1 結附 %2 指向 %3的 %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation> %1 在此遊戲宣佈降服.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation> %1 收回在此遊戲降服.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1已恢復連接。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 已失去連接。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation>%1 從它們的%2 指向自己。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation>%1 從它們的%2指向%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation>%1 從%2的%3 指向自己。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation>%1 從%2的%3 指向%4。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1 從它們的%2指向它們的%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1 從它們的%2指向%3的%4。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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>%1 從%2的%3指向自己的%4。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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>%1 從%2的%3指向%4的%5。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 派出令牌: %2%3</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 已载入牌庫(%2)</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>%1已載入含有 %2張備牌的牌庫(%3).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation>%1销毁了%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>一張牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1將%3的控制轉移給%2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="308"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation>%1將%2%3牌面朝下地放進戰場。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1將%2放進戰場%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation>%1將%2%3置入它們的的墳場。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 放逐%2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation>%1將%2%3移到它們的的手牌中。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation>%1將%2%3放入它們的牌庫。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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>%1將%2%3放在它們的牌庫底部。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation>%1將%2%3放在它們的牌庫頂部。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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>%1將%2%3放在它們的牌庫頂部%4張牌以下。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 將%2%3移到副牌庫.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1使出 %2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="373"/>
         <source>%1 tries to draw from an empty library</source>
         <translation>%1嘗試從空牌庫抽牌</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation><numerusform>%1抽%2張牌。</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 正在查看%2。</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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><numerusform>%1 正在查看%2的 %4 %3張卡牌.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation>底部</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation>頂部</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1把%2翻為面朝下。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1把%2翻為面朝上。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>遊戲已經關閉。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>遊戲已開始。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1 已經加入遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 正在旁觀遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>你已被踢出遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 已經離開遊戲(%2)。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation>%1 已經不再旁觀遊戲(%2)。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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>%1 還未準備好開始遊戲。</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform>%1將其牌庫洗牌，然後抽%2張牌作為新的起手。</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="473"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation>%1將其牌庫洗牌，然後抽起新的手牌。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation>你正在觀看遊戲#%1的錄像。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1已準備好開始遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="510"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation>卡牌(眾) </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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><numerusform>%1 卡牌(眾) </numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation>%1把&amp;2借給%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1把%2展示給%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1 展示 %2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation>%1隨機展示%2%3給%4。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1隨機展示%2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation>%1查看面朝下的卡牌#%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation>%1查看面朝下的卡牌#%2:%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation>%1展示%2%3給%4。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1展示%2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="576"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation>%1 逆轉回合次序，現在輪到%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation>逆轉</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation>正常</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>正面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>翻面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation>%1擲了硬幣。結果為%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1擲%3面骰子，結果為%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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>%1擲了%2個硬幣。結果為%3個正面和%4個反面。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="608"/>
         <source>%1 rolls a %2-sided dice %3 times: %4.</source>
         <translation>%1把%2面骰子擲了%3次:%4</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>輪到 %1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation>%1給%2添加了註釋成%3。</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <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></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <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></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation>%1 將%2指示物設置為 %3 (%4%5)。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%1 將 %2 設置為不被重置。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 將 %2 設置為照常重置。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 移除%2的力量/防禦.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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>%1把%2的力量/防禦從無數值轉為%4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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>%1把%2的力量/防禦從%3轉為%4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1已經鎖定它們的的副牌庫。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1已經把它們的的副牌庫解鎖。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>%1横置它們的永久卡牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1重置它們的永久卡牌.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1 横置 %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1 重置 %2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>% 1 對 %2  洗牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="769"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation>%1 洗 %2 底的 %3 張卡牌.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="774"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation>%1 洗 %2 頂的 %3 張卡牌.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation>%1到%2.洗%3 - %4 </translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 取消了%2的結附。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 放回它們最後一張抽到的卡牌.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation> %1 放回它們最後一張抽到的卡牌(%2).</translation>
     </message>
@@ -5673,110 +6389,115 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation>詞1 詞2 詞3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation>添加新信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation>更改信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation>移除信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>添加信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>信息:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation>更改信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>聊天設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>自定通知觸發詞語</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>允許聊天中提到某人</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>允許自動完成提名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>遊戲內短信速鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="243"/>
         <source>How to use in-game message macros</source>
         <translation>如何使用遊戲內短信速鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>不要顯示未註冊用户的聊天消息。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>不要顯示未註冊用户的私人消息.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>反轉文本顏色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>容許桌面提醒提及私人消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>容許桌面提醒提及聊天提名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>加入聊天室時開啓消息歷史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>（顏色為16進制）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>將單詞以空格區分，僅支持字母.</translation>
     </message>
@@ -5784,37 +6505,42 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -5827,47 +6553,47 @@ Cockatrice will now reload the card database.</source>
         <translation>卡牌類型</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation>法力數值</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation>颜色(眾) </translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation>忠誠值</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation>卡牌主類型</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation>法力費用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation>力量/防御力</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation>正面/底面</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation>佈局</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation>顏色身份</translation>
     </message>
@@ -5890,65 +6616,211 @@ Cockatrice will now reload the card database.</source>
         <translation>重疊方向</translation>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation>不知名階段</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation>重置步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation>維持步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation>抓牌步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation>第一主階步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation>開戰步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation>宣告進攻步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation>宣告阻擋步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation>戰鬥損害步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation>戰鬥結束步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation>第二主階步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation>結束/清理步</translation>
     </message>
@@ -5956,57 +6828,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>重置步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>維持步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>抓牌步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>第一主階段</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>戰鬥開始步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>宣告阻擋步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>宣告阻擋步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>戰鬥損害步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>戰鬥結束步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>第二主階段</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>回合完結部</translation>
     </message>
@@ -6014,7 +6886,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
@@ -6023,183 +6895,195 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation>喜好</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation>版本上別針</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation>版本脫別針</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation>顯示關聯卡牌</translation>
     </message>
@@ -6215,17 +7099,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation>牌庫次序中上一張卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation>牌庫次序中下一張卡牌</translation>
     </message>
@@ -6233,86 +7117,94 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation>英文字母次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation>喜好</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation>發行日期</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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>由後到先</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation>由先倒後</translation>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"/>
     </message>
@@ -6320,37 +7212,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>服務</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>隐藏 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>隱藏其他</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>全部展示</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>喜好...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>退出%1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>關於 %1</translation>
     </message>
@@ -6358,153 +7250,247 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Cockatrice卡牌資料庫 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>所有檔案格式 (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatrice錄像文件 (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>主牌庫</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>副牌庫</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>眾令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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"/>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation>OK/確認</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation>保存</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation>全部保存</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation>打開</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation>&amp;是/Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation>&amp;全選是/Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation>&amp;否/No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation>&amp;全選否/No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation>重試</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation>不理</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation>棄牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation>協助</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation>應用</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation>重設</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation>恢復常用認值</translation>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>上載時間</translation>
     </message>
@@ -6512,32 +7498,32 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>玩家(眾)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>選用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>開始時間</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>維持(秒)</translation>
     </message>
@@ -6545,37 +7531,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -6583,41 +7569,49 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>房間(眾) </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>&amp;加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>許可</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>玩家(眾)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>遊戲(眾)</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6654,27 +7648,27 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>已啓用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>設置類型</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>設置代碼</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>長名</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>發行日期</translation>
     </message>
@@ -6682,53 +7676,53 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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>恢復所有常用快鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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>確定要恢復所有常用快鍵嗎?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation>清除所有常用快鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="111"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>確認清除所有快鍵嗎?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation>部分：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation>行動:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation>快鍵:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation>如何設置自定快鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation>清除所有快键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation>按快鍵名稱搜尋</translation>
     </message>
@@ -6736,12 +7730,12 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>行動</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>快鍵</translation>
     </message>
@@ -6749,14 +7743,14 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>您的配置檔案含有無效的快捷鍵.
 請檢查您的快捷鍵設定.</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>以下快捷鍵設置已經返回常用狀態：
@@ -6784,12 +7778,12 @@ Please check your shortcut settings!</source>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -6797,27 +7791,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>啓用&amp;聲效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>現前聲效主題：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>測試系統聲效引擎</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>聲效設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>主音量</translation>
     </message>
@@ -6825,48 +7819,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="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation>預覽季節已結束</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>現在正刪除spoiler.xml。請啟動Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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>預覽下載出錯</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation>沒有網絡連接</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation>預覽已是最新</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation>沒有添加新預覽</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation>預覽已被更新</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation>最後變更：</translation>
     </message>
@@ -6889,16 +7883,146 @@ Please check your shortcut settings!</source>
         <translation>從發佈更新伺服器收不到有效的回覆.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="177"/>
         <source>No reply received from the tag update server.</source>
         <translation>未收到標籤更新伺服器的回應.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="184"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>從標籤更新伺服器收不到有效的回覆.</translation>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7030,56 +8154,227 @@ Please check your shortcut settings!</source>
         <translation>不能啟動用戶戶口.內部故障</translation>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation type="unfinished"/>
+    </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="262"/>
+        <source>Any</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>卡牌資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>牌庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>篩選項目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>&amp;視圖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation>印刷版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>可見</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>浮動</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation>重置布局</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="82"/>
         <source>Deck: %1</source>
         <translation>牌庫:%1</translation>
     </message>
@@ -7087,61 +8382,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="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7149,22 +8432,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="43"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <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"/>
     </message>
@@ -7205,8 +8488,8 @@ Please check your shortcut settings!</source>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>新文件夾</translation>
     </message>
@@ -7222,83 +8505,83 @@ Please check your shortcut settings!</source>
         <translation>打開牌庫文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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>無效牌庫檔案</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>輸入牌庫名稱</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>本牌庫列表未有名稱.請輸入名稱:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>未命名牌庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation>牌庫上載於伺服器時失敗</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>删除本地檔案</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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>你確定要刪除被選檔案(眾)嗎 ？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation>刪除伺服器上的牌庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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>你確定要剷除所有被選的牌庫嗎?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>新建文件夾名稱:</translation>
     </message>
@@ -7311,17 +8594,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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"/>
     </message>
@@ -7362,7 +8645,7 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation type="unfinished"/>
     </message>
@@ -7370,197 +8653,191 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>遊戲錄像重溫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>玩家列表</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>卡牌資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>錄像時間線</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>階段</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>下個&amp;階段</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation>下個階段&amp;行動</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>下個&amp;回合</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation>逆轉回合次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>&amp;移除所有自設箭頭</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>&amp;順時針旋轉視角</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>&amp;逆時針旋轉視角</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>遊戲&amp;資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation>撤銷&amp;投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>&amp;投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>&amp;離開遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>&amp;關閉遊戲錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;聚焦聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>&amp;説：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>&amp;視圖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>可見</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>浮動</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation>重置布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>你確定要宣佈投降嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation>撤銷投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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>你已經宣佈投降,你想回到這場遊戲嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>離開遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>你確定要離開這個遊戲嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation>有玩家加入遊戲 #%1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation>%1 已經加入遊戲。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>你已被踢出遊戲。</translation>
     </message>
@@ -7568,7 +8845,7 @@ Please enter a name:</source>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
@@ -7576,158 +8853,158 @@ Please enter a name:</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>記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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>時間；發送者姓名；發送者IP；信息；目標ID；目標姓名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation>房間記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>遊戲記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>聊天記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>您必須選擇至少一個過濾項.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>您必須選擇一個可用的日數來作為定位.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>用戶名稱:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>IP地址</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>遊戲名稱：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>遊戲ID：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>信息:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>主房</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>遊戲房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>私人聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>過去 X 天：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>今天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>1小時前</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation>最多結果:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>至少需要1個篩選項。
 您輸入的信息越多，找到結果越準確。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation>獲取用戶記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation>清除篩選項目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>篩選項目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation>記錄位置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation>日期範圍</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation>最多結果</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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>信息歷史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation>不能獲取信息歷史消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation>沒有符合篩選條件的信息。</translation>
     </message>
@@ -7745,27 +9022,27 @@ The more information you put in, the more specific your results will be.</source
         <translation>&amp;離開</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - 私人聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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>你已被這用戶屏蔽, 它們不能再主聊天室看見你的信息,你亦不能參加它們的遊戲.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation>私人信息信到, 来自</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1 已離開伺服器.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1 已加入伺服器.</translation>
     </message>
@@ -7773,180 +9050,180 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>本地檔案系統</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>伺服器錄像倉庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>觀看遊戲錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation>改名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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>新文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>刪除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation>打開錄像文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>下載遊戲錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>過期鎖定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation>本地檔案夾改名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation>本地檔案改名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation>新名稱</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation>出錯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation>改名不成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation>新建文件夾名稱:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>刪除本地檔案</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>你確定要剷除所有被選的檔案嗎?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="505"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>你確定要刪除被選錄像檔案嗎 ？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>刪除伺服器錄像</translation>
     </message>
@@ -7959,47 +9236,62 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>&amp;説：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>&amp;房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>&amp;離開房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>&amp;清除聊天記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>聊天設置...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation>提到了你。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation>點擊查看</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>你正在刷屏。請稍等幾秒鐘。</translation>
     </message>
@@ -8012,30 +9304,30 @@ The more information you put in, the more specific your results will be.</source
         <translation>伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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>加入伺服器房間失敗：在本伺服器上這房間並不存在。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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>伺服器認為你在房間內, 但Cockatrice無法顯示。請重新啓動Cockatrice。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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>你未被允許進入該房間。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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>因為以下不知名的錯誤,所以不能參入伺服器房間: %1.</translation>
     </message>
@@ -8043,92 +9335,97 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>你確定嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>遊戲還在繼續, 你確定要退出嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation>點擊查看</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>你的好友%1已登錄!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation>不知名事件</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8139,38 +9436,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 要升級你的客户端，請點擊“幫助”-&gt;“檢查更新”</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation>閒置超時</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>你即將因為長時間沒有活動而被退出。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>升級</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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>你已被升級.請登出然後再登入讓本更改生效.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>被警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>你由於$1 原因,現在接受警告. 請避免繼續本行為, 否則你將有可能會接受進一步的警誡或懲罰. 若有任何疑問, 請私信我們門下的版主.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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>你收到松本伺服器發出的以下訊息(類似本信息的自定訊息可能未經翻譯)</translation>
@@ -8178,6 +9475,11 @@ Please refrain from engaging in this activity or further actions may be taken ag
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8218,42 +9520,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>生命值</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>白色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>藍色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>黑色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>紅色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>綠色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>無色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>其他</translation>
     </message>
@@ -8261,151 +9563,209 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation>無法打開文件。</translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>用户&amp;詳細信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>私人&amp;聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>顯示這個用户的&amp;遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>加入到&amp;好友列表</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>從&amp;好友列表移除</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>加入到&amp;屏蔽列表</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>從&amp;屏蔽列表移除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>從&amp;遊戲中踢出</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="67"/>
         <source>Warn user</source>
         <translation>警告用戶</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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>查看用户警告记录</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="69"/>
         <source>Ban from &amp;server</source>
         <translation>把用戶從&amp;伺服器禁用</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>查看用户&amp;禁止記錄</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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>升$用戶作為版主</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>把&amp;用戶從版主降級</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation>把&amp;用戶升級成裁判</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="74"/>
         <source>Demote user from judge</source>
         <translation>把&amp;用戶從裁判降級</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="75"/>
         <source>View admin notes</source>
         <translation>閱讀管理筆記</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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"/>
     </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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>%1 的遊戲(眾) </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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>禁用歷史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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>禁止時間；版主；禁止時長；禁止理由；可見理由</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation>用戶從未被禁</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation>不能獲取禁用訊息</translation>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation>警告歷史</translation>
     </message>
@@ -8420,55 +9780,65 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation>用戶從未接收警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation>不能獲取警告信息</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="249"/>
         <source>Failed to get admin notes.</source>
         <translation>不能獲取管理筆記</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>用戶升級成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>用戶降級成功</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>失敗</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>用戶升級失敗</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>用戶降級失敗</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation>把哈希覆印到用戶剪貼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation>移除這用戶訊息</translation>
     </message>
@@ -8476,311 +9846,554 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>位置：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>帳戶年齡</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>更改</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>更改密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>更改頭像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>管理員</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>版主</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>登記用戶</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>未登記用戶</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>裁判</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>不知名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="371"/>
         <source>The entered password does not match your account.</source>
         <translation>輸入密碼跟你戶口不匹配</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>用戶資訊已更新。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation>用戶資訊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation>實名：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation>用戶等級:</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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><numerusform>%n年(眾) ，</numerusform></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="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><numerusform>%10%n日(眾)  %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation>輸入密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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>要核實密碼才能更改你的電郵地址</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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>在嘗試更新你的用戶信息時出現錯誤.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>本伺服器不容許你更新你的用戶資訊.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>密碼已更改</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>本伺服器不容許你更改密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>新的密碼太短</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>舊的密碼不正確</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>頭像已更新。</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>本伺服器不容許你更新你的頭像.</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>在更新你頭像時出現錯誤</translation>
+        <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>本伺服器不容許你更新你的用戶資訊.</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>一般通用接口設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>雙點擊使出卡牌 (而不是單點擊使出)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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>&amp;單一點擊把所有選擇的卡牌使出(不只是被點擊的單張卡牌)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>&amp;把所有使出的非地牌放入堆疊區(不是戰場) 作為常用設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>在令牌上標註牌中文字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>使用浮動菜單，允許右鍵單擊, 把菜單保留在屏幕上</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation>通告設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>開啓任務欄通告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>觀看時在任務欄提示遊戲信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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>在任務欄中提示好友連到伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>動畫設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;橫置/重置 動畫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="231"/>
         <source>Open deck in new tab by default</source>
         <translation>把用新頁開啟牌庫作為常用設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation>重播設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="246"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>用速鍵啟動向後跳的緩衝時間:</translation>
     </message>
@@ -8788,22 +10401,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
@@ -8811,124 +10424,256 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8936,7 +10681,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="41"/>
+        <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"/>
     </message>
@@ -8944,19 +10689,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="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
@@ -8964,27 +10709,37 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -8992,50 +10747,93 @@ 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="53"/>
+        <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"/>
     </message>
     <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -9043,46 +10841,25 @@ 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="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -9090,47 +10867,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="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9138,7 +10920,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="25"/>
+        <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"/>
     </message>
@@ -9146,22 +10928,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="47"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -9169,17 +10951,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="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9187,43 +10969,43 @@ 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_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>你想發出那種警告？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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>把這用戶在所有房間留下的訊息刪除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>&amp;確認</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>&amp;取消</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>對行為不當的用戶發出警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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>接收警告的用戶名稱不能空白.請定好要接收警告的用戶名字.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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>警告名稱不能留空. 請選擇有效的警告.</translation>
     </message>
@@ -9231,133 +11013,133 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <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>將選擇的牌組送到最頂</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>將選擇的牌組往上一格</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>將選擇的牌組往下一格</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>將選擇的牌組送到最底</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation>用排組名稱,代碼,或類型進行搜尋</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="70"/>
         <source>Default order</source>
         <translation>常用次序</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>恢復常用藝術先後次序</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="107"/>
         <source>Enable all sets</source>
         <translation>啟用所有牌組</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="108"/>
         <source>Disable all sets</source>
         <translation>禁用所有卡组</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="109"/>
         <source>Enable selected set(s)</source>
         <translation>啟用選擇的牌組(眾) </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation>停用選擇的牌組(眾) </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="126"/>
         <source>Deck Editor</source>
         <translation>牌庫編輯</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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation>請按 CTRL + A, 以此選擇所有看到的牌組</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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation>只有已經被啟用的卡牌組中的卡牌,才會在牌庫編輯中的卡牌清單出現</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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation>卡牌圖片先後次序由以下次序決定:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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>自訂檔案夾(%`1)優先, 此對話窗中已被啟用的牌組為後(由頂到底)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Card Art</source>
         <translation>卡牌藝術</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation>如何使用自定卡牌圖片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation>筆記</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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation>按列排序允許您在不更改系列優先級別的情況下查找牌組。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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>要再次啓用排序，請單擊列標題，直到此消息消失。</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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation>用現在排序代替牌組先後</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
         <source>Sorts the set priority using the same column</source>
         <translation>用同一列分牌組先後</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation>管理牌組</translation>
     </message>
@@ -9365,72 +11147,72 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation>未分組</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation>按類型分組</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation>按法力數值分組</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation>按顏色排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation>未排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation>按名稱排次序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation>按類型排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation>按法力費用排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation>按顏色(眾) 排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation>按力量/防禦力排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation>按排組排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>關閉界面時洗牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>棟疊觀看</translation>
     </message>
@@ -9438,7 +11220,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation type="unfinished"/>
     </message>
@@ -9446,12 +11228,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation>啟動時自動連接</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation>偵錯紀錄寫進檔案</translation>
     </message>
@@ -9459,1005 +11241,1078 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>主視窗</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation>牌庫編輯</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>遊戲廳堂</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation>牌指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation>玩家指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>力量和防御力</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>遊戲階段</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>遊戲區域</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation>移動所選牌張</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>查看</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation>移動頂牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation>移動底牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>遊戲</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation>抽牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation>聊天室</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation>遊戲視窗</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation>從剪貼板載入牌庫</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation>遊戲錄像</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation>檢查卡牌更新</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation>連線</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>斷開連線</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>全屏</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation>註冊...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation>設定...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation>開始離線遊戲</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation>觀看錄像</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation>清除所有篩選項目</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation>清除所選的篩選項目</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation>移除卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation>管理牌組</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation>編輯自定眾令牌...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation>添加卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation>載入牌庫...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation>從剪貼板載入牌庫</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation>創建新牌庫</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation>打開自定圖片文件夾</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation>印刷牌庫</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation>刪除卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation>重置佈局</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation>保存牌庫</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation>牌庫另存為</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>從剪貼板儲藏牌庫, 帶注釋</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation>從剪貼板儲藏牌庫</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation>從自身檔案載入牌庫</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation>載入伺服器上的牌庫...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation>設定準備開始</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation>切換副牌庫鎖</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation>增加綠色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation>移除綠色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation>設定綠色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation>增加红色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation>移除紅色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation>設定紅色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation>增加生命指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation>移除生命指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation>設定生命指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation>增加白色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation>移除白色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation>設定白色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation>增加藍色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation>移除藍色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation>設定藍色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation>增加黑色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation>移除黑色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation>設定黑色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation>增加無色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation>移除無色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation>設定無色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation>增加其他指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation>移除其他指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation>設定其他指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation>增加力量(+1/+0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation>削減力量(-1/-0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>防禦移到力量（+1/-1）</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>增加防御(+0/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>削減防御(-0/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>力量移到防禦（-1/+1）</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>增加力量和防御(+1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>削減力量和防御(-1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation>設置力量和防禦</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation>重置力量和防御</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>重置</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>維持</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>抽牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation>第一主階段</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation>開始戰鬥</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>攻擊</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>擋格</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>計算損害</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation>戰鬥结束</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation>第二主階段</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>完結</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation>下個階段</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation>下個行動階段</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation>下一回合</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation>從揭露視窗中隱藏這牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation>横置/重置這牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation>重置全牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
-        <translation>鎖定重置狀態</translation>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation>反轉本牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation>查看卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation>使出本牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation>结附牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation>解除牌结附</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation>複製卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation>派出令牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation>派出所有相關令牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation>再做另外令牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation>記下註解</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation>選擇所有在區域的牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation>選擇所有橫行牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation>選擇所有直行牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation>牌庫底</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>放逐</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>墳場</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>手牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation>牌庫頂</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation>戰場，面朝下</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation>戰場</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>牌庫</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>副牌庫</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation>排副多張頂牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation>排副多張底牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation>關閉最近查看</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation>疊區</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation>多張送墳場</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation>多張放逐</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation>找到以下牌前全送疊區</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation>從牌庫底抽一張牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>從牌庫底抽超過一張牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation>畫箭咀</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation>清除自設箭咀</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation>離開遊戲</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation>擲骰</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation>洗牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>再調度</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation>抽一張牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation>抽超過一張牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation>撤銷抽牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation>永遠顯示頂牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation>永遠看到頂牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation>視角順時針轉</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation>視角逆時針轉</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation>取消聚焦文本框</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation>聚焦聊天</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation>掃清聊天</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation>刷新</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation>跳前</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation>跳後</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation>向前大跳</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation>向後大跳</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation>播放/暫停</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation>切換快進</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_zh-Hans.ts b/cockatrice/translations/cockatrice_zh-Hans.ts
index 7793b3f35..a2df2035e 100644
--- a/cockatrice/translations/cockatrice_zh-Hans.ts
+++ b/cockatrice/translations/cockatrice_zh-Hans.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>&amp;设置指示物</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>设置指示物</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>数值物新价值为 &apos;%1&apos;</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,79 +36,81 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation>更新后笔记</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation>%1 的管理笔记</translation>
     </message>
@@ -116,213 +118,264 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation>主牌库</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation>副牌库</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
-        <translation type="unfinished"/>
+        <translation>秒</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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>不能在&apos;%1&apos;创造主题目录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>主题设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>现在主题</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation>打开主题文件夹</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation>选单设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="415"/>
         <source>Show keyboard shortcuts in right-click menus</source>
         <translation>在右击选单中显示键盘快速键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>卡面算绘</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>最有图片的牌上显示牌名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation>将打横佈局卡片自动向上旋转</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>将牌库中包含的牌组推到艺术选择视窗之顶</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>卡牌随游标缩放</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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>在迭区中和直行手牌中,尽量减少交重迭百分点</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="434"/>
         <source>Maximum initial height for card view window:</source>
         <translation>卡望框最高开头高度</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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>横列</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>手牌佈局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>打栋显示手牌(浪费空间)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>啟用向左对齐</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>表格布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>反转垂直坐标</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>界面佈局之内能够容纳的最少玩家数量：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>卡牌上显示的最大字体大小</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="35"/>
         <source>Theme</source>
-        <translation type="unfinished"/>
+        <translation>卡牌主题</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="36"/>
         <source>Art crop of random card</source>
-        <translation type="unfinished"/>
+        <translation>随机卡牌：艺术取料</translation>
     </message>
     <message>
         <location filename="src/interface/widgets/general/background_sources.h" line="37"/>
@@ -333,112 +386,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>禁用 &amp;用家名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>禁用&amp;IP地址</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>禁用客户ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>禁用类型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>&amp;永久禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>&amp;暂时禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>&amp;日</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>&amp;小时</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>&amp;分鐘</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>禁用时间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>请记载禁用原因
 这项只保留为版主, 被禁用户不能看到.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>请记载被禁用户能看到的被禁原因.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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>将这用户所有室中打出的讯息完全移除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>&amp;取消</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>把用户从本伺服器禁用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>若要对用户实施禁用,请你选择以下叁种的拼合:名字,IP,或用户id.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>若用用户名字施行禁用,必须要填写姓名.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>若用ip地址施行禁用,必须要写下IP地址.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>若用用户ID施行禁用,必须要写下用户ID.</translation>
     </message>
@@ -446,152 +499,221 @@ 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="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation>测试版</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation>从发佈更新伺服器收不到回覆.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>从发佈更新伺服器收不到有效的回覆.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation>从档案更新伺服器收不到有效的回覆.</translation>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>名字</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>牌组</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>法力费用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>卡牌类别</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>力量/防御力</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>顏色</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>和</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>或</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>和不是</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>或不是</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>种类</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>顏色</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>词语</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation>卡组</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>法力费用</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation>法力数值</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>稀有度</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>力量</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>防御力</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>忠诚值</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>赛制</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -599,22 +721,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>卡图</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>描述</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>两个都显示</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"/>
     </message>
@@ -622,22 +744,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="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation>查看关联卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -650,12 +772,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation>名称:</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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation>有关牌名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation>不知名的牌</translation>
     </message>
@@ -663,132 +795,150 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation>卡牌大小</translation>
     </message>
@@ -796,133 +946,133 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -931,7 +1081,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -939,29 +1089,470 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -969,47 +1560,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <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"/>
     </message>
@@ -1017,87 +1578,97 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <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"/>
     </message>
@@ -1123,114 +1694,114 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </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="162"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </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="166"/>
+        <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"/>
     </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="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </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="168"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="172"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </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="174"/>
         <source>Load deck from online service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1238,7 +1809,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1246,194 +1817,171 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>更新预览卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation>下载URL已重置。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>下载的卡牌图片已被重置。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>出现错误</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation>一幅或以上的卡牌图片未能被清除。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>添加URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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>更改URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation>图片网路缓存大小：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation>网路缓处再定向生存时间</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation>再定向缓处有效时间</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation>图片缓存大小：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation>添置新 URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation>移除 URL.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation>日</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>更新中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>选择路径</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation>URL下载优先次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>预览</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>自动下载预览</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation>预览位置:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>最后变更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>开啟时自动下载预览</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>免重新啟动人手按制更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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>人手更新完成前,不能关掉设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation>即时下载卡牌图片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation>如何添加自定URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>删除已下载的图片</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation>重置下载URL</translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
-        <translation>下载图片专用硬盘缓储</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
-        <translation>现不在萤光幕上记忆中图片缓储</translation>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation>数目</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation>牌组</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>号码</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation>提供者 id</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>卡牌</translation>
     </message>
@@ -1441,12 +1989,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1454,17 +2002,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -1472,7 +2020,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <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"/>
     </message>
@@ -1480,62 +2028,62 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <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"/>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </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="104"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </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="105"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </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="106"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </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="107"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <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"/>
     </message>
@@ -1543,98 +2091,156 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1652,74 +2258,74 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>载入牌库...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>载入伺服器上的牌库...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>準备好</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation>强迫开始</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation>备牌解锁</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation>解锁锁上</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>出现错误</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>选择的档案不能再入</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1752,143 +2358,143 @@ This will kick all non-ready players from the game.</source>
         <translation>下载中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>已知主办机</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation>删除现选储藏伺服器.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>从已知的伺服器更新伺服器列表</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>新主办</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>名称:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>&amp;主办机:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>&amp;端口:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>玩家 &amp;名字:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>&amp;密码:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>&amp;储存密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>&amp;自动连接</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>当Cockatrice启动时自动连接到最近的登录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>如在连接或註册谁中遇到问题,请联络伺服器职员寻求援助!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>网页</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation>重设密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation>密码忘记了?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>连接</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>登录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation>伺服器联络人</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>连接伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation>伺服器URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation>通信端口</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation>独特伺服器名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>连接警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>你必须将你的连接简介命名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>连接警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>玩家名称不能空置</translation>
     </message>
@@ -1896,117 +2502,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>&amp;记住设定</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>&amp;描述:</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>玩家:</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>一般</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>游戏类型</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>&amp;密码:</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>只容许&amp;好友加入</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>只容许&amp;註册用户加入</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>加入条件</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>允许观看者</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>观看者&amp;需要密码</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>观看者可以&amp;聊天</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>观看者可见&amp;手牌</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>以旁观者的身份创建游戏</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>观看者</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>开始生命总数</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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation>游戏设定选择</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>&amp;清除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>创建游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>游戏资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>伺服器出现错误.</translation>
     </message>
@@ -2014,97 +2625,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>&amp;名称：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>&amp;顏色：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>白色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>蓝色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>黑色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>红色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>绿色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>多色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>无色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>&amp;力量/防御力:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;註释：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>&amp;此令牌离场时会被摧毁</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>令牌资料</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>显示&amp;所有令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>显示本牌库所有令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>从清单中选择令牌</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>派出令牌</translation>
     </message>
@@ -2112,53 +2723,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2166,40 +2777,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>未选择图像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>若要改变头着,请选择新的图片.
 若要移除现有头像, 请不要选择新的图片,直接确认.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>瀏览...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>更改头像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>打开图片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>图片文件（*.png *.jpg *.bmp格式）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>所选图片不能使用。</translation>
     </message>
@@ -2207,17 +2818,17 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2225,38 +2836,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="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>旧密码：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>新密码：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>确认新密码：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>更改密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>你的密码太短。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>新旧密码不一致</translation>
     </message>
@@ -2264,93 +2875,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="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>&amp;名称：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>&amp;顏色：</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="34"/>
         <source>white</source>
         <translation>白色</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="35"/>
         <source>blue</source>
         <translation>蓝色</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="36"/>
         <source>black</source>
         <translation>黑色</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="37"/>
         <source>red</source>
         <translation>红色</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="38"/>
         <source>green</source>
         <translation>绿色</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="39"/>
         <source>multicolor</source>
         <translation>多色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>无色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>&amp;力量/防御力:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>&amp;註释：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>令牌资料</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>添加令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>移除令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation>编辑自定令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>请输入令牌名称:</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>出现错误</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>现时选择的名字跟现有的卡牌或令牌出现衝突.请从&quot;牌组管理&quot;中啟动&apos;令牌牌组&apos;,保持正确显示.</translation>
@@ -2374,12 +2985,12 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>未定义</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>实名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>更改用户资料</translation>
     </message>
@@ -2417,112 +3028,113 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>2小时</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation>&amp;新过:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>游戏 &amp;描述:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>&amp;创建者名称:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>&amp;游戏类型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>&amp;至少:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>&amp;最多：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>可容纳玩家最高数量</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>限制</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation>只显示容许&amp;观看者 观看的游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation>显示有观看者&amp;密码保护的游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation>只显示容许观看者&amp;聊天的游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation>只显示容许观看者看&amp;手牌 的游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation>观看者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>筛选游戏</translation>
     </message>
@@ -2530,52 +3142,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>重设密码验证警告</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>程序出现故障,请再要求新的密码.</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>请输入需要新密码的伺服器和相关户口资料.</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>&amp;主办机:</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>&amp;端口:</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>玩家 &amp;名字:</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>电邮：</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>重设密码验证</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>重设密码验证错误</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>电邮不能空置.</translation>
     </message>
@@ -2583,37 +3195,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>请输入需要新密码的伺服器资料.</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>&amp;主办机:</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>&amp;端口:</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>玩家 &amp;名字:</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>重设密码要求</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>重设密码错误</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>玩家名称不能空置</translation>
     </message>
@@ -2621,86 +3233,86 @@ 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>重设密码警告</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>程序出现故障,请再要求新的密码.</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>请输入收到验证码和新的密码,以便定立新的密码.</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>&amp;主办机:</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>&amp;端口:</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>玩家 &amp;名字:</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>验证码</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>新密码：</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>重设密码</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>玩家名称不能空置</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>重设密码错误</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>验证码不能为空白</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>新密码不能为空白</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>出现错误</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>你的新密码太短。</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>新旧密码不一致.</translation>
     </message>
@@ -2716,17 +3328,17 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>从剪贴板载入牌库</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>牌表不能载入</translation>
     </message>
@@ -2734,43 +3346,43 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2784,45 +3396,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>载入牌库</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation>卡牌名称(或搜寻表达式)</translation>
     </message>
     <message>
-        <location filename="src/game/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>因为cockatrice原生没有ssl支援, 所以你不能自动下载更新. 请瀏览到我们的下载网页,进行人手更新.</translation>
     </message>
     <message>
-        <location filename="src/game/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>开关副牌上锁</translation>
     </message>
     <message>
-        <location filename="src/game/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>把顶牌放在重迭区, 直到...</translation>
     </message>
     <message>
-        <location filename="src/game/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>在卡牌资料库中找不到符合搜寻表达式的卡牌.你想继续吗?</translation>
     </message>
     <message>
-        <location filename="src/game/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>Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/game/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>筛选无效</translation>
     </message>
@@ -2830,7 +3475,7 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation>输入你, 和你想登记的伺服器的资料.
@@ -2838,47 +3483,47 @@ Your email will be used to verify your account.</source>
 我们会使用你的电邮来核实你的户口.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>&amp;主办机:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>&amp;端口:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>玩家 &amp;名字:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>&amp;密码:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>(再次)输入密码：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>电邮：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>(再次)输入电邮：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>国家：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>未定义</translation>
     </message>
@@ -2924,17 +3569,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation>骰子面数:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation>骰子数目:</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation>掷骰</translation>
     </message>
@@ -2942,40 +3587,55 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>读取卡牌资料库时出现不知名错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -2992,7 +3652,7 @@ Would you like to change your database location setting?</source>
 你想要重新设置卡牌资料库路径吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3009,7 +3669,7 @@ Would you like to change your database location setting?</source>
 你想要重新设置卡牌资料库路径吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3022,7 +3682,7 @@ Would you like to change your database location setting?</source>
 你想要重新设置卡牌资料库路径吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3030,7 +3690,7 @@ Would you like to change your database location setting?</source>
 你想要重新设置卡牌资料库路径吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3039,7 +3699,7 @@ Would you like to change your database location setting?</source>
 你想要重新设置卡牌资料库路径吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3055,59 +3715,64 @@ https://github.com/Cockatrice/Cockatrice/issues
 你想不想更改你的资料库位置设定?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>你的牌库目录路径现在无效. 你想要重新设置套牌路径吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>你的卡牌图片目录路径现在无效. 你想要重新设置卡牌图片资料库路径吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>外观</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>用户界面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation>卡牌来源</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>声音</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>快捷键</translation>
     </message>
@@ -3115,39 +3780,39 @@ https://github.com/Cockatrice/Cockatrice/issues
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </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="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </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="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3155,17 +3820,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>下一个</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>上一个</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>每日提示</translation>
     </message>
@@ -3173,165 +3838,165 @@ 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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>现在发行渠道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>重新安装</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>取消下载</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>打开下载页面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation>检查客户端更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>鸡蛇不支持建立SSL连接，因此你不能自动下载更新！
 请访问下载页面以手动更新。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>正在检查更新...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>更新检查已完成</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>没有更新可用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>Cockatrice 已经达到最新版本!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>你运行的已经是最新的发行版本了。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>现行版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>现选发行渠道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>现有更新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>Cockatrice有新版本可用！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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>已发行</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>变更记载</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>你打算现在更新吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>更新出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>检测更新时出现错误:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>下载更新时出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>安装中</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>Cockatrice 不能啟动安装程式</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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>请你尝试人手更新, 关掉cockatrice, 然后重开安装程式.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation>下载位置</translation>
     </message>
@@ -3339,21 +4004,153 @@ 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="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>关闭时清除纪录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>侦错纪录</translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3423,33 +4220,39 @@ You may have to manually download the new version.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <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"/>
     </message>
@@ -3457,7 +4260,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>输入你的筛选类型</translation>
     </message>
@@ -3465,22 +4268,22 @@ 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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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"/>
     </message>
@@ -3488,22 +4291,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation type="unfinished"/>
     </message>
@@ -3511,155 +4314,208 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>请先参加合适房间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>密码错误.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>这个游戏不允许观眾加入.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>这个游戏已经满了.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>这个游戏已经不存在了。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>这个游戏只开放给註册用户.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>这个游戏只开放给房间主办的好友。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>你被这个房间的主办屏蔽了.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>加入游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>密码:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>请先参加相关的房间.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>&amp;筛选游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>&amp;清除筛选项目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>&amp;创建</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>&amp;加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>&amp;作为观看者加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation>显示游戏：%1/%2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>游戏</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation>＞1日</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="43"/>
         <source>%1%2 hr</source>
         <comment>short age in hours</comment>
         <translation><numerusform>%1%2 小时</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation>新建</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="48"/>
         <source>%1%2 min</source>
         <comment>short age in minutes</comment>
         <translation><numerusform>%1%2 分鐘</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>仅限好友</translation>
     </message>
@@ -3669,68 +4525,68 @@ You may have to manually download the new version.</source>
         <translation>仅限註册用户</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>允许聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>查看手牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>允许查看手牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>不允许</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>房间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>时长</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>描述:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>创建者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>类型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>限制</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>玩家</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>观看者</translation>
     </message>
@@ -3738,143 +4594,158 @@ You may have to manually download the new version.</source>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation>重置所有路径</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation>重置所有路径</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>选择路径</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>个人设定</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>语言:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>路径(在便携模式下不能编辑)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>路径</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>牌库路径:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>游戏录像目录:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>图片目录:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>卡牌资料库：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation>自主资料库目录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>令牌资料库:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation>更新渠道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation>啟动时检查客户更新</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>如果客户端缺少伺服器支持的更功能时,请提示我</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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>啟动新版本Cockatrice时,自动运行Oracle.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>显示启动时提示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <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"/>
     </message>
@@ -3882,47 +4753,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -3930,111 +4801,141 @@ You may have to manually download the new version.</source>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4042,193 +4943,213 @@ You may have to manually download the new version.</source>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4236,643 +5157,273 @@ You may have to manually download the new version.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>伺服器已达到最最高用户限额，请另外选择吉时再试.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>你的网路地址拥有太多同时连繫.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>你已被版主禁用</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>预计结束时间: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>这是无限期禁用</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>排期伺服器关机</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>不可用的用户名。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>因为你已在另外的位置登入, 所以你现有的联繫已被登出.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>连繫已被关闭</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>伺服器已经中断你的联繫/
-原因: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation><numerusform>伺服器将会在 %n 分鐘内重新啟动. 所有进行中的游戏都会报销.伺服器关闭原因: %1</numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>排期伺服器关机</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>成功</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>註册已成功。
-现在登入。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>户口啟动已经成功
-现在登入.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>玩家人数</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>请输入玩家人数</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>玩家 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>载入游戏录像</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>关於Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation>版本</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatrice 网页</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>项目经理：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>前项目经理：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>开发者：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>我们的开发者：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>协助开发！</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>翻译者：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>翻译者名单</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>协助翻译!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>支援:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>报告问题</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>排除故障</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>问答</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>伺服器超时</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>登入失败</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation>你的客户端似乎脱小本伺服器需要用来达成连繫的功能.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation>请去&quot;求助-&gt;检查客户端更新&quot; 内更新你的客户.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>用户名或密码错误。请检查账号信息,然后重试。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>已经有在线用户正在使用这用户名.请先关闭连线,然后重新登入.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>你被禁止直到: %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>你已被永久封禁.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>本伺服器要求用户註册. 你想不想现在登记?</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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>本伺服器要求用户拥有客户id. 你的客户端现在不能造成客户id,或是你正在使用修改过的客户端.
-请你关掉现有的客户端,然后重新啟动, 择吉日再试。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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>因为内部出现故障, 请关闭,重开Cockatrice 然后再次尝试.
-如果故障继续出现,请将客户端软件升级为最新版本, 有需要时请联络软件开发人士.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>户口啟动</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>你的户口还未尝啟动.
-你需要提供从啟动电邮得来的验证码.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation>伺服器载满</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>不知名登入错误: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>
-这通常意味住你的客户端版本已经过期,引起你的客户端不能明晓伺服器的回覆.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>您的用户名字必须遵守以下规则：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>在%1 - %2个字符之间。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>可以 $1 包含细楷/小写字母</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>并否</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>可以 $1 包含大楷/大写字母</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>可以 $1 包含数字</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>可以包含以下符号：%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>第一个字符可以 %1 是标点符号</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <source>no unacceptable language as specified by these server rules:</source>
-        <comment>note that the following lines will not be translated</comment>
-        <translation>在以下伺服器规矩中,道明不能接受的语言:</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation>不能含有以下字眼: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation>不能含有以下语句: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>你的用户名字只可以用以下的字符: A-Z, a-z, 0-9, _, ., 和 - .</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>註册被拒绝</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>这伺服器暂时谢绝登记</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>这个用户名字已经被使用.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>登记时必要指明合能用的电邮地址.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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>你看来好像在本伺服器尝试申请新户口, 但是你已经有跟你电邮掛鉤的户口名字.我们的伺服器限制每用户在每个地址可以有多少个户口. 如果需要更多援助或是得取你的登入资料,请联络伺服器办事人.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>密码太短。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>由於伺服器出现技术问题, 你的登记暂时失败.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>不知名登记错误: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>户口啟动失败</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>接口错误: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>你正在尝试跟过时的伺服器连繫. 请把你的 Cockatrice 版本降级,或是连繫於合适的伺服器. 当地/离线版本维 %1, 遥距/上线版本维 %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>你的 Cockatrice 版本现已过时.请把你的版本更新.
-当地/离线版本维 %1, 遥距/上线版本维 %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>向 %1 连接中...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>正在用%2的身份登记到%1伺服器...</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>已经断线了</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>连线成功, 在%1登入</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>正在用%2的身份对%1要求遗忘密码.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>&amp;连线...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>&amp;断线</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>开始&amp;离线游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>&amp;观看游戏录像</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>&amp;全屏</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>&amp;註册加入伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation>&amp;弄回密码</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>设置⋯</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>&amp;退出</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>&amp;动作</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>&amp;Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>&amp;卡牌资料库</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation>&amp;管理牌组</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>编辑自定 &amp;令牌...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>打开自定图片文件夹</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>打开自定牌组文件夹</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>添加自定卡组/卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation>刷新卡牌资料库</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>&amp;求助</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>&amp;关於Cockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp;每日提示</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation>检查客户端更新</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation>检查卡牌更新</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation>查看&amp;侦错纪录</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation>打开设置文件夹</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation>显示/隐藏</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation>新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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>恭喜你将Cockatrice升级为%1.
 现在会帮你啟动oracle, 更新你的卡牌资料库.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation>Cockatrice 已被安装</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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>恭喜你成功安装Cockatrice%1.
 现在会帮你啟动oracle, 安装你的卡牌资料库.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>卡牌资料库</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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>
@@ -4881,29 +5432,29 @@ If unsure or first time user, choose &quot;Yes&quot;</source>
 如果不确定, 或者是第一次使用，请选择“是/Yes”</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>是/Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>否/No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>打开设置</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>发现新卡组</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
@@ -4912,17 +5463,22 @@ Do you want to enable it/them?</source>
 要啟用它们吗？</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>查看卡组</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>欢迎</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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>
@@ -4931,741 +5487,901 @@ Read more about changing the set order or disabling specific sets and consequent
 请阅读,了解更多在“卡组设置”对话框裡.更改卡组顺序或者禁用某些卡组的功能.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>资料库更新现已进行.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>不能运行卡牌资料附更新程式:</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>本伺服器支持你现在客户端软件欠缺的额外功能.
-
-这信息不是大问题, 但此信息可能意会现在已有新版本的 Cockatrice, 或是本伺服器运用自设或预先释放版本.
-
-请到&quot;援助-&gt;检查更新&quot;去更新你的客户端.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>载入卡组/卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>找不到选择的文件。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation>你暂时只能导入xml资料库.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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>已经成功添加新的卡组/卡牌. Cockatrice会重新载入卡牌资料库.</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>卡组/卡牌导入失败.</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
-        <translation>重设密码</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
-        <translation>你的密码已经成功重置, 你可以用新密码重新登入。</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>重置用户密码失败, 请联络伺服器管责人重置密码.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
-        <translation>已经收到啟动要求,   请从你的电邮获取啟动验证码.</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation>从战场上</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation>从它们的坟场</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation>从放逐区</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation>从它们的手牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>%1牌库的顶牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation>它们的顶牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation>从%1牌库的顶</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation>从它们1牌库顶</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>%1牌库的底牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation>它们牌库的底牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation>从%1的牌库底</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation>从它们的牌库底</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation>从%1的牌库</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation>从它们的牌库</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation>从备牌中</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation>从迭区中</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1现在保持%2顶牌显现.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1不再展示牌库顶牌%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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>%1可以随时查看牌库顶牌 %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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>%1再不可以随时查看牌库顶牌 %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1 结附 %2 指向 %3的 %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation> %1 在此游戏宣佈降服.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation> %1 收回在此游戏降服.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1已恢復连接。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 已失去连接。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation>%1 从它们的%2 指向自己。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation>%1 从它们的%2指向%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation>%1 从%2的%3 指向自己。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation>%1 从%2的%3 指向%4。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1 从它们的%2指向它们的%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1 从它们的%2指向%3的%4。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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>%1 从%2的%3指向自己的%4。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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>%1 从%2的%3指向%4的%5。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1 派出令牌: %2%3</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 已载入牌库(%2)</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>%1已载入含有 %2张备牌的牌库(%3).</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation>%1销毁了%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>一张牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1将%3的控制转移给%2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="308"/>
         <source>%1 puts %2 into play%3 face down.</source>
         <translation>%1将%2%3牌面朝下地放进战场。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1将%2放进战场%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation>%1将%2%3置入它们的的坟场。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 放逐%2%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation>%1将%2%3移到它们的的手牌中。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation>%1将%2%3放入它们的牌库。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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>%1将%2%3放在它们的牌库底部。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation>%1将%2%3放在它们的牌库顶部。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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>%1将%2%3放在它们的牌库顶部%4张牌以下。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 将%2%3移到副牌库.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1使出 %2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="373"/>
         <source>%1 tries to draw from an empty library</source>
         <translation>%1尝试从空牌库抽牌</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation><numerusform>%1抽%2张牌。</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 正在查看%2。</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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><numerusform>%1 正在查看%2的 %4 %3张卡牌.</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation>底部</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation>顶部</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1把%2翻为面朝下。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1把%2翻为面朝上。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>游戏已经关闭。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>游戏已开始。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1 已经加入游戏。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 正在旁观游戏。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>你已被踢出游戏。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 已经离开游戏(%2)。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation>%1 已经不再旁观游戏(%2)。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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>%1 还未準备好开始游戏。</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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><numerusform>%1将其牌库洗牌，然后抽%2张牌作为新的起手。</numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="473"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation>%1将其牌库洗牌，然后抽起新的手牌。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation>你正在观看游戏#%1的录像。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1已準备好开始游戏。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="510"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation>卡牌(眾) </translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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><numerusform>%1 卡牌(眾) </numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation>%1把&amp;2借给%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1把%2展示给%3.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1 展示 %2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation>%1随机展示%2%3给%4。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1随机展示%2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation>%1查看面朝下的卡牌#%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation>%1查看面朝下的卡牌#%2:%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation>%1展示%2%3给%4。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1展示%2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="576"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation>%1 逆转回合次序，现在轮到%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation>逆转</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation>正常</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>正面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>翻面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation>%1掷了硬币。结果为%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1掷%3面骰子，结果为%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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>%1掷了%2个硬币。结果为%3个正面和%4个反面。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="608"/>
         <source>%1 rolls a %2-sided dice %3 times: %4.</source>
         <translation>%1把%2面骰子掷了%3次:%4</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>轮到 %1.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation>%1给%2添加了註释成%3。</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <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></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <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></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation>%1 将%2指示物设置为 %3 (%4%5)。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%1 将 %2 设置为不被重置。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 将 %2 设置为照常重置。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 移除%2的力量/防御.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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>%1把%2的力量/防御从无数值转为%4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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>%1把%2的力量/防御从%3转为%4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1已经锁定它们的的副牌库。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1已经把它们的的副牌库解锁。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>%1横置它们的永久卡牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1重置它们的永久卡牌.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1 横置 %2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1 重置 %2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>% 1 对 %2  洗牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="769"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation>%1 洗 %2 底的 %3 张卡牌.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="774"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation>%1 洗 %2 顶的 %3 张卡牌.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation>%1到%2.洗%3 - %4 </translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 取消了%2的结附。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1 放回它们最后一张抽到的卡牌.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation> %1 放回它们最后一张抽到的卡牌(%2).</translation>
     </message>
@@ -5673,110 +6389,115 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation>词1 词2 词3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation>添加新信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation>更改信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation>移除信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>添加信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>信息:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation>更改信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>聊天设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>自定通知触发词语</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>允许聊天中提到某人</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>允许自动完成提名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>游戏内短信速键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="243"/>
         <source>How to use in-game message macros</source>
         <translation>如何使用游戏内短信速键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>不要显示未註册用户的聊天消息。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>不要显示未註册用户的私人消息.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>反转文本顏色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>容许桌面提醒提及私人消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>容许桌面提醒提及聊天提名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>加入聊天室时开启消息历史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>（顏色为16进制）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>将单词以空格区分，仅支持字母.</translation>
     </message>
@@ -5784,37 +6505,42 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -5827,47 +6553,47 @@ Cockatrice will now reload the card database.</source>
         <translation>卡牌类型</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation>法力数值</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation>颜色(眾) </translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation>忠诚值</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation>卡牌主类型</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation>法力费用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation>力量/防御力</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation>正面/底面</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation>佈局</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation>顏色身份</translation>
     </message>
@@ -5890,65 +6616,211 @@ Cockatrice will now reload the card database.</source>
         <translation>重迭方向</translation>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation>不知名阶段</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation>重置步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation>维持步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation>抓牌步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation>第一主阶步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation>开战步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation>宣告进攻步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation>宣告阻挡步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation>战斗损害步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation>战斗结束步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation>第二主阶步</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation>结束/清理步</translation>
     </message>
@@ -5956,57 +6828,57 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>重置步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>维持步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>抓牌步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>第一主阶段</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>战斗开始步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>宣告阻挡步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>宣告阻挡步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>战斗损害步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>战斗结束步</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>第二主阶段</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>回合完结部</translation>
     </message>
@@ -6014,7 +6886,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation>zhs</translation>
@@ -6023,183 +6895,195 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation>喜好</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation>版本上别针</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation>版本脱别针</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation>显示关联卡牌</translation>
     </message>
@@ -6215,17 +7099,17 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation>牌库次序中上一张卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation>牌库次序中下一张卡牌</translation>
     </message>
@@ -6233,86 +7117,94 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation>英文字母次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation>喜好</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation>发行日期</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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>由后到先</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation>由先倒后</translation>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"/>
     </message>
@@ -6320,37 +7212,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>服务</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>隐藏 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>隐藏其他</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>全部展示</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>喜好...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>退出%1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>关於 %1</translation>
     </message>
@@ -6358,153 +7250,247 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>Cockatrice卡牌资料库 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>所有档案格式 (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatrice录像文件 (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>主牌库</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>副牌库</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>眾令牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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"/>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation>OK/确认</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation>保存</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation>全部保存</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation>打开</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation>&amp;是/Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation>&amp;全选是/Yes</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation>&amp;否/No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation>&amp;全选否/No</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation>重试</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation>不理</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation>弃牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation>协助</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation>应用</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation>重设</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation>恢復常用认值</translation>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>上载时间</translation>
     </message>
@@ -6512,32 +7498,32 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>名字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>玩家(眾)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>选用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>开始时间</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>维持(秒)</translation>
     </message>
@@ -6545,37 +7531,37 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -6583,41 +7569,49 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>房间(眾) </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>&amp;加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>房间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>许可</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>玩家(眾)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>游戏(眾)</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6654,27 +7648,27 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>已启用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>设置类型</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>设置代码</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>长名</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>发行日期</translation>
     </message>
@@ -6682,53 +7676,53 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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>恢復所有常用快键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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>确定要恢復所有常用快键吗?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation>清除所有常用快键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="111"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>确认清除所有快键吗?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation>部分：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation>行动:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation>快键:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation>如何设置自定快键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation>清除所有快键</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation>按快键名称搜寻</translation>
     </message>
@@ -6736,12 +7730,12 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation>行动</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation>快键</translation>
     </message>
@@ -6749,14 +7743,14 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>您的配置档案含有无效的快捷键.
 请检查您的快捷键设定.</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>以下快捷键设置已经返回常用状态：
@@ -6784,12 +7778,12 @@ Please check your shortcut settings!</source>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -6797,27 +7791,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>启用&amp;声效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>现前声效主题：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>测试系统声效引擎</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>声效设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>主音量</translation>
     </message>
@@ -6825,48 +7819,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="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation>预览季节已结束</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>现在正删除spoiler.xml。请啟动Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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>预览下载出错</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation>没有网络连接</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation>预览已是最新</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation>没有添加新预览</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation>预览已被更新</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation>最后变更：</translation>
     </message>
@@ -6889,16 +7883,146 @@ Please check your shortcut settings!</source>
         <translation>从发佈更新伺服器收不到有效的回覆.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="177"/>
         <source>No reply received from the tag update server.</source>
         <translation>未收到标籤更新伺服器的回应.</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="184"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>从标籤更新伺服器收不到有效的回覆.</translation>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7030,56 +8154,227 @@ Please check your shortcut settings!</source>
         <translation>不能啟动用户户口.内部故障</translation>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation type="unfinished"/>
+    </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="262"/>
+        <source>Any</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>卡牌资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>牌库</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>筛选项目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>&amp;视图</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation>印刷版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>可见</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>浮动</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation>重置布局</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="82"/>
         <source>Deck: %1</source>
         <translation>牌库:%1</translation>
     </message>
@@ -7087,61 +8382,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="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7149,22 +8432,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="43"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <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"/>
     </message>
@@ -7205,8 +8488,8 @@ Please check your shortcut settings!</source>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>新文件夹</translation>
     </message>
@@ -7222,83 +8505,83 @@ Please check your shortcut settings!</source>
         <translation>打开牌库文件夹</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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>无效牌库档案</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>输入牌库名称</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>本牌库列表未有名称.请输入名称:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>未命名牌库</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation>牌库上载於伺服器时失败</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>删除本地档案</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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>你确定要删除被选档案(眾)吗 ？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation>删除伺服器上的牌库</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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>你确定要剷除所有被选的牌库吗?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>新建文件夹名称:</translation>
     </message>
@@ -7311,17 +8594,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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"/>
     </message>
@@ -7362,7 +8645,7 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation type="unfinished"/>
     </message>
@@ -7370,197 +8653,191 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>游戏录像重温</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>玩家列表</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>卡牌资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>录像时间线</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>阶段</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>下个&amp;阶段</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation>下个阶段&amp;行动</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>下个&amp;回合</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation>逆转回合次序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>&amp;移除所有自设箭头</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>&amp;顺时针旋转视角</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>&amp;逆时针旋转视角</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>游戏&amp;资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation>撤销&amp;投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>&amp;投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>&amp;离开游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>&amp;关闭游戏录像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation>&amp;聚焦聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>&amp;説：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>&amp;视图</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>可见</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>浮动</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation>重置布局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>你确定要宣佈投降吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation>撤销投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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>你已经宣佈投降,你想回到这场游戏吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>离开游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>你确定要离开这个游戏吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation>有玩家加入游戏 #%1</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation>%1 已经加入游戏。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>你已被踢出游戏。</translation>
     </message>
@@ -7568,7 +8845,7 @@ Please enter a name:</source>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
@@ -7576,158 +8853,158 @@ Please enter a name:</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>记录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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>时间；发送者姓名；发送者IP；信息；目标ID；目标姓名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation>房间记录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>游戏记录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>聊天记录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>您必须选择至少一个过滤项.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>您必须选择一个可用的日数来作为定位.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>用户名称:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>IP地址</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>游戏名称：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>游戏ID：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>信息:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>主房</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>游戏房间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>私人聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>过去 X 天：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>今天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>1小时前</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation>最多结果:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>至少需要1个筛选项。
 您输入的信息越多，找到结果越準确。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation>获取用户记录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation>清除筛选项目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>筛选项目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation>记录位置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation>日期范围</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation>最多结果</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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>信息历史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation>不能获取信息历史消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation>没有符合筛选条件的信息。</translation>
     </message>
@@ -7745,27 +9022,27 @@ The more information you put in, the more specific your results will be.</source
         <translation>&amp;离开</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - 私人聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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>你已被这用户屏蔽, 它们不能再主聊天室看见你的信息,你亦不能参加它们的游戏.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation>私人信息信到, 来自</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1 已离开伺服器.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1 已加入伺服器.</translation>
     </message>
@@ -7773,180 +9050,180 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>本地档案系统</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>伺服器录像仓库</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>观看游戏录像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation>改名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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>新文件夹</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>删除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation>打开录像文件夹</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>下载游戏录像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>过期锁定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation>本地档案夹改名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation>本地档案改名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation>新名称</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation>出错</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation>改名不成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation>新建文件夹名称:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>删除本地档案</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation>你确定要剷除所有被选的档案吗?</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="505"/>
         <source>Are you sure you want to delete the selected replays?</source>
         <translation>你确定要删除被选录像档案吗 ？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>删除伺服器录像</translation>
     </message>
@@ -7959,47 +9236,62 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>&amp;説：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>&amp;房间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>&amp;离开房间</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>&amp;清除聊天记录</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>聊天设置...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation>提到了你。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation>点击查看</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>你正在刷屏。请稍等几秒鐘。</translation>
     </message>
@@ -8012,30 +9304,30 @@ The more information you put in, the more specific your results will be.</source
         <translation>伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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>加入伺服器房间失败：在本伺服器上这房间并不存在。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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>伺服器认为你在房间内, 但Cockatrice无法显示。请重新启动Cockatrice。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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>你未被允许进入该房间。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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>因为以下不知名的错误,所以不能参入伺服器房间: %1.</translation>
     </message>
@@ -8043,92 +9335,97 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>你确定吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>游戏还在继续, 你确定要退出吗？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation>点击查看</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>你的好友%1已登录!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation>不知名事件</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8139,38 +9436,38 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 要升级你的客户端，请点击“帮助”-&gt;“检查更新”</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation>閒置超时</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>你即将因为长时间没有活动而被退出。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>升级</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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>你已被升级.请登出然后再登入让本更改生效.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>被警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>你由於$1 原因,现在接受警告. 请避免继续本行为, 否则你将有可能会接受进一步的警诫或惩罚. 若有任何疑问, 请私信我们门下的版主.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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>你收到松本伺服器发出的以下讯息(类似本信息的自定讯息可能未经翻译)</translation>
@@ -8178,6 +9475,11 @@ Please refrain from engaging in this activity or further actions may be taken ag
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8218,42 +9520,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>生命值</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>白色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>蓝色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>黑色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>红色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>绿色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>无色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>其他</translation>
     </message>
@@ -8261,151 +9563,209 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation>无法打开文件。</translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>用户&amp;详细信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>私人&amp;聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>显示这个用户的&amp;游戏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>加入到&amp;好友列表</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>从&amp;好友列表移除</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>加入到&amp;屏蔽列表</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>从&amp;屏蔽列表移除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>从&amp;游戏中踢出</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="67"/>
         <source>Warn user</source>
         <translation>警告用户</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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>查看用户警告记录</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="69"/>
         <source>Ban from &amp;server</source>
         <translation>把用户从&amp;伺服器禁用</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>查看用户&amp;禁止记录</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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>升$用户作为版主</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>把&amp;用户从版主降级</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation>把&amp;用户升级成裁判</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="74"/>
         <source>Demote user from judge</source>
         <translation>把&amp;用户从裁判降级</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="75"/>
         <source>View admin notes</source>
         <translation>阅读管理笔记</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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"/>
     </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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>%1 的游戏(眾) </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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>禁用历史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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>禁止时间；版主；禁止时长；禁止理由；可见理由</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation>用户从未被禁</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation>不能获取禁用讯息</translation>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation>警告历史</translation>
     </message>
@@ -8420,55 +9780,65 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation>用户从未接收警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation>不能获取警告信息</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="249"/>
         <source>Failed to get admin notes.</source>
         <translation>不能获取管理笔记</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>用户升级成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>用户降级成功</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>失败</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>用户升级失败</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>用户降级失败</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation>把哈希覆印到用户剪贴</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation>移除这用户讯息</translation>
     </message>
@@ -8476,311 +9846,554 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>位置：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>帐户年龄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>更改</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>更改密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>更改头像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>管理员</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>版主</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>登记用户</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>未登记用户</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>裁判</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>不知名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="371"/>
         <source>The entered password does not match your account.</source>
         <translation>输入密码跟你户口不匹配</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>用户资讯已更新。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation>用户资讯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation>实名：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation>用户等级:</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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><numerusform>%n年(眾) ，</numerusform></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="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><numerusform>%10%n日(眾)  %20</numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation>输入密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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>要核实密码才能更改你的电邮地址</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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>在尝试更新你的用户信息时出现错误.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>本伺服器不容许你更新你的用户资讯.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>密码已更改</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>本伺服器不容许你更改密码</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>新的密码太短</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>旧的密码不正确</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>头像已更新。</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>本伺服器不容许你更新你的头像.</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>在更新你头像时出现错误</translation>
+        <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>本伺服器不容许你更新你的用户资讯.</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>一般通用接口设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>双点击使出卡牌 (而不是单点击使出)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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>&amp;单一点击把所有选择的卡牌使出(不只是被点击的单张卡牌)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>&amp;把所有使出的非地牌放入堆迭区(不是战场) 作为常用设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>在令牌上标註牌中文字</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>使用浮动菜单，允许右键单击, 把菜单保留在屏幕上</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation>通告设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>开启任务栏通告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>观看时在任务栏提示游戏信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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>在任务栏中提示好友连到伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>动画设定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>&amp;横置/重置 动画</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="231"/>
         <source>Open deck in new tab by default</source>
         <translation>把用新页开啟牌库作为常用设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation>重播设置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="246"/>
         <source>Buffer time for backwards skip via shortcut:</source>
         <translation>用速键啟动向后跳的缓衝时间:</translation>
     </message>
@@ -8788,22 +10401,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
@@ -8811,124 +10424,256 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8936,7 +10681,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="41"/>
+        <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"/>
     </message>
@@ -8944,19 +10689,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="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
@@ -8964,27 +10709,37 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -8992,50 +10747,93 @@ 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="53"/>
+        <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"/>
     </message>
     <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -9043,46 +10841,25 @@ 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="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -9090,47 +10867,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="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9138,7 +10920,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="25"/>
+        <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"/>
     </message>
@@ -9146,22 +10928,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="47"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -9169,17 +10951,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="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9187,43 +10969,43 @@ 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_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>你想发出那种警告？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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>把这用户在所有房间留下的讯息删除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>&amp;确认</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>&amp;取消</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>对行为不当的用户发出警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>出现错误</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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>接收警告的用户名称不能空白.请定好要接收警告的用户名字.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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>警告名称不能留空. 请选择有效的警告.</translation>
     </message>
@@ -9231,133 +11013,133 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <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>将选择的牌组送到最顶</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>将选择的牌组往上一格</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>将选择的牌组往下一格</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>将选择的牌组送到最底</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation>用排组名称,代码,或类型进行搜寻</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="70"/>
         <source>Default order</source>
         <translation>常用次序</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>恢復常用艺术先后次序</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="107"/>
         <source>Enable all sets</source>
         <translation>啟用所有牌组</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="108"/>
         <source>Disable all sets</source>
         <translation>禁用所有卡组</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="109"/>
         <source>Enable selected set(s)</source>
         <translation>啟用选择的牌组(眾) </translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation>停用选择的牌组(眾) </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="126"/>
         <source>Deck Editor</source>
         <translation>牌库编辑</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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation>请按 CTRL + A, 以此选择所有看到的牌组</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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation>只有已经被啟用的卡牌组中的卡牌,才会在牌库编辑中的卡牌清单出现</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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation>卡牌图片先后次序由以下次序决定:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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>自订档案夹(%`1)优先, 此对话窗中已被啟用的牌组为后(由顶到底)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Card Art</source>
         <translation>卡牌艺术</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation>如何使用自定卡牌图片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation>笔记</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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation>按列排序允许您在不更改系列优先级别的情况下查找牌组。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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>要再次启用排序，请单击列标题，直到此消息消失。</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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation>用现在排序代替牌组先后</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
         <source>Sorts the set priority using the same column</source>
         <translation>用同一列分牌组先后</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation>管理牌组</translation>
     </message>
@@ -9365,72 +11147,72 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation>未分组</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation>按类型分组</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation>按法力数值分组</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation>按顏色排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation>未排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation>按名称排次序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation>按类型排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation>按法力费用排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation>按顏色(眾) 排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation>按力量/防御力排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation>按排组排序</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>关闭界面时洗牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>栋迭观看</translation>
     </message>
@@ -9438,7 +11220,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>简体中文 (Chinese Simplified)</translation>
     </message>
@@ -9446,12 +11228,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation>啟动时自动连接</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation>侦错纪录写进档案</translation>
     </message>
@@ -9459,1005 +11241,1078 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>主视窗</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation>牌库编辑</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>游戏厅堂</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation>牌指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation>玩家指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>力量和防御力</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>游戏阶段</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>游戏区域</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation>移动所选牌张</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>查看</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation>移动顶牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation>移动底牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>游戏</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation>抽牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation>聊天室</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation>游戏视窗</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation>从剪贴板载入牌库</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation>游戏录像</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation>检查卡牌更新</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation>连线</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>断开连线</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>全屏</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation>註册...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation>设定...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation>开始离线游戏</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation>观看录像</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation>清除所有筛选项目</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation>清除所选的筛选项目</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation>移除卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation>管理牌组</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation>编辑自定眾令牌...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation>添加卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation>载入牌库...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation>从剪贴板载入牌库</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation>创建新牌库</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation>打开自定图片文件夹</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation>印刷牌库</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation>删除卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation>重置佈局</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation>保存牌库</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation>牌库另存为</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>从剪贴板储藏牌库, 带注释</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation>从剪贴板储藏牌库</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation>从自身档案载入牌库</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation>载入伺服器上的牌库...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation>设定準备开始</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation>切换副牌库锁</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation>增加绿色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation>移除绿色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation>设定绿色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation>增加红色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation>移除红色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation>设定红色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation>增加生命指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation>移除生命指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation>设定生命指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation>增加白色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation>移除白色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation>设定白色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation>增加蓝色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation>移除蓝色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation>设定蓝色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation>增加黑色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation>移除黑色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation>设定黑色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation>增加无色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation>移除无色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation>设定无色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation>增加其他指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation>移除其他指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation>设定其他指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation>增加力量(+1/+0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation>削减力量(-1/-0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>防御移到力量（+1/-1）</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>增加防御(+0/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>削减防御(-0/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>力量移到防御（-1/+1）</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>增加力量和防御(+1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>削减力量和防御(-1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation>设置力量和防御</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation>重置力量和防御</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>重置</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>维持</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>抽牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation>第一主阶段</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation>开始战斗</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>攻击</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>挡格</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>计算损害</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation>战斗结束</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation>第二主阶段</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>完结</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation>下个阶段</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation>下个行动阶段</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation>下一回合</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation>从揭露视窗中隐藏这牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation>横置/重置这牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation>重置全牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
-        <translation>锁定重置状态</translation>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation>反转本牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation>查看卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation>使出本牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation>结附牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation>解除牌结附</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation>复製卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation>派出令牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation>派出所有相关令牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation>再做另外令牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation>记下註解</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation>选择所有在区域的牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation>选择所有横行牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation>选择所有直行牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation>牌库底</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>放逐</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>坟场</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>手牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation>牌库顶</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation>战场，面朝下</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation>战场</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>牌库</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>副牌库</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation>排副多张顶牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation>排副多张底牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation>关闭最近查看</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation>迭区</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation>多张送坟场</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation>多张放逐</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation>找到以下牌前全送迭区</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation>从牌库底抽一张牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation>从牌库底抽超过一张牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation>画箭咀</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation>清除自设箭咀</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation>离开游戏</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation>掷骰</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation>洗牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>再调度</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation>抽一张牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation>抽超过一张牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation>撤销抽牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation>永远显示顶牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation>永远看到顶牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation>视角顺时针转</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation>视角逆时针转</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation>取消聚焦文本框</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation>聚焦聊天</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation>扫清聊天</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation>刷新</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation>跳前</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation>跳后</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation>向前大跳</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation>向后大跳</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation>播放/暂停</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation>切换快进</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/cockatrice/translations/cockatrice_zh-Hant.ts b/cockatrice/translations/cockatrice_zh-Hant.ts
index a9c2a37bf..2ce4cbd53 100644
--- a/cockatrice/translations/cockatrice_zh-Hant.ts
+++ b/cockatrice/translations/cockatrice_zh-Hant.ts
@@ -2,7 +2,7 @@
 <context>
     <name>AbstractCounter</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="82"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="85"/>
         <source>&amp;Set counter...</source>
         <translation>設置指示物為...</translation>
     </message>
@@ -10,12 +10,12 @@
 <context>
     <name>AbstractCounterDialog</name>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="200"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="197"/>
         <source>Set counter</source>
         <translation>設置指示物</translation>
     </message>
     <message>
-        <location filename="src/game/board/abstract_counter.cpp" line="201"/>
+        <location filename="src/game_graphics/board/abstract_counter.cpp" line="198"/>
         <source>New value for counter &apos;%1&apos;:</source>
         <translation>新的指示物數值&apos;%1&apos;：</translation>
     </message>
@@ -23,12 +23,12 @@
 <context>
     <name>AbstractDlgDeckTextEdit</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="26"/>
         <source>&amp;Refresh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="32"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="34"/>
         <source>Parse Set Name and Number (if available)</source>
         <translation type="unfinished"/>
     </message>
@@ -36,79 +36,81 @@
 <context>
     <name>AbstractTabDeckEditor</name>
     <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="216"/>
         <source>Open in new tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="241"/>
         <source>Are you sure?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="277"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="361"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="383"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="299"/>
         <source>Could not open deck at %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="341"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="315"/>
         <source>Could not save remote deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="362"/>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="384"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="368"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="352"/>
         <source>Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="397"/>
+        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="388"/>
         <source>The deck could not be saved.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="504"/>
+        <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"/>
     </message>
+</context>
+<context>
+    <name>AddAnalyticsPanelDialog</name>
     <message>
-        <location filename="src/interface/widgets/tabs/abstract_tab_deck_editor.cpp" line="516"/>
-        <source>No deck was selected to be exported.</source>
+        <location filename="src/interface/widgets/deck_analytics/add_analytics_panel_dialog.cpp" line="10"/>
+        <source>Add Analytics Panel</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AdminNotesDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="293"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="298"/>
         <source>Update Notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="306"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="311"/>
         <source>Admin Notes for %1</source>
         <translation type="unfinished"/>
     </message>
@@ -116,202 +118,253 @@ Please check that the directory is writable and try again.</source>
 <context>
     <name>AllZonesCardAmountWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="35"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="30"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="32"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/all_zones_card_amount_widget.cpp" line="34"/>
+        <source>Tokens</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="445"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="93"/>
         <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="329"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="645"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="661"/>
-        <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.
-
-You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
-
-Are you sure you would like to enable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="668"/>
-        <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.
-
-You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
-
-Are you sure you would like to disable this feature?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="677"/>
-        <source>Confirm Change</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="722"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="399"/>
         <source>Theme settings</source>
         <translation>主題設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="723"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="400"/>
         <source>Current theme:</source>
         <translation>當前主題</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="724"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="401"/>
         <source>Open themes folder</source>
         <translation>打開主題文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="725"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="406"/>
         <source>Home tab background source:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="726"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="407"/>
         <source>Home tab background shuffle frequency:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="727"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="408"/>
         <source>Disabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="729"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="414"/>
         <source>Menu settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="730"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="732"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="424"/>
         <source>Card rendering</source>
         <translation>牌面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="733"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="425"/>
         <source>Display card names on cards having a picture</source>
         <translation>顯示有圖卡牌的名稱</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="734"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="426"/>
         <source>Auto-Rotate cards with sideways layout</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="736"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="738"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="34"/>
+        <source>Light</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="35"/>
+        <source>Dark</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="37"/>
+        <source>System</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="402"/>
+        <source>Active theme palette:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="403"/>
+        <source>Edit theme palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="405"/>
+        <source>Home tab settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="411"/>
+        <source>Styling settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="412"/>
+        <source>Style user list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="418"/>
+        <source>Card printings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="739"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="427"/>
         <source>Scale cards on mouse over</source>
         <translation>卡牌隨指針縮放</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="740"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="428"/>
         <source>Use rounded card corners</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="742"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="431"/>
+        <source>Card layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="743"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="744"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="746"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="745"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="748"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="439"/>
         <source>Card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="752"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="443"/>
         <source>Counter %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="755"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="446"/>
         <source>Hand layout</source>
         <translation>手牌區域佈局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="756"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="447"/>
         <source>Display hand horizontally (wastes space)</source>
         <translation>水平顯示手牌區域 (浪費空間)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="757"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="448"/>
         <source>Enable left justification</source>
         <translation>開啓左對齊</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="759"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="450"/>
         <source>Table grid layout</source>
         <translation>表格佈局</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="760"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="451"/>
         <source>Invert vertical coordinate</source>
         <translation>反轉垂直坐標</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="761"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="452"/>
         <source>Minimum player count for multi-column layout:</source>
         <translation>界面佈局之內能夠容納的玩家欄數量：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="762"/>
+        <location filename="src/interface/widgets/settings_page/appearance_settings_page.cpp" line="429"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation>卡牌上顯示的最大字號</translation>
     </message>
 </context>
+<context>
+    <name>ArchidektApiResponseDeckDisplayWidget</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>BackgroundSources</name>
     <message>
@@ -333,112 +386,112 @@ Are you sure you would like to disable this feature?</source>
 <context>
     <name>BanDialog</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="38"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="39"/>
         <source>ban &amp;user name</source>
         <translation>禁止該用戶</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="42"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="43"/>
         <source>ban &amp;IP address</source>
         <translation>禁止該IP地址</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="46"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="47"/>
         <source>ban client I&amp;D</source>
         <translation>禁止該客户端</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="62"/>
         <source>Ban type</source>
         <translation>禁止類型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="65"/>
         <source>&amp;permanent ban</source>
         <translation>永久禁止</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="66"/>
         <source>&amp;temporary ban</source>
         <translation>暫時禁止</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="67"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="69"/>
         <source>&amp;Days:</source>
         <translation>天：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="73"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="75"/>
         <source>&amp;Hours:</source>
         <translation>小時：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="81"/>
         <source>&amp;Minutes:</source>
         <translation>分鐘：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="94"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="96"/>
         <source>Duration of the ban</source>
         <translation>持續時長</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="97"/>
+        <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>請輸入禁止原因.
 此項為管理緣由而保存並且對於這位被禁止的用戶不可見.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="102"/>
+        <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>請輸入對於被禁止用戶可見的禁止原因</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="105"/>
+        <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>修改該用戶在所有房間中的所有消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="107"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="109"/>
         <source>&amp;OK</source>
         <translation>確認</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="112"/>
         <source>&amp;Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="131"/>
         <source>Ban user from server</source>
         <translation>禁止此用戶</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="211"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="219"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="226"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="234"/>
+        <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>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="212"/>
+        <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>你必須選擇姓名、IP、客户端或任意多選組合來執行禁止操作。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="220"/>
+        <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>在禁用姓名時必須填寫一個姓名。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="227"/>
+        <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>在禁用IP時必須填寫一個IP。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="235"/>
+        <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>在禁用客戶端ID時必須填寫一個客戶端ID。</translation>
     </message>
@@ -446,152 +499,221 @@ 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="210"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="211"/>
         <source>Beta</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="236"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="237"/>
         <source>No reply received from the release update server.</source>
         <translation>未收到更新伺服器的回應。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="245"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="246"/>
         <source>Invalid reply received from the release update server.</source>
         <translation>收到更新伺服器的無效回應</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="278"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="280"/>
         <source>No reply received from the file update server.</source>
         <translation>未收到文件更新伺服器的回應</translation>
     </message>
 </context>
+<context>
+    <name>CardArtPreviewWidget</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="65"/>
+        <source>No card selected</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CardArtRulesModel</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="65"/>
+        <source>Card</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="67"/>
+        <source>ProviderId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="69"/>
+        <source>Mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="71"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardDatabaseModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="66"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="68"/>
         <source>Name</source>
         <translation>名稱</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="68"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="70"/>
         <source>Sets</source>
         <translation>系列</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="70"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="72"/>
         <source>Mana cost</source>
         <translation>魔法力費用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="72"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="74"/>
         <source>Card type</source>
         <translation>卡牌類別</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="74"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="76"/>
         <source>P/T</source>
         <translation>力量/防禦力</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp" line="76"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_database_model.cpp" line="78"/>
         <source>Color(s)</source>
         <translation>顏色</translation>
     </message>
 </context>
+<context>
+    <name>CardDatabaseView</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="135"/>
+        <source>Add to Deck</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="136"/>
+        <source>Add to Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="137"/>
+        <source>Select Printing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="145"/>
+        <source>Show on EDHRec (Commander)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="148"/>
+        <source>Show on EDHRec (Card)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/card_database_view.cpp" line="152"/>
+        <source>Show Related cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardFilter</name>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="46"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="46"/>
         <source>AND</source>
         <comment>Logical conjunction operator used in card filter</comment>
         <translation>和</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="48"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="48"/>
         <source>OR</source>
         <comment>Logical disjunction operator used in card filter</comment>
         <translation>或</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="50"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="50"/>
         <source>AND NOT</source>
         <comment>Negated logical conjunction operator used in card filter</comment>
         <translation>和不是</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="52"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="52"/>
         <source>OR NOT</source>
         <comment>Negated logical disjunction operator used in card filter</comment>
         <translation>或不是</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="62"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="62"/>
         <source>Name</source>
         <translation>名稱</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="64"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="64"/>
+        <source>Name (Exact)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="66"/>
         <source>Type</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="66"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="68"/>
         <source>Color</source>
         <translation>顏色</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="68"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="70"/>
         <source>Text</source>
         <translation>文本</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="70"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="72"/>
         <source>Set</source>
         <translation>系列</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="72"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="74"/>
         <source>Mana Cost</source>
         <translation>魔法力費用</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="74"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="76"/>
         <source>Mana Value</source>
         <translation>魔法力值</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="76"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="78"/>
         <source>Rarity</source>
         <translation>稀有度</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="78"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="80"/>
         <source>Power</source>
         <translation>力量</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="80"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="82"/>
         <source>Toughness</source>
         <translation>防禦力</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="82"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="84"/>
         <source>Loyalty</source>
         <translation>忠誠</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="84"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="86"/>
         <source>Format</source>
         <translation>賽制</translation>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="86"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="88"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/filters/filter_card.cpp" line="88"/>
+        <location filename="../libcockatrice_filters/libcockatrice/filters/filter_card.cpp" line="90"/>
         <source>Sub Type</source>
         <translation type="unfinished"/>
     </message>
@@ -599,22 +721,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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -622,22 +744,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="367"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="373"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="412"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="418"/>
         <source>Add card to deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="425"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
         <source>Mainboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="431"/>
+        <location filename="src/interface/widgets/cards/card_info_picture_widget.cpp" line="437"/>
         <source>Sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -650,12 +772,22 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="71"/>
+        <source>Collector Number:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="86"/>
         <source>Related cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/cards/card_info_text_widget.cpp" line="102"/>
         <source>Unknown card:</source>
         <translation type="unfinished"/>
     </message>
@@ -663,132 +795,150 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardMenu</name>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="275"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="312"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="306"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="490"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="339"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="395"/>
         <source>View related cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="387"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="442"/>
         <source>Token: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="404"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="459"/>
         <source>All tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="427"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="483"/>
         <source>&amp;Select All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="428"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="484"/>
         <source>S&amp;elect Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="429"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="485"/>
         <source>S&amp;elect Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="431"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="487"/>
         <source>&amp;Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="432"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="488"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="433"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="489"/>
         <source>Play &amp;Face Down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="436"/>
-        <source>Toggle &amp;normal untapping</source>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="493"/>
+        <source>Skip &amp;untapping</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="438"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="441"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="498"/>
         <source>&amp;Peek at card face</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="442"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="499"/>
         <source>&amp;Clone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="443"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="500"/>
         <source>Attac&amp;h to card...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="444"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="501"/>
         <source>Unattac&amp;h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="445"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="502"/>
         <source>&amp;Draw arrow...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="446"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="503"/>
         <source>&amp;Set annotation...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="448"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="504"/>
+        <source>Reduce life by power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="506"/>
         <source>Ca&amp;rd counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="453"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="511"/>
         <source>&amp;Add counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="456"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="514"/>
         <source>&amp;Remove counter (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/card_menu.cpp" line="459"/>
+        <location filename="src/game_graphics/player/menu/card_menu.cpp" line="517"/>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>CardPictureLoaderCacheMethod</name>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="24"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/card_picture_loader/card_picture_loader_cache_method.h" line="25"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>CardSizeWidget</name>
     <message>
-        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="22"/>
+        <location filename="src/interface/widgets/cards/card_size_widget.cpp" line="20"/>
         <source>Card Size</source>
         <translation type="unfinished"/>
     </message>
@@ -796,133 +946,133 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CardZoneLogic</name>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>their hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="170"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="184"/>
         <source>%1&apos;s hand</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="174"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="188"/>
         <source>their library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="175"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="189"/>
         <source>%1&apos;s library</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="177"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="191"/>
         <source>of their library</source>
         <comment>top cards of zone,</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="178"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="192"/>
         <source>of %1&apos;s library</source>
         <comment>top cards of zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="180"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="194"/>
         <source>their library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="181"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="195"/>
         <source>%1&apos;s library</source>
         <comment>reveal zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>their library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="183"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="197"/>
         <source>%1&apos;s library</source>
         <comment>shuffle</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>their library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="185"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="199"/>
         <source>%1&apos;s library</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>their graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="188"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="202"/>
         <source>%1&apos;s graveyard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>their exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="190"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="204"/>
         <source>%1&apos;s exile</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="194"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="208"/>
         <source>their sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="195"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="209"/>
         <source>%1&apos;s sideboard</source>
         <comment>look at zone</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="197"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="211"/>
         <source>their sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="198"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="212"/>
         <source>%1&apos;s sideboard</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="203"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="217"/>
         <source>their custom zone &apos;%1&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/logic/card_zone_logic.cpp" line="204"/>
+        <location filename="src/game/zones/card_zone_logic.cpp" line="218"/>
         <source>%1&apos;s custom zone &apos;%2&apos;</source>
         <comment>nominative</comment>
         <translation type="unfinished"/>
@@ -931,7 +1081,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml3Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp" line="77"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
@@ -939,29 +1089,470 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>CockatriceXml4Parser</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="72"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp" line="80"/>
         <source>Parse error at line %1 col %2:</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ColorButton</name>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="10"/>
+        <source>Click to pick a color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/color_button.cpp" line="26"/>
+        <source>Pick colour</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConnectionController</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="142"/>
+        <source>Banned by moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="145"/>
+        <source>Expected end time: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="147"/>
+        <source>This ban lasts indefinitely.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="155"/>
+        <source>Scheduled server shutdown.</source>
+        <translation type="unfinished"/>
+    </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="538"/>
+        <source>Invalid username.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="170"/>
+        <source>Connection closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message numerus="yes">
+        <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>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="181"/>
+        <source>Scheduled server shutdown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="219"/>
+        <source>Failed Login</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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="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="420"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="285"/>
+        <source>Account activation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="299"/>
+        <source>Server Full</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="306"/>
+        <source>Unknown login error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+        <source>Registration denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="353"/>
+        <source>Password too short.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="381"/>
+        <source>Unknown registration error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="393"/>
+        <source>Account activation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="400"/>
+        <source>Socket error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="406"/>
+        <source>Server timeout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="430"/>
+        <source>Registration accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="440"/>
+        <source>Account activation accepted.
+Will now login.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="446"/>
+        <source>Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="447"/>
+        <source>This server supports additional features that your client doesn'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.
+
+To update your client, go to Help -&gt; Check for Updates.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="500"/>
+        <source>Connecting to %1...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="505"/>
+        <source>Registering to %1 as %2...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="509"/>
+        <source>Disconnected</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="513"/>
+        <source>Connected, logging in at %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="542"/>
+        <source>Your username must respect these rules:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="544"/>
+        <source>is %1 - %2 characters long</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="545"/>
+        <source>can %1 contain lowercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="547"/>
+        <source>can %1 contain uppercase characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="550"/>
+        <source>can %1 contain numeric characters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/network/connection_controller/remote_connection_controller.cpp" line="553"/>
+        <source>can contain the following punctuation: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
 <context>
     <name>CustomZoneMenu</name>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="18"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="19"/>
         <source>C&amp;ustom Zones</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="23"/>
-        <location filename="src/game/player/menu/custom_zone_menu.cpp" line="37"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="24"/>
+        <location filename="src/game_graphics/player/menu/custom_zone_menu.cpp" line="38"/>
         <source>View custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckAnalyticsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="70"/>
+        <source>Add Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="71"/>
+        <source>Remove Panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="72"/>
+        <source>Save Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="73"/>
+        <source>Load Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/deck_analytics_widget.cpp" line="74"/>
+        <source>Include Sideboard</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeckEditorCardDatabaseDockWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp" line="46"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckEditorCardInfoDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_card_info_dock_widget.cpp" line="43"/>
         <source>Card Info</source>
         <translation type="unfinished"/>
     </message>
@@ -969,47 +1560,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDatabaseDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="37"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="204"/>
-        <source>Add to Deck</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="205"/>
-        <source>Add to Sideboard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="207"/>
-        <source>Select Printing</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="211"/>
-        <source>Show on EDHRec (Commander)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="215"/>
-        <source>Show on EDHRec (Card)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="223"/>
-        <source>Show Related cards</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="259"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp" line="260"/>
+        <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"/>
     </message>
@@ -1017,87 +1578,97 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorDeckDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="92"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="131"/>
+        <source>Loading Database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="153"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="109"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="175"/>
         <source>Main Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="110"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="176"/>
         <source>Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="111"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="177"/>
         <source>Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="582"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="721"/>
         <source>Select Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="599"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="737"/>
         <source>Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="601"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="739"/>
         <source>Deck &amp;name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="602"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="603"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="604"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="742"/>
         <source>Show tags selection menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="605"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="743"/>
         <source>&amp;Comments:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="606"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="744"/>
         <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="607"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="745"/>
+        <source>Format:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="747"/>
         <source>Hash:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="609"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="749"/>
         <source>&amp;Increment number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="610"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="750"/>
         <source>&amp;Decrement number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="611"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="751"/>
         <source>&amp;Remove row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp" line="612"/>
+        <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"/>
     </message>
@@ -1123,114 +1694,114 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorMenu</name>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="151"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
         <source>&amp;Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="152"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
         <source>&amp;New deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="153"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
         <source>&amp;Load deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="154"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
         <source>Load recent deck...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="155"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
         <source>Clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="156"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
         <source>&amp;Save deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="157"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="158"/>
         <source>Save deck &amp;as...</source>
         <translation type="unfinished"/>
     </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="160"/>
         <source>Load deck from cl&amp;ipboard...</source>
         <translation type="unfinished"/>
     </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="162"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </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="166"/>
+        <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"/>
     </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="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="165"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="166"/>
         <source>Save deck to clipboard</source>
         <translation type="unfinished"/>
     </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="168"/>
         <source>Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="170"/>
         <source>Not Annotated (No set info)</source>
         <translation type="unfinished"/>
     </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="172"/>
         <source>&amp;Print deck...</source>
         <translation type="unfinished"/>
     </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="174"/>
         <source>Load deck from online service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="174"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="175"/>
         <source>&amp;Send deck to online service</source>
         <translation type="unfinished"/>
     </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="176"/>
         <source>Create decklist (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="176"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="177"/>
         <source>Create decklist (decklist.xyz)</source>
         <translation type="unfinished"/>
     </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="178"/>
         <source>Analyze deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="178"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="179"/>
         <source>Analyze deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="180"/>
+        <location filename="src/interface/widgets/menus/deck_editor_menu.cpp" line="181"/>
         <source>&amp;Close</source>
         <translation type="unfinished"/>
     </message>
@@ -1238,7 +1809,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorPrintingSelectorDockWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="40"/>
+        <location filename="src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp" line="49"/>
         <source>Printing Selector</source>
         <translation type="unfinished"/>
     </message>
@@ -1246,194 +1817,171 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1228"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1291"/>
+        <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>更新預覽</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Success</source>
         <translation>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1122"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="115"/>
         <source>Download URLs have been reset.</source>
         <translation>下載URL已重置。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1158"/>
-        <source>Downloaded card pictures have been reset.</source>
-        <translation>下載的卡牌圖片已被重置。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>Error</source>
-        <translation>錯誤</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1161"/>
-        <source>One or more downloaded card pictures could not be cleared.</source>
-        <translation>1個或多個卡牌圖片未能被清除。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="121"/>
         <source>Add URL</source>
         <translation>添加URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1168"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
+        <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>URL:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1188"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1293"/>
+        <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>編輯URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1285"/>
-        <source>Network Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1287"/>
-        <source>Redirect Cache TTL:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1288"/>
-        <source>How long cached redirects for urls are valid for.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1289"/>
-        <source>Picture Cache Size:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1292"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="238"/>
         <source>Add New URL</source>
         <translation>添加新的URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1294"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="240"/>
         <source>Remove URL</source>
         <translation>移除URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1295"/>
-        <source>Day(s)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1217"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="170"/>
         <source>Updating...</source>
         <translation>更新中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1247"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="200"/>
         <source>Choose path</source>
         <translation>選擇路徑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1273"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="226"/>
         <source>URL Download Priority</source>
         <translation>URL下載優先級</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1274"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="227"/>
         <source>Spoilers</source>
         <translation>預覽</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1275"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="228"/>
         <source>Download Spoilers Automatically</source>
         <translation>自動下載預覽</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1276"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="229"/>
         <source>Spoiler Location:</source>
         <translation>預覽位置:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1277"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="230"/>
         <source>Last Change</source>
         <translation>最近的變更</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1278"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="231"/>
         <source>Spoilers download automatically on launch</source>
         <translation>自動下載預覽運行</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1279"/>
+        <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>按下按鈕手動更新而不重新啓動</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1280"/>
+        <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>手動更新完成之前，請勿關閉設置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1281"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="234"/>
         <source>Download card pictures on the fly</source>
         <translation>即時下載卡牌圖片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1282"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="235"/>
         <source>How to add a custom URL</source>
         <translation>如何添加自定義URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1283"/>
-        <source>Delete Downloaded Images</source>
-        <translation>刪除已下載的圖片</translation>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1284"/>
+        <location filename="src/interface/widgets/settings_page/deck_editor_settings_page.cpp" line="236"/>
         <source>Reset Download URLs</source>
         <translation>重置用於下載的URL</translation>
     </message>
+</context>
+<context>
+    <name>DeckListHistoryManagerWidget</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1286"/>
-        <source>On-disk cache for downloaded pictures</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="56"/>
+        <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1290"/>
-        <source>In-memory cache for pictures not currently on screen</source>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="57"/>
+        <source>Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="58"/>
+        <source>Undo/Redo history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="71"/>
+        <source>[redo] </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp" line="88"/>
+        <source>[undo] </source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DeckListModel</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="202"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="211"/>
         <source>Count</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="206"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="215"/>
         <source>Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="208"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="217"/>
         <source>Number</source>
         <translation>數量</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="210"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="219"/>
         <source>Provider ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp" line="204"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp" line="213"/>
         <source>Card</source>
         <translation>卡牌</translation>
     </message>
@@ -1441,12 +1989,12 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckLoader</name>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>Common deck formats (%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp" line="21"/>
+        <location filename="src/interface/deck_loader/deck_loader.cpp" line="28"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1454,17 +2002,17 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewColorIdentityFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -1472,7 +2020,7 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewDeckTagsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="58"/>
+        <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"/>
     </message>
@@ -1480,62 +2028,62 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewTagDialog</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="102"/>
+        <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"/>
     </message>
     <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="102"/>
         <source>Manage your deck tags. Check or uncheck tags as needed, or add new ones:</source>
         <translation type="unfinished"/>
     </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="103"/>
         <source>Add a new tag (e.g., Aggro️)</source>
         <translation type="unfinished"/>
     </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="104"/>
         <source>Add Tag</source>
         <translation type="unfinished"/>
     </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="105"/>
         <source>Filter tags...</source>
         <translation type="unfinished"/>
     </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="106"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </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="107"/>
         <source>Edit default tags</source>
         <translation type="unfinished"/>
     </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="108"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="141"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="142"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="150"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp" line="151"/>
+        <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"/>
     </message>
@@ -1543,98 +2091,156 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckPreviewWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="59"/>
         <source>Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="323"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="398"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="330"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="405"/>
         <source>Rename Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="332"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="334"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="409"/>
         <source>Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="336"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="338"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
         <source>Not Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="340"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="345"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="420"/>
         <source>Rename File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="347"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="422"/>
         <source>Delete File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="362"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="437"/>
         <source>Set Banner Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="380"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="400"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="413"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="488"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="503"/>
         <source>Delete file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="427"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="435"/>
+        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp" line="511"/>
         <source>Delete failed</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>DeckStateManager</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="139"/>
+        <source>Set banner card to %1 (%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="152"/>
+        <source>Tags changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="164"/>
+        <source>Set format to %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="182"/>
+        <source>Added (%1): %2 (%3) %4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="282"/>
+        <source>Removed &quot;%1&quot; (all copies)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="306"/>
+        <source>%1 1 × &quot;%2&quot; (%3)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Added</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/deck_state_manager.cpp" line="307"/>
+        <source>Removed</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DeckStatsInterface</name>
     <message>
@@ -1652,74 +2258,74 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckViewContainer</name>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="127"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="123"/>
         <source>Load deck...</source>
         <translation>讀取套牌...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="128"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="124"/>
         <source>Load remote deck...</source>
         <translation>載入伺服器上的套牌...</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="129"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="125"/>
         <source>Load from clipboard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="130"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="126"/>
         <source>Load from website...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="131"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="127"/>
         <source>Unload deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="132"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="128"/>
         <source>Ready to start</source>
         <translation>準備好開始</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="133"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="129"/>
         <source>Force start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="201"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="197"/>
         <source>Sideboard unlocked</source>
         <translation>解鎖備牌</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="203"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="199"/>
         <source>Sideboard locked</source>
         <translation>鎖定備牌</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <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>錯誤</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="272"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="269"/>
         <source>The selected file could not be loaded.</source>
         <translation>此文件無法被載入</translation>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="284"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="281"/>
         <source>Deck is greater than maximum file size.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="347"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/deckview/deck_view_container.cpp" line="349"/>
+        <location filename="src/game_graphics/deckview/deck_view_container.cpp" line="346"/>
         <source>Cockatrice</source>
         <translation type="unfinished"/>
     </message>
@@ -1752,143 +2358,143 @@ This will kick all non-ready players from the game.</source>
         <translation>下載中...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="20"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="19"/>
         <source>Known Hosts</source>
         <translation>已知主機：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="24"/>
         <source>Delete the currently selected saved server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="33"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="32"/>
         <source>Refresh the server list with known public servers</source>
         <translation>從已知的伺服器更新伺服器列表</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="44"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="43"/>
         <source>New Host</source>
         <translation>新主機</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="45"/>
         <source>Name:</source>
         <translation>名稱:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="50"/>
         <source>&amp;Host:</source>
         <translation>主機：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="55"/>
         <source>&amp;Port:</source>
         <translation>端口：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="60"/>
         <source>Player &amp;name:</source>
         <translation>玩家名字：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="65"/>
         <source>P&amp;assword:</source>
         <translation>密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="72"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="71"/>
         <source>&amp;Save password</source>
         <translation>記住密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="73"/>
         <source>A&amp;uto connect</source>
         <translation>自動連接</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="75"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="74"/>
         <source>Automatically connect to the most recent login when Cockatrice opens</source>
         <translation>當Cockatrice啓動時自動連接到最近的登錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="91"/>
+        <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>如果你在連接或者註冊上遇到了任何麻煩，可以聯繫伺服器的工作人員獲得幫助。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="93"/>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="288"/>
+        <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>網頁</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="103"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="102"/>
         <source>Reset Password</source>
         <translation>重設密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="107"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="106"/>
         <source>Forgot password?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="110"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="109"/>
         <source>&amp;Connect</source>
         <translation>連接</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="134"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="133"/>
         <source>Server</source>
         <translation>伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="153"/>
         <source>Login</source>
         <translation>登錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="157"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="156"/>
         <source>Server Contact</source>
         <translation>聯繫伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="170"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="169"/>
         <source>Connect to Server</source>
         <translation>連接伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="302"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="295"/>
         <source>Server URL</source>
         <translation>伺服器URL</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="305"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="298"/>
         <source>Communication Port</source>
         <translation>通信端口</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="310"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="303"/>
         <source>Unique Server Name</source>
         <translation>唯一的伺服器名稱</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>Connection Warning</source>
         <translation>連接警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="336"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="329"/>
         <source>You need to name your new connection profile.</source>
         <translation>你需要給連接配置文件命名。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>Connect Warning</source>
         <translation>連接警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="351"/>
+        <location filename="src/interface/widgets/dialogs/dlg_connect.cpp" line="344"/>
         <source>The player name can&apos;t be empty.</source>
         <translation>玩家名稱不能為空白</translation>
     </message>
@@ -1896,117 +2502,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>記住設定</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>描述：</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>玩家：</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>綜合</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>房間類型</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>密碼：</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>只容許好友加入</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>只容許註冊用戶加入</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>加入條件</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>允許觀看者</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>觀看者需要密碼</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>觀看者可以聊天</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>觀看者可見手牌</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>以旁觀者的身份創建遊戲</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>觀看者</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="106"/>
+        <source>Create game as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="118"/>
         <source>Game setup options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="180"/>
         <source>&amp;Clear</source>
         <translation>清除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="182"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="186"/>
         <source>Create game</source>
         <translation>創建一個房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="228"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="233"/>
         <source>Game information</source>
         <translation>房間信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/dialogs/dlg_create_game.cpp" line="323"/>
         <source>Server error.</source>
         <translation>伺服器錯誤.</translation>
     </message>
@@ -2014,97 +2625,97 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgCreateToken</name>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="32"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="31"/>
         <source>&amp;Name:</source>
         <translation>名稱：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="33"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="32"/>
         <source>Token</source>
         <translation>衍生物</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="43"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="42"/>
         <source>C&amp;olor:</source>
         <translation>顏色：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="45"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="44"/>
         <source>white</source>
         <translation>白</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="46"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="45"/>
         <source>blue</source>
         <translation>藍</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="47"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="46"/>
         <source>black</source>
         <translation>黑</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="48"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="47"/>
         <source>red</source>
         <translation>紅</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="49"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="48"/>
         <source>green</source>
         <translation>綠</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="50"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="49"/>
         <source>multicolor</source>
         <translation>多色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="51"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="50"/>
         <source>colorless</source>
         <translation>無色</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="54"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="53"/>
         <source>&amp;P/T:</source>
         <translation>力量/防禦力：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="59"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="58"/>
         <source>&amp;Annotation:</source>
         <translation>註釋：</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="64"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="63"/>
         <source>&amp;Destroy token when it leaves the table</source>
         <translation>此衍生物離場時會被摧毀</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="67"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="66"/>
         <source>Create face-down (Only hides name)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="82"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="81"/>
         <source>Token data</source>
         <translation>衍生物數據資料</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="89"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="88"/>
         <source>Show &amp;all tokens</source>
         <translation>顯示所有衍生物</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="91"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="90"/>
         <source>Show tokens from this &amp;deck</source>
         <translation>顯示此套牌所使用的衍生物</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="133"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="129"/>
         <source>Choose token from list</source>
         <translation>從列表中選擇衍生物</translation>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_create_token.cpp" line="151"/>
+        <location filename="src/game_graphics/dialogs/dlg_create_token.cpp" line="147"/>
         <source>Create token</source>
         <translation>派出一個衍生物</translation>
     </message>
@@ -2112,53 +2723,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="45"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
         <source>Edit Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="48"/>
         <source>Add</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="47"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="49"/>
         <source>Confirm</source>
         <translation type="unfinished"/>
     </message>
     <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="50"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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="51"/>
         <source>Enter a tag and press Enter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="69"/>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="117"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Invalid Input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="89"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="91"/>
         <source>Tag name cannot be empty!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>Duplicate Tag</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="100"/>
+        <location filename="src/interface/widgets/dialogs/dlg_default_tags_editor.cpp" line="103"/>
         <source>This tag already exists.</source>
         <translation type="unfinished"/>
     </message>
@@ -2166,40 +2777,40 @@ This will kick all non-ready players from the game.</source>
 <context>
     <name>DlgEditAvatar</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="16"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="55"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="15"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="54"/>
         <source>No image chosen.</source>
         <translation>未選擇圖像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="20"/>
         <source>To change your avatar, choose a new image.
 To remove your current avatar, confirm without choosing a new image.</source>
         <translation>要更改你的頭像，請選擇一個新圖片。
 要清除你當前的頭像，可以不用選擇新頭像直接確認。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="23"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="22"/>
         <source>Browse...</source>
         <translation>瀏覽...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="40"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="39"/>
         <source>Change avatar</source>
         <translation>改變頭像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Open Image</source>
         <translation>打開圖片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="52"/>
         <source>Image Files (*.png *.jpg *.bmp)</source>
         <translation>圖片文件（*.png *.jpg *.bmp格式）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_avatar.cpp" line="63"/>
         <source>Invalid image chosen.</source>
         <translation>所選圖片不可用。</translation>
     </message>
@@ -2207,17 +2818,17 @@ To remove your current avatar, confirm without choosing a new image.</source>
 <context>
     <name>DlgEditDeckInClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="144"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="143"/>
         <source>Edit deck in clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="176"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="172"/>
         <source>Invalid deck list.</source>
         <translation type="unfinished"/>
     </message>
@@ -2225,38 +2836,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="13"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="14"/>
         <source>Old password:</source>
         <translation>舊密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="26"/>
         <source>New password:</source>
         <translation>新密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="32"/>
         <source>Confirm new password:</source>
         <translation>確認新密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="54"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="55"/>
         <source>Change password</source>
         <translation>修改密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <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>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="64"/>
         <source>Your password is too short.</source>
         <translation>你的密碼太短。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="66"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_password.cpp" line="67"/>
         <source>The new passwords don&apos;t match.</source>
         <translation>兩次輸入的新密碼不一致。</translation>
     </message>
@@ -2264,93 +2875,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="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="26"/>
         <source>&amp;Name:</source>
         <translation>名稱：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="32"/>
         <source>C&amp;olor:</source>
         <translation>顏色：</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="34"/>
         <source>white</source>
         <translation>白</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="35"/>
         <source>blue</source>
         <translation>藍</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="36"/>
         <source>black</source>
         <translation>黑</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="37"/>
         <source>red</source>
         <translation>紅</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="38"/>
         <source>green</source>
         <translation>綠</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="39"/>
         <source>multicolor</source>
         <translation>多色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="40"/>
         <source>colorless</source>
         <translation>無色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="46"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="44"/>
         <source>&amp;P/T:</source>
         <translation>力量/防禦力：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="52"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="50"/>
         <source>&amp;Annotation:</source>
         <translation>註釋：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="68"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="66"/>
         <source>Token data</source>
         <translation>衍生物數據資料</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="94"/>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <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>添加衍生物</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="97"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="95"/>
         <source>Remove token</source>
         <translation>刪除衍生物</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="122"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="120"/>
         <source>Edit custom tokens</source>
         <translation>編輯自定義衍生物</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="153"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_tokens.cpp" line="151"/>
         <source>Please enter the name of the token:</source>
         <translation>請輸入衍生物名稱:</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>錯誤</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>所選擇的名字與現有的卡牌或衍生物有衝突。
@@ -2375,12 +2986,12 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>未定義</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="35"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="36"/>
         <source>Real name:</source>
         <translation>真實姓名：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_edit_user.cpp" line="59"/>
         <source>Edit user profile</source>
         <translation>編輯用戶資料</translation>
     </message>
@@ -2418,112 +3029,113 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
         <translation>2小時</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="27"/>
         <source>Hide &apos;buddies only&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="28"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="30"/>
         <source>Hide full games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="33"/>
         <source>Hide games that have started</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="34"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="36"/>
         <source>Hide password protected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="39"/>
         <source>Hide &apos;ignored user&apos; games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="40"/>
-        <source>Hide games not created by buddy</source>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="42"/>
+        <source>Hide games not created by buddies</source>
+        <oldsource>Hide games not created by buddy</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="45"/>
         <source>Hide games with forced open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="51"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="53"/>
         <source>&amp;Newer than:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="56"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="58"/>
         <source>Game &amp;description:</source>
         <translation>房間描述：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="60"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="62"/>
         <source>&amp;Creator name:</source>
         <translation>創建者名字:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="70"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="72"/>
         <source>General</source>
         <translation>綜合</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="86"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="88"/>
         <source>&amp;Game types</source>
         <translation>房間類型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="91"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="94"/>
         <source>at &amp;least:</source>
         <translation>至少：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="98"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="101"/>
         <source>at &amp;most:</source>
         <translation>最多：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="111"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="114"/>
         <source>Maximum player count</source>
         <translation>可容納玩家數量</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="123"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
         <source>Restrictions</source>
         <translation>限制</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="126"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="129"/>
         <source>Show games only if &amp;spectators can watch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="131"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="134"/>
         <source>Show spectator password p&amp;rotected games</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="133"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="136"/>
         <source>Show only if spectators can ch&amp;at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="135"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="138"/>
         <source>Show only if spectators can see &amp;hands</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="148"/>
         <source>Spectators</source>
         <translation>觀看者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="178"/>
+        <location filename="src/interface/widgets/dialogs/dlg_filter_games.cpp" line="181"/>
         <source>Filter games</source>
         <translation>過濾房間</translation>
     </message>
@@ -2531,52 +3143,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>重設密碼驗證警告</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"/>
     </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"/>
     </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>主機：</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>端口：</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>玩家名字：</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>電子郵箱：</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>重設密碼驗證</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>重設密碼驗證錯誤</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>電郵不能為空白</translation>
     </message>
@@ -2584,37 +3196,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"/>
     </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>主機：</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>端口：</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>玩家名字：</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>重設密碼請求</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>重設密碼錯誤</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>玩家名稱不能為空白</translation>
     </message>
@@ -2622,86 +3234,86 @@ 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>重設密碼警告</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"/>
     </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"/>
     </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>主機：</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>端口：</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>玩家名字：</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>驗證碼</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>新密碼：</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"/>
     </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>玩家名稱不能為空白</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"/>
     </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>驗證碼不能為空白</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>新密碼不能為空白</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>錯誤</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>你的密碼太短。</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>密碼不一致</translation>
     </message>
@@ -2717,17 +3329,17 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromClipboard</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="112"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="114"/>
         <source>Load deck from clipboard</source>
         <translation>從剪貼板讀取套牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="130"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp" line="129"/>
         <source>Invalid deck list.</source>
         <translation>無效的牌表.</translation>
     </message>
@@ -2735,43 +3347,43 @@ Make sure to enable the &apos;Token&apos; set in the &quot;Manage sets&quot; dia
 <context>
     <name>DlgLoadDeckFromWebsite</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="43"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="45"/>
         <source>Paste a link to a decklist site here to import it.
 (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="62"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="113"/>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="64"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="116"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="127"/>
         <source>Load Deck from Website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="63"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="65"/>
         <source>No parser available for this deck provider.
  (Archidekt, Deckstats, Moxfield, and TappedOut are supported.)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="78"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="81"/>
         <source>Network error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="95"/>
         <source>Received empty deck data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="114"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="117"/>
         <source>Failed to parse deck data: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="125"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp" line="128"/>
         <source>The provided URL is not recognized as a valid deck URL.
 Valid deck URLs look like this:
 
@@ -2785,45 +3397,78 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgLoadRemoteDeck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_load_remote_deck.cpp" line="25"/>
         <source>Load deck</source>
         <translation>讀取套牌</translation>
     </message>
 </context>
+<context>
+    <name>DlgLocalGameOptions</name>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="15"/>
+        <source>Players:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="26"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="29"/>
+        <source>Starting life total:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="40"/>
+        <source>Game setup options</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="43"/>
+        <source>Remember settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_local_game_options.cpp" line="62"/>
+        <source>Local game options</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>DlgMoveTopCardsUntil</name>
     <message>
-        <location filename="src/game/dialogs/dlg_move_top_cards_until.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_move_top_cards_until.cpp" line="17"/>
         <source>Card name (or search expressions):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
     <message>
-        <location filename="src/game/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"/>
     </message>
@@ -2831,53 +3476,53 @@ https://tappedout.net/mtg-decks/your-deck-name/</source>
 <context>
     <name>DlgRegister</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="17"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="16"/>
         <source>Enter your information and the information of the server you'd like to register to.
 Your email will be used to verify your account.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="21"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="20"/>
         <source>&amp;Host:</source>
         <translation>主機：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="26"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="25"/>
         <source>&amp;Port:</source>
         <translation>端口：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="31"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="30"/>
         <source>Player &amp;name:</source>
         <translation>玩家名字：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="35"/>
         <source>P&amp;assword:</source>
         <translation>密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="41"/>
         <source>Password (again):</source>
         <translation>(再次)輸入密碼：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="48"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="47"/>
         <source>Email:</source>
         <translation>電子郵箱：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="53"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="52"/>
         <source>Email (again):</source>
         <translation>(再次)輸入電郵：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="58"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="57"/>
         <source>Country:</source>
         <translation>國家：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="61"/>
+        <location filename="src/interface/widgets/dialogs/dlg_register.cpp" line="60"/>
         <source>Undefined</source>
         <translation>未定義</translation>
     </message>
@@ -2923,17 +3568,17 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgRollDice</name>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="12"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="12"/>
         <source>Number of sides:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="19"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="19"/>
         <source>Number of dice:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/dialogs/dlg_roll_dice.cpp" line="40"/>
+        <location filename="src/game_graphics/dialogs/dlg_roll_dice.cpp" line="40"/>
         <source>Roll Dice</source>
         <translation type="unfinished"/>
     </message>
@@ -2941,40 +3586,55 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSelectSetForCards</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="137"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="140"/>
         <source>Unmodified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
         <source>Modified Cards:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
         <source>Check Sets to enable them. Drag-and-Drop to reorder them and change their priority. Cards will use the printing of the highest priority enabled set.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="141"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="144"/>
         <source>Clear all set information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="145"/>
         <source>Set all to preferred</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="182"/>
+        <source>Bulk modified printings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="189"/>
+        <source>Cleared all printing information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp" line="198"/>
+        <source>Set all printings to preferred.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1861"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="159"/>
         <source>Unknown Error loading card database</source>
         <translation>讀取卡牌數據庫時出現未知錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1869"/>
+        <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
@@ -2991,7 +3651,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌資料庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1875"/>
+        <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
@@ -3008,7 +3668,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌資料庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1881"/>
+        <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
@@ -3017,7 +3677,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1887"/>
+        <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>
@@ -3026,7 +3686,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌數據庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1891"/>
+        <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>
@@ -3035,7 +3695,7 @@ Would you like to change your database location setting?</source>
 你想要重新設置卡牌資料庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1895"/>
+        <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
@@ -3044,59 +3704,64 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1903"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1913"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1923"/>
+        <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>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1914"/>
+        <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>你的套牌路徑無效。你想要重新設置正確的路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1924"/>
+        <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>你想要重新設置卡牌數據庫路徑嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1936"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="234"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1938"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="236"/>
         <source>General</source>
         <translation>常規</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1939"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="237"/>
         <source>Appearance</source>
         <translation>外觀</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1940"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="238"/>
         <source>User Interface</source>
         <translation>用戶界面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1941"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="239"/>
+        <source>Storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="240"/>
         <source>Card Sources</source>
         <translation>卡牌的來源</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1942"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="241"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1943"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="242"/>
         <source>Sound</source>
         <translation>聲音</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1944"/>
+        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="243"/>
         <source>Shortcuts</source>
         <translation>快捷鍵</translation>
     </message>
@@ -3104,39 +3769,39 @@ Would you like to change your database location setting?</source>
 <context>
     <name>DlgStartupCardCheck</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="8"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="9"/>
         <source>Card Update Check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="16"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="24"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
         <source>Run in foreground</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_startup_card_check.cpp" line="26"/>
         <source>Run in background</source>
         <translation type="unfinished"/>
     </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="27"/>
         <source>Run in background and always from now on</source>
         <translation type="unfinished"/>
     </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="28"/>
         <source>Don&apos;t prompt again and don&apos;t run</source>
         <translation type="unfinished"/>
     </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="29"/>
         <source>Don&apos;t run this time</source>
         <translation type="unfinished"/>
     </message>
@@ -3144,17 +3809,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>下一個</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>已知</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>每日提示</translation>
     </message>
@@ -3162,165 +3827,165 @@ 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="27"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="25"/>
         <source>Current release channel</source>
         <translation>當前的發行通道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="34"/>
         <source>Reinstall</source>
         <translation>重新安裝</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="37"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="35"/>
         <source>Cancel Download</source>
         <translation>取消下載</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="38"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="36"/>
         <source>Open Download Page</source>
         <translation>打開下載頁面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="57"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="55"/>
         <source>Check for Client Updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="65"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="207"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="214"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="229"/>
+        <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>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="66"/>
+        <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>雞蛇不支持建立SSL連接，因此你不能自動下載更新！
 請訪問下載頁面以手動更新。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="92"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="90"/>
         <source>Downloading update: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="109"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="107"/>
         <source>Checking for updates...</source>
         <translation>正在檢查更新...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="124"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="122"/>
         <source>Finished checking for updates</source>
         <translation>更新檢查完成</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="139"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="137"/>
         <source>No Update Available</source>
         <translation>沒有更新可用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="138"/>
         <source>Cockatrice is up to date!</source>
         <translation>雞蛇已經是最新的了！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
+        <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>你運行的已經是最新的發行版本了。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="140"/>
         <source>Current version</source>
         <translation>當前版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="143"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="141"/>
         <source>Selected release channel</source>
         <translation>選擇發行渠道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="152"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="163"/>
+        <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>更新可用</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>雞蛇有新版本可用！</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="153"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="164"/>
+        <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>新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="165"/>
+        <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>發佈</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="155"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="166"/>
+        <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>更新日誌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="156"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="154"/>
         <source>Do you want to update now?</source>
         <translation>你打算現在就更新嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="168"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="171"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="230"/>
+        <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>更新錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="209"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="208"/>
         <source>An error occurred while checking for updates:</source>
         <translation>檢查更新時發生錯誤：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="217"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="216"/>
         <source>An error occurred while downloading an update:</source>
         <translation>下載更新時發生錯誤：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="222"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="221"/>
         <source>Installing...</source>
         <translation>正在安裝...</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="231"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="247"/>
         <source>Cockatrice is unable to open the installer.</source>
         <translation>雞蛇無法打開安裝程序。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="232"/>
+        <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>嘗試關閉雞蛇運行安裝程序手動更新。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="233"/>
+        <location filename="src/interface/widgets/dialogs/dlg_update.cpp" line="249"/>
         <source>Download location</source>
         <translation>下載區域信息</translation>
     </message>
@@ -3328,21 +3993,153 @@ 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="25"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="26"/>
         <source>Clear log when closing</source>
         <translation>關閉時清除日誌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="30"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="31"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="42"/>
+        <location filename="src/interface/widgets/dialogs/dlg_view_log.cpp" line="43"/>
         <source>Debug Log</source>
         <translation>問題日誌</translation>
     </message>
 </context>
+<context>
+    <name>DrawProbabilityConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="54"/>
+        <source>Draw Probability Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="56"/>
+        <source>Criteria:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="57"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="58"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="59"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="60"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="62"/>
+        <source>Exactness:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="63"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="64"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="66"/>
+        <source>Quantity (N):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="67"/>
+        <source>Cards drawn (M):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="70"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_config_dialog.cpp" line="71"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DrawProbabilityWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="98"/>
+        <source>Draw Probability</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="100"/>
+        <source>Probability of drawing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="102"/>
+        <source>Card Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="103"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="104"/>
+        <source>Subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="105"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="107"/>
+        <source>At least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="108"/>
+        <source>Exactly</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="110"/>
+        <source>card(s) having drawn at least</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="111"/>
+        <source>cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Category</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Qty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/draw_probability/draw_probability_widget.cpp" line="113"/>
+        <source>Odds (%)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecApiResponseCardInclusionDisplayWidget</name>
     <message>
@@ -3412,33 +4209,39 @@ You may have to manually download the new version.</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>EdhrecCommanderApiResponseBracketNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_bracket_navigation_widget.cpp" line="40"/>
+        <source>Game Changers</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EdhrecCommanderApiResponseBudgetNavigationWidget</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_budget_navigation_widget.cpp" line="40"/>
+        <source>Budget</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>EdhrecCommanderApiResponseNavigationWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="81"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="61"/>
         <source>Combos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="82"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="62"/>
         <source>Average Deck</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="83"/>
-        <source>Game Changers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_commander_api_response_navigation_widget.cpp" line="84"/>
-        <source>Budget</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EdhrecCommanderResponseCommanderDetailsDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/display/commander/edhrec_api_response_commander_details_display_widget.cpp" line="60"/>
+        <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"/>
     </message>
@@ -3446,7 +4249,7 @@ You may have to manually download the new version.</source>
 <context>
     <name>FilterBuilder</name>
     <message>
-        <location filename="src/filters/filter_builder.cpp" line="28"/>
+        <location filename="src/filters/filter_builder.cpp" line="30"/>
         <source>Type your filter here</source>
         <translation>輸入你打算篩選的類型</translation>
     </message>
@@ -3454,22 +4257,22 @@ 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="66"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="67"/>
         <source>Confirm Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="66"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="77"/>
         <source>Delete Failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp" line="76"/>
+        <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"/>
     </message>
@@ -3477,22 +4280,22 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameEventHandler</name>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="413"/>
+        <location filename="src/game/game_event_handler.cpp" line="438"/>
         <source>kicked by game host or moderator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="416"/>
+        <location filename="src/game/game_event_handler.cpp" line="441"/>
         <source>player left the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="419"/>
+        <location filename="src/game/game_event_handler.cpp" line="444"/>
         <source>player disconnected from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/game_event_handler.cpp" line="423"/>
+        <location filename="src/game/game_event_handler.cpp" line="448"/>
         <source>reason unknown</source>
         <translation type="unfinished"/>
     </message>
@@ -3500,155 +4303,208 @@ You may have to manually download the new version.</source>
 <context>
     <name>GameSelector</name>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <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>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="221"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="238"/>
         <source>Please join the appropriate room first.</source>
         <translation>首先請加入一個房間.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="224"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="241"/>
         <source>Wrong password.</source>
         <translation>密碼錯誤.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="227"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="244"/>
         <source>Spectators are not allowed in this game.</source>
         <translation>這個遊戲不允許觀眾加入.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="230"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="247"/>
         <source>The game is already full.</source>
         <translation>這個遊戲已經滿了.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="250"/>
         <source>The game does not exist any more.</source>
         <translation>這個遊戲不能裝下啊更多了.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="236"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="253"/>
         <source>This game is only open to registered users.</source>
         <translation>這個遊戲只開放給註冊用戶.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="239"/>
+        <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>這個遊戲只開放給好友。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="242"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="259"/>
         <source>You are being ignored by the creator of this game.</source>
         <translation>你屏蔽了這個與遊戲的創造者.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="300"/>
         <source>Join Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="268"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="303"/>
         <source>Spectate Game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="271"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="306"/>
         <source>Game Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="319"/>
+        <source>Join Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="324"/>
+        <source>Spectate Game as Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Join game</source>
         <translation>加入遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="305"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="353"/>
         <source>Password:</source>
         <translation>密碼:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="320"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
         <source>Please join the respective room first.</source>
         <translation>請各自加入一個房間.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="363"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="414"/>
         <source>&amp;Filter games</source>
         <translation>過濾房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="364"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="415"/>
         <source>C&amp;lear filter</source>
         <translation>清除篩選項目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="366"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="417"/>
         <source>C&amp;reate</source>
         <translation>創建</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="367"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="419"/>
         <source>&amp;Join</source>
         <translation>加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="368"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="420"/>
+        <source>Join as judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="421"/>
         <source>J&amp;oin as spectator</source>
         <translation>觀看</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="389"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="422"/>
+        <source>Join as judge spectator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="443"/>
         <source>Games shown: %1 / %2</source>
         <translation>顯示遊戲：%1/%2</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/game_selector.cpp" line="391"/>
+        <location filename="src/interface/widgets/server/game_selector.cpp" line="445"/>
         <source>Games</source>
         <translation>遊戲</translation>
     </message>
 </context>
+<context>
+    <name>GameSelectorQuickFilterToolBar</name>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="50"/>
+        <source>All types</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="142"/>
+        <source>Filter by game name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="143"/>
+        <source>Filter by game type/format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="144"/>
+        <source>Hide games not created by buddies</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="145"/>
+        <source>Hide full games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/game_selector_quick_filter_toolbar.cpp" line="146"/>
+        <source>Hide started games</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>GamesModel</name>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="41"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="34"/>
         <source>&gt;1 day</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="50"/>
+        <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"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="52"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="45"/>
         <source>new</source>
         <translation>新建</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/games_model.cpp" line="55"/>
+        <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"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="151"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="149"/>
         <source>password</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="153"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="152"/>
         <source>buddies only</source>
         <translation>僅限好友</translation>
     </message>
@@ -3658,68 +4514,68 @@ You may have to manually download the new version.</source>
         <translation>僅限註冊用户</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="157"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="158"/>
         <source>open decklists</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="189"/>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="194"/>
+        <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>允許聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="191"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="193"/>
         <source>see hands</source>
         <translation>查看手牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="196"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="198"/>
         <source>can see hands</source>
         <translation>允許查看手牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="201"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="203"/>
         <source>not allowed</source>
         <translation>不允許</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="219"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="222"/>
         <source>Room</source>
         <translation>房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="223"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="226"/>
         <source>Age</source>
         <translation>時長</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="234"/>
         <source>Description</source>
         <translation>描述</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="233"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="236"/>
         <source>Creator</source>
         <translation>創建者</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="235"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="238"/>
         <source>Type</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="237"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="240"/>
         <source>Restrictions</source>
         <translation>限制</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="241"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="244"/>
         <source>Players</source>
         <translation>玩家</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/games_model.cpp" line="249"/>
+        <location filename="src/interface/widgets/server/games_model.cpp" line="252"/>
         <source>Spectators</source>
         <translation>觀看者</translation>
     </message>
@@ -3727,143 +4583,158 @@ You may have to manually download the new version.</source>
 <context>
     <name>GeneralSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="392"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="390"/>
         <source>Reset all paths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="199"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="183"/>
         <source>All paths have been reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="274"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="284"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="294"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="304"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="314"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="324"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="334"/>
+        <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>選擇路徑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="362"/>
-        <source>Personal settings</source>
-        <translation>個人設定</translation>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="356"/>
+        <source>Language settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="363"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="357"/>
         <source>Language:</source>
         <translation>語言:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="366"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="359"/>
+        <source>Version settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="360"/>
+        <source>Card database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="361"/>
+        <source>Startup settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="364"/>
         <source>Paths (editing disabled in portable mode)</source>
         <translation>路徑(在便攜模式下禁止編輯)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="368"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="366"/>
         <source>Paths</source>
         <translation>路徑</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="371"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="369"/>
         <source>How to help with translations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="372"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="370"/>
         <source>Decks directory:</source>
         <translation>套牌路徑:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="373"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="371"/>
         <source>Filters directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="374"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="372"/>
         <source>Replays directory:</source>
         <translation>遊戲錄像目錄:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="375"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="373"/>
         <source>Pictures directory:</source>
         <translation>圖片目錄:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="376"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="374"/>
         <source>Card database:</source>
         <translation>卡牌數據庫:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="377"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="375"/>
         <source>Custom database directory:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="378"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="376"/>
         <source>Token database:</source>
         <translation>衍生物數據庫：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="379"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="377"/>
         <source>Update channel</source>
         <translation>更新通道</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="380"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="378"/>
         <source>Check for client updates on startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="381"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="382"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="380"/>
         <source>Don&apos;t check</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="384"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="382"/>
         <source>Prompt for update</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="386"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="384"/>
         <source>Always update in the background</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="387"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="385"/>
         <source>Check for card database updates every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="388"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="386"/>
         <source> days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="389"/>
+        <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>當客戶端缺少伺服器支持的特性時提示我</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="390"/>
+        <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>運行新版本雞蛇時自動運行Oracle</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="391"/>
+        <location filename="src/interface/widgets/settings_page/general_settings_page.cpp" line="389"/>
         <source>Show tips on startup</source>
         <translation>顯示啓動時提示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="400"/>
+        <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"/>
     </message>
@@ -3871,47 +4742,47 @@ You may have to manually download the new version.</source>
 <context>
     <name>GraveyardMenu</name>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="98"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="100"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="100"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="102"/>
         <source>&amp;View graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="103"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="105"/>
         <source>&amp;Move graveyard to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="104"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="106"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="105"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="107"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="73"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="74"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="106"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="108"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="107"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="109"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/grave_menu.cpp" line="109"/>
+        <location filename="src/game_graphics/player/menu/grave_menu.cpp" line="111"/>
         <source>Reveal random card to...</source>
         <translation type="unfinished"/>
     </message>
@@ -3919,111 +4790,141 @@ You may have to manually download the new version.</source>
 <context>
     <name>HandMenu</name>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="72"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="112"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="75"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="115"/>
         <source>&amp;View hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="76"/>
-        <source>&amp;Sort hand</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="117"/>
+        <source>Sort hand by...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="77"/>
-        <source>Take &amp;mulligan</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="118"/>
+        <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="79"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="119"/>
+        <source>Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="120"/>
+        <source>Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="122"/>
+        <source>Take &amp;mulligan (Choose hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="123"/>
+        <source>Take mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="124"/>
+        <source>Take mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="126"/>
         <source>&amp;Move hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="80"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="127"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="81"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="128"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="82"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="129"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="83"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="130"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="85"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="132"/>
         <source>&amp;Reveal hand to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="86"/>
-        <source>Reveal r&amp;andom card to...</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="133"/>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="136"/>
+        <source>All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="109"/>
-        <location filename="src/game/player/menu/hand_menu.cpp" line="129"/>
-        <source>&amp;All players</source>
+        <location filename="src/game_graphics/player/menu/hand_menu.cpp" line="135"/>
+        <source>Reveal r&amp;andom card to...</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>HomeWidget</name>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="183"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="204"/>
         <source>Create New Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="187"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="208"/>
         <source>Browse Decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="191"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="212"/>
         <source>Browse Card Database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="195"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="216"/>
         <source>Browse EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="198"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="219"/>
+        <source>Browse Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="222"/>
         <source>View Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="226"/>
         <source>Quit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="217"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="241"/>
         <source>Connecting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="221"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="245"/>
         <source>Connect</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/general/home_widget.cpp" line="227"/>
+        <location filename="src/interface/widgets/general/home_widget.cpp" line="251"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -4031,193 +4932,213 @@ You may have to manually download the new version.</source>
 <context>
     <name>LibraryMenu</name>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="192"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="211"/>
         <source>&amp;Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="195"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="214"/>
         <source>&amp;View library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="196"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="215"/>
         <source>View &amp;top cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="197"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="216"/>
         <source>View bottom cards of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="198"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="217"/>
         <source>Reveal &amp;library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="199"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="218"/>
         <source>Lend library to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="200"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="219"/>
         <source>Reveal &amp;top cards to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="201"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="220"/>
         <source>&amp;Top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="202"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="221"/>
         <source>&amp;Bottom of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="203"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="222"/>
         <source>&amp;Always reveal top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="204"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="223"/>
         <source>&amp;Always look at top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="205"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="224"/>
         <source>&amp;Open deck in deck editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="207"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="226"/>
         <source>&amp;Draw card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="208"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="227"/>
         <source>D&amp;raw cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="209"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="228"/>
         <source>&amp;Undo last draw</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="211"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="230"/>
         <source>Shuffle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="213"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="232"/>
         <source>&amp;Play top card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="214"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="233"/>
         <source>Play top card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="215"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="234"/>
         <source>Put top card on &amp;bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="216"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="235"/>
         <source>Move top card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="217"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="236"/>
         <source>Move top card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="218"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="237"/>
         <source>Move top cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="219"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="238"/>
+        <source>Move top cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="239"/>
         <source>Move top cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="220"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="240"/>
+        <source>Move top cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="241"/>
         <source>Put top cards on stack &amp;until...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="221"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="242"/>
         <source>Shuffle top cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="223"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="244"/>
         <source>&amp;Draw bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="224"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="245"/>
         <source>D&amp;raw bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="225"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="246"/>
         <source>&amp;Play bottom card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="226"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="247"/>
         <source>Play bottom card &amp;face down</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="227"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="248"/>
         <source>Move bottom card to grave&amp;yard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="228"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="249"/>
         <source>Move bottom card to e&amp;xile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="229"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="250"/>
         <source>Move bottom cards to &amp;graveyard...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="230"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="251"/>
+        <source>Move bottom cards to graveyard face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="252"/>
         <source>Move bottom cards to &amp;exile...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="231"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="253"/>
+        <source>Move bottom cards to exile face down...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="254"/>
         <source>Put bottom card on &amp;top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="232"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="255"/>
         <source>Shuffle bottom cards...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="240"/>
-        <location filename="src/game/player/menu/library_menu.cpp" line="274"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="263"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="299"/>
         <source>&amp;All players</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="309"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="340"/>
         <source>Reveal top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/library_menu.cpp" line="310"/>
+        <location filename="src/game_graphics/player/menu/library_menu.cpp" line="341"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
@@ -4225,644 +5146,273 @@ You may have to manually download the new version.</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="109"/>
-        <location filename="src/interface/window_main.cpp" line="462"/>
-        <source>The server has reached its maximum user capacity, please check back later.</source>
-        <translation>伺服器已達到最大用戶數，請稍微再試。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="112"/>
-        <source>There are too many concurrent connections from your address.</source>
-        <translation>你的地址有太多連接.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="115"/>
-        <source>Banned by moderator</source>
-        <translation>已被版主禁止</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="118"/>
-        <source>Expected end time: %1</source>
-        <translation>預計結束時間: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="120"/>
-        <source>This ban lasts indefinitely.</source>
-        <translation>這個封禁是永久的.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="126"/>
-        <source>Scheduled server shutdown.</source>
-        <translation>預定伺服器關閉.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="129"/>
-        <location filename="src/interface/window_main.cpp" line="477"/>
-        <source>Invalid username.</source>
-        <translation>不可用的用戶名。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="132"/>
-        <source>You have been logged out due to logging in at another location.</source>
-        <translation>由於在其他地點登陸，您已被登出。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="137"/>
-        <source>Connection closed</source>
-        <translation>連接關閉</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="138"/>
-        <source>The server has terminated your connection.
-Reason: %1</source>
-        <translation>伺服器中斷連接.
-原因: %1</translation>
-    </message>
-    <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="143"/>
-        <source>The server is going to be restarted in %n minute(s).
-All running games will be lost.
-Reason for shutdown: %1</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="148"/>
-        <source>Scheduled server shutdown</source>
-        <translation>預定伺服器關閉</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Success</source>
-        <translation>成功</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="187"/>
-        <source>Registration accepted.
-Will now login.</source>
-        <translation>註冊已成功。
-現在登陸。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="197"/>
-        <source>Account activation accepted.
-Will now login.</source>
-        <translation>賬號已激活。
-現在登陸</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Number of players</source>
-        <translation>玩家人數</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="231"/>
-        <source>Please enter the number of players.</source>
-        <translation>請輸入玩家的數量.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="248"/>
-        <location filename="src/interface/window_main.cpp" line="255"/>
+        <location filename="src/interface/window_main.cpp" line="159"/>
+        <location filename="src/interface/window_main.cpp" line="166"/>
         <source>Player %1</source>
         <translation>玩家 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="267"/>
+        <location filename="src/interface/window_main.cpp" line="179"/>
         <source>Load replay</source>
         <translation>載入遊戲錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="319"/>
+        <location filename="src/interface/window_main.cpp" line="236"/>
         <source>About Cockatrice</source>
         <translation>關於Cockatrice雞蛇</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="321"/>
+        <location filename="src/interface/window_main.cpp" line="238"/>
         <source>Version</source>
         <translation>版本</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Cockatrice Webpage</source>
         <translation>Cockatrice雞蛇網站</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="322"/>
+        <location filename="src/interface/window_main.cpp" line="239"/>
         <source>Project Manager:</source>
         <translation>項目經理：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="323"/>
+        <location filename="src/interface/window_main.cpp" line="240"/>
         <source>Past Project Managers:</source>
         <translation>前項目經理：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="324"/>
+        <location filename="src/interface/window_main.cpp" line="241"/>
         <source>Developers:</source>
         <translation>開發者：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="325"/>
+        <location filename="src/interface/window_main.cpp" line="242"/>
         <source>Our Developers</source>
         <translation>我們的開發者：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="326"/>
+        <location filename="src/interface/window_main.cpp" line="243"/>
         <source>Help Develop!</source>
         <translation>協助開發！</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="327"/>
+        <location filename="src/interface/window_main.cpp" line="244"/>
         <source>Translators:</source>
         <translation>翻譯者：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="328"/>
+        <location filename="src/interface/window_main.cpp" line="245"/>
         <source>Our Translators</source>
         <translation>翻譯者名單</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Help Translate!</source>
         <translation>協助翻譯!</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="329"/>
+        <location filename="src/interface/window_main.cpp" line="246"/>
         <source>Support:</source>
         <translation>支持：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="330"/>
+        <location filename="src/interface/window_main.cpp" line="247"/>
         <source>Report an Issue</source>
         <translation>報告錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="331"/>
+        <location filename="src/interface/window_main.cpp" line="248"/>
         <source>Troubleshooting</source>
         <translation>排除故障</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="332"/>
+        <location filename="src/interface/window_main.cpp" line="249"/>
         <source>F.A.Q.</source>
         <translation>問答</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <location filename="src/interface/window_main.cpp" line="404"/>
-        <location filename="src/interface/window_main.cpp" line="408"/>
-        <location filename="src/interface/window_main.cpp" line="421"/>
-        <location filename="src/interface/window_main.cpp" line="425"/>
-        <location filename="src/interface/window_main.cpp" line="429"/>
-        <location filename="src/interface/window_main.cpp" line="437"/>
-        <location filename="src/interface/window_main.cpp" line="442"/>
-        <location filename="src/interface/window_main.cpp" line="466"/>
-        <location filename="src/interface/window_main.cpp" line="571"/>
-        <location filename="src/interface/window_main.cpp" line="575"/>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <location filename="src/interface/window_main.cpp" line="585"/>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <location filename="src/interface/window_main.cpp" line="609"/>
-        <location filename="src/interface/window_main.cpp" line="615"/>
-        <location filename="src/interface/window_main.cpp" line="1265"/>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="902"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="376"/>
-        <source>Server timeout</source>
-        <translation>伺服器超時</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="395"/>
-        <source>Failed Login</source>
-        <translation>登錄失敗</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="396"/>
-        <source>Your client seems to be missing features this server requires for connection.</source>
-        <translation>你的客戶端缺少連接這個伺服器所需要的要素</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="397"/>
-        <source>To update your client, go to &apos;Help -&gt; Check for Client Updates&apos;.</source>
-        <translation>轉到幫助-&gt;檢查客户端更新，更新你的客户端。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="405"/>
-        <source>Incorrect username or password. Please check your authentication information and try again.</source>
-        <translation>用户名或密碼錯誤。請檢查賬號信息並重試。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="409"/>
-        <source>There is already an active session using this user name.
-Please close that session first and re-login.</source>
-        <translation>已經有一個在線用户正在使用這個用户名.
-首先請關閉這個對話框然後重新登陸.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="415"/>
-        <location filename="src/interface/window_main.cpp" line="565"/>
-        <source>You are banned until %1.</source>
-        <translation>你被禁止直到: %1.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="417"/>
-        <location filename="src/interface/window_main.cpp" line="567"/>
-        <source>You are banned indefinitely.</source>
-        <translation>你被永久封禁.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="430"/>
-        <source>This server requires user registration. Do you want to register now?</source>
-        <translation>伺服器需要註冊。現在註冊嗎？</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="438"/>
-        <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>伺服器需要客户端ID。你的客户端未能生成ID或你正在運行修改過的客户端。
-請關閉並重新打開客户端。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="443"/>
-        <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>出現內部錯誤，請關閉並重啓客戶端再嘗試。如果錯誤仍然出現請將您的客戶端升級到最新版本，如有需要請聯繫您的軟件提供商。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="449"/>
-        <source>Account activation</source>
-        <translation>賬號激活</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="450"/>
-        <source>Your account has not been activated yet.
-You need to provide the activation token received in the activation email.</source>
-        <translation>你的賬號還未激活。
-請提供激活郵件中的驗證碼。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="461"/>
-        <source>Server Full</source>
-        <translation>伺服器已滿</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="467"/>
-        <source>Unknown login error: %1</source>
-        <translation>未知的登陸錯誤: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="468"/>
-        <location filename="src/interface/window_main.cpp" line="587"/>
-        <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>
-這通常表示你的客户端已經過於陳舊，未能響應伺服器提出的請求。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="480"/>
-        <source>Your username must respect these rules:</source>
-        <translation>您的用戶名須遵守以下規則：</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="482"/>
-        <source>is %1 - %2 characters long</source>
-        <translation>在%1 - %2個字符之間。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <source>can %1 contain lowercase characters</source>
-        <translation>能包含  %1 個小寫字母</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="483"/>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>NOT</source>
-        <translation>否</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="485"/>
-        <source>can %1 contain uppercase characters</source>
-        <translation>能包含%1個小寫字母</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="488"/>
-        <source>can %1 contain numeric characters</source>
-        <translation>能包含%1個數字</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="491"/>
-        <source>can contain the following punctuation: %1</source>
-        <translation>能包含以下符號：%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="494"/>
-        <source>first character can %1 be a punctuation mark</source>
-        <translation>第一個字符不能為%1 標點符號</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="501"/>
-        <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"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="511"/>
-        <source>can not contain any of the following words: %1</source>
-        <translation>不能包含以下詞：%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="517"/>
-        <source>can not match any of the following expressions: %1</source>
-        <translation>不能包含以下語句：%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="523"/>
-        <source>You may only use A-Z, a-z, 0-9, _, ., and - in your username.</source>
-        <translation>你可以使用A-Z，a-z，0-9，_，.以及-作為用户名。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="533"/>
-        <location filename="src/interface/window_main.cpp" line="537"/>
-        <location filename="src/interface/window_main.cpp" line="541"/>
-        <location filename="src/interface/window_main.cpp" line="549"/>
-        <location filename="src/interface/window_main.cpp" line="553"/>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Registration denied</source>
-        <translation>註冊失敗</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="534"/>
-        <source>Registration is currently disabled on this server</source>
-        <translation>當前伺服器無法註冊</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="538"/>
-        <source>There is already an existing account with the same user name.</source>
-        <translation>當前用戶名已經被使用。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="542"/>
-        <source>It&apos;s mandatory to specify a valid email address when registering.</source>
-        <translation>註冊時必須提供一個有效的電郵。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="554"/>
-        <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>看起來你正試圖在這個伺服器上註冊一個新賬户，但是你已經有了一個用提供的郵箱註冊的賬户。 此伺服器限制每個郵箱地址可以註冊用户帳户的數量。請聯繫伺服器運營商以獲得進一步幫助或獲取你的憑據信息。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="560"/>
-        <source>Password too short.</source>
-        <translation>密碼太短。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="579"/>
-        <source>Registration failed for a technical problem on the server.</source>
-        <translation>由於伺服器出現技術問題，註冊失敗。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="582"/>
-        <source>The connection to the server has been lost.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="586"/>
-        <source>Unknown registration error: %1</source>
-        <translation>未知的註冊錯誤：%1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="595"/>
-        <source>Account activation failed</source>
-        <translation>賬號激活失敗</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="602"/>
-        <source>Socket error: %1</source>
-        <translation>接口錯誤: %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="610"/>
-        <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>你正在連接到一個過時的伺服器，請下調你的版本或者連接到一個匹配的伺服器.
-你當前的版本 %1, 伺服器版本 %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="616"/>
-        <source>Your Cockatrice client is obsolete. Please update your Cockatrice version.
-Local version is %1, remote version is %2.</source>
-        <translation>你使用的客户端意見過時，請使用更新你版本.
-你當前的版本 %1, 伺服器版本 %2.</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="626"/>
-        <source>Connecting to %1...</source>
-        <translation>連接到 %1⋯</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="630"/>
-        <source>Registering to %1 as %2...</source>
-        <translation>正在將 %2 註冊到  %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="633"/>
-        <source>Disconnected</source>
-        <translation>斷開連接</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="636"/>
-        <source>Connected, logging in at %1</source>
-        <translation>連接登陸到 %1</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="644"/>
-        <location filename="src/interface/window_main.cpp" line="649"/>
-        <location filename="src/interface/window_main.cpp" line="654"/>
-        <source>Requesting forgotten password to %1 as %2...</source>
-        <translation>正在將%2向%1申請忘記密碼流程。</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="665"/>
+        <location filename="src/interface/window_main.cpp" line="295"/>
         <source>&amp;Connect...</source>
         <translation>連接⋯</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="666"/>
+        <location filename="src/interface/window_main.cpp" line="296"/>
         <source>&amp;Disconnect</source>
         <translation>斷開連接</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="667"/>
+        <location filename="src/interface/window_main.cpp" line="297"/>
         <source>Start &amp;local game...</source>
         <translation>開始本地遊戲...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="668"/>
+        <location filename="src/interface/window_main.cpp" line="298"/>
         <source>&amp;Watch replay...</source>
         <translation>觀看錄像...</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="669"/>
+        <location filename="src/interface/window_main.cpp" line="299"/>
         <source>&amp;Full screen</source>
         <translation>全屏</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="670"/>
+        <location filename="src/interface/window_main.cpp" line="300"/>
         <source>&amp;Register to server...</source>
         <translation>註冊到伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="671"/>
+        <location filename="src/interface/window_main.cpp" line="301"/>
         <source>&amp;Restore password...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="672"/>
+        <location filename="src/interface/window_main.cpp" line="302"/>
         <source>&amp;Settings...</source>
         <translation>設置⋯</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="674"/>
+        <location filename="src/interface/window_main.cpp" line="304"/>
         <source>&amp;Exit</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="677"/>
+        <location filename="src/interface/window_main.cpp" line="307"/>
         <source>A&amp;ctions</source>
         <translation>動作</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="679"/>
+        <location filename="src/interface/window_main.cpp" line="309"/>
         <source>&amp;Cockatrice</source>
         <translation>CockatriceCockatrice</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="682"/>
+        <location filename="src/interface/window_main.cpp" line="312"/>
         <source>C&amp;ard Database</source>
         <translation>卡牌資料庫</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="683"/>
+        <location filename="src/interface/window_main.cpp" line="313"/>
         <source>&amp;Manage sets...</source>
         <translation>系列管理</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="684"/>
+        <location filename="src/interface/window_main.cpp" line="314"/>
         <source>Edit custom &amp;tokens...</source>
         <translation>編輯自定義&amp;tokens</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="685"/>
+        <location filename="src/interface/window_main.cpp" line="315"/>
         <source>Open custom image folder</source>
         <translation>打開自定義圖片文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="686"/>
+        <location filename="src/interface/window_main.cpp" line="316"/>
         <source>Open custom sets folder</source>
         <translation>打開自定義系列文件夾</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="687"/>
+        <location filename="src/interface/window_main.cpp" line="317"/>
         <source>Add custom sets/cards</source>
         <translation>添加自定義系列/卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="688"/>
+        <location filename="src/interface/window_main.cpp" line="318"/>
         <source>Reload card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="690"/>
+        <location filename="src/interface/window_main.cpp" line="320"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="692"/>
+        <location filename="src/interface/window_main.cpp" line="322"/>
         <source>&amp;Help</source>
         <translation>幫助</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="693"/>
+        <location filename="src/interface/window_main.cpp" line="323"/>
         <source>&amp;About Cockatrice</source>
         <translation>關於Cockatrice雞蛇</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="694"/>
+        <location filename="src/interface/window_main.cpp" line="324"/>
         <source>&amp;Tip of the Day</source>
         <translation>&amp; 每日提示</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="695"/>
+        <location filename="src/interface/window_main.cpp" line="325"/>
         <source>Check for Client Updates</source>
         <translation>檢查客戶端更新</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="696"/>
+        <location filename="src/interface/window_main.cpp" line="326"/>
         <source>Check for Card Updates...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="697"/>
+        <location filename="src/interface/window_main.cpp" line="327"/>
         <source>Check for Card Updates (Automatic)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="698"/>
+        <location filename="src/interface/window_main.cpp" line="328"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="699"/>
+        <location filename="src/interface/window_main.cpp" line="329"/>
         <source>View &amp;Debug Log</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="700"/>
+        <location filename="src/interface/window_main.cpp" line="330"/>
         <source>Open Settings Folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="702"/>
+        <location filename="src/interface/window_main.cpp" line="332"/>
         <source>Show/Hide</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="998"/>
+        <location filename="src/interface/window_main.cpp" line="630"/>
         <source>New Version</source>
         <translation>新版本</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="999"/>
+        <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>恭喜Cockatrice更新到%1！
 現在啓動Oracle更新你的卡牌資料庫。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1003"/>
+        <location filename="src/interface/window_main.cpp" line="635"/>
         <source>Cockatrice installed</source>
         <translation>雞蛇已安裝</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1004"/>
+        <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>恭喜Cockatrice更新到%1！
 現在啓動Oracle更新你的卡牌資料庫。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1138"/>
+        <location filename="src/interface/window_main.cpp" line="761"/>
         <source>Card database</source>
         <translation>卡牌數據庫</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1140"/>
+        <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>
@@ -4871,46 +5421,51 @@ If unsure or first time user, choose &quot;Yes&quot;</source>
 如果不確定或者你是第一次使用，請選擇“是”</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1144"/>
-        <location filename="src/interface/window_main.cpp" line="1169"/>
+        <location filename="src/interface/window_main.cpp" line="767"/>
+        <location filename="src/interface/window_main.cpp" line="799"/>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1145"/>
-        <location filename="src/interface/window_main.cpp" line="1170"/>
+        <location filename="src/interface/window_main.cpp" line="768"/>
+        <location filename="src/interface/window_main.cpp" line="801"/>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1146"/>
+        <location filename="src/interface/window_main.cpp" line="769"/>
         <source>Open settings</source>
         <translation>打開設定</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1161"/>
+        <location filename="src/interface/window_main.cpp" line="791"/>
         <source>New sets found</source>
         <translation>發現新系列</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/interface/window_main.cpp" line="1163"/>
+        <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>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1171"/>
+        <location filename="src/interface/window_main.cpp" line="800"/>
+        <source>Yes, always enable</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/window_main.cpp" line="802"/>
         <source>View sets</source>
         <translation>查看系列</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1190"/>
+        <location filename="src/interface/window_main.cpp" line="827"/>
         <source>Welcome</source>
         <translation>歡迎</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1191"/>
+        <location filename="src/interface/window_main.cpp" line="828"/>
         <source>Hi! It seems like you'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>
@@ -4919,740 +5474,902 @@ Read more about changing the set order or disabling specific sets and consequent
 瞭解更多用“系列管理”窗口更改系列順序或者禁用某系列的信息。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
-        <location filename="src/interface/window_main.cpp" line="1371"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>Information</source>
         <translation>信息</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1211"/>
+        <location filename="src/interface/window_main.cpp" line="848"/>
         <source>A card database update is already running.</source>
         <translation>數據庫更新已經在運行中。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1266"/>
+        <location filename="src/interface/window_main.cpp" line="903"/>
         <source>Unable to run the card database updater: </source>
         <translation>無法運行卡組數據庫更新器：</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1275"/>
+        <location filename="src/interface/window_main.cpp" line="912"/>
         <source>Card database update running.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1293"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1296"/>
+        <location filename="src/interface/window_main.cpp" line="933"/>
         <source>The process crashed some time after starting successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1300"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1303"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1307"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1312"/>
+        <location filename="src/interface/window_main.cpp" line="949"/>
         <source>Unknown error occurred.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1317"/>
+        <location filename="src/interface/window_main.cpp" line="954"/>
         <source>The card database updater exited with an error:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1372"/>
-        <source>This server supports additional features that your client doesn'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.
-
-To update your client, go to Help -&gt; Check for Updates.</source>
-        <translation>你當前的客户端缺少該伺服器所需要的特性。
-通常不會有問題，但這代表有新版本的Cockatrice可供使用，或有預覽版本。
-要升級客户端，請點擊 幫助-&gt;檢查更新</translation>
-    </message>
-    <message>
-        <location filename="src/interface/window_main.cpp" line="1391"/>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
-        <location filename="src/interface/window_main.cpp" line="1434"/>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <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>載入系列/卡牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1400"/>
+        <location filename="src/interface/window_main.cpp" line="1028"/>
         <source>Selected file cannot be found.</source>
         <translation>找不到選擇的文件。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1406"/>
+        <location filename="src/interface/window_main.cpp" line="1034"/>
         <source>You can only import XML databases at this time.</source>
         <translation>當前只能導入XML格式數據庫。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1435"/>
+        <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>新的系列/卡牌已添加成功。 
 CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1438"/>
+        <location filename="src/interface/window_main.cpp" line="1066"/>
         <source>Sets/cards failed to import.</source>
         <translation>系列/卡牌導入失敗。</translation>
     </message>
+</context>
+<context>
+    <name>ManaBaseConfigDialog</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1489"/>
-        <location filename="src/interface/window_main.cpp" line="1499"/>
-        <location filename="src/interface/window_main.cpp" line="1508"/>
-        <source>Reset Password</source>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="47"/>
+        <source>Mana Base Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1490"/>
-        <source>Your password has been reset successfully, you can now log in using the new credentials.</source>
-        <translation>你的密碼已重置，現在你可以使用新密碼登錄了。</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="49"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1500"/>
-        <source>Failed to reset user account password, please contact the server operator to reset your password.</source>
-        <translation>重置密碼失敗，請聯繫伺服器管理員重置密碼。</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="1509"/>
-        <source>Activation request received, please check your email for an activation token.</source>
-        <translation>激活請求已收到，請查看你的電子郵箱獲取激活驗證碼。</translation>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="52"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="54"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="56"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_config_dialog.cpp" line="57"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ManaBaseWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_base_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_base/mana_base_widget.cpp" line="17"/>
         <source>Mana Base</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaCurveConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="55"/>
+        <source>Group By:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="56"/>
+        <source>type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="57"/>
+        <source>color</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="58"/>
+        <source>subtype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="59"/>
+        <source>power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="60"/>
+        <source>toughness</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="62"/>
+        <source>Filters (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="64"/>
+        <source>Show main bar row</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_config_dialog.cpp" line="65"/>
+        <source>Show per-category rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaCurveWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="19"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_curve_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_curve/mana_curve_widget.cpp" line="22"/>
         <source>Mana Curve</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDevotionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="47"/>
+        <source>Display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="48"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="49"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="50"/>
+        <source>combinedBar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_config_dialog.cpp" line="52"/>
+        <source>Filter Colors (optional):</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>ManaDevotionWidget</name>
     <message>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="22"/>
-        <location filename="src/interface/widgets/deck_analytics/mana_devotion_widget.cpp" line="36"/>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_devotion/mana_devotion_widget.cpp" line="17"/>
         <source>Mana Devotion</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>ManaDistributionConfigDialog</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="48"/>
+        <source>Top display type:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="49"/>
+        <source>pie</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="50"/>
+        <source>bar</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="52"/>
+        <source>Colors:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_config_dialog.cpp" line="54"/>
+        <source>Show per-color rows</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionSingleDisplayWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="42"/>
+        <source>%1 pips (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_single_display_widget.cpp" line="48"/>
+        <source>%1 mana (%2 cards)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ManaDistributionWidget</name>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="14"/>
+        <source>Mana Production + Devotion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_analytics/analyzer_modules/mana_distribution/mana_distribution_widget.cpp" line="120"/>
+        <source>Mana Distribution Settings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>MessageLogWidget</name>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="43"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="34"/>
         <source> from play</source>
         <translation>從戰場上</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="45"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="36"/>
         <source> from their graveyard</source>
         <translation>從他的墳墓場</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="47"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="38"/>
         <source> from exile</source>
         <translation>從放逐區</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="49"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="40"/>
         <source> from their hand</source>
         <translation>從他的手牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="54"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="45"/>
         <source>the top card of %1&apos;s library</source>
         <translation>%1牌庫頂的牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="56"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="47"/>
         <source>the top card of their library</source>
         <translation>他牌庫頂的卡牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="61"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="52"/>
         <source> from the top of %1&apos;s library</source>
         <translation>從%1的牌庫頂</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="63"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="54"/>
         <source> from the top of their library</source>
         <translation>從他的牌庫頂</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="69"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="60"/>
         <source>the bottom card of %1&apos;s library</source>
         <translation>%1的牌庫底牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="71"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="62"/>
         <source>the bottom card of their library</source>
         <translation>他牌庫底部的牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="76"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="67"/>
         <source> from the bottom of %1&apos;s library</source>
         <translation>從%1的牌庫底</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="78"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="69"/>
         <source> from the bottom of their library</source>
         <translation>從他的牌庫底</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="83"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="74"/>
         <source> from %1&apos;s library</source>
         <translation>從%1的牌庫中</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="85"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="76"/>
         <source> from their library</source>
         <translation>從他的牌庫</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="89"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="80"/>
         <source> from sideboard</source>
         <translation>從備牌中</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="91"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="82"/>
         <source> from the stack</source>
         <translation>從堆疊中</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="93"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="84"/>
         <source> from custom zone &apos;%1&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="119"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="110"/>
         <source>%1 is now keeping the top card %2 revealed.</source>
         <translation>%1已持續展示牌庫頂牌%2</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="120"/>
+        <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>%1不再%2展示牌庫頂牌。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="127"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="128"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="135"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="129"/>
         <source>%1 attaches %2 to %3&apos;s %4.</source>
         <translation>%1 結附 %2 指向 %3的 %4.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="146"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="140"/>
         <source>%1 has conceded the game.</source>
         <translation>%1 已放棄遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="155"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="149"/>
         <source>%1 has unconceded the game.</source>
         <translation>%1 已放棄遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="165"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="159"/>
         <source>%1 has restored connection to the game.</source>
         <translation>%1已恢復連接。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="169"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="163"/>
         <source>%1 has lost connection to the game.</source>
         <translation>%1 已失去連接。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="185"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="179"/>
         <source>%1 points from their %2 to themselves.</source>
         <translation>%1 將%2 指向自己。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="188"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="182"/>
         <source>%1 points from their %2 to %3.</source>
         <translation>%1 將%2指向%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="193"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="187"/>
         <source>%1 points from %2&apos;s %3 to themselves.</source>
         <translation>%1將%2的%3</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="198"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="192"/>
         <source>%1 points from %2&apos;s %3 to %4.</source>
         <translation>%1 將%2的%3指向%4。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="206"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="200"/>
         <source>%1 points from their %2 to their %3.</source>
         <translation>%1將他的%2指向他的%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="210"/>
+        <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>%1將他的%2指向%3的%4。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="216"/>
+        <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>%1將%2的%3指向他自己的%4。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="222"/>
+        <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>%1 將%2的%3指向%4的%5。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="230"/>
         <source>%1 creates a face down token.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="238"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="232"/>
         <source>%1 creates token: %2%3.</source>
         <translation>%1創建衍生物：%2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="249"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="243"/>
         <source>%1 has loaded a deck (%2).</source>
         <translation>%1 已載入套牌(%2)</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="251"/>
+        <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>%1已載入含有 %2張備牌的套牌(%3)</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="261"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="255"/>
         <source>%1 destroys %2.</source>
         <translation>%1銷燬了%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="296"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="290"/>
         <source>a card</source>
         <translation>一張牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="302"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="296"/>
         <source>%1 gives %2 control over %3.</source>
         <translation>%1讓%2控制%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="314"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="316"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="310"/>
         <source>%1 puts %2 into play%3.</source>
         <translation>%1將%2%3放進戰場。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="319"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="316"/>
         <source>%1 puts %2%3 into their graveyard.</source>
         <translation>%1將%2%3置入他的墳墓場。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="321"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="320"/>
+        <source>%1 exiles %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="322"/>
         <source>%1 exiles %2%3.</source>
         <translation>%1 %3放逐了 %2</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="323"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="325"/>
         <source>%1 moves %2%3 to their hand.</source>
         <translation>%1將%2%3放回他的手牌中。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="326"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="328"/>
         <source>%1 puts %2%3 into their library.</source>
         <translation>%1將%2%3放入他的牌庫。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="330"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="332"/>
         <source>%1 puts %2%3 on top of their library.</source>
         <translation>%1將%2%3置於其牌庫頂。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="334"/>
+        <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>%1將%2%3放入牌庫%4張牌放在牌庫頂</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="337"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="339"/>
         <source>%1 moves %2%3 to sideboard.</source>
         <translation>%1 將%2%3移動到備牌</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="340"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="343"/>
+        <source>%1 plays %2%3 face down.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="345"/>
         <source>%1 plays %2%3.</source>
         <translation>%1使用 %2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="343"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="363"/>
+        <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"/>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="365"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="375"/>
         <source>%1 draws %2 card(s).</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="375"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="385"/>
         <source>%1 is looking at %2.</source>
         <translation>%1 正在查看%2。</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="380"/>
+        <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"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="384"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="394"/>
         <source>top</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="392"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="402"/>
         <source>%1 turns %2 face-down.</source>
         <translation>%1回合%2翻為面朝下。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="395"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="405"/>
         <source>%1 turns %2 face-up.</source>
         <translation>%1回合%2翻為面朝上。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="401"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="411"/>
         <source>The game has been closed.</source>
         <translation>遊戲已經關閉。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="406"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="416"/>
         <source>The game has started.</source>
         <translation>遊戲已開始。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="411"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="417"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="427"/>
         <source>%1 has joined the game.</source>
         <translation>%1 已經加入遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="423"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="433"/>
         <source>%1 is now watching the game.</source>
         <translation>%1 正在旁觀遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="428"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="438"/>
         <source>You have been kicked out of the game.</source>
         <translation>你已被踢出遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="434"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="444"/>
         <source>%1 has left the game (%2).</source>
         <translation>%1 已經離開了遊戲(%2)。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="442"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="452"/>
         <source>%1 is not watching the game any more (%2).</source>
         <translation>%1 不再旁觀遊戲(%2)。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="449"/>
+        <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>%1 還未準備好開始遊戲。</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="458"/>
+        <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></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="463"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="473"/>
         <source>%1 shuffles their deck and draws a new hand.</source>
         <translation>%1洗牌並抓了新的起手</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="469"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="479"/>
         <source>You are watching a replay of game #%1.</source>
         <translation>你正在觀看遊戲#%1的錄像。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="474"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="484"/>
         <source>%1 is ready to start the game.</source>
         <translation>%1已準備好開始遊戲。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="500"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="510"/>
         <source>cards</source>
         <comment>an unknown amount of cards</comment>
         <translation>牌</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="502"/>
+        <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"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="511"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="521"/>
         <source>%1 lends %2 to %3.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="516"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="526"/>
         <source>%1 reveals %2 to %3.</source>
         <translation>%1將%2展示給%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="522"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="532"/>
         <source>%1 reveals %2.</source>
         <translation>%1 展示 %2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="528"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="538"/>
         <source>%1 randomly reveals %2%3 to %4.</source>
         <translation>%1隨機展示%2%3給%4。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="534"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="544"/>
         <source>%1 randomly reveals %2%3.</source>
         <translation>%1隨機展示%2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="542"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="552"/>
         <source>%1 peeks at face down card #%2.</source>
         <translation>%1查看面朝下的卡牌#%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="546"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="556"/>
         <source>%1 peeks at face down card #%2: %3.</source>
         <translation>%1查看面朝下的卡牌#%2:%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="552"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="562"/>
         <source>%1 reveals %2%3 to %4.</source>
         <translation>%1展示%2%3給%4。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="559"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="569"/>
         <source>%1 reveals %2%3.</source>
         <translation>%1展示%2%3。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="566"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="576"/>
         <source>%1 reversed turn order, now it&apos;s %2.</source>
         <translation>%1 反轉回合順序，現在是%2的回合。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>reversed</source>
         <translation>反轉</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="568"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="578"/>
         <source>normal</source>
         <translation>正常</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Heads</source>
         <translation>正面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="576"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="586"/>
         <source>Tails</source>
         <translation>反面</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="577"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="587"/>
         <source>%1 flipped a coin. It landed as %2.</source>
         <translation>%1擲硬幣。結果為%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="581"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="591"/>
         <source>%1 rolls a %2 with a %3-sided die.</source>
         <translation>%1擲%3面骰子，結果為%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="598"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="626"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="636"/>
         <source>%1&apos;s turn.</source>
         <translation>現在是%1的回合。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="632"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="642"/>
         <source>%1 sets annotation of %2 to %3.</source>
         <translation>%1給%2添加了註釋%3。</translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="643"/>
-        <source>%1 places %2 &quot;%3&quot; counter(s) on %4 (now %5).</source>
+        <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></translation>
     </message>
     <message numerus="yes">
-        <location filename="src/game/log/message_log_widget.cpp" line="645"/>
-        <source>%1 removes %2 &quot;%3&quot; counter(s) from %4 (now %5).</source>
+        <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></translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="663"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="814"/>
+        <source>%1 failed to undo their last draw.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="675"/>
         <source>%1 sets counter %2 to %3 (%4%5).</source>
         <translation>%1 將%2指示物設置為 %3 (%4%5)。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="675"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="687"/>
         <source>%1 sets %2 to not untap normally.</source>
         <translation>%1 將 %2 設置為不會被通常重置。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="677"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="689"/>
         <source>%1 sets %2 to untap normally.</source>
         <translation>%1 將 %2 設置為可通常重置。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="696"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="708"/>
         <source>%1 removes the PT of %2.</source>
         <translation>%1 移除%2力量/防禦</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="701"/>
+        <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>%1改變%2的力量/防禦至%4</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="704"/>
+        <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>%1將%2的力量/防禦從%3改變至%4</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="713"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="725"/>
         <source>%1 has locked their sideboard.</source>
         <translation>%1已鎖定他的備牌。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="716"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="728"/>
         <source>%1 has unlocked their sideboard.</source>
         <translation>%1 解除鎖定他的備牌。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 taps their permanents.</source>
         <translation>%1 橫置了永久物。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="734"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="746"/>
         <source>%1 untaps their permanents.</source>
         <translation>%1 重置了永久物。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 taps %2.</source>
         <translation>%1 橫置了 %2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="737"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="749"/>
         <source>%1 untaps %2.</source>
         <translation>%1 重置了 %2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="753"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="765"/>
         <source>%1 shuffles %2.</source>
         <translation>%1 切洗了%2。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="757"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="769"/>
         <source>%1 shuffles the bottom %3 cards of %2.</source>
         <translation>%1 洗 %2 底的 %3 張卡</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="762"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="774"/>
         <source>%1 shuffles the top %3 cards of %2.</source>
         <translation>%1 洗 %2 頂的 %3 張卡</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="767"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="779"/>
         <source>%1 shuffles cards %3 - %4 of %2.</source>
         <translation>%1洗%3 - %4 到%2.</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="782"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="794"/>
         <source>%1 unattaches %2.</source>
         <translation>%1 取消了%2的結附。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="790"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="802"/>
         <source>%1 undoes their last draw.</source>
         <translation>%1撤銷了最後的抓牌。</translation>
     </message>
     <message>
-        <location filename="src/game/log/message_log_widget.cpp" line="793"/>
+        <location filename="src/game_graphics/log/message_log_widget.cpp" line="805"/>
         <source>%1 undoes their last draw (%2).</source>
         <translation>%1撤銷了最後的抓牌(%2)。</translation>
     </message>
@@ -5660,110 +6377,115 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1534"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="255"/>
         <source>Word1 Word2 Word3</source>
         <translation>詞1 詞2 詞3</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1535"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="256"/>
         <source>Add New Message</source>
         <translation>添加新信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1536"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="257"/>
         <source>Edit Message</source>
         <translation>編輯信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1537"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="258"/>
         <source>Remove Message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="206"/>
         <source>Add message</source>
         <translation>添加信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1486"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <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>信息:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1499"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="219"/>
         <source>Edit message</source>
         <translation>編輯消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1517"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="237"/>
         <source>Chat settings</source>
         <translation>聊天設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1518"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="238"/>
         <source>Custom alert words</source>
         <translation>自定義警告語</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1519"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="239"/>
         <source>Enable chat mentions</source>
         <translation>允許聊天中提到某人</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1520"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="240"/>
         <source>Enable mention completer</source>
         <translation>允許自動完成提名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1521"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="241"/>
         <source>In-game message macros</source>
         <translation>遊戲內消息宏</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1523"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1524"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="244"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation>忽略未註冊用戶的聊天室消息。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1525"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="245"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation>忽略未註冊用戶發出的私人消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1526"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1527"/>
+        <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"/>
+    </message>
+    <message>
+        <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>反轉文本顏色</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1528"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="249"/>
         <source>Enable desktop notifications for private messages</source>
         <translation>開啓私人消息桌面提醒</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1529"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="250"/>
         <source>Enable desktop notification for mentions</source>
         <translation>開啓聊天提名桌面提醒</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1530"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="251"/>
         <source>Enable room message history on join</source>
         <translation>開啓加入聊天室時的歷史消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1531"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1532"/>
+        <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>（顏色為16進制）</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1533"/>
+        <location filename="src/interface/widgets/settings_page/messages_settings_page.cpp" line="254"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation>將單詞以空格區分，僅支持字母</translation>
     </message>
@@ -5771,37 +6493,42 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>MoveMenu</name>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="7"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="8"/>
         <source>Move to</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="72"/>
         <source>&amp;Top of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="73"/>
         <source>X cards from the top of library...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="74"/>
         <source>&amp;Bottom of library in random order</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="75"/>
+        <source>T&amp;able</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="76"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="77"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/move_menu.cpp" line="62"/>
+        <location filename="src/game_graphics/player/menu/move_menu.cpp" line="78"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
@@ -5814,47 +6541,47 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
         <translation>牌類型</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="37"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="38"/>
         <source>Mana Value</source>
         <translation>魔法力值</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="39"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
         <source>Color(s)</source>
         <translation>顏色</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="41"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="44"/>
         <source>Loyalty</source>
         <translation>忠誠</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="43"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
         <source>Main Card Type</source>
         <translation>牌的主類型</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="45"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="50"/>
         <source>Mana Cost</source>
         <translation>魔法力費用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="47"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
         <source>P/T</source>
         <translation>力量/防禦力</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="49"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="56"/>
         <source>Side</source>
         <translation>旁邊</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="51"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="59"/>
         <source>Layout</source>
         <translation>佈局</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="53"/>
+        <location filename="../libcockatrice_card/libcockatrice/card/game_specific_terms.h" line="62"/>
         <source>Color Identity</source>
         <translation>標識色</translation>
     </message>
@@ -5877,65 +6604,211 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PaletteEditorDialog</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="146"/>
+        <source>▼  Edit Palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="162"/>
+        <source>Palette Editor — %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="170"/>
+        <source>This theme ships no default palette files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="176"/>
+        <source>Editing:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="179"/>
+        <source>↺  Revert to theme default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="185"/>
+        <source>Preview this palette without saving to disk</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="262"/>
+        <source>Save failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="263"/>
+        <source>Could not write %1 to:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_editor_dialog.cpp" line="287"/>
+        <source>No default found</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
+<context>
+    <name>PaletteGridWidget</name>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Active</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="77"/>
+        <source>Inactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="79"/>
+        <source>Normal interactive state</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="80"/>
+        <source>Widget is disabled / not interactive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/palette_grid_widget.cpp" line="81"/>
+        <source>Window is in background / unfocused</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>Phase</name>
     <message>
-        <location filename="src/game/phase.cpp" line="25"/>
+        <location filename="src/game/phase.cpp" line="47"/>
         <source>Unknown Phase</source>
         <translation>未知步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="27"/>
+        <location filename="src/game/phase.cpp" line="49"/>
         <source>Untap</source>
         <translation>重置步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="28"/>
+        <location filename="src/game/phase.cpp" line="50"/>
         <source>Upkeep</source>
         <translation>維持步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="29"/>
+        <location filename="src/game/phase.cpp" line="51"/>
         <source>Draw</source>
         <translation>抓牌步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="30"/>
+        <location filename="src/game/phase.cpp" line="52"/>
         <source>First Main</source>
         <translation>主要步驟1</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="31"/>
+        <location filename="src/game/phase.cpp" line="53"/>
         <source>Beginning of Combat</source>
         <translation>戰鬥開始步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="32"/>
+        <location filename="src/game/phase.cpp" line="54"/>
         <source>Declare Attackers</source>
         <translation>宣告進攻步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="33"/>
+        <location filename="src/game/phase.cpp" line="55"/>
         <source>Declare Blockers</source>
         <translation>宣告阻擋步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="34"/>
+        <location filename="src/game/phase.cpp" line="56"/>
         <source>Combat Damage</source>
         <translation>戰鬥傷害步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="35"/>
+        <location filename="src/game/phase.cpp" line="57"/>
         <source>End of Combat</source>
         <translation>戰鬥結束步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="36"/>
+        <location filename="src/game/phase.cpp" line="58"/>
         <source>Second Main</source>
         <translation>主要步驟2</translation>
     </message>
     <message>
-        <location filename="src/game/phase.cpp" line="37"/>
+        <location filename="src/game/phase.cpp" line="59"/>
         <source>End/Cleanup</source>
         <translation>結束/清理階段</translation>
     </message>
@@ -5943,57 +6816,57 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>PhasesToolbar</name>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="154"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="161"/>
         <source>Untap step</source>
         <translation>重置步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="156"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="163"/>
         <source>Upkeep step</source>
         <translation>維持步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="158"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="165"/>
         <source>Draw step</source>
         <translation>抓牌步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="160"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="167"/>
         <source>First main phase</source>
         <translation>主要步驟1</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="162"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="169"/>
         <source>Beginning of combat step</source>
         <translation>戰鬥開始步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="164"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="171"/>
         <source>Declare attackers step</source>
         <translation>宣告進攻步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="166"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="173"/>
         <source>Declare blockers step</source>
         <translation>宣告阻擋步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="168"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="175"/>
         <source>Combat damage step</source>
         <translation>戰鬥傷害步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="170"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="177"/>
         <source>End of combat step</source>
         <translation>戰鬥結束步驟</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="172"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="179"/>
         <source>Second main phase</source>
         <translation>主要步驟2</translation>
     </message>
     <message>
-        <location filename="src/game/phases_toolbar.cpp" line="174"/>
+        <location filename="src/game_graphics/phases_toolbar.cpp" line="181"/>
         <source>End of turn step</source>
         <translation>結束步驟</translation>
     </message>
@@ -6001,7 +6874,7 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="268"/>
+        <location filename="src/interface/card_picture_loader/card_picture_to_load.cpp" line="255"/>
         <source>en</source>
         <comment>code for scryfall's language property, not available for all languages</comment>
         <translation type="unfinished"/>
@@ -6010,183 +6883,195 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>PlayerActions</name>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="151"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+</context>
+<context>
+    <name>PlayerDialogs</name>
+    <message>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="66"/>
         <source>View top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="152"/>
-        <location filename="src/game/player/player_actions.cpp" line="165"/>
-        <location filename="src/game/player/player_actions.cpp" line="225"/>
-        <location filename="src/game/player/player_actions.cpp" line="254"/>
-        <location filename="src/game/player/player_actions.cpp" line="288"/>
-        <location filename="src/game/player/player_actions.cpp" line="314"/>
-        <location filename="src/game/player/player_actions.cpp" line="386"/>
-        <location filename="src/game/player/player_actions.cpp" line="418"/>
-        <location filename="src/game/player/player_actions.cpp" line="590"/>
-        <location filename="src/game/player/player_actions.cpp" line="622"/>
-        <location filename="src/game/player/player_actions.cpp" line="739"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="67"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="78"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="89"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="100"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="111"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="139"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="163"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Number of cards: (max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="164"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="77"/>
         <source>View bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="224"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="88"/>
         <source>Shuffle top cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="253"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="99"/>
         <source>Shuffle bottom cards of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="287"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="110"/>
         <source>Draw hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="289"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="112"/>
         <source>0 and lower are in comparison to current hand size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="313"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="123"/>
         <source>Draw cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="385"/>
-        <source>Move top cards to grave</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="138"/>
+        <source>Move top cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="417"/>
-        <source>Move top cards to exile</source>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="162"/>
+        <source>Move bottom cards to %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="589"/>
-        <source>Move bottom cards to grave</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="621"/>
-        <source>Move bottom cards to exile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="738"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="174"/>
         <source>Draw bottom cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="842"/>
-        <location filename="src/game/player/player_actions.cpp" line="888"/>
-        <source>C&amp;reate another %1 token</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Create tokens</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1016"/>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="205"/>
         <source>Number:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1182"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="239"/>
         <source>Place card X cards from top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>Which position should this card be placed:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1183"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="240"/>
         <source>(max. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1342"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="254"/>
         <source>Change stats to:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1462"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="271"/>
         <source>Set annotation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/player_actions.cpp" line="1463"/>
+        <location filename="src/game_graphics/player/player_dialogs.cpp" line="272"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="src/game/player/player_actions.cpp" line="1556"/>
-        <source>Set counters</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>PlayerMenu</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="101"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="96"/>
         <source>Player &quot;%1&quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="118"/>
+        <location filename="src/game_graphics/player/menu/player_menu.cpp" line="103"/>
         <source>&amp;Counters</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>PrintingDisabledInfoWidget</name>
     <message>
-        <location filename="src/game/player/menu/player_menu.cpp" line="135"/>
-        <source>S&amp;ay</source>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="45"/>
+        <source>The Printing Selector is disabled because you have currently enabled the setting to override all selected printings with personal set preferences.
+
+This setting means you'll only see the default printing for each card, instead of being able to select a printing, and will not see the printings other people have selected.
+
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp" line="49"/>
+        <source>Enable printings again</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PrintingSelector</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="91"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="96"/>
         <source>Display Navigation Buttons</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector.cpp" line="162"/>
+        <source>Printing Selector</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PrintingSelectorCardOverlayWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="167"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="202"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="175"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="210"/>
         <source>Pin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="182"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="217"/>
         <source>Unpin Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="190"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp" line="225"/>
         <source>Show Related cards</source>
         <translation type="unfinished"/>
     </message>
@@ -6202,17 +7087,17 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>PrintingSelectorCardSelectionWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="19"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="22"/>
         <source>Previous Card in Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="24"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
         <source>Bulk Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="27"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_selection_widget.cpp" line="30"/>
         <source>Next Card in Deck</source>
         <translation type="unfinished"/>
     </message>
@@ -6220,86 +7105,94 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>PrintingSelectorCardSortingWidget</name>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="6"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
         <source>Alphabetical</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="7"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
         <source>Preference</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="8"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="9"/>
         <source>Release Date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="34"/>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp" line="50"/>
         <source>Ascending</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>PrintingSelectorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/printing_selector/printing_selector_placeholder_widget.cpp" line="41"/>
+        <source>Select a card to view its available printings</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>PtMenu</name>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="6"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="7"/>
         <source>Power / toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="52"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="63"/>
         <source>&amp;Increase power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="53"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="64"/>
         <source>&amp;Decrease power</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="54"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="65"/>
         <source>I&amp;ncrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="55"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="66"/>
         <source>D&amp;ecrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="56"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="67"/>
         <source>In&amp;crease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="57"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="68"/>
         <source>Dec&amp;rease power and toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="69"/>
         <source>Increase power and decrease toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="59"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="70"/>
         <source>Decrease power and increase toughness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="71"/>
         <source>Set &amp;power and toughness...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/pt_menu.cpp" line="61"/>
+        <location filename="src/game_graphics/player/menu/pt_menu.cpp" line="72"/>
         <source>Reset p&amp;ower and toughness</source>
         <translation type="unfinished"/>
     </message>
@@ -6307,37 +7200,37 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>QMenuBar</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="770"/>
+        <location filename="src/interface/window_main.cpp" line="400"/>
         <source>Services</source>
         <translation>服務</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="771"/>
+        <location filename="src/interface/window_main.cpp" line="401"/>
         <source>Hide %1</source>
         <translation>隱藏 %1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="772"/>
+        <location filename="src/interface/window_main.cpp" line="402"/>
         <source>Hide Others</source>
         <translation>隱藏其他</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="773"/>
+        <location filename="src/interface/window_main.cpp" line="403"/>
         <source>Show All</source>
         <translation>展示所有</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="774"/>
+        <location filename="src/interface/window_main.cpp" line="404"/>
         <source>Preferences...</source>
         <translation>參數</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="775"/>
+        <location filename="src/interface/window_main.cpp" line="405"/>
         <source>Quit %1</source>
         <translation>退出%1</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="776"/>
+        <location filename="src/interface/window_main.cpp" line="406"/>
         <source>About %1</source>
         <translation>關於 %1</translation>
     </message>
@@ -6345,153 +7238,247 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="86"/>
+        <location filename="src/interface/window_main.cpp" line="80"/>
         <source>Cockatrice card database (*.xml)</source>
         <translation>CockatriceCockatrice卡牌數據庫 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="87"/>
+        <location filename="src/interface/window_main.cpp" line="81"/>
         <source>All files (*.*)</source>
         <translation>全部文件 (*.*)</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="269"/>
+        <location filename="src/interface/window_main.cpp" line="181"/>
         <source>Cockatrice replays (*.cor)</source>
         <translation>Cockatrice錄像文件 (*.cor)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="26"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="26"/>
         <source>Maindeck</source>
         <translation>主套牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="28"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="28"/>
         <source>Sideboard</source>
         <translation>備牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/inner_deck_list_node.cpp" line="30"/>
+        <location filename="../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp" line="30"/>
         <source>Tokens</source>
         <translation>衍生物</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="88"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp" line="89"/>
+        <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"/>
     </message>
+    <message>
+        <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.
+
+You will have to use the Set Manager, available through Card Database -&gt; Manage Sets.
+
+Are you sure you would like to enable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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.
+
+You can also use the Set Manager to adjust custom sort order for printings in the Printing Selector (other sort orders like alphabetical or release date are available).
+
+Are you sure you would like to disable this feature?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/dialogs/override_printing_warning.cpp" line="27"/>
+        <source>Confirm Change</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QPlatformTheme</name>
     <message>
-        <location filename="src/interface/window_main.cpp" line="779"/>
+        <location filename="src/interface/window_main.cpp" line="409"/>
         <source>OK</source>
         <translation>確定</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="780"/>
+        <location filename="src/interface/window_main.cpp" line="410"/>
         <source>Save</source>
         <translation>保存</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="781"/>
+        <location filename="src/interface/window_main.cpp" line="411"/>
         <source>Save All</source>
         <translation>保存全部</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="782"/>
+        <location filename="src/interface/window_main.cpp" line="412"/>
         <source>Open</source>
         <translation>打開</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="783"/>
+        <location filename="src/interface/window_main.cpp" line="413"/>
         <source>&amp;Yes</source>
         <translation>是</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="784"/>
+        <location filename="src/interface/window_main.cpp" line="414"/>
         <source>Yes to &amp;All</source>
         <translation>全選是</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="785"/>
+        <location filename="src/interface/window_main.cpp" line="415"/>
         <source>&amp;No</source>
         <translation>否</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="786"/>
+        <location filename="src/interface/window_main.cpp" line="416"/>
         <source>N&amp;o to All</source>
         <translation>全選否</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="787"/>
+        <location filename="src/interface/window_main.cpp" line="417"/>
         <source>Abort</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="788"/>
+        <location filename="src/interface/window_main.cpp" line="418"/>
         <source>Retry</source>
         <translation>重試</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="789"/>
+        <location filename="src/interface/window_main.cpp" line="419"/>
         <source>Ignore</source>
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="790"/>
+        <location filename="src/interface/window_main.cpp" line="420"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="791"/>
+        <location filename="src/interface/window_main.cpp" line="421"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="792"/>
+        <location filename="src/interface/window_main.cpp" line="422"/>
         <source>Discard</source>
         <translation>棄牌</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="793"/>
+        <location filename="src/interface/window_main.cpp" line="423"/>
         <source>Help</source>
         <translation>幫助</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="794"/>
+        <location filename="src/interface/window_main.cpp" line="424"/>
         <source>Apply</source>
         <translation>應用</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="795"/>
+        <location filename="src/interface/window_main.cpp" line="425"/>
         <source>Reset</source>
         <translation>重置</translation>
     </message>
     <message>
-        <location filename="src/interface/window_main.cpp" line="796"/>
+        <location filename="src/interface/window_main.cpp" line="426"/>
         <source>Restore Defaults</source>
         <translation>恢復為默認值</translation>
     </message>
 </context>
+<context>
+    <name>QuickSetupPanel</name>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="60"/>
+        <source>%1%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="70"/>
+        <source>Accent:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="73"/>
+        <source>Intensity:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="74"/>
+        <source>Subtle</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="75"/>
+        <source>Full colour</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="79"/>
+        <source>70%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/palette_editor/quick_setup_panel.cpp" line="81"/>
+        <source>Generate ↓</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+</context>
 <context>
     <name>RemoteDeckList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="168"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="181"/>
         <source>Name</source>
         <translation>名稱</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="170"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="183"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp" line="185"/>
         <source>Upload time</source>
         <translation>上傳時間</translation>
     </message>
@@ -6499,32 +7486,32 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>RemoteReplayList_TreeModel</name>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
         <source>ID</source>
         <translation>ID</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="150"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="158"/>
         <source>Name</source>
         <translation>名稱</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="152"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="160"/>
         <source>Players</source>
         <translation>玩家</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="162"/>
         <source>Keep</source>
         <translation>維持</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="156"/>
+        <location filename="src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp" line="164"/>
         <source>Time started</source>
         <translation>遊戲時間</translation>
     </message>
     <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="166"/>
         <source>Duration (sec)</source>
         <translation>持續(離開)</translation>
     </message>
@@ -6532,37 +7519,37 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>RfgMenu</name>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="58"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="61"/>
         <source>&amp;Exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="60"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="63"/>
         <source>&amp;View exile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="63"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="66"/>
         <source>&amp;Move exile to...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="64"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="67"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="65"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="68"/>
         <source>&amp;Bottom of library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="66"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="69"/>
         <source>&amp;Hand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/rfg_menu.cpp" line="67"/>
+        <location filename="src/game_graphics/player/menu/rfg_menu.cpp" line="70"/>
         <source>&amp;Graveyard</source>
         <translation type="unfinished"/>
     </message>
@@ -6570,41 +7557,49 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>RoomSelector</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="49"/>
         <source>Rooms</source>
         <translation>房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="50"/>
         <source>Joi&amp;n</source>
         <translation>加入</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="58"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="53"/>
         <source>Room</source>
         <translation>房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="59"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="54"/>
         <source>Description</source>
         <translation>信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="60"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="55"/>
         <source>Permissions</source>
         <translation>許可證</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="61"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="56"/>
         <source>Players</source>
         <translation>玩家</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="62"/>
+        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="57"/>
         <source>Games</source>
         <translation>遊戲</translation>
     </message>
 </context>
+<context>
+    <name>SayMenu</name>
+    <message>
+        <location filename="src/game_graphics/player/menu/say_menu.cpp" line="17"/>
+        <source>S&amp;ay</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>SequenceEdit</name>
     <message>
@@ -6641,27 +7636,27 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>SetsModel</name>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="84"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="89"/>
         <source>Enabled</source>
         <translation>已啓用</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="86"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="91"/>
         <source>Set type</source>
         <translation>設置類型</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="88"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="93"/>
         <source>Set code</source>
         <translation>設置代碼</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="90"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="95"/>
         <source>Long name</source>
         <translation>長的名稱</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp" line="92"/>
+        <location filename="../libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp" line="97"/>
         <source>Release date</source>
         <translation>發佈日期</translation>
     </message>
@@ -6669,53 +7664,53 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1709"/>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1732"/>
+        <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>恢復所有默認快捷鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1710"/>
+        <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>確定要恢復所有默認快捷鍵嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1717"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="110"/>
         <source>Clear all default shortcuts</source>
         <translation>清楚所有默認快捷鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1718"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="111"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation>確定要清楚所有快捷鍵？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1727"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="120"/>
         <source>Section:</source>
         <translation>部分:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1728"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="121"/>
         <source>Action:</source>
         <translation>行動:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1729"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="122"/>
         <source>Shortcut:</source>
         <translation>快捷鍵:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1731"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="124"/>
         <source>How to set custom shortcuts</source>
         <translation>如何設置自定義快捷鍵</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1733"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="126"/>
         <source>Clear all shortcuts</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1734"/>
+        <location filename="src/interface/widgets/settings_page/shortcut_settings_page.cpp" line="127"/>
         <source>Search by shortcut name</source>
         <translation type="unfinished"/>
     </message>
@@ -6723,12 +7718,12 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>ShortcutTreeView</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="97"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="97"/>
         <source>Action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp" line="98"/>
+        <location filename="src/client/settings/shortcut_treeview.cpp" line="98"/>
         <source>Shortcut</source>
         <translation type="unfinished"/>
     </message>
@@ -6736,14 +7731,14 @@ CockatriceCockatrice現在會重新載入卡組數據庫。</translation>
 <context>
     <name>ShortcutsSettings</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="54"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="54"/>
         <source>Your configuration file contained invalid shortcuts.
 Please check your shortcut settings!</source>
         <translation>您的配置文件包涵了無效的快捷鍵
 請檢查您的快捷鍵設定</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.cpp" line="56"/>
+        <location filename="src/client/settings/shortcuts_settings.cpp" line="56"/>
         <source>The following shortcuts have been set to default:
 </source>
         <translation>以下快捷方式被設置為默認狀態：
@@ -6771,12 +7766,12 @@ Please check your shortcut settings!</source>
 <context>
     <name>SideboardMenu</name>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="19"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="22"/>
         <source>&amp;Sideboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/sideboard_menu.cpp" line="20"/>
+        <location filename="src/game_graphics/player/menu/sideboard_menu.cpp" line="23"/>
         <source>&amp;View sideboard</source>
         <translation type="unfinished"/>
     </message>
@@ -6784,27 +7779,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1611"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="81"/>
         <source>Enable &amp;sounds</source>
         <translation>啓用聲效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1612"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="82"/>
         <source>Current sounds theme:</source>
         <translation>當前聲效主題：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1613"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="83"/>
         <source>Test system sound engine</source>
         <translation>測試系統聲效</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1614"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="84"/>
         <source>Sound settings</source>
         <translation>聲效設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="1615"/>
+        <location filename="src/interface/widgets/settings_page/sound_settings_page.cpp" line="85"/>
         <source>Master volume</source>
         <translation>主音量</translation>
     </message>
@@ -6812,48 +7807,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="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Spoilers season has ended</source>
         <translation>預覽季節已結束</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="101"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="102"/>
         <source>Deleting spoiler.xml. Please run Oracle</source>
         <translation>刪除spoiler.xml。請運行Oracle</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <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>預覽下載錯誤</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="111"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="112"/>
         <source>No internet connection</source>
         <translation>沒有網絡連接</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="118"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="119"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>Spoilers already up to date</source>
         <translation>Spoilers更新已準備好</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="139"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="140"/>
         <source>No new spoilers added</source>
         <translation>沒有新的預覽被添加</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Spoilers have been updated!</source>
         <translation>預覽已更新！</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="184"/>
+        <location filename="src/client/network/update/card_spoiler/spoiler_background_updater.cpp" line="185"/>
         <source>Last change:</source>
         <translation>最後變更：</translation>
     </message>
@@ -6876,16 +7871,146 @@ Please check your shortcut settings!</source>
         <translation>收到更新伺服器的無效回應。</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="176"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="177"/>
         <source>No reply received from the tag update server.</source>
         <translation>未收到標籤更新伺服器的回應</translation>
     </message>
     <message>
-        <location filename="src/client/network/update/client/release_channel.cpp" line="183"/>
+        <location filename="src/client/network/update/client/release_channel.cpp" line="184"/>
         <source>Invalid reply received from the tag update server.</source>
         <translation>收到標籤更新伺服器的無效回應</translation>
     </message>
 </context>
+<context>
+    <name>StorageSettingsPage</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="178"/>
+        <source>Cached card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="191"/>
+        <source>Downloaded card pictures have been reset.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="193"/>
+        <source>Error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="205"/>
+        <source>Card Picture Loader Caching Method:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="226"/>
+        <source>Delete Cached Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="227"/>
+        <source>Delete Saved Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="228"/>
+        <source>Clear In-Memory Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="230"/>
+        <source>Card Picture Loader Cache Method</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="231"/>
+        <source>Network Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="232"/>
+        <source>Filesystem</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="233"/>
+        <source>In-Memory Picture Cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="235"/>
+        <source>Network Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="236"/>
+        <source>On-disk cache for downloaded pictures</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="237"/>
+        <source>Redirect Cache TTL:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="239"/>
+        <source>Picture Cache Size:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="241"/>
+        <source>Naming scheme:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/storage_settings_page.cpp" line="243"/>
+        <source>Day(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabAccount</name>
     <message>
@@ -7017,56 +8142,227 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
 </context>
+<context>
+    <name>TabArchidekt</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="395"/>
+        <source>Require ALL selected colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="206"/>
+        <source>Bracket:</source>
+        <translation type="unfinished"/>
+    </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="262"/>
+        <source>Any</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="270"/>
+        <source>Cards:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="389"/>
+        <source>Sort by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="392"/>
+        <source>Filter by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp" line="411"/>
+        <source>Display Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/api/archidekt/tab_archidekt.h" line="88"/>
+        <source>Archidekt: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TabCardArtRules</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="162"/>
+        <source>Card:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="163"/>
+        <source>ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="164"/>
+        <source>Mode:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="165"/>
+        <source>Reason:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="192"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="254"/>
+        <source>Add rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="255"/>
+        <source>Remove rule</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.cpp" line="256"/>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_card_art_rules.h" line="58"/>
+        <source>Card Art Rules</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>TabDeckEditor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="132"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="102"/>
         <source>Card Info</source>
         <translation>卡牌信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="133"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="103"/>
         <source>Deck</source>
         <translation>套牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="134"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="104"/>
         <source>Filters</source>
         <translation>過濾器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="131"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="99"/>
         <source>&amp;View</source>
         <translation>視圖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="135"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="101"/>
+        <source>Card Database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="105"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="137"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="140"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="143"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="108"/>
         <source>Visible</source>
         <translation>可見</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="138"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="141"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="144"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="109"/>
         <source>Floating</source>
         <translation>移動窗口</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_editor.cpp" line="112"/>
         <source>Reset layout</source>
         <translation>重置界面</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="82"/>
         <source>Deck: %1</source>
         <translation>套牌: %1</translation>
     </message>
@@ -7074,61 +8370,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="149"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="129"/>
         <source>Visual Deck: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="320"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="327"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="323"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="328"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="324"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="329"/>
-        <source>Filters</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="326"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="300"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="330"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="305"/>
         <source>Printing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="332"/>
-        <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="338"/>
-        <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="308"/>
         <source>Visible</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="336"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="339"/>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="342"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp" line="309"/>
         <source>Floating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <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="312"/>
         <source>Reset layout</source>
         <translation type="unfinished"/>
     </message>
@@ -7136,22 +8420,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="43"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="44"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="45"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp" line="46"/>
+        <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"/>
     </message>
@@ -7192,8 +8476,8 @@ Please check your shortcut settings!</source>
     <message>
         <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="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>新建文件夾</translation>
     </message>
@@ -7209,84 +8493,84 @@ Please check your shortcut settings!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="260"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="263"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="266"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <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>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="278"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="281"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="313"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
         <source>Enter deck name</source>
         <translation>輸入套牌名稱</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="320"/>
+        <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>這個套牌沒有名稱.
 請輸入一個名稱:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="325"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="331"/>
         <source>Unnamed deck</source>
         <translation>未命名套牌</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="350"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="357"/>
         <source>Failed to upload deck to server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="396"/>
         <source>Delete local file</source>
         <translation>刪除本地文件</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="388"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="561"/>
         <source>Delete remote decks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="544"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="373"/>
-        <location filename="src/interface/widgets/tabs/tab_deck_storage.cpp" line="508"/>
+        <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>新建文件夾的名稱:</translation>
     </message>
@@ -7299,17 +8583,17 @@ Please enter a name:</source>
 <context>
     <name>TabDeckStorageVisual</name>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h" line="35"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="30"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp" line="32"/>
+        <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"/>
     </message>
@@ -7350,7 +8634,7 @@ Please enter a name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="33"/>
+        <location filename="src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h" line="32"/>
         <source>EDHRec: </source>
         <translation type="unfinished"/>
     </message>
@@ -7358,197 +8642,191 @@ Please enter a name:</source>
 <context>
     <name>TabGame</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="913"/>
+        <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>錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="279"/>
+        <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>遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="273"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="346"/>
+        <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>玩家列表</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="283"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="344"/>
+        <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>卡牌信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="284"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="345"/>
+        <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>消息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="286"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="358"/>
+        <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>錄像時間線</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="291"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="297"/>
         <source>&amp;Phases</source>
         <translation>階段</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="294"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="300"/>
         <source>&amp;Game</source>
         <translation>遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="296"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
         <source>Next &amp;phase</source>
         <translation>下個階段</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="299"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
         <source>Next phase with &amp;action</source>
         <translation>下個階段&amp;行動</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="302"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
         <source>Next &amp;turn</source>
         <translation>下個回合</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="305"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
         <source>Reverse turn order</source>
         <translation>反轉回合順序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="308"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
         <source>&amp;Remove all local arrows</source>
         <translation>移除所有箭頭</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="311"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
         <source>Rotate View Cl&amp;ockwise</source>
         <translation>順時針旋轉視角</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="314"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
         <source>Rotate View Co&amp;unterclockwise</source>
         <translation>逆時針旋轉視角</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="317"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="323"/>
         <source>Game &amp;information</source>
         <translation>遊戲信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="320"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
         <source>Un&amp;concede</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="322"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="826"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="847"/>
+        <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>放棄遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="329"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
         <source>&amp;Leave game</source>
         <translation>離開遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="327"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="334"/>
         <source>C&amp;lose replay</source>
         <translation>關閉遊戲錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
         <source>&amp;Focus Chat</source>
         <translation>聚焦聊天室</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="336"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
         <source>&amp;Say:</source>
         <translation>説：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="340"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="347"/>
         <source>Selected cards</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="343"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="350"/>
         <source>&amp;View</source>
         <translation>視圖</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="348"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="351"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="354"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="359"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="361"/>
         <source>Visible</source>
         <translation>可見</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="349"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="352"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="355"/>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="360"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="362"/>
         <source>Floating</source>
         <translation>移動窗口</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="363"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="365"/>
         <source>Reset layout</source>
         <translation>重置界面</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="495"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="499"/>
         <source>Are you sure you want to concede this game?</source>
         <translation>你確定放棄這個遊戲？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="501"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="505"/>
         <source>Unconcede</source>
         <translation>取消投降</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="502"/>
+        <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>你已經投降,你想回到這場遊戲嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Leave game</source>
         <translation>離開遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="520"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="524"/>
         <source>Are you sure you want to leave this game?</source>
         <translation>你確定離開這這個遊戲？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="636"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
         <source>A player has joined game #%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="637"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="638"/>
         <source>%1 has joined the game</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="646"/>
+        <location filename="src/interface/widgets/tabs/tab_game.cpp" line="647"/>
         <source>You have been kicked out of the game.</source>
         <translation>你已被踢出遊戲。</translation>
     </message>
@@ -7556,7 +8834,7 @@ Please enter a name:</source>
 <context>
     <name>TabHome</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_home.h" line="31"/>
+        <location filename="src/interface/widgets/tabs/tab_home.h" line="29"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
@@ -7564,158 +8842,158 @@ Please enter a name:</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>記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="30"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="36"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="42"/>
+        <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>時間；發送者姓名；發送者IP；消息；目標ID；目標姓名</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="43"/>
         <source>Room Logs</source>
         <translation>房間記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="46"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="44"/>
         <source>Game Logs</source>
         <translation>遊戲記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="47"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="45"/>
         <source>Chat Logs</source>
         <translation>聊天記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="68"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="66"/>
         <source>You must select at least one filter.</source>
         <translation>您必須至少選擇一個過濾項</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="78"/>
+        <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>您必須選擇一個可用的天數用來定位</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="150"/>
         <source>Username: </source>
         <translation>用户名：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="152"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="154"/>
         <source>IP Address: </source>
         <translation>IP地址：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="156"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="158"/>
         <source>Game Name: </source>
         <translation>遊戲名：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="160"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="162"/>
         <source>GameID: </source>
         <translation>遊戲ID：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="164"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="166"/>
         <source>Message: </source>
         <translation>消息：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="169"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
         <source>Main Room</source>
         <translation>主房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="170"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="172"/>
         <source>Game Room</source>
         <translation>遊戲房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
         <source>Private Chat</source>
         <translation>私人聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="173"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
         <source>Past X Days: </source>
         <translation>過去 X 天：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="174"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="176"/>
         <source>Today</source>
         <translation>今天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="175"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="177"/>
         <source>Last Hour</source>
         <translation>1小時前</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="179"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="181"/>
         <source>Maximum Results: </source>
         <translation>最大結果：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="183"/>
+        <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>至少需要1個篩選項。
 您輸入的信息越多，找到結果越準確。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="186"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="188"/>
         <source>Get User Logs</source>
         <translation>獲取用戶記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="190"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="192"/>
         <source>Clear Filters</source>
         <translation>清楚篩選項目</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="208"/>
         <source>Filters</source>
         <translation>過濾器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="218"/>
         <source>Log Locations</source>
         <translation>記錄位置</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="225"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="227"/>
         <source>Date Range</source>
         <translation>日期範圍</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="232"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="234"/>
         <source>Maximum Results</source>
         <translation>最大結果</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="269"/>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="275"/>
+        <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>消息歷史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="270"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="272"/>
         <source>Failed to collect message history information.</source>
         <translation>獲取消息歷史信息失敗。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="276"/>
+        <location filename="src/interface/widgets/tabs/tab_logs.cpp" line="278"/>
         <source>There are no messages for the selected filters.</source>
         <translation>沒有符合篩選條件的消息。</translation>
     </message>
@@ -7733,27 +9011,27 @@ The more information you put in, the more specific your results will be.</source
         <translation>離開</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="86"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="87"/>
         <source>%1 - Private chat</source>
         <translation>%1 - 私人聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="114"/>
+        <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>該用戶已屏蔽你，他無法在主聊天中看見你的消息，你也不能加入他的遊戲。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="144"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="150"/>
         <source>Private message from</source>
         <translation>私人信息來自</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="161"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
         <source>%1 has left the server.</source>
         <translation>%1 已經離開了伺服器.</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="167"/>
+        <location filename="src/interface/widgets/tabs/tab_message.cpp" line="173"/>
         <source>%1 has joined the server.</source>
         <translation>%1 已經加入了伺服器.</translation>
     </message>
@@ -7761,180 +9039,180 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabReplays</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="199"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
         <source>Local file system</source>
         <translation>本地文件系統</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="200"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="201"/>
         <source>Server replay storage</source>
         <translation>伺服器錄像倉庫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="202"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
+        <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>觀看錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="203"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
         <source>Rename</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="204"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
+        <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>刪除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="207"/>
         <source>Open replays folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
         <source>Download replay</source>
         <translation>下載遊戲錄像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="210"/>
         <source>Toggle expiration lock</source>
         <translation>過期鎖定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="212"/>
         <source>Get replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="213"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local folder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="282"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="287"/>
         <source>Rename local file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="285"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="290"/>
         <source>New name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="300"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="305"/>
         <source>Rename failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="318"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="323"/>
         <source>Name of new folder:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="339"/>
         <source>Delete local file</source>
         <translation>刪除本地文件</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="333"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="490"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="537"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
         <source>Failed to get code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="539"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="600"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="545"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="561"/>
         <source>Could not get replay code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="553"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="569"/>
         <source>Replay Share Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="555"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="557"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="573"/>
         <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="566"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="582"/>
         <source>Replay share code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="587"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="603"/>
         <source>Replay code found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="588"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="593"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="609"/>
         <source>Replay code not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="598"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="614"/>
         <source>Failed to submit code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="605"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="621"/>
         <source>Unexpected error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="489"/>
+        <location filename="src/interface/widgets/tabs/tab_replays.cpp" line="504"/>
         <source>Delete remote replay</source>
         <translation>刪除伺服器上的錄像</translation>
     </message>
@@ -7947,47 +9225,62 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabRoom</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="146"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="67"/>
+        <source>Friends</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="68"/>
+        <source>Online</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="69"/>
+        <source>Ignored</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="161"/>
         <source>&amp;Say:</source>
         <translation>説：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="147"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="162"/>
         <source>Chat</source>
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="148"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
         <source>&amp;Room</source>
         <translation>房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="149"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="164"/>
         <source>&amp;Leave room</source>
         <translation>離開房間</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="150"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="165"/>
         <source>&amp;Clear chat</source>
         <translation>清除聊天記錄</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="151"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="166"/>
         <source>Chat Settings...</source>
         <translation>聊天設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="163"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="178"/>
         <source> mentioned you.</source>
         <translation>提到了你。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="171"/>
+        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="186"/>
         <source>Click to view</source>
         <translation>點擊查看</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_room.cpp" line="215"/>
+        <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>你正在灌水，請等待幾秒再發言.</translation>
     </message>
@@ -8000,30 +9293,30 @@ The more information you put in, the more specific your results will be.</source
         <translation>伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="205"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="210"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="215"/>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="220"/>
+        <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>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="206"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="211"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_server.cpp" line="221"/>
+        <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"/>
     </message>
@@ -8031,92 +9324,97 @@ The more information you put in, the more specific your results will be.</source
 <context>
     <name>TabSupervisor</name>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="205"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="217"/>
         <source>Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="206"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="218"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="207"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="219"/>
         <source>EDHRec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="208"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="220"/>
+        <source>Archidekt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="221"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="209"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="222"/>
         <source>&amp;Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="210"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="223"/>
         <source>Visual Database Display</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="211"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="224"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="212"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="225"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="213"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="226"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="214"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="227"/>
         <source>Game Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="215"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="228"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="216"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="229"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="275"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="293"/>
         <source>Are you sure?</source>
         <translation>你確定嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="276"/>
+        <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>遊戲還在繼續, 你確定要退出嗎？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="999"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1075"/>
         <source>Click to view</source>
         <translation>點擊查看</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1027"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1104"/>
         <source>Your buddy %1 has signed on!</source>
         <translation>你的好友%1已登錄!</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1068"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1148"/>
         <source>Unknown Event</source>
         <translation>未知事件</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1069"/>
+        <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.
 
@@ -8127,39 +9425,39 @@ To update your client, go to Help -&gt; Check for Updates.</source>
 要升級你的客户端，請點擊“幫助”-&gt;“檢查更新”</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>Idle Timeout</source>
         <translation>閒置超時</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1074"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1154"/>
         <source>You are about to be logged out due to inactivity.</source>
         <translation>你即將因為長時間未操作而被退出。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1078"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1158"/>
         <source>Promotion</source>
         <translation>晉升</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1079"/>
+        <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>你已被提升為版主。請退出再登陸以使修改生效。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1083"/>
+        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1163"/>
         <source>Warned</source>
         <translation>被警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1084"/>
+        <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>你因為%1被警告。
 請杜絕此類行為否則會被採取進一步行動。如果有任何疑問，請私信版主。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/tabs/tab_supervisor.cpp" line="1098"/>
+        <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>你收到來自伺服器的如下消息。
@@ -8168,6 +9466,11 @@ Please refrain from engaging in this activity or further actions may be taken ag
 </context>
 <context>
     <name>TabVisualDatabaseDisplay</name>
+    <message>
+        <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="29"/>
+        <source>Database Display</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/tabs/tab_visual_database_display.h" line="28"/>
         <source>Visual Database Display</source>
@@ -8208,42 +9511,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>TranslateCounterName</name>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="4"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="4"/>
         <source>Life</source>
         <translation>生命值</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="5"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="5"/>
         <source>White</source>
         <translation>白色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="6"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="6"/>
         <source>Blue</source>
         <translation>藍色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="7"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="7"/>
         <source>Black</source>
         <translation>黑色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="8"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="8"/>
         <source>Red</source>
         <translation>紅色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="9"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="9"/>
         <source>Green</source>
         <translation>綠色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="10"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="10"/>
         <source>Colorless</source>
         <translation>無色</translation>
     </message>
     <message>
-        <location filename="src/game/board/translate_counter_name.cpp" line="11"/>
+        <location filename="src/game_graphics/board/translate_counter_name.cpp" line="11"/>
         <source>Other</source>
         <translation>其他</translation>
     </message>
@@ -8251,151 +9554,209 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UpdateDownloader</name>
     <message>
-        <location filename="src/client/network/update/client/update_downloader.cpp" line="52"/>
+        <location filename="src/client/network/update/client/update_downloader.cpp" line="53"/>
         <source>Could not open the file for reading.</source>
         <translation>無法打開文件。</translation>
     </message>
 </context>
+<context>
+    <name>UserCardArtSettingsDialog</name>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="98"/>
+        <source>Card Art Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="131"/>
+        <source>Type a card name...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="190"/>
+        <source>Card name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="191"/>
+        <source>Card ProviderId:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="192"/>
+        <source>Left margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="193"/>
+        <source>Right margin (%):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="194"/>
+        <source>Vertical offset:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="195"/>
+        <source>Zoom:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="197"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="204"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_card_settings_dialog.cpp" line="208"/>
+        <source>Remove Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>UserContextMenu</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="59"/>
         <source>User &amp;details</source>
         <translation>用户詳細信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="60"/>
         <source>Private &amp;chat</source>
         <translation>私人聊天</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="63"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="61"/>
         <source>Show this user&apos;s &amp;games</source>
         <translation>顯示這個用户的遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="64"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="62"/>
         <source>Add to &amp;buddy list</source>
         <translation>加入到好友列表</translation>
     </message>
     <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="63"/>
         <source>Remove from &amp;buddy list</source>
         <translation>從好友列表移除</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="64"/>
         <source>Add to &amp;ignore list</source>
         <translation>加入到屏蔽列表</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="65"/>
         <source>Remove from &amp;ignore list</source>
         <translation>從屏蔽列表移除</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="68"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="66"/>
         <source>Kick from &amp;game</source>
         <translation>從遊戲中踢出</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="67"/>
         <source>Warn user</source>
         <translation>警告用戶</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="68"/>
         <source>View user&apos;s war&amp;n history</source>
         <translation>查看用户警告記錄</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="69"/>
         <source>Ban from &amp;server</source>
         <translation>在伺服器中禁止</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="70"/>
         <source>View user&apos;s &amp;ban history</source>
         <translation>查看用户禁止記錄</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="71"/>
         <source>&amp;Promote user to moderator</source>
         <translation>將用戶提升為版主</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="74"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="72"/>
         <source>Dem&amp;ote user from moderator</source>
         <translation>撤銷用户版主職位</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="73"/>
         <source>Promote user to &amp;judge</source>
         <translation type="unfinished"/>
     </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="74"/>
         <source>Demote user from judge</source>
         <translation>撤銷用戶的裁判身份</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="75"/>
         <source>View admin notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="88"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="92"/>
+        <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"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="90"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="82"/>
         <source>This user does not exist.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="89"/>
+        <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"/>
     </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="91"/>
         <source>Could not get %1&apos;s games.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="120"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="118"/>
         <source>%1&apos;s games</source>
         <translation>%1的遊戲</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="175"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="198"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
+        <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>禁止歷史</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="181"/>
+        <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>禁止時間；版主；禁止時長；禁止理由；可見理由</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="199"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="197"/>
         <source>User has never been banned.</source>
         <translation>用戶從未被禁止</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="203"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="202"/>
         <source>Failed to collect ban information.</source>
         <translation>獲取禁止信息失敗。</translation>
     </message>
     <message>
         <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="238"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
         <source>Warning History</source>
         <translation>警告歷史</translation>
     </message>
@@ -8410,55 +9771,65 @@ Please refrain from engaging in this activity or further actions may be taken ag
         <translation>用戶從未被警告</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="239"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="240"/>
         <source>Failed to collect warning information.</source>
         <translation>獲取警告信息失敗。</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="249"/>
         <source>Failed to get admin notes.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="264"/>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <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>成功</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="265"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
         <source>Successfully promoted user.</source>
         <translation>提升用戶成功。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="267"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="269"/>
         <source>Successfully demoted user.</source>
         <translation>撤銷用戶成功。</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="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="479"/>
+        <source>Kick Player</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>失敗</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="272"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="274"/>
         <source>Failed to promote user.</source>
         <translation>提升用戶失敗。</translation>
     </message>
     <message>
-        <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 to demote user.</source>
         <translation>撤銷用戶失敗。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="360"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="363"/>
         <source>Copy hash to clipboard</source>
         <translation>複製哈希到剪貼板</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="380"/>
+        <location filename="src/interface/widgets/server/user/user_context_menu.cpp" line="383"/>
         <source>Remove this user&apos;s messages</source>
         <translation type="unfinished"/>
     </message>
@@ -8466,311 +9837,554 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInfoBox</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="79"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="82"/>
         <source>Location:</source>
         <translation>位置:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
         <source>Account Age:</source>
         <translation>賬號年齡：</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="86"/>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="84"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="87"/>
         <source>Change password</source>
         <translation>修改密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="85"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="88"/>
         <source>Change avatar</source>
         <translation>修改頭像</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="127"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="124"/>
         <source>Administrator</source>
         <translation>管理員</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="129"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="126"/>
         <source>Moderator</source>
         <translation>版主</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="131"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="128"/>
         <source>Registered user</source>
         <translation>註冊用戶</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="133"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="144"/>
+        <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>未註冊用戶</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>裁判</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="154"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="153"/>
         <source>Unknown</source>
         <translation>未知的</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <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>信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="316"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="364"/>
         <source>User information updated.</source>
         <translation>用戶信息已更新。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="268"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="319"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="323"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="327"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="350"/>
-        <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="368"/>
+        <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="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>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="71"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="74"/>
         <source>User Information</source>
         <translation>用戶信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="78"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="81"/>
         <source>Real Name:</source>
         <translation>真實姓名:</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="80"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="83"/>
         <source>User Level:</source>
         <translation>用戶等級:</translation>
     </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="89"/>
+        <source>Edit Banner Card</source>
+        <translation type="unfinished"/>
+    </message>
     <message numerus="yes">
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="172"/>
+        <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"><numerusform></numerusform></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="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"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="231"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="233"/>
         <source>Enter Password</source>
         <translation>輸入密碼</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="232"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="269"/>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="328"/>
-        <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="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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="320"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card removed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="353"/>
+        <source>Banner card updated.</source>
+        <translation type="unfinished"/>
+    </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>
         <translation>該伺服器不允許你更新你的用戶信息。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="337"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="385"/>
         <source>Password changed.</source>
         <translation>密碼已修改。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="340"/>
+        <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>該伺服器不允許你修改你的密碼。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="343"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="391"/>
         <source>The new password is too short.</source>
         <translation>新密碼太短。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="346"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="394"/>
         <source>The old password is incorrect.</source>
         <translation>原密碼不正確。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="361"/>
+        <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="409"/>
         <source>Avatar updated.</source>
         <translation>頭像已更新。</translation>
     </message>
     <message>
-        <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="412"/>
         <source>This server does not permit you to update your avatar.</source>
         <translation>該伺服器不允許你更新你的頭像。</translation>
     </message>
+    <message>
+        <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"/>
+    </message>
     <message>
         <location filename="src/interface/widgets/server/user/user_info_box.cpp" line="368"/>
-        <source>An error occured while trying to updater your avatar.</source>
-        <translation>嘗試更新你的頭像時出錯。</translation>
+        <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>該伺服器不允許你更新你的用戶信息。</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoPopup</name>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="397"/>
+        <source>Open private chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="402"/>
+        <source>View user profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="406"/>
+        <source>Show this user&apos;s games</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>− Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="414"/>
+        <source>Remove from buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>+ Buddy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="418"/>
+        <source>Add to buddy list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>− Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="423"/>
+        <source>Remove from ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>+ Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="427"/>
+        <source>Add to ignore list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="440"/>
+        <source>Ban from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="441"/>
+        <source>Warn user</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>Ban log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="442"/>
+        <source>View ban history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>Warn log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="443"/>
+        <source>View warning history</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>Notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="456"/>
+        <source>View admin notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>− Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="461"/>
+        <source>Demote from moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>+ Mod</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="465"/>
+        <source>Promote to moderator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>− Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="470"/>
+        <source>Demote from judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>+ Judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="474"/>
+        <source>Promote to judge</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="508"/>
+        <source>Join game</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="513"/>
+        <source>Spectate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="593"/>
+        <source>Could not load games.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/server/user/user_info_popup.cpp" line="601"/>
+        <source>No active games.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="941"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="209"/>
         <source>General interface settings</source>
         <translation>通用接口設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="942"/>
+        <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>雙擊卡牌開始 (而不是單擊開始)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="943"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="944"/>
+        <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>默認將所有非地牌加入堆疊(不是戰場)</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="945"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="946"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="947"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="216"/>
         <source>Annotate card text on tokens</source>
         <translation>用卡牌信息給衍生物標注</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="948"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="218"/>
+        <source>Show total selection count</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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>使用浮動菜單，允許右鍵單擊菜單保留在屏幕上</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="949"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="224"/>
         <source>Notifications settings</source>
         <translation>通知設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="950"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="225"/>
         <source>Enable notifications in taskbar</source>
         <translation>開啓任務欄提醒</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="951"/>
+        <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>觀看時在任務欄提示遊戲信息</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="952"/>
+        <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>在任務欄中提示好友連接到伺服器</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="953"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="228"/>
         <source>Animation settings</source>
         <translation>動畫設定</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="954"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="229"/>
         <source>&amp;Tap/untap animation</source>
         <translation>橫置/重置 動畫</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="955"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="230"/>
         <source>Deck editor/storage settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="956"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="957"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="958"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="960"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="962"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="237"/>
         <source>do nothing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="964"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="239"/>
         <source>ask to convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="966"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="241"/>
         <source>always convert to .cod</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="967"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="242"/>
         <source>Default deck editor type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="968"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="243"/>
         <source>Classic Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="969"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="244"/>
         <source>Visual Deck Editor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="970"/>
+        <location filename="src/interface/widgets/settings_page/user_interface_settings_page.cpp" line="245"/>
         <source>Replay settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_settings.cpp" line="971"/>
+        <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"/>
     </message>
@@ -8778,22 +10392,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserListWidget</name>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="452"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="865"/>
         <source>Users connected to server: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="455"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="868"/>
         <source>Users in this room: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="458"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="871"/>
         <source>Buddies online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="461"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="874"/>
         <source>Ignored users online: %1 / %2</source>
         <translation type="unfinished"/>
     </message>
@@ -8801,124 +10415,256 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UtilityMenu</name>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="86"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="113"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="87"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="114"/>
         <source>&amp;Untap all permanents</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="88"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="115"/>
         <source>R&amp;oll die...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="89"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="116"/>
+        <source>Flip coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="117"/>
         <source>&amp;Create token...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="90"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="118"/>
         <source>C&amp;reate another token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/player/menu/utility_menu.cpp" line="91"/>
+        <location filename="src/game_graphics/player/menu/utility_menu.cpp" line="119"/>
         <source>Cr&amp;eate predefined token</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="src/game_graphics/player/menu/utility_menu.h" line="36"/>
+        <source>C&amp;reate another %1 token</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayColorFilterWidget</name>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="52"/>
-        <source>Mode: Exact Match</source>
+        <source>Exact match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="55"/>
-        <source>Mode: Includes</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="53"/>
+        <source>Includes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="58"/>
-        <source>Mode: Include/Exclude</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="54"/>
+        <source>Include / Exclude</source>
+        <oldsource>Mode: Includes</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="62"/>
-        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp" line="56"/>
+        <source>How selected and unselected colors are combined in the filter</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayFilterSaveLoadWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="41"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="42"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp" line="43"/>
+        <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"/>
     </message>
 </context>
+<context>
+    <name>VisualDatabaseDisplayFilterToolbarWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="144"/>
+        <source>Sort by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="145"/>
+        <source>Filter by</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="154"/>
+        <source>Save/Load</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="155"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="156"/>
+        <source>Main Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="157"/>
+        <source>Sub Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="158"/>
+        <source>Sets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp" line="159"/>
+        <source>Formats</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDatabaseDisplayFormatLegalityFilterWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="72"/>
+        <source>Show formats with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="74"/>
+        <source>Do not display formats with less than this amount of cards in the database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="75"/>
+        <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Exact Match</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_format_legality_filter_widget.cpp" line="182"/>
+        <source>Mode: Includes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>VisualDatabaseDisplayMainTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="56"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="67"/>
+        <source>Show main types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="68"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="69"/>
         <source>Do not display card main-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="57"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="70"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="165"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_main_type_filter_widget.cpp" line="178"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDatabaseDisplayNameFilterWidget</name>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="54"/>
-        <source>Filter by name...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="55"/>
-        <source>Load from Deck</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="56"/>
-        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <source>Filter by name... (Exact match)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="57"/>
-        <source>Load from Clipboard</source>
+        <source>Load from Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="58"/>
+        <source>Apply all card names in currently loaded deck as exact match name filters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="59"/>
+        <source>Load from Clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp" line="60"/>
         <source>Apply all card names in clipboard as exact match name filters</source>
         <translation type="unfinished"/>
     </message>
@@ -8926,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="41"/>
+        <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"/>
     </message>
@@ -8934,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="63"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="58"/>
         <source>Search sets...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="85"/>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp" line="254"/>
+        <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"/>
     </message>
@@ -8954,27 +10700,37 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>VisualDatabaseDisplaySubTypeFilterWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="34"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="27"/>
         <source>Search subtypes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="60"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="72"/>
+        <source>Show sub types with at least:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="73"/>
+        <source> cards</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="74"/>
         <source>Do not display card sub-types with less than this amount of cards in the database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="61"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="75"/>
         <source>Filter mode (AND/OR/NOT conjunctions of filters)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Exact Match</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="172"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.cpp" line="186"/>
         <source>Mode: Includes</source>
         <translation type="unfinished"/>
     </message>
@@ -8982,50 +10738,93 @@ 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="53"/>
+        <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"/>
     </message>
     <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="174"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="202"/>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="175"/>
         <source>Clear all filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="204"/>
-        <source>Save and load filters</source>
+        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="193"/>
+        <source>Table</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckDisplayOptionsWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="89"/>
+        <source>Group by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="205"/>
-        <source>Filter by exact card name</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="206"/>
-        <source>Filter by card sub-type</source>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="91"/>
+        <source>Sort by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_database_display/visual_database_display_widget.cpp" line="207"/>
-        <source>Filter by set</source>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </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="123"/>
+        <source>Toggle Layout: Overlap</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp" line="119"/>
+        <source>Toggle Layout: Flat</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VisualDeckEditorPlaceholderWidget</name>
+    <message>
+        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_placeholder_widget.cpp" line="40"/>
+        <source>Add cards using the search bar or database tab to have them appear here</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>VisualDeckEditorSampleHandWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="53"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp" line="54"/>
+        <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"/>
     </message>
@@ -9033,46 +10832,25 @@ 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="193"/>
-        <source>Click and drag to change the sort order within the groups</source>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="194"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="195"/>
+        <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"/>
     </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="197"/>
-        <source>Configure how cards are sorted within their groups</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="198"/>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="324"/>
-        <source>Overlap Layout</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="200"/>
-        <source>Change how cards are displayed within zones (i.e. overlapped or fully visible.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp" line="321"/>
-        <source>Flat Layout</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>VisualDeckStorageFolderDisplayWidget</name>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="44"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp" line="45"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
@@ -9080,47 +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="120"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
         <source>Show Folders</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="121"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="122"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="123"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="124"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="125"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="128"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="138"/>
         <source>Deck tooltip:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="129"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="139"/>
         <source>None</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="130"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp" line="140"/>
         <source>Filepath</source>
         <translation type="unfinished"/>
     </message>
@@ -9128,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="25"/>
+        <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"/>
     </message>
@@ -9136,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="47"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="48"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
         <source>Sort Alphabetically (Filename)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="49"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp" line="50"/>
+        <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"/>
     </message>
@@ -9159,17 +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="119"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="118"/>
         <source>Loading database ...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="120"/>
         <source>Refresh loaded files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="122"/>
+        <location filename="src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp" line="121"/>
         <source>Visual Deck Storage Settings</source>
         <translation type="unfinished"/>
     </message>
@@ -9177,43 +10960,43 @@ 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_widget.cpp" line="135"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="137"/>
         <source>Which warning would you like to send?</source>
         <translation>你想發出那種警告？</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="143"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="145"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="147"/>
         <source>&amp;OK</source>
         <translation>確認</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="148"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="150"/>
         <source>&amp;Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="163"/>
+        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="165"/>
         <source>Warn user for misconduct</source>
         <translation>警告用戶的不當行為</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="169"/>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="175"/>
+        <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>錯誤</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="170"/>
+        <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>發送警告的用戶名不能為空，請提供用戶名以供警告。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/server/user/user_list_widget.cpp" line="176"/>
+        <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>警告不能為空，請選擇警告以供發送。</translation>
     </message>
@@ -9221,133 +11004,133 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <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>將選擇的系列移到頂端</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>將選擇的系列上移</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>將選擇的系列下移</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>將選擇的系列移到底部</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="69"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="65"/>
         <source>Search by set name, code, or type</source>
         <translation>通過系列名、代碼或類型搜索</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="70"/>
         <source>Default order</source>
         <translation>默認順序</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>恢復初始優先順序</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="107"/>
         <source>Enable all sets</source>
         <translation>啓用所有系列</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="108"/>
         <source>Disable all sets</source>
         <translation>禁用所有系列</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="109"/>
         <source>Enable selected set(s)</source>
         <translation>啓用所選系列</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="115"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="110"/>
         <source>Disable selected set(s)</source>
         <translation>禁用所選系列</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="126"/>
         <source>Deck Editor</source>
         <translation>套牌編輯器</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="126"/>
         <source>Use CTRL+A to select all sets in the view.</source>
         <translation type="unfinished"/>
     </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="127"/>
         <source>Only cards in enabled sets will appear in the card list of the deck editor.</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Image priority is decided in the following order:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="134"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="163"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="158"/>
         <source>Include cards rebalanced for Alchemy [requires restart]</source>
         <translation type="unfinished"/>
     </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="128"/>
         <source>Card Art</source>
         <translation>牌張風格</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="138"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="133"/>
         <source>How to use custom card art</source>
         <translation>如何使用自定義卡牌圖片</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="142"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="137"/>
         <source>Hints</source>
         <translation>提示</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="145"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="140"/>
         <source>Note</source>
         <translation>注</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="144"/>
         <source>Sorting by column allows you to find a set while not changing set priority.</source>
         <translation>按列排序允許您在不更改系列優先級的情況下查找系列。</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="150"/>
+        <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>要再次啓用排序，請單擊列標題，直到此消息消失。</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="148"/>
         <source>Use the current sorting as the set priority instead</source>
         <translation>使用當前系列的優先級排序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="154"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="149"/>
         <source>Sorts the set priority using the same column</source>
         <translation>使用同一列系列的優先級排序</translation>
     </message>
     <message>
-        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="193"/>
+        <location filename="src/interface/widgets/dialogs/dlg_manage_sets.cpp" line="188"/>
         <source>Manage sets</source>
         <translation>系列管理</translation>
     </message>
@@ -9355,72 +11138,72 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>ZoneViewWidget</name>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="52"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="61"/>
         <source>Search by card name (or search expressions)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="220"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="234"/>
         <source>Ungrouped</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="221"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="235"/>
         <source>Group by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="222"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="236"/>
         <source>Group by Mana Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="223"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="237"/>
         <source>Group by Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="230"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="244"/>
         <source>Unsorted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="231"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="245"/>
         <source>Sort by Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="232"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="246"/>
         <source>Sort by Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="233"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="247"/>
         <source>Sort by Mana Cost</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="234"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="248"/>
         <source>Sort by Colors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="235"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="249"/>
         <source>Sort by P/T</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="236"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="250"/>
         <source>Sort by Set</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="240"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="254"/>
         <source>shuffle when closing</source>
         <translation>當關閉界面時洗牌</translation>
     </message>
     <message>
-        <location filename="src/game/zones/view_zone_widget.cpp" line="241"/>
+        <location filename="src/game_graphics/zones/view_zone_widget.cpp" line="255"/>
         <source>pile view</source>
         <translation>柱形圖</translation>
     </message>
@@ -9428,7 +11211,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>i18n</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/cache_settings.cpp" line="169"/>
+        <location filename="src/client/settings/cache_settings.cpp" line="187"/>
         <source>English</source>
         <translation>繁體中文 (Chinese Traditional)</translation>
     </message>
@@ -9436,12 +11219,12 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="234"/>
+        <location filename="src/main.cpp" line="232"/>
         <source>Connect on startup</source>
         <translation>啓動連接</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="235"/>
+        <location filename="src/main.cpp" line="233"/>
         <source>Debug to file</source>
         <translation>調試至文件</translation>
     </message>
@@ -9449,1005 +11232,1078 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>shortcutsTab</name>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="47"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="48"/>
         <source>Main Window</source>
         <translation>主窗口</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="49"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="715"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="50"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="770"/>
         <source>Deck Editor</source>
         <translation>套牌編輯</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="51"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="52"/>
         <source>Game Lobby</source>
         <translation>遊戲大廳</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="53"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="54"/>
         <source>Card Counters</source>
         <translation>牌指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="55"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="56"/>
         <source>Player Counters</source>
         <translation>玩家指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="57"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="58"/>
         <source>Power and Toughness</source>
         <translation>力量和防禦力</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="59"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="60"/>
         <source>Game Phases</source>
         <translation>遊戲步驟</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="61"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="62"/>
         <source>Playing Area</source>
         <translation>遊戲區域</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="63"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="64"/>
         <source>Move Selected Card</source>
         <translation>移動所選的牌張</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="65"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="66"/>
         <source>View</source>
         <translation>查看</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="67"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="68"/>
         <source>Move Top Card</source>
         <translation>移動上方的牌張</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="69"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="70"/>
         <source>Move Bottom Card</source>
         <translation>移動底部的牌張</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="71"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="72"/>
         <source>Gameplay</source>
         <translation>遊戲</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="73"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="74"/>
         <source>Drawing</source>
         <translation>繪制</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="75"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="78"/>
         <source>Chat Room</source>
         <translation>聊天室</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="77"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="80"/>
         <source>Game Window</source>
         <translation>遊戲窗口</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="79"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="82"/>
         <source>Load Deck from Clipboard</source>
         <translation>從剪貼板載入套牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="81"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="724"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="84"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="779"/>
         <source>Replays</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="83"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="86"/>
         <source>Tabs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="156"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="159"/>
         <source>Check for Card Updates...</source>
         <translation>檢查卡牌更新</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="159"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="162"/>
         <source>Connect...</source>
         <translation>連接</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="162"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="165"/>
         <source>Disconnect</source>
         <translation>斷開連接</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="166"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="169"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="167"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="170"/>
         <source>Full screen</source>
         <translation>全屏</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="170"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="173"/>
         <source>Register...</source>
         <translation>註冊</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="173"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="176"/>
         <source>Settings...</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="176"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="179"/>
         <source>Start a Local Game...</source>
         <translation>開始本地遊戲</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="179"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="182"/>
         <source>Watch Replay...</source>
         <translation>觀看錄像</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="185"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="188"/>
         <source>Analyze Deck (deckstats.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="189"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="192"/>
         <source>Analyze Deck (tappedout.net)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="192"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="195"/>
         <source>Clear All Filters</source>
         <translation>清除所有篩選項目</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="195"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="198"/>
         <source>Clear Selected Filter</source>
         <translation>清除所選的篩選項目</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="199"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="202"/>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="200"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="203"/>
         <source>Remove Card</source>
         <translation>移除卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="203"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="206"/>
         <source>Manage Sets...</source>
         <translation>系列管理</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="206"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="209"/>
         <source>Edit Custom Tokens...</source>
         <translation>編輯自定義衍生物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="210"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="213"/>
         <source>Export Deck (decklist.org)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="214"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="217"/>
         <source>Export Deck (decklist.xyz)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="217"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="220"/>
         <source>Add Card</source>
         <translation>添加卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="220"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="223"/>
         <source>Load Deck...</source>
         <translation>讀取套牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="224"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="280"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="231"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="287"/>
         <source>Load Deck from Clipboard...</source>
         <translation>從剪貼板載入套牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="228"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="235"/>
         <source>Edit Deck in Clipboard, Annotated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="232"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="239"/>
         <source>Edit Deck in Clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="235"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="242"/>
         <source>New Deck</source>
         <translation>創建新套牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="239"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="246"/>
         <source>Open Custom Pictures Folder</source>
         <translation>打開自定義圖片文件夾</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="242"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="249"/>
         <source>Print Deck...</source>
         <translation>打印套牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="245"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="252"/>
         <source>Delete Card</source>
         <translation>刪除卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="248"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="690"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="255"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="745"/>
         <source>Reset Layout</source>
         <translation>重置佈局</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="251"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="258"/>
         <source>Save Deck</source>
         <translation>保存套牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="254"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="261"/>
         <source>Save Deck as...</source>
         <translation>套牌另存為</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="258"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="265"/>
         <source>Save Deck to Clipboard, Annotated</source>
         <translation>保存套牌到剪貼板，帶注釋</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="262"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="269"/>
         <source>Save Deck to Clipboard, Annotated (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="266"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="273"/>
         <source>Save Deck to Clipboard</source>
         <translation>保存套牌到剪貼板</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="270"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="277"/>
         <source>Save Deck to Clipboard (No Set Info)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="273"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="280"/>
         <source>Load Local Deck...</source>
         <translation>從本地載入套牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="276"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="283"/>
         <source>Load Remote Deck...</source>
         <translation>載入遠程套牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="286"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="297"/>
         <source>Set Ready to Start</source>
         <translation>系列準備好開始</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="290"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="301"/>
         <source>Toggle Sideboard Lock</source>
         <translation>切換備牌鎖</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="395"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="406"/>
         <source>Add Green Counter</source>
         <translation>增加綠色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="398"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="409"/>
         <source>Remove Green Counter</source>
         <translation>移除綠色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="401"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="412"/>
         <source>Set Green Counters...</source>
         <translation>設置綠色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="386"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="397"/>
         <source>Add Red Counter</source>
         <translation>增加紅色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="389"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="400"/>
         <source>Remove Red Counter</source>
         <translation>移除紅色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="392"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="403"/>
         <source>Set Red Counters...</source>
         <translation>設置紅色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="350"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="361"/>
         <source>Add Life Counter</source>
         <translation>增加生命指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="182"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="185"/>
         <source>Show Status Bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="283"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="227"/>
+        <source>Load deck from online service...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="291"/>
+        <source>Load from website...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="294"/>
         <source>Unload Deck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="293"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="304"/>
         <source>Force Start</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="296"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="307"/>
         <source>Add Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="299"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="310"/>
         <source>Remove Card Counter (F)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="302"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="313"/>
         <source>Set Card Counters (F)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="305"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="316"/>
         <source>Add Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="308"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="319"/>
         <source>Remove Card Counter (E)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="311"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="322"/>
         <source>Set Card Counters (E)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="314"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="325"/>
         <source>Add Card Counter(D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="317"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="328"/>
         <source>Remove Card Counter (D)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="320"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="331"/>
         <source>Set Card Counters (D)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="323"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="334"/>
         <source>Add Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="326"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="337"/>
         <source>Remove Card Counter (C)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="329"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="340"/>
         <source>Set Card Counters (C)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="332"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="343"/>
         <source>Add Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="335"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="346"/>
         <source>Remove Card Counter (B)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="338"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="349"/>
         <source>Set Card Counters (B)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="341"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="352"/>
         <source>Add Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="344"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="355"/>
         <source>Remove Card Counter (A)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="347"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="358"/>
         <source>Set Card Counters (A)...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="353"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="364"/>
         <source>Remove Life Counter</source>
         <translation>移除生命指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="356"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="367"/>
         <source>Set Life Counters...</source>
         <translation>設置生命指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="359"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="370"/>
         <source>Add White Counter</source>
         <translation>增加白色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="362"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="373"/>
         <source>Remove White Counter</source>
         <translation>移除白色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="365"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="376"/>
         <source>Set White Counters...</source>
         <translation>設置白色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="368"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="379"/>
         <source>Add Blue Counter</source>
         <translation>增加藍色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="371"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="382"/>
         <source>Remove Blue Counter</source>
         <translation>移除藍色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="374"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="385"/>
         <source>Set Blue Counters...</source>
         <translation>設置藍色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="377"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="388"/>
         <source>Add Black Counter</source>
         <translation>增加黑色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="380"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="391"/>
         <source>Remove Black Counter</source>
         <translation>移除黑色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="383"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="394"/>
         <source>Set Black Counters...</source>
         <translation>設置黑色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="404"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="415"/>
         <source>Add Colorless Counter</source>
         <translation>增加無色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="407"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="418"/>
         <source>Remove Colorless Counter</source>
         <translation>移除無色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="410"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="421"/>
         <source>Set Colorless Counters...</source>
         <translation>設置無色指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="413"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="424"/>
         <source>Add Other Counter</source>
         <translation>增加其他指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="416"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="427"/>
         <source>Remove Other Counter</source>
         <translation>移除其他指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="419"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="430"/>
         <source>Set Other Counters...</source>
         <translation>設置其他指示物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="423"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="434"/>
         <source>Increment all card counters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="426"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="437"/>
         <source>Add Power (+1/+0)</source>
         <translation>增加力量(+1/+0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="429"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="440"/>
         <source>Remove Power (-1/-0)</source>
         <translation>減少力量(-1/-0)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="432"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="443"/>
         <source>Move Toughness to Power (+1/-1)</source>
         <translation>移動防禦到力量（+1/-1）</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="435"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="446"/>
         <source>Add Toughness (+0/+1)</source>
         <translation>增加防禦(+0/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="438"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="449"/>
         <source>Remove Toughness (-0/-1)</source>
         <translation>減少防禦(-0/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="441"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="452"/>
         <source>Move Power to Toughness (-1/+1)</source>
         <translation>移動力量到防禦（-1/+1）</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="444"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="455"/>
         <source>Add Power and Toughness (+1/+1)</source>
         <translation>增加力量和防禦(+1/+1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="447"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="458"/>
         <source>Remove Power and Toughness (-1/-1)</source>
         <translation>減少力量和防禦(-1/-1)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="450"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="461"/>
         <source>Set Power and Toughness...</source>
         <translation>設置力量和防禦</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="453"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="464"/>
         <source>Reset Power and Toughness</source>
         <translation>重置力量和防禦</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="456"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="467"/>
         <source>Untap</source>
         <translation>重置</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="460"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="471"/>
         <source>Upkeep</source>
         <translation>維持</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="462"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="473"/>
         <source>Draw</source>
         <translation>抓</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="463"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="474"/>
         <source>First Main Phase</source>
         <translation>主要步驟1</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="466"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="477"/>
         <source>Start Combat</source>
         <translation>開始戰鬥</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="470"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="481"/>
         <source>Attack</source>
         <translation>攻擊</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="472"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="483"/>
         <source>Block</source>
         <translation>阻擋</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="474"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="485"/>
         <source>Damage</source>
         <translation>傷害</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="475"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="486"/>
         <source>End Combat</source>
         <translation>結束戰鬥</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="478"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="489"/>
         <source>Second Main Phase</source>
         <translation>主要步驟2</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="482"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="493"/>
         <source>End</source>
         <translation>回合結束</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="483"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="494"/>
         <source>Next Phase</source>
         <translation>下個步驟</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="486"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="497"/>
         <source>Next Phase Action</source>
         <translation>下個行動步驟</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="489"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="500"/>
         <source>Next Turn</source>
         <translation>下個回合</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="492"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="503"/>
         <source>Hide Card in Reveal Window</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="495"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="506"/>
         <source>Tap / Untap Card</source>
         <translation>橫置 / 重置卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="498"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="509"/>
         <source>Untap All</source>
         <translation>重置所有</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="501"/>
-        <source>Toggle Untap</source>
-        <translation>鎖定重置狀態</translation>
+        <location filename="src/client/settings/shortcuts_settings.h" line="512"/>
+        <source>Toggle Skip Untapping</source>
+        <oldsource>Toggle Untap</oldsource>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="504"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="515"/>
         <source>Turn Card Over</source>
         <translation>將卡翻面</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="507"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="518"/>
         <source>Peek Card</source>
         <translation>查看卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="510"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="521"/>
         <source>Play Card</source>
         <translation>使用卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="513"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="524"/>
+        <source>Play Card, Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="527"/>
         <source>Attach Card...</source>
         <translation>結附卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="516"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="530"/>
         <source>Unattach Card</source>
         <translation>取消結附</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="519"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="533"/>
         <source>Clone Card</source>
         <translation>複製卡牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="522"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="536"/>
         <source>Create Token...</source>
         <translation>派出衍生物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="525"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="539"/>
         <source>Create All Related Tokens</source>
         <translation>派出所有相關的衍生物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="528"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="542"/>
         <source>Create Another Token</source>
         <translation>派出另一個衍生物</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="531"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="545"/>
         <source>Set Annotation...</source>
         <translation>設置注釋...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="534"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="548"/>
+        <source>Reduce Life by Power</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="551"/>
         <source>Select All Cards in Zone</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="537"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="554"/>
         <source>Select All Cards in Row</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="540"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="557"/>
         <source>Select All Cards in Column</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="543"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="560"/>
+        <source>Reveal Selected Cards to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="563"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="628"/>
         <source>Bottom of Library</source>
         <translation>牌庫底</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="546"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="573"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="599"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="621"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="566"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="587"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="647"/>
         <source>Exile</source>
         <translation>放逐區</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="549"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="569"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="592"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="614"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="569"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="606"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="636"/>
         <source>Graveyard</source>
         <translation>墳墓場</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="553"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="564"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="76"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="573"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="581"/>
         <source>Hand</source>
         <translation>手牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="554"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="625"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="655"/>
         <source>Top of Library</source>
         <translation>牌庫頂</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="557"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="589"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="611"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="633"/>
         <source>Battlefield, Face Down</source>
         <translation>戰場，面朝下</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="560"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="577"/>
         <source>Battlefield</source>
         <translation>戰場</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="565"/>
-        <source>Sort Hand</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="571"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="585"/>
         <source>Library</source>
         <translation>牌庫</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="574"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="588"/>
         <source>Sideboard</source>
         <translation>備牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="577"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="591"/>
         <source>Top Cards of Library</source>
         <translation>牌庫頂牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="580"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="594"/>
         <source>Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="583"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="597"/>
         <source>Close Recent View</source>
         <translation>關閉最近的查看</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="586"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="610"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="600"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="632"/>
         <source>Stack</source>
         <translation>堆疊</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="595"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="617"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="609"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="639"/>
         <source>Graveyard (Multiple)</source>
         <translation>墳場(多個)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="600"/>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="613"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="643"/>
+        <source>Graveyard (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="618"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="648"/>
         <source>Exile (Multiple)</source>
         <translation>放逐區(多個)</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="603"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="622"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="652"/>
+        <source>Exile (Multiple), Face Down</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="625"/>
         <source>Stack Until Found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="628"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="658"/>
         <source>Draw Bottom Card</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="631"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="661"/>
         <source>Draw Multiple Cards from Bottom...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="634"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="664"/>
         <source>Draw Arrow...</source>
         <translation>畫箭頭...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="637"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="667"/>
         <source>Remove Local Arrows</source>
         <translation>移除本地箭頭</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="640"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="670"/>
         <source>Leave Game</source>
         <translation>離開遊戲</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="644"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="674"/>
         <source>Concede</source>
         <translation>投降</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="645"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="675"/>
         <source>Roll Dice...</source>
         <translation>擲骰子...</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="648"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="678"/>
+        <source>Flip Coin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="681"/>
         <source>Shuffle Library</source>
         <translation>洗牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="651"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="684"/>
         <source>Shuffle Top Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="654"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="687"/>
         <source>Shuffle Bottom Cards of Library</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="657"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="690"/>
         <source>Mulligan</source>
         <translation>再調度起手牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="660"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="693"/>
+        <source>Mulligan (Same hand size)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="696"/>
+        <source>Mulligan (Hand size - 1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="699"/>
         <source>Draw a Card</source>
         <translation>抓一張牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="663"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="702"/>
         <source>Draw Multiple Cards...</source>
         <translation>抓多張牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="666"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="705"/>
         <source>Undo Draw</source>
         <translation>撤銷抓牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="669"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="708"/>
         <source>Always Reveal Top Card</source>
         <translation>一直展示牌庫頂牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="672"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="711"/>
         <source>Always Look At Top Card</source>
         <translation>一直檢視牌庫頂牌</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="675"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="714"/>
+        <source>Sort Hand by Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="717"/>
+        <source>Sort Hand by Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="720"/>
+        <source>Sort Hand by Mana Value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="723"/>
+        <source>Reveal Hand to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="727"/>
+        <source>Reveal Random Card to All Players</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/client/settings/shortcuts_settings.h" line="730"/>
         <source>Rotate View Clockwise</source>
         <translation>順時針旋轉視角</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="678"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="733"/>
         <source>Rotate View Counterclockwise</source>
         <translation>逆時針旋轉視角</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="681"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="736"/>
         <source>Unfocus Text Box</source>
         <translation>取消聚焦文本框</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="684"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="739"/>
         <source>Focus Chat</source>
         <translation>聚焦聊天室</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="687"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="742"/>
         <source>Clear Chat</source>
         <translation>清除聊天記錄</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="693"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="748"/>
         <source>Refresh</source>
         <translation>刷新</translation>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="696"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="751"/>
         <source>Skip Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="699"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="754"/>
         <source>Skip Backward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="702"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="757"/>
         <source>Skip Forward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="705"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="760"/>
         <source>Skip Backward by a lot</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="708"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="763"/>
         <source>Play/Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="711"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="766"/>
         <source>Toggle Fast Forward</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="717"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="772"/>
         <source>Home</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="718"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="773"/>
         <source>Visual Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="722"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="777"/>
         <source>Deck Storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="726"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="781"/>
         <source>Server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="728"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="783"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="729"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="784"/>
         <source>Administration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" line="733"/>
+        <location filename="src/client/settings/shortcuts_settings.h" line="788"/>
         <source>Logs</source>
         <translation type="unfinished"/>
     </message>
diff --git a/dbconverter/CMakeLists.txt b/dbconverter/CMakeLists.txt
deleted file mode 100644
index b2de9dcb8..000000000
--- a/dbconverter/CMakeLists.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-cmake_minimum_required(VERSION 3.16)
-project(Dbconverter VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
-
-# ------------------------
-# Sources
-# ------------------------
-set(dbconverter_SOURCES src/main.cpp src/mocks.cpp ${VERSION_STRING_CPP})
-
-# ------------------------
-# Qt configuration
-# ------------------------
-set(QT_DONT_USE_QTGUI TRUE)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-
-# ------------------------
-# Build executable
-# ------------------------
-add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_SOURCES})
-
-# ------------------------
-# Link libraries
-# ------------------------
-target_link_libraries(
-  dbconverter
-  PRIVATE libcockatrice_card
-  PRIVATE libcockatrice_interfaces
-  PRIVATE libcockatrice_settings
-  PRIVATE ${DB_CONVERTER_QT_MODULES}
-)
-
-# ------------------------
-# Install rules
-# ------------------------
-if(UNIX)
-  if(APPLE)
-    set(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME}")
-    set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.cockatrice.${PROJECT_NAME}")
-    set(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME}-${PROJECT_VERSION}")
-    set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME})
-    set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION})
-    set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION})
-
-    install(TARGETS dbconverter BUNDLE DESTINATION ./)
-  else()
-    # Linux
-    install(TARGETS dbconverter RUNTIME DESTINATION bin/)
-  endif()
-elseif(WIN32)
-  install(TARGETS dbconverter RUNTIME DESTINATION ./)
-endif()
-
-# ------------------------
-# Qt plugin handling
-# ------------------------
-if(APPLE)
-  set(plugin_dest_dir dbconverter.app/Contents/Plugins)
-  set(qtconf_dest_dir dbconverter.app/Contents/Resources)
-
-  install(
-    DIRECTORY "${QT_PLUGINS_DIR}/"
-    DESTINATION ${plugin_dest_dir}
-    COMPONENT Runtime
-    FILES_MATCHING
-    PATTERN "*.dSYM" EXCLUDE
-    PATTERN "*_debug.dylib" EXCLUDE
-    PATTERN "platforms/*.dylib"
-  )
-
-  install(
-    CODE "
-        file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
-Plugins = Plugins
-Translations = Resources/translations\")
-        "
-    COMPONENT Runtime
-  )
-
-  install(
-    CODE "
-        file(GLOB_RECURSE QTPLUGINS
-        \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dylib\")
-        set(BU_CHMOD_BUNDLE_ITEMS ON)
-        include(BundleUtilities)
-        fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/dbconverter.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR};${MYSQLCLIENT_LIBRARY_DIR}\")
-        "
-    COMPONENT Runtime
-  )
-endif()
-
-if(WIN32)
-  set(plugin_dest_dir Plugins)
-  set(qtconf_dest_dir .)
-
-  install(
-    DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
-    DESTINATION ./
-    FILES_MATCHING
-    PATTERN "*.dll"
-  )
-
-  install(
-    DIRECTORY "${QT_PLUGINS_DIR}/"
-    DESTINATION ${plugin_dest_dir}
-    COMPONENT Runtime
-    FILES_MATCHING
-    PATTERN "platforms/qdirect2d.dll"
-    PATTERN "platforms/qminimal.dll"
-    PATTERN "platforms/qoffscreen.dll"
-    PATTERN "platforms/qwindows.dll"
-  )
-
-  install(
-    CODE "
-        file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"[Paths]
-Plugins = Plugins
-Translations = Resources/translations\")
-        "
-    COMPONENT Runtime
-  )
-
-  install(
-    CODE "
-        file(GLOB_RECURSE QTPLUGINS
-        \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/*.dll\")
-        set(BU_CHMOD_BUNDLE_ITEMS ON)
-        include(BundleUtilities)
-        fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/dbconverter.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
-        "
-    COMPONENT Runtime
-  )
-endif()
diff --git a/dbconverter/src/main.cpp b/dbconverter/src/main.cpp
deleted file mode 100644
index 67748fa45..000000000
--- a/dbconverter/src/main.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2019 by Fabio Bas   *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#include "main.h"
-
-#include "mocks.h"
-#include "version_string.h"
-
-#include <QCommandLineParser>
-#include <QCoreApplication>
-#include <QDebug>
-#include <QFileInfo>
-#include <QtGlobal>
-
-int main(int argc, char *argv[])
-{
-    QCoreApplication app(argc, argv);
-    app.setOrganizationName("Cockatrice");
-    app.setApplicationName("Dbconverter");
-    app.setApplicationVersion(VERSION_STRING);
-
-    QCommandLineParser parser;
-    parser.addPositionalArgument("olddb", "Read existing card database from <file>");
-    parser.addPositionalArgument("newdb", "Write new card database to <file>");
-    parser.addHelpOption();
-    parser.addVersionOption();
-    parser.process(app);
-
-    QString oldDbPath;
-    QString newDbPath;
-    QStringList args = parser.positionalArguments();
-    if (args.count() == 2) {
-        oldDbPath = QFileInfo(args.at(0)).absoluteFilePath();
-        newDbPath = QFileInfo(args.at(1)).absoluteFilePath();
-    } else {
-        qCritical() << "Usage: dbconverter <olddb> <newdb>";
-        parser.showHelp(1);
-        exit(0);
-    }
-
-    CardDatabaseConverter *db = new CardDatabaseConverter;
-
-    qInfo() << "---------------------------------------------";
-    qInfo() << "Loading cards from" << oldDbPath;
-    db->loadCardDatabase(oldDbPath);
-    qInfo() << "---------------------------------------------";
-    qInfo() << "Saving cards to" << newDbPath;
-    db->saveCardDatabase(newDbPath);
-    qInfo() << "---------------------------------------------";
-}
diff --git a/dbconverter/src/main.h b/dbconverter/src/main.h
deleted file mode 100644
index 7a5809b1b..000000000
--- a/dbconverter/src/main.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef MAIN_H
-#define MAIN_H
-
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/parser/cockatrice_xml_4.h>
-#include <libcockatrice/interfaces/noop_card_preference_provider.h>
-
-class CardDatabaseConverter : public CardDatabase
-{
-public:
-    explicit CardDatabaseConverter()
-    {
-        // Replace querier with one that ignores SettingsCache
-        delete querier;
-        querier = new CardDatabaseQuerier(this, this, new NoopCardPreferenceProvider());
-    };
-
-    LoadStatus loadCardDatabase(const QString &path)
-    {
-        return loader->loadCardDatabase(path);
-    }
-
-    bool saveCardDatabase(const QString &fileName)
-    {
-        CockatriceXml4Parser parser(new NoopCardPreferenceProvider());
-        return parser.saveToFile(sets, cards, fileName);
-    }
-};
-
-#endif
diff --git a/dbconverter/src/mocks.cpp b/dbconverter/src/mocks.cpp
deleted file mode 100644
index b97bd09c7..000000000
--- a/dbconverter/src/mocks.cpp
+++ /dev/null
@@ -1,451 +0,0 @@
-
-#include "mocks.h"
-
-CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *parent)
-    : SettingsManager(settingPath + "cardDatabase.ini", QString(), QString(), parent)
-{
-}
-void CardDatabaseSettings::setSortKey(QString /* shortName */, unsigned int /* sortKey */)
-{
-}
-void CardDatabaseSettings::setEnabled(QString /* shortName */, bool /* enabled */)
-{
-}
-void CardDatabaseSettings::setIsKnown(QString /* shortName */, bool /* isknown */)
-{
-}
-unsigned int CardDatabaseSettings::getSortKey(QString /* shortName */)
-{
-    return 0;
-};
-bool CardDatabaseSettings::isEnabled(QString /* shortName */)
-{
-    return true;
-};
-bool CardDatabaseSettings::isKnown(QString /* shortName */)
-{
-    return true;
-};
-
-QString SettingsCache::getDataPath()
-{
-    return "";
-}
-QString SettingsCache::getSettingsPath()
-{
-    return "";
-}
-void SettingsCache::translateLegacySettings()
-{
-}
-QString SettingsCache::getSafeConfigPath(QString /* configEntry */, QString defaultPath) const
-{
-    return defaultPath;
-}
-QString SettingsCache::getSafeConfigFilePath(QString /* configEntry */, QString defaultPath) const
-{
-    return defaultPath;
-}
-
-void SettingsCache::setUseTearOffMenus(bool /* _useTearOffMenus */)
-{
-}
-void SettingsCache::setCardViewInitialRowsMax(int /* _cardViewInitialRowsMax */)
-{
-}
-void SettingsCache::setCardViewExpandedRowsMax(int /* value */)
-{
-}
-void SettingsCache::setCloseEmptyCardView(const QT_STATE_CHANGED_T /* value */)
-{
-}
-void SettingsCache::setFocusCardViewSearchBar(QT_STATE_CHANGED_T /* value */)
-{
-}
-void SettingsCache::setKnownMissingFeatures(const QString & /* _knownMissingFeatures */)
-{
-}
-void SettingsCache::setCardInfoViewMode(const int /* _viewMode */)
-{
-}
-void SettingsCache::setHighlightWords(const QString & /* _highlightWords */)
-{
-}
-void SettingsCache::setMasterVolume(int /* _masterVolume */)
-{
-}
-void SettingsCache::setLeftJustified(const QT_STATE_CHANGED_T /* _leftJustified */)
-{
-}
-void SettingsCache::setCardScaling(const QT_STATE_CHANGED_T /* _scaleCards */)
-{
-}
-void SettingsCache::setStackCardOverlapPercent(const int /* _verticalCardOverlapPercent */)
-{
-}
-void SettingsCache::setShowMessagePopups(const QT_STATE_CHANGED_T /* _showMessagePopups */)
-{
-}
-void SettingsCache::setShowMentionPopups(const QT_STATE_CHANGED_T /* _showMentionPopus */)
-{
-}
-void SettingsCache::setRoomHistory(const QT_STATE_CHANGED_T /* _roomHistory */)
-{
-}
-void SettingsCache::setLang(const QString & /* _lang */)
-{
-}
-void SettingsCache::setShowTipsOnStartup(bool /* _showTipsOnStartup */)
-{
-}
-void SettingsCache::setSeenTips(const QList<int> & /* _seenTips */)
-{
-}
-void SettingsCache::setDeckPath(const QString & /* _deckPath */)
-{
-}
-void SettingsCache::setFiltersPath(const QString & /*_filtersPath */)
-{
-}
-void SettingsCache::setReplaysPath(const QString & /* _replaysPath */)
-{
-}
-void SettingsCache::setThemesPath(const QString & /* _themesPath */)
-{
-}
-void SettingsCache::setPicsPath(const QString & /* _picsPath */)
-{
-}
-void SettingsCache::setCardDatabasePath(const QString & /* _cardDatabasePath */)
-{
-}
-void SettingsCache::setCustomCardDatabasePath(const QString & /* _customCardDatabasePath */)
-{
-}
-void SettingsCache::setSpoilerDatabasePath(const QString & /* _spoilerDatabasePath */)
-{
-}
-void SettingsCache::setTokenDatabasePath(const QString & /* _tokenDatabasePath */)
-{
-}
-void SettingsCache::setThemeName(const QString & /* _themeName */)
-{
-}
-void SettingsCache::setHomeTabBackgroundSource(const QString & /* _backgroundSource */)
-{
-}
-void SettingsCache::setHomeTabBackgroundShuffleFrequency(int /* frequency */)
-{
-}
-void SettingsCache::setTabVisualDeckStorageOpen(bool /*value*/)
-{
-}
-void SettingsCache::setTabServerOpen(bool /*value*/)
-{
-}
-void SettingsCache::setTabAccountOpen(bool /*value*/)
-{
-}
-void SettingsCache::setTabDeckStorageOpen(bool /*value*/)
-{
-}
-void SettingsCache::setTabReplaysOpen(bool /*value*/)
-{
-}
-void SettingsCache::setTabAdminOpen(bool /*value*/)
-{
-}
-void SettingsCache::setTabLogOpen(bool /*value*/)
-{
-}
-void SettingsCache::setPicDownload(QT_STATE_CHANGED_T /* _picDownload */)
-{
-}
-void SettingsCache::setShowStatusBar(bool /* value */)
-{
-}
-void SettingsCache::setNotificationsEnabled(QT_STATE_CHANGED_T /* _notificationsEnabled */)
-{
-}
-void SettingsCache::setSpectatorNotificationsEnabled(QT_STATE_CHANGED_T /* _spectatorNotificationsEnabled */)
-{
-}
-void SettingsCache::setBuddyConnectNotificationsEnabled(QT_STATE_CHANGED_T /* _buddyConnectNotificationsEnabled */)
-{
-}
-void SettingsCache::setDoubleClickToPlay(QT_STATE_CHANGED_T /* _doubleClickToPlay */)
-{
-}
-void SettingsCache::setClickPlaysAllSelected(QT_STATE_CHANGED_T /* _clickPlaysAllSelected */)
-{
-}
-void SettingsCache::setPlayToStack(QT_STATE_CHANGED_T /* _playToStack */)
-{
-}
-void SettingsCache::setDoNotDeleteArrowsInSubPhases(QT_STATE_CHANGED_T /* _doNotDeleteArrowsInSubPhases */)
-{
-}
-void SettingsCache::setStartingHandSize(int /* _startingHandSize */)
-{
-}
-void SettingsCache::setAnnotateTokens(QT_STATE_CHANGED_T /* _annotateTokens */)
-{
-}
-void SettingsCache::setTabGameSplitterSizes(const QByteArray & /* _tabGameSplitterSizes */)
-{
-}
-void SettingsCache::setShowShortcuts(QT_STATE_CHANGED_T /* _showShortcuts */)
-{
-}
-void SettingsCache::setDisplayCardNames(QT_STATE_CHANGED_T /* _displayCardNames */)
-{
-}
-void SettingsCache::setOverrideAllCardArtWithPersonalPreference(QT_STATE_CHANGED_T /* _displayCardNames */)
-{
-}
-void SettingsCache::setBumpSetsWithCardsInDeckToTop(QT_STATE_CHANGED_T /* _bumpSetsWithCardsInDeckToTop */)
-{
-}
-void SettingsCache::setPrintingSelectorSortOrder(int /* _printingSelectorSortOrder */)
-{
-}
-void SettingsCache::setPrintingSelectorCardSize(int /* _printingSelectorCardSize */)
-{
-}
-void SettingsCache::setIncludeRebalancedCards(bool /* _includeRebalancedCards */)
-{
-}
-void SettingsCache::setPrintingSelectorNavigationButtonsVisible(QT_STATE_CHANGED_T /* _navigationButtonsVisible */)
-{
-}
-void SettingsCache::setDeckEditorBannerCardComboBoxVisible(
-    QT_STATE_CHANGED_T /* _deckEditorBannerCardComboBoxVisible */)
-{
-}
-void SettingsCache::setDeckEditorTagsWidgetVisible(QT_STATE_CHANGED_T /* _deckEditorTagsWidgetVisible */)
-{
-}
-void SettingsCache::setVisualDeckStorageSortingOrder(int /* _visualDeckStorageSortingOrder */)
-{
-}
-void SettingsCache::setVisualDeckStorageShowFolders(QT_STATE_CHANGED_T /* value */)
-{
-}
-void SettingsCache::setVisualDeckStorageShowTagFilter(QT_STATE_CHANGED_T /* _showTags */)
-{
-}
-void SettingsCache::setVisualDeckStorageDefaultTagsList(QStringList /* _defaultTagsList */)
-{
-}
-void SettingsCache::setVisualDeckStorageSearchFolderNames(QT_STATE_CHANGED_T /* value */)
-{
-}
-void SettingsCache::setVisualDeckStorageShowBannerCardComboBox(QT_STATE_CHANGED_T /* _showBannerCardComboBox */)
-{
-}
-void SettingsCache::setVisualDeckStorageShowTagsOnDeckPreviews(QT_STATE_CHANGED_T /* _showTags */)
-{
-}
-void SettingsCache::setVisualDeckStorageCardSize(int /* _visualDeckStorageCardSize */)
-{
-}
-void SettingsCache::setVisualDeckStorageDrawUnusedColorIdentities(
-    QT_STATE_CHANGED_T /* _visualDeckStorageDrawUnusedColorIdentities */)
-{
-}
-void SettingsCache::setVisualDeckStorageUnusedColorIdentitiesOpacity(
-    int /* _visualDeckStorageUnusedColorIdentitiesOpacity */)
-{
-}
-void SettingsCache::setVisualDeckStorageTooltipType(int /* value */)
-{
-}
-void SettingsCache::setVisualDeckStoragePromptForConversion(bool /* _visualDeckStoragePromptForConversion */)
-{
-}
-void SettingsCache::setVisualDeckStorageAlwaysConvert(bool /* _visualDeckStorageAlwaysConvert */)
-{
-}
-void SettingsCache::setVisualDeckStorageInGame(QT_STATE_CHANGED_T /* value */)
-{
-}
-void SettingsCache::setVisualDeckStorageSelectionAnimation(QT_STATE_CHANGED_T /* value */)
-{
-}
-void SettingsCache::setDefaultDeckEditorType(int /* value */)
-{
-}
-void SettingsCache::setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(QT_STATE_CHANGED_T /* _enabled */)
-{
-}
-void SettingsCache::setVisualDatabaseDisplayFilterToMostRecentSetsAmount(int /* _amount */)
-{
-}
-void SettingsCache::setVisualDeckEditorSampleHandSize(int /* _amount */)
-{
-}
-void SettingsCache::setHorizontalHand(QT_STATE_CHANGED_T /* _horizontalHand */)
-{
-}
-void SettingsCache::setInvertVerticalCoordinate(QT_STATE_CHANGED_T /* _invertVerticalCoordinate */)
-{
-}
-void SettingsCache::setMinPlayersForMultiColumnLayout(int /* _minPlayersForMultiColumnLayout */)
-{
-}
-void SettingsCache::setTapAnimation(QT_STATE_CHANGED_T /* _tapAnimation */)
-{
-}
-void SettingsCache::setAutoRotateSidewaysLayoutCards(QT_STATE_CHANGED_T /* _autoRotateSidewaysLayoutCards */)
-{
-}
-void SettingsCache::setOpenDeckInNewTab(QT_STATE_CHANGED_T /* _openDeckInNewTab */)
-{
-}
-void SettingsCache::setRewindBufferingMs(int /* _rewindBufferingMs */)
-{
-}
-void SettingsCache::setChatMention(QT_STATE_CHANGED_T /* _chatMention */)
-{
-}
-void SettingsCache::setChatMentionCompleter(const QT_STATE_CHANGED_T /* _enableMentionCompleter */)
-{
-}
-void SettingsCache::setChatMentionForeground(QT_STATE_CHANGED_T /* _chatMentionForeground */)
-{
-}
-void SettingsCache::setChatHighlightForeground(QT_STATE_CHANGED_T /* _chatHighlightForeground */)
-{
-}
-void SettingsCache::setChatMentionColor(const QString & /* _chatMentionColor */)
-{
-}
-void SettingsCache::setChatHighlightColor(const QString & /* _chatHighlightColor */)
-{
-}
-void SettingsCache::setZoneViewGroupByIndex(int /* _zoneViewGroupByIndex */)
-{
-}
-void SettingsCache::setZoneViewSortByIndex(int /* _zoneViewSortByIndex */)
-{
-}
-void SettingsCache::setZoneViewPileView(QT_STATE_CHANGED_T /* _zoneViewPileView */)
-{
-}
-void SettingsCache::setSoundEnabled(QT_STATE_CHANGED_T /* _soundEnabled */)
-{
-}
-void SettingsCache::setSoundThemeName(const QString & /* _soundThemeName */)
-{
-}
-void SettingsCache::setIgnoreUnregisteredUsers(QT_STATE_CHANGED_T /* _ignoreUnregisteredUsers */)
-{
-}
-void SettingsCache::setIgnoreUnregisteredUserMessages(QT_STATE_CHANGED_T /* _ignoreUnregisteredUserMessages */)
-{
-}
-void SettingsCache::setMainWindowGeometry(const QByteArray & /* _mainWindowGeometry */)
-{
-}
-void SettingsCache::setTokenDialogGeometry(const QByteArray & /* _tokenDialogGeometry */)
-{
-}
-void SettingsCache::setSetsDialogGeometry(const QByteArray & /* _setsDialogGeometry */)
-{
-}
-void SettingsCache::setPixmapCacheSize(const int /* _pixmapCacheSize */)
-{
-}
-void SettingsCache::setNetworkCacheSizeInMB(const int /* _networkCacheSize */)
-{
-}
-void SettingsCache::setNetworkRedirectCacheTtl(const int /* _redirectCacheTtl */)
-{
-}
-void SettingsCache::setClientID(const QString & /* _clientID */)
-{
-}
-void SettingsCache::setClientVersion(const QString & /* _clientVersion */)
-{
-}
-QStringList SettingsCache::getCountries() const
-{
-    static QStringList countries = QStringList() << "us";
-    return countries;
-}
-void SettingsCache::setGameDescription(const QString /* _gameDescription */)
-{
-}
-void SettingsCache::setMaxPlayers(const int /* _maxPlayers */)
-{
-}
-void SettingsCache::setGameTypes(const QString /* _gameTypes */)
-{
-}
-void SettingsCache::setOnlyBuddies(const bool /* _onlyBuddies */)
-{
-}
-void SettingsCache::setOnlyRegistered(const bool /* _onlyRegistered */)
-{
-}
-void SettingsCache::setSpectatorsAllowed(const bool /* _spectatorsAllowed */)
-{
-}
-void SettingsCache::setSpectatorsNeedPassword(const bool /* _spectatorsNeedPassword */)
-{
-}
-void SettingsCache::setSpectatorsCanTalk(const bool /* _spectatorsCanTalk */)
-{
-}
-void SettingsCache::setSpectatorsCanSeeEverything(const bool /* _spectatorsCanSeeEverything */)
-{
-}
-void SettingsCache::setCreateGameAsSpectator(const bool /* _createGameAsSpectator */)
-{
-}
-void SettingsCache::setDefaultStartingLifeTotal(const int /* _startingLifeTotal */)
-{
-}
-void SettingsCache::setShareDecklistsOnLoad(const bool /* _shareDecklistsOnLoad */)
-{
-}
-void SettingsCache::setRememberGameSettings(const bool /* _rememberGameSettings */)
-{
-}
-void SettingsCache::setCheckUpdatesOnStartup(QT_STATE_CHANGED_T /* value */)
-{
-}
-void SettingsCache::setStartupCardUpdateCheckPromptForUpdate(bool /* value */)
-{
-}
-void SettingsCache::setStartupCardUpdateCheckAlwaysUpdate(bool /* value */)
-{
-}
-void SettingsCache::setCardUpdateCheckInterval(int /* value */)
-{
-}
-void SettingsCache::setLastCardUpdateCheck(QDate /* value */)
-{
-}
-void SettingsCache::setNotifyAboutUpdate(QT_STATE_CHANGED_T /* _notifyaboutupdate */)
-{
-}
-void SettingsCache::setNotifyAboutNewVersion(QT_STATE_CHANGED_T /* _notifyaboutnewversion */)
-{
-}
-void SettingsCache::setDownloadSpoilerStatus(bool /* _spoilerStatus */)
-{
-}
-void SettingsCache::setUpdateReleaseChannelIndex(int /* value */)
-{
-}
-void SettingsCache::setMaxFontSize(int /* _max */)
-{
-}
-void SettingsCache::setRoundCardCorners(bool /* _roundCardCorners */)
-{
-}
-
-void CardPictureLoader::clearPixmapCache(CardInfoPtr /* card */)
-{
-}
diff --git a/dbconverter/src/mocks.h b/dbconverter/src/mocks.h
deleted file mode 100644
index 929092bd7..000000000
--- a/dbconverter/src/mocks.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Beware of this preprocessor hack used to redefine the settingCache class
- * instead of including it and all of its dependencies.
- * Always set header guards of mocked objects before including any headers
- * with mocked objects.
- */
-
-#include <QObject>
-#include <QString>
-
-#define PICTURELOADER_H
-
-#include "../../cockatrice/src/client/settings/cache_settings.h"
-
-#include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/utility/macros.h>
-
-extern SettingsCache *settingsCache;
-
-class CardPictureLoader
-{
-public:
-    static void clearPixmapCache(CardInfoPtr card);
-};
diff --git a/doc/carddatabase_v4/cards.xsd b/doc/carddatabase_v4/cards.xsd
index 92d30b94f..df52d6327 100644
--- a/doc/carddatabase_v4/cards.xsd
+++ b/doc/carddatabase_v4/cards.xsd
@@ -6,6 +6,7 @@
                 <xs:attribute type="xs:string" name="exclude" use="optional" />
                 <xs:attribute type="xs:string" name="attach" use="optional" />
                 <xs:attribute type="xs:string" name="persistent" use="optional" />
+                <xs:attribute type="xs:string" name="facedown" use="optional"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
@@ -28,12 +29,17 @@
                 <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>
     </xs:complexType>
+    <xs:complexType name="localizationType">
+        <xs:sequence>
+            <xs:element type="xs:string" name="name" minOccurs="0" maxOccurs="1" />
+            <xs:element type="xs:string" name="text" minOccurs="0" maxOccurs="1" />
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="lang" use="required" />
+    </xs:complexType>
     <xs:group name="cardPropertyGroup">
         <xs:sequence>
             <xs:any processContents="skip" minOccurs="0" maxOccurs="unbounded" />
@@ -48,6 +54,13 @@
                     <xs:group ref="cardPropertyGroup"/>
                 </xs:complexType>
             </xs:element>
+            <xs:element name="localizations" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element type="localizationType" name="localization" minOccurs="0" maxOccurs="unbounded" />
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
             <xs:element type="cardInSetType" name="set" minOccurs="1" maxOccurs="unbounded" />
             <xs:choice minOccurs="0" maxOccurs="unbounded">
                 <xs:element type="relatedType" name="related" minOccurs="0" maxOccurs="unbounded" />
diff --git a/doc/doxygen/DoxygenLayout.xml b/doc/doxygen/DoxygenLayout.xml
index d6847755b..551391db3 100644
--- a/doc/doxygen/DoxygenLayout.xml
+++ b/doc/doxygen/DoxygenLayout.xml
@@ -7,7 +7,7 @@
         <tab type="pages" visible="yes" title="" intro=""/>
         <tab type="topics" visible="yes" title="" intro=""/>
         <tab type="usergroup" title="Code Reference">
-            <tab type="modules" visible="yes" title="" intro="">
+            <tab type="modules" visible="no" title="" intro="">
                 <tab type="modulelist" visible="yes" title="" intro=""/>
                 <tab type="modulemembers" visible="yes" title="" intro=""/>
             </tab>
@@ -15,9 +15,8 @@
                 <tab type="namespacelist" visible="yes" title="" intro=""/>
                 <tab type="namespacemembers" visible="yes" title="" intro=""/>
             </tab>
-            <tab type="concepts" visible="yes" title="">
-            </tab>
-            <tab type="interfaces" visible="yes" title="">
+            <tab type="concepts" visible="no" title=""/>
+            <tab type="interfaces" visible="no" title="">
                 <tab type="interfacelist" visible="yes" title="" intro=""/>
                 <tab type="interfaceindex" visible="$ALPHABETICAL_INDEX" title=""/>
                 <tab type="interfacehierarchy" visible="yes" title="" intro=""/>
@@ -28,11 +27,11 @@
                 <tab type="hierarchy" visible="yes" title="" intro=""/>
                 <tab type="classmembers" visible="yes" title="" intro=""/>
             </tab>
-            <tab type="structs" visible="yes" title="">
+            <tab type="structs" visible="no" title="">
                 <tab type="structlist" visible="yes" title="" intro=""/>
                 <tab type="structindex" visible="$ALPHABETICAL_INDEX" title=""/>
             </tab>
-            <tab type="exceptions" visible="yes" title="">
+            <tab type="exceptions" visible="no" title="">
                 <tab type="exceptionlist" visible="yes" title="" intro=""/>
                 <tab type="exceptionindex" visible="$ALPHABETICAL_INDEX" title=""/>
                 <tab type="exceptionhierarchy" visible="yes" title="" intro=""/>
@@ -41,7 +40,7 @@
                 <tab type="filelist" visible="yes" title="" intro=""/>
                 <tab type="globals" visible="yes" title="" intro=""/>
             </tab>
-            <tab type="examples" visible="yes" title="" intro=""/>
+            <tab type="examples" visible="no" title="" intro=""/>
         </tab>
     </navindex>
 
diff --git a/doc/doxygen/README.md b/doc/doxygen/README.md
new file mode 100644
index 000000000..230422303
--- /dev/null
+++ b/doc/doxygen/README.md
@@ -0,0 +1,28 @@
+## 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:
+```
+HTML_EXTRA_STYLESHEET  = doxygen-awesome.css      # Main CSS file of the theme
+GENERATE_TREEVIEW      = YES                      # Optional, also works without
+HTML_COLORSTYLE        = LIGHT                    # Required with doxygen-awesome-css theme, Auto Dark Mode will still work
+DISABLE_INDEX          = NO                       # YES is bugged in the theme, see jothepro/doxygen-awesome-css/issues/201
+FULL_SIDEBAR           = NO                       # Required for doxygen-awesome-css theme
+```
+
+<br>
+
+Cockatrice dedicated color adjustments are configured in the [cockatrice_docs_style.css](https://github.com/Cockatrice/Cockatrice/blob/master/doc/doxygen/css/cockatrice_docs_style.css) file that uses & overrides the theme definitions.
diff --git a/doc/doxygen/css/cockatrice_docs_style.css b/doc/doxygen/css/cockatrice_docs_style.css
new file mode 100644
index 000000000..e0177bdbb
--- /dev/null
+++ b/doc/doxygen/css/cockatrice_docs_style.css
@@ -0,0 +1,33 @@
+/*
+
+See "Awesome Doxygen CSS" theme docs:
+https://jothepro.github.io/doxygen-awesome-css/md_docs_2customization.html#autotoc_md36
+
+Adjustments here are based on the css file of the theme and variables defined there.
+
+*/
+
+
+/* Light Mode overrides */
+html {
+    --primary-color: #33a946;
+    --primary-dark-color: #33a946;
+    --primary-light-color: #33a946;
+}
+
+/* Dark Mode overrides */
+@media (prefers-color-scheme: dark) {
+    html:not(.light-mode) {
+        --primary-color: #33a946;
+        --primary-dark-color: #33a946;
+        --primary-light-color: #33a946;
+    }
+}
+
+/* Dark Mode overrides, defined twice to support both the dark-mode without and with doxygen-awesome-darkmode-toggle.js */
+html.dark-mode {
+    color-scheme: dark;
+    --primary-color: #33a946;
+    --primary-dark-color: #33a946;
+    --primary-light-color: #33a946;
+}
diff --git a/doc/doxygen/css/doxygen_style.css b/doc/doxygen/css/doxygen_style_old.css
similarity index 100%
rename from doc/doxygen/css/doxygen_style.css
rename to doc/doxygen/css/doxygen_style_old.css
diff --git a/doc/doxygen/css/hide_nav_sync.css b/doc/doxygen/css/hide_nav_sync.css
new file mode 100644
index 000000000..ad06ce6ed
--- /dev/null
+++ b/doc/doxygen/css/hide_nav_sync.css
@@ -0,0 +1,10 @@
+/* hide navigation sync control and icons */
+#nav-sync,
+#nav-sync * {
+    display: none !important;
+}
+
+div.nav-sync-icon,
+div.nav-sync-icon * {
+    display: none !important;
+}
\ No newline at end of file
diff --git a/doc/doxygen/extra-pages/developer_documentation/card_database_schema_and_parsing.md b/doc/doxygen/extra-pages/developer_documentation/card_database_schema_and_parsing.md
deleted file mode 100644
index 6c5e3512b..000000000
--- a/doc/doxygen/extra-pages/developer_documentation/card_database_schema_and_parsing.md
+++ /dev/null
@@ -1 +0,0 @@
-@page card_database_schema_and_parsing Card Database Schema and Parsing
\ No newline at end of file
diff --git a/doc/doxygen/extra-pages/developer_documentation/loading_card_pictures.md b/doc/doxygen/extra-pages/developer_documentation/loading_card_pictures.md
deleted file mode 100644
index b606f9e4b..000000000
--- a/doc/doxygen/extra-pages/developer_documentation/loading_card_pictures.md
+++ /dev/null
@@ -1,52 +0,0 @@
-@page loading_card_pictures Loading Card Pictures
-
-Pictures associated with CardInfo%s are retrieved either from on-disk or the network through the CardPictureLoader.
-
-In most cases, you don't need to concern yourself with the internals of CardPictureLoader.
-
-Simply using one of the ways described in @ref displaying_cards is enough to automatically queue a request to the
-CardPictureLoader when the chosen widget is shown, emitting signals to refresh the widget when the request is finished.
-
-# How requests are triggered
-
-CardPictureLoader::getPixmap() is called exactly two times in the code base, in CardInfoPictureWidget::loadPixmap(), the
-base class
-for all widget based card picture display, and AbstractCardItem::paintPicture(), the base class for all QGraphicsItem
-based card picture
-display. See @ref displaying_cards for more information on the difference between these two display methods.
-
-Because both of these calls are made in the paintEvent() methods of their respective classes, this means that requests
-are issued as soon as but not before the widget is shown on screen.
-
-It is also possible to "warm up" the cache by issuing card picture load requests to the CardPictureLoader without using
-a display widget and waiting for it to be shown by calling CardPictureLoader::cacheCardPixmaps() with a list of
-ExactCard%s.
-
-# The QPixmapCache and QNetworkDiskCache
-
-Cockatrice uses the QPixmapCache from the Qt GUI module to store card pictures in-memory and the QNetworkDiskCache from
-the Qt Network module to cache network requests for card pictures on-disk.
-
-What this means is that the CardPictureLoader will first attempt to look up a card in the QPixmapCache according to the
-ExactCard::getPixmapCacheKey() method of an ExactCard object. If it does not find it in the in-memory cache, it will
-issue a load request, which will first look for local images on-disk and then consult the QNetworkDiskCache and if
-found, use the stored binary data from the network cache to populate the in-memory pixmap cache under the card's cache
-key. If it is not found, it will then proceed with issuing a network request.
-
-The size of both of these caches can be configured by the user in the "Card Sources" settings page.
-
-# PixmapCacheKeys and ProviderIDs
-
-TODO
-
-# The Redirect Cache
-
-TODO
-
-# Local Image Loading
-
-TODO
-
-# URL Generation and Resolution
-
-TODO
\ No newline at end of file
diff --git a/doc/doxygen/extra-pages/index.md b/doc/doxygen/extra-pages/index.md
deleted file mode 100644
index 66113117f..000000000
--- a/doc/doxygen/extra-pages/index.md
+++ /dev/null
@@ -1,8 +0,0 @@
-@mainpage Cockatrice Documentation
-
-# Welcome
-
-This is the **main landing page** of the Cockatrice documentation.
-
-- Go to the @subpage user_reference page
-- Or check out the @subpage developer_reference
\ No newline at end of file
diff --git a/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks.md b/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks.md
deleted file mode 100644
index 030811306..000000000
--- a/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks.md
+++ /dev/null
@@ -1,7 +0,0 @@
-@page editing_decks Editing Decks
-
-@subpage editing_decks_classic
-
-@subpage editing_decks_visual
-
-@subpage editing_decks_printings
\ No newline at end of file
diff --git a/doc/doxygen/extra-pages/user_documentation/index.md b/doc/doxygen/extra-pages/user_documentation/index.md
deleted file mode 100644
index 8a5c88c37..000000000
--- a/doc/doxygen/extra-pages/user_documentation/index.md
+++ /dev/null
@@ -1,13 +0,0 @@
-@page user_reference User Reference
-
-@subpage search_syntax_help
-
-@subpage deck_search_syntax_help
-
-@subpage creating_decks
-
-@subpage importing_decks
-
-@subpage editing_decks
-
-@subpage exporting_decks
\ No newline at end of file
diff --git a/doc/doxygen/filters/proto2cpp.py b/doc/doxygen/filters/proto2cpp.py
new file mode 100644
index 000000000..360935a48
--- /dev/null
+++ b/doc/doxygen/filters/proto2cpp.py
@@ -0,0 +1,285 @@
+#!/usr/bin/env python
+##
+# Doxygen filter for Google Protocol Buffers .proto files.
+# This script converts .proto files into C++ style ones
+# and prints the output to standard output.
+#
+# version 0.8-beta OSI
+#
+# How to enable this filter in Doxygen:
+#   1. Generate Doxygen configuration file with command 'doxygen -g <filename>'
+#        e.g.  doxygen -g doxyfile
+#   2. In the Doxygen configuration file, find FILE_PATTERNS and add *.proto
+#        FILE_PATTERNS          = *.proto
+#   3. In the Doxygen configuration file, find EXTENSION_MAPPING and add proto=C++
+#        EXTENSION_MAPPING      = proto=C++
+#   4. In the Doxygen configuration file, find INPUT_FILTER and add this script
+#        INPUT_FILTER           = "python proto2cpp.py"
+#   5. Run Doxygen with the modified configuration
+#        doxygen doxyfile
+#
+#
+# Version 0.8 2018 Bugfix regarding long comments, remove typo
+# Version 0.7 2018 Bugfix and extensions have been made by Open Simulation Interface (OSI) Carsten Kuebler https://github.com/OpenSimulationInterface,
+# Copyright (C) 2016 Regents of the University of California https://github.com/vgteam/vg
+# Copyright (C) 2012-2015 Timo Marjoniemi https://sourceforge.net/p/proto2cpp/wiki/Home/
+# All rights reserved.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#
+##
+
+import fnmatch
+import inspect
+import os
+import re
+import sys
+
+
+## Class for converting Google Protocol Buffers .proto files into C++ style output to enable Doxygen usage.
+##
+## The C++ style output is printed into standard output.<br />
+## There are three different logging levels for the class:
+## <ul><li>#logNone: do not log anything</li>
+## <li>#logErrors: log errors only</li>
+## <li>#logAll: log everything</li></ul>
+## Logging level is determined by \c #logLevel.<br />
+## Error logs are written to file determined by \c #errorLogFile.<br />
+## Debug logs are written to file determined by \c #logFile.
+#
+class proto2cpp:
+
+    ## Logging level: do not log anything.
+    logNone   = 0
+    ## Logging level: log errors only.
+    logErrors = 1
+    ## Logging level: log everything.
+    logAll    = 2
+
+    ## Constructor
+    #
+    def __init__(self):
+        ## Debug log file name.
+        self.logFile = "proto2cpp.log"
+        ## Error log file name.
+        self.errorLogFile = "proto2cpp.error.log"
+        ## Logging level.
+        self.logLevel = self.logNone
+
+    ## Handles a file.
+    ##
+    ## If @p fileName has .proto suffix, it is processed through parseFile().
+    ## Otherwise it is printed to stdout as is except for file \c proto2cpp.py without
+    ## path since it's the script given to python for processing.
+    ##
+    ## @param fileName Name of the file to be handled.
+    #
+    def handleFile(self, fileName):
+        if fnmatch.fnmatch(filename, '*.proto'):
+            self.log('\nXXXXXXXXXX\nXX ' + filename + '\nXXXXXXXXXX\n\n')
+            # Open the file. Use try to detect whether or not we have an actual file.
+            if (sys.version_info >= (3, 0)):
+                try:
+                    with open(filename, 'r', encoding='utf8') as inputFile:
+                        self.parseFile(inputFile)
+                    pass
+                except IOError as e:
+                    self.logError('the file ' + filename + ' could not be opened for reading')
+            else:
+                # Python 2 code in this block
+                try:
+                    with open(filename, 'r') as inputFile:
+                        self.parseFile(inputFile)
+                    pass
+                except IOError as e:
+                    self.logError('the file ' + filename + ' could not be opened for reading')
+
+        elif not fnmatch.fnmatch(filename, os.path.basename(inspect.getfile(inspect.currentframe()))):
+            self.log('\nXXXXXXXXXX\nXX ' + filename + '\nXXXXXXXXXX\n\n')
+            if (sys.version_info > (3, 0)):
+                try:
+                    with open(filename, 'r', encoding='utf8') as theFile:
+                        output = ''
+                        for theLine in theFile:
+                            output += theLine
+                        print(output)
+                        self.log(output)
+                    pass
+                except IOError as e:
+                    self.logError('the file ' + filename + ' could not be opened for reading')
+            else:
+                # Python 2 code in this block
+                try:
+                    with open(filename, 'r') as theFile:
+                        output = ''
+                        for theLine in theFile:
+                            output += theLine
+                        print(output)
+                        self.log(output)
+                    pass
+                except IOError as e:
+                    self.logError('the file ' + filename + ' could not be opened for reading')
+
+        else:
+            self.log('\nXXXXXXXXXX\nXX ' + filename + ' --skipped--\nXXXXXXXXXX\n\n')
+
+    ## Parser function.
+    ##
+    ## The function takes a .proto file object as input
+    ## parameter and modifies the contents into C++ style.
+    ## The modified data is printed into standard output.
+    ##
+    ## @param inputFile Input file object
+    #
+    def parseFile(self, inputFile):
+        # Go through the input file line by line.
+        isEnum = False
+        isPackage = False
+        isMultilineComment = False
+        # This variable is here as a workaround for not getting extra line breaks (each line
+        # ends with a line separator and print() method will add another one).
+        # We will be adding lines into this var and then print the var out at the end.
+        theOutput = ''
+        for line in inputFile:
+            # Search for comment ("//") and add one more slash character ("/") to the comment
+            # block to make Doxygen detect it.
+            matchComment = re.search("//", line)
+            # Search for semicolon and if one is found before comment, add a third slash character
+            # ("/") and a smaller than ("<") character to the comment to make Doxygen detect it.
+            matchSemicolon = re.search(";", line)
+            if matchSemicolon is not None and (matchComment is not None and matchSemicolon.start() < matchComment.start()):
+                comment = "///<" + line[matchComment.end():]
+                # Replace '.' in nested message references with '::'
+                # don't work for multi-nested references and generates problems with URLs and acronyms
+                #comment = re.sub(r'\s(\w+)\.(\w+)\s', r' \1::\2 ', comment)
+                line = line[:matchComment.start()]
+            elif matchComment is not None:
+                if isMultilineComment:
+                    comment = " * " + line[matchComment.end():]
+                else:
+                    comment = "/** " + line[matchComment.end():]
+                    isMultilineComment = True
+                # replace '.' in nested message references with '::'
+                # don't work for multi-nested references and generates problems with URLs and acronyms
+                #comment = re.sub(r'\s(\w+)\.(\w+)\s', r' \1::\2 ', comment)
+                line = line[:matchComment.start()]
+            else:
+                comment = ""
+
+            # End multiline comment, if there is no comment or if there are some chars before the comment.
+            if (matchComment is None or len(line.strip())>0) and isMultilineComment:
+                theOutput += " */\n"
+                isMultilineComment = False
+
+            # line = line.replace(".", "::") but not in quoted strings (Necessary for import statement)
+            line = re.sub(r'\.(?=(?:[^"]*"[^"]*")*[^"]*$)',r'::',line)
+
+            # Search for " option ...;", remove it
+            line = re.sub(r'\boption\b[^;]+;', r'', line)
+
+            # Search for " package ", make a namespace
+            matchPackage = re.search(r"\bpackage\b", line)
+            if matchPackage is not None:
+                isPackage = True
+                # Convert to C++-style separator and block instead of statement
+                line = "namespace" + line[:matchPackage.start()] + line[matchPackage.end():].replace(";", " {")
+
+            # Search for " repeated " fields and make them ...
+            #matchRepeated = re.search(r"\brepeated\b", line)
+            #if matchRepeated is not None:
+            #  # Convert
+            #  line = re.sub(r'\brepeated\s+(\S+)', r' repeated \1', line)
+
+            # Search for "enum", start changing all semicolons (";") to commas (",").
+            matchEnum = re.search(r"\benum\b", line)
+            if matchEnum is not None:
+                isEnum = True
+
+            # Search semicolon if we have detected an enum, and replace semicolon with comma.
+            if isEnum is True and matchSemicolon is not None:
+                line = line.replace(";", ",")
+
+            # Search for a closing brace.
+            matchClosingBrace = re.search("}", line)
+            if isEnum is True and matchClosingBrace is not None:
+                line = line[:matchClosingBrace.start()] + "};" + line[matchClosingBrace.end():]
+                isEnum = False
+            elif isEnum is False and matchClosingBrace is not None:
+                # Message (to be struct) ends => add semicolon so that it'll
+                # be a proper C(++) struct and Doxygen will handle it correctly.
+                line = line[:matchClosingBrace.start()] + "};" + line[matchClosingBrace.end():]
+
+            # Replacements change start of comment...
+            matchMsg = re.search(r"\bmessage\b", line)
+            if matchMsg is not None:
+                line = line[:matchMsg.start()] + "struct" + line[matchMsg.end():]
+
+            # Replacements change start of comment...
+            matchExt = re.search(r"\bextend\b", line)
+            if matchExt is not None:
+                a_extend = line[matchExt.end():]
+                matchName = re.search(r"\b\w[\S:]*\b", a_extend)
+                if matchName is not None:
+                    name = a_extend[matchName.start():matchName.end()]
+                    name = re.sub(r'\w+::',r'',name)
+                    a_extend = a_extend[:matchName.start()] + name + ": public " + a_extend[matchName.start():]
+                else:
+                    a_extend = "_Dummy: public " + a_extend;
+                line = line[:matchExt.start()] + "struct " + a_extend
+
+            theOutput += (line.strip() + ' ' + comment.strip()).strip() + '\n'
+
+        if isPackage:
+            # Close the package namespace
+            theOutput += "}"
+            isPackage = False
+
+        # Now that we've got all lines in the string let's split the lines and print out
+        # one by one.
+        # This is a workaround to get rid of extra empty line at the end which print() method adds.
+        lines = theOutput.splitlines()
+        for line in lines:
+            if len(line) > 0:
+                print(line) # Add linebreak to generate documentation correct.
+                self.log(line + '\n')
+
+    ## Writes @p string to log file.
+    ##
+    ## #logLevel must be #logAll or otherwise the logging is skipped.
+    ##
+    ## @param string String to be written to log file.
+    #
+    def log(self, string):
+        if self.logLevel >= self.logAll:
+            with open(self.logFile, 'a') as theFile:
+                theFile.write(string)
+
+    ## Writes @p string to error log file.
+    ##
+    ## #logLevel must be #logError or #logAll or otherwise the logging is skipped.
+    ##
+    ## @param string String to be written to error log file.
+    #
+    def logError(self, string):
+        if self.logLevel >= self.logError:
+            with open(self.errorLogFile, 'a') as theFile:
+                theFile.write(string)
+
+converter = proto2cpp()
+# Doxygen will give us the file names
+for filename in sys.argv[1:]:
+    converter.handleFile(filename)
+
+# end of file
\ No newline at end of file
diff --git a/doc/doxygen/images/cockatrice_logo.svg b/doc/doxygen/images/cockatrice_logo.svg
new file mode 100644
index 000000000..89ba62dcf
--- /dev/null
+++ b/doc/doxygen/images/cockatrice_logo.svg
@@ -0,0 +1,232 @@
+<?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/classic_database_display.png b/doc/doxygen/images/screenshots/classic_database_display.png
similarity index 100%
rename from doc/doxygen/images/classic_database_display.png
rename to doc/doxygen/images/screenshots/classic_database_display.png
diff --git a/doc/doxygen/images/classic_database_display_add_buttons.png b/doc/doxygen/images/screenshots/classic_database_display_add_buttons.png
similarity index 100%
rename from doc/doxygen/images/classic_database_display_add_buttons.png
rename to doc/doxygen/images/screenshots/classic_database_display_add_buttons.png
diff --git a/doc/doxygen/images/classic_deck_editor.png b/doc/doxygen/images/screenshots/classic_deck_editor.png
similarity index 100%
rename from doc/doxygen/images/classic_deck_editor.png
rename to doc/doxygen/images/screenshots/classic_deck_editor.png
diff --git a/doc/doxygen/images/deck_dock_deck_list.png b/doc/doxygen/images/screenshots/deck_dock_deck_list.png
similarity index 100%
rename from doc/doxygen/images/deck_dock_deck_list.png
rename to doc/doxygen/images/screenshots/deck_dock_deck_list.png
diff --git a/doc/doxygen/images/deck_dock_deck_list_buttons.png b/doc/doxygen/images/screenshots/deck_dock_deck_list_buttons.png
similarity index 100%
rename from doc/doxygen/images/deck_dock_deck_list_buttons.png
rename to doc/doxygen/images/screenshots/deck_dock_deck_list_buttons.png
diff --git a/doc/doxygen/images/deck_dock_deck_list_group_by.png b/doc/doxygen/images/screenshots/deck_dock_deck_list_group_by.png
similarity index 100%
rename from doc/doxygen/images/deck_dock_deck_list_group_by.png
rename to doc/doxygen/images/screenshots/deck_dock_deck_list_group_by.png
diff --git a/doc/doxygen/images/deckeditordeckdockwidget.png b/doc/doxygen/images/screenshots/deckeditordeckdockwidget.png
similarity index 100%
rename from doc/doxygen/images/deckeditordeckdockwidget.png
rename to doc/doxygen/images/screenshots/deckeditordeckdockwidget.png
diff --git a/doc/doxygen/images/printing_selector.png b/doc/doxygen/images/screenshots/printing_selector.png
similarity index 100%
rename from doc/doxygen/images/printing_selector.png
rename to doc/doxygen/images/screenshots/printing_selector.png
diff --git a/doc/doxygen/images/printing_selector_disable.png b/doc/doxygen/images/screenshots/printing_selector_disable.png
similarity index 100%
rename from doc/doxygen/images/printing_selector_disable.png
rename to doc/doxygen/images/screenshots/printing_selector_disable.png
diff --git a/doc/doxygen/images/printing_selector_enable.png b/doc/doxygen/images/screenshots/printing_selector_enable.png
similarity index 100%
rename from doc/doxygen/images/printing_selector_enable.png
rename to doc/doxygen/images/screenshots/printing_selector_enable.png
diff --git a/doc/doxygen/images/printing_selector_navigation.png b/doc/doxygen/images/screenshots/printing_selector_navigation.png
similarity index 100%
rename from doc/doxygen/images/printing_selector_navigation.png
rename to doc/doxygen/images/screenshots/printing_selector_navigation.png
diff --git a/doc/doxygen/images/printing_selector_options.png b/doc/doxygen/images/screenshots/printing_selector_options.png
similarity index 100%
rename from doc/doxygen/images/printing_selector_options.png
rename to doc/doxygen/images/screenshots/printing_selector_options.png
diff --git a/doc/doxygen/images/printing_selector_pre_providerid.png b/doc/doxygen/images/screenshots/printing_selector_pre_providerid.png
similarity index 100%
rename from doc/doxygen/images/printing_selector_pre_providerid.png
rename to doc/doxygen/images/screenshots/printing_selector_pre_providerid.png
diff --git a/doc/doxygen/images/screenshots/release_channel_beta.png b/doc/doxygen/images/screenshots/release_channel_beta.png
new file mode 100644
index 000000000..00869a9cf
Binary files /dev/null and b/doc/doxygen/images/screenshots/release_channel_beta.png differ
diff --git a/doc/doxygen/images/vde_deck_analytics.png b/doc/doxygen/images/screenshots/vde_deck_analytics.png
similarity index 100%
rename from doc/doxygen/images/vde_deck_analytics.png
rename to doc/doxygen/images/screenshots/vde_deck_analytics.png
diff --git a/doc/doxygen/images/vde_flat_layout_color_grouped.png b/doc/doxygen/images/screenshots/vde_flat_layout_color_grouped.png
similarity index 100%
rename from doc/doxygen/images/vde_flat_layout_color_grouped.png
rename to doc/doxygen/images/screenshots/vde_flat_layout_color_grouped.png
diff --git a/doc/doxygen/images/vde_flat_layout_type_grouped.png b/doc/doxygen/images/screenshots/vde_flat_layout_type_grouped.png
similarity index 100%
rename from doc/doxygen/images/vde_flat_layout_type_grouped.png
rename to doc/doxygen/images/screenshots/vde_flat_layout_type_grouped.png
diff --git a/doc/doxygen/images/vde_overlap_layout_type_grouped.png b/doc/doxygen/images/screenshots/vde_overlap_layout_type_grouped.png
similarity index 100%
rename from doc/doxygen/images/vde_overlap_layout_type_grouped.png
rename to doc/doxygen/images/screenshots/vde_overlap_layout_type_grouped.png
diff --git a/doc/doxygen/images/vde_sample_hand.png b/doc/doxygen/images/screenshots/vde_sample_hand.png
similarity index 100%
rename from doc/doxygen/images/vde_sample_hand.png
rename to doc/doxygen/images/screenshots/vde_sample_hand.png
diff --git a/doc/doxygen/pages/developer_documentation/card_database_schema_and_parsing.md b/doc/doxygen/pages/developer_documentation/card_database_schema_and_parsing.md
new file mode 100644
index 000000000..7b4bdafc3
--- /dev/null
+++ b/doc/doxygen/pages/developer_documentation/card_database_schema_and_parsing.md
@@ -0,0 +1,16 @@
+@page card_database_schema_and_parsing Card Database Schema and Parsing
+
+# Card Database Schemas
+
+Cockatrice uses `XML files` to store information of available cards to be used in the app (`cards.xml`).  
+The token file follows the schema of the card database (`tokens.xml`), too.
+
+Saved decks (`<deckname>.xml`) use a different schema.
+
+- [XSD Schema for `Card Databases`](https://github.com/Cockatrice/Cockatrice/blob/master/doc/carddatabase_v4/cards.xsd) <kbd>v4</kbd>
+- [XSD Schema for `Decks`](https://github.com/Cockatrice/Cockatrice/blob/master/doc/deck.xsd) <kbd>v1</kbd>
+
+
+# Card Database Parsing
+
+TODO
diff --git a/doc/doxygen/extra-pages/developer_documentation/displaying_cards.md b/doc/doxygen/pages/developer_documentation/displaying_cards.md
similarity index 100%
rename from doc/doxygen/extra-pages/developer_documentation/displaying_cards.md
rename to doc/doxygen/pages/developer_documentation/displaying_cards.md
diff --git a/doc/doxygen/extra-pages/developer_documentation/index.md b/doc/doxygen/pages/developer_documentation/index.md
similarity index 66%
rename from doc/doxygen/extra-pages/developer_documentation/index.md
rename to doc/doxygen/pages/developer_documentation/index.md
index b26faf836..80f4eb492 100644
--- a/doc/doxygen/extra-pages/developer_documentation/index.md
+++ b/doc/doxygen/pages/developer_documentation/index.md
@@ -1,9 +1,13 @@
 @page developer_reference Developer Reference
 
+- @subpage logging
+
 - @subpage primer_cards
 
 - @subpage card_database_schema_and_parsing
 - @subpage querying_the_card_database
 
 - @subpage loading_card_pictures
-- @subpage displaying_cards
\ No newline at end of file
+- @subpage displaying_cards
+
+- @subpage developer_reference_network_overview
\ No newline at end of file
diff --git a/doc/doxygen/pages/developer_documentation/loading_card_pictures.md b/doc/doxygen/pages/developer_documentation/loading_card_pictures.md
new file mode 100644
index 000000000..c4c335b00
--- /dev/null
+++ b/doc/doxygen/pages/developer_documentation/loading_card_pictures.md
@@ -0,0 +1,210 @@
+@page loading_card_pictures Loading Card Pictures
+
+Pictures associated with CardInfo%s are retrieved either from on-disk or the network through the CardPictureLoader.
+
+In most cases, you don't need to concern yourself with the internals of CardPictureLoader.
+
+Simply using one of the ways described in @ref displaying_cards is enough to automatically queue a request to the
+CardPictureLoader when the chosen widget is shown, emitting signals to refresh the widget when the request is finished.
+
+# How requests are triggered
+
+CardPictureLoader::getPixmap() is called exactly two times in the code base, in CardInfoPictureWidget::loadPixmap(), the
+base class
+for all widget based card picture display, and AbstractCardItem::paintPicture(), the base class for all QGraphicsItem
+based card picture
+display. See @ref displaying_cards for more information on the difference between these two display methods.
+
+Because both of these calls are made in the paintEvent() methods of their respective classes, this means that requests
+are issued as soon as but not before the widget is shown on screen.
+
+It is also possible to "warm up" the cache by issuing card picture load requests to the CardPictureLoader without using
+a display widget and waiting for it to be shown by calling CardPictureLoader::cacheCardPixmaps() with a list of
+ExactCard%s.
+
+# The QPixmapCache and QNetworkDiskCache
+
+Cockatrice uses the QPixmapCache from the Qt GUI module to store card pictures in-memory and the QNetworkDiskCache from
+the Qt Network module to cache network requests for card pictures on-disk.
+
+What this means is that the CardPictureLoader will first attempt to look up a card in the QPixmapCache according to the
+ExactCard::getPixmapCacheKey() method of an ExactCard object. If it does not find it in the in-memory cache, it will
+issue a load request, which will first look for local images on-disk and then consult the QNetworkDiskCache and if
+found, use the stored binary data from the network cache to populate the in-memory pixmap cache under the card's cache
+key. If it is not found, it will then proceed with issuing a network request.
+
+The size of both of these caches can be configured by the user on the "Storage" settings page.
+
+# PixmapCacheKeys and ProviderIDs
+
+Every card picture that is loaded ends up in the QPixmapCache under a key that identifies the exact printing it belongs
+to. The key is produced by ExactCard::getPixmapCacheKey() and has the following shape:
+
+```text
+card_<card name>_<provider ID>
+```
+
+For example, the _Example Card_ printing with provider ID `0b23cdc8-d413-4fb1-8470-474221b10fe2` is stored
+under `card_Example Card_0b23cdc8-d413-4fb1-8470-474221b10fe2`. If the printing has no provider ID, the key
+drops the suffix and falls back to `card_<card name>`.
+
+The **provider ID** is the Scryfall UUID of the printing. Oracle maps the `scryfallId` of every printing to the `uuid`
+property when building the card database, and deck files persist it as the `uuid` attribute of each card entry. Because
+the provider ID is part of the pixmap cache key, two different printings of the same card never share a cache entry.
+This is exactly what allows the printing selector and exact-card lookups to display the picture of the precise printing
+a card was added as.
+
+The base key holds the full-size image. When a widget asks for a scaled version, the scaled pixmap is stored under an
+additional key of the form `<key>_<width>x<height>`, with the size adjusted for the device pixel ratio of the screen,
+so each widget size is only ever scaled once.
+
+The cache key is also used for bookkeeping outside of the pixmap cache itself:
+
+- CardPictureLoaderWorker keeps a set of keys that are currently being loaded so the same card is never queued twice.
+- CardPictureLoader tracks, per key, the last time loading failed. A failed load stores a NULL pixmap under the key; as
+  long as that marker is present, subsequent requests for the card show the "failed" card back and are only re-queued
+  after the retry interval of 300 seconds has passed.
+- When the CardInfo of a loaded card is destroyed, its cache entries and failure markers are removed.
+
+# The Redirect Cache
+
+Many picture URLs - in particular the Gatherer and Scryfall URLs from the default set of templates - redirect to a CDN
+or to a different host. To avoid following the same redirect for every single card, CardPictureLoaderWorker remembers
+redirects and applies them without an extra network round trip.
+
+The redirect cache is a hash map from original URL to redirect URL plus timestamp. It is persisted to a `cache.ini`
+file (Qt's INI format, under the `redirects` array) inside the redirect cache directory
+(`SettingsCache::instance().paths().getRedirectCachePath()`, i.e. `<cache directory>/redirects/`). The cache is loaded when the worker
+starts, pruned of entries older than the configured TTL, and written back to disk when the application quits.
+
+Entries are added whenever a network reply reports a redirection (see below) and are consulted before any request is
+made: both CardPictureLoaderWorker::queueRequest() and CardPictureLoaderWorker::makeRequest() check for a cached
+redirect first and jump straight to the final URL.
+
+The TTL is the "Redirect Cache TTL" setting on the "Storage" settings page and defaults to 30 days. Lowering it makes
+Cockatrice re-resolve redirects sooner, which can help when a download URL changed its redirect target.
+
+Because Cockatrice tracks redirects itself, the QNetworkAccessManager is configured with Qt's `ManualRedirectPolicy`.
+Redirects found in a reply are handled manually:
+
+- A recursive redirect (a URL redirecting to itself) is treated as a failed load.
+- Otherwise the redirect is recorded in the redirect cache and the request is re-issued against the target URL.
+- A successful reply with one of the redirect status codes 301, 302, 303, 305, 307 or 308 is handled the same way.
+
+Clearing the network cache (CardPictureLoader::clearNetworkCache()) also clears the redirect cache.
+
+# Local Image Loading
+
+Before any network request is issued, CardPictureLoaderWorker hands the ExactCard to CardPictureLoaderLocal, which
+tries to find a matching picture on disk. If a local picture is found, it is used and no network request is made.
+
+CardPictureLoaderLocal searches three locations:
+
+- The **CUSTOM folder** (`<pictures directory>/CUSTOM/`). Every file in it is indexed recursively by its base name
+  (both `baseName` and `completeBaseName`, so a file named `ExampleCard.jpg` is indexed as `ExampleCard`). The index is rebuilt
+  every 10 seconds, so new files are picked up without restarting the
+  client (changing the configured pictures directory only reassigns the search paths; the next timer tick rebuilds the index).
+- The **set-named subfolders** of the pictures directory: `<pictures directory>/<set code>/` and
+  `<pictures directory>/downloadedPics/<set code>/`.
+- The **root of the `downloadedPics` folder** (`<pictures directory>/downloadedPics/`). The export naming schemes without a
+  set-folder part write their files straight into `downloadedPics/`, so this is where flat-scheme downloads and the
+  local overrides described below are matched.
+
+For each candidate folder, the loader generates file-name variants from the card's corrected name, set code, collector
+number and provider ID using the import naming schemes (Card Name + Provider ID, Card Name + Set + Collector,
+Set + Collector + Card Name, Card Name + Set, Card Name), each tried with both `_` and `-` as separator. A file is
+accepted when its name without the extension *equals* the variant exactly - the extension itself is free - and the
+first variant that yields a readable image wins. For example, the file `Example Card_EXM_43.png` in the `EXM` set
+folder matches the card with corrected name `Example Card`, set code `EXM` and collector number `43`.
+
+\attention The file-name variants use the *corrected* card name, so split cards are stored under their joined name: the
+"Example // Card" card is matched by a file named `ExampleCard.*`.
+
+The naming schemes are also documented in the user-facing page @ref custom_card_pictures, which additionally covers
+the CUSTOM folder workflow, `picurl` and download URL templates.
+
+When the filesystem cache method is selected on the "Storage" settings page, downloaded images are additionally written
+into `<pictures directory>/downloadedPics/` using the configured export naming scheme (as `.png` files). The two export
+schemes with a set-folder part (`Set Folder / Name + Provider ID` and `Set Folder / Name + Set Name + Collector`) write
+into `downloadedPics/<set code>/`; the three flat schemes write directly into `downloadedPics/`. Automatic cache writes
+never overwrite an existing file, so a provider outage can permanently leave an outdated image in that folder until it
+is deleted manually - the user-facing troubleshooting guide @ref fixing_card_pictures covers how to do this. Explicit
+image overrides (see below) are the exception and always overwrite.
+
+# Local Image Overrides
+
+Beyond the generic on-disk lookup above, individual printings can be given explicit artwork that wins over every other
+source without touching the CUSTOM folder or any download URL. This is the "Image Overrides" submenu of the context menu
+that opens when you right-click a card in the deck editor's printing selector.
+
+- **Load Custom Image...** asks for a picture file and installs it for the card through
+  CardPictureLoader::saveCardImageToLocalStorage() with `allowOverwrite == true`.
+- **One entry per alternate printing** (labeled `<set> <collector number>`): selecting one hands the card to
+  CardPictureLoader::installPrintingOverride(), which resolves that printing's artwork - enqueueing a load and waiting
+  for the `CardInfo::pixmapUpdated` signal if it is not cached yet - and persists it for the card.
+- **Clear Custom Image** calls CardPictureLoader::deleteAllLocalOverrides() to remove every stored override image of the
+  card, after which normal resolution resumes. The entry is only enabled while CardPictureLoader::hasLocalOverrides()
+  reports at least one stored file.
+
+Overrides are stored as `.png` files in `downloadedPics/` under the export naming scheme configured on the "Storage"
+settings page - which is exactly why the local matcher also looks into the `downloadedPics/` root (see above). They are
+written with `allowOverwrite == true`, so an override always replaces whatever the filesystem cache previously saved for
+that spelling; only *automatic* cache writes are prevented from clobbering it. Overriding a card with its own current
+printing is a no-op (the UI omits it from the menu), and an override whose artwork fails to resolve surfaces the
+"failed" card back instead of a silent no-op while any override already on disk is left in place and re-displayed.
+
+# URL Generation and Resolution
+
+When no local image is available and downloading is enabled, the network loader starts working through a list of
+candidate URLs. This list is managed by CardPictureToLoad and is built in two steps.
+
+First, CardPictureToLoad::extractSetsSorted() collects all sets the card has printings in and sorts them by set
+priority. Unless the user disabled per-printing art ("Override all card art with personal set preference (Pre-ProviderID
+change behavior)"), the set that
+matches the requested printing's provider ID is moved to the front, so the exact printing is always attempted first.
+
+For each set, CardPictureToLoad::populateSetUrls() builds an ordered URL list:
+
+1. A custom URL defined for that printing via the `picurl` property in the card database, if present.
+2. The configured download URL templates, in priority order (Deck Editor → "URL Download Priority").
+
+URL templates are transformed into concrete URLs by CardPictureToLoad::transformUrl(), which substitutes reference
+points. `!name!`, `!setcode!` and friends substitute card and printing data, while the `!set:<property>!` and
+`!prop:<property>!` reference points resolve a property of the printing or of the card respectively. The canonical list
+of all reference points with examples, including the `_fill_with_` and `_substr_` modifiers, lives in
+@ref custom_card_pictures.
+
+The `!set:...!` and `!prop:...!` reference points also support two modifiers:
+
+- `_fill_with_<text>` pads the value with the given text, right-aligned, e.g. `!set:num_fill_with_000!` turns collector
+  number `1` into `001`. If the value is longer than the fill text, the template is invalidated.
+- `_substr_<start>_<length>` extracts a substring, e.g. `!set:num_substr_2_2!` takes two characters starting at the
+  third. If the substring would extend past the end of the value, the template is invalidated.
+
+Substituted values are percent-encoded. If a template asks for a property the card or printing does not have (or one of
+the modifiers invalidates it), the template yields no URL and is skipped; the next template is tried instead.
+
+\attention Custom URLs should start with `http://` or `https://`. The scheme is not validated before the URL is handed
+to QNetworkAccessManager, so a template without an absolute scheme may silently fail to download; prefer HTTPS where the
+provider allows it.
+
+The resolution order is: for the current set, try each URL in the list; when all URLs for a set are exhausted, move to
+the next set; when every set is exhausted, the load fails. A failed load is reported through the NULL-pixmap mechanism
+described in the PixmapCacheKeys and ProviderIDs section above.
+
+Several mechanisms influence the resolution process:
+
+- **Rate limiting.** The worker allows roughly 10 requests per second globally. A server that answers with HTTP 429
+  gets its per-host allowance halved; the first 429 for a host is waited out (honoring the `Retry-After` header if
+  present) and the same URL retried, while a second 429 makes the loader fall through to the other configured sources.
+  When all sources are exhausted the request is deferred with some random jitter and retried once the back-off expires.
+- **Redirects.** Replies with a redirect status (301, 302, 303, 305, 307, 308) are followed and recorded in the
+  redirect cache as described in the Redirect Cache section above.
+- **Blacklisted images.** Gatherer returns the card back image for cards it does not know. A few known MD5 hashes of
+  that image are blacklisted, so such a "successful" download is treated as not found instead of being shown.
+- **WebP.** Images detected as WebP (RIFF/WEBP header) are decoded through QMovie instead of QImageReader.
+- **Downloads disabled.** When "Download card pictures on the fly" is disabled and the network cache method is active,
+  requests use Qt's `AlwaysCache` policy so that only previously cached images are served.
+
+A user-facing reference for writing download URL templates, including more worked examples, is available at
+@ref custom_card_pictures.
diff --git a/doc/doxygen/pages/developer_documentation/logging.md b/doc/doxygen/pages/developer_documentation/logging.md
new file mode 100644
index 000000000..8fd5cb015
--- /dev/null
+++ b/doc/doxygen/pages/developer_documentation/logging.md
@@ -0,0 +1,184 @@
+@page logging Logging
+
+Cockatrice uses QtLogging from the QtCore module for its logging. See
+the [official documentation](https://doc.qt.io/qt-6/qtlogging.html) for further details.
+
+# Log Message Pattern
+
+Any message logged through the QtLogging system automatically conforms to this message pattern:
+
+Generic:
+
+```
+[<timestamp> <log_level>] [<class:function>] - <message> [<filename>:<line_no>]
+```
+
+Example:
+
+```
+[2025-12-05 14:48:25.908 I] [MainWindow::startupConfigCheck] - Startup: found config with current version [window_main.cpp:951]
+```
+
+For more information, see [Logging Setup](#logging-setup).
+
+# Log Level and Categories
+
+\note The default log level for the application is info.
+
+This means that you should only use qInfo() in production-level code if you are truly sure that this message is
+beneficial to end-users and other developers. As a general rule, if your functionality logs to info more than twice in
+response to a user interaction, you are advised to consider moving some of these logs down to the debug level.
+
+\warning You are strongly advised to avoid the use of the generic logging macros (e.g. qDebug(), qInfo(), qWarn()).
+
+\note You should instead use the corresponding category logging macros (qCDebug(), qCInfo(), qCWarn()) and define
+logging
+categories for your log statements.
+
+Example:
+
+```c++
+in .h
+
+inline Q_LOGGING_CATEGORY(ExampleCategory, "cockatrice_example_category");
+inline Q_LOGGING_CATEGORY(ExampleSubCategory, "cockatrice_example_category.sub_category");
+
+in .cpp
+
+qCInfo(ExampleCategory) << "Info level logs are usually sent through the main category"
+qCDebug(ExampleSubCategory) << "Debug level logs are permitted their own category to allow selective silencing"
+```
+
+For more information on how to enable or disable logging categories,
+see [Logging Configuration](#logging-configuration).
+
+# Logging Configuration
+
+For configuring our logging, we use the qtlogging.ini, located under cockatrice/resources/config/qtlogging.ini, which is
+baked into the application in release version and set as the QT_LOGGING_CONF environment variable in main.cpp.
+
+```c++
+#ifdef Q_OS_APPLE
+    // <build>/cockatrice/cockatrice.app/Contents/MacOS/cockatrice
+    const QByteArray configPath = "../../../qtlogging.ini";
+#elif defined(Q_OS_UNIX)
+    // <build>/cockatrice/cockatrice
+    const QByteArray configPath = "./qtlogging.ini";
+#elif defined(Q_OS_WIN)
+    // <build>/cockatrice/Debug/cockatrice.exe
+    const QByteArray configPath = "../qtlogging.ini";
+#else
+    const QByteArray configPath = "";
+#endif
+
+    if (!qEnvironmentVariableIsSet(("QT_LOGGING_CONF"))) {
+        // Set the QT_LOGGING_CONF environment variable
+        qputenv("QT_LOGGING_CONF", configPath);
+    }
+```
+
+For more information on how to use this file and on how Qt evaluates which logging rules/file to use, please
+see the [official Qt documentation](https://doc.qt.io/qt-6/qloggingcategory.html#configuring-categories).
+
+Some examples:
+
+```
+# Turn off all logging except everything from card_picture_loader and all sub categories
+
+[Rules]
+# The default log level is info
+*.debug = false
+*.info = false
+*.warning = false
+*.critical = false
+*.fatal = false
+
+card_picture_loader.* = true
+```
+
+```
+# Turn off all logging except info level logs from card_picture_loader and all sub categories
+
+[Rules]
+# The default log level is info
+*.debug = false
+*.info = false
+*.warning = false
+*.critical = false
+*.fatal = false
+
+card_picture_loader.*.info = true
+```
+
+```
+[Rules]
+# Turn on debug level logs for card_picture_loader but keep logging for sub categories suppressed
+*.debug = false
+
+card_picture_loader.debug = true
+```
+
+```
+[Rules]
+# Turn on all logs for worker subcategory of card_picture_loader
+*.debug = false
+
+card_picture_loader.worker = true
+```
+
+```
+[Rules]
+# Turn off some noisy and irrelevant startup logging for local development
+*.debug = false
+
+qt_translator = false
+window_main.* = false
+release_channel = false
+spoiler_background_updater = false
+theme_manager = false
+sound_engine = false
+tapped_out_interface = false
+card_database = false
+card_database.loading = false
+card_database.loading.success_or_failure = true
+cockatrice_xml.* = false
+```
+
+# Logging Setup
+
+This is achieved through our logging setup in @ref main.cpp, where we set the message pattern and install a custom
+logger which replaces the full file path at the end with just the file name (Qt shows the full and quite lengthy path by
+default).
+
+```c++
+    qSetMessagePattern(
+        "\033[0m[%{time yyyy-MM-dd h:mm:ss.zzz} "
+        "%{if-debug}\033[36mD%{endif}%{if-info}\033[32mI%{endif}%{if-warning}\033[33mW%{endif}%{if-critical}\033[31mC%{"
+        "endif}%{if-fatal}\033[1;31mF%{endif}\033[0m] [%{function}] - %{message} [%{file}:%{line}]");
+    QApplication app(argc, argv);
+
+    QObject::connect(&app, &QApplication::lastWindowClosed, &app, &QApplication::quit);
+
+    qInstallMessageHandler(CockatriceLogger);
+```
+
+```c++
+static void CockatriceLogger(QtMsgType type, const QMessageLogContext &ctx, const QString &message)
+{
+    QString logMessage = qFormatLogMessage(type, ctx, message);
+
+    // Regular expression to match the full path in the square brackets and extract only the filename and line number
+    QRegularExpression regex(R"(\[(?:.:)?[\/\\].*[\/\\]([^\/\\]+\:\d+)\])");
+    QRegularExpressionMatch match = regex.match(logMessage);
+
+    if (match.hasMatch()) {
+        // Extract the filename and line number (e.g., "main.cpp:211")
+        QString filenameLine = match.captured(1);
+
+        // Replace the full path in square brackets with just the filename and line number
+        logMessage.replace(match.captured(0), QString("[%1]").arg(filenameLine));
+    }
+
+    Logger::getInstance().log(type, ctx, logMessage);
+}
+```
\ No newline at end of file
diff --git a/doc/doxygen/pages/developer_documentation/network/client/game_event_handler.md b/doc/doxygen/pages/developer_documentation/network/client/game_event_handler.md
new file mode 100644
index 000000000..051823c6c
--- /dev/null
+++ b/doc/doxygen/pages/developer_documentation/network/client/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/client/index.md b/doc/doxygen/pages/developer_documentation/network/client/index.md
new file mode 100644
index 000000000..f22640448
--- /dev/null
+++ b/doc/doxygen/pages/developer_documentation/network/client/index.md
@@ -0,0 +1,11 @@
+@page developer_reference_network_client Client Networking (Overview)
+
+The clients response to various network protocol events and associated handling are described here.
+
+For information about game scoped events, see:
+
+- @subpage game_event_handler
+
+Certain game scoped events may be forwarded to player based handlers. For more information, see:
+
+- @subpage player_event_handler
\ No newline at end of file
diff --git a/doc/doxygen/pages/developer_documentation/network/client/player_event_handler.md b/doc/doxygen/pages/developer_documentation/network/client/player_event_handler.md
new file mode 100644
index 000000000..6878758da
--- /dev/null
+++ b/doc/doxygen/pages/developer_documentation/network/client/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/index.md b/doc/doxygen/pages/developer_documentation/network/index.md
new file mode 100644
index 000000000..713291d84
--- /dev/null
+++ b/doc/doxygen/pages/developer_documentation/network/index.md
@@ -0,0 +1,7 @@
+@page developer_reference_network_overview Network (Overview)
+
+This page provides information about the networking performed by the client and server.
+
+For information about the protocol, see @subpage developer_reference_protocol
+
+For information about the clients response to and handling of protocol messages, see @subpage developer_reference_network_client
\ No newline at end of file
diff --git a/doc/doxygen/pages/developer_documentation/network/protocol/index.md b/doc/doxygen/pages/developer_documentation/network/protocol/index.md
new file mode 100644
index 000000000..724b6b994
--- /dev/null
+++ b/doc/doxygen/pages/developer_documentation/network/protocol/index.md
@@ -0,0 +1,15 @@
+@page developer_reference_protocol Protocol (Overview)
+
+For an overview of the protocol used by the Cockatrice client and server, see:
+
+- @subpage developer_reference_protocol_overview
+- @subpage protocol_game_command
+
+For client → server communication, see:
+
+- @subpage protocol_command_container
+
+For server → client communication, see:
+
+- @subpage protocol_server_message
+- @subpage protocol_response
\ No newline at end of file
diff --git a/doc/doxygen/pages/developer_documentation/network/protocol/protocol_command_container.md b/doc/doxygen/pages/developer_documentation/network/protocol/protocol_command_container.md
new file mode 100644
index 000000000..0fb634358
--- /dev/null
+++ b/doc/doxygen/pages/developer_documentation/network/protocol/protocol_command_container.md
@@ -0,0 +1,114 @@
+@page protocol_command_container CommandContainer (Protocol Concept)
+
+@section cc_overview Overview
+
+CommandContainer is the client-to-server message envelope used for all
+client requests in the Cockatrice protocol.
+
+Every client-initiated action is transmitted as a CommandContainer.
+The server never sends CommandContainer messages.
+
+This is a protocol-level abstraction and should not be confused with the
+generated protobuf accessors or wire-level encoding.
+
+@section cc_lifecycle Lifetime and Ownership
+
+- CommandContainers are created by clients and consumed by the server.
+- Each container represents one logical request.
+- Containers are processed atomically and in order of arrival.
+
+A container may generate:
+- Exactly one RESPONSE message, and
+- Zero or more EVENT messages.
+
+@section cc_cmd_id Command Identification
+
+The @c cmd_id field is a client-assigned identifier used to correlate
+responses with requests.
+
+Rules:
+- @c cmd_id is optional but strongly recommended
+- The server echoes @c cmd_id only in RESPONSE messages
+- EVENT messages are never associated with a @c cmd_id
+
+The server does not enforce uniqueness of @c cmd_id values.
+
+@section cc_context Command Context
+
+Certain command domains require additional context:
+
+- Room commands require @c room_id
+- Game commands require @c game_id
+
+Context fields are ignored for command domains that do not require them.
+
+If a required context field is missing or invalid, the server responds with
+@c RespContextError.
+
+@section cc_invariants Invariants
+
+The following rules are enforced by the server:
+
+- Exactly one command domain must be populated
+- Commands may be batched only within the same domain
+- Context fields must match the active command domain
+
+Violations of these rules result in @c RespInvalidCommand.
+
+@section cc_domains Command Domains
+
+CommandContainer supports the following mutually exclusive command domains:
+
+- Session commands
+  - Authentication
+  - User discovery
+  - Private messaging
+
+- Room commands
+  - Chat
+  - Game creation
+  - Room membership management
+
+- Game commands
+  - In-game actions
+  - State mutations
+
+- Moderator commands
+  - User moderation
+  - Room moderation
+
+- Admin commands
+  - Server administration
+
+@section cc_batching Command Batching
+
+A CommandContainer may contain multiple commands of the same domain.
+
+Batching guarantees:
+- Commands are processed in the order they appear in the container
+- All commands in the batch share the same context
+
+Partial failure behavior is implementation-defined and may vary by domain.
+
+@section cc_dispatch Dispatch
+
+CommandContainers are dispatched by
+Server_ProtocolHandler::processCommandContainer().
+
+Dispatch is performed by inspecting which command domain is populated.
+Only the first populated domain is considered.
+
+@section cc_errors Error Handling
+
+Common error responses include:
+- @c RespLoginNeeded – client is not authenticated
+- @c RespInvalidCommand – malformed container or invalid domain usage
+- @c RespContextError – missing or invalid room/game context
+
+@section cc_related Related Concepts
+
+- @ref protocol_server_message "ServerMessage"
+- @ref protocol_client_states "Client State Machine"
+
+@see Server_ProtocolHandler::processCommandContainer
+
diff --git a/doc/doxygen/pages/developer_documentation/network/protocol/protocol_game_command.md b/doc/doxygen/pages/developer_documentation/network/protocol/protocol_game_command.md
new file mode 100644
index 000000000..18e31064a
--- /dev/null
+++ b/doc/doxygen/pages/developer_documentation/network/protocol/protocol_game_command.md
@@ -0,0 +1,529 @@
+@page protocol_game_command GameCommand (Protocol Concept)
+
+# Game Commands Reference
+
+This document describes game-level commands (`GameCommandType`) and how they are
+handled across the server and client.
+
+Flow overview:
+
+Client
+→ GameCommand
+→ Server command handler (`Server_Player`, `Server_AbstractParticipant`, or `Server_Game`)
+→ GameEvent(s)
+→ PlayerEventHandler::event*
+
+## Command Mapping
+
+### `GAME_SAY` (1002)
+
+**Purpose:** Send a chat message during a game.
+
+**Server:**
+- `Server_AbstractParticipant::cmdGameSay`
+- Validates spectator chat permissions
+- Applies chat flood protection
+- Emits `Event_GameSay`
+- Logs the message to the server database
+
+**Client:**
+- `PlayerEventHandler::eventGameSay`
+- Adds the chat message to the game log
+
+---
+
+### `SHUFFLE` (1003)
+
+**Purpose:** Shuffle a card zone (usually library).
+
+**Server:**
+- `Server_Player::cmdShuffle`
+- Only allows shuffling the deck zone
+- Rejects if the game has not started or the player has conceded
+- Supports partial-range shuffles (`start` / `end`)
+- Emits `Event_Shuffle`
+- Re-reveals the top card if the deck is being tracked
+
+**Client:**
+- `PlayerEventHandler::eventShuffle`
+- Closes affected library views
+- Clears any revealed top card if necessary
+- Updates deck graphics
+- Logs the shuffle
+
+---
+
+### `ROLL_DIE` (1005)
+
+**Purpose:** Roll one or more dice.
+
+**Server:**
+- Computes random die results
+- Emits `Event_RollDie`
+
+**Client:**
+- `PlayerEventHandler::eventRollDie`
+- Displays the sorted roll results in the game log
+
+---
+
+### `DRAW_CARDS` (1006)
+
+**Purpose:** Draw cards from deck.
+
+**Server:**
+- `Server_Player::cmdDrawCards`
+- Rejects if the game has not started or the player has conceded
+- Moves cards from deck to hand
+- Sends full card information privately to the drawing player
+- Sends only the draw count to all other players
+- Tracks drawn cards for undo
+- Updates revealed-top-card state when necessary
+- Emits `Event_DrawCards`
+
+**Client:**
+- `PlayerEventHandler::eventDrawCards`
+- Moves cards from library to hand
+- Reveals card identities only when included in the event
+- Updates both zones
+- Logs the draw
+
+---
+
+### `UNDO_DRAW` (1007)
+
+**Purpose:** Undo a previous draw.
+
+**Server:**
+- `Server_Player::cmdUndoDraw`
+- Rejects if the game has not started or the player has conceded
+- Uses the tracked draw history (`lastDrawList`)
+- Moves the most recently drawable card from hand back to the top of the deck
+- Emits `Event_GameLogNotice` if undo is no longer possible
+
+**Client:**
+- Processed as a normal `MOVE_CARD`
+- Detects `Context_UndoDraw`
+- Logs the undo draw instead of a normal move
+
+---
+
+### `FLIP_CARD` (1008)
+
+**Purpose:** Flip a card face up or face down.
+
+**Server:**
+- Updates the card's face-down state
+- Reveals identity when turning face up
+- Emits `Event_FlipCard`
+
+**Client:**
+- `PlayerEventHandler::eventFlipCard`
+- Updates the card identity when revealed
+- Changes face-up / face-down state
+- Updates card menus
+- Logs the flip
+
+---
+
+### `ATTACH_CARD` (1009)
+
+**Purpose:** Attach one card to another.
+
+**Server:**
+- Updates attachment relationships
+- Emits `Event_AttachCard`
+
+**Client:**
+- `PlayerEventHandler::eventAttachCard`
+- Updates parent/child attachment links
+- Reorganizes affected zones
+- Logs attach or detach operations
+- Refreshes card actions
+
+---
+
+### `CREATE_TOKEN` (1010)
+
+**Purpose:** Create a token card.
+
+**Server:**
+- Creates a new token card
+- Emits `Event_CreateToken`
+
+**Client:**
+- `PlayerEventHandler::eventCreateToken`
+- Creates the token object
+- Applies token properties (PT, color, annotation, face-down state)
+- Adds it to the requested zone
+- Logs token creation
+
+---
+
+### `CREATE_ARROW` (1011)
+
+**Purpose:** Create a visual arrow.
+
+**Server:**
+- Creates a visual arrow
+- Emits `Event_CreateArrow`
+
+**Client:**
+- `PlayerEventHandler::eventCreateArrow`
+- Creates the arrow graphics
+- Resolves endpoint card names
+- Logs arrow creation
+
+---
+
+### `DELETE_ARROW` (1012)
+
+**Purpose:** Remove a visual arrow.
+
+**Server:**
+- Removes an existing arrow
+- Emits `Event_DeleteArrow`
+
+**Client:**
+- `PlayerEventHandler::eventDeleteArrow`
+- Removes the arrow graphics
+
+---
+
+### `SET_CARD_ATTR` (1013)
+
+**Purpose:** Set a card attribute.
+
+**Server:**
+- Updates one or more card attributes
+- Emits `Event_SetCardAttr`
+
+**Client:**
+- `PlayerEventHandler::eventSetCardAttr`
+- Updates tapped state, color, annotation, power/toughness, face-down state, attacking state, and related visuals
+- Logs attribute changes where appropriate
+
+---
+
+### `SET_CARD_COUNTER` (1014)
+
+**Purpose:** Set a card counter.
+
+**Server:**
+- Updates the specified card counter
+- Emits `Event_SetCardCounter`
+
+**Client:**
+- `PlayerEventHandler::eventSetCardCounter`
+- Updates the displayed counter value
+- Refreshes card actions
+- Logs the counter change
+
+---
+
+### `INC_CARD_COUNTER` (1015)
+
+**Purpose:** Increment a card counter.
+
+**Server:**
+- Normalizes to a set-counter operation
+- Emits `Event_SetCardCounter`
+
+**Client:**
+- Processed identically to `SET_CARD_COUNTER`
+
+---
+
+### `READY_START` (1016)
+
+**Purpose:** Mark player as ready.
+
+**Server:**
+- Marks the player as ready
+- Starts the game once all required players are ready
+
+**Client:**
+- Reflected through updated game state events
+
+---
+
+### `CONCEDE` (1017)
+
+**Purpose:** Concede the game.
+
+**Server:**
+- Marks the player as conceded
+- Returns borrowed cards where appropriate
+- Ends the game if only one player remains
+
+**Client:**
+- Reflected through updated game state events
+
+---
+
+### `INC_COUNTER` (1018)
+
+**Purpose:** Increment a player counter.
+
+**Server:**
+- `Server_Player::cmdIncCounter`
+- Rejects if the game has not started or the player has conceded
+- Updates the counter value
+- Emits `Event_SetCounter` only if the value changed
+
+**Client:**
+- `PlayerEventHandler::eventSetCounter`
+- Updates the displayed player counter
+- Logs the change
+
+---
+
+### `CREATE_COUNTER` (1019)
+
+**Purpose:** Create a player counter.
+
+**Server:**
+- `Server_Player::cmdCreateCounter`
+- Rejects if the game has not started or the player has conceded
+- Allocates a new counter ID
+- Creates the counter
+- Emits `Event_CreateCounter`
+
+**Client:**
+- `PlayerEventHandler::eventCreateCounter`
+- Creates the local player counter
+
+---
+
+### `SET_COUNTER` (1020)
+
+**Purpose:** Set a player counter value.
+
+**Server:**
+- `Server_Player::cmdSetCounter`
+- Rejects if the game has not started or the player has conceded
+- Updates the counter value
+- Emits `Event_SetCounter` only if the value changed
+
+**Client:**
+- `PlayerEventHandler::eventSetCounter`
+- Updates the counter value
+- Logs the change
+
+---
+
+### `DEL_COUNTER` (1021)
+
+**Purpose:** Delete a player counter.
+
+**Server:**
+- `Server_Player::cmdDelCounter`
+- Rejects if the game has not started or the player has conceded
+- Deletes the counter
+- Emits `Event_DelCounter`
+
+**Client:**
+- `PlayerEventHandler::eventDelCounter`
+- Removes the counter
+
+---
+
+### `NEXT_TURN` (1022)
+
+**Purpose:** Advance to the next turn.
+
+**Server:**
+- `Server_Player::cmdNextTurn`
+- Rejects if the game has not started
+- Conceded players cannot advance turns unless acting as a judge
+- Calls `Server_Game::nextTurn()`
+
+**Client:**
+- Reflected through subsequent active-player and active-phase events
+
+---
+
+### `SET_ACTIVE_PHASE` (1023)
+
+**Purpose:** Set active phase.
+
+**Server:**
+- `Server_Player::cmdSetActivePhase`
+- Rejects if the game has not started
+- Judges may change the phase at any time
+- Normal players may only change the phase during their own active turn
+- Calls `Server_Game::setActivePhase()`
+
+**Client:**
+- Reflected through updated phase events
+
+---
+
+### `DUMP_ZONE` (1024)
+
+**Purpose:** Dump zone contents.
+
+**Server:**
+- Generates a zone summary
+- Emits `Event_DumpZone`
+
+**Client:**
+- `PlayerEventHandler::eventDumpZone`
+- Logs the zone contents summary
+
+---
+
+### `REVEAL_CARDS` (1026)
+
+**Purpose:** Reveal specific cards.
+
+**Server:**
+- Reveals cards to one or more players
+- Emits `Event_RevealCards`
+
+**Client:**
+- `PlayerEventHandler::eventRevealCards`
+- Reveals cards in-place or in a reveal window
+- Supports temporary peeks
+- Updates revealed top cards
+- Logs the reveal
+
+---
+
+### `MOVE_CARD` (1027)
+
+**Purpose:** Move a card between zones.
+
+**Server:**
+- Moves cards between zones
+- Updates ownership and attachments as needed
+- Emits `Event_MoveCard`
+
+**Client:**
+- `PlayerEventHandler::eventMoveCard`
+- Moves the card between zones
+- Updates ownership, attachments, IDs and revealed information
+- Handles undo-draw context
+- Refreshes menus and zone layouts
+- Logs the move
+
+---
+
+### `SET_SIDEBOARD_PLAN` (1028)
+
+**Purpose:** Set sideboard configuration.
+
+**Server:**
+- `Server_Player::cmdSetSideboardPlan`
+- Allowed only before readying for the game
+- Requires a loaded deck
+- Requires sideboarding to be unlocked
+- Stores the current sideboard plan
+
+**Client:**
+- No game event is generated
+
+---
+
+### `DECK_SELECT` (1029)
+
+**Purpose:** Select a deck.
+
+**Server:**
+- `Server_Player::cmdDeckSelect`
+- Allowed only before the game starts
+- Loads a deck from either the database or serialized deck data
+- Locks sideboarding
+- Updates player properties
+- Emits `Event_PlayerPropertiesChanged`
+- Attaches `Context_DeckSelect`
+- Returns the selected deck in the command response
+
+**Client:**
+- Reflected through updated player properties and command response
+
+---
+
+### `SET_SIDEBOARD_LOCK` (1030)
+
+**Purpose:** Lock or unlock sideboarding.
+
+**Server:**
+- `Server_Player::cmdSetSideboardLock`
+- Allowed only before readying
+- Toggles sideboard locking
+- Clears pending sideboard plans when locking
+- Emits `Event_PlayerPropertiesChanged`
+- Attaches `Context_SetSideboardLock`
+
+**Client:**
+- Reflected through updated player properties
+
+---
+
+### `CHANGE_ZONE_PROPERTIES` (1031)
+
+**Purpose:** Change zone properties.
+
+**Server:**
+- `Server_Player::cmdChangeZoneProperties`
+- Delegates to the abstract implementation
+- Updates top-card revelation if required
+- Emits `Event_ChangeZoneProperties`
+
+**Client:**
+- `PlayerEventHandler::eventChangeZoneProperties`
+- Updates always-reveal-top-card and always-look-at-top-card settings
+- Logs property changes
+
+---
+
+### `UNCONCEDE` (1032)
+
+**Purpose:** Undo a concede.
+
+**Server:**
+- Restores the player's active status
+
+**Client:**
+- Reflected through updated game state events
+
+---
+
+### `JUDGE` (1033)
+
+**Purpose:** Execute commands on behalf of another player.
+
+**Server:**
+- `Server_AbstractParticipant::cmdJudge`
+- Requires judge privileges
+- Executes embedded commands as the selected player
+- Marks resulting events as judge-forced
+
+**Client:**
+- Transparent; resulting events are processed normally
+
+---
+
+### `REVERSE_TURN` (1034)
+
+**Purpose:** Reverse turn order.
+
+**Server:**
+- `Server_Player::cmdReverseTurn`
+- Conceded non-judge players cannot use the command
+- Delegates to `Server_AbstractParticipant::cmdReverseTurn`
+- Toggles turn order
+- Emits `Event_ReverseTurn`
+
+**Client:**
+- Reflected by subsequent active-player progression
+
+---
+
+## Notes
+
+- Game commands are handled by `Server_Player`, `Server_AbstractParticipant`, or `Server_Game`, depending on the command.
+- Only commands that emit `GameEvent`s produce corresponding `PlayerEventHandler` callbacks.
+- Some commands modify server state without generating a dedicated client event.
+- Judge commands are transport wrappers that execute other game commands on behalf of another player.
\ No newline at end of file
diff --git a/doc/doxygen/pages/developer_documentation/network/protocol/protocol_overview.md b/doc/doxygen/pages/developer_documentation/network/protocol/protocol_overview.md
new file mode 100644
index 000000000..f91b94c5f
--- /dev/null
+++ b/doc/doxygen/pages/developer_documentation/network/protocol/protocol_overview.md
@@ -0,0 +1,76 @@
+@page developer_reference_protocol_overview Protocol (Overview)
+
+# Cockatrice Server Protocol – Overview
+
+## Purpose
+
+This document describes the Cockatrice client/server protocol as implemented
+by the Cockatrice server. It is intended for developers implementing clients
+or modifying the server.
+
+The protocol is **stateful**, **event-driven**, and **asynchronous**.
+
+---
+
+## High-Level Properties
+
+- Encoding: Google Protocol Buffers
+- Transport: TCP or WebSocket (transport-agnostic at protocol level)
+- Directionality:
+    - Clients send `CommandContainer`
+    - Server sends `ServerMessage`
+- Responses and events are interleaved
+- Clients must handle unsolicited events at any time
+
+---
+
+## Message Envelopes
+
+### Client → Server: CommandContainer
+
+A `CommandContainer` represents one logical client request.
+
+Protocol invariants:
+- Exactly one command domain may be used per container
+- Multiple commands of the same domain may be batched
+- Context is provided via `room_id` or `game_id` when required
+
+Command domains:
+- Session commands
+- Room commands
+- Game commands
+- Moderator commands
+- Admin commands
+
+---
+
+### Server → Client: ServerMessage
+
+A `ServerMessage` represents either:
+- A response to a command (`RESPONSE`)
+- An unsolicited event (`*_EVENT`)
+
+Protocol invariants:
+- Events may be delivered before or after responses
+- Responses reference the original command via `cmd_id`
+- Events are never correlated to a command
+
+---
+
+## Asynchronous Model
+
+Clients MUST NOT assume request/response ordering.
+
+Example valid sequence:
+
+1. Client sends JOIN_ROOM
+2. Server sends room chat history events
+3. Server sends room join notifications
+4. Server sends JOIN_ROOM response
+
+---
+
+## Versioning
+
+The server reports a protocol version during connection initialization.
+Clients MUST verify compatibility before sending commands.
diff --git a/doc/doxygen/pages/developer_documentation/network/protocol/protocol_response.md b/doc/doxygen/pages/developer_documentation/network/protocol/protocol_response.md
new file mode 100644
index 000000000..ce588114b
--- /dev/null
+++ b/doc/doxygen/pages/developer_documentation/network/protocol/protocol_response.md
@@ -0,0 +1,27 @@
+@page protocol_response Response (Protocol Concept)
+
+## Overview
+
+`Response` is the server-to-client message sent immediately after a command, using the same `cmd_id` to link to the originating command.  
+It provides a `Response::ResponseCode` and optionally a `Response::ResponseType` to guide client handling.
+
+## Fields
+
+- **cmd_id** (`uint64`, required) — Command ID this response corresponds to
+- **response_code** (`Response::ResponseCode`, optional) — Outcome of the command
+
+## Response Codes
+
+All possible outcome codes are defined in Response::ResponseCode
+
+These describe the result of the command, e.g., success, failure, or special conditions like bans or registration requirements.
+
+## Response Types
+
+Responses are routed according to Response::ResponseType
+
+Each `ResponseType` corresponds to a high-level category, like `JOIN_ROOM` or `DECK_UPLOAD`.
+
+## Extensions
+
+- Protobuf extensions from 100 to max are reserved for future use
diff --git a/doc/doxygen/pages/developer_documentation/network/protocol/protocol_server_message.md b/doc/doxygen/pages/developer_documentation/network/protocol/protocol_server_message.md
new file mode 100644
index 000000000..b8dac9c43
--- /dev/null
+++ b/doc/doxygen/pages/developer_documentation/network/protocol/protocol_server_message.md
@@ -0,0 +1,171 @@
+@page protocol_server_message ServerMessage (Protocol Concept)
+
+## Overview
+
+`ServerMessage` is the server-to-client message envelope used for all
+communication originating from the Cockatrice server.
+
+The server never sends `CommandContainer` messages, and clients never send
+`ServerMessage` messages.
+
+A `ServerMessage` represents either:
+
+- A direct response to a client command, or
+- An unsolicited event emitted by the server
+
+This document describes `ServerMessage` as a protocol-level concept.
+It should not be confused with generated protobuf accessors or wire-level
+encoding details.
+
+---
+
+## Lifetime and Delivery
+
+`ServerMessage` instances are emitted by the server and delivered
+asynchronously to clients.
+
+Delivery guarantees:
+
+- Messages are delivered in the order sent by the server
+- Messages may be delivered at any time
+- Events may be delivered before or after responses
+
+Clients **must** be prepared to handle `ServerMessage` objects at all times,
+regardless of pending requests.
+
+---
+
+## Message Type
+
+Each `ServerMessage` contains **exactly one payload**, identified by the
+`message_type` field.
+
+The following message types are supported:
+
+- `RESPONSE`
+- `SESSION_EVENT`
+- `ROOM_EVENT`
+- `GAME_EVENT_CONTAINER`
+
+A message containing multiple payloads or an unknown type is considered
+malformed.
+
+---
+
+## RESPONSE
+
+`RESPONSE` messages are direct replies to client-issued `CommandContainer`
+messages.
+
+Characteristics:
+
+- Contain a `Response` payload
+- Echo the client-assigned `cmd_id`
+- Indicate success or failure of the request
+
+A single `CommandContainer` results in **at most one** `RESPONSE`.
+
+`RESPONSE` messages may be preceded or followed by event messages.
+
+---
+
+## Events
+
+Event messages are unsolicited notifications emitted by the server.
+
+Event message types include:
+
+- `SESSION_EVENT`
+- `ROOM_EVENT`
+- `GAME_EVENT_CONTAINER`
+
+Event messages:
+
+- Are not correlated to a specific client command
+- Do not include a `cmd_id`
+- May be delivered at any time
+
+Clients **must** process events independently of responses.
+
+---
+
+## Event Scopes
+
+### Session Events
+
+Session events are global to the client session and may include:
+
+- Server notifications
+- Private messages
+- User status updates
+
+---
+
+### Room Events
+
+Room events are scoped to a specific room and are delivered only to clients
+currently present in that room.
+
+---
+
+### Game Events
+
+Game events are scoped to a specific game and are delivered only to
+participating clients.
+
+Game events are grouped within a `GameEventContainer` to allow batching.
+
+---
+
+## Event Batching
+
+Some `ServerMessage` types may contain multiple logical events.
+
+- `GameEventContainer` may batch multiple game events
+- Other event types represent a single logical event
+
+Clients must process all contained events **in order**.
+
+---
+
+## Error Semantics
+
+Errors are communicated **exclusively** via `RESPONSE` messages.
+
+Event messages are never used to signal command failure.
+
+Common error responses include:
+
+- `RespInvalidCommand`
+- `RespLoginNeeded`
+- `RespContextError`
+- `RespChatFlood`
+
+---
+
+## Related Concepts
+
+- CommandContainer
+- Client State Machine
+- Response
+
+---
+
+## Reference Proto Definition
+
+```proto
+message ServerMessage {
+    enum MessageType {
+        RESPONSE = 0;
+        SESSION_EVENT = 1;
+        GAME_EVENT_CONTAINER = 2;
+        ROOM_EVENT = 3;
+    }
+
+    optional MessageType message_type = 1;
+    optional Response response = 2;
+    optional SessionEvent session_event = 3;
+    optional GameEventContainer game_event_container = 4;
+    optional RoomEvent room_event = 5;
+}
+```
\ No newline at end of file
diff --git a/doc/doxygen/extra-pages/developer_documentation/primer_cards.md b/doc/doxygen/pages/developer_documentation/primer_cards.md
similarity index 100%
rename from doc/doxygen/extra-pages/developer_documentation/primer_cards.md
rename to doc/doxygen/pages/developer_documentation/primer_cards.md
diff --git a/doc/doxygen/extra-pages/developer_documentation/querying_the_card_database.md b/doc/doxygen/pages/developer_documentation/querying_the_card_database.md
similarity index 100%
rename from doc/doxygen/extra-pages/developer_documentation/querying_the_card_database.md
rename to doc/doxygen/pages/developer_documentation/querying_the_card_database.md
diff --git a/doc/doxygen/pages/index.md b/doc/doxygen/pages/index.md
new file mode 100644
index 000000000..9dafe1882
--- /dev/null
+++ b/doc/doxygen/pages/index.md
@@ -0,0 +1,12 @@
+@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
+- @subpage developer_reference
+
+Please also check the <a href="https://cockatrice.github.io/" target="_blank" rel="noopener noreferrer">Cockatrice Webpage</a> or our <a href="https://github.com/Cockatrice/Cockatrice" target="_blank" rel="noopener noreferrer">Code Repository</a> for general information.
diff --git a/doc/doxygen/pages/user_documentation/card_pictures/custom_card_pictures.md b/doc/doxygen/pages/user_documentation/card_pictures/custom_card_pictures.md
new file mode 100644
index 000000000..bcea6db8b
--- /dev/null
+++ b/doc/doxygen/pages/user_documentation/card_pictures/custom_card_pictures.md
@@ -0,0 +1,135 @@
+@page custom_card_pictures Custom Card Pictures
+
+There are four ways to make Cockatrice use custom artwork for your cards:
+
+- Placing image files in the **CUSTOM pictures folder**.
+- Providing a **custom card database** that points each printing at a picture URL via the `picurl` property.
+- Writing your **own download URL templates**.
+- Setting an **image override** for a single card from inside the deck editor.
+
+Each of these is described below. If pictures are missing or wrong, see @ref fixing_card_pictures instead.
+
+# Custom Pictures Folder (CUSTOM)
+
+Any image file placed in the CUSTOM folder is used as the card picture, and no download is attempted for cards that
+match a file there.
+
+- The folder is `<pictures directory>/CUSTOM/`. The pictures directory is configured on the 'General' settings tab,
+  under 'Directories' → 'Pictures directory'.
+- Any image format Qt can decode is accepted (PNG, JPG/JPEG, WebP, GIF, BMP, ...); the file extension is not filtered,
+  so even an extension-less file is picked up if the decoder recognizes its content.
+- Files are indexed by their name, so you can organize them into subfolders freely.
+- New or changed files are picked up automatically within a few seconds — no client restart is required.
+
+The file name must match the card using one of the naming schemes below. Both `_` and `-` are accepted as separators,
+and the file extension is ignored when matching:
+
+| Scheme                      | Example file name                                       |
+| --------------------------- | ------------------------------------------------------- |
+| Card Name                   | `Example Card.png`                                      |
+| Card Name + Set             | `Example Card_DDL.png`                                  |
+| Card Name + Set + Collector | `Example Card_DDL_43.png`                               |
+| Set + Collector + Card Name | `DDL_43_Example Card.png`                               |
+| Card Name + Provider ID     | `Example Card_0b23cdc8-d413-4fb1-8470-474221b10fe2.png` |
+
+The name used for matching is the *corrected* card name. Correction removes the split-card separator ` // ` and the
+characters reserved in Windows file names (`* < > : " \ ?` and control characters), and turns `/` into a space, so the
+"Example // Card" card is matched by a file named `ExampleCard.png`, not `Example // Card.png`. Most other punctuation
+(commas, apostrophes, `!`, ...) is left untouched.
+
+\attention A file in the CUSTOM folder always wins over downloaded pictures, even if it is the wrong image. Delete the
+file if you want to see the downloaded artwork again.
+
+The naming conventions are the same as those recognized in the set-named subfolders and in `downloadedPics`, and are
+documented for developers in @ref loading_card_pictures.
+
+# Custom Card Database (picurl)
+
+If you maintain your own card database (see the
+[Custom Cards & Sets](https://github.com/Cockatrice/Cockatrice/wiki/Custom-Cards-&-Sets) wiki), each printing's `<set>`
+tag can carry a `picurl` attribute containing a full URL for that printing's picture:
+
+```xml
+<set picurl="https://example.com/cards/example-card.jpg" ...>
+```
+
+Cockatrice tries this URL **before** the configured download URL templates, so it is the most direct way to provide
+custom artwork for a specific printing.
+
+- The URL should start with `http://` or `https://`; the scheme is not validated, so make sure it is absolute or the
+  download may silently fail.
+- When you change a `picurl` for a card whose picture was already downloaded and cached, delete the stored images
+  (Storage tab → 'Delete Saved Images' / 'Delete Cached Images') so Cockatrice fetches the new URL.
+
+# Custom Download URL Templates
+
+The built-in download URLs are templates: Cockatrice replaces reference points in the URL with information about the
+card and its printing. You can write your own templates in 'Cockatrice → Settings' (Ctrl + Shift + P by default), on
+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`                                      |
+
+The `!set:...!` and `!prop:...!` reference points support two modifiers:
+
+- `_fill_with_<text>` pads the value with the given text, right-aligned, e.g. `!set:num_fill_with_000!` turns collector
+  number `1` into `001`. If the value is longer than the fill text, the template is skipped.
+- `_substr_<start>_<length>` extracts a substring, e.g. `!set:num_substr_2_2!` takes two characters starting at the
+  third. If the substring would extend past the end of the value, the template is skipped.
+
+Substituted values are URL-encoded. A template that asks for a property the card or printing does not have is skipped,
+and the next template in the list is tried instead.
+
+\attention Custom URLs should start with `http://` or `https://`. As with `picurl`, the scheme is not validated before
+the URL is handed to QNetworkAccessManager, so use an absolute URL or the download may silently fail.
+
+Some working examples:
+
+```text
+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!
+https://api.scryfall.com/cards/multiverse/!set:muid!?format=image
+https://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!set:muid!&type=card
+https://gatherer.wizards.com/Handlers/Image.ashx?name=!name!&type=card
+```
+
+See the [Custom Picture Download URLs](https://github.com/Cockatrice/Cockatrice/wiki/Custom-Picture-Download-URLs)
+wiki for more examples and ideas.
+
+\attention Keep in mind that templates using `!name!` or `!set:muid!` resolve by name or multiverse ID, not by the
+exact printing. Only the Scryfall `!set:uuid!` templates always return the exact printing requested. See
+@ref fixing_card_pictures for more on this.
+
+# Image Overrides
+
+The quickest way to give one card custom art is an image override: right-click the card in the deck editor's printing
+selector and open the **Image Overrides** submenu of the context menu.
+
+- **Load Custom Image...** — choose a picture file (the dialog suggests PNG, JPG/JPEG and WebP); it becomes that card's
+  artwork immediately.
+- **One entry per alternate printing** of the card, labeled `<set> <collector number>` (hovering an entry previews that
+  printing's artwork). Selecting one makes the card use that exact printing's picture, so e.g. a basic land can be shown
+  with any of its artworks.
+- **Clear Custom Image** — removes the stored override and returns the card to normal resolution. It is only available
+  while the card has a stored override.
+
+Overrides are stored as `.png` files in `<pictures directory>/downloadedPics/`, under the "Naming scheme" configured on
+the Storage settings page, and are matched the same way as downloaded images. Because local files are checked before any
+URL is requested, an override always wins over downloaded artwork and `picurl` for that card. The override exists only on
+the machine it was created on - it is not part of the deck file - so a card with a stored override shows normally on
+another computer.
+
+\attention If you also keep a matching file in the CUSTOM folder, that file is matched before the override. When you
+change an override, use **Clear Custom Image** so the stored `.png` is replaced; manually deleting the file in
+`downloadedPics/` has the same effect.
diff --git a/doc/doxygen/extra-pages/user_documentation/deck_management/creating_decks.md b/doc/doxygen/pages/user_documentation/deck_management/creating_decks.md
similarity index 60%
rename from doc/doxygen/extra-pages/user_documentation/deck_management/creating_decks.md
rename to doc/doxygen/pages/user_documentation/deck_management/creating_decks.md
index bfe578afd..153320c3d 100644
--- a/doc/doxygen/extra-pages/user_documentation/deck_management/creating_decks.md
+++ b/doc/doxygen/pages/user_documentation/deck_management/creating_decks.md
@@ -8,10 +8,8 @@ by selecting "Deck Editor" or "Visual Deck Editor" under the "Tabs" application
 
 # Further References
 
-See @ref editing_decks for information on how to modify the attributes and contents of a deck in the Deck Editor
+- See @ref editing_decks for information on how to modify the attributes and contents of a deck in the Deck Editor
 widgets.
-
-See @ref exporting_decks for information on how to store and persist your deck either in-client or to external
+- See @ref exporting_decks for information on how to store and persist your deck either in-client or to external
 services.
-
-See @ref importing_decks for information on how to import existing decks either in-client or from external services
\ No newline at end of file
+- See @ref importing_decks for information on how to import existing decks either in-client or from external services
diff --git a/doc/doxygen/pages/user_documentation/deck_management/editing_decks.md b/doc/doxygen/pages/user_documentation/deck_management/editing_decks.md
new file mode 100644
index 000000000..37b613461
--- /dev/null
+++ b/doc/doxygen/pages/user_documentation/deck_management/editing_decks.md
@@ -0,0 +1,6 @@
+@page editing_decks Editing Decks
+
+ - @subpage editing_decks_classic
+ - @subpage editing_decks_visual
+
+ - @subpage editing_decks_printings
diff --git a/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_classic.md b/doc/doxygen/pages/user_documentation/deck_management/editing_decks_classic.md
similarity index 100%
rename from doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_classic.md
rename to doc/doxygen/pages/user_documentation/deck_management/editing_decks_classic.md
diff --git a/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_printings.md b/doc/doxygen/pages/user_documentation/deck_management/editing_decks_printings.md
similarity index 100%
rename from doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_printings.md
rename to doc/doxygen/pages/user_documentation/deck_management/editing_decks_printings.md
diff --git a/doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_visual.md b/doc/doxygen/pages/user_documentation/deck_management/editing_decks_visual.md
similarity index 100%
rename from doc/doxygen/extra-pages/user_documentation/deck_management/editing_decks_visual.md
rename to doc/doxygen/pages/user_documentation/deck_management/editing_decks_visual.md
diff --git a/doc/doxygen/extra-pages/user_documentation/deck_management/exporting_decks.md b/doc/doxygen/pages/user_documentation/deck_management/exporting_decks.md
similarity index 100%
rename from doc/doxygen/extra-pages/user_documentation/deck_management/exporting_decks.md
rename to doc/doxygen/pages/user_documentation/deck_management/exporting_decks.md
diff --git a/doc/doxygen/extra-pages/user_documentation/deck_management/importing_decks.md b/doc/doxygen/pages/user_documentation/deck_management/importing_decks.md
similarity index 77%
rename from doc/doxygen/extra-pages/user_documentation/deck_management/importing_decks.md
rename to doc/doxygen/pages/user_documentation/deck_management/importing_decks.md
index e9626d57f..4aab7ad2c 100644
--- a/doc/doxygen/extra-pages/user_documentation/deck_management/importing_decks.md
+++ b/doc/doxygen/pages/user_documentation/deck_management/importing_decks.md
@@ -38,7 +38,18 @@ 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:
 
-TODO
+`[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`.
 
 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/pages/user_documentation/index.md
new file mode 100644
index 000000000..f4ecbe8a1
--- /dev/null
+++ b/doc/doxygen/pages/user_documentation/index.md
@@ -0,0 +1,30 @@
+@page user_reference User Reference
+
+## Deck Management
+
+- @subpage creating_decks
+- @subpage importing_decks
+- @subpage editing_decks
+- @subpage exporting_decks
+
+## Release Channels
+
+- @subpage beta_release
+
+## Settings
+
+- @subpage settings_folder
+
+## Card Pictures
+
+- @subpage custom_card_pictures
+
+## Troubleshooting
+
+- @subpage fixing_card_pictures
+- @subpage enabling_debug_logs
+
+## Syntax Help
+
+- @subpage search_syntax_help
+- @subpage deck_search_syntax_help
diff --git a/doc/doxygen/pages/user_documentation/settings/beta.md b/doc/doxygen/pages/user_documentation/settings/beta.md
new file mode 100644
index 000000000..733af79f5
--- /dev/null
+++ b/doc/doxygen/pages/user_documentation/settings/beta.md
@@ -0,0 +1,54 @@
+@page beta_release Beta Release
+
+The beta version of Cockatrice features all the newest features before they make their way into the latest stable
+release.
+It allows us to test these features ahead of time and you to give feedback on them.
+We release new betas very frequently and usually release a follow-up beta with a fix within a day or two if we break
+anything. In contrast, stable releases are released much less frequently but ensured to be stable.
+
+# What to Expect from the Beta
+
+Using the beta and giving feedback on it helps us improve Cockatrice a lot.
+We do not perform any automatic data collection so your voluntary feedback is the only way for us to get a sense of what
+you enjoy, expect, or would like to change.
+
+We highly appreciate your active participation and feedback.
+
+That being said, some words of warning should be issued:
+
+The beta release may contain unfinished features, bugs, or performance issues.
+It is intended for testing and feedback and may be less stable than the default release.
+
+We recommend using the beta only if you are comfortable encountering issues and helping us improve Cockatrice.
+
+# Switching to the Beta
+
+To switch to the Beta, navigate to your settings, using the Tab "Cockatrice → Settings" or Ctrl + Shift + P (default
+shortcut).
+
+Within the settings, in the first tab 'General', the first section 'Personal Settings' contains the setting 'Release
+Channel'.
+
+\image html release_channel_beta.png
+
+Switch this to 'Beta'.
+
+Afterwards, close your settings, and use the 'Help' tab to search for a client update. You should be prompted to install
+the beta version.
+
+# Switching back to Stable
+
+Follow the same steps as above, but set Release Channel to 'Default'.
+
+# Giving Feedback
+
+If you encounter a bug or unexpected behavior while using the beta, please report it on:
+
+- GitHub: https://github.com/Cockatrice/Cockatrice/issues
+- Discord: https://discord.gg/4hNswvHeFd in #beta-testing
+
+When reporting issues, please include:
+
+- Your operating system
+- The beta version number (found in 'Help → About Cockatrice')
+- Steps to reproduce the problem, if possible
diff --git a/doc/doxygen/pages/user_documentation/settings/settings_folder.md b/doc/doxygen/pages/user_documentation/settings/settings_folder.md
new file mode 100644
index 000000000..5b3426e45
--- /dev/null
+++ b/doc/doxygen/pages/user_documentation/settings/settings_folder.md
@@ -0,0 +1,43 @@
+@page settings_folder Settings Folder and Backups
+
+Cockatrice keeps all of its preferences in a settings folder on your computer, one `.ini` file per
+group of settings (appearance, sound, decks, and so on). Open it from the main window via
+Help → Open Settings Folder.
+
+# The Per-File Migration
+
+Older versions of Cockatrice stored every setting in a single `global.ini` file. The settings were
+split into per-group `.ini` files so that unrelated groups no longer share one file. The first time
+you start a version that uses the new layout, your settings are moved into the new files
+automatically and nothing is lost. The old `global.ini` is kept next to the new files as
+`global.ini.old`.
+
+# Automatic Backups
+
+Both migrations overwrite files in the settings folder in place, so before either one runs,
+Cockatrice copies the whole folder to a timestamped backup folder:
+
+```
+<data folder>/settings-backup-20261002-193000/
+```
+
+The backup folder sits next to the settings folder, not inside it. Every backup is kept, so if
+settings ever end up wrong you can compare against, or copy files back from, the earlier snapshot.
+Backups are only created when a migration actually has work to do, so a normal start creates
+nothing.
+
+# Downgrading
+
+Settings migrations only run forwards. If you ever go back to an older version of Cockatrice, that
+version does not read the new per-group files, so it will start with default settings.
+
+Before downgrading, copy your settings folder somewhere safe, for example:
+
+-   Linux: `~/.local/share/Cockatrice/settings/`
+-   macOS: `~/Library/Application Support/Cockatrice/settings/`
+-   Windows: `%LOCALAPPDATA%\Cockatrice\settings\`
+
+Portable installs keep the settings folder in the `data` folder next to the executable.
+
+Copying that folder back after downgrading restores your settings. The automatic backup folder from
+the migration is there as a second copy of the same data if you need it.
\ No newline at end of file
diff --git a/doc/doxygen/pages/user_documentation/troubleshooting/enabling_debug_logs.md b/doc/doxygen/pages/user_documentation/troubleshooting/enabling_debug_logs.md
new file mode 100644
index 000000000..27c4272f5
--- /dev/null
+++ b/doc/doxygen/pages/user_documentation/troubleshooting/enabling_debug_logs.md
@@ -0,0 +1,142 @@
+@page enabling_debug_logs Enabling Debug Logs
+
+Cockatrice ships with a "diagnostics mode" that prints detailed debug messages about what the client is doing. This is
+extremely useful when asking for help, because it shows exactly what happened: which URL the card picture loader tried,
+whether it found or missed a file on disk, whether a download succeeded or failed, which redirects were followed, and
+much more. Each of these messages belongs to a category, and you can enable or disable categories individually.
+
+Don't worry, this sounds more technical than it is. You only need to do two things: create one small text file, and tell
+Cockatrice where it is. There are no installation steps and you can undo everything later (see [When you are
+done](#when-you-are-done)).
+
+# Step 1: Create the file
+
+Open a plain text editor (Notepad on Windows, TextEdit on macOS, or any text editor on Linux) and paste the following
+content:
+
+```ini
+[Rules]
+# The default log level is info
+*.debug = false
+
+# Turn on debug level logs for the card picture loader and all its sub categories
+card_picture_loader.* = true
+```
+
+Save the file with the exact name `qtlogging.ini` in a place you can find again, for example your Documents folder.
+
+\attention The file name matters: it must be `qtlogging.ini`, not `qtlogging.ini.txt`. If your text editor adds a
+`.txt` extension automatically, you need to stop it from doing so (see below). On macOS, TextEdit must be switched to
+plain text mode first via 'Format → Make Plain Text'.
+
+The file contains one rule per line. The `*.debug = false` rule turns off debug messages everywhere by default, and the
+`card_picture_loader.* = true` line then re-enables them for the card picture loader. The `.*` at the end means "this
+category and all of its sub categories". To enable a different category instead, just replace that line with the
+category name of your choice, for example `card_database.loading = true` or `window_main.startup = true`.
+
+# Step 2: Tell Cockatrice where the file is
+
+Cockatrice does not know about the file yet. You have to point it there by setting an environment variable called
+`QT_LOGGING_CONF` to the full location of your file. How to do this depends on your operating system:
+
+**Windows**
+
+1. Press the Windows key, type "environment variables", and open "Edit the system environment variables".
+2. Click "Environment Variables...", then under "User variables" click "New...".
+3. Set "Variable name" to `QT_LOGGING_CONF` and "Variable value" to the full path of your file, for example
+   `C:\Users\YourName\Documents\qtlogging.ini`.
+4. Confirm all dialogs, then close and reopen Cockatrice.
+
+Alternatively, if Cockatrice is installed in a folder you can write to, you can simply place the `qtlogging.ini` file
+directly next to the Cockatrice executable (in the same folder as `cockatrice.exe`) and skip the environment variable
+altogether. Note that this copy may be replaced when you update the client.
+
+**macOS**
+
+Open the Terminal app (it is in 'Applications → Utilities') and run the following two commands, replacing the path
+with the full location of your file:
+
+```shell
+launchctl setenv QT_LOGGING_CONF /path/to/qtlogging.ini
+open -a Cockatrice
+```
+
+You can also use `export QT_LOGGING_CONF=/path/to/qtlogging.ini` to set the variable for the current terminal session.
+
+The setting stays active until you log out or restart your Mac. If you have multiple users on the same Mac, be aware
+that this setting only applies to your user account.
+
+**Linux**
+
+For a quick test, open a terminal and start Cockatrice with the file on the command line, replacing the path with the
+full location of your file:
+
+```shell
+QT_LOGGING_CONF=/path/to/qtlogging.ini cockatrice
+```
+
+If this works and you want it to apply every time you start Cockatrice, add the following line to your `~/.profile`
+file and log in again:
+
+```shell
+export QT_LOGGING_CONF="/path/to/qtlogging.ini"
+```
+
+# Step 3: See the logs
+
+Now that debug logging is enabled, open Cockatrice and trigger the behavior you are investigating, for example by
+opening a deck, reloading the card database, or starting a game.
+
+The easiest way to see the logs is to use the built-in log viewer inside Cockatrice itself: open 'Help → View Debug
+Log'. A window appears that shows the log messages live and keeps the most recent entries. It even has a 'Copy to
+clipboard' button so you can paste the output into a bug report or a Discord message. This works the same on every
+operating system.
+
+If you prefer to capture everything to a file instead, start Cockatrice with the `--debug-output` option:
+
+```shell
+cockatrice --debug-output
+```
+
+Cockatrice then writes the full log to a file called `qdebug.txt` in the folder it was started from.
+
+# Which categories are available?
+
+Every message Cockatrice logs belongs to a category. The following table lists the most useful ones for troubleshooting,
+grouped by area. Enable a category by adding a line like `category = true` to your `qtlogging.ini` file (or use a `.*`
+suffix, e.g. `card_picture_loader.*`, to include all sub categories).
+
+| What you want to see                                                      | 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` |
+| Networking and servers                                                    | `local_client`, `remote_client`, `tapped_out_interface`, `servers_settings`                                        |
+| In-game logic                                                             | `player`, `game_scene.*`, `card_zone.*`, `view_zone`, `game_event_handler`                                         |
+| Dialogs and tabs                                                          | `dlg_settings`, `dlg_update`, `dlg_tip_of_the_day`, `tab_game`, `tab_message`, `tab_supervisor`                    |
+| Settings and shortcuts                                                    | `settings_cache`, `shortcuts_settings`                                                                             |
+| Deck and card filtering                                                   | `filter_string`, `deck_filter_string`, `syntax_help`                                                               |
+
+For example, to investigate why a card database update seems to fail, enable the card database categories:
+
+```ini
+[Rules]
+*.debug = false
+
+card_database = true
+card_database.loading = true
+card_database.loading.success_or_failure = true
+card_database.update = true
+cockatrice_xml.* = true
+```
+
+# When you are done
+
+To turn the diagnostics back off, just reverse what you did: remove the `QT_LOGGING_CONF` environment variable (or
+unset it again via `launchctl unsetenv QT_LOGGING_CONF` on macOS) and/or delete the `qtlogging.ini` file, then restart
+Cockatrice. Leaving it on is harmless, but the extra logging can make the client slightly slower.
+
+For the full details on how Cockatrice logging works, including the complete list of categories, see @ref logging.
diff --git a/doc/doxygen/pages/user_documentation/troubleshooting/fixing_card_pictures.md b/doc/doxygen/pages/user_documentation/troubleshooting/fixing_card_pictures.md
new file mode 100644
index 000000000..7f761c020
--- /dev/null
+++ b/doc/doxygen/pages/user_documentation/troubleshooting/fixing_card_pictures.md
@@ -0,0 +1,118 @@
+@page fixing_card_pictures Fixing Card Pictures
+
+This guide collects the common causes for card pictures not showing up, showing the wrong printing, or showing the
+card back instead of the artwork, and how to fix them.
+
+Work through the steps in order. In most cases the problem is caused by an outdated client, misconfigured download
+URLs, stale local images, or a corrupted cache.
+
+# Update Your Client
+
+Picture handling bugs are fixed on a regular basis, so the first thing to try is updating your client.
+
+Use the update check in 'Help → Check for Updates' (or look for the update prompt shown on startup).
+
+If a fix has not yet made it into the latest stable release, it may already be available in the beta release. The beta
+ships very frequently and usually receives a follow-up fix within a day or two if something breaks.
+
+See @subpage beta_release for instructions on how to switch to the beta channel.
+
+# Check Your Download URLs
+
+Card pictures are downloaded from a list of URL templates. Each template is tried in order until one produces a valid
+image, so the order matters: URLs at the top of the list are tried first.
+
+The list can be found in 'Cockatrice → Settings' (or Ctrl + Shift + P by default), on the 'Deck Editor' tab, in the
+'URL Download Priority' section. Make sure 'Download card pictures on the fly' is enabled and that the list contains
+valid URLs. If you suspect the list has been modified or corrupted, press 'Reset Download URLs' to restore the
+defaults.
+
+For information on how to add your own custom URL templates, see the 'How to add a custom URL' link in the same
+settings section, or @ref custom_card_pictures for a full reference of the URL reference points, the CUSTOM
+pictures folder, and custom card databases.
+
+# Check Your Local Picture Folder
+
+Before any network request is made, Cockatrice looks for local image files. If a matching file is found on disk it is
+shown instead of anything downloaded, even if it is the wrong image.
+
+The pictures directory is configured on the 'General' settings tab, under 'Directories' → 'Pictures directory'.
+Cockatrice checks the following locations, in order:
+
+- The custom pictures folder (recursively indexed by file name).
+- `<pictures directory>/<set code>/<card file name>`
+- `<pictures directory>/downloadedPics/<set code>/<card file name>`
+- `<pictures directory>/downloadedPics/<card file name>` (for export naming schemes without a set folder)
+
+A file only matches when its name without the extension equals one of the recognized scheme patterns exactly.
+
+The following import naming schemes are recognized (using both `_` and `-` as separators). The canonical table with
+concrete example file names is on @ref custom_card_pictures:
+
+| Scheme                      | Pattern                    |
+| --------------------------- | -------------------------- |
+| Card Name + Provider ID     | `{name}_{providerId}`      |
+| Card Name + Set + Collector | `{name}_{set}_{collector}` |
+| Set + Collector + Card Name | `{set}_{collector}_{name}` |
+| Card Name + Set             | `{name}_{set}`             |
+| Card Name                   | `{name}`                   |
+
+If a picture you downloaded or placed manually is wrong, stale, or corrupted, delete the offending file. Pay special
+attention to the `downloadedPics` subfolder: this is where the filesystem caching method writes downloaded images, and
+after a provider outage it can permanently contain the wrong printing until you delete it manually.
+
+If a card persistently shows artwork you assigned yourself, you may have an **image override** set for it. Right-click
+the card in the deck editor's printing selector and use 'Image Overrides' → 'Clear Custom Image' to remove it (or
+delete the stored `.png` in `downloadedPics/`). See @ref custom_card_pictures for details.
+
+See @ref loading_card_pictures for details on how local images are loaded.
+
+# Clear Caches
+
+Cockatrice caches card pictures in three places. All of them can be managed on the 'Storage' settings tab:
+
+- **Network cache** — downloaded images stored on disk. Press 'Delete Cached Images' to clear it.
+- **Filesystem / image backup** — downloaded images written directly to `downloadedPics`. Press 'Delete Saved Images'
+  to clear it.
+- **In-memory (pixmap) cache** — images currently held in RAM. Press 'Clear In-Memory Images' to clear it.
+
+If a provider outage caused the wrong pictures to be downloaded and cached, clearing the network cache (and the
+'Delete Saved Images' button if you use the filesystem caching method) will force Cockatrice to download the correct
+images again. The redirect cache TTL (also on the Storage tab) controls how long previously seen redirects for
+download URLs are remembered; lowering it can help if a URL used to redirect somewhere else.
+
+# Restart the Client
+
+After updating the client, changing the download URLs, moving or deleting local image files, or clearing caches, it is
+recommended to restart Cockatrice so that all changes are fully picked up.
+
+# Check Logs
+
+Before changing any settings, check the existing logs first. Rate limit errors and most download errors are already
+logged at warn level, so you may find the cause without enabling debug mode.
+
+Open 'Help → View Debug Log' and look for error or warning messages related to card picture loading. If you need more
+detail than the default log level provides, see below.
+
+# Enable Picture Loader Debug Logs
+
+If the steps above did not solve the problem, you can turn on a "diagnostics mode" that prints what the picture loader
+is actually doing: which URL it is trying, whether it found or missed a file on disk, whether the download succeeded or
+failed, and which redirects it followed. This information is extremely useful when asking for help.
+
+See @subpage enabling_debug_logs for a step-by-step guide on how to enable the logs, including instructions
+for Windows, macOS, and Linux.
+
+# Provider Accuracy
+
+Cards in Cockatrice are identified by a provider ID, which is the Scryfall UUID of a specific printing. Decks store
+this ID, which is why the exact printing a card was added as can be looked up again.
+
+The Scryfall URL templates built into Cockatrice use this provider ID directly (`!set:uuid!`), so they always download
+the exact printing that was requested.
+
+The Gatherer URL templates, on the other hand, do **not** use the provider ID. They resolve pictures by multiverse ID
+(`!set:muid!`) or by card name (`!name!`) only. As a result they may return a different printing than the one the
+provider ID refers to, or no picture at all for cards Gatherer does not know. If you need pictures to match the exact
+printing of a card, make sure the Scryfall URLs are at the top of your download URL priority list and consider removing
+or demoting the Gatherer URLs.
diff --git a/doc/doxygen/theme b/doc/doxygen/theme
new file mode 160000
index 000000000..46483f1e5
--- /dev/null
+++ b/doc/doxygen/theme
@@ -0,0 +1 @@
+Subproject commit 46483f1e5a70ffb9ecd3b82d0a1cd1b24edf13da
diff --git a/docker-compose.yml b/docker-compose.yml
index 3d9f9f38f..6cbac61f0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: servatrice
+    image: ghcr.io/cockatrice/servatrice:latest
     depends_on:
       - mysql
     ports:
diff --git a/docker-compose.yml.windows b/docker-compose.yml.windows
index 6663c90fd..3d29b1e5f 100644
--- a/docker-compose.yml.windows
+++ b/docker-compose.yml.windows
@@ -16,7 +16,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: servatrice
+    image: ghcr.io/cockatrice/servatrice:latest
     depends_on:
       - mysql
     ports:
diff --git a/format.sh b/format.sh
index 51fccbdcf..9e3a6069b 100755
--- a/format.sh
+++ b/format.sh
@@ -3,7 +3,7 @@
 # This script will run clang-format on all modified, non-3rd-party C++/Header files.
 # Optionally runs cmake-format on all modified cmake files.
 # Optionally runs shellcheck on all modified shell files.
-# Uses clang-format cmake-format git diff find shellcheck
+# Uses clang-format, cmake-format, git, diff, find and shellcheck
 # Never, ever, should this receive a path with a newline in it. Don't bother proofing it for that.
 
 set -o pipefail
@@ -11,24 +11,18 @@ set -o pipefail
 # go to the project root directory, this file should be located in the project root directory
 olddir="$PWD"
 cd "${BASH_SOURCE%/*}/" || exit 2 # could not find path, this could happen with special links etc.
+phys_root="$(pwd -P)"
 
 # defaults
 include=("cockatrice/src" \
-"dbconverter/src" \
-"libcockatrice_card" \
-"libcockatrice_deck_list" \
-"libcockatrice_network" \
-"libcockatrice_protocol" \
-"libcockatrice_rng" \
-"libcockatrice_settings" \
-"libcockatrice_utility" \
+libcockatrice_* \
 "oracle/src" \
 "servatrice/src" \
+"cmake/pch" \
 "tests")
 exclude=("libcockatrice_rng/libcockatrice/rng/sfmt/" \
 "libcockatrice_utility/libcockatrice/utility/peglib.h" \
 "oracle/src/lzma/" \
-"oracle/src/qt-json/" \
 "oracle/src/zip/" \
 "servatrice/src/smtp/")
 exts=("cpp" "h" "proto")
@@ -110,11 +104,11 @@ OPTIONS:
         Do not check any source files for clang-format.
 
     --print-version
-        Print the version of clang-format being used before continuing.
+        Print the lint tool version being used before continuing.
 
     --shell
-        Use shellcheck to lint shell files. Not available in the default inline
-        mode.
+        Use shellcheck to lint shell files.
+        Not available in the default inline mode.
 
     -t, --test
         Do not edit files in place. Set exit code to 1 if changes are required.
@@ -175,14 +169,14 @@ EOM
         echo "error in parsing arguments of $0: $1 is an unrecognized option" >&2
         exit 2 # input error
       fi
-      if [[ ! $1 ]] || next_dir=$(cd "$olddir" && cd -- "$1" && pwd); then
+      if [[ ! $1 ]] || next_dir=$(cd "$olddir" && cd -- "$1" && pwd -P); then
         if ! [[ $set_include ]]; then
           include=() # remove default includes
           set_include=1
         fi
         if [[ $1 ]]; then
-          if [[ $next_dir != $PWD/* ]]; then
-            echo "error in parsing arguments of $0: $next_dir is not in $PWD" >&2
+          if [[ "$next_dir" != "$phys_root" && "$next_dir" != "$phys_root"/* ]]; then
+            echo "error in parsing arguments of $0: $next_dir is not in $phys_root" >&2
             exit 2 # input error
           fi
           include+=("$next_dir")
diff --git a/gcovr.cfg b/gcovr.cfg
new file mode 100644
index 000000000..ac893b6a4
--- /dev/null
+++ b/gcovr.cfg
@@ -0,0 +1,63 @@
+# 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
new file mode 100755
index 000000000..279200adf
--- /dev/null
+++ b/iwyu.sh
@@ -0,0 +1,226 @@
+#!/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 857376163..b3583522c 100644
--- a/libcockatrice_card/CMakeLists.txt
+++ b/libcockatrice_card/CMakeLists.txt
@@ -5,6 +5,8 @@ set(CMAKE_AUTORCC ON)
 set(HEADERS
     libcockatrice/card/card_info.h
     libcockatrice/card/card_info_comparator.h
+    libcockatrice/card/card_localization.h
+    libcockatrice/card/lazy_properties_hash.h
     libcockatrice/card/database/card_database.h
     libcockatrice/card/database/card_database_loader.h
     libcockatrice/card/database/card_database_manager.h
@@ -12,35 +14,38 @@ set(HEADERS
     libcockatrice/card/database/parser/card_database_parser.h
     libcockatrice/card/database/parser/cockatrice_xml_3.h
     libcockatrice/card/database/parser/cockatrice_xml_4.h
+    libcockatrice/card/import/card_name_normalizer.h
     libcockatrice/card/printing/exact_card.h
     libcockatrice/card/printing/printing_info.h
     libcockatrice/card/set/card_set.h
     libcockatrice/card/relation/card_relation.h
 )
 
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
+qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
 
 add_library(
   libcockatrice_card STATIC
   ${MOC_SOURCES}
   libcockatrice/card/card_info.cpp
   libcockatrice/card/card_info_comparator.cpp
+  libcockatrice/card/card_localization.cpp
+  libcockatrice/card/lazy_properties_hash.cpp
   libcockatrice/card/database/card_database.cpp
+  libcockatrice/card/database/card_database_cache.cpp
   libcockatrice/card/database/card_database_loader.cpp
   libcockatrice/card/database/card_database_manager.cpp
   libcockatrice/card/database/card_database_querier.cpp
   libcockatrice/card/database/parser/card_database_parser.cpp
   libcockatrice/card/database/parser/cockatrice_xml_3.cpp
   libcockatrice/card/database/parser/cockatrice_xml_4.cpp
+  libcockatrice/card/import/card_name_normalizer.cpp
   libcockatrice/card/printing/exact_card.cpp
   libcockatrice/card/printing/printing_info.cpp
   libcockatrice/card/relation/card_relation.cpp
   libcockatrice/card/set/card_set.cpp
   libcockatrice/card/set/card_set_list.cpp
+  libcockatrice/card/format/format_legality_rules.cpp
+  libcockatrice/card/format/format_legality_rules.h
 )
 
 target_include_directories(
@@ -55,3 +60,5 @@ 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 3054a10cf..bd33f18e7 100644
--- a/libcockatrice_card/libcockatrice/card/card_info.cpp
+++ b/libcockatrice_card/libcockatrice/card/card_info.cpp
@@ -1,40 +1,78 @@
 #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 <QDir>
+#include <QHashIterator>
 #include <QRegularExpression>
 #include <QSharedPointer>
 #include <QString>
-#include <QVariant>
-#include <algorithm>
 #include <utility>
 
-class CardRelation;
-class CardSet;
-class CardInfo;
-
 using CardInfoPtr = QSharedPointer<CardInfo>;
 
+const QHash<QString, QString> &CardInfo::getPropertiesHash() const
+{
+    return properties.getProperties();
+}
+
+void CardInfo::setProperty(const QString &_name, const QString &_value)
+{
+    bool changed = properties.insert(_name, _value);
+    if (!changed) {
+        return;
+    }
+
+    emit cardInfoChanged(smartThis);
+}
+
 CardInfo::CardInfo(const QString &_name,
                    const QString &_text,
                    bool _isToken,
-                   QVariantHash _properties,
+                   const QHash<QString, QString> &_properties,
                    const QList<CardRelation *> &_relatedCards,
                    const QList<CardRelation *> &_reverseRelatedCards,
                    SetToPrintingsMap _sets,
-                   const UiAttributes _uiAttributes)
-    : name(_name), text(_text), isToken(_isToken), properties(std::move(_properties)), relatedCards(_relatedCards),
-      reverseRelatedCards(_reverseRelatedCards), setsToPrintings(std::move(_sets)), uiAttributes(_uiAttributes)
+                   const UiAttributes _uiAttributes,
+                   QMap<QString, QString> _localizedNames,
+                   QMap<QString, QString> _localizedTexts)
+    : name(_name), text(_text), isToken(_isToken), localizedNames(std::move(_localizedNames)),
+      localizedTexts(std::move(_localizedTexts)), properties(LazyPropertiesHash(_properties)),
+      relatedCards(_relatedCards), reverseRelatedCards(_reverseRelatedCards), setsToPrintings(std::move(_sets)),
+      uiAttributes(_uiAttributes)
 {
     simpleName = CardInfo::simplifyName(name);
 
     refreshCachedSets();
 }
 
+CardInfo::CardInfo(const QString &_name,
+                   const QString &_text,
+                   bool _isToken,
+                   const QByteArray &_propertiesBlob,
+                   const QList<CardRelation *> &_relatedCards,
+                   const QList<CardRelation *> &_reverseRelatedCards,
+                   SetToPrintingsMap _sets,
+                   const UiAttributes _uiAttributes,
+                   QString _simpleName,
+                   QSet<QString> _altNames,
+                   QMap<QString, QString> _localizedNames,
+                   QMap<QString, QString> _localizedTexts)
+    : name(_name), simpleName(std::move(_simpleName)), text(_text), isToken(_isToken),
+      localizedNames(std::move(_localizedNames)), localizedTexts(std::move(_localizedTexts)),
+      properties(LazyPropertiesHash(_propertiesBlob)), relatedCards(_relatedCards),
+      reverseRelatedCards(_reverseRelatedCards), setsToPrintings(std::move(_sets)), uiAttributes(_uiAttributes),
+      altNames(std::move(_altNames))
+{
+    // propertiesBlob is materialized lazily on first query; simpleName and
+    // altNames are supplied by the caller (binary cache). Only the set-name
+    // display list still depends on the current enabled-set state.
+    refreshCachedSetNames();
+}
+
 CardInfoPtr CardInfo::newInstance(const QString &_name)
 {
     return newInstance(_name, "", false, {}, {}, {}, {}, {});
@@ -43,14 +81,16 @@ CardInfoPtr CardInfo::newInstance(const QString &_name)
 CardInfoPtr CardInfo::newInstance(const QString &_name,
                                   const QString &_text,
                                   bool _isToken,
-                                  QVariantHash _properties,
+                                  const QHash<QString, QString> &_properties,
                                   const QList<CardRelation *> &_relatedCards,
                                   const QList<CardRelation *> &_reverseRelatedCards,
                                   SetToPrintingsMap _sets,
-                                  const UiAttributes _uiAttributes)
+                                  const UiAttributes _uiAttributes,
+                                  QMap<QString, QString> _localizedNames,
+                                  QMap<QString, QString> _localizedTexts)
 {
-    CardInfoPtr ptr(new CardInfo(_name, _text, _isToken, std::move(_properties), _relatedCards, _reverseRelatedCards,
-                                 _sets, _uiAttributes));
+    CardInfoPtr ptr(new CardInfo(_name, _text, _isToken, _properties, _relatedCards, _reverseRelatedCards, _sets,
+                                 _uiAttributes, std::move(_localizedNames), std::move(_localizedTexts)));
     ptr->setSmartPointer(ptr);
 
     for (const auto &printings : _sets) {
@@ -63,6 +103,37 @@ CardInfoPtr CardInfo::newInstance(const QString &_name,
     return ptr;
 }
 
+CardInfoPtr CardInfo::newInstance(const QString &_name,
+                                  const QString &_text,
+                                  bool _isToken,
+                                  QByteArray _propertiesBlob,
+                                  const QList<CardRelation *> &_relatedCards,
+                                  const QList<CardRelation *> &_reverseRelatedCards,
+                                  SetToPrintingsMap _sets,
+                                  const UiAttributes _uiAttributes,
+                                  QString _simpleName,
+                                  QSet<QString> _altNames,
+                                  bool _appendToSets,
+                                  QMap<QString, QString> _localizedNames,
+                                  QMap<QString, QString> _localizedTexts)
+{
+    CardInfoPtr ptr(new CardInfo(_name, _text, _isToken, std::move(_propertiesBlob), _relatedCards,
+                                 _reverseRelatedCards, _sets, _uiAttributes, std::move(_simpleName),
+                                 std::move(_altNames), std::move(_localizedNames), std::move(_localizedTexts)));
+    ptr->setSmartPointer(ptr);
+
+    if (_appendToSets) {
+        for (const auto &printings : _sets) {
+            for (const PrintingInfo &printing : printings) {
+                printing.getSet()->append(ptr);
+                break;
+            }
+        }
+    }
+
+    return ptr;
+}
+
 QString CardInfo::getCorrectedName() const
 {
     // remove all the characters reserved in windows file paths,
@@ -75,7 +146,22 @@ QString CardInfo::getCorrectedName() const
     return result.remove(rmrx).replace(spacerx, space);
 }
 
-void CardInfo::addToSet(const CardSetPtr &_set, const PrintingInfo _info)
+QString CardInfo::getLegalityProp(const QString &format) const
+{
+    return getProperty("format-" + format);
+}
+
+bool CardInfo::isLegalInFormat(const QString &format) const
+{
+    if (format.isEmpty()) {
+        return true;
+    }
+
+    QString formatLegality = getLegalityProp(format);
+    return formatLegality == "legal" || formatLegality == "restricted";
+}
+
+void CardInfo::addToSet(const CardSetPtr &_set, const PrintingInfo &_info)
 {
     if (!_set->contains(smartThis)) {
         _set->append(smartThis);
@@ -87,15 +173,16 @@ void CardInfo::addToSet(const CardSetPtr &_set, const PrintingInfo _info)
     refreshCachedSets();
 }
 
-void CardInfo::combineLegalities(const QVariantHash &props)
+void CardInfo::combineLegalities(const QHash<QString, QString> &props)
 {
-    QHashIterator<QString, QVariant> it(props);
+    QHashIterator it(props);
     while (it.hasNext()) {
         it.next();
         if (it.key().startsWith("format-")) {
-            smartThis->setProperty(it.key(), it.value().toString());
+            properties.insert(it.key(), it.value());
         }
     }
+    emit cardInfoChanged(smartThis);
 }
 
 void CardInfo::refreshCachedSets()
@@ -156,7 +243,7 @@ QString CardInfo::simplifyName(const QString &name)
     return simpleName;
 }
 
-const QChar CardInfo::getColorChar() const
+QChar CardInfo::getColorChar() const
 {
     QString colors = getColors();
     switch (colors.size()) {
@@ -178,7 +265,7 @@ void CardInfo::resetReverseRelatedCards2Me()
 }
 
 // Back-compatibility methods. Remove ASAP
-const QString CardInfo::getCardType() const
+QString CardInfo::getCardType() const
 {
     return getProperty(Mtg::CardType);
 }
@@ -186,11 +273,11 @@ void CardInfo::setCardType(const QString &value)
 {
     setProperty(Mtg::CardType, value);
 }
-const QString CardInfo::getCmc() const
+QString CardInfo::getCmc() const
 {
     return getProperty(Mtg::ConvertedManaCost);
 }
-const QString CardInfo::getColors() const
+QString CardInfo::getColors() const
 {
     return getProperty(Mtg::Colors);
 }
@@ -198,19 +285,19 @@ void CardInfo::setColors(const QString &value)
 {
     setProperty(Mtg::Colors, value);
 }
-const QString CardInfo::getLoyalty() const
+QString CardInfo::getLoyalty() const
 {
     return getProperty(Mtg::Loyalty);
 }
-const QString CardInfo::getMainCardType() const
+QString CardInfo::getMainCardType() const
 {
     return getProperty(Mtg::MainCardType);
 }
-const QString CardInfo::getManaCost() const
+QString CardInfo::getManaCost() const
 {
     return getProperty(Mtg::ManaCost);
 }
-const QString CardInfo::getPowTough() const
+QString CardInfo::getPowTough() const
 {
     return getProperty(Mtg::PowTough);
 }
diff --git a/libcockatrice_card/libcockatrice/card/card_info.h b/libcockatrice_card/libcockatrice/card/card_info.h
index 7bd51356c..356da0546 100644
--- a/libcockatrice_card/libcockatrice/card/card_info.h
+++ b/libcockatrice_card/libcockatrice/card/card_info.h
@@ -1,16 +1,23 @@
 #ifndef CARD_INFO_H
 #define CARD_INFO_H
 
+#include "format/format_legality_rules.h"
+#include "lazy_properties_hash.h"
 #include "printing/printing_info.h"
 
-#include <QDate>
+#include <QByteArray>
+#include <QChar>
 #include <QHash>
 #include <QList>
 #include <QLoggingCategory>
 #include <QMap>
 #include <QMetaType>
+#include <QObject>
+#include <QSet>
 #include <QSharedPointer>
-#include <QVariant>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
 #include <utility>
 
 inline Q_LOGGING_CATEGORY(CardInfoLog, "card_info");
@@ -18,14 +25,15 @@ inline Q_LOGGING_CATEGORY(CardInfoLog, "card_info");
 class CardInfo;
 class CardSet;
 class CardRelation;
-class ICardDatabaseParser;
 
 typedef QSharedPointer<CardInfo> CardInfoPtr;
 typedef QSharedPointer<CardSet> CardSetPtr;
+typedef QSharedPointer<FormatRules> FormatRulesPtr;
 typedef QMap<QString, QList<PrintingInfo>> SetToPrintingsMap;
 
 typedef QHash<QString, CardInfoPtr> CardNameMap;
 typedef QHash<QString, CardSetPtr> SetNameMap;
+typedef QHash<QString, FormatRulesPtr> FormatRulesNameMap;
 
 Q_DECLARE_METATYPE(CardInfoPtr)
 
@@ -66,12 +74,17 @@ private:
      *  @anchor PrivateCardProperties
      */
     ///@{
-    CardInfoPtr smartThis;                         ///< Smart pointer to self for safe cross-references.
-    QString name;                                  ///< Full name of the card.
-    QString simpleName;                            ///< Simplified name for fuzzy matching.
-    QString text;                                  ///< Text description or rules text of the card.
-    bool isToken;                                  ///< Whether this card is a token or not.
-    QVariantHash properties;                       ///< Key-value store of dynamic card properties.
+    CardInfoPtr smartThis; ///< Smart pointer to self for safe cross-references.
+    QString name;          ///< Full name of the card.
+    QString simpleName;    ///< Simplified name for fuzzy matching.
+    QString text;          ///< Text description or rules text of the card.
+    bool isToken;          ///< Whether this card is a token or not.
+
+    QMap<QString, QString> localizedNames; ///< Localized card names, keyed by language code.
+    QMap<QString, QString> localizedTexts; ///< Localized rules text, keyed by language code.
+
+    LazyPropertiesHash properties; ///< Key-value store of dynamic card properties.
+
     QList<CardRelation *> relatedCards;            ///< Forward references to related cards.
     QList<CardRelation *> reverseRelatedCards;     ///< Cards that refer back to this card.
     QList<CardRelation *> reverseRelatedCardsToMe; ///< Cards that consider this card as related.
@@ -93,15 +106,55 @@ public:
      * @param _reverseRelatedCards Backward references to related cards.
      * @param _sets Map of set names to printing information.
      * @param _uiAttributes Attributes that affect display and game logic
+     * @param _localizedNames Localized card names, keyed by language code.
+     * @param _localizedTexts Localized rules text, keyed by language code.
      */
     explicit CardInfo(const QString &_name,
                       const QString &_text,
                       bool _isToken,
-                      QVariantHash _properties,
+                      const QHash<QString, QString> &_properties,
                       const QList<CardRelation *> &_relatedCards,
                       const QList<CardRelation *> &_reverseRelatedCards,
                       SetToPrintingsMap _sets,
-                      UiAttributes _uiAttributes);
+                      UiAttributes _uiAttributes,
+                      QMap<QString, QString> _localizedNames = {},
+                      QMap<QString, QString> _localizedTexts = {});
+
+    /**
+     * @brief Constructs a CardInfo from a cache snapshot with precomputed derived
+     *        state.
+     *
+     * Used by the binary cache reader to skip recomputing @p _simpleName and
+     * @p _altNames (which otherwise require a Unicode normalization and a full
+     * printing scan). Properties are supplied as a pre-serialized @p _propertiesBlob
+     * so the QHash<QString, QString> is not built at load time (it is materialized on first
+     * query).
+     *
+     * @param _name The card name.
+     * @param _text Rules text or description of the card.
+     * @param _isToken Token flag.
+     * @param _propertiesBlob Pre-serialized properties blob (as written by the cache).
+     * @param _relatedCards Forward relationships.
+     * @param _reverseRelatedCards Reverse relationships.
+     * @param _sets Printing information per set.
+     * @param _uiAttributes Attributes that affect display and game logic.
+     * @param _simpleName Precomputed simplified name.
+     * @param _altNames Precomputed alternate names.
+     * @param _localizedNames Localized card names, keyed by language code.
+     * @param _localizedTexts Localized rules text, keyed by language code.
+     */
+    explicit CardInfo(const QString &_name,
+                      const QString &_text,
+                      bool _isToken,
+                      const QByteArray &_propertiesBlob,
+                      const QList<CardRelation *> &_relatedCards,
+                      const QList<CardRelation *> &_reverseRelatedCards,
+                      SetToPrintingsMap _sets,
+                      UiAttributes _uiAttributes,
+                      QString _simpleName,
+                      QSet<QString> _altNames,
+                      QMap<QString, QString> _localizedNames = {},
+                      QMap<QString, QString> _localizedTexts = {});
 
     /**
      * @brief Copy constructor for CardInfo.
@@ -112,7 +165,8 @@ public:
      */
     CardInfo(const CardInfo &other)
         : QObject(other.parent()), name(other.name), simpleName(other.simpleName), text(other.text),
-          isToken(other.isToken), properties(other.properties), relatedCards(other.relatedCards),
+          isToken(other.isToken), localizedNames(other.localizedNames), localizedTexts(other.localizedTexts),
+          properties(other.properties), relatedCards(other.relatedCards),
           reverseRelatedCards(other.reverseRelatedCards), reverseRelatedCardsToMe(other.reverseRelatedCardsToMe),
           setsToPrintings(other.setsToPrintings), uiAttributes(other.uiAttributes), setsNames(other.setsNames),
           altNames(other.altNames)
@@ -140,16 +194,56 @@ public:
      * @param _reverseRelatedCards Reverse relationships.
      * @param _sets Printing information per set.
      * @param _uiAttributes Attributes that affect display and game logic
+     * @param _localizedNames Localized card names, keyed by language code.
+     * @param _localizedTexts Localized rules text, keyed by language code.
      * @return Shared pointer to the new CardInfo instance.
      */
     static CardInfoPtr newInstance(const QString &_name,
                                    const QString &_text,
                                    bool _isToken,
-                                   QVariantHash _properties,
+                                   const QHash<QString, QString> &_properties,
                                    const QList<CardRelation *> &_relatedCards,
                                    const QList<CardRelation *> &_reverseRelatedCards,
                                    SetToPrintingsMap _sets,
-                                   UiAttributes _uiAttributes);
+                                   UiAttributes _uiAttributes,
+                                   QMap<QString, QString> _localizedNames = {},
+                                   QMap<QString, QString> _localizedTexts = {});
+
+    /**
+     * @brief Creates a new instance from a cache snapshot with precomputed
+     *        derived state.
+     *
+     * @param _name Name of the card.
+     * @param _text Rules text or description.
+     * @param _isToken Token flag.
+     * @param _propertiesBlob Pre-serialized properties blob (as written by the cache).
+     * @param _relatedCards Forward relationships.
+     * @param _reverseRelatedCards Reverse relationships.
+     * @param _sets Printing information per set.
+     * @param _uiAttributes Attributes that affect display and game logic.
+     * @param _simpleName Precomputed simplified name.
+     * @param _altNames Precomputed alternate names.
+     * @param _appendToSets When true (default), the card is appended to each of
+     *        its CardSets. Pass false when building cards in parallel so the
+     *        (non-thread-safe) set membership is populated in a later
+     *        single-threaded pass.
+     * @param _localizedNames Localized card names, keyed by language code.
+     * @param _localizedTexts Localized rules text, keyed by language code.
+     * @return Shared pointer to the new CardInfo instance.
+     */
+    static CardInfoPtr newInstance(const QString &_name,
+                                   const QString &_text,
+                                   bool _isToken,
+                                   QByteArray _propertiesBlob,
+                                   const QList<CardRelation *> &_relatedCards,
+                                   const QList<CardRelation *> &_reverseRelatedCards,
+                                   SetToPrintingsMap _sets,
+                                   UiAttributes _uiAttributes,
+                                   QString _simpleName,
+                                   QSet<QString> _altNames,
+                                   bool _appendToSets = true,
+                                   QMap<QString, QString> _localizedNames = {},
+                                   QMap<QString, QString> _localizedTexts = {});
 
     /**
      * @brief Clones the current CardInfo instance.
@@ -199,26 +293,114 @@ public:
         text = _text;
         emit cardInfoChanged(smartThis);
     }
+
+    /**
+     * @brief Returns the card name in the given language, falling back to the
+     *        English name when no localization is available.
+     *
+     * @param lang Language code (e.g. "de", "ja", "zhs").
+     * @return The localized name, or the English name as fallback.
+     */
+    [[nodiscard]] const QString &getLocalizedName(const QString &lang) const
+    {
+        const auto it = localizedNames.constFind(lang);
+        return it != localizedNames.constEnd() ? it.value() : name;
+    }
+
+    /**
+     * @brief Returns the rules text in the given language, falling back to the
+     *        English text when no localization is available.
+     *
+     * @param lang Language code (e.g. "de", "ja", "zhs").
+     * @return The localized text, or the English text as fallback.
+     */
+    [[nodiscard]] const QString &getLocalizedText(const QString &lang) const
+    {
+        const auto it = localizedTexts.constFind(lang);
+        return it != localizedTexts.constEnd() ? it.value() : text;
+    }
+
+    /**
+     * @brief Returns the localized card names keyed by language code.
+     *
+     * Only languages that have an entry are present; there is no English
+     * fallback in this map.
+     */
+    [[nodiscard]] const QMap<QString, QString> &getLocalizedNames() const
+    {
+        return localizedNames;
+    }
+
+    /**
+     * @brief Returns the localized rules text keyed by language code.
+     *
+     * Only languages that have an entry are present; there is no English
+     * fallback in this map.
+     */
+    [[nodiscard]] const QMap<QString, QString> &getLocalizedTexts() const
+    {
+        return localizedTexts;
+    }
+
+    /**
+     * @brief Sets the card name for the given language.
+     *
+     * @param lang Language code.
+     * @param _localizedName The localized card name.
+     */
+    void setLocalizedName(const QString &lang, const QString &_localizedName)
+    {
+        if (localizedNames.value(lang) == _localizedName) {
+            return;
+        }
+        localizedNames.insert(lang, _localizedName);
+        emit cardInfoChanged(smartThis);
+    }
+
+    /**
+     * @brief Sets the rules text for the given language.
+     *
+     * @param lang Language code.
+     * @param _localizedText The localized rules text.
+     */
+    void setLocalizedText(const QString &lang, const QString &_localizedText)
+    {
+        if (localizedTexts.value(lang) == _localizedText) {
+            return;
+        }
+        localizedTexts.insert(lang, _localizedText);
+        emit cardInfoChanged(smartThis);
+    }
+
+    /**
+     * @brief Returns the language codes for which this card has a localized
+     *        name or rules text.
+     */
+    [[nodiscard]] QStringList localizationLanguages() const
+    {
+        QStringList languages = localizedNames.keys();
+        languages.append(localizedTexts.keys());
+        languages.removeDuplicates();
+        return languages;
+    }
     [[nodiscard]] bool getIsToken() const
     {
         return isToken;
     }
     [[nodiscard]] QStringList getProperties() const
     {
-        return properties.keys();
+        return getPropertiesHash().keys();
     }
+    [[nodiscard]] const QHash<QString, QString> &getPropertiesHash() const;
+
     [[nodiscard]] QString getProperty(const QString &propertyName) const
     {
-        return properties.value(propertyName).toString();
-    }
-    void setProperty(const QString &_name, const QString &_value)
-    {
-        properties.insert(_name, _value);
-        emit cardInfoChanged(smartThis);
+        return getPropertiesHash().value(propertyName);
     }
+    void setProperty(const QString &_name, const QString &_value);
     [[nodiscard]] bool hasProperty(const QString &propertyName) const
     {
-        return properties.contains(propertyName);
+        return getPropertiesHash().contains(propertyName);
     }
     [[nodiscard]] const SetToPrintingsMap &getSets() const
     {
@@ -264,18 +446,18 @@ public:
     }
     //@}
 
-    [[nodiscard]] const QChar getColorChar() const;
+    [[nodiscard]] QChar getColorChar() const;
 
     /** @name Legacy/Convenience Property Accessors */ //@{
-    [[nodiscard]] const QString getCardType() const;
+    [[nodiscard]] QString getCardType() const;
     void setCardType(const QString &value);
-    [[nodiscard]] const QString getCmc() const;
-    [[nodiscard]] const QString getColors() const;
+    [[nodiscard]] QString getCmc() const;
+    [[nodiscard]] QString getColors() const;
     void setColors(const QString &value);
-    [[nodiscard]] const QString getLoyalty() const;
-    [[nodiscard]] const QString getMainCardType() const;
-    [[nodiscard]] const QString getManaCost() const;
-    [[nodiscard]] const QString getPowTough() const;
+    [[nodiscard]] QString getLoyalty() const;
+    [[nodiscard]] QString getMainCardType() const;
+    [[nodiscard]] QString getManaCost() const;
+    [[nodiscard]] QString getPowTough() const;
     void setPowTough(const QString &value);
     //@}
 
@@ -288,6 +470,23 @@ public:
      */
     [[nodiscard]] QString getCorrectedName() const;
 
+    /**
+     * @brief Gets the card's legality value for the given format.
+     * The legality prop for a format is stored in the property map under the key "format-<name>"
+     * @param format The format's name.
+     * @return The card's legality value for the format. Empty if not found.
+     */
+    [[nodiscard]] QString getLegalityProp(const QString &format) const;
+
+    /**
+     * @brief Checks if the card is legal in the given format.
+     * A card is considered legal in a format if its properties map contains an entry for "format-<name>", with value
+     * "legal" or "restricted".
+     * @param format The format's name. If empty, will always return true.
+     * @return Whether the card is legal in the given format.
+     */
+    [[nodiscard]] bool isLegalInFormat(const QString &format) const;
+
     /**
      * @brief Adds a printing to a specific set.
      *
@@ -296,7 +495,7 @@ public:
      * @param _set The set to which the card should be added.
      * @param _info Optional printing information.
      */
-    void addToSet(const CardSetPtr &_set, PrintingInfo _info = PrintingInfo());
+    void addToSet(const CardSetPtr &_set, const PrintingInfo &_info = PrintingInfo());
 
     /**
      * @brief Combines legality properties from a provided map.
@@ -305,7 +504,7 @@ public:
      *
      * @param props Key-value mapping of format legalities.
      */
-    void combineLegalities(const QVariantHash &props);
+    void combineLegalities(const QHash<QString, QString> &props);
 
     /**
      * @brief Refreshes all cached fields that are calculated from the contained sets and printings.
diff --git a/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp b/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
index 821cc8675..d0800e596 100644
--- a/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
+++ b/libcockatrice_card/libcockatrice/card/card_info_comparator.cpp
@@ -1,5 +1,11 @@
 #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)
 {
@@ -25,22 +31,13 @@ bool CardInfoComparator::operator()(const CardInfoPtr &a, const CardInfoPtr &b)
 
 bool CardInfoComparator::compareVariants(const QVariant &a, const QVariant &b) const
 {
-    // Determine the type of QVariant based on Qt version
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     if (a.typeId() != b.typeId()) {
-#else
-    if (a.type() != b.type()) {
-#endif
         // If they are not the same type, compare as strings
         return a.toString() < b.toString();
     }
 
     // Perform type-specific comparison
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     switch (static_cast<int>(a.typeId())) {
-#else
-    switch (static_cast<int>(a.type())) {
-#endif
         case static_cast<int>(QMetaType::Int):
             return a.toInt() < b.toInt();
         case static_cast<int>(QMetaType::Double):
@@ -66,7 +63,7 @@ QVariant CardInfoComparator::getProperty(const CardInfoPtr &card, const QString
         return card->getIsToken();
     }
 
-    // Otherwise, check if it's a custom property in the QVariantHash
+    // Otherwise, check if it's a custom property in the properties hash
     if (card->hasProperty(property)) {
         return card->getProperty(property);
     }
diff --git a/libcockatrice_card/libcockatrice/card/card_info_comparator.h b/libcockatrice_card/libcockatrice/card/card_info_comparator.h
index b8d9c47e6..b184f5d55 100644
--- a/libcockatrice_card/libcockatrice/card/card_info_comparator.h
+++ b/libcockatrice_card/libcockatrice/card/card_info_comparator.h
@@ -1,14 +1,17 @@
 /**
  * @file card_info_comparator.h
  * @ingroup Cards
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARD_INFO_COMPARATOR_H
 #define CARD_INFO_COMPARATOR_H
 
 #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
new file mode 100644
index 000000000..4f91bac78
--- /dev/null
+++ b/libcockatrice_card/libcockatrice/card/card_localization.cpp
@@ -0,0 +1,40 @@
+#include "card_localization.h"
+
+#include <QHash>
+#include <QList>
+#include <QLocale>
+#include <QStringList>
+#include <utility>
+
+namespace CardLocalization
+{
+const QStringList &supportedLanguages()
+{
+    static const QStringList languages = {"cs", "de", "es", "fr", "it", "ja", "ko", "pt", "ru", "zhs", "zht", "he"};
+    return languages;
+}
+
+QString languageDisplayName(const QString &lang)
+{
+    static const QHash<QString, QString> displayNames = {
+        {"cs", "Česky (Czech)"},
+        {"de", "Deutsch (German)"},
+        {"es", "Español (Spanish)"},
+        {"fr", "Français (French)"},
+        {"it", "Italiano (Italian)"},
+        {"ja", "日本語 (Japanese)"},
+        {"ko", "한국어 (Korean)"},
+        {"pt", "Português (Portuguese)"},
+        {"ru", "Русский (Russian)"},
+        {"he", "עברית (Hebrew)"},
+        {"zhs", "简体中文 (Chinese Simplified)"},
+        {"zht", "繁體中文 (Chinese Traditional)"},
+    };
+    const QString displayName = displayNames.value(lang);
+    if (!displayName.isEmpty()) {
+        return displayName;
+    }
+    const QString nativeName = QLocale(lang).nativeLanguageName();
+    return nativeName.isEmpty() ? lang : nativeName;
+}
+} // namespace CardLocalization
\ No newline at end of file
diff --git a/libcockatrice_card/libcockatrice/card/card_localization.h b/libcockatrice_card/libcockatrice/card/card_localization.h
new file mode 100644
index 000000000..ee2aaa9b7
--- /dev/null
+++ b/libcockatrice_card/libcockatrice/card/card_localization.h
@@ -0,0 +1,81 @@
+#ifndef CARD_LOCALIZATION_H
+#define CARD_LOCALIZATION_H
+
+#include <QLatin1String>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
+
+/**
+ * @brief The card languages card search should run against.
+ */
+enum class SearchLanguageMode
+{
+    English,  ///< Only search the English card names and texts.
+    Selected, ///< Search the selected card language (untranslated cards still match in English).
+    Both      ///< Search both the English and the selected card language names and texts.
+};
+
+/**
+ * @brief The card language and matching mode searches run against.
+ *
+ * Bundles the card language code configured in the settings with the
+ * SearchLanguageMode, so entry points take one value instead of two related
+ * parameters.
+ */
+struct CardSearchLanguage
+{
+    QString language; ///< Card language code (e.g. "de"); empty means the English fallback.
+    SearchLanguageMode mode = SearchLanguageMode::English; ///< How the language participates in the search.
+
+    /**
+     * @brief Whether only the English card data is searched.
+     *
+     * @return True when no card language is selected or English itself is selected.
+     */
+    [[nodiscard]] bool isEnglishOnly() const
+    {
+        return language.isEmpty() || language == QLatin1String("en");
+    }
+
+    bool operator==(const CardSearchLanguage &) const = default;
+    bool operator!=(const CardSearchLanguage &) const = default;
+};
+
+/**
+ * @namespace CardLocalization
+ * @ingroup Cards
+ *
+ * @brief Shared language metadata for localized card text and images.
+ *
+ * Lists the language codes Cockatrice can display localized card data for and
+ * provides human-readable names. The list is shared between Oracle (which
+ * imports the selected language's card data) and the client settings UI (which
+ * offers the language choice).
+ */
+namespace CardLocalization
+{
+/**
+ * @brief Language codes for which localized card data can be imported/displayed.
+ *
+ * Matches the languages Scryfall can serve localized card images for. "en" is
+ * always available as the default/fallback and is not listed here.
+ *
+ * @return The list of supported language codes.
+ */
+[[nodiscard]] const QStringList &supportedLanguages();
+
+/**
+ * @brief Human-readable name for a language code.
+ *
+ * Follows the same "native name (English name)" format the UI language list
+ * uses (e.g. "日本語 (Japanese)"), so the English fallback is always visible.
+ *
+ * @param lang Language code (e.g. "de", "ja", "zhs").
+ * @return The language's native name with its English name in parentheses, or
+ *         the code itself if it cannot be resolved.
+ */
+[[nodiscard]] QString languageDisplayName(const QString &lang);
+} // namespace CardLocalization
+
+#endif // CARD_LOCALIZATION_H
\ No newline at end of file
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.cpp b/libcockatrice_card/libcockatrice/card/database/card_database.cpp
index 2e977901f..7b0d5b2f9 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database.cpp
@@ -1,16 +1,28 @@
 #include "card_database.h"
 
 #include "../relation/card_relation.h"
-#include "parser/cockatrice_xml_4.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 <QCryptographicHash>
 #include <QDebug>
-#include <QDirIterator>
-#include <QFile>
-#include <QRegularExpression>
-#include <algorithm>
+#include <QList>
+#include <QMessageLogger>
+#include <QMetaObject>
+#include <QMetaType>
+#include <QMutexLocker>
+#include <QSharedPointer>
 #include <utility>
 
+class ICardDatabasePathProvider;
+class ICardPreferenceProvider;
+class ICardSetPriorityController;
+
 CardDatabase::CardDatabase(QObject *parent,
                            ICardPreferenceProvider *prefs,
                            ICardDatabasePathProvider *pathProvider,
@@ -19,14 +31,19 @@ CardDatabase::CardDatabase(QObject *parent,
 {
     qRegisterMetaType<CardInfoPtr>("CardInfoPtr");
     qRegisterMetaType<CardInfoPtr>("CardSetPtr");
+    qRegisterMetaType<CardDatabaseData>("CardDatabaseData");
 
     // create loader and wire it up
-    loader = new CardDatabaseLoader(this, this, pathProvider, prefs);
+    loader = new CardDatabaseLoader(this, this, pathProvider, 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);
     connect(loader, &CardDatabaseLoader::newSetsFound, this, &CardDatabase::cardDatabaseNewSetsFound);
     connect(loader, &CardDatabaseLoader::allNewSetsEnabled, this, &CardDatabase::cardDatabaseAllNewSetsEnabled);
+    // swap the finished snapshot into the live database. Uses AutoConnection so
+    // that cross-thread loads are delivered via the event loop while same-thread/
+    // synchronous callers get the swap immediately.
+    connect(loader, &CardDatabaseLoader::databaseDataReady, this, &CardDatabase::swapInDatabaseData);
 
     querier = new CardDatabaseQuerier(this, this, prefs);
 }
@@ -60,6 +77,24 @@ void CardDatabase::loadCardDatabases()
     loadStatus = loader->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);
+
+    if (loadStatus == Ok) {
+        QMetaObject::invokeMethod(this, &CardDatabase::checkUnknownSets, Qt::AutoConnection);
+    }
+}
+
 bool CardDatabase::saveCustomTokensToFile()
 {
     return loader->saveCustomTokensToFile();
@@ -67,22 +102,28 @@ bool CardDatabase::saveCustomTokensToFile()
 
 void CardDatabase::refreshCachedReverseRelatedCards()
 {
-    for (const auto &card : cards) {
+    refreshCachedReverseRelatedCards(cards);
+}
+
+void CardDatabase::refreshCachedReverseRelatedCards(CardNameMap &cardMap)
+{
+    for (const auto &card : cardMap) {
         card->resetReverseRelatedCards2Me();
     }
 
-    for (const auto &card : cards) {
+    for (const auto &card : cardMap) {
         for (auto *rel : card->getReverseRelatedCards()) {
-            if (auto target = cards.value(rel->getName())) {
+            if (auto target = cardMap.value(rel->getName())) {
                 auto *newRel = new CardRelation(card->getName(), rel->getAttachType(), rel->getIsCreateAllExclusion(),
-                                                rel->getIsVariable(), rel->getDefaultCount(), rel->getIsPersistent());
+                                                rel->getIsVariable(), rel->getDefaultCount(), rel->getIsPersistent(),
+                                                rel->getIsFaceDown());
                 target->addReverseRelatedCards2Me(newRel);
             }
         }
     }
 }
 
-void CardDatabase::addCard(CardInfoPtr card)
+void CardDatabase::addCard(const CardInfoPtr &card)
 {
     if (card == nullptr) {
         qCWarning(CardDatabaseLog) << "CardDatabase::addCard(nullptr)";
@@ -93,9 +134,11 @@ void CardDatabase::addCard(CardInfoPtr card)
 
     // If a card already exists, just add the new set property.
     if (auto existing = cards.value(name)) {
-        for (const auto &printings : card->getSets())
-            for (const auto &printing : printings)
+        for (const auto &printings : card->getSets()) {
+            for (const auto &printing : printings) {
                 existing->addToSet(printing.getSet(), printing);
+            }
+        }
         return;
     }
 
@@ -106,21 +149,24 @@ void CardDatabase::addCard(CardInfoPtr card)
     emit cardAdded(card);
 }
 
-void CardDatabase::removeCard(CardInfoPtr card)
+void CardDatabase::removeCard(const CardInfoPtr &card)
 {
     if (card.isNull()) {
         qCWarning(CardDatabaseLog) << "CardDatabase::removeCard(nullptr)";
         return;
     }
 
-    for (auto *cardRelation : card->getRelatedCards())
+    for (auto *cardRelation : card->getRelatedCards()) {
         cardRelation->deleteLater();
+    }
 
-    for (auto *cardRelation : card->getReverseRelatedCards())
+    for (auto *cardRelation : card->getReverseRelatedCards()) {
         cardRelation->deleteLater();
+    }
 
-    for (auto *cardRelation : card->getReverseRelatedCards2Me())
+    for (auto *cardRelation : card->getReverseRelatedCards2Me()) {
         cardRelation->deleteLater();
+    }
 
     QMutexLocker locker(removeCardMutex);
     cards.remove(card->getName());
@@ -128,7 +174,7 @@ void CardDatabase::removeCard(CardInfoPtr card)
     emit cardRemoved(card);
 }
 
-void CardDatabase::addSet(CardSetPtr set)
+void CardDatabase::addSet(const CardSetPtr &set)
 {
     sets.insert(set->getShortName(), set);
 }
@@ -164,15 +210,19 @@ void CardDatabase::checkUnknownSets()
         if (numUnknownSets > 0) {
             emit cardDatabaseNewSetsFound(numUnknownSets, unknownSetNames);
         } else {
-            _sets.markAllAsKnown();
+            _sets.markAllAsKnownBatched(setPriorityController);
         }
     } else {
         // No set enabled. Probably this is the first time running trice
-        _sets.guessSortKeys();
+        _sets.enableAllBatched(setPriorityController);
         _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();
     }
 }
@@ -180,22 +230,58 @@ void CardDatabase::checkUnknownSets()
 void CardDatabase::enableAllUnknownSets()
 {
     auto _sets = getSetList();
-    _sets.enableAllUnknown();
+    _sets.enableAllUnknownBatched(setPriorityController);
 }
 
 void CardDatabase::markAllSetsAsKnown()
 {
     auto _sets = getSetList();
-    _sets.markAllAsKnown();
+    _sets.markAllAsKnownBatched(setPriorityController);
 }
 
-void CardDatabase::notifyEnabledSetsChanged()
+void CardDatabase::notifyEnabledSetsChanged(bool recomputeCachedSets)
 {
-    // refresh the list of cached set names
-    for (const CardInfoPtr &card : cards) {
-        card->refreshCachedSets();
+    if (recomputeCachedSets) {
+        // refresh the list of cached set names / alt names for every card; this is
+        // only needed when the enabled-set state actually changed (e.g. the user
+        // toggled a set in the settings UI).
+        for (const CardInfoPtr &card : cards) {
+            card->refreshCachedSets();
+        }
     }
 
     // inform the carddatabasemodels that they need to re-check their list of cards
     emit cardDatabaseEnabledSetsChanged();
 }
+
+void CardDatabase::addFormat(const FormatRulesPtr &format)
+{
+    formats.insert(format->formatName.toLower(), format);
+}
+
+void CardDatabase::swapInDatabaseData(CardDatabaseData data)
+{
+    for (const auto &card : cards) {
+        for (auto *rel : card->getRelatedCards()) {
+            rel->deleteLater();
+        }
+        for (auto *rel : card->getReverseRelatedCards()) {
+            rel->deleteLater();
+        }
+        for (auto *rel : card->getReverseRelatedCards2Me()) {
+            rel->deleteLater();
+        }
+    }
+
+    cards = std::move(data.cards);
+    simpleNameCards = std::move(data.simpleNameCards);
+    sets = std::move(data.sets);
+    formats = std::move(data.formats);
+
+    loadStatus = cards.isEmpty() ? NotLoaded : Ok;
+
+    // inform listeners that the whole database was replaced; they should
+    // rebuild from the live containers in a single batch instead of reacting
+    // to individual card additions.
+    emit cardDatabaseReset();
+}
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.h b/libcockatrice_card/libcockatrice/card/database/card_database.h
index 6028cce86..9f0d67b67 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database.h
@@ -3,16 +3,25 @@
 
 #include "../set/card_set_list.h"
 #include "card_database_loader.h"
-#include "card_database_querier.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 <QBasicMutex>
-#include <QDate>
-#include <QHash>
-#include <QList>
 #include <QLoggingCategory>
-#include <QVector>
-#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
-#include <utility>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class CardDatabaseQuerier;
+class ICardDatabasePathProvider;
+class ICardPreferenceProvider;
+class ICardSetPriorityController;
 
 inline Q_LOGGING_CATEGORY(CardDatabaseLog, "card_database");
 
@@ -30,39 +39,42 @@ class CardDatabase : public QObject
     Q_OBJECT
 
 protected:
-    /// Controller to determine set priority when choosing preferred printings.
+    /** @brief Controller to determine set priority when choosing preferred printings. */
     ICardSetPriorityController *setPriorityController;
 
-    /// Cards indexed by exact name
+    /** @brief Cards indexed by exact name. */
     CardNameMap cards;
 
-    /// Cards indexed by simplified name (normalized)
+    /** @brief Cards indexed by simplified name (normalized). */
     CardNameMap simpleNameCards;
 
-    /// Sets indexed by short name
+    /** @brief Sets indexed by short name. */
     SetNameMap sets;
 
-    /// Loader responsible for file discovery and parsing
+    FormatRulesNameMap formats;
+
+    /** @brief Loader responsible for file discovery and parsing. */
     CardDatabaseLoader *loader;
 
-    /// Current load status of the database
+    /** @brief Current load status of the database. */
     LoadStatus loadStatus;
 
-    /// Querier for higher-level card lookups
+    /** @brief Querier for higher-level card lookups. */
     CardDatabaseQuerier *querier;
 
 private:
-    /**
-     * @brief Check for sets that are unknown and emit signals if needed.
-     */
-    void checkUnknownSets();
-
     /**
      * @brief Refreshes the cached reverse-related cards for all cards.
      */
     void refreshCachedReverseRelatedCards();
 
-    /// Mutexes for thread safety
+    /**
+     * @brief Refreshes the cached reverse-related cards for the given card map.
+     * @param cardMap Map of cards to process.
+     */
+    void refreshCachedReverseRelatedCards(CardNameMap &cardMap);
+
+    /** @brief Mutexes for thread safety. */
     QBasicMutex *clearDatabaseMutex = new QBasicMutex(), *addCardMutex = new QBasicMutex(),
                 *removeCardMutex = new QBasicMutex();
 
@@ -86,7 +98,7 @@ public:
      * @brief Removes a card from the database.
      * @param card Pointer to the card to remove.
      */
-    void removeCard(CardInfoPtr card);
+    void removeCard(const CardInfoPtr &card);
 
     /** @brief Clears all cards, sets, and internal state. */
     void clear();
@@ -125,34 +137,79 @@ public:
     /** @brief Marks all sets as known. */
     void markAllSetsAsKnown();
 
-    /** @brief Notifies listeners that enabled sets changed. */
-    void notifyEnabledSetsChanged();
+    /**
+     * @brief Notifies listeners that enabled sets changed.
+     * @param recomputeCachedSets When true, every card's cached set-name / alt-name
+     *        data is recomputed (needed only when enabled-set state actually
+     *        changed). Pass false after a plain reload, where enabled-set state is
+     *        unchanged and the cached data is still valid.
+     */
+    void notifyEnabledSetsChanged(bool recomputeCachedSets = true);
+
+    /**
+     * @brief Check for sets that are unknown and emit signals if needed.
+     *
+     * Called from MainWindow::startupConfigCheck() after signal connections are
+     * live (the front-loaded parse in main() runs before MainWindow exists, so
+     * signals emitted there would have no receivers).  May also be called by
+     * the loader via the friend declaration.  Has side effects: enables all
+     * sets when none are enabled (first-run), marks all sets as known.
+     */
+    void checkUnknownSets();
+
+    ICardSetPriorityController *getPriorityController()
+    {
+        return setPriorityController;
+    }
 
 public slots:
     /**
      * @brief Adds a card to the database.
      * @param card CardInfoPtr to add.
      */
-    void addCard(CardInfoPtr card);
+    void addCard(const CardInfoPtr &card);
 
     /**
      * @brief Adds a set to the database.
      * @param set Pointer to CardSet to add.
      */
-    void addSet(CardSetPtr set);
+    void addSet(const CardSetPtr &set);
 
-    /** @brief Loads card databases from configured paths. */
+    void addFormat(const FormatRulesPtr &format);
+
+    /** @brief Loads card databases from configured paths, using the binary cache when valid. */
     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.
      * @return True if successful.
      */
     bool saveCustomTokensToFile();
 
+    /**
+     * @brief Replaces the entire contents of the database with the provided
+     *        snapshot in a single operation. Intended to be called once a
+     *        background load has finished building a CardDatabaseData, so that
+     *        observers never see a partially-populated database.
+     * @param data The fully-built snapshot to adopt.
+     */
+    void swapInDatabaseData(CardDatabaseData data);
+
 signals:
     /** @brief Emitted when the card database has finished loading successfully. */
     void cardDatabaseLoadingFinished();
 
+    /**
+     * @brief Emitted once after the live database contents have been replaced
+     *        by a freshly loaded snapshot. Models should rebuild from the
+     *        database in a single batch rather than reacting to per-card adds.
+     */
+    void cardDatabaseReset();
+
     /** @brief Emitted when the card database fails to load. */
     void cardDatabaseLoadingFailed();
 
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_cache.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_cache.cpp
new file mode 100644
index 000000000..4ab4d1fca
--- /dev/null
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_cache.cpp
@@ -0,0 +1,542 @@
+#include "card_database_cache.h"
+
+#include "../card_info.h"
+#include "../format/format_legality_rules.h"
+#include "../printing/printing_info.h"
+#include "../relation/card_relation.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
+{
+constexpr quint32 CACHE_MAGIC = 0x43445243; // "CDRC"
+constexpr quint32 CACHE_VERSION = 3;
+
+// ---- Primitives -----------------------------------------------------------
+
+void writeString(QDataStream &out, const QString &s)
+{
+    out << s;
+}
+
+QString readString(QDataStream &in)
+{
+    QString s;
+    in >> s;
+    return s;
+}
+
+// Stores a QHash<QString, QString> as a single pre-serialized blob. The reader keeps the
+// blob as-is and materializes the QHash<QString, QString> lazily on first query, which is
+// what removes the allocation storm from database load (see card_info.cpp /
+// printing_info.cpp).
+void writeHashBlob(QDataStream &out, const QHash<QString, QString> &h)
+{
+    QByteArray blob;
+    QDataStream blobOut(&blob, QIODevice::WriteOnly);
+    blobOut.setVersion(QDataStream::Qt_6_4);
+    blobOut << h;
+    out << static_cast<quint32>(blob.size());
+    out.writeRawData(blob.constData(), blob.size());
+}
+
+QByteArray readHashBlob(QDataStream &in)
+{
+    quint32 len = 0;
+    in >> len;
+    if (in.status() != QDataStream::Ok || static_cast<qint64>(len) > in.device()->bytesAvailable()) {
+        return {};
+    }
+    QByteArray blob(len, Qt::Uninitialized);
+    in.readRawData(blob.data(), static_cast<int>(len));
+    return blob;
+}
+
+void writeDate(QDataStream &out, const QDate &d)
+{
+    out << d;
+}
+
+QDate readDate(QDataStream &in)
+{
+    QDate d;
+    in >> d;
+    return d;
+}
+
+void writeStringMap(QDataStream &out, const QMap<QString, QString> &map)
+{
+    out << static_cast<quint32>(map.size());
+    for (auto it = map.constBegin(); it != map.constEnd(); ++it) {
+        writeString(out, it.key());
+        writeString(out, it.value());
+    }
+}
+
+QMap<QString, QString> readStringMap(QDataStream &in)
+{
+    QMap<QString, QString> map;
+    quint32 count = 0;
+    in >> count;
+    if (in.status() != QDataStream::Ok) {
+        return map;
+    }
+    for (quint32 i = 0; i < count; ++i) {
+        QString key = readString(in);
+        QString value = readString(in);
+        if (in.status() != QDataStream::Ok) {
+            map.clear();
+            return map;
+        }
+        map.insert(key, value);
+    }
+    return map;
+}
+
+// ---- CardRelation ----------------------------------------------------------
+
+void writeRelation(QDataStream &out, const CardRelation *rel)
+{
+    writeString(out, rel->getName());
+    out << static_cast<quint32>(rel->getAttachType());
+    out << rel->getIsCreateAllExclusion();
+    out << rel->getIsVariable();
+    out << rel->getDefaultCount();
+    out << rel->getIsPersistent();
+    out << rel->getIsFaceDown();
+}
+
+CardRelation *readRelation(QDataStream &in)
+{
+    QString name = readString(in);
+    quint32 attachType = 0;
+    bool isExclusion = false;
+    bool isVariable = false;
+    int defaultCount = 1;
+    bool isPersistent = false;
+    bool isFaceDown = false;
+    in >> attachType;
+    in >> isExclusion;
+    in >> isVariable;
+    in >> defaultCount;
+    in >> isPersistent;
+    in >> isFaceDown;
+    return new CardRelation(name, static_cast<CardRelationType>(attachType), isExclusion, isVariable, defaultCount,
+                            isPersistent, isFaceDown);
+}
+
+// ---- PrintingInfo ----------------------------------------------------------
+
+// A printing references its set by short name; the CardSetPtr is resolved after
+// all sets have been reconstructed on read.
+void writePrinting(QDataStream &out, const PrintingInfo &p)
+{
+    writeString(out, p.getSet() ? p.getSet()->getShortName() : QString());
+    writeHashBlob(out, p.getPropertiesHash());
+}
+
+PrintingInfo readPrinting(QDataStream &in, const SetNameMap &sets)
+{
+    QString setName = readString(in);
+    QByteArray propsBlob = readHashBlob(in);
+    auto set = sets.value(setName);
+
+    return PrintingInfo(set, LazyPropertiesHash(propsBlob));
+}
+
+// ---- CardSet ---------------------------------------------------------------
+
+void writeSet(QDataStream &out, const CardSetPtr &set)
+{
+    writeString(out, set->getShortName());
+    writeString(out, set->getLongName());
+    writeString(out, set->getSetType());
+    writeDate(out, set->getReleaseDate());
+    out << static_cast<quint32>(set->getPriority());
+}
+
+CardSetPtr readSet(QDataStream &in, ICardSetPriorityController *priorityController)
+{
+    QString shortName = readString(in);
+    QString longName = readString(in);
+    QString setType = readString(in);
+    QDate releaseDate = readDate(in);
+    quint32 priority = 0;
+    in >> priority;
+    return CardSet::newInstance(priorityController, shortName, longName, setType, releaseDate,
+                                static_cast<CardSet::Priority>(priority));
+}
+
+// ---- CardInfo --------------------------------------------------------------
+
+void writeCard(QDataStream &out, const CardInfoPtr &card)
+{
+    writeString(out, card->getName());
+    writeString(out, card->getText());
+    out << card->getIsToken();
+    writeHashBlob(out, card->getPropertiesHash());
+
+    CardInfo::UiAttributes ui = card->getUiAttributes();
+    out << ui.cipt;
+    out << ui.landscapeOrientation;
+    out << ui.tableRow;
+    out << ui.upsideDownArt;
+
+    // Precomputed derived state, so the reader can skip simplifyName() and the
+    // per-printing alt-name scan entirely.
+    writeString(out, card->getSimpleName());
+    {
+        const QSet<QString> altNames = card->getAltNames();
+        out << static_cast<quint32>(altNames.size());
+        for (const QString &alt : altNames) {
+            writeString(out, alt);
+        }
+    }
+
+    // setsToPrintings
+    const SetToPrintingsMap sets = card->getSets();
+    out << static_cast<quint32>(sets.size());
+    for (auto it = sets.constBegin(); it != sets.constEnd(); ++it) {
+        writeString(out, it.key());
+        out << static_cast<quint32>(it.value().size());
+        for (const PrintingInfo &p : it.value()) {
+            writePrinting(out, p);
+        }
+    }
+
+    // related cards
+    const QList<CardRelation *> related = card->getRelatedCards();
+    out << static_cast<quint32>(related.size());
+    for (const CardRelation *rel : related) {
+        writeRelation(out, rel);
+    }
+
+    // reverse-related cards (the reverseRelatedCards list, not the computed 2Me)
+    const QList<CardRelation *> reverse = card->getReverseRelatedCards();
+    out << static_cast<quint32>(reverse.size());
+    for (const CardRelation *rel : reverse) {
+        writeRelation(out, rel);
+    }
+
+    // localized card data
+    writeStringMap(out, card->getLocalizedNames());
+    writeStringMap(out, card->getLocalizedTexts());
+}
+
+CardInfoPtr readCard(QDataStream &in, const SetNameMap &sets)
+{
+    QString name = readString(in);
+    QString text = readString(in);
+    bool isToken = false;
+    in >> isToken;
+    QByteArray propertiesBlob = readHashBlob(in);
+
+    CardInfo::UiAttributes ui;
+    in >> ui.cipt;
+    in >> ui.landscapeOrientation;
+    in >> ui.tableRow;
+    in >> ui.upsideDownArt;
+
+    // Precomputed derived state, restored directly to skip simplifyName() and the
+    // per-printing alt-name scan.
+    QString simpleName = readString(in);
+    QSet<QString> altNames;
+    quint32 altNameCount = 0;
+    in >> altNameCount;
+    if (in.status() != QDataStream::Ok) {
+        return nullptr;
+    }
+    altNames.reserve(altNameCount);
+    for (quint32 i = 0; i < altNameCount; ++i) {
+        altNames.insert(readString(in));
+    }
+
+    SetToPrintingsMap cardSets;
+    quint32 setCount = 0;
+    in >> setCount;
+    if (in.status() != QDataStream::Ok) {
+        return nullptr;
+    }
+    for (quint32 i = 0; i < setCount; ++i) {
+        QString setName = readString(in);
+        quint32 printingCount = 0;
+        in >> printingCount;
+        if (in.status() != QDataStream::Ok) {
+            return nullptr;
+        }
+        QList<PrintingInfo> printings;
+        printings.reserve(printingCount);
+        for (quint32 j = 0; j < printingCount; ++j) {
+            printings.append(readPrinting(in, sets));
+        }
+        cardSets.insert(setName, printings);
+    }
+
+    QList<CardRelation *> related;
+    quint32 relatedCount = 0;
+    in >> relatedCount;
+    if (in.status() != QDataStream::Ok) {
+        return nullptr;
+    }
+    related.reserve(relatedCount);
+    for (quint32 i = 0; i < relatedCount; ++i) {
+        related.append(readRelation(in));
+    }
+
+    QList<CardRelation *> reverse;
+    quint32 reverseCount = 0;
+    in >> reverseCount;
+    if (in.status() != QDataStream::Ok) {
+        return nullptr;
+    }
+    reverse.reserve(reverseCount);
+    for (quint32 i = 0; i < reverseCount; ++i) {
+        reverse.append(readRelation(in));
+    }
+
+    const QMap<QString, QString> localizedNames = readStringMap(in);
+    if (in.status() != QDataStream::Ok) {
+        return nullptr;
+    }
+    const QMap<QString, QString> localizedTexts = readStringMap(in);
+    if (in.status() != QDataStream::Ok) {
+        return nullptr;
+    }
+
+    CardInfoPtr card = CardInfo::newInstance(name, text, isToken, propertiesBlob, related, reverse, cardSets, ui,
+                                             simpleName, altNames, false, localizedNames, localizedTexts);
+
+    return card;
+}
+
+// ---- FormatRules -----------------------------------------------------------
+
+void writeFormat(QDataStream &out, const FormatRulesPtr &format)
+{
+    writeString(out, format->formatName);
+    out << format->minDeckSize;
+    out << format->maxDeckSize;
+    out << format->maxSideboardSize;
+
+    out << static_cast<quint32>(format->allowedCounts.size());
+    for (const AllowedCount &ac : format->allowedCounts) {
+        out << ac.max;
+        writeString(out, ac.label);
+    }
+
+    out << static_cast<quint32>(format->exceptions.size());
+    for (const ExceptionRule &ex : format->exceptions) {
+        out << static_cast<quint32>(ex.conditions.size());
+        for (const CardCondition &cond : ex.conditions) {
+            writeString(out, cond.field);
+            writeString(out, cond.matchType);
+            writeString(out, cond.value);
+        }
+        out << ex.maxCopies;
+    }
+}
+
+FormatRulesPtr readFormat(QDataStream &in)
+{
+    FormatRulesPtr format(new FormatRules());
+    format->formatName = readString(in);
+    in >> format->minDeckSize;
+    in >> format->maxDeckSize;
+    in >> format->maxSideboardSize;
+
+    quint32 allowedCount = 0;
+    in >> allowedCount;
+    if (in.status() != QDataStream::Ok) {
+        return nullptr;
+    }
+    for (quint32 i = 0; i < allowedCount; ++i) {
+        AllowedCount ac;
+        in >> ac.max;
+        ac.label = readString(in);
+        format->allowedCounts.append(ac);
+    }
+
+    quint32 exceptionCount = 0;
+    in >> exceptionCount;
+    if (in.status() != QDataStream::Ok) {
+        return nullptr;
+    }
+    for (quint32 i = 0; i < exceptionCount; ++i) {
+        ExceptionRule ex;
+        quint32 condCount = 0;
+        in >> condCount;
+        if (in.status() != QDataStream::Ok) {
+            return nullptr;
+        }
+        for (quint32 j = 0; j < condCount; ++j) {
+            CardCondition cond;
+            cond.field = readString(in);
+            cond.matchType = readString(in);
+            cond.value = readString(in);
+            ex.conditions.append(cond);
+        }
+        in >> ex.maxCopies;
+        format->exceptions.append(ex);
+    }
+    return format;
+}
+
+} // namespace
+
+bool CardDatabaseCache::write(const QString &cachePath, const CardDatabaseData &data, const QByteArray &sourceHash)
+{
+    QSaveFile file(cachePath);
+    if (!file.open(QIODevice::WriteOnly)) {
+        return false;
+    }
+
+    QDataStream out(&file);
+    out.setVersion(QDataStream::Qt_6_4);
+
+    // Header
+    out << CACHE_MAGIC;
+    out << CACHE_VERSION;
+    out << sourceHash;
+
+    // Sets
+    out << static_cast<quint32>(data.sets.size());
+    for (const CardSetPtr &set : data.sets) {
+        writeSet(out, set);
+    }
+
+    // Cards
+    const quint32 cardCount = static_cast<quint32>(data.cards.size());
+    out << cardCount;
+    for (const CardInfoPtr &card : data.cards) {
+        writeCard(out, card);
+    }
+
+    // Formats
+    out << static_cast<quint32>(data.formats.size());
+    for (const FormatRulesPtr &format : data.formats) {
+        writeFormat(out, format);
+    }
+
+    return file.commit();
+}
+
+bool CardDatabaseCache::read(const QString &cachePath,
+                             CardDatabaseData &data,
+                             const QByteArray &sourceHash,
+                             ICardSetPriorityController *priorityController)
+{
+    QFile file(cachePath);
+    if (!file.open(QIODevice::ReadOnly)) {
+        return false;
+    }
+
+    // Read the whole cache into memory up front; deserialization then works on an
+    // in-memory buffer with no further disk I/O.
+    QByteArray raw = file.readAll();
+    if (raw.isEmpty()) {
+        return false;
+    }
+
+    QBuffer buffer(&raw);
+    buffer.open(QIODevice::ReadOnly);
+    QDataStream in(&buffer);
+    in.setVersion(QDataStream::Qt_6_4);
+
+    quint32 magic = 0;
+    quint32 version = 0;
+    QByteArray storedHash;
+    in >> magic >> version >> storedHash;
+    if (magic != CACHE_MAGIC || version != CACHE_VERSION || storedHash != sourceHash) {
+        return false;
+    }
+
+    QElapsedTimer deserializeTimer;
+    deserializeTimer.start();
+
+    // Sets
+    quint32 setCount = 0;
+    in >> setCount;
+    if (in.status() != QDataStream::Ok) {
+        return false;
+    }
+    for (quint32 i = 0; i < setCount; ++i) {
+        CardSetPtr set = readSet(in, priorityController);
+        data.sets.insert(set->getShortName(), set);
+    }
+
+    // Cards
+    quint32 cardCount = 0;
+    in >> cardCount;
+    if (in.status() != QDataStream::Ok) {
+        return false;
+    }
+    if (cardCount > 0) {
+        data.cards.reserve(static_cast<int>(cardCount));
+        for (quint32 i = 0; i < cardCount; ++i) {
+            CardInfoPtr card = readCard(in, data.sets);
+            if (card == nullptr) {
+                return false;
+            }
+            data.cards.insert(card->getName(), card);
+            data.simpleNameCards.insert(card->getSimpleName(), card);
+        }
+
+        for (const CardInfoPtr &card : data.cards) {
+            for (const auto &printings : card->getSets()) {
+                for (const PrintingInfo &printing : printings) {
+                    if (auto set = printing.getSet()) {
+                        set->append(card);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    // Formats
+    quint32 formatCount = 0;
+    in >> formatCount;
+    if (in.status() != QDataStream::Ok) {
+        return false;
+    }
+    for (quint32 i = 0; i < formatCount; ++i) {
+        FormatRulesPtr format = readFormat(in);
+        if (format == nullptr) {
+            return false;
+        }
+        data.formats.insert(format->formatName.toLower(), format);
+    }
+
+    qCInfo(CardDatabaseLoadingLog) << "[cache] read + deserialize" << deserializeTimer.elapsed() << "ms for"
+                                   << cardCount << "cards";
+
+    if (in.status() != QDataStream::Ok) {
+        return false;
+    }
+
+    return file.error() == QFile::NoError;
+}
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_cache.h b/libcockatrice_card/libcockatrice/card/database/card_database_cache.h
new file mode 100644
index 000000000..178b3ac6e
--- /dev/null
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_cache.h
@@ -0,0 +1,35 @@
+#ifndef CARDDATABASE_CACHE_H
+#define CARDDATABASE_CACHE_H
+
+#include <QString>
+
+class ICardSetPriorityController;
+class QByteArray;
+struct CardDatabaseData;
+
+namespace CardDatabaseCache
+{
+/**
+ * @brief Writes a fully-built database snapshot to a binary cache file.
+ * @param cachePath Path of the cache file to write.
+ * @param data The snapshot to serialize.
+ * @param sourceHash Hash of the source XML used to validate the cache later.
+ * @return True if the cache was written successfully.
+ */
+bool write(const QString &cachePath, const CardDatabaseData &data, const QByteArray &sourceHash);
+
+/**
+ * @brief Reads a database snapshot from a binary cache file.
+ * @param cachePath Path of the cache file to read.
+ * @param data Snapshot to populate.
+ * @param sourceHash Expected hash of the source XML; read fails if it differs.
+ * @param priorityController Controller used to reconstruct CardSet state.
+ * @return True if a valid, up-to-date cache was read.
+ */
+bool read(const QString &cachePath,
+          CardDatabaseData &data,
+          const QByteArray &sourceHash,
+          ICardSetPriorityController *priorityController);
+} // namespace CardDatabaseCache
+
+#endif // CARDDATABASE_CACHE_H
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_data.h b/libcockatrice_card/libcockatrice/card/database/card_database_data.h
new file mode 100644
index 000000000..2ca087b7e
--- /dev/null
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_data.h
@@ -0,0 +1,24 @@
+#ifndef CARDDATABASE_DATA_H
+#define CARDDATABASE_DATA_H
+
+#include <libcockatrice/card/card_info.h>
+
+/**
+ * @struct CardDatabaseData
+ * @ingroup CardDatabase
+ * @brief Value type holding the full parsed state of a card database.
+ *
+ * Parsers fill a CardDatabaseData off the UI thread; the finished snapshot is
+ * then swapped into the live CardDatabase atomically. Keeping this separate from
+ * the live container avoids emitting per-card change notifications and prevents
+ * readers from observing a half-loaded database.
+ */
+struct CardDatabaseData
+{
+    CardNameMap cards;
+    CardNameMap simpleNameCards;
+    SetNameMap sets;
+    FormatRulesNameMap formats;
+};
+
+#endif // CARDDATABASE_DATA_H
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
index f56f6a0b5..00b21f88e 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp
@@ -1,33 +1,56 @@
 #include "card_database_loader.h"
 
 #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"
 
+#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)
-    : QObject(parent), database(db), pathProvider(_pathProvider)
+                                       ICardSetPriorityController *_priorityController)
+    : QObject(parent), database(db), pathProvider(_pathProvider), priorityController(_priorityController)
 {
-    // instantiate available parsers here and connect them to the database
-    availableParsers << new CockatriceXml4Parser(_preferenceProvider);
-    availableParsers << new CockatriceXml3Parser;
+    // instantiate available parsers here
+    availableParsers << new CockatriceXml4Parser(_priorityController);
+    availableParsers << new CockatriceXml3Parser(_priorityController);
 
-    for (auto *p : availableParsers) {
-        // connect parser outputs to the database adders
-        connect(p, &ICardDatabaseParser::addCard, database, &CardDatabase::addCard, Qt::DirectConnection);
-        connect(p, &ICardDatabaseParser::addSet, database, &CardDatabase::addSet, Qt::DirectConnection);
-    }
+    // 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,
-            &CardDatabaseLoader::loadCardDatabases);
+    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();
+    });
 }
 
 CardDatabaseLoader::~CardDatabaseLoader()
@@ -36,7 +59,7 @@ CardDatabaseLoader::~CardDatabaseLoader()
     availableParsers.clear();
 }
 
-LoadStatus CardDatabaseLoader::loadFromFile(const QString &fileName)
+LoadStatus CardDatabaseLoader::loadFromFile(const QString &fileName, CardDatabaseData &data)
 {
     QFile file(fileName);
     if (!file.open(QIODevice::ReadOnly)) {
@@ -47,7 +70,7 @@ LoadStatus CardDatabaseLoader::loadFromFile(const QString &fileName)
         file.reset();
         if (parser->getCanParseFile(fileName, file)) {
             file.reset();
-            parser->parseFile(file);
+            parser->parseFileInto(file, data);
             return Ok;
         }
     }
@@ -55,24 +78,29 @@ LoadStatus CardDatabaseLoader::loadFromFile(const QString &fileName)
     return Invalid;
 }
 
-LoadStatus CardDatabaseLoader::loadCardDatabase(const QString &path)
+LoadStatus CardDatabaseLoader::loadCardDatabase(const QString &path, CardDatabaseData &data)
 {
     auto startTime = QTime::currentTime();
     LoadStatus tempLoadStatus = NotLoaded;
     if (!path.isEmpty()) {
         QMutexLocker locker(loadFromFileMutex);
-        tempLoadStatus = loadFromFile(path);
+        tempLoadStatus = loadFromFile(path, data);
     }
 
     int msecs = startTime.msecsTo(QTime::currentTime());
     qCInfo(CardDatabaseLoadingLog) << "Loaded card database: Path =" << path << "Status =" << tempLoadStatus
-                                   << "Cards =" << (database ? database->cards.size() : 0)
-                                   << "Sets =" << (database ? database->sets.size() : 0) << QString("%1ms").arg(msecs);
+                                   << "Cards =" << data.cards.size() << "Sets =" << data.sets.size()
+                                   << QString("%1ms").arg(msecs);
 
     return tempLoadStatus;
 }
 
-LoadStatus CardDatabaseLoader::loadCardDatabases()
+LoadStatus CardDatabaseLoader::loadCardDatabases(bool ignoreCache)
+{
+    return doLoadCardDatabases(ignoreCache);
+}
+
+LoadStatus CardDatabaseLoader::doLoadCardDatabases(bool ignoreCache)
 {
     QMutexLocker locker(reloadDatabaseMutex);
 
@@ -84,30 +112,72 @@ LoadStatus CardDatabaseLoader::loadCardDatabases()
     emit loadingStarted();
     qCInfo(CardDatabaseLoadingLog) << "Card Database Loading Started";
 
-    database->clear(); // remove old db
+    ICardDatabaseParser::clearSetlist();
 
-    LoadStatus loadStatus = loadCardDatabase(pathProvider->getCardDatabasePath()); // load main card database
-    loadCardDatabase(pathProvider->getTokenDatabasePath());                        // load tokens database
-    loadCardDatabase(pathProvider->getSpoilerCardDatabasePath());                  // load spoilers database
+    CardDatabaseData data;
+    LoadStatus loadStatus = NotLoaded;
 
-    // find all custom card databases, recursively & following symlinks
-    // then load them alphabetically
+    // 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();
-    for (int i = 0; i < customPaths.size(); ++i) {
-        const auto &p = customPaths.at(i);
-        qCInfo(CardDatabaseLoadingLog) << "Loading Custom Set" << i << "(" << p << ")";
-        loadCardDatabase(p);
+    const QByteArray sourceHash = computeSourceHash(customPaths);
+    if (ignoreCache) {
+        qCInfo(CardDatabaseLoadingLog) << "Ignoring binary cache, re-parsing source files";
+    }
+    if (!ignoreCache && loadFromCache(data, sourceHash)) {
+        qCInfo(CardDatabaseLoadingLog) << "Loaded card database from binary cache";
+        loadStatus = Ok;
+    } else {
+        loadStatus = loadCardDatabase(pathProvider->getCardDatabasePath(), data); // main card database
+        if (loadStatus == Ok) {
+            loadCardDatabase(pathProvider->getTokenDatabasePath(), data);       // tokens database
+            loadCardDatabase(pathProvider->getSpoilerCardDatabasePath(), data); // spoilers database
+
+            // find all custom card databases, recursively & following symlinks
+            // then load them alphabetically
+            for (int i = 0; i < customPaths.size(); ++i) {
+                const auto &p = customPaths.at(i);
+                qCInfo(CardDatabaseLoadingLog) << "Loading Custom Set" << i << "(" << p << ")";
+                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)) {
+                qCWarning(CardDatabaseLoadingLog) << "Failed to write binary cache to" << cachePath();
+            }
+        }
     }
 
-    // AFTER all the cards have been loaded
-
-    // resolve the reverse-related tags
-
-    database->refreshCachedReverseRelatedCards();
-
+    // AFTER all the cards have been loaded: resolve the reverse-related tags
+    // against the fully-built snapshot.
     if (loadStatus == Ok) {
-        database->checkUnknownSets(); // update deck editors, etc
+        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();
     } else {
         qCInfo(CardDatabaseLoadingSuccessOrFailureLog) << "Card Database Loading Failed";
@@ -117,14 +187,81 @@ LoadStatus CardDatabaseLoader::loadCardDatabases()
     return loadStatus;
 }
 
+QString CardDatabaseLoader::cachePath() const
+{
+    return pathProvider->getCardDatabasePath() + ".cache";
+}
+
+QByteArray CardDatabaseLoader::computeSourceHash(const QStringList &customPaths) const
+{
+    // Hash over the paths, sizes and modification times of every input file so
+    // the cache invalidates when any source changes. Cheap (no content read).
+    QCryptographicHash hash(QCryptographicHash::Sha256);
+
+    // Include the application version so parser changes automatically invalidate
+    // old caches even when the XML files are byte-identical.
+    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;
+    for (const QString &path : inputs) {
+        QFileInfo info(path);
+        if (info.exists()) {
+            hash.addData(path.toUtf8());
+            hash.addData(QByteArray(1, '\0'));
+            hash.addData(QByteArray::number(info.size()));
+            hash.addData(QByteArray(1, '\0'));
+            hash.addData(QByteArray::number(info.lastModified().toSecsSinceEpoch()));
+            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();
+}
+
+bool CardDatabaseLoader::loadFromCache(CardDatabaseData &data, const QByteArray &sourceHash)
+{
+    if (sourceHash.isEmpty()) {
+        return false;
+    }
+    return CardDatabaseCache::read(cachePath(), data, sourceHash, priorityController);
+}
+
+bool CardDatabaseLoader::saveToCache(const CardDatabaseData &data, const QByteArray &sourceHash)
+{
+    if (sourceHash.isEmpty()) {
+        return false;
+    }
+    return CardDatabaseCache::write(cachePath(), data, sourceHash);
+}
+
 QStringList CardDatabaseLoader::collectCustomDatabasePaths() const
 {
     QDirIterator it(pathProvider->getCustomCardDatabasePath(), {"*.xml"}, QDir::Files,
                     QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
 
     QStringList paths;
-    while (it.hasNext())
+    while (it.hasNext()) {
         paths << it.next();
+    }
     paths.sort();
     return paths;
 }
@@ -149,6 +286,6 @@ bool CardDatabaseLoader::saveCustomTokensToFile()
         }
     }
 
-    availableParsers.first()->saveToFile(tmpSets, tmpCards, fileName);
+    availableParsers.first()->saveToFile(FormatRulesNameMap(), tmpSets, tmpCards, fileName);
     return true;
 }
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
index f4e690428..bfbaa0f51 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h
@@ -2,10 +2,21 @@
 #define COCKATRICE_CARD_DATABASE_LOADER_H
 
 #include <QBasicMutex>
+#include <QByteArray>
 #include <QList>
 #include <QLoggingCategory>
-#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
-#include <libcockatrice/interfaces/interface_card_preference_provider.h>
+#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"
 
 inline Q_LOGGING_CATEGORY(CardDatabaseLoadingLog, "card_database.loading");
 inline Q_LOGGING_CATEGORY(CardDatabaseLoadingSuccessOrFailureLog, "card_database.loading.success_or_failure");
@@ -47,12 +58,11 @@ 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. */
     ~CardDatabaseLoader() override;
@@ -60,16 +70,24 @@ public:
 public slots:
     /**
      * @brief Loads all configured card databases.
+     *
+     * 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();
+    LoadStatus loadCardDatabases(bool ignoreCache = false);
 
     /**
-     * @brief Loads a single card database file.
+     * @brief Loads a single card database file into the given snapshot.
      * @param path Path to the database file.
+     * @param data Snapshot to populate.
      * @return LoadStatus indicating success or failure.
      */
-    LoadStatus loadCardDatabase(const QString &path);
+    LoadStatus loadCardDatabase(const QString &path, CardDatabaseData &data);
 
     /**
      * @brief Saves custom tokens to the user-defined custom database path.
@@ -87,6 +105,12 @@ signals:
     /** @brief Emitted when loading fails. */
     void loadingFailed();
 
+    /**
+     * @brief Emitted with the fully-built snapshot once background loading
+     *        completes. The receiver swaps it into the live database.
+     */
+    void databaseDataReady(CardDatabaseData data);
+
     /**
      * @brief Emitted when new sets are discovered during loading.
      * @param numSets Number of new sets.
@@ -99,11 +123,19 @@ signals:
 
 private:
     /**
-     * @brief Loads a database from a single file using the available parsers.
+     * @brief Parses a single file into the given snapshot using the available parsers.
      * @param fileName Path to the database file.
+     * @param data Snapshot to populate.
      * @return LoadStatus indicating success or failure.
      */
-    LoadStatus loadFromFile(const QString &fileName);
+    LoadStatus loadFromFile(const QString &fileName, CardDatabaseData &data);
+
+    /**
+     * @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);
 
     /**
      * @brief Collects custom card database paths recursively.
@@ -111,10 +143,39 @@ private:
      */
     [[nodiscard]] QStringList collectCustomDatabasePaths() const;
 
+    /**
+     * @brief Computes a hash identifying the current set of input database files.
+     * @return Hash over the paths, sizes and modification times of all inputs.
+     */
+    [[nodiscard]] QByteArray computeSourceHash(const QStringList &customPaths) const;
+
+    /**
+     * @brief Path of the binary cache file derived from the main card database path.
+     * @return Cache file path.
+     */
+    [[nodiscard]] QString cachePath() const;
+
+    /**
+     * @brief Attempts to populate the snapshot from the binary cache.
+     * @param data Snapshot to populate.
+     * @param sourceHash Pre-computed hash identifying the current input files.
+     * @return True if a valid, up-to-date cache was read.
+     */
+    bool loadFromCache(CardDatabaseData &data, const QByteArray &sourceHash);
+
+    /**
+     * @brief Writes the snapshot to the binary cache for the current inputs.
+     * @param data Snapshot to serialize.
+     * @param sourceHash Pre-computed hash identifying the current input files.
+     * @return True if the cache was written successfully.
+     */
+    bool saveToCache(const CardDatabaseData &data, const QByteArray &sourceHash);
+
 private:
-    CardDatabase *database;                        /**< Non-owning pointer to the target CardDatabase. */
-    ICardDatabasePathProvider *pathProvider;       /**< Pointer to the path provider. */
-    QList<ICardDatabaseParser *> availableParsers; /**< List of available parsers for different formats. */
+    CardDatabase *database;                         /**< Non-owning pointer to the target CardDatabase. */
+    ICardDatabasePathProvider *pathProvider;        /**< Pointer to the path provider. */
+    ICardSetPriorityController *priorityController; /**< Controller for reconstructing set state. */
+    QList<ICardDatabaseParser *> availableParsers;  /**< List of available parsers for different formats. */
 
     QBasicMutex *loadFromFileMutex = new QBasicMutex();   /**< Mutex for single-file loading. */
     QBasicMutex *reloadDatabaseMutex = new QBasicMutex(); /**< Mutex for reloading entire database. */
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp
index 614b4a7f8..b06c258fa 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp
@@ -1,9 +1,16 @@
 #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 58a744fbb..074154a41 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_manager.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_manager.h
@@ -2,7 +2,12 @@
 #define CARD_DATABASE_ACCESSOR_H
 
 #pragma once
-#include "card_database.h"
+
+class CardDatabase;
+class CardDatabaseQuerier;
+class ICardDatabasePathProvider;
+class ICardPreferenceProvider;
+class ICardSetPriorityController;
 
 /**
  * @class CardDatabaseManager
@@ -67,13 +72,13 @@ private:
     /** @brief Private destructor. */
     ~CardDatabaseManager() = default;
 
-    /// Static card preference provider pointer (default: Noop)
+    /** @brief Static card preference provider pointer (default: Noop). */
     static ICardPreferenceProvider *cardPreferenceProvider;
 
-    /// Static path provider pointer (default: Noop)
+    /** @brief Static path provider pointer (default: Noop). */
     static ICardDatabasePathProvider *pathProvider;
 
-    /// Static set priority controller pointer (default: Noop)
+    /** @brief Static set priority controller pointer (default: Noop). */
     static ICardSetPriorityController *setPriorityController;
 };
 
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
index 65999e590..2fad5212d 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
@@ -4,14 +4,32 @@
 #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 <qrandom.h>
+#include <QLatin1String>
+#include <QRandomGenerator>
+#include <QSharedPointer>
+#include <QStringLiteral>
+#include <qnamespace.h>
 
 CardDatabaseQuerier::CardDatabaseQuerier(QObject *_parent,
                                          const CardDatabase *_db,
                                          const ICardPreferenceProvider *prefs)
     : QObject(_parent), db(_db), prefs(prefs)
 {
+    // Invalidate the cached count maps whenever the database contents change.
+    connect(db, &CardDatabase::cardAdded, this, &CardDatabaseQuerier::invalidateCaches);
+    connect(db, &CardDatabase::cardRemoved, this, &CardDatabaseQuerier::invalidateCaches);
+    connect(db, &CardDatabase::cardDatabaseReset, this, &CardDatabaseQuerier::invalidateCaches);
+}
+
+void CardDatabaseQuerier::invalidateCaches()
+{
+    mainCardTypeCountsCache.clear();
+    subCardTypeCountsCache.clear();
+    formatsCountCache.clear();
 }
 
 /**
@@ -36,8 +54,9 @@ QList<CardInfoPtr> CardDatabaseQuerier::getCardInfos(const QStringList &cardName
     QList<CardInfoPtr> cardInfos;
     for (const QString &cardName : cardNames) {
         CardInfoPtr ptr = db->cards.value(cardName);
-        if (ptr)
+        if (ptr) {
             cardInfos.append(ptr);
+        }
     }
 
     return cardInfos;
@@ -50,10 +69,12 @@ CardInfoPtr CardDatabaseQuerier::getCardBySimpleName(const QString &cardName) co
 
 CardInfoPtr CardDatabaseQuerier::lookupCardByName(const QString &name) const
 {
-    if (auto info = getCardInfo(name))
+    if (auto info = getCardInfo(name)) {
         return info;
-    if (auto info = getCardBySimpleName(name))
+    }
+    if (auto info = getCardBySimpleName(name)) {
         return info;
+    }
     return getCardBySimpleName(CardInfo::simplifyName(name));
 }
 
@@ -71,8 +92,9 @@ QList<ExactCard> CardDatabaseQuerier::getCards(const QList<CardRef> &cardRefs) c
     QList<ExactCard> cards;
     for (const auto &cardRef : cardRefs) {
         ExactCard card = getCard(cardRef);
-        if (card)
+        if (card) {
             cards.append(card);
+        }
     }
 
     return cards;
@@ -119,8 +141,9 @@ ExactCard CardDatabaseQuerier::guessCard(const CardRef &cardRef) const
 
 ExactCard CardDatabaseQuerier::getRandomCard() const
 {
-    if (db->cards.isEmpty())
+    if (db->cards.isEmpty()) {
         return {};
+    }
 
     const auto keys = db->cards.keys();
     int randomIndex = QRandomGenerator::global()->bounded(keys.size());
@@ -133,7 +156,7 @@ ExactCard CardDatabaseQuerier::getRandomCard() const
 ExactCard CardDatabaseQuerier::getCardFromSameSet(const QString &cardName, const PrintingInfo &otherPrinting) const
 {
     // The source card does not have a printing defined, which means we can't get a card from the same set.
-    if (otherPrinting == PrintingInfo()) {
+    if (otherPrinting.isEmpty()) {
         return getCard({cardName});
     }
 
@@ -299,46 +322,64 @@ QString CardDatabaseQuerier::getPreferredPrintingProviderId(const QString &cardN
 
 QStringList CardDatabaseQuerier::getAllMainCardTypes() const
 {
-    QSet<QString> types;
-    for (const auto &card : db->cards.values()) {
-        types.insert(card->getMainCardType());
-    }
-    return types.values();
+    return getAllMainCardTypesWithCount().keys();
 }
 
 QMap<QString, int> CardDatabaseQuerier::getAllMainCardTypesWithCount() const
 {
-    QMap<QString, int> typeCounts;
-
-    for (const auto &card : db->cards.values()) {
-        QString type = card->getMainCardType();
-        typeCounts[type]++;
+    // An empty cache is always recomputed correctly: a database with no cards
+    // produces an empty map, so the cache is only ever empty when it needs a
+    // (trivially cheap) rebuild.
+    if (mainCardTypeCountsCache.isEmpty()) {
+        for (const auto &card : db->cards.values()) {
+            QString type = card->getMainCardType();
+            mainCardTypeCountsCache[type]++;
+        }
     }
 
-    return typeCounts;
+    return mainCardTypeCountsCache;
 }
 
 QMap<QString, int> CardDatabaseQuerier::getAllSubCardTypesWithCount() const
 {
-    QMap<QString, int> typeCounts;
+    if (subCardTypeCountsCache.isEmpty()) {
+        for (const auto &card : db->cards.values()) {
+            QString type = card->getCardType();
 
-    for (const auto &card : db->cards.values()) {
-        QString type = card->getCardType();
+            QStringList parts = type.split(" — ");
 
-        QStringList parts = type.split(" — ");
+            if (parts.size() > 1) { // Ensure there are subtypes
+                QStringList subtypes = parts[1].split(" ", Qt::SkipEmptyParts);
 
-        if (parts.size() > 1) { // Ensure there are subtypes
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
-            QStringList subtypes = parts[1].split(" ", Qt::SkipEmptyParts);
-#else
-            QStringList subtypes = parts[1].split(" ", QString::SkipEmptyParts);
-#endif
-
-            for (const QString &subtype : subtypes) {
-                typeCounts[subtype]++;
+                for (const QString &subtype : subtypes) {
+                    subCardTypeCountsCache[subtype]++;
+                }
             }
         }
     }
 
-    return typeCounts;
-}
\ No newline at end of file
+    return subCardTypeCountsCache;
+}
+
+FormatRulesPtr CardDatabaseQuerier::getFormat(const QString &formatName) const
+{
+    return db->formats.value(formatName.toLower());
+}
+
+QMap<QString, int> CardDatabaseQuerier::getAllFormatsWithCount() const
+{
+    if (formatsCountCache.isEmpty()) {
+        for (const auto &card : db->cards.values()) {
+            QStringList allProps = card->getProperties();
+
+            for (const QString &prop : allProps) {
+                if (prop.startsWith("format-")) {
+                    QString formatName = prop.mid(QStringLiteral("format-").size());
+                    formatsCountCache[formatName]++;
+                }
+            }
+        }
+    }
+
+    return formatsCountCache;
+}
diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_querier.h b/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
index d9a980f06..a1409b3cc 100644
--- a/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
+++ b/libcockatrice_card/libcockatrice/card/database/card_database_querier.h
@@ -3,12 +3,18 @@
 
 #include "../card_info.h"
 #include "../printing/exact_card.h"
+#include "libcockatrice/card/printing/printing_info.h"
 
+#include <QList>
+#include <QMap>
 #include <QObject>
-#include <libcockatrice/interfaces/interface_card_preference_provider.h>
-#include <libcockatrice/utility/card_ref.h>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
 
 class CardDatabase;
+class ICardPreferenceProvider;
+struct CardRef;
 
 /**
  * @class CardDatabaseQuerier
@@ -214,10 +220,22 @@ public:
      * @return Map of subtype string to count.
      */
     [[nodiscard]] QMap<QString, int> getAllSubCardTypesWithCount() const;
+    FormatRulesPtr getFormat(const QString &formatName) const;
+    QMap<QString, int> getAllFormatsWithCount() const;
 
 private:
     const CardDatabase *db;               //!< Card database used for all lookups.
     const ICardPreferenceProvider *prefs; //!< Preference provider for preferred printings.
+
+    // Count maps are expensive to compute (they iterate the whole database) and are
+    // queried every time a filter widget is built, so cache them and invalidate on
+    // any database mutation. Only the main thread reads or writes these.
+    mutable QMap<QString, int> mainCardTypeCountsCache;
+    mutable QMap<QString, int> subCardTypeCountsCache;
+    mutable QMap<QString, int> formatsCountCache;
+
+private slots:
+    void invalidateCaches();
 };
 
 #endif // COCKATRICE_CARD_DATABASE_QUERIER_H
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 e9686f816..1374533ca 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.cpp
@@ -1,9 +1,18 @@
 #include "card_database_parser.h"
 
-#include <libcockatrice/interfaces/noop_card_set_priority_controller.h>
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/database/card_database_data.h"
+
+#include <QSharedPointer>
+
+class ICardSetPriorityController;
 
 SetNameMap ICardDatabaseParser::sets;
 
+ICardDatabaseParser::ICardDatabaseParser(ICardSetPriorityController *_cardSetPriorityController)
+    : cardSetPriorityController(_cardSetPriorityController)
+{
+}
 void ICardDatabaseParser::clearSetlist()
 {
     sets.clear();
@@ -19,13 +28,17 @@ CardSetPtr ICardDatabaseParser::internalAddSet(const QString &setName,
         return sets.value(setName);
     }
 
-    CardSetPtr newSet = CardSet::newInstance(new NoopCardSetPriorityController(), setName);
+    CardSetPtr newSet = CardSet::newInstance(cardSetPriorityController, setName);
     newSet->setLongName(longName);
     newSet->setSetType(setType);
     newSet->setReleaseDate(releaseDate);
     newSet->setPriority(priority);
 
     sets.insert(setName, newSet);
-    emit addSet(newSet);
+    if (targetData) {
+        targetData->sets.insert(setName, newSet);
+    } else {
+        emit addSet(newSet);
+    }
     return newSet;
 }
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 35012dbc5..b82d9aed7 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h
+++ b/libcockatrice_card/libcockatrice/card/database/parser/card_database_parser.h
@@ -2,9 +2,17 @@
 #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 <QIODevice>
+#include <QDate>
+#include <QObject>
 #include <QString>
+#include <qtmetamacros.h>
+
+class ICardSetPriorityController;
+class QIODevice;
+struct CardDatabaseData;
 
 #define COCKATRICE_XML_XSI_NAMESPACE "http://www.w3.org/2001/XMLSchema-instance"
 
@@ -20,6 +28,7 @@ class ICardDatabaseParser : public QObject
 {
     Q_OBJECT
 public:
+    ICardDatabaseParser(ICardSetPriorityController *cardSetPriorityController);
     ~ICardDatabaseParser() override = default;
 
     /**
@@ -36,8 +45,18 @@ public:
      */
     virtual void parseFile(QIODevice &device) = 0;
 
+    /**
+     * @brief Parses a database file into the given snapshot, without emitting
+     *        any signals. Used for background loads that swap the snapshot into
+     *        the live database once complete.
+     * @param device QIODevice representing the file content.
+     * @param data Target snapshot to populate.
+     */
+    virtual void parseFileInto(QIODevice &device, CardDatabaseData &data) = 0;
+
     /**
      * @brief Saves card and set data to a file.
+     * @param _formats
      * @param sets Map of sets to save.
      * @param cards Map of cards to save.
      * @param fileName Target file path.
@@ -45,7 +64,8 @@ public:
      * @param sourceVersion Optional version string of the source.
      * @return true if save succeeded.
      */
-    virtual bool saveToFile(SetNameMap sets,
+    virtual bool saveToFile(FormatRulesNameMap _formats,
+                            SetNameMap sets,
                             CardNameMap cards,
                             const QString &fileName,
                             const QString &sourceUrl = "unknown",
@@ -57,6 +77,22 @@ public:
 protected:
     /** @brief Cached global list of sets shared between all parsers. */
     static SetNameMap sets;
+    ICardSetPriorityController *cardSetPriorityController;
+
+    /**
+     * @brief Snapshot the current parse is filling, or nullptr when emitting signals.
+     *
+     * This is an implicit-inheritance-via-member-variable pattern: parseFileInto()
+     * sets this before delegating to parseFile(), and loadCardsFromXml() /
+     * loadFormats() check it to decide between direct insertion and signal
+     * emission.  Safe under the current model because loadFromFileMutex serialises
+     * all parser access and parseFile() is never re-entered.  If a future change
+     * adds parallel parsing or a second parseFileInto() call within parseFile(),
+     * this pointer would race -- at that point refactor to pass CardDatabaseData*
+     * through the call chain instead. However, we are mostly RAM, not CPU bound on
+     * DB startup at this point so there's not much point to parallel parsing.
+     */
+    CardDatabaseData *targetData = nullptr;
 
     /**
      * @brief Internal helper to add a set to the global set cache.
@@ -79,6 +115,8 @@ signals:
 
     /** Emitted when a set is loaded from the database. */
     void addSet(CardSetPtr set);
+
+    void addFormat(FormatRulesPtr format);
 };
 
 Q_DECLARE_INTERFACE(ICardDatabaseParser, "ICardDatabaseParser")
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 35e2f3d83..b17eb8b5e 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp
@@ -2,18 +2,43 @@
 
 #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                                                                                 \
     "https://raw.githubusercontent.com/Cockatrice/Cockatrice/master/doc/carddatabase_v3/cards.xsd"
 
+CockatriceXml3Parser::CockatriceXml3Parser(ICardSetPriorityController *_cardSetPriorityController)
+    : ICardDatabaseParser(_cardSetPriorityController)
+{
+}
+
 bool CockatriceXml3Parser::getCanParseFile(const QString &fileName, QIODevice &device)
 {
     qCInfo(CockatriceXml3Log) << "Trying to parse: " << fileName;
@@ -74,6 +99,13 @@ void CockatriceXml3Parser::parseFile(QIODevice &device)
     }
 }
 
+void CockatriceXml3Parser::parseFileInto(QIODevice &device, CardDatabaseData &data)
+{
+    targetData = &data;
+    parseFile(device);
+    targetData = nullptr;
+}
+
 void CockatriceXml3Parser::loadSetsFromXml(QXmlStreamReader &xml)
 {
     while (!xml.atEnd()) {
@@ -160,7 +192,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
         if (xmlName == "card") {
             QString name = QString("");
             QString text = QString("");
-            QVariantHash properties = QVariantHash();
+            QHash<QString, QString> properties;
             QString colors = QString("");
             QList<CardRelation *> relatedCards, reverseRelatedCards;
             auto _sets = SetToPrintingsMap();
@@ -212,27 +244,33 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
                     // NOTE: attributes must be read before readElementText()
                     QXmlStreamAttributes attrs = xml.attributes();
                     QString setName = xml.readElementText(QXmlStreamReader::IncludeChildElements);
-                    PrintingInfo setInfo(internalAddSet(setName));
-                    if (attrs.hasAttribute("muId")) {
-                        setInfo.setProperty("muid", attrs.value("muId").toString());
-                    }
+                    auto set = internalAddSet(setName);
+                    // Only load printings from sets the user has enabled, matching the v4 loader's
+                    // behaviour. Without this check, disabling a set has no effect on v3 databases.
+                    if (set->getEnabled()) {
+                        QHash<QString, QString> printingProps;
+                        if (attrs.hasAttribute("muId")) {
+                            printingProps.insert("muid", attrs.value("muId").toString());
+                        }
 
-                    if (attrs.hasAttribute("muId")) {
-                        setInfo.setProperty("uuid", attrs.value("uuId").toString());
-                    }
+                        if (attrs.hasAttribute("uuId")) {
+                            printingProps.insert("uuid", attrs.value("uuId").toString());
+                        }
 
-                    if (attrs.hasAttribute("picURL")) {
-                        setInfo.setProperty("picurl", attrs.value("picURL").toString());
-                    }
+                        if (attrs.hasAttribute("picURL")) {
+                            printingProps.insert("picurl", attrs.value("picURL").toString());
+                        }
 
-                    if (attrs.hasAttribute("num")) {
-                        setInfo.setProperty("num", attrs.value("num").toString());
-                    }
+                        if (attrs.hasAttribute("num")) {
+                            printingProps.insert("num", attrs.value("num").toString());
+                        }
 
-                    if (attrs.hasAttribute("rarity")) {
-                        setInfo.setProperty("rarity", attrs.value("rarity").toString());
+                        if (attrs.hasAttribute("rarity")) {
+                            printingProps.insert("rarity", attrs.value("rarity").toString());
+                        }
+                        PrintingInfo setInfo(set, LazyPropertiesHash(printingProps));
+                        _sets[setName].append(setInfo);
                     }
-                    _sets[setName].append(setInfo);
                     // related cards
                 } else if (xmlName == "related" || xmlName == "reverse-related") {
                     CardRelationType attach = CardRelationType::DoesNotAttach;
@@ -289,7 +327,20 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml)
                                                  .upsideDownArt = upsideDown};
             CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards,
                                                         reverseRelatedCards, _sets, attributes);
-            emit addCard(newCard);
+            if (targetData) {
+                if (auto existing = targetData->cards.value(name)) {
+                    for (const auto &printings : newCard->getSets()) {
+                        for (const auto &printing : printings) {
+                            existing->addToSet(printing.getSet(), printing);
+                        }
+                    }
+                } else {
+                    targetData->cards.insert(name, newCard);
+                    targetData->simpleNameCards.insert(newCard->getSimpleName(), newCard);
+                }
+            } else {
+                emit addCard(newCard);
+            }
         }
     }
 }
@@ -438,12 +489,15 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
     return xml;
 }
 
-bool CockatriceXml3Parser::saveToFile(SetNameMap _sets,
+bool CockatriceXml3Parser::saveToFile(FormatRulesNameMap _formats,
+                                      SetNameMap _sets,
                                       CardNameMap cards,
                                       const QString &fileName,
                                       const QString &sourceUrl,
                                       const QString &sourceVersion)
 {
+    Q_UNUSED(_formats);
+
     QFile file(fileName);
     if (!file.open(QIODevice::WriteOnly)) {
         return false;
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 a727561ea..cb76e960d 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.h
@@ -2,9 +2,14 @@
 #define COCKATRICE_XML3_H
 
 #include "card_database_parser.h"
+#include "libcockatrice/card/card_info.h"
 
 #include <QLoggingCategory>
-#include <QXmlStreamReader>
+#include <QString>
+#include <qtmetamacros.h>
+
+class ICardSetPriorityController;
+class QXmlStreamReader;
 
 inline Q_LOGGING_CATEGORY(CockatriceXml3Log, "cockatrice_xml.xml_3_parser");
 
@@ -26,7 +31,7 @@ class CockatriceXml3Parser : public ICardDatabaseParser
 {
     Q_OBJECT
 public:
-    CockatriceXml3Parser() = default;
+    CockatriceXml3Parser(ICardSetPriorityController *cardSetPriorityController);
     ~CockatriceXml3Parser() override = default;
 
     /**
@@ -43,10 +48,18 @@ public:
      */
     void parseFile(QIODevice &device) override;
 
+    /**
+     * @brief Parse the XML database into the given snapshot.
+     * @param device Open QIODevice positioned at start of file.
+     * @param data Target snapshot to populate.
+     */
+    void parseFileInto(QIODevice &device, CardDatabaseData &data) override;
+
     /**
      * @brief Save sets and cards back to an XML3 file.
      */
-    bool saveToFile(SetNameMap _sets,
+    bool saveToFile(FormatRulesNameMap _formats,
+                    SetNameMap _sets,
                     CardNameMap cards,
                     const QString &fileName,
                     const QString &sourceUrl = "unknown",
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 ab4c8002d..4d975e533 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp
@@ -1,20 +1,44 @@
 #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(ICardPreferenceProvider *_cardPreferenceProvider)
-    : cardPreferenceProvider(_cardPreferenceProvider)
+CockatriceXml4Parser::CockatriceXml4Parser(ICardSetPriorityController *_cardSetPriorityController)
+    : ICardDatabaseParser(_cardSetPriorityController)
 {
 }
 
@@ -60,7 +84,9 @@ void CockatriceXml4Parser::parseFile(QIODevice &device)
                 }
 
                 auto xmlName = xml.name().toString();
-                if (xmlName == "sets") {
+                if (xmlName == "formats") {
+                    loadFormats(xml);
+                } else if (xmlName == "sets") {
                     loadSetsFromXml(xml);
                 } else if (xmlName == "cards") {
                     loadCardsFromXml(xml);
@@ -78,6 +104,127 @@ void CockatriceXml4Parser::parseFile(QIODevice &device)
     }
 }
 
+void CockatriceXml4Parser::parseFileInto(QIODevice &device, CardDatabaseData &data)
+{
+    targetData = &data;
+    parseFile(device);
+    targetData = nullptr;
+}
+
+static QSharedPointer<FormatRules> parseFormat(QXmlStreamReader &xml)
+{
+    auto rulesPtr = FormatRulesPtr(new FormatRules());
+
+    if (xml.attributes().hasAttribute("formatName")) {
+        rulesPtr->formatName = xml.attributes().value("formatName").toString();
+    }
+
+    while (!xml.atEnd()) {
+        auto token = xml.readNext();
+
+        if (token == QXmlStreamReader::EndElement && xml.name().toString() == "format") {
+            break;
+        }
+
+        if (token != QXmlStreamReader::StartElement) {
+            continue;
+        }
+
+        QString xmlName = xml.name().toString();
+
+        if (xmlName == "minDeckSize") {
+            rulesPtr->minDeckSize = xml.readElementText().toInt();
+        } else if (xmlName == "maxDeckSize") {
+            QString text = xml.readElementText();
+            rulesPtr->maxDeckSize = text.toInt();
+        } else if (xmlName == "maxSideboardSize") {
+            rulesPtr->maxSideboardSize = xml.readElementText().toInt();
+        } else if (xmlName == "allowedCounts") {
+            while (!xml.atEnd()) {
+                token = xml.readNext();
+
+                if (token == QXmlStreamReader::EndElement && xml.name().toString() == "allowedCounts") {
+                    break;
+                }
+
+                if (token == QXmlStreamReader::StartElement && xml.name().toString() == "count") {
+
+                    AllowedCount c;
+
+                    QString maxAttr = xml.attributes().value("max").toString();
+                    c.max = (maxAttr == "unlimited") ? -1 : maxAttr.toInt();
+
+                    c.label = xml.readElementText().trimmed();
+
+                    rulesPtr->allowedCounts.append(c);
+                }
+            }
+        } else if (xmlName == "exceptions") {
+            while (!xml.atEnd()) {
+                token = xml.readNext();
+
+                if (token == QXmlStreamReader::EndElement && xml.name().toString() == "exceptions") {
+                    break;
+                }
+
+                if (token == QXmlStreamReader::StartElement && xml.name().toString() == "exception") {
+                    ExceptionRule ex;
+
+                    while (!xml.atEnd()) {
+                        token = xml.readNext();
+
+                        if (token == QXmlStreamReader::EndElement && xml.name().toString() == "exception") {
+                            break;
+                        }
+
+                        if (token == QXmlStreamReader::StartElement) {
+                            QString ename = xml.name().toString();
+
+                            if (ename == "maxCopies") {
+                                QString text = xml.readElementText();
+                                ex.maxCopies = (text == "unlimited") ? -1 : text.toInt();
+                            } else if (ename == "cardCondition") {
+                                CardCondition cond;
+                                cond.field = xml.attributes().value("field").toString();
+                                cond.matchType = xml.attributes().value("match").toString();
+                                cond.value = xml.attributes().value("value").toString();
+                                ex.conditions.append(cond);
+                                xml.skipCurrentElement();
+                            } else {
+                                xml.skipCurrentElement();
+                            }
+                        }
+                    }
+
+                    rulesPtr->exceptions.append(ex);
+                }
+            }
+        } else {
+            xml.skipCurrentElement();
+        }
+    }
+
+    return rulesPtr;
+}
+
+void CockatriceXml4Parser::loadFormats(QXmlStreamReader &xml)
+{
+    while (!xml.atEnd()) {
+        if (xml.readNext() == QXmlStreamReader::EndElement) {
+            break;
+        }
+
+        if (xml.name().toString() == "format") {
+            auto rulesPtr = parseFormat(xml);
+            if (targetData) {
+                targetData->formats.insert(rulesPtr->formatName.toLower(), rulesPtr);
+            } else {
+                emit addFormat(rulesPtr);
+            }
+        }
+    }
+}
+
 void CockatriceXml4Parser::loadSetsFromXml(QXmlStreamReader &xml)
 {
     while (!xml.atEnd()) {
@@ -118,9 +265,9 @@ void CockatriceXml4Parser::loadSetsFromXml(QXmlStreamReader &xml)
     }
 }
 
-QVariantHash CockatriceXml4Parser::loadCardPropertiesFromXml(QXmlStreamReader &xml)
+QHash<QString, QString> CockatriceXml4Parser::loadCardPropertiesFromXml(QXmlStreamReader &xml)
 {
-    QVariantHash properties = QVariantHash();
+    QHash<QString, QString> properties;
     while (!xml.atEnd()) {
         if (xml.readNext() == QXmlStreamReader::EndElement) {
             break;
@@ -136,7 +283,6 @@ QVariantHash CockatriceXml4Parser::loadCardPropertiesFromXml(QXmlStreamReader &x
 
 void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
 {
-    bool includeRebalancedCards = cardPreferenceProvider->getIncludeRebalancedCards();
     while (!xml.atEnd()) {
         if (xml.readNext() == QXmlStreamReader::EndElement) {
             break;
@@ -147,7 +293,9 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
         if (xmlName == "card") {
             QString name = QString("");
             QString text = QString("");
-            QVariantHash properties = QVariantHash();
+            QHash<QString, QString> properties;
+            QMap<QString, QString> localizedNames;
+            QMap<QString, QString> localizedTexts;
             QList<CardRelation *> relatedCards, reverseRelatedCards;
             auto _sets = SetToPrintingsMap();
             int tableRow = 0;
@@ -173,6 +321,44 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                     // generic properties
                 } else if (xmlName == "prop") {
                     properties = loadCardPropertiesFromXml(xml);
+                    // localized card data
+                } else if (xmlName == "localizations") {
+                    while (!xml.atEnd()) {
+                        if (xml.readNextStartElement()) {
+                            const QString elementName = xml.name().toString();
+                            if (elementName == "localization") {
+                                const QString lang = xml.attributes().value("lang").toString();
+                                QString localizedName;
+                                QString localizedText;
+                                while (!xml.atEnd()) {
+                                    if (xml.readNext() == QXmlStreamReader::EndElement) {
+                                        break;
+                                    }
+                                    if (xml.isStartElement()) {
+                                        const QString childName = xml.name().toString();
+                                        QString value = xml.readElementText(QXmlStreamReader::IncludeChildElements);
+                                        if (childName == "name") {
+                                            localizedName = value;
+                                        } else if (childName == "text") {
+                                            localizedText = value;
+                                        }
+                                    }
+                                }
+                                if (!lang.isEmpty()) {
+                                    if (!localizedName.isEmpty()) {
+                                        localizedNames.insert(lang, localizedName);
+                                    }
+                                    if (!localizedText.isEmpty()) {
+                                        localizedTexts.insert(lang, localizedText);
+                                    }
+                                }
+                            } else {
+                                xml.skipCurrentElement();
+                            }
+                        } else {
+                            break;
+                        }
+                    }
                     // positioning info
                 } else if (xmlName == "tablerow") {
                     tableRow = xml.readElementText(QXmlStreamReader::IncludeChildElements).toInt();
@@ -189,24 +375,16 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                     QString setName = xml.readElementText(QXmlStreamReader::IncludeChildElements);
                     auto set = internalAddSet(setName);
                     if (set->getEnabled()) {
-                        PrintingInfo printingInfo(set);
+                        QHash<QString, QString> printingProps;
                         for (QXmlStreamAttribute attr : attrs) {
                             QString attrName = attr.name().toString();
-                            if (attrName == "picURL")
+                            if (attrName == "picURL") {
                                 attrName = "picurl";
-                            printingInfo.setProperty(attrName, attr.value().toString());
-                        }
-
-                        // 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);
+                            }
+                            printingProps.insert(attrName, attr.value().toString());
                         }
+                        PrintingInfo printingInfo(set, LazyPropertiesHash(printingProps));
+                        _sets[setName].append(printingInfo);
                     }
                     // related cards
                 } else if (xmlName == "related" || xmlName == "reverse-related") {
@@ -214,6 +392,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                     bool exclude = false;
                     bool variable = false;
                     bool persistent = false;
+                    bool facedown = false;
                     int count = 1;
                     QXmlStreamAttributes attrs = xml.attributes();
                     QString cardName = xml.readElementText(QXmlStreamReader::IncludeChildElements);
@@ -245,7 +424,12 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                         persistent = true;
                     }
 
-                    auto *relation = new CardRelation(cardName, attachType, exclude, variable, count, persistent);
+                    if (attrs.hasAttribute("facedown")) {
+                        facedown = true;
+                    }
+
+                    auto *relation =
+                        new CardRelation(cardName, attachType, exclude, variable, count, persistent, facedown);
                     if (xmlName == "reverse-related") {
                         reverseRelatedCards << relation;
                     } else {
@@ -266,13 +450,82 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml)
                                                  .landscapeOrientation = landscapeOrientation,
                                                  .tableRow = tableRow,
                                                  .upsideDownArt = upsideDown};
-            CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards,
-                                                        reverseRelatedCards, _sets, attributes);
-            emit addCard(newCard);
+            CardInfoPtr newCard =
+                CardInfo::newInstance(name, text, isToken, properties, relatedCards, reverseRelatedCards, _sets,
+                                      attributes, std::move(localizedNames), std::move(localizedTexts));
+            if (targetData) {
+                // Mirror CardDatabase::addCard: if a card with this name already
+                // exists, merge the new printings into it instead of replacing.
+                if (auto existing = targetData->cards.value(name)) {
+                    for (const auto &printings : newCard->getSets()) {
+                        for (const auto &printing : printings) {
+                            existing->addToSet(printing.getSet(), printing);
+                        }
+                    }
+                } else {
+                    targetData->cards.insert(name, newCard);
+                    targetData->simpleNameCards.insert(newCard->getSimpleName(), newCard);
+                }
+            } else {
+                emit addCard(newCard);
+            }
         }
     }
 }
 
+static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const QSharedPointer<FormatRules> &rulesPtr)
+{
+    if (rulesPtr.isNull()) {
+        qCWarning(CockatriceXml4Log) << "&operator<< FormatRules is nullptr";
+        return xml;
+    }
+
+    const FormatRules &rules = *rulesPtr;
+
+    xml.writeStartElement("format");
+    if (!rules.formatName.isEmpty()) {
+        xml.writeAttribute("formatName", rules.formatName);
+    }
+
+    xml.writeTextElement("minDeckSize", QString::number(rules.minDeckSize));
+    xml.writeTextElement("maxDeckSize", rules.maxDeckSize >= 0 ? QString::number(rules.maxDeckSize) : "0");
+    xml.writeTextElement("maxSideboardSize", QString::number(rules.maxSideboardSize));
+    if (!rules.allowedCounts.isEmpty()) {
+        xml.writeStartElement("allowedCounts");
+
+        for (const AllowedCount &c : rules.allowedCounts) {
+            xml.writeStartElement("count");
+            xml.writeAttribute("max", c.max == -1 ? "unlimited" : QString::number(c.max));
+            xml.writeCharacters(c.label);
+            xml.writeEndElement(); // count
+        }
+
+        xml.writeEndElement(); // allowedCounts
+    }
+
+    if (!rules.exceptions.isEmpty()) {
+        xml.writeStartElement("exceptions");
+        for (const ExceptionRule &ex : rules.exceptions) {
+            xml.writeStartElement("exception");
+            xml.writeTextElement("maxCopies", ex.maxCopies == -1 ? "unlimited" : QString::number(ex.maxCopies));
+
+            for (const CardCondition &cond : ex.conditions) {
+                xml.writeStartElement("cardCondition");
+                xml.writeAttribute("field", cond.field);
+                xml.writeAttribute("match", cond.matchType);
+                xml.writeAttribute("value", cond.value);
+                xml.writeEndElement(); // cardCondition
+            }
+
+            xml.writeEndElement(); // exception
+        }
+        xml.writeEndElement(); // exceptions
+    }
+
+    xml.writeEndElement(); // format
+    return xml;
+}
+
 static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSetPtr &set)
 {
     if (set.isNull()) {
@@ -316,6 +569,26 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
     }
     xml.writeEndElement();
 
+    // localized card data
+    const QStringList localizedLanguages = info->localizationLanguages();
+    if (!localizedLanguages.isEmpty()) {
+        xml.writeStartElement("localizations");
+        const QMap<QString, QString> &localizedNames = info->getLocalizedNames();
+        const QMap<QString, QString> &localizedTexts = info->getLocalizedTexts();
+        for (const QString &lang : localizedLanguages) {
+            xml.writeStartElement("localization");
+            xml.writeAttribute("lang", lang);
+            if (localizedNames.contains(lang)) {
+                xml.writeTextElement("name", localizedNames.value(lang));
+            }
+            if (localizedTexts.contains(lang)) {
+                xml.writeTextElement("text", localizedTexts.value(lang));
+            }
+            xml.writeEndElement();
+        }
+        xml.writeEndElement();
+    }
+
     // sets
     for (const auto &printings : info->getSets()) {
         for (const PrintingInfo &set : printings) {
@@ -342,6 +615,9 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
         if (i->getIsPersistent()) {
             xml.writeAttribute("persistent", "persistent");
         }
+        if (i->getIsFaceDown()) {
+            xml.writeAttribute("facedown", "facedown");
+        }
         if (i->getIsVariable()) {
             if (1 == i->getDefaultCount()) {
                 xml.writeAttribute("count", "x");
@@ -399,7 +675,8 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in
     return xml;
 }
 
-bool CockatriceXml4Parser::saveToFile(SetNameMap _sets,
+bool CockatriceXml4Parser::saveToFile(FormatRulesNameMap _formats,
+                                      SetNameMap _sets,
                                       CardNameMap cards,
                                       const QString &fileName,
                                       const QString &sourceUrl,
@@ -426,6 +703,14 @@ bool CockatriceXml4Parser::saveToFile(SetNameMap _sets,
     xml.writeTextElement("sourceVersion", sourceVersion);
     xml.writeEndElement();
 
+    if (_formats.count() > 0) {
+        xml.writeStartElement("formats");
+        for (FormatRulesPtr format : _formats) {
+            xml << format;
+        }
+        xml.writeEndElement();
+    }
+
     if (_sets.count() > 0) {
         xml.writeStartElement("sets");
         for (CardSetPtr set : _sets) {
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 b83f6929e..390282796 100644
--- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h
+++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.h
@@ -2,10 +2,15 @@
 #define COCKATRICE_XML4_H
 
 #include "card_database_parser.h"
+#include "libcockatrice/card/card_info.h"
 
+#include <QHash>
 #include <QLoggingCategory>
-#include <QXmlStreamReader>
-#include <libcockatrice/interfaces/interface_card_preference_provider.h>
+#include <QString>
+#include <qtmetamacros.h>
+
+class ICardSetPriorityController;
+class QXmlStreamReader;
 
 inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.xml_4_parser");
 
@@ -19,9 +24,8 @@ inline Q_LOGGING_CATEGORY(CockatriceXml4Log, "cockatrice_xml.xml_4_parser");
  * making the parser more extensible and schema-compliant.
  *
  * @note Differences from v3:
- * - Card properties are stored in <prop> blocks as a QVariantHash.
+ * - 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.
  */
@@ -29,7 +33,7 @@ class CockatriceXml4Parser : public ICardDatabaseParser
 {
     Q_OBJECT
 public:
-    explicit CockatriceXml4Parser(ICardPreferenceProvider *cardPreferenceProvider);
+    explicit CockatriceXml4Parser(ICardSetPriorityController *cardSetPriorityController);
     ~CockatriceXml4Parser() override = default;
 
     /**
@@ -46,32 +50,38 @@ public:
      */
     void parseFile(QIODevice &device) override;
 
+    /**
+     * @brief Parse the XML database into the given snapshot.
+     * @param device Open QIODevice positioned at start of file.
+     * @param data Target snapshot to populate.
+     */
+    void parseFileInto(QIODevice &device, CardDatabaseData &data) override;
+
     /**
      * @brief Save sets and cards back to an XML4 file.
      */
-    bool saveToFile(SetNameMap _sets,
+    bool saveToFile(FormatRulesNameMap _formats,
+                    SetNameMap _sets,
                     CardNameMap cards,
                     const QString &fileName,
                     const QString &sourceUrl = "unknown",
                     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.
-     * @return A QVariantHash mapping property names to values.
+     * @return A QHash<QString, QString> mapping property names to values.
      */
-    QVariantHash loadCardPropertiesFromXml(QXmlStreamReader &xml);
+    QHash<QString, QString> loadCardPropertiesFromXml(QXmlStreamReader &xml);
 
     /**
      * @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);
 
+    void loadFormats(QXmlStreamReader &xml);
     /**
      * @brief Load all <set> elements from the XML stream.
      * @param xml The open QXmlStreamReader positioned at the <sets> element.
diff --git a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.cpp b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.cpp
new file mode 100644
index 000000000..64785759e
--- /dev/null
+++ b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.cpp
@@ -0,0 +1,56 @@
+#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)
+{
+    CardMatchType type = matchTypeFromString(cond.matchType);
+    QString fieldValue;
+    if (cond.field == "name") {
+        fieldValue = card.getName();
+    } else if (cond.field == "text") {
+        fieldValue = card.getText();
+    } else {
+        fieldValue = card.getProperty(cond.field);
+    }
+
+    switch (type) {
+        case CardMatchType::Equals:
+            return fieldValue == cond.value;
+        case CardMatchType::NotEquals:
+            return fieldValue != cond.value;
+        case CardMatchType::Contains:
+            return fieldValue.contains(cond.value, Qt::CaseInsensitive);
+        case CardMatchType::NotContains:
+            return !fieldValue.contains(cond.value, Qt::CaseInsensitive);
+        case CardMatchType::Regex: {
+            QRegularExpression re(cond.value, QRegularExpression::CaseInsensitiveOption);
+            return re.match(fieldValue).hasMatch();
+        }
+        default:
+            return false;
+    }
+}
+
+bool exceptionAppliesToCard(const CardInfo &card, const ExceptionRule &rule)
+{
+    for (const CardCondition &cond : rule.conditions) {
+        if (!cardMatchesCondition(card, cond)) {
+            return false; // all conditions must match
+        }
+    }
+    return true;
+}
+
+bool cardHasAnyException(const CardInfo &card, const FormatRules &format)
+{
+    for (const ExceptionRule &rule : format.exceptions) {
+        if (exceptionAppliesToCard(card, rule)) {
+            return true;
+        }
+    }
+    return false;
+}
\ No newline at end of file
diff --git a/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h
new file mode 100644
index 000000000..15ba46728
--- /dev/null
+++ b/libcockatrice_card/libcockatrice/card/format/format_legality_rules.h
@@ -0,0 +1,79 @@
+#ifndef COCKATRICE_FORMAT_LEGALITY_RULES_H
+#define COCKATRICE_FORMAT_LEGALITY_RULES_H
+
+#include <QList>
+#include <QSharedPointer>
+#include <QString>
+
+class CardInfo;
+
+using CardInfoPtr = QSharedPointer<CardInfo>;
+
+struct CardCondition
+{
+    QString field;     // e.g. "type", "maintype", "text"
+    QString matchType; // "contains", "equals", "regex", "notContains", etc.
+    QString value;     // e.g. "Basic Land"
+};
+
+struct AllowedCount
+{
+    int max = 0;   // 4, 1, 0, or -1 for unlimited
+    QString label; // "legal", "restricted", "banned"
+};
+
+struct ExceptionRule
+{
+    QList<CardCondition> conditions; // All must match
+    int maxCopies = -1;              // -1 = unlimited
+};
+
+struct FormatRules
+{
+    QString formatName;
+    int minDeckSize = 60;
+    int maxDeckSize = -1; // -1 = unlimited
+    int maxSideboardSize = 15;
+
+    QList<AllowedCount> allowedCounts;
+
+    QList<ExceptionRule> exceptions; // Cards allowed to break maxCopies
+};
+
+enum class CardMatchType
+{
+    Equals,
+    NotEquals,
+    Contains,
+    NotContains,
+    Regex
+};
+
+// convert string to enum
+inline CardMatchType matchTypeFromString(const QString &str)
+{
+    if (str == "equals") {
+        return CardMatchType::Equals;
+    }
+    if (str == "notEquals") {
+        return CardMatchType::NotEquals;
+    }
+    if (str == "contains") {
+        return CardMatchType::Contains;
+    }
+    if (str == "notContains") {
+        return CardMatchType::NotContains;
+    }
+    if (str == "regex") {
+        return CardMatchType::Regex;
+    }
+    return CardMatchType::Equals; // fallback default
+}
+
+bool cardMatchesCondition(const CardInfo &card, const CardCondition &cond);
+
+bool exceptionAppliesToCard(const CardInfo &card, const ExceptionRule &rule);
+
+bool cardHasAnyException(const CardInfo &card, const FormatRules &format);
+
+#endif // COCKATRICE_FORMAT_LEGALITY_RULES_H
diff --git a/libcockatrice_card/libcockatrice/card/game_specific_terms.h b/libcockatrice_card/libcockatrice/card/game_specific_terms.h
index 2931365ad..e9160e514 100644
--- a/libcockatrice_card/libcockatrice/card/game_specific_terms.h
+++ b/libcockatrice_card/libcockatrice/card/game_specific_terms.h
@@ -1,8 +1,8 @@
 /**
  * @file game_specific_terms.h
  * @ingroup Cards
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef GAME_SPECIFIC_TERMS_H
 #define GAME_SPECIFIC_TERMS_H
@@ -31,26 +31,36 @@ QString const ColorIdentity("coloridentity");
 
 inline static const QString getNicePropertyName(QString key)
 {
-    if (key == CardType)
+    if (key == CardType) {
         return QCoreApplication::translate("Mtg", "Card Type");
-    if (key == ConvertedManaCost)
+    }
+    if (key == ConvertedManaCost) {
         return QCoreApplication::translate("Mtg", "Mana Value");
-    if (key == Colors)
+    }
+    if (key == Colors) {
         return QCoreApplication::translate("Mtg", "Color(s)");
-    if (key == Loyalty)
+    }
+    if (key == Loyalty) {
         return QCoreApplication::translate("Mtg", "Loyalty");
-    if (key == MainCardType)
+    }
+    if (key == MainCardType) {
         return QCoreApplication::translate("Mtg", "Main Card Type");
-    if (key == ManaCost)
+    }
+    if (key == ManaCost) {
         return QCoreApplication::translate("Mtg", "Mana Cost");
-    if (key == PowTough)
+    }
+    if (key == PowTough) {
         return QCoreApplication::translate("Mtg", "P/T");
-    if (key == Side)
+    }
+    if (key == Side) {
         return QCoreApplication::translate("Mtg", "Side");
-    if (key == Layout)
+    }
+    if (key == Layout) {
         return QCoreApplication::translate("Mtg", "Layout");
-    if (key == ColorIdentity)
+    }
+    if (key == ColorIdentity) {
         return QCoreApplication::translate("Mtg", "Color Identity");
+    }
     return key;
 }
 } // namespace Mtg
diff --git a/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp b/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp
new file mode 100644
index 000000000..975f7f2d6
--- /dev/null
+++ b/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.cpp
@@ -0,0 +1,72 @@
+#include "card_name_normalizer.h"
+
+#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.
+ * @param cardName Base name.
+ * @return Full display name, or the cardName unchanged if a display name is not found.
+ */
+static QString getCompleteCardName(const QString &cardName)
+{
+    ExactCard temp = CardDatabaseManager::query()->guessCard({cardName});
+    if (temp) {
+        return temp.getName();
+    }
+
+    return cardName;
+}
+
+QString CardNameNormalizer::operator()(const QString &cardNameString) const
+{
+    QString cardName = cardNameString;
+
+    // Regex for advanced card parsing
+    static const QRegularExpression reSplitCard(R"( ?\/\/ ?)");
+    static const QRegularExpression reBrace(R"( ?[\[\{][^\]\}]*[\]\}] ?)"); // not nested
+    static const QRegularExpression reRoundBrace(R"(^\([^\)]*\) ?)");       // () are only matched at start of string
+    static const QRegularExpression reDigitBrace(R"( ?\(\d*\) ?)");         // () are matched if containing digits
+    static const QRegularExpression reBraceDigit(
+        R"( ?\([\dA-Z]+\) *\d+$)"); // () are matched if containing setcode then a number
+    static const QRegularExpression reDoubleFacedMarker(R"( ?\(Transform\) ?)");
+
+    static const QHash<QRegularExpression, QString> differences{{QRegularExpression("’"), "'"},
+                                                                {QRegularExpression("Æ"), "Ae"},
+                                                                {QRegularExpression("æ"), "ae"},
+                                                                {QRegularExpression(" ?[|/]+ ?"), " // "}};
+
+    // Handle advanced card types
+    if (cardName.contains(reSplitCard)) {
+        cardName = cardName.split(reSplitCard).join(" // ");
+    }
+
+    if (cardName.contains(reDoubleFacedMarker)) {
+        QStringList faces = cardName.split(reDoubleFacedMarker);
+        cardName = faces.first().trimmed();
+    }
+
+    // Remove unnecessary characters
+    cardName.remove(reBrace);
+    cardName.remove(reRoundBrace); // I'll be entirely honest here, these are split to accommodate just three cards
+    cardName.remove(reDigitBrace); // from un-sets that have a word in between round braces at the end
+    cardName.remove(reBraceDigit); // very specific format with the set code in () and collectors number after
+
+    // Normalize characters
+    for (auto diff = differences.constBegin(); diff != differences.constEnd(); ++diff) {
+        cardName.replace(diff.key(), diff.value());
+    }
+
+    // Resolve complete card name
+    cardName = getCompleteCardName(cardName);
+
+    return cardName;
+}
\ No newline at end of file
diff --git a/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.h b/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.h
new file mode 100644
index 000000000..716e7da80
--- /dev/null
+++ b/libcockatrice_card/libcockatrice/card/import/card_name_normalizer.h
@@ -0,0 +1,15 @@
+#ifndef COCKATRICE_CARD_NAME_NORMALIZER_H
+#define COCKATRICE_CARD_NAME_NORMALIZER_H
+
+#include <QString>
+
+/**
+ * Functor that normalizes the raw card name parsed during a plaintext deck import into the card name that Cockatrice
+ * uses.
+ */
+struct CardNameNormalizer
+{
+    QString operator()(const QString &cardNameString) const;
+};
+
+#endif // COCKATRICE_CARD_NAME_NORMALIZER_H
diff --git a/libcockatrice_card/libcockatrice/card/lazy_properties_hash.cpp b/libcockatrice_card/libcockatrice/card/lazy_properties_hash.cpp
new file mode 100644
index 000000000..a12de469b
--- /dev/null
+++ b/libcockatrice_card/libcockatrice/card/lazy_properties_hash.cpp
@@ -0,0 +1,97 @@
+#include "lazy_properties_hash.h"
+
+#include <QDataStream>
+#include <QMutexLocker>
+#include <QSharedPointer>
+
+LazyPropertiesHash::LazyPropertiesHash() : isMaterialized(true)
+{
+}
+
+LazyPropertiesHash::LazyPropertiesHash(const QByteArray &blob) : blob(blob)
+{
+}
+
+LazyPropertiesHash::LazyPropertiesHash(const QHash<QString, QString> &properties)
+    : properties(properties), isMaterialized(true)
+{
+}
+
+LazyPropertiesHash::LazyPropertiesHash(const LazyPropertiesHash &other)
+{
+    // since we do not allow dematerialization, we only need to lock if not materialized yet
+    if (other.isMaterialized) {
+        blob = other.blob;
+        properties = other.properties;
+        isMaterialized = true;
+    } else {
+        QMutexLocker lock(&other.propertiesMutex);
+        blob = other.blob;
+        properties = other.properties;
+        isMaterialized = false;
+    }
+}
+
+LazyPropertiesHash &LazyPropertiesHash::operator=(const LazyPropertiesHash &other)
+{
+    if (this == &other) {
+        return *this;
+    }
+
+    // since we do not allow dematerialization, we only need to lock if not materialized yet
+    if (other.isMaterialized) {
+        blob = other.blob;
+        properties = other.properties;
+        isMaterialized = true;
+    } else {
+        QMutexLocker lock(&other.propertiesMutex);
+        blob = other.blob;
+        properties = other.properties;
+        isMaterialized = false;
+    }
+
+    return *this;
+}
+
+void LazyPropertiesHash::ensureMaterialized() const
+{
+    QMutexLocker lock(&propertiesMutex);
+
+    if (isMaterialized) {
+        return;
+    }
+
+    if (!blob.isEmpty()) {
+        QDataStream in(blob);
+        in.setVersion(QDataStream::Qt_6_4);
+        in >> properties;
+    }
+
+    blob.clear();
+
+    isMaterialized = true;
+}
+
+QString LazyPropertiesHash::value(const QString &key) const
+{
+    ensureMaterialized();
+    return properties.value(key);
+}
+
+bool LazyPropertiesHash::insert(const QString &key, const QString &value)
+{
+    ensureMaterialized();
+
+    if (value == properties.value(key)) {
+        return false;
+    }
+
+    properties.insert(key, value);
+    return true;
+}
+
+const QHash<QString, QString> &LazyPropertiesHash::getProperties() const
+{
+    ensureMaterialized();
+    return properties;
+}
diff --git a/libcockatrice_card/libcockatrice/card/lazy_properties_hash.h b/libcockatrice_card/libcockatrice/card/lazy_properties_hash.h
new file mode 100644
index 000000000..04f5d0251
--- /dev/null
+++ b/libcockatrice_card/libcockatrice/card/lazy_properties_hash.h
@@ -0,0 +1,76 @@
+#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.
+ *
+ * Properties are stored as a pre-serialized blob (cheap to load), and the QString is materialized on the first query,
+ * so the database load avoids constructing thousands of QString per card.
+ *
+ * Once the properties are materialized, it cannot be unmaterialized.
+ * If you want to reset the properties to an unmaterialized state, you should create a new LazyPropertiesHash.
+ */
+class LazyPropertiesHash
+{
+
+    mutable QByteArray blob;                    ///< Serialized properties (load form).
+    mutable QHash<QString, QString> properties; ///< Materialized properties (query form).
+    mutable QMutex propertiesMutex;             ///< Guards lazy materialization.
+    mutable bool isMaterialized = false;        ///< Whether propertiesCache is valid.
+
+    /**
+     * @brief Materializes properties from blob if not already done. Clears blob afterward.
+     * Safe to call from const getters (members are mutable).
+     */
+    void ensureMaterialized() const;
+
+public:
+    /**
+     * @brief Default constructor.
+     */
+    LazyPropertiesHash();
+
+    /**
+     * @brief Creates an unmaterialized LazyPropertiesHash
+     * @param blob The pre-serialized blob
+     */
+    explicit LazyPropertiesHash(const QByteArray &blob);
+
+    /**
+     * @brief Creates an already-materialized LazyPropertiesHash
+     * @param properties The properties
+     */
+    explicit LazyPropertiesHash(const QHash<QString, QString> &properties);
+
+    // Override copy constructor and copy-assignment because mutex isn't copiable
+    LazyPropertiesHash(const LazyPropertiesHash &other);
+    LazyPropertiesHash &operator=(const LazyPropertiesHash &other);
+
+    /**
+     * @brief Gets the value from the materialized properties hash
+     * @param key The key
+     * @return The value, or an empty string if the key is not present
+     */
+    QString value(const QString &key) const;
+
+    /**
+     * @brief Inserts a value into the materialized properties hash
+     * @param key The key
+     * @param value The value to insert
+     * @return True if a new value was inserted; false if the new value is the same as the existing value
+     */
+    bool insert(const QString &key, const QString &value);
+
+    /**
+     * @brief Gets a view of the materialized properties hash.
+     * @return The properties hash
+     */
+    const QHash<QString, QString> &getProperties() const;
+};
+
+#endif // COCKATRICE_LAZY_PROPERTIES_HASH_H
diff --git a/libcockatrice_card/libcockatrice/card/printing/exact_card.cpp b/libcockatrice_card/libcockatrice/card/printing/exact_card.cpp
index 993b5b96e..19e902b27 100644
--- a/libcockatrice_card/libcockatrice/card/printing/exact_card.cpp
+++ b/libcockatrice_card/libcockatrice/card/printing/exact_card.cpp
@@ -3,6 +3,10 @@
 #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 01c61a3a1..ea49072fb 100644
--- a/libcockatrice_card/libcockatrice/card/printing/exact_card.h
+++ b/libcockatrice_card/libcockatrice/card/printing/exact_card.h
@@ -2,6 +2,11 @@
 #define EXACT_CARD_H
 
 #include "../card_info.h"
+#include "libcockatrice/card/printing/printing_info.h"
+
+#include <QByteArray>
+#include <QMetaType>
+#include <QString>
 
 /**
  * @class ExactCard
@@ -114,5 +119,6 @@ public:
      */
     void emitPixmapUpdated() const;
 };
+Q_DECLARE_METATYPE(ExactCard)
 
 #endif // EXACT_CARD_H
diff --git a/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp b/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp
index 340998565..654efac5e 100644
--- a/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp
+++ b/libcockatrice_card/libcockatrice/card/printing/printing_info.cpp
@@ -2,19 +2,25 @@
 
 #include "../set/card_set.h"
 
-PrintingInfo::PrintingInfo(const CardSetPtr &_set) : set(_set)
+PrintingInfo::PrintingInfo(const CardSetPtr &_set, const LazyPropertiesHash &_properties)
+    : set(_set), properties(_properties)
 {
 }
 
+void PrintingInfo::setProperty(const QString &_name, const QString &_value)
+{
+    properties.insert(_name, _value);
+}
+
 /**
  * Gets the uuid property of the printing, or an empty string if the property isn't present
  */
 QString PrintingInfo::getUuid() const
 {
-    return properties.value("uuid").toString();
+    return getPropertiesHash().value("uuid");
 }
 
 QString PrintingInfo::getFlavorName() const
 {
-    return properties.value("flavorName").toString();
-}
\ No newline at end of file
+    return getPropertiesHash().value("flavorName");
+}
diff --git a/libcockatrice_card/libcockatrice/card/printing/printing_info.h b/libcockatrice_card/libcockatrice/card/printing/printing_info.h
index 43d82a9cb..038960e86 100644
--- a/libcockatrice_card/libcockatrice/card/printing/printing_info.h
+++ b/libcockatrice_card/libcockatrice/card/printing/printing_info.h
@@ -2,10 +2,14 @@
 #define COCKATRICE_PRINTING_INFO_H
 
 #include "../set/card_set.h"
+#include "libcockatrice/card/lazy_properties_hash.h"
 
+#include <QHash>
 #include <QList>
 #include <QMap>
-#include <QVariant>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
 
 class PrintingInfo;
 
@@ -30,8 +34,9 @@ public:
      * @brief Constructs a PrintingInfo associated with a specific set.
      *
      * @param _set The set this printing belongs to (defaults to null).
+     * @param _properties The printing properties (defaults to empty)
      */
-    explicit PrintingInfo(const CardSetPtr &_set = nullptr);
+    explicit PrintingInfo(const CardSetPtr &_set = nullptr, const LazyPropertiesHash &_properties = {});
 
     /**
      * @brief Destroys the PrintingInfo.
@@ -51,12 +56,22 @@ public:
      */
     bool operator==(const PrintingInfo &other) const
     {
-        return this->set == other.set && this->properties == other.properties;
+        return this->set == other.set && this->getPropertiesHash() == other.getPropertiesHash();
+    }
+
+    /**
+     * @brief check if the info is empty, as if default constructed.
+     *
+     * @return True if both set and properties are empty, otherwise false.
+     */
+    bool isEmpty() const
+    {
+        return set == nullptr && getPropertiesHash().isEmpty();
     }
 
 private:
-    CardSetPtr set;          ///< The set this variation belongs to.
-    QVariantHash properties; ///< Key-value store for variation-specific attributes.
+    CardSetPtr set;                ///< The set this variation belongs to.
+    LazyPropertiesHash properties; ///< Key-value store for variation-specific attributes.
 
 public:
     /**
@@ -76,7 +91,12 @@ public:
      */
     [[nodiscard]] QStringList getProperties() const
     {
-        return properties.keys();
+        return getPropertiesHash().keys();
+    }
+
+    [[nodiscard]] const QHash<QString, QString> &getPropertiesHash() const
+    {
+        return properties.getProperties();
     }
 
     /**
@@ -87,7 +107,7 @@ public:
      */
     [[nodiscard]] QString getProperty(const QString &propertyName) const
     {
-        return properties.value(propertyName).toString();
+        return properties.value(propertyName);
     }
 
     /**
@@ -98,10 +118,7 @@ public:
      * @param _name The name of the property.
      * @param _value The string value to assign.
      */
-    void setProperty(const QString &_name, const QString &_value)
-    {
-        properties.insert(_name, _value);
-    }
+    void setProperty(const QString &_name, const QString &_value);
 
     /**
      * @brief Returns the providerID for this printing.
@@ -116,6 +133,18 @@ public:
      * @return The flavorName, or empty if it isn't present.
      */
     [[nodiscard]] QString getFlavorName() const;
+
+    /**
+     * @brief Returns the artist name credited for this printing's artwork.
+     *
+     * Requires a card database generated with artist data.
+     *
+     * @return The artist name, or empty if it isn't present.
+     */
+    [[nodiscard]] QString getArtist() const
+    {
+        return getProperty("artist");
+    }
 };
 
 #endif // COCKATRICE_PRINTING_INFO_H
diff --git a/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp b/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp
index 90e59e439..410b25682 100644
--- a/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp
+++ b/libcockatrice_card/libcockatrice/card/relation/card_relation.cpp
@@ -1,14 +1,14 @@
 #include "card_relation.h"
 
-#include "card_relation_type.h"
-
 CardRelation::CardRelation(const QString &_name,
                            CardRelationType _attachType,
                            bool _isCreateAllExclusion,
                            bool _isVariableCount,
                            int _defaultCount,
-                           bool _isPersistent)
+                           bool _isPersistent,
+                           bool _isFaceDown)
     : name(_name), attachType(_attachType), isCreateAllExclusion(_isCreateAllExclusion),
-      isVariableCount(_isVariableCount), defaultCount(_defaultCount), isPersistent(_isPersistent)
+      isVariableCount(_isVariableCount), defaultCount(_defaultCount), isPersistent(_isPersistent),
+      isFaceDown(_isFaceDown)
 {
-}
\ No newline at end of file
+}
diff --git a/libcockatrice_card/libcockatrice/card/relation/card_relation.h b/libcockatrice_card/libcockatrice/card/relation/card_relation.h
index 9ff704097..3a1366f2b 100644
--- a/libcockatrice_card/libcockatrice/card/relation/card_relation.h
+++ b/libcockatrice_card/libcockatrice/card/relation/card_relation.h
@@ -5,6 +5,7 @@
 
 #include <QObject>
 #include <QString>
+#include <qtmetamacros.h>
 
 /**
  * @class CardRelation
@@ -31,6 +32,7 @@ private:
     bool isVariableCount;      ///< True if the number of creations is variable.
     int defaultCount;          ///< Default number of cards created or involved.
     bool isPersistent;         ///< True if this relation persists (i.e. is not destroyed) on zone change.
+    bool isFaceDown;           ///< True if this relation creates the tokens facedown
 
 public:
     /**
@@ -42,13 +44,15 @@ public:
      * @param _isVariableCount Whether the count is variable.
      * @param _defaultCount Default number for creations or transformations.
      * @param _isPersistent Whether the relation persists across zone changes.
+     * @param _isFaceDown Whether the relation creates the token face down
      */
     explicit CardRelation(const QString &_name = QString(),
                           CardRelationType _attachType = CardRelationType::DoesNotAttach,
                           bool _isCreateAllExclusion = false,
                           bool _isVariableCount = false,
                           int _defaultCount = 1,
-                          bool _isPersistent = false);
+                          bool _isPersistent = false,
+                          bool _isFaceDown = false);
 
     /**
      * @brief Returns the name of the related card.
@@ -151,6 +155,16 @@ public:
     {
         return isPersistent;
     }
+
+    /**
+     * @brief Returns whether the relation creates the token facedown.
+     *
+     * @return True if facedown, false otherwise.
+     */
+    [[nodiscard]] bool getIsFaceDown() const
+    {
+        return isFaceDown;
+    }
 };
 
 #endif // COCKATRICE_CARD_RELATION_H
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.cpp b/libcockatrice_card/libcockatrice/card/set/card_set.cpp
index 20d0aced8..e873eeeab 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set.cpp
+++ b/libcockatrice_card/libcockatrice/card/set/card_set.cpp
@@ -1,5 +1,7 @@
 #include "card_set.h"
 
+#include "libcockatrice/interfaces/interface_card_set_priority_controller.h"
+
 #include <QSet>
 #include <utility>
 
@@ -33,37 +35,19 @@ QString CardSet::getCorrectedShortName() const
 {
     // For Windows machines.
     QSet<QString> invalidFileNames;
-    invalidFileNames << "CON"
-                     << "PRN"
-                     << "AUX"
-                     << "NUL"
-                     << "COM1"
-                     << "COM2"
-                     << "COM3"
-                     << "COM4"
-                     << "COM5"
-                     << "COM6"
-                     << "COM7"
-                     << "COM8"
-                     << "COM9"
-                     << "LPT1"
-                     << "LPT2"
-                     << "LPT3"
-                     << "LPT4"
-                     << "LPT5"
-                     << "LPT6"
-                     << "LPT7"
-                     << "LPT8"
-                     << "LPT9";
+    invalidFileNames << "CON" << "PRN" << "AUX" << "NUL" << "COM1" << "COM2" << "COM3" << "COM4" << "COM5" << "COM6"
+                     << "COM7" << "COM8" << "COM9" << "LPT1" << "LPT2" << "LPT3" << "LPT4" << "LPT5" << "LPT6" << "LPT7"
+                     << "LPT8" << "LPT9";
 
     return invalidFileNames.contains(shortName) ? shortName + "_" : shortName;
 }
 
 void CardSet::loadSetOptions()
 {
-    sortKey = priorityController->getSortKey(shortName);
-    enabled = priorityController->isEnabled(shortName);
-    isknown = priorityController->isKnown(shortName);
+    const ICardSetPriorityController::SetOptions options = priorityController->getSetOptions(shortName);
+    sortKey = options.sortKey;
+    enabled = options.enabled;
+    isknown = options.isKnown;
 }
 
 void CardSet::setSortKey(unsigned int _sortKey)
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.h b/libcockatrice_card/libcockatrice/card/set/card_set.h
index fe4b66522..b9ac74e2d 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set.h
+++ b/libcockatrice_card/libcockatrice/card/set/card_set.h
@@ -5,12 +5,14 @@
 #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>;
 
 /**
@@ -107,31 +109,31 @@ public:
      */
     [[nodiscard]] QString getCorrectedShortName() const;
 
-    /// @return Short identifier of the set.
+    /** @return Short identifier of the set. */
     [[nodiscard]] QString getShortName() const
     {
         return shortName;
     }
 
-    /// @return Descriptive name of the set.
+    /** @return Descriptive name of the set. */
     [[nodiscard]] QString getLongName() const
     {
         return longName;
     }
 
-    /// @return Type/category string of the set.
+    /** @return Type/category string of the set. */
     [[nodiscard]] QString getSetType() const
     {
         return setType;
     }
 
-    /// @return Release date of the set.
+    /** @return Release date of the set. */
     [[nodiscard]] QDate getReleaseDate() const
     {
         return releaseDate;
     }
 
-    /// @return Priority level of the set.
+    /** @return Priority level of the set. */
     [[nodiscard]] Priority getPriority() const
     {
         return priority;
@@ -181,7 +183,16 @@ public:
      */
     void loadSetOptions();
 
-    /// @return The sort key assigned to this set.
+    void setSortKeyInMemory(unsigned int _sortKey)
+    {
+        sortKey = _sortKey;
+    }
+    void setEnabledInMemory(bool _enabled)
+    {
+        enabled = _enabled;
+    }
+
+    /** @return The sort key assigned to this set. */
     [[nodiscard]] int getSortKey() const
     {
         return sortKey;
@@ -193,7 +204,7 @@ public:
      */
     void setSortKey(unsigned int _sortKey);
 
-    /// @return True if the set is enabled.
+    /** @return True if the set is enabled. */
     [[nodiscard]] bool getEnabled() const
     {
         return enabled;
@@ -205,7 +216,7 @@ public:
      */
     void setEnabled(bool _enabled);
 
-    /// @return True if the set is considered known.
+    /** @return True if the set is considered known. */
     [[nodiscard]] bool getIsKnown() const
     {
         return isknown;
@@ -216,6 +227,10 @@ 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_comparator.h b/libcockatrice_card/libcockatrice/card/set/card_set_comparator.h
index 96f1052a9..0caa9f156 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set_comparator.h
+++ b/libcockatrice_card/libcockatrice/card/set/card_set_comparator.h
@@ -1,8 +1,8 @@
 /**
  * @file card_set_comparator.h
  * @ingroup CardSets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef SET_PRIORITY_COMPARATOR_H
 #define SET_PRIORITY_COMPARATOR_H
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp b/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
index 8d6aa7365..c4faf1c4c 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
+++ b/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp
@@ -1,5 +1,14 @@
 #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:
@@ -55,60 +64,87 @@ QStringList CardSetList::getUnknownSetsNames()
     return sets;
 }
 
-void CardSetList::enableAllUnknown()
+void CardSetList::enableAllUnknownBatched(ICardSetPriorityController *controller)
 {
-    for (int i = 0; i < size(); ++i) {
-        CardSetPtr set = at(i);
-        if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {
-            set->setIsKnown(true);
-            set->setEnabled(true);
-        } else if (set && set->getIsKnownIgnored() && !set->getEnabled()) {
-            set->setEnabled(true);
-        }
-    }
-}
-
-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;
     for (int i = 0; i < size(); ++i) {
         CardSetPtr set = at(i);
         if (set.isNull()) {
-            // qCWarning(CardInfoLog) << "guessSortKeys set is null";
             continue;
         }
-        set->setSortKey(i);
+
+        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)
+{
+    defaultSort();
+
+    QVector<ICardSetPriorityController::SetSaveData> saveData;
+    saveData.reserve(size());
+    for (int i = 0; i < size(); ++i) {
+        CardSetPtr set = at(i);
+        if (set.isNull()) {
+            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);
     }
 }
 
diff --git a/libcockatrice_card/libcockatrice/card/set/card_set_list.h b/libcockatrice_card/libcockatrice/card/set/card_set_list.h
index 81d605374..f31710b33 100644
--- a/libcockatrice_card/libcockatrice/card/set/card_set_list.h
+++ b/libcockatrice_card/libcockatrice/card/set/card_set_list.h
@@ -4,6 +4,8 @@
 #include "card_set.h"
 
 #include <QList>
+#include <QSharedPointer>
+#include <QStringList>
 
 /**
  * @class CardSetList
@@ -38,36 +40,37 @@ public:
     void sortByKey();
 
     /**
-     * @brief Reassigns sort keys based on the current order.
+     * @brief Enables every set with fresh sort keys, persisting in one flush.
      *
-     * 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.
+     * 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.
      */
-    void guessSortKeys();
+    void enableAllBatched(ICardSetPriorityController *controller);
 
     /**
-     * @brief Enables all sets that are unknown or ignored.
+     * @brief Enables all sets that are unknown or ignored, persisting in one flush.
      *
      * 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 enableAllUnknown();
+    void enableAllUnknownBatched(ICardSetPriorityController *controller);
 
     /**
-     * @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.
+     * @brief Marks all sets as known and adjusts their enabled state, persisting in one flush.
      *
      * 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 markAllAsKnown();
+    void markAllAsKnownBatched(ICardSetPriorityController *controller);
 
     /**
      * @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 5dffff3f7..e61a5702c 100644
--- a/libcockatrice_deck_list/CMakeLists.txt
+++ b/libcockatrice_deck_list/CMakeLists.txt
@@ -9,14 +9,14 @@ set(HEADERS
     libcockatrice/deck_list/tree/inner_deck_list_node.h
     libcockatrice/deck_list/deck_list.h
     libcockatrice/deck_list/deck_list_history_manager.h
+    libcockatrice/deck_list/deck_list_node_tree.h
     libcockatrice/deck_list/deck_list_memento.h
+    libcockatrice/deck_list/deck_list_plain_text_parser.h
+    libcockatrice/deck_list/playmat_resolver.h
+    libcockatrice/deck_list/sideboard_plan.h
 )
 
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
+qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
 
 add_library(
   libcockatrice_deck_list STATIC
@@ -27,10 +27,19 @@ add_library(
   libcockatrice/deck_list/tree/inner_deck_list_node.cpp
   libcockatrice/deck_list/deck_list.cpp
   libcockatrice/deck_list/deck_list_history_manager.cpp
+  libcockatrice/deck_list/deck_list_node_tree.cpp
+  libcockatrice/deck_list/deck_list_plain_text_parser.cpp
+  libcockatrice/deck_list/playmat_resolver.cpp
+  libcockatrice/deck_list/sideboard_plan.cpp
 )
 
 add_dependencies(libcockatrice_deck_list libcockatrice_protocol)
 
 target_include_directories(libcockatrice_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-target_link_libraries(libcockatrice_deck_list PUBLIC libcockatrice_protocol libcockatrice_utility ${QT_CORE_MODULE})
+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 30b7ba314..821b53dff 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
@@ -1,163 +1,199 @@
 #include "deck_list.h"
 
 #include "deck_list_memento.h"
-#include "tree/abstract_deck_list_node.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/deck_list_card_node.h"
 #include "tree/inner_deck_list_node.h"
 
-#include <QCryptographicHash>
+#include <QAnyStringView>
 #include <QDebug>
-#include <QFile>
-#include <QRegularExpression>
 #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>
 
-#if QT_VERSION < 0x050600
-// qHash on QRegularExpression was added in 5.6, FIX IT
-uint qHash(const QRegularExpression &key, uint seed) noexcept
-{
-    return qHash(key.pattern(), seed); // call qHash on pattern QString instead
-}
-#endif
+static const QString CURRENT_SIDEBOARD_PLAN_KEY = "";
 
-SideboardPlan::SideboardPlan(const QString &_name, const QList<MoveCard_ToZone> &_moveList)
-    : name(_name), moveList(_moveList)
+/**
+ * @brief Parses a floating point XML attribute into a clamped playmat parameter.
+ *
+ * Falls back to @p fallback when the attribute is missing or malformed, so
+ * malformed deck files cannot produce degenerate art rectangles (e.g. a zoom
+ * of 0 dividing by zero).
+ *
+ * @param valueString Raw attribute text.
+ * @param fallback Value used when the text cannot be parsed.
+ * @param min Lower clamp bound.
+ * @param max Upper clamp bound.
+ * @return The parsed value clamped to [min, max], or @p fallback.
+ */
+static double parseClampedParam(const QString &valueString, double fallback, double min, double max)
 {
-}
-
-void SideboardPlan::setMoveList(const QList<MoveCard_ToZone> &_moveList)
-{
-    moveList = _moveList;
-}
-
-bool SideboardPlan::readElement(QXmlStreamReader *xml)
-{
-    while (!xml->atEnd()) {
-        xml->readNext();
-        const QString childName = xml->name().toString();
-        if (xml->isStartElement()) {
-            if (childName == "name")
-                name = xml->readElementText();
-            else if (childName == "move_card_to_zone") {
-                MoveCard_ToZone m;
-                while (!xml->atEnd()) {
-                    xml->readNext();
-                    const QString childName2 = xml->name().toString();
-                    if (xml->isStartElement()) {
-                        if (childName2 == "card_name")
-                            m.set_card_name(xml->readElementText().toStdString());
-                        else if (childName2 == "start_zone")
-                            m.set_start_zone(xml->readElementText().toStdString());
-                        else if (childName2 == "target_zone")
-                            m.set_target_zone(xml->readElementText().toStdString());
-                    } else if (xml->isEndElement() && (childName2 == "move_card_to_zone")) {
-                        moveList.append(m);
-                        break;
-                    }
-                }
-            }
-        } else if (xml->isEndElement() && (childName == "sideboard_plan"))
-            return true;
+    bool ok = false;
+    const double value = valueString.toDouble(&ok);
+    if (!ok) {
+        return fallback;
     }
-    return false;
+    return qBound(min, value, max);
 }
 
-void SideboardPlan::write(QXmlStreamWriter *xml)
+/**
+ * @brief Reads a `bannerCard` element from the XML stream.
+ *
+ * @param xml Reader positioned at the element.
+ * @return The referenced card.
+ */
+static CardRef readBannerCard(QXmlStreamReader *xml)
 {
-    xml->writeStartElement("sideboard_plan");
-    xml->writeTextElement("name", name);
-    for (auto &i : moveList) {
-        xml->writeStartElement("move_card_to_zone");
-        xml->writeTextElement("card_name", QString::fromStdString(i.card_name()));
-        xml->writeTextElement("start_zone", QString::fromStdString(i.start_zone()));
-        xml->writeTextElement("target_zone", QString::fromStdString(i.target_zone()));
-        xml->writeEndElement();
-    }
-    xml->writeEndElement();
+    QString providerId = xml->attributes().value("providerId").toString();
+    QString cardName = xml->readElementText();
+    return {cardName, providerId};
+}
+
+/**
+ * @brief Reads a `playmatCard` element from the XML stream.
+ *
+ * Attribute values are read before readElementText consumes the element, and
+ * the params are clamped to the same ranges as the settings dialog and the
+ * remote player-properties path so malformed deck files cannot produce
+ * degenerate art rectangles (e.g. a zoom of 0 dividing by zero).
+ *
+ * @param xml Reader positioned at the element.
+ * @return The referenced card plus its clamped positioning parameters.
+ */
+static PlaymatInfo readPlaymatCard(QXmlStreamReader *xml)
+{
+    QString providerId = xml->attributes().value("providerId").toString();
+    QString marginLStr = xml->attributes().value("marginPctL").toString();
+    QString marginRStr = xml->attributes().value("marginPctR").toString();
+    QString vOffStr = xml->attributes().value("verticalOffset").toString();
+    QString zoomStr = xml->attributes().value("zoom").toString();
+    QString cardName = xml->readElementText();
+
+    return {
+        .card = {cardName, providerId},
+        .params = {.marginPctL = parseClampedParam(marginLStr, 0.07, 0.0, 0.95),
+                   .marginPctR = parseClampedParam(marginRStr, 0.07, 0.0, 0.95),
+                   .verticalOffset = parseClampedParam(vOffStr, 0.33, 0.0, 1.0),
+                   .zoom = parseClampedParam(zoomStr, 1.0, 0.1, 4.0)},
+    };
 }
 
 bool DeckList::Metadata::isEmpty() const
 {
-    return name.isEmpty() && comments.isEmpty() && bannerCard.isEmpty() && tags.isEmpty();
+    return name.isEmpty() && comments.isEmpty() && bannerCard.isEmpty() && tags.isEmpty() && playmat.card.isEmpty();
+}
+
+bool DeckList::Metadata::readElement(QXmlStreamReader *xml, const QString &childName)
+{
+    if (childName == "lastLoadedTimestamp") {
+        lastLoadedTimestamp = xml->readElementText();
+    } else if (childName == "deckname") {
+        name = xml->readElementText();
+    } else if (childName == "format") {
+        gameFormat = xml->readElementText();
+    } else if (childName == "comments") {
+        comments = xml->readElementText();
+    } else if (childName == "bannerCard") {
+        bannerCard = readBannerCard(xml);
+    } else if (childName == "playmatCard") {
+        playmat = readPlaymatCard(xml);
+    } else if (childName == "tags") {
+        tags.clear(); // Clear existing tags
+        while (xml->readNextStartElement()) {
+            if (xml->name().toString() == "tag") {
+                tags.append(xml->readElementText());
+            }
+        }
+    } else {
+        return false;
+    }
+    return true;
+}
+
+void DeckList::Metadata::write(QXmlStreamWriter *xml) const
+{
+    xml->writeTextElement("lastLoadedTimestamp", lastLoadedTimestamp);
+    xml->writeTextElement("deckname", name);
+    xml->writeTextElement("format", gameFormat);
+    xml->writeStartElement("bannerCard");
+    xml->writeAttribute("providerId", bannerCard.providerId);
+    xml->writeCharacters(bannerCard.name);
+    xml->writeEndElement();
+    if (!playmat.card.isEmpty()) {
+        xml->writeStartElement("playmatCard");
+        xml->writeAttribute("providerId", playmat.card.providerId);
+        xml->writeAttribute("marginPctL", QString::number(playmat.params.marginPctL, 'f', 4));
+        xml->writeAttribute("marginPctR", QString::number(playmat.params.marginPctR, 'f', 4));
+        xml->writeAttribute("verticalOffset", QString::number(playmat.params.verticalOffset, 'f', 4));
+        xml->writeAttribute("zoom", QString::number(playmat.params.zoom, 'f', 4));
+        xml->writeCharacters(playmat.card.name);
+        xml->writeEndElement();
+    }
+    xml->writeTextElement("comments", comments);
+
+    // Write tags
+    xml->writeStartElement("tags");
+    for (const QString &tag : tags) {
+        xml->writeTextElement("tag", tag);
+    }
+    xml->writeEndElement();
 }
 
 DeckList::DeckList()
-{
-    root = new InnerDecklistNode;
-}
-
-DeckList::DeckList(const DeckList &other)
-    : metadata(other.metadata), sideboardPlans(other.sideboardPlans), root(new InnerDecklistNode(other.getRoot())),
-      cachedDeckHash(other.cachedDeckHash)
 {
 }
 
 DeckList::DeckList(const QString &nativeString)
 {
-    root = new InnerDecklistNode;
     loadFromString_Native(nativeString);
 }
 
-DeckList::~DeckList()
+DeckList::DeckList(const Metadata &metadata,
+                   const DecklistNodeTree &tree,
+                   const QMap<QString, SideboardPlan> &sideboardPlans)
+    : metadata(metadata), sideboardPlans(sideboardPlans), tree(tree)
 {
-    delete root;
-
-    QMapIterator<QString, SideboardPlan *> i(sideboardPlans);
-    while (i.hasNext())
-        delete i.next().value();
 }
 
-QList<MoveCard_ToZone> DeckList::getCurrentSideboardPlan()
+QList<MoveCard_ToZone> DeckList::getCurrentSideboardPlan() const
 {
-    SideboardPlan *current = sideboardPlans.value(QString(), 0);
-    if (!current)
-        return QList<MoveCard_ToZone>();
-    else
-        return current->getMoveList();
+    if (!sideboardPlans.contains(CURRENT_SIDEBOARD_PLAN_KEY)) {
+        return {};
+    }
+
+    return sideboardPlans.value(CURRENT_SIDEBOARD_PLAN_KEY).getMoveList();
 }
 
 void DeckList::setCurrentSideboardPlan(const QList<MoveCard_ToZone> &plan)
 {
-    SideboardPlan *current = sideboardPlans.value(QString(), 0);
-    if (!current) {
-        current = new SideboardPlan;
-        sideboardPlans.insert(QString(), current);
-    }
-
-    current->setMoveList(plan);
+    sideboardPlans[CURRENT_SIDEBOARD_PLAN_KEY].setMoveList(plan);
 }
 
 bool DeckList::readElement(QXmlStreamReader *xml)
 {
     const QString childName = xml->name().toString();
     if (xml->isStartElement()) {
-        if (childName == "lastLoadedTimestamp") {
-            metadata.lastLoadedTimestamp = xml->readElementText();
-        } else if (childName == "deckname") {
-            metadata.name = xml->readElementText();
-        } else if (childName == "comments") {
-            metadata.comments = xml->readElementText();
-        } else if (childName == "bannerCard") {
-            QString providerId = xml->attributes().value("providerId").toString();
-            QString cardName = xml->readElementText();
-            metadata.bannerCard = {cardName, providerId};
-        } else if (childName == "tags") {
-            metadata.tags.clear(); // Clear existing tags
-            while (xml->readNextStartElement()) {
-                if (xml->name().toString() == "tag") {
-                    metadata.tags.append(xml->readElementText());
-                }
-            }
-        } else if (childName == "zone") {
-            InnerDecklistNode *newZone = getZoneObjFromName(xml->attributes().value("name").toString());
-            newZone->readElement(xml);
+        if (metadata.readElement(xml, childName)) {
+            return true;
+        }
+        if (childName == "zone") {
+            tree.readZoneElement(xml);
         } else if (childName == "sideboard_plan") {
-            SideboardPlan *newSideboardPlan = new SideboardPlan;
-            if (newSideboardPlan->readElement(xml)) {
-                sideboardPlans.insert(newSideboardPlan->getName(), newSideboardPlan);
-            } else {
-                delete newSideboardPlan;
+            SideboardPlan newSideboardPlan;
+            if (newSideboardPlan.readElement(xml)) {
+                sideboardPlans.insert(newSideboardPlan.getName(), newSideboardPlan);
             }
         }
     } else if (xml->isEndElement() && (childName == "cockatrice_deck")) {
@@ -166,45 +202,45 @@ bool DeckList::readElement(QXmlStreamReader *xml)
     return true;
 }
 
-static void writeMetadata(QXmlStreamWriter *xml, const DeckList::Metadata &metadata)
-{
-    xml->writeTextElement("lastLoadedTimestamp", metadata.lastLoadedTimestamp);
-    xml->writeTextElement("deckname", metadata.name);
-    xml->writeStartElement("bannerCard");
-    xml->writeAttribute("providerId", metadata.bannerCard.providerId);
-    xml->writeCharacters(metadata.bannerCard.name);
-    xml->writeEndElement();
-    xml->writeTextElement("comments", metadata.comments);
-
-    // Write tags
-    xml->writeStartElement("tags");
-    for (const QString &tag : metadata.tags) {
-        xml->writeTextElement("tag", tag);
-    }
-    xml->writeEndElement();
-}
-
 void DeckList::write(QXmlStreamWriter *xml) const
 {
     xml->writeStartElement("cockatrice_deck");
     xml->writeAttribute("version", "1");
 
-    writeMetadata(xml, metadata);
+    metadata.write(xml);
 
     // Write zones
-    for (int i = 0; i < root->size(); i++) {
-        root->at(i)->writeElement(xml);
-    }
+    tree.write(xml);
 
     // Write sideboard plans
-    QMapIterator<QString, SideboardPlan *> i(sideboardPlans);
-    while (i.hasNext()) {
-        i.next().value()->write(xml);
+    for (auto &sideboardPlan : sideboardPlans.values()) {
+        sideboardPlan.write(xml);
     }
 
     xml->writeEndElement(); // Close "cockatrice_deck"
 }
 
+bool DeckList::seekToNextElement(QXmlStreamReader *xml)
+{
+    while (!xml->atEnd()) {
+        xml->readNext();
+        if (xml->isStartElement()) {
+            return true;
+        }
+    }
+    return false;
+}
+
+void DeckList::readDeckBody(QXmlStreamReader *xml)
+{
+    while (!xml->atEnd()) {
+        xml->readNext();
+        if (!readElement(xml)) {
+            break;
+        }
+    }
+}
+
 bool DeckList::loadFromXml(QXmlStreamReader *xml)
 {
     if (xml->error()) {
@@ -213,17 +249,11 @@ bool DeckList::loadFromXml(QXmlStreamReader *xml)
     }
 
     cleanList();
-    while (!xml->atEnd()) {
-        xml->readNext();
-        if (xml->isStartElement()) {
-            if (xml->name().toString() != "cockatrice_deck")
-                return false;
-            while (!xml->atEnd()) {
-                xml->readNext();
-                if (!readElement(xml))
-                    break;
-            }
+    while (seekToNextElement(xml)) {
+        if (xml->name().toString() != "cockatrice_deck") {
+            return false;
         }
+        readDeckBody(xml);
     }
     refreshDeckHash();
     if (xml->error()) {
@@ -255,7 +285,7 @@ bool DeckList::loadFromFile_Native(QIODevice *device)
     return loadFromXml(&xml);
 }
 
-bool DeckList::saveToFile_Native(QIODevice *device)
+bool DeckList::saveToFile_Native(QIODevice *device) const
 {
     QXmlStreamWriter xml(device);
     xml.setAutoFormatting(true);
@@ -272,215 +302,34 @@ bool DeckList::saveToFile_Native(QIODevice *device)
  *
  * @param in The text to load
  * @param preserveMetadata If true, don't clear the existing metadata
+ * @param cardNameNormalizer Function that takes the parsed card name string in the text and
  * @return False if the input was empty, true otherwise.
  */
-bool DeckList::loadFromStream_Plain(QTextStream &in, bool preserveMetadata)
+bool DeckList::loadFromStream_Plain(QTextStream &in,
+                                    bool preserveMetadata,
+                                    const std::function<QString(const QString &)> &cardNameNormalizer)
 {
-    const QRegularExpression reCardLine(R"(^\s*[\w\[\(\{].*$)", QRegularExpression::UseUnicodePropertiesOption);
-    const QRegularExpression reEmpty("^\\s*$");
-    const QRegularExpression reComment(R"([\w\[\(\{].*$)", QRegularExpression::UseUnicodePropertiesOption);
-    const QRegularExpression reSBMark("^\\s*sb:\\s*(.+)", QRegularExpression::CaseInsensitiveOption);
-    const QRegularExpression reSBComment("^sideboard\\b.*$", QRegularExpression::CaseInsensitiveOption);
-    const QRegularExpression reDeckComment("^((main)?deck(list)?|mainboard)\\b",
-                                           QRegularExpression::CaseInsensitiveOption);
-
-    // Regex for advanced card parsing
-    const QRegularExpression reMultiplier(R"(^[xX\(\[]*(\d+)[xX\*\)\]]* ?(.+))");
-    const QRegularExpression reSplitCard(R"( ?\/\/ ?)");
-    const QRegularExpression reBrace(R"( ?[\[\{][^\]\}]*[\]\}] ?)"); // not nested
-    const QRegularExpression reRoundBrace(R"(^\([^\)]*\) ?)");       // () are only matched at start of string
-    const QRegularExpression reDigitBrace(R"( ?\(\d*\) ?)");         // () are matched if containing digits
-    const QRegularExpression reBraceDigit(
-        R"( ?\([\dA-Z]+\) *\d+$)"); // () are matched if containing setcode then a number
-    const QRegularExpression reDoubleFacedMarker(R"( ?\(Transform\) ?)");
-
-    // Regex for extracting set code and collector number with attached symbols
-    const QRegularExpression reHyphenFormat(R"(\((\w{3,})\)\s+(\w{3,})-(\d+[^\w\s]*))");
-    const QRegularExpression reRegularFormat(R"(\((\w{3,})\)\s+(\d+[^\w\s]*))");
-
-    const QHash<QRegularExpression, QString> differences{{QRegularExpression("’"), QString("'")},
-                                                         {QRegularExpression("Æ"), QString("Ae")},
-                                                         {QRegularExpression("æ"), QString("ae")},
-                                                         {QRegularExpression(" ?[|/]+ ?"), QString(" // ")}};
-
-    cleanList(preserveMetadata);
-
-    auto inputs = in.readAll().trimmed().split('\n');
-    auto max_line = inputs.size();
-
-    // Start at the first empty line before the first card line
-    auto deckStart = inputs.indexOf(reCardLine);
-    if (deckStart == -1) {
-        if (inputs.indexOf(reComment) == -1) {
-            return false; // Input is empty
-        }
-        deckStart = max_line;
-    } else {
-        deckStart = inputs.lastIndexOf(reEmpty, deckStart);
-        if (deckStart == -1) {
-            deckStart = 0;
-        }
+    if (!preserveMetadata) {
+        metadata = {};
     }
-
-    // find sideboard position, if marks are used this won't be needed
-    int sBStart = -1;
-    if (inputs.indexOf(reSBMark, deckStart) == -1) {
-        sBStart = inputs.indexOf(reSBComment, deckStart);
-        if (sBStart == -1) {
-            sBStart = inputs.indexOf(reEmpty, deckStart + 1);
-            if (sBStart == -1) {
-                sBStart = max_line;
-            }
-            auto nextCard = inputs.indexOf(reCardLine, sBStart + 1);
-            if (inputs.indexOf(reEmpty, nextCard + 1) != -1) {
-                sBStart = max_line;
-            }
-        }
-    }
-
-    int index = 0;
-    QRegularExpressionMatch match;
-
-    // Parse name and comments
-    while (index < deckStart) {
-        const auto &current = inputs.at(index++);
-        if (!current.contains(reEmpty)) {
-            match = reComment.match(current);
-            metadata.name = match.captured();
-            break;
-        }
-    }
-    while (index < deckStart) {
-        const auto &current = inputs.at(index++);
-        if (!current.contains(reEmpty)) {
-            match = reComment.match(current);
-            metadata.comments += match.captured() + '\n';
-        }
-    }
-    metadata.comments.chop(1);
-
-    // Discard empty lines
-    while (index < max_line && inputs.at(index).contains(reEmpty)) {
-        ++index;
-    }
-
-    // Discard line if it starts with deck or mainboard, all cards until the sideboard starts are in the mainboard
-    if (inputs.at(index).contains(reDeckComment)) {
-        ++index;
-    }
-
-    // Parse decklist
-    for (; index < max_line; ++index) {
-        // check if line is a card
-        match = reCardLine.match(inputs.at(index));
-        if (!match.hasMatch())
-            continue;
-
-        QString cardName = match.captured().simplified();
-        bool sideboard = false;
-
-        // Sideboard detection
-        if (sBStart < 0) {
-            match = reSBMark.match(cardName);
-            if (match.hasMatch()) {
-                sideboard = true;
-                cardName = match.captured(1);
-            }
-        } else {
-            if (index == sBStart)
-                continue;
-            sideboard = index > sBStart;
-        }
-
-        // Extract set code, collector number, and foil
-        QString setCode;
-        QString collectorNumber;
-        bool isFoil = false;
-
-        // Check for foil status at the end of the card name
-        if (cardName.endsWith("*F*", Qt::CaseInsensitive)) {
-            isFoil = true;
-            cardName.chop(3); // Remove the "*F*" from the card name
-        }
-        Q_UNUSED(isFoil);
-
-        // Attempt to match the hyphen-separated format (PLST-2094)
-        match = reHyphenFormat.match(cardName);
-        if (match.hasMatch()) {
-            setCode = match.captured(2).toUpper();
-            collectorNumber = match.captured(3);
-            cardName = cardName.left(match.capturedStart()).trimmed();
-        } else {
-            // Attempt to match the regular format (PLST) 2094
-            match = reRegularFormat.match(cardName);
-            if (match.hasMatch()) {
-                setCode = match.captured(1).toUpper();
-                collectorNumber = match.captured(2);
-                cardName = cardName.left(match.capturedStart()).trimmed();
-            }
-        }
-
-        // check if a specific amount is mentioned
-        int amount = 1;
-        match = reMultiplier.match(cardName);
-        if (match.hasMatch()) {
-            amount = match.captured(1).toInt();
-            cardName = match.captured(2);
-        }
-
-        // Handle advanced card types
-        if (cardName.contains(reSplitCard)) {
-            cardName = cardName.split(reSplitCard).join(" // ");
-        }
-
-        if (cardName.contains(reDoubleFacedMarker)) {
-            QStringList faces = cardName.split(reDoubleFacedMarker);
-            cardName = faces.first().trimmed();
-        }
-
-        // Remove unnecessary characters
-        cardName.remove(reBrace);
-        cardName.remove(reRoundBrace); // I'll be entirely honest here, these are split to accommodate just three cards
-        cardName.remove(reDigitBrace); // from un-sets that have a word in between round braces at the end
-        cardName.remove(reBraceDigit); // very specific format with the set code in () and collectors number after
-
-        // Normalize names
-        for (auto diff = differences.constBegin(); diff != differences.constEnd(); ++diff) {
-            cardName.replace(diff.key(), diff.value());
-        }
-
-        // Determine the zone (mainboard/sideboard)
-        QString zoneName = sideboard ? DECK_ZONE_SIDE : DECK_ZONE_MAIN;
-
-        // make new entry in decklist
-        new DecklistCardNode(cardName, amount, getZoneObjFromName(zoneName), -1, setCode, collectorNumber);
-    }
-
+    bool ok = DeckListPlainText::parse(in, cardNameNormalizer, metadata, tree);
     refreshDeckHash();
-    return true;
+    return ok;
 }
 
-InnerDecklistNode *DeckList::getZoneObjFromName(const QString &zoneName)
-{
-    for (int i = 0; i < root->size(); i++) {
-        auto *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
-        if (node->getName() == zoneName) {
-            return node;
-        }
-    }
-
-    return new InnerDecklistNode(zoneName, root);
-}
-
-bool DeckList::loadFromFile_Plain(QIODevice *device)
+bool DeckList::loadFromFile_Plain(QIODevice *device, const std::function<QString(const QString &)> &cardNameNormalizer)
 {
     QTextStream in(device);
-    return loadFromStream_Plain(in, false);
+    return loadFromStream_Plain(in, false, cardNameNormalizer);
 }
 
-bool DeckList::saveToStream_Plain(QTextStream &stream, bool prefixSideboardCards, bool slashTappedOutSplitCards)
+bool DeckList::saveToStream_Plain(QTextStream &stream, bool prefixSideboardCards, bool slashTappedOutSplitCards) const
 {
     auto writeToStream = [&stream, prefixSideboardCards, slashTappedOutSplitCards](const auto node, const auto card) {
+        // The maybeboard is scratch space and never exported.
+        if (node->getName() == DECK_ZONE_MAYBEBOARD) {
+            return;
+        }
         if (prefixSideboardCards && node->getName() == DECK_ZONE_SIDE) {
             stream << "SB: ";
         }
@@ -495,13 +344,13 @@ bool DeckList::saveToStream_Plain(QTextStream &stream, bool prefixSideboardCards
     return true;
 }
 
-bool DeckList::saveToFile_Plain(QIODevice *device, bool prefixSideboardCards, bool slashTappedOutSplitCards)
+bool DeckList::saveToFile_Plain(QIODevice *device, bool prefixSideboardCards, bool slashTappedOutSplitCards) const
 {
     QTextStream out(device);
     return saveToStream_Plain(out, prefixSideboardCards, slashTappedOutSplitCards);
 }
 
-QString DeckList::writeToString_Plain(bool prefixSideboardCards, bool slashTappedOutSplitCards)
+QString DeckList::writeToString_Plain(bool prefixSideboardCards, bool slashTappedOutSplitCards) const
 {
     QString result;
     QTextStream out(&result);
@@ -516,184 +365,70 @@ QString DeckList::writeToString_Plain(bool prefixSideboardCards, bool slashTappe
  */
 void DeckList::cleanList(bool preserveMetadata)
 {
-    root->clearTree();
+    tree.clear();
     if (!preserveMetadata) {
         metadata = {};
     }
     refreshDeckHash();
 }
 
-void DeckList::getCardListHelper(InnerDecklistNode *item, QSet<QString> &result)
+QStringList DeckList::getCardList(const QSet<QString> &restrictToZones) const
 {
-    for (int i = 0; i < item->size(); ++i) {
-        auto *node = dynamic_cast<DecklistCardNode *>(item->at(i));
+    auto nodes = tree.getCardNodes(restrictToZones);
 
-        if (node) {
-            result.insert(node->getName());
-        } else {
-            getCardListHelper(dynamic_cast<InnerDecklistNode *>(item->at(i)), result);
-        }
-    }
+    QStringList result;
+    std::transform(nodes.cbegin(), nodes.cend(), std::back_inserter(result), [](auto node) { return node->getName(); });
+
+    return result;
 }
 
-void DeckList::getCardRefListHelper(InnerDecklistNode *item, QList<CardRef> &result)
+QList<CardRef> DeckList::getCardRefList(const QSet<QString> &restrictToZones) const
 {
-    for (int i = 0; i < item->size(); ++i) {
-        auto *node = dynamic_cast<DecklistCardNode *>(item->at(i));
+    auto nodes = tree.getCardNodes(restrictToZones);
 
-        if (node) {
-            result.append(node->toCardRef());
-        } else {
-            getCardRefListHelper(dynamic_cast<InnerDecklistNode *>(item->at(i)), result);
-        }
-    }
-}
-
-QStringList DeckList::getCardList() const
-{
-    QSet<QString> result;
-    getCardListHelper(root, result);
-    return result.values();
-}
-
-QList<CardRef> DeckList::getCardRefList() const
-{
     QList<CardRef> result;
-    getCardRefListHelper(root, result);
+    std::transform(nodes.cbegin(), nodes.cend(), std::back_inserter(result),
+                   [](auto node) { return node->toCardRef(); });
+
     return result;
 }
 
-QList<DecklistCardNode *> DeckList::getCardNodes(const QStringList &restrictToZones) const
+QList<const DecklistCardNode *> DeckList::getCardNodes(const QSet<QString> &restrictToZones) const
 {
-    QList<DecklistCardNode *> result;
+    return tree.getCardNodes(restrictToZones);
+}
 
-    for (auto *node : *root) {
-        auto *zoneNode = dynamic_cast<InnerDecklistNode *>(node);
-        if (zoneNode == nullptr) {
-            continue;
-        }
-        if (!restrictToZones.isEmpty() && !restrictToZones.contains(node->getName())) {
-            continue;
-        }
-        for (auto *cardNode : *zoneNode) {
-            auto *cardCardNode = dynamic_cast<DecklistCardNode *>(cardNode);
-            if (cardCardNode != nullptr) {
-                result.append(cardCardNode);
-            }
-        }
-    }
-
-    return result;
+QList<const InnerDecklistNode *> DeckList::getZoneNodes(const QSet<QString> &restrictToZones) const
+{
+    return tree.getZoneNodes(restrictToZones);
 }
 
 int DeckList::getSideboardSize() const
 {
-    int size = 0;
-    for (int i = 0; i < root->size(); ++i) {
-        auto *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
-        if (node->getName() != DECK_ZONE_SIDE) {
-            continue;
-        }
+    auto cards = tree.getCardNodes({DECK_ZONE_SIDE});
 
-        for (int j = 0; j < node->size(); j++) {
-            auto *card = dynamic_cast<DecklistCardNode *>(node->at(j));
-            size += card->getNumber();
-        }
+    int size = 0;
+    for (auto card : cards) {
+        size += card->getNumber();
     }
+
     return size;
 }
 
 DecklistCardNode *DeckList::addCard(const QString &cardName,
                                     const QString &zoneName,
-                                    const int position,
+                                    int position,
                                     const QString &cardSetName,
                                     const QString &cardSetCollectorNumber,
-                                    const QString &cardProviderId)
+                                    const QString &cardProviderId,
+                                    bool formatLegal)
 {
-    auto *zoneNode = dynamic_cast<InnerDecklistNode *>(root->findChild(zoneName));
-    if (zoneNode == nullptr) {
-        zoneNode = new InnerDecklistNode(zoneName, root);
-    }
-
-    auto *node =
-        new DecklistCardNode(cardName, 1, zoneNode, position, cardSetName, cardSetCollectorNumber, cardProviderId);
+    auto node =
+        tree.addCard(cardName, 1, zoneName, position, cardSetName, cardSetCollectorNumber, cardProviderId, formatLegal);
     refreshDeckHash();
-
     return node;
 }
 
-bool DeckList::deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode)
-{
-    if (node == root) {
-        return true;
-    }
-
-    bool updateHash = false;
-    if (rootNode == nullptr) {
-        rootNode = root;
-        updateHash = true;
-    }
-
-    int index = rootNode->indexOf(node);
-    if (index != -1) {
-        delete rootNode->takeAt(index);
-
-        if (rootNode->empty()) {
-            deleteNode(rootNode, rootNode->getParent());
-        }
-
-        if (updateHash) {
-            refreshDeckHash();
-        }
-
-        return true;
-    }
-
-    for (int i = 0; i < rootNode->size(); i++) {
-        auto *inner = dynamic_cast<InnerDecklistNode *>(rootNode->at(i));
-        if (inner) {
-            if (deleteNode(node, inner)) {
-                if (updateHash) {
-                    refreshDeckHash();
-                }
-
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-static QString computeDeckHash(const InnerDecklistNode *root)
-{
-    QStringList cardList;
-    QSet<QString> hashZones, optionalZones;
-
-    hashZones << DECK_ZONE_MAIN << DECK_ZONE_SIDE; // Zones in deck to be included in hashing process
-    optionalZones << DECK_ZONE_TOKENS;             // Optional zones in deck not included in hashing process
-
-    for (int i = 0; i < root->size(); i++) {
-        auto *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
-        for (int j = 0; j < node->size(); j++) {
-            if (hashZones.contains(node->getName())) // Mainboard or Sideboard
-            {
-                auto *card = dynamic_cast<DecklistCardNode *>(node->at(j));
-                for (int k = 0; k < card->getNumber(); ++k) {
-                    cardList.append((node->getName() == DECK_ZONE_SIDE ? "SB:" : "") + card->getName().toLower());
-                }
-            }
-        }
-    }
-    cardList.sort();
-    QByteArray deckHashArray = QCryptographicHash::hash(cardList.join(";").toUtf8(), QCryptographicHash::Sha1);
-    quint64 number = (((quint64)(unsigned char)deckHashArray[0]) << 32) +
-                     (((quint64)(unsigned char)deckHashArray[1]) << 24) +
-                     (((quint64)(unsigned char)deckHashArray[2] << 16)) +
-                     (((quint64)(unsigned char)deckHashArray[3]) << 8) + (quint64)(unsigned char)deckHashArray[4];
-    return QString::number(number, 32).rightJustified(8, '0');
-}
-
 /**
  * Gets the deck hash.
  * The hash is computed on the first call to this method, and is cached until the decklist is modified.
@@ -706,7 +441,7 @@ QString DeckList::getDeckHash() const
         return cachedDeckHash;
     }
 
-    cachedDeckHash = computeDeckHash(root);
+    cachedDeckHash = tree.computeDeckHash();
     return cachedDeckHash;
 }
 
@@ -723,15 +458,7 @@ void DeckList::refreshDeckHash()
  */
 void DeckList::forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func) const
 {
-    // Support for this is only possible if the internal structure
-    // doesn't get more complicated.
-    for (int i = 0; i < root->size(); i++) {
-        InnerDecklistNode *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
-        for (int j = 0; j < node->size(); j++) {
-            DecklistCardNode *card = dynamic_cast<DecklistCardNode *>(node->at(j));
-            func(node, card);
-        }
-    }
+    tree.forEachCard(func);
 }
 
 DeckListMemento DeckList::createMemento(const QString &reason) const
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
index d4d1204e6..6796e9c33 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
@@ -1,6 +1,6 @@
 /**
  * @file deck_list.h
- * @brief Defines the DeckList class and supporting types for managing a full
+ * @brief Defines the DeckList class, which manages a full
  *        deck structure including cards, zones, sideboard plans, and
  *        serialization to/from multiple formats. This is a logic class which
  *        does not care about Qt or user facing views.
@@ -11,81 +11,25 @@
 #define DECKLIST_H
 
 #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 <QVector>
-#include <QtCore/QXmlStreamReader>
-#include <libcockatrice/protocol/pb/move_card_to_zone.pb.h>
-#include <libcockatrice/utility/card_ref.h>
+#include <QSet>
+#include <QString>
+#include <QStringList>
+#include <functional>
+#include <libcockatrice/utility/playmat_params.h>
 
-class AbstractDecklistNode;
 class DecklistCardNode;
-class CardDatabase;
 class QIODevice;
 class QTextStream;
-class InnerDecklistNode;
-
-/**
- * @class SideboardPlan
- * @ingroup Decks
- * @brief Represents a predefined sideboarding strategy for a deck.
- *
- * Sideboard plans store a named list of card movements that should be applied
- * between the mainboard and sideboard for a specific matchup. Each movement
- * is expressed using a `MoveCard_ToZone` protobuf message.
- *
- * ### Responsibilities:
- * - Store the plan name and list of moves.
- * - Support XML serialization/deserialization.
- *
- * ### Typical usage:
- * A deck can contain multiple sideboard plans (e.g., "vs Aggro", "vs Control"),
- * each describing how to transform the main deck into its intended configuration.
- */
-class SideboardPlan
-{
-private:
-    QString name;                    ///< Human-readable name of this plan.
-    QList<MoveCard_ToZone> moveList; ///< List of move instructions for this plan.
-
-public:
-    /**
-     * @brief Construct a new SideboardPlan.
-     * @param _name The plan name.
-     * @param _moveList Initial list of card move instructions.
-     */
-    explicit SideboardPlan(const QString &_name = QString(),
-                           const QList<MoveCard_ToZone> &_moveList = QList<MoveCard_ToZone>());
-
-    /**
-     * @brief Read a SideboardPlan from an XML stream.
-     * @param xml XML reader positioned at the plan element.
-     * @return true if parsing succeeded.
-     */
-    bool readElement(QXmlStreamReader *xml);
-
-    /**
-     * @brief Write this SideboardPlan to XML.
-     * @param xml Stream to append the serialized element to.
-     */
-    void write(QXmlStreamWriter *xml);
-
-    /// @return The plan name.
-    [[nodiscard]] QString getName() const
-    {
-        return name;
-    }
-
-    /// @return Const reference to the move list.
-    [[nodiscard]] const QList<MoveCard_ToZone> &getMoveList() const
-    {
-        return moveList;
-    }
-
-    /// @brief Replace the move list with a new one.
-    void setMoveList(const QList<MoveCard_ToZone> &_moveList);
-};
+class QXmlStreamReader;
+class QXmlStreamWriter;
 
 /**
  * @class DeckList
@@ -107,14 +51,14 @@ public:
  * - Provide hashing for deck identity (deck hash).
  *
  * ### Ownership:
- * - Owns the root `InnerDecklistNode` tree.
+ * - Owns the `DecklistNodeTree`.
  * - Owns `SideboardPlan` instances stored in `sideboardPlans`.
  *
  * ### Example workflow:
  * ```
  * DeckList deck;
  * deck.setName("Mono Red Aggro");
- * deck.addCard("Lightning Bolt", "main", -1);
+ * deck.addCard("Lightning Bolt", "main");
  * deck.addTag("Aggro");
  * deck.saveToFile_Native(device);
  * ```
@@ -126,20 +70,39 @@ public:
     {
         QString name;                ///< User-defined deck name.
         QString comments;            ///< Free-form comments or notes.
+        QString gameFormat;          ///< The name of the game format this deck contains legal cards for
         CardRef bannerCard;          ///< Optional representative card for the deck.
         QStringList tags;            ///< User-defined tags for deck classification.
         QString lastLoadedTimestamp; ///< Timestamp string of last load.
+        PlaymatInfo playmat;         ///< Optional playmat background for table+stack zones.
 
         /**
          * @brief Checks if all values (except for lastLoadedTimestamp) in the metadata is empty.
          */
         bool isEmpty() const;
+
+        /**
+         * @brief Reads a single deck metadata element from a Cockatrice deck XML stream.
+         *
+         * @param xml Reader positioned at the element.
+         * @param childName Name of the current element.
+         * @return true if a metadata element was consumed, false if @p childName is
+         *         not a metadata element.
+         */
+        bool readElement(QXmlStreamReader *xml, const QString &childName);
+
+        /**
+         * @brief Writes the deck metadata section of a Cockatrice deck XML file.
+         *
+         * @param xml Writer to append the metadata elements to.
+         */
+        void write(QXmlStreamWriter *xml) const;
     };
 
 private:
-    Metadata metadata;                             ///< Deck metadata that is stored in the deck file
-    QMap<QString, SideboardPlan *> sideboardPlans; ///< Named sideboard plans.
-    InnerDecklistNode *root;                       ///< Root of the deck tree (zones + cards).
+    Metadata metadata;                           ///< Deck metadata that is stored in the deck file
+    QMap<QString, SideboardPlan> sideboardPlans; ///< Named sideboard plans.
+    DecklistNodeTree tree;                       ///< The deck tree (zones + cards).
 
     /**
      * @brief Cached deck hash, recalculated lazily.
@@ -147,13 +110,24 @@ private:
      */
     mutable QString cachedDeckHash;
 
-    // Helpers for traversing the tree
-    static void getCardListHelper(InnerDecklistNode *node, QSet<QString> &result);
-    static void getCardRefListHelper(InnerDecklistNode *item, QList<CardRef> &result);
-    InnerDecklistNode *getZoneObjFromName(const QString &zoneName);
+    /** @name XML load helpers */
+    ///@{
+    /**
+     * @brief Advances to the next element in the XML stream.
+     * @param xml Reader to advance past non-element tokens.
+     * @return true when a start element was reached, false at end of stream.
+     */
+    bool seekToNextElement(QXmlStreamReader *xml);
+
+    /**
+     * @brief Reads the contents of a `cockatrice_deck` element into this deck.
+     * @param xml Reader positioned at the deck element, stopped at its end.
+     */
+    void readDeckBody(QXmlStreamReader *xml);
+    ///@}
 
 public:
-    /// @name Metadata setters
+    /** @name Metadata setters */
     ///@{
     void setName(const QString &_name = QString())
     {
@@ -179,24 +153,45 @@ public:
     {
         metadata.bannerCard = _bannerCard;
     }
+    void setPlaymat(const PlaymatInfo &_playmat = {})
+    {
+        metadata.playmat = _playmat;
+    }
     void setLastLoadedTimestamp(const QString &_lastLoadedTimestamp = QString())
     {
         metadata.lastLoadedTimestamp = _lastLoadedTimestamp;
     }
+    void setGameFormat(const QString &_gameFormat = QString())
+    {
+        metadata.gameFormat = _gameFormat;
+    }
     ///@}
 
-    /// @brief Construct an empty deck.
+    /** @brief Construct an empty deck. */
     explicit DeckList();
-    /// @brief Copy constructor (deep copies the node tree)
-    DeckList(const DeckList &other);
-    /// @brief Construct from a serialized native-format string.
+    /** @brief Construct from a serialized native-format string. */
     explicit DeckList(const QString &nativeString);
-    virtual ~DeckList();
+    /** @brief Construct from components. */
+    DeckList(const Metadata &metadata,
+             const DecklistNodeTree &tree,
+             const QMap<QString, SideboardPlan> &sideboardPlans = {});
 
-    /// @name Metadata getters
-    /// The individual metadata getters still exist for backwards compatibility.
-    /// TODO: Figure out when we can remove them.
+    /**
+     * @brief Gets a pointer to the underlying node tree.
+     * Note: DO NOT call this method unless the object needs to have access to the underlying model.
+     * For now, only the DeckListModel should be calling this.
+     */
+    DecklistNodeTree *getTree()
+    {
+        return &tree;
+    }
+
+    /**
+     * @name Metadata getters
+     * The individual metadata getters still exist for backwards compatibility.
+     */
     ///@{
+    //! \todo Figure out when we can remove them.
     const Metadata &getMetadata() const
     {
         return metadata;
@@ -217,10 +212,18 @@ public:
     {
         return metadata.bannerCard;
     }
+    PlaymatInfo getPlaymat() const
+    {
+        return metadata.playmat;
+    }
     QString getLastLoadedTimestamp() const
     {
         return metadata.lastLoadedTimestamp;
     }
+    QString getGameFormat() const
+    {
+        return metadata.gameFormat;
+    }
     ///@}
 
     bool isBlankDeck() const
@@ -228,17 +231,17 @@ public:
         return metadata.isEmpty() && getCardList().isEmpty();
     }
 
-    /// @name Sideboard plans
+    /** @name Sideboard plans */
     ///@{
-    QList<MoveCard_ToZone> getCurrentSideboardPlan();
+    QList<MoveCard_ToZone> getCurrentSideboardPlan() const;
     void setCurrentSideboardPlan(const QList<MoveCard_ToZone> &plan);
-    const QMap<QString, SideboardPlan *> &getSideboardPlans() const
+    const QMap<QString, SideboardPlan> &getSideboardPlans() const
     {
         return sideboardPlans;
     }
     ///@}
 
-    /// @name Serialization (XML)
+    /** @name Serialization (XML) */
     ///@{
     bool readElement(QXmlStreamReader *xml);
     void write(QXmlStreamWriter *xml) const;
@@ -246,43 +249,44 @@ public:
     bool loadFromString_Native(const QString &nativeString);
     QString writeToString_Native() const;
     bool loadFromFile_Native(QIODevice *device);
-    bool saveToFile_Native(QIODevice *device);
+    bool saveToFile_Native(QIODevice *device) const;
     ///@}
 
-    /// @name Serialization (Plain text)
+    /** @name Serialization (Plain text) */
     ///@{
-    bool loadFromStream_Plain(QTextStream &stream, bool preserveMetadata);
-    bool loadFromFile_Plain(QIODevice *device);
-    bool saveToStream_Plain(QTextStream &stream, bool prefixSideboardCards, bool slashTappedOutSplitCards);
-    bool saveToFile_Plain(QIODevice *device, bool prefixSideboardCards = true, bool slashTappedOutSplitCards = false);
-    QString writeToString_Plain(bool prefixSideboardCards = true, bool slashTappedOutSplitCards = false);
+    bool loadFromStream_Plain(QTextStream &stream,
+                              bool preserveMetadata,
+                              const std::function<QString(const QString &)> &cardNameNormalizer);
+    bool loadFromFile_Plain(QIODevice *device, const std::function<QString(const QString &)> &cardNameNormalizer);
+    bool saveToStream_Plain(QTextStream &stream, bool prefixSideboardCards, bool slashTappedOutSplitCards) const;
+    bool
+    saveToFile_Plain(QIODevice *device, bool prefixSideboardCards = true, bool slashTappedOutSplitCards = false) const;
+    QString writeToString_Plain(bool prefixSideboardCards = true, bool slashTappedOutSplitCards = false) const;
     ///@}
 
-    /// @name Deck manipulation
+    /** @name Deck manipulation */
     ///@{
     void cleanList(bool preserveMetadata = false);
     bool isEmpty() const
     {
-        return root->isEmpty() && metadata.isEmpty() && sideboardPlans.isEmpty();
+        return tree.isEmpty() && metadata.isEmpty() && sideboardPlans.isEmpty();
     }
-    QStringList getCardList() const;
-    QList<CardRef> getCardRefList() const;
-    QList<DecklistCardNode *> getCardNodes(const QStringList &restrictToZones = QStringList()) const;
+    QStringList getCardList(const QSet<QString> &restrictToZones = {}) const;
+    QList<CardRef> getCardRefList(const QSet<QString> &restrictToZones = {}) const;
+    QList<const DecklistCardNode *> getCardNodes(const QSet<QString> &restrictToZones = {}) const;
+    QList<const InnerDecklistNode *> getZoneNodes(const QSet<QString> &restrictToZones = {}) const;
     int getSideboardSize() const;
-    InnerDecklistNode *getRoot() const
-    {
-        return root;
-    }
+
     DecklistCardNode *addCard(const QString &cardName,
                               const QString &zoneName,
-                              int position,
+                              int position = -1,
                               const QString &cardSetName = QString(),
                               const QString &cardSetCollectorNumber = QString(),
-                              const QString &cardProviderId = QString());
-    bool deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode = nullptr);
+                              const QString &cardProviderId = QString(),
+                              const bool formatLegal = true);
     ///@}
 
-    /// @name Deck identity
+    /** @name Deck identity */
     ///@{
     QString getDeckHash() const;
     void refreshDeckHash();
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 83c9cc0bb..cba926fd5 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,5 +1,10 @@
 #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);
@@ -14,40 +19,32 @@ void DeckListHistoryManager::clear()
     emit undoRedoStateChanged();
 }
 
-void DeckListHistoryManager::undo(DeckList *deck)
+void DeckListHistoryManager::restoreAndSwap(QStack<DeckListMemento> &source,
+                                            QStack<DeckListMemento> &target,
+                                            DeckList *deck)
 {
-    if (undoStack.isEmpty())
+    if (source.isEmpty()) {
         return;
+    }
 
-    // Peek at the memento we are going to restore
-    const DeckListMemento &mementoToRestore = undoStack.top();
+    // The reason is read before the source is popped.
+    const QString reason = source.top().getReason();
 
-    // Save current state for redo
-    DeckListMemento currentState = deck->createMemento(mementoToRestore.getReason());
-    redoStack.push(currentState);
+    // Save the current state so the opposite direction can return to it.
+    target.push(deck->createMemento(reason));
 
-    // Pop the last state from undo stack and restore it
-    DeckListMemento memento = undoStack.pop();
-    deck->restoreMemento(memento);
+    // Apply the state we are moving to.
+    deck->restoreMemento(source.pop());
 
     emit undoRedoStateChanged();
 }
 
+void DeckListHistoryManager::undo(DeckList *deck)
+{
+    restoreAndSwap(undoStack, redoStack, deck);
+}
+
 void DeckListHistoryManager::redo(DeckList *deck)
 {
-    if (redoStack.isEmpty())
-        return;
-
-    // Peek at the memento we are going to restore
-    const DeckListMemento &mementoToRestore = redoStack.top();
-
-    // Save current state for undo
-    DeckListMemento currentState = deck->createMemento(mementoToRestore.getReason());
-    undoStack.push(currentState);
-
-    // Pop the next state from redo stack and restore it
-    DeckListMemento memento = redoStack.pop();
-    deck->restoreMemento(memento);
-
-    emit undoRedoStateChanged();
+    restoreAndSwap(redoStack, undoStack, deck);
 }
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 e6bd27e2d..dce9e0af8 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,11 +1,13 @@
 #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
 {
@@ -47,6 +49,13 @@ public:
     }
 
 private:
+    /**
+     * @brief Moves one state from @p source to @p target, applying it to @p deck.
+     *
+     * Used by both undo (undoStack -> redoStack) and redo (redoStack -> undoStack).
+     */
+    void restoreAndSwap(QStack<DeckListMemento> &source, QStack<DeckListMemento> &target, DeckList *deck);
+
     QStack<DeckListMemento> undoStack;
     QStack<DeckListMemento> redoStack;
 };
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
new file mode 100644
index 000000000..5c26030bf
--- /dev/null
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp
@@ -0,0 +1,401 @@
+#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;
+
+namespace
+{
+
+/**
+ * @brief Expands card nodes into one lowercase name entry per copy.
+ *
+ * @param nodes The card nodes to expand.
+ * @param prefix Optional prefix prepended to every entry (e.g. "SB:" for the sideboard).
+ * @return One entry per copy, in node order.
+ */
+QStringList cardNodesToCopies(const QList<const DecklistCardNode *> &nodes, const QString &prefix = {})
+{
+    QStringList result;
+    for (auto node : nodes) {
+        for (int i = 0; i < node->getNumber(); ++i) {
+            result.append(prefix + node->getName().toLower());
+        }
+    }
+    return result;
+}
+
+/**
+ * @brief Packs the first five bytes of a SHA-1 digest into a compact base-32 number.
+ *
+ * The bytes are placed in most-significant-byte-first order (byte 0 shifted by 32,
+ * byte 4 unshifted) so decks that only differ in their low-order hash bytes still
+ * produce distinct identifiers.
+ *
+ * @return The 8-character base-32 representation of the packed number.
+ */
+QString encodeDeckHash(const QByteArray &digest)
+{
+    quint64 number = 0;
+    for (int i = 0; i < 5; ++i) {
+        number |= static_cast<quint64>(static_cast<unsigned char>(digest[i])) << (32 - 8 * i);
+    }
+    return QString::number(number, 32).rightJustified(8, '0');
+}
+
+/**
+ * @brief Collects every card node in @p node's subtree, in tree order.
+ *
+ * @return The collected card nodes.
+ */
+QList<const DecklistCardNode *> collectCardsRecursive(const InnerDecklistNode *node)
+{
+    QList<const DecklistCardNode *> result;
+    for (int i = 0; i < node->size(); i++) {
+        if (auto *card = dynamic_cast<const DecklistCardNode *>(node->at(i))) {
+            result.append(card);
+        } else if (auto *inner = dynamic_cast<const InnerDecklistNode *>(node->at(i))) {
+            result.append(collectCardsRecursive(inner));
+        }
+    }
+    return result;
+}
+
+/**
+ * @brief Invokes @p func on every card in @p node's subtree.
+ *
+ * Cards nested in custom zones are reported with their top-level @p boardZone
+ * so that callers can classify cards by board (main/side/maybeboard/tokens).
+ */
+void forEachCardInNode(InnerDecklistNode *boardZone,
+                       InnerDecklistNode *node,
+                       const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func)
+{
+    for (int i = 0; i < node->size(); i++) {
+        if (auto *card = dynamic_cast<DecklistCardNode *>(node->at(i))) {
+            func(boardZone, card);
+        } else if (auto *inner = dynamic_cast<InnerDecklistNode *>(node->at(i))) {
+            forEachCardInNode(boardZone, inner, func);
+        }
+    }
+}
+
+} // namespace
+
+DecklistNodeTree::DecklistNodeTree() : root(new InnerDecklistNode())
+{
+}
+
+DecklistNodeTree::DecklistNodeTree(const DecklistNodeTree &other) : root(new InnerDecklistNode(other.root))
+{
+}
+
+DecklistNodeTree &DecklistNodeTree::operator=(const DecklistNodeTree &other)
+{
+    if (this != &other) {
+        delete root;
+        root = new InnerDecklistNode(other.root);
+    }
+    return *this;
+}
+
+DecklistNodeTree::~DecklistNodeTree()
+{
+    delete root;
+}
+
+bool DecklistNodeTree::isEmpty() const
+{
+    return root->isEmpty();
+}
+
+void DecklistNodeTree::clear()
+{
+    root->clearTree();
+}
+
+QList<const DecklistCardNode *> DecklistNodeTree::getCardNodes(const QSet<QString> &restrictToZones) const
+{
+    QList<const DecklistCardNode *> result;
+
+    for (auto *zoneNode : getZoneNodes(restrictToZones)) {
+        result.append(collectCardsRecursive(zoneNode));
+    }
+
+    return result;
+}
+
+QList<const InnerDecklistNode *> DecklistNodeTree::getZoneNodes(const QSet<QString> &restrictToZones) const
+{
+    QList<const InnerDecklistNode *> zones;
+    for (auto *node : *root) {
+        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(node);
+        if (!currentZone) {
+            continue;
+        }
+        if (!restrictToZones.isEmpty() && !restrictToZones.contains(currentZone->getName())) {
+            continue;
+        }
+        zones.append(currentZone);
+    }
+
+    return zones;
+}
+
+QString DecklistNodeTree::computeDeckHash() const
+{
+    auto mainDeckNodes = getCardNodes({DECK_ZONE_MAIN});
+    auto sideDeckNodes = getCardNodes({DECK_ZONE_SIDE});
+
+    QStringList cardList = cardNodesToCopies(mainDeckNodes) + cardNodesToCopies(sideDeckNodes, "SB:");
+
+    cardList.sort();
+    QByteArray deckHashArray = QCryptographicHash::hash(cardList.join(";").toUtf8(), QCryptographicHash::Sha1);
+    return encodeDeckHash(deckHashArray);
+}
+
+void DecklistNodeTree::write(QXmlStreamWriter *xml) const
+{
+    for (int i = 0; i < root->size(); i++) {
+        root->at(i)->writeElement(xml);
+    }
+}
+
+void DecklistNodeTree::readZoneElement(QXmlStreamReader *xml)
+{
+    QString zoneName = xml->attributes().value("name").toString();
+    InnerDecklistNode *newZone = getZoneObjFromName(zoneName);
+    totalCards += newZone->readElement(xml, MAX_DECK_SIZE - totalCards);
+}
+
+DecklistCardNode *DecklistNodeTree::addCard(const QString &cardName,
+                                            int amount,
+                                            const QString &zoneName,
+                                            int position,
+                                            const QString &cardSetName,
+                                            const QString &cardSetCollectorNumber,
+                                            const QString &cardProviderId,
+                                            const bool formatLegal)
+{
+    amount = qMin(amount, MAX_DECK_SIZE - totalCards);
+    totalCards += amount;
+    auto *zoneNode = getZoneObjFromName(zoneName);
+    auto *node = new DecklistCardNode(cardName, amount, zoneNode, position, cardSetName, cardSetCollectorNumber,
+                                      cardProviderId, formatLegal);
+    return node;
+}
+
+bool DecklistNodeTree::deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode)
+{
+    if (node == root) {
+        return true;
+    }
+
+    if (rootNode == nullptr) {
+        rootNode = root;
+    }
+
+    int index = rootNode->indexOf(node);
+    if (index != -1) {
+        delete rootNode->takeAt(index);
+        pruneEmptyBoardZone(rootNode);
+        return true;
+    }
+
+    for (int i = 0; i < rootNode->size(); i++) {
+        auto *inner = dynamic_cast<InnerDecklistNode *>(rootNode->at(i));
+        if (inner) {
+            if (deleteNode(node, inner)) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+void DecklistNodeTree::pruneEmptyBoardZone(InnerDecklistNode *container)
+{
+    if (container->isEmpty() && container->getParent() == root) {
+        deleteNode(container, container->getParent());
+    }
+}
+
+void DecklistNodeTree::forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func) const
+{
+    for (int i = 0; i < root->size(); i++) {
+        if (auto *zone = dynamic_cast<InnerDecklistNode *>(root->at(i))) {
+            forEachCardInNode(zone, zone, func);
+        }
+    }
+}
+
+/**
+ * Gets the InnerDecklistNode that is the root node for the given zone, creating a new node if it doesn't exist.
+ *
+ * Top-level zones take precedence, then deck-unique custom zones nested under boards
+ * are resolved. Unknown names create a new top-level zone (legacy behavior).
+ */
+InnerDecklistNode *DecklistNodeTree::getZoneObjFromName(const QString &zoneName)
+{
+    for (int i = 0; i < root->size(); i++) {
+        auto *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
+        if (node && node->getName() == zoneName) {
+            return node;
+        }
+    }
+
+    if (auto *customZone = findCustomZoneByName(zoneName)) {
+        return customZone;
+    }
+
+    return new InnerDecklistNode(zoneName, root);
+}
+
+InnerDecklistNode *DecklistNodeTree::findBoardZone(const QString &boardZoneName) const
+{
+    return dynamic_cast<InnerDecklistNode *>(root->findChild(boardZoneName));
+}
+
+InnerDecklistNode *DecklistNodeTree::findOrCreateBoardZone(const QString &boardZoneName)
+{
+    auto *boardZone = findBoardZone(boardZoneName);
+    if (!boardZone &&
+        (boardZoneName == DECK_ZONE_MAYBEBOARD || boardZoneName == DECK_ZONE_MAIN || boardZoneName == DECK_ZONE_SIDE)) {
+        // The boards are lazy zones: they only exist once cards or custom zones need them.
+        boardZone = new InnerDecklistNode(boardZoneName, root);
+    }
+    return boardZone;
+}
+
+InnerDecklistNode *DecklistNodeTree::addCustomZone(const QString &boardZoneName, const QString &zoneName)
+{
+    if (hasZoneName(zoneName)) {
+        return nullptr;
+    }
+
+    auto *boardZone = findOrCreateBoardZone(boardZoneName);
+
+    if (!boardZone) {
+        return nullptr;
+    }
+
+    return new InnerDecklistNode(zoneName, boardZone);
+}
+
+bool DecklistNodeTree::renameCustomZone(const QString &oldZoneName, const QString &newZoneName)
+{
+    if (hasZoneName(newZoneName)) {
+        return false;
+    }
+
+    auto *zone = findCustomZoneByName(oldZoneName);
+    if (!zone) {
+        return false;
+    }
+
+    zone->setName(newZoneName);
+    return true;
+}
+
+bool DecklistNodeTree::moveCustomZone(const QString &zoneName, const QString &newBoardZoneName)
+{
+    auto *zone = findCustomZoneByName(zoneName);
+    if (!zone) {
+        return false;
+    }
+
+    auto *currentBoardZone = zone->getParent();
+    if (currentBoardZone && currentBoardZone->getName() == newBoardZoneName) {
+        return true;
+    }
+
+    auto *newBoardZone = findOrCreateBoardZone(newBoardZoneName);
+    if (!newBoardZone) {
+        return false;
+    }
+
+    currentBoardZone->removeOne(zone);
+    newBoardZone->append(zone);
+    zone->setParent(newBoardZone);
+    return true;
+}
+
+bool DecklistNodeTree::removeCustomZone(const QString &zoneName)
+{
+    auto *zone = findCustomZoneByName(zoneName);
+    if (!zone) {
+        return false;
+    }
+
+    // Detach and delete without pruning the board zone.
+    auto *boardZone = zone->getParent();
+    boardZone->removeOne(zone);
+    delete zone;
+    return true;
+}
+
+QList<const InnerDecklistNode *> DecklistNodeTree::getCustomZones(const QString &boardZoneName) const
+{
+    QList<const InnerDecklistNode *> result;
+
+    auto *boardZone = findBoardZone(boardZoneName);
+    if (!boardZone) {
+        return result;
+    }
+
+    for (int i = 0; i < boardZone->size(); i++) {
+        if (auto *customZone = dynamic_cast<InnerDecklistNode *>(boardZone->at(i))) {
+            result.append(customZone);
+        }
+    }
+
+    return result;
+}
+
+InnerDecklistNode *DecklistNodeTree::findCustomZoneByName(const QString &zoneName) const
+{
+    for (int i = 0; i < root->size(); i++) {
+        auto *boardZone = dynamic_cast<InnerDecklistNode *>(root->at(i));
+        if (!boardZone) {
+            continue;
+        }
+
+        for (int j = 0; j < boardZone->size(); j++) {
+            auto *customZone = dynamic_cast<InnerDecklistNode *>(boardZone->at(j));
+            if (customZone && customZone->getName() == zoneName) {
+                return customZone;
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+bool DecklistNodeTree::hasZoneName(const QString &zoneName) const
+{
+    // The standard zones are reserved names even before they are created lazily.
+    if (zoneName == DECK_ZONE_MAIN || zoneName == DECK_ZONE_SIDE || zoneName == DECK_ZONE_MAYBEBOARD ||
+        zoneName == DECK_ZONE_TOKENS) {
+        return true;
+    }
+
+    if (root->findChild(zoneName)) {
+        return true;
+    }
+
+    return findCustomZoneByName(zoneName) != nullptr;
+}
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
new file mode 100644
index 000000000..08b4b0d73
--- /dev/null
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h
@@ -0,0 +1,166 @@
+#ifndef COCKATRICE_DECKLIST_NODE_TREE_H
+#define COCKATRICE_DECKLIST_NODE_TREE_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
+{
+    InnerDecklistNode *root; ///< Root of the deck tree (zones + cards).
+    int totalCards = 0;
+
+public:
+    /** @brief Constructs an empty DecklistNodeTree. */
+    explicit DecklistNodeTree();
+    /** @brief Copy constructor. Deep copies the tree. */
+    explicit DecklistNodeTree(const DecklistNodeTree &other);
+    /** @brief Copy-assignment operator. Deep copies the tree. */
+    DecklistNodeTree &operator=(const DecklistNodeTree &other);
+
+    virtual ~DecklistNodeTree();
+
+    /**
+     * @brief Gets a pointer to the underlying root node.
+     * Note: DO NOT call this method unless the object needs to have access to the underlying model.
+     * For now, only the DeckListModel should be calling this.
+     */
+    InnerDecklistNode *getRoot() const
+    {
+        return root;
+    }
+
+    bool isEmpty() const;
+
+    /**
+     * @brief Deletes all nodes except the root.
+     */
+    void clear();
+
+    /**
+     * Gets all card nodes in the tree
+     * @param restrictToZones Only get the nodes in these zones
+     * @return A QList containing all the card nodes in the zone.
+     */
+    QList<const DecklistCardNode *> getCardNodes(const QSet<QString> &restrictToZones = {}) const;
+
+    /**
+     * Gets all zone nodes in the tree
+     * @param restrictToZones If not empty, only get the zone nodes with these names.
+     * @return A QList containing all the zone nodes in the tree.
+     */
+    QList<const InnerDecklistNode *> getZoneNodes(const QSet<QString> &restrictToZones = {}) const;
+
+    /**
+     * @brief Computes the deck hash
+     */
+    QString computeDeckHash() const;
+
+    /**
+     *@brief Writes the contents of the deck to xml
+     */
+    void write(QXmlStreamWriter *xml) const;
+
+    /**
+     * @brief Reads a "zone" section of the xml to this tree
+     */
+    void readZoneElement(QXmlStreamReader *xml);
+
+    DecklistCardNode *addCard(const QString &cardName,
+                              int amount,
+                              const QString &zoneName,
+                              int position,
+                              const QString &cardSetName = QString(),
+                              const QString &cardSetCollectorNumber = QString(),
+                              const QString &cardProviderId = QString(),
+                              const bool formatLegal = true);
+    bool deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode = nullptr);
+
+    /**
+     * @brief Creates a new custom zone nested under a board zone.
+     *
+     * Custom zone names must be unique across the whole deck so that cards can be
+     * added to a custom zone without specifying its board zone.
+     *
+     * @param boardZoneName Name of the board zone (e.g. DECK_ZONE_MAIN).
+     * @param zoneName Name of the custom zone.
+     * @return The created zone node, or nullptr if the name is already in use.
+     */
+    InnerDecklistNode *addCustomZone(const QString &boardZoneName, const QString &zoneName);
+
+    /**
+     * @brief Renames a custom zone.
+     * @return true on success, false if the zone was not found or the new name is taken.
+     */
+    bool renameCustomZone(const QString &oldZoneName, const QString &newZoneName);
+
+    /**
+     * @brief Moves a custom zone (and all its cards) to another board zone.
+     * @return true on success, false if the zone or the new board zone was not found.
+     */
+    bool moveCustomZone(const QString &zoneName, const QString &newBoardZoneName);
+
+    /**
+     * @brief Removes a custom zone and all its cards.
+     * @return true if the zone was found and removed.
+     */
+    bool removeCustomZone(const QString &zoneName);
+
+    /**
+     * @brief Gets all custom zones nested under a board zone.
+     * @param boardZoneName Name of the board zone.
+     * @return The custom zones, in insertion order.
+     */
+    QList<const InnerDecklistNode *> getCustomZones(const QString &boardZoneName) const;
+
+    /**
+     * @brief Checks whether a zone name is taken anywhere in the deck.
+     *
+     * Covers the standard board names and any top-level or nested custom zone.
+     * @param zoneName The checked name.
+     * @return true if the name is reserved or already in use.
+     */
+    bool hasZoneName(const QString &zoneName) const;
+
+    /**
+     * @brief Finds a custom zone anywhere in the deck by name.
+     *
+     * Walks the children of every top-level zone, so a zone nested under any
+     * board (and not just the standard ones) is found.
+     * @param zoneName The zone name to find.
+     * @return The matching zone node, or nullptr if none exists.
+     */
+    InnerDecklistNode *findCustomZoneByName(const QString &zoneName) const;
+
+    /**
+     * @brief Applies a function to every card in the deck tree. This can modify the cards.
+     *
+     * @param func Function taking (top-level board zone node, card node). Cards nested
+     *        in custom zones are reported with their board zone.
+     */
+    void forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func) const;
+
+private:
+    // Helpers for traversing the tree
+    InnerDecklistNode *getZoneObjFromName(const QString &zoneName);
+    InnerDecklistNode *findBoardZone(const QString &boardZoneName) const;
+    InnerDecklistNode *findOrCreateBoardZone(const QString &boardZoneName);
+
+    /**
+     * @brief Recursively removes @p container when it is an empty board zone.
+     *
+     * Empty custom zones are kept while empty board zones get pruned, so a
+     * board zone disappears once its last card or custom zone goes away.
+     */
+    void pruneEmptyBoardZone(InnerDecklistNode *container);
+};
+
+#endif // COCKATRICE_DECKLIST_NODE_TREE_H
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
new file mode 100644
index 000000000..fb6a61769
--- /dev/null
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.cpp
@@ -0,0 +1,207 @@
+#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
+{
+
+bool parse(QTextStream &in,
+           const std::function<QString(const QString &)> &cardNameNormalizer,
+           DeckList::Metadata &metadata,
+           DecklistNodeTree &tree)
+{
+    tree.clear();
+
+    static const QRegularExpression reCardLine(R"(^\s*[\w\[\(\{].*$)", QRegularExpression::UseUnicodePropertiesOption);
+    static const QRegularExpression reEmpty("^\\s*$");
+    static const QRegularExpression reComment(R"([\w\[\(\{].*$)", QRegularExpression::UseUnicodePropertiesOption);
+    static const QRegularExpression reSBMark("^\\s*sb:\\s*(.+)", QRegularExpression::CaseInsensitiveOption);
+    static const QRegularExpression reSBComment("^sideboard\\b.*$", QRegularExpression::CaseInsensitiveOption);
+    static const QRegularExpression reDeckComment("^((main)?deck(list)?|mainboard)\\b",
+                                                  QRegularExpression::CaseInsensitiveOption);
+
+    // 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]*))");
+    static const QRegularExpression reRegularFormat(R"(\((\w{3,})\)\s+(\d+[^\w\s]*))");
+
+    auto inputs = in.readAll().trimmed().split('\n');
+    auto max_line = inputs.size();
+
+    // Start at the first empty line before the first card line
+    auto deckStart = inputs.indexOf(reCardLine);
+    if (deckStart == -1) {
+        if (inputs.indexOf(reComment) == -1) {
+            return false; // Input is empty
+        }
+        deckStart = max_line;
+    } else {
+        deckStart = inputs.lastIndexOf(reEmpty, deckStart);
+        if (deckStart == -1) {
+            deckStart = 0;
+        }
+    }
+
+    // find sideboard position, if marks are used this won't be needed
+    int sBStart = -1;
+    if (inputs.indexOf(reSBMark, deckStart) == -1) {
+        sBStart = inputs.indexOf(reSBComment, deckStart);
+        if (sBStart == -1) {
+            sBStart = inputs.indexOf(reEmpty, deckStart + 1);
+            if (sBStart == -1) {
+                sBStart = max_line;
+            }
+            auto nextCard = inputs.indexOf(reCardLine, sBStart + 1);
+            if (inputs.indexOf(reEmpty, nextCard + 1) != -1) {
+                sBStart = max_line;
+            }
+        }
+    }
+
+    int index = 0;
+    QRegularExpressionMatch match;
+
+    // Parse name and comments
+    while (index < deckStart) {
+        const auto &current = inputs.at(index++);
+        if (!current.contains(reEmpty)) {
+            match = reComment.match(current);
+            metadata.name = match.captured();
+            break;
+        }
+    }
+    while (index < deckStart) {
+        const auto &current = inputs.at(index++);
+        if (!current.contains(reEmpty)) {
+            match = reComment.match(current);
+            metadata.comments += match.captured() + '\n';
+        }
+    }
+    metadata.comments.chop(1);
+
+    // Discard empty lines
+    while (index < max_line && inputs.at(index).contains(reEmpty)) {
+        ++index;
+    }
+
+    // Discard line if it starts with deck or mainboard, all cards until the sideboard starts are in the mainboard
+    if (inputs.at(index).contains(reDeckComment)) {
+        ++index;
+    }
+
+    // Parse decklist
+    for (; index < max_line; ++index) {
+        // check if line is a card
+        match = reCardLine.match(inputs.at(index));
+        if (!match.hasMatch()) {
+            continue;
+        }
+
+        const QString rawLine = match.captured();
+        QString cardName = rawLine.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) {
+            match = reSBMark.match(cardName);
+            if (match.hasMatch()) {
+                sideboard = true;
+                cardName = match.captured(1);
+            }
+        } else {
+            if (index == sBStart) {
+                continue;
+            }
+            sideboard = index > sBStart;
+        }
+
+        // Extract set code, collector number, and foil
+        QString setCode;
+        QString collectorNumber;
+        bool isFoil = false;
+
+        // Check for foil status at the end of the card name
+        if (cardName.endsWith("*F*", Qt::CaseInsensitive)) {
+            isFoil = true;
+            cardName.chop(3); // Remove the "*F*" from the card name
+        }
+        Q_UNUSED(isFoil);
+
+        // Attempt to match the hyphen-separated format (PLST-2094)
+        match = reHyphenFormat.match(cardName);
+        if (match.hasMatch()) {
+            setCode = match.captured(2).toUpper();
+            collectorNumber = match.captured(3);
+            cardName = cardName.left(match.capturedStart()).trimmed();
+        } else {
+            // Attempt to match the regular format (PLST) 2094
+            match = reRegularFormat.match(cardName);
+            if (match.hasMatch()) {
+                setCode = match.captured(1).toUpper();
+                collectorNumber = match.captured(2);
+                cardName = cardName.left(match.capturedStart()).trimmed();
+            }
+        }
+
+        // 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);
+            }
+        }
+
+        // Normalize the card name
+        cardName = cardNameNormalizer(cardName);
+
+        // Determine the zone (mainboard/sideboard)
+        QString zoneName = sideboard ? DECK_ZONE_SIDE : DECK_ZONE_MAIN;
+
+        // make new entry in decklist
+        tree.addCard(cardName, amount, zoneName, -1, setCode, collectorNumber);
+    }
+
+    return true;
+}
+
+} // namespace DeckListPlainText
\ No newline at end of file
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
new file mode 100644
index 000000000..0845f7935
--- /dev/null
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.h
@@ -0,0 +1,34 @@
+#ifndef COCKATRICE_DECK_LIST_PLAIN_TEXT_PARSER_H
+#define COCKATRICE_DECK_LIST_PLAIN_TEXT_PARSER_H
+
+#include "deck_list.h"
+
+#include <functional>
+
+class QTextStream;
+class DecklistNodeTree;
+class QString;
+
+namespace DeckListPlainText
+{
+
+/**
+ * @brief Parses a plain-text deck list into a tree and its metadata.
+ *
+ * Clears the tree first, then fills both from the text.
+ *
+ * @param in The text to load
+ * @param cardNameNormalizer Function that takes the parsed card name string
+ *        in the text and returns the name to store
+ * @param metadata Deck metadata written by the parser
+ * @param tree Deck tree the parser adds cards to
+ * @return False if the input was empty, true otherwise.
+ */
+bool parse(QTextStream &in,
+           const std::function<QString(const QString &)> &cardNameNormalizer,
+           DeckList::Metadata &metadata,
+           DecklistNodeTree &tree);
+
+} // namespace DeckListPlainText
+
+#endif // COCKATRICE_DECK_LIST_PLAIN_TEXT_PARSER_H
\ No newline at end of file
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.cpp
new file mode 100644
index 000000000..d1d44cca5
--- /dev/null
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.cpp
@@ -0,0 +1,60 @@
+#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,
+                                    const QList<PlaymatInfo> &fallbackList,
+                                    PlaymatFallbackMode fallbackMode,
+                                    int rotationIndex)
+{
+    if (!force.card.isEmpty()) {
+        return force;
+    }
+
+    const PlaymatInfo &deckPlaymat = deck.getPlaymat();
+    if (!deckPlaymat.card.isEmpty()) {
+        return deckPlaymat;
+    }
+
+    if (fallbackList.isEmpty()) {
+        return {};
+    }
+
+    switch (fallbackMode) {
+        case PlaymatFallbackModeFixed:
+            return fallbackList.first();
+        case PlaymatFallbackModeRoundRobin:
+            return fallbackList.at(rotationIndex % fallbackList.size());
+        case PlaymatFallbackModeRandom:
+            return fallbackList.at(QRandomGenerator::global()->bounded(fallbackList.size()));
+    }
+
+    return {};
+}
+
+PlaymatInfo resolvePlaymatForDeck(const DeckList &deck,
+                                  const QList<PlaymatInfo> &fallbackList,
+                                  PlaymatMode mode,
+                                  PlaymatFallbackMode fallbackBehavior,
+                                  int rotationIndex)
+{
+    switch (mode) {
+        case PlaymatModeOverrideDeck: {
+            const DeckList emptyDeck;
+            return resolveEffectivePlaymat(emptyDeck, {}, fallbackList, fallbackBehavior, rotationIndex);
+        }
+        case PlaymatModeFallback:
+            return resolveEffectivePlaymat(deck, {}, fallbackList, fallbackBehavior, rotationIndex);
+        case PlaymatModeDeckOnly:
+            return deck.getPlaymat();
+    }
+
+    return {};
+}
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.h b/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.h
new file mode 100644
index 000000000..411ca81fd
--- /dev/null
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/playmat_resolver.h
@@ -0,0 +1,50 @@
+#ifndef COCKATRICE_PLAYMAT_RESOLVER_H
+#define COCKATRICE_PLAYMAT_RESOLVER_H
+
+#include "libcockatrice/utility/playmat_params.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.
+ *
+ * @param deck The deck to resolve a playmat for.
+ * @param force An optional user-level override; wins over everything. Pass an
+ *              empty @ref PlaymatInfo::card to skip it.
+ * @param fallbackList User-level fallback playmats, consulted only when the
+ *                     deck has no configured playmat.
+ * @param fallbackMode How @p fallbackList is consulted (ignored when empty).
+ * @param rotationIndex In/out cursor for @c PlaymatFallbackModeRoundRobin;
+ *                      advanced once per call. Unused for the other modes.
+ * @return The effective playmat; an empty @ref PlaymatInfo::card when
+ *         nothing in the chain resolves.
+ */
+PlaymatInfo resolveEffectivePlaymat(const DeckList &deck,
+                                    const PlaymatInfo &force,
+                                    const QList<PlaymatInfo> &fallbackList,
+                                    PlaymatFallbackMode fallbackMode,
+                                    int rotationIndex);
+
+/**
+ * @brief Resolves the playmat to display for a deck according to the user's
+ *        collection mode (@ref PlaymatMode), combining the deck with the
+ *        given fallback list.
+ *
+ * @param deck The deck to resolve a playmat for.
+ * @param fallbackList User-level fallback playmats.
+ * @param mode How the collection interacts with the deck-configured playmat.
+ * @param fallbackBehavior How @p fallbackList is picked from.
+ * @param rotationIndex Cursor for @c PlaymatFallbackModeRoundRobin.
+ * @return The effective playmat; an empty @ref PlaymatInfo::card when nothing resolves.
+ */
+PlaymatInfo resolvePlaymatForDeck(const DeckList &deck,
+                                  const QList<PlaymatInfo> &fallbackList,
+                                  PlaymatMode mode,
+                                  PlaymatFallbackMode fallbackBehavior,
+                                  int rotationIndex);
+
+#endif // COCKATRICE_PLAYMAT_RESOLVER_H
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
new file mode 100644
index 000000000..3a47bf1a5
--- /dev/null
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
@@ -0,0 +1,77 @@
+#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
+{
+
+void readMoveCardToZone(QXmlStreamReader *xml, QList<MoveCard_ToZone> &moveList)
+{
+    MoveCard_ToZone move;
+    while (!xml->atEnd()) {
+        xml->readNext();
+        const QString childName = xml->name().toString();
+        if (xml->isStartElement()) {
+            if (childName == "card_name") {
+                move.set_card_name(xml->readElementText().toStdString());
+            } else if (childName == "start_zone") {
+                move.set_start_zone(xml->readElementText().toStdString());
+            } else if (childName == "target_zone") {
+                move.set_target_zone(xml->readElementText().toStdString());
+            }
+        } else if (xml->isEndElement() && (childName == "move_card_to_zone")) {
+            moveList.append(move);
+            return;
+        }
+    }
+}
+
+} // namespace
+
+SideboardPlan::SideboardPlan(const QString &_name, const QList<MoveCard_ToZone> &_moveList)
+    : name(_name), moveList(_moveList)
+{
+}
+
+void SideboardPlan::setMoveList(const QList<MoveCard_ToZone> &_moveList)
+{
+    moveList = _moveList;
+}
+
+bool SideboardPlan::readElement(QXmlStreamReader *xml)
+{
+    while (!xml->atEnd()) {
+        xml->readNext();
+        const QString childName = xml->name().toString();
+        if (xml->isStartElement()) {
+            if (childName == "name") {
+                name = xml->readElementText();
+            } else if (childName == "move_card_to_zone") {
+                readMoveCardToZone(xml, moveList);
+            }
+        } else if (xml->isEndElement() && (childName == "sideboard_plan")) {
+            return true;
+        }
+    }
+    return false;
+}
+
+void SideboardPlan::write(QXmlStreamWriter *xml) const
+{
+    xml->writeStartElement("sideboard_plan");
+    xml->writeTextElement("name", name);
+    for (auto &i : moveList) {
+        xml->writeStartElement("move_card_to_zone");
+        xml->writeTextElement("card_name", QString::fromStdString(i.card_name()));
+        xml->writeTextElement("start_zone", QString::fromStdString(i.start_zone()));
+        xml->writeTextElement("target_zone", QString::fromStdString(i.target_zone()));
+        xml->writeEndElement();
+    }
+    xml->writeEndElement();
+}
\ No newline at end of file
diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h
new file mode 100644
index 000000000..ee29991d6
--- /dev/null
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.h
@@ -0,0 +1,71 @@
+#ifndef COCKATRICE_SIDEBOARD_PLAN_H
+#define COCKATRICE_SIDEBOARD_PLAN_H
+
+#include <QList>
+#include <QString>
+#include <libcockatrice/protocol/pb/move_card_to_zone.pb.h>
+
+class QXmlStreamWriter;
+class QXmlStreamReader;
+
+/**
+ * @class SideboardPlan
+ * @ingroup Decks
+ * @brief Represents a predefined sideboarding strategy for a deck.
+ *
+ * Sideboard plans store a named list of card movements that should be applied
+ * between the mainboard and sideboard for a specific matchup. Each movement
+ * is expressed using a `MoveCard_ToZone` protobuf message.
+ *
+ * ### Responsibilities:
+ * - Store the plan name and list of moves.
+ * - Support XML serialization/deserialization.
+ *
+ * ### Typical usage:
+ * A deck can contain multiple sideboard plans (e.g., "vs Aggro", "vs Control"),
+ * each describing how to transform the main deck into its intended configuration.
+ */
+class SideboardPlan
+{
+private:
+    QString name;                    ///< Human-readable name of this plan.
+    QList<MoveCard_ToZone> moveList; ///< List of move instructions for this plan.
+
+public:
+    /**
+     * @brief Construct a new SideboardPlan.
+     * @param _name The plan name.
+     * @param _moveList Initial list of card move instructions.
+     */
+    explicit SideboardPlan(const QString &_name = "", const QList<MoveCard_ToZone> &_moveList = {});
+
+    /**
+     * @brief Read a SideboardPlan from an XML stream.
+     * @param xml XML reader positioned at the plan element.
+     * @return true if parsing succeeded.
+     */
+    bool readElement(QXmlStreamReader *xml);
+
+    /**
+     * @brief Write this SideboardPlan to XML.
+     * @param xml Stream to append the serialized element to.
+     */
+    void write(QXmlStreamWriter *xml) const;
+
+    /** @return The plan name. */
+    [[nodiscard]] QString getName() const
+    {
+        return name;
+    }
+
+    /** @return Const reference to the move list. */
+    [[nodiscard]] const QList<MoveCard_ToZone> &getMoveList() const
+    {
+        return moveList;
+    }
+
+    /** @brief Replace the move list with a new one. */
+    void setMoveList(const QList<MoveCard_ToZone> &_moveList);
+};
+
+#endif // COCKATRICE_SIDEBOARD_PLAN_H
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 b8a497c20..5c7b4bf84 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,5 +1,10 @@
 #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) {
@@ -34,16 +39,6 @@ bool AbstractDecklistCardNode::compareName(AbstractDecklistNode *other) const
     }
 }
 
-bool AbstractDecklistCardNode::readElement(QXmlStreamReader *xml)
-{
-    while (!xml->atEnd()) {
-        xml->readNext();
-        if (xml->isEndElement() && xml->name().toString() == "card")
-            return false;
-    }
-    return true;
-}
-
 void AbstractDecklistCardNode::writeElement(QXmlStreamWriter *xml)
 {
     xml->writeEmptyElement("card");
@@ -59,4 +54,4 @@ void AbstractDecklistCardNode::writeElement(QXmlStreamWriter *xml)
     if (!getCardProviderId().isEmpty()) {
         xml->writeAttribute("uuid", getCardProviderId());
     }
-}
\ No newline at end of file
+}
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 1d201a4c1..ebfd9a0b6 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,6 +13,10 @@
 
 #include "abstract_deck_list_node.h"
 
+#include <QString>
+
+class InnerDecklistNode;
+
 /**
  * @class AbstractDecklistCardNode
  * @ingroup DeckModels
@@ -58,36 +62,42 @@ public:
     {
     }
 
-    /// @return The number of copies of this card in the deck.
+    /** @return The number of copies of this card in the deck. */
     [[nodiscard]] virtual int getNumber() const = 0;
 
-    /// @param _number Set the number of copies of this card.
+    /** @param _number Set the number of copies of this card. */
     virtual void setNumber(int _number) = 0;
 
-    /// @return The display name of this card.
+    /** @return The display name of this card. */
     [[nodiscard]] QString getName() const override = 0;
 
-    /// @param _name Set the display name of this card.
+    /** @param _name Set the display name of this card. */
     virtual void setName(const QString &_name) = 0;
 
-    /// @return The provider identifier for this card (e.g., UUID).
+    /** @return The provider identifier for this card (e.g., UUID). */
     [[nodiscard]] virtual QString getCardProviderId() const override = 0;
 
-    /// @param _cardProviderId Set the provider identifier for this card.
+    /** @param _cardProviderId Set the provider identifier for this card. */
     virtual void setCardProviderId(const QString &_cardProviderId) = 0;
 
-    /// @return The abbreviated set code (e.g., "NEO").
+    /** @return The abbreviated set code (e.g., "NEO"). */
     [[nodiscard]] virtual QString getCardSetShortName() const override = 0;
 
-    /// @param _cardSetShortName Set the abbreviated set code.
+    /** @param _cardSetShortName Set the abbreviated set code. */
     virtual void setCardSetShortName(const QString &_cardSetShortName) = 0;
 
-    /// @return The collector number of the card within its set.
+    /** @return The collector number of the card within its set. */
     [[nodiscard]] virtual QString getCardCollectorNumber() const override = 0;
 
-    /// @param _cardSetNumber Set the collector number.
+    /** @param _cardSetNumber Set the collector number. */
     virtual void setCardCollectorNumber(const QString &_cardSetNumber) = 0;
 
+    /** @return The format legality of the card. */
+    virtual bool getFormatLegality() const = 0;
+
+    /** @param _formatLegal If the card is considered legal. */
+    virtual void setFormatLegality(const bool _formatLegal) = 0;
+
     /**
      * @brief Get the height of this node in the tree.
      *
@@ -128,15 +138,6 @@ public:
      */
     bool compareName(AbstractDecklistNode *other) const;
 
-    /**
-     * @brief Deserialize this node’s properties from XML.
-     * @param xml QXmlStreamReader positioned at the element.
-     * @return true if parsing succeeded.
-     *
-     * This supports loading deck files from Cockatrice’s XML format.
-     */
-    bool readElement(QXmlStreamReader *xml) override;
-
     /**
      * @brief Serialize this node’s properties to XML.
      * @param xml Writer to append this node’s XML element.
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 877705705..406c6fb4d 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,7 +17,9 @@
 #ifndef COCKATRICE_ABSTRACT_DECK_LIST_NODE_H
 #define COCKATRICE_ABSTRACT_DECK_LIST_NODE_H
 
-#include <QtCore/QXmlStreamWriter>
+#include <QString>
+
+class QXmlStreamWriter;
 
 /**
  * @enum DeckSortMethod
@@ -101,7 +103,7 @@ public:
      */
     explicit AbstractDecklistNode(InnerDecklistNode *_parent = nullptr, int position = -1);
 
-    /// Virtual destructor. Child classes must clean up their resources.
+    /** @brief Virtual destructor. Child classes must clean up their resources. */
     virtual ~AbstractDecklistNode() = default;
 
     /**
@@ -136,12 +138,18 @@ public:
      */
     [[nodiscard]] virtual bool isDeckHeader() const = 0;
 
-    /// @return The parent node, or nullptr if this is the root.
+    /** @return The parent node, or nullptr if this is the root. */
     [[nodiscard]] InnerDecklistNode *getParent() const
     {
         return parent;
     }
 
+    /** @param newParent Reparent this node. The new parent takes ownership. */
+    void setParent(InnerDecklistNode *newParent)
+    {
+        parent = newParent;
+    }
+
     /**
      * @brief Compute the depth of this node in the tree.
      * @return Distance from the root (root = 0, children = 1, etc.).
@@ -173,11 +181,10 @@ public:
 
     /**
      * @name XML serialization
-     * These methods support reading and writing decks from/to
+     * This method supports writing this node and its children to the
      * Cockatrice deck XML format.
      * @{
      */
-    virtual bool readElement(QXmlStreamReader *xml) = 0;
     virtual void writeElement(QXmlStreamWriter *xml) = 0;
     /// @}
 };
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 1791c09a6..803737f1e 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,5 +1,9 @@
 #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 c2fe038e6..c96a764af 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,7 +14,11 @@
 
 #include "abstract_deck_list_card_node.h"
 
+#include <QString>
 #include <libcockatrice/utility/card_ref.h>
+#include <utility>
+
+class InnerDecklistNode;
 
 /**
  * @class DecklistCardNode
@@ -51,6 +55,7 @@ class DecklistCardNode : public AbstractDecklistCardNode
     QString cardSetShortName; ///< Short set code (e.g., "NEO").
     QString cardSetNumber;    ///< Collector number within the set.
     QString cardProviderId;   ///< External provider identifier (e.g., UUID).
+    bool formatLegal;         ///< Format legality
 
 public:
     /**
@@ -63,6 +68,7 @@ public:
      * @param _cardSetShortName Short set code (e.g., "NEO").
      * @param _cardSetNumber Collector number within the set.
      * @param _cardProviderId External provider ID (e.g., UUID).
+     * @param _formatLegality If the card is legal in the format
      *
      * On construction, if a parent is provided, this node is inserted into
      * the parent’s children list automatically.
@@ -73,10 +79,11 @@ public:
                               int position = -1,
                               QString _cardSetShortName = QString(),
                               QString _cardSetNumber = QString(),
-                              QString _cardProviderId = QString())
+                              QString _cardProviderId = QString(),
+                              bool _formatLegality = true)
         : AbstractDecklistCardNode(_parent, position), name(std::move(_name)), number(_number),
           cardSetShortName(std::move(_cardSetShortName)), cardSetNumber(std::move(_cardSetNumber)),
-          cardProviderId(std::move(_cardProviderId))
+          cardProviderId(std::move(_cardProviderId)), formatLegal(_formatLegality)
     {
     }
 
@@ -90,67 +97,79 @@ public:
      */
     explicit DecklistCardNode(DecklistCardNode *other, InnerDecklistNode *_parent);
 
-    /// @return The quantity of this card.
+    /** @return The quantity of this card. */
     [[nodiscard]] int getNumber() const override
     {
         return number;
     }
 
-    /// @param _number Set the quantity of this card.
+    /** @param _number Set the quantity of this card. */
     void setNumber(int _number) override
     {
         number = _number;
     }
 
-    /// @return The display name of this card.
+    /** @return The display name of this card. */
     [[nodiscard]] QString getName() const override
     {
         return name;
     }
 
-    /// @param _name Set the display name of this card.
+    /** @param _name Set the display name of this card. */
     void setName(const QString &_name) override
     {
         name = _name;
     }
 
-    /// @return The provider identifier for this card.
+    /** @return The provider identifier for this card. */
     [[nodiscard]] QString getCardProviderId() const override
     {
         return cardProviderId;
     }
 
-    /// @param _providerId Set the provider identifier for this card.
+    /** @param _providerId Set the provider identifier for this card. */
     void setCardProviderId(const QString &_providerId) override
     {
         cardProviderId = _providerId;
     }
 
-    /// @return The short set code (e.g., "NEO").
+    /** @return The short set code (e.g., "NEO"). */
     [[nodiscard]] QString getCardSetShortName() const override
     {
         return cardSetShortName;
     }
 
-    /// @param _cardSetShortName Set the short set code.
+    /** @param _cardSetShortName Set the short set code. */
     void setCardSetShortName(const QString &_cardSetShortName) override
     {
         cardSetShortName = _cardSetShortName;
     }
 
-    /// @return The collector number of this card within its set.
+    /** @return The collector number of this card within its set. */
     [[nodiscard]] QString getCardCollectorNumber() const override
     {
         return cardSetNumber;
     }
 
-    /// @param _cardSetNumber Set the collector number.
+    /** @param _cardSetNumber Set the collector number. */
     void setCardCollectorNumber(const QString &_cardSetNumber) override
     {
         cardSetNumber = _cardSetNumber;
     }
 
-    /// @return Always false; card nodes are not deck headers.
+    /** @return The format legality of the card. */
+    [[nodiscard]] bool getFormatLegality() const override
+    {
+        return formatLegal;
+    }
+
+    /** @param _formatLegal If the card is considered legal. */
+    void setFormatLegality(const bool _formatLegal) override
+    {
+        formatLegal = _formatLegal;
+    }
+
+    /** @return Always false; card nodes are not deck headers. */
     [[nodiscard]] bool isDeckHeader() const override
     {
         return false;
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 eca58963a..b7b1e0b8f 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,6 +1,18 @@
 #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())
@@ -28,6 +40,8 @@ QString InnerDecklistNode::visibleNameFromName(const QString &_name)
         return QObject::tr("Sideboard");
     } else if (_name == DECK_ZONE_TOKENS) {
         return QObject::tr("Tokens");
+    } else if (_name == DECK_ZONE_MAYBEBOARD) {
+        return QObject::tr("Maybeboard");
     } else {
         return _name;
     }
@@ -41,6 +55,13 @@ void InnerDecklistNode::setSortMethod(DeckSortMethod method)
     }
 }
 
+const QList<QString> &InnerDecklistNode::boardZoneNames()
+{
+    static const QList<QString> names = {QString(DECK_ZONE_MAIN), QString(DECK_ZONE_SIDE),
+                                         QString(DECK_ZONE_MAYBEBOARD)};
+    return names;
+}
+
 QString InnerDecklistNode::getVisibleName() const
 {
     return visibleNameFromName(name);
@@ -48,8 +69,9 @@ QString InnerDecklistNode::getVisibleName() const
 
 void InnerDecklistNode::clearTree()
 {
-    for (int i = 0; i < size(); i++)
+    for (int i = 0; i < size(); i++) {
         delete at(i);
+    }
     clear();
 }
 
@@ -84,6 +106,9 @@ AbstractDecklistNode *InnerDecklistNode::findCardChildByNameProviderIdAndNumber(
 
 int InnerDecklistNode::height() const
 {
+    if (isEmpty()) {
+        return 1;
+    }
     return at(0)->height() + 1;
 }
 
@@ -138,62 +163,76 @@ bool InnerDecklistNode::compareName(AbstractDecklistNode *other) const
     }
 }
 
-bool InnerDecklistNode::readElement(QXmlStreamReader *xml)
+int InnerDecklistNode::readCardElement(QXmlStreamReader *xml, int remainingBudget)
 {
+    const int amount = qMin(xml->attributes().value("number").toString().toInt(), remainingBudget);
+    new DecklistCardNode(xml->attributes().value("name").toString(), amount, this, -1,
+                         xml->attributes().value("setShortName").toString(),
+                         xml->attributes().value("collectorNumber").toString(),
+                         xml->attributes().value("uuid").toString());
+    return amount;
+}
+
+int InnerDecklistNode::readElement(QXmlStreamReader *xml, int limit)
+{
+    int totalCards = 0;
     while (!xml->atEnd()) {
         xml->readNext();
         const QString childName = xml->name().toString();
+        const int remainingBudget = limit - totalCards;
         if (xml->isStartElement()) {
             if (childName == "zone") {
                 auto *newZone = new InnerDecklistNode(xml->attributes().value("name").toString(), this);
-                newZone->readElement(xml);
+                totalCards += newZone->readElement(xml, remainingBudget);
             } else if (childName == "card") {
-                auto *newCard = new DecklistCardNode(
-                    xml->attributes().value("name").toString(), xml->attributes().value("number").toString().toInt(),
-                    this, -1, xml->attributes().value("setShortName").toString(),
-                    xml->attributes().value("collectorNumber").toString(), xml->attributes().value("uuid").toString());
-                newCard->readElement(xml);
+                totalCards += readCardElement(xml, remainingBudget);
             }
-        } else if (xml->isEndElement() && (childName == "zone"))
-            return false;
+        } else if (xml->isEndElement() && (childName == "zone")) {
+            return totalCards;
+        }
     }
-    return true;
+    return totalCards;
 }
 
 void InnerDecklistNode::writeElement(QXmlStreamWriter *xml)
 {
     xml->writeStartElement("zone");
     xml->writeAttribute("name", name);
-    for (int i = 0; i < size(); i++)
+    for (int i = 0; i < size(); i++) {
         at(i)->writeElement(xml);
+    }
     xml->writeEndElement(); // zone
 }
 
+QVector<QPair<int, AbstractDecklistNode *>> InnerDecklistNode::indexedSnapshot() const
+{
+    QVector<QPair<int, AbstractDecklistNode *>> snapshot(size());
+    for (int i = size() - 1; i >= 0; --i) {
+        snapshot[i].first = i;
+        snapshot[i].second = at(i);
+    }
+    return snapshot;
+}
+
+QVector<QPair<int, int>> InnerDecklistNode::applySortedOrder(const QVector<QPair<int, AbstractDecklistNode *>> &sorted)
+{
+    QVector<QPair<int, int>> result(size());
+    for (int i = size() - 1; i >= 0; --i) {
+        result[i].first = sorted[i].first;
+        result[i].second = i;
+        replace(i, sorted[i].second);
+    }
+    return result;
+}
+
 QVector<QPair<int, int>> InnerDecklistNode::sort(Qt::SortOrder order)
 {
-    QVector<QPair<int, int>> result(size());
+    auto snapshot = indexedSnapshot();
 
-    // Initialize temporary list with contents of current list
-    QVector<QPair<int, AbstractDecklistNode *>> tempList(size());
-    for (int i = size() - 1; i >= 0; --i) {
-        tempList[i].first = i;
-        tempList[i].second = at(i);
-    }
-
-    // Sort temporary list
     auto cmp = [order](const auto &a, const auto &b) {
         return (order == Qt::AscendingOrder) ? (b.second->compare(a.second)) : (a.second->compare(b.second));
     };
+    std::sort(snapshot.begin(), snapshot.end(), cmp);
 
-    std::sort(tempList.begin(), tempList.end(), cmp);
-
-    // Map old indexes to new indexes and
-    // copy temporary list to the current one
-    for (int i = size() - 1; i >= 0; --i) {
-        result[i].first = tempList[i].first;
-        result[i].second = i;
-        replace(i, tempList[i].second);
-    }
-
-    return result;
-}
\ No newline at end of file
+    return applySortedOrder(snapshot);
+}
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 f4c48afce..6086f9efa 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
@@ -18,12 +18,23 @@
 
 #include "abstract_deck_list_node.h"
 
-/// Constant for the "main" deck zone name.
+#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"
-/// Constant for the "sideboard" zone name.
+/** @brief Constant for the "sideboard" zone name. */
 #define DECK_ZONE_SIDE "side"
-/// Constant for the "tokens" zone name.
+/** @brief Constant for the "tokens" zone name. */
 #define DECK_ZONE_TOKENS "tokens"
+/** @brief Constant for the "maybeboard" zone name. */
+#define DECK_ZONE_MAYBEBOARD "maybeboard"
 
 /**
  * @class InnerDecklistNode
@@ -93,13 +104,13 @@ public:
      */
     void setSortMethod(DeckSortMethod method) override;
 
-    /// @return The internal name of this node.
+    /** @return The internal name of this node. */
     [[nodiscard]] QString getName() const override
     {
         return name;
     }
 
-    /// @param _name Set the internal name of this node.
+    /** @param _name Set the internal name of this node. */
     void setName(const QString &_name)
     {
         name = _name;
@@ -116,31 +127,38 @@ public:
      */
     static QString visibleNameFromName(const QString &_name);
 
+    /**
+     * @brief The standard board zone names, in display order.
+     *
+     * @return main, side and maybeboard.
+     */
+    static const QList<QString> &boardZoneNames();
+
     /**
      * @brief Get this node’s display-friendly name.
      * @return Human-readable name (zone/group name).
      */
     [[nodiscard]] virtual QString getVisibleName() const;
 
-    /// @return Always empty for container nodes.
+    /** @return Always empty for container nodes. */
     [[nodiscard]] QString getCardProviderId() const override
     {
         return "";
     }
 
-    /// @return Always empty for container nodes.
+    /** @return Always empty for container nodes. */
     [[nodiscard]] QString getCardSetShortName() const override
     {
         return "";
     }
 
-    /// @return Always empty for container nodes.
+    /** @return Always empty for container nodes. */
     [[nodiscard]] QString getCardCollectorNumber() const override
     {
         return "";
     }
 
-    /// @return Always true; InnerDecklistNode represents deck structure.
+    /** @return Always true; InnerDecklistNode represents deck structure. */
     [[nodiscard]] bool isDeckHeader() const override
     {
         return true;
@@ -196,10 +214,10 @@ public:
      */
     bool compare(AbstractDecklistNode *other) const override;
 
-    /// @copydoc compare(AbstractDecklistNode*) const
+    /** @copydoc compare(AbstractDecklistNode*) const */
     bool compareNumber(AbstractDecklistNode *other) const;
 
-    /// @copydoc compare(AbstractDecklistNode*) const
+    /** @copydoc compare(AbstractDecklistNode*) const */
     bool compareName(AbstractDecklistNode *other) const;
 
     /**
@@ -211,18 +229,45 @@ public:
      */
     QVector<QPair<int, int>> sort(Qt::SortOrder order = Qt::AscendingOrder);
 
+private:
+    /**
+     * @brief Snapshots the current children as (old index, node) pairs.
+     */
+    QVector<QPair<int, AbstractDecklistNode *>> indexedSnapshot() const;
+
+    /**
+     * @brief Replaces this node's children with @p sorted and maps old indexes to new ones.
+     *
+     * @return A list of (old index, new index) pairs for each reordered child.
+     */
+    QVector<QPair<int, int>> applySortedOrder(const QVector<QPair<int, AbstractDecklistNode *>> &sorted);
+
+public:
     /**
      * @brief Deserialize this node and its children from XML.
      * @param xml Reader positioned at this element.
-     * @return true if parsing succeeded.
+     * @param limit The maximum amount of cards to read
+     * @return the amount of cards found
      */
-    bool readElement(QXmlStreamReader *xml) override;
+    int readElement(QXmlStreamReader *xml, int limit);
 
     /**
      * @brief Serialize this node and its children to XML.
      * @param xml Writer to append elements to.
      */
     void writeElement(QXmlStreamWriter *xml) override;
+
+private:
+    /**
+     * @brief Reads a single `card` element and appends it to this node.
+     *
+     * The card's quantity is capped at @p remainingBudget so a malicious or
+     * oversized deck file cannot push the total card count past the deck size
+     * limit.
+     *
+     * @return The amount of cards actually added.
+     */
+    int readCardElement(QXmlStreamReader *xml, int remainingBudget);
 };
 
 #endif // COCKATRICE_INNER_DECK_LIST_NODE_H
diff --git a/libcockatrice_filters/CMakeLists.txt b/libcockatrice_filters/CMakeLists.txt
index 74566ca05..2d45b8e5b 100644
--- a/libcockatrice_filters/CMakeLists.txt
+++ b/libcockatrice_filters/CMakeLists.txt
@@ -6,11 +6,7 @@ set(HEADERS libcockatrice/filters/filter_card.h libcockatrice/filters/filter_str
             libcockatrice/filters/filter_tree.h
 )
 
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
+qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
 
 add_library(
   libcockatrice_filters STATIC ${MOC_SOURCES} libcockatrice/filters/filter_card.cpp
@@ -22,3 +18,5 @@ 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 d49a1b9cb..26cddd53c 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_card.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_card.cpp
@@ -1,6 +1,9 @@
 #include "filter_card.h"
 
 #include <QJsonObject>
+#include <QJsonValue>
+#include <QJsonValueRef>
+#include <QSharedPointer>
 
 QJsonObject CardFilter::toJson() const
 {
@@ -60,6 +63,8 @@ const QString CardFilter::attrName(Attr a)
     switch (a) {
         case AttrName:
             return tr("Name");
+        case AttrNameExact:
+            return tr("Name (Exact)");
         case AttrType:
             return tr("Type");
         case AttrColor:
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_card.h b/libcockatrice_filters/libcockatrice/filters/filter_card.h
index 4392a4630..e6a37ee40 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_card.h
+++ b/libcockatrice_filters/libcockatrice/filters/filter_card.h
@@ -1,14 +1,16 @@
 /**
  * @file filter_card.h
  * @ingroup CardDatabaseModelFilters
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARDFILTER_H
 #define CARDFILTER_H
 
+#include <QJsonObject>
 #include <QObject>
 #include <QString>
+#include <qtmetamacros.h>
 
 class CardFilter : public QObject
 {
@@ -33,6 +35,7 @@ public:
         AttrLoyalty,
         AttrManaCost,
         AttrName,
+        AttrNameExact,
         AttrPow,
         AttrRarity,
         AttrSet,
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
index 3615729f0..bc137b0f6 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp
@@ -1,11 +1,35 @@
 #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
@@ -19,7 +43,8 @@ SomewhatComplexQueryPart <- [(] QueryPartList [)] / QueryPart
 QueryPart <- NotQuery / SetQuery / RarityQuery / CMCQuery / FormatQuery / PowerQuery / ToughnessQuery / ColorQuery / TypeQuery / OracleQuery / FieldQuery / GenericQuery
 
 NotQuery <- ('NOT' ws/'-') SomewhatComplexQueryPart
-SetQuery <- ('e'/'set') [:] FlexStringValue
+SetQuery <- ('e'/'set') SetQueryValue
+SetQueryValue <- ([=:] FlexStringValue) / (<[!][=]?> FlexStringValue) / SetExpression
 OracleQuery <- 'o' [:] MatcherString
 
 
@@ -46,7 +71,7 @@ FieldQuery <- String [:] MatcherString / String ws? NumericExpression
 
 NonDoubleQuoteUnlessEscaped <- '\\\"'. / !["].
 NonSingleQuoteUnlessEscaped <- "\\\'". / !['].
-UnescapedStringListPart <- !['":<>=! ].
+UnescapedStringListPart <- !['":<>()=! ].
 SingleApostropheString <- (UnescapedStringListPart+ ws*)* ['] (UnescapedStringListPart+ ws*)*
 String <- SingleApostropheString / UnescapedStringListPart+ / ["] <NonDoubleQuoteUnlessEscaped*> ["] / ['] <NonSingleQuoteUnlessEscaped*> [']
 StringValue <- String / [(] StringList [)]
@@ -64,6 +89,8 @@ RegexMatcherString <- ('\\/' / !'/' .)+
 FlexStringValue <- CompactStringSet / String / [(] StringList [)]
 CompactStringSet <- StringListString ([,+] StringListString)+
 
+SetExpression <- NumericOperator ws? String
+
 NumericExpression <- NumericOperator ws? NumericValue
 NumericOperator <- [=:] / <[><!][=]?>
 NumericValue <- [0-9]+
@@ -71,6 +98,36 @@ NumericValue <- [0-9]+
 
 static std::once_flag init;
 
+// The peglib parser rules (and therefore their rule actions) are set up once per
+// process, so a rule action cannot capture per-instance state. The card language
+// plain-text name and text queries search in is therefore handed to the GenericQuery
+// and OracleQuery rule actions through this thread-local context, which is live only
+// while a FilterString is being parsed. The rule actions copy it into the filter
+// closures they produce, so card evaluation never reads process-global state.
+thread_local CardSearchLanguage searchLanguageContext;
+
+namespace
+{
+bool matchesInSearchLanguage(const QString &english,
+                             const QString &localized,
+                             const CardSearchLanguage &searchLanguage,
+                             const StringMatcher &matcher)
+{
+    if (searchLanguage.mode == SearchLanguageMode::English) {
+        return matcher(english);
+    }
+
+    if (searchLanguage.mode == SearchLanguageMode::Both) {
+        if (!searchLanguage.isEnglishOnly() && matcher(localized)) {
+            return true;
+        }
+        return matcher(english);
+    }
+
+    return searchLanguage.isEnglishOnly() ? matcher(english) : matcher(localized);
+}
+} // namespace
+
 static void setupParserRules()
 {
     auto passthru = [](const peg::SemanticValues &sv) -> Filter {
@@ -100,13 +157,35 @@ static void setupParserRules()
         const auto matcher = std::any_cast<StringMatcher>(sv[0]);
         return [=](const CardData &x) -> bool { return matcher(x->getCardType()); };
     };
-    search["SetQuery"] = [](const peg::SemanticValues &sv) -> Filter {
-        auto matcher = std::any_cast<StringMatcher>(sv[0]);
-        return [=](const CardData &x) -> bool {
-            QList<QString> sets = x->getSets().keys();
+    search["SetQueryValue"] = [](const peg::SemanticValues &sv) -> Filter {
+        if (sv.choice() == 0) {
+            auto matcher = std::any_cast<StringMatcher>(sv[0]);
+            return [=](const CardData &x) -> bool {
+                QList<QString> sets = x->getSets().keys();
 
-            auto matchesSet = [&matcher](const QString &set) { return matcher(set); };
-            return std::any_of(sets.begin(), sets.end(), matchesSet);
+                auto matchesSet = [&matcher](const QString &set) { return matcher(set); };
+                return std::any_of(sets.begin(), sets.end(), matchesSet);
+            };
+        }
+        if (sv.choice() == 1) {
+            auto matcher = std::any_cast<StringMatcher>(sv[0]);
+            return [=](const CardData &x) -> bool {
+                QList<QString> sets = x->getSets().keys();
+
+                auto matchesSet = [&matcher](const QString &set) { return matcher(set); };
+                return std::none_of(sets.begin(), sets.end(), matchesSet);
+            };
+        }
+
+        auto matcher = std::any_cast<NumberMatcher>(sv[0]);
+        return [=](const CardData &x) -> bool {
+            const auto &sets = x->getSets().values();
+            auto matchesSet = [&](const PrintingInfo &printing) {
+                return printing.getSet()->getEnabled() && matcher(printing.getSet()->getReleaseDate().toJulianDay());
+            };
+            return std::any_of(sets.begin(), sets.end(), [&](const auto &printings) {
+                return std::any_of(printings.begin(), printings.end(), matchesSet);
+            });
         };
     };
     search["Rarity"] = [](const peg::SemanticValues &sv) -> QString {
@@ -143,13 +222,12 @@ static void setupParserRules()
     search["FormatQuery"] = [](const peg::SemanticValues &sv) -> Filter {
         if (sv.choice() == 0) {
             const auto format = std::any_cast<QString>(sv[0]);
-            return
-                [=](const CardData &x) -> bool { return x->getProperty(QString("format-%1").arg(format)) == "legal"; };
+            return [=](const CardData &x) -> bool { return x->getLegalityProp(format) == "legal"; };
         }
 
         const auto format = std::any_cast<QString>(sv[1]);
         const auto legality = std::any_cast<QString>(sv[0]);
-        return [=](const CardData &x) -> bool { return x->getProperty(QString("format-%1").arg(format)) == legality; };
+        return [=](const CardData &x) -> bool { return x->getLegalityProp(format) == legality; };
     };
     search["Legality"] = [](const peg::SemanticValues &sv) -> QString {
         switch (tolower(std::string(sv.sv())[0])) {
@@ -248,33 +326,54 @@ static void setupParserRules()
         return QString::fromStdString(std::string(sv.sv()));
     };
 
-    search["NumericExpression"] = [](const peg::SemanticValues &sv) -> NumberMatcher {
-        const auto arg = std::any_cast<int>(sv[1]);
-        const auto op = std::any_cast<QString>(sv[0]);
+    search["NumericOperator"] = [](const peg::SemanticValues &sv) -> NumberComparer {
+        const auto op = QString::fromStdString(std::string(sv.sv()));
 
-        if (op == ">")
-            return [=](const int s) { return s > arg; };
-        if (op == ">=")
-            return [=](const int s) { return s >= arg; };
-        if (op == "<")
-            return [=](const int s) { return s < arg; };
-        if (op == "<=")
-            return [=](const int s) { return s <= arg; };
-        if (op == "=")
-            return [=](const int s) { return s == arg; };
-        if (op == ":")
-            return [=](const int s) { return s == arg; };
-        if (op == "!=")
-            return [=](const int s) { return s != arg; };
-        return [](int) { return false; };
+        if (op == ">") {
+            return [=](const int s, const int arg) { return s > arg; };
+        }
+        if (op == ">=") {
+            return [=](const int s, const int arg) { return s >= arg; };
+        }
+        if (op == "<") {
+            return [=](const int s, const int arg) { return s < arg; };
+        }
+        if (op == "<=") {
+            return [=](const int s, const int arg) { return s <= arg; };
+        }
+        if (op == "=") {
+            return [=](const int s, const int arg) { return s == arg; };
+        }
+        if (op == ":") {
+            return [=](const int s, const int arg) { return s == arg; };
+        }
+        if (op == "!=") {
+            return [=](const int s, const int arg) { return s != arg; };
+        }
+        return [](int, int) { return false; };
     };
 
     search["NumericValue"] = [](const peg::SemanticValues &sv) -> int {
         return QString::fromStdString(std::string(sv.sv())).toInt();
     };
 
-    search["NumericOperator"] = [](const peg::SemanticValues &sv) -> QString {
-        return QString::fromStdString(std::string(sv.sv()));
+    search["NumericExpression"] = [](const peg::SemanticValues &sv) -> NumberMatcher {
+        const auto comparer = std::any_cast<NumberComparer>(sv[0]);
+        const auto arg = std::any_cast<int>(sv[1]);
+        return [=](int s) { return comparer(s, arg); };
+    };
+
+    search["SetExpression"] = [](const peg::SemanticValues &sv) -> NumberMatcher {
+        const auto comparer = std::any_cast<NumberComparer>(sv[0]);
+        const auto setCode = std::any_cast<QString>(sv[1]);
+        const auto allSets = CardDatabaseManager::getInstance()->getSetList();
+        for (auto &set : allSets) {
+            if (set->getShortName() == setCode) {
+                const int releaseDate = set->getReleaseDate().toJulianDay();
+                return [=](int s) { return comparer(s, releaseDate); };
+            }
+        }
+        return [](int) { return false; };
     };
 
     search["NormalMatcher"] = [](const peg::SemanticValues &sv) -> StringMatcher {
@@ -297,7 +396,11 @@ static void setupParserRules()
 
     search["OracleQuery"] = [](const peg::SemanticValues &sv) -> Filter {
         const auto matcher = std::any_cast<StringMatcher>(sv[0]);
-        return [=](const CardData &x) { return matcher(x->getText()); };
+        const CardSearchLanguage searchLanguage = searchLanguageContext;
+        return [=](const CardData &x) {
+            return matchesInSearchLanguage(x->getText(), x->getLocalizedText(searchLanguage.language), searchLanguage,
+                                           matcher);
+        };
     };
 
     search["ColorQuery"] = [](const peg::SemanticValues &sv) -> Filter {
@@ -316,8 +419,9 @@ static void setupParserRules()
                     return true;
                 }
 
-                if (parts.contains("c") && match.length() == 0)
+                if (parts.contains("c") && match.length() == 0) {
                     return true;
+                }
 
                 auto containsColor = [&parts](const QString &s) { return parts.contains(s); };
                 return std::any_of(match.begin(), match.end(), containsColor);
@@ -373,7 +477,11 @@ static void setupParserRules()
     };
     search["GenericQuery"] = [](const peg::SemanticValues &sv) -> Filter {
         const auto matcher = std::any_cast<StringMatcher>(sv[0]);
-        return [=](const CardData &x) { return matcher(x->getName()); };
+        const CardSearchLanguage searchLanguage = searchLanguageContext;
+        return [=](const CardData &x) {
+            return matchesInSearchLanguage(x->getName(), x->getLocalizedName(searchLanguage.language), searchLanguage,
+                                           matcher);
+        };
     };
 
     search["Color"] = [](const peg::SemanticValues &sv) -> char { return "WUBRGU"[sv.choice()]; };
@@ -388,7 +496,7 @@ FilterString::FilterString()
     _error = "Not initialized";
 }
 
-FilterString::FilterString(const QString &expr)
+FilterString::FilterString(const QString &expr, const CardSearchLanguage &searchLanguage)
 {
     QByteArray ba = expr.simplified().toUtf8();
 
@@ -401,6 +509,8 @@ FilterString::FilterString(const QString &expr)
         return;
     }
 
+    searchLanguageContext = searchLanguage;
+
     search.set_logger([&](size_t /*ln*/, size_t col, const std::string &msg) {
         _error = QString("Error at position %1: %2").arg(col).arg(QString::fromStdString(msg));
     });
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.h b/libcockatrice_filters/libcockatrice/filters/filter_string.h
index 8fc41ce68..2abe95201 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_string.h
+++ b/libcockatrice_filters/libcockatrice/filters/filter_string.h
@@ -1,20 +1,19 @@
 /**
  * @file filter_string.h
  * @ingroup CardDatabaseModelFilters
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 <utility>
+#include <libcockatrice/card/card_localization.h>
+
+struct CardSearchLanguage;
 
 inline Q_LOGGING_CATEGORY(FilterStringLog, "filter_string");
 
@@ -22,11 +21,13 @@ typedef CardInfoPtr CardData;
 typedef std::function<bool(const CardData &)> Filter;
 typedef std::function<bool(const QString &)> StringMatcher;
 typedef std::function<bool(int)> NumberMatcher;
+typedef std::function<bool(int, int)> NumberComparer;
 
 namespace peg
 {
 template <typename Annotation> struct AstBase;
 struct EmptyType;
+
 typedef AstBase<EmptyType> Ast;
 } // namespace peg
 
@@ -34,7 +35,7 @@ class FilterString
 {
 public:
     FilterString();
-    explicit FilterString(const QString &exp);
+    explicit FilterString(const QString &exp, const CardSearchLanguage &searchLanguage = {});
     [[nodiscard]] bool check(const CardData &card) const
     {
         if (card.isNull()) {
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
index 89b772b8e..742b44e97 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
+++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp
@@ -1,8 +1,16 @@
 #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
 {
@@ -100,14 +108,16 @@ FilterTreeNode *FilterItemList::termNode(const QString &term)
     return childNodes.at(i);
 }
 
-bool FilterItemList::testTypeAnd(const CardInfoPtr info, CardFilter::Attr attr) const
+bool FilterItemList::testTypeAnd(const CardInfoPtr info,
+                                 CardFilter::Attr attr,
+                                 const CardSearchLanguage &searchLanguage) const
 {
     for (auto i = childNodes.constBegin(); i != childNodes.constEnd(); i++) {
         if (!(*i)->isEnabled()) {
             continue;
         }
 
-        if (!(*i)->acceptCardAttr(info, attr)) {
+        if (!(*i)->acceptCardAttr(info, attr, searchLanguage)) {
             return false;
         }
     }
@@ -115,13 +125,17 @@ bool FilterItemList::testTypeAnd(const CardInfoPtr info, CardFilter::Attr attr)
     return true;
 }
 
-bool FilterItemList::testTypeAndNot(const CardInfoPtr info, CardFilter::Attr attr) const
+bool FilterItemList::testTypeAndNot(const CardInfoPtr info,
+                                    CardFilter::Attr attr,
+                                    const CardSearchLanguage &searchLanguage) const
 {
     // if any one in the list is true, return false
-    return !testTypeOr(info, attr);
+    return !testTypeOr(info, attr, searchLanguage);
 }
 
-bool FilterItemList::testTypeOr(const CardInfoPtr info, CardFilter::Attr attr) const
+bool FilterItemList::testTypeOr(const CardInfoPtr info,
+                                CardFilter::Attr attr,
+                                const CardSearchLanguage &searchLanguage) const
 {
     bool noChildEnabledChild = true;
 
@@ -134,7 +148,7 @@ bool FilterItemList::testTypeOr(const CardInfoPtr info, CardFilter::Attr attr) c
             noChildEnabledChild = false;
         }
 
-        if ((*i)->acceptCardAttr(info, attr)) {
+        if ((*i)->acceptCardAttr(info, attr, searchLanguage)) {
             return true;
         }
     }
@@ -142,15 +156,58 @@ bool FilterItemList::testTypeOr(const CardInfoPtr info, CardFilter::Attr attr) c
     return noChildEnabledChild;
 }
 
-bool FilterItemList::testTypeOrNot(const CardInfoPtr info, CardFilter::Attr attr) const
+bool FilterItemList::testTypeOrNot(const CardInfoPtr info,
+                                   CardFilter::Attr attr,
+                                   const CardSearchLanguage &searchLanguage) const
 {
     // if any one in the list is false, return true
-    return !testTypeAnd(info, attr);
+    return !testTypeAnd(info, attr, searchLanguage);
 }
 
-bool FilterItem::acceptName(const CardInfoPtr info) const
+bool FilterItem::acceptName(const CardInfoPtr info, const CardSearchLanguage &searchLanguage) const
 {
-    return info->getName().contains(term, Qt::CaseInsensitive);
+    const QString &englishName = info->getName();
+    const QString &localizedName = info->getLocalizedName(searchLanguage.language);
+
+    switch (searchLanguage.mode) {
+        case SearchLanguageMode::English:
+            return englishName.contains(term, Qt::CaseInsensitive);
+        case SearchLanguageMode::Both:
+            if (englishName.contains(term, Qt::CaseInsensitive)) {
+                return true;
+            }
+            return !searchLanguage.isEnglishOnly() && localizedName.contains(term, Qt::CaseInsensitive);
+        case SearchLanguageMode::Selected:
+            if (searchLanguage.isEnglishOnly()) {
+                return englishName.contains(term, Qt::CaseInsensitive);
+            }
+            return localizedName.contains(term, Qt::CaseInsensitive);
+    }
+
+    return false;
+}
+
+bool FilterItem::acceptNameExact(const CardInfoPtr info, const CardSearchLanguage &searchLanguage) const
+{
+    const QString &englishName = info->getName();
+    const QString &localizedName = info->getLocalizedName(searchLanguage.language);
+
+    switch (searchLanguage.mode) {
+        case SearchLanguageMode::English:
+            return englishName == term;
+        case SearchLanguageMode::Both:
+            if (englishName == term) {
+                return true;
+            }
+            return !searchLanguage.isEnglishOnly() && localizedName == term;
+        case SearchLanguageMode::Selected:
+            if (searchLanguage.isEnglishOnly()) {
+                return englishName == term;
+            }
+            return localizedName == term;
+    }
+
+    return false;
 }
 
 bool FilterItem::acceptType(const CardInfoPtr info) const
@@ -200,16 +257,35 @@ bool FilterItem::acceptColor(const CardInfoPtr info) const
      */
     int match_count = 0;
     for (auto &it : converted_term) {
-        if (info->getColors().contains(it, Qt::CaseInsensitive))
+        if (info->getColors().contains(it, Qt::CaseInsensitive)) {
             match_count++;
+        }
     }
 
     return match_count == converted_term.length();
 }
 
-bool FilterItem::acceptText(const CardInfoPtr info) const
+bool FilterItem::acceptText(const CardInfoPtr info, const CardSearchLanguage &searchLanguage) const
 {
-    return info->getText().contains(term, Qt::CaseInsensitive);
+    const QString &englishText = info->getText();
+    const QString &localizedText = info->getLocalizedText(searchLanguage.language);
+
+    switch (searchLanguage.mode) {
+        case SearchLanguageMode::English:
+            return englishText.contains(term, Qt::CaseInsensitive);
+        case SearchLanguageMode::Both:
+            if (englishText.contains(term, Qt::CaseInsensitive)) {
+                return true;
+            }
+            return !searchLanguage.isEnglishOnly() && localizedText.contains(term, Qt::CaseInsensitive);
+        case SearchLanguageMode::Selected:
+            if (searchLanguage.isEnglishOnly()) {
+                return englishText.contains(term, Qt::CaseInsensitive);
+            }
+            return localizedText.contains(term, Qt::CaseInsensitive);
+    }
+
+    return false;
 }
 
 bool FilterItem::acceptSet(const CardInfoPtr info) const
@@ -270,7 +346,7 @@ bool FilterItem::acceptCmc(const CardInfoPtr info) const
 
 bool FilterItem::acceptFormat(const CardInfoPtr info) const
 {
-    return info->getProperty(QString("format-%1").arg(term.toLower())) == "legal";
+    return info->getLegalityProp(term.toLower()) == "legal";
 }
 
 bool FilterItem::acceptLoyalty(const CardInfoPtr info) const
@@ -396,17 +472,21 @@ bool FilterItem::relationCheck(int cardInfo) const
     return result;
 }
 
-bool FilterItem::acceptCardAttr(const CardInfoPtr info, CardFilter::Attr attr) const
+bool FilterItem::acceptCardAttr(const CardInfoPtr info,
+                                CardFilter::Attr attr,
+                                const CardSearchLanguage &searchLanguage) const
 {
     switch (attr) {
         case CardFilter::AttrName:
-            return acceptName(info);
+            return acceptName(info, searchLanguage);
+        case CardFilter::AttrNameExact:
+            return acceptNameExact(info, searchLanguage);
         case CardFilter::AttrType:
             return acceptType(info);
         case CardFilter::AttrColor:
             return acceptColor(info);
         case CardFilter::AttrText:
-            return acceptText(info);
+            return acceptText(info, searchLanguage);
         case CardFilter::AttrSet:
             return acceptSet(info);
         case CardFilter::AttrManaCost:
@@ -476,18 +556,18 @@ FilterTreeNode *FilterTree::termNode(const CardFilter *f)
     return termNode(f->attr(), f->type(), f->term());
 }
 
-bool FilterTree::testAttr(const CardInfoPtr info, const LogicMap *lm) const
+bool FilterTree::testAttr(const CardInfoPtr info, const LogicMap *lm, const CardSearchLanguage &searchLanguage) const
 {
     const FilterItemList *fil;
     bool status = true;
 
     fil = lm->findTypeList(CardFilter::TypeAnd);
-    if (fil && fil->isEnabled() && !fil->testTypeAnd(info, lm->attr)) {
+    if (fil && fil->isEnabled() && !fil->testTypeAnd(info, lm->attr, searchLanguage)) {
         return false;
     }
 
     fil = lm->findTypeList(CardFilter::TypeAndNot);
-    if (fil && fil->isEnabled() && !fil->testTypeAndNot(info, lm->attr)) {
+    if (fil && fil->isEnabled() && !fil->testTypeAndNot(info, lm->attr, searchLanguage)) {
         return false;
     }
 
@@ -496,23 +576,23 @@ bool FilterTree::testAttr(const CardInfoPtr info, const LogicMap *lm) const
         status = false;
 
         // if this is true we can return because it is OR'd with the OrNot list
-        if (fil->testTypeOr(info, lm->attr)) {
+        if (fil->testTypeOr(info, lm->attr, searchLanguage)) {
             return true;
         }
     }
 
     fil = lm->findTypeList(CardFilter::TypeOrNot);
-    if (fil && fil->isEnabled() && fil->testTypeOrNot(info, lm->attr)) {
+    if (fil && fil->isEnabled() && fil->testTypeOrNot(info, lm->attr, searchLanguage)) {
         return true;
     }
 
     return status;
 }
 
-bool FilterTree::acceptsCard(const CardInfoPtr info) const
+bool FilterTree::acceptsCard(const CardInfoPtr info, const CardSearchLanguage &searchLanguage) const
 {
     for (auto i = childNodes.constBegin(); i != childNodes.constEnd(); i++) {
-        if ((*i)->isEnabled() && !testAttr(info, *i)) {
+        if ((*i)->isEnabled() && !testAttr(info, *i, searchLanguage)) {
             return false;
         }
     }
@@ -535,12 +615,14 @@ void FilterTree::removeFilter(const CardFilter *toRemove)
 {
     for (int i = childNodes.size() - 1; i >= 0; --i) {
         auto *logicMap = dynamic_cast<LogicMap *>(childNodes.at(i));
-        if (!logicMap || logicMap->attr != toRemove->attr())
+        if (!logicMap || logicMap->attr != toRemove->attr()) {
             continue;
+        }
 
         FilterItemList *typeList = logicMap->typeList(toRemove->type());
-        if (!typeList)
+        if (!typeList) {
             continue;
+        }
 
         int termIdx = typeList->termIndex(toRemove->term());
         if (termIdx != -1) {
diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.h b/libcockatrice_filters/libcockatrice/filters/filter_tree.h
index af91d2dbf..0defd466b 100644
--- a/libcockatrice_filters/libcockatrice/filters/filter_tree.h
+++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.h
@@ -1,19 +1,23 @@
 /**
  * @file filter_tree.h
  * @ingroup CardDatabaseModelFilters
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef FILTERTREE_H
 #define FILTERTREE_H
 
 #include "filter_card.h"
+#include "libcockatrice/card/card_info.h"
 
 #include <QList>
 #include <QObject>
-#include <libcockatrice/card/database/card_database.h>
+#include <QString>
+#include <qtmetamacros.h>
 #include <utility>
 
+struct CardSearchLanguage;
+
 class FilterTreeNode
 {
 private:
@@ -70,28 +74,33 @@ public:
     }
     virtual void nodeChanged() const
     {
-        if (parent() != nullptr)
+        if (parent() != nullptr) {
             parent()->nodeChanged();
+        }
     }
     virtual void preInsertChild(const FilterTreeNode *p, int i) const
     {
-        if (parent() != nullptr)
+        if (parent() != nullptr) {
             parent()->preInsertChild(p, i);
+        }
     }
     virtual void postInsertChild(const FilterTreeNode *p, int i) const
     {
-        if (parent() != nullptr)
+        if (parent() != nullptr) {
             parent()->postInsertChild(p, i);
+        }
     }
     virtual void preRemoveChild(const FilterTreeNode *p, int i) const
     {
-        if (parent() != nullptr)
+        if (parent() != nullptr) {
             parent()->preRemoveChild(p, i);
+        }
     }
     virtual void postRemoveChild(const FilterTreeNode *p, int i) const
     {
-        if (parent() != nullptr)
+        if (parent() != nullptr) {
             parent()->postRemoveChild(p, i);
+        }
     }
 };
 
@@ -114,6 +123,7 @@ public:
 
 class FilterItemList;
 class FilterTree;
+
 class LogicMap : public FilterTreeBranch<FilterItemList *>
 {
 
@@ -136,6 +146,7 @@ public:
 };
 
 class FilterItem;
+
 class FilterItemList : public FilterTreeBranch<FilterItem *>
 {
 private:
@@ -162,10 +173,14 @@ public:
         return CardFilter::typeName(type);
     }
 
-    [[nodiscard]] bool testTypeAnd(CardInfoPtr info, CardFilter::Attr attr) const;
-    [[nodiscard]] bool testTypeAndNot(CardInfoPtr info, CardFilter::Attr attr) const;
-    [[nodiscard]] bool testTypeOr(CardInfoPtr info, CardFilter::Attr attr) const;
-    [[nodiscard]] bool testTypeOrNot(CardInfoPtr info, CardFilter::Attr attr) const;
+    [[nodiscard]] bool
+    testTypeAnd(CardInfoPtr info, CardFilter::Attr attr, const CardSearchLanguage &searchLanguage) const;
+    [[nodiscard]] bool
+    testTypeAndNot(CardInfoPtr info, CardFilter::Attr attr, const CardSearchLanguage &searchLanguage) const;
+    [[nodiscard]] bool
+    testTypeOr(CardInfoPtr info, CardFilter::Attr attr, const CardSearchLanguage &searchLanguage) const;
+    [[nodiscard]] bool
+    testTypeOrNot(CardInfoPtr info, CardFilter::Attr attr, const CardSearchLanguage &searchLanguage) const;
 };
 
 class FilterItem : public FilterTreeNode
@@ -202,19 +217,21 @@ public:
         return true;
     }
 
-    [[nodiscard]] bool acceptName(CardInfoPtr info) const;
+    [[nodiscard]] bool acceptName(CardInfoPtr info, const CardSearchLanguage &searchLanguage) const;
+    [[nodiscard]] bool acceptNameExact(CardInfoPtr info, const CardSearchLanguage &searchLanguage) const;
     [[nodiscard]] bool acceptType(CardInfoPtr info) const;
     [[nodiscard]] bool acceptMainType(CardInfoPtr info) const;
     [[nodiscard]] bool acceptSubType(CardInfoPtr info) const;
     [[nodiscard]] bool acceptColor(CardInfoPtr info) const;
-    [[nodiscard]] bool acceptText(CardInfoPtr info) const;
+    [[nodiscard]] bool acceptText(CardInfoPtr info, const CardSearchLanguage &searchLanguage) const;
     [[nodiscard]] bool acceptSet(CardInfoPtr info) const;
     [[nodiscard]] bool acceptManaCost(CardInfoPtr info) const;
     [[nodiscard]] bool acceptCmc(CardInfoPtr info) const;
     [[nodiscard]] bool acceptPowerToughness(CardInfoPtr info, CardFilter::Attr attr) const;
     [[nodiscard]] bool acceptLoyalty(CardInfoPtr info) const;
     [[nodiscard]] bool acceptRarity(CardInfoPtr info) const;
-    [[nodiscard]] bool acceptCardAttr(CardInfoPtr info, CardFilter::Attr attr) const;
+    [[nodiscard]] bool
+    acceptCardAttr(CardInfoPtr info, CardFilter::Attr attr, const CardSearchLanguage &searchLanguage) const;
     [[nodiscard]] bool acceptFormat(CardInfoPtr info) const;
     [[nodiscard]] bool relationCheck(int cardInfo) const;
 };
@@ -234,7 +251,7 @@ private:
     LogicMap *attrLogicMap(CardFilter::Attr attr);
     FilterItemList *attrTypeList(CardFilter::Attr attr, CardFilter::Type type);
 
-    bool testAttr(CardInfoPtr info, const LogicMap *lm) const;
+    bool testAttr(CardInfoPtr info, const LogicMap *lm, const CardSearchLanguage &searchLanguage) const;
 
     void nodeChanged() const override
     {
@@ -273,7 +290,7 @@ public:
         return 0;
     }
 
-    [[nodiscard]] bool acceptsCard(CardInfoPtr info) const;
+    [[nodiscard]] bool acceptsCard(CardInfoPtr info, const CardSearchLanguage &searchLanguage) const;
     void removeFiltersByAttr(CardFilter::Attr filterType);
     void removeFilter(const CardFilter *toRemove);
     void clear();
diff --git a/libcockatrice_interfaces/CMakeLists.txt b/libcockatrice_interfaces/CMakeLists.txt
index 4f34f7985..3b17569b1 100644
--- a/libcockatrice_interfaces/CMakeLists.txt
+++ b/libcockatrice_interfaces/CMakeLists.txt
@@ -3,23 +3,33 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
 set(HEADERS
+    libcockatrice/interfaces/interface_cache_storage_settings_provider.h
     libcockatrice/interfaces/interface_card_database_path_provider.h
     libcockatrice/interfaces/interface_card_preference_provider.h
     libcockatrice/interfaces/interface_card_set_priority_controller.h
+    libcockatrice/interfaces/interface_cards_display_settings_provider.h
+    libcockatrice/interfaces/interface_chat_settings_provider.h
+    libcockatrice/interfaces/interface_deck_editor_settings_provider.h
+    libcockatrice/interfaces/interface_game_settings_provider.h
+    libcockatrice/interfaces/interface_interface_settings_provider.h
     libcockatrice/interfaces/interface_network_settings_provider.h
+    libcockatrice/interfaces/interface_paths_settings_provider.h
+    libcockatrice/interfaces/interface_personal_settings_provider.h
+    libcockatrice/interfaces/interface_sound_settings_provider.h
+    libcockatrice/interfaces/interface_tabs_settings_provider.h
+    libcockatrice/interfaces/interface_updates_settings_provider.h
+    libcockatrice/interfaces/interface_visual_deck_storage_settings_provider.h
     libcockatrice/interfaces/noop_card_database_path_provider.h
     libcockatrice/interfaces/noop_card_preference_provider.h
     libcockatrice/interfaces/noop_card_set_priority_controller.h
 )
 
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
+qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
 
 add_library(libcockatrice_interfaces STATIC ${MOC_SOURCES})
 
 target_include_directories(libcockatrice_interfaces PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-target_link_libraries(libcockatrice_interfaces PUBLIC ${QT_CORE_MODULE})
+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_cache_storage_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_cache_storage_settings_provider.h
new file mode 100644
index 000000000..2881164d6
--- /dev/null
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_cache_storage_settings_provider.h
@@ -0,0 +1,14 @@
+#ifndef COCKATRICE_INTERFACE_CACHE_STORAGE_SETTINGS_PROVIDER_H
+#define COCKATRICE_INTERFACE_CACHE_STORAGE_SETTINGS_PROVIDER_H
+
+class ICacheStorageSettingsProvider
+{
+public:
+    virtual ~ICacheStorageSettingsProvider() = default;
+
+    [[nodiscard]] virtual int getPixmapCacheSize() const = 0;
+    [[nodiscard]] virtual int getNetworkCacheSizeInMB() const = 0;
+    [[nodiscard]] virtual int getRedirectCacheTtl() const = 0;
+};
+
+#endif // COCKATRICE_INTERFACE_CACHE_STORAGE_SETTINGS_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_preference_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_preference_provider.h
index a6cf941fb..2510919ca 100644
--- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_preference_provider.h
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_preference_provider.h
@@ -8,7 +8,6 @@ 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 a4f3184cc..746ac9490 100644
--- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_set_priority_controller.h
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_set_priority_controller.h
@@ -1,18 +1,72 @@
 #ifndef COCKATRICE_INTERFACE_CARD_SET_PRIORITY_CONTROLLER_H
 #define COCKATRICE_INTERFACE_CARD_SET_PRIORITY_CONTROLLER_H
 
+#include <QString>
+#include <QStringList>
+
 class ICardSetPriorityController
 {
 public:
+    struct SetSaveData
+    {
+        QString shortName;
+        unsigned int sortKey;
+        bool enabled;
+        bool isKnown = false;
+    };
+
+    /**
+     * @brief Bundled per-set priority options, returned in a single call.
+     *
+     * Reading these individually (getSortKey/isEnabled/isKnown) is cheap for the
+     * noop controller but extremely expensive when backed by QSettings, which
+     * re-opens and re-parses the whole .ini on every access. Callers that need
+     * more than one option for the same set (notably CardSet construction during
+     * database load) should use getSetOptions() to avoid that cost.
+     */
+    struct SetOptions
+    {
+        unsigned int sortKey = 0;
+        bool enabled = false;
+        bool isKnown = false;
+    };
+
     virtual ~ICardSetPriorityController() = default;
 
     virtual void setSortKey(QString shortName, unsigned int sortKey) = 0;
     virtual void setEnabled(QString shortName, bool enabled) = 0;
     virtual void setIsKnown(QString shortName, bool isknown) = 0;
 
-    virtual unsigned int getSortKey(QString shortName) = 0;
-    virtual bool isEnabled(QString shortName) = 0;
-    virtual bool isKnown(QString shortName) = 0;
+    virtual unsigned int getSortKey(QString shortName) const = 0;
+    virtual bool isEnabled(QString shortName) const = 0;
+    virtual bool isKnown(QString shortName) const = 0;
+
+    /**
+     * @brief Returns the bundled priority options for a set in a single call.
+     * @param shortName The set's short name.
+     * @return The sort key, enabled and known flags for the set.
+     */
+    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;
 };
 
 #endif // COCKATRICE_INTERFACE_CARD_SET_PRIORITY_CONTROLLER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_cards_display_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_cards_display_settings_provider.h
new file mode 100644
index 000000000..a5ab4fc37
--- /dev/null
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_cards_display_settings_provider.h
@@ -0,0 +1,35 @@
+#ifndef COCKATRICE_INTERFACE_CARDS_DISPLAY_SETTINGS_PROVIDER_H
+#define COCKATRICE_INTERFACE_CARDS_DISPLAY_SETTINGS_PROVIDER_H
+
+#include <QString>
+
+class ICardsDisplaySettingsProvider
+{
+public:
+    virtual ~ICardsDisplaySettingsProvider() = default;
+
+    [[nodiscard]] virtual bool getDisplayCardNames() const = 0;
+    [[nodiscard]] virtual bool getRoundCardCorners() const = 0;
+    [[nodiscard]] virtual bool getOverrideAllCardArtWithPersonalPreference() const = 0;
+    [[nodiscard]] virtual bool getBumpSetsWithCardsInDeckToTop() const = 0;
+    [[nodiscard]] virtual int getPrintingSelectorSortOrder() const = 0;
+    [[nodiscard]] virtual int getPrintingSelectorCardSize() const = 0;
+    [[nodiscard]] virtual bool getPrintingSelectorNavigationButtonsVisible() const = 0;
+    [[nodiscard]] virtual bool getTapAnimation() const = 0;
+    [[nodiscard]] virtual bool getArrowDrawAnimation() const = 0;
+    [[nodiscard]] virtual bool getAutoRotateSidewaysLayoutCards() const = 0;
+    [[nodiscard]] virtual bool getScaleCards() const = 0;
+    [[nodiscard]] virtual int getStackCardOverlapPercent() const = 0;
+    [[nodiscard]] virtual int getCardInfoViewMode() const = 0;
+    [[nodiscard]] virtual int getVisualDeckStorageCardSize() const = 0;
+    [[nodiscard]] virtual int getVisualDatabaseDisplayCardSize() const = 0;
+    [[nodiscard]] virtual int getVisualDeckEditorCardSize() const = 0;
+    [[nodiscard]] virtual bool getVisualDeckEditorShowCardCounts() const = 0;
+    [[nodiscard]] virtual int getEDHRecCardSize() const = 0;
+    [[nodiscard]] virtual int getArchidektPreviewSize() const = 0;
+    [[nodiscard]] virtual int getSampleHandSize() const = 0;
+    [[nodiscard]] virtual QString getCardLang() const = 0;
+    [[nodiscard]] virtual int getCardSearchLanguage() const = 0;
+};
+
+#endif // COCKATRICE_INTERFACE_CARDS_DISPLAY_SETTINGS_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_chat_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_chat_settings_provider.h
new file mode 100644
index 000000000..04dad9243
--- /dev/null
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_chat_settings_provider.h
@@ -0,0 +1,28 @@
+#ifndef COCKATRICE_INTERFACE_CHAT_SETTINGS_PROVIDER_H
+#define COCKATRICE_INTERFACE_CHAT_SETTINGS_PROVIDER_H
+
+#include <QString>
+
+class IChatSettingsProvider
+{
+public:
+    virtual ~IChatSettingsProvider() = default;
+
+    [[nodiscard]] virtual bool getChatMention() const = 0;
+    [[nodiscard]] virtual bool getChatMentionCompleter() const = 0;
+    [[nodiscard]] virtual QString getChatMentionColor() const = 0;
+    [[nodiscard]] virtual QString getChatHighlightColor() const = 0;
+    [[nodiscard]] virtual bool getChatMentionForeground() const = 0;
+    [[nodiscard]] virtual bool getChatHighlightForeground() const = 0;
+    [[nodiscard]] virtual bool getIgnoreUnregisteredUsers() const = 0;
+    [[nodiscard]] virtual bool getIgnoreUnregisteredUserMessages() const = 0;
+    [[nodiscard]] virtual bool getIgnoreNonBuddyUserMessages() const = 0;
+    [[nodiscard]] virtual bool getShowMessagePopup() const = 0;
+    [[nodiscard]] virtual bool getShowMentionPopup() const = 0;
+    [[nodiscard]] virtual bool getRoomHistory() const = 0;
+    [[nodiscard]] virtual bool getIgnoreAllPrivateMessages() const = 0;
+    [[nodiscard]] virtual bool getUseGameTime() const = 0;
+    [[nodiscard]] virtual QString getHighlightWords() const = 0;
+};
+
+#endif // COCKATRICE_INTERFACE_CHAT_SETTINGS_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_deck_editor_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_deck_editor_settings_provider.h
new file mode 100644
index 000000000..0ef39d044
--- /dev/null
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_deck_editor_settings_provider.h
@@ -0,0 +1,15 @@
+#ifndef COCKATRICE_INTERFACE_DECK_EDITOR_SETTINGS_PROVIDER_H
+#define COCKATRICE_INTERFACE_DECK_EDITOR_SETTINGS_PROVIDER_H
+
+class IDeckEditorSettingsProvider
+{
+public:
+    virtual ~IDeckEditorSettingsProvider() = default;
+
+    [[nodiscard]] virtual bool getOpenDeckInNewTab() const = 0;
+    [[nodiscard]] virtual bool getBannerCardComboBoxVisible() const = 0;
+    [[nodiscard]] virtual bool getTagsWidgetVisible() const = 0;
+    [[nodiscard]] virtual int getDefaultDeckEditorType() const = 0;
+};
+
+#endif // COCKATRICE_INTERFACE_DECK_EDITOR_SETTINGS_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_game_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_game_settings_provider.h
new file mode 100644
index 000000000..2b1ddf8ec
--- /dev/null
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_game_settings_provider.h
@@ -0,0 +1,29 @@
+#ifndef COCKATRICE_INTERFACE_GAME_SETTINGS_PROVIDER_H
+#define COCKATRICE_INTERFACE_GAME_SETTINGS_PROVIDER_H
+
+#include <QString>
+
+class IGameSettingsProvider
+{
+public:
+    virtual ~IGameSettingsProvider() = default;
+
+    [[nodiscard]] virtual QString getGameDescription() const = 0;
+    [[nodiscard]] virtual int getMaxPlayers() const = 0;
+    [[nodiscard]] virtual QString getGameTypes() const = 0;
+    [[nodiscard]] virtual bool getOnlyBuddies() const = 0;
+    [[nodiscard]] virtual bool getOnlyRegistered() const = 0;
+    [[nodiscard]] virtual bool getSpectatorsAllowed() const = 0;
+    [[nodiscard]] virtual bool getSpectatorsNeedPassword() const = 0;
+    [[nodiscard]] virtual bool getSpectatorsCanTalk() const = 0;
+    [[nodiscard]] virtual bool getSpectatorsCanSeeEverything() const = 0;
+    [[nodiscard]] virtual bool getCreateGameAsSpectator() const = 0;
+    [[nodiscard]] virtual int getDefaultStartingLifeTotal() const = 0;
+    [[nodiscard]] virtual bool getShareDecklistsOnLoad() const = 0;
+    [[nodiscard]] virtual bool getRememberGameSettings() const = 0;
+    [[nodiscard]] virtual bool getLocalGameRememberSettings() const = 0;
+    [[nodiscard]] virtual int getLocalGameMaxPlayers() const = 0;
+    [[nodiscard]] virtual int getLocalGameStartingLifeTotal() const = 0;
+};
+
+#endif // COCKATRICE_INTERFACE_GAME_SETTINGS_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_interface_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_interface_settings_provider.h
new file mode 100644
index 000000000..bc2118cb3
--- /dev/null
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_interface_settings_provider.h
@@ -0,0 +1,95 @@
+#ifndef COCKATRICE_INTERFACE_INTERFACE_SETTINGS_PROVIDER_H
+#define COCKATRICE_INTERFACE_INTERFACE_SETTINGS_PROVIDER_H
+
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <libcockatrice/utility/playmat_params.h>
+
+/**
+ * @brief Whether playmats are rendered in-game, and for whom.
+ */
+enum PlaymatVisibility
+{
+    PlaymatVisibilityNone = 0,    ///< Don't use playmats.
+    PlaymatVisibilityOwnOnly = 1, ///< Show the local player's playmat only.
+    PlaymatVisibilityAll = 2      ///< Show playmats for all players.
+};
+
+/**
+ * @brief How the user-level playmat collection interacts with the deck-configured playmat.
+ */
+enum PlaymatMode
+{
+    PlaymatModeOverrideDeck = 0, ///< Always use the collection, ignoring any deck-configured playmat.
+    PlaymatModeFallback = 1,     ///< Prefer the deck-configured playmat; fall back to the collection when absent.
+    PlaymatModeDeckOnly = 2      ///< Use only the deck-configured playmat, ignoring the collection.
+};
+
+/**
+ * @brief How the user-level fallback playmat list is consulted when a deck has no playmat configured.
+ */
+enum PlaymatFallbackMode
+{
+    PlaymatFallbackModeFixed = 0,      ///< Always use the first entry of the fallback list.
+    PlaymatFallbackModeRoundRobin = 1, ///< Cycle through the list, advancing one entry per resolution.
+    PlaymatFallbackModeRandom = 2      ///< Pick a random entry per resolution.
+};
+
+class IInterfaceSettingsProvider
+{
+public:
+    virtual ~IInterfaceSettingsProvider() = default;
+
+    [[nodiscard]] virtual bool getUseTearOffMenus() const = 0;
+    [[nodiscard]] virtual int getCardViewInitialRowsMax() const = 0;
+    [[nodiscard]] virtual int getCardViewExpandedRowsMax() const = 0;
+    [[nodiscard]] virtual bool getCloseEmptyCardView() const = 0;
+    [[nodiscard]] virtual bool getFocusCardViewSearchBar() const = 0;
+    [[nodiscard]] virtual bool getKeepGameChatFocus() const = 0;
+    [[nodiscard]] virtual bool getNotificationsEnabled() const = 0;
+    [[nodiscard]] virtual bool getSpectatorNotificationsEnabled() const = 0;
+    [[nodiscard]] virtual bool getBuddyConnectNotificationsEnabled() const = 0;
+    [[nodiscard]] virtual bool getDoubleClickToPlay() const = 0;
+    [[nodiscard]] virtual bool getClickPlaysAllSelected() const = 0;
+    [[nodiscard]] virtual bool getPlayToStack() const = 0;
+    [[nodiscard]] virtual bool getDoNotDeleteArrowsInSubPhases() const = 0;
+    [[nodiscard]] virtual int getStartingHandSize() const = 0;
+    [[nodiscard]] virtual bool getAnnotateTokens() const = 0;
+    [[nodiscard]] virtual bool getShowDragSelectionCount() const = 0;
+    [[nodiscard]] virtual bool getShowTotalSelectionCount() const = 0;
+    [[nodiscard]] virtual int getTallyType() const = 0;
+    [[nodiscard]] virtual bool getHorizontalHand() const = 0;
+    [[nodiscard]] virtual bool getInvertVerticalCoordinate() const = 0;
+    [[nodiscard]] virtual int getMinPlayersForMultiColumnLayout() const = 0;
+    [[nodiscard]] virtual int getRewindBufferingMs() const = 0;
+    [[nodiscard]] virtual qreal getFastForwardSpeed() const = 0;
+    [[nodiscard]] virtual bool getSkipEmptySections() const = 0;
+    [[nodiscard]] virtual bool getLeftJustified() const = 0;
+    [[nodiscard]] virtual int getZoneViewGroupByIndex() const = 0;
+    [[nodiscard]] virtual int getZoneViewSortByIndex() const = 0;
+    [[nodiscard]] virtual bool getZoneViewPileView() const = 0;
+    [[nodiscard]] virtual bool getShowStatusBar() const = 0;
+    [[nodiscard]] virtual bool getShowShortcuts() const = 0;
+    [[nodiscard]] virtual bool getShowGameSelectorFilterToolbar() const = 0;
+    [[nodiscard]] virtual bool getLifeCounterAnimationsEnabled() const = 0;
+    [[nodiscard]] virtual bool getBattlefieldFlashEnabled() const = 0;
+    [[nodiscard]] virtual QStringList getUserListExpandedSections() const = 0;
+
+    /** @brief Who gets playmats rendered: @ref PlaymatVisibility. */
+    [[nodiscard]] virtual int getPlaymatVisibility() const = 0;
+
+    /** @brief User-level playmat collection. Used either as a forced playmat
+     *         (mode == @ref PlaymatModeOverrideDeck) or as a fallback when a deck has none
+     *         (mode == @ref PlaymatModeFallback). */
+    [[nodiscard]] virtual QList<PlaymatInfo> getPlaymatFallbackList() const = 0;
+
+    /** @brief How the fallback list is applied: @ref PlaymatMode. */
+    [[nodiscard]] virtual int getPlaymatMode() const = 0;
+
+    /** @brief How the fallback list is picked from when mode is @ref PlaymatModeFallback:
+     *         @ref PlaymatFallbackMode. */
+    [[nodiscard]] virtual int getPlaymatFallbackBehavior() const = 0;
+};
+
+#endif // COCKATRICE_INTERFACE_INTERFACE_SETTINGS_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_paths_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_paths_settings_provider.h
new file mode 100644
index 000000000..d4edc8b81
--- /dev/null
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_paths_settings_provider.h
@@ -0,0 +1,24 @@
+#ifndef COCKATRICE_INTERFACE_PATHS_SETTINGS_PROVIDER_H
+#define COCKATRICE_INTERFACE_PATHS_SETTINGS_PROVIDER_H
+
+#include <QString>
+
+class IPathsSettingsProvider
+{
+public:
+    virtual ~IPathsSettingsProvider() = default;
+
+    [[nodiscard]] virtual QString getDeckPath() const = 0;
+    [[nodiscard]] virtual QString getFiltersPath() const = 0;
+    [[nodiscard]] virtual QString getReplaysPath() const = 0;
+    [[nodiscard]] virtual QString getPicsPath() const = 0;
+    [[nodiscard]] virtual QString getCustomPicsPath() const = 0;
+    [[nodiscard]] virtual QString getThemesPath() const = 0;
+    [[nodiscard]] virtual QString getCardDatabasePath() const = 0;
+    [[nodiscard]] virtual QString getCustomCardDatabasePath() const = 0;
+    [[nodiscard]] virtual QString getTokenDatabasePath() const = 0;
+    [[nodiscard]] virtual QString getSpoilerCardDatabasePath() const = 0;
+    [[nodiscard]] virtual QString getRedirectCachePath() const = 0;
+};
+
+#endif // COCKATRICE_INTERFACE_PATHS_SETTINGS_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_personal_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_personal_settings_provider.h
new file mode 100644
index 000000000..f3d3b1220
--- /dev/null
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_personal_settings_provider.h
@@ -0,0 +1,18 @@
+#ifndef COCKATRICE_INTERFACE_PERSONAL_SETTINGS_PROVIDER_H
+#define COCKATRICE_INTERFACE_PERSONAL_SETTINGS_PROVIDER_H
+
+#include <QDate>
+#include <QList>
+#include <QString>
+
+class IPersonalSettingsProvider
+{
+public:
+    virtual ~IPersonalSettingsProvider() = default;
+
+    [[nodiscard]] virtual QString getLang() const = 0;
+    [[nodiscard]] virtual bool getShowTipsOnStartup() const = 0;
+    [[nodiscard]] virtual QList<int> getSeenTips() const = 0;
+};
+
+#endif // COCKATRICE_INTERFACE_PERSONAL_SETTINGS_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_sound_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_sound_settings_provider.h
new file mode 100644
index 000000000..7bc170d0d
--- /dev/null
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_sound_settings_provider.h
@@ -0,0 +1,16 @@
+#ifndef COCKATRICE_INTERFACE_SOUND_SETTINGS_PROVIDER_H
+#define COCKATRICE_INTERFACE_SOUND_SETTINGS_PROVIDER_H
+
+#include <QString>
+
+class ISoundSettingsProvider
+{
+public:
+    virtual ~ISoundSettingsProvider() = default;
+
+    [[nodiscard]] virtual bool getSoundEnabled() const = 0;
+    [[nodiscard]] virtual QString getSoundThemeName() const = 0;
+    [[nodiscard]] virtual int getMasterVolume() const = 0;
+};
+
+#endif // COCKATRICE_INTERFACE_SOUND_SETTINGS_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_tabs_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_tabs_settings_provider.h
new file mode 100644
index 000000000..054c4cd72
--- /dev/null
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_tabs_settings_provider.h
@@ -0,0 +1,27 @@
+#ifndef COCKATRICE_INTERFACE_TABS_SETTINGS_PROVIDER_H
+#define COCKATRICE_INTERFACE_TABS_SETTINGS_PROVIDER_H
+
+#include <QString>
+
+class ITabsSettingsProvider
+{
+public:
+    virtual ~ITabsSettingsProvider() = default;
+
+    [[nodiscard]] virtual int getStartupTabIndex() const = 0;
+    [[nodiscard]] virtual QString getStartupServerHost() const = 0;
+    [[nodiscard]] virtual QString getStartupServerPort() const = 0;
+    [[nodiscard]] virtual QString getStartupRoomName() const = 0;
+    [[nodiscard]] virtual bool getTabVisualDeckStorageOpen() const = 0;
+    [[nodiscard]] virtual bool getTabServerOpen() const = 0;
+    [[nodiscard]] virtual bool getTabAccountOpen() const = 0;
+    [[nodiscard]] virtual bool getTabDeckStorageOpen() const = 0;
+    [[nodiscard]] virtual bool getTabReplaysOpen() const = 0;
+    [[nodiscard]] virtual bool getTabAdminOpen() const = 0;
+    [[nodiscard]] virtual bool getTabLogOpen() const = 0;
+    [[nodiscard]] virtual bool getTabReportOpen() const = 0;
+    [[nodiscard]] virtual bool getTabModerationOpen() const = 0;
+    [[nodiscard]] virtual bool getTabCardArtRulesOpen() const = 0;
+};
+
+#endif // COCKATRICE_INTERFACE_TABS_SETTINGS_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_updates_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_updates_settings_provider.h
new file mode 100644
index 000000000..687484c2c
--- /dev/null
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_updates_settings_provider.h
@@ -0,0 +1,23 @@
+#ifndef COCKATRICE_INTERFACE_UPDATES_SETTINGS_PROVIDER_H
+#define COCKATRICE_INTERFACE_UPDATES_SETTINGS_PROVIDER_H
+
+#include <QDate>
+
+class IUpdatesSettingsProvider
+{
+public:
+    virtual ~IUpdatesSettingsProvider() = default;
+
+    [[nodiscard]] virtual bool getCheckUpdatesOnStartup() const = 0;
+    [[nodiscard]] virtual bool getStartupCardUpdateCheckPromptForUpdate() = 0;
+    [[nodiscard]] virtual bool getStartupCardUpdateCheckAlwaysUpdate() = 0;
+    [[nodiscard]] virtual int getCardUpdateCheckInterval() const = 0;
+    [[nodiscard]] virtual QDate getLastCardUpdateCheck() const = 0;
+    [[nodiscard]] virtual bool getCardUpdateCheckRequired() const = 0;
+    [[nodiscard]] virtual bool getAlwaysEnableNewSets() const = 0;
+    [[nodiscard]] virtual bool getNotifyAboutUpdates() const = 0;
+    [[nodiscard]] virtual bool getNotifyAboutNewVersion() const = 0;
+    [[nodiscard]] virtual int getUpdateReleaseChannelIndex() const = 0;
+};
+
+#endif // COCKATRICE_INTERFACE_UPDATES_SETTINGS_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_visual_deck_storage_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_visual_deck_storage_settings_provider.h
new file mode 100644
index 000000000..114b053c6
--- /dev/null
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_visual_deck_storage_settings_provider.h
@@ -0,0 +1,30 @@
+#ifndef COCKATRICE_INTERFACE_VISUAL_DECK_STORAGE_SETTINGS_PROVIDER_H
+#define COCKATRICE_INTERFACE_VISUAL_DECK_STORAGE_SETTINGS_PROVIDER_H
+
+#include <QStringList>
+
+class IVisualDeckStorageSettingsProvider
+{
+public:
+    virtual ~IVisualDeckStorageSettingsProvider() = default;
+
+    [[nodiscard]] virtual int getVisualDeckStorageSortingOrder() const = 0;
+    [[nodiscard]] virtual bool getVisualDeckStorageShowFolders() const = 0;
+    [[nodiscard]] virtual bool getVisualDeckStorageShowTagFilter() const = 0;
+    [[nodiscard]] virtual QStringList getVisualDeckStorageDefaultTagsList() const = 0;
+    [[nodiscard]] virtual bool getVisualDeckStorageSearchFolderNames() const = 0;
+    [[nodiscard]] virtual bool getVisualDeckStorageShowColorIdentity() const = 0;
+    [[nodiscard]] virtual bool getVisualDeckStorageShowBannerCardComboBox() const = 0;
+    [[nodiscard]] virtual bool getVisualDeckStorageShowTagsOnDeckPreviews() const = 0;
+    [[nodiscard]] virtual bool getVisualDeckStorageDrawUnusedColorIdentities() const = 0;
+    [[nodiscard]] virtual int getVisualDeckStorageUnusedColorIdentitiesOpacity() const = 0;
+    [[nodiscard]] virtual int getVisualDeckStorageTooltipType() const = 0;
+    [[nodiscard]] virtual bool getVisualDeckStoragePromptForConversion() const = 0;
+    [[nodiscard]] virtual bool getVisualDeckStorageAlwaysConvert() const = 0;
+    [[nodiscard]] virtual bool getVisualDeckStorageInGame() const = 0;
+    [[nodiscard]] virtual bool getVisualDeckStorageSelectionAnimation() const = 0;
+    [[nodiscard]] virtual bool getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const = 0;
+    [[nodiscard]] virtual int getVisualDatabaseDisplayFilterToMostRecentSetsAmount() const = 0;
+};
+
+#endif // COCKATRICE_INTERFACE_VISUAL_DECK_STORAGE_SETTINGS_PROVIDER_H
diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_preference_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_preference_provider.h
index 3781f4b63..f846d51e8 100644
--- a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_preference_provider.h
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_preference_provider.h
@@ -9,11 +9,6 @@ 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 b2410781c..94e1f0c9a 100644
--- a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_set_priority_controller.h
+++ b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_set_priority_controller.h
@@ -6,28 +6,42 @@
 class NoopCardSetPriorityController : public ICardSetPriorityController
 {
 public:
-    void setSortKey(QString /* shortName */, unsigned int /* sortKey */)
+    void setSortKey(QString /* shortName */, unsigned int /* sortKey */) override
     {
     }
-    void setEnabled(QString /* shortName */, bool /* enabled */)
+    void setEnabled(QString /* shortName */, bool /* enabled */) override
     {
     }
-    void setIsKnown(QString /* shortName */, bool /* isknown */)
+    void setIsKnown(QString /* shortName */, bool /* isknown */) override
     {
     }
 
-    unsigned int getSortKey(QString /* shortName */)
+    unsigned int getSortKey(QString /* shortName */) const override
     {
         return 0;
     }
-    bool isEnabled(QString /* shortName */)
+    bool isEnabled(QString /* shortName */) const override
     {
         return true;
     }
-    bool isKnown(QString /* shortName */)
+    bool isKnown(QString /* shortName */) const override
     {
         return true;
     }
+
+    SetOptions getSetOptions(QString /* shortName */) const override
+    {
+        return {0, true, true};
+    }
+
+    QStringList getEnabledSetNames() const override
+    {
+        return {};
+    }
+
+    void saveSets(const QVector<SetSaveData> & /* data */) override
+    {
+    }
 };
 
 #endif // COCKATRICE_NOOP_CARD_SET_PRIORITY_CONTROLLER_H
diff --git a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
index 950d6d79f..a73e36dbb 100644
--- a/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
+++ b/libcockatrice_models/libcockatrice/models/database/CMakeLists.txt
@@ -12,11 +12,7 @@ set(HEADERS
     token/token_edit_model.h
 )
 
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
+qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
 
 add_library(
   libcockatrice_models_database STATIC
@@ -33,3 +29,5 @@ 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 387eb454f..b99b8b0f7 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,11 +1,24 @@
 #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)
 {
 }
 
 bool CardCompleterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
 {
+    if (!sourceModel()) {
+        return false;
+    }
+
     if (filterRegularExpression().pattern().isEmpty()) {
         return true;
     }
@@ -13,6 +26,5 @@ bool CardCompleterProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex
     QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
     QString data = index.data(Qt::DisplayRole).toString();
 
-    // Ensure substring matching
     return data.contains(filterRegularExpression());
 }
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 afb6f1fcf..8aa671af7 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
@@ -1,13 +1,16 @@
 /**
  * @file card_completer_proxy_model.h
  * @ingroup CardDatabaseModels
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARD_COMPLETER_PROXY_MODEL_H
 #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 6a930c1da..5bde6e3fc 100644
--- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp
@@ -3,6 +3,10 @@
 #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>
 
@@ -19,11 +23,18 @@ int CardSearchModel::rowCount(const QModelIndex &parent) const
 
 QVariant CardSearchModel::data(const QModelIndex &index, int role) const
 {
-    if (!index.isValid() || index.row() >= searchResults.size())
+    if (!index.isValid() || index.row() >= searchResults.size()) {
         return QVariant();
+    }
+
+    const SearchResult &result = searchResults.at(index.row());
 
     if (role == Qt::DisplayRole) {
-        return searchResults.at(index.row()).card->getName();
+        return result.card->getName();
+    }
+
+    if (role == CardInfoRole) {
+        return QVariant::fromValue(result.card);
     }
 
     return QVariant();
@@ -34,40 +45,91 @@ void CardSearchModel::updateSearchResults(const QString &query)
     beginResetModel();
     searchResults.clear();
 
-    if (query.isEmpty() || !sourceModel)
+    if (query.isEmpty() || !sourceModel) {
+        endResetModel();
         return;
-
-    // Set the filter for the display model
-    sourceModel->setCardName(query);
-
-    // Collect matching cards and compute Levenshtein distance
-    for (int i = 0; i < sourceModel->rowCount(); ++i) {
-        QModelIndex modelIndex = sourceModel->index(i, 0);
-        QModelIndex sourceIndex = sourceModel->mapToSource(modelIndex);
-        CardDatabaseModel *sourceDbModel = qobject_cast<CardDatabaseModel *>(sourceModel->sourceModel());
-
-        if (!sourceDbModel || !sourceIndex.isValid())
-            return;
-
-        CardInfoPtr card = sourceDbModel->getCard(sourceIndex.row());
-
-        if (!card)
-            continue;
-
-        int distance = levenshteinDistance(query.toLower(), card->getName().toLower());
-        searchResults.append({card, distance});
     }
 
-    // Sort by Levenshtein distance (lower distance = better match)
-    std::sort(searchResults.begin(), searchResults.end(),
-              [](const SearchResult &a, const SearchResult &b) { return a.distance < b.distance; });
+    CardDatabaseModel *sourceDbModel = qobject_cast<CardDatabaseModel *>(sourceModel->sourceModel());
+    if (!sourceDbModel) {
+        endResetModel();
+        return;
+    }
 
-    // Keep only the top 5 results
-    if (searchResults.size() > 10)
+    const QString lowerQuery = query.toLower();
+
+    QList<SearchResult> prefixMatches;
+    QList<SearchResult> containsMatches;
+
+    // Iterate the raw database model directly so results are always complete and fresh
+    const int rowCount = sourceDbModel->rowCount();
+    for (int i = 0; i < rowCount; ++i) {
+        CardInfoPtr card = sourceDbModel->getCard(i);
+        if (!card) {
+            continue;
+        }
+
+        // The completer suggestions match against the same languages the card
+        // search uses, so typing a localized name finds the card. In Both mode
+        // either language can match.
+        for (const QString &matchName : searchableNames(card)) {
+            const QString lowerName = matchName.toLower();
+            if (!lowerName.contains(lowerQuery)) {
+                continue;
+            }
+
+            const int distance = levenshteinDistance(lowerQuery, lowerName);
+
+            if (lowerName.startsWith(lowerQuery)) {
+                prefixMatches.append({card, distance});
+            } else {
+                containsMatches.append({card, distance});
+            }
+            break;
+        }
+    }
+
+    auto sortByDistanceThenLength = [this](const SearchResult &a, const SearchResult &b) {
+        if (a.distance != b.distance) {
+            return a.distance < b.distance;
+        }
+        return sortableName(a.card).size() < sortableName(b.card).size();
+    };
+
+    std::sort(prefixMatches.begin(), prefixMatches.end(), sortByDistanceThenLength);
+    std::sort(containsMatches.begin(), containsMatches.end(), sortByDistanceThenLength);
+
+    // Prefix matches always come first, then contains-only matches
+    searchResults.reserve(prefixMatches.size() + containsMatches.size());
+    searchResults.append(prefixMatches);
+    searchResults.append(containsMatches);
+
+    // Keep only the top 10 results
+    if (searchResults.size() > 10) {
         searchResults = searchResults.mid(0, 10);
-
-    emit dataChanged(index(0, 0), index(rowCount() - 1, 0));
-    emit layoutChanged();
+    }
 
     endResetModel();
 }
+
+QStringList CardSearchModel::searchableNames(const CardInfoPtr &card) const
+{
+    if (searchLanguage.isEnglishOnly()) {
+        return {card->getName()};
+    }
+
+    const QString localizedName = card->getLocalizedName(searchLanguage.language);
+    if (searchLanguage.mode == SearchLanguageMode::Selected) {
+        return {localizedName};
+    }
+
+    return {card->getName(), localizedName};
+}
+
+QString CardSearchModel::sortableName(const CardInfoPtr &card) const
+{
+    if (searchLanguage.isEnglishOnly()) {
+        return card->getName();
+    }
+    return card->getLocalizedName(searchLanguage.language);
+}
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 18be2c55a..08d0e8636 100644
--- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h
@@ -1,20 +1,36 @@
 /**
  * @file card_search_model.h
  * @ingroup CardDatabaseModels
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARD_SEARCH_MODEL_H
 #define CARD_SEARCH_MODEL_H
 
-#include "../card_database_display_model.h"
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/card_localization.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
 {
     Q_OBJECT
 public:
+    enum CardSearchRoles
+    {
+        CardInfoRole = Qt::UserRole + 1,
+    };
+
     explicit CardSearchModel(CardDatabaseDisplayModel *sourceModel, QObject *parent = nullptr);
 
     [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
@@ -22,6 +38,14 @@ public:
 
     void updateSearchResults(const QString &query); // Update results based on input
 
+    void setSearchLanguage(const CardSearchLanguage &searchLang)
+    {
+        if (searchLanguage == searchLang) {
+            return;
+        }
+        searchLanguage = searchLang;
+    }
+
 private:
     struct SearchResult
     {
@@ -29,8 +53,15 @@ private:
         int distance;
     };
 
+    /** @brief The names a card is searched by with the current search language. */
+    [[nodiscard]] QStringList searchableNames(const CardInfoPtr &card) const;
+
+    /** @brief The name used to break distance ties when sorting suggestions. */
+    [[nodiscard]] QString sortableName(const CardInfoPtr &card) const;
+
     CardDatabaseDisplayModel *sourceModel;
     QList<SearchResult> searchResults;
+    CardSearchLanguage searchLanguage;
 };
 
 #endif // CARD_SEARCH_MODEL_H
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 5ce63a939..39bb8314c 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp
@@ -1,6 +1,23 @@
 #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)
@@ -10,11 +27,28 @@ CardDatabaseDisplayModel::CardDatabaseDisplayModel(QObject *parent)
     setSortCaseSensitivity(Qt::CaseInsensitive);
 
     dirtyTimer.setSingleShot(true);
-    connect(&dirtyTimer, &QTimer::timeout, this, &CardDatabaseDisplayModel::invalidate);
+    connect(&dirtyTimer, &QTimer::timeout, this, [this]() {
+        invalidate();
+        emit modelDirty();
+    });
 
     loadedRowCount = 0;
 }
 
+void CardDatabaseDisplayModel::setSourceModel(QAbstractItemModel *model)
+{
+    QSortFilterProxyModel::setSourceModel(model);
+
+    connect(model, &QAbstractItemModel::rowsInserted, this, [this]() { dirty(); });
+
+    connect(model, &QAbstractItemModel::rowsRemoved, this, [this]() { dirty(); });
+
+    connect(model, &QAbstractItemModel::modelReset, this, [this]() {
+        loadedRowCount = 0;
+        dirty();
+    });
+}
+
 QMap<wchar_t, wchar_t> CardDatabaseDisplayModel::characterTranslation = {{L'“', L'\"'},
                                                                          {L'”', L'\"'},
                                                                          {L'‘', L'\''},
@@ -58,12 +92,14 @@ bool CardDatabaseDisplayModel::lessThan(const QModelIndex &left, const QModelInd
 
         // test for an exact match: isLeftType && leftString.size() == cardName.size()
         // or an exclusive start match: isLeftType && !isRightType
-        if (isLeftType && (!isRightType || leftString.size() == cardName.size()))
+        if (isLeftType && (!isRightType || leftString.size() == cardName.size())) {
             return true;
+        }
 
         // same checks for the right string
-        if (isRightType && (!isLeftType || rightString.size() == cardName.size()))
+        if (isRightType && (!isLeftType || rightString.size() == cardName.size())) {
             return false;
+        }
     } else if (right.column() == CardDatabaseModel::PTColumn && left.column() == CardDatabaseModel::PTColumn) {
         QStringList leftList = leftString.split("/");
         QStringList rightList = rightString.split("/");
@@ -155,11 +191,12 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex
 {
     CardInfoPtr info = static_cast<CardDatabaseModel *>(sourceModel())->getCard(sourceRow);
 
-    if (((isToken == ShowTrue) && !info->getIsToken()) || ((isToken == ShowFalse) && info->getIsToken()))
+    if (((isToken == ShowTrue) && !info->getIsToken()) || ((isToken == ShowFalse) && info->getIsToken())) {
         return false;
+    }
 
     if (filterString != nullptr) {
-        if (filterTree != nullptr && !filterTree->acceptsCard(info)) {
+        if (filterTree != nullptr && !filterTree->acceptsCard(info, searchLanguage)) {
             return false;
         }
         return filterString->check(info);
@@ -170,14 +207,23 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex
 
 bool CardDatabaseDisplayModel::rowMatchesCardName(CardInfoPtr info) const
 {
-    if (!cardName.isEmpty() && !info->getName().contains(cardName, Qt::CaseInsensitive))
-        return false;
+    if (!cardName.isEmpty()) {
+        const bool matchesEnglish = info->getName().contains(cardName, Qt::CaseInsensitive);
+        const bool matchesLocalized =
+            !searchLanguage.isEnglishOnly() &&
+            info->getLocalizedName(searchLanguage.language).contains(cardName, Qt::CaseInsensitive);
+        if (!matchesEnglish && !matchesLocalized) {
+            return false;
+        }
+    }
 
-    if (!cardNameSet.isEmpty() && !cardNameSet.contains(info->getName()))
+    if (!cardNameSet.isEmpty() && !cardNameSet.contains(info->getName())) {
         return false;
+    }
 
-    if (filterTree != nullptr)
-        return filterTree->acceptsCard(info);
+    if (filterTree != nullptr) {
+        return filterTree->acceptsCard(info, searchLanguage);
+    }
 
     return true;
 }
@@ -191,8 +237,9 @@ void CardDatabaseDisplayModel::clearFilterAll()
     cardText.clear();
     cardTypes.clear();
     cardColors.clear();
-    if (filterTree != nullptr)
+    if (filterTree != nullptr) {
         filterTree->clear();
+    }
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
     endFilterChange(QSortFilterProxyModel::Direction::Rows);
 #else
@@ -202,14 +249,37 @@ void CardDatabaseDisplayModel::clearFilterAll()
 
 void CardDatabaseDisplayModel::setFilterTree(FilterTree *_filterTree)
 {
-    if (this->filterTree != nullptr)
+    if (this->filterTree != nullptr) {
         disconnect(this->filterTree, nullptr, this, nullptr);
+    }
 
     this->filterTree = _filterTree;
     connect(this->filterTree, &FilterTree::changed, this, &CardDatabaseDisplayModel::filterTreeChanged);
     invalidate();
 }
 
+void CardDatabaseDisplayModel::setStringFilter(const QString &_src)
+{
+    searchText = _src;
+    delete filterString;
+    filterString = new FilterString(_src, searchLanguage);
+    dirty();
+}
+
+void CardDatabaseDisplayModel::setSearchLanguage(const CardSearchLanguage &searchLang)
+{
+    if (searchLanguage == searchLang) {
+        return;
+    }
+
+    searchLanguage = searchLang;
+
+    if (filterString != nullptr) {
+        setStringFilter(searchText);
+    }
+    dirty();
+}
+
 void CardDatabaseDisplayModel::filterTreeChanged()
 {
     invalidate();
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 0c5994a3a..d12dd1fb4 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h
@@ -8,11 +8,21 @@
 #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
@@ -32,17 +42,19 @@ private:
     FilterString *filterString;
     int loadedRowCount;
     QTimer dirtyTimer;
+    CardSearchLanguage searchLanguage;
+    QString searchText;
 
     /** The translation table that will be used for sanitizeCardName. */
     static QMap<wchar_t, wchar_t> characterTranslation;
 
 public:
     explicit CardDatabaseDisplayModel(QObject *parent = nullptr);
+    void setSourceModel(QAbstractItemModel *model) override;
     void setFilterTree(FilterTree *_filterTree);
     void setIsToken(FilterBool _isToken)
     {
         isToken = _isToken;
-        emit modelDirty();
         dirty();
     }
 
@@ -53,22 +65,15 @@ public:
             filterString = nullptr;
         }
         cardName = sanitizeCardName(_cardName, characterTranslation);
-        emit modelDirty();
-        dirty();
-    }
-    void setStringFilter(const QString &_src)
-    {
-        delete filterString;
-        filterString = new FilterString(_src);
-        emit modelDirty();
         dirty();
     }
+    void setStringFilter(const QString &_src);
     void setCardNameSet(const QSet<QString> &_cardNameSet)
     {
         cardNameSet = _cardNameSet;
-        emit modelDirty();
         dirty();
     }
+    void setSearchLanguage(const CardSearchLanguage &searchLang);
 
     void dirty()
     {
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
index e33156329..1ede554f8 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp
@@ -1,8 +1,16 @@
 #include "card_database_model.h"
 
-#include <QMap>
+#include "libcockatrice/card/printing/printing_info.h"
+#include "libcockatrice/card/set/card_set.h"
+
+#include <QChar>
+#include <QSharedPointer>
+#include <QString>
+#include <QVariant>
 #include <libcockatrice/card/database/card_database.h>
 
+class QObject;
+
 #define CARDDBMODEL_COLUMNS 6
 
 CardDatabaseModel::CardDatabaseModel(CardDatabase *_db, bool _showOnlyCardsFromEnabledSets, QObject *parent)
@@ -12,6 +20,7 @@ CardDatabaseModel::CardDatabaseModel(CardDatabase *_db, bool _showOnlyCardsFromE
     connect(db, &CardDatabase::cardRemoved, this, &CardDatabaseModel::cardRemoved);
     connect(db, &CardDatabase::cardDatabaseEnabledSetsChanged, this,
             &CardDatabaseModel::cardDatabaseEnabledSetsChanged);
+    connect(db, &CardDatabase::cardDatabaseReset, this, &CardDatabaseModel::resetCardList);
 
     cardDatabaseEnabledSetsChanged();
 }
@@ -31,8 +40,9 @@ int CardDatabaseModel::columnCount(const QModelIndex & /*parent*/) const
 QVariant CardDatabaseModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid() || index.row() >= cardList.size() || index.column() >= CARDDBMODEL_COLUMNS ||
-        (role != Qt::DisplayRole && role != SortRole))
+        (role != Qt::DisplayRole && role != SortRole)) {
         return QVariant();
+    }
 
     CardInfoPtr card = cardList.at(index.row());
     switch (index.column()) {
@@ -56,10 +66,12 @@ QVariant CardDatabaseModel::data(const QModelIndex &index, int role) const
 
 QVariant CardDatabaseModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
-    if (role != Qt::DisplayRole)
+    if (role != Qt::DisplayRole) {
         return QVariant();
-    if (orientation != Qt::Horizontal)
+    }
+    if (orientation != Qt::Horizontal) {
         return QVariant();
+    }
     switch (section) {
         case NameColumn:
             return QString(tr("Name"));
@@ -78,24 +90,27 @@ QVariant CardDatabaseModel::headerData(int section, Qt::Orientation orientation,
     }
 }
 
-void CardDatabaseModel::cardInfoChanged(CardInfoPtr card)
+void CardDatabaseModel::cardInfoChanged(const CardInfoPtr &card)
 {
     const int row = cardList.indexOf(card);
-    if (row == -1)
+    if (row == -1) {
         return;
+    }
 
     emit dataChanged(index(row, 0), index(row, CARDDBMODEL_COLUMNS - 1));
 }
 
-bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(CardInfoPtr card)
+bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(const CardInfoPtr &card) const
 {
-    if (!showOnlyCardsFromEnabledSets)
+    if (!showOnlyCardsFromEnabledSets) {
         return true;
+    }
 
     for (const auto &printings : card->getSets()) {
         for (const auto &printing : printings) {
-            if (printing.getSet()->getEnabled())
+            if (printing.getSet()->getEnabled()) {
                 return true;
+            }
         }
     }
 
@@ -104,22 +119,53 @@ bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(CardInfoPtr card)
 
 void CardDatabaseModel::cardDatabaseEnabledSetsChanged()
 {
-    // remove all the cards no more present in at least one enabled set
+    // Build the new card list in a single pass.
+    QList<CardInfoPtr> newCardList;
+    newCardList.reserve(cardList.size());
     for (const CardInfoPtr &card : cardList) {
-        if (!checkCardHasAtLeastOneEnabledSet(card)) {
-            cardRemoved(card);
+        if (checkCardHasAtLeastOneEnabledSet(card)) {
+            newCardList.append(card);
+        }
+    }
+    for (const CardInfoPtr &card : db->getCardList()) {
+        if (!cardListSet.contains(card) && checkCardHasAtLeastOneEnabledSet(card)) {
+            newCardList.append(card);
         }
     }
 
-    // re-check all the card currently not shown, maybe their part of a newly-enabled set
-    for (const CardInfoPtr &card : db->getCardList()) {
-        if (!cardListSet.contains(card)) {
-            cardAdded(card);
+    if (newCardList == cardList) {
+        return;
+    }
+
+    // Rebuild the whole list inside a single model reset instead of emitting
+    // per-card insert/remove notifications. With tens of thousands of cards the
+    // per-card path is the dominant cost of constructing a CardDatabaseModel.
+    QSet<CardInfoPtr> oldCardListSet = cardListSet;
+    QSet<CardInfoPtr> newCardListSet(newCardList.begin(), newCardList.end());
+
+    beginResetModel();
+
+    // Disconnect cards that are no longer shown.
+    for (const CardInfoPtr &card : cardList) {
+        if (!newCardListSet.contains(card)) {
+            disconnect(card.data(), nullptr, this, nullptr);
         }
     }
+
+    cardList = newCardList;
+    cardListSet = newCardListSet;
+
+    // Connect cards that are now shown for the first time.
+    for (const CardInfoPtr &card : cardList) {
+        if (!oldCardListSet.contains(card)) {
+            connect(card.data(), &CardInfo::cardInfoChanged, this, &CardDatabaseModel::cardInfoChanged);
+        }
+    }
+
+    endResetModel();
 }
 
-void CardDatabaseModel::cardAdded(CardInfoPtr card)
+void CardDatabaseModel::cardAdded(const CardInfoPtr &card)
 {
     if (checkCardHasAtLeastOneEnabledSet(card)) {
         // add the card if it's present in at least one enabled set
@@ -145,3 +191,18 @@ void CardDatabaseModel::cardRemoved(CardInfoPtr card)
     cardList.removeAt(row);
     endRemoveRows();
 }
+
+void CardDatabaseModel::resetCardList()
+{
+    beginResetModel();
+    cardList.clear();
+    cardListSet.clear();
+    for (const CardInfoPtr &card : db->getCardList()) {
+        if (checkCardHasAtLeastOneEnabledSet(card)) {
+            cardList.append(card);
+            cardListSet.insert(card);
+            connect(card.data(), &CardInfo::cardInfoChanged, this, &CardDatabaseModel::cardInfoChanged);
+        }
+    }
+    endResetModel();
+}
diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_model.h
index 218cfff92..208240109 100644
--- a/libcockatrice_models/libcockatrice/models/database/card_database_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/card_database_model.h
@@ -7,10 +7,17 @@
 #ifndef CARDDATABASEMODEL_H
 #define CARDDATABASEMODEL_H
 
+#include "libcockatrice/card/card_info.h"
+
 #include <QAbstractListModel>
 #include <QList>
+#include <QModelIndex>
 #include <QSet>
-#include <libcockatrice/card/database/card_database.h>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
+
+class CardDatabase;
+class QObject;
 
 class CardDatabaseModel : public QAbstractListModel
 {
@@ -51,12 +58,13 @@ private:
     CardDatabase *db;
     bool showOnlyCardsFromEnabledSets;
 
-    inline bool checkCardHasAtLeastOneEnabledSet(CardInfoPtr card);
+    inline bool checkCardHasAtLeastOneEnabledSet(const CardInfoPtr &card) const;
 private slots:
-    void cardAdded(CardInfoPtr card);
+    void cardAdded(const CardInfoPtr &card);
     void cardRemoved(CardInfoPtr card);
-    void cardInfoChanged(CardInfoPtr card);
+    void cardInfoChanged(const CardInfoPtr &card);
     void cardDatabaseEnabledSetsChanged();
+    void resetCardList();
 };
 
 #endif
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 2af815246..a0b9c1061 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,13 +1,27 @@
 #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())
 {
     sets.sortByKey();
     for (const CardSetPtr &set : sets) {
-        if (set->getEnabled())
+        if (set->getEnabled()) {
             enabledSets.insert(set);
+        }
     }
 }
 
@@ -15,16 +29,18 @@ SetsModel::~SetsModel() = default;
 
 int SetsModel::rowCount(const QModelIndex &parent) const
 {
-    if (parent.isValid())
+    if (parent.isValid()) {
         return 0;
-    else
+    } else {
         return sets.size();
+    }
 }
 
 QVariant SetsModel::data(const QModelIndex &index, int role) const
 {
-    if (!index.isValid() || (index.column() >= NUM_COLS) || (index.row() >= rowCount()))
+    if (!index.isValid() || (index.column() >= NUM_COLS) || (index.row() >= rowCount())) {
         return QVariant();
+    }
 
     CardSetPtr set = sets[index.row()];
 
@@ -40,12 +56,13 @@ QVariant SetsModel::data(const QModelIndex &index, int role) const
         }
     }
 
-    if (role != Qt::DisplayRole && role != SortRole)
+    if (role != Qt::DisplayRole && role != SortRole) {
         return QVariant();
+    }
 
     switch (index.column()) {
         case SortKeyCol:
-            return QString("%1").arg(set->getSortKey(), 8, 10, QChar('0'));
+            return QString("%1").arg(index.row(), 8, 10, QChar('0'));
         case IsKnownCol:
             return set->getIsKnown();
         case SetTypeCol:
@@ -72,8 +89,9 @@ bool SetsModel::setData(const QModelIndex &index, const QVariant &value, int rol
 
 QVariant SetsModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
-    if ((role != Qt::DisplayRole) || (orientation != Qt::Horizontal))
+    if ((role != Qt::DisplayRole) || (orientation != Qt::Horizontal)) {
         return QVariant();
+    }
     switch (section) {
         case SortKeyCol:
             return QString("Key"); /* no tr() for translations needed, column just used for sorting --> hidden */
@@ -97,13 +115,15 @@ QVariant SetsModel::headerData(int section, Qt::Orientation orientation, int rol
 
 Qt::ItemFlags SetsModel::flags(const QModelIndex &index) const
 {
-    if (!index.isValid())
+    if (!index.isValid()) {
         return Qt::NoItemFlags;
+    }
 
     Qt::ItemFlags flags = QAbstractTableModel::flags(index) | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
 
-    if (index.column() == EnabledCol)
+    if (index.column() == EnabledCol) {
         flags |= Qt::ItemIsUserCheckable;
+    }
 
     return flags;
 }
@@ -115,8 +135,9 @@ Qt::DropActions SetsModel::supportedDropActions() const
 
 QMimeData *SetsModel::mimeData(const QModelIndexList &indexes) const
 {
-    if (indexes.isEmpty())
+    if (indexes.isEmpty()) {
         return 0;
+    }
 
     SetsMimeData *result = new SetsMimeData(indexes[0].row());
     return qobject_cast<QMimeData *>(result);
@@ -128,16 +149,19 @@ bool SetsModel::dropMimeData(const QMimeData *data,
                              int /*column*/,
                              const QModelIndex &parent)
 {
-    if (action != Qt::MoveAction)
+    if (action != Qt::MoveAction) {
         return false;
+    }
     if (row == -1) {
-        if (!parent.isValid())
+        if (!parent.isValid()) {
             return false;
+        }
         row = parent.row();
     }
     int oldRow = qobject_cast<const SetsMimeData *>(data)->getOldRow();
-    if (oldRow < row)
+    if (oldRow < row) {
         row--;
+    }
 
     swapRows(oldRow, row);
 
@@ -148,10 +172,11 @@ void SetsModel::toggleRow(int row, bool enable)
 {
     CardSetPtr temp = sets.at(row);
 
-    if (enable)
+    if (enable) {
         enabledSets.insert(temp);
-    else
+    } else {
         enabledSets.remove(temp);
+    }
 
     emit dataChanged(index(row, EnabledCol), index(row, EnabledCol));
 }
@@ -160,13 +185,15 @@ void SetsModel::toggleRow(int row)
 {
     CardSetPtr tmp = sets.at(row);
 
-    if (tmp == nullptr)
+    if (tmp == nullptr) {
         return;
+    }
 
-    if (enabledSets.contains(tmp))
+    if (enabledSets.contains(tmp)) {
         enabledSets.remove(tmp);
-    else
+    } else {
         enabledSets.insert(tmp);
+    }
 
     emit dataChanged(index(row, EnabledCol), index(row, EnabledCol));
 }
@@ -175,9 +202,11 @@ void SetsModel::toggleAll(bool enabled)
 {
     enabledSets.clear();
 
-    if (enabled)
-        for (CardSetPtr set : sets)
+    if (enabled) {
+        for (CardSetPtr set : sets) {
             enabledSets.insert(set);
+        }
+    }
 
     emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
 }
@@ -208,8 +237,9 @@ void SetsModel::sort(int column, Qt::SortOrder order)
     int numRows = rowCount();
     int row;
 
-    for (row = 0; row < numRows; ++row)
+    for (row = 0; row < numRows; ++row) {
         setMap.insert(index(row, column).data(SetsModel::SortRole).toString(), sets.at(row));
+    }
 
     QList<CardSetPtr> tmp = setMap.values();
     sets.clear();
@@ -228,16 +258,19 @@ void SetsModel::sort(int column, Qt::SortOrder order)
 
 void SetsModel::save(CardDatabase *db)
 {
-    // order
-    for (int i = 0; i < sets.size(); i++)
-        sets[i]->setSortKey(static_cast<unsigned int>(i + 1));
+    QVector<ICardSetPriorityController::SetSaveData> saveData;
+    saveData.reserve(sets.size());
 
-    // enabled sets
-    for (const CardSetPtr &set : sets)
-        set->setEnabled(enabledSets.contains(set));
+    for (int i = 0; i < sets.size(); ++i) {
+        const unsigned int sortKey = static_cast<unsigned int>(i + 1);
+        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()});
+    }
 
+    db->getPriorityController()->saveSets(saveData);
     sets.sortByKey();
-
     db->notifyEnabledSetsChanged();
 }
 
@@ -250,8 +283,9 @@ void SetsModel::restore(CardDatabase *db)
     // enabled sets
     enabledSets.clear();
     for (const CardSetPtr &set : sets) {
-        if (set->getEnabled())
+        if (set->getEnabled()) {
             enabledSets.insert(set);
+        }
     }
 
     emit dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
@@ -282,16 +316,14 @@ bool SetsDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex &source
     auto typeIndex = sourceModel()->index(sourceRow, SetsModel::SetTypeCol, sourceParent);
     auto nameIndex = sourceModel()->index(sourceRow, SetsModel::LongNameCol, sourceParent);
     auto shortNameIndex = sourceModel()->index(sourceRow, SetsModel::ShortNameCol, sourceParent);
+    auto dateIndex = sourceModel()->index(sourceRow, SetsModel::ReleaseDateCol, sourceParent);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
     const auto filter = filterRegularExpression();
-#else
-    const auto filter = filterRegExp();
-#endif
 
     return (sourceModel()->data(typeIndex).toString().contains(filter) ||
             sourceModel()->data(nameIndex).toString().contains(filter) ||
-            sourceModel()->data(shortNameIndex).toString().contains(filter));
+            sourceModel()->data(shortNameIndex).toString().contains(filter) ||
+            sourceModel()->data(dateIndex).toString().contains(filter));
 }
 
 bool SetsDisplayModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
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 0ffc5a847..354414dc8 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
@@ -1,19 +1,30 @@
 /**
  * @file sets_model.h
  * @ingroup CardDatabaseModels
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #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 <libcockatrice/card/database/card_database.h>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
-class SetsProxyModel;
+class CardDatabase;
+class QObject;
 
 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 4282c6dc8..e08183576 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.cpp
@@ -1,6 +1,12 @@
 #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 f6b2fdfbb..a8625368f 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h
@@ -1,14 +1,19 @@
 /**
  * @file token_display_model.h
  * @ingroup CardDatabaseModels
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_TOKEN_DISPLAY_MODEL_H
 #define COCKATRICE_TOKEN_DISPLAY_MODEL_H
 
 #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 89a1f71b1..9636ed665 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp
@@ -2,9 +2,13 @@
 
 #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 5e5843761..2f3398899 100644
--- a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h
+++ b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h
@@ -1,14 +1,19 @@
 /**
  * @file token_edit_model.h
  * @ingroup CardDatabaseModels
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_TOKEN_EDIT_MODEL_H
 #define COCKATRICE_TOKEN_EDIT_MODEL_H
 
 #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 851636a35..324bed102 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
+++ b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt
@@ -4,14 +4,11 @@ set(CMAKE_AUTORCC ON)
 
 set(HEADERS deck_list_model.h deck_list_sort_filter_proxy_model.h)
 
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
+qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
 
 add_library(
-  libcockatrice_models_deck_list STATIC ${MOC_SOURCES} deck_list_model.cpp deck_list_sort_filter_proxy_model.cpp
+  libcockatrice_models_deck_list STATIC ${MOC_SOURCES} deck_list_model.cpp deck_list_model_custom_zones.cpp
+                                        deck_list_sort_filter_proxy_model.cpp
 )
 
 target_include_directories(libcockatrice_models_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
@@ -19,3 +16,5 @@ 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 bd16ab3d2..4b4088972 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
@@ -1,30 +1,77 @@
 #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)
 {
-    // This class will leak the decklist object. We cannot safely delete it in the dtor because the deckList field is a
-    // non-owning pointer and another deckList might have been assigned to it.
-    // `DeckListModel::cleanList` also leaks for the same reason.
-    // TODO: fix the leak
-    deckList = new DeckList;
+    deckList = QSharedPointer<DeckList>(new DeckList());
     root = new InnerDecklistNode;
 }
 
+DeckListModel::DeckListModel(QObject *parent, const QSharedPointer<DeckList> &deckList) : DeckListModel(parent)
+{
+    setDeckList(deckList);
+
+    // forward change signals
+    connect(this, &DeckListModel::cardAddedAt, this, &DeckListModel::cardsChanged);
+    connect(this, &DeckListModel::cardRemoved, this, &DeckListModel::cardsChanged);
+    connect(this, &DeckListModel::deckReplaced, this, &DeckListModel::cardsChanged);
+
+    connect(this, &DeckListModel::cardNodeAddedAt, this, &DeckListModel::cardNodesChanged);
+    connect(this, &DeckListModel::cardNodeRemoved, this, &DeckListModel::cardNodesChanged);
+    connect(this, &DeckListModel::deckReplaced, this, &DeckListModel::cardNodesChanged);
+}
+
 DeckListModel::~DeckListModel()
 {
     delete root;
 }
 
-QString DeckListModel::getGroupCriteriaForCard(CardInfoPtr info) const
+void DeckListModel::setDisplayLanguage(const QString &lang)
+{
+    if (displayLang == lang) {
+        return;
+    }
+    displayLang = lang;
+    emit layoutAboutToBeChanged();
+    emit layoutChanged();
+}
+
+/**
+ * @brief Extract the value from the card that is used for the group criteria.
+ * @param info Pointer to card information.
+ * @param criteria The group criteria
+ * @return String representing the value of the criteria.
+ */
+static QString extractGroupCriteriaValue(const CardInfoPtr &info, DeckListModelGroupCriteria::Type criteria)
 {
     if (!info) {
         return "unknown";
     }
 
-    switch (activeGroupCriteria) {
+    switch (criteria) {
         case DeckListModelGroupCriteria::MAIN_TYPE:
             return info->getMainCardType();
         case DeckListModelGroupCriteria::MANA_COST:
@@ -41,7 +88,7 @@ void DeckListModel::rebuildTree()
     beginResetModel();
     root->clearTree();
 
-    InnerDecklistNode *listRoot = deckList->getRoot();
+    InnerDecklistNode *listRoot = deckList->getTree()->getRoot();
 
     for (int i = 0; i < listRoot->size(); i++) {
         auto *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
@@ -50,13 +97,14 @@ void DeckListModel::rebuildTree()
         for (int j = 0; j < currentZone->size(); j++) {
             auto *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
 
-            // TODO: better sanity checking
+            // Non-card children are custom zones; they are mirrored in a single
+            // pass below so each is mirrored exactly once.
             if (currentCard == nullptr) {
                 continue;
             }
 
             CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
-            QString groupCriteria = getGroupCriteriaForCard(info);
+            QString groupCriteria = extractGroupCriteriaValue(info, activeGroupCriteria);
 
             auto *groupNode = dynamic_cast<InnerDecklistNode *>(node->findChild(groupCriteria));
 
@@ -66,9 +114,22 @@ void DeckListModel::rebuildTree()
 
             new DecklistModelCardNode(currentCard, groupNode);
         }
+
+        // Custom zones nested under the board zone are mirrored as-is, with their
+        // cards as direct children (no further grouping).
+        DeckListModelCustomZones::mirrorCustomZones(currentZone, node);
     }
 
+    // The shadow tree was built in deck file order. Apply the active sort while
+    // the reset is still open so every consumer (tree view and visual editor)
+    // sees the canonical order from the start. sortShadowTree emits no signals,
+    // which is only valid before endResetModel closes the reset.
+    root->setSortMethod(lastKnownColumn == 0 ? DeckSortMethod::ByNumber : DeckSortMethod::ByName);
+    sortShadowTree(root, lastKnownOrder);
+
     endResetModel();
+
+    refreshCardFormatLegalities();
 }
 
 int DeckListModel::rowCount(const QModelIndex &parent) const
@@ -136,6 +197,9 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const
             case DeckRoles::IsLegalRole:
                 return true;
 
+            case DeckRoles::IsCustomZoneRole:
+                return DeckListModelCustomZones::isCustomZone(group);
+
             default:
                 return {};
         }
@@ -148,8 +212,15 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const
             switch (index.column()) {
                 case DeckListModelColumns::CARD_AMOUNT:
                     return card->getNumber();
-                case DeckListModelColumns::CARD_NAME:
+                case DeckListModelColumns::CARD_NAME: {
+                    if (role == Qt::DisplayRole) {
+                        CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(card->getName());
+                        if (info) {
+                            return info->getLocalizedName(displayLang);
+                        }
+                    }
                     return card->getName();
+                }
                 case DeckListModelColumns::CARD_SET:
                     return card->getCardSetShortName();
                 case DeckListModelColumns::CARD_COLLECTOR_NUMBER:
@@ -168,28 +239,20 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const
             return card->depth();
         }
 
+        case DeckRoles::IsLegalRole: {
+            return card->getFormatLegality();
+        }
+
+        case DeckRoles::IsCustomZoneRole: {
+            return false;
+        }
+
         default: {
             return {};
         }
     }
 }
 
-void DeckListModel::emitBackgroundUpdates(const QModelIndex &parent)
-{
-    int rows = rowCount(parent);
-    if (rows == 0)
-        return;
-
-    QModelIndex topLeft = index(0, 0, parent);
-    QModelIndex bottomRight = index(rows - 1, columnCount() - 1, parent);
-    emit dataChanged(topLeft, bottomRight, {Qt::BackgroundRole});
-
-    for (int r = 0; r < rows; ++r) {
-        QModelIndex child = index(r, 0, parent);
-        emitBackgroundUpdates(child);
-    }
-}
-
 QVariant DeckListModel::headerData(const int section, const Qt::Orientation orientation, const int role) const
 {
     if ((role != Qt::DisplayRole) || (orientation != Qt::Horizontal)) {
@@ -248,6 +311,23 @@ Qt::ItemFlags DeckListModel::flags(const QModelIndex &index) const
     return result;
 }
 
+void DeckListModel::emitBackgroundUpdates(const QModelIndex &parent)
+{
+    int rows = rowCount(parent);
+    if (rows == 0) {
+        return;
+    }
+
+    QModelIndex topLeft = index(0, 0, parent);
+    QModelIndex bottomRight = index(rows - 1, columnCount() - 1, parent);
+    emit dataChanged(topLeft, bottomRight, {Qt::BackgroundRole});
+
+    for (int r = 0; r < rows; ++r) {
+        QModelIndex child = index(r, 0, parent);
+        emitBackgroundUpdates(child);
+    }
+}
+
 void DeckListModel::emitRecursiveUpdates(const QModelIndex &index)
 {
     if (!index.isValid()) {
@@ -268,6 +348,7 @@ bool DeckListModel::setData(const QModelIndex &index, const QVariant &value, con
     switch (index.column()) {
         case DeckListModelColumns::CARD_AMOUNT:
             node->setNumber(value.toInt());
+            refreshCardFormatLegalities();
             break;
         case DeckListModelColumns::CARD_NAME:
             node->setName(value.toString());
@@ -289,7 +370,6 @@ bool DeckListModel::setData(const QModelIndex &index, const QVariant &value, con
     deckList->refreshDeckHash();
     emit deckHashChanged();
 
-    emit dataChanged(index, index);
     return true;
 }
 
@@ -304,28 +384,40 @@ bool DeckListModel::removeRows(int row, int count, const QModelIndex &parent)
         return false;
     }
 
+    // Custom zone rows are managed through the deck tree, never removed as model rows.
+    for (int i = 0; i < count; i++) {
+        if (DeckListModelCustomZones::isCustomZone(node->at(row + i))) {
+            return false;
+        }
+    }
+
     beginRemoveRows(parent, row, row + count - 1);
     for (int i = 0; i < count; i++) {
         AbstractDecklistNode *toDelete = node->takeAt(row);
         if (auto *temp = dynamic_cast<DecklistModelCardNode *>(toDelete)) {
-            deckList->deleteNode(temp->getDataNode());
+            deckList->getTree()->deleteNode(temp->getDataNode());
         }
         delete toDelete;
     }
     endRemoveRows();
 
-    if (node->empty() && (node != root)) {
+    // Empty criteria groups get pruned, but custom zones stay until explicitly deleted.
+    if (node->empty() && (node != root) && !DeckListModelCustomZones::isCustomZone(node)) {
         removeRows(parent.row(), 1, parent.parent());
     } else {
         emitRecursiveUpdates(parent);
     }
 
+    deckList->refreshDeckHash();
+    emit deckHashChanged();
+
     return true;
 }
 
 InnerDecklistNode *DeckListModel::createNodeIfNeeded(const QString &name, InnerDecklistNode *parent)
 {
-    auto *newNode = dynamic_cast<InnerDecklistNode *>(parent->findChild(name));
+    // Group lookups must not resolve a mirrored custom zone that shares the name.
+    auto *newNode = DeckListModelCustomZones::findGroupChild(parent, name);
     if (!newNode) {
         beginInsertRows(nodeToIndex(parent), parent->size(), parent->size());
         newNode = new InnerDecklistNode(name, parent);
@@ -339,24 +431,44 @@ DecklistModelCardNode *DeckListModel::findCardNode(const QString &cardName,
                                                    const QString &providerId,
                                                    const QString &cardNumber) const
 {
-    InnerDecklistNode *zoneNode = dynamic_cast<InnerDecklistNode *>(root->findChild(zoneName));
-    if (!zoneNode) {
-        return nullptr;
-    }
-
     CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(cardName);
     if (!info) {
         return nullptr;
     }
 
-    QString groupCriteria = getGroupCriteriaForCard(info);
-    InnerDecklistNode *groupNode = dynamic_cast<InnerDecklistNode *>(zoneNode->findChild(groupCriteria));
-    if (!groupNode) {
-        return nullptr;
+    // 1. Board zone lookup: search the criteria groups, then the custom zones
+    //    nested under the board.
+    if (auto *zoneNode = dynamic_cast<InnerDecklistNode *>(root->findChild(zoneName))) {
+        QString groupCriteria = extractGroupCriteriaValue(info, activeGroupCriteria);
+        if (auto *groupNode = DeckListModelCustomZones::findGroupChild(zoneNode, groupCriteria)) {
+            if (auto *card = dynamic_cast<DecklistModelCardNode *>(
+                    groupNode->findCardChildByNameProviderIdAndNumber(cardName, providerId, cardNumber))) {
+                return card;
+            }
+        }
+
+        for (auto *child : *zoneNode) {
+            if (!DeckListModelCustomZones::isCustomZone(child)) {
+                continue;
+            }
+            auto *customZone = dynamic_cast<InnerDecklistNode *>(child);
+            if (!customZone) {
+                continue;
+            }
+            if (auto *card = dynamic_cast<DecklistModelCardNode *>(
+                    customZone->findCardChildByNameProviderIdAndNumber(cardName, providerId, cardNumber))) {
+                return card;
+            }
+        }
     }
 
-    return dynamic_cast<DecklistModelCardNode *>(
-        groupNode->findCardChildByNameProviderIdAndNumber(cardName, providerId, cardNumber));
+    // 2. Custom zone lookup by name (custom zone names are deck-unique).
+    if (auto *customZone = DeckListModelCustomZones::findSubZoneByName(root, zoneName)) {
+        return dynamic_cast<DecklistModelCardNode *>(
+            customZone->findCardChildByNameProviderIdAndNumber(cardName, providerId, cardNumber));
+    }
+
+    return nullptr;
 }
 
 QModelIndex DeckListModel::findCard(const QString &cardName,
@@ -397,43 +509,182 @@ QModelIndex DeckListModel::addCard(const ExactCard &card, const QString &zoneNam
         return {};
     }
 
-    InnerDecklistNode *zoneNode = createNodeIfNeeded(zoneName, root);
-
     CardInfoPtr cardInfo = card.getCardPtr();
     PrintingInfo printingInfo = card.getPrinting();
 
-    QString groupCriteria = getGroupCriteriaForCard(cardInfo);
-    InnerDecklistNode *groupNode = createNodeIfNeeded(groupCriteria, zoneNode);
+    InnerDecklistNode *cardParent = nullptr;
 
-    const QModelIndex parentIndex = nodeToIndex(groupNode);
-    auto *cardNode = dynamic_cast<DecklistModelCardNode *>(groupNode->findCardChildByNameProviderIdAndNumber(
+    auto *boardNode = dynamic_cast<InnerDecklistNode *>(root->findChild(zoneName));
+    auto *customZoneNode = boardNode ? nullptr : DeckListModelCustomZones::findSubZoneByName(root, zoneName);
+
+    // Mirroring flattens nested deck sub-zones into shadow rows, so a shadow row
+    // index is only usable as a deck-tree position while both sides have the same
+    // direct-children shape. When they diverge, the card is appended to the deck
+    // zone instead of being written out of range.
+    InnerDecklistNode *deckCardParent = nullptr;
+    bool customZoneNeedsAppend = false;
+
+    if (boardNode) {
+        // Board zone: cards are grouped by the active criteria.
+        QString groupCriteria = extractGroupCriteriaValue(cardInfo, activeGroupCriteria);
+        cardParent = createNodeIfNeeded(groupCriteria, boardNode);
+    } else if (customZoneNode) {
+        // Custom zone: cards live flat inside the zone.
+        cardParent = customZoneNode;
+        auto *listRoot = deckList->getTree()->getRoot();
+        for (int i = 0; i < listRoot->size(); ++i) {
+            auto *boardZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+            if (!boardZone) {
+                continue;
+            }
+            deckCardParent = dynamic_cast<InnerDecklistNode *>(boardZone->findChild(zoneName));
+            if (deckCardParent) {
+                break;
+            }
+        }
+        // A deck custom zone holding nested sub-zones mirrors with flattened rows,
+        // so a shadow row index does not map onto its direct children.
+        if (deckCardParent) {
+            for (int i = 0; i < deckCardParent->size(); ++i) {
+                if (dynamic_cast<InnerDecklistNode *>(deckCardParent->at(i))) {
+                    customZoneNeedsAppend = true;
+                    break;
+                }
+            }
+        }
+    } else {
+        // Not present in the shadow tree. The deck tree may still hold a custom
+        // zone that has not been mirrored (callers can add a zone and then a
+        // card without a rebuild). Check before falling back to creating a
+        // top-level zone the deck does not actually have.
+        auto *listRoot = deckList->getTree()->getRoot();
+        bool hasDeckZone = false;
+        for (int i = 0; i < listRoot->size(); ++i) {
+            if (auto *boardZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i))) {
+                // Only real zones count: a card sitting directly under the board
+                // shares the name comparison but is not a zone, and treating it as
+                // one would recurse forever without mirroring anything.
+                if (dynamic_cast<InnerDecklistNode *>(boardZone->findChild(zoneName))) {
+                    hasDeckZone = true;
+                    break;
+                }
+            }
+        }
+
+        if (hasDeckZone) {
+            rebuildTree();
+            return addCard(card, zoneName);
+        }
+
+        // Unknown zone: create a top-level zone (legacy behavior).
+        QString groupCriteria = extractGroupCriteriaValue(cardInfo, activeGroupCriteria);
+        auto *newZone = createNodeIfNeeded(zoneName, root);
+        cardParent = createNodeIfNeeded(groupCriteria, newZone);
+    }
+
+    const QModelIndex parentIndex = nodeToIndex(cardParent);
+    auto *cardNode = dynamic_cast<DecklistModelCardNode *>(cardParent->findCardChildByNameProviderIdAndNumber(
         card.getName(), printingInfo.getUuid(), printingInfo.getProperty("num")));
     const auto cardSetName = printingInfo.getSet().isNull() ? "" : printingInfo.getSet()->getCorrectedShortName();
 
+    bool cardNodeAdded = false;
     if (!cardNode) {
         // Determine the correct index
-        int insertRow = findSortedInsertRow(groupNode, cardInfo);
+        int insertRow = findSortedInsertRow(cardParent, cardInfo);
+        int deckInsertRow = customZoneNeedsAppend ? -1 : insertRow;
 
-        auto *decklistCard = deckList->addCard(cardInfo->getName(), zoneName, insertRow, cardSetName,
+        auto *decklistCard = deckList->addCard(cardInfo->getName(), zoneName, deckInsertRow, cardSetName,
                                                printingInfo.getProperty("num"), printingInfo.getProperty("uuid"));
 
         beginInsertRows(parentIndex, insertRow, insertRow);
-        cardNode = new DecklistModelCardNode(decklistCard, groupNode, insertRow);
+        cardNode = new DecklistModelCardNode(decklistCard, cardParent, insertRow);
         endInsertRows();
+
+        cardNodeAdded = true;
     } else {
         cardNode->setNumber(cardNode->getNumber() + 1);
         cardNode->setCardSetShortName(cardSetName);
         cardNode->setCardCollectorNumber(printingInfo.getProperty("num"));
         cardNode->setCardProviderId(printingInfo.getProperty("uuid"));
-        deckList->refreshDeckHash();
-        emit deckHashChanged();
+        // Emit dataChanged for the amount column since we modified it
+        QModelIndex cardIndex = nodeToIndex(cardNode);
+        QModelIndex amountIndex = cardIndex.sibling(cardIndex.row(), DeckListModelColumns::CARD_AMOUNT);
+        emit dataChanged(amountIndex, amountIndex, {Qt::EditRole});
     }
     sort(lastKnownColumn, lastKnownOrder);
+    refreshCardFormatLegalities();
     emitRecursiveUpdates(parentIndex);
-    return nodeToIndex(cardNode);
+
+    deckList->refreshDeckHash();
+    emit deckHashChanged();
+
+    auto index = nodeToIndex(cardNode);
+
+    if (cardNodeAdded) {
+        emit cardNodeAddedAt(index);
+    }
+
+    emit cardAddedAt(index);
+
+    return index;
 }
 
-int DeckListModel::findSortedInsertRow(InnerDecklistNode *parent, CardInfoPtr cardInfo) const
+bool DeckListModel::offsetCountAtIndex(const QModelIndex &idx, int offset)
+{
+    if (!idx.isValid()) {
+        return false;
+    }
+
+    auto *node = static_cast<AbstractDecklistNode *>(idx.internalPointer());
+    auto *card = dynamic_cast<DecklistModelCardNode *>(node);
+
+    if (!card) {
+        return false;
+    }
+
+    const QModelIndex numberIndex = idx.siblingAtColumn(DeckListModelColumns::CARD_AMOUNT);
+    const int count = numberIndex.data(Qt::EditRole).toInt();
+    const int newCount = count + offset;
+
+    if (newCount <= 0) {
+        removeRow(idx.row(), idx.parent());
+        emit cardNodeRemoved();
+    } else {
+        setData(numberIndex, newCount, Qt::EditRole);
+    }
+
+    if (offset > 0) {
+        emit cardAddedAt(idx);
+    } else if (offset < 0) {
+        emit cardRemoved();
+    }
+
+    return true;
+}
+
+bool DeckListModel::removeCardAtIndex(const QModelIndex &idx)
+{
+    if (!idx.isValid()) {
+        return false;
+    }
+
+    auto *node = static_cast<AbstractDecklistNode *>(idx.internalPointer());
+    auto *card = dynamic_cast<DecklistModelCardNode *>(node);
+
+    if (!card) {
+        return false;
+    }
+
+    bool success = removeRow(idx.row(), idx.parent());
+
+    if (success) {
+        emit cardRemoved();
+    }
+
+    return success;
+}
+
+int DeckListModel::findSortedInsertRow(const InnerDecklistNode *parent, const CardInfoPtr &cardInfo) const
 {
     if (!cardInfo) {
         return parent->size(); // fallback: append at end
@@ -441,8 +692,9 @@ int DeckListModel::findSortedInsertRow(InnerDecklistNode *parent, CardInfoPtr ca
 
     for (int i = 0; i < parent->size(); ++i) {
         auto *existingCard = dynamic_cast<DecklistModelCardNode *>(parent->at(i));
-        if (!existingCard)
+        if (!existingCard) {
             continue;
+        }
 
         bool lessThan = false;
         switch (lastKnownColumn) {
@@ -459,8 +711,9 @@ int DeckListModel::findSortedInsertRow(InnerDecklistNode *parent, CardInfoPtr ca
                 break;
         }
 
-        if (lessThan)
+        if (lessThan) {
             return i;
+        }
     }
 
     return parent->size(); // insert at end if no earlier match
@@ -475,21 +728,41 @@ QModelIndex DeckListModel::nodeToIndex(AbstractDecklistNode *node) const
     return createIndex(node->getParent()->indexOf(node), 0, node);
 }
 
+/**
+ * @brief Sorts a freshly built shadow subtree without emitting model signals.
+ *
+ * Used by rebuildTree while the model reset is still open (emitting layout
+ * changes during a reset is invalid). Reorders every node just like
+ * sortHelper does, but ignores the movement mapping because there are no
+ * persistent indices established yet.
+ */
+void DeckListModel::sortShadowTree(InnerDecklistNode *node, Qt::SortOrder order)
+{
+    // The mapping is not needed: fresh shadow nodes have no persistent indices yet.
+    (void)DeckListModelCustomZones::sortWithCustomZonesLast(root, node, order);
+
+    for (int i = node->size() - 1; i >= 0; --i) {
+        if (auto *subNode = dynamic_cast<InnerDecklistNode *>(node->at(i))) {
+            sortShadowTree(subNode, order);
+        }
+    }
+}
+
 void DeckListModel::sortHelper(InnerDecklistNode *node, Qt::SortOrder order)
 {
-    // Sort children of node and save the information needed to
-    // update the list of persistent indexes.
-    QVector<QPair<int, int>> sortResult = node->sort(order);
+    // Sort children (custom zones always sorted after groups within a board) and
+    // use the movement mapping to update the list of persistent indices.
+    const auto mapping = DeckListModelCustomZones::sortWithCustomZonesLast(root, node, order);
 
     QModelIndexList from, to;
     int columns = columnCount();
-    for (int i = sortResult.size() - 1; i >= 0; --i) {
-        const int fromRow = sortResult[i].first;
-        const int toRow = sortResult[i].second;
-        AbstractDecklistNode *temp = node->at(toRow);
+    for (const auto &move : mapping) {
+        const int preSortRow = move.first;
+        const int finalRow = move.second;
+        AbstractDecklistNode *temp = node->at(finalRow);
         for (int j = 0; j < columns; ++j) {
-            from << createIndex(fromRow, j, temp);
-            to << createIndex(toRow, j, temp);
+            from << createIndex(preSortRow, j, temp);
+            to << createIndex(finalRow, j, temp);
         }
     }
     changePersistentIndexList(from, to);
@@ -532,104 +805,156 @@ void DeckListModel::setActiveGroupCriteria(DeckListModelGroupCriteria::Type newC
     rebuildTree();
 }
 
+void DeckListModel::setActiveFormat(const QString &_format)
+{
+    deckList->setGameFormat(_format);
+    refreshCardFormatLegalities();
+    emitBackgroundUpdates(QModelIndex()); // start from root
+}
+
 void DeckListModel::cleanList()
 {
-    setDeckList(new DeckList);
+    setDeckList(QSharedPointer<DeckList>(new DeckList()));
 }
 
 /**
  * @param _deck The deck.
  */
-void DeckListModel::setDeckList(DeckList *_deck)
+void DeckListModel::setDeckList(const QSharedPointer<DeckList> &_deck)
 {
     if (deckList != _deck) {
         deckList = _deck;
     }
     rebuildTree();
+    emit deckReplaced();
 }
 
-QList<ExactCard> DeckListModel::getCards() const
+void DeckListModel::forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func)
 {
-    QList<ExactCard> cards;
-    DeckList *decklist = getDeckList();
-    if (!decklist) {
-        return cards;
-    }
-    InnerDecklistNode *listRoot = decklist->getRoot();
-    if (!listRoot)
-        return cards;
-
-    for (int i = 0; i < listRoot->size(); i++) {
-        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
-        if (!currentZone)
-            continue;
-        for (int j = 0; j < currentZone->size(); j++) {
-            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
-            if (!currentCard)
-                continue;
-            for (int k = 0; k < currentCard->getNumber(); ++k) {
-                ExactCard card = CardDatabaseManager::query()->getCard(currentCard->toCardRef());
-                if (card) {
-                    cards.append(card);
-                } else {
-                    qDebug() << "Card not found in database!";
-                }
-            }
-        }
-    }
-    return cards;
+    deckList->forEachCard(func);
 }
 
-QList<ExactCard> DeckListModel::getCardsForZone(const QString &zoneName) const
+QList<const DecklistCardNode *> DeckListModel::getCardNodes() const
 {
-    QList<ExactCard> cards;
-    DeckList *decklist = getDeckList();
-    if (!decklist) {
-        return cards;
-    }
-    InnerDecklistNode *listRoot = decklist->getRoot();
-    if (!listRoot)
-        return cards;
-
-    for (int i = 0; i < listRoot->size(); i++) {
-        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
-        if (!currentZone)
-            continue;
-        if (currentZone->getName() == zoneName) {
-            for (int j = 0; j < currentZone->size(); j++) {
-                DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
-                if (!currentCard)
-                    continue;
-                for (int k = 0; k < currentCard->getNumber(); ++k) {
-                    ExactCard card = CardDatabaseManager::query()->getCard(currentCard->toCardRef());
-                    if (card) {
-                        cards.append(card);
-                    } else {
-                        qDebug() << "Card not found in database!";
-                    }
-                }
-            }
-        }
-    }
-    return cards;
+    return deckList->getCardNodes();
 }
 
-QList<QString> *DeckListModel::getZones() const
+QList<const DecklistCardNode *> DeckListModel::getCardNodesForZone(const QString &zoneName) const
 {
-    QList<QString> *zones = new QList<QString>();
-    DeckList *decklist = getDeckList();
-    if (!decklist) {
-        return zones;
-    }
-    InnerDecklistNode *listRoot = decklist->getRoot();
-    if (!listRoot)
-        return zones;
+    return deckList->getCardNodes({zoneName});
+}
+
+QList<QString> DeckListModel::getCardNames() const
+{
+    auto nodes = deckList->getCardNodes();
+
+    QList<QString> names;
+    std::transform(nodes.cbegin(), nodes.cend(), std::back_inserter(names), [](auto node) { return node->getName(); });
+
+    return names;
+}
+
+QList<CardRef> DeckListModel::getCardRefs() const
+{
+    auto nodes = deckList->getCardNodes();
+
+    QList<CardRef> cardRefs;
+    std::transform(nodes.cbegin(), nodes.cend(), std::back_inserter(cardRefs),
+                   [](auto node) { return node->toCardRef(); });
+
+    return cardRefs;
+}
+
+QList<QString> DeckListModel::getZones() const
+{
+    auto zoneNodes = deckList->getZoneNodes();
+
+    QList<QString> zones;
+    std::transform(zoneNodes.cbegin(), zoneNodes.cend(), std::back_inserter(zones),
+                   [](auto zoneNode) { return zoneNode->getName(); });
 
-    for (int i = 0; i < listRoot->size(); i++) {
-        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
-        if (!currentZone)
-            continue;
-        zones->append(currentZone->getName());
-    }
     return zones;
-}
\ No newline at end of file
+}
+
+QStringList DeckListModel::getCustomZoneNames(const QString &boardZoneName) const
+{
+    QStringList zoneNames;
+    for (const auto *customZone : deckList->getTree()->getCustomZones(boardZoneName)) {
+        zoneNames.append(customZone->getName());
+    }
+    return zoneNames;
+}
+
+static int maxAllowedForLegality(const FormatRules &format, const QString &legality)
+{
+    for (const AllowedCount &c : format.allowedCounts) {
+        if (c.label == legality) {
+            return c.max;
+        }
+    }
+    return -1; // unknown legality → treat as illegal
+}
+
+static bool isCardQuantityLegalForFormat(const QString &format, const CardInfo &cardInfo, int quantity)
+{
+    if (format.isEmpty()) {
+        return true;
+    }
+
+    auto formatRules = CardDatabaseManager::query()->getFormat(format);
+
+    // if format has no custom rules, then just do the default check
+    if (!formatRules) {
+        return cardInfo.isLegalInFormat(format);
+    }
+
+    // Exceptions always win
+    if (cardHasAnyException(cardInfo, *formatRules)) {
+        return true;
+    }
+
+    // check legality prop
+    const QString legality = cardInfo.getLegalityProp(format);
+    if (legality.isEmpty()) {
+        return false;
+    }
+
+    int maxAllowed = maxAllowedForLegality(*formatRules, legality);
+
+    if (maxAllowed == -1) {
+        return false;
+    }
+
+    if (maxAllowed < 0) { // unlimited
+        return true;
+    }
+
+    return quantity <= maxAllowed;
+}
+
+static bool isCardNodeLegalForFormat(const QString &format, const InnerDecklistNode *zone, const DecklistCardNode *card)
+{
+    // Don't check legality for tokens
+    if (zone->getName() == DECK_ZONE_TOKENS) {
+        return true;
+    }
+
+    // unknown cards are not legal
+    ExactCard exactCard = CardDatabaseManager::query()->getCard(card->toCardRef());
+    if (!exactCard) {
+        return false;
+    }
+
+    // actual check
+    return isCardQuantityLegalForFormat(format, exactCard.getInfo(), card->getNumber());
+}
+
+void DeckListModel::refreshCardFormatLegalities()
+{
+    QString format = deckList->getGameFormat();
+
+    deckList->forEachCard([&format](const InnerDecklistNode *zone, DecklistCardNode *card) {
+        bool legal = isCardNodeLegalForFormat(format, zone, card);
+        card->setFormatLegality(legal);
+    });
+}
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 a480c606b..7334d48ef 100644
--- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h
@@ -1,16 +1,26 @@
 #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 <../../../../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 <libcockatrice/card/printing/exact_card.h>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <QModelIndex>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
+#include <functional>
+#include <qnamespace.h>
+#include <qtmetamacros.h>
 
-class CardDatabase;
-class QPrinter;
-class QTextCursor;
+class AbstractDecklistNode;
+class DeckList;
+class ExactCard;
+class QObject;
 
 /**
  * @namespace DeckRoles
@@ -30,7 +40,8 @@ enum
 {
     IsCardRole = Qt::UserRole + 1, /**< Indicates whether the item represents a card. */
     DepthRole,                     /**< Depth level within the deck's grouping hierarchy. */
-    IsLegalRole                    /**< Whether the card is legal in the current deck format. */
+    IsLegalRole,                   /**< Whether the card is legal in the current deck format. */
+    IsCustomZoneRole               /**< Whether the item represents a custom zone nested under a board zone. */
 };
 } // namespace DeckRoles
 
@@ -89,12 +100,15 @@ static inline QString toString(Type t)
 
 static inline Type fromString(const QString &s)
 {
-    if (s == "Main Type")
+    if (s == "Main Type") {
         return MAIN_TYPE;
-    if (s == "Mana Cost")
+    }
+    if (s == "Mana Cost") {
         return MANA_COST;
-    if (s == "Colors")
+    }
+    if (s == "Colors") {
         return COLOR;
+    }
     return MAIN_TYPE; // default
 }
 } // namespace DeckListModelGroupCriteria
@@ -164,6 +178,14 @@ public:
     {
         dataNode->setCardCollectorNumber(_cardSetNumber);
     }
+    bool getFormatLegality() const override
+    {
+        return dataNode->getFormatLegality();
+    }
+    void setFormatLegality(const bool _formatLegal) override
+    {
+        dataNode->setFormatLegality(_formatLegal);
+    }
 
     /**
      * @brief Returns the underlying data node.
@@ -189,12 +211,18 @@ public:
  * InnerDecklistNode containers and supports grouping, sorting, adding/removing
  * cards, and printing decklists.
  *
+ * Outside code should refrain from modifying the model with methods inherited from QAbstractItemModel, such as with
+ * `setData` or `removeRow`.
+ * Instead, use the custom methods on this class to modify the model, such as `addCard`, `offsetCountAtIndex`, or
+ * `removeCardAtIndex`.
+ * This ensures the custom signals for this class are correctly emitted.
+ *
  * Signals:
  * - deckHashChanged(): emitted when the deck contents change in a way that
  *   affects its hash.
  *
  * Slots:
- * - rebuildTree(): rebuilds the model structure from the underlying DeckLoader.
+ * - rebuildTree(): rebuilds the model structure from the underlying node tree.
  */
 class DeckListModel : public QAbstractItemModel
 {
@@ -202,23 +230,81 @@ class DeckListModel : public QAbstractItemModel
 
 public slots:
     /**
-     * @brief Rebuilds the model tree from the underlying DeckLoader.
+     * @brief Rebuilds the model tree from the underlying node tree.
      *
      * This updates all indices and ensures the model reflects the current
      * state of the deck.
      */
     void rebuildTree();
 
+    /**
+     * @brief Sets the criteria used to group cards in the model.
+     * @param newCriteria The new grouping criteria.
+     */
+    void setActiveGroupCriteria(DeckListModelGroupCriteria::Type newCriteria);
+
+    void setActiveFormat(const QString &_format);
+
 signals:
     /**
      * @brief Emitted whenever the deck hash changes due to modifications in the model.
      */
     void deckHashChanged();
 
+    /**
+     * @brief Emitted whenever the cards in the deck changes. This includes when the deck is replaced.
+     */
+    void cardsChanged();
+
+    /**
+     * @brief Emitted whenever a card is added to the deck, regardless of whether it's an entirely new card or an
+     * existing card that got incremented.
+     * @param index The index of the card that got added.
+     */
+    void cardAddedAt(const QModelIndex &index);
+
+    /**
+     * @brief Emitted whenever a card is removed from the deck, regardless of whether a card node was removed or an
+     * existing card got decremented.
+     */
+    void cardRemoved();
+
+    /**
+     * @brief Emitted whenever a card node is added or removed. This includes when the deck is replaced.
+     */
+    void cardNodesChanged();
+
+    /**
+     * @brief Emitted whenever a new card node is added.
+     * @param index The index of the card node that got added.
+     */
+    void cardNodeAddedAt(const QModelIndex &index);
+
+    /**
+     * @brief Emitted whenever a card node is removed.
+     */
+    void cardNodeRemoved();
+
+    /**
+     * @brief Emitted whenever the deck in the model has been replaced with a new one
+     */
+    void deckReplaced();
+
 public:
     explicit DeckListModel(QObject *parent = nullptr);
+    explicit DeckListModel(QObject *parent, const QSharedPointer<DeckList> &deckList);
     ~DeckListModel() override;
 
+    /**
+     * @brief Selects the language code for localized card names in the display role.
+     *
+     * The model never reads global settings itself; callers wire this to the card
+     * language setting (including reacting to its changes) rather than the model
+     * querying it.
+     * @param lang Language code; "en" shows the canonical English names.
+     */
+    void setDisplayLanguage(const QString &lang);
+
     /**
      * @brief Returns the root index of the model.
      * @return QModelIndex representing the root node.
@@ -228,24 +314,19 @@ public:
         return nodeToIndex(root);
     }
 
-    /**
-     * @brief Returns the value of the grouping category for a card based on the current criteria.
-     * @param info Pointer to card information.
-     * @return String representing the value of the current grouping criteria for the card.
-     */
-    [[nodiscard]] QString getGroupCriteriaForCard(CardInfoPtr info) const;
-
-    // Qt model overrides
+    /// @name Qt model overrides
+    ///@{
     [[nodiscard]] int rowCount(const QModelIndex &parent) const override;
     [[nodiscard]] int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override;
     [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
-    void emitBackgroundUpdates(const QModelIndex &parent);
     [[nodiscard]] QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
     [[nodiscard]] QModelIndex index(int row, int column, const QModelIndex &parent) const override;
     [[nodiscard]] QModelIndex parent(const QModelIndex &index) const override;
     [[nodiscard]] Qt::ItemFlags flags(const QModelIndex &index) const override;
     bool setData(const QModelIndex &index, const QVariant &value, int role) override;
     bool removeRows(int row, int count, const QModelIndex &parent) override;
+    void sort(int column, Qt::SortOrder order) override;
+    ///@}
 
     /**
      * @brief Finds a card by name, zone, and optional identifiers.
@@ -279,41 +360,73 @@ public:
     QModelIndex addCard(const ExactCard &card, const QString &zoneName);
 
     /**
-     * @brief Determines the sorted insertion row for a card.
-     * @param parent The parent node where the card will be inserted.
-     * @param cardInfo The card info to insert.
-     * @return Row index where the card should be inserted to maintain sort order.
+     * @brief Changes the `amount` field in the card node at the index by the amount.
+     * Removes the node if it causes the amount to fall to 0 or below.
+     * @param idx The index of a card node. No-ops if the index is invalid or not a card node.
+     * @param offset The amount to change the amount field by.
+     * @return Whether the operation was successful
      */
-    int findSortedInsertRow(InnerDecklistNode *parent, CardInfoPtr cardInfo) const;
+    bool offsetCountAtIndex(const QModelIndex &idx, int offset);
 
-    void sort(int column, Qt::SortOrder order) override;
+    /**
+     * @brief Removes the card node at the index
+     * @param idx The index of a card node. No-ops if the index is invalid or not a card node.
+     * @return Whether the node was removed.
+     */
+    bool removeCardAtIndex(const QModelIndex &idx);
 
     /**
      * @brief Removes all cards and resets the model.
      */
     void cleanList();
-    [[nodiscard]] DeckList *getDeckList() const
+
+    [[nodiscard]] QSharedPointer<DeckList> getDeckList() const
     {
         return deckList;
     }
-    void setDeckList(DeckList *_deck);
-
-    [[nodiscard]] QList<ExactCard> getCards() const;
-    [[nodiscard]] QList<ExactCard> getCardsForZone(const QString &zoneName) const;
-    [[nodiscard]] QList<QString> *getZones() const;
+    void setDeckList(const QSharedPointer<DeckList> &_deck);
 
     /**
-     * @brief Sets the criteria used to group cards in the model.
-     * @param newCriteria The new grouping criteria.
+     * @brief Apply a function to every card in the deck tree.
+     *
+     * @param func Function taking (zone node, card node).
      */
-    void setActiveGroupCriteria(DeckListModelGroupCriteria::Type newCriteria);
+    void forEachCard(const std::function<void(InnerDecklistNode *, DecklistCardNode *)> &func);
+
+    /**
+     * @brief Gets a list of all card nodes in the deck.
+     */
+    [[nodiscard]] QList<const DecklistCardNode *> getCardNodes() const;
+    [[nodiscard]] QList<const DecklistCardNode *> getCardNodesForZone(const QString &zoneName) const;
+
+    /**
+     * @brief Gets a deduplicated list of all card names that appear in the model
+     */
+    [[nodiscard]] QList<QString> getCardNames() const;
+    /**
+     * @brief Gets a deduplicated list of all CardRefs that appear in the model
+     */
+    [[nodiscard]] QList<CardRef> getCardRefs() const;
+    /**
+     * @brief Gets a list of all zone names that appear in the model
+     */
+    [[nodiscard]] QList<QString> getZones() const;
+
+    /**
+     * @brief Gets the names of the custom zones nested under the given board zone.
+     *
+     * @param boardZoneName The board zone to query (main/side/maybeboard)
+     * @return The custom zone names, in deck order
+     */
+    [[nodiscard]] QStringList getCustomZoneNames(const QString &boardZoneName) const;
 
 private:
-    DeckList *deckList;      /**< Pointer to the deck loader providing the underlying data. */
-    InnerDecklistNode *root; /**< Root node of the model tree. */
+    QSharedPointer<DeckList> deckList; /**< Pointer to the decklist providing the underlying data. */
+    InnerDecklistNode *root;           /**< Root node of the model tree. */
     DeckListModelGroupCriteria::Type activeGroupCriteria = DeckListModelGroupCriteria::MAIN_TYPE;
     int lastKnownColumn;          /**< Last column used for sorting. */
     Qt::SortOrder lastKnownOrder; /**< Last known sort order. */
+    QString displayLang = "en";   /**< Language code for localized card names in the display role. */
 
     InnerDecklistNode *createNodeIfNeeded(const QString &name, InnerDecklistNode *parent);
     QModelIndex nodeToIndex(AbstractDecklistNode *node) const;
@@ -321,15 +434,40 @@ private:
                                                       const QString &zoneName,
                                                       const QString &providerId = "",
                                                       const QString &cardNumber = "") const;
+
+    /**
+     * @brief Determines the sorted insertion row for a card.
+     * @param parent The parent node where the card will be inserted.
+     * @param cardInfo The card info to insert.
+     * @return Row index where the card should be inserted to maintain sort order.
+     */
+    int findSortedInsertRow(const InnerDecklistNode *parent, const CardInfoPtr &cardInfo) const;
+
+    /**
+     * @brief Recursively emits the dataChanged signal with role as Qt::BackgroundRole for all indices that are children
+     * of the given node. This is used to update the background color when changing formats.
+     * @param parent The parent node
+     */
+    void emitBackgroundUpdates(const QModelIndex &parent);
+
+    /**
+     * @brief Recursively emits the dataChanged signal for the given node and all parent nodes.
+     * @param index The parent node
+     */
     void emitRecursiveUpdates(const QModelIndex &index);
+
     void sortHelper(InnerDecklistNode *node, Qt::SortOrder order);
+    void sortShadowTree(InnerDecklistNode *node, Qt::SortOrder order);
 
     template <typename T> T getNode(const QModelIndex &index) const
     {
-        if (!index.isValid())
+        if (!index.isValid()) {
             return dynamic_cast<T>(root);
+        }
         return dynamic_cast<T>(static_cast<AbstractDecklistNode *>(index.internalPointer()));
     }
+
+    void refreshCardFormatLegalities();
 };
 
 #endif
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
new file mode 100644
index 000000000..419c38b04
--- /dev/null
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp
@@ -0,0 +1,156 @@
+#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
+{
+
+bool isCustomZone(const AbstractDecklistNode *node)
+{
+    return dynamic_cast<const DecklistModelSubZoneNode *>(node) != nullptr;
+}
+
+namespace
+{
+
+/**
+ * @brief Flattens every card under @p zone into @p shadowZone, preserving order.
+ *
+ * Custom zones mirror as a single row level: cards nested in sub-zones of any
+ * depth are added as direct children of the mirrored zone so no card is left
+ * without a model row.
+ */
+void flattenCards(const InnerDecklistNode *zone, InnerDecklistNode *shadowZone)
+{
+    for (int k = 0; k < zone->size(); k++) {
+        if (auto *zoneCard = dynamic_cast<DecklistCardNode *>(zone->at(k))) {
+            new DecklistModelCardNode(zoneCard, shadowZone);
+        } else if (auto *subZone = dynamic_cast<const InnerDecklistNode *>(zone->at(k))) {
+            flattenCards(subZone, shadowZone);
+        }
+    }
+}
+
+} // namespace
+
+void mirrorCustomZones(const InnerDecklistNode *deckBoardZone, InnerDecklistNode *shadowBoardZone)
+{
+    for (int j = 0; j < deckBoardZone->size(); j++) {
+        auto *customZone = dynamic_cast<const InnerDecklistNode *>(deckBoardZone->at(j));
+        if (!customZone) {
+            continue;
+        }
+
+        auto *shadowZone = new DecklistModelSubZoneNode(customZone->getName(), shadowBoardZone);
+        flattenCards(customZone, shadowZone);
+    }
+}
+
+InnerDecklistNode *findGroupChild(InnerDecklistNode *parent, const QString &name)
+{
+    for (int i = 0; i < parent->size(); i++) {
+        AbstractDecklistNode *child = parent->at(i);
+        if (isCustomZone(child)) {
+            continue;
+        }
+        auto *group = dynamic_cast<InnerDecklistNode *>(child);
+        if (group && group->getName() == name) {
+            return group;
+        }
+    }
+    return nullptr;
+}
+
+DecklistModelSubZoneNode *findSubZoneByName(InnerDecklistNode *root, const QString &zoneName)
+{
+    for (int i = 0; i < root->size(); i++) {
+        auto *boardZone = dynamic_cast<InnerDecklistNode *>(root->at(i));
+        if (!boardZone) {
+            continue;
+        }
+
+        for (int j = 0; j < boardZone->size(); j++) {
+            auto *customZone = dynamic_cast<DecklistModelSubZoneNode *>(boardZone->at(j));
+            if (customZone && customZone->getName() == zoneName) {
+                return customZone;
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+namespace
+{
+
+/**
+ * @brief Sorts a node's children and returns the (preSortRow, finalRow) mapping.
+ */
+QList<QPair<int, int>> plainSort(InnerDecklistNode *node, Qt::SortOrder order)
+{
+    const QVector<QPair<int, int>> sortResult = node->sort(order);
+
+    QList<QPair<int, int>> mapping;
+    mapping.reserve(node->size());
+    for (int i = 0; i < node->size(); ++i) {
+        mapping.append({sortResult[i].first, i});
+    }
+    return mapping;
+}
+
+/**
+ * @brief Sorts a board zone's children, then stably moves custom zones to the end.
+ *
+ * @return The (preSortRow, finalRow) mapping covering both the sort and the shift.
+ */
+QList<QPair<int, int>> boardSort(InnerDecklistNode *node, Qt::SortOrder order)
+{
+    const QVector<QPair<int, int>> sortResult = node->sort(order);
+
+    QVector<AbstractDecklistNode *> groups;
+    QVector<AbstractDecklistNode *> customZones;
+    QHash<AbstractDecklistNode *, int> preSortRowOf;
+
+    groups.reserve(node->size());
+    customZones.reserve(node->size());
+
+    for (int i = 0; i < node->size(); ++i) {
+        AbstractDecklistNode *child = node->at(i);
+        preSortRowOf.insert(child, sortResult[i].first);
+        if (isCustomZone(child)) {
+            customZones.append(child);
+        } else {
+            groups.append(child);
+        }
+    }
+
+    QVector<AbstractDecklistNode *> ordered = groups + customZones;
+    for (int i = 0; i < ordered.size(); ++i) {
+        node->replace(i, ordered[i]);
+    }
+
+    QList<QPair<int, int>> mapping;
+    mapping.reserve(ordered.size());
+    for (int i = 0; i < ordered.size(); ++i) {
+        mapping.append({preSortRowOf.value(ordered[i]), i});
+    }
+    return mapping;
+}
+
+} // namespace
+
+QList<QPair<int, int>> sortWithCustomZonesLast(InnerDecklistNode *root, InnerDecklistNode *node, Qt::SortOrder order)
+{
+    const bool isBoardZone = (node != root) && (node->getParent() == root);
+    return isBoardZone ? boardSort(node, order) : plainSort(node, order);
+}
+
+} // 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
new file mode 100644
index 000000000..53bdeaa1e
--- /dev/null
+++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h
@@ -0,0 +1,101 @@
+#ifndef DECK_LIST_MODEL_CUSTOM_ZONES_H
+#define DECK_LIST_MODEL_CUSTOM_ZONES_H
+
+#include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h>
+#include <QList>
+#include <QPair>
+#include <QString>
+#include <qnamespace.h>
+
+class AbstractDecklistNode;
+
+/**
+ * @class DecklistModelSubZoneNode
+ * @ingroup DeckModels
+ * @brief Model node representing a custom zone nested under a board zone.
+ *
+ * Custom zones group cards by user-defined names (e.g. "Removal", "Utility")
+ * inside a board zone. They are mirrored from the underlying deck tree so that
+ * they can be told apart from criteria group nodes by type.
+ */
+class DecklistModelSubZoneNode : public InnerDecklistNode
+{
+public:
+    using InnerDecklistNode::InnerDecklistNode;
+};
+
+/**
+ * @namespace DeckListModelCustomZones
+ * @ingroup DeckModels
+ * @brief Tree-level helpers for the deck list model's custom-zone shadow nodes.
+ *
+ * The deck list model keeps a second "shadow" tree of InnerDecklistNode that
+ * mirrors the canonical deck tree for grouping and sorting. Custom zones add a
+ * layer of bookkeeping to that shadow tree: they must be mirrored alongside
+ * criteria groups, always sort after the groups within a board, and be
+ * resolvable by deck-unique name.
+ *
+ * This namespace centralizes every "what is / where is a custom zone" decision
+ * so the model itself only wires the results into Qt model signals.
+ */
+namespace DeckListModelCustomZones
+{
+
+/**
+ * @brief Whether the given node is a custom zone (as opposed to a criteria group).
+ */
+[[nodiscard]] bool isCustomZone(const AbstractDecklistNode *node);
+
+/**
+ * @brief Finds a criteria-group child of @p parent by name, skipping custom zones.
+ *
+ * The shadow tree keeps criteria groups and mirrored custom zones as siblings
+ * under a board zone, and `InnerDecklistNode::findChild` matches both by name.
+ * Group lookups must not resolve a custom zone that happens to share the group
+ * name (e.g. a zone called "Creature"), so this searches only non-custom
+ * children.
+ *
+ * @param parent The shadow node whose children are searched.
+ * @param name The group name to find.
+ * @return The matching group node, or nullptr if none exists.
+ */
+[[nodiscard]] InnerDecklistNode *findGroupChild(InnerDecklistNode *parent, const QString &name);
+
+/**
+ * @brief Mirrors the custom zones of a deck board zone into its shadow board node.
+ *
+ * Each custom zone becomes a DecklistModelSubZoneNode under @p shadowBoardZone
+ * with its cards as direct (un-grouped) children.
+ *
+ * @param deckBoardZone The board zone in the canonical deck tree.
+ * @param shadowBoardZone The matching board zone in the model's shadow tree.
+ */
+void mirrorCustomZones(const InnerDecklistNode *deckBoardZone, InnerDecklistNode *shadowBoardZone);
+
+/**
+ * @brief Finds a custom zone in the shadow tree by deck-unique name.
+ * @param root Root of the shadow tree.
+ * @param zoneName The custom zone name to find.
+ * @return The matching custom zone node, or nullptr if not found.
+ */
+[[nodiscard]] DecklistModelSubZoneNode *findSubZoneByName(InnerDecklistNode *root, const QString &zoneName);
+
+/**
+ * @brief Sorts a shadow node's children, keeping a board's custom zones last.
+ *
+ * Sorting alone would interleave custom zones with criteria groups by name, but
+ * custom zones must always stay after the groups within a board, regardless of
+ * name. This applies the sort and, for board zones, stably moves the custom
+ * zones to the end.
+ *
+ * @param root Root of the shadow tree (used to classify board zones).
+ * @param node The shadow node whose children are reordered.
+ * @param order Sort order to apply.
+ * @return A list of (preSortRow, finalRow) pairs describing how each node moved.
+ */
+[[nodiscard]] QList<QPair<int, int>>
+sortWithCustomZonesLast(InnerDecklistNode *root, InnerDecklistNode *node, Qt::SortOrder order);
+
+} // namespace DeckListModelCustomZones
+
+#endif // DECK_LIST_MODEL_CUSTOM_ZONES_H
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 35fd4d9f8..dcb294ec8 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,6 +1,16 @@
 #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
 {
@@ -11,8 +21,8 @@ bool DeckListSortFilterProxyModel::lessThan(const QModelIndex &left, const QMode
     bool rightIsCard = src->data(right, Qt::UserRole + 1).toBool();
 
     if (!leftIsCard || !rightIsCard) {
-        QString lName = src->data(left.siblingAtColumn(1), Qt::EditRole).toString();
-        QString rName = src->data(right.siblingAtColumn(1), Qt::EditRole).toString();
+        QString lName = src->data(left.siblingAtColumn(DeckListModelColumns::CARD_NAME), Qt::EditRole).toString();
+        QString rName = src->data(right.siblingAtColumn(DeckListModelColumns::CARD_NAME), Qt::EditRole).toString();
         return lName.localeAwareCompare(rName) < 0;
     }
 
@@ -29,25 +39,29 @@ bool DeckListSortFilterProxyModel::lessThan(const QModelIndex &left, const QMode
             QString ln = lNode->getName();
             QString rn = rNode->getName();
             int cmp = ln.localeAwareCompare(rn);
-            if (cmp != 0)
+            if (cmp != 0) {
                 return cmp < 0;
+            }
         } else if (crit == "cmc") {
             int lc = lInfo ? lInfo->getCmc().toInt() : 0;
             int rc = rInfo ? rInfo->getCmc().toInt() : 0;
-            if (lc != rc)
+            if (lc != rc) {
                 return lc < rc;
+            }
         } else if (crit == "colors") {
             QString lr = lInfo ? lInfo->getColors() : QString();
             QString rr = rInfo ? rInfo->getColors() : QString();
             int cmp = lr.localeAwareCompare(rr);
-            if (cmp != 0)
+            if (cmp != 0) {
                 return cmp < 0;
+            }
         } else if (crit == "maintype") {
             QString lr = lInfo ? lInfo->getMainCardType() : QString();
             QString rr = rInfo ? rInfo->getMainCardType() : QString();
             int cmp = lr.localeAwareCompare(rr);
-            if (cmp != 0)
+            if (cmp != 0) {
                 return cmp < 0;
+            }
         }
     }
 
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 94742795d..522ed1e23 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
@@ -1,14 +1,19 @@
 /**
  * @file deck_list_sort_filter_proxy_model.h
  * @ingroup DeckEditorCardGroupWidgets
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H
 #define COCKATRICE_DECK_LIST_SORT_FILTER_PROXY_MODEL_H
 
+#include <QList>
 #include <QSortFilterProxyModel>
-#include <libcockatrice/card/database/card_database_manager.h>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class QObject;
 
 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 2753246de..53ad524b4 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/CMakeLists.txt
@@ -2,15 +2,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
-set(HEADERS abstract_client.h)
+set(HEADERS abstract_client.h latency_tracker.h)
 
-set(SOURCES abstract_client.cpp)
+set(SOURCES abstract_client.cpp latency_tracker.cpp)
 
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
+qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
 
 add_library(libcockatrice_network_client_abstract STATIC ${MOC_SOURCES} ${SOURCES})
 
@@ -23,3 +19,5 @@ 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 11458768d..d66653fb1 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp
@@ -1,6 +1,26 @@
 #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>
 #include <libcockatrice/protocol/pb/commands.pb.h>
@@ -28,6 +48,7 @@ AbstractClient::AbstractClient(QObject *parent)
     qRegisterMetaType<Response>("Response");
     qRegisterMetaType<Response::ResponseCode>("Response::ResponseCode");
     qRegisterMetaType<ClientStatus>("ClientStatus");
+    qRegisterMetaType<LatencyTracker::Stats>("LatencyTracker::Stats");
     qRegisterMetaType<RoomEvent>("RoomEvent");
     qRegisterMetaType<GameEventContainer>("GameEventContainer");
     qRegisterMetaType<Event_ServerIdentification>("Event_ServerIdentification");
@@ -66,10 +87,13 @@ void AbstractClient::processProtocolItem(const ServerMessage &item)
             const int cmdId = response.cmd_id();
 
             PendingCommand *pend = pendingCommands.value(cmdId, 0);
-            if (!pend)
+            if (!pend) {
                 return;
+            }
             pendingCommands.remove(cmdId);
 
+            recordLatency(*pend);
+
             pend->processResponse(response);
             pend->deleteLater();
             break;
@@ -160,9 +184,62 @@ void AbstractClient::queuePendingCommand(PendingCommand *pend)
 
     pendingCommands.insert(cmdId, pend);
 
+    pend->startTiming();
     sendCommandContainer(pend->getCommandContainer());
 }
 
+namespace
+{
+constexpr int STATS_EMIT_INTERVAL_MS = 1000;
+// Game actions are what players perceive as lag. Surface unusually slow ones
+// without requiring debug logging to be enabled.
+constexpr qint64 SLOW_GAME_COMMAND_WARN_MS = 1500;
+} // namespace
+
+void AbstractClient::recordLatency(PendingCommand &pend)
+{
+    const qint64 elapsed = pend.elapsedMs();
+    if (elapsed < 0) {
+        return;
+    }
+
+    latencyTracker.addSample(elapsed);
+
+    if (AbstractClientLog().isDebugEnabled()) {
+        qCDebug(AbstractClientLog).noquote()
+            << "command RTT:" << elapsed << "ms (cmd_id" << pend.getCommandContainer().cmd_id() << ")";
+    }
+
+    if (elapsed >= SLOW_GAME_COMMAND_WARN_MS && pend.getCommandContainer().game_command_size() > 0) {
+        qCWarning(AbstractClientLog).noquote()
+            << "slow game command round trip:" << elapsed << "ms | " << getSafeDebugString(pend.getCommandContainer());
+    }
+
+    // Emit aggregated stats at most once per StatsEmitIntervalMs so that the
+    // per-command hot path stays free of signal traffic. The keepalive ping
+    // guarantees a fresh sample roughly every second while connected.
+    if (!statsEmitClockStarted || statsEmitClock.elapsed() >= STATS_EMIT_INTERVAL_MS) {
+        statsEmitClock.start();
+        statsEmitClockStarted = true;
+        const LatencyTracker::Stats stats = latencyTracker.stats();
+
+        QList<int> samples;
+        samples.reserve(stats.sampleCount);
+        for (qint64 sample : latencyTracker.recentSamples()) {
+            samples.append(static_cast<int>(sample));
+        }
+
+        emit pingStatsUpdated(stats, samples);
+    }
+}
+
+void AbstractClient::clearLatencyStats()
+{
+    latencyTracker.clear();
+    statsEmitClockStarted = false;
+    emit pingStatsUpdated(LatencyTracker::Stats{}, {});
+}
+
 PendingCommand *AbstractClient::prepareSessionCommand(const ::google::protobuf::Message &cmd)
 {
     CommandContainer cont;
@@ -195,3 +272,24 @@ PendingCommand *AbstractClient::prepareAdminCommand(const ::google::protobuf::Me
     c->GetReflection()->MutableMessage(c, cmd.GetDescriptor()->FindExtensionByName("ext"))->CopyFrom(cmd);
     return new PendingCommand(cont);
 }
+
+PendingCommand *AbstractClient::prepareDeveloperCommand(const ::google::protobuf::Message &cmd)
+{
+    CommandContainer cont;
+    DeveloperCommand *c = cont.add_developer_command();
+    // A developer command message may also be usable through other command
+    // families, so select the extension scoped to DeveloperCommand rather than
+    // guessing by name.
+    const ::google::protobuf::Descriptor *cmdDescriptor = cmd.GetDescriptor();
+    const ::google::protobuf::Descriptor *developerDescriptor = DeveloperCommand::descriptor();
+    const ::google::protobuf::FieldDescriptor *developerExtension = nullptr;
+    for (int i = 0; i < cmdDescriptor->extension_count(); ++i) {
+        if (cmdDescriptor->extension(i)->containing_type() == developerDescriptor) {
+            developerExtension = cmdDescriptor->extension(i);
+            break;
+        }
+    }
+    Q_ASSERT(developerExtension != nullptr);
+    c->GetReflection()->MutableMessage(c, developerExtension)->CopyFrom(cmd);
+    return new PendingCommand(cont);
+}
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
index dc3be5a94..442e96eb2 100644
--- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h
@@ -1,16 +1,39 @@
 /**
  * @file abstract_client.h
  * @ingroup Client
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef ABSTRACTCLIENT_H
 #define ABSTRACTCLIENT_H
 
+#include "latency_tracker.h"
+
+#include <QElapsedTimer>
+#include <QLoggingCategory>
+#include <QMap>
 #include <QMutex>
-#include <QVariant>
-#include <libcockatrice/protocol/pb/response.pb.h>
+#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 <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");
 
 class PendingCommand;
 class CommandContainer;
@@ -30,7 +53,6 @@ class Event_NotifyUser;
 class Event_ConnectionClosed;
 class Event_ServerShutdown;
 class Event_ReplayAdded;
-class FeatureSet;
 
 enum ClientStatus
 {
@@ -54,6 +76,18 @@ signals:
     void statusChanged(ClientStatus _status);
     void maxPingTime(int seconds, int maxSeconds);
 
+    /**
+     * @brief Aggregated round-trip statistics and a chronological snapshot of
+     * the rolling window, emitted at most once per second.
+     *
+     * All values in the stats struct are in milliseconds; sampleCount is the
+     * number of samples currently in the rolling window. The samples list is
+     * ordered oldest first so graphs can redraw without polling the tracker
+     * across threads. Emitted from the client thread. The connection to UI
+     * objects is automatically queued across threads.
+     */
+    void pingStatsUpdated(const LatencyTracker::Stats &stats, const QList<int> &samplesMs);
+
     // Room events
     void roomEventReceived(const RoomEvent &event);
     // Game events
@@ -85,6 +119,11 @@ private:
     int nextCmdId;
     mutable QMutex clientMutex;
     ClientStatus status;
+    LatencyTracker latencyTracker;
+    QElapsedTimer statsEmitClock;
+    bool statsEmitClockStarted = false;
+
+    void recordLatency(PendingCommand &pend);
 private slots:
     void queuePendingCommand(PendingCommand *pend);
 protected slots:
@@ -113,6 +152,16 @@ public:
     void sendCommand(const CommandContainer &cont);
     void sendCommand(PendingCommand *pend);
 
+    /**
+     * @brief Drops all recorded round-trip samples and resets the stats
+     * emission throttle, emitting zeroed stats so that UI listeners can
+     * clear their display.
+     *
+     * Must be called from the client thread (as RemoteClient's disconnect
+     * path does). The tracker is deliberately lock-free.
+     */
+    void clearLatencyStats();
+
     bool getServerSupportsPasswordHash() const
     {
         return serverSupportsPasswordHash;
@@ -122,10 +171,25 @@ public:
         return userName;
     }
 
+    /**
+     * @brief Returns the server address configured for the current connection.
+     *
+     * May be empty for clients that have no server counterpart (e.g. local test clients).
+     */
+    virtual QString serverName() const
+    {
+        return {};
+    }
+    virtual quint16 serverPort() const
+    {
+        return 0;
+    }
+
     static PendingCommand *prepareSessionCommand(const ::google::protobuf::Message &cmd);
     static PendingCommand *prepareRoomCommand(const ::google::protobuf::Message &cmd, int roomId);
     static PendingCommand *prepareModeratorCommand(const ::google::protobuf::Message &cmd);
     static PendingCommand *prepareAdminCommand(const ::google::protobuf::Message &cmd);
+    static PendingCommand *prepareDeveloperCommand(const ::google::protobuf::Message &cmd);
 
     QMap<QString, bool> clientFeatures;
 };
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.cpp b/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.cpp
new file mode 100644
index 000000000..bc6230621
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.cpp
@@ -0,0 +1,63 @@
+#include "latency_tracker.h"
+
+#include <QSharedPointer>
+#include <QtGlobal>
+#include <QtMath>
+#include <algorithm>
+#include <stddef.h>
+
+void LatencyTracker::addSample(qint64 ms)
+{
+    samples[static_cast<size_t>(head)] = ms;
+    head = (head + 1) % WindowSize;
+    if (count < WindowSize) {
+        ++count;
+    }
+}
+
+QList<qint64> LatencyTracker::recentSamples() const
+{
+    QList<qint64> result;
+    result.reserve(count);
+    for (int i = count; i > 0; --i) {
+        const int index = (head + WindowSize - i) % WindowSize;
+        result.append(samples[static_cast<size_t>(index)]);
+    }
+    return result;
+}
+
+LatencyTracker::Stats LatencyTracker::stats() const
+{
+    if (count == 0) {
+        return {};
+    }
+
+    QList<qint64> sorted(samples.cbegin(), samples.cbegin() + count);
+    std::sort(sorted.begin(), sorted.end());
+
+    Stats s;
+    s.sampleCount = count;
+    s.lastMs = samples[static_cast<size_t>((head + WindowSize - 1) % WindowSize)];
+    s.maxMs = sorted.last();
+
+    const int n = count;
+    if (n % 2 == 1) {
+        s.medianMs = sorted[n / 2];
+    } else {
+        s.medianMs = (sorted[n / 2 - 1] + sorted[n / 2]) / 2;
+    }
+
+    // Nearest-rank percentile: smallest value in the list such that at least
+    // 95% of the samples are <= it.
+    const int p95Index = qMax(0, qCeil(0.95 * static_cast<double>(n)) - 1);
+    s.p95Ms = sorted[p95Index];
+
+    return s;
+}
+
+void LatencyTracker::clear()
+{
+    samples.fill(0);
+    head = 0;
+    count = 0;
+}
diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.h b/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.h
new file mode 100644
index 000000000..cae11ea4d
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/network/client/abstract/latency_tracker.h
@@ -0,0 +1,53 @@
+/**
+ * @file latency_tracker.h
+ * @ingroup Client
+ */
+
+#ifndef LATENCY_TRACKER_H
+#define LATENCY_TRACKER_H
+
+#include <QByteArray>
+#include <QList>
+#include <QMetaType>
+#include <QtGlobal>
+#include <array>
+
+/**
+ * @brief Fixed-capacity rolling window of network round-trip time samples.
+ *
+ * The hot path (addSample) is a single array store and is intentionally free of
+ * allocations, locks, or signal emissions so that recording one sample per
+ * completed command cannot affect gameplay performance. Aggregate statistics
+ * are only computed on demand in stats(), which callers should throttle.
+ */
+class LatencyTracker
+{
+public:
+    static constexpr int WindowSize = 64;
+
+    struct Stats
+    {
+        qint64 lastMs = 0;   ///< most recently added sample
+        qint64 medianMs = 0; ///< median over the current window
+        qint64 p95Ms = 0;    ///< 95th percentile over the current window
+        qint64 maxMs = 0;    ///< maximum over the current window
+        int sampleCount = 0; ///< number of samples currently in the window
+    };
+
+    void addSample(qint64 ms);
+    Stats stats() const;
+
+    /// Snapshot of the current window in chronological order (oldest first).
+    QList<qint64> recentSamples() const;
+
+    void clear();
+
+private:
+    std::array<qint64, WindowSize> samples{};
+    int head = 0;  ///< index where the next sample will be written
+    int count = 0; ///< number of valid samples, capped at WindowSize
+};
+
+Q_DECLARE_METATYPE(LatencyTracker::Stats)
+
+#endif
diff --git a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
index d12a324dc..08c12b7f8 100644
--- a/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/local/CMakeLists.txt
@@ -6,11 +6,7 @@ set(HEADERS local_client.h)
 
 set(SOURCES local_client.cpp)
 
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
+qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
 
 add_library(libcockatrice_network_client_local STATIC ${MOC_SOURCES} ${SOURCES})
 
@@ -23,3 +19,5 @@ 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 eefa3a2f3..c1c1cc976 100644
--- a/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/local/local_client.cpp
@@ -1,9 +1,17 @@
 #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 e8c5330ac..3ae570255 100644
--- a/libcockatrice_network/libcockatrice/network/client/local/local_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/local/local_client.h
@@ -1,8 +1,8 @@
 /**
  * @file local_client.h
  * @ingroup Client
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef LOCALCLIENT_H
 #define LOCALCLIENT_H
@@ -10,6 +10,11 @@
 #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 0548700e4..c32ca0aa8 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/client/remote/CMakeLists.txt
@@ -6,11 +6,7 @@ set(HEADERS remote_client.h)
 
 set(SOURCES remote_client.cpp)
 
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
+qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
 
 add_library(libcockatrice_network_client_remote STATIC ${MOC_SOURCES} ${SOURCES})
 
@@ -23,3 +19,5 @@ 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 c0167a875..feda9e3f4 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
+++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp
@@ -1,5 +1,8 @@
 #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>
@@ -7,13 +10,21 @@
 #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>
@@ -22,6 +33,10 @@
 #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;
 
@@ -42,11 +57,7 @@ RemoteClient::RemoteClient(QObject *parent, INetworkSettingsProvider *_networkSe
     connect(socket, &QTcpSocket::connected, this, &RemoteClient::slotConnected);
     connect(socket, &QTcpSocket::readyRead, this, &RemoteClient::readData);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     connect(socket, &QTcpSocket::errorOccurred, this, &RemoteClient::slotSocketError);
-#else
-    connect(socket, qOverload<QAbstractSocket::SocketError>(&QTcpSocket::error), this, &RemoteClient::slotSocketError);
-#endif
 
     websocket = new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this);
     connect(websocket, &QWebSocket::binaryMessageReceived, this, &RemoteClient::websocketMessageReceived);
@@ -217,8 +228,9 @@ Command_Login RemoteClient::generateCommandLogin()
 
     if (!clientFeatures.isEmpty()) {
         QMap<QString, bool>::iterator i;
-        for (i = clientFeatures.begin(); i != clientFeatures.end(); ++i)
+        for (i = clientFeatures.begin(); i != clientFeatures.end(); ++i) {
             cmdLogin.add_clientfeatures(i.key().toStdString().c_str());
+        }
     }
 
     return cmdLogin;
@@ -227,14 +239,14 @@ Command_Login RemoteClient::generateCommandLogin()
 void RemoteClient::doLogin()
 {
     if (!password.isEmpty() && serverSupportsPasswordHash) {
-        // TODO store and log in using stored hashed password
+        //! \todo Store and log in using stored hashed password.
         if (hashedPassword.isEmpty()) {
             doRequestPasswordSalt(); // ask salt to create hashedPassword, then log in
         } else {
             doHashedLogin(); // log in using hashed password instead
         }
     } else {
-        // TODO add setting for client to reject unhashed logins
+        //! \todo Add setting for client to reject unhashed logins.
         setStatus(StatusLoggingIn);
         Command_Login cmdLogin = generateCommandLogin();
         if (!password.isEmpty()) {
@@ -288,8 +300,9 @@ void RemoteClient::loginResponse(const Response &response)
 
     QString possibleMissingFeatures;
     if (resp.missing_features_size() > 0) {
-        for (int i = 0; i < resp.missing_features_size(); ++i)
+        for (int i = 0; i < resp.missing_features_size(); ++i) {
             possibleMissingFeatures.append("," + QString::fromStdString(resp.missing_features(i)));
+        }
     }
 
     if (response.response_code() == Response::RespOk) {
@@ -297,13 +310,15 @@ void RemoteClient::loginResponse(const Response &response)
         emit userInfoChanged(resp.user_info());
 
         QList<ServerInfo_User> buddyList;
-        for (int i = resp.buddy_list_size() - 1; i >= 0; --i)
+        for (int i = resp.buddy_list_size() - 1; i >= 0; --i) {
             buddyList.append(resp.buddy_list(i));
+        }
         emit buddyListReceived(buddyList);
 
         QList<ServerInfo_User> ignoreList;
-        for (int i = resp.ignore_list_size() - 1; i >= 0; --i)
+        for (int i = resp.ignore_list_size() - 1; i >= 0; --i) {
             ignoreList.append(resp.ignore_list(i));
+        }
         emit ignoreListReceived(ignoreList);
 
         if (newMissingFeatureFound(possibleMissingFeatures) && resp.missing_features_size() > 0 &&
@@ -315,8 +330,9 @@ void RemoteClient::loginResponse(const Response &response)
     } else if (response.response_code() != Response::RespNotConnected) {
         QList<QString> missingFeatures;
         if (resp.missing_features_size() > 0) {
-            for (int i = 0; i < resp.missing_features_size(); ++i)
+            for (int i = 0; i < resp.missing_features_size(); ++i) {
                 missingFeatures << QString::fromStdString(resp.missing_features(i));
+            }
         }
         emit loginError(response.response_code(), QString::fromStdString(resp.denied_reason_str()),
                         static_cast<quint32>(resp.denied_end_time()), missingFeatures);
@@ -387,24 +403,31 @@ void RemoteClient::readData()
                     inputBuffer.remove(0, 4);
                     messageInProgress = true;
                 }
-            } else
+            } else {
                 return;
+            }
         }
-        if (inputBuffer.size() < messageLength)
+        if (inputBuffer.size() < messageLength) {
             return;
+        }
 
         ServerMessage newServerMessage;
-        newServerMessage.ParseFromArray(inputBuffer.data(), messageLength);
-
-        qCDebug(RemoteClientLog).noquote() << "IN" << getSafeDebugString(newServerMessage);
+        bool ok = newServerMessage.ParseFromArray(inputBuffer.data(), messageLength);
 
         inputBuffer.remove(0, messageLength);
         messageInProgress = false;
 
-        processProtocolItem(newServerMessage);
+        if (ok) {
+            qCDebug(RemoteClientLog).noquote() << "IN" << getSafeDebugString(newServerMessage);
 
-        if (getStatus() == StatusDisconnecting) // use thread-safe getter
+            processProtocolItem(newServerMessage);
+        } else {
+            qCDebug(RemoteClientLog) << "parsing error!";
+        }
+
+        if (getStatus() == StatusDisconnecting) { // use thread-safe getter
             doDisconnectFromServer();
+        }
     } while (!inputBuffer.isEmpty());
 }
 
@@ -412,11 +435,13 @@ void RemoteClient::websocketMessageReceived(const QByteArray &message)
 {
     lastDataReceived = timeRunning;
     ServerMessage newServerMessage;
-    newServerMessage.ParseFromArray(message.data(), message.length());
+    if (newServerMessage.ParseFromArray(message.data(), message.length())) {
+        qCDebug(RemoteClientLog).noquote() << "IN" << getSafeDebugString(newServerMessage);
 
-    qCDebug(RemoteClientLog).noquote() << "IN" << getSafeDebugString(newServerMessage);
-
-    processProtocolItem(newServerMessage);
+        processProtocolItem(newServerMessage);
+    } else {
+        qCDebug(RemoteClientLog) << "parsing error!";
+    }
 }
 
 void RemoteClient::sendCommandContainer(const CommandContainer &cont)
@@ -430,19 +455,27 @@ void RemoteClient::sendCommandContainer(const CommandContainer &cont)
     qCDebug(RemoteClientLog).noquote() << "OUT" << getSafeDebugString(cont);
 
     QByteArray buf;
+    bool ok;
     if (usingWebSocket) {
         buf.resize(size);
-        cont.SerializeToArray(buf.data(), size);
-        websocket->sendBinaryMessage(buf);
+        ok = cont.SerializeToArray(buf.data(), size);
+        if (ok) {
+            websocket->sendBinaryMessage(buf);
+        }
     } else {
         buf.resize(size + 4);
-        cont.SerializeToArray(buf.data() + 4, size);
-        buf.data()[3] = (unsigned char)size;
-        buf.data()[2] = (unsigned char)(size >> 8);
-        buf.data()[1] = (unsigned char)(size >> 16);
-        buf.data()[0] = (unsigned char)(size >> 24);
+        ok = cont.SerializeToArray(buf.data() + 4, size);
+        if (ok) {
+            buf.data()[3] = (unsigned char)size;
+            buf.data()[2] = (unsigned char)(size >> 8);
+            buf.data()[1] = (unsigned char)(size >> 16);
+            buf.data()[0] = (unsigned char)(size >> 24);
 
-        socket->write(buf);
+            socket->write(buf);
+        }
+    }
+    if (!ok) {
+        qCDebug(RemoteClientLog) << "transmit error!";
     }
 }
 
@@ -525,10 +558,12 @@ void RemoteClient::doDisconnectFromServer()
         delete i;
     }
     pendingCommands.clear();
+    clearLatencyStats();
 
     setStatus(StatusDisconnected);
-    if (websocket->isValid())
+    if (websocket->isValid()) {
         websocket->close();
+    }
     socket->close();
 }
 
@@ -539,6 +574,15 @@ void RemoteClient::ping()
         PendingCommand *pend = i.next().value();
         if (pend->tick() > maxTimeout) {
             i.remove();
+            // Answer the command instead of dropping it silently: the connection may still
+            // be alive (other traffic keeps lastDataReceived fresh) while this single
+            // command stalled, and awaiters such as TabServer's room-join dedup can only
+            // release their in-flight markers when `finished` fires. A silent drop wedges
+            // them permanently - e.g. a room whose join timing never surfaces again.
+            Response response;
+            response.set_response_code(Response::RespNotConnected);
+            response.set_cmd_id(pend->getCommandContainer().cmd_id());
+            pend->processResponse(response);
             pend->deleteLater();
         }
     }
@@ -605,8 +649,9 @@ bool RemoteClient::newMissingFeatureFound(const QString &_serversMissingFeatures
     QStringList serversMissingFeaturesList = _serversMissingFeatures.split(",");
     for (const QString &feature : serversMissingFeaturesList) {
         if (!feature.isEmpty()) {
-            if (!networkSettingsProvider->getKnownMissingFeatures().contains(feature))
+            if (!networkSettingsProvider->getKnownMissingFeatures().contains(feature)) {
                 return true;
+            }
         }
     }
     return newMissingFeature;
@@ -618,8 +663,9 @@ void RemoteClient::clearNewClientFeatures()
     QStringList existingKnownMissingFeatures = networkSettingsProvider->getKnownMissingFeatures().split(",");
     for (const QString &existingKnownFeature : existingKnownMissingFeatures) {
         if (!existingKnownFeature.isEmpty()) {
-            if (!clientFeatures.contains(existingKnownFeature))
+            if (!clientFeatures.contains(existingKnownFeature)) {
                 newKnownMissingFeatures.append("," + existingKnownFeature);
+            }
         }
     }
     networkSettingsProvider->setKnownMissingFeatures(newKnownMissingFeatures);
@@ -657,10 +703,12 @@ void RemoteClient::requestForgotPasswordResponse(const Response &response)
     if (response.response_code() == Response::RespOk) {
         if (resp.challenge_email()) {
             emit sigPromptForForgotPasswordChallenge();
-        } else
+        } else {
             emit sigPromptForForgotPasswordReset();
-    } else
+        }
+    } else {
         emit sigForgotPasswordError();
+    }
 
     doDisconnectFromServer();
 }
@@ -688,8 +736,9 @@ void RemoteClient::submitForgotPasswordResetResponse(const Response &response)
 {
     if (response.response_code() == Response::RespOk) {
         emit sigForgotPasswordSuccess();
-    } else
+    } else {
         emit sigForgotPasswordError();
+    }
 
     doDisconnectFromServer();
 }
@@ -722,8 +771,9 @@ void RemoteClient::submitForgotPasswordChallengeResponse(const Response &respons
 {
     if (response.response_code() == Response::RespOk) {
         emit sigPromptForForgotPasswordReset();
-    } else
+    } else {
         emit sigForgotPasswordError();
+    }
 
     doDisconnectFromServer();
 }
diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
index 15e3e8ef5..4d8c24fd2 100644
--- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
+++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.h
@@ -1,18 +1,30 @@
 /**
  * @file remote_client.h
  * @ingroup Client
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef REMOTECLIENT_H
 #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 <libcockatrice/interfaces/interface_network_settings_provider.h>
-#include <libcockatrice/protocol/pb/commands.pb.h>
+#include <QtGlobal>
+#include <qtmetamacros.h>
+
+class Event_ConnectionClosed;
+class Event_ServerIdentification;
+class INetworkSettingsProvider;
+class QObject;
+template <typename T> class QList;
 
 inline Q_LOGGING_CATEGORY(RemoteClientLog, "remote_client");
 
@@ -131,6 +143,22 @@ public:
             return socket->peerName();
         }
     }
+    quint16 peerPort() const
+    {
+        if (usingWebSocket) {
+            return websocket->peerPort();
+        } else {
+            return socket->peerPort();
+        }
+    }
+    QString serverName() const override
+    {
+        return lastHostname;
+    }
+    quint16 serverPort() const override
+    {
+        return static_cast<quint16>(lastPort);
+    }
     void
     connectToServer(const QString &hostname, unsigned int port, const QString &_userName, const QString &_password);
     void registerToServer(const QString &hostname,
diff --git a/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt b/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
index 80fb379a4..020753d7f 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/server/local/CMakeLists.txt
@@ -6,11 +6,7 @@ set(HEADERS local_server.h local_server_interface.h)
 
 set(SOURCES local_server.cpp local_server_interface.cpp)
 
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
+qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
 
 add_library(libcockatrice_network_server_local STATIC ${MOC_SOURCES} ${SOURCES})
 
@@ -19,3 +15,5 @@ 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 8f9d82aa4..ebfc9bdeb 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server.cpp
@@ -1,8 +1,17 @@
 #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 70586f6c1..ee8d487d2 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server.h
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server.h
@@ -1,16 +1,19 @@
 /**
  * @file local_server.h
  * @ingroup Server
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef LOCALSERVER_H
 #define LOCALSERVER_H
 
 #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 bb86198af..b7c8d4bfa 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.cpp
@@ -1,8 +1,10 @@
 #include "local_server_interface.h"
 
+#include "../remote/server_protocolhandler.h"
 #include "local_server.h"
 
-#include <QDebug>
+class CommandContainer;
+class Server_DatabaseInterface;
 
 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 4410fd65c..8aadb40ca 100644
--- a/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
+++ b/libcockatrice_network/libcockatrice/network/server/local/local_server_interface.h
@@ -1,15 +1,20 @@
 /**
  * @file local_server_interface.h
  * @ingroup Server
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef LOCALSERVERINTERFACE_H
 #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 e883baa0d..5840f80c0 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
+++ b/libcockatrice_network/libcockatrice/network/server/remote/CMakeLists.txt
@@ -10,7 +10,12 @@ set(HEADERS
     game/server_card.h
     game/server_cardzone.h
     game/server_counter.h
+    game/game_config.h
+    game/server_deck_validation_strategy.h
     game/server_game.h
+    game/server_game_lifecycle_strategy.h
+    game/server_match_result_strategy.h
+    game/server_match_game_factory.h
     game/server_player.h
     game/server_spectator.h
     server.h
@@ -23,11 +28,7 @@ set(HEADERS
     serverinfo_user_container.h
 )
 
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
+qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
 
 add_library(
   libcockatrice_network_server_remote STATIC
@@ -61,3 +62,5 @@ 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/game_config.h b/libcockatrice_network/libcockatrice/network/server/remote/game/game_config.h
new file mode 100644
index 000000000..baf946632
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/game_config.h
@@ -0,0 +1,26 @@
+#ifndef GAME_CONFIG_H
+#define GAME_CONFIG_H
+
+#include <QList>
+#include <QString>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+
+struct GameConfig
+{
+    ServerInfo_User creatorInfo;
+    int gameId = -1;
+    QString description;
+    QString password;
+    int maxPlayers = 2;
+    QList<int> gameTypes;
+    bool onlyBuddies = false;
+    bool onlyRegistered = false;
+    bool spectatorsAllowed = false;
+    bool spectatorsNeedPassword = false;
+    bool spectatorsCanTalk = true;
+    bool spectatorsSeeEverything = true;
+    int startingLifeTotal = 20;
+    bool shareDecklistsOnLoad = true;
+};
+
+#endif
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 493b8e966..5b8d901bb 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,10 +4,16 @@
 #include "../server_abstractuserinterface.h"
 #include "../server_database_interface.h"
 #include "../server_room.h"
-#include "server_card.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_game.h"
-#include "server_player.h"
+#include "server_response_containers.h"
+#include "serverinfo_user_container.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>
@@ -37,6 +43,7 @@
 #include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
 #include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
 #include <libcockatrice/protocol/pb/command_set_counter.pb.h>
+#include <libcockatrice/protocol/pb/command_set_playmat.pb.h>
 #include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>
 #include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
 #include <libcockatrice/protocol/pb/command_shuffle.pb.h>
@@ -48,7 +55,8 @@
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <libcockatrice/utility/string_limits.h>
+#include <string>
 
 Server_AbstractParticipant::Server_AbstractParticipant(Server_Game *_game,
                                                        int _playerId,
@@ -144,6 +152,13 @@ Response::ResponseCode Server_AbstractParticipant::cmdSetSideboardLock(const Com
     return Response::RespFunctionNotAllowed;
 }
 
+Response::ResponseCode Server_AbstractParticipant::cmdSetPlaymat(const Command_SetPlaymat & /*cmd*/,
+                                                                 ResponseContainer & /*rc*/,
+                                                                 GameEventStorage & /*ges*/)
+{
+    return Response::RespFunctionNotAllowed;
+}
+
 Response::ResponseCode Server_AbstractParticipant::cmdConcede(const Command_Concede & /*cmd*/,
                                                               ResponseContainer & /*rc*/,
                                                               GameEventStorage & /*ges*/)
@@ -525,6 +540,9 @@ Server_AbstractParticipant::processGameCommand(const GameCommand &command, Respo
         case GameCommand::REVERSE_TURN:
             return cmdReverseTurn(command.GetExtension(Command_ReverseTurn::ext), rc, ges);
             break;
+        case GameCommand::SET_PLAYMAT:
+            return cmdSetPlaymat(command.GetExtension(Command_SetPlaymat::ext), rc, ges);
+            break;
         default:
             return Response::RespInvalidCommand;
     }
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 f60d56dcf..195da9b7f 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,7 +17,6 @@ class GameEventContainer;
 class GameEventStorage;
 class ResponseContainer;
 class GameCommand;
-
 class Command_KickFromGame;
 class Command_LeaveGame;
 class Command_GameSay;
@@ -52,6 +51,7 @@ class Command_SetSideboardPlan;
 class Command_DeckSelect;
 class Command_SetSideboardLock;
 class Command_ChangeZoneProperties;
+class Command_SetPlaymat;
 
 class Server_AbstractParticipant : public Server_ArrowTarget, public ServerInfo_User_Container
 {
@@ -89,11 +89,11 @@ public:
     {
         return playerId;
     }
-    bool getSpectator() const
+    bool isSpectator() const
     {
         return spectator;
     }
-    bool getJudge() const
+    bool isJudge() const
     {
         return judge;
     }
@@ -124,6 +124,8 @@ public:
     cmdSetSideboardPlan(const Command_SetSideboardPlan &cmd, ResponseContainer &rc, GameEventStorage &ges);
     virtual Response::ResponseCode
     cmdSetSideboardLock(const Command_SetSideboardLock &cmd, ResponseContainer &rc, GameEventStorage &ges);
+    virtual Response::ResponseCode
+    cmdSetPlaymat(const Command_SetPlaymat &cmd, ResponseContainer &rc, GameEventStorage &ges);
     virtual Response::ResponseCode cmdGameSay(const Command_GameSay &cmd, ResponseContainer &rc, GameEventStorage &ges);
     virtual Response::ResponseCode cmdShuffle(const Command_Shuffle &cmd, ResponseContainer &rc, GameEventStorage &ges);
     virtual Response::ResponseCode
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 aaf7f1332..47c810d0d 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,14 +1,33 @@
 #include "server_abstract_player.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 <QDebug>
-#include <QRegularExpression>
+#include <QList>
+#include <QListIterator>
+#include <QMapIterator>
+#include <QObject>
+#include <QSet>
+#include <QSharedPointer>
+#include <QVariant>
 #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>
@@ -47,7 +66,14 @@
 #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/trice_limits.h>
+#include <libcockatrice/utility/dice_limits.h>
+#include <libcockatrice/utility/string_limits.h>
+#include <libcockatrice/utility/zone_names.h>
+#include <ranges>
+#include <set>
+#include <string>
+
+class Server_AbstractUserInterface;
 
 Server_AbstractPlayer::Server_AbstractPlayer(Server_Game *_game,
                                              int _playerId,
@@ -62,6 +88,15 @@ Server_AbstractPlayer::Server_AbstractPlayer(Server_Game *_game,
 
 Server_AbstractPlayer::~Server_AbstractPlayer() = default;
 
+int Server_AbstractPlayer::getCardCount() const
+{
+    int result = 0;
+    for (auto *zone : zones) {
+        result += zone->getCards().size();
+    }
+    return result;
+}
+
 void Server_AbstractPlayer::prepareDestroy()
 {
     delete deck;
@@ -78,17 +113,6 @@ int Server_AbstractPlayer::newCardId()
     return nextCardId++;
 }
 
-int Server_AbstractPlayer::newArrowId() const
-{
-    int id = 0;
-    for (Server_Arrow *a : arrows) {
-        if (a->getId() > id) {
-            id = a->getId();
-        }
-    }
-    return id + 1;
-}
-
 void Server_AbstractPlayer::setupZones()
 {
     nextCardId = 0;
@@ -190,14 +214,74 @@ shouldDestroyOnMove(const Server_Card *card, const Server_CardZone *startZone, c
     }
 
     // Allow tokens on the stack
-    if ((startZone->getName() == "table" || startZone->getName() == "stack") &&
-        (targetZone->getName() == "table" || targetZone->getName() == "stack")) {
+    if ((startZone->getName() == ZoneNames::TABLE || startZone->getName() == ZoneNames::STACK) &&
+        (targetZone->getName() == ZoneNames::TABLE || targetZone->getName() == ZoneNames::STACK)) {
         return false;
     }
 
     return true;
 }
 
+/**
+ * @brief Determines whether the moved card should be face-down
+ */
+static bool
+shouldBeFaceDown(const MoveCardStruct &cardStruct, const Server_CardZone *startZone, const Server_CardZone *targetZone)
+{
+    if (!targetZone) {
+        return false;
+    }
+
+    // being face-down only makes sense for public zones
+    if (targetZone->getType() != ServerInfo_Zone::PublicZone) {
+        return false;
+    }
+
+    // face-down property in proto takes precedence
+    if (cardStruct.cardToMove->has_face_down()) {
+        return cardStruct.cardToMove->face_down();
+    }
+
+    // Default to keep face-down the same if zone didn't change.
+    // Compare using zone names because face-down is maintained when changing controllers.
+    if (startZone && startZone->getName() == targetZone->getName()) {
+        return cardStruct.card->getFaceDown();
+    }
+
+    return false;
+}
+
+/**
+ * @brief Determines whether a set of moved cards is from the bottom of the deck
+ */
+static bool shouldBeFromTheBottom(const Server_CardZone *startZone, const std::set<MoveCardStruct> &cardsToMove)
+{
+    if (!startZone) {
+        return false;
+    }
+
+    if (startZone->getName() != ZoneNames::DECK) {
+        return false;
+    }
+
+    int movedCount = static_cast<int>(cardsToMove.size());
+    int tailStart = startZone->getCards().size() - movedCount;
+    if (tailStart <= 0) { // if the entire deck is moved it should not be considered from the bottom
+        return false;
+    }
+
+    // check if the move is a contiguous block at the end of the deck, fail fast when not
+    int expectedPosition = tailStart;
+    for (const auto &card : cardsToMove) {
+        if (card.position != expectedPosition) {
+            return false;
+        }
+        ++expectedPosition;
+    }
+
+    return true;
+}
+
 Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges,
                                                        Server_CardZone *startzone,
                                                        const QList<const CardToMove *> &_cards,
@@ -214,8 +298,11 @@ Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges,
         return Response::RespContextError;
     }
 
-    if (!targetzone->hasCoords() && (xCoord <= -1)) {
-        xCoord = targetzone->getCards().size();
+    if (!targetzone->hasCoords()) {
+        yCoord = 0;
+        if (xCoord <= -1) {
+            xCoord = targetzone->getCards().size();
+        }
     }
 
     std::set<MoveCardStruct> cardsToMove;
@@ -235,7 +322,7 @@ Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges,
         }
 
         // do not allow attached cards to move around on the table
-        if (card->getParentCard() && targetzone->getName() == "table") {
+        if (card->getParentCard() && targetzone->getName() == ZoneNames::TABLE) {
             continue;
         }
 
@@ -255,165 +342,21 @@ Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges,
     bool revealTopStart = false;
     bool revealTopTarget = false;
 
-    for (auto cardStruct : cardsToMove) {
-        Server_Card *card = cardStruct.card;
-        const CardToMove *thisCardProperties = cardStruct.cardToMove;
-        int originalPosition = cardStruct.position;
-        bool faceDown = targetzone->hasCoords() &&
-                        (thisCardProperties->has_face_down() ? thisCardProperties->face_down() : card->getFaceDown());
+    bool isFromBottom = shouldBeFromTheBottom(startzone, cardsToMove);
 
-        bool sourceBeingLookedAt;
-        int position = startzone->removeCard(card, sourceBeingLookedAt);
-
-        // Attachment relationships can be retained when moving a card onto the opponent's table
-        if (startzone->getName() != targetzone->getName()) {
-            // Delete all attachment relationships
-            if (card->getParentCard()) {
-                card->setParentCard(nullptr);
-            }
-
-            // Make a copy of the list because the original one gets modified during the loop
-            QList<Server_Card *> attachedCards = card->getAttachedCards();
-            for (auto &attachedCard : attachedCards) {
-                attachedCard->getZone()->getPlayer()->unattachCard(ges, attachedCard);
-            }
+    if (isFromBottom) {
+        std::ranges::reverse_view reversedCardsToMove{cardsToMove};
+        for (auto card : reversedCardsToMove) {
+            processMoveCard(ges, startzone, targetzone, card, xCoord, yCoord, xIndex, revealTopStart, revealTopTarget,
+                            isReversed, undoingDraw);
         }
-
-        if (startzone != targetzone) {
-            // Delete all arrows from and to the card
-            for (auto *player : game->getPlayers().values()) {
-                QList<int> arrowsToDelete;
-                for (Server_Arrow *arrow : player->getArrows()) {
-                    if ((arrow->getStartCard() == card) || (arrow->getTargetItem() == card))
-                        arrowsToDelete.append(arrow->getId());
-                }
-                for (int j : arrowsToDelete) {
-                    player->deleteArrow(j);
-                }
-            }
-        }
-
-        if (shouldDestroyOnMove(card, startzone, targetzone)) {
-            Event_DestroyCard event;
-            event.set_zone_name(startzone->getName().toStdString());
-            event.set_card_id(static_cast<google::protobuf::uint32>(card->getId()));
-            ges.enqueueGameEvent(event, playerId);
-
-            if (Server_Card *stashedCard = card->takeStashedCard()) {
-                stashedCard->setId(newCardId());
-                ges.enqueueGameEvent(makeCreateTokenEvent(startzone, stashedCard, card->getX(), card->getY()),
-                                     playerId);
-                card->deleteLater();
-                card = stashedCard;
-            } else {
-                card->deleteLater();
-                card = nullptr;
-            }
-        }
-
-        if (card) {
-            ++xIndex;
-            int newX = isReversed ? targetzone->getCards().size() - xCoord + xIndex : xCoord + xIndex;
-
-            if (targetzone->hasCoords()) {
-                newX = targetzone->getFreeGridColumn(newX, yCoord, card->getName(), faceDown);
-            } else {
-                yCoord = 0;
-                card->resetState(targetzone->getName() == "stack");
-            }
-
-            targetzone->insertCard(card, newX, yCoord);
-            int targetLookedCards = targetzone->getCardsBeingLookedAt();
-            bool sourceKnownToPlayer = isReversed || (sourceBeingLookedAt && !card->getFaceDown());
-            if (targetzone->getType() == ServerInfo_Zone::HiddenZone && targetLookedCards >= newX) {
-                if (sourceKnownToPlayer) {
-                    targetLookedCards += 1;
-                } else {
-                    targetLookedCards = newX;
-                }
-                targetzone->setCardsBeingLookedAt(targetLookedCards);
-            }
-
-            bool targetHiddenToOthers = faceDown || (targetzone->getType() != ServerInfo_Zone::PublicZone);
-            bool sourceHiddenToOthers = card->getFaceDown() || (startzone->getType() != ServerInfo_Zone::PublicZone);
-
-            int oldCardId = card->getId();
-            if ((faceDown && (startzone != targetzone)) || (targetzone->getPlayer() != startzone->getPlayer())) {
-                card->setId(targetzone->getPlayer()->newCardId());
-            }
-            card->setFaceDown(faceDown);
-
-            Event_MoveCard eventOthers;
-            eventOthers.set_start_player_id(startzone->getPlayer()->getPlayerId());
-            eventOthers.set_start_zone(startzone->getName().toStdString());
-            eventOthers.set_target_player_id(targetzone->getPlayer()->getPlayerId());
-            if (startzone != targetzone) {
-                eventOthers.set_target_zone(targetzone->getName().toStdString());
-            }
-            eventOthers.set_y(yCoord);
-            eventOthers.set_face_down(faceDown);
-
-            Event_MoveCard eventPrivate(eventOthers);
-            if (sourceBeingLookedAt || targetzone->getType() != ServerInfo_Zone::HiddenZone ||
-                startzone->getType() != ServerInfo_Zone::HiddenZone) {
-                eventPrivate.set_card_id(oldCardId);
-                eventPrivate.set_new_card_id(card->getId());
-            } else {
-                eventPrivate.set_card_id(-1);
-                eventPrivate.set_new_card_id(-1);
-            }
-            if (sourceKnownToPlayer || !(faceDown || targetzone->getType() == ServerInfo_Zone::HiddenZone)) {
-                QString privateCardName = card->getName();
-                eventPrivate.set_card_name(privateCardName.toStdString());
-                eventPrivate.set_new_card_provider_id(card->getProviderId().toStdString());
-            }
-            if (startzone->getType() == ServerInfo_Zone::HiddenZone) {
-                eventPrivate.set_position(position);
-            } else {
-                eventPrivate.set_position(-1);
-            }
-
-            eventPrivate.set_x(newX);
-
-            if (
-                // cards from public zones have their id known, their previous position is already known, the event does
-                // not accomodate for previous locations in zones with coordinates (which are always public)
-                (startzone->getType() != ServerInfo_Zone::PublicZone) &&
-                // other players are not allowed to be able to track which card is which in private zones like the hand
-                (startzone->getType() != ServerInfo_Zone::PrivateZone)) {
-                eventOthers.set_position(position);
-            }
-            if (
-                // other players are not allowed to be able to track which card is which in private zones like the hand
-                (targetzone->getType() != ServerInfo_Zone::PrivateZone)) {
-                eventOthers.set_x(newX);
-            }
-
-            if ((startzone->getType() == ServerInfo_Zone::PublicZone) ||
-                (targetzone->getType() == ServerInfo_Zone::PublicZone)) {
-                eventOthers.set_card_id(oldCardId);
-                if (!(sourceHiddenToOthers && targetHiddenToOthers)) {
-                    QString publicCardName = card->getName();
-                    eventOthers.set_card_name(publicCardName.toStdString());
-                    eventOthers.set_new_card_provider_id(card->getProviderId().toStdString());
-                }
-                eventOthers.set_new_card_id(card->getId());
-            }
-
-            ges.enqueueGameEvent(eventPrivate, playerId, GameEventStorageItem::SendToPrivate, playerId);
-            ges.enqueueGameEvent(eventOthers, playerId, GameEventStorageItem::SendToOthers);
-
-            if (originalPosition == 0) {
-                revealTopStart = true;
-            }
-            if (newX == 0) {
-                revealTopTarget = true;
-            }
-
-            // handle side effects for this card
-            onCardBeingMoved(ges, cardStruct, startzone, targetzone, undoingDraw);
+    } else {
+        for (auto card : cardsToMove) {
+            processMoveCard(ges, startzone, targetzone, card, xCoord, yCoord, xIndex, revealTopStart, revealTopTarget,
+                            isReversed, undoingDraw);
         }
     }
+
     if (revealTopStart) {
         revealTopCardIfNeeded(startzone, ges);
     }
@@ -433,6 +376,178 @@ Response::ResponseCode Server_AbstractPlayer::moveCard(GameEventStorage &ges,
     return Response::RespOk;
 }
 
+void Server_AbstractPlayer::processMoveCard(GameEventStorage &ges,
+                                            Server_CardZone *startzone,
+                                            Server_CardZone *targetzone,
+                                            MoveCardStruct cardStruct,
+                                            int xCoord,
+                                            int yCoord,
+                                            int &xIndex,
+                                            bool &revealTopStart,
+                                            bool &revealTopTarget,
+                                            bool isReversed,
+                                            bool undoingDraw)
+{
+    Server_Card *card = cardStruct.card;
+    int originalPosition = cardStruct.position;
+
+    bool sourceBeingLookedAt;
+    int position = startzone->removeCard(card, sourceBeingLookedAt);
+
+    // Attachment relationships can be retained when moving a card onto the opponent's table
+    if (startzone->getName() != targetzone->getName()) {
+        // Delete all attachment relationships
+        if (card->getParentCard()) {
+            card->setParentCard(nullptr);
+        }
+
+        // Make a copy of the list because the original one gets modified during the loop
+        QList<Server_Card *> attachedCards = card->getAttachedCards();
+        for (auto &attachedCard : attachedCards) {
+            attachedCard->getZone()->getPlayer()->unattachCard(ges, attachedCard);
+        }
+    }
+
+    if (startzone != targetzone) {
+        // Delete all arrows from and to the card
+        for (auto *player : game->getPlayers().values()) {
+            QList<int> arrowsToDelete;
+            for (Server_Arrow *arrow : player->getArrows()) {
+                if ((arrow->getStartCard() == card) || (arrow->getTargetItem() == card)) {
+                    arrowsToDelete.append(arrow->getId());
+                }
+            }
+            for (int j : arrowsToDelete) {
+                Event_DeleteArrow event;
+                event.set_arrow_id(j);
+                ges.enqueueGameEvent(event, player->getPlayerId());
+                player->deleteArrow(j);
+            }
+        }
+    }
+
+    if (shouldDestroyOnMove(card, startzone, targetzone)) {
+        Event_DestroyCard event;
+        event.set_zone_name(startzone->getName().toStdString());
+        event.set_card_id(static_cast<google::protobuf::uint32>(card->getId()));
+        ges.enqueueGameEvent(event, playerId);
+
+        if (Server_Card *stashedCard = card->takeStashedCard()) {
+            stashedCard->setId(newCardId());
+            ges.enqueueGameEvent(makeCreateTokenEvent(startzone, stashedCard, card->getX(), card->getY()), playerId);
+            card->deleteLater();
+            card = stashedCard;
+        } else {
+            card->deleteLater();
+            card = nullptr;
+        }
+    }
+
+    if (card) {
+        ++xIndex;
+        int newX = isReversed ? targetzone->getCards().size() - xCoord + xIndex : xCoord + xIndex;
+
+        bool faceDown = shouldBeFaceDown(cardStruct, startzone, targetzone);
+
+        if (targetzone->hasCoords()) {
+            newX = targetzone->getFreeGridColumn(newX, yCoord, card->getName(), faceDown);
+        } else {
+            card->resetState(targetzone->getName() == ZoneNames::STACK);
+        }
+
+        targetzone->insertCard(card, newX, yCoord);
+        int targetLookedCards = targetzone->getCardsBeingLookedAt();
+        bool sourceKnownToPlayer = isReversed || (sourceBeingLookedAt && !card->getFaceDown());
+        if (targetzone->getType() == ServerInfo_Zone::HiddenZone && targetLookedCards >= newX) {
+            if (sourceKnownToPlayer) {
+                targetLookedCards += 1;
+            } else {
+                targetLookedCards = newX;
+            }
+            targetzone->setCardsBeingLookedAt(targetLookedCards);
+        }
+
+        bool targetHiddenToOthers = faceDown || (targetzone->getType() != ServerInfo_Zone::PublicZone);
+        bool sourceHiddenToOthers = card->getFaceDown() || (startzone->getType() != ServerInfo_Zone::PublicZone);
+
+        int oldCardId = card->getId();
+        if ((faceDown && (startzone != targetzone)) || (targetzone->getPlayer() != startzone->getPlayer())) {
+            card->setId(targetzone->getPlayer()->newCardId());
+        }
+        card->setFaceDown(faceDown);
+
+        Event_MoveCard eventOthers;
+        eventOthers.set_start_player_id(startzone->getPlayer()->getPlayerId());
+        eventOthers.set_start_zone(startzone->getName().toStdString());
+        eventOthers.set_target_player_id(targetzone->getPlayer()->getPlayerId());
+        if (startzone != targetzone) {
+            eventOthers.set_target_zone(targetzone->getName().toStdString());
+        }
+        eventOthers.set_y(yCoord);
+        eventOthers.set_face_down(faceDown);
+
+        Event_MoveCard eventPrivate(eventOthers);
+        if (sourceBeingLookedAt || targetzone->getType() != ServerInfo_Zone::HiddenZone ||
+            startzone->getType() != ServerInfo_Zone::HiddenZone) {
+            eventPrivate.set_card_id(oldCardId);
+            eventPrivate.set_new_card_id(card->getId());
+        } else {
+            eventPrivate.set_card_id(-1);
+            eventPrivate.set_new_card_id(-1);
+        }
+        if (sourceKnownToPlayer || !(faceDown || targetzone->getType() == ServerInfo_Zone::HiddenZone)) {
+            QString privateCardName = card->getName();
+            eventPrivate.set_card_name(privateCardName.toStdString());
+            eventPrivate.set_new_card_provider_id(card->getProviderId().toStdString());
+        }
+        if (startzone->getType() == ServerInfo_Zone::HiddenZone) {
+            eventPrivate.set_position(position);
+        } else {
+            eventPrivate.set_position(-1);
+        }
+
+        eventPrivate.set_x(newX);
+
+        if (
+            // cards from public zones have their id known, their previous position is already known, the event does
+            // not accomodate for previous locations in zones with coordinates (which are always public)
+            (startzone->getType() != ServerInfo_Zone::PublicZone) &&
+            // other players are not allowed to be able to track which card is which in private zones like the hand
+            (startzone->getType() != ServerInfo_Zone::PrivateZone)) {
+            eventOthers.set_position(position);
+        }
+        if (
+            // other players are not allowed to be able to track which card is which in private zones like the hand
+            (targetzone->getType() != ServerInfo_Zone::PrivateZone)) {
+            eventOthers.set_x(newX);
+        }
+
+        if ((startzone->getType() == ServerInfo_Zone::PublicZone) ||
+            (targetzone->getType() == ServerInfo_Zone::PublicZone)) {
+            eventOthers.set_card_id(oldCardId);
+            if (!(sourceHiddenToOthers && targetHiddenToOthers)) {
+                QString publicCardName = card->getName();
+                eventOthers.set_card_name(publicCardName.toStdString());
+                eventOthers.set_new_card_provider_id(card->getProviderId().toStdString());
+            }
+            eventOthers.set_new_card_id(card->getId());
+        }
+
+        ges.enqueueGameEvent(eventPrivate, playerId, GameEventStorageItem::SendToPrivate, playerId);
+        ges.enqueueGameEvent(eventOthers, playerId, GameEventStorageItem::SendToOthers);
+
+        if (originalPosition == 0) {
+            revealTopStart = true;
+        }
+        if (newX == 0) {
+            revealTopTarget = true;
+        }
+
+        // handle side effects for this card
+        onCardBeingMoved(ges, cardStruct, startzone, targetzone, undoingDraw);
+    }
+}
+
 void Server_AbstractPlayer::onCardBeingMoved(GameEventStorage &ges,
                                              const MoveCardStruct &cardStruct,
                                              Server_CardZone *startzone,
@@ -575,51 +690,8 @@ Server_AbstractPlayer::cmdConcede(const Command_Concede & /*cmd*/, ResponseConta
     setConceded(true);
     game->removeArrowsRelatedToPlayer(ges, this);
     game->unattachCards(ges, this);
+    game->returnCardsFromPlayer(ges, this);
 
-    playerMutex.lock();
-
-    // Return cards to their rightful owners before conceding the game
-    static const QRegularExpression ownerRegex{"Owner: ?([^\n]+)"};
-    for (const auto &card : zones.value("table")->getCards()) {
-        if (card == nullptr) {
-            continue;
-        }
-
-        const auto &regexResult = ownerRegex.match(card->getAnnotation());
-        if (!regexResult.hasMatch()) {
-            continue;
-        }
-
-        CardToMove cardToMove;
-        cardToMove.set_card_id(card->getId());
-
-        for (const auto *player : game->getPlayers()) {
-            if (player == nullptr || player->getUserInfo() == nullptr) {
-                continue;
-            }
-
-            const auto &ownerToReturnTo = regexResult.captured(1);
-            const auto &correctOwner = QString::compare(QString::fromStdString(player->getUserInfo()->name()),
-                                                        ownerToReturnTo, Qt::CaseInsensitive) == 0;
-            if (!correctOwner) {
-                continue;
-            }
-
-            const auto &startZone = zones.value("table");
-            const auto &targetZone = player->getZones().value("table");
-
-            if (startZone == nullptr || targetZone == nullptr) {
-                continue;
-            }
-
-            moveCard(ges, startZone, QList<const CardToMove *>() << &cardToMove, targetZone, 0, 0, false);
-            break;
-        }
-    }
-
-    playerMutex.unlock();
-
-    // All borrowed cards have been returned, can now continue cleanup process
     clearZones();
 
     Event_PlayerPropertiesChanged event;
@@ -1044,8 +1116,9 @@ Server_AbstractPlayer::cmdCreateToken(const Command_CreateToken &cmd, ResponseCo
                 _event.set_zone_name(card->getZone()->getName().toStdString());
                 _event.set_card_id(card->getId());
 
-                card->setCounter(i.key(), i.value(), &_event);
-                ges.enqueueGameEvent(_event, playerId);
+                if (card->setCounter(i.key(), i.value(), &_event)) {
+                    ges.enqueueGameEvent(_event, playerId);
+                }
             }
 
             // Copy parent card
@@ -1083,12 +1156,18 @@ Server_AbstractPlayer::cmdCreateToken(const Command_CreateToken &cmd, ResponseCo
                         targetItem = card;
                     }
                     if (sendGameEvent) {
-                        Event_CreateArrow _event;
-                        ServerInfo_Arrow *arrowInfo = _event.mutable_arrow_info();
-                        changedArrowIds.append(arrow->getId());
-                        int id = player->newArrowId();
-                        arrow->setId(id);
-                        arrowInfo->set_id(id);
+                        const int oldId = arrow->getId();
+                        changedArrowIds.append(oldId);
+
+                        Event_DeleteArrow deleteEvent;
+                        deleteEvent.set_arrow_id(oldId);
+                        ges.enqueueGameEvent(deleteEvent, player->getPlayerId());
+
+                        Event_CreateArrow createEvent;
+                        ServerInfo_Arrow *arrowInfo = createEvent.mutable_arrow_info();
+                        const int newId = game->generateArrowId();
+                        arrow->setId(newId);
+                        arrowInfo->set_id(newId);
                         arrowInfo->set_start_player_id(player->getPlayerId());
                         arrowInfo->set_start_zone(startCard->getZone()->getName().toStdString());
                         arrowInfo->set_start_card_id(startCard->getId());
@@ -1102,7 +1181,7 @@ Server_AbstractPlayer::cmdCreateToken(const Command_CreateToken &cmd, ResponseCo
                             arrowInfo->set_target_card_id(arrowTargetCard->getId());
                         }
                         arrowInfo->mutable_arrow_color()->CopyFrom(arrow->getColor());
-                        ges.enqueueGameEvent(_event, player->getPlayerId());
+                        ges.enqueueGameEvent(createEvent, player->getPlayerId());
                     }
                 }
                 for (int id : changedArrowIds) {
@@ -1209,7 +1288,8 @@ Server_AbstractPlayer::cmdCreateArrow(const Command_CreateArrow &cmd, ResponseCo
 
     int currentPhase = game->getActivePhase();
     int deletionPhase = cmd.has_delete_in_phase() ? cmd.delete_in_phase() : currentPhase;
-    auto arrow = new Server_Arrow(newArrowId(), startCard, targetItem, cmd.arrow_color(), currentPhase, deletionPhase);
+    auto arrow = new Server_Arrow(game->generateArrowId(), startCard, targetItem, cmd.arrow_color(), currentPhase,
+                                  deletionPhase);
     addArrow(arrow);
 
     Event_CreateArrow event;
@@ -1291,8 +1371,9 @@ Response::ResponseCode Server_AbstractPlayer::cmdSetCardCounter(const Command_Se
     Event_SetCardCounter event;
     event.set_zone_name(zone->getName().toStdString());
     event.set_card_id(card->getId());
-    card->setCounter(cmd.counter_id(), cmd.counter_value(), &event);
-    ges.enqueueGameEvent(event, playerId);
+    if (card->setCounter(cmd.counter_id(), cmd.counter_value(), &event)) {
+        ges.enqueueGameEvent(event, playerId);
+    }
 
     return Response::RespOk;
 }
@@ -1321,14 +1402,13 @@ Response::ResponseCode Server_AbstractPlayer::cmdIncCardCounter(const Command_In
         return Response::RespNameNotFound;
     }
 
-    int newValue = card->getCounter(cmd.counter_id()) + cmd.counter_delta();
-    card->setCounter(cmd.counter_id(), newValue);
-
     Event_SetCardCounter event;
     event.set_zone_name(zone->getName().toStdString());
     event.set_card_id(card->getId());
-    event.set_counter_id(cmd.counter_id());
-    event.set_counter_value(newValue);
+    if (!card->incrementCounter(cmd.counter_id(), cmd.counter_delta(), &event)) {
+        return Response::RespOk;
+    }
+
     ges.enqueueGameEvent(event, playerId);
 
     return Response::RespOk;
@@ -1426,8 +1506,9 @@ Server_AbstractPlayer::cmdRevealCards(const Command_RevealCards &cmd, ResponseCo
 
     if (cmd.has_player_id()) {
         Server_AbstractPlayer *otherPlayer = game->getPlayer(cmd.player_id());
-        if (!otherPlayer)
+        if (!otherPlayer) {
             return Response::RespNameNotFound;
+        }
     }
     Server_CardZone *zone = zones.value(nameFromStdString(cmd.zone_name()));
     if (!zone) {
@@ -1516,7 +1597,7 @@ Server_AbstractPlayer::cmdRevealCards(const Command_RevealCards &cmd, ResponseCo
             zone->addWritePermission(cmd.player_id());
         }
 
-        if (getJudge()) {
+        if (judge) {
             ges.setOverwriteOwnership(true);
         }
 
@@ -1580,10 +1661,11 @@ void Server_AbstractPlayer::getInfo(ServerInfo_Player *info,
                                     bool withUserInfo)
 {
     getProperties(*info->mutable_properties(), withUserInfo);
-    if (recipient == this) {
-        if (deck) {
-            info->set_deck_list(deck->writeToString_Native().toStdString());
-        }
+
+    // Deck lists are only shared with other players when the game is in Open Decklists mode,
+    // so a player joining an open lobby can see every deck that was loaded before they joined.
+    if (deck && (recipient == this || game->getShareDecklistsOnLoad())) {
+        info->set_deck_list(deck->writeToString_Native().toStdString());
     }
 
     for (Server_Arrow *arrow : arrows) {
@@ -1602,5 +1684,13 @@ void Server_AbstractPlayer::getPlayerProperties(ServerInfo_PlayerProperties &res
     result.set_ready_start(readyStart);
     if (deck) {
         result.set_deck_hash(deck->getDeckHash().toStdString());
+        const auto &playmat = deck->getPlaymat();
+        auto *playmatParams = result.mutable_playmat_params();
+        playmatParams->set_card_name(playmat.card.name.toStdString());
+        playmatParams->set_card_provider_id(playmat.card.providerId.toStdString());
+        playmatParams->set_margin_pct_l(playmat.params.marginPctL);
+        playmatParams->set_margin_pct_r(playmat.params.marginPctR);
+        playmatParams->set_vertical_offset(playmat.params.verticalOffset);
+        playmatParams->set_zoom(playmat.params.zoom);
     }
 }
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 40fe84aa1..ae20955bf 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,25 +1,32 @@
 #ifndef ABSTRACT_PLAYER_H
 #define ABSTRACT_PLAYER_H
 
-#include "../serverinfo_user_container.h"
+#include "libcockatrice/protocol/pb/response.pb.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);
@@ -43,10 +50,16 @@ public:
                           Server_AbstractUserInterface *_handler);
     ~Server_AbstractPlayer() override;
     void prepareDestroy() override;
+    /// Total cards across all of this player's zones. The caller must hold the game's mutex.
+    int getCardCount() const;
     const DeckList *getDeckList() const
     {
         return deck;
     }
+    bool getSideboardLocked() const
+    {
+        return sideboardLocked;
+    }
     bool getReadyStart() const
     {
         return readyStart;
@@ -74,7 +87,6 @@ public:
     }
 
     int newCardId();
-    int newArrowId() const;
 
     void addZone(Server_CardZone *zone);
     void addArrow(Server_Arrow *arrow);
@@ -93,6 +105,19 @@ public:
                                     bool fixFreeSpaces = true,
                                     bool undoingDraw = false,
                                     bool isReversed = false);
+
+    void processMoveCard(GameEventStorage &ges,
+                         Server_CardZone *startzone,
+                         Server_CardZone *targetzone,
+                         MoveCardStruct cardStruct,
+                         int xCoord,
+                         int yCoord,
+                         int &xIndex,
+                         bool &revealTopStart,
+                         bool &revealTopTarget,
+                         bool isReversed,
+                         bool undoingDraw);
+
     virtual void onCardBeingMoved(GameEventStorage &ges,
                                   const MoveCardStruct &cardStruct,
                                   Server_CardZone *startzone,
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 f6787baa2..b5ccff8fe 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrow.cpp
@@ -1,10 +1,16 @@
 #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,
@@ -30,6 +36,7 @@ void Server_Arrow::getInfo(ServerInfo_Arrow *info)
         info->set_target_player_id(targetCard->getZone()->getPlayer()->getPlayerId());
         info->set_target_zone(targetCard->getZone()->getName().toStdString());
         info->set_target_card_id(targetCard->getId());
-    } else
+    } else {
         info->set_target_player_id(static_cast<Server_Player *>(targetItem)->getPlayerId());
+    }
 }
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 5a080018d..c4da725c2 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_arrowtarget.h
@@ -2,6 +2,7 @@
 #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 86ff2f008..c79f13634 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.cpp
@@ -19,13 +19,22 @@
  ***************************************************************************/
 #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>
 
 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),
@@ -36,11 +45,13 @@ Server_Card::Server_Card(const CardRef &cardRef, int _id, int _coord_x, int _coo
 Server_Card::~Server_Card()
 {
     // setParentCard(0) leads to the item being removed from our list, so we can't iterate properly
-    while (!attachedCards.isEmpty())
+    while (!attachedCards.isEmpty()) {
         attachedCards.first()->setParentCard(0);
+    }
 
-    if (parentCard)
+    if (parentCard) {
         parentCard->removeAttachedCard(this);
+    }
 
     if (stashedCard) {
         stashedCard->deleteLater();
@@ -62,16 +73,18 @@ void Server_Card::resetState(bool keepAnnotations)
 
 QString Server_Card::setAttribute(CardAttribute attribute, const QString &avalue, bool allCards)
 {
-    if (attribute == AttrTapped && avalue != "1" && allCards && doesntUntap)
+    if (attribute == AttrTapped && avalue != "1" && allCards && doesntUntap) {
         return QVariant(tapped).toString();
+    }
 
     return setAttribute(attribute, avalue);
 }
 
 QString Server_Card::setAttribute(CardAttribute attribute, const QString &avalue, Event_SetCardAttr *event)
 {
-    if (event)
+    if (event) {
         event->set_attribute(attribute);
+    }
 
     switch (attribute) {
         case AttrTapped: {
@@ -89,8 +102,9 @@ QString Server_Card::setAttribute(CardAttribute attribute, const QString &avalue
             break;
         case AttrPT:
             setPT(avalue);
-            if (event)
+            if (event) {
                 event->set_attr_value(getPT().toStdString());
+            }
             return getPT();
         case AttrAnnotation:
             setAnnotation(avalue);
@@ -99,31 +113,69 @@ QString Server_Card::setAttribute(CardAttribute attribute, const QString &avalue
             setDoesntUntap(avalue == "1");
             break;
     }
-    if (event)
+    if (event) {
         event->set_attr_value(avalue.toStdString());
+    }
     return avalue;
 }
 
-void Server_Card::setCounter(int _id, int value, Event_SetCardCounter *event)
+bool Server_Card::setCounter(int _id, int value, Event_SetCardCounter *event)
 {
-    if (value)
+    // Clamp to valid card counter range [0, MAX_COUNTER_VALUE]
+    value = qBound(0, value, MAX_COUNTER_VALUE);
+
+    const int oldValue = counters.value(_id, 0);
+    if (value == oldValue) {
+        return false;
+    }
+
+    if (value) {
         counters.insert(_id, value);
-    else
+    } else {
         counters.remove(_id);
+    }
 
     if (event) {
         event->set_counter_id(_id);
         event->set_counter_value(value);
     }
+
+    return true;
+}
+
+bool Server_Card::incrementCounter(int counterId, int delta, Event_SetCardCounter *event)
+{
+    const int oldValue = counters.value(counterId, 0);
+    // Clamp to [0, MAX_COUNTER_VALUE] for card counters
+    const int newValue = addClamped(oldValue, delta, 0, MAX_COUNTER_VALUE);
+
+    if (newValue == oldValue) {
+        return false;
+    }
+
+    if (newValue) {
+        counters.insert(counterId, newValue);
+    } else {
+        counters.remove(counterId);
+    }
+
+    if (event) {
+        event->set_counter_id(counterId);
+        event->set_counter_value(newValue);
+    }
+
+    return true;
 }
 
 void Server_Card::setParentCard(Server_Card *_parentCard)
 {
-    if (parentCard)
+    if (parentCard) {
         parentCard->removeAttachedCard(this);
+    }
     parentCard = _parentCard;
-    if (parentCard)
+    if (parentCard) {
         parentCard->addAttachedCard(this);
+    }
 }
 
 void Server_Card::getInfo(ServerInfo_Card *info)
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 bc326bbc4..cffd9eb40 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_card.h
@@ -22,15 +22,18 @@
 
 #include "server_arrowtarget.h"
 
+#include <QList>
 #include <QMap>
 #include <QString>
-#include <libcockatrice/protocol/pb/card_attributes.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
+#include <QtGlobal>
 #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
 {
@@ -153,7 +156,24 @@ public:
     {
         cardRef = _cardRef;
     }
-    void setCounter(int _id, int value, Event_SetCardCounter *event = nullptr);
+    /**
+     * @brief Sets a card counter to an exact value with clamping.
+     * @param _id The counter ID.
+     * @param value The desired value (clamped to [0, MAX_COUNTER_VALUE]; 0 removes the counter).
+     * @param event Optional event to populate with counter state.
+     * @return true if the value changed, false otherwise.
+     */
+    [[nodiscard]] bool setCounter(int _id, int value, Event_SetCardCounter *event = nullptr);
+    /**
+     * @brief Increments a card counter with overflow-safe arithmetic.
+     * @param counterId The counter ID to modify.
+     * @param delta The amount to add (may be negative for decrement).
+     * @param event Optional event to populate with counter state.
+     * @return true if the value changed, false otherwise.
+     * @note If counter does not exist, starts from 0. Counter is removed if result is 0.
+     * @note Clamps result to [0, MAX_COUNTER_VALUE].
+     */
+    [[nodiscard]] bool incrementCounter(int counterId, int delta, Event_SetCardCounter *event = nullptr);
     void setTapped(bool _tapped)
     {
         tapped = _tapped;
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 68dcadd35..5f40aa480 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.cpp
@@ -19,13 +19,21 @@
  ***************************************************************************/
 #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,
@@ -47,67 +55,74 @@ void Server_CardZone::shuffle(int start, int end)
     cardsBeingLookedAt = 0;
 
     // Size 0 or 1 decks are sorted
-    if (cards.size() < 2)
+    if (cards.size() < 2) {
         return;
+    }
 
     // Negative numbers signify positions starting at the end of the
     // zone convert these to actual indexes.
-    if (end < 0)
+    if (end < 0) {
         end += cards.size();
+    }
 
-    if (start < 0)
+    if (start < 0) {
         start += cards.size();
+    }
 
-    if (start < 0 || end < 0 || start >= cards.size() || end >= cards.size())
+    if (start < 0 || end < 0 || start >= cards.size() || end >= cards.size()) {
         return;
+    }
 
     for (int i = end; i > start; i--) {
         int j = rng->rand(start, i);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0))
         cards.swapItemsAt(j, i);
-#else
-        cards.swap(j, i);
-#endif
     }
     playersWithWritePermission.clear();
 }
 
 void Server_CardZone::removeCardFromCoordMap(Server_Card *card, int oldX, int oldY)
 {
-    if (oldX < 0)
+    if (oldX < 0) {
         return;
+    }
 
     const int baseX = (oldX / 3) * 3;
     QMap<int, Server_Card *> &coordMap = coordinateMap[oldY];
 
-    if (coordMap.contains(baseX) && coordMap.contains(baseX + 1) && coordMap.contains(baseX + 2))
+    if (coordMap.contains(baseX) && coordMap.contains(baseX + 1) && coordMap.contains(baseX + 2)) {
         // If the removal of this card has opened up a previously full pile...
         freePilesMap[oldY].insert(coordMap.value(baseX)->getName(), baseX);
+    }
 
     coordMap.remove(oldX);
 
     if (!(coordMap.contains(baseX) && coordMap.value(baseX)->getName() == card->getName()) &&
         !(coordMap.contains(baseX + 1) && coordMap.value(baseX + 1)->getName() == card->getName()) &&
-        !(coordMap.contains(baseX + 2) && coordMap.value(baseX + 2)->getName() == card->getName()))
+        !(coordMap.contains(baseX + 2) && coordMap.value(baseX + 2)->getName() == card->getName())) {
         // If this card was the last one with this name...
         freePilesMap[oldY].remove(card->getName(), baseX);
+    }
 
     if (!coordMap.contains(baseX) && !coordMap.contains(baseX + 1) && !coordMap.contains(baseX + 2)) {
         // If the removal of this card has freed a whole pile, i.e. it was the last card in it...
-        if (baseX < freeSpaceMap[oldY])
+        if (baseX < freeSpaceMap[oldY]) {
             freeSpaceMap[oldY] = baseX;
+        }
     }
 }
 
 void Server_CardZone::insertCardIntoCoordMap(Server_Card *card, int x, int y)
 {
-    if (x < 0)
+    if (x < 0) {
         return;
+    }
 
     coordinateMap[y].insert(x, card);
     if (!(x % 3)) {
-        if (!card->getFaceDown() && !freePilesMap[y].contains(card->getName(), x) && card->getAttachedCards().isEmpty())
+        if (!card->getFaceDown() && !freePilesMap[y].contains(card->getName(), x) &&
+            card->getAttachedCards().isEmpty()) {
             freePilesMap[y].insert(card->getName(), x);
+        }
         if (freeSpaceMap[y] == x) {
             int nextFreeX = x;
             do {
@@ -150,8 +165,9 @@ Server_Card *Server_CardZone::getCard(int id, int *position, bool remove)
         for (int i = 0; i < cards.size(); ++i) {
             Server_Card *tmp = cards[i];
             if (tmp->getId() == id) {
-                if (position)
+                if (position) {
                     *position = i;
+                }
                 if (remove) {
                     cards.removeAt(i);
                     tmp->setZone(nullptr);
@@ -161,11 +177,13 @@ Server_Card *Server_CardZone::getCard(int id, int *position, bool remove)
         }
         return nullptr;
     } else {
-        if ((id >= cards.size()) || (id < 0))
+        if ((id >= cards.size()) || (id < 0)) {
             return nullptr;
+        }
         Server_Card *tmp = cards[id];
-        if (position)
+        if (position) {
             *position = id;
+        }
         if (remove) {
             cards.removeAt(id);
             tmp->setZone(nullptr);
@@ -188,32 +206,35 @@ int Server_CardZone::getFreeGridColumn(int x, int y, const QString &cardName, bo
 
             if (coordMap.contains(x) && (coordMap[x]->getFaceDown() || !coordMap[x]->getAttachedCards().isEmpty())) {
                 // don't pile up on: 1. facedown cards 2. cards with attached cards
-            } else if (!coordMap.contains(x))
+            } else if (!coordMap.contains(x)) {
                 return x;
-            else if (!coordMap.contains(x + 1))
+            } else if (!coordMap.contains(x + 1)) {
                 return x + 1;
-            else
+            } else {
                 return x + 2;
+            }
         }
     } else if (x >= 0) {
         int resultX = 0;
         x = (x / 3) * 3;
-        if (!coordMap.contains(x))
+        if (!coordMap.contains(x)) {
             resultX = x;
-        else if (!coordMap.value(x)->getAttachedCards().isEmpty()) {
+        } else if (!coordMap.value(x)->getAttachedCards().isEmpty()) {
             resultX = x;
             x = -1;
-        } else if (!coordMap.contains(x + 1))
+        } else if (!coordMap.contains(x + 1)) {
             resultX = x + 1;
-        else if (!coordMap.contains(x + 2))
+        } else if (!coordMap.contains(x + 2)) {
             resultX = x + 2;
-        else {
+        } else {
             resultX = x;
             x = -1;
         }
-        if (x < 0)
-            while (coordMap.contains(resultX))
+        if (x < 0) {
+            while (coordMap.contains(resultX)) {
                 resultX += 3;
+            }
+        }
 
         return resultX;
     }
@@ -223,16 +244,18 @@ int Server_CardZone::getFreeGridColumn(int x, int y, const QString &cardName, bo
 
 bool Server_CardZone::isColumnStacked(int x, int y) const
 {
-    if (!has_coords)
+    if (!has_coords) {
         return false;
+    }
 
     return coordinateMap[y].contains((x / 3) * 3 + 1);
 }
 
 bool Server_CardZone::isColumnEmpty(int x, int y) const
 {
-    if (!has_coords)
+    if (!has_coords) {
         return true;
+    }
 
     return !coordinateMap[y].contains((x / 3) * 3);
 }
@@ -247,12 +270,14 @@ void Server_CardZone::moveCardInRow(GameEventStorage &ges, Server_Card *card, in
 
 void Server_CardZone::fixFreeSpaces(GameEventStorage &ges)
 {
-    if (!has_coords)
+    if (!has_coords) {
         return;
+    }
 
     QSet<QPair<int, int>> placesToLook;
-    for (auto &card : cards)
+    for (auto &card : cards) {
         placesToLook.insert(QPair<int, int>((card->getX() / 3) * 3, card->getY()));
+    }
 
     QSetIterator<QPair<int, int>> placeIterator(placesToLook);
     while (placeIterator.hasNext()) {
@@ -261,26 +286,30 @@ void Server_CardZone::fixFreeSpaces(GameEventStorage &ges)
         int y = foo.second;
 
         if (!coordinateMap[y].contains(baseX)) {
-            if (coordinateMap[y].contains(baseX + 1))
+            if (coordinateMap[y].contains(baseX + 1)) {
                 moveCardInRow(ges, coordinateMap[y].value(baseX + 1), baseX, y);
-            else if (coordinateMap[y].contains(baseX + 2)) {
+            } else if (coordinateMap[y].contains(baseX + 2)) {
                 moveCardInRow(ges, coordinateMap[y].value(baseX + 2), baseX, y);
                 continue;
-            } else
+            } else {
                 continue;
+            }
         }
-        if (!coordinateMap[y].contains(baseX + 1) && coordinateMap[y].contains(baseX + 2))
+        if (!coordinateMap[y].contains(baseX + 1) && coordinateMap[y].contains(baseX + 2)) {
             moveCardInRow(ges, coordinateMap[y].value(baseX + 2), baseX + 1, y);
+        }
     }
 }
 
 void Server_CardZone::updateCardCoordinates(Server_Card *card, int oldX, int oldY)
 {
-    if (!has_coords)
+    if (!has_coords) {
         return;
+    }
 
-    if (oldX != -1)
+    if (oldX != -1) {
         removeCardFromCoordMap(card, oldX, oldY);
+    }
     insertCardIntoCoordMap(card, card->getX(), card->getY());
 }
 
@@ -303,8 +332,9 @@ void Server_CardZone::insertCard(Server_Card *card, int x, int y)
 
 void Server_CardZone::clear()
 {
-    for (auto card : cards)
+    for (auto card : cards) {
         delete card;
+    }
     cards.clear();
     coordinateMap.clear();
     freePilesMap.clear();
@@ -333,7 +363,8 @@ void Server_CardZone::getInfo(ServerInfo_Zone *info, Server_AbstractParticipant
     const bool zonesOthersCanSee = type == ServerInfo_Zone::PublicZone;
     if ((selfPlayerAsking && zonesSelfCanSee) || (otherPlayerAsking && zonesOthersCanSee)) {
         QListIterator<Server_Card *> cardIterator(cards);
-        while (cardIterator.hasNext())
+        while (cardIterator.hasNext()) {
             cardIterator.next()->getInfo(info->add_card_list());
+        }
     }
 }
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 77fea54ca..9ed39a159 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_cardzone.h
@@ -20,15 +20,16 @@
 #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 b18e11c2b..f3dcb0fb1 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.cpp
@@ -1,6 +1,9 @@
 #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_counter.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.h
index 55aad991c..ca093b7cf 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_counter.h
@@ -22,9 +22,23 @@
 
 #include <QString>
 #include <libcockatrice/protocol/pb/color.pb.h>
+#include <libcockatrice/utility/clamped_arithmetic.h>
+#include <limits>
 
 class ServerInfo_Counter;
 
+/**
+ * @class Server_Counter
+ * @brief Represents a player counter with overflow-safe increment arithmetic.
+ *
+ * All value modifications return whether the value actually changed,
+ * enabling callers to skip unnecessary network events.
+ *
+ * @note Direct assignment via setCount() does not clamp; only
+ *       incrementCount() enforces int boundary saturation.
+ * @note Unlike card counters, player counters are never auto-removed
+ *       when they reach zero - they persist with value 0.
+ */
 class Server_Counter
 {
 protected:
@@ -59,11 +73,38 @@ public:
     {
         return count;
     }
-    void setCount(int _count)
+
+    /**
+     * @brief Sets the counter to an exact value.
+     * @param _count The new value (assigned directly without clamping).
+     * @return true if the value changed, false otherwise.
+     * @warning This performs raw assignment. For overflow-safe incrementing,
+     *          use incrementCount().
+     */
+    [[nodiscard]] bool setCount(int _count)
     {
+        const int oldCount = count;
         count = _count;
+        return count != oldCount;
     }
 
+    /**
+     * @brief Increments the counter by delta with overflow-safe arithmetic.
+     * @param delta The amount to add (may be negative for decrement).
+     * @return true if the value changed, false otherwise.
+     * @note Clamps result to [INT_MIN, INT_MAX] to prevent overflow.
+     */
+    [[nodiscard]] bool incrementCount(int delta)
+    {
+        const int oldCount = count;
+        count = addClamped(count, delta, std::numeric_limits<int>::min(), std::numeric_limits<int>::max());
+        return count != oldCount;
+    }
+
+    /**
+     * @brief Populates info with this counter's current state for network serialization.
+     * @param info The protobuf message to populate.
+     */
     void getInfo(ServerInfo_Counter *info);
 };
 
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_deck_validation_strategy.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_deck_validation_strategy.h
new file mode 100644
index 000000000..8298214b4
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_deck_validation_strategy.h
@@ -0,0 +1,45 @@
+#ifndef SERVER_DECK_VALIDATION_STRATEGY_H
+#define SERVER_DECK_VALIDATION_STRATEGY_H
+
+#include <libcockatrice/protocol/pb/response.pb.h>
+
+class DeckList;
+class Server_Game;
+class Server_Player;
+class ResponseContainer;
+
+/**
+ * @brief Strategy for validating a player's deck before it is loaded into a game.
+ *
+ * Subclasses decide whether a deck may be accepted; the default implementation
+ * accepts every deck.
+ */
+class Server_DeckValidationStrategy
+{
+public:
+    virtual ~Server_DeckValidationStrategy() = default;
+
+    /**
+     * @brief Validate @p deck for @p player in @p game.
+     *
+     * @p rc is an out parameter used to attach the response details for a rejected
+     * deck (e.g. an error response extension via ResponseContainer::setResponseExtension).
+     * @return Response::RespOk when the deck is accepted, an error code otherwise.
+     */
+    virtual Response::ResponseCode
+    validate(Server_Game *game, Server_Player *player, DeckList *deck, ResponseContainer &rc) = 0;
+};
+
+/**
+ * @brief Default deck validation strategy that accepts every deck.
+ */
+class Server_DefaultDeckValidationStrategy : public Server_DeckValidationStrategy
+{
+public:
+    Response::ResponseCode validate(Server_Game *, Server_Player *, DeckList *, ResponseContainer &) override
+    {
+        return Response::RespOk;
+    }
+};
+
+#endif
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 5ec7b3c5d..b1863c91e 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp
@@ -23,18 +23,46 @@
 #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_connection_state_changed.pb.h>
+#include <libcockatrice/protocol/pb/context_deck_select.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>
@@ -49,39 +77,27 @@
 #include <libcockatrice/protocol/pb/event_set_active_phase.pb.h>
 #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 ServerInfo_User &_creatorInfo,
-                         int _gameId,
-                         const QString &_description,
-                         const QString &_password,
-                         int _maxPlayers,
-                         const QList<int> &_gameTypes,
-                         bool _onlyBuddies,
-                         bool _onlyRegistered,
-                         bool _spectatorsAllowed,
-                         bool _spectatorsNeedPassword,
-                         bool _spectatorsCanTalk,
-                         bool _spectatorsSeeEverything,
-                         int _startingLifeTotal,
-                         bool _shareDecklistsOnLoad,
-                         Server_Room *_room)
-    : QObject(), room(_room), nextPlayerId(0), hostId(0), creatorInfo(new ServerInfo_User(_creatorInfo)),
-      gameStarted(false), gameClosed(false), gameId(_gameId), password(_password), maxPlayers(_maxPlayers),
-      gameTypes(_gameTypes), activePlayer(-1), activePhase(-1), onlyBuddies(_onlyBuddies),
-      onlyRegistered(_onlyRegistered), spectatorsAllowed(_spectatorsAllowed),
-      spectatorsNeedPassword(_spectatorsNeedPassword), spectatorsCanTalk(_spectatorsCanTalk),
-      spectatorsSeeEverything(_spectatorsSeeEverything), startingLifeTotal(_startingLifeTotal),
-      shareDecklistsOnLoad(_shareDecklistsOnLoad), inactivityCounter(0), startTimeOfThisGame(0), secondsElapsed(0),
-      firstGameStarted(false), turnOrderReversed(false), startTime(QDateTime::currentDateTime()), pingClock(nullptr),
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+Server_Game::Server_Game(const GameConfig &config, Server_Room *_room)
+    : QObject(), room(_room), nextPlayerId(0), hostId(0), creatorInfo(new ServerInfo_User(config.creatorInfo)),
+      gameStarted(false), gameClosed(false), gameId(config.gameId), description(config.description.simplified()),
+      password(config.password), maxPlayers(config.maxPlayers), gameTypes(config.gameTypes), activePlayer(-1),
+      activePhase(-1), onlyBuddies(config.onlyBuddies), onlyRegistered(config.onlyRegistered),
+      spectatorsAllowed(config.spectatorsAllowed), spectatorsNeedPassword(config.spectatorsNeedPassword),
+      spectatorsCanTalk(config.spectatorsCanTalk), spectatorsSeeEverything(config.spectatorsSeeEverything),
+      startingLifeTotal(config.startingLifeTotal), shareDecklistsOnLoad(config.shareDecklistsOnLoad),
+      inactivityCounter(0), startTimeOfThisGame(0), secondsElapsed(0), firstGameStarted(false),
+      turnOrderReversed(false), startTime(QDateTime::currentDateTime()), pingClock(nullptr),
+      deckValidationStrategy(new Server_DefaultDeckValidationStrategy),
+      lifecycleStrategy(new Server_DefaultLifecycleStrategy), matchResultStrategy(new Server_NullMatchResultStrategy),
       gameMutex()
-#else
-      gameMutex(QMutex::Recursive)
-#endif
 {
     currentReplay = new GameReplay;
     currentReplay->set_replay_id(room->getServer()->getDatabaseInterface()->getNextReplayId());
-    description = _description.simplified();
 
     connect(this, &Server_Game::sigStartGameIfReady, this, &Server_Game::doStartGameIfReady, Qt::QueuedConnection);
 
@@ -148,8 +164,9 @@ void Server_Game::storeGameInformation()
 
     const QStringList &allGameTypes = room->getGameTypes();
     QStringList _gameTypes;
-    for (int i = gameInfo.game_types_size() - 1; i >= 0; --i)
+    for (int i = gameInfo.game_types_size() - 1; i >= 0; --i) {
         _gameTypes.append(allGameTypes[gameInfo.game_types(i)]);
+    }
 
     for (const auto &playerName : allPlayersEver) {
         replayMatchInfo->add_player_names(playerName.toStdString());
@@ -167,8 +184,9 @@ void Server_Game::storeGameInformation()
     server->clientsLock.lockForRead();
     for (auto userName : allPlayersEver + allSpectatorsEver) {
         Server_AbstractUserInterface *userHandler = server->findUser(userName);
-        if (userHandler && server->getStoreReplaysEnabled())
+        if (userHandler && server->getStoreReplaysEnabled()) {
             userHandler->sendProtocolItem(*sessionEvent);
+        }
     }
     server->clientsLock.unlock();
     delete sessionEvent;
@@ -190,10 +208,11 @@ void Server_Game::pingClockTimeout()
     bool allPlayersInactive = true;
     int playerCount = 0;
     for (auto *participant : participants) {
-        if (participant == nullptr)
+        if (participant == nullptr) {
             continue;
+        }
 
-        if (!participant->getSpectator()) {
+        if (!participant->isSpectator()) {
             ++playerCount;
         }
 
@@ -204,7 +223,7 @@ void Server_Game::pingClockTimeout()
         }
 
         if ((participant->getPingTime() != -1) &&
-            (!participant->getSpectator() || participant->getPlayerId() == hostId)) {
+            (!participant->isSpectator() || participant->getPlayerId() == hostId)) {
             allPlayersInactive = false;
         }
     }
@@ -226,7 +245,7 @@ QMap<int, Server_AbstractPlayer *> Server_Game::getPlayers() const // copies poi
     QMutexLocker locker(&gameMutex);
     for (int id : participants.keys()) {
         auto *participant = participants[id];
-        if (!participant->getSpectator()) {
+        if (!participant->isSpectator()) {
             players[id] = static_cast<Server_AbstractPlayer *>(participant);
         }
     }
@@ -236,7 +255,7 @@ QMap<int, Server_AbstractPlayer *> Server_Game::getPlayers() const // copies poi
 Server_AbstractPlayer *Server_Game::getPlayer(int id) const
 {
     auto *participant = participants.value(id);
-    if (!participant->getSpectator()) {
+    if (participant && !participant->isSpectator()) {
         return static_cast<Server_AbstractPlayer *>(participant);
     } else {
         return nullptr;
@@ -248,14 +267,26 @@ int Server_Game::getPlayerCount() const
     return participants.size() - getSpectatorCount();
 }
 
+int Server_Game::getCardsInGame() const
+{
+    QMutexLocker locker(&gameMutex);
+
+    int result = 0;
+    for (auto *player : getPlayers()) {
+        result += player->getCardCount();
+    }
+    return result;
+}
+
 int Server_Game::getSpectatorCount() const
 {
     QMutexLocker locker(&gameMutex);
 
     int result = 0;
     for (Server_AbstractParticipant *participant : participants.values()) {
-        if (participant->getSpectator())
+        if (participant->isSpectator()) {
             ++result;
+        }
     }
     return result;
 }
@@ -270,8 +301,9 @@ void Server_Game::createGameStateChangedEvent(Event_GameStateChanged *event,
         event->set_game_started(true);
         event->set_active_player_id(0);
         event->set_active_phase(0);
-    } else
+    } else {
         event->set_game_started(false);
+    }
 
     for (Server_AbstractParticipant *participant : participants.values()) {
         participant->getInfo(event->add_player_list(), recipient, omniscient, withUserInfo);
@@ -299,15 +331,15 @@ void Server_Game::sendGameStateToPlayers()
     // send game state info to clients according to their role in the game
     for (auto *participant : participants.values()) {
         GameEventContainer *gec;
-        if (participant->getSpectator()) {
-            if (spectatorsSeeEverything || participant->getJudge()) {
+        if (participant->isSpectator()) {
+            if (spectatorsSeeEverything || participant->isJudge()) {
                 gec = prepareGameEvent(omniscientEvent, -1);
             } else {
                 gec = prepareGameEvent(spectatorNormalEvent, -1);
             }
         } else {
             Event_GameStateChanged event;
-            createGameStateChangedEvent(&event, participant, false, false);
+            createGameStateChangedEvent(&event, participant, participant->isJudge(), false);
 
             gec = prepareGameEvent(event, -1);
         }
@@ -330,7 +362,7 @@ void Server_Game::doStartGameIfReady(bool forceStartGame)
         if (!player->getReadyStart()) {
             if (forceStartGame) {
                 // Player is not ready to start, so kick them
-                // TODO: Move them to Spectators instead
+                //! \todo Move them to Spectators instead.
                 kickParticipant(player->getPlayerId());
             } else {
                 return;
@@ -338,7 +370,15 @@ void Server_Game::doStartGameIfReady(bool forceStartGame)
         }
     }
 
+    // Only actual starts are timed. The early returns above are no-ops.
+    QElapsedTimer startupTimer;
+    startupTimer.start();
     players = getPlayers(); // players could have been kicked, get new list of players
+    if (lifecycleStrategy->onGameStarting(this) == Server_GameLifecycleStrategy::StartAction::Handled) {
+        locker.unlock();
+        return;
+    }
+
     for (Server_AbstractPlayer *player : players.values()) {
         player->setupZones();
     }
@@ -368,13 +408,15 @@ void Server_Game::doStartGameIfReady(bool forceStartGame)
         delete replayCont;
 
         startTimeOfThisGame = secondsElapsed;
-    } else
+    } else {
         firstGameStarted = true;
+    }
 
     sendGameStateToPlayers();
 
     activePlayer = -1;
     nextTurn();
+    room->getServer()->observeGameStartDurationMs(startupTimer.nsecsElapsed() / 1000000);
 
     locker.unlock();
 
@@ -395,13 +437,17 @@ void Server_Game::stopGameIfFinished()
     QMutexLocker locker(&gameMutex);
 
     int playing = 0;
+    Server_AbstractPlayer *lastPlayer = nullptr;
     auto players = getPlayers();
     for (auto *player : players.values()) {
-        if (!player->getConceded())
+        if (!player->getConceded()) {
             ++playing;
+            lastPlayer = player;
+        }
     }
-    if (playing > 1)
+    if (playing > 1) {
         return;
+    }
 
     gameStarted = false;
 
@@ -412,6 +458,16 @@ void Server_Game::stopGameIfFinished()
 
     sendGameStateToPlayers();
 
+    bool matchDecided = matchResultStrategy->onGameFinished(this, playing, lastPlayer);
+    if (matchDecided) {
+        locker.unlock();
+
+        sendGameEventContainer(prepareGameEvent(Event_GameClosed(), -1));
+        gameClosed = true;
+        deleteLater();
+        return;
+    }
+
     locker.unlock();
 
     ServerInfo_Game gameInfo;
@@ -429,32 +485,40 @@ Response::ResponseCode Server_Game::checkJoin(ServerInfo_User *user,
 {
     Server_DatabaseInterface *databaseInterface = room->getServer()->getDatabaseInterface();
     for (auto *participant : participants.values()) {
-        if (participant->getUserInfo()->name() == user->name())
+        if (participant->getUserInfo()->name() == user->name()) {
             return Response::RespContextError;
+        }
     }
 
     if (asJudge && !(user->user_level() & ServerInfo_User::IsJudge)) {
         return Response::RespUserLevelTooLow;
     }
-    if (!(overrideRestrictions && (user->user_level() & ServerInfo_User::IsModerator))) {
-        if ((_password != password) && !(spectator && !spectatorsNeedPassword))
+    if (!(overrideRestrictions && (user->user_level() & (ServerInfo_User::IsModerator | ServerInfo_User::IsJudge)))) {
+        if ((_password != password) && !(spectator && !spectatorsNeedPassword)) {
             return Response::RespWrongPassword;
-        if (!(user->user_level() & ServerInfo_User::IsRegistered) && onlyRegistered)
+        }
+        if (!(user->user_level() & ServerInfo_User::IsRegistered) && onlyRegistered) {
             return Response::RespUserLevelTooLow;
-        if (onlyBuddies && (user->name() != creatorInfo->name()))
+        }
+        if (onlyBuddies && (user->name() != creatorInfo->name())) {
             if (!databaseInterface->isInBuddyList(QString::fromStdString(creatorInfo->name()),
-                                                  QString::fromStdString(user->name())))
+                                                  QString::fromStdString(user->name()))) {
                 return Response::RespOnlyBuddies;
+            }
+        }
         if (databaseInterface->isInIgnoreList(QString::fromStdString(creatorInfo->name()),
-                                              QString::fromStdString(user->name())))
+                                              QString::fromStdString(user->name()))) {
             return Response::RespInIgnoreList;
+        }
         if (spectator) {
-            if (!spectatorsAllowed)
+            if (!spectatorsAllowed) {
                 return Response::RespSpectatorsNotAllowed;
+            }
         }
     }
-    if (!spectator && (gameStarted || (getPlayerCount() >= getMaxPlayers())))
+    if (!spectator && (gameStarted || (getPlayerCount() >= getMaxPlayers()))) {
         return Response::RespGameFull;
+    }
 
     return Response::RespOk;
 }
@@ -464,8 +528,9 @@ bool Server_Game::containsUser(const QString &userName) const
     QMutexLocker locker(&gameMutex);
 
     for (auto *participant : participants.values()) {
-        if (participant->getUserInfo()->name() == userName.toStdString())
+        if (participant->getUserInfo()->name() == userName.toStdString()) {
             return true;
+        }
     }
     return false;
 }
@@ -501,7 +566,7 @@ void Server_Game::addPlayer(Server_AbstractUserInterface *userInterface,
         allPlayersEver.insert(playerName);
 
         // if the original creator of the game joins, give them host status back
-        // FIXME: transferring host to spectators has side effects
+        //! \todo Transferring host to spectators has side effects.
         if (newParticipant->getUserInfo()->name() == creatorInfo->name()) {
             hostId = newParticipant->getPlayerId();
             sendGameEventContainer(prepareGameEvent(Event_GameHostChanged(), hostId));
@@ -510,15 +575,13 @@ void Server_Game::addPlayer(Server_AbstractUserInterface *userInterface,
 
     if (broadcastUpdate) {
         ServerInfo_Game gameInfo;
-        gameInfo.set_room_id(room->getId());
-        gameInfo.set_game_id(gameId);
-        gameInfo.set_player_count(getPlayerCount());
-        gameInfo.set_spectators_count(getSpectatorCount());
+        getInfo(gameInfo);
         emit gameInfoChanged(gameInfo);
     }
 
-    if ((newParticipant->getUserInfo()->user_level() & ServerInfo_User::IsRegistered) && !spectator)
+    if ((newParticipant->getUserInfo()->user_level() & ServerInfo_User::IsRegistered) && !spectator) {
         room->getServer()->addPersistentPlayer(playerName, room->getId(), gameId, newParticipant->getPlayerId());
+    }
 
     userInterface->playerAddedToGame(gameId, room->getId(), newParticipant->getPlayerId());
 
@@ -531,7 +594,7 @@ void Server_Game::removeParticipant(Server_AbstractParticipant *participant, Eve
                                               gameId, participant->getPlayerId());
     participants.remove(participant->getPlayerId());
 
-    bool spectator = participant->getSpectator();
+    bool spectator = participant->isSpectator();
     GameEventStorage ges;
     if (!spectator) {
         auto *player = static_cast<Server_AbstractPlayer *>(participant);
@@ -565,15 +628,13 @@ void Server_Game::removeParticipant(Server_AbstractParticipant *participant, Eve
     }
     if (!spectator) {
         stopGameIfFinished();
-        if (gameStarted && playerActive)
+        if (gameStarted && playerActive) {
             nextTurn();
+        }
     }
 
     ServerInfo_Game gameInfo;
-    gameInfo.set_room_id(room->getId());
-    gameInfo.set_game_id(gameId);
-    gameInfo.set_player_count(getPlayerCount());
-    gameInfo.set_spectators_count(getSpectatorCount());
+    getInfo(gameInfo);
     emit gameInfoChanged(gameInfo);
 }
 
@@ -589,15 +650,18 @@ void Server_Game::removeArrowsRelatedToPlayer(GameEventStorage &ges, Server_Abst
         for (auto *arrow : anyPlayer->getArrows().values()) {
             auto *targetCard = qobject_cast<Server_Card *>(arrow->getTargetItem());
             if (targetCard) {
-                if (targetCard->getZone() != nullptr && targetCard->getZone()->getPlayer() == player)
+                if (targetCard->getZone() != nullptr && targetCard->getZone()->getPlayer() == player) {
                     toDelete.append(arrow);
+                }
             } else if (arrow->getTargetItem() == player) {
                 toDelete.append(arrow);
             }
 
             // Don't use else here! It has to happen regardless of whether targetCard == 0.
-            if (arrow->getStartCard()->getZone() != nullptr && arrow->getStartCard()->getZone()->getPlayer() == player)
+            if (arrow->getStartCard()->getZone() != nullptr &&
+                arrow->getStartCard()->getZone()->getPlayer() == player) {
                 toDelete.append(arrow);
+            }
         }
         for (auto *arrow : toDelete) {
             Event_DeleteArrow event;
@@ -636,8 +700,9 @@ bool Server_Game::kickParticipant(int playerId)
     QMutexLocker locker(&gameMutex);
 
     auto *participant = participants.value(playerId);
-    if (!participant)
+    if (!participant) {
         return false;
+    }
 
     GameEventContainer *gec = prepareGameEvent(Event_Kicked(), -1);
     participant->sendGameEvent(*gec);
@@ -675,6 +740,11 @@ void Server_Game::setActivePhase(int newPhase)
     sendGameEventContainer(prepareGameEvent(event, -1));
 }
 
+qint64 Server_Game::generateArrowId()
+{
+    return nextArrowId++;
+}
+
 void Server_Game::removeArrows(int newPhase, bool force)
 {
     QMutexLocker locker(&gameMutex);
@@ -732,8 +802,8 @@ void Server_Game::createGameJoinedEvent(Server_AbstractParticipant *joiningParti
     getInfo(*event1.mutable_game_info());
     event1.set_host_id(hostId);
     event1.set_player_id(joiningParticipant->getPlayerId());
-    event1.set_spectator(joiningParticipant->getSpectator());
-    event1.set_judge(joiningParticipant->getJudge());
+    event1.set_spectator(joiningParticipant->isSpectator());
+    event1.set_judge(joiningParticipant->isJudge());
     event1.set_resuming(resuming);
     if (resuming) {
         const QStringList &allGameTypes = room->getGameTypes();
@@ -751,12 +821,54 @@ void Server_Game::createGameJoinedEvent(Server_AbstractParticipant *joiningParti
     event2.set_active_player_id(activePlayer);
     event2.set_active_phase(activePhase);
 
-    bool omniscient = joiningParticipant->getSpectator() && (spectatorsSeeEverything || joiningParticipant->getJudge());
+    bool omniscient = (joiningParticipant->isSpectator() && spectatorsSeeEverything) || joiningParticipant->isJudge();
     for (auto *participant : participants.values()) {
         participant->getInfo(event2.add_player_list(), joiningParticipant, omniscient, true);
     }
 
     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,
@@ -767,12 +879,12 @@ void Server_Game::sendGameEventContainer(GameEventContainer *cont,
 
     cont->set_game_id(gameId);
     for (auto *participant : participants.values()) {
-        const bool playerPrivate =
-            (participant->getPlayerId() == privatePlayerId) ||
-            (participant->getSpectator() && (spectatorsSeeEverything || participant->getJudge()));
+        const bool playerPrivate = (participant->getPlayerId() == privatePlayerId) || participant->isJudge() ||
+                                   (participant->isSpectator() && spectatorsSeeEverything);
         if ((recipients.testFlag(GameEventStorageItem::SendToPrivate) && playerPrivate) ||
-            (recipients.testFlag(GameEventStorageItem::SendToOthers) && !playerPrivate))
+            (recipients.testFlag(GameEventStorageItem::SendToOthers) && !playerPrivate)) {
             participant->sendGameEvent(*cont);
+        }
     }
     if (recipients.testFlag(GameEventStorageItem::SendToPrivate)) {
         cont->set_seconds_elapsed(secondsElapsed - startTimeOfThisGame);
@@ -788,11 +900,13 @@ Server_Game::prepareGameEvent(const ::google::protobuf::Message &gameEvent, int
 {
     auto *cont = new GameEventContainer;
     cont->set_game_id(gameId);
-    if (context)
+    if (context) {
         cont->mutable_context()->CopyFrom(*context);
+    }
     GameEvent *event = cont->add_event_list();
-    if (playerId != -1)
+    if (playerId != -1) {
         event->set_player_id(playerId);
+    }
     event->GetReflection()
         ->MutableMessage(event, gameEvent.GetDescriptor()->FindExtensionByName("ext"))
         ->CopyFrom(gameEvent);
@@ -818,6 +932,12 @@ void Server_Game::getInfo(ServerInfo_Game &result) const
         result.set_player_count(getPlayerCount());
         result.set_started(gameStarted);
         result.mutable_creator_info()->CopyFrom(*getCreatorInfo());
+        const Server_AbstractParticipant *host = participants.value(hostId, nullptr);
+        if (host != nullptr) {
+            host->copyUserInfo(*result.mutable_host_info(), false);
+        } else {
+            result.mutable_host_info()->CopyFrom(*getCreatorInfo());
+        }
         result.set_only_buddies(onlyBuddies);
         result.set_only_registered(onlyRegistered);
         result.set_spectators_allowed(getSpectatorsAllowed());
@@ -829,3 +949,51 @@ void Server_Game::getInfo(ServerInfo_Game &result) const
         result.set_start_time(startTime.toSecsSinceEpoch());
     }
 }
+
+void Server_Game::returnCardsFromPlayer(GameEventStorage &ges, Server_AbstractPlayer *player)
+{
+    QMutexLocker locker(&gameMutex);
+    // Return cards to their rightful owners before conceding the game
+    static const QRegularExpression ownerRegex{"Owner: ?([^\n]+)"};
+    const auto &playerTable = player->getZones().value(ZoneNames::TABLE);
+    for (const auto &card : playerTable->getCards()) {
+        if (card == nullptr) {
+            continue;
+        }
+
+        const auto &regexResult = ownerRegex.match(card->getAnnotation());
+        if (!regexResult.hasMatch()) {
+            continue;
+        }
+
+        CardToMove cardToMove;
+        cardToMove.set_card_id(card->getId());
+
+        for (const auto *otherPlayer : getPlayers()) {
+            if (otherPlayer == nullptr || otherPlayer->getUserInfo() == nullptr) {
+                continue;
+            }
+
+            const auto &ownerToReturnTo = regexResult.captured(1);
+            const auto &correctOwner = QString::compare(QString::fromStdString(otherPlayer->getUserInfo()->name()),
+                                                        ownerToReturnTo, Qt::CaseInsensitive) == 0;
+            if (!correctOwner) {
+                continue;
+            }
+
+            const auto &targetZone = otherPlayer->getZones().value(ZoneNames::TABLE);
+
+            if (playerTable == nullptr || targetZone == nullptr) {
+                continue;
+            }
+
+            player->moveCard(ges, playerTable, QList<const CardToMove *>() << &cardToMove, targetZone, 0, 0, false);
+            break;
+        }
+    }
+}
+
+void Server_Game::setDeckValidationStrategy(Server_DeckValidationStrategy *strategy)
+{
+    deckValidationStrategy.reset(strategy);
+}
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 033542fad..c7f8d0929 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h
@@ -21,16 +21,25 @@
 #define SERVERGAME_H
 
 #include "../server_response_containers.h"
+#include "libcockatrice/protocol/pb/game_event_context.pb.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 <QStringList>
+#include <QString>
+#include <QtGlobal>
+#include <atomic>
 #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;
@@ -42,6 +51,17 @@ 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
 {
@@ -49,6 +69,7 @@ class Server_Game : public QObject
 private:
     Server_Room *room;
     int nextPlayerId;
+    std::atomic<qint64> nextArrowId = 1;
     int hostId;
     ServerInfo_User *creatorInfo;
     QMap<int, Server_AbstractParticipant *> participants;
@@ -77,6 +98,12 @@ private:
     QList<GameReplay *> replayList;
     GameReplay *currentReplay;
 
+    QScopedPointer<Server_DeckValidationStrategy> deckValidationStrategy;
+
+    QScopedPointer<Server_GameLifecycleStrategy> lifecycleStrategy;
+
+    QScopedPointer<Server_MatchResultStrategy> matchResultStrategy;
+
     void createGameStateChangedEvent(Event_GameStateChanged *event,
                                      Server_AbstractParticipant *recipient,
                                      bool omniscient,
@@ -90,26 +117,8 @@ private slots:
     void doStartGameIfReady(bool forceStartGame = false);
 
 public:
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     mutable QRecursiveMutex gameMutex;
-#else
-    mutable QMutex gameMutex;
-#endif
-    Server_Game(const ServerInfo_User &_creatorInfo,
-                int _gameId,
-                const QString &_description,
-                const QString &_password,
-                int _maxPlayers,
-                const QList<int> &_gameTypes,
-                bool _onlyBuddies,
-                bool _onlyRegistered,
-                bool _spectatorsAllowed,
-                bool _spectatorsNeedPassword,
-                bool _spectatorsCanTalk,
-                bool _spectatorsSeeEverything,
-                int _startingLifeTotal,
-                bool _shareDecklistsOnLoad,
-                Server_Room *parent);
+    Server_Game(const GameConfig &config, Server_Room *parent);
     ~Server_Game() override;
     Server_Room *getRoom() const
     {
@@ -129,6 +138,8 @@ public:
         return gameStarted;
     }
     int getPlayerCount() const;
+    /// Total cards across all players' zones. Takes gameMutex itself.
+    int getCardsInGame() const;
     int getSpectatorCount() const;
     QMap<int, Server_AbstractPlayer *> getPlayers() const;
     Server_AbstractPlayer *getPlayer(int id) const;
@@ -200,6 +211,7 @@ public:
     }
     void setActivePlayer(int newPlayer);
     void setActivePhase(int newPhase);
+    qint64 generateArrowId();
     void removeArrows(int newPhase, bool force = false);
     void nextTurn();
     int getSecondsElapsed() const
@@ -222,6 +234,21 @@ public:
                                 GameEventStorageItem::EventRecipients recipients = GameEventStorageItem::SendToPrivate |
                                                                                    GameEventStorageItem::SendToOthers,
                                 int privatePlayerId = -1);
+    void returnCardsFromPlayer(GameEventStorage &ges, Server_AbstractPlayer *player);
+
+    /** @brief Get the current deck validation strategy (non-owning). */
+    Server_DeckValidationStrategy *getDeckValidationStrategy() const
+    {
+        return deckValidationStrategy.data();
+    }
+    /** @brief Replace the deck validation strategy; takes ownership of @p strategy. */
+    void setDeckValidationStrategy(Server_DeckValidationStrategy *strategy);
+
+    /** @brief Get the current game lifecycle strategy (non-owning). */
+    Server_GameLifecycleStrategy *getLifecycleStrategy() const
+    {
+        return lifecycleStrategy.data();
+    }
 };
 
 #endif
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game_lifecycle_strategy.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game_lifecycle_strategy.h
new file mode 100644
index 000000000..b71ce486d
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game_lifecycle_strategy.h
@@ -0,0 +1,43 @@
+#ifndef SERVER_GAME_LIFECYCLE_STRATEGY_H
+#define SERVER_GAME_LIFECYCLE_STRATEGY_H
+
+class Server_Game;
+
+/**
+ * @brief Strategy hook invoked around a game's lifecycle transitions.
+ *
+ * Subclasses can intercept the game start to perform custom setup (e.g. draft or
+ * tournament initialization); the default implementation never intercepts.
+ */
+class Server_GameLifecycleStrategy
+{
+public:
+    virtual ~Server_GameLifecycleStrategy() = default;
+
+    /** @brief How the game start should proceed after this hook returns. */
+    enum class StartAction
+    {
+        ProceedNormal, ///< Continue with the normal game start flow.
+        Handled,       ///< The strategy handled the start; abort the normal flow.
+    };
+
+    /**
+     * @brief Called when a game is about to start.
+     * @return How the start flow should proceed.
+     */
+    virtual StartAction onGameStarting(Server_Game *game) = 0;
+};
+
+/**
+ * @brief Default lifecycle strategy that never intercepts the game start.
+ */
+class Server_DefaultLifecycleStrategy : public Server_GameLifecycleStrategy
+{
+public:
+    StartAction onGameStarting(Server_Game *) override
+    {
+        return StartAction::ProceedNormal;
+    }
+};
+
+#endif
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_match_game_factory.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_match_game_factory.h
new file mode 100644
index 000000000..d5cf81cb6
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_match_game_factory.h
@@ -0,0 +1,29 @@
+#ifndef SERVER_MATCH_GAME_FACTORY_H
+#define SERVER_MATCH_GAME_FACTORY_H
+
+#include <QString>
+
+class GameConfig;
+class Server_Game;
+class Server_AbstractUserInterface;
+
+/**
+ * @brief Abstract factory for creating match games, forward-looking for tournament modes.
+ *
+ * Implementations own the rules of how a match game is constructed, how player
+ * interfaces are resolved, and how games are registered with a room.
+ */
+class Server_MatchGameFactory
+{
+public:
+    virtual ~Server_MatchGameFactory() = default;
+
+    /** @brief Create a match game from @p config, storing the assigned game id in @p outGameId. */
+    virtual Server_Game *createMatchGame(const GameConfig &config, int &outGameId) = 0;
+    /** @brief Resolve the user interface for @p playerName. */
+    virtual Server_AbstractUserInterface *getUserInterface(const QString &playerName) = 0;
+    /** @brief Register @p game with the room that owns it. */
+    virtual void addGameToRoom(Server_Game *game) = 0;
+};
+
+#endif
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_match_result_strategy.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_match_result_strategy.h
new file mode 100644
index 000000000..51c696db1
--- /dev/null
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_match_result_strategy.h
@@ -0,0 +1,38 @@
+#ifndef SERVER_MATCH_RESULT_STRATEGY_H
+#define SERVER_MATCH_RESULT_STRATEGY_H
+
+class Server_AbstractPlayer;
+class Server_Game;
+
+/**
+ * @brief Strategy hook invoked when a game has finished to decide the match result.
+ *
+ * Subclasses can report the match outcome (e.g. to a tournament backend) and decide
+ * whether the game should be closed permanently; the default implementation never
+ * closes the game, preserving the normal return-to-lobby behavior.
+ */
+class Server_MatchResultStrategy
+{
+public:
+    virtual ~Server_MatchResultStrategy() = default;
+
+    /**
+     * @brief Called when a game has finished.
+     * @return Whether the game has been decided and should be closed.
+     */
+    virtual bool onGameFinished(Server_Game *game, int playing, Server_AbstractPlayer *lastPlayer) = 0;
+};
+
+/**
+ * @brief Default match result strategy that never closes the game.
+ */
+class Server_NullMatchResultStrategy : public Server_MatchResultStrategy
+{
+public:
+    bool onGameFinished(Server_Game *, int, Server_AbstractPlayer *) override
+    {
+        return false;
+    }
+};
+
+#endif
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 8190155e9..a4c904c01 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
@@ -1,23 +1,34 @@
 #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 <QDebug>
-#include <QRegularExpression>
-#include <algorithm>
+#include <QMapIterator>
+#include <QSet>
+#include <QSharedPointer>
+#include <QString>
+#include <QtGlobal>
+#include <google/protobuf/stubs/port.h>
 #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>
@@ -27,6 +38,7 @@
 #include <libcockatrice/protocol/pb/command_mulligan.pb.h>
 #include <libcockatrice/protocol/pb/command_set_active_phase.pb.h>
 #include <libcockatrice/protocol/pb/command_set_counter.pb.h>
+#include <libcockatrice/protocol/pb/command_set_playmat.pb.h>
 #include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>
 #include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
 #include <libcockatrice/protocol/pb/command_shuffle.pb.h>
@@ -36,17 +48,21 @@
 #include <libcockatrice/protocol/pb/event_create_counter.pb.h>
 #include <libcockatrice/protocol/pb/event_del_counter.pb.h>
 #include <libcockatrice/protocol/pb/event_draw_cards.pb.h>
+#include <libcockatrice/protocol/pb/event_game_log_notice.pb.h>
 #include <libcockatrice/protocol/pb/event_player_properties_changed.pb.h>
 #include <libcockatrice/protocol/pb/event_set_counter.pb.h>
 #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/trice_limits.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,
@@ -80,15 +96,15 @@ void Server_Player::setupZones()
     // ------------------------------------------------------------------
 
     // Create zones
-    auto *deckZone = new Server_CardZone(this, "deck", false, ServerInfo_Zone::HiddenZone);
+    auto *deckZone = new Server_CardZone(this, ZoneNames::DECK, false, ServerInfo_Zone::HiddenZone);
     addZone(deckZone);
-    auto *sbZone = new Server_CardZone(this, "sb", false, ServerInfo_Zone::HiddenZone);
+    auto *sbZone = new Server_CardZone(this, ZoneNames::SIDEBOARD, false, ServerInfo_Zone::HiddenZone);
     addZone(sbZone);
-    addZone(new Server_CardZone(this, "table", true, ServerInfo_Zone::PublicZone));
-    addZone(new Server_CardZone(this, "hand", false, ServerInfo_Zone::PrivateZone));
-    addZone(new Server_CardZone(this, "stack", false, ServerInfo_Zone::PublicZone));
-    addZone(new Server_CardZone(this, "grave", false, ServerInfo_Zone::PublicZone));
-    addZone(new Server_CardZone(this, "rfg", false, ServerInfo_Zone::PublicZone));
+    addZone(new Server_CardZone(this, ZoneNames::TABLE, true, ServerInfo_Zone::PublicZone));
+    addZone(new Server_CardZone(this, ZoneNames::HAND, false, ServerInfo_Zone::PrivateZone));
+    addZone(new Server_CardZone(this, ZoneNames::STACK, false, ServerInfo_Zone::PublicZone));
+    addZone(new Server_CardZone(this, ZoneNames::GRAVE, false, ServerInfo_Zone::PublicZone));
+    addZone(new Server_CardZone(this, ZoneNames::EXILE, false, ServerInfo_Zone::PublicZone));
 
     addCounter(new Server_Counter(0, "life", makeColor(255, 255, 255), 25, game->getStartingLifeTotal()));
     addCounter(new Server_Counter(1, "w", makeColor(255, 255, 150), 20, 0));
@@ -102,28 +118,16 @@ void Server_Player::setupZones()
     // ------------------------------------------------------------------
 
     // Assign card ids and create deck from deck list
-    InnerDecklistNode *listRoot = deck->getRoot();
-    for (int i = 0; i < listRoot->size(); ++i) {
-        auto *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
-        Server_CardZone *z;
-        if (currentZone->getName() == DECK_ZONE_MAIN) {
-            z = deckZone;
-        } else if (currentZone->getName() == DECK_ZONE_SIDE) {
-            z = sbZone;
-        } else {
-            continue;
+    auto insertCardsIntoZone = [this](auto cards, auto *zone) {
+        for (auto card : cards) {
+            for (int k = 0; k < card->getNumber(); ++k) {
+                zone->insertCard(new Server_Card(card->toCardRef(), nextCardId++, 0, 0, zone), -1, 0);
+            }
         }
+    };
 
-        for (int j = 0; j < currentZone->size(); ++j) {
-            auto *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
-            if (!currentCard) {
-                continue;
-            }
-            for (int k = 0; k < currentCard->getNumber(); ++k) {
-                z->insertCard(new Server_Card(currentCard->toCardRef(), nextCardId++, 0, 0, z), -1, 0);
-            }
-        }
-    }
+    insertCardsIntoZone(deck->getCardNodes({DECK_ZONE_MAIN}), deckZone);
+    insertCardsIntoZone(deck->getCardNodes({DECK_ZONE_SIDE}), sbZone);
 
     const QList<MoveCard_ToZone> &sideboardPlan = deck->getCurrentSideboardPlan();
     for (const auto &m : sideboardPlan) {
@@ -176,8 +180,8 @@ void Server_Player::addCounter(Server_Counter *counter)
 
 Response::ResponseCode Server_Player::drawCards(GameEventStorage &ges, int number)
 {
-    Server_CardZone *deckZone = zones.value("deck");
-    Server_CardZone *handZone = zones.value("hand");
+    Server_CardZone *deckZone = zones.value(ZoneNames::DECK);
+    Server_CardZone *handZone = zones.value(ZoneNames::HAND);
     if (deckZone->getCards().size() < number) {
         number = deckZone->getCards().size();
     }
@@ -222,7 +226,7 @@ void Server_Player::onCardBeingMoved(GameEventStorage &ges,
     // "Undo draw" should only remain valid if the just-drawn card stays within the user's hand (e.g., they only
     // reorder their hand). If a just-drawn card leaves the hand then remove cards before it from the list
     // (Ignore the case where the card is currently being un-drawn.)
-    if (startzone->getName() == "hand" && targetzone->getName() != "hand" && !undoingDraw) {
+    if (startzone->getName() == ZoneNames::HAND && targetzone->getName() != ZoneNames::HAND && !undoingDraw) {
         int index = lastDrawList.lastIndexOf(card->getId());
         if (index != -1) {
             lastDrawList.erase(lastDrawList.begin(), lastDrawList.begin() + index);
@@ -260,6 +264,14 @@ Server_Player::cmdDeckSelect(const Command_DeckSelect &cmd, ResponseContainer &r
     Event_PlayerPropertiesChanged event;
     event.mutable_player_properties()->set_sideboard_locked(true);
     event.mutable_player_properties()->set_deck_hash(deck->getDeckHash().toStdString());
+    const auto &playmat = deck->getPlaymat();
+    auto *playmatParams = event.mutable_player_properties()->mutable_playmat_params();
+    playmatParams->set_card_name(playmat.card.name.left(MAX_NAME_LENGTH).toStdString());
+    playmatParams->set_card_provider_id(playmat.card.providerId.left(MAX_NAME_LENGTH).toStdString());
+    playmatParams->set_margin_pct_l(playmat.params.marginPctL);
+    playmatParams->set_margin_pct_r(playmat.params.marginPctR);
+    playmatParams->set_vertical_offset(playmat.params.verticalOffset);
+    playmatParams->set_zoom(playmat.params.zoom);
     ges.enqueueGameEvent(event, playerId);
 
     Context_DeckSelect context;
@@ -338,11 +350,11 @@ Server_Player::cmdShuffle(const Command_Shuffle &cmd, ResponseContainer & /*rc*/
         return Response::RespContextError;
     }
 
-    if (cmd.has_zone_name() && cmd.zone_name() != "deck") {
+    if (cmd.has_zone_name() && cmd.zone_name() != ZoneNames::DECK) {
         return Response::RespFunctionNotAllowed;
     }
 
-    Server_CardZone *zone = zones.value("deck");
+    Server_CardZone *zone = zones.value(ZoneNames::DECK);
     if (!zone) {
         return Response::RespNameNotFound;
     }
@@ -369,8 +381,8 @@ Server_Player::cmdMulligan(const Command_Mulligan &cmd, ResponseContainer & /*rc
         return Response::RespContextError;
     }
 
-    Server_CardZone *hand = zones.value("hand");
-    Server_CardZone *_deck = zones.value("deck");
+    Server_CardZone *hand = zones.value(ZoneNames::HAND);
+    Server_CardZone *_deck = zones.value(ZoneNames::DECK);
     int number = cmd.number();
 
     if (!hand->getCards().isEmpty()) {
@@ -420,14 +432,17 @@ Server_Player::cmdUndoDraw(const Command_UndoDraw & /*cmd*/, ResponseContainer &
     }
 
     if (lastDrawList.isEmpty()) {
+        Event_GameLogNotice event;
+        event.set_notice_type(Event_GameLogNotice::UNDO_DRAW_FAILED);
+        ges.enqueueGameEvent(event, playerId);
         return Response::RespContextError;
     }
 
     Response::ResponseCode retVal;
     auto *cardToMove = new CardToMove;
     cardToMove->set_card_id(lastDrawList.takeLast());
-    retVal = moveCard(ges, zones.value("hand"), QList<const CardToMove *>() << cardToMove, zones.value("deck"), 0, 0,
-                      false, true);
+    retVal = moveCard(ges, zones.value(ZoneNames::HAND), QList<const CardToMove *>() << cardToMove,
+                      zones.value(ZoneNames::DECK), 0, 0, false, true);
     delete cardToMove;
 
     return retVal;
@@ -443,17 +458,19 @@ Server_Player::cmdIncCounter(const Command_IncCounter &cmd, ResponseContainer &
         return Response::RespContextError;
     }
 
-    Server_Counter *c = counters.value(cmd.counter_id(), 0);
+    const int counterId = cmd.counter_id();
+    Server_Counter *c = counters.value(counterId, nullptr);
     if (!c) {
         return Response::RespNameNotFound;
     }
 
-    c->setCount(c->getCount() + cmd.delta());
-
-    Event_SetCounter event;
-    event.set_counter_id(c->getId());
-    event.set_value(c->getCount());
-    ges.enqueueGameEvent(event, playerId);
+    bool didChange = c->incrementCount(cmd.delta());
+    if (didChange) {
+        Event_SetCounter event;
+        event.set_counter_id(c->getId());
+        event.set_value(c->getCount());
+        ges.enqueueGameEvent(event, playerId);
+    }
 
     return Response::RespOk;
 }
@@ -494,17 +511,19 @@ Server_Player::cmdSetCounter(const Command_SetCounter &cmd, ResponseContainer &
         return Response::RespContextError;
     }
 
-    Server_Counter *c = counters.value(cmd.counter_id(), 0);
+    const int counterId = cmd.counter_id();
+    Server_Counter *c = counters.value(counterId, nullptr);
     if (!c) {
         return Response::RespNameNotFound;
     }
 
-    c->setCount(cmd.value());
-
-    Event_SetCounter event;
-    event.set_counter_id(c->getId());
-    event.set_value(c->getCount());
-    ges.enqueueGameEvent(event, playerId);
+    bool didChange = c->setCount(cmd.value());
+    if (didChange) {
+        Event_SetCounter event;
+        event.set_counter_id(c->getId());
+        event.set_value(c->getCount());
+        ges.enqueueGameEvent(event, playerId);
+    }
 
     return Response::RespOk;
 }
@@ -519,15 +538,16 @@ Server_Player::cmdDelCounter(const Command_DelCounter &cmd, ResponseContainer &
         return Response::RespContextError;
     }
 
-    Server_Counter *counter = counters.value(cmd.counter_id(), 0);
+    const int counterId = cmd.counter_id();
+    Server_Counter *counter = counters.value(counterId, nullptr);
     if (!counter) {
         return Response::RespNameNotFound;
     }
-    counters.remove(cmd.counter_id());
+    counters.remove(counterId);
     delete counter;
 
     Event_DelCounter event;
-    event.set_counter_id(cmd.counter_id());
+    event.set_counter_id(counterId);
     ges.enqueueGameEvent(event, playerId);
 
     return Response::RespOk;
@@ -596,6 +616,46 @@ Server_Player::cmdReverseTurn(const Command_ReverseTurn &cmd, ResponseContainer
     return Server_AbstractParticipant::cmdReverseTurn(cmd, rc, ges);
 }
 
+Response::ResponseCode
+Server_Player::cmdSetPlaymat(const Command_SetPlaymat &cmd, ResponseContainer &rc, GameEventStorage &ges)
+{
+    Q_UNUSED(rc);
+
+    if (!deck) {
+        return Response::RespContextError;
+    }
+
+    const auto &pp = cmd.playmat_params();
+    const auto rawName = QString::fromStdString(pp.card_name());
+    const auto rawProviderId = QString::fromStdString(pp.card_provider_id());
+    if (rawName.length() > MAX_NAME_LENGTH || rawProviderId.length() > MAX_NAME_LENGTH) {
+        return Response::RespInvalidData;
+    }
+    PlaymatInfo playmat;
+    playmat.card.name = rawName;
+    playmat.card.providerId = rawProviderId;
+    playmat.params.marginPctL = qBound(0.0, pp.margin_pct_l(), 0.95);
+    playmat.params.marginPctR = qBound(0.0, pp.margin_pct_r(), 0.95);
+    playmat.params.verticalOffset = qBound(0.0, pp.vertical_offset(), 1.0);
+    playmat.params.zoom = qBound(0.1, pp.zoom(), 4.0);
+    deck->setPlaymat(playmat);
+
+    Event_PlayerPropertiesChanged event;
+    auto *props = event.mutable_player_properties();
+    props->set_sideboard_locked(sideboardLocked);
+    props->set_deck_hash(deck->getDeckHash().toStdString());
+    auto *playmatParams = props->mutable_playmat_params();
+    playmatParams->set_card_name(playmat.card.name.toStdString());
+    playmatParams->set_card_provider_id(playmat.card.providerId.toStdString());
+    playmatParams->set_margin_pct_l(playmat.params.marginPctL);
+    playmatParams->set_margin_pct_r(playmat.params.marginPctR);
+    playmatParams->set_vertical_offset(playmat.params.verticalOffset);
+    playmatParams->set_zoom(playmat.params.zoom);
+    ges.enqueueGameEvent(event, playerId);
+
+    return Response::RespOk;
+}
+
 void Server_Player::getInfo(ServerInfo_Player *info,
                             Server_AbstractParticipant *recipient,
                             bool omniscient,
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 5925ed3c2..5d514a344 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.h
@@ -1,8 +1,19 @@
 #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
@@ -62,6 +73,8 @@ public:
     cmdSetActivePhase(const Command_SetActivePhase &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
     Response::ResponseCode
     cmdReverseTurn(const Command_ReverseTurn & /*cmd*/, ResponseContainer & /*rc*/, GameEventStorage &ges) override;
+    Response::ResponseCode
+    cmdSetPlaymat(const Command_SetPlaymat &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
     Response::ResponseCode cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd,
                                                    ResponseContainer &rc,
                                                    GameEventStorage &ges) override;
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 bc873e386..d1c369949 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.cpp
@@ -1,5 +1,11 @@
 #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 4d3928a63..2a8995ec3 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_spectator.h
@@ -3,6 +3,12 @@
 
 #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 a5a74c54c..73b13e23e 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server.cpp
@@ -19,16 +19,36 @@
  ***************************************************************************/
 #include "server.h"
 
+#include "game/server_abstract_participant.h"
 #include "game/server_game.h"
-#include "game/server_player.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 "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 <QCoreApplication>
+#include <QDateTime>
 #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>
@@ -36,6 +56,10 @@
 #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)
 {
@@ -56,8 +80,9 @@ void Server::prepareDestroy()
 {
     roomsLock.lockForWrite();
     QMapIterator<int, Server_Room *> roomIterator(rooms);
-    while (roomIterator.hasNext())
+    while (roomIterator.hasNext()) {
         delete roomIterator.next().value();
+    }
     rooms.clear();
     roomsLock.unlock();
 }
@@ -86,22 +111,25 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session,
     bool hasClientId = false;
     if (clientid.isEmpty()) {
         // client id is empty, either out dated client or client has been modified
-        if (getClientIDRequiredEnabled())
+        if (getClientIDRequiredEnabled()) {
             return ClientIdRequired;
+        }
     } else {
         hasClientId = true;
     }
 
-    if (name.size() > 35)
+    if (name.size() > 35) {
         name = name.left(35);
+    }
 
     Server_DatabaseInterface *databaseInterface = getDatabaseInterface();
 
     AuthenticationResult authState = databaseInterface->checkUserPassword(session, name, password, clientid, reasonStr,
                                                                           secondsLeft, passwordNeedsHash);
     if (authState == NotLoggedIn || authState == UserIsBanned || authState == UsernameInvalid ||
-        authState == UserIsInactive)
+        authState == UserIsInactive) {
         return authState;
+    }
 
     ServerInfo_User data = databaseInterface->getUserData(name, true);
     data.set_address(session->getAddress().toStdString());
@@ -140,8 +168,9 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session,
         QString tempName = name;
         int i = 0;
         while (users.contains(tempName) || databaseInterface->activeUserExists(tempName) ||
-               databaseInterface->userSessionExists(tempName))
+               databaseInterface->userSessionExists(tempName)) {
             tempName = name + "_" + QString::number(++i);
+        }
         name = tempName;
         data.set_name(name.toStdString());
     }
@@ -163,9 +192,11 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session,
     Event_UserJoined event;
     event.mutable_user_info()->CopyFrom(session->copyUserInfo(false));
     SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event);
-    for (auto &client : clients)
-        if (client->getAcceptsUserListChanges())
+    for (auto &client : clients) {
+        if (client->getAcceptsUserListChanges()) {
             client->sendProtocolItem(*se);
+        }
+    }
     delete se;
 
     event.mutable_user_info()->CopyFrom(session->copyUserInfo(true, true, true));
@@ -183,6 +214,25 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session,
     return authState;
 }
 
+void Server::broadcastUserInfoUpdate(Server_ProtocolHandler *source)
+{
+    Event_UserJoined event;
+    event.mutable_user_info()->CopyFrom(source->copyUserInfo(false));
+
+    SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event);
+
+    clientsLock.lockForRead();
+    for (auto &client : clients) {
+        if (client->getAcceptsUserListChanges()) {
+            client->sendProtocolItem(*se);
+        }
+    }
+    clientsLock.unlock();
+
+    sendIsl_SessionEvent(*se);
+    delete se;
+}
+
 void Server::addPersistentPlayer(const QString &userName, int roomId, int gameId, int playerId)
 {
     QWriteLocker locker(&persistentPlayersLock);
@@ -206,19 +256,22 @@ Server_AbstractUserInterface *Server::findUser(const QString &userName) const
     // Call this only with clientsLock set.
 
     Server_AbstractUserInterface *userHandler = users.value(userName);
-    if (userHandler)
+    if (userHandler) {
         return userHandler;
-    else
+    } else {
         return externalUsers.value(userName);
+    }
 }
 
 void Server::addClient(Server_ProtocolHandler *client)
 {
-    if (client->getConnectionType() == "tcp")
+    if (client->getConnectionType() == "tcp") {
         tcpUserCount++;
+    }
 
-    if (client->getConnectionType() == "websocket")
+    if (client->getConnectionType() == "websocket") {
         webSocketUserCount++;
+    }
 
     QWriteLocker locker(&clientsLock);
     clients << client;
@@ -232,11 +285,13 @@ void Server::removeClient(Server_ProtocolHandler *client)
         return;
     }
 
-    if (client->getConnectionType() == "tcp")
+    if (client->getConnectionType() == "tcp") {
         tcpUserCount--;
+    }
 
-    if (client->getConnectionType() == "websocket")
+    if (client->getConnectionType() == "websocket") {
         webSocketUserCount--;
+    }
 
     QWriteLocker locker(&clientsLock);
     clients.removeAt(clientIndex);
@@ -245,9 +300,11 @@ void Server::removeClient(Server_ProtocolHandler *client)
         Event_UserLeft event;
         event.set_name(data->name());
         SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event);
-        for (auto &_client : clients)
-            if (_client->getAcceptsUserListChanges())
+        for (auto &_client : clients) {
+            if (_client->getAcceptsUserListChanges()) {
                 _client->sendProtocolItem(*se);
+            }
+        }
         sendIsl_SessionEvent(*se);
         delete se;
 
@@ -272,10 +329,11 @@ QList<QString> Server::getOnlineModeratorList() const
     for (auto &client : clients) {
         ServerInfo_User *data = client->getUserInfo();
 
-        // TODO: this line should be updated in the event there is any type of new user level created
+        //! \todo This line should be updated in the event there is any type of new user level created.
         if (data &&
-            (data->user_level() & ServerInfo_User::IsModerator || data->user_level() & ServerInfo_User::IsAdmin))
+            (data->user_level() & ServerInfo_User::IsModerator || data->user_level() & ServerInfo_User::IsAdmin)) {
             results << QString::fromStdString(data->name()).simplified();
+        }
     }
     return results;
 }
@@ -293,9 +351,11 @@ void Server::externalUserJoined(const ServerInfo_User &userInfo)
     event.mutable_user_info()->CopyFrom(userInfo);
 
     SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event);
-    for (auto &client : clients)
-        if (client->getAcceptsUserListChanges())
+    for (auto &client : clients) {
+        if (client->getAcceptsUserListChanges()) {
             client->sendProtocolItem(*se);
+        }
+    }
     delete se;
     clientsLock.unlock();
 
@@ -319,18 +379,21 @@ void Server::externalUserLeft(const QString &userName)
     while (userGamesIterator.hasNext()) {
         userGamesIterator.next();
         Server_Room *room = rooms.value(userGamesIterator.value().first);
-        if (!room)
+        if (!room) {
             continue;
+        }
 
         QReadLocker roomGamesLocker(&room->gamesLock);
         Server_Game *game = room->getGames().value(userGamesIterator.key());
-        if (!game)
+        if (!game) {
             continue;
+        }
 
         QMutexLocker gameLocker(&game->gameMutex);
         auto *participant = game->getParticipants().value(userGamesIterator.value().second);
-        if (!participant)
+        if (!participant) {
             continue;
+        }
 
         participant->disconnectClient();
     }
@@ -343,9 +406,11 @@ void Server::externalUserLeft(const QString &userName)
 
     SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event);
     clientsLock.lockForRead();
-    for (auto &client : clients)
-        if (client->getAcceptsUserListChanges())
+    for (auto &client : clients) {
+        if (client->getAcceptsUserListChanges()) {
             client->sendProtocolItem(*se);
+        }
+    }
     clientsLock.unlock();
     delete se;
 }
@@ -492,8 +557,9 @@ void Server::externalGameCommandContainerReceived(const CommandContainer &cont,
 
             Response::ResponseCode resp = participant->processGameCommand(sc, responseContainer, ges);
 
-            if (resp != Response::RespOk)
+            if (resp != Response::RespOk) {
                 finalResponseCode = resp;
+            }
         }
         ges.sendToGame(game);
 
@@ -547,13 +613,16 @@ void Server::broadcastRoomUpdate(const ServerInfo_Room &roomInfo, bool sendToIsl
     SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event);
 
     clientsLock.lockForRead();
-    for (auto &client : clients)
-        if (client->getAcceptsRoomListChanges())
+    for (auto &client : clients) {
+        if (client->getAcceptsRoomListChanges()) {
             client->sendProtocolItem(*se);
+        }
+    }
     clientsLock.unlock();
 
-    if (sendToIsl)
+    if (sendToIsl) {
         sendIsl_SessionEvent(*se);
+    }
 
     delete se;
 }
@@ -591,8 +660,9 @@ void Server::sendIsl_Response(const Response &item, int serverId, qint64 session
 {
     IslMessage msg;
     msg.set_message_type(IslMessage::RESPONSE);
-    if (sessionId != -1)
+    if (sessionId != -1) {
         msg.set_session_id(static_cast<google::protobuf::uint64>(sessionId));
+    }
     msg.mutable_response()->CopyFrom(item);
 
     emit sigSendIslMessage(msg, serverId);
@@ -602,8 +672,9 @@ void Server::sendIsl_SessionEvent(const SessionEvent &item, int serverId, qint64
 {
     IslMessage msg;
     msg.set_message_type(IslMessage::SESSION_EVENT);
-    if (sessionId != -1)
+    if (sessionId != -1) {
         msg.set_session_id(static_cast<google::protobuf::uint64>(sessionId));
+    }
     msg.mutable_session_event()->CopyFrom(item);
 
     emit sigSendIslMessage(msg, serverId);
@@ -613,8 +684,9 @@ void Server::sendIsl_GameEventContainer(const GameEventContainer &item, int serv
 {
     IslMessage msg;
     msg.set_message_type(IslMessage::GAME_EVENT_CONTAINER);
-    if (sessionId != -1)
+    if (sessionId != -1) {
         msg.set_session_id(static_cast<google::protobuf::uint64>(sessionId));
+    }
     msg.mutable_game_event_container()->CopyFrom(item);
 
     emit sigSendIslMessage(msg, serverId);
@@ -624,8 +696,9 @@ void Server::sendIsl_RoomEvent(const RoomEvent &item, int serverId, qint64 sessi
 {
     IslMessage msg;
     msg.set_message_type(IslMessage::ROOM_EVENT);
-    if (sessionId != -1)
+    if (sessionId != -1) {
         msg.set_session_id(static_cast<google::protobuf::uint64>(sessionId));
+    }
     msg.mutable_room_event()->CopyFrom(item);
 
     emit sigSendIslMessage(msg, serverId);
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server.h b/libcockatrice_network/libcockatrice/network/server/remote/server.h
index ab57fac4e..99247bb67 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server.h
@@ -3,30 +3,32 @@
 
 #include "server_player_reference.h"
 
+#include <QList>
+#include <QMap>
 #include <QMultiMap>
 #include <QMutex>
+#include <QMutexLocker>
 #include <QObject>
 #include <QReadWriteLock>
-#include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_ban.pb.h>
-#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <QString>
+#include <QtGlobal>
+#include <qtmetamacros.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
 {
@@ -38,7 +40,8 @@ enum AuthenticationResult
     UsernameInvalid,
     RegistrationRequired,
     UserIsInactive,
-    ClientIdRequired
+    ClientIdRequired,
+    PasswordChangeRequired
 };
 
 class Server : public QObject
@@ -64,6 +67,7 @@ public:
                                    QString &clientid,
                                    QString &clientVersion,
                                    QString &connectionType);
+    void broadcastUserInfoUpdate(Server_ProtocolHandler *source);
 
     const QMap<int, Server_Room *> &getRooms()
     {
@@ -90,6 +94,10 @@ public:
     {
         return QString();
     }
+    virtual SessionEvent *getLoginSessionEvent() const
+    {
+        return nullptr;
+    }
     virtual QString getRequiredFeatures() const
     {
         return QString();
@@ -174,6 +182,11 @@ public:
     {
         return false;
     }
+    /// Called once per actual game start with how long bringing every player's
+    /// zones online took, so servers can spot deck sizes that wedge threads.
+    virtual void observeGameStartDurationMs(qint64 /* elapsedMs */)
+    {
+    }
 
     Server_DatabaseInterface *getDatabaseInterface() const;
     int getNextLocalGameId()
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
index f9b61ab48..25aa415fc 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.cpp
@@ -1,7 +1,13 @@
 #include "server_abstractuserinterface.h"
 
+#include "game/server_abstract_participant.h"
 #include "game/server_game.h"
-#include "game/server_player.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 "server.h"
 #include "server_player_reference.h"
 #include "server_response_containers.h"
@@ -9,8 +15,13 @@
 
 #include <QDebug>
 #include <QList>
+#include <QReadLocker>
+#include <QReadWriteLock>
+#include <QString>
 #include <google/protobuf/descriptor.h>
-#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
+#include <google/protobuf/message.h>
+#include <qlogging.h>
+#include <utility>
 
 void Server_AbstractUserInterface::sendProtocolItemByType(ServerMessage::MessageType type,
                                                           const ::google::protobuf::Message &item)
@@ -45,25 +56,32 @@ void Server_AbstractUserInterface::sendResponseContainer(const ResponseContainer
 {
     const QList<QPair<ServerMessage::MessageType, ::google::protobuf::Message *>> &preResponseQueue =
         responseContainer.getPreResponseQueue();
-    for (int i = 0; i < preResponseQueue.size(); ++i)
+    for (int i = 0; i < preResponseQueue.size(); ++i) {
         sendProtocolItemByType(preResponseQueue[i].first, *preResponseQueue[i].second);
+    }
 
     if (responseCode != Response::RespNothing) {
         Response response;
         response.set_cmd_id(responseContainer.getCmdId());
         response.set_response_code(responseCode);
         ::google::protobuf::Message *responseExtension = responseContainer.getResponseExtension();
-        if (responseExtension)
+        if (responseExtension) {
             response.GetReflection()
                 ->MutableMessage(&response, responseExtension->GetDescriptor()->FindExtensionByName("ext"))
                 ->CopyFrom(*responseExtension);
+        }
         sendProtocolItem(response);
     }
 
     const QList<QPair<ServerMessage::MessageType, ::google::protobuf::Message *>> &postResponseQueue =
         responseContainer.getPostResponseQueue();
-    for (int i = 0; i < postResponseQueue.size(); ++i)
+    for (int i = 0; i < postResponseQueue.size(); ++i) {
         sendProtocolItemByType(postResponseQueue[i].first, *postResponseQueue[i].second);
+    }
+}
+
+void Server_AbstractUserInterface::onLogin(ResponseContainer &)
+{
 }
 
 void Server_AbstractUserInterface::playerRemovedFromGame(Server_Game *game)
@@ -92,18 +110,21 @@ void Server_AbstractUserInterface::joinPersistentGames(ResponseContainer &rc)
         const PlayerReference &pr = gamesToJoin.at(i);
 
         Server_Room *room = server->getRooms().value(pr.getRoomId());
-        if (!room)
+        if (!room) {
             continue;
+        }
         QReadLocker roomGamesLocker(&room->gamesLock);
 
         Server_Game *game = room->getGames().value(pr.getGameId());
-        if (!game)
+        if (!game) {
             continue;
+        }
         QMutexLocker gameLocker(&game->gameMutex);
 
         auto *participant = game->getParticipants().value(pr.getPlayerId());
-        if (!participant)
+        if (!participant) {
             continue;
+        }
 
         participant->setUserInterface(this);
         playerAddedToGame(game->getGameId(), room->getId(), participant->getPlayerId());
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
index b11260003..a19475e34 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_abstractuserinterface.h
@@ -5,6 +5,8 @@
 
 #include <QMap>
 #include <QMutex>
+#include <QMutexLocker>
+#include <QPair>
 #include <libcockatrice/protocol/pb/response.pb.h>
 #include <libcockatrice/protocol/pb/server_message.pb.h>
 
@@ -12,9 +14,15 @@ 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
 {
@@ -42,6 +50,7 @@ public:
     void playerRemovedFromGame(Server_Game *game);
     void playerAddedToGame(int gameId, int roomId, int playerId);
     void joinPersistentGames(ResponseContainer &rc);
+    virtual void onLogin(ResponseContainer &rc);
 
     QMap<int, QPair<int, int>> getGames() const
     {
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 b43dbde42..e0be7990b 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_database_interface.h
@@ -1,9 +1,22 @@
 #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
 {
@@ -172,6 +185,9 @@ public:
     {
         return false;
     }
+    virtual void setForcePasswordChange(const QString & /* user */, bool /* force */)
+    {
+    }
 };
 
 #endif
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
index bfd8d113c..fc5cfa148 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
@@ -1,19 +1,43 @@
 #include "server_protocolhandler.h"
 
+#include "game/game_config.h"
+#include "game/server_abstract_participant.h"
 #include "game/server_game.h"
-#include "game/server_player.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 "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/descriptor.h>
+#include <google/protobuf/repeated_ptr_field.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>
@@ -26,7 +50,10 @@
 #include <libcockatrice/protocol/pb/response_list_users.pb.h>
 #include <libcockatrice/protocol/pb/response_login.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <libcockatrice/utility/string_limits.h>
+#include <qlogging.h>
+#include <string>
+#include <utility>
 
 Server_ProtocolHandler::Server_ProtocolHandler(Server *_server,
                                                Server_DatabaseInterface *_databaseInterface,
@@ -48,8 +75,9 @@ Server_ProtocolHandler::~Server_ProtocolHandler()
 // The thread must not hold any server locks when calling this (e.g. clientsLock, roomsLock).
 void Server_ProtocolHandler::prepareDestroy()
 {
-    if (deleted)
+    if (deleted) {
         return;
+    }
     deleted = true;
 
     for (auto *room : rooms.values()) {
@@ -64,8 +92,9 @@ void Server_ProtocolHandler::prepareDestroy()
         gameIterator.next();
 
         Server_Room *room = server->getRooms().value(gameIterator.value().first);
-        if (!room)
+        if (!room) {
             continue;
+        }
         room->gamesLock.lockForRead();
         Server_Game *game = room->getGames().value(gameIterator.key());
         if (!game) {
@@ -131,6 +160,22 @@ void Server_ProtocolHandler::sendProtocolItem(const RoomEvent &item)
 Response::ResponseCode Server_ProtocolHandler::processSessionCommandContainer(const CommandContainer &cont,
                                                                               ResponseContainer &rc)
 {
+    const auto isPreAuthSessionCommand = [](SessionCommand::SessionCommandType type) {
+        switch (type) {
+            case SessionCommand::PING:
+            case SessionCommand::LOGIN:
+            case SessionCommand::REGISTER:
+            case SessionCommand::ACTIVATE:
+            case SessionCommand::FORGOT_PASSWORD_REQUEST:
+            case SessionCommand::FORGOT_PASSWORD_RESET:
+            case SessionCommand::FORGOT_PASSWORD_CHALLENGE:
+            case SessionCommand::REQUEST_PASSWORD_SALT:
+                return true;
+            default:
+                return false;
+        }
+    };
+
     Response::ResponseCode finalResponseCode = Response::RespOk;
     for (int i = cont.session_command_size() - 1; i >= 0; --i) {
         Response::ResponseCode resp = Response::RespInvalidCommand;
@@ -139,36 +184,42 @@ Response::ResponseCode Server_ProtocolHandler::processSessionCommandContainer(co
         if (num != SessionCommand::PING) { // don't log ping commands
             logDebugMessage(getSafeDebugString(sc));
         }
-        switch ((SessionCommand::SessionCommandType)num) {
-            case SessionCommand::PING:
-                resp = cmdPing(sc.GetExtension(Command_Ping::ext), rc);
-                break;
-            case SessionCommand::LOGIN:
-                resp = cmdLogin(sc.GetExtension(Command_Login::ext), rc);
-                break;
-            case SessionCommand::MESSAGE:
-                resp = cmdMessage(sc.GetExtension(Command_Message::ext), rc);
-                break;
-            case SessionCommand::GET_GAMES_OF_USER:
-                resp = cmdGetGamesOfUser(sc.GetExtension(Command_GetGamesOfUser::ext), rc);
-                break;
-            case SessionCommand::GET_USER_INFO:
-                resp = cmdGetUserInfo(sc.GetExtension(Command_GetUserInfo::ext), rc);
-                break;
-            case SessionCommand::LIST_ROOMS:
-                resp = cmdListRooms(sc.GetExtension(Command_ListRooms::ext), rc);
-                break;
-            case SessionCommand::JOIN_ROOM:
-                resp = cmdJoinRoom(sc.GetExtension(Command_JoinRoom::ext), rc);
-                break;
-            case SessionCommand::LIST_USERS:
-                resp = cmdListUsers(sc.GetExtension(Command_ListUsers::ext), rc);
-                break;
-            default:
-                resp = processExtendedSessionCommand(num, sc, rc);
+        const auto commandType = static_cast<SessionCommand::SessionCommandType>(num);
+        if (authState == NotLoggedIn && !isPreAuthSessionCommand(commandType)) {
+            resp = Response::RespLoginNeeded;
+        } else {
+            switch (commandType) {
+                case SessionCommand::PING:
+                    resp = cmdPing(sc.GetExtension(Command_Ping::ext), rc);
+                    break;
+                case SessionCommand::LOGIN:
+                    resp = cmdLogin(sc.GetExtension(Command_Login::ext), rc);
+                    break;
+                case SessionCommand::MESSAGE:
+                    resp = cmdMessage(sc.GetExtension(Command_Message::ext), rc);
+                    break;
+                case SessionCommand::GET_GAMES_OF_USER:
+                    resp = cmdGetGamesOfUser(sc.GetExtension(Command_GetGamesOfUser::ext), rc);
+                    break;
+                case SessionCommand::GET_USER_INFO:
+                    resp = cmdGetUserInfo(sc.GetExtension(Command_GetUserInfo::ext), rc);
+                    break;
+                case SessionCommand::LIST_ROOMS:
+                    resp = cmdListRooms(sc.GetExtension(Command_ListRooms::ext), rc);
+                    break;
+                case SessionCommand::JOIN_ROOM:
+                    resp = cmdJoinRoom(sc.GetExtension(Command_JoinRoom::ext), rc);
+                    break;
+                case SessionCommand::LIST_USERS:
+                    resp = cmdListUsers(sc.GetExtension(Command_ListUsers::ext), rc);
+                    break;
+                default:
+                    resp = processExtendedSessionCommand(num, sc, rc);
+            }
         }
-        if (resp != Response::RespOk)
+        if (resp != Response::RespOk) {
             finalResponseCode = resp;
+        }
     }
     return finalResponseCode;
 }
@@ -176,13 +227,15 @@ Response::ResponseCode Server_ProtocolHandler::processSessionCommandContainer(co
 Response::ResponseCode Server_ProtocolHandler::processRoomCommandContainer(const CommandContainer &cont,
                                                                            ResponseContainer &rc)
 {
-    if (authState == NotLoggedIn)
+    if (authState == NotLoggedIn) {
         return Response::RespLoginNeeded;
+    }
 
     QReadLocker locker(&server->roomsLock);
     Server_Room *room = rooms.value(cont.room_id(), 0);
-    if (!room)
+    if (!room) {
         return Response::RespNotInRoom;
+    }
 
     resetIdleTimer();
 
@@ -206,8 +259,9 @@ Response::ResponseCode Server_ProtocolHandler::processRoomCommandContainer(const
                 resp = cmdJoinGame(sc.GetExtension(Command_JoinGame::ext), room, rc);
                 break;
         }
-        if (resp != Response::RespOk)
+        if (resp != Response::RespOk) {
             finalResponseCode = resp;
+        }
     }
     return finalResponseCode;
 }
@@ -232,18 +286,21 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const
         // allows a user to sideboard without receiving flooding message
         << GameCommand::MOVE_CARD;
 
-    if (authState == NotLoggedIn)
+    if (authState == NotLoggedIn) {
         return Response::RespLoginNeeded;
+    }
 
     QMap<int, QPair<int, int>> gameMap = getGames();
-    if (!gameMap.contains(cont.game_id()))
+    if (!gameMap.contains(cont.game_id())) {
         return Response::RespNotInRoom;
+    }
     const QPair<int, int> roomIdAndPlayerId = gameMap.value(cont.game_id());
 
     QReadLocker roomsLocker(&server->roomsLock);
     Server_Room *room = server->getRooms().value(roomIdAndPlayerId.first);
-    if (!room)
+    if (!room) {
         return Response::RespNotInRoom;
+    }
 
     QReadLocker roomGamesLocker(&room->gamesLock);
     Server_Game *game = room->getGames().value(cont.game_id());
@@ -258,8 +315,9 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const
 
     QMutexLocker gameLocker(&game->gameMutex);
     auto *participant = game->getParticipants().value(roomIdAndPlayerId.second);
-    if (!participant)
+    if (!participant) {
         return Response::RespNotInRoom;
+    }
 
     resetIdleTimer();
 
@@ -274,11 +332,13 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const
 
         if (commandCountingInterval > 0) {
             int totalCount = 0;
-            if (commandCountOverTime.isEmpty())
+            if (commandCountOverTime.isEmpty()) {
                 commandCountOverTime.prepend(0);
+            }
 
-            if (!antifloodCommandsWhiteList.contains((GameCommand::GameCommandType)getPbExtension(sc)))
+            if (!antifloodCommandsWhiteList.contains((GameCommand::GameCommandType)getPbExtension(sc))) {
                 ++commandCountOverTime[0];
+            }
 
             for (int count : commandCountOverTime) {
                 totalCount += count;
@@ -291,8 +351,9 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const
 
         Response::ResponseCode resp = participant->processGameCommand(sc, rc, ges);
 
-        if (resp != Response::RespOk)
+        if (resp != Response::RespOk) {
             finalResponseCode = resp;
+        }
     }
     ges.sendToGame(game);
 
@@ -302,10 +363,12 @@ Response::ResponseCode Server_ProtocolHandler::processGameCommandContainer(const
 Response::ResponseCode Server_ProtocolHandler::processModeratorCommandContainer(const CommandContainer &cont,
                                                                                 ResponseContainer &rc)
 {
-    if (!userInfo)
+    if (!userInfo) {
         return Response::RespLoginNeeded;
-    if (!(userInfo->user_level() & ServerInfo_User::IsModerator))
+    }
+    if (!(userInfo->user_level() & ServerInfo_User::IsModerator)) {
         return Response::RespLoginNeeded;
+    }
 
     resetIdleTimer();
 
@@ -317,8 +380,9 @@ Response::ResponseCode Server_ProtocolHandler::processModeratorCommandContainer(
         logDebugMessage(getSafeDebugString(sc));
 
         resp = processExtendedModeratorCommand(num, sc, rc);
-        if (resp != Response::RespOk)
+        if (resp != Response::RespOk) {
             finalResponseCode = resp;
+        }
     }
     return finalResponseCode;
 }
@@ -326,10 +390,12 @@ Response::ResponseCode Server_ProtocolHandler::processModeratorCommandContainer(
 Response::ResponseCode Server_ProtocolHandler::processAdminCommandContainer(const CommandContainer &cont,
                                                                             ResponseContainer &rc)
 {
-    if (!userInfo)
+    if (!userInfo) {
         return Response::RespLoginNeeded;
-    if (!(userInfo->user_level() & ServerInfo_User::IsAdmin))
+    }
+    if (!(userInfo->user_level() & ServerInfo_User::IsAdmin)) {
         return Response::RespLoginNeeded;
+    }
 
     resetIdleTimer();
 
@@ -341,8 +407,36 @@ Response::ResponseCode Server_ProtocolHandler::processAdminCommandContainer(cons
         logDebugMessage(getSafeDebugString(sc));
 
         resp = processExtendedAdminCommand(num, sc, rc);
-        if (resp != Response::RespOk)
+        if (resp != Response::RespOk) {
             finalResponseCode = resp;
+        }
+    }
+    return finalResponseCode;
+}
+
+Response::ResponseCode Server_ProtocolHandler::processDeveloperCommandContainer(const CommandContainer &cont,
+                                                                                ResponseContainer &rc)
+{
+    if (!userInfo) {
+        return Response::RespLoginNeeded;
+    }
+    if (!(userInfo->user_level() & ServerInfo_User::IsDeveloper)) {
+        return Response::RespLoginNeeded;
+    }
+
+    resetIdleTimer();
+
+    Response::ResponseCode finalResponseCode = Response::RespOk;
+    for (int i = cont.developer_command_size() - 1; i >= 0; --i) {
+        Response::ResponseCode resp = Response::RespInvalidCommand;
+        const DeveloperCommand &sc = cont.developer_command(i);
+        const int num = getPbExtension(sc);
+        logDebugMessage(getSafeDebugString(sc));
+
+        resp = processExtendedDeveloperCommand(num, sc, rc);
+        if (resp != Response::RespOk) {
+            finalResponseCode = resp;
+        }
     }
     return finalResponseCode;
 }
@@ -350,29 +444,34 @@ Response::ResponseCode Server_ProtocolHandler::processAdminCommandContainer(cons
 void Server_ProtocolHandler::processCommandContainer(const CommandContainer &cont)
 {
     // Command processing must be disabled after prepareDestroy() has been called.
-    if (deleted)
+    if (deleted) {
         return;
+    }
 
     lastDataReceived = timeRunning;
 
     ResponseContainer responseContainer(cont.has_cmd_id() ? cont.cmd_id() : -1);
     Response::ResponseCode finalResponseCode;
 
-    if (cont.game_command_size())
+    if (cont.game_command_size()) {
         finalResponseCode = processGameCommandContainer(cont, responseContainer);
-    else if (cont.room_command_size())
+    } else if (cont.room_command_size()) {
         finalResponseCode = processRoomCommandContainer(cont, responseContainer);
-    else if (cont.session_command_size())
+    } else if (cont.session_command_size()) {
         finalResponseCode = processSessionCommandContainer(cont, responseContainer);
-    else if (cont.moderator_command_size())
+    } else if (cont.moderator_command_size()) {
         finalResponseCode = processModeratorCommandContainer(cont, responseContainer);
-    else if (cont.admin_command_size())
+    } else if (cont.admin_command_size()) {
         finalResponseCode = processAdminCommandContainer(cont, responseContainer);
-    else
+    } else if (cont.developer_command_size()) {
+        finalResponseCode = processDeveloperCommandContainer(cont, responseContainer);
+    } else {
         finalResponseCode = Response::RespInvalidCommand;
+    }
 
-    if ((finalResponseCode != Response::RespNothing))
+    if ((finalResponseCode != Response::RespNothing)) {
         sendResponseContainer(responseContainer, finalResponseCode);
+    }
 }
 
 void Server_ProtocolHandler::pingClockTimeout()
@@ -386,11 +485,13 @@ void Server_ProtocolHandler::pingClockTimeout()
     if (interval > 0) {
         if (pingclockinterval > 0) {
             messageSizeOverTime.prepend(0);
-            if (messageSizeOverTime.size() > (msgcountinterval / pingclockinterval))
+            if (messageSizeOverTime.size() > (msgcountinterval / pingclockinterval)) {
                 messageSizeOverTime.removeLast();
+            }
             messageCountOverTime.prepend(0);
-            if (messageCountOverTime.size() > (msgcountinterval / pingclockinterval))
+            if (messageCountOverTime.size() > (msgcountinterval / pingclockinterval)) {
                 messageCountOverTime.removeLast();
+            }
         }
     }
 
@@ -398,19 +499,22 @@ void Server_ProtocolHandler::pingClockTimeout()
     if (interval > 0) {
         if (pingclockinterval > 0) {
             commandCountOverTime.prepend(0);
-            if (commandCountOverTime.size() > (cmdcountinterval / pingclockinterval))
+            if (commandCountOverTime.size() > (cmdcountinterval / pingclockinterval)) {
                 commandCountOverTime.removeLast();
+            }
         }
     }
 
-    if (timeRunning - lastDataReceived > server->getMaxPlayerInactivityTime())
+    if (timeRunning - lastDataReceived > server->getMaxPlayerInactivityTime()) {
         prepareDestroy();
+    }
 
-    // PrivLevel users, Moderators, and Admins are not subject to the server idle timeout policy
+    // PrivLevel users, Moderators, Admins, and Developers are not subject to the server idle timeout policy
     const bool hasPrivLevel = userInfo && QString::fromStdString(userInfo->privlevel()).toLower() != "none";
-    const bool isModOrAdmin =
-        userInfo && (userInfo->user_level() & (ServerInfo_User::IsModerator | ServerInfo_User::IsAdmin));
-    if (!hasPrivLevel && !isModOrAdmin) {
+    const bool isStaff =
+        userInfo && (userInfo->user_level() &
+                     (ServerInfo_User::IsModerator | ServerInfo_User::IsAdmin | ServerInfo_User::IsDeveloper));
+    if (!hasPrivLevel && !isStaff) {
         if ((server->getIdleClientTimeout() > 0) && (idleClientWarningSent)) {
             if (timeRunning - lastActionReceived > server->getIdleClientTimeout()) {
                 prepareDestroy();
@@ -444,8 +548,9 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd
     QString password;
     bool needsHash = false;
     if (cmd.has_password()) {
-        if (cmd.password().length() > MAX_NAME_LENGTH)
+        if (cmd.password().length() > MAX_NAME_LENGTH) {
             return Response::RespWrongPassword;
+        }
         password = QString::fromStdString(cmd.password());
         needsHash = true;
     } else if (cmd.hashed_password().length() > MAX_NAME_LENGTH) {
@@ -493,8 +598,9 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd
         case UserIsBanned: {
             auto *re = new Response_Login;
             re->set_denied_reason_str(reasonStr.toStdString());
-            if (banSecondsLeft != 0)
+            if (banSecondsLeft != 0) {
                 re->set_denied_end_time(QDateTime::currentDateTime().addSecs(banSecondsLeft).toSecsSinceEpoch());
+            }
             rc.setResponseExtension(re);
             return Response::RespUserIsBanned;
         }
@@ -514,6 +620,8 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd
             return Response::RespClientIdRequired;
         case UserIsInactive:
             return Response::RespAccountNotActivated;
+        case PasswordChangeRequired:
+            return Response::RespPasswordChangeRequired;
         default:
             authState = res;
             usingRealPassword = needsHash;
@@ -534,36 +642,46 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd
     event.set_message(server->getLoginMessage().toStdString());
     rc.enqueuePostResponseItem(ServerMessage::SESSION_EVENT, prepareSessionEvent(event));
 
+    SessionEvent *loginEvent = server->getLoginSessionEvent();
+    if (loginEvent) {
+        rc.enqueuePostResponseItem(ServerMessage::SESSION_EVENT, loginEvent);
+    }
+
     auto *re = new Response_Login;
     re->mutable_user_info()->CopyFrom(copyUserInfo(true));
 
     if (authState == PasswordRight) {
         QMapIterator<QString, ServerInfo_User> buddyIterator(databaseInterface->getBuddyList(userName));
-        while (buddyIterator.hasNext())
+        while (buddyIterator.hasNext()) {
             re->add_buddy_list()->CopyFrom(buddyIterator.next().value());
+        }
 
         QMapIterator<QString, ServerInfo_User> ignoreIterator(databaseInterface->getIgnoreList(userName));
-        while (ignoreIterator.hasNext())
+        while (ignoreIterator.hasNext()) {
             re->add_ignore_list()->CopyFrom(ignoreIterator.next().value());
+        }
     }
 
     // return to client any missing features the server has that the client does not
     if (!missingClientFeatures.isEmpty()) {
         QMap<QString, bool>::iterator i;
-        for (i = missingClientFeatures.begin(); i != missingClientFeatures.end(); ++i)
+        for (i = missingClientFeatures.begin(); i != missingClientFeatures.end(); ++i) {
             re->add_missing_features(i.key().toStdString().c_str());
+        }
     }
 
     joinPersistentGames(rc);
     databaseInterface->removeForgotPassword(userName);
+    onLogin(rc);
     rc.setResponseExtension(re);
     return Response::RespOk;
 }
 
 Response::ResponseCode Server_ProtocolHandler::cmdMessage(const Command_Message &cmd, ResponseContainer &rc)
 {
-    if (authState == NotLoggedIn)
+    if (authState == NotLoggedIn) {
         return Response::RespLoginNeeded;
+    }
 
     QReadLocker locker(&server->clientsLock);
 
@@ -599,8 +717,9 @@ Response::ResponseCode Server_ProtocolHandler::cmdMessage(const Command_Message
 Response::ResponseCode Server_ProtocolHandler::cmdGetGamesOfUser(const Command_GetGamesOfUser &cmd,
                                                                  ResponseContainer &rc)
 {
-    if (authState == NotLoggedIn)
+    if (authState == NotLoggedIn) {
         return Response::RespLoginNeeded;
+    }
 
     // Do not show games to someone on the ignore list of that user, except for mods
     QString target_user = nameFromStdString(cmd.user_name());
@@ -624,8 +743,9 @@ Response::ResponseCode Server_ProtocolHandler::cmdGetGamesOfUser(const Command_G
         room->gamesLock.lockForRead();
         room->getInfo(*re->add_room_list(), false, true);
         QListIterator<ServerInfo_Game> gameIterator(room->getGamesOfUser(nameFromStdString(cmd.user_name())));
-        while (gameIterator.hasNext())
+        while (gameIterator.hasNext()) {
             re->add_game_list()->CopyFrom(gameIterator.next());
+        }
         room->gamesLock.unlock();
     }
     server->roomsLock.unlock();
@@ -636,20 +756,30 @@ Response::ResponseCode Server_ProtocolHandler::cmdGetGamesOfUser(const Command_G
 
 Response::ResponseCode Server_ProtocolHandler::cmdGetUserInfo(const Command_GetUserInfo &cmd, ResponseContainer &rc)
 {
-    if (authState == NotLoggedIn)
+    if (authState == NotLoggedIn) {
         return Response::RespLoginNeeded;
+    }
 
     QString userName = nameFromStdString(cmd.user_name());
     auto *re = new Response_GetUserInfo;
-    if (userName.isEmpty())
+    if (userName.isEmpty()) {
         re->mutable_user_info()->CopyFrom(*userInfo);
-    else {
+    } else {
 
         QReadLocker locker(&server->clientsLock);
 
         ServerInfo_User_Container *infoSource = server->findUser(userName);
         if (!infoSource) {
             re->mutable_user_info()->CopyFrom(databaseInterface->getUserData(userName, true));
+            // The user is not currently online. Mirror the redaction that
+            // copyUserInfo() applies to online users: the id and email address
+            // are only ever visible to the account owner, and the client id
+            // only to moderators.
+            re->mutable_user_info()->clear_id();
+            re->mutable_user_info()->clear_email();
+            if (!(userInfo->user_level() & ServerInfo_User::IsModerator)) {
+                re->mutable_user_info()->clear_clientid();
+            }
         } else {
             re->mutable_user_info()->CopyFrom(
                 infoSource->copyUserInfo(true, false, userInfo->user_level() & ServerInfo_User::IsModerator));
@@ -662,13 +792,15 @@ Response::ResponseCode Server_ProtocolHandler::cmdGetUserInfo(const Command_GetU
 
 Response::ResponseCode Server_ProtocolHandler::cmdListRooms(const Command_ListRooms & /*cmd*/, ResponseContainer &rc)
 {
-    if (authState == NotLoggedIn)
+    if (authState == NotLoggedIn) {
         return Response::RespLoginNeeded;
+    }
 
     Event_ListRooms event;
     QMapIterator<int, Server_Room *> roomIterator(server->getRooms());
-    while (roomIterator.hasNext())
+    while (roomIterator.hasNext()) {
         roomIterator.next().value()->getInfo(*event.add_room_list(), false);
+    }
     rc.enqueuePreResponseItem(ServerMessage::SESSION_EVENT, prepareSessionEvent(event));
 
     acceptsRoomListChanges = true;
@@ -677,20 +809,25 @@ Response::ResponseCode Server_ProtocolHandler::cmdListRooms(const Command_ListRo
 
 Response::ResponseCode Server_ProtocolHandler::cmdJoinRoom(const Command_JoinRoom &cmd, ResponseContainer &rc)
 {
-    if (authState == NotLoggedIn)
+    if (authState == NotLoggedIn) {
         return Response::RespLoginNeeded;
+    }
 
-    if (rooms.contains(cmd.room_id()))
+    if (rooms.contains(cmd.room_id())) {
         return Response::RespContextError;
+    }
 
     QReadLocker serverLocker(&server->roomsLock);
     Server_Room *room = server->getRooms().value(cmd.room_id(), 0);
-    if (!room)
+    if (!room) {
         return Response::RespNameNotFound;
+    }
 
-    if (!(userInfo->user_level() & ServerInfo_User::IsModerator))
-        if (!(room->userMayJoin(*userInfo)))
+    if (!(userInfo->user_level() & ServerInfo_User::IsModerator)) {
+        if (!(room->userMayJoin(*userInfo))) {
             return Response::RespUserLevelTooLow;
+        }
+    }
 
     room->addClient(this);
     rooms.insert(room->getId(), room);
@@ -722,17 +859,20 @@ Response::ResponseCode Server_ProtocolHandler::cmdJoinRoom(const Command_JoinRoo
 
 Response::ResponseCode Server_ProtocolHandler::cmdListUsers(const Command_ListUsers & /*cmd*/, ResponseContainer &rc)
 {
-    if (authState == NotLoggedIn)
+    if (authState == NotLoggedIn) {
         return Response::RespLoginNeeded;
+    }
 
     auto *re = new Response_ListUsers;
     server->clientsLock.lockForRead();
     QMapIterator<QString, Server_ProtocolHandler *> userIterator = server->getUsers();
-    while (userIterator.hasNext())
+    while (userIterator.hasNext()) {
         re->add_user_list()->CopyFrom(userIterator.next().value()->copyUserInfo(false));
+    }
     QMapIterator<QString, Server_AbstractUserInterface *> extIterator = server->getExternalUsers();
-    while (extIterator.hasNext())
+    while (extIterator.hasNext()) {
         re->add_user_list()->CopyFrom(extIterator.next().value()->copyUserInfo(false));
+    }
 
     acceptsUserListChanges = true;
     server->clientsLock.unlock();
@@ -799,10 +939,12 @@ Server_ProtocolHandler::cmdRoomSay(const Command_RoomSay &cmd, Server_Room *room
 Response::ResponseCode
 Server_ProtocolHandler::cmdCreateGame(const Command_CreateGame &cmd, Server_Room *room, ResponseContainer &rc)
 {
-    if (authState == NotLoggedIn)
+    if (authState == NotLoggedIn) {
         return Response::RespLoginNeeded;
-    if (cmd.password().length() > MAX_NAME_LENGTH)
+    }
+    if (cmd.password().length() > MAX_NAME_LENGTH) {
         return Response::RespContextError;
+    }
 
     auto level = userInfo->user_level();
     bool isJudge = level & ServerInfo_User::IsJudge;
@@ -838,10 +980,22 @@ Server_ProtocolHandler::cmdCreateGame(const Command_CreateGame &cmd, Server_Room
 
     // When server doesn't permit registered users to exist, do not honor only-reg setting
     bool onlyRegisteredUsers = cmd.only_registered() && (server->permitUnregisteredUsers());
-    auto *game = new Server_Game(copyUserInfo(false), gameId, description, QString::fromStdString(cmd.password()),
-                                 cmd.max_players(), gameTypes, cmd.only_buddies(), onlyRegisteredUsers,
-                                 cmd.spectators_allowed(), cmd.spectators_need_password(), cmd.spectators_can_talk(),
-                                 cmd.spectators_see_everything(), startingLifeTotal, shareDecklistsOnLoad, room);
+    GameConfig config{.creatorInfo = copyUserInfo(false),
+                      .gameId = gameId,
+                      .description = description,
+                      .password = QString::fromStdString(cmd.password()),
+                      .maxPlayers = static_cast<int>(cmd.max_players()),
+                      .gameTypes = gameTypes,
+                      .onlyBuddies = cmd.only_buddies(),
+                      .onlyRegistered = onlyRegisteredUsers,
+                      .spectatorsAllowed = cmd.spectators_allowed(),
+                      .spectatorsNeedPassword = cmd.spectators_need_password(),
+                      .spectatorsCanTalk = cmd.spectators_can_talk(),
+                      .spectatorsSeeEverything = cmd.spectators_see_everything(),
+                      .startingLifeTotal = startingLifeTotal,
+                      .shareDecklistsOnLoad = shareDecklistsOnLoad};
+
+    auto *game = new Server_Game(config, room);
 
     game->addPlayer(this, rc, asSpectator, asJudge, false);
     room->addGame(game);
@@ -852,8 +1006,9 @@ Server_ProtocolHandler::cmdCreateGame(const Command_CreateGame &cmd, Server_Room
 Response::ResponseCode
 Server_ProtocolHandler::cmdJoinGame(const Command_JoinGame &cmd, Server_Room *room, ResponseContainer &rc)
 {
-    if (authState == NotLoggedIn)
+    if (authState == NotLoggedIn) {
         return Response::RespLoginNeeded;
+    }
 
     return room->processJoinGameCommand(cmd, rc, this);
 }
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
index 0d05b91c8..a12706757 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h
@@ -4,33 +4,24 @@
 #include "server.h"
 #include "server_abstractuserinterface.h"
 
+#include <QList>
+#include <QMap>
 #include <QObject>
+#include <QString>
 #include <libcockatrice/protocol/pb/response.pb.h>
-#include <libcockatrice/protocol/pb/server_message.pb.h>
+#include <qtmetamacros.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;
@@ -98,6 +89,12 @@ private:
     {
         return Response::RespFunctionNotAllowed;
     }
+    Response::ResponseCode processDeveloperCommandContainer(const CommandContainer &cont, ResponseContainer &rc);
+    virtual Response::ResponseCode
+    processExtendedDeveloperCommand(int /* cmdType */, const DeveloperCommand & /* cmd */, ResponseContainer & /* rc */)
+    {
+        return Response::RespFunctionNotAllowed;
+    }
 
     void resetIdleTimer();
 private slots:
@@ -129,7 +126,7 @@ public:
         return timeRunning - lastDataReceived;
     }
     bool addSaidMessageSize(int size);
-    void processCommandContainer(const CommandContainer &cont);
+    virtual void processCommandContainer(const CommandContainer &cont);
 
     void sendProtocolItem(const Response &item);
     void sendProtocolItem(const SessionEvent &item);
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h b/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h
index d68656b9d..3bdf04220 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_remoteuserinterface.h
@@ -3,6 +3,9 @@
 
 #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 9b07bdb91..4c4f351c9 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.cpp
@@ -1,8 +1,13 @@
 #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,
@@ -25,8 +30,9 @@ GameEventStorage::GameEventStorage() : gameEventContext(0), privatePlayerId(0)
 GameEventStorage::~GameEventStorage()
 {
     delete gameEventContext;
-    for (int i = 0; i < gameEventList.size(); ++i)
+    for (int i = 0; i < gameEventList.size(); ++i) {
         delete gameEventList[i];
+    }
 }
 
 void GameEventStorage::setGameEventContext(const ::google::protobuf::Message &_gameEventContext)
@@ -44,14 +50,16 @@ void GameEventStorage::enqueueGameEvent(const ::google::protobuf::Message &event
                                         int _privatePlayerId)
 {
     gameEventList.append(new GameEventStorageItem(event, playerId, recipients));
-    if (_privatePlayerId != -1)
+    if (_privatePlayerId != -1) {
         privatePlayerId = _privatePlayerId;
+    }
 }
 
 void GameEventStorage::sendToGame(Server_Game *game)
 {
-    if (gameEventList.isEmpty())
+    if (gameEventList.isEmpty()) {
         return;
+    }
 
     auto *contPrivate = new GameEventContainer;
     auto *contOthers = new GameEventContainer;
@@ -68,10 +76,12 @@ void GameEventStorage::sendToGame(Server_Game *game)
     for (const auto &i : gameEventList) {
         const GameEvent &event = i->getGameEvent();
         const GameEventStorageItem::EventRecipients recipients = i->getRecipients();
-        if (recipients.testFlag(GameEventStorageItem::SendToPrivate))
+        if (recipients.testFlag(GameEventStorageItem::SendToPrivate)) {
             contPrivate->add_event_list()->CopyFrom(event);
-        if (recipients.testFlag(GameEventStorageItem::SendToOthers))
+        }
+        if (recipients.testFlag(GameEventStorageItem::SendToOthers)) {
             contOthers->add_event_list()->CopyFrom(event);
+        }
     }
     if (gameEventContext) {
         contPrivate->mutable_context()->CopyFrom(*gameEventContext);
@@ -88,8 +98,10 @@ ResponseContainer::ResponseContainer(int _cmdId) : cmdId(_cmdId), responseExtens
 ResponseContainer::~ResponseContainer()
 {
     delete responseExtension;
-    for (int i = 0; i < preResponseQueue.size(); ++i)
+    for (int i = 0; i < preResponseQueue.size(); ++i) {
         delete preResponseQueue[i].second;
-    for (int i = 0; i < postResponseQueue.size(); ++i)
+    }
+    for (int i = 0; i < postResponseQueue.size(); ++i) {
         delete postResponseQueue[i].second;
+    }
 }
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 118b32d38..32b7a80a2 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_response_containers.h
@@ -1,10 +1,14 @@
 #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 bfa8912b1..614de8d63 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/server_room.cpp
@@ -1,11 +1,26 @@
 #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 <QDebug>
+#include <QMapIterator>
+#include <QMutexLocker>
+#include <QReadLocker>
+#include <QRecursiveMutex>
+#include <QSharedPointer>
 #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>
@@ -15,7 +30,11 @@
 #include <libcockatrice/protocol/pb/room_commands.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_chat_message.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_room.pb.h>
-#include <libcockatrice/utility/trice_limits.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,
@@ -42,8 +61,9 @@ Server_Room::~Server_Room()
 
     gamesLock.lockForWrite();
     const QList<Server_Game *> gameList = games.values();
-    for (int i = 0; i < gameList.size(); ++i)
+    for (int i = 0; i < gameList.size(); ++i) {
         delete gameList[i];
+    }
     games.clear();
     gamesLock.unlock();
 
@@ -55,19 +75,23 @@ Server_Room::~Server_Room()
 bool Server_Room::userMayJoin(const ServerInfo_User &userInfo)
 {
 
-    if (permissionLevel.toLower() == "administrator" || permissionLevel.toLower() == "moderator")
+    if (permissionLevel.toLower() == "administrator" || permissionLevel.toLower() == "moderator") {
         return false;
+    }
 
-    if (permissionLevel.toLower() == "registered" && !(userInfo.user_level() & ServerInfo_User::IsRegistered))
+    if (permissionLevel.toLower() == "registered" && !(userInfo.user_level() & ServerInfo_User::IsRegistered)) {
         return false;
+    }
 
     if (privilegeLevel.toLower() != "none") {
         if (privilegeLevel.toLower() == "privileged") {
-            if (privilegeLevel.toLower() == "none")
+            if (privilegeLevel.toLower() == "none") {
                 return false;
+            }
         } else {
-            if (privilegeLevel.toLower() != QString::fromStdString(userInfo.privlevel()).toLower())
+            if (privilegeLevel.toLower() != QString::fromStdString(userInfo.privlevel()).toLower()) {
                 return false;
+            }
         }
     }
     return true;
@@ -92,12 +116,14 @@ Server_Room::getInfo(ServerInfo_Room &result, bool complete, bool showGameTypes,
     result.set_game_count(games.size() + externalGames.size());
     if (complete) {
         QMapIterator<int, Server_Game *> gameIterator(games);
-        while (gameIterator.hasNext())
+        while (gameIterator.hasNext()) {
             gameIterator.next().value()->getInfo(*result.add_game_list());
+        }
         if (includeExternalData) {
             QMapIterator<int, ServerInfo_Game> externalGameIterator(externalGames);
-            while (externalGameIterator.hasNext())
+            while (externalGameIterator.hasNext()) {
                 result.add_game_list()->CopyFrom(externalGameIterator.next().value());
+            }
         }
     }
     gamesLock.unlock();
@@ -106,22 +132,25 @@ Server_Room::getInfo(ServerInfo_Room &result, bool complete, bool showGameTypes,
     result.set_player_count(users.size() + externalUsers.size());
     if (complete) {
         QMapIterator<QString, Server_ProtocolHandler *> userIterator(users);
-        while (userIterator.hasNext())
+        while (userIterator.hasNext()) {
             result.add_user_list()->CopyFrom(userIterator.next().value()->copyUserInfo(false));
+        }
         if (includeExternalData) {
             QMapIterator<QString, ServerInfo_User_Container> externalUserIterator(externalUsers);
-            while (externalUserIterator.hasNext())
+            while (externalUserIterator.hasNext()) {
                 result.add_user_list()->CopyFrom(externalUserIterator.next().value().copyUserInfo(false));
+            }
         }
     }
     usersLock.unlock();
 
-    if (complete || showGameTypes)
+    if (complete || showGameTypes) {
         for (int i = 0; i < gameTypes.size(); ++i) {
             ServerInfo_GameType *gameTypeInfo = result.add_gametype_list();
             gameTypeInfo->set_game_type_id(i);
             gameTypeInfo->set_description(gameTypes[i].toStdString());
         }
+    }
 
     return result;
 }
@@ -208,8 +237,9 @@ void Server_Room::removeExternalUser(const QString &_name)
     roomInfo.set_room_id(id);
 
     usersLock.lockForWrite();
-    if (externalUsers.contains(_name))
+    if (externalUsers.contains(_name)) {
         externalUsers.remove(_name);
+    }
     roomInfo.set_player_count(users.size() + externalUsers.size());
     usersLock.unlock();
 
@@ -227,10 +257,11 @@ void Server_Room::updateExternalGameList(const ServerInfo_Game &gameInfo)
     roomInfo.set_room_id(id);
 
     gamesLock.lockForWrite();
-    if (!gameInfo.has_player_count() && externalGames.contains(gameInfo.game_id()))
+    if (!gameInfo.has_player_count() && externalGames.contains(gameInfo.game_id())) {
         externalGames.remove(gameInfo.game_id());
-    else
+    } else {
         externalGames.insert(gameInfo.game_id(), gameInfo);
+    }
     roomInfo.set_game_count(games.size() + externalGames.size());
     gamesLock.unlock();
 
@@ -242,8 +273,9 @@ Response::ResponseCode Server_Room::processJoinGameCommand(const Command_JoinGam
                                                            ResponseContainer &rc,
                                                            Server_AbstractUserInterface *userInterface)
 {
-    if (cmd.password().length() > MAX_NAME_LENGTH)
+    if (cmd.password().length() > MAX_NAME_LENGTH) {
         return Response::RespWrongPassword;
+    }
     // This function is called from the Server thread and from the S_PH thread.
     // server->roomsMutex is always locked.
 
@@ -271,8 +303,9 @@ Response::ResponseCode Server_Room::processJoinGameCommand(const Command_JoinGam
     Response::ResponseCode result =
         game->checkJoin(userInterface->getUserInfo(), QString::fromStdString(cmd.password()), cmd.spectator(),
                         cmd.override_restrictions(), cmd.join_as_judge());
-    if (result == Response::RespOk)
+    if (result == Response::RespOk) {
         game->addPlayer(userInterface, rc, cmd.spectator(), cmd.join_as_judge());
+    }
 
     return result;
 }
@@ -329,13 +362,15 @@ void Server_Room::sendRoomEvent(RoomEvent *event, bool sendToIsl)
     usersLock.lockForRead();
     {
         QMapIterator<QString, Server_ProtocolHandler *> userIterator(users);
-        while (userIterator.hasNext())
+        while (userIterator.hasNext()) {
             userIterator.next().value()->sendProtocolItem(*event);
+        }
     }
     usersLock.unlock();
 
-    if (sendToIsl)
+    if (sendToIsl) {
         static_cast<Server *>(parent())->sendIsl_RoomEvent(*event);
+    }
 
     delete event;
 }
@@ -405,9 +440,11 @@ int Server_Room::getGamesCreatedByUser(const QString &userName) const
 
     QMapIterator<int, Server_Game *> gamesIterator(games);
     int result = 0;
-    while (gamesIterator.hasNext())
-        if (gamesIterator.next().value()->getCreatorInfo()->name() == userName.toStdString())
+    while (gamesIterator.hasNext()) {
+        if (gamesIterator.next().value()->getCreatorInfo()->name() == userName.toStdString()) {
             ++result;
+        }
+    }
     return result;
 }
 
diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_room.h b/libcockatrice_network/libcockatrice/network/server/remote/server_room.h
index 3d9988f20..5933894d5 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 "serverinfo_user_container.h"
-
+#include <QList>
 #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,10 +18,17 @@ 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_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp b/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp
index 77ff38906..24e734a4e 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/serverinfo_user_container.cpp
@@ -13,10 +13,11 @@ ServerInfo_User_Container::ServerInfo_User_Container(const ServerInfo_User &_use
 
 ServerInfo_User_Container::ServerInfo_User_Container(const ServerInfo_User_Container &other)
 {
-    if (other.userInfo)
+    if (other.userInfo) {
         userInfo = new ServerInfo_User(*other.userInfo);
-    else
+    } else {
         userInfo = nullptr;
+    }
 }
 
 ServerInfo_User_Container::~ServerInfo_User_Container()
@@ -45,8 +46,9 @@ ServerInfo_User &ServerInfo_User_Container::copyUserInfo(ServerInfo_User &result
             result.clear_id();
             result.clear_email();
         }
-        if (!complete)
+        if (!complete) {
             result.clear_avatar_bmp();
+        }
     }
     return result;
 }
diff --git a/libcockatrice_protocol/CMakeLists.txt b/libcockatrice_protocol/CMakeLists.txt
index 7dc0a0360..55184045a 100644
--- a/libcockatrice_protocol/CMakeLists.txt
+++ b/libcockatrice_protocol/CMakeLists.txt
@@ -24,3 +24,5 @@ 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 f0c3448b5..f892c3f15 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp
+++ b/libcockatrice_protocol/libcockatrice/protocol/debug_pb_message.cpp
@@ -1,11 +1,13 @@
 #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/trice_limits.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
@@ -58,8 +60,9 @@ void SafePrinter::applySafePrinter(const ::google::protobuf::Message &message,
             case ::google::protobuf::FieldDescriptor::CPPTYPE_STRING:
                 if (field->name().find("password") != std::string::npos) { // name contains password
                     auto *safePrinter = new SafePrinter();
-                    if (!printer.RegisterFieldValuePrinter(field, safePrinter))
+                    if (!printer.RegisterFieldValuePrinter(field, safePrinter)) {
                         delete safePrinter; // in case safePrinter has not been taken ownership of
+                    }
                 }
                 break;
             case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE:
@@ -101,6 +104,10 @@ QString getSafeDebugString(const ::google::protobuf::Message &message)
 #endif // GOOGLE_PROTOBUF_VERSION > 3004000
 
     std::string debug_string;
-    printer.PrintToString(message, &debug_string);
-    return QString::number(size) + " bytes " + QString::fromStdString(debug_string);
+    bool ok = printer.PrintToString(message, &debug_string);
+    if (ok) {
+        return QString::number(size) + " bytes " + QString::fromStdString(debug_string);
+    } else {
+        return "[could not convert message to string]";
+    }
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp b/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
index 1b08c4040..0f8fd4210 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
+++ b/libcockatrice_protocol/libcockatrice/protocol/featureset.cpp
@@ -1,6 +1,7 @@
 #include "featureset.h"
 
 #include <QMap>
+#include <QSharedPointer>
 
 FeatureSet::FeatureSet()
 {
@@ -33,14 +34,16 @@ void FeatureSet::initalizeFeatureList(QMap<QString, bool> &_featureList)
 
 void FeatureSet::enableRequiredFeature(QMap<QString, bool> &_featureList, const QString &featureName)
 {
-    if (_featureList.contains(featureName))
+    if (_featureList.contains(featureName)) {
         _featureList.insert(featureName, true);
+    }
 }
 
 void FeatureSet::disableRequiredFeature(QMap<QString, bool> &_featureList, const QString &featureName)
 {
-    if (_featureList.contains(featureName))
+    if (_featureList.contains(featureName)) {
         _featureList.insert(featureName, false);
+    }
 }
 
 QMap<QString, bool>
diff --git a/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp b/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp
index d6235858a..b9d2f18d0 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp
+++ b/libcockatrice_protocol/libcockatrice/protocol/get_pb_extension.cpp
@@ -2,13 +2,16 @@
 
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/message.h>
+#include <vector>
 
 int getPbExtension(const ::google::protobuf::Message &message)
 {
     std::vector<const ::google::protobuf::FieldDescriptor *> fieldList;
     message.GetReflection()->ListFields(message, &fieldList);
-    for (unsigned int j = 0; j < fieldList.size(); ++j)
-        if (fieldList[j]->is_extension())
+    for (unsigned int j = 0; j < fieldList.size(); ++j) {
+        if (fieldList[j]->is_extension()) {
             return fieldList[j]->number();
+        }
+    }
     return -1;
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt
index 212ab69dd..4e4f0e190 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt
@@ -15,9 +15,17 @@ set(PROTO_FILES
     command_deck_del.proto
     command_deck_del_dir.proto
     command_deck_download.proto
+    command_deck_download_public.proto
     command_deck_list.proto
+    command_deck_list_other_user.proto
     command_deck_new_dir.proto
     command_deck_select.proto
+    command_deck_set_visibility.proto
+    command_deck_share_create.proto
+    command_deck_share_download.proto
+    command_deck_share_list.proto
+    command_deck_share_list_mine.proto
+    command_deck_share_remove.proto
     command_deck_upload.proto
     command_del_counter.proto
     command_delete_arrow.proto
@@ -25,6 +33,7 @@ set(PROTO_FILES
     command_dump_zone.proto
     command_flip_card.proto
     command_game_say.proto
+    command_get_server_stats.proto
     command_inc_card_counter.proto
     command_inc_counter.proto
     command_kick_from_game.proto
@@ -35,10 +44,21 @@ set(PROTO_FILES
     command_ready_start.proto
     command_replay_delete_match.proto
     command_replay_download.proto
+    command_replay_download_by_game_id.proto
     command_replay_get_code.proto
     command_replay_list.proto
     command_replay_modify_match.proto
     command_replay_submit_code.proto
+    command_report.proto
+    command_report_add_comment.proto
+    command_report_assign.proto
+    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
     command_reveal_cards.proto
     command_reverse_turn.proto
     command_roll_die.proto
@@ -46,6 +66,7 @@ set(PROTO_FILES
     command_set_card_attr.proto
     command_set_card_counter.proto
     command_set_counter.proto
+    command_set_playmat.proto
     command_set_sideboard_lock.proto
     command_set_sideboard_plan.proto
     command_shuffle.proto
@@ -60,6 +81,7 @@ set(PROTO_FILES
     context_ready_start.proto
     context_set_sideboard_lock.proto
     context_undo_draw.proto
+    developer_commands.proto
     event_add_to_list.proto
     event_attach_card.proto
     event_change_zone_properties.proto
@@ -76,9 +98,9 @@ set(PROTO_FILES
     event_game_closed.proto
     event_game_host_changed.proto
     event_game_joined.proto
+    event_game_log_notice.proto
     event_game_say.proto
     event_game_state_changed.proto
-    event_game_state_changed.proto
     event_join.proto
     event_join_room.proto
     event_kicked.proto
@@ -121,13 +143,19 @@ set(PROTO_FILES
     response_activate.proto
     response_adjust_mod.proto
     response_ban_history.proto
+    response_card_art_rule_entry.proto
     response_deck_download.proto
     response_deck_list.proto
+    response_deck_share_create.proto
+    response_deck_share_download.proto
+    response_deck_share_list.proto
+    response_deck_share_list_mine.proto
     response_deck_upload.proto
     response_dump_zone.proto
     response_forgotpasswordrequest.proto
     response_get_admin_notes.proto
     response_get_games_of_user.proto
+    response_get_server_stats.proto
     response_get_user_info.proto
     response_join_room.proto
     response_list_users.proto
@@ -135,8 +163,19 @@ set(PROTO_FILES
     response_password_salt.proto
     response_register.proto
     response_replay_download.proto
+    response_replay_download_by_game_id.proto
     response_replay_get_code.proto
     response_replay_list.proto
+    response_report_details.proto
+    response_report_list.proto
+    response_report_my_list.proto
+    response_report_stats.proto
+    response_report_user_info.proto
+    response_moderator_last_logins.proto
+    response_remove_user_avatar.proto
+    response_reset_user_password.proto
+    response_user_alts.proto
+    response_user_sessions.proto
     response_viewlog_history.proto
     response_warn_history.proto
     response_warn_list.proto
@@ -149,16 +188,22 @@ set(PROTO_FILES
     serverinfo_cardcounter.proto
     serverinfo_chat_message.proto
     serverinfo_counter.proto
+    serverinfo_deck_share_item.proto
+    serverinfo_deck_share_summary.proto
     serverinfo_deckstorage.proto
     serverinfo_game.proto
     serverinfo_gametype.proto
+    serverinfo_moderator_login.proto
     serverinfo_player.proto
     serverinfo_playerping.proto
     serverinfo_playerproperties.proto
     serverinfo_replay.proto
     serverinfo_replay_match.proto
+    serverinfo_report.proto
     serverinfo_room.proto
     serverinfo_user.proto
+    serverinfo_user_alt.proto
+    serverinfo_user_session.proto
     serverinfo_warning.proto
     serverinfo_zone.proto
     session_commands.proto
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/admin_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/admin_commands.proto
index 8faaec2d2..f1f85e376 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/admin_commands.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/admin_commands.proto
@@ -5,6 +5,7 @@ message AdminCommand {
         SHUTDOWN_SERVER = 1001;
         RELOAD_CONFIG = 1002;
         ADJUST_MOD = 1003;
+        RESET_USER_PASSWORD = 1016;
     }
     extensions 100 to max;
 }
@@ -36,4 +37,12 @@ message Command_AdjustMod {
     required string user_name = 1;
     optional bool should_be_mod = 2;
     optional bool should_be_judge = 3;
+    optional bool should_be_developer = 4;
+}
+
+message Command_ResetUserPassword {
+    extend AdminCommand {
+        optional Command_ResetUserPassword ext = 1016;
+    }
+    optional string user_name = 1;
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_download_public.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_download_public.proto
new file mode 100644
index 000000000..a5592ef51
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_download_public.proto
@@ -0,0 +1,9 @@
+syntax = "proto2";
+import "session_commands.proto";
+
+message Command_DeckDownloadPublic {
+    extend SessionCommand {
+        optional Command_DeckDownloadPublic ext = 1031;
+    }
+    optional uint32 deck_id = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_list_other_user.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_list_other_user.proto
new file mode 100644
index 000000000..2459608e2
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_list_other_user.proto
@@ -0,0 +1,9 @@
+syntax = "proto2";
+import "session_commands.proto";
+
+message Command_DeckListOtherUser {
+    extend SessionCommand {
+        optional Command_DeckListOtherUser ext = 1029;
+    }
+    optional string user_name = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_set_visibility.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_set_visibility.proto
new file mode 100644
index 000000000..3ada87973
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_set_visibility.proto
@@ -0,0 +1,13 @@
+syntax = "proto2";
+import "session_commands.proto";
+
+message Command_DeckSetVisibility {
+    extend SessionCommand {
+        optional Command_DeckSetVisibility ext = 1030;
+    }
+    // Set the public visibility of a single deck (mutually exclusive with folder_path).
+    optional uint32 deck_id = 1;
+    // Set the public visibility of a folder (all decks under it inherit).
+    optional string folder_path = 2;
+    optional bool is_public = 3;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_create.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_create.proto
new file mode 100644
index 000000000..9cebf8eae
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_create.proto
@@ -0,0 +1,24 @@
+syntax = "proto2";
+import "session_commands.proto";
+
+message DeckShareItem {
+    // Reference an existing deck in the sharer's personal deck storage.
+    // Mutually exclusive with deck_list.
+    optional uint32 deck_id = 1;
+    // Inline deck content in the native format.
+    // Mutually exclusive with deck_id.
+    optional string deck_list = 2;
+    // Color identity of the deck (e.g. "WUBRG"), computed by the sharing client.
+    optional string color_identity = 3;
+}
+
+message Command_DeckShareCreate {
+    extend SessionCommand {
+        optional Command_DeckShareCreate ext = 1026;
+    }
+    optional string name = 1;
+    repeated DeckShareItem items = 2;
+    // Path of a folder in the sharer's personal deck storage. When set, all
+    // decks in that folder are shared (resolved by the server).
+    optional string folder_path = 3;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_download.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_download.proto
new file mode 100644
index 000000000..251a662b3
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_download.proto
@@ -0,0 +1,10 @@
+syntax = "proto2";
+import "session_commands.proto";
+
+message Command_DeckShareDownload {
+    extend SessionCommand {
+        optional Command_DeckShareDownload ext = 1028;
+    }
+    optional string token = 1;
+    optional uint32 item_id = 2;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_list.proto
new file mode 100644
index 000000000..b75fd65f9
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_list.proto
@@ -0,0 +1,9 @@
+syntax = "proto2";
+import "session_commands.proto";
+
+message Command_DeckShareList {
+    extend SessionCommand {
+        optional Command_DeckShareList ext = 1027;
+    }
+    optional string token = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_list_mine.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_list_mine.proto
new file mode 100644
index 000000000..75bc30714
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_list_mine.proto
@@ -0,0 +1,10 @@
+syntax = "proto2";
+import "session_commands.proto";
+
+// Requests the list of share bundles created by the calling user, so they can
+// be reviewed and revoked before they expire.
+message Command_DeckShareListMine {
+    extend SessionCommand {
+        optional Command_DeckShareListMine ext = 1032;
+    }
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_remove.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_remove.proto
new file mode 100644
index 000000000..348996da9
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_remove.proto
@@ -0,0 +1,11 @@
+syntax = "proto2";
+import "session_commands.proto";
+
+// Revokes one of the calling user's own share bundles. The referenced items
+// are removed by cascade.
+message Command_DeckShareRemove {
+    extend SessionCommand {
+        optional Command_DeckShareRemove ext = 1033;
+    }
+    optional uint32 share_id = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_upload.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_upload.proto
index 63d9c80ef..1a5d44e9e 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_upload.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_upload.proto
@@ -8,4 +8,10 @@ message Command_DeckUpload {
     optional string path = 1;    // to upload a new deck
     optional uint32 deck_id = 2; // to replace an existing deck
     optional string deck_list = 3;
+    optional bool is_public = 4; // mark the deck public on upload (publish)
+    // The server derives the banner card and tags from deck_list, so clients only
+    // need to send the color identity, which cannot be computed server-side.
+    reserved 5, 6, 8;
+    reserved "banner_card_name", "banner_card_provider", "tags";
+    optional string color_identity = 7;
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_get_server_stats.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_get_server_stats.proto
new file mode 100644
index 000000000..33c56293b
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_get_server_stats.proto
@@ -0,0 +1,8 @@
+syntax = "proto2";
+import "developer_commands.proto";
+
+message Command_GetServerStats {
+    extend DeveloperCommand {
+        optional Command_GetServerStats ext = 1000;
+    }
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_move_card.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_move_card.proto
index 6e9301d27..a5b96da2e 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_move_card.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_move_card.proto
@@ -6,7 +6,9 @@ message CardToMove {
     // Id of the card in its current zone
     optional sint32 card_id = 1 [default = -1];
 
-    // Places the card face down, hiding its name
+    // If true, places the card face down, hiding its name.
+    // If false, forcibly turns the card face up.
+    // If not set, defers the resulting face down state to the server.
     optional bool face_down = 2;
 
     // When moving add this value to the power/toughness field of the card
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_download_by_game_id.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_download_by_game_id.proto
new file mode 100644
index 000000000..8fa61a517
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_replay_download_by_game_id.proto
@@ -0,0 +1,9 @@
+syntax = "proto2";
+import "moderator_commands.proto";
+
+message Command_ReplayDownloadByGameId {
+    extend ModeratorCommand {
+        optional Command_ReplayDownloadByGameId ext = 1203;
+    }
+    required sint32 game_id = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_report.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report.proto
new file mode 100644
index 000000000..3a8c1548e
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report.proto
@@ -0,0 +1,13 @@
+syntax = "proto2";
+import "session_commands.proto";
+
+message Command_Report {
+    extend SessionCommand {
+        optional Command_Report ext = 1200;
+    }
+    optional string reported_user = 1;
+    optional int32 game_id = 2;
+    optional string category = 3;
+    optional string description = 4;
+    optional string chat_log = 5;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_add_comment.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_add_comment.proto
new file mode 100644
index 000000000..1fc5696e5
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_add_comment.proto
@@ -0,0 +1,10 @@
+syntax = "proto2";
+import "session_commands.proto";
+
+message Command_ReportAddComment {
+    extend SessionCommand {
+        optional Command_ReportAddComment ext = 1205;
+    }
+    required int32 report_id = 1;
+    required string comment = 2;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_assign.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_assign.proto
new file mode 100644
index 000000000..2b72205f8
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_assign.proto
@@ -0,0 +1,9 @@
+syntax = "proto2";
+import "moderator_commands.proto";
+
+message Command_ReportAssign {
+    extend ModeratorCommand {
+        optional Command_ReportAssign ext = 1201;
+    }
+    required int32 report_id = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_details.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_details.proto
new file mode 100644
index 000000000..e3ae8cfb4
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_details.proto
@@ -0,0 +1,9 @@
+syntax = "proto2";
+import "session_commands.proto";
+
+message Command_ReportDetails {
+    extend SessionCommand {
+        optional Command_ReportDetails ext = 1206;
+    }
+    required int32 report_id = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_list.proto
new file mode 100644
index 000000000..6993de1a7
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_list.proto
@@ -0,0 +1,11 @@
+syntax = "proto2";
+import "moderator_commands.proto";
+
+message Command_ReportList {
+    extend ModeratorCommand {
+        optional Command_ReportList ext = 1200;
+    }
+    optional bool unresolved_only = 1;
+    optional uint32 offset = 2 [default = 0];
+    optional uint32 limit = 3 [default = 100];
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_my_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_my_list.proto
new file mode 100644
index 000000000..7ee18a65d
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_my_list.proto
@@ -0,0 +1,8 @@
+syntax = "proto2";
+import "session_commands.proto";
+
+message Command_ReportMyList {
+    extend SessionCommand {
+        optional Command_ReportMyList ext = 1204;
+    }
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_reopen.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_reopen.proto
new file mode 100644
index 000000000..1f9c707e8
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_reopen.proto
@@ -0,0 +1,10 @@
+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/command_report_resolve.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_resolve.proto
new file mode 100644
index 000000000..312ca0f9d
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_resolve.proto
@@ -0,0 +1,11 @@
+syntax = "proto2";
+import "moderator_commands.proto";
+
+message Command_ReportResolve {
+    extend ModeratorCommand {
+        optional Command_ReportResolve ext = 1202;
+    }
+    required int32 report_id = 1;
+    optional string resolution_note = 2;
+    optional bool dismissed = 3;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_stats.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_stats.proto
new file mode 100644
index 000000000..b3c6eb1a9
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_stats.proto
@@ -0,0 +1,8 @@
+syntax = "proto2";
+import "moderator_commands.proto";
+
+message Command_ReportStats {
+    extend ModeratorCommand {
+        optional Command_ReportStats ext = 1205;
+    }
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_user_info.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_user_info.proto
new file mode 100644
index 000000000..8f83cb5a3
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_report_user_info.proto
@@ -0,0 +1,9 @@
+syntax = "proto2";
+import "moderator_commands.proto";
+
+message Command_ReportUserInfo {
+    extend ModeratorCommand {
+        optional Command_ReportUserInfo ext = 1204;
+    }
+    optional string user_name = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_playmat.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_playmat.proto
new file mode 100644
index 000000000..ad9a29a44
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_set_playmat.proto
@@ -0,0 +1,9 @@
+syntax = "proto2";
+import "game_commands.proto";
+import "serverinfo_playerproperties.proto";
+message Command_SetPlaymat {
+    extend GameCommand {
+        optional Command_SetPlaymat ext = 1035;
+    }
+    optional ServerInfo_PlayerProperties.PlaymatParams playmat_params = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/commands.proto
index b6eaf6733..964407819 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/commands.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/commands.proto
@@ -4,6 +4,7 @@ import "game_commands.proto";
 import "room_commands.proto";
 import "moderator_commands.proto";
 import "admin_commands.proto";
+import "developer_commands.proto";
 
 message CommandContainer {
     optional uint64 cmd_id = 1;
@@ -16,4 +17,5 @@ message CommandContainer {
     repeated RoomCommand room_command = 102;
     repeated ModeratorCommand moderator_command = 103;
     repeated AdminCommand admin_command = 104;
+    repeated DeveloperCommand developer_command = 105;
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/developer_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/developer_commands.proto
new file mode 100644
index 000000000..bed47d44c
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/developer_commands.proto
@@ -0,0 +1,8 @@
+syntax = "proto2";
+message DeveloperCommand {
+    enum DeveloperCommandType {
+        GET_SERVER_STATS = 1000;
+        VIEWLOG_HISTORY = 1001;
+    }
+    extensions 100 to max;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_log_notice.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_log_notice.proto
new file mode 100644
index 000000000..ef0dcc102
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/event_game_log_notice.proto
@@ -0,0 +1,20 @@
+syntax = "proto2";
+import "game_event.proto";
+
+// Notifies clients of an event that happened, and which could safely be dropped without affect the game state.
+// This mostly just means events that should cause a message to be logged to chat.
+message Event_GameLogNotice {
+
+    // The type of the notice.
+    // Clients who do not recognize the type should drop the event.
+    enum NoticeType {
+        // Player's "undo draw" command failed due to losing track of recent draw
+        UNDO_DRAW_FAILED = 1;
+    }
+
+    extend GameEvent {
+        optional Event_GameLogNotice ext = 2022;
+    }
+
+    optional NoticeType notice_type = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/event_notify_user.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/event_notify_user.proto
index 3a90d278b..b722dfc71 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/event_notify_user.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/event_notify_user.proto
@@ -9,6 +9,8 @@ message Event_NotifyUser {
         WARNING = 2;
         IDLEWARNING = 3;
         CUSTOM = 4;
+        REPORT_RESOLVED = 5;
+        REPORT_COMMENT = 6;
     }
 
     extend SessionEvent {
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto
index 796f4fc68..2e5b88978 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/game_commands.proto
@@ -1,56 +1,202 @@
 syntax = "proto2";
 
-// Commands that are sent during a game to change the game state
+/// Commands that are sent during a game to change the game state
 message GameCommand {
+
+    /// Identifies the concrete game command to execute
     enum GameCommandType {
+
+        /// Kick a player from the game.
+        /// Server: Server_AbstractParticipant::cmdKickFromGame
+        /// Client: reflected via game state events
         KICK_FROM_GAME = 1000;
+
+        /// Leave the current game voluntarily.
+        /// Server: Server_AbstractParticipant::cmdLeaveGame
+        /// Client: reflected via game state events
         LEAVE_GAME = 1001;
+
+        /// Send an in-game chat message.
+        /// Server: Server_AbstractParticipant::cmdGameSay
+        /// Client: PlayerEventHandler::eventGameSay
         GAME_SAY = 1002;
+
+        /// Shuffle a zone (typically the library).
+        /// Server: Server_Player::cmdShuffle
+        /// Client: PlayerEventHandler::eventShuffle
         SHUFFLE = 1003;
+
+        /// Take a mulligan at game start.
+        /// Server: Server_Player::cmdMulligan
+        /// Client: reflected via game state events
         MULLIGAN = 1004;
+
+        /// Roll one or more dice.
+        /// Server: Server_AbstractPlayer::cmdRollDie
+        /// Client: PlayerEventHandler::eventRollDie
         ROLL_DIE = 1005;
+
+        /// Draw cards from the deck.
+        /// Server: Server_Player::cmdDrawCards
+        /// Client: PlayerEventHandler::eventDrawCards
         DRAW_CARDS = 1006;
+
+        /// Undo a previous draw action.
+        /// Server: Server_Player::cmdUndoDraw
+        /// Client: PlayerEventHandler::eventMoveCard (Context_UndoDraw)
         UNDO_DRAW = 1007;
+
+        /// Flip a card face up or face down.
+        /// Server: Server_AbstractPlayer::cmdFlipCard
+        /// Client: PlayerEventHandler::eventFlipCard
         FLIP_CARD = 1008;
+
+        /// Attach one card to another.
+        /// Server: Server_AbstractPlayer::cmdAttachCard
+        /// Client: PlayerEventHandler::eventAttachCard
         ATTACH_CARD = 1009;
+
+        /// Create a token card.
+        /// Server: Server_AbstractPlayer::cmdCreateToken
+        /// Client: PlayerEventHandler::eventCreateToken
         CREATE_TOKEN = 1010;
+
+        /// Create a visual arrow between objects.
+        /// Server: Server_AbstractPlayer::cmdCreateArrow
+        /// Client: PlayerEventHandler::eventCreateArrow
         CREATE_ARROW = 1011;
+
+        /// Delete a visual arrow.
+        /// Server: Server_AbstractPlayer::cmdDeleteArrow
+        /// Client: PlayerEventHandler::eventDeleteArrow
         DELETE_ARROW = 1012;
+
+        /// Set a card attribute (e.g. tapped, flipped).
+        /// Server: Server_AbstractPlayer::cmdSetCardAttr
+        /// Client: PlayerEventHandler::eventSetCardAttr
         SET_CARD_ATTR = 1013;
+
+        /// Set a counter value on a card.
+        /// Server: Server_AbstractPlayer::cmdSetCardCounter
+        /// Client: PlayerEventHandler::eventSetCardCounter
         SET_CARD_COUNTER = 1014;
+
+        /// Increment a counter on a card.
+        /// Server: Server_AbstractPlayer::cmdIncCardCounter
+        /// Client: PlayerEventHandler::eventSetCardCounter
         INC_CARD_COUNTER = 1015;
+
+        /// Mark the player as ready to start the game.
+        /// Server: Server_AbstractPlayer::cmdReadyStart
+        /// Client: reflected via game state events
         READY_START = 1016;
+
+        /// Concede the game.
+        /// Server: Server_AbstractPlayer::cmdConcede
+        /// Client: reflected via game state events
         CONCEDE = 1017;
+
+        /// Increment a global (non-card) counter.
+        /// Server: Server_Player::cmdIncCounter
+        /// Client: PlayerEventHandler::eventSetCounter
         INC_COUNTER = 1018;
+
+        /// Create a new global counter.
+        /// Server: Server_Player::cmdCreateCounter
+        /// Client: PlayerEventHandler::eventCreateCounter
         CREATE_COUNTER = 1019;
+
+        /// Set a global counter value.
+        /// Server: Server_Player::cmdSetCounter
+        /// Client: PlayerEventHandler::eventSetCounter
         SET_COUNTER = 1020;
+
+        /// Delete a global counter.
+        /// Server: Server_Player::cmdDelCounter
+        /// Client: PlayerEventHandler::eventDelCounter
         DEL_COUNTER = 1021;
+
+        /// Advance to the next turn.
+        /// Server: Server_Player::cmdNextTurn
+        /// Client: reflected via active player / phase events
         NEXT_TURN = 1022;
+
+        /// Set the active phase of the turn.
+        /// Server: Server_Player::cmdSetActivePhase
+        /// Client: reflected via game state events
         SET_ACTIVE_PHASE = 1023;
+
+        /// Dump the contents of a zone.
+        /// Server: Server_AbstractPlayer::cmdDumpZone
+        /// Client: PlayerEventHandler::eventDumpZone
         DUMP_ZONE = 1024;
-        // STOP_DUMP_ZONE = 1025; // obsolete
+
+        /// Reveal specific cards to players.
+        /// Server: Server_AbstractPlayer::cmdRevealCards
+        /// Client: PlayerEventHandler::eventRevealCards
         REVEAL_CARDS = 1026;
+
+        /// Move a card between zones.
+        /// Server: Server_AbstractPlayer::cmdMoveCard
+        /// Client: PlayerEventHandler::eventMoveCard
         MOVE_CARD = 1027;
+
+        /// Set the sideboard plan for the game.
+        /// Server: Server_Player::cmdSetSideboardPlan
+        /// Client: not forwarded as a game event
         SET_SIDEBOARD_PLAN = 1028;
+
+        /// Select a deck for the game.
+        /// Server: Server_Player::cmdDeckSelect
+        /// Client: reflected via lobby / game state
         DECK_SELECT = 1029;
+
+        /// Lock or unlock sideboarding.
+        /// Server: Server_Player::cmdSetSideboardLock
+        /// Client: reflected via game state
         SET_SIDEBOARD_LOCK = 1030;
+
+        /// Change zone properties (visibility, reveal-top, etc.).
+        /// Server: Server_Player::cmdChangeZoneProperties
+        /// Client: PlayerEventHandler::eventChangeZoneProperties
         CHANGE_ZONE_PROPERTIES = 1031;
+
+        /// Undo a previous concede.
+        /// Server: Server_AbstractPlayer::cmdUnconcede
+        /// Client: reflected via game state
         UNCONCEDE = 1032;
+
+        /// Execute a command on behalf of another player.
+        /// Server: Server_AbstractParticipant::cmdJudge
+        /// Client: transparent (wrapped commands handled normally)
         JUDGE = 1033;
+
+        /// Reverse the current turn order.
+        /// Server: Server_Player::cmdReverseTurn
+        /// Client: reflected via subsequent turn events
         REVERSE_TURN = 1034;
+
+        /// Set the player's playmat independently of the deck.
+        /// Server: Server_Player::cmdSetPlaymat
+        /// Client: reflected via player properties changed event
+        SET_PLAYMAT = 1035;
     }
+
     extensions 100 to max;
 }
 
-// A wrapper around a normal game command that allows a privileged user to send a command on behalf of another player
+/// A wrapper around a normal game command that allows a privileged user
+/// to send a command on behalf of another player.
 message Command_Judge {
+
     extend GameCommand {
+        /// Judge command extension payload
         optional Command_Judge ext = 1033;
     }
 
-    // The player on whose behalf this command is sent
+    /// The player on whose behalf this command is sent.
     optional sint32 target_id = 1 [default = -1];
 
-    // The wrapped game command
+    /// One or more wrapped game commands to execute.
     repeated GameCommand game_command = 2;
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto
index 8682128af..7d3147701 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/game_event.proto
@@ -33,6 +33,7 @@ message GameEvent {
         // STOP_DUMP_ZONE = 2019; // obsolete
         CHANGE_ZONE_PROPERTIES = 2020;
         REVERSE_TURN = 2021;
+        GAME_LOG_NOTICE = 2022;
     }
     optional sint32 player_id = 1 [default = -1];
     extensions 100 to max;
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto
index 9d01b51d2..5298d3dad 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto
@@ -1,4 +1,5 @@
 syntax = "proto2";
+import "developer_commands.proto";
 message ModeratorCommand {
     enum ModeratorCommandType {
         BAN_FROM_SERVER = 1000;
@@ -11,6 +12,21 @@ message ModeratorCommand {
         FORCE_ACTIVATE_USER = 1007;
         GET_ADMIN_NOTES = 1008;
         UPDATE_ADMIN_NOTES = 1009;
+        ADD_CARD_ART_RULE = 1010;
+        REMOVE_CARD_ART_RULE = 1011;
+        LIST_CARD_ART_RULES = 1012;
+        GET_USER_SESSIONS = 1013;
+        GET_USER_ALTS = 1014;
+        GET_MODERATOR_LAST_LOGINS = 1015;
+        RESET_USER_PASSWORD = 1016;
+        REMOVE_USER_AVATAR = 1017;
+        REPORT_LIST = 1200;
+        REPORT_ASSIGN = 1201;
+        REPORT_RESOLVE = 1202;
+        REPLAY_DOWNLOAD_BY_GAME_ID = 1203;
+        REPORT_USER_INFO = 1204;
+        REPORT_STATS = 1205;
+        REPORT_REOPEN = 1206;
     }
     extensions 100 to max;
 }
@@ -66,6 +82,9 @@ message Command_ViewLogHistory {
     extend ModeratorCommand {
         optional Command_ViewLogHistory ext = 1005;
     }
+    extend DeveloperCommand {
+        optional Command_ViewLogHistory dev_ext = 1001;
+    }
     optional string user_name = 1;       // user that created message
     optional string ip_address = 2;      // ip address of user that created message
     optional string game_name = 3;       // client id of user that created the message
@@ -106,3 +125,57 @@ message Command_UpdateAdminNotes {
     optional string user_name = 1;
     optional string notes = 2;
 }
+
+message Command_AddCardArtRule {
+    extend ModeratorCommand {
+        optional Command_AddCardArtRule ext = 1010;
+    }
+
+    optional string card_name = 1;
+    optional string card_provider_id = 2;
+    optional string mode = 3; // "ALLOW" or "DENY"
+    optional string reason = 4;
+}
+
+message Command_RemoveCardArtRule {
+    extend ModeratorCommand {
+        optional Command_RemoveCardArtRule ext = 1011;
+    }
+
+    optional string card_name = 1;
+    optional string card_provider_id = 2;
+}
+
+message Command_ListCardArtRules {
+    extend ModeratorCommand {
+        optional Command_ListCardArtRules ext = 1012;
+    }
+}
+
+message Command_GetUserSessions {
+    extend ModeratorCommand {
+        optional Command_GetUserSessions ext = 1013;
+    }
+    optional string user_name = 1;
+    optional uint32 limit = 2 [default = 110];
+}
+
+message Command_GetUserAlts {
+    extend ModeratorCommand {
+        optional Command_GetUserAlts ext = 1014;
+    }
+    optional string user_name = 1;
+}
+
+message Command_GetModeratorLastLogins {
+    extend ModeratorCommand {
+        optional Command_GetModeratorLastLogins ext = 1015;
+    }
+}
+
+message Command_RemoveUserAvatar {
+    extend ModeratorCommand {
+        optional Command_RemoveUserAvatar ext = 1017;
+    }
+    optional string user_name = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response.proto
index dece8ae17..caf9febde 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/response.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response.proto
@@ -1,35 +1,44 @@
 syntax = "proto2";
 
-// Sent immediately after a command with the same cmd_id, connecting it to the command sent to the server
+/// Server response envelope linking to a command
+/**
+ * This message is sent immediately after a client command, using the same `cmd_id`
+ * to connect the response to the command.
+ *
+ * Responses may contain standard outcome codes (`ResponseCode`) and indicate
+ * what type of response the server is sending (`ResponseType`).
+ */
 message Response {
+
+    // Outcome of the command sent by the client
     enum ResponseCode {
-        RespNotConnected = -1;
-        RespNothing = 0;
-        RespOk = 1;
-        RespNotInRoom = 2;
-        RespInternalError = 3;
-        RespInvalidCommand = 4;
-        RespInvalidData = 5;
-        RespNameNotFound = 6;
-        RespLoginNeeded = 7;
-        RespFunctionNotAllowed = 8;
-        RespGameNotStarted = 9;
-        RespGameFull = 10;
-        RespContextError = 11;
-        RespWrongPassword = 12;
-        RespSpectatorsNotAllowed = 13;
-        RespOnlyBuddies = 14;
-        RespUserLevelTooLow = 15;
-        RespInIgnoreList = 16;
-        RespWouldOverwriteOldSession = 17;
-        RespChatFlood = 18;
-        RespUserIsBanned = 19;
-        RespAccessDenied = 20;
-        RespUsernameInvalid = 21;
-        RespRegistrationRequired = 22;
-        RespRegistrationAccepted = 23;    // Server agrees to process client's registration request
-        RespUserAlreadyExists = 24;       // Client attempted to register a name which is already registered
-        RespEmailRequiredToRegister = 25; // Server requires email to register accounts but client did not provide one
+        RespNotConnected = -1;             // Client is not connected or session expired
+        RespNothing = 0;                   // No response required
+        RespOk = 1;                        // Command succeeded
+        RespNotInRoom = 2;                 // Client is not in the room for this command
+        RespInternalError = 3;             // Server encountered an unexpected error
+        RespInvalidCommand = 4;            // Command was invalid or unrecognized
+        RespInvalidData = 5;               // Command data was invalid or malformed
+        RespNameNotFound = 6;              // Target user not found
+        RespLoginNeeded = 7;               // Client must log in first
+        RespFunctionNotAllowed = 8;        // Client tried to perform a restricted action
+        RespGameNotStarted = 9;            // Game has not started yet
+        RespGameFull = 10;                 // Game is full
+        RespContextError = 11;             // Context (room/game) mismatch
+        RespWrongPassword = 12;            // Password for this room or game is incorrect
+        RespSpectatorsNotAllowed = 13;     // Spectators are not allowed in this room/game
+        RespOnlyBuddies = 14;              // Only buddies can perform this action
+        RespUserLevelTooLow = 15;          // User’s permission level is insufficient
+        RespInIgnoreList = 16;             // Target user has ignored the client
+        RespWouldOverwriteOldSession = 17; // Would overwrite an existing session
+        RespChatFlood = 18;                // Too many messages sent in short time
+        RespUserIsBanned = 19;             // Client is banned
+        RespAccessDenied = 20;             // Access to this action is denied
+        RespUsernameInvalid = 21;          // Username is invalid
+        RespRegistrationRequired = 22;     // Registration is required
+        RespRegistrationAccepted = 23;     // Server agrees to process client's registration request
+        RespUserAlreadyExists = 24;        // Client attempted to register a name which is already registered
+        RespEmailRequiredToRegister = 25;  // Server requires email to register accounts but client did not provide one
         RespTooManyRequests = 26;  // Server refused to complete command because client has sent too many too quickly
         RespPasswordTooShort = 27; // Server requires a decent password
         RespAccountNotActivated =
@@ -44,33 +53,43 @@ message Response {
         RespClientUpdateRequired = 35; // Client is missing features that the server is requiring
         RespServerFull = 36;           // Server user limit reached
         RespEmailBlackListed = 37;     // Server has blocked the email address provided for registration for some reason
+        RespPasswordChangeRequired = 38; // Server requires the user to change their password before proceeding
     }
-    enum ResponseType {
-        JOIN_ROOM = 1000;
-        LIST_USERS = 1001;
-        GET_GAMES_OF_USER = 1002;
-        GET_USER_INFO = 1003;
-        DUMP_ZONE = 1004;
-        LOGIN = 1005;
-        DECK_LIST = 1006;
-        DECK_DOWNLOAD = 1007;
-        DECK_UPLOAD = 1008;
-        REGISTER = 1009;
-        ACTIVATE = 1010;
-        ADJUST_MOD = 1011;
-        BAN_HISTORY = 1012;
-        WARN_HISTORY = 1013;
-        WARN_LIST = 1014;
-        VIEW_LOG = 1015;
-        FORGOT_PASSWORD_REQUEST = 1016;
-        PASSWORD_SALT = 1017;
-        GET_ADMIN_NOTES = 1018;
-        REPLAY_LIST = 1100;
-        REPLAY_DOWNLOAD = 1101;
-        REPLAY_GET_CODE = 1102;
-    }
-    required uint64 cmd_id = 1;
-    optional ResponseCode response_code = 2;
 
-    extensions 100 to max;
+    // Type of response, used to route handling on the client
+    enum ResponseType {
+        JOIN_ROOM = 1000;               // Response for joining a room
+        LIST_USERS = 1001;              // Response listing users
+        GET_GAMES_OF_USER = 1002;       // Response with user's games
+        GET_USER_INFO = 1003;           // Response with user info
+        DUMP_ZONE = 1004;               // Response with zone dump
+        LOGIN = 1005;                   // Response to login attempt
+        DECK_LIST = 1006;               // Response with deck list
+        DECK_DOWNLOAD = 1007;           // Response for deck download
+        DECK_UPLOAD = 1008;             // Response for deck upload
+        REGISTER = 1009;                // Response to registration
+        ACTIVATE = 1010;                // Response to activation
+        ADJUST_MOD = 1011;              // Response to mod adjustments
+        BAN_HISTORY = 1012;             // Response with ban history
+        WARN_HISTORY = 1013;            // Response with warn history
+        WARN_LIST = 1014;               // Response with current warnings
+        VIEW_LOG = 1015;                // Response with logs
+        FORGOT_PASSWORD_REQUEST = 1016; // Response to password reset request
+        PASSWORD_SALT = 1017;           // Response containing password salt
+        GET_ADMIN_NOTES = 1018;         // Response with admin notes
+        GET_SERVER_STATS = 1019;        // Response with server status statistics
+        REPLAY_LIST = 1100;             // Response listing replays
+        REPLAY_DOWNLOAD = 1101;         // Response for replay download
+        REPLAY_GET_CODE = 1102;         // Response containing replay code
+        DECK_SHARE_CREATE = 1103;       // Response to deck share creation
+        DECK_SHARE_LIST = 1104;         // Response listing shared decks
+        DECK_SHARE_DOWNLOAD = 1105;     // Response for shared deck download
+        DECK_SHARE_LIST_MINE = 1106;    // Response listing the caller's own shares
+        CARD_ART_RULE_LIST = 1200;      // Response containing a list of card art rules
+    }
+
+    required uint64 cmd_id = 1;              // Command ID that this response corresponds to
+    optional ResponseCode response_code = 2; // Outcome code of the command
+
+    extensions 100 to max; // Protobuf extensions reserved for future use
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_card_art_rule_entry.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_card_art_rule_entry.proto
new file mode 100644
index 000000000..25b76e09f
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_card_art_rule_entry.proto
@@ -0,0 +1,16 @@
+syntax = "proto2";
+import "response.proto";
+
+message Response_CardArtRuleEntry {
+    optional string card_name = 1;
+    optional string card_provider_id = 2;
+    optional string mode = 3;
+    optional string reason = 4;
+}
+
+message Response_ListCardArtRules {
+    extend Response {
+        optional Response_ListCardArtRules ext = 1200;
+    }
+    repeated Response_CardArtRuleEntry entries = 1;
+}
\ No newline at end of file
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_create.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_create.proto
new file mode 100644
index 000000000..574c02eb6
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_create.proto
@@ -0,0 +1,11 @@
+syntax = "proto2";
+import "response.proto";
+
+message Response_DeckShareCreate {
+    extend Response {
+        optional Response_DeckShareCreate ext = 1103;
+    }
+    optional string token = 1;
+    optional uint64 expires_at = 2;
+    optional uint32 item_count = 3;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_download.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_download.proto
new file mode 100644
index 000000000..def0ccbe6
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_download.proto
@@ -0,0 +1,9 @@
+syntax = "proto2";
+import "response.proto";
+
+message Response_DeckShareDownload {
+    extend Response {
+        optional Response_DeckShareDownload ext = 1105;
+    }
+    optional string deck = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_list.proto
new file mode 100644
index 000000000..3edffa8ac
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_list.proto
@@ -0,0 +1,12 @@
+syntax = "proto2";
+import "response.proto";
+import "serverinfo_deck_share_item.proto";
+
+message Response_DeckShareList {
+    extend Response {
+        optional Response_DeckShareList ext = 1104;
+    }
+    optional string name = 1;
+    optional uint64 expires_at = 2;
+    repeated ServerInfo_DeckShareItem items = 3;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_list_mine.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_list_mine.proto
new file mode 100644
index 000000000..e3cbf83b9
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_list_mine.proto
@@ -0,0 +1,10 @@
+syntax = "proto2";
+import "response.proto";
+import "serverinfo_deck_share_summary.proto";
+
+message Response_DeckShareListMine {
+    extend Response {
+        optional Response_DeckShareListMine ext = 1106;
+    }
+    repeated ServerInfo_DeckShareSummary shares = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_get_server_stats.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_get_server_stats.proto
new file mode 100644
index 000000000..bb8ff3c43
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_get_server_stats.proto
@@ -0,0 +1,41 @@
+syntax = "proto2";
+import "response.proto";
+
+message CommandStats {
+    optional uint32 kind_index = 1;       // 0=session, 1=room, 2=game, 3=moderator, 4=admin, 5=developer
+    optional uint32 extension_number = 2; // protobuf extension number within the kind
+    optional string command_name = 3;     // e.g. "session/Command_Ping"
+    optional uint64 count = 4;            // number of times observed
+    optional uint64 total_ms = 5;         // cumulative processing milliseconds
+}
+
+message Response_GetServerStats {
+    extend Response {
+        optional Response_GetServerStats ext = 1220;
+    }
+
+    optional uint64 users_count = 1;
+    optional uint64 mods_count = 2;
+    optional uint64 games_count = 3;
+
+    // Traffic recorded during the last status update tick
+    optional uint64 tx_bytes = 4;
+    optional uint64 rx_bytes = 5;
+
+    optional uint64 uptime_secs = 6;
+    optional uint64 timest = 7; // unix timestamp of the snapshot
+
+    // Live metrics from MetricsRegistry (reset on server restart)
+    optional uint64 cards_in_games = 8;
+    optional uint64 eventloop_stalls_total = 9;
+    optional uint64 eventloop_last_stall_ms = 10;
+    optional uint64 eventloop_max_stall_ms = 11;
+    optional uint64 total_commands = 12;
+    optional uint64 total_command_time_ms = 13;
+    optional int32 active_command_types = 14;
+    optional uint64 game_start_count = 15;
+    optional uint64 game_start_total_ms = 16;
+
+    // Per-command breakdown (only types with count > 0)
+    repeated CommandStats command_stats = 20;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_moderator_last_logins.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_moderator_last_logins.proto
new file mode 100644
index 000000000..6288880c4
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_moderator_last_logins.proto
@@ -0,0 +1,10 @@
+syntax = "proto2";
+import "response.proto";
+import "serverinfo_moderator_login.proto";
+
+message Response_ModeratorLastLogins {
+    extend Response {
+        optional Response_ModeratorLastLogins ext = 1217;
+    }
+    repeated ServerInfo_ModeratorLogin logins = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_remove_user_avatar.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_remove_user_avatar.proto
new file mode 100644
index 000000000..e5697d4e0
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_remove_user_avatar.proto
@@ -0,0 +1,9 @@
+syntax = "proto2";
+import "response.proto";
+
+message Response_RemoveUserAvatar {
+    extend Response {
+        optional Response_RemoveUserAvatar ext = 1219;
+    }
+    optional string user_name = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_download_by_game_id.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_download_by_game_id.proto
new file mode 100644
index 000000000..77a5feb81
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_replay_download_by_game_id.proto
@@ -0,0 +1,10 @@
+syntax = "proto2";
+import "response.proto";
+
+message Response_ReplayDownloadByGameId {
+    extend Response {
+        optional Response_ReplayDownloadByGameId ext = 1203;
+    }
+    optional bytes replay_data = 1;
+    optional sint32 replay_id = 2;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_report_details.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_report_details.proto
new file mode 100644
index 000000000..463beaefc
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_report_details.proto
@@ -0,0 +1,10 @@
+syntax = "proto2";
+import "response.proto";
+import "serverinfo_report.proto";
+
+message Response_ReportDetails {
+    extend Response {
+        optional Response_ReportDetails ext = 1214;
+    }
+    optional ServerInfo_Report report = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_report_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_report_list.proto
new file mode 100644
index 000000000..73d9fbef8
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_report_list.proto
@@ -0,0 +1,11 @@
+syntax = "proto2";
+import "response.proto";
+import "serverinfo_report.proto";
+
+message Response_ReportList {
+    extend Response {
+        optional Response_ReportList ext = 1210;
+    }
+    repeated ServerInfo_Report reports = 1;
+    optional uint32 total_count = 2;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_report_my_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_report_my_list.proto
new file mode 100644
index 000000000..fdd02a3f1
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_report_my_list.proto
@@ -0,0 +1,10 @@
+syntax = "proto2";
+import "response.proto";
+import "serverinfo_report.proto";
+
+message Response_ReportMyList {
+    extend Response {
+        optional Response_ReportMyList ext = 1213;
+    }
+    repeated ServerInfo_Report reports = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_report_stats.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_report_stats.proto
new file mode 100644
index 000000000..8bd2cf766
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_report_stats.proto
@@ -0,0 +1,36 @@
+syntax = "proto2";
+import "response.proto";
+
+message Response_ReportStats {
+    extend Response {
+        optional Response_ReportStats ext = 1212;
+    }
+
+    optional int32 total_reports = 1;
+    optional int32 total_pending = 2;
+    optional int32 total_assigned = 3;
+    optional int32 total_resolved = 4;
+
+    optional int32 reports_last_24h = 5;
+    optional int32 reports_last_7d = 6;
+    optional int32 reports_last_30d = 7;
+
+    optional double avg_resolution_hours = 8;
+
+    optional int32 reports_this_week = 9;
+    optional int32 reports_last_week = 10;
+
+    repeated ReportCategoryCount category_counts = 11;
+    repeated ReportTopUser top_reported_users = 12;
+    repeated ReportTopUser top_reporters = 13;
+}
+
+message ReportCategoryCount {
+    optional string category = 1;
+    optional int32 count = 2;
+}
+
+message ReportTopUser {
+    optional string user_name = 1;
+    optional int32 count = 2;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_report_user_info.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_report_user_info.proto
new file mode 100644
index 000000000..5f9e8ec38
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_report_user_info.proto
@@ -0,0 +1,21 @@
+syntax = "proto2";
+import "response.proto";
+import "serverinfo_report.proto";
+
+message Response_ReportUserInfo {
+    extend Response {
+        optional Response_ReportUserInfo ext = 1211;
+    }
+
+    optional string user_name = 1;
+    optional int32 total_reports = 2;
+    optional int32 total_bans = 3;
+    optional int32 total_warns = 4;
+    optional int64 registration_time = 5;
+    optional bool is_admin = 6;
+    optional bool is_active = 7;
+    optional string admin_notes = 8;
+    repeated ServerInfo_Report recent_reports = 9;
+    // Last known login of the user, epoch seconds; 0 = unknown.
+    optional int64 last_login = 10;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_reset_user_password.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_reset_user_password.proto
new file mode 100644
index 000000000..aa379e573
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_reset_user_password.proto
@@ -0,0 +1,12 @@
+syntax = "proto2";
+import "response.proto";
+
+message Response_ResetUserPassword {
+    extend Response {
+        optional Response_ResetUserPassword ext = 1218;
+    }
+    optional string user_name = 1;
+    // The generated temporary password, shown to the moderator who
+    // requested the reset. The affected user must change it on first login.
+    optional string temporary_password = 2;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_user_alts.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_user_alts.proto
new file mode 100644
index 000000000..6bc48d6cb
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_user_alts.proto
@@ -0,0 +1,10 @@
+syntax = "proto2";
+import "response.proto";
+import "serverinfo_user_alt.proto";
+
+message Response_UserAlts {
+    extend Response {
+        optional Response_UserAlts ext = 1216;
+    }
+    repeated ServerInfo_UserAlt alts = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_user_sessions.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_user_sessions.proto
new file mode 100644
index 000000000..7174fd3f7
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_user_sessions.proto
@@ -0,0 +1,10 @@
+syntax = "proto2";
+import "response.proto";
+import "serverinfo_user_session.proto";
+
+message Response_UserSessions {
+    extend Response {
+        optional Response_UserSessions ext = 1215;
+    }
+    repeated ServerInfo_UserSession sessions = 1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_list.proto
index d48352529..cddd08a51 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_list.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response_warn_list.proto
@@ -8,4 +8,7 @@ message Response_WarnList {
     repeated string warning = 1;
     optional string user_name = 2;
     optional string user_clientid = 3;
+    // Recommended starting intervention level per warning category,
+    // aligned by index with `warning`. Absent or shorter lists default to 1.
+    repeated uint32 warning_il = 4;
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deck_share_item.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deck_share_item.proto
new file mode 100644
index 000000000..bac025419
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deck_share_item.proto
@@ -0,0 +1,10 @@
+syntax = "proto2";
+
+message ServerInfo_DeckShareItem {
+    optional uint32 id = 1;
+    optional string name = 2;
+    repeated string tags = 3;
+    optional string banner_card = 4;
+    optional string game_format = 5;
+    optional string color_identity = 6;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deck_share_summary.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deck_share_summary.proto
new file mode 100644
index 000000000..43273a54f
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deck_share_summary.proto
@@ -0,0 +1,10 @@
+syntax = "proto2";
+
+// A share bundle created by a user, as reported by a "list my shares" query.
+message ServerInfo_DeckShareSummary {
+    optional uint32 id = 1;
+    optional string name = 2;
+    optional uint64 creation_time = 3;
+    optional uint64 expires_at = 4;
+    optional uint32 item_count = 5;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deckstorage.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deckstorage.proto
index 16e3f28e3..b04d676d8 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deckstorage.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deckstorage.proto
@@ -1,10 +1,21 @@
 syntax = "proto2";
 message ServerInfo_DeckStorage_File {
     optional uint32 creation_time = 1;
+    optional bool is_public = 2;
+    // Preview metadata computed by the uploading client, so other clients can
+    // render this deck (e.g. in a visual storage grid) without downloading the
+    // full deck list. Empty for decks uploaded before the metadata columns.
+    optional string banner_card_name = 3;
+    optional string banner_card_provider = 4;
+    optional string color_identity = 5;
+    // Tag names associated with the deck. Empty for decks uploaded before the
+    // tags column existed.
+    repeated string tags = 6;
 }
 
 message ServerInfo_DeckStorage_Folder {
     repeated ServerInfo_DeckStorage_TreeItem items = 1;
+    optional bool is_public = 2;
 }
 
 message ServerInfo_DeckStorage_TreeItem {
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto
index 9a56e034c..9989ae18a 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_game.proto
@@ -62,4 +62,7 @@ message ServerInfo_Game {
 
     // whether the game is closed. Closed games are finished and can't be interacted with
     optional bool closed = 52;
+
+    // the current host of the game, which may differ from the creator after a host transfer
+    optional ServerInfo_User host_info = 53;
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_moderator_login.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_moderator_login.proto
new file mode 100644
index 000000000..21db2d3fa
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_moderator_login.proto
@@ -0,0 +1,11 @@
+syntax = "proto2";
+
+/**
+ * The last login date of a staff member (moderator/judge/admin).
+ * Used by the moderation "Moderator Last Logins" tool.
+ */
+message ServerInfo_ModeratorLogin {
+    optional string user_name = 1;  // staff account name
+    optional uint64 last_login = 2; // last known login, epoch seconds; 0 = unknown
+    optional uint32 user_level = 3; // ServerInfo_User::UserLevelFlag mask (moderator/judge/admin)
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerproperties.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerproperties.proto
index cdd0ee42c..ae19e4018 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerproperties.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_playerproperties.proto
@@ -2,6 +2,15 @@ syntax = "proto2";
 import "serverinfo_user.proto";
 
 message ServerInfo_PlayerProperties {
+    message PlaymatParams {
+        optional string card_name = 1;
+        optional string card_provider_id = 2;
+        optional double margin_pct_l = 3 [default = 0.07];
+        optional double margin_pct_r = 4 [default = 0.07];
+        optional double vertical_offset = 5 [default = 0.33];
+        optional double zoom = 6 [default = 1.0];
+    }
+
     optional sint32 player_id = 1;
     optional ServerInfo_User user_info = 2;
     optional bool spectator = 3;
@@ -11,4 +20,5 @@ message ServerInfo_PlayerProperties {
     optional sint32 ping_seconds = 7;
     optional bool sideboard_locked = 8;
     optional bool judge = 9;
+    optional PlaymatParams playmat_params = 10;
 }
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_report.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_report.proto
new file mode 100644
index 000000000..3b624cc6d
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_report.proto
@@ -0,0 +1,39 @@
+syntax = "proto2";
+
+message ServerInfo_ReportComment {
+    optional string author_name = 1;
+    optional string comment_text = 2;
+    optional int64 comment_time = 3;
+    optional bool is_moderator = 4;
+}
+
+message ServerInfo_Report {
+    optional int32 report_id = 1;
+
+    optional string reporter_name = 2;
+    optional string reported_user_name = 3;
+
+    optional int32 game_id = 4;
+    optional int32 replay_id = 5;
+    optional int32 room_id = 6;
+
+    optional string category = 7;
+    optional string status = 8;
+
+    optional string description = 9;
+
+    optional int64 report_time = 10;
+
+    optional string assigned_mod_name = 11;
+
+    optional int64 resolution_time = 12;
+
+    repeated ServerInfo_ReportComment comments = 13;
+
+    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/pb/serverinfo_user.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto
index 10add611f..ea3f56705 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto
@@ -1,4 +1,5 @@
 syntax = "proto2";
+
 message ServerInfo_User {
     enum UserLevelFlag {
         IsNothing = 0;
@@ -7,11 +8,20 @@ message ServerInfo_User {
         IsModerator = 4;
         IsAdmin = 8;
         IsJudge = 16;
+        IsDeveloper = 32;
     };
     message PawnColorsOverride {
         optional string left_side = 1;
         optional string right_side = 2;
     };
+    message CardArtParams {
+        optional string card_name = 1;
+        optional string card_provider_id = 2;
+        optional double margin_pct_l = 3 [default = 0.33];
+        optional double margin_pct_r = 4 [default = 0.02];
+        optional double vertical_offset = 5 [default = 0.35];
+        optional double zoom = 6 [default = 1.0];
+    };
 
     optional string name = 1;
     optional uint32 user_level = 2;
@@ -28,4 +38,5 @@ message ServerInfo_User {
     optional string clientid = 13;
     optional string privlevel = 14;
     optional PawnColorsOverride pawn_colors = 15;
-}
+    optional CardArtParams card_art_params = 16;
+}
\ No newline at end of file
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user_alt.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user_alt.proto
new file mode 100644
index 000000000..191dd5063
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user_alt.proto
@@ -0,0 +1,16 @@
+syntax = "proto2";
+
+/**
+ * An account that shares an IP address, client id or eMail address with
+ * the account being investigated. Used by the moderation "Get User Alts" tool.
+ */
+message ServerInfo_UserAlt {
+    optional string user_name = 1;         // account name
+    optional string email = 2;             // registration eMail
+    optional string clientid = 3;          // client id
+    optional uint64 registration_time = 4; // account registration, epoch seconds
+    optional uint64 last_login = 5;        // last known login, epoch seconds; 0 = unknown
+    optional uint32 warn_count = 6;        // number of warnings on record
+    optional uint32 ban_count = 7;         // number of bans on record
+    optional bool is_active = 8;           // account is not deactivated/banned
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user_session.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user_session.proto
new file mode 100644
index 000000000..7ce240050
--- /dev/null
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user_session.proto
@@ -0,0 +1,14 @@
+syntax = "proto2";
+
+/**
+ * A single login session of a user on the server, as stored in the
+ * sessions table. Used by the moderation "Get User Sessions" tool.
+ */
+message ServerInfo_UserSession {
+    optional string user_name = 1;       // account that was logged in
+    optional string ip_address = 2;      // IP address used for the session
+    optional string clientid = 3;        // client id used for the session
+    optional uint64 start_time = 4;      // session start, epoch seconds
+    optional uint64 end_time = 5;        // session end, epoch seconds; 0 = still active
+    optional string connection_type = 6; // "tcp" or "websocket"
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto
index cecf87370..4b7fe9c85 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto
+++ b/libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto
@@ -27,12 +27,26 @@ message SessionCommand {
         FORGOT_PASSWORD_RESET = 1022;
         FORGOT_PASSWORD_CHALLENGE = 1023;
         REQUEST_PASSWORD_SALT = 1024;
+        SET_CARD_ART_PARAMS = 1025;
+        DECK_SHARE_CREATE = 1026;
+        DECK_SHARE_LIST = 1027;
+        DECK_SHARE_DOWNLOAD = 1028;
+        DECK_LIST_OTHER_USER = 1029;
+        DECK_SET_VISIBILITY = 1030;
+        DECK_DOWNLOAD_PUBLIC = 1031;
+        DECK_SHARE_LIST_MINE = 1032;
+        DECK_SHARE_REMOVE = 1033;
         REPLAY_LIST = 1100;
         REPLAY_DOWNLOAD = 1101;
         REPLAY_MODIFY_MATCH = 1102;
         REPLAY_DELETE_MATCH = 1103;
         REPLAY_GET_CODE = 1104;
         REPLAY_SUBMIT_CODE = 1105;
+        REPORT = 1200;
+        // 1201-1203 reserved: removed during squash
+        REPORT_MY_LIST = 1204;
+        REPORT_ADD_COMMENT = 1205;
+        REPORT_DETAILS = 1206;
     }
     extensions 100 to max;
 }
@@ -205,3 +219,15 @@ message Command_RequestPasswordSalt {
     }
     required string user_name = 1;
 }
+
+message Command_SetCardArtParams {
+    extend SessionCommand {
+        optional Command_SetCardArtParams ext = 1025;
+    }
+    optional string card_name = 1;
+    optional string card_provider_id = 2;
+    optional double margin_pct_l = 3;
+    optional double margin_pct_r = 4;
+    optional double vertical_offset = 5;
+    optional double zoom = 6;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp b/libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp
index 4a9943d33..4a23fb6ef 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp
+++ b/libcockatrice_protocol/libcockatrice/protocol/pending_command.cpp
@@ -1,5 +1,8 @@
 #include "pending_command.h"
 
+class CommandContainer;
+class Response;
+
 PendingCommand::PendingCommand(const CommandContainer &_commandContainer, QVariant _extraData)
     : commandContainer(_commandContainer), extraData(_extraData), ticks(0)
 {
@@ -29,3 +32,13 @@ int PendingCommand::tick()
 {
     return ++ticks;
 }
+
+void PendingCommand::startTiming()
+{
+    startTime.start();
+}
+
+qint64 PendingCommand::elapsedMs() const
+{
+    return startTime.isValid() ? startTime.nsecsElapsed() / 1000000 : -1;
+}
diff --git a/libcockatrice_protocol/libcockatrice/protocol/pending_command.h b/libcockatrice_protocol/libcockatrice/protocol/pending_command.h
index 1d2d9ff17..9ed8a863c 100644
--- a/libcockatrice_protocol/libcockatrice/protocol/pending_command.h
+++ b/libcockatrice_protocol/libcockatrice/protocol/pending_command.h
@@ -1,15 +1,20 @@
 /**
  * @file pending_command.h
  * @ingroup Messages
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef PENDING_COMMAND_H
 #define PENDING_COMMAND_H
 
+#include <QElapsedTimer>
+#include <QObject>
 #include <QVariant>
+#include <QtGlobal>
 #include <libcockatrice/protocol/pb/commands.pb.h>
-#include <libcockatrice/protocol/pb/response.pb.h>
+#include <qtmetamacros.h>
+
+class Response;
 
 class PendingCommand : public QObject
 {
@@ -21,6 +26,7 @@ private:
     CommandContainer commandContainer;
     QVariant extraData;
     int ticks;
+    QElapsedTimer startTime;
 
 public:
     explicit PendingCommand(const CommandContainer &_commandContainer, QVariant _extraData = QVariant());
@@ -29,6 +35,18 @@ public:
     QVariant getExtraData() const;
     void processResponse(const Response &response);
     int tick();
+
+    /**
+     * @brief Starts the round-trip timer. Called by the client thread right
+     * before the command container is handed to the transport layer.
+     */
+    void startTiming();
+
+    /**
+     * @return Milliseconds elapsed since startTiming(), or -1 if the timer was
+     * never started.
+     */
+    qint64 elapsedMs() const;
 };
 
 #endif
diff --git a/libcockatrice_rng/CMakeLists.txt b/libcockatrice_rng/CMakeLists.txt
index 6ff2a4537..6128e3f6e 100644
--- a/libcockatrice_rng/CMakeLists.txt
+++ b/libcockatrice_rng/CMakeLists.txt
@@ -4,17 +4,17 @@ set(CMAKE_AUTORCC ON)
 
 set(HEADERS libcockatrice/rng/rng_abstract.h libcockatrice/rng/rng_sfmt.h libcockatrice/rng/sfmt/SFMT.h)
 
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
+qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
 
 add_library(
   libcockatrice_rng STATIC ${MOC_SOURCES} libcockatrice/rng/rng_abstract.cpp libcockatrice/rng/rng_sfmt.cpp
                            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 63072b988..34a778ca9 100644
--- a/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp
+++ b/libcockatrice_rng/libcockatrice/rng/rng_abstract.cpp
@@ -1,6 +1,8 @@
 #include "rng_abstract.h"
 
 #include <QDebug>
+#include <QList>
+#include <qlogging.h>
 
 QVector<int> RNG_Abstract::makeNumbersVector(int n, int min, int max)
 {
@@ -8,10 +10,11 @@ QVector<int> RNG_Abstract::makeNumbersVector(int n, int min, int max)
     QVector<int> result(bins);
     for (int i = 0; i < n; ++i) {
         int number = rand(min, max);
-        if ((number < min) || (number > max))
+        if ((number < min) || (number > max)) {
             qDebug() << "rand(" << min << "," << max << ") returned " << number;
-        else
+        } else {
             result[number - min]++;
+        }
     }
     return result;
 }
@@ -19,12 +22,14 @@ QVector<int> RNG_Abstract::makeNumbersVector(int n, int min, int max)
 double RNG_Abstract::testRandom(const QVector<int> &numbers) const
 {
     int n = 0;
-    for (int i = 0; i < numbers.size(); ++i)
+    for (int i = 0; i < numbers.size(); ++i) {
         n += numbers[i];
+    }
     double expected = (double)n / (double)numbers.size();
     double chisq = 0;
-    for (int i = 0; i < numbers.size(); ++i)
+    for (int i = 0; i < numbers.size(); ++i) {
         chisq += ((double)numbers[i] - expected) * ((double)numbers[i] - expected) / expected;
+    }
 
     return chisq;
 }
diff --git a/libcockatrice_rng/libcockatrice/rng/rng_abstract.h b/libcockatrice_rng/libcockatrice/rng/rng_abstract.h
index 903e6ef1a..49fb89612 100644
--- a/libcockatrice_rng/libcockatrice/rng/rng_abstract.h
+++ b/libcockatrice_rng/libcockatrice/rng/rng_abstract.h
@@ -3,6 +3,7 @@
 
 #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 5a6d8c862..13e6fe680 100644
--- a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp
+++ b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp
@@ -1,9 +1,13 @@
 #include "rng_sfmt.h"
 
-#include <QDateTime>
-#include <algorithm>
-#include <climits>
+#include "libcockatrice/rng/rng_abstract.h"
+#include "libcockatrice/rng/sfmt/SFMT.h"
+
+#include <QString>
 #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.
@@ -11,10 +15,11 @@
 #define UINT64_MAX (~(uint64_t)0)
 #endif
 
-RNG_SFMT::RNG_SFMT(QObject *parent) : RNG_Abstract(parent)
+RNG_SFMT::RNG_SFMT(uint64_t seed, QObject *parent) : RNG_Abstract(parent)
 {
-    // initialize the random number generator with a 32bit integer seed (timestamp)
-    sfmt_init_gen_rand(&sfmt, QDateTime::currentDateTime().toSecsSinceEpoch());
+    // initialize the random number generator with a 64bit seed, e.g. from a CSPRNG
+    uint32_t seedArray[2] = {static_cast<uint32_t>(seed), static_cast<uint32_t>(seed >> 32)};
+    sfmt_init_by_array(&sfmt, seedArray, 2);
 }
 
 /**
@@ -40,8 +45,9 @@ unsigned int RNG_SFMT::rand(int min, int max)
     }
 
     // For complete fairness and equal timing, this should be a roll, but let's skip it anyway
-    if (min == max)
+    if (min == max) {
         return max;
+    }
 
     // This is actually not used in Cockatrice:
     // Someone wants rand() % -foo, so we should compute -rand(0, +foo)
diff --git a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h
index 7e9f53df3..e178812ab 100644
--- a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h
+++ b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h
@@ -5,7 +5,10 @@
 #include "sfmt/SFMT.h"
 
 #include <QMutex>
-#include <climits>
+#include <qtmetamacros.h>
+#include <stdint.h>
+
+class QObject;
 
 /**
  * This class encapsulates a state of the art PRNG and can be used
@@ -36,7 +39,7 @@ private:
     unsigned int cdf(unsigned int min, unsigned int max);
 
 public:
-    explicit RNG_SFMT(QObject *parent = nullptr);
+    explicit RNG_SFMT(uint64_t seed, QObject *parent = nullptr);
     unsigned int rand(int min, int max) override;
 };
 
diff --git a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c
index b4ac9308b..fde6367a0 100644
--- a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c
+++ b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.c
@@ -60,7 +60,9 @@ inline static void swap(w128_t *array, int size);
  */
   static const w128_t sse2_param_mask = {{SFMT_MSK1, SFMT_MSK2,
                                           SFMT_MSK3, SFMT_MSK4}};
-  #if defined(_MSC_VER)
+  #if defined(__AVX2__) && (SFMT_SL1 >= 16) && !(SFMT_N & 1) && !(SFMT_POS1 & 1)
+    #include "SFMT-avx256.h"
+  #elif defined(_MSC_VER)
     #include "SFMT-sse2-msc.h"
   #else
     #include "SFMT-sse2.h"
diff --git a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h
index 79e012d63..34d9e746f 100644
--- a/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h
+++ b/libcockatrice_rng/libcockatrice/rng/sfmt/SFMT.h
@@ -88,8 +88,13 @@ union W128_T {
     uint64_t u64[2];
     uint32x4_t si;
 };
+//#elif defined(HAVE_SSE2)
 #elif defined(HAVE_SSE2)
-  #include <emmintrin.h>
+  #if defined(__AVX2__)
+    #include <immintrin.h>
+  #else 
+    #include <emmintrin.h>
+  #endif
 
 /** 128-bit data structure */
 union W128_T {
@@ -112,8 +117,18 @@ typedef union W128_T w128_t;
  * SFMT internal state
  */
 struct SFMT_T {
+#if defined(__AVX2__)
+    union {
+        w128_t state[SFMT_N];
+        __m256i state_ymm[SFMT_N/2];
+    #if defined(__AVX512VL__)
+        __m512i state_zmm[SFMT_N/4];
+    #endif
+    };
+#else
     /** the 128-bit internal state array */
     w128_t state[SFMT_N];
+#endif
     /** index counter to the 32-bit internal state array */
     int idx;
 };
@@ -249,9 +264,9 @@ inline static double sfmt_genrand_real3(sfmt_t * sfmt)
 }
 
 /**
- * converts an unsigned 32-bit integer to double on [0,1)
+ * converts an unsigned 64-bit integer to double on [0,1)
  * with 53-bit resolution.
- * @param v 32-bit unsigned integer
+ * @param v 64-bit unsigned integer
  * @return double on [0,1)-real-interval with 53-bit resolution.
  */
 inline static double sfmt_to_res53(uint64_t v)
diff --git a/libcockatrice_settings/CMakeLists.txt b/libcockatrice_settings/CMakeLists.txt
index 3afe6e00a..5a2fa42a9 100644
--- a/libcockatrice_settings/CMakeLists.txt
+++ b/libcockatrice_settings/CMakeLists.txt
@@ -3,37 +3,65 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
 set(HEADERS
+    libcockatrice/settings/appearance_settings.h
+    libcockatrice/settings/cache_storage_settings.h
     libcockatrice/settings/card_database_settings.h
     libcockatrice/settings/card_override_settings.h
+    libcockatrice/settings/cards_display_settings.h
+    libcockatrice/settings/chat_settings.h
+    libcockatrice/settings/commander_bracket_settings.h
     libcockatrice/settings/debug_settings.h
+    libcockatrice/settings/deck_editor_settings.h
     libcockatrice/settings/download_settings.h
     libcockatrice/settings/game_filters_settings.h
+    libcockatrice/settings/game_settings.h
+    libcockatrice/settings/interface_settings.h
     libcockatrice/settings/layouts_settings.h
     libcockatrice/settings/message_settings.h
+    libcockatrice/settings/network_settings.h
+    libcockatrice/settings/paths_settings.h
+    libcockatrice/settings/personal_settings.h
     libcockatrice/settings/recents_settings.h
     libcockatrice/settings/servers_settings.h
     libcockatrice/settings/settings_manager.h
+    libcockatrice/settings/settings_migration.h
+    libcockatrice/settings/sound_settings.h
+    libcockatrice/settings/tabs_settings.h
+    libcockatrice/settings/updates_settings.h
+    libcockatrice/settings/visual_deck_storage_settings.h
 )
 
-if(Qt6_FOUND)
-  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
-elseif(Qt5_FOUND)
-  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
-endif()
+qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
 
 add_library(
   libcockatrice_settings STATIC
   ${MOC_SOURCES}
+  libcockatrice/settings/appearance_settings.cpp
+  libcockatrice/settings/cache_storage_settings.cpp
   libcockatrice/settings/card_database_settings.cpp
   libcockatrice/settings/card_override_settings.cpp
+  libcockatrice/settings/commander_bracket_settings.cpp
+  libcockatrice/settings/cards_display_settings.cpp
+  libcockatrice/settings/chat_settings.cpp
   libcockatrice/settings/debug_settings.cpp
+  libcockatrice/settings/deck_editor_settings.cpp
   libcockatrice/settings/download_settings.cpp
   libcockatrice/settings/game_filters_settings.cpp
+  libcockatrice/settings/game_settings.cpp
+  libcockatrice/settings/interface_settings.cpp
   libcockatrice/settings/layouts_settings.cpp
   libcockatrice/settings/message_settings.cpp
+  libcockatrice/settings/network_settings.cpp
+  libcockatrice/settings/paths_settings.cpp
+  libcockatrice/settings/personal_settings.cpp
   libcockatrice/settings/recents_settings.cpp
   libcockatrice/settings/servers_settings.cpp
   libcockatrice/settings/settings_manager.cpp
+  libcockatrice/settings/settings_migration.cpp
+  libcockatrice/settings/sound_settings.cpp
+  libcockatrice/settings/tabs_settings.cpp
+  libcockatrice/settings/updates_settings.cpp
+  libcockatrice/settings/visual_deck_storage_settings.cpp
 )
 
 target_include_directories(
@@ -43,3 +71,5 @@ 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
new file mode 100644
index 000000000..14969dae6
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/appearance_settings.cpp
@@ -0,0 +1,99 @@
+#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)
+{
+}
+
+QString AppearanceSettings::getThemeName() const
+{
+    return getValue("themeName", QString(), QString()).toString();
+}
+
+void AppearanceSettings::setThemeName(const QString &_themeName)
+{
+    setValue(_themeName, "themeName");
+    emit themeNameChanged();
+}
+
+bool AppearanceSettings::getStyleUserList() const
+{
+    return getValue("styleUserList", QString(), QString(), true).toBool();
+}
+
+void AppearanceSettings::setStyleUserList(bool _styleUserList)
+{
+    setValue(_styleUserList, "styleUserList");
+    emit styleUserListChanged();
+}
+
+int AppearanceSettings::getMaxFontSize() const
+{
+    return getValue("maxFontSize", QString(), QString(), 12).toInt();
+}
+
+void AppearanceSettings::setMaxFontSize(int _max)
+{
+    setValue(_max, "maxFontSize");
+}
+
+QString AppearanceSettings::getHomeTabBackgroundSource() const
+{
+    return getValue("homeTabBackgroundSource", QString(), QString(), "themed").toString();
+}
+
+void AppearanceSettings::setHomeTabBackgroundSource(const QString &_backgroundSource)
+{
+    setValue(_backgroundSource, "homeTabBackgroundSource");
+    emit homeTabBackgroundSourceChanged();
+}
+
+int AppearanceSettings::getHomeTabBackgroundShuffleFrequency() const
+{
+    return getValue("homeTabBackgroundShuffleFrequency", QString(), QString(), 0).toInt();
+}
+
+void AppearanceSettings::setHomeTabBackgroundShuffleFrequency(int _frequency)
+{
+    setValue(_frequency, "homeTabBackgroundShuffleFrequency");
+    emit homeTabBackgroundShuffleFrequencyChanged();
+}
+
+bool AppearanceSettings::getHomeTabDisplayCardName() const
+{
+    return getValue("homeTabDisplayCardName", QString(), QString(), true).toBool();
+}
+
+void AppearanceSettings::setHomeTabDisplayCardName(bool _displayCardName)
+{
+    setValue(_displayCardName, "homeTabDisplayCardName");
+    emit homeTabDisplayCardNameChanged();
+}
+
+bool AppearanceSettings::getHomeTabBackgroundDim() const
+{
+    return getValue("homeTabBackgroundDim", QString(), QString(), true).toBool();
+}
+
+void AppearanceSettings::setHomeTabBackgroundDim(bool _dimBackground)
+{
+    setValue(_dimBackground, "homeTabBackgroundDim");
+    emit homeTabBackgroundDimChanged();
+}
+
+int AppearanceSettings::getHomeTabButtonColorSourceIndex() const
+{
+    return getValue("homeTabButtonColorSource", "", "", 0).toInt();
+}
+
+void AppearanceSettings::setHomeTabButtonColorSourceIndex(int index)
+{
+    setValue(index, "homeTabButtonColorSource");
+    emit homeTabButtonColorChanged();
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/appearance_settings.h b/libcockatrice_settings/libcockatrice/settings/appearance_settings.h
new file mode 100644
index 000000000..9d15caddd
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/appearance_settings.h
@@ -0,0 +1,56 @@
+/**
+ * @file appearance_settings.h
+ * @ingroup CoreSettings
+ */
+//! \todo Document this file.
+
+#ifndef APPEARANCE_SETTINGS_H
+#define APPEARANCE_SETTINGS_H
+
+#include "settings_manager.h"
+
+#include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
+
+class AppearanceSettings : public SettingsManager
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    [[nodiscard]] QString getThemeName() const;
+    void setThemeName(const QString &_themeName);
+    [[nodiscard]] bool getStyleUserList() const;
+    void setStyleUserList(bool _styleUserList);
+    [[nodiscard]] int getMaxFontSize() const;
+    void setMaxFontSize(int _max);
+    [[nodiscard]] QString getHomeTabBackgroundSource() const;
+    void setHomeTabBackgroundSource(const QString &_backgroundSource);
+    [[nodiscard]] int getHomeTabBackgroundShuffleFrequency() const;
+    void setHomeTabBackgroundShuffleFrequency(int _frequency);
+    [[nodiscard]] bool getHomeTabDisplayCardName() const;
+    void setHomeTabDisplayCardName(bool _displayCardName);
+    [[nodiscard]] bool getHomeTabBackgroundDim() const;
+    void setHomeTabBackgroundDim(bool _dimBackground);
+    [[nodiscard]] int getHomeTabButtonColorSourceIndex() const;
+    void setHomeTabButtonColorSourceIndex(int index);
+
+signals:
+    void themeNameChanged();
+    void styleUserListChanged();
+    void homeTabBackgroundSourceChanged();
+    void homeTabBackgroundShuffleFrequencyChanged();
+    void homeTabDisplayCardNameChanged();
+    void homeTabBackgroundDimChanged();
+    void homeTabButtonColorChanged();
+
+public:
+    explicit AppearanceSettings(const QString &settingPath, QObject *parent = nullptr);
+
+private:
+    AppearanceSettings(const AppearanceSettings & /*other*/);
+};
+
+#endif // APPEARANCE_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.cpp b/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.cpp
new file mode 100644
index 000000000..aaea87791
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.cpp
@@ -0,0 +1,68 @@
+#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)
+{
+}
+
+int CacheStorageSettings::getPixmapCacheSize() const
+{
+    return getValue("pixmapCacheSize", QString(), QString(), PIXMAPCACHE_SIZE_DEFAULT).toInt();
+}
+
+int CacheStorageSettings::getNetworkCacheSizeInMB() const
+{
+    return getValue("networkCacheSize", QString(), QString(), NETWORK_CACHE_SIZE_DEFAULT).toInt();
+}
+
+int CacheStorageSettings::getRedirectCacheTtl() const
+{
+    return getValue("redirectCacheTtl", QString(), QString(), NETWORK_REDIRECT_CACHE_TTL_DEFAULT).toInt();
+}
+
+int CacheStorageSettings::getCardPictureLoaderCacheMethod() const
+{
+    return getValue("cardPictureLoaderCacheMethod", QString(), QString(), 0).toInt();
+}
+
+int CacheStorageSettings::getLocalCardImageStorageNamingScheme() const
+{
+    return getValue("localCardImageStorageNamingScheme", QString(), QString(), LOCAL_CARD_IMAGE_NAMING_SCHEME_DEFAULT)
+        .toInt();
+}
+
+void CacheStorageSettings::setPixmapCacheSize(int _pixmapCacheSize)
+{
+    setValue(_pixmapCacheSize, "pixmapCacheSize");
+    emit pixmapCacheSizeChanged(_pixmapCacheSize);
+}
+
+void CacheStorageSettings::setNetworkCacheSizeInMB(int _networkCacheSize)
+{
+    setValue(_networkCacheSize, "networkCacheSize");
+    emit networkCacheSizeChanged(_networkCacheSize);
+}
+
+void CacheStorageSettings::setNetworkRedirectCacheTtl(int _redirectCacheTtl)
+{
+    setValue(_redirectCacheTtl, "redirectCacheTtl");
+    emit redirectCacheTtlChanged(_redirectCacheTtl);
+}
+
+void CacheStorageSettings::setCardImageCacheMethod(int _cardImageCachingMethod)
+{
+    setValue(_cardImageCachingMethod, "cardPictureLoaderCacheMethod");
+    emit cardPictureLoaderCacheMethodChanged(_cardImageCachingMethod);
+}
+
+void CacheStorageSettings::setLocalCardImageStorageNamingScheme(int _localCardImageStorageNamingScheme)
+{
+    setValue(_localCardImageStorageNamingScheme, "localCardImageStorageNamingScheme");
+    emit localCardImageStorageNamingSchemeChanged(_localCardImageStorageNamingScheme);
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.h b/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.h
new file mode 100644
index 000000000..a4c8a197d
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/cache_storage_settings.h
@@ -0,0 +1,61 @@
+#ifndef CACHE_STORAGE_SETTINGS_H
+#define CACHE_STORAGE_SETTINGS_H
+
+#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
+#define PIXMAPCACHE_SIZE_MIN 64
+#define PIXMAPCACHE_SIZE_MAX 4096
+
+// In MB
+constexpr int NETWORK_CACHE_SIZE_DEFAULT = 1024 * 4; // 4 GB
+constexpr int NETWORK_CACHE_SIZE_MIN = 1;            // 1 MB
+constexpr int NETWORK_CACHE_SIZE_MAX = 1024 * 1024;  // 1 TB
+
+#define LOCAL_CARD_IMAGE_NAMING_SCHEME_DEFAULT 6
+
+// In Days
+#define NETWORK_REDIRECT_CACHE_TTL_DEFAULT 30
+#define NETWORK_REDIRECT_CACHE_TTL_MIN 1
+#define NETWORK_REDIRECT_CACHE_TTL_MAX 90
+
+class CacheStorageSettings : public SettingsManager, public ICacheStorageSettingsProvider
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    [[nodiscard]] int getPixmapCacheSize() const override;
+    [[nodiscard]] int getNetworkCacheSizeInMB() const override;
+    [[nodiscard]] int getRedirectCacheTtl() const override;
+    [[nodiscard]] int getCardPictureLoaderCacheMethod() const;
+    [[nodiscard]] int getLocalCardImageStorageNamingScheme() const;
+
+    void setPixmapCacheSize(int _pixmapCacheSize);
+    void setNetworkCacheSizeInMB(int _networkCacheSize);
+    void setNetworkRedirectCacheTtl(int _redirectCacheTtl);
+    void setCardImageCacheMethod(int _cardImageCachingMethod);
+    void setLocalCardImageStorageNamingScheme(int _scheme);
+
+signals:
+    void pixmapCacheSizeChanged(int newSizeInMBs);
+    void networkCacheSizeChanged(int newSizeInMBs);
+    void redirectCacheTtlChanged(int newTtl);
+    void cardPictureLoaderCacheMethodChanged(int cardPictureLoaderCacheMethod);
+    void localCardImageStorageNamingSchemeChanged(int localCardImageStorageNamingScheme);
+
+public:
+    explicit CacheStorageSettings(const QString &settingPath, QObject *parent = nullptr);
+
+private:
+    CacheStorageSettings(const CacheStorageSettings & /*other*/);
+};
+
+#endif // CACHE_STORAGE_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp b/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp
index 79738f1cd..49bcb042b 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/card_database_settings.cpp
@@ -1,5 +1,17 @@
 #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)
 {
@@ -7,30 +19,109 @@ CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *
 
 void CardDatabaseSettings::setSortKey(QString shortName, unsigned int sortKey)
 {
-    setValue(sortKey, "sortkey", "sets", std::move(shortName));
+    setValue(sortKey, "sortKey", "sets", shortName);
+    QMutexLocker lock(&setOptionsMutex);
+    ensureSetOptionsLoaded();
+    setOptionsCache[shortName].sortKey = sortKey;
 }
 
 void CardDatabaseSettings::setEnabled(QString shortName, bool enabled)
 {
-    setValue(enabled, "enabled", "sets", std::move(shortName));
+    setValue(enabled, "enabled", "sets", shortName);
+    QMutexLocker lock(&setOptionsMutex);
+    ensureSetOptionsLoaded();
+    setOptionsCache[shortName].enabled = enabled;
 }
 
 void CardDatabaseSettings::setIsKnown(QString shortName, bool isknown)
 {
-    setValue(isknown, "isknown", "sets", std::move(shortName));
+    setValue(isknown, "isKnown", "sets", shortName);
+    QMutexLocker lock(&setOptionsMutex);
+    ensureSetOptionsLoaded();
+    setOptionsCache[shortName].isKnown = isknown;
 }
 
-unsigned int CardDatabaseSettings::getSortKey(QString shortName)
+void CardDatabaseSettings::ensureSetOptionsLoaded() const
 {
-    return getValue("sortkey", "sets", std::move(shortName)).toUInt();
+    if (setOptionsLoaded) {
+        return;
+    }
+    QSettings settings(getSettings());
+    settings.beginGroup("sets");
+    const QStringList groups = settings.childGroups();
+    for (const QString &group : groups) {
+        settings.beginGroup(group);
+        SetOptions &o = setOptionsCache[group];
+        o.sortKey = settings.value("sortKey", 0).toUInt();
+        o.enabled = settings.value("enabled", true).toBool();
+        o.isKnown = settings.value("isKnown", true).toBool();
+        settings.endGroup();
+    }
+    setOptionsLoaded = true;
 }
 
-bool CardDatabaseSettings::isEnabled(QString shortName)
+unsigned int CardDatabaseSettings::getSortKey(QString shortName) const
 {
-    return getValue("enabled", "sets", std::move(shortName)).toBool();
+    QMutexLocker lock(&setOptionsMutex);
+    ensureSetOptionsLoaded();
+    return setOptionsCache.value(shortName).sortKey;
 }
 
-bool CardDatabaseSettings::isKnown(QString shortName)
+bool CardDatabaseSettings::isEnabled(QString shortName) const
 {
-    return getValue("isknown", "sets", std::move(shortName)).toBool();
+    QMutexLocker lock(&setOptionsMutex);
+    ensureSetOptionsLoaded();
+    return setOptionsCache.value(shortName).enabled;
+}
+
+bool CardDatabaseSettings::isKnown(QString shortName) const
+{
+    QMutexLocker lock(&setOptionsMutex);
+    ensureSetOptionsLoaded();
+    return setOptionsCache.value(shortName).isKnown;
+}
+
+ICardSetPriorityController::SetOptions CardDatabaseSettings::getSetOptions(QString shortName) const
+{
+    QMutexLocker lock(&setOptionsMutex);
+    ensureSetOptionsLoaded();
+    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) {
+        s.beginGroup("sets");
+        for (const auto &entry : data) {
+            s.beginGroup(entry.shortName);
+            s.setValue("sortKey", entry.sortKey);
+            s.setValue("enabled", entry.enabled);
+            s.setValue("isKnown", entry.isKnown);
+            s.endGroup();
+        }
+        s.endGroup();
+    });
+
+    QMutexLocker lock(&setOptionsMutex);
+    ensureSetOptionsLoaded();
+    for (const auto &entry : data) {
+        SetOptions &o = setOptionsCache[entry.shortName];
+        o.sortKey = entry.sortKey;
+        o.enabled = entry.enabled;
+        o.isKnown = entry.isKnown;
+    }
 }
diff --git a/libcockatrice_settings/libcockatrice/settings/card_database_settings.h b/libcockatrice_settings/libcockatrice/settings/card_database_settings.h
index 9a176a99b..5bdf17aef 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_database_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/card_database_settings.h
@@ -2,15 +2,22 @@
  * @file card_database_settings.h
  * @ingroup CardDatabase
  * @ingroup CardSettings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef CARDDATABASESETTINGS_H
 #define CARDDATABASESETTINGS_H
 
 #include "settings_manager.h"
 
+#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
 {
@@ -22,12 +29,29 @@ public:
     void setEnabled(QString shortName, bool enabled) override;
     void setIsKnown(QString shortName, bool isknown) override;
 
-    unsigned int getSortKey(QString shortName) override;
-    bool isEnabled(QString shortName) override;
-    bool isKnown(QString shortName) override;
+    unsigned int getSortKey(QString shortName) const override;
+    bool isEnabled(QString shortName) const override;
+    bool isKnown(QString shortName) const override;
+
+    SetOptions getSetOptions(QString shortName) const override;
+
+    QStringList getEnabledSetNames() const override;
+
+    void saveSets(const QVector<SetSaveData> &data) override;
 
 private:
     explicit CardDatabaseSettings(const QString &settingPath, QObject *parent = nullptr);
+
+    // In-memory cache of set priority options. QSettings re-opens and re-parses
+    // the whole .ini on every access, which is catastrophic when CardSet
+    // construction calls getSortKey/isEnabled/isKnown once per set during the
+    // database load (thousands of file parses). The cache is populated from a
+    // single QSettings session and kept consistent with the writes below.
+    mutable QMutex setOptionsMutex;
+    mutable QHash<QString, SetOptions> setOptionsCache;
+    mutable bool setOptionsLoaded = false;
+
+    void ensureSetOptionsLoaded() const;
 };
 
 #endif // CARDDATABASESETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp b/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp
index 894358be6..5a853a927 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/card_override_settings.cpp
@@ -1,5 +1,12 @@
 #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)
 {
@@ -15,7 +22,7 @@ void CardOverrideSettings::deleteCardPreferenceOverride(const QString &cardName)
     deleteValue(cardName);
 }
 
-QString CardOverrideSettings::getCardPreferenceOverride(const QString &cardName)
+QString CardOverrideSettings::getCardPreferenceOverride(const QString &cardName) const
 {
     return getValue(cardName).toString();
 }
\ No newline at end of file
diff --git a/libcockatrice_settings/libcockatrice/settings/card_override_settings.h b/libcockatrice_settings/libcockatrice/settings/card_override_settings.h
index d5ee0287b..a9e8b2d69 100644
--- a/libcockatrice_settings/libcockatrice/settings/card_override_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/card_override_settings.h
@@ -1,16 +1,19 @@
 /**
  * @file card_override_settings.h
  * @ingroup CardSettings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_CARD_OVERRIDE_SETTINGS_H
 #define COCKATRICE_CARD_OVERRIDE_SETTINGS_H
 
 #include "settings_manager.h"
 
-#include <QObject>
-#include <libcockatrice/utility/card_ref.h>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
+struct CardRef;
 
 class CardOverrideSettings : public SettingsManager
 {
@@ -22,7 +25,7 @@ public:
 
     void deleteCardPreferenceOverride(const QString &cardName);
 
-    QString getCardPreferenceOverride(const QString &cardName);
+    QString getCardPreferenceOverride(const QString &cardName) const;
 
 private:
     explicit CardOverrideSettings(const QString &settingPath, QObject *parent = nullptr);
diff --git a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp
new file mode 100644
index 000000000..f047973f0
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp
@@ -0,0 +1,266 @@
+#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)
+{
+}
+
+bool CardsDisplaySettings::getDisplayCardNames() const
+{
+    return getValue("displayCardNames", QString(), QString(), true).toBool();
+}
+
+bool CardsDisplaySettings::getRoundCardCorners() const
+{
+    return getValue("roundCardCorners", QString(), QString(), true).toBool();
+}
+
+bool CardsDisplaySettings::getOverrideAllCardArtWithPersonalPreference() const
+{
+    return getValue("overrideAllCardArtWithPersonalPreference", QString(), QString(), false).toBool();
+}
+
+bool CardsDisplaySettings::getBumpSetsWithCardsInDeckToTop() const
+{
+    return getValue("bumpSetsWithCardsInDeckToTop", QString(), QString(), true).toBool();
+}
+
+int CardsDisplaySettings::getPrintingSelectorSortOrder() const
+{
+    return getValue("sortOrder", "cards", "printingSelector", 1).toInt();
+}
+
+int CardsDisplaySettings::getPrintingSelectorCardSize() const
+{
+    return getValue("printingSelector", "cards", "cardSize", 100).toInt();
+}
+
+bool CardsDisplaySettings::getPrintingSelectorNavigationButtonsVisible() const
+{
+    return getValue("navigationButtonsVisible", "cards", "printingSelector", true).toBool();
+}
+
+bool CardsDisplaySettings::getTapAnimation() const
+{
+    return getValue("tapAnimation", QString(), QString(), true).toBool();
+}
+
+bool CardsDisplaySettings::getArrowDrawAnimation() const
+{
+    return getValue("arrowDrawAnimation", QString(), QString(), true).toBool();
+}
+
+bool CardsDisplaySettings::getAutoRotateSidewaysLayoutCards() const
+{
+    return getValue("autoRotateSidewaysLayoutCards", QString(), QString(), true).toBool();
+}
+
+bool CardsDisplaySettings::getScaleCards() const
+{
+    return getValue("scaleCards", QString(), QString(), true).toBool();
+}
+
+int CardsDisplaySettings::getStackCardOverlapPercent() const
+{
+    return getValue("verticalCardOverlapPercent", QString(), QString(), 33).toInt();
+}
+
+int CardsDisplaySettings::getCardInfoViewMode() const
+{
+    return getValue("cardInfoViewMode", QString(), QString(), 0).toInt();
+}
+
+int CardsDisplaySettings::getVisualDeckStorageCardSize() const
+{
+    return getValue("visualDeckStorage", "cards", "cardSize", 100).toInt();
+}
+
+int CardsDisplaySettings::getVisualDatabaseDisplayCardSize() const
+{
+    return getValue("visualDatabaseDisplay", "cards", "cardSize", 100).toInt();
+}
+
+int CardsDisplaySettings::getVisualDeckEditorCardSize() const
+{
+    return getValue("visualDeckEditor", "cards", "cardSize", 100).toInt();
+}
+
+bool CardsDisplaySettings::getVisualDeckEditorShowCardCounts() const
+{
+    return getValue("visualDeckEditorShowCardCounts", QString(), QString(), true).toBool();
+}
+
+int CardsDisplaySettings::getEDHRecCardSize() const
+{
+    return getValue("edhrec", "cards", "cardSize", 100).toInt();
+}
+
+int CardsDisplaySettings::getArchidektPreviewSize() const
+{
+    return getValue("archidektPreview", "cards", "cardSize", 100).toInt();
+}
+
+int CardsDisplaySettings::getSampleHandSize() const
+{
+    return getValue("sampleHandSize", "cards", "cardSize", 7).toInt();
+}
+
+QString CardsDisplaySettings::getCardLang() const
+{
+    return getValue("cardLang", QString(), QString(), "en").toString();
+}
+
+int CardsDisplaySettings::getCardSearchLanguage() const
+{
+    return getValue("cardSearchLanguage", QString(), QString(), static_cast<int>(SearchLanguageMode::English)).toInt();
+}
+
+void CardsDisplaySettings::setDisplayCardNames(bool _displayCardNames)
+{
+    setValue(_displayCardNames, "displayCardNames");
+    emit displayCardNamesChanged();
+}
+
+void CardsDisplaySettings::setRoundCardCorners(bool _roundCardCorners)
+{
+    if (_roundCardCorners == getRoundCardCorners()) {
+        return;
+    }
+    setValue(_roundCardCorners, "roundCardCorners");
+    emit roundCardCornersChanged(_roundCardCorners);
+}
+
+void CardsDisplaySettings::setOverrideAllCardArtWithPersonalPreference(bool _overrideAllCardArt)
+{
+    setValue(_overrideAllCardArt, "overrideAllCardArtWithPersonalPreference");
+    emit overrideAllCardArtWithPersonalPreferenceChanged(_overrideAllCardArt);
+}
+
+void CardsDisplaySettings::setBumpSetsWithCardsInDeckToTop(bool _bumpSetsWithCardsInDeckToTop)
+{
+    setValue(_bumpSetsWithCardsInDeckToTop, "bumpSetsWithCardsInDeckToTop");
+    emit bumpSetsWithCardsInDeckToTopChanged();
+}
+
+void CardsDisplaySettings::setPrintingSelectorSortOrder(int _printingSelectorSortOrder)
+{
+    setValue(_printingSelectorSortOrder, "sortOrder", "cards", "printingSelector");
+    emit printingSelectorSortOrderChanged();
+}
+
+void CardsDisplaySettings::setPrintingSelectorCardSize(int _printingSelectorCardSize)
+{
+    setValue(_printingSelectorCardSize, "printingSelector", "cards", "cardSize");
+    emit printingSelectorCardSizeChanged();
+}
+
+void CardsDisplaySettings::setPrintingSelectorNavigationButtonsVisible(bool _navigationButtonsVisible)
+{
+    setValue(_navigationButtonsVisible, "navigationButtonsVisible", "cards", "printingSelector");
+    emit printingSelectorNavigationButtonsVisibleChanged();
+}
+
+void CardsDisplaySettings::setTapAnimation(bool _tapAnimation)
+{
+    setValue(_tapAnimation, "tapAnimation");
+}
+
+void CardsDisplaySettings::setArrowDrawAnimation(bool _arrowDrawAnimation)
+{
+    setValue(_arrowDrawAnimation, "arrowDrawAnimation");
+}
+
+void CardsDisplaySettings::setAutoRotateSidewaysLayoutCards(bool _autoRotateSidewaysLayoutCards)
+{
+    setValue(_autoRotateSidewaysLayoutCards, "autoRotateSidewaysLayoutCards");
+}
+
+void CardsDisplaySettings::setCardScaling(bool _scaleCards)
+{
+    setValue(_scaleCards, "scaleCards");
+}
+
+void CardsDisplaySettings::setStackCardOverlapPercent(int _verticalCardOverlapPercent)
+{
+    setValue(_verticalCardOverlapPercent, "verticalCardOverlapPercent");
+}
+
+void CardsDisplaySettings::setCardInfoViewMode(int _viewMode)
+{
+    setValue(_viewMode, "cardInfoViewMode");
+}
+
+void CardsDisplaySettings::setVisualDeckStorageCardSize(int _cardSize)
+{
+    setValue(_cardSize, "visualDeckStorage", "cards", "cardSize");
+    emit visualDeckStorageCardSizeChanged();
+}
+
+void CardsDisplaySettings::setVisualDatabaseDisplayCardSize(int _cardSize)
+{
+    setValue(_cardSize, "visualDatabaseDisplay", "cards", "cardSize");
+    emit visualDatabaseDisplayCardSizeChanged();
+}
+
+void CardsDisplaySettings::setVisualDeckEditorCardSize(int _cardSize)
+{
+    setValue(_cardSize, "visualDeckEditor", "cards", "cardSize");
+    emit visualDeckEditorCardSizeChanged();
+}
+
+void CardsDisplaySettings::setVisualDeckEditorShowCardCounts(bool _showCardCounts)
+{
+    if (_showCardCounts == getVisualDeckEditorShowCardCounts()) {
+        return;
+    }
+    setValue(_showCardCounts, "visualDeckEditorShowCardCounts");
+    emit visualDeckEditorShowCardCountsChanged(_showCardCounts);
+}
+
+void CardsDisplaySettings::setEDHRecCardSize(int _edhrecCardSize)
+{
+    setValue(_edhrecCardSize, "edhrec", "cards", "cardSize");
+    emit edhRecCardSizeChanged();
+}
+
+void CardsDisplaySettings::setArchidektPreviewCardSize(int _archidektPreviewCardSize)
+{
+    setValue(_archidektPreviewCardSize, "archidektPreview", "cards", "cardSize");
+    emit archidektPreviewSizeChanged();
+}
+
+void CardsDisplaySettings::setSampleHandSize(int _sampleHandSize)
+{
+    setValue(_sampleHandSize, "sampleHandSize", "cards", "cardSize");
+    emit sampleHandSizeChanged(_sampleHandSize);
+}
+
+void CardsDisplaySettings::setCardLang(const QString &_cardLang)
+{
+    if (_cardLang == getCardLang()) {
+        return;
+    }
+    setValue(_cardLang, "cardLang");
+    // Flush to disk immediately: the Oracle tool is a separate process that
+    // reads this value to decide which foreignData to import, so it must not
+    // observe a stale (pre-change) value.
+    sync();
+    emit cardLangChanged(_cardLang);
+}
+
+void CardsDisplaySettings::setCardSearchLanguage(int _cardSearchLanguage)
+{
+    if (_cardSearchLanguage == getCardSearchLanguage()) {
+        return;
+    }
+    setValue(_cardSearchLanguage, "cardSearchLanguage");
+    emit cardSearchLanguageChanged(_cardSearchLanguage);
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.h b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.h
new file mode 100644
index 000000000..961550d3c
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.h
@@ -0,0 +1,89 @@
+#ifndef CARDS_DISPLAY_SETTINGS_H
+#define CARDS_DISPLAY_SETTINGS_H
+
+#include "settings_manager.h"
+
+#include <QString>
+#include <libcockatrice/interfaces/interface_cards_display_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QObject;
+
+class CardsDisplaySettings : public SettingsManager, public ICardsDisplaySettingsProvider
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    [[nodiscard]] bool getDisplayCardNames() const override;
+    [[nodiscard]] bool getRoundCardCorners() const override;
+    [[nodiscard]] bool getOverrideAllCardArtWithPersonalPreference() const override;
+    [[nodiscard]] bool getBumpSetsWithCardsInDeckToTop() const override;
+    [[nodiscard]] int getPrintingSelectorSortOrder() const override;
+    [[nodiscard]] int getPrintingSelectorCardSize() const override;
+    [[nodiscard]] bool getPrintingSelectorNavigationButtonsVisible() const override;
+    [[nodiscard]] bool getTapAnimation() const override;
+    [[nodiscard]] bool getArrowDrawAnimation() const override;
+    [[nodiscard]] bool getAutoRotateSidewaysLayoutCards() const override;
+    [[nodiscard]] bool getScaleCards() const override;
+    [[nodiscard]] int getStackCardOverlapPercent() const override;
+    [[nodiscard]] int getCardInfoViewMode() const override;
+    [[nodiscard]] int getVisualDeckStorageCardSize() const override;
+    [[nodiscard]] int getVisualDatabaseDisplayCardSize() const override;
+    [[nodiscard]] int getVisualDeckEditorCardSize() const override;
+    [[nodiscard]] bool getVisualDeckEditorShowCardCounts() const override;
+    [[nodiscard]] int getEDHRecCardSize() const override;
+    [[nodiscard]] int getArchidektPreviewSize() const override;
+    [[nodiscard]] int getSampleHandSize() const override;
+    [[nodiscard]] QString getCardLang() const override;
+    [[nodiscard]] int getCardSearchLanguage() const override;
+
+    void setDisplayCardNames(bool _displayCardNames);
+    void setRoundCardCorners(bool _roundCardCorners);
+    void setOverrideAllCardArtWithPersonalPreference(bool _overrideAllCardArt);
+    void setBumpSetsWithCardsInDeckToTop(bool _bumpSetsWithCardsInDeckToTop);
+    void setPrintingSelectorSortOrder(int _printingSelectorSortOrder);
+    void setPrintingSelectorCardSize(int _printingSelectorCardSize);
+    void setPrintingSelectorNavigationButtonsVisible(bool _navigationButtonsVisible);
+    void setTapAnimation(bool _tapAnimation);
+    void setArrowDrawAnimation(bool _arrowDrawAnimation);
+    void setAutoRotateSidewaysLayoutCards(bool _autoRotateSidewaysLayoutCards);
+    void setCardScaling(bool _scaleCards);
+    void setStackCardOverlapPercent(int _verticalCardOverlapPercent);
+    void setCardInfoViewMode(int _viewMode);
+    void setVisualDeckStorageCardSize(int _cardSize);
+    void setVisualDatabaseDisplayCardSize(int _cardSize);
+    void setVisualDeckEditorCardSize(int _cardSize);
+    void setVisualDeckEditorShowCardCounts(bool _showCardCounts);
+    void setEDHRecCardSize(int _edhrecCardSize);
+    void setArchidektPreviewCardSize(int _archidektPreviewCardSize);
+    void setSampleHandSize(int _sampleHandSize);
+    void setCardLang(const QString &_cardLang);
+    void setCardSearchLanguage(int _cardSearchLanguage);
+
+signals:
+    void displayCardNamesChanged();
+    void roundCardCornersChanged(bool roundCardCorners);
+    void overrideAllCardArtWithPersonalPreferenceChanged(bool _overrideAllCardArtWithPersonalPreference);
+    void bumpSetsWithCardsInDeckToTopChanged();
+    void printingSelectorSortOrderChanged();
+    void printingSelectorCardSizeChanged();
+    void printingSelectorNavigationButtonsVisibleChanged();
+    void visualDeckStorageCardSizeChanged();
+    void visualDatabaseDisplayCardSizeChanged();
+    void visualDeckEditorCardSizeChanged();
+    void visualDeckEditorShowCardCountsChanged(bool showCardCounts);
+    void edhRecCardSizeChanged();
+    void archidektPreviewSizeChanged();
+    void sampleHandSizeChanged(int amount);
+    void cardLangChanged(const QString &lang);
+    void cardSearchLanguageChanged(int cardSearchLanguage);
+
+public:
+    explicit CardsDisplaySettings(const QString &settingPath, QObject *parent = nullptr);
+
+private:
+    CardsDisplaySettings(const CardsDisplaySettings & /*other*/);
+};
+
+#endif // CARDS_DISPLAY_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/chat_settings.cpp b/libcockatrice_settings/libcockatrice/settings/chat_settings.cpp
new file mode 100644
index 000000000..d9ae0ddac
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/chat_settings.cpp
@@ -0,0 +1,163 @@
+#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)
+{
+}
+
+bool ChatSettings::getChatMention() const
+{
+    return getValue("mention", QString(), QString(), true).toBool();
+}
+
+bool ChatSettings::getChatMentionCompleter() const
+{
+    return getValue("mentionCompleter", QString(), QString(), true).toBool();
+}
+
+QString ChatSettings::getChatMentionColor() const
+{
+    return getValue("mentionColor", QString(), QString(), "A6120D").toString();
+}
+
+QString ChatSettings::getChatHighlightColor() const
+{
+    return getValue("highlightColor", QString(), QString(), "A6120D").toString();
+}
+
+bool ChatSettings::getChatMentionForeground() const
+{
+    return getValue("mentionForeground", QString(), QString(), true).toBool();
+}
+
+bool ChatSettings::getChatHighlightForeground() const
+{
+    return getValue("highlightForeground", QString(), QString(), true).toBool();
+}
+
+bool ChatSettings::getIgnoreUnregisteredUsers() const
+{
+    return getValue("ignoreUnregistered").toBool();
+}
+
+bool ChatSettings::getIgnoreUnregisteredUserMessages() const
+{
+    return getValue("ignoreUnregisteredMessages").toBool();
+}
+
+bool ChatSettings::getIgnoreNonBuddyUserMessages() const
+{
+    return getValue("ignoreNonBuddyMessages").toBool();
+}
+
+bool ChatSettings::getShowMessagePopup() const
+{
+    return getValue("showMessagePopups", QString(), QString(), true).toBool();
+}
+
+bool ChatSettings::getShowMentionPopup() const
+{
+    return getValue("showMentionPopups", QString(), QString(), true).toBool();
+}
+
+bool ChatSettings::getRoomHistory() const
+{
+    return getValue("roomHistory", QString(), QString(), true).toBool();
+}
+
+bool ChatSettings::getIgnoreAllPrivateMessages() const
+{
+    return getValue("ignoreAllPrivateMessages", QString(), QString(), false).toBool();
+}
+
+bool ChatSettings::getUseGameTime() const
+{
+    return getValue("useGameTime", QString(), QString(), false).toBool();
+}
+
+QString ChatSettings::getHighlightWords() const
+{
+    return getValue("highlightWords").toString();
+}
+
+void ChatSettings::setChatMention(bool _chatMention)
+{
+    setValue(_chatMention, "mention");
+}
+
+void ChatSettings::setChatMentionCompleter(bool _chatMentionCompleter)
+{
+    setValue(_chatMentionCompleter, "mentionCompleter");
+    emit chatMentionCompleterChanged();
+}
+
+void ChatSettings::setChatMentionColor(const QString &_chatMentionColor)
+{
+    setValue(_chatMentionColor, "mentionColor");
+}
+
+void ChatSettings::setChatHighlightColor(const QString &_chatHighlightColor)
+{
+    setValue(_chatHighlightColor, "highlightColor");
+}
+
+void ChatSettings::setChatMentionForeground(bool _chatMentionForeground)
+{
+    setValue(_chatMentionForeground, "mentionForeground");
+}
+
+void ChatSettings::setChatHighlightForeground(bool _chatHighlightForeground)
+{
+    setValue(_chatHighlightForeground, "highlightForeground");
+}
+
+void ChatSettings::setIgnoreUnregisteredUsers(bool _ignoreUnregisteredUsers)
+{
+    setValue(_ignoreUnregisteredUsers, "ignoreUnregistered");
+}
+
+void ChatSettings::setIgnoreUnregisteredUserMessages(bool _ignoreUnregisteredUserMessages)
+{
+    setValue(_ignoreUnregisteredUserMessages, "ignoreUnregisteredMessages");
+}
+
+void ChatSettings::setIgnoreNonBuddyUserMessages(bool _ignoreNonBuddyUserMessages)
+{
+    setValue(_ignoreNonBuddyUserMessages, "ignoreNonBuddyMessages");
+}
+
+void ChatSettings::setShowMessagePopups(bool _showMessagePopups)
+{
+    setValue(_showMessagePopups, "showMessagePopups");
+}
+
+void ChatSettings::setShowMentionPopups(bool _showMentionPopups)
+{
+    setValue(_showMentionPopups, "showMentionPopups");
+}
+
+void ChatSettings::setRoomHistory(bool _roomHistory)
+{
+    setValue(_roomHistory, "roomHistory");
+}
+
+void ChatSettings::setIgnoreAllPrivateMessages(bool _ignoreAllPrivateMessages)
+{
+    setValue(_ignoreAllPrivateMessages, "ignoreAllPrivateMessages");
+}
+
+void ChatSettings::setUseGameTime(bool _useGameTime)
+{
+    setValue(_useGameTime, "useGameTime");
+}
+
+void ChatSettings::setHighlightWords(const QString &_highlightWords)
+{
+    setValue(_highlightWords, "highlightWords");
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/chat_settings.h b/libcockatrice_settings/libcockatrice/settings/chat_settings.h
new file mode 100644
index 000000000..e00da4527
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/chat_settings.h
@@ -0,0 +1,60 @@
+#ifndef CHAT_SETTINGS_H
+#define CHAT_SETTINGS_H
+
+#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
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    [[nodiscard]] bool getChatMention() const override;
+    [[nodiscard]] bool getChatMentionCompleter() const override;
+    [[nodiscard]] QString getChatMentionColor() const override;
+    [[nodiscard]] QString getChatHighlightColor() const override;
+    [[nodiscard]] bool getChatMentionForeground() const override;
+    [[nodiscard]] bool getChatHighlightForeground() const override;
+    [[nodiscard]] bool getIgnoreUnregisteredUsers() const override;
+    [[nodiscard]] bool getIgnoreUnregisteredUserMessages() const override;
+    [[nodiscard]] bool getIgnoreNonBuddyUserMessages() const override;
+    [[nodiscard]] bool getShowMessagePopup() const override;
+    [[nodiscard]] bool getShowMentionPopup() const override;
+    [[nodiscard]] bool getRoomHistory() const override;
+    [[nodiscard]] bool getIgnoreAllPrivateMessages() const override;
+    [[nodiscard]] bool getUseGameTime() const override;
+    [[nodiscard]] QString getHighlightWords() const override;
+
+    void setChatMention(bool _chatMention);
+    void setChatMentionCompleter(bool _chatMentionCompleter);
+    void setChatMentionColor(const QString &_chatMentionColor);
+    void setChatHighlightColor(const QString &_chatHighlightColor);
+    void setChatMentionForeground(bool _chatMentionForeground);
+    void setChatHighlightForeground(bool _chatHighlightForeground);
+    void setIgnoreUnregisteredUsers(bool _ignoreUnregisteredUsers);
+    void setIgnoreUnregisteredUserMessages(bool _ignoreUnregisteredUserMessages);
+    void setIgnoreNonBuddyUserMessages(bool _ignoreNonBuddyUserMessages);
+    void setShowMessagePopups(bool _showMessagePopups);
+    void setShowMentionPopups(bool _showMentionPopups);
+    void setRoomHistory(bool _roomHistory);
+    void setIgnoreAllPrivateMessages(bool _ignoreAllPrivateMessages);
+    void setUseGameTime(bool _useGameTime);
+    void setHighlightWords(const QString &_highlightWords);
+
+signals:
+    void chatMentionCompleterChanged();
+
+public:
+    explicit ChatSettings(const QString &settingPath, QObject *parent = nullptr);
+
+private:
+    ChatSettings(const ChatSettings & /*other*/);
+};
+
+#endif // CHAT_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.cpp b/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.cpp
new file mode 100644
index 000000000..eb692fe81
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.cpp
@@ -0,0 +1,204 @@
+#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()
+{
+    return {
+        QVariantMap{{"tag", "R"},
+                    {"officialName", "[5] cEDH"},
+                    {"displayName", "Ruthless"},
+                    {"explanation",
+                     "Top-tier competitive decks with maximum optimization, fast combos, and minimal variance."}},
+        QVariantMap{{"tag", "S"},
+                    {"officialName", "[4] Optimized"},
+                    {"displayName", "Spicy"},
+                    {"explanation", "Highly tuned decks with strong synergy and occasional combo finishes."}},
+        QVariantMap{{"tag", "P"},
+                    {"officialName", "[3] Upgraded"},
+                    {"displayName", "Powerful"},
+                    {"explanation", "Focused decks with clear win conditions and solid consistency."}},
+        QVariantMap{{"tag", "O"},
+                    {"officialName", "[2] Core"},
+                    {"displayName", "Oddball"},
+                    {"explanation", "Unconventional or thematic decks with some structure but non-standard choices."}},
+        QVariantMap{{"tag", "C"},
+                    {"officialName", "[2] Core"},
+                    {"displayName", "Core"},
+                    {"explanation", "Preconstructed or precon-level decks with straightforward strategies."}},
+        QVariantMap{{"tag", "E"},
+                    {"officialName", "[1] Exhibition"},
+                    {"displayName", "Exhibition"},
+                    {"explanation", "Ultra-casual, theme-focused decks with minimal optimization."}},
+        QVariantMap{{"tag", "B"},
+                    {"officialName", "Banned"},
+                    {"displayName", "Banned"},
+                    {"explanation", "The deck contains one or more cards banned in Commander."}},
+    };
+}
+
+CommanderBracketSettings::CommanderBracketSettings(const QString &settingPath, QObject *parent)
+    : SettingsManager(settingPath + "commander_brackets.ini", "commander_brackets", QString(), parent)
+{
+}
+
+void CommanderBracketSettings::setSchemaVersion(int version)
+{
+    setValue(version, "schemaVersion");
+}
+int CommanderBracketSettings::getSchemaVersion() const
+{
+    QVariant value = getValue("schemaVersion");
+    return value.isValid() ? value.toInt() : 0;
+}
+
+void CommanderBracketSettings::clearDefinitions()
+{
+    auto settings = getSettings();
+
+    settings.beginGroup("commander_brackets");
+    settings.remove("");
+    settings.endGroup();
+
+    settings.sync();
+}
+
+void CommanderBracketSettings::saveDefinitions(const QVariantList &definitions)
+{
+    auto settings = getSettings();
+
+    settings.beginGroup("commander_brackets");
+
+    settings.remove("");
+
+    settings.setValue("schemaVersion", CurrentSchemaVersion);
+
+    for (const auto &entry : definitions) {
+        QVariantMap map = entry.toMap();
+
+        QString tag = map.value("tag").toString();
+
+        if (tag.isEmpty()) {
+            continue;
+        }
+
+        settings.beginGroup(tag);
+
+        settings.setValue("officialName", map.value("officialName"));
+
+        settings.setValue("displayName", map.value("displayName"));
+
+        settings.setValue("explanation", map.value("explanation"));
+
+        settings.endGroup();
+    }
+
+    settings.endGroup();
+
+    settings.sync();
+}
+
+QVariantList CommanderBracketSettings::loadDefinitions() const
+{
+    QVariantList result;
+
+    auto settings = getSettings();
+
+    settings.beginGroup("commander_brackets");
+
+    int version = settings.value("schemaVersion", 0).toInt();
+
+    if (version != CurrentSchemaVersion) {
+        settings.endGroup();
+        return result;
+    }
+
+    QStringList groups = settings.childGroups();
+
+    for (const QString &tag : groups) {
+        settings.beginGroup(tag);
+
+        QVariantMap map;
+
+        map["tag"] = tag;
+        map["officialName"] = settings.value("officialName");
+        map["displayName"] = settings.value("displayName");
+        map["explanation"] = settings.value("explanation");
+
+        result.append(map);
+
+        settings.endGroup();
+    }
+
+    settings.endGroup();
+
+    return result;
+}
+
+void CommanderBracketSettings::reloadDefinitions(const QVariantList &definitionsList)
+{
+    definitions.clear();
+
+    for (const auto &entry : definitionsList) {
+        const auto map = entry.toMap();
+
+        CommanderBracketDefinition definition;
+
+        definition.tag = map.value("tag").toString();
+        definition.officialName = map.value("officialName").toString();
+        definition.displayName = map.value("displayName").toString();
+        definition.explanation = map.value("explanation").toString();
+
+        if (!definition.tag.isEmpty()) {
+            definitions.insert(definition.tag, definition);
+        }
+    }
+}
+
+QString CommanderBracketSettings::officialName(const QString &tag) const
+{
+    auto it = definitions.find(tag);
+
+    if (it == definitions.end()) {
+        return tag;
+    }
+
+    return it->officialName;
+}
+
+QString CommanderBracketSettings::displayName(const QString &tag) const
+{
+    auto it = definitions.find(tag);
+
+    if (it == definitions.end()) {
+        return tag;
+    }
+
+    return it->displayName;
+}
+
+QString CommanderBracketSettings::explanation(const QString &tag) const
+{
+    auto it = definitions.find(tag);
+
+    if (it == definitions.end()) {
+        return {};
+    }
+
+    return it->explanation;
+}
+
+bool CommanderBracketSettings::contains(const QString &tag) const
+{
+    return definitions.contains(tag);
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.h b/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.h
new file mode 100644
index 000000000..ad012fc30
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/commander_bracket_settings.h
@@ -0,0 +1,58 @@
+#ifndef COMMANDER_BRACKET_SETTINGS_H
+#define COMMANDER_BRACKET_SETTINGS_H
+
+#include "settings_manager.h"
+
+#include <QHash>
+#include <QString>
+#include <QVariantList>
+#include <qtmetamacros.h>
+
+class QObject;
+
+struct CommanderBracketDefinition
+{
+    QString tag;
+
+    QString officialName;
+    QString displayName;
+
+    QString explanation;
+};
+
+class CommanderBracketSettings : public SettingsManager
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    static constexpr int CurrentSchemaVersion = 1;
+
+    static QVariantList defaultDefinitions();
+
+    void clearDefinitions();
+
+    void saveDefinitions(const QVariantList &definitions);
+
+    QVariantList loadDefinitions() const;
+
+    void reloadDefinitions(const QVariantList &definitions);
+
+    QString officialName(const QString &tag) const;
+    QString displayName(const QString &tag) const;
+    QString explanation(const QString &tag) const;
+    bool contains(const QString &tag) const;
+
+    void setSchemaVersion(int version);
+    int getSchemaVersion() const;
+
+private:
+    explicit CommanderBracketSettings(const QString &settingPath, QObject *parent = nullptr);
+
+    CommanderBracketSettings(const CommanderBracketSettings &) = delete;
+    CommanderBracketSettings &operator=(const CommanderBracketSettings &) = delete;
+
+    QHash<QString, CommanderBracketDefinition> definitions;
+};
+
+#endif // COMMANDER_BRACKET_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp b/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp
index 084696dc1..c36e7187e 100644
--- a/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/debug_settings.cpp
@@ -1,6 +1,11 @@
 #include "debug_settings.h"
 
-#include <QtCore/QFile>
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QFile>
+#include <QVariant>
+
+class QObject;
 
 DebugSettings::DebugSettings(const QString &settingPath, QObject *parent)
     : SettingsManager(settingPath + "debug.ini", "debug", QString(), parent)
@@ -11,22 +16,22 @@ DebugSettings::DebugSettings(const QString &settingPath, QObject *parent)
     }
 }
 
-bool DebugSettings::getShowCardId()
+bool DebugSettings::getShowCardId() const
 {
     return getValue("showCardId").toBool();
 }
 
-bool DebugSettings::getLocalGameOnStartup()
+bool DebugSettings::getLocalGameOnStartup() const
 {
     return getValue("onStartup", "localgame").toBool();
 }
 
-int DebugSettings::getLocalGamePlayerCount()
+int DebugSettings::getLocalGamePlayerCount() const
 {
     return getValue("playerCount", "localgame").toInt();
 }
 
-QString DebugSettings::getDeckPathForPlayer(const QString &playerName)
+QString DebugSettings::getDeckPathForPlayer(const QString &playerName) const
 {
     return getValue(playerName, "localgame", "deck").toString();
 }
\ No newline at end of file
diff --git a/libcockatrice_settings/libcockatrice/settings/debug_settings.h b/libcockatrice_settings/libcockatrice/settings/debug_settings.h
index 2087b16b3..9521a7738 100644
--- a/libcockatrice_settings/libcockatrice/settings/debug_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/debug_settings.h
@@ -1,13 +1,18 @@
 /**
  * @file debug_settings.h
  * @ingroup CoreSettings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef DEBUG_SETTINGS_H
 #define DEBUG_SETTINGS_H
 #include "settings_manager.h"
 
+#include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
+
 class DebugSettings : public SettingsManager
 {
     Q_OBJECT
@@ -17,12 +22,12 @@ class DebugSettings : public SettingsManager
     DebugSettings(const DebugSettings & /*other*/);
 
 public:
-    bool getShowCardId();
+    bool getShowCardId() const;
 
-    bool getLocalGameOnStartup();
-    int getLocalGamePlayerCount();
+    bool getLocalGameOnStartup() const;
+    int getLocalGamePlayerCount() const;
 
-    QString getDeckPathForPlayer(const QString &playerName);
+    QString getDeckPathForPlayer(const QString &playerName) const;
 };
 
 #endif // DEBUG_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.cpp b/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.cpp
new file mode 100644
index 000000000..ee570ed67
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.cpp
@@ -0,0 +1,89 @@
+#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)
+{
+}
+
+bool DeckEditorSettings::getOpenDeckInNewTab() const
+{
+    return getValue("openDeckInNewTab", QString(), QString(), false).toBool();
+}
+
+bool DeckEditorSettings::getBannerCardComboBoxVisible() const
+{
+    return getValue("bannerCardComboBoxVisible", QString(), QString(), true).toBool();
+}
+
+bool DeckEditorSettings::getTagsWidgetVisible() const
+{
+    return getValue("tagsWidgetVisible", QString(), QString(), true).toBool();
+}
+
+int DeckEditorSettings::getDefaultDeckEditorType() const
+{
+    return getValue("defaultDeckEditorType", QString(), QString(), 1).toInt();
+}
+
+int DeckEditorSettings::getVdeStartupTab() const
+{
+    return getValue("vdeStartupTab", QString(), QString(), VdeStartupTabContext).toInt();
+}
+
+void DeckEditorSettings::setOpenDeckInNewTab(bool _openDeckInNewTab)
+{
+    setValue(_openDeckInNewTab, "openDeckInNewTab");
+}
+
+void DeckEditorSettings::setBannerCardComboBoxVisible(bool _bannerCardComboBoxVisible)
+{
+    setValue(_bannerCardComboBoxVisible, "bannerCardComboBoxVisible");
+    emit bannerCardComboBoxVisibleChanged(_bannerCardComboBoxVisible);
+}
+
+void DeckEditorSettings::setTagsWidgetVisible(bool _tagsWidgetVisible)
+{
+    setValue(_tagsWidgetVisible, "tagsWidgetVisible");
+    emit tagsWidgetVisibleChanged(_tagsWidgetVisible);
+}
+
+void DeckEditorSettings::setDefaultDeckEditorType(int _defaultDeckEditorType)
+{
+    setValue(_defaultDeckEditorType, "defaultDeckEditorType");
+}
+
+void DeckEditorSettings::setVdeStartupTab(int _vdeStartupTab)
+{
+    setValue(_vdeStartupTab, "vdeStartupTab");
+    emit vdeStartupTabChanged(_vdeStartupTab);
+}
+
+int DeckEditorSettings::getCommanderSpellbookIntegrationEnabled() const
+{
+    return getValue("commanderspellbookintegrationenabled", QString(), QString(),
+                    commanderSpellbookIntegrationEnabledIndexUnprompted)
+        .toInt();
+}
+
+bool DeckEditorSettings::getCommanderSpellbookIntegrationUseOfficialBracketNames() const
+{
+    return getValue("commanderspellbookintegrationuseofficialbracketnames", QString(), QString(), false).toBool();
+}
+
+void DeckEditorSettings::setCommanderSpellbookIntegrationEnabled(int _commanderSpellbookIntegrationEnabled)
+{
+    setValue(_commanderSpellbookIntegrationEnabled, "commanderspellbookintegrationenabled");
+    emit commanderSpellbookIntegrationEnabledChanged(_commanderSpellbookIntegrationEnabled);
+}
+
+void DeckEditorSettings::setCommanderSpellbookIntegrationUseOfficialBracketNames(bool _useOfficialBracketNames)
+{
+    setValue(_useOfficialBracketNames, "commanderspellbookintegrationuseofficialbracketnames");
+    emit commanderSpellbookIntegrationUseOfficialBracketNamesChanged(_useOfficialBracketNames);
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.h b/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.h
new file mode 100644
index 000000000..aa024910d
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/deck_editor_settings.h
@@ -0,0 +1,63 @@
+#ifndef DECK_EDITOR_SETTINGS_H
+#define DECK_EDITOR_SETTINGS_H
+
+#include "settings_manager.h"
+
+#include <QString>
+#include <libcockatrice/interfaces/interface_deck_editor_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QObject;
+
+enum commanderSpellbookIntegrationEnabledIndex
+{
+    commanderSpellbookIntegrationEnabledIndexDisabled,
+    commanderSpellbookIntegrationEnabledIndexEnabled,
+    commanderSpellbookIntegrationEnabledIndexAutomatic,
+    commanderSpellbookIntegrationEnabledIndexUnprompted,
+};
+
+enum VdeStartupTab
+{
+    VdeStartupTabContext, ///< Match the opened deck: new decks show the database display, existing decks the deck view
+    VdeStartupTabDeckDisplay,     ///< Always open the Visual Deck View
+    VdeStartupTabDatabaseDisplay, ///< Always open the Visual Database Display
+};
+
+class DeckEditorSettings : public SettingsManager, public IDeckEditorSettingsProvider
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    [[nodiscard]] bool getOpenDeckInNewTab() const override;
+    [[nodiscard]] bool getBannerCardComboBoxVisible() const override;
+    [[nodiscard]] bool getTagsWidgetVisible() const override;
+    [[nodiscard]] int getDefaultDeckEditorType() const override;
+    [[nodiscard]] int getVdeStartupTab() const;
+    [[nodiscard]] int getCommanderSpellbookIntegrationEnabled() const;
+    [[nodiscard]] bool getCommanderSpellbookIntegrationUseOfficialBracketNames() const;
+
+    void setOpenDeckInNewTab(bool _openDeckInNewTab);
+    void setBannerCardComboBoxVisible(bool _bannerCardComboBoxVisible);
+    void setTagsWidgetVisible(bool _tagsWidgetVisible);
+    void setDefaultDeckEditorType(int _defaultDeckEditorType);
+    void setVdeStartupTab(int _vdeStartupTab);
+    void setCommanderSpellbookIntegrationEnabled(int _commanderSpellbookIntegrationEnabled);
+    void setCommanderSpellbookIntegrationUseOfficialBracketNames(bool _useOfficialBracketNames);
+
+signals:
+    void bannerCardComboBoxVisibleChanged(bool visible);
+    void tagsWidgetVisibleChanged(bool visible);
+    void commanderSpellbookIntegrationEnabledChanged(int enabled);
+    void commanderSpellbookIntegrationUseOfficialBracketNamesChanged(bool useOfficialBracketNames);
+    void vdeStartupTabChanged(int vdeStartupTab);
+
+public:
+    explicit DeckEditorSettings(const QString &settingPath, QObject *parent = nullptr);
+
+private:
+    DeckEditorSettings(const DeckEditorSettings & /*other*/);
+};
+
+#endif // DECK_EDITOR_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/download_settings.cpp b/libcockatrice_settings/libcockatrice/settings/download_settings.cpp
index ad4b81ec5..84a6a7509 100644
--- a/libcockatrice_settings/libcockatrice/settings/download_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/download_settings.cpp
@@ -2,12 +2,40 @@
 
 #include "settings_manager.h"
 
+#include <QList>
+#include <QSettings>
+#include <QVariant>
+#include <QtGlobal>
+#include <utility>
+
+class QObject;
+
 const QStringList DownloadSettings::DEFAULT_DOWNLOAD_URLS = {
-    "https://api.scryfall.com/cards/!set:uuid!?format=image&face=!prop:side!",
-    "https://api.scryfall.com/cards/multiverse/!set:muid!?format=image",
+    "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!",
+    "https://api.scryfall.com/cards/multiverse/!set:muid!?format=image&lang=!sflang!",
     "https://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!set:muid!&type=card",
     "https://gatherer.wizards.com/Handlers/Image.ashx?name=!name!&type=card"};
 
+const QString DownloadSettings::SCRYFALL_NAMED_LOCALIZED_URL =
+    "https://api.scryfall.com/cards/named?fuzzy=!localizedName!&lang=!sflang!&format=image&face=!prop:side!";
+
+// Developer-set ceilings for the per-host request allowance. Users may lower a host's
+// allowance via the download settings, but can never raise it above these values. Hosts
+// not listed default to DEFAULT_HOST_REQUEST_LIMIT. A cap of UNLIMITED_HOST_QUOTA marks a
+// host that is never throttled per host and skips the dispatch pacing (429 backoff still applies).
+const QHash<QString, int> DownloadSettings::DEVELOPER_HOST_CAPS = {
+    // The Scryfall API enforces 10 requests/second; stay one under so a burst can't trip 429s.
+    {"api.scryfall.com", 9},
+    // The Scryfall image CDN has no documented per-client rate limit.
+    {"cards.scryfall.io", UNLIMITED_HOST_QUOTA},
+};
+
+const QHash<QString, int> &DownloadSettings::getDeveloperHostCaps()
+{
+    return DEVELOPER_HOST_CAPS;
+}
+
 DownloadSettings::DownloadSettings(const QString &settingPath, QObject *parent = nullptr)
     : SettingsManager(settingPath + "downloads.ini", "downloads", QString(), parent)
 {
@@ -18,7 +46,7 @@ void DownloadSettings::setDownloadUrls(const QStringList &downloadURLs)
     setValue(QVariant::fromValue(downloadURLs), "urls");
 }
 
-QStringList DownloadSettings::getAllURLs()
+QStringList DownloadSettings::getAllURLs() const
 {
     return getValue("urls").toStringList();
 }
@@ -27,3 +55,91 @@ void DownloadSettings::resetToDefaultURLs()
 {
     setValue(QVariant::fromValue(DEFAULT_DOWNLOAD_URLS), "urls");
 }
+
+bool DownloadSettings::addLocalizedScryfallUrl()
+{
+    const QStringList urls = getAllURLs();
+    if (urls.contains(SCRYFALL_NAMED_LOCALIZED_URL)) {
+        return false;
+    }
+    QStringList updated = urls;
+    updated.prepend(SCRYFALL_NAMED_LOCALIZED_URL);
+    setDownloadUrls(updated);
+    return true;
+}
+
+bool DownloadSettings::getPicDownload() const
+{
+    return getValue("pictureDownload", QString(), QString(), true).toBool();
+}
+
+void DownloadSettings::setPicDownload(bool _picDownload)
+{
+    setValue(_picDownload, "pictureDownload");
+    emit picDownloadChanged();
+}
+
+bool DownloadSettings::getDownloadSpoilersStatus() const
+{
+    return getValue("downloadSpoilers", QString(), QString(), false).toBool();
+}
+
+void DownloadSettings::setDownloadSpoilerStatus(bool _spoilerStatus)
+{
+    setValue(_spoilerStatus, "downloadSpoilers");
+    emit downloadSpoilerStatusChanged();
+}
+
+QHash<QString, int> DownloadSettings::getHostRequestLimits() const
+{
+    auto settings = getSettings();
+    if (!defaultGroup.isEmpty()) {
+        settings.beginGroup(defaultGroup);
+    }
+    settings.beginGroup("hostRequestLimits");
+
+    QHash<QString, int> hostRequestLimits;
+    const QStringList hosts = settings.childKeys();
+    for (const QString &host : hosts) {
+        hostRequestLimits.insert(host, settings.value(host).toInt());
+    }
+
+    settings.endGroup();
+    if (!defaultGroup.isEmpty()) {
+        settings.endGroup();
+    }
+    return hostRequestLimits;
+}
+
+void DownloadSettings::setHostRequestLimits(const QHash<QString, int> &hostRequestLimits)
+{
+    auto settings = getSettings();
+    if (!defaultGroup.isEmpty()) {
+        settings.beginGroup(defaultGroup);
+    }
+
+    // Drop the legacy single-key form (an opaque @Variant blob) written by earlier builds so each
+    // host is stored as a plain, hand-editable key in its own subgroup.
+    settings.remove("hostRequestLimits");
+    settings.beginGroup("hostRequestLimits");
+    settings.remove(QString());
+    for (auto it = hostRequestLimits.cbegin(); it != hostRequestLimits.cend(); ++it) {
+        settings.setValue(it.key(), it.value());
+    }
+    settings.endGroup();
+
+    if (!defaultGroup.isEmpty()) {
+        settings.endGroup();
+    }
+    settings.sync();
+    emit hostRequestLimitsChanged();
+}
+
+int DownloadSettings::clampHostRequestLimit(const QString &host, int requested) const
+{
+    const int devCap = DEVELOPER_HOST_CAPS.value(host, DEFAULT_HOST_REQUEST_LIMIT);
+    if (devCap == UNLIMITED_HOST_QUOTA) {
+        return qMax(MIN_HOST_REQUEST_LIMIT, requested);
+    }
+    return qBound(MIN_HOST_REQUEST_LIMIT, requested, devCap);
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/download_settings.h b/libcockatrice_settings/libcockatrice/settings/download_settings.h
index ed3634ea1..f7cf482e1 100644
--- a/libcockatrice_settings/libcockatrice/settings/download_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/download_settings.h
@@ -1,27 +1,85 @@
 /**
  * @file download_settings.h
  * @ingroup NetworkSettings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef COCKATRICE_DOWNLOADSETTINGS_H
 #define COCKATRICE_DOWNLOADSETTINGS_H
 
 #include "settings_manager.h"
 
+#include <QHash>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class QObject;
+
 class DownloadSettings : public SettingsManager
 {
     Q_OBJECT
     friend class SettingsCache;
 
     static const QStringList DEFAULT_DOWNLOAD_URLS;
+    static const QString SCRYFALL_NAMED_LOCALIZED_URL;
+    static const QHash<QString, int> DEVELOPER_HOST_CAPS;
 
 public:
+    /** @brief Per-host request allowance (requests/second) when no developer cap applies. */
+    static constexpr int DEFAULT_HOST_REQUEST_LIMIT = 10;
+    /** @brief Floor for any per-host request allowance. */
+    static constexpr int MIN_HOST_REQUEST_LIMIT = 1;
+    /**
+     * @brief Upper bound offered to the user when lowering an unlocked host's allowance.
+     *
+     * Unlocked hosts have no developer cap, so `clampHostRequestLimit` puts no upper bound on
+     * them; this only bounds what the settings dialog offers, and matches the widest paced
+     * allowance a user is documented to be able to hand-edit in `downloads.ini`. Choosing 0
+     * below this restores the "unlimited" fast path.
+     */
+    static constexpr int UNLOCKED_HOST_LIMIT_MAX = 50;
+    /** @brief Developer cap marking a host as never throttled per host or by the dispatch pacing. */
+    static constexpr int UNLIMITED_HOST_QUOTA = -1;
+
+    /**
+     * @brief Developer-set per-host allowance ceilings (requests/second), keyed by host.
+     *
+     * Hosts not present default to DEFAULT_HOST_REQUEST_LIMIT. An entry of
+     * UNLIMITED_HOST_QUOTA marks a host that users may still lower, but that is never
+     * throttled per host by default. Users can never raise a host's allowance above its
+     * developer cap.
+     */
+    static const QHash<QString, int> &getDeveloperHostCaps();
+
     explicit DownloadSettings(const QString &, QObject *);
 
-    QStringList getAllURLs();
+    QStringList getAllURLs() const;
     void setDownloadUrls(const QStringList &downloadURLs);
     void resetToDefaultURLs();
+    [[nodiscard]] bool addLocalizedScryfallUrl();
+    [[nodiscard]] bool getPicDownload() const;
+    void setPicDownload(bool _picDownload);
+    [[nodiscard]] bool getDownloadSpoilersStatus() const;
+    void setDownloadSpoilerStatus(bool _spoilerStatus);
+
+    /** @brief User-set per-host request allowances (requests/second). Missing hosts use the developer default. */
+    QHash<QString, int> getHostRequestLimits() const;
+    void setHostRequestLimits(const QHash<QString, int> &hostRequestLimits);
+
+    /**
+     * @brief Clamps the user's requested allowance for a host against its developer cap.
+     * @param host The host to clamp for
+     * @param requested The user-requested allowance in requests/second
+     * @return The effective allowance. Users may lower a host's allowance but never raise it
+     *         above the developer cap; hosts with UNLIMITED_HOST_QUOTA have no upper bound.
+     */
+    [[nodiscard]] int clampHostRequestLimit(const QString &host, int requested) const;
+
+signals:
+    void picDownloadChanged();
+    void downloadSpoilerStatusChanged();
+    void hostRequestLimitsChanged();
 };
 
 #endif // COCKATRICE_DOWNLOADSETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp
index e5db3010d..79d1bc9e2 100644
--- a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.cpp
@@ -1,155 +1,163 @@
 #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)
 {
 }
 
-/*
+/**
  * The game type might contain special characters, so to use it in
  * QSettings we just hash it.
  */
-QString GameFiltersSettings::hashGameType(const QString &gameType) const
+static QString hashGameType(const QString &gameType)
 {
     return QCryptographicHash::hash(gameType.toUtf8(), QCryptographicHash::Md5).toHex();
 }
 
 void GameFiltersSettings::setHideBuddiesOnlyGames(bool hide)
 {
-    setValue(hide, "hide_buddies_only_games");
+    setValue(hide, "hideBuddiesOnlyGames");
 }
 
-bool GameFiltersSettings::isHideBuddiesOnlyGames()
+bool GameFiltersSettings::isHideBuddiesOnlyGames() const
 {
-    QVariant previous = getValue("hide_buddies_only_games");
+    QVariant previous = getValue("hideBuddiesOnlyGames");
     return previous == QVariant() ? false : previous.toBool();
 }
 
 void GameFiltersSettings::setHideFullGames(bool hide)
 {
-    setValue(hide, "hide_full_games");
+    setValue(hide, "hideFullGames");
 }
 
-bool GameFiltersSettings::isHideFullGames()
+bool GameFiltersSettings::isHideFullGames() const
 {
-    QVariant previous = getValue("hide_full_games");
+    QVariant previous = getValue("hideFullGames");
     return previous == QVariant() ? false : previous.toBool();
 }
 
 void GameFiltersSettings::setHideGamesThatStarted(bool hide)
 {
-    setValue(hide, "hide_games_that_started");
+    setValue(hide, "hideGamesThatStarted");
 }
 
-bool GameFiltersSettings::isHideGamesThatStarted()
+bool GameFiltersSettings::isHideGamesThatStarted() const
 {
-    QVariant previous = getValue("hide_games_that_started");
+    QVariant previous = getValue("hideGamesThatStarted");
     return previous == QVariant() ? false : previous.toBool();
 }
 
 void GameFiltersSettings::setHidePasswordProtectedGames(bool hide)
 {
-    setValue(hide, "hide_password_protected_games");
+    setValue(hide, "hidePasswordProtectedGames");
 }
 
-bool GameFiltersSettings::isHidePasswordProtectedGames()
+bool GameFiltersSettings::isHidePasswordProtectedGames() const
 {
-    QVariant previous = getValue("hide_password_protected_games");
+    QVariant previous = getValue("hidePasswordProtectedGames");
     return previous == QVariant() ? false : previous.toBool();
 }
 
 void GameFiltersSettings::setHideIgnoredUserGames(bool hide)
 {
-    setValue(hide, "hide_ignored_user_games");
+    setValue(hide, "hideIgnoredUserGames");
 }
 
-bool GameFiltersSettings::isHideIgnoredUserGames()
+bool GameFiltersSettings::isHideIgnoredUserGames() const
 {
-    QVariant previous = getValue("hide_ignored_user_games");
+    QVariant previous = getValue("hideIgnoredUserGames");
     return previous == QVariant() ? true : previous.toBool();
 }
 
 void GameFiltersSettings::setHideNotBuddyCreatedGames(bool hide)
 {
-    setValue(hide, "hide_not_buddy_created_games");
+    setValue(hide, "hideNotBuddyCreatedGames");
 }
 
-bool GameFiltersSettings::isHideNotBuddyCreatedGames()
+bool GameFiltersSettings::isHideNotBuddyCreatedGames() const
 {
-    QVariant previous = getValue("hide_not_buddy_created_games");
+    QVariant previous = getValue("hideNotBuddyCreatedGames");
     return previous == QVariant() ? false : previous.toBool();
 }
 
 void GameFiltersSettings::setHideOpenDecklistGames(bool hide)
 {
-    setValue(hide, "hide_open_decklist_games");
+    setValue(hide, "hideOpenDecklistGames");
 }
 
-bool GameFiltersSettings::isHideOpenDecklistGames()
+bool GameFiltersSettings::isHideOpenDecklistGames() const
 {
-    QVariant previous = getValue("hide_open_decklist_games");
+    QVariant previous = getValue("hideOpenDecklistGames");
     return previous == QVariant() ? false : previous.toBool();
 }
 
 void GameFiltersSettings::setGameNameFilter(QString gameName)
 {
-    setValue(gameName, "game_name_filter");
+    setValue(gameName, "gameNameFilter");
 }
 
-QString GameFiltersSettings::getGameNameFilter()
+QString GameFiltersSettings::getGameNameFilter() const
 {
-    return getValue("game_name_filter").toString();
+    return getValue("gameNameFilter").toString();
 }
 
-void GameFiltersSettings::setCreatorNameFilters(QStringList creatorName)
+void GameFiltersSettings::setHostNameFilters(QStringList hostName)
 {
-    setValue(creatorName, "creator_name_filter");
+    setValue(hostName, "hostNameFilter");
 }
 
-QStringList GameFiltersSettings::getCreatorNameFilters()
+QStringList GameFiltersSettings::getHostNameFilters() const
 {
-    return getValue("creator_name_filter").toStringList();
+    return getValue("hostNameFilter").toStringList();
 }
 
 void GameFiltersSettings::setMinPlayers(int min)
 {
-    setValue(min, "min_players");
+    setValue(min, "minPlayers");
 }
 
-int GameFiltersSettings::getMinPlayers()
+int GameFiltersSettings::getMinPlayers() const
 {
-    QVariant previous = getValue("min_players");
+    QVariant previous = getValue("minPlayers");
     return previous == QVariant() ? 1 : previous.toInt();
 }
 
 void GameFiltersSettings::setMaxPlayers(int max)
 {
-    setValue(max, "max_players");
+    setValue(max, "maxPlayers");
 }
 
-int GameFiltersSettings::getMaxPlayers()
+int GameFiltersSettings::getMaxPlayers() const
 {
-    QVariant previous = getValue("max_players");
+    QVariant previous = getValue("maxPlayers");
     return previous == QVariant() ? 99 : previous.toInt();
 }
 
 void GameFiltersSettings::setMaxGameAge(const QTime &maxGameAge)
 {
-    setValue(maxGameAge, "max_game_age_time");
+    setValue(maxGameAge, "maxGameAgeTime");
 }
 
-QTime GameFiltersSettings::getMaxGameAge()
+QTime GameFiltersSettings::getMaxGameAge() const
 {
-    QVariant previous = getValue("max_game_age_time");
+    QVariant previous = getValue("maxGameAgeTime");
     return previous.toTime();
 }
 
 void GameFiltersSettings::setGameTypeEnabled(QString gametype, bool enabled)
 {
-    setValue(enabled, "game_type/" + hashGameType(gametype));
+    setValue(enabled, "gameType/" + hashGameType(gametype));
 }
 
 void GameFiltersSettings::setGameHashedTypeEnabled(QString gametypeHASHED, bool enabled)
@@ -157,52 +165,52 @@ void GameFiltersSettings::setGameHashedTypeEnabled(QString gametypeHASHED, bool
     setValue(enabled, gametypeHASHED);
 }
 
-bool GameFiltersSettings::isGameTypeEnabled(QString gametype)
+bool GameFiltersSettings::isGameTypeEnabled(QString gametype) const
 {
-    QVariant previous = getValue("game_type/" + hashGameType(gametype));
+    QVariant previous = getValue("gameType/" + hashGameType(gametype));
     return previous == QVariant() ? false : previous.toBool();
 }
 
 void GameFiltersSettings::setShowOnlyIfSpectatorsCanWatch(bool show)
 {
-    setValue(show, "show_only_if_spectators_can_watch");
+    setValue(show, "showOnlyIfSpectatorsCanWatch");
 }
 
-bool GameFiltersSettings::isShowOnlyIfSpectatorsCanWatch()
+bool GameFiltersSettings::isShowOnlyIfSpectatorsCanWatch() const
 {
-    QVariant previous = getValue("show_only_if_spectators_can_watch");
+    QVariant previous = getValue("showOnlyIfSpectatorsCanWatch");
     return previous == QVariant() ? false : previous.toBool();
 }
 
 void GameFiltersSettings::setShowSpectatorPasswordProtected(bool show)
 {
-    setValue(show, "show_spectator_password_protected");
+    setValue(show, "showSpectatorPasswordProtected");
 }
 
-bool GameFiltersSettings::isShowSpectatorPasswordProtected()
+bool GameFiltersSettings::isShowSpectatorPasswordProtected() const
 {
-    QVariant previous = getValue("show_spectator_password_protected");
+    QVariant previous = getValue("showSpectatorPasswordProtected");
     return previous == QVariant() ? false : previous.toBool();
 }
 
 void GameFiltersSettings::setShowOnlyIfSpectatorsCanChat(bool show)
 {
-    setValue(show, "show_only_if_spectators_can_chat");
+    setValue(show, "showOnlyIfSpectatorsCanChat");
 }
 
-bool GameFiltersSettings::isShowOnlyIfSpectatorsCanChat()
+bool GameFiltersSettings::isShowOnlyIfSpectatorsCanChat() const
 {
-    QVariant previous = getValue("show_only_if_spectators_can_chat");
+    QVariant previous = getValue("showOnlyIfSpectatorsCanChat");
     return previous == QVariant() ? false : previous.toBool();
 }
 
 void GameFiltersSettings::setShowOnlyIfSpectatorsCanSeeHands(bool show)
 {
-    setValue(show, "show_only_if_spectators_can_see_hands");
+    setValue(show, "showOnlyIfSpectatorsCanSeeHands");
 }
 
-bool GameFiltersSettings::isShowOnlyIfSpectatorsCanSeeHands()
+bool GameFiltersSettings::isShowOnlyIfSpectatorsCanSeeHands() const
 {
-    QVariant previous = getValue("show_only_if_spectators_can_see_hands");
+    QVariant previous = getValue("showOnlyIfSpectatorsCanSeeHands");
     return previous == QVariant() ? false : previous.toBool();
 }
\ No newline at end of file
diff --git a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h
index 45e9b7441..ec5e3fdc2 100644
--- a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h
@@ -2,37 +2,44 @@
  * @file game_filters_settings.h
  * @ingroup Lobby
  * @ingroup GameSettings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef GAMEFILTERSSETTINGS_H
 #define GAMEFILTERSSETTINGS_H
 
 #include "settings_manager.h"
 
+#include <QString>
+#include <QStringList>
+#include <QTime>
+#include <qtmetamacros.h>
+
+class QObject;
+
 class GameFiltersSettings : public SettingsManager
 {
     Q_OBJECT
     friend class SettingsCache;
 
 public:
-    bool isHideBuddiesOnlyGames();
-    bool isHideFullGames();
-    bool isHideGamesThatStarted();
-    bool isHidePasswordProtectedGames();
-    bool isHideIgnoredUserGames();
-    bool isHideNotBuddyCreatedGames();
-    bool isHideOpenDecklistGames();
-    QString getGameNameFilter();
-    QStringList getCreatorNameFilters();
-    int getMinPlayers();
-    int getMaxPlayers();
-    QTime getMaxGameAge();
-    bool isGameTypeEnabled(QString gametype);
-    bool isShowOnlyIfSpectatorsCanWatch();
-    bool isShowSpectatorPasswordProtected();
-    bool isShowOnlyIfSpectatorsCanChat();
-    bool isShowOnlyIfSpectatorsCanSeeHands();
+    bool isHideBuddiesOnlyGames() const;
+    bool isHideFullGames() const;
+    bool isHideGamesThatStarted() const;
+    bool isHidePasswordProtectedGames() const;
+    bool isHideIgnoredUserGames() const;
+    bool isHideNotBuddyCreatedGames() const;
+    bool isHideOpenDecklistGames() const;
+    QString getGameNameFilter() const;
+    QStringList getHostNameFilters() const;
+    int getMinPlayers() const;
+    int getMaxPlayers() const;
+    QTime getMaxGameAge() const;
+    bool isGameTypeEnabled(QString gametype) const;
+    bool isShowOnlyIfSpectatorsCanWatch() const;
+    bool isShowSpectatorPasswordProtected() const;
+    bool isShowOnlyIfSpectatorsCanChat() const;
+    bool isShowOnlyIfSpectatorsCanSeeHands() const;
 
     void setHideBuddiesOnlyGames(bool hide);
     void setHideIgnoredUserGames(bool hide);
@@ -42,7 +49,7 @@ public:
     void setHidePasswordProtectedGames(bool hide);
     void setHideNotBuddyCreatedGames(bool hide);
     void setGameNameFilter(QString gameName);
-    void setCreatorNameFilters(QStringList creatorName);
+    void setHostNameFilters(QStringList hostName);
     void setMinPlayers(int min);
     void setMaxPlayers(int max);
     void setMaxGameAge(const QTime &maxGameAge);
@@ -56,8 +63,6 @@ public:
 private:
     explicit GameFiltersSettings(const QString &settingPath, QObject *parent = nullptr);
     GameFiltersSettings(const GameFiltersSettings & /*other*/);
-
-    [[nodiscard]] QString hashGameType(const QString &gameType) const;
 };
 
 #endif // GAMEFILTERSSETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/game_settings.cpp b/libcockatrice_settings/libcockatrice/settings/game_settings.cpp
new file mode 100644
index 000000000..c8c6463e3
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/game_settings.cpp
@@ -0,0 +1,172 @@
+#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)
+{
+}
+
+QString GameSettings::getGameDescription() const
+{
+    return getValue("gameDescription", "game").toString();
+}
+
+int GameSettings::getMaxPlayers() const
+{
+    return getValue("maxPlayers", "game", QString(), 2).toInt();
+}
+
+QString GameSettings::getGameTypes() const
+{
+    return getValue("gameTypes", "game").toString();
+}
+
+bool GameSettings::getOnlyBuddies() const
+{
+    return getValue("onlyBuddies", "game").toBool();
+}
+
+bool GameSettings::getOnlyRegistered() const
+{
+    return getValue("onlyRegistered", "game").toBool();
+}
+
+bool GameSettings::getSpectatorsAllowed() const
+{
+    return getValue("spectatorsAllowed", "game").toBool();
+}
+
+bool GameSettings::getSpectatorsNeedPassword() const
+{
+    return getValue("spectatorsNeedPassword", "game").toBool();
+}
+
+bool GameSettings::getSpectatorsCanTalk() const
+{
+    return getValue("spectatorsCanTalk", "game").toBool();
+}
+
+bool GameSettings::getSpectatorsCanSeeEverything() const
+{
+    return getValue("spectatorsCanSeeEverything", "game").toBool();
+}
+
+bool GameSettings::getCreateGameAsSpectator() const
+{
+    return getValue("createGameAsSpectator", "game").toBool();
+}
+
+int GameSettings::getDefaultStartingLifeTotal() const
+{
+    return getValue("defaultStartingLifeTotal", "game", QString(), 20).toInt();
+}
+
+bool GameSettings::getShareDecklistsOnLoad() const
+{
+    return getValue("shareDecklistsOnLoad", "game").toBool();
+}
+
+bool GameSettings::getRememberGameSettings() const
+{
+    return getValue("rememberGameSettings", "game", QString(), true).toBool();
+}
+
+bool GameSettings::getLocalGameRememberSettings() const
+{
+    return getValue("rememberSettings", "localgameoptions").toBool();
+}
+
+int GameSettings::getLocalGameMaxPlayers() const
+{
+    return getValue("maxPlayers", "localgameoptions", QString(), 1).toInt();
+}
+
+int GameSettings::getLocalGameStartingLifeTotal() const
+{
+    return getValue("startingLifeTotal", "localgameoptions", QString(), 20).toInt();
+}
+
+void GameSettings::setGameDescription(const QString &_gameDescription)
+{
+    setValue(_gameDescription, "gameDescription", "game");
+}
+
+void GameSettings::setMaxPlayers(int _maxPlayers)
+{
+    setValue(_maxPlayers, "maxPlayers", "game");
+}
+
+void GameSettings::setGameTypes(const QString &_gameTypes)
+{
+    setValue(_gameTypes, "gameTypes", "game");
+}
+
+void GameSettings::setOnlyBuddies(bool _onlyBuddies)
+{
+    setValue(_onlyBuddies, "onlyBuddies", "game");
+}
+
+void GameSettings::setOnlyRegistered(bool _onlyRegistered)
+{
+    setValue(_onlyRegistered, "onlyRegistered", "game");
+}
+
+void GameSettings::setSpectatorsAllowed(bool _spectatorsAllowed)
+{
+    setValue(_spectatorsAllowed, "spectatorsAllowed", "game");
+}
+
+void GameSettings::setSpectatorsNeedPassword(bool _spectatorsNeedPassword)
+{
+    setValue(_spectatorsNeedPassword, "spectatorsNeedPassword", "game");
+}
+
+void GameSettings::setSpectatorsCanTalk(bool _spectatorsCanTalk)
+{
+    setValue(_spectatorsCanTalk, "spectatorsCanTalk", "game");
+}
+
+void GameSettings::setSpectatorsCanSeeEverything(bool _spectatorsCanSeeEverything)
+{
+    setValue(_spectatorsCanSeeEverything, "spectatorsCanSeeEverything", "game");
+}
+
+void GameSettings::setCreateGameAsSpectator(bool _createGameAsSpectator)
+{
+    setValue(_createGameAsSpectator, "createGameAsSpectator", "game");
+}
+
+void GameSettings::setDefaultStartingLifeTotal(int _defaultStartingLifeTotal)
+{
+    setValue(_defaultStartingLifeTotal, "defaultStartingLifeTotal", "game");
+}
+
+void GameSettings::setShareDecklistsOnLoad(bool _shareDecklistsOnLoad)
+{
+    setValue(_shareDecklistsOnLoad, "shareDecklistsOnLoad", "game");
+}
+
+void GameSettings::setRememberGameSettings(bool _rememberGameSettings)
+{
+    setValue(_rememberGameSettings, "rememberGameSettings", "game");
+}
+
+void GameSettings::setLocalGameRememberSettings(bool value)
+{
+    setValue(value, "rememberSettings", "localgameoptions");
+}
+
+void GameSettings::setLocalGameMaxPlayers(int value)
+{
+    setValue(value, "maxPlayers", "localgameoptions");
+}
+
+void GameSettings::setLocalGameStartingLifeTotal(int value)
+{
+    setValue(value, "startingLifeTotal", "localgameoptions");
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/game_settings.h b/libcockatrice_settings/libcockatrice/settings/game_settings.h
new file mode 100644
index 000000000..3e64234fc
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/game_settings.h
@@ -0,0 +1,59 @@
+#ifndef GAME_SETTINGS_H
+#define GAME_SETTINGS_H
+
+#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
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    [[nodiscard]] QString getGameDescription() const override;
+    [[nodiscard]] int getMaxPlayers() const override;
+    [[nodiscard]] QString getGameTypes() const override;
+    [[nodiscard]] bool getOnlyBuddies() const override;
+    [[nodiscard]] bool getOnlyRegistered() const override;
+    [[nodiscard]] bool getSpectatorsAllowed() const override;
+    [[nodiscard]] bool getSpectatorsNeedPassword() const override;
+    [[nodiscard]] bool getSpectatorsCanTalk() const override;
+    [[nodiscard]] bool getSpectatorsCanSeeEverything() const override;
+    [[nodiscard]] bool getCreateGameAsSpectator() const override;
+    [[nodiscard]] int getDefaultStartingLifeTotal() const override;
+    [[nodiscard]] bool getShareDecklistsOnLoad() const override;
+    [[nodiscard]] bool getRememberGameSettings() const override;
+    [[nodiscard]] bool getLocalGameRememberSettings() const override;
+    [[nodiscard]] int getLocalGameMaxPlayers() const override;
+    [[nodiscard]] int getLocalGameStartingLifeTotal() const override;
+
+    void setGameDescription(const QString &_gameDescription);
+    void setMaxPlayers(int _maxPlayers);
+    void setGameTypes(const QString &_gameTypes);
+    void setOnlyBuddies(bool _onlyBuddies);
+    void setOnlyRegistered(bool _onlyRegistered);
+    void setSpectatorsAllowed(bool _spectatorsAllowed);
+    void setSpectatorsNeedPassword(bool _spectatorsNeedPassword);
+    void setSpectatorsCanTalk(bool _spectatorsCanTalk);
+    void setSpectatorsCanSeeEverything(bool _spectatorsCanSeeEverything);
+    void setCreateGameAsSpectator(bool _createGameAsSpectator);
+    void setDefaultStartingLifeTotal(int _defaultStartingLifeTotal);
+    void setShareDecklistsOnLoad(bool _shareDecklistsOnLoad);
+    void setRememberGameSettings(bool _rememberGameSettings);
+    void setLocalGameRememberSettings(bool value);
+    void setLocalGameMaxPlayers(int value);
+    void setLocalGameStartingLifeTotal(int value);
+
+public:
+    explicit GameSettings(const QString &settingPath, QObject *parent = nullptr);
+
+private:
+    GameSettings(const GameSettings & /*other*/);
+};
+
+#endif // GAME_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/interface_settings.cpp b/libcockatrice_settings/libcockatrice/settings/interface_settings.cpp
new file mode 100644
index 000000000..256d9eb26
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/interface_settings.cpp
@@ -0,0 +1,471 @@
+#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.
+
+QString encodePlaymatInfo(const PlaymatInfo &res)
+{
+    return res.card.name + PLAYMAT_FIELD_SEP + res.card.providerId + PLAYMAT_FIELD_SEP +
+           QString::number(res.params.marginPctL, 'f', 4) + PLAYMAT_FIELD_SEP +
+           QString::number(res.params.marginPctR, 'f', 4) + PLAYMAT_FIELD_SEP +
+           QString::number(res.params.verticalOffset, 'f', 4) + PLAYMAT_FIELD_SEP +
+           QString::number(res.params.zoom, 'f', 4);
+}
+
+PlaymatInfo decodePlaymatInfo(const QString &encoded)
+{
+    const QStringList fields = encoded.split(PLAYMAT_FIELD_SEP);
+    if (fields.size() != 6) {
+        return {};
+    }
+    PlaymatInfo res;
+    res.card.name = fields.at(0);
+    res.card.providerId = fields.at(1);
+    res.params.marginPctL = fields.at(2).toDouble();
+    res.params.marginPctR = fields.at(3).toDouble();
+    res.params.verticalOffset = fields.at(4).toDouble();
+    res.params.zoom = fields.at(5).toDouble();
+    return res;
+}
+} // namespace
+
+InterfaceSettings::InterfaceSettings(const QString &settingPath, QObject *parent)
+    : SettingsManager(settingPath + "interface.ini", "interface", QString(), parent)
+{
+}
+
+bool InterfaceSettings::getUseTearOffMenus() const
+{
+    return getValue("useTearOffMenus", QString(), QString(), false).toBool();
+}
+
+int InterfaceSettings::getCardViewInitialRowsMax() const
+{
+    return getValue("cardViewInitialRowsMax", QString(), QString(), 14).toInt();
+}
+
+int InterfaceSettings::getCardViewExpandedRowsMax() const
+{
+    return getValue("cardViewExpandedRowsMax", QString(), QString(), 20).toInt();
+}
+
+bool InterfaceSettings::getCloseEmptyCardView() const
+{
+    return getValue("closeEmptyCardView", QString(), QString(), true).toBool();
+}
+
+bool InterfaceSettings::getFocusCardViewSearchBar() const
+{
+    return getValue("focusCardViewSearchBar", QString(), QString(), true).toBool();
+}
+
+bool InterfaceSettings::getKeepGameChatFocus() const
+{
+    return getValue("keepGameChatFocus", QString(), QString(), false).toBool();
+}
+
+bool InterfaceSettings::getNotificationsEnabled() const
+{
+    return getValue("enabled", "interface", "notifications", true).toBool();
+}
+
+bool InterfaceSettings::getSpectatorNotificationsEnabled() const
+{
+    return getValue("spectatorsEnabled", "interface", "notifications", false).toBool();
+}
+
+bool InterfaceSettings::getBuddyConnectNotificationsEnabled() const
+{
+    return getValue("buddyConnectEnabled", "interface", "notifications", true).toBool();
+}
+
+bool InterfaceSettings::getDoubleClickToPlay() const
+{
+    return getValue("doubleClickToPlay", QString(), QString(), true).toBool();
+}
+
+bool InterfaceSettings::getClickPlaysAllSelected() const
+{
+    return getValue("clickPlaysAllSelected", QString(), QString(), true).toBool();
+}
+
+bool InterfaceSettings::getPlayToStack() const
+{
+    return getValue("playToStack", QString(), QString(), true).toBool();
+}
+
+bool InterfaceSettings::getDoNotDeleteArrowsInSubPhases() const
+{
+    return getValue("doNotDeleteArrowsInSubPhases", QString(), QString(), true).toBool();
+}
+
+int InterfaceSettings::getStartingHandSize() const
+{
+    return getValue("startingHandSize", QString(), QString(), 7).toInt();
+}
+
+bool InterfaceSettings::getAnnotateTokens() const
+{
+    return getValue("annotateTokens", QString(), QString(), false).toBool();
+}
+
+bool InterfaceSettings::getShowDragSelectionCount() const
+{
+    return getValue("showLassoSelectionCount", QString(), QString(), true).toBool();
+}
+
+bool InterfaceSettings::getShowTotalSelectionCount() const
+{
+    return getValue("showPersistentSelectionCount", QString(), QString(), true).toBool();
+}
+
+int InterfaceSettings::getTallyType() const
+{
+    return getValue("tallyType", QString(), QString(), 0).toInt();
+}
+
+bool InterfaceSettings::getHorizontalHand() const
+{
+    return getValue("horizontal", "hand", QString(), true).toBool();
+}
+
+bool InterfaceSettings::getInvertVerticalCoordinate() const
+{
+    return getValue("invertVertical", "table", QString(), false).toBool();
+}
+
+int InterfaceSettings::getMinPlayersForMultiColumnLayout() const
+{
+    return getValue("minPlayersMulticolumn", QString(), QString(), 4).toInt();
+}
+
+int InterfaceSettings::getRewindBufferingMs() const
+{
+    return getValue("rewindBufferingMs", "replay", QString(), 200).toInt();
+}
+
+qreal InterfaceSettings::getFastForwardSpeed() const
+{
+    return getValue("fastForwardSpeed", "replay", QString(), 10).toReal();
+}
+
+bool InterfaceSettings::getSkipEmptySections() const
+{
+    return getValue("skipEmptySections", "replay", QString(), false).toBool();
+}
+
+bool InterfaceSettings::getLeftJustified() const
+{
+    return getValue("leftJustified", QString(), QString(), false).toBool();
+}
+
+int InterfaceSettings::getZoneViewGroupByIndex() const
+{
+    return getValue("groupBy", "zoneview", QString(), 1).toInt();
+}
+
+int InterfaceSettings::getZoneViewSortByIndex() const
+{
+    return getValue("sortBy", "zoneview", QString(), 1).toInt();
+}
+
+bool InterfaceSettings::getZoneViewPileView() const
+{
+    return getValue("pileView", "zoneview", QString(), true).toBool();
+}
+
+bool InterfaceSettings::getShowStatusBar() const
+{
+    return getValue("showStatusBar", QString(), QString(), false).toBool();
+}
+
+bool InterfaceSettings::getShowShortcuts() const
+{
+    return getValue("showShortcuts", QString(), QString(), true).toBool();
+}
+
+bool InterfaceSettings::getShowGameSelectorFilterToolbar() const
+{
+    return getValue("showGameSelectorFilterToolbar", QString(), QString(), true).toBool();
+}
+
+int InterfaceSettings::getPlaymatVisibility() const
+{
+    return qBound(0, getValue("playmatvisibility", QString(), QString(), 2).toInt(), 2);
+}
+
+QList<PlaymatInfo> InterfaceSettings::getPlaymatFallbackList() const
+{
+    const QStringList entries = getValue("playmatFallbackList", QString(), QString(), QStringList()).toStringList();
+    QList<PlaymatInfo> result;
+    result.reserve(entries.size());
+    for (const QString &entry : entries) {
+        const PlaymatInfo res = decodePlaymatInfo(entry);
+        if (!res.card.isEmpty()) {
+            result.append(res);
+        }
+    }
+    return result;
+}
+
+int InterfaceSettings::getPlaymatMode() const
+{
+    return qBound(0, getValue("playmatMode", QString(), QString(), 1).toInt(), 2);
+}
+
+int InterfaceSettings::getPlaymatFallbackBehavior() const
+{
+    return qBound(0, getValue("playmatFallbackBehavior", QString(), QString(), 0).toInt(), 2);
+}
+
+bool InterfaceSettings::getLifeCounterAnimationsEnabled() const
+{
+    return getValue("lifeCounterAnimationsEnabled", QString(), QString(), true).toBool();
+}
+
+bool InterfaceSettings::getBattlefieldFlashEnabled() const
+{
+    return getValue("battlefieldFlashEnabled", QString(), QString(), true).toBool();
+}
+
+QStringList InterfaceSettings::getUserListExpandedSections() const
+{
+    return getValue("userListExpandedSections", QString(), QString(), QStringList({"buddy", "online", "ignore"}))
+        .toStringList();
+}
+
+void InterfaceSettings::setUseTearOffMenus(bool _useTearOffMenus)
+{
+    setValue(_useTearOffMenus, "useTearOffMenus");
+    emit useTearOffMenusChanged(_useTearOffMenus);
+}
+
+void InterfaceSettings::setCardViewInitialRowsMax(int _cardViewInitialRowsMax)
+{
+    setValue(_cardViewInitialRowsMax, "cardViewInitialRowsMax");
+}
+
+void InterfaceSettings::setCardViewExpandedRowsMax(int value)
+{
+    setValue(value, "cardViewExpandedRowsMax");
+}
+
+void InterfaceSettings::setCloseEmptyCardView(bool value)
+{
+    setValue(value, "closeEmptyCardView");
+}
+
+void InterfaceSettings::setFocusCardViewSearchBar(bool value)
+{
+    setValue(value, "focusCardViewSearchBar");
+}
+
+void InterfaceSettings::setKeepGameChatFocus(bool value)
+{
+    setValue(value, "keepGameChatFocus");
+    emit keepGameChatFocusChanged(value);
+}
+
+void InterfaceSettings::setNotificationsEnabled(bool _notificationsEnabled)
+{
+    setValue(_notificationsEnabled, "enabled", "interface", "notifications");
+}
+
+void InterfaceSettings::setSpectatorNotificationsEnabled(bool _spectatorNotificationsEnabled)
+{
+    setValue(_spectatorNotificationsEnabled, "spectatorsEnabled", "interface", "notifications");
+}
+
+void InterfaceSettings::setBuddyConnectNotificationsEnabled(bool _buddyConnectNotificationsEnabled)
+{
+    setValue(_buddyConnectNotificationsEnabled, "buddyConnectEnabled", "interface", "notifications");
+}
+
+void InterfaceSettings::setDoubleClickToPlay(bool _doubleClickToPlay)
+{
+    setValue(_doubleClickToPlay, "doubleClickToPlay");
+}
+
+void InterfaceSettings::setClickPlaysAllSelected(bool _clickPlaysAllSelected)
+{
+    setValue(_clickPlaysAllSelected, "clickPlaysAllSelected");
+}
+
+void InterfaceSettings::setPlayToStack(bool _playToStack)
+{
+    setValue(_playToStack, "playToStack");
+}
+
+void InterfaceSettings::setDoNotDeleteArrowsInSubPhases(bool _doNotDeleteArrowsInSubPhases)
+{
+    setValue(_doNotDeleteArrowsInSubPhases, "doNotDeleteArrowsInSubPhases");
+}
+
+void InterfaceSettings::setStartingHandSize(int _startingHandSize)
+{
+    setValue(_startingHandSize, "startingHandSize");
+}
+
+void InterfaceSettings::setAnnotateTokens(bool _annotateTokens)
+{
+    setValue(_annotateTokens, "annotateTokens");
+}
+
+void InterfaceSettings::setShowDragSelectionCount(bool _showDragSelectionCount)
+{
+    setValue(_showDragSelectionCount, "showLassoSelectionCount");
+}
+
+void InterfaceSettings::setShowTotalSelectionCount(bool _showTotalSelectionCount)
+{
+    setValue(_showTotalSelectionCount, "showPersistentSelectionCount");
+}
+
+void InterfaceSettings::setTallyType(int value)
+{
+    if (getTallyType() == value) {
+        return;
+    }
+    setValue(value, "tallyType");
+    emit tallyTypeChanged(value);
+}
+
+void InterfaceSettings::setHorizontalHand(bool _horizontalHand)
+{
+    setValue(_horizontalHand, "horizontal", "hand");
+    emit horizontalHandChanged();
+}
+
+void InterfaceSettings::setInvertVerticalCoordinate(bool _invertVerticalCoordinate)
+{
+    setValue(_invertVerticalCoordinate, "invertVertical", "table");
+    emit invertVerticalCoordinateChanged();
+}
+
+void InterfaceSettings::setMinPlayersForMultiColumnLayout(int _minPlayersForMultiColumnLayout)
+{
+    setValue(_minPlayersForMultiColumnLayout, "minPlayersMulticolumn");
+    emit minPlayersForMultiColumnLayoutChanged();
+}
+
+void InterfaceSettings::setRewindBufferingMs(int _rewindBufferingMs)
+{
+    setValue(_rewindBufferingMs, "rewindBufferingMs", "replay");
+}
+
+void InterfaceSettings::setFastForwardSpeed(qreal _value)
+{
+    setValue(_value, "fastForwardSpeed", "replay");
+}
+
+void InterfaceSettings::setSkipEmptySections(bool _value)
+{
+    setValue(_value, "skipEmptySections", "replay");
+}
+
+void InterfaceSettings::setLeftJustified(bool _leftJustified)
+{
+    setValue(_leftJustified, "leftJustified");
+    emit handJustificationChanged();
+}
+
+void InterfaceSettings::setZoneViewGroupByIndex(int _zoneViewGroupByIndex)
+{
+    setValue(_zoneViewGroupByIndex, "groupBy", "zoneview");
+}
+
+void InterfaceSettings::setZoneViewSortByIndex(int _zoneViewSortByIndex)
+{
+    setValue(_zoneViewSortByIndex, "sortBy", "zoneview");
+}
+
+void InterfaceSettings::setZoneViewPileView(bool _zoneViewPileView)
+{
+    setValue(_zoneViewPileView, "pileView", "zoneview");
+}
+
+void InterfaceSettings::setShowStatusBar(bool _showStatusBar)
+{
+    setValue(_showStatusBar, "showStatusBar");
+    emit showStatusBarChanged(_showStatusBar);
+}
+
+void InterfaceSettings::setShowShortcuts(bool _showShortcuts)
+{
+    setValue(_showShortcuts, "showShortcuts");
+}
+
+void InterfaceSettings::setShowGameSelectorFilterToolbar(bool _showGameSelectorFilterToolbar)
+{
+    setValue(_showGameSelectorFilterToolbar, "showGameSelectorFilterToolbar");
+    emit showGameSelectorFilterToolbarChanged(_showGameSelectorFilterToolbar);
+}
+
+void InterfaceSettings::setPlaymatVisibility(int _visibility)
+{
+    if (getPlaymatVisibility() == _visibility) {
+        return;
+    }
+    setValue(_visibility, "playmatvisibility");
+    emit playmatVisibilityChanged(_visibility);
+}
+
+void InterfaceSettings::setPlaymatFallbackList(const QList<PlaymatInfo> &_fallbackList)
+{
+    QStringList entries;
+    entries.reserve(_fallbackList.size());
+    for (const PlaymatInfo &res : _fallbackList) {
+        entries.append(encodePlaymatInfo(res));
+    }
+    setValue(entries, "playmatFallbackList");
+    emit playmatSettingsChanged();
+}
+
+void InterfaceSettings::setPlaymatMode(int _mode)
+{
+    const int mode = qBound(0, _mode, 2);
+    if (getPlaymatMode() == mode) {
+        return;
+    }
+    setValue(mode, "playmatMode");
+    emit playmatSettingsChanged();
+}
+
+void InterfaceSettings::setPlaymatFallbackBehavior(int _behavior)
+{
+    const int behavior = qBound(0, _behavior, 2);
+    if (getPlaymatFallbackBehavior() == behavior) {
+        return;
+    }
+    setValue(behavior, "playmatFallbackBehavior");
+    emit playmatSettingsChanged();
+}
+
+void InterfaceSettings::setLifeCounterAnimationsEnabled(bool _lifeCounterAnimationsEnabled)
+{
+    setValue(_lifeCounterAnimationsEnabled, "lifeCounterAnimationsEnabled");
+    emit lifeCounterAnimationsEnabledChanged(_lifeCounterAnimationsEnabled);
+}
+
+void InterfaceSettings::setBattlefieldFlashEnabled(bool _battlefieldFlashEnabled)
+{
+    setValue(_battlefieldFlashEnabled, "battlefieldFlashEnabled");
+    emit battlefieldFlashEnabledChanged(_battlefieldFlashEnabled);
+}
+
+void InterfaceSettings::setUserListExpandedSections(const QStringList &sections)
+{
+    setValue(sections, "userListExpandedSections");
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/interface_settings.h b/libcockatrice_settings/libcockatrice/settings/interface_settings.h
new file mode 100644
index 000000000..41bb6ee17
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/interface_settings.h
@@ -0,0 +1,122 @@
+#ifndef INTERFACE_SETTINGS_H
+#define INTERFACE_SETTINGS_H
+
+#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
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    [[nodiscard]] bool getUseTearOffMenus() const override;
+    [[nodiscard]] int getCardViewInitialRowsMax() const override;
+    [[nodiscard]] int getCardViewExpandedRowsMax() const override;
+    [[nodiscard]] bool getCloseEmptyCardView() const override;
+    [[nodiscard]] bool getFocusCardViewSearchBar() const override;
+    [[nodiscard]] bool getKeepGameChatFocus() const override;
+    [[nodiscard]] bool getNotificationsEnabled() const override;
+    [[nodiscard]] bool getSpectatorNotificationsEnabled() const override;
+    [[nodiscard]] bool getBuddyConnectNotificationsEnabled() const override;
+    [[nodiscard]] bool getDoubleClickToPlay() const override;
+    [[nodiscard]] bool getClickPlaysAllSelected() const override;
+    [[nodiscard]] bool getPlayToStack() const override;
+    [[nodiscard]] bool getDoNotDeleteArrowsInSubPhases() const override;
+    [[nodiscard]] int getStartingHandSize() const override;
+    [[nodiscard]] bool getAnnotateTokens() const override;
+    [[nodiscard]] bool getShowDragSelectionCount() const override;
+    [[nodiscard]] bool getShowTotalSelectionCount() const override;
+    [[nodiscard]] int getTallyType() const override;
+    [[nodiscard]] bool getHorizontalHand() const override;
+    [[nodiscard]] bool getInvertVerticalCoordinate() const override;
+    [[nodiscard]] int getMinPlayersForMultiColumnLayout() const override;
+    [[nodiscard]] int getRewindBufferingMs() const override;
+    [[nodiscard]] qreal getFastForwardSpeed() const override;
+    [[nodiscard]] bool getSkipEmptySections() const override;
+    [[nodiscard]] bool getLeftJustified() const override;
+    [[nodiscard]] int getZoneViewGroupByIndex() const override;
+    [[nodiscard]] int getZoneViewSortByIndex() const override;
+    [[nodiscard]] bool getZoneViewPileView() const override;
+    [[nodiscard]] bool getShowStatusBar() const override;
+    [[nodiscard]] bool getShowShortcuts() const override;
+    [[nodiscard]] bool getShowGameSelectorFilterToolbar() const override;
+    [[nodiscard]] int getPlaymatVisibility() const override;
+    [[nodiscard]] QList<PlaymatInfo> getPlaymatFallbackList() const override;
+    [[nodiscard]] int getPlaymatMode() const override;
+    [[nodiscard]] int getPlaymatFallbackBehavior() const override;
+    [[nodiscard]] bool getLifeCounterAnimationsEnabled() const override;
+    [[nodiscard]] bool getBattlefieldFlashEnabled() const override;
+    [[nodiscard]] QStringList getUserListExpandedSections() const override;
+
+    void setUseTearOffMenus(bool _useTearOffMenus);
+    void setCardViewInitialRowsMax(int _cardViewInitialRowsMax);
+    void setCardViewExpandedRowsMax(int value);
+    void setCloseEmptyCardView(bool value);
+    void setFocusCardViewSearchBar(bool value);
+    void setKeepGameChatFocus(bool value);
+    void setNotificationsEnabled(bool _notificationsEnabled);
+    void setSpectatorNotificationsEnabled(bool _spectatorNotificationsEnabled);
+    void setBuddyConnectNotificationsEnabled(bool _buddyConnectNotificationsEnabled);
+    void setDoubleClickToPlay(bool _doubleClickToPlay);
+    void setClickPlaysAllSelected(bool _clickPlaysAllSelected);
+    void setPlayToStack(bool _playToStack);
+    void setDoNotDeleteArrowsInSubPhases(bool _doNotDeleteArrowsInSubPhases);
+    void setStartingHandSize(int _startingHandSize);
+    void setAnnotateTokens(bool _annotateTokens);
+    void setShowDragSelectionCount(bool _showDragSelectionCount);
+    void setShowTotalSelectionCount(bool _showTotalSelectionCount);
+    void setTallyType(int value);
+    void setHorizontalHand(bool _horizontalHand);
+    void setInvertVerticalCoordinate(bool _invertVerticalCoordinate);
+    void setMinPlayersForMultiColumnLayout(int _minPlayersForMultiColumnLayout);
+    void setRewindBufferingMs(int _rewindBufferingMs);
+    void setFastForwardSpeed(qreal _value);
+    void setSkipEmptySections(bool _value);
+    void setLeftJustified(bool _leftJustified);
+    void setZoneViewGroupByIndex(int _zoneViewGroupByIndex);
+    void setZoneViewSortByIndex(int _zoneViewSortByIndex);
+    void setZoneViewPileView(bool _zoneViewPileView);
+    void setShowStatusBar(bool _showStatusBar);
+    void setShowShortcuts(bool _showShortcuts);
+    void setShowGameSelectorFilterToolbar(bool _showGameSelectorFilterToolbar);
+    void setPlaymatVisibility(int _visibility);
+    void setPlaymatFallbackList(const QList<PlaymatInfo> &_fallbackList);
+    void setPlaymatMode(int _mode);
+    void setPlaymatFallbackBehavior(int _behavior);
+    void setLifeCounterAnimationsEnabled(bool _lifeCounterAnimationsEnabled);
+    void setBattlefieldFlashEnabled(bool _battlefieldFlashEnabled);
+    void setUserListExpandedSections(const QStringList &sections);
+
+signals:
+    void useTearOffMenusChanged(bool state);
+    void keepGameChatFocusChanged(bool value);
+    void horizontalHandChanged();
+    void invertVerticalCoordinateChanged();
+    void minPlayersForMultiColumnLayoutChanged();
+    void handJustificationChanged();
+    void tallyTypeChanged(int type);
+    void showStatusBarChanged(bool state);
+    void showGameSelectorFilterToolbarChanged(bool state);
+    void playmatVisibilityChanged(int visibility);
+    void playmatSettingsChanged();
+    void lifeCounterAnimationsEnabledChanged(bool state);
+    void battlefieldFlashEnabledChanged(bool state);
+
+public:
+    explicit InterfaceSettings(const QString &settingPath, QObject *parent = nullptr);
+
+private:
+    InterfaceSettings(const InterfaceSettings & /*other*/);
+};
+
+#endif // INTERFACE_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp b/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp
index 4b1400e0c..aba620026 100644
--- a/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/layouts_settings.cpp
@@ -1,207 +1,155 @@
 #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";
+
+const static QString GROUP_MAIN_WINDOW = "mainWindow";
+const static QString GROUP_DECK_EDITOR = "deckEditor";
+const static QString GROUP_VISUAL_DECK_EDITOR = "visualDeckEditor";
+const static QString GROUP_DECK_EDITOR_DB = "deckEditorDb";
+const static QString GROUP_SETS_DIALOG = "setsDialog";
+const static QString GROUP_TOKEN_DIALOG = "tokenDialog";
+const static QString GROUP_GAME_PLAY_AREA = "gamePlayArea";
+const static QString GROUP_REPLAY_PLAY_AREA = "replayPlayArea";
+
 LayoutsSettings::LayoutsSettings(const QString &settingPath, QObject *parent)
-    : SettingsManager(settingPath + "layouts.ini", "layouts", QString(), parent)
+    : SettingsManager(settingPath + "layouts.ini", QString(), QString(), parent)
 {
 }
 
-const QByteArray LayoutsSettings::getDeckEditorLayoutState()
+void LayoutsSettings::setMainWindowGeometry(const QByteArray &value)
 {
-    return getValue("layouts/deckEditor_state").toByteArray();
+    setValue(value, GEOMETRY_PROP, GROUP_MAIN_WINDOW);
+}
+
+QByteArray LayoutsSettings::getMainWindowGeometry() const
+{
+    return getValue(GEOMETRY_PROP, GROUP_MAIN_WINDOW).toByteArray();
+}
+
+QByteArray LayoutsSettings::getDeckEditorLayoutState() const
+{
+    return getValue(STATE_PROP, GROUP_DECK_EDITOR).toByteArray();
 }
 
 void LayoutsSettings::setDeckEditorLayoutState(const QByteArray &value)
 {
-    setValue(value, "layouts/deckEditor_state");
+    setValue(value, STATE_PROP, GROUP_DECK_EDITOR);
 }
 
-const QByteArray LayoutsSettings::getDeckEditorGeometry()
+QByteArray LayoutsSettings::getDeckEditorGeometry() const
 {
-    return getValue("layouts/deckEditor_geometry").toByteArray();
+    return getValue(GEOMETRY_PROP, GROUP_DECK_EDITOR).toByteArray();
 }
 
 void LayoutsSettings::setDeckEditorGeometry(const QByteArray &value)
 {
-    setValue(value, "layouts/deckEditor_geometry");
+    setValue(value, GEOMETRY_PROP, GROUP_DECK_EDITOR);
 }
 
-QSize LayoutsSettings::getDeckEditorCardSize()
+QByteArray LayoutsSettings::getVisualDeckEditorLayoutState() const
 {
-    QVariant previous = getValue("layouts/deckEditor_CardSize");
-    return previous == QVariant() ? QSize(250, 500) : previous.toSize();
+    return getValue(STATE_PROP, GROUP_VISUAL_DECK_EDITOR).toByteArray();
 }
 
-void LayoutsSettings::setDeckEditorCardSize(const QSize &value)
+void LayoutsSettings::setVisualDeckEditorLayoutState(const QByteArray &value)
 {
-    setValue(value, "layouts/deckEditor_CardSize");
+    setValue(value, STATE_PROP, GROUP_VISUAL_DECK_EDITOR);
 }
 
-QSize LayoutsSettings::getDeckEditorDeckSize()
+QByteArray LayoutsSettings::getVisualDeckEditorGeometry() const
 {
-    QVariant previous = getValue("layouts/deckEditor_DeckSize");
-    return previous == QVariant() ? QSize(250, 360) : previous.toSize();
+    return getValue(GEOMETRY_PROP, GROUP_VISUAL_DECK_EDITOR).toByteArray();
 }
 
-void LayoutsSettings::setDeckEditorDeckSize(const QSize &value)
+void LayoutsSettings::setVisualDeckEditorGeometry(const QByteArray &value)
 {
-    setValue(value, "layouts/deckEditor_DeckSize");
+    setValue(value, GEOMETRY_PROP, GROUP_VISUAL_DECK_EDITOR);
 }
 
-QSize LayoutsSettings::getDeckEditorPrintingSelectorSize()
+QByteArray LayoutsSettings::getDeckEditorDbHeaderState() const
 {
-    QVariant previous = getValue("layouts/deckEditor_PrintingSelectorSize");
-    return previous == QVariant() ? QSize(525, 250) : previous.toSize();
-}
-
-void LayoutsSettings::setDeckEditorPrintingSelectorSize(const QSize &value)
-{
-    setValue(value, "layouts/deckEditor_PrintingSelectorSize");
-}
-
-QSize LayoutsSettings::getDeckEditorFilterSize()
-{
-    QVariant previous = getValue("layouts/deckEditor_FilterSize");
-    return previous == QVariant() ? QSize(250, 250) : previous.toSize();
-}
-
-void LayoutsSettings::setDeckEditorFilterSize(const QSize &value)
-{
-    setValue(value, "layouts/deckEditor_FilterSize");
-}
-
-const QByteArray LayoutsSettings::getDeckEditorDbHeaderState()
-{
-    return getValue("layouts/deckEditorDbHeader_state").toByteArray();
+    return getValue(STATE_PROP, GROUP_DECK_EDITOR_DB, "header").toByteArray();
 }
 
 void LayoutsSettings::setDeckEditorDbHeaderState(const QByteArray &value)
 {
-    setValue(value, "layouts/deckEditorDbHeader_state");
+    setValue(value, STATE_PROP, GROUP_DECK_EDITOR_DB, "header");
 }
 
-const QByteArray LayoutsSettings::getSetsDialogHeaderState()
+QByteArray LayoutsSettings::getSetsDialogHeaderState() const
 {
-    return getValue("layouts/setsDialogHeader_state").toByteArray();
+    return getValue(STATE_PROP, GROUP_SETS_DIALOG, "header").toByteArray();
 }
 
 void LayoutsSettings::setSetsDialogHeaderState(const QByteArray &value)
 {
-    setValue(value, "layouts/setsDialogHeader_state");
+    setValue(value, STATE_PROP, GROUP_SETS_DIALOG, "header");
+}
+
+void LayoutsSettings::setSetsDialogGeometry(const QByteArray &value)
+{
+    setValue(value, GEOMETRY_PROP, GROUP_SETS_DIALOG);
+}
+
+QByteArray LayoutsSettings::getSetsDialogGeometry() const
+{
+    return getValue(GEOMETRY_PROP, GROUP_SETS_DIALOG).toByteArray();
+}
+
+void LayoutsSettings::setTokenDialogGeometry(const QByteArray &value)
+{
+    setValue(value, GEOMETRY_PROP, GROUP_TOKEN_DIALOG);
+}
+
+QByteArray LayoutsSettings::getTokenDialogGeometry() const
+{
+    return getValue(GEOMETRY_PROP, GROUP_TOKEN_DIALOG).toByteArray();
 }
 
 void LayoutsSettings::setGamePlayAreaGeometry(const QByteArray &value)
 {
-    setValue(value, "layouts/gameplayarea_geometry");
+    setValue(value, GEOMETRY_PROP, GROUP_GAME_PLAY_AREA);
 }
 
 void LayoutsSettings::setGamePlayAreaState(const QByteArray &value)
 {
-    setValue(value, "layouts/gameplayarea_state");
+    setValue(value, STATE_PROP, GROUP_GAME_PLAY_AREA);
 }
 
-const QByteArray LayoutsSettings::getGamePlayAreaLayoutState()
+QByteArray LayoutsSettings::getGamePlayAreaLayoutState() const
 {
-    return getValue("layouts/gameplayarea_state").toByteArray();
+    return getValue(STATE_PROP, GROUP_GAME_PLAY_AREA).toByteArray();
 }
 
-const QByteArray LayoutsSettings::getGamePlayAreaGeometry()
+QByteArray LayoutsSettings::getGamePlayAreaGeometry() const
 {
-    return getValue("layouts/gameplayarea_geometry").toByteArray();
-}
-
-const QSize LayoutsSettings::getGameCardInfoSize()
-{
-    QVariant previous = getValue("layouts/gameplayarea_CardInfoSize");
-    return previous == QVariant() ? QSize(250, 360) : previous.toSize();
-}
-
-void LayoutsSettings::setGameCardInfoSize(const QSize &value)
-{
-    setValue(value, "layouts/gameplayarea_CardInfoSize");
-}
-
-const QSize LayoutsSettings::getGameMessageLayoutSize()
-{
-    QVariant previous = getValue("layouts/gameplayarea_MessageLayoutSize");
-    return previous == QVariant() ? QSize(250, 250) : previous.toSize();
-}
-
-void LayoutsSettings::setGameMessageLayoutSize(const QSize &value)
-{
-    setValue(value, "layouts/gameplayarea_MessageLayoutSize");
-}
-
-const QSize LayoutsSettings::getGamePlayerListSize()
-{
-    QVariant previous = getValue("layouts/gameplayarea_PlayerListSize");
-    return previous == QVariant() ? QSize(250, 50) : previous.toSize();
-}
-
-void LayoutsSettings::setGamePlayerListSize(const QSize &value)
-{
-    setValue(value, "layouts/gameplayarea_PlayerListSize");
+    return getValue(GEOMETRY_PROP, GROUP_GAME_PLAY_AREA).toByteArray();
 }
 
 void LayoutsSettings::setReplayPlayAreaGeometry(const QByteArray &value)
 {
-    setValue(value, "layouts/replayplayarea_geometry");
+    setValue(value, GEOMETRY_PROP, GROUP_REPLAY_PLAY_AREA);
 }
 
 void LayoutsSettings::setReplayPlayAreaState(const QByteArray &value)
 {
-    setValue(value, "layouts/replayplayarea_state");
+    setValue(value, STATE_PROP, GROUP_REPLAY_PLAY_AREA);
 }
 
-const QByteArray LayoutsSettings::getReplayPlayAreaLayoutState()
+QByteArray LayoutsSettings::getReplayPlayAreaLayoutState() const
 {
-    return getValue("layouts/replayplayarea_state").toByteArray();
+    return getValue(STATE_PROP, GROUP_REPLAY_PLAY_AREA).toByteArray();
 }
 
-const QByteArray LayoutsSettings::getReplayPlayAreaGeometry()
+QByteArray LayoutsSettings::getReplayPlayAreaGeometry() const
 {
-    return getValue("layouts/replayplayarea_geometry").toByteArray();
-}
-
-const QSize LayoutsSettings::getReplayCardInfoSize()
-{
-    QVariant previous = getValue("layouts/replayplayarea_CardInfoSize");
-    return previous == QVariant() ? QSize(250, 360) : previous.toSize();
-}
-
-void LayoutsSettings::setReplayCardInfoSize(const QSize &value)
-{
-    setValue(value, "layouts/replayplayarea_CardInfoSize");
-}
-
-const QSize LayoutsSettings::getReplayMessageLayoutSize()
-{
-    QVariant previous = getValue("layouts/replayplayarea_MessageLayoutSize");
-    return previous == QVariant() ? QSize(250, 200) : previous.toSize();
-}
-
-void LayoutsSettings::setReplayMessageLayoutSize(const QSize &value)
-{
-    setValue(value, "layouts/replayplayarea_MessageLayoutSize");
-}
-
-const QSize LayoutsSettings::getReplayPlayerListSize()
-{
-    QVariant previous = getValue("layouts/replayplayarea_PlayerListSize");
-    return previous == QVariant() ? QSize(250, 50) : previous.toSize();
-}
-
-void LayoutsSettings::setReplayPlayerListSize(const QSize &value)
-{
-    setValue(value, "layouts/replayplayarea_PlayerListSize");
-}
-
-const QSize LayoutsSettings::getReplayReplaySize()
-{
-    QVariant previous = getValue("layouts/replayplayarea_ReplaySize");
-    return previous == QVariant() ? QSize(900, 100) : previous.toSize();
-}
-
-void LayoutsSettings::setReplayReplaySize(const QSize &value)
-{
-    setValue(value, "layouts/replayplayarea_ReplaySize");
+    return getValue(GEOMETRY_PROP, GROUP_REPLAY_PLAY_AREA).toByteArray();
 }
diff --git a/libcockatrice_settings/libcockatrice/settings/layouts_settings.h b/libcockatrice_settings/libcockatrice/settings/layouts_settings.h
index 5feb0f4f6..91b0a2ea6 100644
--- a/libcockatrice_settings/libcockatrice/settings/layouts_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/layouts_settings.h
@@ -1,15 +1,19 @@
 /**
  * @file layouts_settings.h
  * @ingroup CoreSettings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef LAYOUTSSETTINGS_H
 #define LAYOUTSSETTINGS_H
 
 #include "settings_manager.h"
 
-#include <QSize>
+#include <QByteArray>
+#include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
 
 class LayoutsSettings : public SettingsManager
 {
@@ -17,49 +21,43 @@ class LayoutsSettings : public SettingsManager
     friend class SettingsCache;
 
 public:
+    void setMainWindowGeometry(const QByteArray &value);
+
     void setDeckEditorLayoutState(const QByteArray &value);
     void setDeckEditorGeometry(const QByteArray &value);
-    void setDeckEditorCardSize(const QSize &value);
-    void setDeckEditorDeckSize(const QSize &value);
-    void setDeckEditorPrintingSelectorSize(const QSize &value);
-    void setDeckEditorFilterSize(const QSize &value);
+
+    void setVisualDeckEditorLayoutState(const QByteArray &value);
+    void setVisualDeckEditorGeometry(const QByteArray &value);
+
     void setDeckEditorDbHeaderState(const QByteArray &value);
     void setSetsDialogHeaderState(const QByteArray &value);
+    void setSetsDialogGeometry(const QByteArray &value);
+    void setTokenDialogGeometry(const QByteArray &value);
 
     void setGamePlayAreaGeometry(const QByteArray &value);
     void setGamePlayAreaState(const QByteArray &value);
-    void setGameCardInfoSize(const QSize &value);
-    void setGameMessageLayoutSize(const QSize &value);
-    void setGamePlayerListSize(const QSize &value);
 
     void setReplayPlayAreaGeometry(const QByteArray &value);
     void setReplayPlayAreaState(const QByteArray &value);
-    void setReplayCardInfoSize(const QSize &value);
-    void setReplayMessageLayoutSize(const QSize &value);
-    void setReplayPlayerListSize(const QSize &value);
-    void setReplayReplaySize(const QSize &value);
 
-    const QByteArray getDeckEditorLayoutState();
-    const QByteArray getDeckEditorGeometry();
-    QSize getDeckEditorCardSize();
-    QSize getDeckEditorDeckSize();
-    QSize getDeckEditorPrintingSelectorSize();
-    QSize getDeckEditorFilterSize();
-    const QByteArray getDeckEditorDbHeaderState();
-    const QByteArray getSetsDialogHeaderState();
+    QByteArray getMainWindowGeometry() const;
 
-    const QByteArray getGamePlayAreaLayoutState();
-    const QByteArray getGamePlayAreaGeometry();
-    const QSize getGameCardInfoSize();
-    const QSize getGameMessageLayoutSize();
-    const QSize getGamePlayerListSize();
+    QByteArray getDeckEditorLayoutState() const;
+    QByteArray getDeckEditorGeometry() const;
 
-    const QByteArray getReplayPlayAreaLayoutState();
-    const QByteArray getReplayPlayAreaGeometry();
-    const QSize getReplayCardInfoSize();
-    const QSize getReplayMessageLayoutSize();
-    const QSize getReplayPlayerListSize();
-    const QSize getReplayReplaySize();
+    QByteArray getVisualDeckEditorLayoutState() const;
+    QByteArray getVisualDeckEditorGeometry() const;
+
+    QByteArray getDeckEditorDbHeaderState() const;
+    QByteArray getSetsDialogHeaderState() const;
+    QByteArray getSetsDialogGeometry() const;
+    QByteArray getTokenDialogGeometry() const;
+
+    QByteArray getGamePlayAreaLayoutState() const;
+    QByteArray getGamePlayAreaGeometry() const;
+
+    QByteArray getReplayPlayAreaLayoutState() const;
+    QByteArray getReplayPlayAreaGeometry() const;
 signals:
 
 public slots:
diff --git a/libcockatrice_settings/libcockatrice/settings/message_settings.cpp b/libcockatrice_settings/libcockatrice/settings/message_settings.cpp
index 761c94484..ca77246ef 100644
--- a/libcockatrice_settings/libcockatrice/settings/message_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/message_settings.cpp
@@ -1,16 +1,22 @@
 #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)
 {
 }
 
-QString MessageSettings::getMessageAt(int index)
+QString MessageSettings::getMessageAt(int index) const
 {
     return getValue(QString("msg%1").arg(index)).toString();
 }
 
-int MessageSettings::getCount()
+int MessageSettings::getCount() const
 {
     return getValue("count").toInt();
 }
diff --git a/libcockatrice_settings/libcockatrice/settings/message_settings.h b/libcockatrice_settings/libcockatrice/settings/message_settings.h
index 265c455e1..83513d562 100644
--- a/libcockatrice_settings/libcockatrice/settings/message_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/message_settings.h
@@ -1,22 +1,27 @@
 /**
  * @file message_settings.h
  * @ingroup NetworkSettings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef MESSAGESETTINGS_H
 #define MESSAGESETTINGS_H
 
 #include "settings_manager.h"
 
+#include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
+
 class MessageSettings : public SettingsManager
 {
     Q_OBJECT
     friend class SettingsCache;
 
 public:
-    int getCount();
-    QString getMessageAt(int index);
+    int getCount() const;
+    QString getMessageAt(int index) const;
 
     void setCount(int count);
     void setMessageAt(int index, QString message);
diff --git a/libcockatrice_settings/libcockatrice/settings/network_settings.cpp b/libcockatrice_settings/libcockatrice/settings/network_settings.cpp
new file mode 100644
index 000000000..6d0fa9d1c
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/network_settings.cpp
@@ -0,0 +1,62 @@
+#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)
+{
+}
+
+QString NetworkSettings::getClientID() const
+{
+    return getValue("clientId", QString(), QString(), "notset").toString();
+}
+
+void NetworkSettings::setClientID(const QString &_clientID)
+{
+    setValue(_clientID, "clientId");
+}
+
+QString NetworkSettings::getClientVersion() const
+{
+    return getValue("clientVersion", QString(), QString(), "notset").toString();
+}
+
+void NetworkSettings::setClientVersion(const QString &_clientVersion)
+{
+    setValue(_clientVersion, "clientVersion");
+}
+
+int NetworkSettings::getKeepAlive() const
+{
+    return getValue("keepAlive", QString(), QString(), 3).toInt();
+}
+
+void NetworkSettings::setKeepAlive(int _keepAlive)
+{
+    setValue(_keepAlive, "keepAlive");
+}
+
+int NetworkSettings::getTimeOut() const
+{
+    return getValue("timeout", QString(), QString(), 5).toInt();
+}
+
+void NetworkSettings::setTimeOut(int _timeOut)
+{
+    setValue(_timeOut, "timeout");
+}
+
+QString NetworkSettings::getKnownMissingFeatures() const
+{
+    return getValue("knownMissingFeatures", QString(), QString(), "").toString();
+}
+
+void NetworkSettings::setKnownMissingFeatures(const QString &_knownMissingFeatures)
+{
+    setValue(_knownMissingFeatures, "knownMissingFeatures");
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/network_settings.h b/libcockatrice_settings/libcockatrice/settings/network_settings.h
new file mode 100644
index 000000000..4367f9cb3
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/network_settings.h
@@ -0,0 +1,41 @@
+/**
+ * @file network_settings.h
+ * @ingroup NetworkSettings
+ */
+//! \todo Document this file.
+
+#ifndef NETWORK_SETTINGS_H
+#define NETWORK_SETTINGS_H
+
+#include "settings_manager.h"
+
+#include <QString>
+#include <qtmetamacros.h>
+
+class QObject;
+
+class NetworkSettings : public SettingsManager
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    [[nodiscard]] QString getClientID() const;
+    void setClientID(const QString &_clientID);
+    [[nodiscard]] QString getClientVersion() const;
+    void setClientVersion(const QString &_clientVersion);
+    [[nodiscard]] int getKeepAlive() const;
+    void setKeepAlive(int _keepAlive);
+    [[nodiscard]] int getTimeOut() const;
+    void setTimeOut(int _timeOut);
+    [[nodiscard]] QString getKnownMissingFeatures() const;
+    void setKnownMissingFeatures(const QString &_knownMissingFeatures);
+
+public:
+    explicit NetworkSettings(const QString &settingPath, QObject *parent = nullptr);
+
+private:
+    NetworkSettings(const NetworkSettings & /*other*/);
+};
+
+#endif // NETWORK_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/paths_settings.cpp b/libcockatrice_settings/libcockatrice/settings/paths_settings.cpp
new file mode 100644
index 000000000..41ccf6460
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/paths_settings.cpp
@@ -0,0 +1,174 @@
+#include "paths_settings.h"
+
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QDir>
+#include <QStringList>
+#include <QVariant>
+
+class QObject;
+
+PathsSettings::PathsSettings(const QString &settingPath, QObject *parent)
+    : SettingsManager(settingPath + "paths.ini", "paths", QString(), parent)
+{
+}
+
+QString PathsSettings::getDeckPath() const
+{
+    return getValue("decks").toString();
+}
+
+QString PathsSettings::getFiltersPath() const
+{
+    return getValue("filters").toString();
+}
+
+QString PathsSettings::getReplaysPath() const
+{
+    return getValue("replays").toString();
+}
+
+QString PathsSettings::getPicsPath() const
+{
+    return getValue("pics").toString();
+}
+
+QString PathsSettings::getCustomPicsPath() const
+{
+    return getValue("customPics").toString();
+}
+
+QString PathsSettings::getThemesPath() const
+{
+    return getValue("themes").toString();
+}
+
+QString PathsSettings::getCardDatabasePath() const
+{
+    return getValue("cardDatabase").toString();
+}
+
+QString PathsSettings::getCustomCardDatabasePath() const
+{
+    return getValue("customSets").toString();
+}
+
+QString PathsSettings::getTokenDatabasePath() const
+{
+    return getValue("tokenDatabase").toString();
+}
+
+QString PathsSettings::getSpoilerCardDatabasePath() const
+{
+    return getValue("spoilerDatabase").toString();
+}
+
+QString PathsSettings::getRedirectCachePath() const
+{
+    return getValue("redirects").toString();
+}
+
+void PathsSettings::setDeckPath(const QString &_deckPath)
+{
+    setValue(_deckPath, "decks");
+}
+
+void PathsSettings::setFiltersPath(const QString &_filtersPath)
+{
+    setValue(_filtersPath, "filters");
+}
+
+void PathsSettings::setReplaysPath(const QString &_replaysPath)
+{
+    setValue(_replaysPath, "replays");
+}
+
+void PathsSettings::setPicsPath(const QString &_picsPath)
+{
+    setValue(_picsPath, "pics");
+    emit picsPathChanged();
+}
+
+void PathsSettings::setCustomPicsPath(const QString &_customPicsPath)
+{
+    setValue(_customPicsPath, "customPics");
+}
+
+void PathsSettings::setThemesPath(const QString &_themesPath)
+{
+    setValue(_themesPath, "themes");
+    emit themeChanged();
+}
+
+void PathsSettings::setCardDatabasePath(const QString &_cardDatabasePath)
+{
+    setValue(_cardDatabasePath, "cardDatabase");
+    emit cardDatabasePathChanged();
+}
+
+void PathsSettings::setCustomCardDatabasePath(const QString &_customCardDatabasePath)
+{
+    setValue(_customCardDatabasePath, "customSets");
+    emit cardDatabasePathChanged();
+}
+
+void PathsSettings::setTokenDatabasePath(const QString &_tokenDatabasePath)
+{
+    setValue(_tokenDatabasePath, "tokenDatabase");
+    emit cardDatabasePathChanged();
+}
+
+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
new file mode 100644
index 000000000..fa00428e3
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/paths_settings.h
@@ -0,0 +1,73 @@
+#ifndef PATHS_SETTINGS_H
+#define PATHS_SETTINGS_H
+
+#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
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    [[nodiscard]] QString getDeckPath() const override;
+    [[nodiscard]] QString getFiltersPath() const override;
+    [[nodiscard]] QString getReplaysPath() const override;
+    [[nodiscard]] QString getPicsPath() const override;
+    [[nodiscard]] QString getCustomPicsPath() const override;
+    [[nodiscard]] QString getThemesPath() const override;
+    [[nodiscard]] QString getCardDatabasePath() const override;
+    [[nodiscard]] QString getCustomCardDatabasePath() const override;
+    [[nodiscard]] QString getTokenDatabasePath() const override;
+    [[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);
+    void setPicsPath(const QString &_picsPath);
+    void setCustomPicsPath(const QString &_customPicsPath);
+    void setThemesPath(const QString &_themesPath);
+    void setCardDatabasePath(const QString &_cardDatabasePath);
+    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:
+    PathsSettings(const PathsSettings & /*other*/);
+};
+
+#endif // PATHS_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/personal_settings.cpp b/libcockatrice_settings/libcockatrice/settings/personal_settings.cpp
new file mode 100644
index 000000000..682144485
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/personal_settings.cpp
@@ -0,0 +1,53 @@
+#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)
+{
+}
+
+QString PersonalSettings::getLang() const
+{
+    return getValue("lang", QString(), QString(), QString()).toString();
+}
+
+bool PersonalSettings::getShowTipsOnStartup() const
+{
+    return getValue("showTips", "tipOfDay", QString(), true).toBool();
+}
+
+QList<int> PersonalSettings::getSeenTips() const
+{
+    QList<int> tips;
+    auto tipValues = getValue("seenTips", "tipOfDay", QString()).toList();
+    for (const auto &tipNumber : tipValues) {
+        tips.append(tipNumber.toInt());
+    }
+    return tips;
+}
+
+void PersonalSettings::setLang(const QString &_lang)
+{
+    setValue(_lang, "lang");
+    emit langChanged();
+}
+
+void PersonalSettings::setShowTipsOnStartup(bool _showTipsOnStartup)
+{
+    setValue(_showTipsOnStartup, "showTips", "tipOfDay");
+}
+
+void PersonalSettings::setSeenTips(const QList<int> &_seenTips)
+{
+    QList<QVariant> storedTipList;
+    for (auto tipNumber : _seenTips) {
+        storedTipList.append(tipNumber);
+    }
+    setValue(QVariant::fromValue(storedTipList), "seenTips", "tipOfDay");
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/personal_settings.h b/libcockatrice_settings/libcockatrice/settings/personal_settings.h
new file mode 100644
index 000000000..0819af41b
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/personal_settings.h
@@ -0,0 +1,37 @@
+#ifndef PERSONAL_SETTINGS_H
+#define PERSONAL_SETTINGS_H
+
+#include "settings_manager.h"
+
+#include <QString>
+#include <libcockatrice/interfaces/interface_personal_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QObject;
+template <typename T> class QList;
+
+class PersonalSettings : public SettingsManager, public IPersonalSettingsProvider
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    [[nodiscard]] QString getLang() const override;
+    [[nodiscard]] bool getShowTipsOnStartup() const override;
+    [[nodiscard]] QList<int> getSeenTips() const override;
+
+    void setLang(const QString &_lang);
+    void setShowTipsOnStartup(bool _showTipsOnStartup);
+    void setSeenTips(const QList<int> &_seenTips);
+
+signals:
+    void langChanged();
+
+public:
+    explicit PersonalSettings(const QString &settingPath, QObject *parent = nullptr);
+
+private:
+    PersonalSettings(const PersonalSettings & /*other*/);
+};
+
+#endif // PERSONAL_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp b/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp
index e64dd7494..4f2c06c88 100644
--- a/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/recents_settings.cpp
@@ -1,5 +1,12 @@
 #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)
@@ -7,18 +14,18 @@ RecentsSettings::RecentsSettings(const QString &settingPath, QObject *parent)
 {
 }
 
-QStringList RecentsSettings::getRecentlyOpenedDeckPaths()
+QStringList RecentsSettings::getRecentlyOpenedDeckPaths() const
 {
-    return getValue("deckpaths").toStringList();
+    return getValue("deckPaths").toStringList();
 }
 void RecentsSettings::clearRecentlyOpenedDeckPaths()
 {
-    deleteValue("deckpaths");
+    deleteValue("deckPaths");
     emit recentlyOpenedDeckPathsChanged();
 }
 void RecentsSettings::updateRecentlyOpenedDeckPaths(const QString &deckPath)
 {
-    auto deckPaths = getValue("deckpaths").toStringList();
+    auto deckPaths = getValue("deckPaths").toStringList();
     deckPaths.removeAll(deckPath);
 
     deckPaths.prepend(deckPath);
@@ -27,11 +34,11 @@ void RecentsSettings::updateRecentlyOpenedDeckPaths(const QString &deckPath)
         deckPaths.removeLast();
     }
 
-    setValue(deckPaths, "deckpaths");
+    setValue(deckPaths, "deckPaths");
     emit recentlyOpenedDeckPathsChanged();
 }
 
-QString RecentsSettings::getLatestDeckDirPath()
+QString RecentsSettings::getLatestDeckDirPath() const
 {
     return getValue("latestDeckDir", "dirs").toString();
 }
diff --git a/libcockatrice_settings/libcockatrice/settings/recents_settings.h b/libcockatrice_settings/libcockatrice/settings/recents_settings.h
index 23c8f1a9f..dc5853908 100644
--- a/libcockatrice_settings/libcockatrice/settings/recents_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/recents_settings.h
@@ -1,14 +1,20 @@
 /**
  * @file recents_settings.h
  * @ingroup DeckSettings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef RECENTS_SETTINGS_H
 #define RECENTS_SETTINGS_H
 
 #include "settings_manager.h"
 
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class QObject;
+
 class RecentsSettings : public SettingsManager
 {
     Q_OBJECT
@@ -18,11 +24,11 @@ class RecentsSettings : public SettingsManager
     RecentsSettings(const RecentsSettings & /*other*/);
 
 public:
-    QStringList getRecentlyOpenedDeckPaths();
+    QStringList getRecentlyOpenedDeckPaths() const;
     void clearRecentlyOpenedDeckPaths();
     void updateRecentlyOpenedDeckPaths(const QString &deckPath);
 
-    QString getLatestDeckDirPath();
+    QString getLatestDeckDirPath() const;
     void setLatestDeckDirPath(const QString &dirPath);
 
 signals:
diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
index 5f69f47c9..c5c4b2592 100644
--- a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp
@@ -1,8 +1,17 @@
 #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)
 {
@@ -10,28 +19,28 @@ ServersSettings::ServersSettings(const QString &settingPath, QObject *parent)
 
 void ServersSettings::setPreviousHostLogin(int previous)
 {
-    setValue(previous, "previoushostlogin");
+    setValue(previous, "previousHostLogin");
 }
 
-int ServersSettings::getPreviousHostLogin()
+int ServersSettings::getPreviousHostLogin() const
 {
-    QVariant previous = getValue("previoushostlogin");
+    QVariant previous = getValue("previousHostLogin");
     return previous == QVariant() ? 1 : previous.toInt();
 }
 
 void ServersSettings::setPreviousHostList(QStringList list)
 {
-    setValue(list, "previoushosts");
+    setValue(list, "previousHosts");
 }
 
-QStringList ServersSettings::getPreviousHostList()
+QStringList ServersSettings::getPreviousHostList() const
 {
-    return getValue("previoushosts").toStringList();
+    return getValue("previousHosts").toStringList();
 }
 
 void ServersSettings::setPrevioushostName(const QString &name)
 {
-    setValue(name, "previoushostName");
+    setValue(name, "previousHostName");
 }
 
 QString ServersSettings::getSaveName(QString defaultname)
@@ -48,31 +57,33 @@ QString ServersSettings::getSite(QString defaultSite)
     return site == QVariant() ? std::move(defaultSite) : site.toString();
 }
 
-QString ServersSettings::getPrevioushostName()
+QString ServersSettings::getPrevioushostName() const
 {
-    QVariant value = getValue("previoushostName");
+    QVariant value = getValue("previousHostName");
     return value == QVariant() ? "Rooster Ranges" : value.toString();
 }
 
-int ServersSettings::getPrevioushostindex(const QString &saveName)
+int ServersSettings::getPrevioushostindex(const QString &saveName) const
 {
     int size = getValue("totalServers", "server", "server_details").toInt();
 
-    for (int i = 0; i <= size; ++i)
-        if (saveName == getValue(QString("saveName%1").arg(i), "server", "server_details").toString())
+    for (int i = 0; i <= size; ++i) {
+        if (saveName == getValue(QString("saveName%1").arg(i), "server", "server_details").toString()) {
             return i;
+        }
+    }
 
     return -1;
 }
 
-QString ServersSettings::getHostname(QString defaultHost)
+QString ServersSettings::getHostname(QString defaultHost) const
 {
     int index = getPrevioushostindex(getPrevioushostName());
     QVariant hostname = getValue(QString("server%1").arg(index), "server", "server_details");
     return hostname == QVariant() ? std::move(defaultHost) : hostname.toString();
 }
 
-QString ServersSettings::getPort(QString defaultPort)
+QString ServersSettings::getPort(QString defaultPort) const
 {
     int index = getPrevioushostindex(getPrevioushostName());
     QVariant port = getValue(QString("port%1").arg(index), "server", "server_details");
@@ -80,7 +91,7 @@ QString ServersSettings::getPort(QString defaultPort)
     return port == QVariant() ? std::move(defaultPort) : port.toString();
 }
 
-QString ServersSettings::getPlayerName(QString defaultName)
+QString ServersSettings::getPlayerName(QString defaultName) const
 {
     int index = getPrevioushostindex(getPrevioushostName());
     QVariant name = getValue(QString("username%1").arg(index), "server", "server_details");
@@ -92,13 +103,14 @@ QString ServersSettings::getPassword()
 {
     int index = getPrevioushostindex(getPrevioushostName());
 
-    if (getSavePassword())
+    if (getSavePassword()) {
         return getValue(QString("password%1").arg(index), "server", "server_details").toString();
+    }
 
     return QString();
 }
 
-bool ServersSettings::getSavePassword()
+bool ServersSettings::getSavePassword() const
 {
     int index = getPrevioushostindex(getPrevioushostName());
     bool save = getValue(QString("savePassword%1").arg(index), "server", "server_details").toBool();
@@ -107,56 +119,56 @@ bool ServersSettings::getSavePassword()
 
 void ServersSettings::setAutoConnect(int autoconnect)
 {
-    setValue(autoconnect, "auto_connect");
+    setValue(autoconnect, "autoConnect");
 }
 
-int ServersSettings::getAutoConnect()
+int ServersSettings::getAutoConnect() const
 {
-    QVariant autoconnect = getValue("auto_connect");
+    QVariant autoconnect = getValue("autoConnect");
     return autoconnect == QVariant() ? 0 : autoconnect.toInt();
 }
 
 void ServersSettings::setFPHostName(QString hostname)
 {
-    setValue(hostname, "fphostname");
+    setValue(hostname, "fpHostName");
 }
 
-QString ServersSettings::getFPHostname(QString defaultHost)
+QString ServersSettings::getFPHostname(QString defaultHost) const
 {
-    QVariant hostname = getValue("fphostname");
+    QVariant hostname = getValue("fpHostName");
     return hostname == QVariant() ? std::move(defaultHost) : hostname.toString();
 }
 
 void ServersSettings::setFPPort(QString port)
 {
-    setValue(port, "fpport");
+    setValue(port, "fpPort");
 }
 
-QString ServersSettings::getFPPort(QString defaultPort)
+QString ServersSettings::getFPPort(QString defaultPort) const
 {
-    QVariant port = getValue("fpport");
+    QVariant port = getValue("fpPort");
     return port == QVariant() ? std::move(defaultPort) : port.toString();
 }
 
 void ServersSettings::setFPPlayerName(QString playerName)
 {
-    setValue(playerName, "fpplayername");
+    setValue(playerName, "fpPlayerName");
 }
 
-QString ServersSettings::getFPPlayerName(QString defaultName)
+QString ServersSettings::getFPPlayerName(QString defaultName) const
 {
-    QVariant name = getValue("fpplayername");
+    QVariant name = getValue("fpPlayerName");
     return name == QVariant() ? std::move(defaultName) : name.toString();
 }
 
 void ServersSettings::setClearDebugLogStatus(bool abIsChecked)
 {
-    setValue(abIsChecked, "save_debug_log");
+    setValue(abIsChecked, "saveDebugLog");
 }
 
-bool ServersSettings::getClearDebugLogStatus(bool abDefaultValue)
+bool ServersSettings::getClearDebugLogStatus(bool abDefaultValue) const
 {
-    QVariant cbFlushLog = getValue("save_debug_log");
+    QVariant cbFlushLog = getValue("saveDebugLog");
     return cbFlushLog == QVariant() ? abDefaultValue : cbFlushLog.toBool();
 }
 
@@ -168,8 +180,14 @@ void ServersSettings::addNewServer(const QString &saveName,
                                    bool savePassword,
                                    const QString &site)
 {
-    if (updateExistingServer(saveName, serv, port, username, password, savePassword, site))
+    // Match the exact host-plus-port server the caller is adding, so a link or
+    // public-server list entry cannot clobber the port (and credentials) of an
+    // unrelated entry that happens to share the same hostname.
+    const int existingIndex = findServerIndex(serv, port);
+    if (existingIndex >= 0) {
+        updateServerFields(existingIndex, saveName, username, password, savePassword, site);
         return;
+    }
 
     int index = getValue("totalServers", "server", "server_details").toInt() + 1;
 
@@ -267,25 +285,95 @@ bool ServersSettings::updateExistingServer(QString saveName,
     for (int i = 0; i <= size; ++i) {
         if (serv == getValue(QString("server%1").arg(i), "server", "server_details").toString()) {
             setValue(port, QString("port%1").arg(i), "server", "server_details");
-            if (!username.isEmpty()) {
-                setValue(username, QString("username%1").arg(i), "server", "server_details");
-            }
-
-            if (savePassword && !password.isEmpty()) {
-                setValue(password, QString("password%1").arg(i), "server", "server_details");
-            } else {
-                setValue(QString(), QString("password%1").arg(i), "server", "server_details");
-            }
-
-            if (!site.isEmpty()) {
-                setValue(site, QString("site%1").arg(i), "server", "server_details");
-            }
-
-            setValue(savePassword, QString("savePassword%1").arg(i), "server", "server_details");
-            setValue(saveName, QString("saveName%1").arg(i), "server", "server_details");
+            updateServerFields(i, saveName, username, password, savePassword, site);
 
             return true;
         }
     }
     return false;
 }
+
+void ServersSettings::updateServerFields(int index,
+                                         const QString &saveName,
+                                         const QString &username,
+                                         const QString &password,
+                                         bool savePassword,
+                                         const QString &site)
+{
+    if (!username.isEmpty()) {
+        setValue(username, QString("username%1").arg(index), "server", "server_details");
+    }
+
+    if (savePassword && !password.isEmpty()) {
+        setValue(password, QString("password%1").arg(index), "server", "server_details");
+    } else {
+        setValue(QString(), QString("password%1").arg(index), "server", "server_details");
+    }
+
+    if (!site.isEmpty()) {
+        setValue(site, QString("site%1").arg(index), "server", "server_details");
+    }
+
+    setValue(savePassword, QString("savePassword%1").arg(index), "server", "server_details");
+    setValue(saveName, QString("saveName%1").arg(index), "server", "server_details");
+}
+
+int ServersSettings::findServerIndex(const QString &host, const QString &port) const
+{
+    int size = getValue("totalServers", "server", "server_details").toInt();
+
+    for (int i = 0; i <= size; ++i) {
+        QString storedHost = getValue(QString("server%1").arg(i), "server", "server_details").toString();
+        QString storedPort = getValue(QString("port%1").arg(i), "server", "server_details").toString();
+
+        if (storedHost == host && storedPort == port) {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+int ServersSettings::findHostIndex(const QString &host) const
+{
+    int size = getValue("totalServers", "server", "server_details").toInt();
+
+    for (int i = 0; i <= size; ++i) {
+        QString storedHost = getValue(QString("server%1").arg(i), "server", "server_details").toString();
+
+        if (storedHost.compare(host, Qt::CaseInsensitive) == 0) {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+bool ServersSettings::hasUsername(const QString &host, const QString &port) const
+{
+    int index = findServerIndex(host, port);
+    if (index < 0) {
+        return false;
+    }
+
+    QString user = getValue(QString("username%1").arg(index), "server", "server_details").toString();
+    return !user.isEmpty();
+}
+
+bool ServersSettings::hasCredentials(const QString &host, const QString &port) const
+{
+    int index = findServerIndex(host, port);
+    if (index < 0) {
+        return false;
+    }
+
+    bool save = getValue(QString("savePassword%1").arg(index), "server", "server_details").toBool();
+    QString password = getValue(QString("password%1").arg(index), "server", "server_details").toString();
+
+    return save && !password.isEmpty();
+}
+
+bool ServersSettings::hasLoginData(const QString &host, const QString &port) const
+{
+    return hasUsername(host, port) && hasCredentials(host, port);
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.h b/libcockatrice_settings/libcockatrice/settings/servers_settings.h
index 4d92c4647..40648baa9 100644
--- a/libcockatrice_settings/libcockatrice/settings/servers_settings.h
+++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.h
@@ -1,8 +1,8 @@
 /**
  * @file servers_settings.h
  * @ingroup NetworkSettings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef SERVERSSETTINGS_H
 #define SERVERSSETTINGS_H
@@ -10,7 +10,12 @@
 #include "settings_manager.h"
 
 #include <QLoggingCategory>
-#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <qtmetamacros.h>
+
+class QObject;
+
 #define SERVERSETTINGS_DEFAULT_HOST "server.cockatrice.us"
 #define SERVERSETTINGS_DEFAULT_PORT "4748"
 
@@ -22,21 +27,21 @@ class ServersSettings : public SettingsManager
     friend class SettingsCache;
 
 public:
-    int getPreviousHostLogin();
-    int getPrevioushostindex(const QString &);
-    QStringList getPreviousHostList();
-    QString getPrevioushostName();
-    QString getHostname(QString defaultHost = SERVERSETTINGS_DEFAULT_HOST);
-    QString getPort(QString defaultPort = SERVERSETTINGS_DEFAULT_PORT);
-    QString getPlayerName(QString defaultName = "");
-    QString getFPHostname(QString defaultHost = SERVERSETTINGS_DEFAULT_HOST);
-    QString getFPPort(QString defaultPort = SERVERSETTINGS_DEFAULT_PORT);
-    QString getFPPlayerName(QString defaultName = "");
+    int getPreviousHostLogin() const;
+    int getPrevioushostindex(const QString &) const;
+    QStringList getPreviousHostList() const;
+    QString getPrevioushostName() const;
+    QString getHostname(QString defaultHost = SERVERSETTINGS_DEFAULT_HOST) const;
+    QString getPort(QString defaultPort = SERVERSETTINGS_DEFAULT_PORT) const;
+    QString getPlayerName(QString defaultName = "") const;
+    QString getFPHostname(QString defaultHost = SERVERSETTINGS_DEFAULT_HOST) const;
+    QString getFPPort(QString defaultPort = SERVERSETTINGS_DEFAULT_PORT) const;
+    QString getFPPlayerName(QString defaultName = "") const;
     QString getPassword();
     QString getSaveName(QString defaultname = "");
     QString getSite(QString defaultName = "");
-    bool getSavePassword();
-    int getAutoConnect();
+    bool getSavePassword() const;
+    int getAutoConnect() const;
 
     void setPreviousHostLogin(int previous);
     void setPrevioushostName(const QString &);
@@ -61,13 +66,24 @@ public:
                               QString password,
                               bool savePassword,
                               QString site = QString());
+    void updateServerFields(int index,
+                            const QString &saveName,
+                            const QString &username,
+                            const QString &password,
+                            bool savePassword,
+                            const QString &site);
+    int findServerIndex(const QString &host, const QString &port) const;
+    int findHostIndex(const QString &host) const;
+    bool hasUsername(const QString &host, const QString &port) const;
+    bool hasCredentials(const QString &host, const QString &port) const;
+    bool hasLoginData(const QString &host, const QString &port) const;
 
     bool updateExistingServerWithoutLoss(QString saveName,
                                          QString serv = QString(),
                                          QString port = QString(),
                                          QString site = QString());
     void setClearDebugLogStatus(bool abIsChecked);
-    bool getClearDebugLogStatus(bool abDefaultValue);
+    bool getClearDebugLogStatus(bool abDefaultValue) const;
 
 private:
     explicit ServersSettings(const QString &settingPath, QObject *parent = nullptr);
diff --git a/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp b/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp
index ede5a2027..f98778ca0 100644
--- a/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp
+++ b/libcockatrice_settings/libcockatrice/settings/settings_manager.cpp
@@ -1,16 +1,23 @@
 #include "settings_manager.h"
 
-SettingsManager::SettingsManager(const QString &settingPath,
+SettingsManager::SettingsManager(const QString &_settingPath,
                                  const QString &_defaultGroup,
                                  const QString &_defaultSubGroup,
                                  QObject *parent)
-    : QObject(parent), settings(settingPath, QSettings::IniFormat), defaultGroup(_defaultGroup),
-      defaultSubGroup(_defaultSubGroup)
+    : QObject(parent), settingPath(_settingPath), defaultGroup(_defaultGroup), defaultSubGroup(_defaultSubGroup)
 {
 }
 
+QSettings SettingsManager::getSettings() const
+{
+    // Do not store the QSettings instance in a field, as that is not threadsafe (see #6747)
+    return QSettings(settingPath, QSettings::IniFormat);
+}
+
 void SettingsManager::setValue(const QVariant &value, const QString &name)
 {
+    auto settings = getSettings();
+
     if (!defaultGroup.isEmpty()) {
         settings.beginGroup(defaultGroup);
     }
@@ -35,6 +42,8 @@ void SettingsManager::setValue(const QVariant &value,
                                const QString &group,
                                const QString &subGroup)
 {
+    auto settings = getSettings();
+
     if (!group.isEmpty()) {
         settings.beginGroup(group);
     }
@@ -56,6 +65,8 @@ void SettingsManager::setValue(const QVariant &value,
 
 void SettingsManager::deleteValue(const QString &name)
 {
+    auto settings = getSettings();
+
     if (!defaultGroup.isEmpty()) {
         settings.beginGroup(defaultGroup);
     }
@@ -77,6 +88,8 @@ void SettingsManager::deleteValue(const QString &name)
 
 void SettingsManager::deleteValue(const QString &name, const QString &group, const QString &subGroup)
 {
+    auto settings = getSettings();
+
     if (!group.isEmpty()) {
         settings.beginGroup(group);
     }
@@ -96,8 +109,10 @@ void SettingsManager::deleteValue(const QString &name, const QString &group, con
     }
 }
 
-QVariant SettingsManager::getValue(const QString &name)
+QVariant SettingsManager::getValue(const QString &name) const
 {
+    auto settings = getSettings();
+
     if (!defaultGroup.isEmpty()) {
         settings.beginGroup(defaultGroup);
     }
@@ -119,33 +134,80 @@ QVariant SettingsManager::getValue(const QString &name)
     return value;
 }
 
-QVariant SettingsManager::getValue(const QString &name, const QString &group, const QString &subGroup)
+QVariant SettingsManager::getValue(const QString &name, const QString &group, const QString &subGroup) const
 {
-    if (!group.isEmpty()) {
-        settings.beginGroup(group);
+    auto settings = getSettings();
+
+    QString effectiveGroup = group.isEmpty() ? defaultGroup : group;
+    QString effectiveSubGroup = subGroup.isEmpty() ? defaultSubGroup : subGroup;
+
+    if (!effectiveGroup.isEmpty()) {
+        settings.beginGroup(effectiveGroup);
     }
 
-    if (!subGroup.isEmpty()) {
-        settings.beginGroup(subGroup);
+    if (!effectiveSubGroup.isEmpty()) {
+        settings.beginGroup(effectiveSubGroup);
     }
 
     QVariant value = settings.value(name);
 
-    if (!subGroup.isEmpty()) {
+    if (!effectiveSubGroup.isEmpty()) {
         settings.endGroup();
     }
 
-    if (!group.isEmpty()) {
+    if (!effectiveGroup.isEmpty()) {
         settings.endGroup();
     }
 
     return value;
 }
 
+QVariant SettingsManager::getValue(const QString &name,
+                                   const QString &group,
+                                   const QString &subGroup,
+                                   const QVariant &defaultValue) const
+{
+    auto settings = getSettings();
+
+    QString effectiveGroup = group.isEmpty() ? defaultGroup : group;
+    QString effectiveSubGroup = subGroup.isEmpty() ? defaultSubGroup : subGroup;
+
+    if (!effectiveGroup.isEmpty()) {
+        settings.beginGroup(effectiveGroup);
+    }
+
+    if (!effectiveSubGroup.isEmpty()) {
+        settings.beginGroup(effectiveSubGroup);
+    }
+
+    QVariant value = settings.value(name, defaultValue);
+
+    if (!effectiveSubGroup.isEmpty()) {
+        settings.endGroup();
+    }
+
+    if (!effectiveGroup.isEmpty()) {
+        settings.endGroup();
+    }
+
+    return value;
+}
+
+void SettingsManager::batchWrite(std::function<void(QSettings &)> batchWriteFunction)
+{
+    auto settings = getSettings();
+    settings.setAtomicSyncRequired(false);
+    batchWriteFunction(settings);
+    settings.sync(); // single flush
+    settings.setAtomicSyncRequired(true);
+}
+
 /**
  * Calls sync on the underlying QSettings object
  */
 void SettingsManager::sync()
 {
+    auto settings = getSettings();
+
     settings.sync();
-}
\ No newline at end of file
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/settings_manager.h b/libcockatrice_settings/libcockatrice/settings/settings_manager.h
index 3592d8f8c..8d3110106 100644
--- a/libcockatrice_settings/libcockatrice/settings/settings_manager.h
+++ b/libcockatrice_settings/libcockatrice/settings/settings_manager.h
@@ -1,36 +1,51 @@
 /**
  * @file settings_manager.h
  * @ingroup Settings
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef SETTINGSMANAGER_H
 #define SETTINGSMANAGER_H
 
+#include <QObject>
 #include <QSettings>
-#include <QStringList>
+#include <QString>
 #include <QVariant>
+#include <functional>
+#include <qtmetamacros.h>
 
 class SettingsManager : public QObject
 {
     Q_OBJECT
+
 public:
     explicit SettingsManager(const QString &settingPath,
                              const QString &defaultGroup = QString(),
                              const QString &defaultSubGroup = QString(),
                              QObject *parent = nullptr);
-    QVariant getValue(const QString &name);
-    QVariant getValue(const QString &name, const QString &group, const QString &subGroup = QString());
+
+    QVariant getValue(const QString &name) const;
+    QVariant getValue(const QString &name, const QString &group, const QString &subGroup = QString()) const;
+    QVariant
+    getValue(const QString &name, const QString &group, const QString &subGroup, const QVariant &defaultValue) const;
+    void batchWrite(std::function<void(QSettings &)> batchWriteFunction);
+
     void sync();
 
 protected:
-    QSettings settings;
+    QString settingPath;
     QString defaultGroup;
     QString defaultSubGroup;
+
+    QSettings getSettings() const;
+
     void setValue(const QVariant &value, const QString &name);
+
     void
     setValue(const QVariant &value, const QString &name, const QString &group, const QString &subGroup = QString());
+
     void deleteValue(const QString &name);
+
     void deleteValue(const QString &name, const QString &group, const QString &subGroup = QString());
 };
 
diff --git a/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp b/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp
new file mode 100644
index 000000000..c3f299f40
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp
@@ -0,0 +1,814 @@
+#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");
+
+static const QString MIGRATION_SENTINEL_KEY = QStringLiteral("migration/perfile_complete");
+
+/**
+ * True when global.ini holds keys that migrateSettingsFromGlobalIni() would still move, i.e. the
+ * exact condition that function uses to decide whether it has work to do. If a user runs an older
+ * Cockatrice build that writes to global.ini (non-sentinel keys) and then upgrades back, those new
+ * keys would otherwise be silently ignored, so they are re-migrated instead.
+ */
+static bool hasPendingGlobalIniSettings(const QString &settingsPath)
+{
+    if (!QFile::exists(settingsPath + "global.ini")) {
+        return false;
+    }
+
+    QSettings globalIni(settingsPath + "global.ini", QSettings::IniFormat);
+    if (!globalIni.value(MIGRATION_SENTINEL_KEY, false).toBool()) {
+        return true;
+    }
+
+    // The sentinel is set, so any key besides it was written after the migration, i.e. by an
+    // older build sharing this file. Those are exactly the keys to re-migrate.
+    QStringList otherKeys = globalIni.allKeys();
+    otherKeys.removeAll(MIGRATION_SENTINEL_KEY);
+    return !otherKeys.isEmpty();
+}
+
+static void migrateTabsSettings(const QString &settingsPath, QSettings &globalIni)
+{
+    if (!globalIni.contains("tabs/visualDeckStorage") && !globalIni.contains("tabs/server") &&
+        !globalIni.contains("tabs/account") && !globalIni.contains("tabs/deckStorage") &&
+        !globalIni.contains("tabs/replays") && !globalIni.contains("tabs/admin") && !globalIni.contains("tabs/log")) {
+        return;
+    }
+
+    QSettings tabsIni(settingsPath + "tabs.ini", QSettings::IniFormat);
+    tabsIni.setValue("tabs/visualDeckStorage", globalIni.value("tabs/visualDeckStorage", true));
+    tabsIni.setValue("tabs/server", globalIni.value("tabs/server", true));
+    tabsIni.setValue("tabs/account", globalIni.value("tabs/account", true));
+    tabsIni.setValue("tabs/deckStorage", globalIni.value("tabs/deckStorage", true));
+    tabsIni.setValue("tabs/replays", globalIni.value("tabs/replays", true));
+    tabsIni.setValue("tabs/admin", globalIni.value("tabs/admin", true));
+    tabsIni.setValue("tabs/log", globalIni.value("tabs/log", true));
+}
+
+static void migrateSoundSettings(const QString &settingsPath, QSettings &globalIni)
+{
+    if (!globalIni.contains("sound/enabled") && !globalIni.contains("sound/theme") &&
+        !globalIni.contains("sound/mastervolume")) {
+        return;
+    }
+
+    QSettings soundIni(settingsPath + "sound.ini", QSettings::IniFormat);
+    soundIni.setValue("sound/enabled", globalIni.value("sound/enabled", false));
+    soundIni.setValue("sound/theme", globalIni.value("sound/theme"));
+    soundIni.setValue("sound/masterVolume", globalIni.value("sound/mastervolume", 100));
+}
+
+static void migrateGameSettings(const QString &settingsPath, QSettings &globalIni)
+{
+    const QMap<QString, QString> gameKeyMap = {
+        {"game/maxplayers", "game/maxPlayers"},
+        {"game/gamedescription", "game/gameDescription"},
+        {"game/gametypes", "game/gameTypes"},
+        {"game/onlybuddies", "game/onlyBuddies"},
+        {"game/onlyregistered", "game/onlyRegistered"},
+        {"game/spectatorsallowed", "game/spectatorsAllowed"},
+        {"game/spectatorsneedpassword", "game/spectatorsNeedPassword"},
+        {"game/spectatorscantalk", "game/spectatorsCanTalk"},
+        {"game/spectatorscanseeeverything", "game/spectatorsCanSeeEverything"},
+        {"game/creategameasspectator", "game/createGameAsSpectator"},
+        {"game/defaultstartinglifetotal", "game/defaultStartingLifeTotal"},
+        {"game/sharedecklistsonload", "game/shareDecklistsOnLoad"},
+        {"game/remembergamesettings", "game/rememberGameSettings"},
+        {"localgameoptions/maxplayers", "localgameoptions/maxPlayers"},
+        {"localgameoptions/startinglifetotal", "localgameoptions/startingLifeTotal"},
+        {"localgameoptions/remembersettings", "localgameoptions/rememberSettings"},
+    };
+
+    bool hasAny = false;
+    for (auto it = gameKeyMap.constBegin(); it != gameKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            hasAny = true;
+            break;
+        }
+    }
+    if (!hasAny) {
+        return;
+    }
+
+    QSettings gameIni(settingsPath + "game.ini", QSettings::IniFormat);
+    for (auto it = gameKeyMap.constBegin(); it != gameKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            gameIni.setValue(it.value(), globalIni.value(it.key()));
+        }
+    }
+}
+
+static void migrateChatSettings(const QString &settingsPath, QSettings &globalIni)
+{
+    const QMap<QString, QString> chatKeyMap = {
+        {"chat/mention", "chat/mention"},
+        {"chat/mentioncompleter", "chat/mentionCompleter"},
+        {"chat/mentioncolor", "chat/mentionColor"},
+        {"chat/highlightcolor", "chat/highlightColor"},
+        {"chat/mentionforeground", "chat/mentionForeground"},
+        {"chat/highlightforeground", "chat/highlightForeground"},
+        {"chat/ignore_unregistered", "chat/ignoreUnregistered"},
+        {"chat/ignore_unregistered_messages", "chat/ignoreUnregisteredMessages"},
+        {"chat/ignore_nonbuddy_messages", "chat/ignoreNonBuddyMessages"},
+        {"chat/showmessagepopups", "chat/showMessagePopups"},
+        {"chat/showmentionpopups", "chat/showMentionPopups"},
+        {"chat/roomhistory", "chat/roomHistory"},
+        {"chat/highlightwords", "chat/highlightWords"},
+        // Legacy highlight words lived under [personal], but the chat settings
+        // class reads them from [chat]
+        {"personal/highlightWords", "chat/highlightWords"},
+    };
+    bool hasAny = false;
+    for (auto it = chatKeyMap.constBegin(); it != chatKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            hasAny = true;
+            break;
+        }
+    }
+    if (!hasAny) {
+        return;
+    }
+
+    QSettings chatIni(settingsPath + "chat.ini", QSettings::IniFormat);
+    for (auto it = chatKeyMap.constBegin(); it != chatKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            chatIni.setValue(it.value(), globalIni.value(it.key()));
+        }
+    }
+}
+
+static void migrateCacheStorageSettings(const QString &settingsPath, QSettings &globalIni)
+{
+    const QMap<QString, QString> cacheStorageKeyMap = {
+        {"personal/pixmapCacheSize", "cache_storage/pixmapCacheSize"},
+        {"personal/networkCacheSize", "cache_storage/networkCacheSize"},
+        {"personal/redirectCacheTtl", "cache_storage/redirectCacheTtl"},
+        {"personal/cardPictureLoaderCacheMethod", "cache_storage/cardPictureLoaderCacheMethod"},
+        {"personal/localCardImageStorageNamingScheme", "cache_storage/localCardImageStorageNamingScheme"},
+    };
+    bool hasAny = false;
+    for (auto it = cacheStorageKeyMap.constBegin(); it != cacheStorageKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            hasAny = true;
+            break;
+        }
+    }
+    if (!hasAny) {
+        return;
+    }
+
+    QSettings cacheStorageIni(settingsPath + "cache_storage.ini", QSettings::IniFormat);
+    for (auto it = cacheStorageKeyMap.constBegin(); it != cacheStorageKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            cacheStorageIni.setValue(it.value(), globalIni.value(it.key()));
+        }
+    }
+}
+
+static void migrateUpdatesSettings(const QString &settingsPath, QSettings &globalIni)
+{
+    const QMap<QString, QString> updateKeyMap = {
+        {"personal/startupUpdateCheck", "updates/startupUpdateCheck"},
+        {"personal/startupCardUpdateCheckPromptForUpdate", "updates/startupCardUpdateCheckPromptForUpdate"},
+        {"personal/startupCardUpdateCheckAlwaysUpdate", "updates/startupCardUpdateCheckAlwaysUpdate"},
+        {"personal/cardUpdateCheckInterval", "updates/cardUpdateCheckInterval"},
+        {"personal/lastCardUpdateCheck", "updates/lastCardUpdateCheck"},
+        {"personal/alwaysEnableNewSets", "updates/alwaysEnableNewSets"},
+        {"personal/updatenotification", "updates/updateNotification"},
+        {"personal/newversionnotification", "updates/newVersionNotification"},
+        {"personal/updatereleasechannel", "updates/updateReleaseChannel"},
+    };
+    bool hasAny = false;
+    for (auto it = updateKeyMap.constBegin(); it != updateKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            hasAny = true;
+            break;
+        }
+    }
+    if (!hasAny) {
+        return;
+    }
+
+    QSettings updatesIni(settingsPath + "updates.ini", QSettings::IniFormat);
+    for (auto it = updateKeyMap.constBegin(); it != updateKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            updatesIni.setValue(it.value(), globalIni.value(it.key()));
+        }
+    }
+}
+
+static void migratePersonalSettings(const QString &settingsPath, QSettings &globalIni)
+{
+    const QStringList personalRootKeys = {"personal/lang"};
+    const QStringList tipKeys = {"tipOfDay/showTips", "tipOfDay/seenTips"};
+
+    bool hasAny = false;
+    for (const auto &key : personalRootKeys) {
+        if (globalIni.contains(key)) {
+            hasAny = true;
+        }
+    }
+    for (const auto &key : tipKeys) {
+        if (globalIni.contains(key)) {
+            hasAny = true;
+        }
+    }
+    if (!hasAny) {
+        return;
+    }
+
+    QSettings personalIni(settingsPath + "personal.ini", QSettings::IniFormat);
+    for (const auto &key : personalRootKeys) {
+        if (globalIni.contains(key)) {
+            personalIni.setValue(key, globalIni.value(key));
+        }
+    }
+    for (const auto &key : tipKeys) {
+        if (globalIni.contains(key)) {
+            personalIni.setValue(key, globalIni.value(key));
+        }
+    }
+}
+
+static void migrateCardsDisplaySettings(const QString &settingsPath, QSettings &globalIni)
+{
+    const QMap<QString, QString> cardsKeyMap = {
+        {"cards/displaycardnames", "cards/displayCardNames"},
+        {"cards/roundcardcorners", "cards/roundCardCorners"},
+        {"cards/overrideallcardartwithpersonalpreference", "cards/overrideAllCardArtWithPersonalPreference"},
+        {"cards/bumpsetswithcardsindecktotop", "cards/bumpSetsWithCardsInDeckToTop"},
+        {"cards/tapanimation", "cards/tapAnimation"},
+        {"cards/autorotatesidewayslayoutcards", "cards/autoRotateSidewaysLayoutCards"},
+        {"cards/scaleCards", "cards/scaleCards"},
+        {"cards/verticalCardOverlapPercent", "cards/verticalCardOverlapPercent"},
+        {"cards/cardinfoviewmode", "cards/cardInfoViewMode"},
+        {"cards/printingselectorsortorder", "cards/printingSelector/sortOrder"},
+        {"cards/printingselectornavigationbuttonsvisible", "cards/printingSelector/navigationButtonsVisible"},
+        {"cards/printingselectorcardsize", "cards/cardSize/printingSelector"},
+        {"interface/visualdeckstoragecardsize", "cards/cardSize/visualDeckStorage"},
+        {"interface/visualdatabasedisplaycardsize", "cards/cardSize/visualDatabaseDisplay"},
+        {"interface/visualdeckeditorcardsize", "cards/cardSize/visualDeckEditor"},
+        {"interface/edhreccardsize", "cards/cardSize/edhrec"},
+        {"interface/archidektpreviewsize", "cards/cardSize/archidektPreview"},
+        {"interface/visualdeckeditorsamplehandsize", "cards/cardSize/sampleHandSize"},
+    };
+
+    bool hasAny = false;
+    for (auto it = cardsKeyMap.constBegin(); it != cardsKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            hasAny = true;
+            break;
+        }
+    }
+    if (!hasAny) {
+        return;
+    }
+
+    QSettings cardsIni(settingsPath + "cards_display.ini", QSettings::IniFormat);
+    for (auto it = cardsKeyMap.constBegin(); it != cardsKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            cardsIni.setValue(it.value(), globalIni.value(it.key()));
+        }
+    }
+}
+
+static void migrateCardCounterSettings(const QString &settingsPath, QSettings &globalIni)
+{
+    QStringList counterKeys;
+    const QStringList allKeys = globalIni.allKeys();
+    for (const auto &key : allKeys) {
+        if (key.startsWith("cards/counters/")) {
+            counterKeys.append(key);
+        }
+    }
+    if (counterKeys.isEmpty()) {
+        return;
+    }
+
+    QSettings countersIni(settingsPath + "card_counters.ini", QSettings::IniFormat);
+    for (const auto &key : counterKeys) {
+        countersIni.setValue(key, globalIni.value(key));
+    }
+}
+
+static void migrateInterfaceSettings(const QString &settingsPath, QSettings &globalIni)
+{
+    const QMap<QString, QString> interfaceKeyMap = {
+        {"interface/usetearoffmenus", "interface/useTearOffMenus"},
+        {"interface/cardViewInitialRowsMax", "interface/cardViewInitialRowsMax"},
+        {"interface/cardViewExpandedRowsMax", "interface/cardViewExpandedRowsMax"},
+        {"interface/closeEmptyCardView", "interface/closeEmptyCardView"},
+        {"interface/focusCardViewSearchBar", "interface/focusCardViewSearchBar"},
+        {"interface/keepGameChatFocus", "interface/keepGameChatFocus"},
+        {"interface/doubleclicktoplay", "interface/doubleClickToPlay"},
+        {"interface/clickPlaysAllSelected", "interface/clickPlaysAllSelected"},
+        {"interface/playtostack", "interface/playToStack"},
+        {"interface/doNotDeleteArrowsInSubPhases", "interface/doNotDeleteArrowsInSubPhases"},
+        {"interface/startinghandsize", "interface/startingHandSize"},
+        {"interface/annotatetokens", "interface/annotateTokens"},
+        {"interface/showlassoselectioncount", "interface/showLassoSelectionCount"},
+        {"interface/showpersistentselectioncount", "interface/showPersistentSelectionCount"},
+        {"interface/tallyType", "interface/tallyType"},
+        {"interface/leftjustified", "interface/leftJustified"},
+        {"interface/min_players_multicolumn", "interface/minPlayersMulticolumn"},
+        {"hand/horizontal", "hand/horizontal"},
+        {"table/invert_vertical", "table/invertVertical"},
+        {"replay/rewindBufferingMs", "replay/rewindBufferingMs"},
+        {"replay/fastForwardSpeed", "replay/fastForwardSpeed"},
+        {"zoneview/groupby", "zoneview/groupBy"},
+        {"zoneview/sortby", "zoneview/sortBy"},
+        {"zoneview/pileview", "zoneview/pileView"},
+        {"personal/showStatusBar", "interface/showStatusBar"},
+        {"menu/showshortcuts", "interface/showShortcuts"},
+        {"menu/showgameselectorfiltertoolbar", "interface/showGameSelectorFilterToolbar"},
+        {"interface/notificationsenabled", "interface/notifications/enabled"},
+        {"interface/specnotificationsenabled", "interface/notifications/spectatorsEnabled"},
+        {"interface/buddyconnectnotificationsenabled", "interface/notifications/buddyConnectEnabled"},
+    };
+    bool hasAny = false;
+    for (auto it = interfaceKeyMap.constBegin(); it != interfaceKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            hasAny = true;
+            break;
+        }
+    }
+    if (!hasAny) {
+        return;
+    }
+
+    QSettings interfaceIni(settingsPath + "interface.ini", QSettings::IniFormat);
+    for (auto it = interfaceKeyMap.constBegin(); it != interfaceKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            interfaceIni.setValue(it.value(), globalIni.value(it.key()));
+        }
+    }
+}
+
+static void migrateDownloadSettings(const QString &settingsPath, QSettings &globalIni)
+{
+    const QMap<QString, QString> downloadKeyMap = {
+        {"personal/picturedownload", "downloads/pictureDownload"},
+        {"personal/downloadspoilers", "downloads/downloadSpoilers"},
+    };
+    bool hasAny = false;
+    for (auto it = downloadKeyMap.constBegin(); it != downloadKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            hasAny = true;
+            break;
+        }
+    }
+    if (!hasAny) {
+        return;
+    }
+
+    QSettings downloadsIni(settingsPath + "downloads.ini", QSettings::IniFormat);
+    for (auto it = downloadKeyMap.constBegin(); it != downloadKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            downloadsIni.setValue(it.value(), globalIni.value(it.key()));
+        }
+    }
+}
+
+static void migrateAppearanceSettings(const QString &settingsPath, QSettings &globalIni)
+{
+    const QMap<QString, QString> appearanceKeyMap = {
+        {"theme/name", "appearance/themeName"},
+        {"game/maxfontsize", "appearance/maxFontSize"},
+        {"home/background", "appearance/homeTabBackgroundSource"},
+        {"home/background/shuffleTimer", "appearance/homeTabBackgroundShuffleFrequency"},
+        {"home/background/displayCardName", "appearance/homeTabDisplayCardName"},
+        {"appearance/styleUserList", "appearance/styleUserList"},
+    };
+    bool hasAny = false;
+    for (auto it = appearanceKeyMap.constBegin(); it != appearanceKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            hasAny = true;
+            break;
+        }
+    }
+    if (!hasAny) {
+        return;
+    }
+
+    QSettings appearanceIni(settingsPath + "appearance.ini", QSettings::IniFormat);
+    for (auto it = appearanceKeyMap.constBegin(); it != appearanceKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            QVariant value = globalIni.value(it.key());
+            if (it.key() == "theme/name" && value.toString() == "Default") {
+                value = "System";
+            }
+            appearanceIni.setValue(it.value(), value);
+        }
+    }
+}
+
+static void migrateNetworkSettings(const QString &settingsPath, QSettings &globalIni)
+{
+    const QMap<QString, QString> networkKeyMap = {
+        {"personal/clientid", "network/clientId"},
+        {"personal/clientversion", "network/clientVersion"},
+        {"personal/keepalive", "network/keepAlive"},
+        {"personal/timeout", "network/timeout"},
+        {"interface/knownmissingfeatures", "network/knownMissingFeatures"},
+    };
+    bool hasAny = false;
+    for (auto it = networkKeyMap.constBegin(); it != networkKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            hasAny = true;
+            break;
+        }
+    }
+    if (!hasAny) {
+        return;
+    }
+
+    QSettings networkIni(settingsPath + "network.ini", QSettings::IniFormat);
+    for (auto it = networkKeyMap.constBegin(); it != networkKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            networkIni.setValue(it.value(), globalIni.value(it.key()));
+        }
+    }
+}
+
+static void migratePathsSettings(const QString &settingsPath, QSettings &globalIni)
+{
+    const QMap<QString, QString> pathsKeyMap = {
+        {"paths/decks", "paths/decks"},
+        {"paths/filters", "paths/filters"},
+        {"paths/replays", "paths/replays"},
+        {"paths/pics", "paths/pics"},
+        {"paths/custompics", "paths/customPics"},
+        {"paths/themes", "paths/themes"},
+        {"paths/carddatabase", "paths/cardDatabase"},
+        {"paths/customsets", "paths/customSets"},
+        {"paths/tokendatabase", "paths/tokenDatabase"},
+        {"paths/spoilerdatabase", "paths/spoilerDatabase"},
+        {"paths/redirects", "paths/redirects"},
+    };
+    bool hasAny = false;
+    for (auto it = pathsKeyMap.constBegin(); it != pathsKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            hasAny = true;
+            break;
+        }
+    }
+    if (!hasAny) {
+        return;
+    }
+
+    QSettings pathsIni(settingsPath + "paths.ini", QSettings::IniFormat);
+    for (auto it = pathsKeyMap.constBegin(); it != pathsKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            pathsIni.setValue(it.value(), globalIni.value(it.key()));
+        }
+    }
+}
+
+static void migrateVisualDeckStorageSettings(const QString &settingsPath, QSettings &globalIni)
+{
+    const QMap<QString, QString> vdsKeyMap = {
+        {"interface/visualdeckstoragesortingorder", "interface/visualDeckStorage/sortingOrder"},
+        {"interface/visualdeckstorageshowfolders", "interface/visualDeckStorage/showFolders"},
+        {"interface/visualdeckstorageshowtagfilter", "interface/visualDeckStorage/showTagFilter"},
+        {"interface/visualdeckstoragedefaulttagslist", "interface/visualDeckStorage/defaultTagsList"},
+        {"interface/visualdeckstoragesearchfoldernames", "interface/visualDeckStorage/searchFolderNames"},
+        {"interface/visualdeckstorageshowcoloridentity", "interface/visualDeckStorage/showColorIdentity"},
+        {"interface/visualdeckstorageshowbannercardcombobox", "interface/visualDeckStorage/showBannerCardComboBox"},
+        {"interface/visualdeckstorageshowtagsondeckpreviews", "interface/visualDeckStorage/showTagsOnDeckPreviews"},
+        {"interface/visualdeckstoragedrawunusedcoloridentities",
+         "interface/visualDeckStorage/drawUnusedColorIdentities"},
+        {"interface/visualdeckstorageunusedcoloridentitiesopacity",
+         "interface/visualDeckStorage/unusedColorIdentitiesOpacity"},
+        {"interface/visualdeckstoragetooltiptype", "interface/visualDeckStorage/tooltipType"},
+        {"interface/visualdeckstoragepromptforconversion", "interface/visualDeckStorage/promptForConversion"},
+        {"interface/visualdeckstoragealwaysconvert", "interface/visualDeckStorage/alwaysConvert"},
+        {"interface/visualdeckstorageingame", "interface/visualDeckStorage/inGame"},
+        {"interface/visualdeckstorageselectionanimation", "interface/visualDeckStorage/selectionAnimation"},
+        {"interface/visualdatabasedisplayfiltertomostrecentsetsenabled",
+         "interface/visualDatabaseDisplay/filterToMostRecentSetsEnabled"},
+        {"interface/visualdatabasedisplayfiltertomostrecentsetsamount",
+         "interface/visualDatabaseDisplay/filterToMostRecentSetsAmount"},
+    };
+    bool hasAny = false;
+    for (auto it = vdsKeyMap.constBegin(); it != vdsKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            hasAny = true;
+            break;
+        }
+    }
+    if (!hasAny) {
+        return;
+    }
+
+    QSettings vdsIni(settingsPath + "visual_deck_storage.ini", QSettings::IniFormat);
+    for (auto it = vdsKeyMap.constBegin(); it != vdsKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            vdsIni.setValue(it.value(), globalIni.value(it.key()));
+        }
+    }
+}
+
+static void migrateDeckEditorSettings(const QString &settingsPath, QSettings &globalIni)
+{
+    const QMap<QString, QString> deckEditorKeyMap = {
+        {"editor/openDeckInNewTab", "deckeditor/openDeckInNewTab"},
+        {"interface/deckeditorbannercardcomboboxvisible", "deckeditor/bannerCardComboBoxVisible"},
+        {"interface/deckeditortagswidgetvisible", "deckeditor/tagsWidgetVisible"},
+        {"interface/defaultDeckEditorType", "deckeditor/defaultDeckEditorType"},
+    };
+    bool hasAny = false;
+    for (auto it = deckEditorKeyMap.constBegin(); it != deckEditorKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            hasAny = true;
+            break;
+        }
+    }
+    if (!hasAny) {
+        return;
+    }
+
+    QSettings deckEditorIni(settingsPath + "deck_editor.ini", QSettings::IniFormat);
+    for (auto it = deckEditorKeyMap.constBegin(); it != deckEditorKeyMap.constEnd(); ++it) {
+        if (globalIni.contains(it.key())) {
+            deckEditorIni.setValue(it.value(), globalIni.value(it.key()));
+        }
+    }
+}
+
+static void migrateLegacySets(const QString &settingsPath)
+{
+    QSettings legacySetting;
+    legacySetting.beginGroup("sets");
+    QStringList groups = legacySetting.childGroups();
+    if (groups.isEmpty()) {
+        legacySetting.endGroup();
+        return;
+    }
+
+    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"));
+        }
+        legacySetting.endGroup();
+    }
+    legacySetting.endGroup();
+}
+
+static void migrateLegacyServers(const QString &settingsPath)
+{
+    QSettings legacySetting;
+    legacySetting.beginGroup("server");
+    QStringList keys = legacySetting.allKeys();
+    if (keys.isEmpty()) {
+        legacySetting.endGroup();
+        return;
+    }
+
+    const QMap<QString, QString> serverKeyMap = {
+        {"previoushostlogin", "previousHostLogin"},
+        {"previoushosts", "previousHosts"},
+        {"previoushostName", "previousHostName"},
+        {"auto_connect", "autoConnect"},
+        {"fphostname", "fpHostName"},
+        {"fpport", "fpPort"},
+        {"fpplayername", "fpPlayerName"},
+        {"save_debug_log", "saveDebugLog"},
+    };
+
+    QSettings serversIni(settingsPath + "servers.ini", QSettings::IniFormat);
+    for (auto it = serverKeyMap.constBegin(); it != serverKeyMap.constEnd(); ++it) {
+        if (legacySetting.contains(it.key())) {
+            serversIni.setValue("server/" + it.value(), legacySetting.value(it.key()));
+        }
+    }
+
+    legacySetting.beginGroup("server_details");
+    const QStringList detailsKeys = legacySetting.allKeys();
+    for (const auto &key : detailsKeys) {
+        serversIni.setValue("server/server_details/" + key, legacySetting.value(key));
+    }
+    legacySetting.endGroup();
+    legacySetting.endGroup();
+}
+
+static void migrateLegacyMessages(const QString &settingsPath)
+{
+    QSettings legacySetting;
+    legacySetting.beginGroup("messages");
+    QStringList keys = legacySetting.allKeys();
+    if (keys.isEmpty()) {
+        legacySetting.endGroup();
+        return;
+    }
+
+    QSettings messageIni(settingsPath + "messages.ini", QSettings::IniFormat);
+    for (const auto &key : keys) {
+        if (key == "count") {
+            messageIni.setValue("messages/count", legacySetting.value("count"));
+        } else {
+            messageIni.setValue("messages/" + key, legacySetting.value(key));
+        }
+    }
+    legacySetting.endGroup();
+}
+
+static void migrateLegacyGameFilters(const QString &settingsPath)
+{
+    QSettings legacySetting;
+    legacySetting.beginGroup("filter_games");
+    QStringList keys = legacySetting.allKeys();
+    if (keys.isEmpty()) {
+        legacySetting.endGroup();
+        return;
+    }
+
+    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) {
+        if (legacySetting.contains(it.key())) {
+            filtersIni.setValue("filter_games/" + it.value(), legacySetting.value(it.key()));
+        }
+    }
+    const QString gameTypePrefix = "game_type/";
+    for (const auto &key : keys) {
+        if (key.startsWith(gameTypePrefix)) {
+            filtersIni.setValue("filter_games/gameType/" + key.mid(gameTypePrefix.size()), legacySetting.value(key));
+        }
+    }
+    legacySetting.endGroup();
+}
+
+bool SettingsMigration::migrateLegacySettings(const QString &settingsPath)
+{
+    QSettings personalIni(settingsPath + "personal.ini", QSettings::IniFormat);
+    if (personalIni.value("migration/legacy_complete", false).toBool()) {
+        return false;
+    }
+
+    migrateLegacySets(settingsPath);
+    migrateLegacyServers(settingsPath);
+    migrateLegacyMessages(settingsPath);
+    migrateLegacyGameFilters(settingsPath);
+
+    personalIni.setValue("migration/legacy_complete", true);
+    personalIni.sync();
+    return true;
+}
+
+bool SettingsMigration::migrateSettingsFromGlobalIni(const QString &settingsPath)
+{
+    if (!hasPendingGlobalIniSettings(settingsPath)) {
+        return false;
+    }
+
+    QSettings globalIni(settingsPath + "global.ini", QSettings::IniFormat);
+
+    migrateTabsSettings(settingsPath, globalIni);
+    migrateSoundSettings(settingsPath, globalIni);
+    migrateGameSettings(settingsPath, globalIni);
+    migrateChatSettings(settingsPath, globalIni);
+    migrateCacheStorageSettings(settingsPath, globalIni);
+    migrateUpdatesSettings(settingsPath, globalIni);
+    migratePersonalSettings(settingsPath, globalIni);
+    migrateDownloadSettings(settingsPath, globalIni);
+    migrateCardsDisplaySettings(settingsPath, globalIni);
+    migrateCardCounterSettings(settingsPath, globalIni);
+    migrateInterfaceSettings(settingsPath, globalIni);
+    migrateAppearanceSettings(settingsPath, globalIni);
+    migrateNetworkSettings(settingsPath, globalIni);
+    migratePathsSettings(settingsPath, globalIni);
+    migrateVisualDeckStorageSettings(settingsPath, globalIni);
+    migrateDeckEditorSettings(settingsPath, globalIni);
+
+    QFile::remove(settingsPath + "global.ini.old");
+    QFile::rename(settingsPath + "global.ini", settingsPath + "global.ini.old");
+
+    QSettings newGlobalIni(settingsPath + "global.ini", QSettings::IniFormat);
+    newGlobalIni.setValue(MIGRATION_SENTINEL_KEY, true);
+    newGlobalIni.sync();
+
+    return true;
+}
+
+bool SettingsMigration::isMigrationPending(const QString &settingsPath)
+{
+    if (hasPendingGlobalIniSettings(settingsPath)) {
+        return true;
+    }
+
+    QSettings personalIni(settingsPath + "personal.ini", QSettings::IniFormat);
+    if (personalIni.value("migration/legacy_complete", false).toBool()) {
+        return false;
+    }
+
+    // migrateLegacySettings() also runs on an empty profile, where it only writes its sentinel.
+    // Reporting that as pending would leave a backup folder behind on every fresh install, so
+    // only count it when there really are legacy keys left to move.
+    return !QSettings().allKeys().isEmpty();
+}
+
+QString SettingsMigration::backupSettingsDirectory(const QString &settingsPath)
+{
+    QDir settingsDir(QDir::cleanPath(settingsPath));
+    if (!settingsDir.exists()) {
+        return QString();
+    }
+
+    const QDir::Filters fileFilters = QDir::Files | QDir::Hidden | QDir::System | QDir::NoDotAndDotDot;
+
+    // A profile holding nothing but empty files has nothing to lose, and backing it up would only
+    // leave clutter next to the settings folder.
+    const QFileInfoList files = settingsDir.entryInfoList(fileFilters);
+    const bool hasContent =
+        std::any_of(files.cbegin(), files.cend(), [](const QFileInfo &file) { return file.size() > 0; });
+    if (!hasContent) {
+        return QString();
+    }
+
+    // Keep the backup a sibling of the settings folder rather than a child: a folder that is never
+    // copied into its own backup, and one the "Open settings folder" action does not have to skip.
+    QDir backupParentDir(settingsDir.absolutePath());
+    if (!backupParentDir.cdUp()) {
+        qCWarning(SettingsMigrationLog) << "[SettingsMigration] Could not resolve the parent of the settings folder:"
+                                        << settingsDir.absolutePath();
+        return QString();
+    }
+
+    const QString backupName =
+        QStringLiteral("settings-backup-") + QDateTime::currentDateTime().toString("yyyyMMdd-HHmmss");
+    QString backupPath = backupParentDir.absoluteFilePath(backupName);
+    // Two migrations inside the same second must not merge into a single folder.
+    for (int suffix = 1; QFileInfo::exists(backupPath); ++suffix) {
+        backupPath = backupParentDir.absoluteFilePath(backupName + '-' + QString::number(suffix));
+    }
+
+    if (!QDir().mkpath(backupPath)) {
+        qCWarning(SettingsMigrationLog) << "[SettingsMigration] Could not create the settings backup folder:"
+                                        << backupPath;
+        return QString();
+    }
+
+    QDir backupDir(backupPath);
+    QDirIterator it(settingsDir.absolutePath(), fileFilters, QDirIterator::Subdirectories);
+    while (it.hasNext()) {
+        it.next();
+
+        const QString target = backupDir.absoluteFilePath(settingsDir.relativeFilePath(it.filePath()));
+        QDir().mkpath(QFileInfo(target).absolutePath());
+        if (!QFile::copy(it.filePath(), target)) {
+            // A partially copied backup still beats none: report it and let the migration run.
+            qCWarning(SettingsMigrationLog) << "[SettingsMigration] Could not back up settings file:" << it.filePath();
+        }
+    }
+
+    qCInfo(SettingsMigrationLog) << "[SettingsMigration] Settings backed up to" << backupPath;
+    return backupPath;
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/settings_migration.h b/libcockatrice_settings/libcockatrice/settings/settings_migration.h
new file mode 100644
index 000000000..78f9c8a3f
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/settings_migration.h
@@ -0,0 +1,26 @@
+#ifndef SETTINGS_MIGRATION_H
+#define SETTINGS_MIGRATION_H
+
+#include <QString>
+
+class SettingsMigration
+{
+public:
+    static bool migrateSettingsFromGlobalIni(const QString &settingsPath);
+    static bool migrateLegacySettings(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.
+     */
+    static bool isMigrationPending(const QString &settingsPath);
+
+    /**
+     * Copies the whole settings directory to a timestamped sibling folder, so a migration that
+     * overwrites per-domain files can be undone by hand. Returns the backup path, or an empty
+     * string when there was nothing to back up or the copy failed. Never aborts the migration.
+     */
+    static QString backupSettingsDirectory(const QString &settingsPath);
+};
+
+#endif // SETTINGS_MIGRATION_H
diff --git a/libcockatrice_settings/libcockatrice/settings/sound_settings.cpp b/libcockatrice_settings/libcockatrice/settings/sound_settings.cpp
new file mode 100644
index 000000000..5de7f9105
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/sound_settings.cpp
@@ -0,0 +1,45 @@
+#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)
+{
+}
+
+bool SoundSettings::getSoundEnabled() const
+{
+    return getValue("enabled", QString(), QString(), false).toBool();
+}
+
+QString SoundSettings::getSoundThemeName() const
+{
+    return getValue("theme", QString(), QString()).toString();
+}
+
+int SoundSettings::getMasterVolume() const
+{
+    return getValue("masterVolume", QString(), QString(), 100).toInt();
+}
+
+void SoundSettings::setSoundEnabled(bool _soundEnabled)
+{
+    setValue(_soundEnabled, "enabled");
+    emit soundEnabledChanged();
+}
+
+void SoundSettings::setSoundThemeName(const QString &_soundThemeName)
+{
+    setValue(_soundThemeName, "theme");
+    emit soundThemeChanged();
+}
+
+void SoundSettings::setMasterVolume(int _masterVolume)
+{
+    setValue(_masterVolume, "masterVolume");
+    emit masterVolumeChanged(_masterVolume);
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/sound_settings.h b/libcockatrice_settings/libcockatrice/settings/sound_settings.h
new file mode 100644
index 000000000..df6332cae
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/sound_settings.h
@@ -0,0 +1,38 @@
+#ifndef SOUND_SETTINGS_H
+#define SOUND_SETTINGS_H
+
+#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
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    [[nodiscard]] bool getSoundEnabled() const override;
+    [[nodiscard]] QString getSoundThemeName() const override;
+    [[nodiscard]] int getMasterVolume() const override;
+
+    void setSoundEnabled(bool _soundEnabled);
+    void setSoundThemeName(const QString &_soundThemeName);
+    void setMasterVolume(int _masterVolume);
+
+signals:
+    void soundEnabledChanged();
+    void soundThemeChanged();
+    void masterVolumeChanged(int value);
+
+public:
+    explicit SoundSettings(const QString &settingPath, QObject *parent = nullptr);
+
+private:
+    SoundSettings(const SoundSettings & /*other*/);
+};
+
+#endif // SOUND_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp b/libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp
new file mode 100644
index 000000000..7ed6c4433
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp
@@ -0,0 +1,169 @@
+#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)
+{
+}
+
+int TabsSettings::getStartupTabIndex() const
+{
+    return getValue("startupTab", QString(), QString(), StartupTab::StartupTabHome).toInt();
+}
+
+QString TabsSettings::getStartupServerHost() const
+{
+    return getValue("startupServerHost", QString(), QString(), QString()).toString();
+}
+
+QString TabsSettings::getStartupServerPort() const
+{
+    return getValue("startupServerPort", QString(), QString(), QString()).toString();
+}
+
+QString TabsSettings::getStartupRoomName() const
+{
+    return getValue("startupRoomName", QString(), QString(), QString()).toString();
+}
+
+bool TabsSettings::getTabVisualDeckStorageOpen() const
+{
+    return getValue("visualDeckStorage", QString(), QString(), true).toBool();
+}
+
+bool TabsSettings::getTabServerOpen() const
+{
+    return getValue("server", QString(), QString(), true).toBool();
+}
+
+bool TabsSettings::getTabAccountOpen() const
+{
+    return getValue("account", QString(), QString(), true).toBool();
+}
+
+bool TabsSettings::getTabDeckStorageOpen() const
+{
+    return getValue("deckStorage", QString(), QString(), true).toBool();
+}
+
+bool TabsSettings::getTabReplaysOpen() const
+{
+    return getValue("replays", QString(), QString(), true).toBool();
+}
+
+bool TabsSettings::getTabAdminOpen() const
+{
+    return getValue("admin", QString(), QString(), true).toBool();
+}
+
+bool TabsSettings::getTabLogOpen() const
+{
+    return getValue("log", QString(), QString(), true).toBool();
+}
+
+void TabsSettings::setStartupTabIndex(int value)
+{
+    if (getStartupTabIndex() == value) {
+        return;
+    }
+    setValue(value, "startupTab");
+    emit startupTabIndexChanged(value);
+}
+
+void TabsSettings::setStartupServerHost(const QString &host)
+{
+    if (getStartupServerHost() == host) {
+        return;
+    }
+    setValue(host, "startupServerHost");
+    emit startupServerHostChanged(host);
+}
+
+void TabsSettings::setStartupServerPort(const QString &port)
+{
+    if (getStartupServerPort() == port) {
+        return;
+    }
+    setValue(port, "startupServerPort");
+    emit startupServerPortChanged(port);
+}
+
+void TabsSettings::setStartupRoomName(const QString &roomName)
+{
+    if (getStartupRoomName() == roomName) {
+        return;
+    }
+    setValue(roomName, "startupRoomName");
+    emit startupRoomNameChanged(roomName);
+}
+
+bool TabsSettings::getTabReportOpen() const
+{
+    return getValue("report", QString(), QString(), false).toBool();
+}
+
+bool TabsSettings::getTabModerationOpen() const
+{
+    return getValue("moderation", QString(), QString(), false).toBool();
+}
+
+bool TabsSettings::getTabCardArtRulesOpen() const
+{
+    return getValue("cardArtRules", QString(), QString(), false).toBool();
+}
+
+void TabsSettings::setTabVisualDeckStorageOpen(bool value)
+{
+    setValue(value, "visualDeckStorage");
+}
+
+void TabsSettings::setTabServerOpen(bool value)
+{
+    setValue(value, "server");
+}
+
+void TabsSettings::setTabAccountOpen(bool value)
+{
+    setValue(value, "account");
+}
+
+void TabsSettings::setTabDeckStorageOpen(bool value)
+{
+    setValue(value, "deckStorage");
+}
+
+void TabsSettings::setTabReplaysOpen(bool value)
+{
+    setValue(value, "replays");
+}
+
+void TabsSettings::setTabAdminOpen(bool value)
+{
+    setValue(value, "admin");
+}
+
+void TabsSettings::setTabLogOpen(bool value)
+{
+    setValue(value, "log");
+}
+
+void TabsSettings::setTabReportOpen(bool value)
+{
+    setValue(value, "report");
+}
+
+void TabsSettings::setTabModerationOpen(bool value)
+{
+    setValue(value, "moderation");
+}
+
+void TabsSettings::setTabCardArtRulesOpen(bool value)
+{
+    setValue(value, "cardArtRules");
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/tabs_settings.h b/libcockatrice_settings/libcockatrice/settings/tabs_settings.h
new file mode 100644
index 000000000..5411a6721
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/tabs_settings.h
@@ -0,0 +1,80 @@
+#ifndef TABS_SETTINGS_H
+#define TABS_SETTINGS_H
+
+#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.
+ *
+ * The destination is a request: tabs that were not open before (Deck Editor, Server Room, …)
+ * are opened as part of the startup flow. Destinations that require a server connection use the
+ * intent system to satisfy their pre-conditions.
+ */
+enum StartupTab
+{
+    StartupTabHome,              ///< The Home tab
+    StartupTabVisualDeckStorage, ///< The visual deck storage tab
+    StartupTabDeckStorage,       ///< The deck storage tab
+    StartupTabReplays,           ///< The game replays tab
+    StartupTabDeckEditor,        ///< A fresh classic deck editor tab
+    StartupTabVisualDeckEditor,  ///< A fresh visual deck editor tab
+    StartupTabServer,            ///< The server lobby: connect and select the server tab
+    StartupTabServerRoom         ///< A server room: connect and join the room by name
+};
+
+class TabsSettings : public SettingsManager, public ITabsSettingsProvider
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    [[nodiscard]] int getStartupTabIndex() const override;
+    [[nodiscard]] QString getStartupServerHost() const override;
+    [[nodiscard]] QString getStartupServerPort() const override;
+    [[nodiscard]] QString getStartupRoomName() const override;
+    [[nodiscard]] bool getTabVisualDeckStorageOpen() const override;
+    [[nodiscard]] bool getTabServerOpen() const override;
+    [[nodiscard]] bool getTabAccountOpen() const override;
+    [[nodiscard]] bool getTabDeckStorageOpen() const override;
+    [[nodiscard]] bool getTabReplaysOpen() const override;
+    [[nodiscard]] bool getTabAdminOpen() const override;
+    [[nodiscard]] bool getTabLogOpen() const override;
+    [[nodiscard]] bool getTabReportOpen() const override;
+    [[nodiscard]] bool getTabModerationOpen() const override;
+    [[nodiscard]] bool getTabCardArtRulesOpen() const override;
+
+    void setStartupTabIndex(int value);
+    void setStartupServerHost(const QString &host);
+    void setStartupServerPort(const QString &port);
+    void setStartupRoomName(const QString &roomName);
+    void setTabVisualDeckStorageOpen(bool value);
+    void setTabServerOpen(bool value);
+    void setTabAccountOpen(bool value);
+    void setTabDeckStorageOpen(bool value);
+    void setTabReplaysOpen(bool value);
+    void setTabAdminOpen(bool value);
+    void setTabLogOpen(bool value);
+    void setTabReportOpen(bool value);
+    void setTabModerationOpen(bool value);
+    void setTabCardArtRulesOpen(bool value);
+
+signals:
+    void startupTabIndexChanged(int index);
+    void startupServerHostChanged(const QString &host);
+    void startupServerPortChanged(const QString &port);
+    void startupRoomNameChanged(const QString &roomName);
+
+public:
+    explicit TabsSettings(const QString &settingPath, QObject *parent = nullptr);
+
+private:
+    TabsSettings(const TabsSettings & /*other*/);
+};
+
+#endif // TABS_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/updates_settings.cpp b/libcockatrice_settings/libcockatrice/settings/updates_settings.cpp
new file mode 100644
index 000000000..9ea22ed7c
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/updates_settings.cpp
@@ -0,0 +1,121 @@
+#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)
+{
+}
+
+bool UpdatesSettings::getCheckUpdatesOnStartup() const
+{
+    return getValue("startupUpdateCheck", QString(), QString(), true).toBool();
+}
+
+bool UpdatesSettings::getStartupCardUpdateCheckPromptForUpdate()
+{
+    return getValue("startupCardUpdateCheckPromptForUpdate", QString(), QString(), true).toBool();
+}
+
+bool UpdatesSettings::getStartupCardUpdateCheckAlwaysUpdate()
+{
+    return getValue("startupCardUpdateCheckAlwaysUpdate", QString(), QString(), false).toBool();
+}
+
+int UpdatesSettings::getCardUpdateCheckInterval() const
+{
+    return getValue("cardUpdateCheckInterval", QString(), QString(), 7).toInt();
+}
+
+QDate UpdatesSettings::getLastCardUpdateCheck() const
+{
+    return getValue("lastCardUpdateCheck", QString(), QString(), QDateTime::currentDateTime().date()).toDate();
+}
+
+bool UpdatesSettings::getCardUpdateCheckRequired() const
+{
+    return getLastCardUpdateCheck().daysTo(QDateTime::currentDateTime().date()) >= getCardUpdateCheckInterval() &&
+           getLastCardUpdateCheck() != QDateTime::currentDateTime().date();
+}
+
+bool UpdatesSettings::getAlwaysEnableNewSets() const
+{
+    return getValue("alwaysEnableNewSets", QString(), QString(), false).toBool();
+}
+
+bool UpdatesSettings::getNotifyAboutUpdates() const
+{
+    return getValue("updateNotification", QString(), QString(), true).toBool();
+}
+
+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();
+}
+
+void UpdatesSettings::setCheckUpdatesOnStartup(bool value)
+{
+    setValue(value, "startupUpdateCheck");
+}
+
+void UpdatesSettings::setStartupCardUpdateCheckPromptForUpdate(bool value)
+{
+    setValue(value, "startupCardUpdateCheckPromptForUpdate");
+}
+
+void UpdatesSettings::setStartupCardUpdateCheckAlwaysUpdate(bool value)
+{
+    setValue(value, "startupCardUpdateCheckAlwaysUpdate");
+}
+
+void UpdatesSettings::setCardUpdateCheckInterval(int value)
+{
+    setValue(value, "cardUpdateCheckInterval");
+}
+
+void UpdatesSettings::setLastCardUpdateCheck(QDate value)
+{
+    setValue(value, "lastCardUpdateCheck");
+}
+
+void UpdatesSettings::setAlwaysEnableNewSets(bool value)
+{
+    setValue(value, "alwaysEnableNewSets");
+}
+
+void UpdatesSettings::setNotifyAboutUpdates(bool _notifyaboutupdate)
+{
+    setValue(_notifyaboutupdate, "updateNotification");
+}
+
+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
new file mode 100644
index 000000000..490dca14e
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/updates_settings.h
@@ -0,0 +1,49 @@
+#ifndef UPDATES_SETTINGS_H
+#define UPDATES_SETTINGS_H
+
+#include "settings_manager.h"
+
+#include <QString>
+#include <libcockatrice/interfaces/interface_updates_settings_provider.h>
+#include <qtmetamacros.h>
+
+class QDate;
+class QObject;
+
+class UpdatesSettings : public SettingsManager, public IUpdatesSettingsProvider
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    [[nodiscard]] bool getCheckUpdatesOnStartup() const override;
+    [[nodiscard]] bool getStartupCardUpdateCheckPromptForUpdate() override;
+    [[nodiscard]] bool getStartupCardUpdateCheckAlwaysUpdate() override;
+    [[nodiscard]] int getCardUpdateCheckInterval() const override;
+    [[nodiscard]] QDate getLastCardUpdateCheck() const override;
+    [[nodiscard]] bool getCardUpdateCheckRequired() const override;
+    [[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);
+    void setStartupCardUpdateCheckPromptForUpdate(bool value);
+    void setStartupCardUpdateCheckAlwaysUpdate(bool value);
+    void setCardUpdateCheckInterval(int value);
+    void setLastCardUpdateCheck(QDate value);
+    void setAlwaysEnableNewSets(bool value);
+    void setNotifyAboutUpdates(bool _notifyaboutupdate);
+    void setNotifyAboutNewVersion(bool _notifyaboutnewversion);
+    void setCardDatabaseUpdateTrayNotification(bool value);
+    void setUpdateReleaseChannelIndex(int value);
+
+public:
+    explicit UpdatesSettings(const QString &settingPath, QObject *parent = nullptr);
+
+private:
+    UpdatesSettings(const UpdatesSettings & /*other*/);
+};
+
+#endif // UPDATES_SETTINGS_H
diff --git a/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.cpp b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.cpp
new file mode 100644
index 000000000..4667a278c
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.cpp
@@ -0,0 +1,290 @@
+#include "visual_deck_storage_settings.h"
+
+#include "libcockatrice/settings/settings_manager.h"
+
+#include <QList>
+#include <QVariant>
+
+class QObject;
+
+namespace
+{
+QStringList defaultTags = {
+    // Strategies
+    "🏃️ Aggro",
+    "🧙‍️ Control",
+    "⚔️ Midrange",
+    "🌀 Combo",
+    "🪓 Mill",
+    "🔒 Stax",
+    "🗺️ Landfall",
+    "🛡️ Pillowfort",
+    "🌱 Ramp",
+    "⚡ Storm",
+    "💀 Aristocrats",
+    "☠️ Reanimator",
+    "👹 Sacrifice",
+    "🔥 Burn",
+    "🌟 Lifegain",
+    "🔮 Spellslinger",
+    "👥 Tokens",
+    "🎭 Blink",
+    "⏳ Time Manipulation",
+    "🌍 Domain",
+    "💫 Proliferate",
+    "📜 Saga",
+    "🎲 Chaos",
+    "🪄 Auras",
+    "🔫 Pingers",
+
+    // Themes
+    "👑 Monarch",
+    "🚀 Vehicles",
+    "💉 Infect",
+    "🩸 Madness",
+    "🌀 Morph",
+
+    // Card Types
+    "⚔️ Creature",
+    "💎 Artifact",
+    "🌔 Enchantment",
+    "📖 Sorcery",
+    "⚡ Instant",
+    "🌌 Planeswalker",
+    "🌏 Land",
+    "🪄 Aura",
+
+    // Kindred Types
+    "🐉 Kindred",
+    "🧙 Humans",
+    "⚔️ Soldiers",
+    "🛡️ Knights",
+    "🎻 Bards",
+    "🧝 Elves",
+    "🌲 Dryads",
+    "😇 Angels",
+    "🎩 Wizards",
+    "🧛 Vampires",
+    "🦴 Skeletons",
+    "💀 Zombies",
+    "👹 Demons",
+    "👾 Eldrazi",
+    "🐉 Dragons",
+    "🐠 Merfolk",
+    "🦁 Cats",
+    "🐺 Wolves",
+    "🐺 Werewolves",
+    "🦇 Bats",
+    "🐀 Rats",
+    "🦅 Birds",
+    "🦗 Insects",
+    "🍄 Fungus",
+    "🐚 Sea Creatures",
+    "🐗 Boars",
+    "🦊 Foxes",
+    "🦄 Unicorns",
+    "🐘 Elephants",
+    "🐻 Bears",
+    "🦏 Rhinos",
+    "🦂 Scorpions",
+
+};
+}
+
+VisualDeckStorageSettings::VisualDeckStorageSettings(const QString &settingPath, QObject *parent)
+    : SettingsManager(settingPath + "visual_deck_storage.ini", "interface", QString(), parent)
+{
+}
+
+int VisualDeckStorageSettings::getVisualDeckStorageSortingOrder() const
+{
+    return getValue("sortingOrder", "interface", "visualDeckStorage", 0).toInt();
+}
+
+bool VisualDeckStorageSettings::getVisualDeckStorageShowFolders() const
+{
+    return getValue("showFolders", "interface", "visualDeckStorage", true).toBool();
+}
+
+bool VisualDeckStorageSettings::getVisualDeckStorageShowTagFilter() const
+{
+    return getValue("showTagFilter", "interface", "visualDeckStorage", true).toBool();
+}
+
+QStringList VisualDeckStorageSettings::getVisualDeckStorageDefaultTagsList() const
+{
+    return getValue("defaultTagsList", "interface", "visualDeckStorage", QVariant::fromValue(defaultTags))
+        .toStringList();
+}
+
+bool VisualDeckStorageSettings::getVisualDeckStorageSearchFolderNames() const
+{
+    return getValue("searchFolderNames", "interface", "visualDeckStorage", true).toBool();
+}
+
+bool VisualDeckStorageSettings::getVisualDeckStorageShowColorIdentity() const
+{
+    return getValue("showColorIdentity", "interface", "visualDeckStorage", true).toBool();
+}
+
+bool VisualDeckStorageSettings::getVisualDeckStorageShowBannerCardComboBox() const
+{
+    return getValue("showBannerCardComboBox", "interface", "visualDeckStorage", true).toBool();
+}
+
+bool VisualDeckStorageSettings::getVisualDeckStorageShowTagsOnDeckPreviews() const
+{
+    return getValue("showTagsOnDeckPreviews", "interface", "visualDeckStorage", true).toBool();
+}
+
+bool VisualDeckStorageSettings::getVisualDeckStorageShowUploadTime() const
+{
+    return getValue("showUploadTime", "interface", "visualDeckStorage", true).toBool();
+}
+
+bool VisualDeckStorageSettings::getVisualDeckStorageDrawUnusedColorIdentities() const
+{
+    return getValue("drawUnusedColorIdentities", "interface", "visualDeckStorage", true).toBool();
+}
+
+int VisualDeckStorageSettings::getVisualDeckStorageUnusedColorIdentitiesOpacity() const
+{
+    return getValue("unusedColorIdentitiesOpacity", "interface", "visualDeckStorage", 15).toInt();
+}
+
+int VisualDeckStorageSettings::getVisualDeckStorageTooltipType() const
+{
+    return getValue("tooltipType", "interface", "visualDeckStorage", 0).toInt();
+}
+
+bool VisualDeckStorageSettings::getVisualDeckStoragePromptForConversion() const
+{
+    return getValue("promptForConversion", "interface", "visualDeckStorage", true).toBool();
+}
+
+bool VisualDeckStorageSettings::getVisualDeckStorageAlwaysConvert() const
+{
+    return getValue("alwaysConvert", "interface", "visualDeckStorage", false).toBool();
+}
+
+bool VisualDeckStorageSettings::getVisualDeckStorageInGame() const
+{
+    return getValue("inGame", "interface", "visualDeckStorage", true).toBool();
+}
+
+bool VisualDeckStorageSettings::getVisualDeckStorageSelectionAnimation() const
+{
+    return getValue("selectionAnimation", "interface", "visualDeckStorage", true).toBool();
+}
+
+bool VisualDeckStorageSettings::getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const
+{
+    return getValue("filterToMostRecentSetsEnabled", "interface", "visualDatabaseDisplay", false).toBool();
+}
+
+int VisualDeckStorageSettings::getVisualDatabaseDisplayFilterToMostRecentSetsAmount() const
+{
+    return getValue("filterToMostRecentSetsAmount", "interface", "visualDatabaseDisplay", 10).toInt();
+}
+
+void VisualDeckStorageSettings::setVisualDeckStorageSortingOrder(int _sortingOrder)
+{
+    setValue(_sortingOrder, "sortingOrder", "interface", "visualDeckStorage");
+}
+
+void VisualDeckStorageSettings::setVisualDeckStorageShowFolders(bool value)
+{
+    setValue(value, "showFolders", "interface", "visualDeckStorage");
+}
+
+void VisualDeckStorageSettings::setVisualDeckStorageShowTagFilter(bool _showTags)
+{
+    setValue(_showTags, "showTagFilter", "interface", "visualDeckStorage");
+    emit visualDeckStorageShowTagFilterChanged(_showTags);
+}
+
+void VisualDeckStorageSettings::setVisualDeckStorageDefaultTagsList(QStringList _defaultTagsList)
+{
+    setValue(QVariant::fromValue(_defaultTagsList), "defaultTagsList", "interface", "visualDeckStorage");
+    emit visualDeckStorageDefaultTagsListChanged();
+}
+
+void VisualDeckStorageSettings::setVisualDeckStorageSearchFolderNames(bool value)
+{
+    setValue(value, "searchFolderNames", "interface", "visualDeckStorage");
+}
+
+void VisualDeckStorageSettings::setVisualDeckStorageShowColorIdentity(bool value)
+{
+    setValue(value, "showColorIdentity", "interface", "visualDeckStorage");
+    emit visualDeckStorageShowColorIdentityChanged(value);
+}
+
+void VisualDeckStorageSettings::setVisualDeckStorageShowBannerCardComboBox(bool _showBannerCardComboBox)
+{
+    setValue(_showBannerCardComboBox, "showBannerCardComboBox", "interface", "visualDeckStorage");
+    emit visualDeckStorageShowBannerCardComboBoxChanged(_showBannerCardComboBox);
+}
+
+void VisualDeckStorageSettings::setVisualDeckStorageShowTagsOnDeckPreviews(bool _showTags)
+{
+    setValue(_showTags, "showTagsOnDeckPreviews", "interface", "visualDeckStorage");
+    emit visualDeckStorageShowTagsOnDeckPreviewsChanged(_showTags);
+}
+
+void VisualDeckStorageSettings::setVisualDeckStorageShowUploadTime(bool value)
+{
+    setValue(value, "showUploadTime", "interface", "visualDeckStorage");
+    emit visualDeckStorageShowUploadTimeChanged(value);
+}
+
+void VisualDeckStorageSettings::setVisualDeckStorageDrawUnusedColorIdentities(bool _draw)
+{
+    setValue(_draw, "drawUnusedColorIdentities", "interface", "visualDeckStorage");
+    emit visualDeckStorageDrawUnusedColorIdentitiesChanged(_draw);
+}
+
+void VisualDeckStorageSettings::setVisualDeckStorageUnusedColorIdentitiesOpacity(int _opacity)
+{
+    setValue(_opacity, "unusedColorIdentitiesOpacity", "interface", "visualDeckStorage");
+    emit visualDeckStorageUnusedColorIdentitiesOpacityChanged(_opacity);
+}
+
+void VisualDeckStorageSettings::setVisualDeckStorageTooltipType(int value)
+{
+    setValue(value, "tooltipType", "interface", "visualDeckStorage");
+}
+
+void VisualDeckStorageSettings::setVisualDeckStoragePromptForConversion(bool _prompt)
+{
+    setValue(_prompt, "promptForConversion", "interface", "visualDeckStorage");
+}
+
+void VisualDeckStorageSettings::setVisualDeckStorageAlwaysConvert(bool _always)
+{
+    setValue(_always, "alwaysConvert", "interface", "visualDeckStorage");
+}
+
+void VisualDeckStorageSettings::setVisualDeckStorageInGame(bool enabled)
+{
+    setValue(enabled, "inGame", "interface", "visualDeckStorage");
+    emit visualDeckStorageInGameChanged(enabled);
+}
+
+void VisualDeckStorageSettings::setVisualDeckStorageSelectionAnimation(bool enabled)
+{
+    setValue(enabled, "selectionAnimation", "interface", "visualDeckStorage");
+    emit visualDeckStorageSelectionAnimationChanged(enabled);
+}
+
+void VisualDeckStorageSettings::setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(bool _enabled)
+{
+    setValue(_enabled, "filterToMostRecentSetsEnabled", "interface", "visualDatabaseDisplay");
+    emit visualDatabaseDisplayFilterToMostRecentSetsEnabledChanged(_enabled);
+}
+
+void VisualDeckStorageSettings::setVisualDatabaseDisplayFilterToMostRecentSetsAmount(int _amount)
+{
+    setValue(_amount, "filterToMostRecentSetsAmount", "interface", "visualDatabaseDisplay");
+    emit visualDatabaseDisplayFilterToMostRecentSetsAmountChanged(_amount);
+}
diff --git a/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.h b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.h
new file mode 100644
index 000000000..12b96fd8b
--- /dev/null
+++ b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.h
@@ -0,0 +1,78 @@
+#ifndef VISUAL_DECK_STORAGE_SETTINGS_H
+#define VISUAL_DECK_STORAGE_SETTINGS_H
+
+#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
+{
+    Q_OBJECT
+    friend class SettingsCache;
+
+public:
+    [[nodiscard]] int getVisualDeckStorageSortingOrder() const override;
+    [[nodiscard]] bool getVisualDeckStorageShowFolders() const override;
+    [[nodiscard]] bool getVisualDeckStorageShowTagFilter() const override;
+    [[nodiscard]] QStringList getVisualDeckStorageDefaultTagsList() const override;
+    [[nodiscard]] bool getVisualDeckStorageSearchFolderNames() const override;
+    [[nodiscard]] bool getVisualDeckStorageShowColorIdentity() const override;
+    [[nodiscard]] bool getVisualDeckStorageShowBannerCardComboBox() const override;
+    [[nodiscard]] bool getVisualDeckStorageShowTagsOnDeckPreviews() const override;
+    [[nodiscard]] bool getVisualDeckStorageShowUploadTime() const;
+    [[nodiscard]] bool getVisualDeckStorageDrawUnusedColorIdentities() const override;
+    [[nodiscard]] int getVisualDeckStorageUnusedColorIdentitiesOpacity() const override;
+    [[nodiscard]] int getVisualDeckStorageTooltipType() const override;
+    [[nodiscard]] bool getVisualDeckStoragePromptForConversion() const override;
+    [[nodiscard]] bool getVisualDeckStorageAlwaysConvert() const override;
+    [[nodiscard]] bool getVisualDeckStorageInGame() const override;
+    [[nodiscard]] bool getVisualDeckStorageSelectionAnimation() const override;
+    [[nodiscard]] bool getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const override;
+    [[nodiscard]] int getVisualDatabaseDisplayFilterToMostRecentSetsAmount() const override;
+
+    void setVisualDeckStorageSortingOrder(int _sortingOrder);
+    void setVisualDeckStorageShowFolders(bool value);
+    void setVisualDeckStorageShowTagFilter(bool _showTags);
+    void setVisualDeckStorageDefaultTagsList(QStringList _defaultTagsList);
+    void setVisualDeckStorageSearchFolderNames(bool value);
+    void setVisualDeckStorageShowColorIdentity(bool value);
+    void setVisualDeckStorageShowBannerCardComboBox(bool _showBannerCardComboBox);
+    void setVisualDeckStorageShowTagsOnDeckPreviews(bool _showTags);
+    void setVisualDeckStorageShowUploadTime(bool value);
+    void setVisualDeckStorageDrawUnusedColorIdentities(bool _draw);
+    void setVisualDeckStorageUnusedColorIdentitiesOpacity(int _opacity);
+    void setVisualDeckStorageTooltipType(int value);
+    void setVisualDeckStoragePromptForConversion(bool _prompt);
+    void setVisualDeckStorageAlwaysConvert(bool _always);
+    void setVisualDeckStorageInGame(bool enabled);
+    void setVisualDeckStorageSelectionAnimation(bool enabled);
+    void setVisualDatabaseDisplayFilterToMostRecentSetsEnabled(bool _enabled);
+    void setVisualDatabaseDisplayFilterToMostRecentSetsAmount(int _amount);
+
+signals:
+    void visualDeckStorageShowTagFilterChanged(bool _visible);
+    void visualDeckStorageDefaultTagsListChanged();
+    void visualDeckStorageShowColorIdentityChanged(bool _visible);
+    void visualDeckStorageShowBannerCardComboBoxChanged(bool _visible);
+    void visualDeckStorageShowTagsOnDeckPreviewsChanged(bool _visible);
+    void visualDeckStorageShowUploadTimeChanged(bool _visible);
+    void visualDeckStorageDrawUnusedColorIdentitiesChanged(bool _visible);
+    void visualDeckStorageUnusedColorIdentitiesOpacityChanged(bool value);
+    void visualDeckStorageInGameChanged(bool enabled);
+    void visualDeckStorageSelectionAnimationChanged(bool enabled);
+    void visualDatabaseDisplayFilterToMostRecentSetsEnabledChanged(bool enabled);
+    void visualDatabaseDisplayFilterToMostRecentSetsAmountChanged(int amount);
+
+public:
+    explicit VisualDeckStorageSettings(const QString &settingPath, QObject *parent = nullptr);
+
+private:
+    VisualDeckStorageSettings(const VisualDeckStorageSettings & /*other*/);
+};
+
+#endif // VISUAL_DECK_STORAGE_SETTINGS_H
diff --git a/libcockatrice_utility/CMakeLists.txt b/libcockatrice_utility/CMakeLists.txt
index be07ad2f4..cb71c0635 100644
--- a/libcockatrice_utility/CMakeLists.txt
+++ b/libcockatrice_utility/CMakeLists.txt
@@ -5,26 +5,51 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
-set(UTILITY_SOURCES libcockatrice/utility/expression.cpp libcockatrice/utility/levenshtein.cpp
-                    libcockatrice/utility/passwordhasher.cpp libcockatrice/utility/system_memory_querier.cpp
+set(UTILITY_SOURCES
+    libcockatrice/utility/cryptoutil.cpp
+    libcockatrice/utility/expression.cpp
+    libcockatrice/utility/levenshtein.cpp
+    libcockatrice/utility/passwordhasher.cpp
+    libcockatrice/utility/report_categories.cpp
+    libcockatrice/utility/server_rate_limiter.cpp
+    libcockatrice/utility/system_memory_querier.cpp
+    libcockatrice/utility/translation_loader.cpp
+    libcockatrice/utility/warning_categories.cpp
 )
 
 set(UTILITY_HEADERS
+    libcockatrice/utility/card_ref.h
     libcockatrice/utility/color.h
+    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
+    libcockatrice/utility/report_categories.h
+    libcockatrice/utility/string_limits.h
+    libcockatrice/utility/dice_limits.h
+    libcockatrice/utility/counter_limits.h
+    libcockatrice/utility/clamped_arithmetic.h
+    libcockatrice/utility/zone_names.h
+    libcockatrice/utility/days_years_between.h
+    libcockatrice/utility/server_rate_limiter.h
     libcockatrice/utility/system_memory_querier.h
-    libcockatrice/utility/trice_limits.h
+    libcockatrice/utility/translation_loader.h
+    libcockatrice/utility/warning_categories.h
 )
 
 add_library(libcockatrice_utility STATIC ${UTILITY_SOURCES} ${UTILITY_HEADERS})
 
 target_include_directories(libcockatrice_utility PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-target_link_libraries(libcockatrice_utility PUBLIC libcockatrice_rng ${QT_CORE_MODULE})
+find_package(OpenSSL REQUIRED)
+
+target_link_libraries(libcockatrice_utility PUBLIC libcockatrice_rng OpenSSL::Crypto ${QT_CORE_MODULE})
 
 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/clamped_arithmetic.h b/libcockatrice_utility/libcockatrice/utility/clamped_arithmetic.h
new file mode 100644
index 000000000..1afac758c
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/clamped_arithmetic.h
@@ -0,0 +1,22 @@
+#ifndef CLAMPED_ARITHMETIC_H
+#define CLAMPED_ARITHMETIC_H
+
+#include <QtGlobal>
+#include <cstdint>
+
+/**
+ * @brief Overflow-safe clamped addition: returns value + delta bounded to [minValue, maxValue].
+ *
+ * Uses a 64-bit intermediate so the addition cannot overflow int. Shared by the bounded
+ * counter arithmetic in both the client and the server.
+ *
+ * @note Requires minValue <= maxValue. Bounds come from trusted compile-time call sites;
+ *       qBound() asserts this internally in debug builds.
+ */
+inline int addClamped(int value, int delta, int minValue, int maxValue)
+{
+    const auto result = static_cast<int64_t>(value) + static_cast<int64_t>(delta);
+    return static_cast<int>(qBound(static_cast<int64_t>(minValue), result, static_cast<int64_t>(maxValue)));
+}
+
+#endif // CLAMPED_ARITHMETIC_H
diff --git a/libcockatrice_utility/libcockatrice/utility/color.h b/libcockatrice_utility/libcockatrice/utility/color.h
index 164c6ffd7..6afe984bd 100644
--- a/libcockatrice_utility/libcockatrice/utility/color.h
+++ b/libcockatrice_utility/libcockatrice/utility/color.h
@@ -21,6 +21,74 @@ inline color convertQColorToColor(const QColor &c)
     result.set_b(c.blue());
     return result;
 }
+
+#include <QMap>
+#include <QSet>
+
+namespace GameSpecificColors
+{
+namespace MTG
+{
+inline QColor colorHelper(const QString &name)
+{
+    static const QMap<QString, QColor> colorMap = {
+        {"W", QColor(245, 245, 220)},
+        {"U", QColor(80, 140, 255)},
+        {"B", QColor(60, 60, 60)},
+        {"R", QColor(220, 60, 50)},
+        {"G", QColor(70, 160, 70)},
+        {"Creature", QColor(70, 130, 180)},
+        {"Instant", QColor(138, 43, 226)},
+        {"Sorcery", QColor(199, 21, 133)},
+        {"Enchantment", QColor(218, 165, 32)},
+        {"Artifact", QColor(169, 169, 169)},
+        {"Planeswalker", QColor(210, 105, 30)},
+        {"Land", QColor(110, 80, 50)},
+    };
+
+    if (colorMap.contains(name)) {
+        return colorMap[name];
+    }
+
+    if (name.length() == 1 && colorMap.contains(name.toUpper())) {
+        return colorMap[name.toUpper()];
+    }
+
+    uint h = qHash(name);
+    int r = 100 + (h % 120);
+    int g = 100 + ((h >> 8) % 120);
+    int b = 100 + ((h >> 16) % 120);
+
+    return QColor(r, g, b);
+}
+
+inline QList<QPair<QString, int>> sortManaMapWUBRGCFirst(const QMap<QString, int> &input)
+{
+    static const QStringList priorityOrder = {"W", "U", "B", "R", "G", "C"};
+
+    QList<QPair<QString, int>> result;
+    QSet<QString> consumed;
+
+    // 1. Add priority colors in fixed order
+    for (const QString &key : priorityOrder) {
+        auto it = input.find(key);
+        if (it != input.end()) {
+            result.append({it.key(), it.value()});
+            consumed.insert(it.key());
+        }
+    }
+
+    // 2. Add remaining keys (QMap iteration is already sorted)
+    for (auto it = input.begin(); it != input.end(); ++it) {
+        if (!consumed.contains(it.key())) {
+            result.append({it.key(), it.value()});
+        }
+    }
+
+    return result;
+}
+} // namespace MTG
+} // namespace GameSpecificColors
 #endif
 
 inline color makeColor(int r, int g, int b)
diff --git a/libcockatrice_utility/libcockatrice/utility/counter_limits.h b/libcockatrice_utility/libcockatrice/utility/counter_limits.h
new file mode 100644
index 000000000..1343dbb3f
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/counter_limits.h
@@ -0,0 +1,17 @@
+#ifndef COUNTER_LIMITS_H
+#define COUNTER_LIMITS_H
+
+/**
+ * @brief Upper bound for a bounded counter's value: [0, MAX_COUNTER_VALUE].
+ *
+ * Caps an individual counter's VALUE (e.g. a +1/+1 counter at 999), not how many counters
+ * something holds. Applies to counters that are constrained to a non-negative display range,
+ * such as card counters and commander tax. Unbounded counters (e.g. a player's life total)
+ * do not use this limit and may go negative, saturating only at the int range.
+ *
+ * The max of 999 is a display constraint (3-digit rendering) and a reasonable gameplay limit.
+ * The server enforces these bounds; the client may also check them for UX optimization.
+ */
+constexpr int MAX_COUNTER_VALUE = 999;
+
+#endif // COUNTER_LIMITS_H
diff --git a/libcockatrice_utility/libcockatrice/utility/cryptoutil.cpp b/libcockatrice_utility/libcockatrice/utility/cryptoutil.cpp
new file mode 100644
index 000000000..fb59022de
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/cryptoutil.cpp
@@ -0,0 +1,26 @@
+#include "cryptoutil.h"
+
+#include <openssl/rand.h>
+#include <qlogging.h>
+
+namespace CryptoUtil
+{
+QByteArray randomBytes(int count)
+{
+    QByteArray bytes(count, '\0');
+    if (RAND_bytes(reinterpret_cast<unsigned char *>(bytes.data()), count) != 1) {
+        // Randomness failure is fatal: never fall back to a predictable source.
+        qFatal("CryptoUtil::randomBytes: RAND_bytes failed");
+    }
+    return bytes;
+}
+
+quint64 randomUInt64()
+{
+    quint64 value;
+    if (RAND_bytes(reinterpret_cast<unsigned char *>(&value), sizeof(value)) != 1) {
+        qFatal("CryptoUtil::randomUInt64: RAND_bytes failed");
+    }
+    return value;
+}
+} // namespace CryptoUtil
diff --git a/libcockatrice_utility/libcockatrice/utility/cryptoutil.h b/libcockatrice_utility/libcockatrice/utility/cryptoutil.h
new file mode 100644
index 000000000..dba9dc37d
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/cryptoutil.h
@@ -0,0 +1,13 @@
+#ifndef CRYPTOUTIL_H
+#define CRYPTOUTIL_H
+
+#include <QByteArray>
+#include <QtGlobal>
+
+namespace CryptoUtil
+{
+QByteArray randomBytes(int count);
+quint64 randomUInt64();
+} // namespace CryptoUtil
+
+#endif
diff --git a/libcockatrice_utility/libcockatrice/utility/days_years_between.h b/libcockatrice_utility/libcockatrice/utility/days_years_between.h
new file mode 100644
index 000000000..4b3b5bc0c
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/days_years_between.h
@@ -0,0 +1,13 @@
+#ifndef COCKATRICE_DAYS_YEARS_BETWEEN_H
+#define COCKATRICE_DAYS_YEARS_BETWEEN_H
+
+#include <QDateTime>
+
+inline static QPair<int, int> getDaysAndYearsBetween(const QDate &then, const QDate &now)
+{
+    int years = now.addDays(1 - then.dayOfYear()).year() - then.year(); // there is no yearsTo
+    int days = then.addYears(years).daysTo(now);
+    return {days, years};
+}
+
+#endif // COCKATRICE_DAYS_YEARS_BETWEEN_H
diff --git a/libcockatrice_utility/libcockatrice/utility/dice_limits.h b/libcockatrice_utility/libcockatrice/utility/dice_limits.h
new file mode 100644
index 000000000..e1407c57e
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/dice_limits.h
@@ -0,0 +1,15 @@
+#ifndef DICE_LIMITS_H
+#define DICE_LIMITS_H
+
+#include <QtGlobal> // for uint
+
+/** @brief Fewest sides a rollable die may have. */
+constexpr uint MINIMUM_DIE_SIDES = 2;
+/** @brief Most sides a rollable die may have. */
+constexpr uint MAXIMUM_DIE_SIDES = 1000000;
+/** @brief Fewest dice that may be rolled at once. */
+constexpr uint MINIMUM_DICE_TO_ROLL = 1;
+/** @brief Most dice that may be rolled at once. */
+constexpr uint MAXIMUM_DICE_TO_ROLL = 100;
+
+#endif // DICE_LIMITS_H
diff --git a/libcockatrice_utility/libcockatrice/utility/expression.cpp b/libcockatrice_utility/libcockatrice/utility/expression.cpp
index 3b2e815d1..85d1cdddc 100644
--- a/libcockatrice_utility/libcockatrice/utility/expression.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/expression.cpp
@@ -5,7 +5,12 @@
 #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
@@ -20,7 +25,7 @@ peg::parser math(R"(
 
     NUMBER       <-  < '-'? [0-9]+ >
     NAME         <-  < [a-z][a-z0-9]* >
-    VARIABLE     <-  < [x] >
+    VARIABLE     <-  < [xX] >
     FUNCTION     <-  NAME '(' EXPRESSION ( [,\n] EXPRESSION )* ')'
 
     %whitespace  <-  [ \t\r]*
@@ -54,8 +59,9 @@ double Expression::eval(const peg::Ast &ast)
         return stod(std::string(ast.token));
     } else if (ast.name == "FUNCTION") {
         QString name = QString::fromStdString(std::string(nodes[0]->token));
-        if (!fns.contains(name))
+        if (!fns.contains(name)) {
             return 0;
+        }
         return fns[name](eval(*nodes[1]));
     } else if (ast.name == "VARIABLE") {
         return value;
diff --git a/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp b/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp
index cfb972f91..f7d8459cb 100644
--- a/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/levenshtein.cpp
@@ -1,5 +1,7 @@
 #include "levenshtein.h"
 
+#include <QChar>
+#include <QSharedPointer>
 #include <algorithm>
 #include <vector>
 
@@ -9,10 +11,12 @@ int levenshteinDistance(const QString &s1, const QString &s2)
     int len2 = s2.size();
     std::vector<std::vector<int>> dp(len1 + 1, std::vector<int>(len2 + 1));
 
-    for (int i = 0; i <= len1; i++)
+    for (int i = 0; i <= len1; i++) {
         dp[i][0] = i;
-    for (int j = 0; j <= len2; j++)
+    }
+    for (int j = 0; j <= len2; j++) {
         dp[0][j] = j;
+    }
 
     for (int i = 1; i <= len1; i++) {
         for (int j = 1; j <= len2; j++) {
diff --git a/libcockatrice_utility/libcockatrice/utility/levenshtein.h b/libcockatrice_utility/libcockatrice/utility/levenshtein.h
index e83235470..3da730e53 100644
--- a/libcockatrice_utility/libcockatrice/utility/levenshtein.h
+++ b/libcockatrice_utility/libcockatrice/utility/levenshtein.h
@@ -1,8 +1,8 @@
 /**
  * @file levenshtein.h
  * @ingroup Core
- * @brief TODO: Document this.
  */
+//! \todo Document this file.
 
 #ifndef LEVENSHTEIN_H
 #define LEVENSHTEIN_H
diff --git a/libcockatrice_utility/libcockatrice/utility/local_server_name.h b/libcockatrice_utility/libcockatrice/utility/local_server_name.h
new file mode 100644
index 000000000..a5797fba1
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/local_server_name.h
@@ -0,0 +1,28 @@
+#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 c40c5f94f..b4a412fa6 100644
--- a/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp
+++ b/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp
@@ -1,7 +1,9 @@
 #include "passwordhasher.h"
 
+#include <QByteArray>
+#include <QChar>
 #include <QCryptographicHash>
-#include <libcockatrice/rng/rng_sfmt.h>
+#include <libcockatrice/utility/cryptoutil.h>
 
 QString PasswordHasher::computeHash(const QString &password, const QString &salt)
 {
@@ -21,12 +23,28 @@ QString PasswordHasher::generateRandomSalt(const int len)
     static const char alphanum[] = "0123456789"
                                    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
                                    "abcdefghijklmnopqrstuvwxyz";
+    const int size = sizeof(alphanum) - 1;
+
+    // Two bytes per character, corrected for modulo bias via rejection sampling.
+    const int bucketSize = 65536 / size;
+    const int limit = bucketSize * size;
 
     QString ret;
-    int size = sizeof(alphanum) - 1;
-
+    ret.reserve(len);
+    QByteArray random = CryptoUtil::randomBytes(len * 2);
+    int bytesUsed = 0;
     for (int i = 0; i < len; ++i) {
-        ret.append(alphanum[rng->rand(0, size)]);
+        unsigned int value;
+        do {
+            if (bytesUsed >= random.size()) {
+                random = CryptoUtil::randomBytes(len * 2);
+                bytesUsed = 0;
+            }
+            value = static_cast<unsigned int>(static_cast<unsigned char>(random.at(bytesUsed))) << 8 |
+                    static_cast<unsigned int>(static_cast<unsigned char>(random.at(bytesUsed + 1)));
+            bytesUsed += 2;
+        } while (value >= limit);
+        ret.append(alphanum[value / bucketSize]);
     }
 
     return ret;
@@ -34,5 +52,5 @@ QString PasswordHasher::generateRandomSalt(const int len)
 
 QString PasswordHasher::generateActivationToken()
 {
-    return QCryptographicHash::hash(generateRandomSalt().toUtf8(), QCryptographicHash::Md5).toBase64().left(16);
+    return QString(CryptoUtil::randomBytes(16).toBase64().left(16));
 }
diff --git a/libcockatrice_utility/libcockatrice/utility/passwordhasher.h b/libcockatrice_utility/libcockatrice/utility/passwordhasher.h
index 811ecef15..8ad83f089 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 <QObject>
+#include <QString>
 
 class PasswordHasher
 {
diff --git a/libcockatrice_utility/libcockatrice/utility/peglib.h b/libcockatrice_utility/libcockatrice/utility/peglib.h
index 459fa5a27..a67a86549 100644
--- a/libcockatrice_utility/libcockatrice/utility/peglib.h
+++ b/libcockatrice_utility/libcockatrice/utility/peglib.h
@@ -7,6 +7,9 @@
 
 #pragma once
 
+#define CPPPEGLIB_VERSION "1.16.0"
+#define CPPPEGLIB_VERSION_NUM "0x011000"
+
 /*
  * Configuration
  */
@@ -17,6 +20,7 @@
 
 #include <algorithm>
 #include <any>
+#include <bitset>
 #include <cassert>
 #include <cctype>
 #if __has_include(<charconv>)
@@ -30,11 +34,13 @@
 #include <map>
 #include <memory>
 #include <mutex>
+#include <optional>
 #include <set>
 #include <sstream>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 #if !defined(__cplusplus) || __cplusplus < 201703L
@@ -43,6 +49,8 @@
 
 namespace peg {
 
+struct GrammarBlob;
+
 /*-----------------------------------------------------------------------------
  *  scope_exit
  *---------------------------------------------------------------------------*/
@@ -51,28 +59,28 @@ namespace peg {
 // "http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n4189".
 
 template <typename EF> struct scope_exit {
-    explicit scope_exit(EF &&f)
-        : exit_function(std::move(f)), execute_on_destruction{true} {}
+  explicit scope_exit(EF &&f)
+      : exit_function(std::move(f)), execute_on_destruction{true} {}
 
-    scope_exit(scope_exit &&rhs)
-        : exit_function(std::move(rhs.exit_function)),
-          execute_on_destruction{rhs.execute_on_destruction} {
-        rhs.release();
-    }
+  scope_exit(scope_exit &&rhs)
+      : exit_function(std::move(rhs.exit_function)),
+        execute_on_destruction{rhs.execute_on_destruction} {
+    rhs.release();
+  }
 
-    ~scope_exit() {
-        if (execute_on_destruction) { this->exit_function(); }
-    }
+  ~scope_exit() {
+    if (execute_on_destruction) { this->exit_function(); }
+  }
 
-    void release() { this->execute_on_destruction = false; }
+  void release() { this->execute_on_destruction = false; }
 
 private:
-    scope_exit(const scope_exit &) = delete;
-    void operator=(const scope_exit &) = delete;
-    scope_exit &operator=(scope_exit &&) = delete;
+  scope_exit(const scope_exit &) = delete;
+  void operator=(const scope_exit &) = delete;
+  scope_exit &operator=(scope_exit &&) = delete;
 
-    EF exit_function;
-    bool execute_on_destruction;
+  EF exit_function;
+  bool execute_on_destruction;
 };
 
 /*-----------------------------------------------------------------------------
@@ -80,130 +88,136 @@ private:
  *---------------------------------------------------------------------------*/
 
 inline size_t codepoint_length(const char *s8, size_t l) {
-    if (l) {
-        auto b = static_cast<uint8_t>(s8[0]);
-        if ((b & 0x80) == 0) {
-            return 1;
-        } else if ((b & 0xE0) == 0xC0 && l >= 2) {
-            return 2;
-        } else if ((b & 0xF0) == 0xE0 && l >= 3) {
-            return 3;
-        } else if ((b & 0xF8) == 0xF0 && l >= 4) {
-            return 4;
-        }
+  if (l) {
+    auto b = static_cast<uint8_t>(s8[0]);
+    if ((b & 0x80) == 0) {
+      return 1;
+    } else if ((b & 0xE0) == 0xC0 && l >= 2) {
+      return 2;
+    } else if ((b & 0xF0) == 0xE0 && l >= 3) {
+      return 3;
+    } else if ((b & 0xF8) == 0xF0 && l >= 4) {
+      return 4;
     }
-    return 0;
+  }
+  return 0;
 }
 
 inline size_t codepoint_count(const char *s8, size_t l) {
-    size_t count = 0;
-    for (size_t i = 0; i < l; i += codepoint_length(s8 + i, l - i)) {
-        count++;
+  size_t count = 0;
+  for (size_t i = 0; i < l;) {
+    auto len = codepoint_length(s8 + i, l - i);
+    if (len == 0) {
+      // Invalid UTF-8 byte, treat as single byte to avoid infinite loop
+      len = 1;
     }
-    return count;
+    i += len;
+    count++;
+  }
+  return count;
 }
 
 inline size_t encode_codepoint(char32_t cp, char *buff) {
-    if (cp < 0x0080) {
-        buff[0] = static_cast<char>(cp & 0x7F);
-        return 1;
-    } else if (cp < 0x0800) {
-        buff[0] = static_cast<char>(0xC0 | ((cp >> 6) & 0x1F));
-        buff[1] = static_cast<char>(0x80 | (cp & 0x3F));
-        return 2;
-    } else if (cp < 0xD800) {
-        buff[0] = static_cast<char>(0xE0 | ((cp >> 12) & 0xF));
-        buff[1] = static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
-        buff[2] = static_cast<char>(0x80 | (cp & 0x3F));
-        return 3;
-    } else if (cp < 0xE000) {
-        // D800 - DFFF is invalid...
-        return 0;
-    } else if (cp < 0x10000) {
-        buff[0] = static_cast<char>(0xE0 | ((cp >> 12) & 0xF));
-        buff[1] = static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
-        buff[2] = static_cast<char>(0x80 | (cp & 0x3F));
-        return 3;
-    } else if (cp < 0x110000) {
-        buff[0] = static_cast<char>(0xF0 | ((cp >> 18) & 0x7));
-        buff[1] = static_cast<char>(0x80 | ((cp >> 12) & 0x3F));
-        buff[2] = static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
-        buff[3] = static_cast<char>(0x80 | (cp & 0x3F));
-        return 4;
-    }
+  if (cp < 0x0080) {
+    buff[0] = static_cast<char>(cp & 0x7F);
+    return 1;
+  } else if (cp < 0x0800) {
+    buff[0] = static_cast<char>(0xC0 | ((cp >> 6) & 0x1F));
+    buff[1] = static_cast<char>(0x80 | (cp & 0x3F));
+    return 2;
+  } else if (cp < 0xD800) {
+    buff[0] = static_cast<char>(0xE0 | ((cp >> 12) & 0xF));
+    buff[1] = static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
+    buff[2] = static_cast<char>(0x80 | (cp & 0x3F));
+    return 3;
+  } else if (cp < 0xE000) {
+    // D800 - DFFF is invalid...
     return 0;
+  } else if (cp < 0x10000) {
+    buff[0] = static_cast<char>(0xE0 | ((cp >> 12) & 0xF));
+    buff[1] = static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
+    buff[2] = static_cast<char>(0x80 | (cp & 0x3F));
+    return 3;
+  } else if (cp < 0x110000) {
+    buff[0] = static_cast<char>(0xF0 | ((cp >> 18) & 0x7));
+    buff[1] = static_cast<char>(0x80 | ((cp >> 12) & 0x3F));
+    buff[2] = static_cast<char>(0x80 | ((cp >> 6) & 0x3F));
+    buff[3] = static_cast<char>(0x80 | (cp & 0x3F));
+    return 4;
+  }
+  return 0;
 }
 
 inline std::string encode_codepoint(char32_t cp) {
-    char buff[4];
-    auto l = encode_codepoint(cp, buff);
-    return std::string(buff, l);
+  char buff[4];
+  auto l = encode_codepoint(cp, buff);
+  return std::string(buff, l);
 }
 
 inline bool decode_codepoint(const char *s8, size_t l, size_t &bytes,
                              char32_t &cp) {
-    if (l) {
-        auto b = static_cast<uint8_t>(s8[0]);
-        if ((b & 0x80) == 0) {
-            bytes = 1;
-            cp = b;
-            return true;
-        } else if ((b & 0xE0) == 0xC0) {
-            if (l >= 2) {
-                bytes = 2;
-                cp = ((static_cast<char32_t>(s8[0] & 0x1F)) << 6) |
-                     (static_cast<char32_t>(s8[1] & 0x3F));
-                return true;
-            }
-        } else if ((b & 0xF0) == 0xE0) {
-            if (l >= 3) {
-                bytes = 3;
-                cp = ((static_cast<char32_t>(s8[0] & 0x0F)) << 12) |
-                     ((static_cast<char32_t>(s8[1] & 0x3F)) << 6) |
-                     (static_cast<char32_t>(s8[2] & 0x3F));
-                return true;
-            }
-        } else if ((b & 0xF8) == 0xF0) {
-            if (l >= 4) {
-                bytes = 4;
-                cp = ((static_cast<char32_t>(s8[0] & 0x07)) << 18) |
-                     ((static_cast<char32_t>(s8[1] & 0x3F)) << 12) |
-                     ((static_cast<char32_t>(s8[2] & 0x3F)) << 6) |
-                     (static_cast<char32_t>(s8[3] & 0x3F));
-                return true;
-            }
-        }
+  if (l) {
+    auto b = static_cast<uint8_t>(s8[0]);
+    if ((b & 0x80) == 0) {
+      bytes = 1;
+      cp = b;
+      return true;
+    } else if ((b & 0xE0) == 0xC0) {
+      if (l >= 2) {
+        bytes = 2;
+        cp = ((static_cast<char32_t>(s8[0] & 0x1F)) << 6) |
+             (static_cast<char32_t>(s8[1] & 0x3F));
+        return true;
+      }
+    } else if ((b & 0xF0) == 0xE0) {
+      if (l >= 3) {
+        bytes = 3;
+        cp = ((static_cast<char32_t>(s8[0] & 0x0F)) << 12) |
+             ((static_cast<char32_t>(s8[1] & 0x3F)) << 6) |
+             (static_cast<char32_t>(s8[2] & 0x3F));
+        return true;
+      }
+    } else if ((b & 0xF8) == 0xF0) {
+      if (l >= 4) {
+        bytes = 4;
+        cp = ((static_cast<char32_t>(s8[0] & 0x07)) << 18) |
+             ((static_cast<char32_t>(s8[1] & 0x3F)) << 12) |
+             ((static_cast<char32_t>(s8[2] & 0x3F)) << 6) |
+             (static_cast<char32_t>(s8[3] & 0x3F));
+        return true;
+      }
     }
-    return false;
+  }
+  return false;
 }
 
 inline size_t decode_codepoint(const char *s8, size_t l, char32_t &cp) {
-    size_t bytes;
-    if (decode_codepoint(s8, l, bytes, cp)) { return bytes; }
-    return 0;
+  size_t bytes;
+  if (decode_codepoint(s8, l, bytes, cp)) { return bytes; }
+  return 0;
 }
 
 inline char32_t decode_codepoint(const char *s8, size_t l) {
-    char32_t cp = 0;
-    decode_codepoint(s8, l, cp);
-    return cp;
+  char32_t cp = 0;
+  decode_codepoint(s8, l, cp);
+  return cp;
 }
 
 inline std::u32string decode(const char *s8, size_t l) {
-    std::u32string out;
-    size_t i = 0;
-    while (i < l) {
-        auto beg = i++;
-        while (i < l && (s8[i] & 0xc0) == 0x80) {
-            i++;
-        }
-        out += decode_codepoint(&s8[beg], (i - beg));
+  std::u32string out;
+  size_t i = 0;
+  while (i < l) {
+    auto beg = i++;
+    while (i < l && (s8[i] & 0xc0) == 0x80) {
+      i++;
     }
-    return out;
+    out += decode_codepoint(&s8[beg], (i - beg));
+  }
+  return out;
 }
 
 template <typename T> const char *u8(const T *s) {
-    return reinterpret_cast<const char *>(s);
+  return reinterpret_cast<const char *>(s);
 }
 
 /*-----------------------------------------------------------------------------
@@ -211,23 +225,23 @@ template <typename T> const char *u8(const T *s) {
  *---------------------------------------------------------------------------*/
 
 inline std::string escape_characters(const char *s, size_t n) {
-    std::string str;
-    for (size_t i = 0; i < n; i++) {
-        auto c = s[i];
-        switch (c) {
-            case '\f': str += "\\f"; break;
-            case '\n': str += "\\n"; break;
-            case '\r': str += "\\r"; break;
-            case '\t': str += "\\t"; break;
-            case '\v': str += "\\v"; break;
-            default: str += c; break;
-        }
+  std::string str;
+  for (size_t i = 0; i < n; i++) {
+    auto c = s[i];
+    switch (c) {
+    case '\f': str += "\\f"; break;
+    case '\n': str += "\\n"; break;
+    case '\r': str += "\\r"; break;
+    case '\t': str += "\\t"; break;
+    case '\v': str += "\\v"; break;
+    default: str += c; break;
     }
-    return str;
+  }
+  return str;
 }
 
 inline std::string escape_characters(std::string_view sv) {
-    return escape_characters(sv.data(), sv.size());
+  return escape_characters(sv.data(), sv.size());
 }
 
 /*-----------------------------------------------------------------------------
@@ -235,120 +249,169 @@ inline std::string escape_characters(std::string_view sv) {
  *---------------------------------------------------------------------------*/
 
 inline bool is_hex(char c, int &v) {
-    if ('0' <= c && c <= '9') {
-        v = c - '0';
-        return true;
-    } else if ('a' <= c && c <= 'f') {
-        v = c - 'a' + 10;
-        return true;
-    } else if ('A' <= c && c <= 'F') {
-        v = c - 'A' + 10;
-        return true;
-    }
-    return false;
+  if ('0' <= c && c <= '9') {
+    v = c - '0';
+    return true;
+  } else if ('a' <= c && c <= 'f') {
+    v = c - 'a' + 10;
+    return true;
+  } else if ('A' <= c && c <= 'F') {
+    v = c - 'A' + 10;
+    return true;
+  }
+  return false;
 }
 
 inline bool is_digit(char c, int &v) {
-    if ('0' <= c && c <= '9') {
-        v = c - '0';
-        return true;
-    }
-    return false;
+  if ('0' <= c && c <= '9') {
+    v = c - '0';
+    return true;
+  }
+  return false;
 }
 
 inline std::pair<int, size_t> parse_hex_number(const char *s, size_t n,
                                                size_t i) {
-    int ret = 0;
-    int val;
-    while (i < n && is_hex(s[i], val)) {
-        ret = static_cast<int>(ret * 16 + val);
-        i++;
-    }
-    return std::pair(ret, i);
+  int ret = 0;
+  int val;
+  while (i < n && is_hex(s[i], val)) {
+    ret = static_cast<int>(ret * 16 + val);
+    i++;
+  }
+  return std::pair(ret, i);
 }
 
 inline std::pair<int, size_t> parse_octal_number(const char *s, size_t n,
                                                  size_t i) {
-    int ret = 0;
-    int val;
-    while (i < n && is_digit(s[i], val)) {
-        ret = static_cast<int>(ret * 8 + val);
-        i++;
-    }
-    return std::pair(ret, i);
+  int ret = 0;
+  int val;
+  while (i < n && is_digit(s[i], val)) {
+    ret = static_cast<int>(ret * 8 + val);
+    i++;
+  }
+  return std::pair(ret, i);
 }
 
 inline std::string resolve_escape_sequence(const char *s, size_t n) {
-    std::string r;
-    r.reserve(n);
+  std::string r;
+  r.reserve(n);
 
-    size_t i = 0;
-    while (i < n) {
-        auto ch = s[i];
-        if (ch == '\\') {
-            i++;
-            if (i == n) { throw std::runtime_error("Invalid escape sequence..."); }
-            switch (s[i]) {
-                case 'f':
-                    r += '\f';
-                    i++;
-                    break;
-                case 'n':
-                    r += '\n';
-                    i++;
-                    break;
-                case 'r':
-                    r += '\r';
-                    i++;
-                    break;
-                case 't':
-                    r += '\t';
-                    i++;
-                    break;
-                case 'v':
-                    r += '\v';
-                    i++;
-                    break;
-                case '\'':
-                    r += '\'';
-                    i++;
-                    break;
-                case '"':
-                    r += '"';
-                    i++;
-                    break;
-                case '[':
-                    r += '[';
-                    i++;
-                    break;
-                case ']':
-                    r += ']';
-                    i++;
-                    break;
-                case '\\':
-                    r += '\\';
-                    i++;
-                    break;
-                case 'x':
-                case 'u': {
-                    char32_t cp;
-                    std::tie(cp, i) = parse_hex_number(s, n, i + 1);
-                    r += encode_codepoint(cp);
-                    break;
-                }
-                default: {
-                    char32_t cp;
-                    std::tie(cp, i) = parse_octal_number(s, n, i);
-                    r += encode_codepoint(cp);
-                    break;
-                }
-            }
-        } else {
-            r += ch;
-            i++;
-        }
+  size_t i = 0;
+  while (i < n) {
+    auto ch = s[i];
+    if (ch == '\\') {
+      i++;
+      assert(i < n);
+
+      switch (s[i]) {
+      case 'f':
+        r += '\f';
+        i++;
+        break;
+      case 'n':
+        r += '\n';
+        i++;
+        break;
+      case 'r':
+        r += '\r';
+        i++;
+        break;
+      case 't':
+        r += '\t';
+        i++;
+        break;
+      case 'v':
+        r += '\v';
+        i++;
+        break;
+      case '\'':
+        r += '\'';
+        i++;
+        break;
+      case '"':
+        r += '"';
+        i++;
+        break;
+      case '[':
+        r += '[';
+        i++;
+        break;
+      case ']':
+        r += ']';
+        i++;
+        break;
+      case '^':
+        r += '^';
+        i++;
+        break;
+      case '-':
+        r += '-';
+        i++;
+        break;
+      case '\\':
+        r += '\\';
+        i++;
+        break;
+      case 'x':
+      case 'u': {
+        char32_t cp;
+        std::tie(cp, i) = parse_hex_number(s, n, i + 1);
+        r += encode_codepoint(cp);
+        break;
+      }
+      default: {
+        char32_t cp;
+        std::tie(cp, i) = parse_octal_number(s, n, i);
+        r += encode_codepoint(cp);
+        break;
+      }
+      }
+    } else {
+      r += ch;
+      i++;
     }
-    return r;
+  }
+  return r;
+}
+
+/*
+ * Predefined character classes (ASCII semantics)
+ */
+inline const std::vector<std::pair<char32_t, char32_t>> *
+predefined_character_class(std::string_view name) {
+  static const std::map<std::string_view,
+                        std::vector<std::pair<char32_t, char32_t>>>
+      table = {
+          {"alnum", {{'0', '9'}, {'A', 'Z'}, {'a', 'z'}}},
+          {"alpha", {{'A', 'Z'}, {'a', 'z'}}},
+          {"ascii", {{0x00, 0x7F}}},
+          {"blank", {{'\t', '\t'}, {' ', ' '}}},
+          {"cntrl", {{0x00, 0x1F}, {0x7F, 0x7F}}},
+          {"digit", {{'0', '9'}}},
+          {"graph", {{0x21, 0x7E}}},
+          {"lower", {{'a', 'z'}}},
+          {"print", {{0x20, 0x7E}}},
+          {"punct", {{0x21, 0x2F}, {0x3A, 0x40}, {0x5B, 0x60}, {0x7B, 0x7E}}},
+          {"space", {{'\t', '\r'}, {' ', ' '}}},
+          {"upper", {{'A', 'Z'}}},
+          {"word", {{'0', '9'}, {'A', 'Z'}, {'_', '_'}, {'a', 'z'}}},
+          {"xdigit", {{'0', '9'}, {'A', 'F'}, {'a', 'f'}}},
+      };
+  auto it = table.find(name);
+  return it != table.end() ? &it->second : nullptr;
+}
+
+// Ranges must be sorted and non-overlapping.
+inline std::vector<std::pair<char32_t, char32_t>> complement_character_ranges(
+    const std::vector<std::pair<char32_t, char32_t>> &ranges) {
+  std::vector<std::pair<char32_t, char32_t>> r;
+  char32_t next = 0;
+  for (const auto &[lo, hi] : ranges) {
+    if (lo > next) { r.emplace_back(next, lo - 1); }
+    next = hi + 1;
+  }
+  if (next <= 0x10FFFF) { r.emplace_back(next, 0x10FFFF); }
+  return r;
 }
 
 /*-----------------------------------------------------------------------------
@@ -356,19 +419,26 @@ inline std::string resolve_escape_sequence(const char *s, size_t n) {
  *---------------------------------------------------------------------------*/
 
 template <typename T> T token_to_number_(std::string_view sv) {
-    T n = 0;
+  T n = 0;
 #if __has_include(<charconv>)
-    if constexpr (!std::is_floating_point<T>::value) {
-        std::from_chars(sv.data(), sv.data() + sv.size(), n);
+  if constexpr (!std::is_floating_point<T>::value) {
+    std::from_chars(sv.data(), sv.data() + sv.size(), n);
 #else
-    if constexpr (false) {
+  if constexpr (false) {
 #endif
-    } else {
-        auto s = std::string(sv);
-        std::istringstream ss(s);
-        ss >> n;
-    }
-    return n;
+  } else {
+    auto s = std::string(sv);
+    std::istringstream ss(s);
+    ss >> n;
+  }
+  return n;
+}
+
+inline std::string to_lower(std::string s) {
+  for (auto &c : s) {
+    c = static_cast<char>(std::tolower(static_cast<unsigned char>(c)));
+  }
+  return s;
 }
 
 /*-----------------------------------------------------------------------------
@@ -377,75 +447,76 @@ template <typename T> T token_to_number_(std::string_view sv) {
 
 class Trie {
 public:
-    Trie(const std::vector<std::string> &items, bool ignore_case)
-        : ignore_case_(ignore_case) {
-        size_t id = 0;
-        for (const auto &item : items) {
-            const auto &s = ignore_case ? to_lower(item) : item;
-            for (size_t len = 1; len <= item.size(); len++) {
-                auto last = len == item.size();
-                std::string_view sv(s.data(), len);
-                auto it = dic_.find(sv);
-                if (it == dic_.end()) {
-                    dic_.emplace(sv, Info{last, last, id});
-                } else if (last) {
-                    it->second.match = true;
-                } else {
-                    it->second.done = false;
-                }
-            }
-            id++;
+  Trie(const std::vector<std::string> &items, bool ignore_case)
+      : ignore_case_(ignore_case), items_count_(items.size()) {
+    size_t id = 0;
+    for (const auto &item : items) {
+      const auto &s = ignore_case ? to_lower(item) : item;
+      if (item.size() > max_len_) { max_len_ = item.size(); }
+      for (size_t len = 1; len <= item.size(); len++) {
+        auto last = len == item.size();
+        std::string_view sv(s.data(), len);
+        auto it = dic_.find(sv);
+        if (it == dic_.end()) {
+          dic_.emplace(sv, Info{last, last, id});
+        } else if (last) {
+          it->second.match = true;
+        } else {
+          it->second.done = false;
         }
+      }
+      id++;
+    }
+  }
+
+  size_t match(const char *text, size_t text_len, size_t &id) const {
+    auto limit = std::min(text_len, max_len_);
+    std::string lower_text;
+    if (ignore_case_) {
+      lower_text = to_lower(std::string(text, limit));
+      text = lower_text.data();
     }
 
-    size_t match(const char *text, size_t text_len, size_t &id) const {
-        std::string lower_text;
-        if (ignore_case_) {
-            lower_text = to_lower(text);
-            text = lower_text.data();
+    size_t match_len = 0;
+    auto done = false;
+    size_t len = 1;
+    while (!done && len <= limit) {
+      std::string_view sv(text, len);
+      auto it = dic_.find(sv);
+      if (it == dic_.end()) {
+        done = true;
+      } else {
+        if (it->second.match) {
+          match_len = len;
+          id = it->second.id;
         }
-
-        size_t match_len = 0;
-        auto done = false;
-        size_t len = 1;
-        while (!done && len <= text_len) {
-            std::string_view sv(text, len);
-            auto it = dic_.find(sv);
-            if (it == dic_.end()) {
-                done = true;
-            } else {
-                if (it->second.match) {
-                    match_len = len;
-                    id = it->second.id;
-                }
-                if (it->second.done) { done = true; }
-            }
-            len += 1;
-        }
-        return match_len;
+        if (it->second.done) { done = true; }
+      }
+      len += 1;
     }
+    return match_len;
+  }
 
-    size_t size() const { return dic_.size(); }
+  size_t size() const { return dic_.size(); }
+  size_t items_count() const { return items_count_; }
+
+  friend struct ComputeFirstSet;
+  friend struct GrammarBlob;
 
 private:
-    std::string to_lower(std::string s) const {
-        for (char &c : s) {
-            c = std::tolower(c);
-        }
-        return s;
-    }
+  struct Info {
+    bool done;
+    bool match;
+    size_t id;
+  };
 
-    struct Info {
-        bool done;
-        bool match;
-        size_t id;
-    };
+  // TODO: Use unordered_map when heterogeneous lookup is supported in C++20
+  // std::unordered_map<std::string, Info> dic_;
+  std::map<std::string, Info, std::less<>> dic_;
 
-    // TODO: Use unordered_map when heterogeneous lookup is supported in C++20
-    // std::unordered_map<std::string, Info> dic_;
-    std::map<std::string, Info, std::less<>> dic_;
-
-    bool ignore_case_;
+  bool ignore_case_;
+  size_t items_count_;
+  size_t max_len_ = 0;
 };
 
 /*-----------------------------------------------------------------------------
@@ -456,21 +527,21 @@ private:
  * Line information utility function
  */
 inline std::pair<size_t, size_t> line_info(const char *start, const char *cur) {
-    auto p = start;
-    auto col_ptr = p;
-    auto no = 1;
+  auto p = start;
+  auto col_ptr = p;
+  auto no = 1;
 
-    while (p < cur) {
-        if (*p == '\n') {
-            no++;
-            col_ptr = p + 1;
-        }
-        p++;
+  while (p < cur) {
+    if (*p == '\n') {
+      no++;
+      col_ptr = p + 1;
     }
+    p++;
+  }
 
-    auto col = codepoint_count(col_ptr, p - col_ptr) + 1;
+  auto col = codepoint_count(col_ptr, p - col_ptr) + 1;
 
-    return std::pair(no, col);
+  return std::pair(no, col);
 }
 
 /*
@@ -478,19 +549,19 @@ inline std::pair<size_t, size_t> line_info(const char *start, const char *cur) {
  */
 inline constexpr unsigned int str2tag_core(const char *s, size_t l,
                                            unsigned int h) {
-    return (l == 0) ? h
-                    : str2tag_core(s + 1, l - 1,
-                                   (h * 33) ^ static_cast<unsigned char>(*s));
+  return (l == 0) ? h
+                  : str2tag_core(s + 1, l - 1,
+                                 (h * 33) ^ static_cast<unsigned char>(*s));
 }
 
 inline constexpr unsigned int str2tag(std::string_view sv) {
-    return str2tag_core(sv.data(), sv.size(), 0);
+  return str2tag_core(sv.data(), sv.size(), 0);
 }
 
 namespace udl {
 
-inline constexpr unsigned int operator"" _(const char *s, size_t l) {
-    return str2tag_core(s, l, 0);
+inline constexpr unsigned int operator""_(const char *s, size_t l) {
+  return str2tag_core(s, l, 0);
 }
 
 } // namespace udl
@@ -501,126 +572,113 @@ inline constexpr unsigned int operator"" _(const char *s, size_t l) {
 class Context;
 
 struct SemanticValues : protected std::vector<std::any> {
-    SemanticValues() = default;
-    SemanticValues(Context *c) : c_(c) {}
+  SemanticValues() = default;
+  SemanticValues(Context *c) : c_(c) {}
 
-    // Input text
-    const char *path = nullptr;
-    const char *ss = nullptr;
+  // Input text
+  const char *path = nullptr;
+  const char *ss = nullptr;
 
-    // Matched string
-    std::string_view sv() const { return sv_; }
+  // Matched string
+  std::string_view sv() const { return sv_; }
 
-    // Definition name
-    const std::string &name() const { return name_; }
+  // Definition name
+  const std::string &name() const { return name_; }
 
-    std::vector<unsigned int> tags;
+  std::vector<unsigned int> tags;
 
-    // Line number and column at which the matched string is
-    std::pair<size_t, size_t> line_info() const;
+  // Line number and column at which the matched string is
+  std::pair<size_t, size_t> line_info() const;
 
-    // Choice count
-    size_t choice_count() const { return choice_count_; }
+  // Choice count
+  size_t choice_count() const { return choice_count_; }
 
-    // Choice number (0 based index)
-    size_t choice() const { return choice_; }
+  // Choice number (0 based index)
+  size_t choice() const { return choice_; }
 
-    // Tokens
-    std::vector<std::string_view> tokens;
+  // Tokens
+  std::vector<std::string_view> tokens;
 
-    std::string_view token(size_t id = 0) const {
-        if (tokens.empty()) { return sv_; }
-        assert(id < tokens.size());
-        return tokens[id];
+  std::string_view token(size_t id = 0) const {
+    if (tokens.empty()) { return sv_; }
+    assert(id < tokens.size());
+    return tokens[id];
+  }
+
+  // Token conversion
+  std::string token_to_string(size_t id = 0) const {
+    return std::string(token(id));
+  }
+
+  template <typename T> T token_to_number() const {
+    return token_to_number_<T>(token());
+  }
+
+  // Transform the semantic value vector to another vector
+  template <typename T>
+  std::vector<T> transform(size_t beg = 0,
+                           size_t end = static_cast<size_t>(-1)) const {
+    std::vector<T> r;
+    end = (std::min)(end, size());
+    for (size_t i = beg; i < end; i++) {
+      r.emplace_back(std::any_cast<T>((*this)[i]));
     }
+    return r;
+  }
 
-    // Token conversion
-    std::string token_to_string(size_t id = 0) const {
-        return std::string(token(id));
-    }
-
-    template <typename T> T token_to_number() const {
-        return token_to_number_<T>(token());
-    }
-
-    // Transform the semantic value vector to another vector
-    template <typename T>
-    std::vector<T> transform(size_t beg = 0,
-                             size_t end = static_cast<size_t>(-1)) const {
-        std::vector<T> r;
-        end = (std::min)(end, size());
-        for (size_t i = beg; i < end; i++) {
-            r.emplace_back(std::any_cast<T>((*this)[i]));
-        }
-        return r;
-    }
-
-    void append(SemanticValues &chvs) {
-        sv_ = chvs.sv_;
-        for (auto &v : chvs) {
-            emplace_back(std::move(v));
-        }
-        for (auto &tag : chvs.tags) {
-            tags.emplace_back(std::move(tag));
-        }
-        for (auto &tok : chvs.tokens) {
-            tokens.emplace_back(std::move(tok));
-        }
-    }
-
-    using std::vector<std::any>::iterator;
-    using std::vector<std::any>::const_iterator;
-    using std::vector<std::any>::size;
-    using std::vector<std::any>::empty;
-    using std::vector<std::any>::assign;
-    using std::vector<std::any>::begin;
-    using std::vector<std::any>::end;
-    using std::vector<std::any>::rbegin;
-    using std::vector<std::any>::rend;
-    using std::vector<std::any>::operator[];
-    using std::vector<std::any>::at;
-    using std::vector<std::any>::resize;
-    using std::vector<std::any>::front;
-    using std::vector<std::any>::back;
-    using std::vector<std::any>::push_back;
-    using std::vector<std::any>::pop_back;
-    using std::vector<std::any>::insert;
-    using std::vector<std::any>::erase;
-    using std::vector<std::any>::clear;
-    using std::vector<std::any>::swap;
-    using std::vector<std::any>::emplace;
-    using std::vector<std::any>::emplace_back;
+  using std::vector<std::any>::iterator;
+  using std::vector<std::any>::const_iterator;
+  using std::vector<std::any>::size;
+  using std::vector<std::any>::empty;
+  using std::vector<std::any>::assign;
+  using std::vector<std::any>::begin;
+  using std::vector<std::any>::end;
+  using std::vector<std::any>::rbegin;
+  using std::vector<std::any>::rend;
+  using std::vector<std::any>::operator[];
+  using std::vector<std::any>::at;
+  using std::vector<std::any>::resize;
+  using std::vector<std::any>::front;
+  using std::vector<std::any>::back;
+  using std::vector<std::any>::push_back;
+  using std::vector<std::any>::pop_back;
+  using std::vector<std::any>::insert;
+  using std::vector<std::any>::erase;
+  using std::vector<std::any>::clear;
+  using std::vector<std::any>::swap;
+  using std::vector<std::any>::emplace;
+  using std::vector<std::any>::emplace_back;
 
 private:
-    friend class Context;
-    friend class Dictionary;
-    friend class Sequence;
-    friend class PrioritizedChoice;
-    friend class Repetition;
-    friend class Holder;
-    friend class PrecedenceClimbing;
+  friend class Context;
+  friend class Dictionary;
+  friend class Sequence;
+  friend class PrioritizedChoice;
+  friend class Repetition;
+  friend class Holder;
+  friend class PrecedenceClimbing;
 
-    Context *c_ = nullptr;
-    std::string_view sv_;
-    size_t choice_count_ = 0;
-    size_t choice_ = 0;
-    std::string name_;
+  Context *c_ = nullptr;
+  std::string_view sv_;
+  size_t choice_count_ = 0;
+  size_t choice_ = 0;
+  std::string name_;
 };
 
 /*
  * Semantic action
  */
 template <typename F, typename... Args> std::any call(F fn, Args &&...args) {
-    using R = decltype(fn(std::forward<Args>(args)...));
-    if constexpr (std::is_void<R>::value) {
-        fn(std::forward<Args>(args)...);
-        return std::any();
-    } else if constexpr (std::is_same<typename std::remove_cv<R>::type,
-                                      std::any>::value) {
-        return fn(std::forward<Args>(args)...);
-    } else {
-        return std::any(fn(std::forward<Args>(args)...));
-    }
+  using R = decltype(fn(std::forward<Args>(args)...));
+  if constexpr (std::is_void<R>::value) {
+    fn(std::forward<Args>(args)...);
+    return std::any();
+  } else if constexpr (std::is_same<typename std::remove_cv<R>::type,
+                                    std::any>::value) {
+    return fn(std::forward<Args>(args)...);
+  } else {
+    return std::any(fn(std::forward<Args>(args)...));
+  }
 }
 
 template <typename T>
@@ -637,30 +695,74 @@ struct argument_count<R (C::*)(Args...) const>
 
 class Action {
 public:
-    Action() = default;
-    Action(Action &&rhs) = default;
-    template <typename F> Action(F fn) : fn_(make_adaptor(fn)) {}
-    template <typename F> void operator=(F fn) { fn_ = make_adaptor(fn); }
-    Action &operator=(const Action &rhs) = default;
+  Action() = default;
+  Action(Action &&rhs) = default;
+  template <typename F> Action(F fn) : fn_(make_adaptor(fn)) {}
+  template <typename F> void operator=(F fn) { fn_ = make_adaptor(fn); }
+  Action &operator=(const Action &rhs) = default;
 
-    operator bool() const { return bool(fn_); }
+  operator bool() const { return bool(fn_); }
 
-    std::any operator()(SemanticValues &vs, std::any &dt) const {
-        return fn_(vs, dt);
-    }
+  std::any operator()(SemanticValues &vs, std::any &dt,
+                      const std::any &predicate_data) const {
+    return fn_(vs, dt, predicate_data);
+  }
 
 private:
-    using Fty = std::function<std::any(SemanticValues &vs, std::any &dt)>;
+  using Fty = std::function<std::any(SemanticValues &vs, std::any &dt,
+                                     const std::any &predicate_data)>;
 
-    template <typename F> Fty make_adaptor(F fn) {
-        if constexpr (argument_count<F>::value == 1) {
-            return [fn](auto &vs, auto & /*dt*/) { return call(fn, vs); };
-        } else {
-            return [fn](auto &vs, auto &dt) { return call(fn, vs, dt); };
-        }
+  template <typename F> Fty make_adaptor(F fn) {
+    if constexpr (argument_count<F>::value == 1) {
+      return [fn](auto &vs, auto & /*dt*/, const auto & /*predicate_data*/) {
+        return call(fn, vs);
+      };
+    } else if constexpr (argument_count<F>::value == 2) {
+      return [fn](auto &vs, auto &dt, const auto & /*predicate_data*/) {
+        return call(fn, vs, dt);
+      };
+    } else {
+      return [fn](auto &vs, auto &dt, const auto &predicate_data) {
+        return call(fn, vs, dt, predicate_data);
+      };
     }
+  }
 
-    Fty fn_;
+  Fty fn_;
+};
+
+class Predicate {
+public:
+  Predicate() = default;
+  Predicate(Predicate &&rhs) = default;
+  template <typename F> Predicate(F fn) : fn_(make_adaptor(fn)) {}
+  template <typename F> void operator=(F fn) { fn_ = make_adaptor(fn); }
+  Predicate &operator=(const Predicate &rhs) = default;
+
+  operator bool() const { return bool(fn_); }
+
+  bool operator()(const SemanticValues &vs, const std::any &dt,
+                  std::string &msg, std::any &predicate_data) const {
+    return fn_(vs, dt, msg, predicate_data);
+  }
+
+private:
+  using Fty = std::function<bool(const SemanticValues &vs, const std::any &dt,
+                                 std::string &msg, std::any &predicate_data)>;
+
+  template <typename F> Fty make_adaptor(F fn) {
+    if constexpr (argument_count<F>::value == 3) {
+      return [fn](const auto &vs, const auto &dt, auto &msg,
+                  auto & /*predicate_data*/) { return fn(vs, dt, msg); };
+    } else {
+      return [fn](const auto &vs, const auto &dt, auto &msg,
+                  auto &predicate_data) {
+        return fn(vs, dt, msg, predicate_data);
+      };
+    }
+  }
+
+  Fty fn_;
 };
 
 /*
@@ -676,73 +778,96 @@ inline bool fail(size_t len) { return len == static_cast<size_t>(-1); }
 using Log = std::function<void(size_t line, size_t col, const std::string &msg,
                                const std::string &rule)>;
 
+/*
+ * ErrorReport - structured error information passed to an ErrorReporter.
+ * Unlike Log, nothing is flattened into a display string, so applications
+ * can map errors to their own error types, localize messages, or feed
+ * diagnostics to IDEs.
+ */
+struct ErrorReport {
+  size_t line = 0;              // 1-based
+  size_t col = 1;               // 1-based
+  size_t position = 0;          // byte offset in the input
+  std::string unexpected_token; // heuristic token at the error position
+  std::vector<std::string> expected_literals;
+  std::vector<std::string> expected_rules; // rules starting with '_' excluded
+  std::string message; // custom error_message if any (placeholders resolved)
+  std::string label;   // rule name or recovery label the error belongs to
+};
+
+using ErrorReporter = std::function<void(const ErrorReport &report)>;
+
 /*
  * ErrorInfo
  */
 class Definition;
 
 struct ErrorInfo {
-    const char *error_pos = nullptr;
-    std::vector<std::pair<const char *, const Definition *>> expected_tokens;
-    const char *message_pos = nullptr;
-    std::string message;
-    std::string label;
-    const char *last_output_pos = nullptr;
-    bool keep_previous_token = false;
+  const char *error_pos = nullptr;
+  std::vector<std::pair<const char *, const Definition *>> expected_tokens;
+  const char *message_pos = nullptr;
+  std::string message;
+  std::string label;
+  const char *last_output_pos = nullptr;
+  bool keep_previous_token = false;
 
-    void clear() {
-        error_pos = nullptr;
-        expected_tokens.clear();
-        message_pos = nullptr;
-        message.clear();
+  void clear() {
+    error_pos = nullptr;
+    expected_tokens.clear();
+    message_pos = nullptr;
+    message.clear();
+  }
+
+  void add(const char *error_literal, const Definition *error_rule) {
+    for (const auto &[t, r] : expected_tokens) {
+      if (t == error_literal && r == error_rule) { return; }
     }
+    expected_tokens.emplace_back(error_literal, error_rule);
+  }
 
-    void add(const char *error_literal, const Definition *error_rule) {
-        for (const auto &[t, r] : expected_tokens) {
-            if (t == error_literal && r == error_rule) { return; }
-        }
-        expected_tokens.emplace_back(error_literal, error_rule);
-    }
-
-    void output_log(const Log &log, const char *s, size_t n);
+  void output_log(const Log &log, const char *s, size_t n) {
+    output_log(log, nullptr, s, n);
+  }
+  void output_log(const Log &log, const ErrorReporter &reporter, const char *s,
+                  size_t n);
 
 private:
-    int cast_char(char c) const { return static_cast<unsigned char>(c); }
+  int cast_char(char c) const { return static_cast<unsigned char>(c); }
 
-    std::string heuristic_error_token(const char *s, size_t n,
-                                      const char *pos) const {
-        auto len = n - std::distance(s, pos);
-        if (len) {
-            size_t i = 0;
-            auto c = cast_char(pos[i++]);
-            if (!std::ispunct(c) && !std::isspace(c)) {
-                while (i < len && !std::ispunct(cast_char(pos[i])) &&
-                       !std::isspace(cast_char(pos[i]))) {
-                    i++;
-                }
-            }
-
-            size_t count = CPPPEGLIB_HEURISTIC_ERROR_TOKEN_MAX_CHAR_COUNT;
-            size_t j = 0;
-            while (count > 0 && j < i) {
-                j += codepoint_length(&pos[j], i - j);
-                count--;
-            }
-
-            return escape_characters(pos, j);
+  std::string heuristic_error_token(const char *s, size_t n,
+                                    const char *pos) const {
+    auto len = n - std::distance(s, pos);
+    if (len) {
+      size_t i = 0;
+      auto c = cast_char(pos[i++]);
+      if (!std::ispunct(c) && !std::isspace(c)) {
+        while (i < len && !std::ispunct(cast_char(pos[i])) &&
+               !std::isspace(cast_char(pos[i]))) {
+          i++;
         }
-        return std::string();
-    }
+      }
 
-    std::string replace_all(std::string str, const std::string &from,
-                            const std::string &to) const {
-        size_t pos = 0;
-        while ((pos = str.find(from, pos)) != std::string::npos) {
-            str.replace(pos, from.length(), to);
-            pos += to.length();
-        }
-        return str;
+      size_t count = CPPPEGLIB_HEURISTIC_ERROR_TOKEN_MAX_CHAR_COUNT;
+      size_t j = 0;
+      while (count > 0 && j < i) {
+        j += codepoint_length(&pos[j], i - j);
+        count--;
+      }
+
+      return escape_characters(pos, j);
     }
+    return std::string();
+  }
+
+  std::string replace_all(std::string str, const std::string &from,
+                          const std::string &to) const {
+    size_t pos = 0;
+    while ((pos = str.find(from, pos)) != std::string::npos) {
+      str.replace(pos, from.length(), to);
+      pos += to.length();
+    }
+    return str;
+  }
 };
 
 /*
@@ -760,213 +885,478 @@ using TracerLeave = std::function<void(
 
 using TracerStartOrEnd = std::function<void(std::any &trace_data)>;
 
+// Packrat memoization table: open-addressing hash map keyed by the fused
+// (position * rule count + rule id) index. The insert-heavy access pattern
+// makes node-based containers a bottleneck, so keys and lengths live in one
+// flat array of 16-byte POD slots probed linearly; semantic values go into a
+// parallel array that is never allocated when no cached result carries a
+// value. Erased slots become tombstones (erase only happens during
+// left-recursion cache invalidation).
+class PackratCache {
+public:
+  explicit PackratCache(size_t expected_entries) {
+    while (initial_capacity_ < expected_entries) {
+      initial_capacity_ *= 2;
+    }
+  }
+
+  bool find(size_t key, size_t &len, std::any &val) const {
+    if (slots_.empty()) { return false; }
+    auto mask = slots_.size() - 1;
+    auto i = mix(key) & mask;
+    while (true) {
+      auto &slot = slots_[i];
+      if (slot.key == key) {
+        len = slot.len;
+        if (!vals_.empty()) {
+          val = vals_[i];
+        } else {
+          val.reset();
+        }
+        return true;
+      }
+      if (slot.key == kEmpty) { return false; }
+      i = (i + 1) & mask;
+    }
+  }
+
+  void insert_or_assign(size_t key, size_t len, const std::any &val) {
+    if (slots_.empty() || (used_ + 1) * 4 > slots_.size() * 3) { grow(); }
+    auto mask = slots_.size() - 1;
+    auto i = mix(key) & mask;
+    auto insert_pos = kEmpty;
+    while (true) {
+      auto &slot = slots_[i];
+      if (slot.key == key) {
+        insert_pos = i;
+        break;
+      }
+      if (slot.key == kTombstone) {
+        if (insert_pos == kEmpty) { insert_pos = i; }
+      } else if (slot.key == kEmpty) {
+        if (insert_pos == kEmpty) { insert_pos = i; }
+        if (slots_[insert_pos].key == kEmpty) { used_++; }
+        break;
+      }
+      i = (i + 1) & mask;
+    }
+    auto &dest = slots_[insert_pos];
+    dest.key = key;
+    dest.len = len;
+    if (val.has_value()) {
+      if (vals_.empty()) { vals_.resize(slots_.size()); }
+      vals_[insert_pos] = val;
+    } else if (!vals_.empty()) {
+      vals_[insert_pos].reset();
+    }
+  }
+
+  void erase(size_t key) {
+    if (slots_.empty()) { return; }
+    auto mask = slots_.size() - 1;
+    auto i = mix(key) & mask;
+    while (true) {
+      auto &slot = slots_[i];
+      if (slot.key == key) {
+        slot.key = kTombstone;
+        if (!vals_.empty()) { vals_[i].reset(); }
+        return;
+      }
+      if (slot.key == kEmpty) { return; }
+      i = (i + 1) & mask;
+    }
+  }
+
+private:
+  static constexpr size_t kEmpty = static_cast<size_t>(-1);
+  static constexpr size_t kTombstone = static_cast<size_t>(-2);
+
+  struct Slot {
+    size_t key = kEmpty;
+    size_t len = 0;
+  };
+
+  static size_t mix(size_t key) {
+    // Mix in 64 bits so `h >> 32` stays well-defined where size_t is 32-bit
+    // (wasm32); on 64-bit targets this is bit-identical to the size_t mix.
+    auto h = static_cast<uint64_t>(key) * 0x9E3779B97F4A7C15ull;
+    return static_cast<size_t>(h ^ (h >> 32));
+  }
+
+  void grow() {
+    auto new_cap = slots_.empty() ? initial_capacity_ : slots_.size() * 2;
+    std::vector<Slot> old_slots = std::move(slots_);
+    std::vector<std::any> old_vals = std::move(vals_);
+    slots_.assign(new_cap, Slot{});
+    if (!old_vals.empty()) { vals_.assign(new_cap, std::any()); }
+    used_ = 0;
+    auto mask = new_cap - 1;
+    for (size_t j = 0; j < old_slots.size(); j++) {
+      auto &slot = old_slots[j];
+      if (slot.key == kEmpty || slot.key == kTombstone) { continue; }
+      auto i = mix(slot.key) & mask;
+      while (slots_[i].key != kEmpty) {
+        i = (i + 1) & mask;
+      }
+      slots_[i] = slot;
+      if (!old_vals.empty()) { vals_[i] = std::move(old_vals[j]); }
+      used_++;
+    }
+  }
+
+  size_t initial_capacity_ = 1024;
+  std::vector<Slot> slots_;
+  std::vector<std::any> vals_;
+  size_t used_ = 0; // occupied + tombstone slots
+};
+
 class Context {
 public:
-    const char *path;
-    const char *s;
-    const size_t l;
+  const char *path;
+  const char *s;
+  const size_t l;
 
-    ErrorInfo error_info;
-    bool recovered = false;
+  ErrorInfo error_info;
+  bool recovered = false;
 
-    std::vector<std::shared_ptr<SemanticValues>> value_stack;
-    size_t value_stack_size = 0;
+  std::vector<std::unique_ptr<SemanticValues>> value_stack;
+  size_t value_stack_size = 0;
 
-    std::vector<Definition *> rule_stack;
-    std::vector<std::vector<std::shared_ptr<Ope>>> args_stack;
+  std::vector<Definition *> rule_stack;
 
-    size_t in_token_boundary_count = 0;
+  // One frame per rule reference: the macro arguments in scope, and the
+  // instantiation they identify (0 for anything but a left-recursive macro).
+  struct ArgsFrame {
+    std::vector<std::shared_ptr<Ope>> args;
+    size_t macro_inst = 0;
+  };
+  std::vector<ArgsFrame> args_stack;
 
-    std::shared_ptr<Ope> whitespaceOpe;
-    bool in_whitespace = false;
+  size_t in_token_boundary_count = 0;
 
-    std::shared_ptr<Ope> wordOpe;
+  std::shared_ptr<Ope> whitespaceOpe;
+  bool in_whitespace = false;
 
-    std::vector<std::map<std::string_view, std::string>> capture_scope_stack;
-    size_t capture_scope_stack_size = 0;
+  std::shared_ptr<Ope> wordOpe;
 
-    std::vector<bool> cut_stack;
+  std::vector<std::pair<std::string_view, std::string>> capture_entries;
 
-    const size_t def_count;
-    const bool enablePackratParsing;
-    std::vector<bool> cache_registered;
-    std::vector<bool> cache_success;
+  std::vector<bool> cut_stack;
 
-    std::map<std::pair<size_t, size_t>, std::tuple<size_t, std::any>>
-        cache_values;
+  const size_t def_count;
+  const bool enablePackratParsing;
+  const std::vector<int32_t> *packrat_index; // def_id -> cache slot or -1
+  size_t packrat_cached_count;               // number of memoized rules
+  std::vector<bool> cache_registered;
+  std::vector<bool> cache_success;
+  // Innermost active start position per rule; re-entry guard for rules that
+  // are not memoized (replaces the per-position bitvector for them).
+  std::vector<const char *> active_pos;
 
-    TracerEnter tracer_enter;
-    TracerLeave tracer_leave;
-    std::any trace_data;
-    const bool verbose_trace;
+  PackratCache cache_values;
 
-    Log log;
+  // Left recursion support
+  struct LRMemo {
+    size_t len = static_cast<size_t>(-1);
+    std::any val;
+  };
 
-    Context(const char *path, const char *s, size_t l, size_t def_count,
-            std::shared_ptr<Ope> whitespaceOpe, std::shared_ptr<Ope> wordOpe,
-            bool enablePackratParsing, TracerEnter tracer_enter,
-            TracerLeave tracer_leave, std::any trace_data, bool verbose_trace,
-            Log log)
-        : path(path), s(s), l(l), whitespaceOpe(whitespaceOpe), wordOpe(wordOpe),
-          def_count(def_count), enablePackratParsing(enablePackratParsing),
-          cache_registered(enablePackratParsing ? def_count * (l + 1) : 0),
-          cache_success(enablePackratParsing ? def_count * (l + 1) : 0),
-          tracer_enter(tracer_enter), tracer_leave(tracer_leave),
-          trace_data(trace_data), verbose_trace(verbose_trace), log(log) {
+  // A left-recursive rule instance: the definition plus, for a macro, the
+  // instantiation it was invoked with (0 for a plain rule). Two
+  // instantiations of the same macro grow independent seeds.
+  using LRRule = std::pair<const Definition *, size_t>;
+  using LRKey = std::pair<LRRule, const char *>;
 
-        push_args({});
-        push_capture_scope();
+  std::map<LRKey, LRMemo> lr_memo;
+
+  // Rules whose lr_memo was hit during the current parse scope.
+  // Used to track LR cycle membership.
+  std::set<LRRule> lr_refs_hit;
+
+  // Rules currently in their seeding/growing phase at a given position.
+  // Protected from having their lr_memo erased by inner growers.
+  std::set<LRKey> lr_active_seeds;
+
+  // Interned macro instantiations: (definition, resolved arguments) -> id.
+  std::map<std::vector<const void *>, size_t> macro_inst_ids;
+  size_t next_macro_inst_ = 1;
+
+  // Map a def_id to its slot in the cache tables, or -1 for guard-only
+  // rules (not memoized).
+  int32_t cache_slot(size_t def_id) const {
+    if (!packrat_index) { return static_cast<int32_t>(def_id); }
+    return def_id < packrat_index->size() ? (*packrat_index)[def_id] : -1;
+  }
+
+  void clear_packrat_cache(const char *pos, size_t def_id) {
+    if (!enablePackratParsing) { return; }
+    auto slot = cache_slot(def_id);
+    if (slot < 0) { return; }
+    auto col = static_cast<size_t>(pos - s);
+    auto idx = packrat_cached_count * col + static_cast<size_t>(slot);
+    if (idx < cache_registered.size()) {
+      cache_registered[idx] = false;
+      cache_success[idx] = false;
+    }
+    cache_values.erase(idx);
+  }
+
+  void write_packrat_cache(const char *pos, size_t def_id, size_t len,
+                           const std::any &val) {
+    if (!enablePackratParsing) { return; }
+    auto slot = cache_slot(def_id);
+    if (slot < 0) { return; }
+    auto col = pos - s;
+    auto idx = packrat_cached_count * static_cast<size_t>(col) +
+               static_cast<size_t>(slot);
+    if (idx >= cache_registered.size()) { return; }
+    cache_registered[idx] = true;
+    cache_success[idx] = true;
+    cache_values.insert_or_assign(idx, len, val);
+  }
+
+  TracerEnter tracer_enter;
+  TracerLeave tracer_leave;
+  const bool has_tracer;
+  std::any trace_data;
+  const bool verbose_trace;
+
+  // Byte-wise tolower frozen at parse start, so case-insensitive matching
+  // avoids a locale-sensitive libc call per input byte.
+  unsigned char tolower_table[256];
+
+  Log log;
+  ErrorReporter error_reporter;
+
+  Context(const char *path, const char *s, size_t l, size_t def_count,
+          std::shared_ptr<Ope> whitespaceOpe, std::shared_ptr<Ope> wordOpe,
+          bool enablePackratParsing, TracerEnter tracer_enter,
+          TracerLeave tracer_leave, std::any trace_data, bool verbose_trace,
+          Log log, ErrorReporter error_reporter = nullptr,
+          const std::vector<int32_t> *packrat_index = nullptr,
+          size_t packrat_cached_count = 0)
+      : path(path), s(s), l(l), whitespaceOpe(whitespaceOpe), wordOpe(wordOpe),
+        def_count(def_count), enablePackratParsing(enablePackratParsing),
+        packrat_index(packrat_index),
+        packrat_cached_count(packrat_index ? packrat_cached_count : def_count),
+        cache_registered(
+            enablePackratParsing ? this->packrat_cached_count * (l + 1) : 0),
+        cache_success(
+            enablePackratParsing ? this->packrat_cached_count * (l + 1) : 0),
+        active_pos(enablePackratParsing ? def_count : 0, nullptr),
+        cache_values(enablePackratParsing ? (packrat_index ? l / 8 + 16 : l / 2)
+                                          : 0),
+        tracer_enter(tracer_enter), tracer_leave(tracer_leave),
+        has_tracer(tracer_enter && tracer_leave), trace_data(trace_data),
+        verbose_trace(verbose_trace), log(log), error_reporter(error_reporter) {
+
+    for (size_t i = 0; i < 256; i++) {
+      tolower_table[i] =
+          static_cast<unsigned char>(std::tolower(static_cast<int>(i)));
     }
 
-    ~Context() {
-        pop_capture_scope();
+    push_args({});
+  }
 
-        assert(!value_stack_size);
-        assert(!capture_scope_stack_size);
-        assert(cut_stack.empty());
+  ~Context() {
+    assert(!value_stack_size);
+    assert(cut_stack.empty());
+  }
+
+  Context(const Context &) = delete;
+  Context(Context &&) = delete;
+  Context operator=(const Context &) = delete;
+
+  // Per-rule packrat stats (populated when packrat_stats is non-null)
+  struct PackratStats {
+    size_t hits = 0;
+    size_t misses = 0;
+  };
+  std::vector<PackratStats> *packrat_stats = nullptr;
+
+  template <typename T>
+  void packrat(const char *a_s, size_t def_id, size_t &len, std::any &val,
+               T fn) {
+    if (!enablePackratParsing) {
+      fn(val);
+      return;
     }
 
-    Context(const Context &) = delete;
-    Context(Context &&) = delete;
-    Context operator=(const Context &) = delete;
-
-    template <typename T>
-    void packrat(const char *a_s, size_t def_id, size_t &len, std::any &val,
-                 T fn) {
-        if (!enablePackratParsing) {
-            fn(val);
-            return;
+    auto slot = cache_slot(def_id);
+    if (slot < 0) {
+      // Guard-only rule: no memoization. Recursion at the same position is
+      // caught by the per-rule active-position guard.
+      if (active_pos[def_id] == a_s) {
+        if (packrat_stats && def_id < packrat_stats->size()) {
+          (*packrat_stats)[def_id].hits++;
         }
+        len = static_cast<size_t>(-1);
+        return;
+      }
+      if (packrat_stats && def_id < packrat_stats->size()) {
+        (*packrat_stats)[def_id].misses++;
+      }
+      auto save = active_pos[def_id];
+      active_pos[def_id] = a_s;
+      fn(val);
+      active_pos[def_id] = save;
+      return;
+    }
 
-        auto col = a_s - s;
-        auto idx = def_count * static_cast<size_t>(col) + def_id;
+    auto col = a_s - s;
+    auto idx = packrat_cached_count * static_cast<size_t>(col) +
+               static_cast<size_t>(slot);
 
-        if (cache_registered[idx]) {
-            if (cache_success[idx]) {
-                auto key = std::pair(col, def_id);
-                std::tie(len, val) = cache_values[key];
-                return;
-            } else {
-                len = static_cast<size_t>(-1);
-                return;
-            }
-        } else {
-            fn(val);
-            cache_registered[idx] = true;
-            cache_success[idx] = success(len);
-            if (success(len)) {
-                auto key = std::pair(col, def_id);
-                cache_values[key] = std::pair(len, val);
-            }
-            return;
+    if (cache_registered[idx]) {
+      if (packrat_stats && def_id < packrat_stats->size()) {
+        (*packrat_stats)[def_id].hits++;
+      }
+      if (cache_success[idx]) {
+        if (!cache_values.find(idx, len, val)) {
+          len = 0;
+          val.reset();
         }
+        return;
+      } else {
+        len = static_cast<size_t>(-1);
+        return;
+      }
+    } else {
+      // Pre-register as failure (re-entry guard + failure memoization)
+      cache_registered[idx] = true;
+      cache_success[idx] = false;
+
+      if (packrat_stats && def_id < packrat_stats->size()) {
+        (*packrat_stats)[def_id].misses++;
+      }
+
+      fn(val);
+
+      if (success(len)) { write_packrat_cache(a_s, def_id, len, val); }
+      return;
+    }
+  }
+
+  // Semantic values
+  SemanticValues &push_semantic_values_scope() {
+    assert(value_stack_size <= value_stack.size());
+    if (value_stack_size == value_stack.size()) {
+      value_stack.emplace_back(std::make_unique<SemanticValues>(this));
+    } else {
+      auto &vs = *value_stack[value_stack_size];
+      if (!vs.empty()) {
+        vs.clear();
+        if (!vs.tags.empty()) { vs.tags.clear(); }
+      }
+      vs.sv_ = std::string_view();
+      vs.choice_count_ = 0;
+      vs.choice_ = 0;
+      if (!vs.tokens.empty()) { vs.tokens.clear(); }
     }
 
-    SemanticValues &push() {
-        push_capture_scope();
-        return push_semantic_values_scope();
-    }
+    auto &vs = *value_stack[value_stack_size++];
+    vs.path = path;
+    vs.ss = s;
+    return vs;
+  }
 
-    void pop() {
-        pop_capture_scope();
-        pop_semantic_values_scope();
-    }
+  void pop_semantic_values_scope() { value_stack_size--; }
 
-    // Semantic values
-    SemanticValues &push_semantic_values_scope() {
-        assert(value_stack_size <= value_stack.size());
-        if (value_stack_size == value_stack.size()) {
-            value_stack.emplace_back(std::make_shared<SemanticValues>(this));
-        } else {
-            auto &vs = *value_stack[value_stack_size];
-            if (!vs.empty()) {
-                vs.clear();
-                if (!vs.tags.empty()) { vs.tags.clear(); }
-            }
-            vs.sv_ = std::string_view();
-            vs.choice_count_ = 0;
-            vs.choice_ = 0;
-            if (!vs.tokens.empty()) { vs.tokens.clear(); }
-        }
+  // Arguments
+  void push_args(std::vector<std::shared_ptr<Ope>> &&args,
+                 size_t macro_inst = 0) {
+    args_stack.push_back({std::move(args), macro_inst});
+  }
 
-        auto &vs = *value_stack[value_stack_size++];
-        vs.path = path;
-        vs.ss = s;
-        return vs;
-    }
+  void pop_args() { args_stack.pop_back(); }
 
-    void pop_semantic_values_scope() { value_stack_size--; }
+  const std::vector<std::shared_ptr<Ope>> &top_args() const {
+    return args_stack[args_stack.size() - 1].args;
+  }
 
-    // Arguments
-    void push_args(std::vector<std::shared_ptr<Ope>> &&args) {
-        args_stack.emplace_back(args);
-    }
+  size_t top_macro_inst() const {
+    return args_stack[args_stack.size() - 1].macro_inst;
+  }
 
-    void pop_args() { args_stack.pop_back(); }
+  // Identify a macro invocation by what its resolved arguments denote (see
+  // macro_inst_key). `Sum(A)` inside `Sum(N)`'s own body resolves A back to
+  // the argument the outer call was given, so both invocations intern to the
+  // same id and the inner one finds the outer's seed — which is what makes
+  // growing terminate.
+  size_t intern_macro_inst(std::vector<const void *> &&key) {
+    auto [it, inserted] =
+        macro_inst_ids.emplace(std::move(key), next_macro_inst_);
+    if (inserted) { next_macro_inst_++; }
+    return it->second;
+  }
 
-    const std::vector<std::shared_ptr<Ope>> &top_args() const {
-        return args_stack[args_stack.size() - 1];
-    }
+  // Snapshot/Rollback
+  struct Snapshot {
+    size_t sv_size;
+    size_t sv_tags_size;
+    size_t sv_tokens_size;
+    std::string_view sv_sv;
+    size_t choice_count;
+    size_t choice;
+    size_t capture_size;
+  };
 
-    // Capture scope
-    void push_capture_scope() {
-        assert(capture_scope_stack_size <= capture_scope_stack.size());
-        if (capture_scope_stack_size == capture_scope_stack.size()) {
-            capture_scope_stack.emplace_back(
-                std::map<std::string_view, std::string>());
-        } else {
-            auto &cs = capture_scope_stack[capture_scope_stack_size];
-            if (!cs.empty()) { cs.clear(); }
-        }
-        capture_scope_stack_size++;
-    }
+  Snapshot snapshot(const SemanticValues &vs) const {
+    return {vs.size(),        vs.tags.size(), vs.tokens.size(),      vs.sv_,
+            vs.choice_count_, vs.choice_,     capture_entries.size()};
+  }
 
-    void pop_capture_scope() { capture_scope_stack_size--; }
+  void rollback(SemanticValues &vs, const Snapshot &snap) {
+    vs.resize(snap.sv_size);
+    vs.tags.resize(snap.sv_tags_size);
+    vs.tokens.resize(snap.sv_tokens_size);
+    vs.sv_ = snap.sv_sv;
+    vs.choice_count_ = snap.choice_count;
+    vs.choice_ = snap.choice;
+    capture_entries.resize(snap.capture_size);
+  }
 
-    void shift_capture_values() {
-        assert(capture_scope_stack_size >= 2);
-        auto curr = &capture_scope_stack[capture_scope_stack_size - 1];
-        auto prev = curr - 1;
-        for (const auto &[k, v] : *curr) {
-            (*prev)[k] = v;
-        }
-    }
+  // Skip trailing whitespace with trace suppression.
+  // Returns whitespace length, or -1 on failure.
+  // No-op (returns 0) if inside a token boundary or no whitespaceOpe.
+  size_t skip_whitespace(const char *a_s, size_t n, SemanticValues &vs,
+                         std::any &dt);
 
-    // Error
-    void set_error_pos(const char *a_s, const char *literal = nullptr);
+  // Error
+  void set_error_pos(const char *a_s, const char *literal = nullptr);
 
-    // Trace
-    void trace_enter(const Ope &ope, const char *a_s, size_t n,
-                     const SemanticValues &vs, std::any &dt);
-    void trace_leave(const Ope &ope, const char *a_s, size_t n,
-                     const SemanticValues &vs, std::any &dt, size_t len);
-    bool is_traceable(const Ope &ope) const;
+  // Trace
+  void trace_enter(const Ope &ope, const char *a_s, size_t n,
+                   const SemanticValues &vs, std::any &dt);
+  void trace_leave(const Ope &ope, const char *a_s, size_t n,
+                   const SemanticValues &vs, std::any &dt, size_t len);
+  bool is_traceable(const Ope &ope) const;
 
-    // Line info
-    std::pair<size_t, size_t> line_info(const char *cur) const {
-        std::call_once(source_line_index_init_, [this]() {
-            for (size_t pos = 0; pos < l; pos++) {
-                if (s[pos] == '\n') { source_line_index.push_back(pos); }
-            }
-            source_line_index.push_back(l);
-        });
+  // Line info
+  std::pair<size_t, size_t> line_info(const char *cur) const {
+    std::call_once(source_line_index_init_, [this]() {
+      for (size_t pos = 0; pos < l; pos++) {
+        if (s[pos] == '\n') { source_line_index.push_back(pos); }
+      }
+      source_line_index.push_back(l);
+    });
 
-        auto pos = static_cast<size_t>(std::distance(s, cur));
+    auto pos = static_cast<size_t>(std::distance(s, cur));
 
-        auto it = std::lower_bound(
-            source_line_index.begin(), source_line_index.end(), pos,
-            [](size_t element, size_t value) { return element < value; });
+    auto it = std::lower_bound(
+        source_line_index.begin(), source_line_index.end(), pos,
+        [](size_t element, size_t value) { return element < value; });
 
-        auto id = static_cast<size_t>(std::distance(source_line_index.begin(), it));
-        auto off = pos - (id == 0 ? 0 : source_line_index[id - 1] + 1);
-        return std::pair(id + 1, off + 1);
-    }
+    auto id = static_cast<size_t>(std::distance(source_line_index.begin(), it));
+    auto off = pos - (id == 0 ? 0 : source_line_index[id - 1] + 1);
+    return std::pair(id + 1, off + 1);
+  }
 
-    size_t next_trace_id = 0;
-    std::vector<size_t> trace_ids;
-    bool ignore_trace_state = false;
-    mutable std::once_flag source_line_index_init_;
-    mutable std::vector<size_t> source_line_index;
+  size_t next_trace_id = 0;
+  std::vector<size_t> trace_ids;
+  bool ignore_trace_state = false;
+  mutable std::once_flag source_line_index_init_;
+  mutable std::vector<size_t> source_line_index;
 };
 
 /*
@@ -974,416 +1364,593 @@ public:
  */
 class Ope {
 public:
-    struct Visitor;
+  struct Visitor;
 
-    virtual ~Ope() = default;
-    size_t parse(const char *s, size_t n, SemanticValues &vs, Context &c,
-                 std::any &dt) const;
-    virtual size_t parse_core(const char *s, size_t n, SemanticValues &vs,
-                              Context &c, std::any &dt) const = 0;
-    virtual void accept(Visitor &v) = 0;
+  virtual ~Ope() = default;
+  size_t parse(const char *s, size_t n, SemanticValues &vs, Context &c,
+               std::any &dt) const;
+  virtual size_t parse_core(const char *s, size_t n, SemanticValues &vs,
+                            Context &c, std::any &dt) const = 0;
+  virtual void accept(Visitor &v) = 0;
+
+  bool is_token_boundary = false;
+  bool is_choice_like = false;
+};
+
+// Keyword-guarded identifier data, heap-allocated only for matching Sequences.
+// Avoids bloating all Sequence objects with bitsets and keyword sets.
+struct KeywordGuardData {
+  std::bitset<256> identifier_first;        // first char of identifier
+  std::bitset<256> identifier_rest;         // subsequent chars of identifier
+  std::vector<std::string> exact_keywords;  // single-word keywords (lowercase)
+  std::vector<std::string> prefix_keywords; // first word of compound keywords
+  size_t min_keyword_len = 0;
+  size_t max_keyword_len = 0;
+
+  static bool matches_any(const std::vector<std::string> &keywords,
+                          std::string_view input) {
+    return std::any_of(keywords.begin(), keywords.end(),
+                       [&](const auto &kw) { return kw == input; });
+  }
 };
 
 class Sequence : public Ope {
 public:
-    template <typename... Args>
-    Sequence(const Args &...args)
-        : opes_{static_cast<std::shared_ptr<Ope>>(args)...} {}
-    Sequence(const std::vector<std::shared_ptr<Ope>> &opes) : opes_(opes) {}
-    Sequence(std::vector<std::shared_ptr<Ope>> &&opes) : opes_(opes) {}
+  template <typename... Args>
+  Sequence(const Args &...args)
+      : opes_{static_cast<std::shared_ptr<Ope>>(args)...} {}
+  Sequence(const std::vector<std::shared_ptr<Ope>> &opes) : opes_(opes) {}
+  Sequence(std::vector<std::shared_ptr<Ope>> &&opes) : opes_(std::move(opes)) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                      std::any &dt) const override {
-        auto &chvs = c.push_semantic_values_scope();
-        auto se = scope_exit([&]() { c.pop_semantic_values_scope(); });
-        size_t i = 0;
-        for (const auto &ope : opes_) {
-            auto len = ope->parse(s + i, n - i, chvs, c, dt);
-            if (fail(len)) { return len; }
-            i += len;
-        }
-        vs.append(chvs);
-        return i;
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override {
+    // Keyword-guarded identifier fast path:
+    // Fuses !ReservedKeyword <identifier> into scan-then-lookup
+    if (kw_guard_) {
+      if (auto result = parse_keyword_guarded(s, n, vs, c, dt)) {
+        return *result;
+      }
+      // nullopt means prefix keyword match — fall through to normal path
     }
+    size_t i = 0;
+    for (const auto &ope : opes_) {
+      auto len = ope->parse(s + i, n - i, vs, c, dt);
+      if (fail(len)) { return len; }
+      i += len;
+    }
+    return i;
+  }
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    std::vector<std::shared_ptr<Ope>> opes_;
+  std::vector<std::shared_ptr<Ope>> opes_;
+
+private:
+  friend struct SetupFirstSets;
+  std::unique_ptr<KeywordGuardData> kw_guard_;
+
+  // Returns parse result, or nullopt to fall through to normal path
+  std::optional<size_t> parse_keyword_guarded(const char *s, size_t n,
+                                              SemanticValues &vs, Context &c,
+                                              std::any &dt) const {
+    const auto &kw = *kw_guard_;
+    if (n < 1 || !kw.identifier_first.test(static_cast<unsigned char>(*s))) {
+      c.set_error_pos(s);
+      return static_cast<size_t>(-1);
+    }
+    // Scan identifier using bitset
+    size_t id_len = 1;
+    while (id_len < n &&
+           kw.identifier_rest.test(static_cast<unsigned char>(s[id_len]))) {
+      id_len++;
+    }
+    // Skip keyword matching if identifier length is out of range
+    if (id_len >= kw.min_keyword_len && id_len <= kw.max_keyword_len) {
+      char lower_buf[64];
+      std::unique_ptr<char[]> lower_heap;
+      char *lower = lower_buf;
+      if (id_len > sizeof(lower_buf)) {
+        lower_heap.reset(new char[id_len]);
+        lower = lower_heap.get();
+      }
+      std::transform(s, s + id_len, lower, [&c](unsigned char ch) {
+        return static_cast<char>(c.tolower_table[ch]);
+      });
+      std::string_view lower_sv(lower, id_len);
+
+      if (KeywordGuardData::matches_any(kw.exact_keywords, lower_sv)) {
+        c.set_error_pos(s);
+        return static_cast<size_t>(-1);
+      }
+      if (KeywordGuardData::matches_any(kw.prefix_keywords, lower_sv)) {
+        return std::nullopt;
+      }
+    }
+    // Success: emit token and consume trailing whitespace
+    vs.tokens.emplace_back(std::string_view(s, id_len));
+    auto wl = c.skip_whitespace(s + id_len, n - id_len, vs, dt);
+    if (fail(wl)) { return wl; }
+    return id_len + wl;
+  }
+};
+
+struct FirstSet {
+  // First-Set: set of possible first bytes for an expression.
+  // Used by PrioritizedChoice to skip alternatives that cannot match.
+  std::bitset<256> chars;    // byte values that can appear as the first byte
+  bool can_be_empty = false; // true if the expression can match empty string
+  bool any_char = false;     // true if any character can appear (cannot filter)
+  const char *first_literal = nullptr; // first literal for error reporting
+  const Definition *first_rule =
+      nullptr; // first token rule for error reporting
+
+  void merge(const FirstSet &other) {
+    chars |= other.chars;
+    if (other.can_be_empty) { can_be_empty = true; }
+    if (other.any_char) { any_char = true; }
+    // Note: first_literal/first_rule are NOT merged — per-alternative
+  }
 };
 
 class PrioritizedChoice : public Ope {
 public:
-    template <typename... Args>
-    PrioritizedChoice(bool for_label, const Args &...args)
-        : opes_{static_cast<std::shared_ptr<Ope>>(args)...},
-          for_label_(for_label) {}
-    PrioritizedChoice(const std::vector<std::shared_ptr<Ope>> &opes)
-        : opes_(opes) {}
-    PrioritizedChoice(std::vector<std::shared_ptr<Ope>> &&opes) : opes_(opes) {}
+  template <typename... Args>
+  PrioritizedChoice(bool for_label, const Args &...args)
+      : opes_{static_cast<std::shared_ptr<Ope>>(args)...},
+        for_label_(for_label) {
+    is_choice_like = true;
+  }
+  PrioritizedChoice(const std::vector<std::shared_ptr<Ope>> &opes)
+      : opes_(opes) {
+    is_choice_like = true;
+  }
+  PrioritizedChoice(std::vector<std::shared_ptr<Ope>> &&opes)
+      : opes_(std::move(opes)) {
+    is_choice_like = true;
+  }
 
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                      std::any &dt) const override {
-        size_t len = static_cast<size_t>(-1);
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override {
+    size_t len = static_cast<size_t>(-1);
 
-        if (!for_label_) { c.cut_stack.push_back(false); }
-        auto se1 = scope_exit([&]() {
-            if (!for_label_) { c.cut_stack.pop_back(); }
-        });
+    if (!for_label_) { c.cut_stack.push_back(false); }
+    auto se = scope_exit([&]() {
+      if (!for_label_) { c.cut_stack.pop_back(); }
+    });
 
-        size_t id = 0;
-        for (const auto &ope : opes_) {
-            if (!c.cut_stack.empty()) { c.cut_stack.back() = false; }
-
-            auto &chvs = c.push();
-            c.error_info.keep_previous_token = id > 0;
-            auto se2 = scope_exit([&]() {
-                c.pop();
-                c.error_info.keep_previous_token = false;
-            });
-
-            len = ope->parse(s, n, chvs, c, dt);
-
-            if (success(len)) {
-                vs.append(chvs);
-                vs.choice_count_ = opes_.size();
-                vs.choice_ = id;
-                c.shift_capture_values();
-                break;
-            } else if (!c.cut_stack.empty() && c.cut_stack.back()) {
-                break;
+    size_t id = 0;
+    for (const auto &ope : opes_) {
+      // First-Set filtering: skip if next byte cannot start this alternative
+      if (n > 0 && id < first_sets_.size()) {
+        const auto &fs = first_sets_[id];
+        if (!fs.any_char && !fs.can_be_empty &&
+            !fs.chars.test(static_cast<unsigned char>(*s))) {
+          if ((c.log || c.error_reporter) &&
+              (fs.first_literal || fs.first_rule)) {
+            if (c.error_info.error_pos <= s) {
+              if (c.error_info.error_pos < s || !(id > 0)) {
+                c.error_info.error_pos = s;
+                c.error_info.expected_tokens.clear();
+              }
+              if (fs.first_literal) {
+                c.error_info.add(fs.first_literal, nullptr);
+              } else {
+                c.error_info.add(nullptr, fs.first_rule);
+              }
             }
-
-            id++;
+          }
+          id++;
+          continue;
         }
+      }
 
-        return len;
+      if (!c.cut_stack.empty()) { c.cut_stack.back() = false; }
+
+      auto snap = c.snapshot(vs);
+      c.error_info.keep_previous_token = id > 0;
+
+      len = ope->parse(s, n, vs, c, dt);
+
+      if (success(len)) {
+        vs.choice_count_ = opes_.size();
+        vs.choice_ = id;
+        break;
+      }
+
+      c.rollback(vs, snap);
+
+      if (!c.cut_stack.empty() && c.cut_stack.back()) { break; }
+
+      id++;
     }
 
-    void accept(Visitor &v) override;
+    c.error_info.keep_previous_token = false;
+    return len;
+  }
 
-    size_t size() const { return opes_.size(); }
+  void accept(Visitor &v) override;
 
-    std::vector<std::shared_ptr<Ope>> opes_;
-    bool for_label_ = false;
+  size_t size() const { return opes_.size(); }
+
+  std::vector<std::shared_ptr<Ope>> opes_;
+  bool for_label_ = false;
+  std::vector<FirstSet> first_sets_;
 };
 
 class Repetition : public Ope {
 public:
-    Repetition(const std::shared_ptr<Ope> &ope, size_t min, size_t max)
-        : ope_(ope), min_(min), max_(max) {}
+  Repetition(const std::shared_ptr<Ope> &ope, size_t min, size_t max)
+      : ope_(ope), min_(min), max_(max) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                      std::any &dt) const override {
-        size_t count = 0;
-        size_t i = 0;
-        while (count < min_) {
-            auto &chvs = c.push();
-            auto se = scope_exit([&]() { c.pop(); });
-
-            auto len = ope_->parse(s + i, n - i, chvs, c, dt);
-
-            if (success(len)) {
-                vs.append(chvs);
-                c.shift_capture_values();
-            } else {
-                return len;
-            }
-            i += len;
-            count++;
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override {
+    // ISpan fast path: tight loop for ASCII CharacterClass repetition.
+    // Safe because each ASCII match is exactly 1 byte, so byte count == match
+    // count.
+    if (span_bitset_) {
+      const auto &bitset = *span_bitset_;
+      size_t i = 0;
+      if (max_ == std::numeric_limits<size_t>::max()) {
+        // Unbounded repetition (*, +): no per-iteration max check
+        while (i < n && bitset.test(static_cast<unsigned char>(s[i]))) {
+          i++;
         }
-
-        while (count < max_) {
-            auto &chvs = c.push();
-            auto se = scope_exit([&]() { c.pop(); });
-
-            auto len = ope_->parse(s + i, n - i, chvs, c, dt);
-
-            if (success(len)) {
-                vs.append(chvs);
-                c.shift_capture_values();
-            } else {
-                break;
-            }
-            i += len;
-            count++;
+      } else {
+        auto limit = std::min(n, max_);
+        while (i < limit && bitset.test(static_cast<unsigned char>(s[i]))) {
+          i++;
         }
-        return i;
+      }
+      if (i < min_) {
+        c.set_error_pos(s + i);
+        return static_cast<size_t>(-1);
+      }
+      return i;
     }
 
-    void accept(Visitor &v) override;
-
-    bool is_zom() const {
-        return min_ == 0 && max_ == std::numeric_limits<size_t>::max();
+    size_t count = 0;
+    size_t i = 0;
+    while (count < min_) {
+      auto len = ope_->parse(s + i, n - i, vs, c, dt);
+      if (fail(len)) { return len; }
+      i += len;
+      count++;
     }
 
-    static std::shared_ptr<Repetition> zom(const std::shared_ptr<Ope> &ope) {
-        return std::make_shared<Repetition>(ope, 0,
-                                            std::numeric_limits<size_t>::max());
+    while (count < max_) {
+      auto snap = c.snapshot(vs);
+      auto len = ope_->parse(s + i, n - i, vs, c, dt);
+      if (fail(len)) {
+        c.rollback(vs, snap);
+        break;
+      }
+      i += len;
+      count++;
     }
+    return i;
+  }
 
-    static std::shared_ptr<Repetition> oom(const std::shared_ptr<Ope> &ope) {
-        return std::make_shared<Repetition>(ope, 1,
-                                            std::numeric_limits<size_t>::max());
-    }
+  void accept(Visitor &v) override;
 
-    static std::shared_ptr<Repetition> opt(const std::shared_ptr<Ope> &ope) {
-        return std::make_shared<Repetition>(ope, 0, 1);
-    }
+  bool is_zom() const {
+    return min_ == 0 && max_ == std::numeric_limits<size_t>::max();
+  }
 
-    std::shared_ptr<Ope> ope_;
-    size_t min_;
-    size_t max_;
+  static std::shared_ptr<Repetition> zom(const std::shared_ptr<Ope> &ope) {
+    return std::make_shared<Repetition>(ope, 0,
+                                        std::numeric_limits<size_t>::max());
+  }
+
+  static std::shared_ptr<Repetition> oom(const std::shared_ptr<Ope> &ope) {
+    return std::make_shared<Repetition>(ope, 1,
+                                        std::numeric_limits<size_t>::max());
+  }
+
+  static std::shared_ptr<Repetition> opt(const std::shared_ptr<Ope> &ope) {
+    return std::make_shared<Repetition>(ope, 0, 1);
+  }
+
+  std::shared_ptr<Ope> ope_;
+  size_t min_;
+  size_t max_;
+  const std::bitset<256> *span_bitset_ =
+      nullptr; // non-owning, set by SetupFirstSets
 };
 
 class AndPredicate : public Ope {
 public:
-    AndPredicate(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
+  AndPredicate(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues & /*vs*/,
-                      Context &c, std::any &dt) const override {
-        auto &chvs = c.push();
-        auto se = scope_exit([&]() { c.pop(); });
-
-        auto len = ope_->parse(s, n, chvs, c, dt);
-
-        if (success(len)) {
-            return 0;
-        } else {
-            return len;
-        }
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override {
+    auto snap = c.snapshot(vs);
+    auto len = ope_->parse(s, n, vs, c, dt);
+    c.rollback(vs, snap); // Always rollback — predicates consume nothing
+    if (success(len)) {
+      return 0;
+    } else {
+      return len;
     }
+  }
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    std::shared_ptr<Ope> ope_;
+  std::shared_ptr<Ope> ope_;
 };
 
 class NotPredicate : public Ope {
 public:
-    NotPredicate(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
+  NotPredicate(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues & /*vs*/,
-                      Context &c, std::any &dt) const override {
-        auto &chvs = c.push();
-        auto se = scope_exit([&]() { c.pop(); });
-        auto len = ope_->parse(s, n, chvs, c, dt);
-        if (success(len)) {
-            c.set_error_pos(s);
-            return static_cast<size_t>(-1);
-        } else {
-            return 0;
-        }
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override {
+    auto snap = c.snapshot(vs);
+    auto len = ope_->parse(s, n, vs, c, dt);
+    c.rollback(vs, snap); // Always rollback — predicates consume nothing
+    if (success(len)) {
+      c.set_error_pos(s);
+      return static_cast<size_t>(-1);
+    } else {
+      return 0;
     }
+  }
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    std::shared_ptr<Ope> ope_;
+  std::shared_ptr<Ope> ope_;
 };
 
 class Dictionary : public Ope, public std::enable_shared_from_this<Dictionary> {
 public:
-    Dictionary(const std::vector<std::string> &v, bool ignore_case)
-        : trie_(v, ignore_case) {}
+  Dictionary(const std::vector<std::string> &v, bool ignore_case)
+      : trie_(v, ignore_case) {
+    is_choice_like = true;
+  }
 
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                      std::any &dt) const override;
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override;
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    Trie trie_;
+  Trie trie_;
 };
 
 class LiteralString : public Ope,
                       public std::enable_shared_from_this<LiteralString> {
 public:
-    LiteralString(std::string &&s, bool ignore_case)
-        : lit_(s), ignore_case_(ignore_case), is_word_(false) {}
+  LiteralString(std::string &&s, bool ignore_case)
+      : lit_(std::move(s)), ignore_case_(ignore_case),
+        lower_lit_(ignore_case ? to_lower(lit_) : std::string()),
+        is_word_(false) {}
 
-    LiteralString(const std::string &s, bool ignore_case)
-        : lit_(s), ignore_case_(ignore_case), is_word_(false) {}
+  LiteralString(const std::string &s, bool ignore_case)
+      : lit_(s), ignore_case_(ignore_case),
+        lower_lit_(ignore_case ? to_lower(lit_) : std::string()),
+        is_word_(false) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                      std::any &dt) const override;
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override;
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    std::string lit_;
-    bool ignore_case_;
-    mutable std::once_flag init_is_word_;
-    mutable bool is_word_;
+  std::string lit_;
+  bool ignore_case_;
+  std::string lower_lit_; // pre-computed for ignore_case
+  mutable std::once_flag init_is_word_;
+  mutable bool is_word_;
 };
 
 class CharacterClass : public Ope,
                        public std::enable_shared_from_this<CharacterClass> {
 public:
-    CharacterClass(const std::string &s, bool negated, bool ignore_case)
-        : negated_(negated), ignore_case_(ignore_case) {
-        auto chars = decode(s.data(), s.length());
-        auto i = 0u;
-        while (i < chars.size()) {
-            if (i + 2 < chars.size() && chars[i + 1] == '-') {
-                auto cp1 = chars[i];
-                auto cp2 = chars[i + 2];
-                ranges_.emplace_back(std::pair(cp1, cp2));
-                i += 3;
-            } else {
-                auto cp = chars[i];
-                ranges_.emplace_back(std::pair(cp, cp));
-                i += 1;
-            }
-        }
-        assert(!ranges_.empty());
+  CharacterClass(const std::string &s, bool negated, bool ignore_case)
+      : negated_(negated), ignore_case_(ignore_case) {
+    auto chars = decode(s.data(), s.length());
+    auto i = 0u;
+    while (i < chars.size()) {
+      if (i + 2 < chars.size() && chars[i + 1] == '-') {
+        auto cp1 = chars[i];
+        auto cp2 = chars[i + 2];
+        ranges_.emplace_back(std::pair(cp1, cp2));
+        i += 3;
+      } else {
+        auto cp = chars[i];
+        ranges_.emplace_back(std::pair(cp, cp));
+        i += 1;
+      }
+    }
+    assert(!ranges_.empty());
+    setup_ascii_bitset();
+  }
+
+  CharacterClass(const std::vector<std::pair<char32_t, char32_t>> &ranges,
+                 bool negated, bool ignore_case)
+      : ranges_(ranges), negated_(negated), ignore_case_(ignore_case) {
+    assert(!ranges_.empty());
+    setup_ascii_bitset();
+  }
+
+  size_t parse_core(const char *s, size_t n, SemanticValues & /*vs*/,
+                    Context &c, std::any & /*dt*/) const override {
+    if (n < 1) {
+      c.set_error_pos(s);
+      return static_cast<size_t>(-1);
     }
 
-    CharacterClass(const std::vector<std::pair<char32_t, char32_t>> &ranges,
-                   bool negated, bool ignore_case)
-        : ranges_(ranges), negated_(negated), ignore_case_(ignore_case) {
-        assert(!ranges_.empty());
-    }
-
-    size_t parse_core(const char *s, size_t n, SemanticValues & /*vs*/,
-                      Context &c, std::any & /*dt*/) const override {
-        if (n < 1) {
-            c.set_error_pos(s);
-            return static_cast<size_t>(-1);
-        }
-
-        char32_t cp = 0;
-        auto len = decode_codepoint(s, n, cp);
-
-        for (const auto &range : ranges_) {
-            if (in_range(range, cp)) {
-                if (negated_) {
-                    c.set_error_pos(s);
-                    return static_cast<size_t>(-1);
-                } else {
-                    return len;
-                }
-            }
-        }
+    char32_t cp = 0;
+    auto len = decode_codepoint(s, n, cp);
 
+    for (const auto &range : ranges_) {
+      if (in_range(range, cp)) {
         if (negated_) {
-            return len;
+          c.set_error_pos(s);
+          return static_cast<size_t>(-1);
         } else {
-            c.set_error_pos(s);
-            return static_cast<size_t>(-1);
+          return len;
         }
+      }
     }
 
-    void accept(Visitor &v) override;
+    if (negated_) {
+      return len;
+    } else {
+      c.set_error_pos(s);
+      return static_cast<size_t>(-1);
+    }
+  }
+
+  void accept(Visitor &v) override;
+
+  friend struct ComputeFirstSet;
+  friend struct GrammarBlob;
+  friend struct OpeSignature;
+
+  bool is_ascii_only() const { return is_ascii_only_; }
+  const std::bitset<256> &ascii_bitset() const { return ascii_bitset_; }
 
 private:
-    bool in_range(const std::pair<char32_t, char32_t> &range, char32_t cp) const {
-        if (ignore_case_) {
-            auto cpl = std::tolower(cp);
-            return std::tolower(range.first) <= cpl &&
-                   cpl <= std::tolower(range.second);
-        } else {
-            return range.first <= cp && cp <= range.second;
-        }
+  bool in_range(const std::pair<char32_t, char32_t> &range, char32_t cp) const {
+    if (ignore_case_) {
+      auto cpl = std::tolower(cp);
+      return std::tolower(range.first) <= cpl &&
+             cpl <= std::tolower(range.second);
+    } else {
+      return range.first <= cp && cp <= range.second;
     }
+  }
 
-    std::vector<std::pair<char32_t, char32_t>> ranges_;
-    bool negated_;
-    bool ignore_case_;
+  void setup_ascii_bitset() {
+    if (negated_) { return; } // negated classes can match non-ASCII
+    for (const auto &[lo, hi] : ranges_) {
+      if (lo > 0x7F || hi > 0x7F) { return; }
+    }
+    is_ascii_only_ = true;
+    for (const auto &[lo, hi] : ranges_) {
+      for (auto cp = lo; cp <= hi; cp++) {
+        auto ch = static_cast<unsigned char>(cp);
+        ascii_bitset_.set(ch);
+        if (ignore_case_) {
+          ascii_bitset_.set(static_cast<unsigned char>(std::toupper(ch)));
+          ascii_bitset_.set(static_cast<unsigned char>(std::tolower(ch)));
+        }
+      }
+    }
+  }
+
+  std::vector<std::pair<char32_t, char32_t>> ranges_;
+  bool negated_;
+  bool ignore_case_;
+  std::bitset<256> ascii_bitset_;
+  bool is_ascii_only_ = false;
 };
 
 class Character : public Ope, public std::enable_shared_from_this<Character> {
 public:
-    Character(char ch) : ch_(ch) {}
+  Character(char32_t ch) : ch_(ch) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues & /*vs*/,
-                      Context &c, std::any & /*dt*/) const override {
-        if (n < 1 || s[0] != ch_) {
-            c.set_error_pos(s);
-            return static_cast<size_t>(-1);
-        }
-        return 1;
+  size_t parse_core(const char *s, size_t n, SemanticValues & /*vs*/,
+                    Context &c, std::any & /*dt*/) const override {
+    if (n < 1) {
+      c.set_error_pos(s);
+      return static_cast<size_t>(-1);
     }
 
-    void accept(Visitor &v) override;
+    char32_t cp = 0;
+    auto len = decode_codepoint(s, n, cp);
 
-    char ch_;
+    if (cp != ch_) {
+      c.set_error_pos(s);
+      return static_cast<size_t>(-1);
+    }
+    return len;
+  }
+
+  void accept(Visitor &v) override;
+
+  char32_t ch_;
 };
 
 class AnyCharacter : public Ope,
                      public std::enable_shared_from_this<AnyCharacter> {
 public:
-    size_t parse_core(const char *s, size_t n, SemanticValues & /*vs*/,
-                      Context &c, std::any & /*dt*/) const override {
-        auto len = codepoint_length(s, n);
-        if (len < 1) {
-            c.set_error_pos(s);
-            return static_cast<size_t>(-1);
-        }
-        return len;
+  size_t parse_core(const char *s, size_t n, SemanticValues & /*vs*/,
+                    Context &c, std::any & /*dt*/) const override {
+    auto len = codepoint_length(s, n);
+    if (len < 1) {
+      c.set_error_pos(s);
+      return static_cast<size_t>(-1);
     }
+    return len;
+  }
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 };
 
 class CaptureScope : public Ope {
 public:
-    CaptureScope(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
+  CaptureScope(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                      std::any &dt) const override {
-        c.push_capture_scope();
-        auto se = scope_exit([&]() { c.pop_capture_scope(); });
-        return ope_->parse(s, n, vs, c, dt);
-    }
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override {
+    auto cap_snap = c.capture_entries.size();
+    auto len = ope_->parse(s, n, vs, c, dt);
+    c.capture_entries.resize(cap_snap); // Always rollback (isolation)
+    return len;
+  }
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    std::shared_ptr<Ope> ope_;
+  std::shared_ptr<Ope> ope_;
 };
 
 class Capture : public Ope {
 public:
-    using MatchAction = std::function<void(const char *s, size_t n, Context &c)>;
+  using MatchAction = std::function<void(const char *s, size_t n, Context &c)>;
 
-    Capture(const std::shared_ptr<Ope> &ope, MatchAction ma)
-        : ope_(ope), match_action_(ma) {}
+  Capture(const std::shared_ptr<Ope> &ope, MatchAction ma)
+      : ope_(ope), match_action_(ma) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                      std::any &dt) const override {
-        auto len = ope_->parse(s, n, vs, c, dt);
-        if (success(len) && match_action_) { match_action_(s, len, c); }
-        return len;
-    }
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override {
+    auto len = ope_->parse(s, n, vs, c, dt);
+    if (success(len) && match_action_) { match_action_(s, len, c); }
+    return len;
+  }
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    std::shared_ptr<Ope> ope_;
-    MatchAction match_action_;
+  std::shared_ptr<Ope> ope_;
+  MatchAction match_action_;
 };
 
 class TokenBoundary : public Ope {
 public:
-    TokenBoundary(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
+  TokenBoundary(const std::shared_ptr<Ope> &ope) : ope_(ope) {
+    is_token_boundary = true;
+  }
 
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                      std::any &dt) const override;
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override;
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    std::shared_ptr<Ope> ope_;
+  std::shared_ptr<Ope> ope_;
 };
 
 class Ignore : public Ope {
 public:
-    Ignore(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
+  Ignore(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues & /*vs*/,
-                      Context &c, std::any &dt) const override {
-        auto &chvs = c.push_semantic_values_scope();
-        auto se = scope_exit([&]() { c.pop_semantic_values_scope(); });
-        return ope_->parse(s, n, chvs, c, dt);
-    }
+  size_t parse_core(const char *s, size_t n, SemanticValues & /*vs*/,
+                    Context &c, std::any &dt) const override {
+    auto &chvs = c.push_semantic_values_scope();
+    auto se = scope_exit([&]() { c.pop_semantic_values_scope(); });
+    return ope_->parse(s, n, chvs, c, dt);
+  }
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    std::shared_ptr<Ope> ope_;
+  std::shared_ptr<Ope> ope_;
 };
 
 using Parser = std::function<size_t(const char *s, size_t n, SemanticValues &vs,
@@ -1391,293 +1958,298 @@ using Parser = std::function<size_t(const char *s, size_t n, SemanticValues &vs,
 
 class User : public Ope {
 public:
-    User(Parser fn) : fn_(fn) {}
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs,
-                      Context & /*c*/, std::any &dt) const override {
-        assert(fn_);
-        return fn_(s, n, vs, dt);
-    }
-    void accept(Visitor &v) override;
-    std::function<size_t(const char *s, size_t n, SemanticValues &vs,
-                         std::any &dt)>
-        fn_;
+  User(Parser fn) : fn_(fn) {}
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs,
+                    Context & /*c*/, std::any &dt) const override {
+    assert(fn_);
+    return fn_(s, n, vs, dt);
+  }
+  void accept(Visitor &v) override;
+  std::function<size_t(const char *s, size_t n, SemanticValues &vs,
+                       std::any &dt)>
+      fn_;
 };
 
 class WeakHolder : public Ope {
 public:
-    WeakHolder(const std::shared_ptr<Ope> &ope) : weak_(ope) {}
+  WeakHolder(const std::shared_ptr<Ope> &ope) : weak_(ope) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                      std::any &dt) const override {
-        auto ope = weak_.lock();
-        assert(ope);
-        return ope->parse(s, n, vs, c, dt);
-    }
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override {
+    auto ope = weak_.lock();
+    assert(ope);
+    return ope->parse(s, n, vs, c, dt);
+  }
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    std::weak_ptr<Ope> weak_;
+  std::weak_ptr<Ope> weak_;
 };
 
 class Holder : public Ope {
 public:
-    Holder(Definition *outer) : outer_(outer) {}
+  Holder(Definition *outer) : outer_(outer) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                      std::any &dt) const override;
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override;
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    std::any reduce(SemanticValues &vs, std::any &dt) const;
+  std::any reduce(SemanticValues &vs, std::any &dt,
+                  const std::any &predicate_data) const;
 
-    const std::string &name() const;
-    const std::string &trace_name() const;
+  const std::string &name() const;
+  const std::string &trace_name() const;
 
-    std::shared_ptr<Ope> ope_;
-    Definition *outer_;
-    mutable std::once_flag trace_name_init_;
-    mutable std::string trace_name_;
+  std::shared_ptr<Ope> ope_;
+  Definition *outer_;
+  mutable std::once_flag trace_name_init_;
+  mutable std::string trace_name_;
 
-    friend class Definition;
+  friend class Definition;
 };
 
 using Grammar = std::unordered_map<std::string, Definition>;
 
 class Reference : public Ope, public std::enable_shared_from_this<Reference> {
 public:
-    Reference(const Grammar &grammar, const std::string &name, const char *s,
-              bool is_macro, const std::vector<std::shared_ptr<Ope>> &args)
-        : grammar_(grammar), name_(name), s_(s), is_macro_(is_macro), args_(args),
-          rule_(nullptr), iarg_(0) {}
+  Reference(const Grammar &grammar, const std::string &name, const char *s,
+            bool is_macro, const std::vector<std::shared_ptr<Ope>> &args)
+      : grammar_(grammar), name_(name), s_(s), is_macro_(is_macro), args_(args),
+        rule_(nullptr), iarg_(0) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                      std::any &dt) const override;
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override;
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    std::shared_ptr<Ope> get_core_operator() const;
+  std::shared_ptr<Ope> get_core_operator() const;
 
-    const Grammar &grammar_;
-    const std::string name_;
-    const char *s_;
+  const Grammar &grammar_;
+  const std::string name_;
+  const char *s_;
 
-    const bool is_macro_;
-    const std::vector<std::shared_ptr<Ope>> args_;
+  const bool is_macro_;
+  const std::vector<std::shared_ptr<Ope>> args_;
 
-    Definition *rule_;
-    size_t iarg_;
+  Definition *rule_;
+  size_t iarg_;
 };
 
 class Whitespace : public Ope {
 public:
-    Whitespace(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
+  Whitespace(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                      std::any &dt) const override {
-        if (c.in_whitespace) { return 0; }
-        c.in_whitespace = true;
-        auto se = scope_exit([&]() { c.in_whitespace = false; });
-        return ope_->parse(s, n, vs, c, dt);
-    }
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override {
+    if (c.in_whitespace) { return 0; }
+    c.in_whitespace = true;
+    auto se = scope_exit([&]() { c.in_whitespace = false; });
+    return ope_->parse(s, n, vs, c, dt);
+  }
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    std::shared_ptr<Ope> ope_;
+  std::shared_ptr<Ope> ope_;
 };
 
 class BackReference : public Ope {
 public:
-    BackReference(std::string &&name) : name_(name) {}
+  BackReference(std::string &&name) : name_(std::move(name)) {}
 
-    BackReference(const std::string &name) : name_(name) {}
+  BackReference(const std::string &name) : name_(name) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                      std::any &dt) const override;
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override;
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    std::string name_;
+  std::string name_;
 };
 
 class PrecedenceClimbing : public Ope {
 public:
-    using BinOpeInfo = std::map<std::string_view, std::pair<size_t, char>>;
+  using BinOpeInfo = std::map<std::string_view, std::pair<size_t, char>>;
 
-    PrecedenceClimbing(const std::shared_ptr<Ope> &atom,
-                       const std::shared_ptr<Ope> &binop, const BinOpeInfo &info,
-                       const Definition &rule)
-        : atom_(atom), binop_(binop), info_(info), rule_(rule) {}
+  PrecedenceClimbing(const std::shared_ptr<Ope> &atom,
+                     const std::shared_ptr<Ope> &binop, const BinOpeInfo &info,
+                     const Definition &rule)
+      : atom_(atom), binop_(binop), info_(info), rule_(rule) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                      std::any &dt) const override {
-        return parse_expression(s, n, vs, c, dt, 0);
-    }
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override {
+    return parse_expression(s, n, vs, c, dt, 0);
+  }
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    std::shared_ptr<Ope> atom_;
-    std::shared_ptr<Ope> binop_;
-    BinOpeInfo info_;
-    const Definition &rule_;
+  std::shared_ptr<Ope> atom_;
+  std::shared_ptr<Ope> binop_;
+  BinOpeInfo info_;
+  // Owned backing storage for info_ keys when this node is built by
+  // GrammarBlob::deserialize. Grammars parsed from source leave this empty and
+  // point info_ keys into the retained grammar text instead.
+  std::vector<std::string> info_keys_;
+  const Definition &rule_;
 
 private:
-    size_t parse_expression(const char *s, size_t n, SemanticValues &vs,
-                            Context &c, std::any &dt, size_t min_prec) const;
+  size_t parse_expression(const char *s, size_t n, SemanticValues &vs,
+                          Context &c, std::any &dt, size_t min_prec) const;
 
-    Definition &get_reference_for_binop(Context &c) const;
+  Definition &get_reference_for_binop(Context &c) const;
 };
 
 class Recovery : public Ope {
 public:
-    Recovery(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
+  Recovery(const std::shared_ptr<Ope> &ope) : ope_(ope) {}
 
-    size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
-                      std::any &dt) const override;
+  size_t parse_core(const char *s, size_t n, SemanticValues &vs, Context &c,
+                    std::any &dt) const override;
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 
-    std::shared_ptr<Ope> ope_;
+  std::shared_ptr<Ope> ope_;
 };
 
 class Cut : public Ope, public std::enable_shared_from_this<Cut> {
 public:
-    size_t parse_core(const char * /*s*/, size_t /*n*/, SemanticValues & /*vs*/,
-                      Context &c, std::any & /*dt*/) const override {
-        if (!c.cut_stack.empty()) { c.cut_stack.back() = true; }
-        return 0;
-    }
+  size_t parse_core(const char * /*s*/, size_t /*n*/, SemanticValues & /*vs*/,
+                    Context &c, std::any & /*dt*/) const override {
+    if (!c.cut_stack.empty()) { c.cut_stack.back() = true; }
+    return 0;
+  }
 
-    void accept(Visitor &v) override;
+  void accept(Visitor &v) override;
 };
 
 /*
  * Factories
  */
 template <typename... Args> std::shared_ptr<Ope> seq(Args &&...args) {
-    return std::make_shared<Sequence>(static_cast<std::shared_ptr<Ope>>(args)...);
+  return std::make_shared<Sequence>(static_cast<std::shared_ptr<Ope>>(args)...);
 }
 
 template <typename... Args> std::shared_ptr<Ope> cho(Args &&...args) {
-    return std::make_shared<PrioritizedChoice>(
-        false, static_cast<std::shared_ptr<Ope>>(args)...);
+  return std::make_shared<PrioritizedChoice>(
+      false, static_cast<std::shared_ptr<Ope>>(args)...);
 }
 
 template <typename... Args> std::shared_ptr<Ope> cho4label_(Args &&...args) {
-    return std::make_shared<PrioritizedChoice>(
-        true, static_cast<std::shared_ptr<Ope>>(args)...);
+  return std::make_shared<PrioritizedChoice>(
+      true, static_cast<std::shared_ptr<Ope>>(args)...);
 }
 
 inline std::shared_ptr<Ope> zom(const std::shared_ptr<Ope> &ope) {
-    return Repetition::zom(ope);
+  return Repetition::zom(ope);
 }
 
 inline std::shared_ptr<Ope> oom(const std::shared_ptr<Ope> &ope) {
-    return Repetition::oom(ope);
+  return Repetition::oom(ope);
 }
 
 inline std::shared_ptr<Ope> opt(const std::shared_ptr<Ope> &ope) {
-    return Repetition::opt(ope);
+  return Repetition::opt(ope);
 }
 
 inline std::shared_ptr<Ope> rep(const std::shared_ptr<Ope> &ope, size_t min,
                                 size_t max) {
-    return std::make_shared<Repetition>(ope, min, max);
+  return std::make_shared<Repetition>(ope, min, max);
 }
 
 inline std::shared_ptr<Ope> apd(const std::shared_ptr<Ope> &ope) {
-    return std::make_shared<AndPredicate>(ope);
+  return std::make_shared<AndPredicate>(ope);
 }
 
 inline std::shared_ptr<Ope> npd(const std::shared_ptr<Ope> &ope) {
-    return std::make_shared<NotPredicate>(ope);
+  return std::make_shared<NotPredicate>(ope);
 }
 
 inline std::shared_ptr<Ope> dic(const std::vector<std::string> &v,
                                 bool ignore_case) {
-    return std::make_shared<Dictionary>(v, ignore_case);
+  return std::make_shared<Dictionary>(v, ignore_case);
 }
 
 inline std::shared_ptr<Ope> lit(std::string &&s) {
-    return std::make_shared<LiteralString>(s, false);
+  return std::make_shared<LiteralString>(s, false);
 }
 
 inline std::shared_ptr<Ope> liti(std::string &&s) {
-    return std::make_shared<LiteralString>(s, true);
+  return std::make_shared<LiteralString>(s, true);
 }
 
 inline std::shared_ptr<Ope> cls(const std::string &s) {
-    return std::make_shared<CharacterClass>(s, false, false);
+  return std::make_shared<CharacterClass>(s, false, false);
 }
 
 inline std::shared_ptr<Ope>
 cls(const std::vector<std::pair<char32_t, char32_t>> &ranges,
     bool ignore_case = false) {
-    return std::make_shared<CharacterClass>(ranges, false, ignore_case);
+  return std::make_shared<CharacterClass>(ranges, false, ignore_case);
 }
 
 inline std::shared_ptr<Ope> ncls(const std::string &s) {
-    return std::make_shared<CharacterClass>(s, true, false);
+  return std::make_shared<CharacterClass>(s, true, false);
 }
 
 inline std::shared_ptr<Ope>
 ncls(const std::vector<std::pair<char32_t, char32_t>> &ranges,
      bool ignore_case = false) {
-    return std::make_shared<CharacterClass>(ranges, true, ignore_case);
+  return std::make_shared<CharacterClass>(ranges, true, ignore_case);
 }
 
-inline std::shared_ptr<Ope> chr(char dt) {
-    return std::make_shared<Character>(dt);
+inline std::shared_ptr<Ope> chr(char32_t dt) {
+  return std::make_shared<Character>(dt);
 }
 
 inline std::shared_ptr<Ope> dot() { return std::make_shared<AnyCharacter>(); }
 
 inline std::shared_ptr<Ope> csc(const std::shared_ptr<Ope> &ope) {
-    return std::make_shared<CaptureScope>(ope);
+  return std::make_shared<CaptureScope>(ope);
 }
 
 inline std::shared_ptr<Ope> cap(const std::shared_ptr<Ope> &ope,
                                 Capture::MatchAction ma) {
-    return std::make_shared<Capture>(ope, ma);
+  return std::make_shared<Capture>(ope, ma);
 }
 
 inline std::shared_ptr<Ope> tok(const std::shared_ptr<Ope> &ope) {
-    return std::make_shared<TokenBoundary>(ope);
+  return std::make_shared<TokenBoundary>(ope);
 }
 
 inline std::shared_ptr<Ope> ign(const std::shared_ptr<Ope> &ope) {
-    return std::make_shared<Ignore>(ope);
+  return std::make_shared<Ignore>(ope);
 }
 
 inline std::shared_ptr<Ope>
 usr(std::function<size_t(const char *s, size_t n, SemanticValues &vs,
                          std::any &dt)>
         fn) {
-    return std::make_shared<User>(fn);
+  return std::make_shared<User>(fn);
 }
 
 inline std::shared_ptr<Ope> ref(const Grammar &grammar, const std::string &name,
                                 const char *s, bool is_macro,
                                 const std::vector<std::shared_ptr<Ope>> &args) {
-    return std::make_shared<Reference>(grammar, name, s, is_macro, args);
+  return std::make_shared<Reference>(grammar, name, s, is_macro, args);
 }
 
 inline std::shared_ptr<Ope> wsp(const std::shared_ptr<Ope> &ope) {
-    return std::make_shared<Whitespace>(std::make_shared<Ignore>(ope));
+  return std::make_shared<Whitespace>(std::make_shared<Ignore>(ope));
 }
 
 inline std::shared_ptr<Ope> bkr(std::string &&name) {
-    return std::make_shared<BackReference>(name);
+  return std::make_shared<BackReference>(name);
 }
 
 inline std::shared_ptr<Ope> pre(const std::shared_ptr<Ope> &atom,
                                 const std::shared_ptr<Ope> &binop,
                                 const PrecedenceClimbing::BinOpeInfo &info,
                                 const Definition &rule) {
-    return std::make_shared<PrecedenceClimbing>(atom, binop, info, rule);
+  return std::make_shared<PrecedenceClimbing>(atom, binop, info, rule);
 }
 
 inline std::shared_ptr<Ope> rec(const std::shared_ptr<Ope> &ope) {
-    return std::make_shared<Recovery>(ope);
+  return std::make_shared<Recovery>(ope);
 }
 
 inline std::shared_ptr<Ope> cut() { return std::make_shared<Cut>(); }
@@ -1686,511 +2258,737 @@ inline std::shared_ptr<Ope> cut() { return std::make_shared<Cut>(); }
  * Visitor
  */
 struct Ope::Visitor {
-    virtual ~Visitor() {}
-    virtual void visit(Sequence &) {}
-    virtual void visit(PrioritizedChoice &) {}
-    virtual void visit(Repetition &) {}
-    virtual void visit(AndPredicate &) {}
-    virtual void visit(NotPredicate &) {}
-    virtual void visit(Dictionary &) {}
-    virtual void visit(LiteralString &) {}
-    virtual void visit(CharacterClass &) {}
-    virtual void visit(Character &) {}
-    virtual void visit(AnyCharacter &) {}
-    virtual void visit(CaptureScope &) {}
-    virtual void visit(Capture &) {}
-    virtual void visit(TokenBoundary &) {}
-    virtual void visit(Ignore &) {}
-    virtual void visit(User &) {}
-    virtual void visit(WeakHolder &) {}
-    virtual void visit(Holder &) {}
-    virtual void visit(Reference &) {}
-    virtual void visit(Whitespace &) {}
-    virtual void visit(BackReference &) {}
-    virtual void visit(PrecedenceClimbing &) {}
-    virtual void visit(Recovery &) {}
-    virtual void visit(Cut &) {}
+  virtual ~Visitor() {}
+  virtual void visit(Sequence &) {}
+  virtual void visit(PrioritizedChoice &) {}
+  virtual void visit(Repetition &) {}
+  virtual void visit(AndPredicate &) {}
+  virtual void visit(NotPredicate &) {}
+  virtual void visit(Dictionary &) {}
+  virtual void visit(LiteralString &) {}
+  virtual void visit(CharacterClass &) {}
+  virtual void visit(Character &) {}
+  virtual void visit(AnyCharacter &) {}
+  virtual void visit(CaptureScope &) {}
+  virtual void visit(Capture &) {}
+  virtual void visit(TokenBoundary &) {}
+  virtual void visit(Ignore &) {}
+  virtual void visit(User &) {}
+  virtual void visit(WeakHolder &) {}
+  virtual void visit(Holder &) {}
+  virtual void visit(Reference &) {}
+  virtual void visit(Whitespace &) {}
+  virtual void visit(BackReference &) {}
+  virtual void visit(PrecedenceClimbing &) {}
+  virtual void visit(Recovery &) {}
+  virtual void visit(Cut &) {}
+};
+
+struct TraversalVisitor : public Ope::Visitor {
+  using Ope::Visitor::visit;
+  void visit(Sequence &ope) override {
+    for (auto &op : ope.opes_) {
+      op->accept(*this);
+    }
+  }
+  void visit(PrioritizedChoice &ope) override {
+    for (auto &op : ope.opes_) {
+      op->accept(*this);
+    }
+  }
+  void visit(Repetition &ope) override { ope.ope_->accept(*this); }
+  void visit(AndPredicate &ope) override { ope.ope_->accept(*this); }
+  void visit(NotPredicate &ope) override { ope.ope_->accept(*this); }
+  void visit(CaptureScope &ope) override { ope.ope_->accept(*this); }
+  void visit(Capture &ope) override { ope.ope_->accept(*this); }
+  void visit(TokenBoundary &ope) override { ope.ope_->accept(*this); }
+  void visit(Ignore &ope) override { ope.ope_->accept(*this); }
+  void visit(WeakHolder &ope) override { ope.weak_.lock()->accept(*this); }
+  void visit(Holder &ope) override { ope.ope_->accept(*this); }
+  void visit(Whitespace &ope) override { ope.ope_->accept(*this); }
+  void visit(Recovery &ope) override { ope.ope_->accept(*this); }
+  void visit(PrecedenceClimbing &ope) override { ope.atom_->accept(*this); }
 };
 
 struct TraceOpeName : public Ope::Visitor {
-    using Ope::Visitor::visit;
+  using Ope::Visitor::visit;
 
-    void visit(Sequence &) override { name_ = "Sequence"; }
-    void visit(PrioritizedChoice &) override { name_ = "PrioritizedChoice"; }
-    void visit(Repetition &) override { name_ = "Repetition"; }
-    void visit(AndPredicate &) override { name_ = "AndPredicate"; }
-    void visit(NotPredicate &) override { name_ = "NotPredicate"; }
-    void visit(Dictionary &) override { name_ = "Dictionary"; }
-    void visit(LiteralString &) override { name_ = "LiteralString"; }
-    void visit(CharacterClass &) override { name_ = "CharacterClass"; }
-    void visit(Character &) override { name_ = "Character"; }
-    void visit(AnyCharacter &) override { name_ = "AnyCharacter"; }
-    void visit(CaptureScope &) override { name_ = "CaptureScope"; }
-    void visit(Capture &) override { name_ = "Capture"; }
-    void visit(TokenBoundary &) override { name_ = "TokenBoundary"; }
-    void visit(Ignore &) override { name_ = "Ignore"; }
-    void visit(User &) override { name_ = "User"; }
-    void visit(WeakHolder &) override { name_ = "WeakHolder"; }
-    void visit(Holder &ope) override { name_ = ope.trace_name().data(); }
-    void visit(Reference &) override { name_ = "Reference"; }
-    void visit(Whitespace &) override { name_ = "Whitespace"; }
-    void visit(BackReference &) override { name_ = "BackReference"; }
-    void visit(PrecedenceClimbing &) override { name_ = "PrecedenceClimbing"; }
-    void visit(Recovery &) override { name_ = "Recovery"; }
-    void visit(Cut &) override { name_ = "Cut"; }
+  void visit(Sequence &) override { name_ = "Sequence"; }
+  void visit(PrioritizedChoice &) override { name_ = "PrioritizedChoice"; }
+  void visit(Repetition &) override { name_ = "Repetition"; }
+  void visit(AndPredicate &) override { name_ = "AndPredicate"; }
+  void visit(NotPredicate &) override { name_ = "NotPredicate"; }
+  void visit(Dictionary &) override { name_ = "Dictionary"; }
+  void visit(LiteralString &) override { name_ = "LiteralString"; }
+  void visit(CharacterClass &) override { name_ = "CharacterClass"; }
+  void visit(Character &) override { name_ = "Character"; }
+  void visit(AnyCharacter &) override { name_ = "AnyCharacter"; }
+  void visit(CaptureScope &) override { name_ = "CaptureScope"; }
+  void visit(Capture &) override { name_ = "Capture"; }
+  void visit(TokenBoundary &) override { name_ = "TokenBoundary"; }
+  void visit(Ignore &) override { name_ = "Ignore"; }
+  void visit(User &) override { name_ = "User"; }
+  void visit(WeakHolder &) override { name_ = "WeakHolder"; }
+  void visit(Holder &ope) override { name_ = ope.trace_name().data(); }
+  void visit(Reference &) override { name_ = "Reference"; }
+  void visit(Whitespace &) override { name_ = "Whitespace"; }
+  void visit(BackReference &) override { name_ = "BackReference"; }
+  void visit(PrecedenceClimbing &) override { name_ = "PrecedenceClimbing"; }
+  void visit(Recovery &) override { name_ = "Recovery"; }
+  void visit(Cut &) override { name_ = "Cut"; }
 
-    static std::string get(Ope &ope) {
-        TraceOpeName vis;
-        ope.accept(vis);
-        return vis.name_;
-    }
+  static std::string get(Ope &ope) {
+    TraceOpeName vis;
+    ope.accept(vis);
+    return vis.name_;
+  }
 
 private:
-    const char *name_ = nullptr;
+  const char *name_ = nullptr;
 };
 
-struct AssignIDToDefinition : public Ope::Visitor {
-    using Ope::Visitor::visit;
+struct AssignIDToDefinition : public TraversalVisitor {
+  using TraversalVisitor::visit;
 
-    void visit(Sequence &ope) override {
-        for (auto op : ope.opes_) {
-            op->accept(*this);
-        }
-    }
-    void visit(PrioritizedChoice &ope) override {
-        for (auto op : ope.opes_) {
-            op->accept(*this);
-        }
-    }
-    void visit(Repetition &ope) override { ope.ope_->accept(*this); }
-    void visit(AndPredicate &ope) override { ope.ope_->accept(*this); }
-    void visit(NotPredicate &ope) override { ope.ope_->accept(*this); }
-    void visit(CaptureScope &ope) override { ope.ope_->accept(*this); }
-    void visit(Capture &ope) override { ope.ope_->accept(*this); }
-    void visit(TokenBoundary &ope) override { ope.ope_->accept(*this); }
-    void visit(Ignore &ope) override { ope.ope_->accept(*this); }
-    void visit(WeakHolder &ope) override { ope.weak_.lock()->accept(*this); }
-    void visit(Holder &ope) override;
-    void visit(Reference &ope) override;
-    void visit(Whitespace &ope) override { ope.ope_->accept(*this); }
-    void visit(PrecedenceClimbing &ope) override;
-    void visit(Recovery &ope) override { ope.ope_->accept(*this); }
+  void visit(Holder &ope) override;
+  void visit(Reference &ope) override;
+  void visit(PrecedenceClimbing &ope) override;
 
-    std::unordered_map<void *, size_t> ids;
+  std::unordered_map<void *, size_t> ids;
 };
 
 struct IsLiteralToken : public Ope::Visitor {
-    using Ope::Visitor::visit;
+  using Ope::Visitor::visit;
 
-    void visit(PrioritizedChoice &ope) override {
-        for (auto op : ope.opes_) {
-            if (!IsLiteralToken::check(*op)) { return; }
-        }
-        result_ = true;
+  void visit(PrioritizedChoice &ope) override {
+    for (const auto &op : ope.opes_) {
+      if (!IsLiteralToken::check(*op)) { return; }
     }
+    result_ = true;
+  }
 
-    void visit(Dictionary &) override { result_ = true; }
-    void visit(LiteralString &) override { result_ = true; }
+  void visit(Dictionary &) override { result_ = true; }
+  void visit(LiteralString &) override { result_ = true; }
 
-    static bool check(Ope &ope) {
-        IsLiteralToken vis;
-        ope.accept(vis);
-        return vis.result_;
-    }
+  static bool check(Ope &ope) {
+    IsLiteralToken vis;
+    ope.accept(vis);
+    return vis.result_;
+  }
 
 private:
-    bool result_ = false;
+  bool result_ = false;
 };
 
-struct TokenChecker : public Ope::Visitor {
-    using Ope::Visitor::visit;
+struct TokenChecker : public TraversalVisitor {
+  using TraversalVisitor::visit;
 
-    void visit(Sequence &ope) override {
-        for (auto op : ope.opes_) {
-            op->accept(*this);
-        }
-    }
-    void visit(PrioritizedChoice &ope) override {
-        for (auto op : ope.opes_) {
-            op->accept(*this);
-        }
-    }
-    void visit(Repetition &ope) override { ope.ope_->accept(*this); }
-    void visit(CaptureScope &ope) override { ope.ope_->accept(*this); }
-    void visit(Capture &ope) override { ope.ope_->accept(*this); }
-    void visit(TokenBoundary &) override { has_token_boundary_ = true; }
-    void visit(Ignore &ope) override { ope.ope_->accept(*this); }
-    void visit(WeakHolder &) override { has_rule_ = true; }
-    void visit(Holder &ope) override { ope.ope_->accept(*this); }
-    void visit(Reference &ope) override;
-    void visit(Whitespace &ope) override { ope.ope_->accept(*this); }
-    void visit(PrecedenceClimbing &ope) override { ope.atom_->accept(*this); }
-    void visit(Recovery &ope) override { ope.ope_->accept(*this); }
+  void visit(TokenBoundary &) override { has_token_boundary_ = true; }
+  void visit(AndPredicate &) override {}
+  void visit(NotPredicate &) override {}
+  void visit(WeakHolder &) override { has_rule_ = true; }
+  void visit(Reference &ope) override;
 
-    static bool is_token(Ope &ope) {
-        if (IsLiteralToken::check(ope)) { return true; }
+  static bool is_token(Ope &ope) {
+    if (IsLiteralToken::check(ope)) { return true; }
 
-        TokenChecker vis;
-        ope.accept(vis);
-        return vis.has_token_boundary_ || !vis.has_rule_;
-    }
+    TokenChecker vis;
+    ope.accept(vis);
+    return vis.has_token_boundary_ || !vis.has_rule_;
+  }
 
 private:
-    bool has_token_boundary_ = false;
-    bool has_rule_ = false;
+  bool has_token_boundary_ = false;
+  bool has_rule_ = false;
 };
 
 struct FindLiteralToken : public Ope::Visitor {
-    using Ope::Visitor::visit;
+  using Ope::Visitor::visit;
 
-    void visit(LiteralString &ope) override { token_ = ope.lit_.data(); }
-    void visit(TokenBoundary &ope) override { ope.ope_->accept(*this); }
-    void visit(Ignore &ope) override { ope.ope_->accept(*this); }
-    void visit(Reference &ope) override;
-    void visit(Recovery &ope) override { ope.ope_->accept(*this); }
+  void visit(LiteralString &ope) override { token_ = ope.lit_.data(); }
+  void visit(TokenBoundary &ope) override { ope.ope_->accept(*this); }
+  void visit(Ignore &ope) override { ope.ope_->accept(*this); }
+  void visit(Reference &ope) override;
+  void visit(Recovery &ope) override { ope.ope_->accept(*this); }
 
-    static const char *token(Ope &ope) {
-        FindLiteralToken vis;
-        ope.accept(vis);
-        return vis.token_;
-    }
+  static const char *token(Ope &ope) {
+    FindLiteralToken vis;
+    ope.accept(vis);
+    return vis.token_;
+  }
 
 private:
-    const char *token_ = nullptr;
+  const char *token_ = nullptr;
 };
 
-struct DetectLeftRecursion : public Ope::Visitor {
-    using Ope::Visitor::visit;
+struct DetectLeftRecursion : public TraversalVisitor {
+  using TraversalVisitor::visit;
 
-    DetectLeftRecursion(const std::string &name) : name_(name) {}
+  DetectLeftRecursion(const std::string &name) : name_(name) {}
 
-    void visit(Sequence &ope) override {
-        for (auto op : ope.opes_) {
-            op->accept(*this);
-            if (done_) {
-                break;
-            } else if (error_s) {
-                done_ = true;
-                break;
-            }
-        }
+  void visit(Sequence &ope) override {
+    for (const auto &op : ope.opes_) {
+      op->accept(*this);
+      if (done_) {
+        break;
+      } else if (error_s) {
+        done_ = true;
+        break;
+      }
     }
-    void visit(PrioritizedChoice &ope) override {
-        for (auto op : ope.opes_) {
-            op->accept(*this);
-            if (error_s) {
-                done_ = true;
-                break;
-            }
-        }
+  }
+  void visit(PrioritizedChoice &ope) override {
+    for (const auto &op : ope.opes_) {
+      op->accept(*this);
+      if (error_s) {
+        done_ = true;
+        break;
+      }
     }
-    void visit(Repetition &ope) override {
-        ope.ope_->accept(*this);
-        done_ = ope.min_ > 0;
-    }
-    void visit(AndPredicate &ope) override {
-        ope.ope_->accept(*this);
-        done_ = false;
-    }
-    void visit(NotPredicate &ope) override {
-        ope.ope_->accept(*this);
-        done_ = false;
-    }
-    void visit(Dictionary &) override { done_ = true; }
-    void visit(LiteralString &ope) override { done_ = !ope.lit_.empty(); }
-    void visit(CharacterClass &) override { done_ = true; }
-    void visit(Character &) override { done_ = true; }
-    void visit(AnyCharacter &) override { done_ = true; }
-    void visit(CaptureScope &ope) override { ope.ope_->accept(*this); }
-    void visit(Capture &ope) override { ope.ope_->accept(*this); }
-    void visit(TokenBoundary &ope) override { ope.ope_->accept(*this); }
-    void visit(Ignore &ope) override { ope.ope_->accept(*this); }
-    void visit(User &) override { done_ = true; }
-    void visit(WeakHolder &ope) override { ope.weak_.lock()->accept(*this); }
-    void visit(Holder &ope) override { ope.ope_->accept(*this); }
-    void visit(Reference &ope) override;
-    void visit(Whitespace &ope) override { ope.ope_->accept(*this); }
-    void visit(BackReference &) override { done_ = true; }
-    void visit(PrecedenceClimbing &ope) override { ope.atom_->accept(*this); }
-    void visit(Recovery &ope) override { ope.ope_->accept(*this); }
-    void visit(Cut &) override { done_ = true; }
+  }
+  void visit(Repetition &ope) override {
+    ope.ope_->accept(*this);
+    done_ = ope.min_ > 0;
+  }
+  void visit(AndPredicate &ope) override {
+    ope.ope_->accept(*this);
+    done_ = false;
+  }
+  void visit(NotPredicate &ope) override {
+    ope.ope_->accept(*this);
+    done_ = false;
+  }
+  void visit(Dictionary &) override { done_ = true; }
+  void visit(LiteralString &ope) override { done_ = !ope.lit_.empty(); }
+  void visit(CharacterClass &) override { done_ = true; }
+  void visit(Character &) override { done_ = true; }
+  void visit(AnyCharacter &) override { done_ = true; }
+  void visit(User &) override { done_ = true; }
+  void visit(Reference &ope) override;
+  void visit(BackReference &) override { done_ = true; }
+  void visit(Cut &) override { done_ = true; }
 
-    const char *error_s = nullptr;
+  const char *error_s = nullptr;
+
+  // What a bare parameter reference denotes, plus the frame it was found at
+  // -- see visit_in_defining_scope.
+  struct ResolvedArg {
+    std::shared_ptr<Ope> ope;
+    size_t depth = 0;
+  };
+  ResolvedArg resolve_macro_arg(size_t iarg) const;
+  void visit_in_defining_scope(const ResolvedArg &arg);
+
+  // A macro's body depends on its arguments, so "already visited" has to be
+  // per instantiation, not per name: in `A <- W('z') / W(A)`, visiting W with
+  // 'z' says nothing about W with A. Instantiations are identified by their
+  // resolved arguments, the same way as at parse time.
+  size_t intern_macro_inst(const Reference &ope);
+
+  // A macro that instantiates itself with a growing argument
+  // (`M(s) <- M(s / 'x')`) has no finite set of instantiations. Stop
+  // descending instead of looping forever; the rule is then reported as
+  // non-left-recursive, which is what this analysis did for every macro
+  // before it became instantiation-aware. The bound is on nesting depth in
+  // general, not self-recursion specifically, so it also caps any other
+  // chain of nested macro calls -- generously, for real grammars.
+  static const size_t max_macro_inst_depth = 32;
 
 private:
-    std::string name_;
-    std::unordered_set<std::string> refs_;
-    bool done_ = false;
+  std::string name_;
+  std::set<std::pair<const Definition *, size_t>> refs_;
+  std::map<std::vector<const void *>, size_t> macro_inst_ids_;
+  size_t next_macro_inst_ = 1;
+  bool done_ = false;
+  std::vector<const std::vector<std::shared_ptr<Ope>> *> macro_args_stack_;
 };
 
-struct HasEmptyElement : public Ope::Visitor {
-    using Ope::Visitor::visit;
+struct ComputeCanBeEmpty : public TraversalVisitor {
+  using TraversalVisitor::visit;
 
-    HasEmptyElement(std::vector<std::pair<const char *, std::string>> &refs,
-                    std::unordered_map<std::string, bool> &has_error_cache)
-        : refs_(refs), has_error_cache_(has_error_cache) {}
+  bool result = false;
 
-    void visit(Sequence &ope) override;
-    void visit(PrioritizedChoice &ope) override {
-        for (auto op : ope.opes_) {
-            op->accept(*this);
-            if (is_empty) { return; }
-        }
-    }
-    void visit(Repetition &ope) override {
-        if (ope.min_ == 0) {
-            set_error();
-        } else {
-            ope.ope_->accept(*this);
-        }
-    }
-    void visit(AndPredicate &) override { set_error(); }
-    void visit(NotPredicate &) override { set_error(); }
-    void visit(LiteralString &ope) override {
-        if (ope.lit_.empty()) { set_error(); }
-    }
-    void visit(CaptureScope &ope) override { ope.ope_->accept(*this); }
-    void visit(Capture &ope) override { ope.ope_->accept(*this); }
-    void visit(TokenBoundary &ope) override { ope.ope_->accept(*this); }
-    void visit(Ignore &ope) override { ope.ope_->accept(*this); }
-    void visit(WeakHolder &ope) override { ope.weak_.lock()->accept(*this); }
-    void visit(Holder &ope) override { ope.ope_->accept(*this); }
-    void visit(Reference &ope) override;
-    void visit(Whitespace &ope) override { ope.ope_->accept(*this); }
-    void visit(PrecedenceClimbing &ope) override { ope.atom_->accept(*this); }
-    void visit(Recovery &ope) override { ope.ope_->accept(*this); }
-
-    bool is_empty = false;
-    const char *error_s = nullptr;
-    std::string error_name;
-
-private:
-    void set_error() {
-        is_empty = true;
-        tie(error_s, error_name) = refs_.back();
-    }
-    std::vector<std::pair<const char *, std::string>> &refs_;
-    std::unordered_map<std::string, bool> &has_error_cache_;
+  void visit(Sequence &ope) override {
+    result = std::all_of(ope.opes_.begin(), ope.opes_.end(), [](auto &op) {
+      ComputeCanBeEmpty vis;
+      op->accept(vis);
+      return vis.result;
+    });
+  }
+  void visit(PrioritizedChoice &ope) override {
+    result = std::any_of(ope.opes_.begin(), ope.opes_.end(), [](auto &op) {
+      ComputeCanBeEmpty vis;
+      op->accept(vis);
+      return vis.result;
+    });
+  }
+  void visit(Repetition &ope) override { result = ope.min_ == 0; }
+  void visit(AndPredicate &) override { result = true; }
+  void visit(NotPredicate &) override { result = true; }
+  void visit(Dictionary &) override { result = false; }
+  void visit(LiteralString &ope) override { result = ope.lit_.empty(); }
+  void visit(CharacterClass &) override { result = false; }
+  void visit(Character &) override { result = false; }
+  void visit(AnyCharacter &) override { result = false; }
+  void visit(User &) override { result = false; }
+  void visit(Reference &ope) override;
+  void visit(BackReference &) override { result = false; }
+  void visit(Cut &) override { result = false; }
 };
 
-struct DetectInfiniteLoop : public Ope::Visitor {
-    using Ope::Visitor::visit;
+// Structural signature of an Ope. Two alternatives whose first k elements
+// have equal signatures consume the same text, so their (k+1)-th elements
+// start at the same position. Opes whose state cannot be serialized get
+// their address instead: that only ever reads as "these differ", which
+// costs an optimization rather than adding one.
+struct OpeSignature : public Ope::Visitor {
+  using Ope::Visitor::visit;
+  std::string s;
 
-    DetectInfiniteLoop(const char *s, const std::string &name,
-                       std::vector<std::pair<const char *, std::string>> &refs,
-                       std::unordered_map<std::string, bool> &has_error_cache)
-        : refs_(refs), has_error_cache_(has_error_cache) {
-        refs_.emplace_back(s, name);
+  void visit(Sequence &ope) override { group("seq", ope.opes_); }
+  void visit(PrioritizedChoice &ope) override { group("cho", ope.opes_); }
+  void visit(Repetition &ope) override {
+    s += "(rep " + std::to_string(ope.min_) + " " +
+         (ope.max_ == std::numeric_limits<size_t>::max()
+              ? std::string("inf")
+              : std::to_string(ope.max_));
+    wrap(*ope.ope_);
+  }
+  void visit(AndPredicate &ope) override { unary("and", *ope.ope_); }
+  void visit(NotPredicate &ope) override { unary("not", *ope.ope_); }
+  void visit(CaptureScope &ope) override { unary("cps", *ope.ope_); }
+  void visit(Capture &ope) override { unary("cap", *ope.ope_); }
+  void visit(TokenBoundary &ope) override { unary("tok", *ope.ope_); }
+  void visit(Ignore &ope) override { unary("ign", *ope.ope_); }
+  void visit(Whitespace &ope) override { unary("wsp", *ope.ope_); }
+  void visit(Recovery &ope) override { unary("rec", *ope.ope_); }
+  // A rule is named, never expanded — that is what keeps a recursive
+  // grammar's signature finite. WeakHolder only ever wraps a Holder, so
+  // descending through it lands on a name too.
+  void visit(Holder &ope) override { s += "(hld " + ope.name() + ")"; }
+  void visit(WeakHolder &ope) override {
+    if (auto p = ope.weak_.lock()) {
+      unary("wek", *p);
+    } else {
+      opaque(&ope);
     }
+  }
+  void visit(Reference &ope) override {
+    s += "(ref " + ope.name_;
+    for (auto &arg : ope.args_) {
+      s += ' ';
+      arg->accept(*this);
+    }
+    s += ')';
+  }
+  void visit(LiteralString &ope) override {
+    s += "(lit " + std::to_string(ope.ignore_case_) + " " + ope.lit_ + ")";
+  }
+  void visit(CharacterClass &ope) override {
+    s += "(cls " + std::to_string(ope.negated_) + " " +
+         std::to_string(ope.ignore_case_);
+    for (const auto &[lo, hi] : ope.ranges_) {
+      s += " " + std::to_string(static_cast<uint32_t>(lo)) + "-" +
+           std::to_string(static_cast<uint32_t>(hi));
+    }
+    s += ')';
+  }
+  void visit(Character &ope) override {
+    s += "(chr " + std::to_string(static_cast<uint32_t>(ope.ch_)) + ")";
+  }
+  void visit(AnyCharacter &) override { s += "(any)"; }
+  void visit(Dictionary &ope) override { opaque(&ope); }
+  void visit(User &ope) override { opaque(&ope); }
+  void visit(BackReference &ope) override { opaque(&ope); }
+  void visit(PrecedenceClimbing &ope) override { opaque(&ope); }
+  void visit(Cut &ope) override { opaque(&ope); }
 
-    DetectInfiniteLoop(std::vector<std::pair<const char *, std::string>> &refs,
-                       std::unordered_map<std::string, bool> &has_error_cache)
-        : refs_(refs), has_error_cache_(has_error_cache) {}
-
-    void visit(Sequence &ope) override {
-        for (auto op : ope.opes_) {
-            op->accept(*this);
-            if (has_error) { return; }
-        }
-    }
-    void visit(PrioritizedChoice &ope) override {
-        for (auto op : ope.opes_) {
-            op->accept(*this);
-            if (has_error) { return; }
-        }
-    }
-    void visit(Repetition &ope) override {
-        if (ope.max_ == std::numeric_limits<size_t>::max()) {
-            HasEmptyElement vis(refs_, has_error_cache_);
-            ope.ope_->accept(vis);
-            if (vis.is_empty) {
-                has_error = true;
-                error_s = vis.error_s;
-                error_name = vis.error_name;
-            }
-        } else {
-            ope.ope_->accept(*this);
-        }
-    }
-    void visit(AndPredicate &ope) override { ope.ope_->accept(*this); }
-    void visit(NotPredicate &ope) override { ope.ope_->accept(*this); }
-    void visit(CaptureScope &ope) override { ope.ope_->accept(*this); }
-    void visit(Capture &ope) override { ope.ope_->accept(*this); }
-    void visit(TokenBoundary &ope) override { ope.ope_->accept(*this); }
-    void visit(Ignore &ope) override { ope.ope_->accept(*this); }
-    void visit(WeakHolder &ope) override { ope.weak_.lock()->accept(*this); }
-    void visit(Holder &ope) override { ope.ope_->accept(*this); }
-    void visit(Reference &ope) override;
-    void visit(Whitespace &ope) override { ope.ope_->accept(*this); }
-    void visit(PrecedenceClimbing &ope) override { ope.atom_->accept(*this); }
-    void visit(Recovery &ope) override { ope.ope_->accept(*this); }
-
-    bool has_error = false;
-    const char *error_s = nullptr;
-    std::string error_name;
+  static std::string get(Ope &ope) {
+    OpeSignature vis;
+    ope.accept(vis);
+    return std::move(vis.s);
+  }
 
 private:
-    std::vector<std::pair<const char *, std::string>> &refs_;
-    std::unordered_map<std::string, bool> &has_error_cache_;
+  void group(const char *tag, const std::vector<std::shared_ptr<Ope>> &v) {
+    s += '(';
+    s += tag;
+    for (const auto &op : v) {
+      s += ' ';
+      op->accept(*this);
+    }
+    s += ')';
+  }
+  void unary(const char *tag, Ope &inner) {
+    s += '(';
+    s += tag;
+    wrap(inner);
+  }
+  void wrap(Ope &inner) {
+    s += ' ';
+    inner.accept(*this);
+    s += ')';
+  }
+  void opaque(const void *p) {
+    s += "(opq " + std::to_string(reinterpret_cast<std::uintptr_t>(p)) + ")";
+  }
 };
 
-struct ReferenceChecker : public Ope::Visitor {
-    using Ope::Visitor::visit;
+struct HasEmptyElement : public TraversalVisitor {
+  using TraversalVisitor::visit;
 
-    ReferenceChecker(const Grammar &grammar,
-                     const std::vector<std::string> &params)
-        : grammar_(grammar), params_(params) {}
+  HasEmptyElement(std::vector<std::pair<const char *, std::string>> &refs,
+                  std::unordered_map<std::string, bool> &has_error_cache)
+      : refs_(refs), has_error_cache_(has_error_cache) {}
 
-    void visit(Sequence &ope) override {
-        for (auto op : ope.opes_) {
-            op->accept(*this);
-        }
+  void visit(Sequence &ope) override;
+  void visit(PrioritizedChoice &ope) override {
+    for (const auto &op : ope.opes_) {
+      op->accept(*this);
+      if (is_empty) { return; }
     }
-    void visit(PrioritizedChoice &ope) override {
-        for (auto op : ope.opes_) {
-            op->accept(*this);
-        }
+  }
+  void visit(Repetition &ope) override {
+    if (ope.min_ == 0) {
+      set_error();
+    } else {
+      ope.ope_->accept(*this);
     }
-    void visit(Repetition &ope) override { ope.ope_->accept(*this); }
-    void visit(AndPredicate &ope) override { ope.ope_->accept(*this); }
-    void visit(NotPredicate &ope) override { ope.ope_->accept(*this); }
-    void visit(CaptureScope &ope) override { ope.ope_->accept(*this); }
-    void visit(Capture &ope) override { ope.ope_->accept(*this); }
-    void visit(TokenBoundary &ope) override { ope.ope_->accept(*this); }
-    void visit(Ignore &ope) override { ope.ope_->accept(*this); }
-    void visit(WeakHolder &ope) override { ope.weak_.lock()->accept(*this); }
-    void visit(Holder &ope) override { ope.ope_->accept(*this); }
-    void visit(Reference &ope) override;
-    void visit(Whitespace &ope) override { ope.ope_->accept(*this); }
-    void visit(PrecedenceClimbing &ope) override { ope.atom_->accept(*this); }
-    void visit(Recovery &ope) override { ope.ope_->accept(*this); }
+  }
+  void visit(AndPredicate &) override { set_error(); }
+  void visit(NotPredicate &) override { set_error(); }
+  void visit(LiteralString &ope) override {
+    if (ope.lit_.empty()) { set_error(); }
+  }
+  void visit(Reference &ope) override;
 
-    std::unordered_map<std::string, const char *> error_s;
-    std::unordered_map<std::string, std::string> error_message;
-    std::unordered_set<std::string> referenced;
+  bool is_empty = false;
+  const char *error_s = nullptr;
+  std::string error_name;
 
 private:
-    const Grammar &grammar_;
-    const std::vector<std::string> &params_;
+  void set_error() {
+    is_empty = true;
+    tie(error_s, error_name) = refs_.back();
+  }
+  std::vector<std::pair<const char *, std::string>> &refs_;
+  std::unordered_map<std::string, bool> &has_error_cache_;
 };
 
-struct LinkReferences : public Ope::Visitor {
-    using Ope::Visitor::visit;
+struct DetectInfiniteLoop : public TraversalVisitor {
+  using TraversalVisitor::visit;
 
-    LinkReferences(Grammar &grammar, const std::vector<std::string> &params)
-        : grammar_(grammar), params_(params) {}
+  DetectInfiniteLoop(const char *s, const std::string &name,
+                     std::vector<std::pair<const char *, std::string>> &refs,
+                     std::unordered_map<std::string, bool> &has_error_cache)
+      : refs_(refs), has_error_cache_(has_error_cache) {
+    refs_.emplace_back(s, name);
+  }
 
-    void visit(Sequence &ope) override {
-        for (auto op : ope.opes_) {
-            op->accept(*this);
-        }
+  DetectInfiniteLoop(std::vector<std::pair<const char *, std::string>> &refs,
+                     std::unordered_map<std::string, bool> &has_error_cache)
+      : refs_(refs), has_error_cache_(has_error_cache) {}
+
+  void visit(Sequence &ope) override {
+    for (const auto &op : ope.opes_) {
+      op->accept(*this);
+      if (has_error) { return; }
     }
-    void visit(PrioritizedChoice &ope) override {
-        for (auto op : ope.opes_) {
-            op->accept(*this);
-        }
+  }
+  void visit(PrioritizedChoice &ope) override {
+    for (const auto &op : ope.opes_) {
+      op->accept(*this);
+      if (has_error) { return; }
     }
-    void visit(Repetition &ope) override { ope.ope_->accept(*this); }
-    void visit(AndPredicate &ope) override { ope.ope_->accept(*this); }
-    void visit(NotPredicate &ope) override { ope.ope_->accept(*this); }
-    void visit(CaptureScope &ope) override { ope.ope_->accept(*this); }
-    void visit(Capture &ope) override { ope.ope_->accept(*this); }
-    void visit(TokenBoundary &ope) override { ope.ope_->accept(*this); }
-    void visit(Ignore &ope) override { ope.ope_->accept(*this); }
-    void visit(WeakHolder &ope) override { ope.weak_.lock()->accept(*this); }
-    void visit(Holder &ope) override { ope.ope_->accept(*this); }
-    void visit(Reference &ope) override;
-    void visit(Whitespace &ope) override { ope.ope_->accept(*this); }
-    void visit(PrecedenceClimbing &ope) override { ope.atom_->accept(*this); }
-    void visit(Recovery &ope) override { ope.ope_->accept(*this); }
+  }
+  void visit(Repetition &ope) override {
+    if (ope.max_ == std::numeric_limits<size_t>::max()) {
+      HasEmptyElement vis(refs_, has_error_cache_);
+      ope.ope_->accept(vis);
+      if (vis.is_empty) {
+        has_error = true;
+        error_s = vis.error_s;
+        error_name = vis.error_name;
+      }
+    } else {
+      ope.ope_->accept(*this);
+    }
+  }
+  void visit(Reference &ope) override;
+
+  bool has_error = false;
+  const char *error_s = nullptr;
+  std::string error_name;
 
 private:
-    Grammar &grammar_;
-    const std::vector<std::string> &params_;
+  std::vector<std::pair<const char *, std::string>> &refs_;
+  std::unordered_map<std::string, bool> &has_error_cache_;
+};
+
+struct ReferenceChecker : public TraversalVisitor {
+  using TraversalVisitor::visit;
+
+  ReferenceChecker(const Grammar &grammar,
+                   const std::vector<std::string> &params)
+      : grammar_(grammar), params_(params) {}
+
+  void visit(Reference &ope) override;
+
+  std::unordered_map<std::string, const char *> error_s;
+  std::unordered_map<std::string, std::string> error_message;
+  std::unordered_set<std::string> referenced;
+
+private:
+  const Grammar &grammar_;
+  const std::vector<std::string> &params_;
+};
+
+struct LinkReferences : public TraversalVisitor {
+  using TraversalVisitor::visit;
+
+  LinkReferences(Grammar &grammar, const std::vector<std::string> &params)
+      : grammar_(grammar), params_(params) {}
+
+  void visit(Reference &ope) override;
+
+private:
+  Grammar &grammar_;
+  const std::vector<std::string> &params_;
 };
 
 struct FindReference : public Ope::Visitor {
-    using Ope::Visitor::visit;
+  using Ope::Visitor::visit;
 
-    FindReference(const std::vector<std::shared_ptr<Ope>> &args,
-                  const std::vector<std::string> &params)
-        : args_(args), params_(params) {}
+  FindReference(const std::vector<std::shared_ptr<Ope>> &args,
+                const std::vector<std::string> &params)
+      : args_(args), params_(params) {}
 
-    void visit(Sequence &ope) override {
-        std::vector<std::shared_ptr<Ope>> opes;
-        for (auto o : ope.opes_) {
-            o->accept(*this);
-            opes.push_back(found_ope);
-        }
-        found_ope = std::make_shared<Sequence>(opes);
+  void visit(Sequence &ope) override {
+    std::vector<std::shared_ptr<Ope>> opes;
+    for (const auto &o : ope.opes_) {
+      o->accept(*this);
+      opes.emplace_back(std::move(found_ope));
     }
-    void visit(PrioritizedChoice &ope) override {
-        std::vector<std::shared_ptr<Ope>> opes;
-        for (auto o : ope.opes_) {
-            o->accept(*this);
-            opes.push_back(found_ope);
-        }
-        found_ope = std::make_shared<PrioritizedChoice>(opes);
+    found_ope = std::make_shared<Sequence>(opes);
+  }
+  void visit(PrioritizedChoice &ope) override {
+    std::vector<std::shared_ptr<Ope>> opes;
+    for (const auto &o : ope.opes_) {
+      o->accept(*this);
+      opes.emplace_back(std::move(found_ope));
     }
-    void visit(Repetition &ope) override {
-        ope.ope_->accept(*this);
-        found_ope = rep(found_ope, ope.min_, ope.max_);
-    }
-    void visit(AndPredicate &ope) override {
-        ope.ope_->accept(*this);
-        found_ope = apd(found_ope);
-    }
-    void visit(NotPredicate &ope) override {
-        ope.ope_->accept(*this);
-        found_ope = npd(found_ope);
-    }
-    void visit(Dictionary &ope) override { found_ope = ope.shared_from_this(); }
-    void visit(LiteralString &ope) override {
-        found_ope = ope.shared_from_this();
-    }
-    void visit(CharacterClass &ope) override {
-        found_ope = ope.shared_from_this();
-    }
-    void visit(Character &ope) override { found_ope = ope.shared_from_this(); }
-    void visit(AnyCharacter &ope) override { found_ope = ope.shared_from_this(); }
-    void visit(CaptureScope &ope) override {
-        ope.ope_->accept(*this);
-        found_ope = csc(found_ope);
-    }
-    void visit(Capture &ope) override {
-        ope.ope_->accept(*this);
-        found_ope = cap(found_ope, ope.match_action_);
-    }
-    void visit(TokenBoundary &ope) override {
-        ope.ope_->accept(*this);
-        found_ope = tok(found_ope);
-    }
-    void visit(Ignore &ope) override {
-        ope.ope_->accept(*this);
-        found_ope = ign(found_ope);
-    }
-    void visit(WeakHolder &ope) override { ope.weak_.lock()->accept(*this); }
-    void visit(Holder &ope) override { ope.ope_->accept(*this); }
-    void visit(Reference &ope) override;
-    void visit(Whitespace &ope) override {
-        ope.ope_->accept(*this);
-        found_ope = wsp(found_ope);
-    }
-    void visit(PrecedenceClimbing &ope) override {
-        ope.atom_->accept(*this);
-        found_ope = csc(found_ope);
-    }
-    void visit(Recovery &ope) override {
-        ope.ope_->accept(*this);
-        found_ope = rec(found_ope);
-    }
-    void visit(Cut &ope) override { found_ope = ope.shared_from_this(); }
+    found_ope = std::make_shared<PrioritizedChoice>(opes);
+  }
+  void visit(Repetition &ope) override {
+    ope.ope_->accept(*this);
+    found_ope = rep(found_ope, ope.min_, ope.max_);
+  }
+  void visit(AndPredicate &ope) override {
+    ope.ope_->accept(*this);
+    found_ope = apd(found_ope);
+  }
+  void visit(NotPredicate &ope) override {
+    ope.ope_->accept(*this);
+    found_ope = npd(found_ope);
+  }
+  void visit(Dictionary &ope) override { found_ope = ope.shared_from_this(); }
+  void visit(LiteralString &ope) override {
+    found_ope = ope.shared_from_this();
+  }
+  void visit(CharacterClass &ope) override {
+    found_ope = ope.shared_from_this();
+  }
+  void visit(Character &ope) override { found_ope = ope.shared_from_this(); }
+  void visit(AnyCharacter &ope) override { found_ope = ope.shared_from_this(); }
+  void visit(CaptureScope &ope) override {
+    ope.ope_->accept(*this);
+    found_ope = csc(found_ope);
+  }
+  void visit(Capture &ope) override {
+    ope.ope_->accept(*this);
+    found_ope = cap(found_ope, ope.match_action_);
+  }
+  void visit(TokenBoundary &ope) override {
+    ope.ope_->accept(*this);
+    found_ope = tok(found_ope);
+  }
+  void visit(Ignore &ope) override {
+    ope.ope_->accept(*this);
+    found_ope = ign(found_ope);
+  }
+  void visit(WeakHolder &ope) override { ope.weak_.lock()->accept(*this); }
+  void visit(Holder &ope) override { ope.ope_->accept(*this); }
+  void visit(Reference &ope) override;
+  void visit(Whitespace &ope) override {
+    ope.ope_->accept(*this);
+    found_ope = wsp(found_ope);
+  }
+  void visit(PrecedenceClimbing &ope) override {
+    ope.atom_->accept(*this);
+    found_ope = csc(found_ope);
+  }
+  void visit(Recovery &ope) override {
+    ope.ope_->accept(*this);
+    found_ope = rec(found_ope);
+  }
+  void visit(Cut &ope) override { found_ope = ope.shared_from_this(); }
 
-    std::shared_ptr<Ope> found_ope;
+  std::shared_ptr<Ope> found_ope;
 
 private:
-    const std::vector<std::shared_ptr<Ope>> &args_;
-    const std::vector<std::string> &params_;
+  const std::vector<std::shared_ptr<Ope>> &args_;
+  const std::vector<std::string> &params_;
+};
+
+/*
+ * First-Set computation
+ */
+struct ComputeFirstSet : public TraversalVisitor {
+  using TraversalVisitor::visit;
+
+  void visit(Sequence &ope) override {
+    for (const auto &op : ope.opes_) {
+      FirstSet element_fs;
+      auto save = result_;
+      result_ = FirstSet{};
+      op->accept(*this);
+      element_fs = result_;
+      result_ = save;
+      result_.chars |= element_fs.chars;
+      if (element_fs.any_char) { result_.any_char = true; }
+      if (!result_.first_literal) {
+        result_.first_literal = element_fs.first_literal;
+      }
+      if (!result_.first_rule) { result_.first_rule = element_fs.first_rule; }
+      if (!element_fs.can_be_empty) { return; }
+      // This element can be empty, continue to next
+    }
+    result_.can_be_empty = true;
+  }
+  void visit(PrioritizedChoice &ope) override {
+    auto save = result_;
+    for (const auto &op : ope.opes_) {
+      result_ = FirstSet{};
+      op->accept(*this);
+      save.merge(result_);
+    }
+    result_ = save;
+  }
+  void visit(Repetition &ope) override {
+    ope.ope_->accept(*this);
+    if (ope.min_ == 0) { result_.can_be_empty = true; }
+  }
+  void visit(AndPredicate &) override { result_.can_be_empty = true; }
+  void visit(NotPredicate &) override { result_.can_be_empty = true; }
+  void visit(Dictionary &ope) override {
+    for (const auto &[key, info] : ope.trie_.dic_) {
+      if (!key.empty()) {
+        auto ch = static_cast<unsigned char>(key[0]);
+        result_.chars.set(ch);
+        if (ope.trie_.ignore_case_) {
+          result_.chars.set(static_cast<unsigned char>(std::toupper(ch)));
+          result_.chars.set(static_cast<unsigned char>(std::tolower(ch)));
+        }
+      }
+    }
+  }
+  void visit(LiteralString &ope) override {
+    if (ope.lit_.empty()) {
+      result_.can_be_empty = true;
+    } else {
+      auto ch = static_cast<unsigned char>(ope.lit_[0]);
+      result_.chars.set(ch);
+      if (ope.ignore_case_) {
+        result_.chars.set(static_cast<unsigned char>(std::toupper(ch)));
+        result_.chars.set(static_cast<unsigned char>(std::tolower(ch)));
+      }
+      if (!result_.first_literal) { result_.first_literal = ope.lit_.c_str(); }
+    }
+  }
+  void visit(CharacterClass &ope) override {
+    for (const auto &range : ope.ranges_) {
+      auto cp1 = range.first;
+      auto cp2 = range.second;
+      if (cp1 > 0x7F || cp2 > 0x7F) {
+        // Non-ASCII range: conservative fallback
+        result_.any_char = true;
+        return;
+      }
+      for (auto cp = cp1; cp <= cp2; cp++) {
+        auto ch = static_cast<unsigned char>(cp);
+        result_.chars.set(ch);
+        if (ope.ignore_case_) {
+          result_.chars.set(static_cast<unsigned char>(std::toupper(ch)));
+          result_.chars.set(static_cast<unsigned char>(std::tolower(ch)));
+        }
+      }
+    }
+    if (ope.negated_) {
+      result_.chars.flip();
+      result_.any_char = true; // negated class can match non-ASCII
+    }
+  }
+  void visit(Character &ope) override {
+    if (ope.ch_ > 0x7F) {
+      result_.any_char = true;
+    } else {
+      result_.chars.set(static_cast<unsigned char>(ope.ch_));
+    }
+  }
+  void visit(AnyCharacter &) override { result_.any_char = true; }
+  void visit(User &) override { result_.any_char = true; }
+  void visit(Reference &ope) override;
+  void visit(BackReference &) override { result_.any_char = true; }
+  void visit(Cut &) override { result_.can_be_empty = true; }
+
+  // Per-rule cache shared across a SetupFirstSets traversal. Without it,
+  // every alternative of every PrioritizedChoice re-walks referenced
+  // rules — O(refs^depth) work for grammars with many cross-references.
+  // Only cycle-free rule computations are cached; results computed under
+  // a cycle (left recursion) would be incomplete and unsafe to reuse from
+  // a different call context.
+  using FirstSetCache = std::unordered_map<const Definition *, FirstSet>;
+
+  explicit ComputeFirstSet(FirstSetCache &cache) : cache_(cache) {}
+
+  FirstSet result_;
+
+private:
+  FirstSetCache &cache_;
+  std::unordered_set<const Definition *> refs_;
+  size_t cycle_count_ = 0;
+};
+
+struct SetupFirstSets : public TraversalVisitor {
+  using TraversalVisitor::visit;
+
+  void visit(Sequence &ope) override;
+  void setup_keyword_guarded_identifier(Sequence &ope);
+
+  void visit(PrioritizedChoice &ope) override {
+    ope.first_sets_.clear();
+    ope.first_sets_.reserve(ope.opes_.size());
+    for (const auto &op : ope.opes_) {
+      ComputeFirstSet cfs(first_set_cache_);
+      op->accept(cfs);
+      ope.first_sets_.push_back(cfs.result_);
+    }
+    for (const auto &op : ope.opes_) {
+      op->accept(*this);
+    }
+  }
+  void visit(Repetition &ope) override {
+    ope.ope_->accept(*this);
+    // ISpan optimization: detect Repetition + ASCII CharacterClass
+    auto cc = dynamic_cast<CharacterClass *>(ope.ope_.get());
+    if (cc && cc->is_ascii_only()) { ope.span_bitset_ = &cc->ascii_bitset(); }
+  }
+  void visit(Reference &ope) override;
+  void visit(Holder &ope) override;
+
+private:
+  ComputeFirstSet::FirstSetCache first_set_cache_;
+  std::unordered_set<const Definition *> visited_rules_;
 };
 
 /*
@@ -2205,279 +3003,315 @@ static const char *RECOVER_DEFINITION_NAME = "%recover";
  */
 class Definition {
 public:
-    struct Result {
-        bool ret;
-        bool recovered;
-        size_t len;
-        ErrorInfo error_info;
-    };
+  struct Result {
+    bool ret;
+    bool recovered;
+    size_t len;
+    ErrorInfo error_info;
+  };
 
-    Definition() : holder_(std::make_shared<Holder>(this)) {}
+  Definition() : holder_(std::make_shared<Holder>(this)) {}
 
-    Definition(const Definition &rhs) : name(rhs.name), holder_(rhs.holder_) {
-        holder_->outer_ = this;
+  Definition(const Definition &rhs) : name(rhs.name), holder_(rhs.holder_) {
+    holder_->outer_ = this;
+  }
+
+  Definition(const std::shared_ptr<Ope> &ope)
+      : holder_(std::make_shared<Holder>(this)) {
+    *this <= ope;
+  }
+
+  operator std::shared_ptr<Ope>() {
+    return std::make_shared<WeakHolder>(holder_);
+  }
+
+  Definition &operator<=(const std::shared_ptr<Ope> &ope) {
+    holder_->ope_ = ope;
+    return *this;
+  }
+
+  Result parse(const char *s, size_t n, const char *path = nullptr,
+               Log log = nullptr,
+               ErrorReporter error_reporter = nullptr) const {
+    SemanticValues vs;
+    std::any dt;
+    return parse_core(s, n, vs, dt, path, log, error_reporter);
+  }
+
+  Result parse(const char *s, const char *path = nullptr, Log log = nullptr,
+               ErrorReporter error_reporter = nullptr) const {
+    auto n = strlen(s);
+    return parse(s, n, path, log, error_reporter);
+  }
+
+  Result parse(const char *s, size_t n, std::any &dt,
+               const char *path = nullptr, Log log = nullptr,
+               ErrorReporter error_reporter = nullptr) const {
+    SemanticValues vs;
+    return parse_core(s, n, vs, dt, path, log, error_reporter);
+  }
+
+  Result parse(const char *s, std::any &dt, const char *path = nullptr,
+               Log log = nullptr,
+               ErrorReporter error_reporter = nullptr) const {
+    auto n = strlen(s);
+    return parse(s, n, dt, path, log, error_reporter);
+  }
+
+  template <typename T>
+  Result parse_and_get_value(const char *s, size_t n, T &val,
+                             const char *path = nullptr, Log log = nullptr,
+                             ErrorReporter error_reporter = nullptr) const {
+    SemanticValues vs;
+    std::any dt;
+    auto r = parse_core(s, n, vs, dt, path, log, error_reporter);
+    if (r.ret && !vs.empty() && vs.front().has_value()) {
+      val = std::any_cast<T>(vs[0]);
     }
+    return r;
+  }
 
-    Definition(const std::shared_ptr<Ope> &ope)
-        : holder_(std::make_shared<Holder>(this)) {
-        *this <= ope;
-    }
+  template <typename T>
+  Result parse_and_get_value(const char *s, T &val, const char *path = nullptr,
+                             Log log = nullptr,
+                             ErrorReporter error_reporter = nullptr) const {
+    auto n = strlen(s);
+    return parse_and_get_value(s, n, val, path, log, error_reporter);
+  }
 
-    operator std::shared_ptr<Ope>() {
-        return std::make_shared<WeakHolder>(holder_);
+  template <typename T>
+  Result parse_and_get_value(const char *s, size_t n, std::any &dt, T &val,
+                             const char *path = nullptr, Log log = nullptr,
+                             ErrorReporter error_reporter = nullptr) const {
+    SemanticValues vs;
+    auto r = parse_core(s, n, vs, dt, path, log, error_reporter);
+    if (r.ret && !vs.empty() && vs.front().has_value()) {
+      val = std::any_cast<T>(vs[0]);
     }
+    return r;
+  }
 
-    Definition &operator<=(const std::shared_ptr<Ope> &ope) {
-        holder_->ope_ = ope;
-        return *this;
-    }
-
-    Result parse(const char *s, size_t n, const char *path = nullptr,
-                 Log log = nullptr) const {
-        SemanticValues vs;
-        std::any dt;
-        return parse_core(s, n, vs, dt, path, log);
-    }
-
-    Result parse(const char *s, const char *path = nullptr,
-                 Log log = nullptr) const {
-        auto n = strlen(s);
-        return parse(s, n, path, log);
-    }
-
-    Result parse(const char *s, size_t n, std::any &dt,
-                 const char *path = nullptr, Log log = nullptr) const {
-        SemanticValues vs;
-        return parse_core(s, n, vs, dt, path, log);
-    }
-
-    Result parse(const char *s, std::any &dt, const char *path = nullptr,
-                 Log log = nullptr) const {
-        auto n = strlen(s);
-        return parse(s, n, dt, path, log);
-    }
-
-    template <typename T>
-    Result parse_and_get_value(const char *s, size_t n, T &val,
-                               const char *path = nullptr,
-                               Log log = nullptr) const {
-        SemanticValues vs;
-        std::any dt;
-        auto r = parse_core(s, n, vs, dt, path, log);
-        if (r.ret && !vs.empty() && vs.front().has_value()) {
-            val = std::any_cast<T>(vs[0]);
-        }
-        return r;
-    }
-
-    template <typename T>
-    Result parse_and_get_value(const char *s, T &val, const char *path = nullptr,
-                               Log log = nullptr) const {
-        auto n = strlen(s);
-        return parse_and_get_value(s, n, val, path, log);
-    }
-
-    template <typename T>
-    Result parse_and_get_value(const char *s, size_t n, std::any &dt, T &val,
-                               const char *path = nullptr,
-                               Log log = nullptr) const {
-        SemanticValues vs;
-        auto r = parse_core(s, n, vs, dt, path, log);
-        if (r.ret && !vs.empty() && vs.front().has_value()) {
-            val = std::any_cast<T>(vs[0]);
-        }
-        return r;
-    }
-
-    template <typename T>
-    Result parse_and_get_value(const char *s, std::any &dt, T &val,
-                               const char *path = nullptr,
-                               Log log = nullptr) const {
-        auto n = strlen(s);
-        return parse_and_get_value(s, n, dt, val, path, log);
-    }
+  template <typename T>
+  Result parse_and_get_value(const char *s, std::any &dt, T &val,
+                             const char *path = nullptr, Log log = nullptr,
+                             ErrorReporter error_reporter = nullptr) const {
+    auto n = strlen(s);
+    return parse_and_get_value(s, n, dt, val, path, log, error_reporter);
+  }
 
 #if defined(__cpp_lib_char8_t)
-    Result parse(const char8_t *s, size_t n, const char *path = nullptr,
-                 Log log = nullptr) const {
-        return parse(reinterpret_cast<const char *>(s), n, path, log);
-    }
+  Result parse(const char8_t *s, size_t n, const char *path = nullptr,
+               Log log = nullptr) const {
+    return parse(reinterpret_cast<const char *>(s), n, path, log);
+  }
 
-    Result parse(const char8_t *s, const char *path = nullptr,
-                 Log log = nullptr) const {
-        return parse(reinterpret_cast<const char *>(s), path, log);
-    }
+  Result parse(const char8_t *s, const char *path = nullptr,
+               Log log = nullptr) const {
+    return parse(reinterpret_cast<const char *>(s), path, log);
+  }
 
-    Result parse(const char8_t *s, size_t n, std::any &dt,
-                 const char *path = nullptr, Log log = nullptr) const {
-        return parse(reinterpret_cast<const char *>(s), n, dt, path, log);
-    }
+  Result parse(const char8_t *s, size_t n, std::any &dt,
+               const char *path = nullptr, Log log = nullptr) const {
+    return parse(reinterpret_cast<const char *>(s), n, dt, path, log);
+  }
 
-    Result parse(const char8_t *s, std::any &dt, const char *path = nullptr,
-                 Log log = nullptr) const {
-        return parse(reinterpret_cast<const char *>(s), dt, path, log);
-    }
+  Result parse(const char8_t *s, std::any &dt, const char *path = nullptr,
+               Log log = nullptr) const {
+    return parse(reinterpret_cast<const char *>(s), dt, path, log);
+  }
 
-    template <typename T>
-    Result parse_and_get_value(const char8_t *s, size_t n, T &val,
-                               const char *path = nullptr,
-                               Log log = nullptr) const {
-        return parse_and_get_value(reinterpret_cast<const char *>(s), n, val, *path,
-                                   log);
-    }
+  template <typename T>
+  Result parse_and_get_value(const char8_t *s, size_t n, T &val,
+                             const char *path = nullptr,
+                             Log log = nullptr) const {
+    return parse_and_get_value(reinterpret_cast<const char *>(s), n, val, path,
+                               log);
+  }
 
-    template <typename T>
-    Result parse_and_get_value(const char8_t *s, T &val,
-                               const char *path = nullptr,
-                               Log log = nullptr) const {
-        return parse_and_get_value(reinterpret_cast<const char *>(s), val, *path,
-                                   log);
-    }
+  template <typename T>
+  Result parse_and_get_value(const char8_t *s, T &val,
+                             const char *path = nullptr,
+                             Log log = nullptr) const {
+    return parse_and_get_value(reinterpret_cast<const char *>(s), val, path,
+                               log);
+  }
 
-    template <typename T>
-    Result parse_and_get_value(const char8_t *s, size_t n, std::any &dt, T &val,
-                               const char *path = nullptr,
-                               Log log = nullptr) const {
-        return parse_and_get_value(reinterpret_cast<const char *>(s), n, dt, val,
-                                   *path, log);
-    }
+  template <typename T>
+  Result parse_and_get_value(const char8_t *s, size_t n, std::any &dt, T &val,
+                             const char *path = nullptr,
+                             Log log = nullptr) const {
+    return parse_and_get_value(reinterpret_cast<const char *>(s), n, dt, val,
+                               path, log);
+  }
 
-    template <typename T>
-    Result parse_and_get_value(const char8_t *s, std::any &dt, T &val,
-                               const char *path = nullptr,
-                               Log log = nullptr) const {
-        return parse_and_get_value(reinterpret_cast<const char *>(s), dt, val,
-                                   *path, log);
-    }
+  template <typename T>
+  Result parse_and_get_value(const char8_t *s, std::any &dt, T &val,
+                             const char *path = nullptr,
+                             Log log = nullptr) const {
+    return parse_and_get_value(reinterpret_cast<const char *>(s), dt, val, path,
+                               log);
+  }
 #endif
 
-    void operator=(Action a) { action = a; }
+  void operator=(Action a) { action = a; }
 
-    template <typename T> Definition &operator,(T fn) {
-        operator=(fn);
-        return *this;
-    }
+  template <typename T> Definition &operator,(T fn) {
+    operator=(fn);
+    return *this;
+  }
 
-    Definition &operator~() {
-        ignoreSemanticValue = true;
-        return *this;
-    }
+  Definition &operator~() {
+    ignoreSemanticValue = true;
+    return *this;
+  }
 
-    void accept(Ope::Visitor &v) { holder_->accept(v); }
+  void accept(Ope::Visitor &v) { holder_->accept(v); }
 
-    std::shared_ptr<Ope> get_core_operator() const { return holder_->ope_; }
+  std::shared_ptr<Ope> get_core_operator() const { return holder_->ope_; }
 
-    bool is_token() const {
-        std::call_once(is_token_init_, [this]() {
-            is_token_ = TokenChecker::is_token(*get_core_operator());
-        });
-        return is_token_;
-    }
+  bool is_token() const {
+    std::call_once(is_token_init_, [this]() {
+      is_token_ = TokenChecker::is_token(*get_core_operator());
+    });
+    return is_token_;
+  }
 
-    std::string name;
-    const char *s_ = nullptr;
-    std::pair<size_t, size_t> line_ = {1, 1};
+  std::string name;
+  const char *s_ = nullptr;
+  std::pair<size_t, size_t> line_ = {1, 1};
 
-    std::function<bool(const SemanticValues &vs, const std::any &dt,
-                       std::string &msg)>
-        predicate;
+  Predicate predicate;
 
-    size_t id = 0;
-    Action action;
-    std::function<void(const Context &c, const char *s, size_t n, std::any &dt)>
-        enter;
-    std::function<void(const Context &c, const char *s, size_t n, size_t matchlen,
-                       std::any &value, std::any &dt)>
-        leave;
-    bool ignoreSemanticValue = false;
-    std::shared_ptr<Ope> whitespaceOpe;
-    std::shared_ptr<Ope> wordOpe;
-    bool enablePackratParsing = false;
-    bool is_macro = false;
-    std::vector<std::string> params;
-    bool disable_action = false;
+  size_t id = 0;
+  Action action;
+  std::function<void(const Context &c, const char *s, size_t n, std::any &dt)>
+      enter;
+  std::function<void(const Context &c, const char *s, size_t n, size_t matchlen,
+                     std::any &value, std::any &dt)>
+      leave;
+  bool ignoreSemanticValue = false;
+  std::shared_ptr<Ope> whitespaceOpe;
+  std::shared_ptr<Ope> wordOpe;
+  bool enablePackratParsing = false;
+  bool is_macro = false;
+  std::vector<std::string> params;
+  bool disable_action = false;
+  bool is_left_recursive = false;
+  bool can_be_empty = false;
 
-    TracerEnter tracer_enter;
-    TracerLeave tracer_leave;
-    bool verbose_trace = false;
-    TracerStartOrEnd tracer_start;
-    TracerStartOrEnd tracer_end;
+  TracerEnter tracer_enter;
+  TracerLeave tracer_leave;
+  bool verbose_trace = false;
+  TracerStartOrEnd tracer_start;
+  TracerStartOrEnd tracer_end;
 
-    std::string error_message;
-    bool no_ast_opt = false;
+  std::string error_message;
+  bool no_ast_opt = false;
+  bool no_whitespace = false; // Disable %whitespace skipping inside this rule
+                              // (like a token boundary, without capturing)
+  std::string ast_name; // When non-empty, AST nodes produced by this rule carry
+                        // this name/tag instead of the rule's own name
 
-    bool eoi_check = true;
+  bool eoi_check = true;
+
+  // Per-rule packrat stats (optional, for profiling)
+  mutable bool collect_packrat_stats = false;
+  mutable std::vector<Context::PackratStats> packrat_stats_;
 
 private:
-    friend class Reference;
-    friend class ParserGenerator;
+  friend class Reference;
+  friend class ParserGenerator;
 
-    Definition &operator=(const Definition &rhs);
-    Definition &operator=(Definition &&rhs);
+  Definition &operator=(const Definition &rhs);
+  Definition &operator=(Definition &&rhs);
 
-    void initialize_definition_ids() const {
-        std::call_once(definition_ids_init_, [&]() {
-            AssignIDToDefinition vis;
-            holder_->accept(vis);
-            if (whitespaceOpe) { whitespaceOpe->accept(vis); }
-            if (wordOpe) { wordOpe->accept(vis); }
-            definition_ids_.swap(vis.ids);
-        });
+  void initialize_definition_ids() const {
+    std::call_once(definition_ids_init_, [&]() {
+      AssignIDToDefinition vis;
+      holder_->accept(vis);
+      if (whitespaceOpe) { whitespaceOpe->accept(vis); }
+      if (wordOpe) { wordOpe->accept(vis); }
+      definition_ids_.swap(vis.ids);
+    });
+  }
+
+  void initialize_packrat_filter() const;
+
+  Result parse_core(const char *s, size_t n, SemanticValues &vs, std::any &dt,
+                    const char *path, Log log,
+                    ErrorReporter error_reporter = nullptr) const {
+    initialize_definition_ids();
+
+    std::shared_ptr<Ope> ope = holder_;
+
+    std::any trace_data;
+    if (tracer_start) { tracer_start(trace_data); }
+    auto se = scope_exit([&]() {
+      if (tracer_end) { tracer_end(trace_data); }
+    });
+
+    const std::vector<int32_t> *packrat_index = nullptr;
+    size_t packrat_cached_count = 0;
+    if (enablePackratParsing) {
+      initialize_packrat_filter();
+      if (!packrat_index_.empty()) {
+        packrat_index = &packrat_index_;
+        packrat_cached_count = packrat_cached_count_;
+      } else {
+        packrat_cached_count = definition_ids_.size();
+      }
     }
 
-    Result parse_core(const char *s, size_t n, SemanticValues &vs, std::any &dt,
-                      const char *path, Log log) const {
-        initialize_definition_ids();
+    Context c(path, s, n, definition_ids_.size(), whitespaceOpe, wordOpe,
+              enablePackratParsing, tracer_enter, tracer_leave, trace_data,
+              verbose_trace, log, error_reporter, packrat_index,
+              packrat_cached_count);
 
-        std::shared_ptr<Ope> ope = holder_;
-
-        std::any trace_data;
-        if (tracer_start) { tracer_start(trace_data); }
-        auto se1 = scope_exit([&]() {
-            if (tracer_end) { tracer_end(trace_data); }
-        });
-
-        Context c(path, s, n, definition_ids_.size(), whitespaceOpe, wordOpe,
-                  enablePackratParsing, tracer_enter, tracer_leave, trace_data,
-                  verbose_trace, log);
-
-        size_t i = 0;
-
-        if (whitespaceOpe) {
-            auto save_ignore_trace_state = c.ignore_trace_state;
-            c.ignore_trace_state = !c.verbose_trace;
-            auto se2 =
-                scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
-
-            auto len = whitespaceOpe->parse(s, n, vs, c, dt);
-            if (fail(len)) { return Result{false, c.recovered, i, c.error_info}; }
-
-            i = len;
-        }
-
-        auto len = ope->parse(s + i, n - i, vs, c, dt);
-        auto ret = success(len);
-        if (ret) {
-            i += len;
-            if (eoi_check) {
-                if (i < n) {
-                    if (c.error_info.error_pos - c.s < s + i - c.s) {
-                        c.error_info.message_pos = s + i;
-                        c.error_info.message = "expected end of input";
-                    }
-                    ret = false;
-                }
-            }
-        }
-        return Result{ret, c.recovered, i, c.error_info};
+    if (collect_packrat_stats) {
+      packrat_stats_.resize(definition_ids_.size());
+      c.packrat_stats = &packrat_stats_;
     }
 
-    std::shared_ptr<Holder> holder_;
-    mutable std::once_flag is_token_init_;
-    mutable bool is_token_ = false;
-    mutable std::once_flag assign_id_to_definition_init_;
-    mutable std::once_flag definition_ids_init_;
-    mutable std::unordered_map<void *, size_t> definition_ids_;
+    size_t i = 0;
+
+    if (whitespaceOpe) {
+      auto save_ignore_trace_state = c.ignore_trace_state;
+      c.ignore_trace_state = !c.verbose_trace;
+      auto se =
+          scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
+
+      auto len = whitespaceOpe->parse(s, n, vs, c, dt);
+      if (fail(len)) { return Result{false, c.recovered, i, c.error_info}; }
+
+      i = len;
+    }
+
+    auto len = ope->parse(s + i, n - i, vs, c, dt);
+    auto ret = success(len);
+    if (ret) {
+      i += len;
+      if (eoi_check) {
+        if (i < n) {
+          if (c.error_info.error_pos - c.s < s + i - c.s) {
+            c.error_info.message_pos = s + i;
+            c.error_info.message = "expected end of input";
+          }
+          ret = false;
+        }
+      }
+    }
+    return Result{ret, c.recovered, i, c.error_info};
+  }
+
+  std::shared_ptr<Holder> holder_;
+  mutable std::once_flag is_token_init_;
+  mutable bool is_token_ = false;
+  mutable std::once_flag assign_id_to_definition_init_;
+  mutable std::once_flag definition_ids_init_;
+  mutable std::unordered_map<void *, size_t> definition_ids_;
+  mutable std::once_flag packrat_filter_init_;
+  mutable std::vector<int32_t> packrat_index_; // def_id -> cache slot or -1
+  mutable size_t packrat_cached_count_ = 0;
 };
 
 /*
@@ -2487,592 +3321,823 @@ private:
 inline size_t parse_literal(const char *s, size_t n, SemanticValues &vs,
                             Context &c, std::any &dt, const std::string &lit,
                             std::once_flag &init_is_word, bool &is_word,
-                            bool ignore_case) {
-    size_t i = 0;
-    for (; i < lit.size(); i++) {
-        if (i >= n || (ignore_case ? (std::tolower(s[i]) != std::tolower(lit[i]))
-                                   : (s[i] != lit[i]))) {
-            c.set_error_pos(s, lit.data());
-            return static_cast<size_t>(-1);
-        }
+                            bool ignore_case, const std::string &lower_lit) {
+  size_t i = 0;
+  for (; i < lit.size(); i++) {
+    if (i >= n ||
+        (ignore_case
+             ? (static_cast<char>(
+                    c.tolower_table[static_cast<unsigned char>(s[i])]) !=
+                lower_lit[i])
+             : (s[i] != lit[i]))) {
+      c.set_error_pos(s, lit.data());
+      return static_cast<size_t>(-1);
     }
+  }
 
-    // Word check
-    if (c.wordOpe) {
-        auto save_ignore_trace_state = c.ignore_trace_state;
-        c.ignore_trace_state = !c.verbose_trace;
-        auto se =
-            scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
+  // Word check
+  if (c.wordOpe) {
+    auto save_ignore_trace_state = c.ignore_trace_state;
+    c.ignore_trace_state = !c.verbose_trace;
+    auto se =
+        scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
 
-        std::call_once(init_is_word, [&]() {
-            SemanticValues dummy_vs;
-            Context dummy_c(nullptr, c.s, c.l, 0, nullptr, nullptr, false, nullptr,
-                            nullptr, nullptr, false, nullptr);
-            std::any dummy_dt;
+    std::call_once(init_is_word, [&]() {
+      SemanticValues dummy_vs;
+      Context dummy_c(nullptr, c.s, c.l, 0, nullptr, nullptr, false, nullptr,
+                      nullptr, nullptr, false, nullptr);
+      std::any dummy_dt;
 
-            auto len =
-                c.wordOpe->parse(lit.data(), lit.size(), dummy_vs, dummy_c, dummy_dt);
-            is_word = success(len);
-        });
+      auto len =
+          c.wordOpe->parse(lit.data(), lit.size(), dummy_vs, dummy_c, dummy_dt);
+      is_word = success(len);
+    });
 
-        if (is_word) {
-            SemanticValues dummy_vs;
-            Context dummy_c(nullptr, c.s, c.l, 0, nullptr, nullptr, false, nullptr,
-                            nullptr, nullptr, false, nullptr);
-            std::any dummy_dt;
+    if (is_word) {
+      SemanticValues dummy_vs;
+      Context dummy_c(nullptr, c.s, c.l, 0, nullptr, nullptr, false, nullptr,
+                      nullptr, nullptr, false, nullptr);
+      std::any dummy_dt;
 
-            NotPredicate ope(c.wordOpe);
-            auto len = ope.parse(s + i, n - i, dummy_vs, dummy_c, dummy_dt);
-            if (fail(len)) {
-                c.set_error_pos(s, lit.data());
-                return len;
-            }
-            i += len;
-        }
+      NotPredicate ope(c.wordOpe);
+      auto len = ope.parse(s + i, n - i, dummy_vs, dummy_c, dummy_dt);
+      if (fail(len)) {
+        c.set_error_pos(s, lit.data());
+        return len;
+      }
+      i += len;
     }
+  }
 
-    // Skip whitespace
-    if (!c.in_token_boundary_count && c.whitespaceOpe) {
-        auto save_ignore_trace_state = c.ignore_trace_state;
-        c.ignore_trace_state = !c.verbose_trace;
-        auto se =
-            scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
+  // Skip whitespace
+  auto wl = c.skip_whitespace(s + i, n - i, vs, dt);
+  if (fail(wl)) { return wl; }
+  i += wl;
 
-        auto len = c.whitespaceOpe->parse(s + i, n - i, vs, c, dt);
-        if (fail(len)) { return len; }
-        i += len;
-    }
-
-    return i;
+  return i;
 }
 
 inline std::pair<size_t, size_t> SemanticValues::line_info() const {
-    assert(c_);
-    return c_->line_info(sv_.data());
+  assert(c_);
+  return c_->line_info(sv_.data());
 }
 
-inline void ErrorInfo::output_log(const Log &log, const char *s, size_t n) {
-    if (message_pos) {
-        if (message_pos > last_output_pos) {
-            last_output_pos = message_pos;
-            auto line = line_info(s, message_pos);
-            std::string msg;
-            if (auto unexpected_token = heuristic_error_token(s, n, message_pos);
-                !unexpected_token.empty()) {
-                msg = replace_all(message, "%t", unexpected_token);
+inline void ErrorInfo::output_log(const Log &log, const ErrorReporter &reporter,
+                                  const char *s, size_t n) {
+  if (message_pos) {
+    if (message_pos > last_output_pos) {
+      last_output_pos = message_pos;
+      auto line = line_info(s, message_pos);
+      std::string msg;
+      auto unexpected_token = heuristic_error_token(s, n, message_pos);
+      if (!unexpected_token.empty()) {
+        msg = replace_all(message, "%t", unexpected_token);
 
-                auto unexpected_char = unexpected_token.substr(
-                    0,
-                    codepoint_length(unexpected_token.data(), unexpected_token.size()));
+        auto unexpected_char = unexpected_token.substr(
+            0,
+            codepoint_length(unexpected_token.data(), unexpected_token.size()));
 
-                msg = replace_all(msg, "%c", unexpected_char);
-            } else {
-                msg = message;
-            }
-            log(line.first, line.second, msg, label);
-        }
-    } else if (error_pos) {
-        if (error_pos > last_output_pos) {
-            last_output_pos = error_pos;
-            auto line = line_info(s, error_pos);
-
-            std::string msg;
-            if (expected_tokens.empty()) {
-                msg = "syntax error.";
-            } else {
-                msg = "syntax error";
-
-                // unexpected token
-                if (auto unexpected_token = heuristic_error_token(s, n, error_pos);
-                    !unexpected_token.empty()) {
-                    msg += ", unexpected '";
-                    msg += unexpected_token;
-                    msg += "'";
-                }
-
-                auto first_item = true;
-                size_t i = 0;
-                while (i < expected_tokens.size()) {
-                    auto [error_literal, error_rule] = expected_tokens[i];
-
-                    // Skip rules start with '_'
-                    if (!(error_rule && error_rule->name[0] == '_')) {
-                        msg += (first_item ? ", expecting " : ", ");
-                        if (error_literal) {
-                            msg += "'";
-                            msg += error_literal;
-                            msg += "'";
-                        } else {
-                            msg += "<" + error_rule->name + ">";
-                            if (label.empty()) { label = error_rule->name; }
-                        }
-                        first_item = false;
-                    }
-
-                    i++;
-                }
-                msg += ".";
-            }
-            log(line.first, line.second, msg, label);
-        }
+        msg = replace_all(msg, "%c", unexpected_char);
+      } else {
+        msg = message;
+      }
+      if (reporter) {
+        ErrorReport report;
+        report.line = line.first;
+        report.col = line.second;
+        report.position = static_cast<size_t>(message_pos - s);
+        report.unexpected_token = unexpected_token;
+        report.message = msg;
+        report.label = label;
+        reporter(report);
+      }
+      if (log) { log(line.first, line.second, msg, label); }
     }
+  } else if (error_pos) {
+    if (error_pos > last_output_pos) {
+      last_output_pos = error_pos;
+      auto line = line_info(s, error_pos);
+
+      ErrorReport report;
+      report.line = line.first;
+      report.col = line.second;
+      report.position = static_cast<size_t>(error_pos - s);
+
+      std::string msg;
+      if (expected_tokens.empty()) {
+        msg = "syntax error.";
+      } else {
+        msg = "syntax error";
+
+        // unexpected token
+        if (auto unexpected_token = heuristic_error_token(s, n, error_pos);
+            !unexpected_token.empty()) {
+          msg += ", unexpected '";
+          msg += unexpected_token;
+          msg += "'";
+          report.unexpected_token = unexpected_token;
+        }
+
+        auto first_item = true;
+        size_t i = 0;
+        while (i < expected_tokens.size()) {
+          auto [error_literal, error_rule] = expected_tokens[i];
+
+          // Skip rules start with '_'
+          if (!(error_rule && error_rule->name[0] == '_')) {
+            msg += (first_item ? ", expecting " : ", ");
+            if (error_literal) {
+              msg += "'";
+              msg += error_literal;
+              msg += "'";
+              report.expected_literals.emplace_back(error_literal);
+            } else {
+              msg += "<" + error_rule->name + ">";
+              if (label.empty()) { label = error_rule->name; }
+              report.expected_rules.emplace_back(error_rule->name);
+            }
+            first_item = false;
+          }
+
+          i++;
+        }
+        msg += ".";
+      }
+      if (reporter) {
+        report.label = label;
+        reporter(report);
+      }
+      if (log) { log(line.first, line.second, msg, label); }
+    }
+  }
+}
+
+inline size_t Context::skip_whitespace(const char *a_s, size_t n,
+                                       SemanticValues &vs, std::any &dt) {
+  if (in_token_boundary_count || !whitespaceOpe) { return 0; }
+  auto save = ignore_trace_state;
+  ignore_trace_state = !verbose_trace;
+  auto se = scope_exit([&]() { ignore_trace_state = save; });
+  return whitespaceOpe->parse(a_s, n, vs, *this, dt);
 }
 
 inline void Context::set_error_pos(const char *a_s, const char *literal) {
-    if (log) {
-        if (error_info.error_pos <= a_s) {
-            if (error_info.error_pos < a_s || !error_info.keep_previous_token) {
-                error_info.error_pos = a_s;
-                error_info.expected_tokens.clear();
-            }
+  if (log || error_reporter) {
+    if (error_info.error_pos <= a_s) {
+      if (error_info.error_pos < a_s || !error_info.keep_previous_token) {
+        error_info.error_pos = a_s;
+        error_info.expected_tokens.clear();
+      }
 
-            const char *error_literal = nullptr;
-            const Definition *error_rule = nullptr;
+      const char *error_literal = nullptr;
+      const Definition *error_rule = nullptr;
 
-            if (literal) {
-                error_literal = literal;
-            } else if (!rule_stack.empty()) {
-                auto rule = rule_stack.back();
-                auto ope = rule->get_core_operator();
-                if (auto token = FindLiteralToken::token(*ope);
-                    token && token[0] != '\0') {
-                    error_literal = token;
-                }
-            }
-
-            for (auto r : rule_stack) {
-                error_rule = r;
-                if (r->is_token()) { break; }
-            }
-
-            if (error_literal || error_rule) {
-                error_info.add(error_literal, error_rule);
-            }
+      if (literal) {
+        error_literal = literal;
+      } else if (!rule_stack.empty()) {
+        auto rule = rule_stack.back();
+        auto ope = rule->get_core_operator();
+        if (auto token = FindLiteralToken::token(*ope);
+            token && token[0] != '\0') {
+          error_literal = token;
         }
+      }
+
+      for (auto r : rule_stack) {
+        error_rule = r;
+        if (r->is_token()) { break; }
+      }
+
+      if (error_literal || error_rule) {
+        error_info.add(error_literal, error_rule);
+      }
     }
+  }
 }
 
 inline void Context::trace_enter(const Ope &ope, const char *a_s, size_t n,
                                  const SemanticValues &vs, std::any &dt) {
-    trace_ids.push_back(next_trace_id++);
-    tracer_enter(ope, a_s, n, vs, *this, dt, trace_data);
+  trace_ids.push_back(next_trace_id++);
+  tracer_enter(ope, a_s, n, vs, *this, dt, trace_data);
 }
 
 inline void Context::trace_leave(const Ope &ope, const char *a_s, size_t n,
                                  const SemanticValues &vs, std::any &dt,
                                  size_t len) {
-    tracer_leave(ope, a_s, n, vs, *this, dt, len, trace_data);
-    trace_ids.pop_back();
+  tracer_leave(ope, a_s, n, vs, *this, dt, len, trace_data);
+  trace_ids.pop_back();
 }
 
 inline bool Context::is_traceable(const Ope &ope) const {
-    if (tracer_enter && tracer_leave) {
-        if (ignore_trace_state) { return false; }
-        return !dynamic_cast<const peg::Reference *>(&ope);
-    }
-    return false;
+  if (has_tracer) {
+    if (ignore_trace_state) { return false; }
+    return !dynamic_cast<const peg::Reference *>(&ope);
+  }
+  return false;
 }
 
 inline size_t Ope::parse(const char *s, size_t n, SemanticValues &vs,
                          Context &c, std::any &dt) const {
-    if (c.is_traceable(*this)) {
-        c.trace_enter(*this, s, n, vs, dt);
-        auto len = parse_core(s, n, vs, c, dt);
-        c.trace_leave(*this, s, n, vs, dt, len);
-        return len;
-    }
-    return parse_core(s, n, vs, c, dt);
+  if (c.is_traceable(*this)) {
+    c.trace_enter(*this, s, n, vs, dt);
+    auto len = parse_core(s, n, vs, c, dt);
+    c.trace_leave(*this, s, n, vs, dt, len);
+    return len;
+  }
+  return parse_core(s, n, vs, c, dt);
 }
 
 inline size_t Dictionary::parse_core(const char *s, size_t n,
                                      SemanticValues &vs, Context &c,
                                      std::any &dt) const {
-    size_t id;
-    auto i = trie_.match(s, n, id);
+  size_t id;
+  auto i = trie_.match(s, n, id);
 
-    if (i == 0) {
+  if (i == 0) {
+    c.set_error_pos(s);
+    return static_cast<size_t>(-1);
+  }
+
+  vs.choice_count_ = trie_.items_count();
+  vs.choice_ = id;
+
+  // Word check
+  if (c.wordOpe) {
+    auto save_ignore_trace_state = c.ignore_trace_state;
+    c.ignore_trace_state = !c.verbose_trace;
+    auto se =
+        scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
+
+    {
+      SemanticValues dummy_vs;
+      Context dummy_c(nullptr, c.s, c.l, 0, nullptr, nullptr, false, nullptr,
+                      nullptr, nullptr, false, nullptr);
+      std::any dummy_dt;
+
+      NotPredicate ope(c.wordOpe);
+      auto len = ope.parse(s + i, n - i, dummy_vs, dummy_c, dummy_dt);
+      if (fail(len)) {
         c.set_error_pos(s);
-        return static_cast<size_t>(-1);
+        return len;
+      }
+      i += len;
     }
+  }
 
-    vs.choice_count_ = trie_.size();
-    vs.choice_ = id;
+  // Skip whitespace
+  auto wl = c.skip_whitespace(s + i, n - i, vs, dt);
+  if (fail(wl)) { return wl; }
+  i += wl;
 
-    // Word check
-    if (c.wordOpe) {
-        auto save_ignore_trace_state = c.ignore_trace_state;
-        c.ignore_trace_state = !c.verbose_trace;
-        auto se =
-            scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
-
-        {
-            SemanticValues dummy_vs;
-            Context dummy_c(nullptr, c.s, c.l, 0, nullptr, nullptr, false, nullptr,
-                            nullptr, nullptr, false, nullptr);
-            std::any dummy_dt;
-
-            NotPredicate ope(c.wordOpe);
-            auto len = ope.parse(s + i, n - i, dummy_vs, dummy_c, dummy_dt);
-            if (fail(len)) {
-                c.set_error_pos(s);
-                return len;
-            }
-            i += len;
-        }
-    }
-
-    // Skip whitespace
-    if (!c.in_token_boundary_count && c.whitespaceOpe) {
-        auto save_ignore_trace_state = c.ignore_trace_state;
-        c.ignore_trace_state = !c.verbose_trace;
-        auto se =
-            scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
-
-        auto len = c.whitespaceOpe->parse(s + i, n - i, vs, c, dt);
-        if (fail(len)) { return len; }
-        i += len;
-    }
-
-    return i;
+  return i;
 }
 
 inline size_t LiteralString::parse_core(const char *s, size_t n,
                                         SemanticValues &vs, Context &c,
                                         std::any &dt) const {
-    return parse_literal(s, n, vs, c, dt, lit_, init_is_word_, is_word_,
-                         ignore_case_);
+  return parse_literal(s, n, vs, c, dt, lit_, init_is_word_, is_word_,
+                       ignore_case_, lower_lit_);
 }
 
 inline size_t TokenBoundary::parse_core(const char *s, size_t n,
                                         SemanticValues &vs, Context &c,
                                         std::any &dt) const {
-    auto save_ignore_trace_state = c.ignore_trace_state;
-    c.ignore_trace_state = !c.verbose_trace;
-    auto se1 =
-        scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
+  auto save_ignore_trace_state = c.ignore_trace_state;
+  c.ignore_trace_state = !c.verbose_trace;
+  auto se =
+      scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
 
-    size_t len;
-    {
-        c.in_token_boundary_count++;
-        auto se2 = scope_exit([&]() { c.in_token_boundary_count--; });
-        len = ope_->parse(s, n, vs, c, dt);
-    }
+  size_t len;
+  {
+    c.in_token_boundary_count++;
+    auto se = scope_exit([&]() { c.in_token_boundary_count--; });
+    len = ope_->parse(s, n, vs, c, dt);
+  }
 
-    if (success(len)) {
-        vs.tokens.emplace_back(std::string_view(s, len));
+  if (success(len)) {
+    vs.tokens.emplace_back(std::string_view(s, len));
 
-        if (!c.in_token_boundary_count) {
-            if (c.whitespaceOpe) {
-                auto l = c.whitespaceOpe->parse(s + len, n - len, vs, c, dt);
-                if (fail(l)) { return l; }
-                len += l;
-            }
+    auto wl = c.skip_whitespace(s + len, n - len, vs, dt);
+    if (fail(wl)) { return wl; }
+    len += wl;
+  }
+  return len;
+}
+
+// Resolve `%{name}` placeholders in a custom error message against the
+// named captures recorded so far ($name<...>). Unknown names resolve to an
+// empty string. `%t` / `%c` are resolved later, at log-output time.
+inline std::string resolve_capture_placeholders(const std::string &msg,
+                                                const Context &c) {
+  auto pos = msg.find("%{");
+  if (pos == std::string::npos) { return msg; }
+
+  std::string r;
+  size_t i = 0;
+  while (pos != std::string::npos) {
+    auto end = msg.find('}', pos + 2);
+    if (end == std::string::npos) { break; }
+    r.append(msg, i, pos - i);
+    auto name = std::string_view(msg).substr(pos + 2, end - (pos + 2));
+    for (auto it = c.capture_entries.rbegin(); it != c.capture_entries.rend();
+         ++it) {
+      if (it->first == name) {
+        // The captured span can include whitespace skipped after a token
+        // boundary; trim it for display.
+        auto v = std::string_view(it->second);
+        while (!v.empty() &&
+               std::isspace(static_cast<unsigned char>(v.back()))) {
+          v.remove_suffix(1);
         }
+        while (!v.empty() &&
+               std::isspace(static_cast<unsigned char>(v.front()))) {
+          v.remove_prefix(1);
+        }
+        r += v;
+        break;
+      }
     }
-    return len;
+    i = end + 1;
+    pos = msg.find("%{", i);
+  }
+  r.append(msg, i, msg.size() - i);
+  return r;
 }
 
 inline size_t Holder::parse_core(const char *s, size_t n, SemanticValues &vs,
                                  Context &c, std::any &dt) const {
-    if (!ope_) {
-        throw std::logic_error("Uninitialized definition ope was used...");
-    }
+  if (!ope_) {
+    throw std::logic_error("Uninitialized definition ope was used...");
+  }
 
-    // Macro reference
-    if (outer_->is_macro) {
-        c.rule_stack.push_back(outer_);
-        auto len = ope_->parse(s, n, vs, c, dt);
-        c.rule_stack.pop_back();
-        return len;
-    }
+  // Macro reference. A left-recursive macro cannot take this path: it needs
+  // the seed-growing below, which in turn needs its own semantic value scope
+  // to memoise. Such a macro forms a scope like a plain rule does.
+  if (outer_->is_macro && !outer_->is_left_recursive) {
+    c.rule_stack.push_back(outer_);
+    auto len = ope_->parse(s, n, vs, c, dt);
+    c.rule_stack.pop_back();
+    return len;
+  }
 
-    size_t len;
-    std::any val;
+  size_t len;
+  std::any val;
 
-    c.packrat(s, outer_->id, len, val, [&](std::any &a_val) {
-        if (outer_->enter) { outer_->enter(c, s, n, dt); }
-        auto &chvs = c.push_semantic_values_scope();
-        auto se = scope_exit([&]() {
-            c.pop_semantic_values_scope();
-            if (outer_->leave) { outer_->leave(c, s, n, len, a_val, dt); }
-        });
+  // Shared parse body: invokes enter/leave callbacks, parses the rule's
+  // operator, handles actions/predicates/errors, and calls reduce.
+  // Returns {parse_len, parse_val}.
+  auto do_parse = [&]() {
+    size_t parse_len;
+    std::any parse_val;
 
-        c.rule_stack.push_back(outer_);
-        len = ope_->parse(s, n, chvs, c, dt);
-        c.rule_stack.pop_back();
-
-        // Invoke action
-        if (success(len)) {
-            chvs.sv_ = std::string_view(s, len);
-            chvs.name_ = outer_->name;
-
-            auto ope_ptr = ope_.get();
-            {
-                auto tok_ptr = dynamic_cast<const peg::TokenBoundary *>(ope_ptr);
-                if (tok_ptr) { ope_ptr = tok_ptr->ope_.get(); }
-            }
-            if (!dynamic_cast<const peg::PrioritizedChoice *>(ope_ptr) &&
-                !dynamic_cast<const peg::Dictionary *>(ope_ptr)) {
-                chvs.choice_count_ = 0;
-                chvs.choice_ = 0;
-            }
-
-            std::string msg;
-            if (outer_->predicate && !outer_->predicate(chvs, dt, msg)) {
-                if (c.log && !msg.empty() && c.error_info.message_pos < s) {
-                    c.error_info.message_pos = s;
-                    c.error_info.message = msg;
-                    c.error_info.label = outer_->name;
-                }
-                len = static_cast<size_t>(-1);
-            }
-
-            if (success(len)) {
-                if (!c.recovered) { a_val = reduce(chvs, dt); }
-            } else {
-                if (c.log && !msg.empty() && c.error_info.message_pos < s) {
-                    c.error_info.message_pos = s;
-                    c.error_info.message = msg;
-                    c.error_info.label = outer_->name;
-                }
-            }
-        } else {
-            if (c.log && !outer_->error_message.empty() &&
-                c.error_info.message_pos < s) {
-                c.error_info.message_pos = s;
-                c.error_info.message = outer_->error_message;
-                c.error_info.label = outer_->name;
-            }
-        }
+    if (outer_->enter) { outer_->enter(c, s, n, dt); }
+    auto &chvs = c.push_semantic_values_scope();
+    auto se = scope_exit([&]() {
+      c.pop_semantic_values_scope();
+      if (outer_->leave) { outer_->leave(c, s, n, parse_len, parse_val, dt); }
     });
 
-    if (success(len)) {
-        if (!outer_->ignoreSemanticValue) {
-            vs.emplace_back(std::move(val));
-            vs.tags.emplace_back(str2tag(outer_->name));
+    c.rule_stack.push_back(outer_);
+    if (outer_->no_whitespace) {
+      {
+        c.in_token_boundary_count++;
+        auto se2 = scope_exit([&]() { c.in_token_boundary_count--; });
+        parse_len = ope_->parse(s, n, chvs, c, dt);
+      }
+      if (success(parse_len)) {
+        auto wl = c.skip_whitespace(s + parse_len, n - parse_len, chvs, dt);
+        if (fail(wl)) {
+          parse_len = wl;
+        } else {
+          parse_len += wl;
         }
+      }
+    } else {
+      parse_len = ope_->parse(s, n, chvs, c, dt);
+    }
+    c.rule_stack.pop_back();
+
+    if (success(parse_len)) {
+      chvs.sv_ = std::string_view(s, parse_len);
+      chvs.name_ = outer_->name;
+
+      auto ope_ptr = ope_.get();
+      if (ope_ptr->is_token_boundary) {
+        ope_ptr = static_cast<const peg::TokenBoundary *>(ope_ptr)->ope_.get();
+      }
+      if (!ope_ptr->is_choice_like) {
+        chvs.choice_count_ = 0;
+        chvs.choice_ = 0;
+      }
+
+      std::string msg;
+      std::any predicate_data;
+      if (outer_->predicate) {
+        if (!outer_->predicate(chvs, dt, msg, predicate_data)) {
+          if ((c.log || c.error_reporter) && !msg.empty() &&
+              c.error_info.message_pos < s) {
+            c.error_info.message_pos = s;
+            c.error_info.message = msg;
+            c.error_info.label = outer_->name;
+          }
+          parse_len = static_cast<size_t>(-1);
+        }
+      }
+
+      if (success(parse_len)) {
+        if (!c.recovered) { parse_val = reduce(chvs, dt, predicate_data); }
+      } else {
+        if ((c.log || c.error_reporter) && !msg.empty() &&
+            c.error_info.message_pos < s) {
+          c.error_info.message_pos = s;
+          c.error_info.message = msg;
+          c.error_info.label = outer_->name;
+        }
+      }
+    } else {
+      if ((c.log || c.error_reporter) && !outer_->error_message.empty() &&
+          c.error_info.message_pos < s) {
+        c.error_info.message_pos = s;
+        c.error_info.message =
+            resolve_capture_placeholders(outer_->error_message, c);
+        c.error_info.label = outer_->name;
+      }
     }
 
-    return len;
+    return std::make_pair(parse_len, std::move(parse_val));
+  };
+
+  if (outer_->is_left_recursive) {
+    // A macro grows one seed per instantiation: Sum(D) and Sum(L) are
+    // different rules as far as the memo is concerned.
+    auto lr_rule = Context::LRRule(outer_, c.top_macro_inst());
+    auto lr_key = Context::LRKey(lr_rule, s);
+
+    // Check LR memo first
+    auto it = c.lr_memo.find(lr_key);
+    if (it != c.lr_memo.end()) {
+      if (success(it->second.len)) {
+        len = it->second.len;
+        val = it->second.val;
+      } else {
+        len = static_cast<size_t>(-1);
+      }
+      // Record that this rule's lr_memo was accessed.
+      // Any LR rule currently seeding will know we're in its cycle.
+      c.lr_refs_hit.insert(lr_rule);
+    } else {
+      // Seed with FAIL
+      c.lr_memo[lr_key] = {static_cast<size_t>(-1), {}};
+
+      // Mark as active seed (protects our lr_memo from inner growers)
+      c.lr_active_seeds.insert(lr_key);
+      auto seed_guard = scope_exit([&]() { c.lr_active_seeds.erase(lr_key); });
+
+      // Track which LR rules are referenced during our parse
+      // to identify cycle members
+      auto saved_refs = std::move(c.lr_refs_hit);
+      c.lr_refs_hit.clear();
+
+      // Initial parse (self-references will hit the FAIL seed)
+      auto [initial_len, initial_val] = do_parse();
+
+      // Rules whose lr_memo was hit during our parse are in our cycle.
+      // If we detected cycle members, we ourselves are also part of
+      // the cycle, so add self — this lets parent seeders see us as
+      // a transitive cycle member.
+      auto cycle_rules = c.lr_refs_hit;
+      if (!cycle_rules.empty()) { cycle_rules.insert(lr_rule); }
+
+      // Restore parent's refs and propagate cycle info upward
+      c.lr_refs_hit = std::move(saved_refs);
+      c.lr_refs_hit.insert(cycle_rules.begin(), cycle_rules.end());
+
+      if (!success(initial_len)) {
+        // Keep FAIL in lr_memo so we don't re-seed
+        len = static_cast<size_t>(-1);
+      } else {
+        // Got initial seed, now grow
+        len = initial_len;
+        val = std::move(initial_val);
+        c.lr_memo[lr_key] = {len, val};
+
+        while (true) {
+          // Clear this rule's packrat cache. A macro is never written there
+          // (that cache is keyed by rule id alone, which cannot tell two
+          // instantiations apart), so there is nothing to clear for one.
+          if (!outer_->is_macro) { c.clear_packrat_cache(s, outer_->id); }
+
+          // Clear lr_memo for cycle-dependent rules at this position,
+          // but NOT for rules currently in their own seeding phase
+          // (lr_active_seeds) — those are outer growers we must not
+          // interfere with.
+          for (auto memo_it = c.lr_memo.begin(); memo_it != c.lr_memo.end();) {
+            if (memo_it->first.second == s && memo_it->first.first != lr_rule &&
+                cycle_rules.count(memo_it->first.first) &&
+                !c.lr_active_seeds.count(memo_it->first)) {
+              memo_it = c.lr_memo.erase(memo_it);
+            } else {
+              ++memo_it;
+            }
+          }
+
+          auto [new_len, new_val] = do_parse();
+
+          if (!success(new_len) || new_len <= len) {
+            break; // No improvement, done growing
+          }
+
+          len = new_len;
+          val = std::move(new_val);
+          c.lr_memo[lr_key] = {len, val};
+        }
+      }
+
+      // Write final result to packrat cache (lr_memo entry is kept as
+      // the primary lookup for LR rules at this position)
+      if (success(len) && !outer_->is_macro) {
+        c.write_packrat_cache(s, outer_->id, len, val);
+      }
+    }
+  } else {
+    if (c.enablePackratParsing) {
+      // Packrat cache acts as re-entry guard (pre-registered as
+      // failure before fn is called).
+      c.packrat(s, outer_->id, len, val, [&](std::any &a_val) {
+        auto [parse_len, parse_val] = do_parse();
+        len = parse_len;
+        if (success(len)) { a_val = std::move(parse_val); }
+      });
+    } else {
+      // Without packrat, use lr_memo as re-entry guard to prevent
+      // stack overflow from undetected left recursion.
+      auto guard_key = Context::LRKey({outer_, c.top_macro_inst()}, s);
+      if (c.lr_memo.count(guard_key)) {
+        len = static_cast<size_t>(-1);
+      } else {
+        c.lr_memo[guard_key] = {static_cast<size_t>(-1), {}};
+        auto [parse_len, parse_val] = do_parse();
+        len = parse_len;
+        val = std::move(parse_val);
+        c.lr_memo.erase(guard_key);
+      }
+    }
+  }
+
+  if (success(len)) {
+    if (!outer_->ignoreSemanticValue) {
+      vs.emplace_back(std::move(val));
+      vs.tags.emplace_back(str2tag(outer_->name));
+    }
+  }
+
+  return len;
 }
 
-inline std::any Holder::reduce(SemanticValues &vs, std::any &dt) const {
-    if (outer_->action && !outer_->disable_action) {
-        return outer_->action(vs, dt);
-    } else if (vs.empty()) {
-        return std::any();
-    } else {
-        return std::move(vs.front());
-    }
+inline std::any Holder::reduce(SemanticValues &vs, std::any &dt,
+                               const std::any &predicate_data) const {
+  if (outer_->action && !outer_->disable_action) {
+    return outer_->action(vs, dt, predicate_data);
+  } else if (vs.empty()) {
+    return std::any();
+  } else {
+    return std::move(vs.front());
+  }
 }
 
 inline const std::string &Holder::name() const { return outer_->name; }
 
 inline const std::string &Holder::trace_name() const {
-    std::call_once(trace_name_init_,
-                   [this]() { trace_name_ = "[" + outer_->name + "]"; });
-    return trace_name_;
+  std::call_once(trace_name_init_,
+                 [this]() { trace_name_ = "[" + outer_->name + "]"; });
+  return trace_name_;
+}
+
+// Key a macro instantiation by what each argument denotes rather than by the
+// node that spells it: `M(N)` written at two call sites builds two Reference
+// nodes for the same rule N, and those are the same instantiation.
+inline std::vector<const void *>
+macro_inst_key(const Definition *def,
+               const std::vector<std::shared_ptr<Ope>> &args) {
+  std::vector<const void *> key;
+  key.reserve(args.size() + 1);
+  key.push_back(def);
+  for (const auto &arg : args) {
+    auto ref = dynamic_cast<Reference *>(arg.get());
+    key.push_back(ref && ref->rule_ ? static_cast<const void *>(ref->rule_)
+                                    : static_cast<const void *>(arg.get()));
+  }
+  return key;
 }
 
 inline size_t Reference::parse_core(const char *s, size_t n, SemanticValues &vs,
                                     Context &c, std::any &dt) const {
-    auto save_ignore_trace_state = c.ignore_trace_state;
-    if (rule_ && rule_->ignoreSemanticValue) {
-        c.ignore_trace_state = !c.verbose_trace;
-    }
-    auto se1 =
-        scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
+  auto save_ignore_trace_state = c.ignore_trace_state;
+  if (rule_ && rule_->ignoreSemanticValue) {
+    c.ignore_trace_state = !c.verbose_trace;
+  }
+  auto se =
+      scope_exit([&]() { c.ignore_trace_state = save_ignore_trace_state; });
 
-    if (rule_) {
-        // Reference rule
-        if (rule_->is_macro) {
-            // Macro
-            FindReference vis(c.top_args(), c.rule_stack.back()->params);
+  if (rule_) {
+    // Reference rule
+    if (rule_->is_macro) {
+      // Macro
+      FindReference vis(c.top_args(), c.rule_stack.back()->params);
 
-            // Collect arguments
-            std::vector<std::shared_ptr<Ope>> args;
-            for (auto arg : args_) {
-                arg->accept(vis);
-                args.emplace_back(std::move(vis.found_ope));
-            }
+      // Collect arguments
+      std::vector<std::shared_ptr<Ope>> args;
+      for (const auto &arg : args_) {
+        arg->accept(vis);
+        args.emplace_back(std::move(vis.found_ope));
+      }
 
-            c.push_args(std::move(args));
-            auto se2 = scope_exit([&]() { c.pop_args(); });
-            auto ope = get_core_operator();
-            return ope->parse(s, n, vs, c, dt);
-        } else {
-            // Definition
-            c.push_args(std::vector<std::shared_ptr<Ope>>());
-            auto se3 = scope_exit([&]() { c.pop_args(); });
-            auto ope = get_core_operator();
-            return ope->parse(s, n, vs, c, dt);
-        }
+      auto inst = rule_->is_left_recursive
+                      ? c.intern_macro_inst(macro_inst_key(rule_, args))
+                      : 0;
+      c.push_args(std::move(args), inst);
+      auto se = scope_exit([&]() { c.pop_args(); });
+      return rule_->holder_->parse(s, n, vs, c, dt);
     } else {
-        // Reference parameter in macro
-        const auto &args = c.top_args();
-        return args[iarg_]->parse(s, n, vs, c, dt);
+      // Definition
+      c.push_args(std::vector<std::shared_ptr<Ope>>());
+      auto se2 = scope_exit([&]() { c.pop_args(); });
+      return rule_->holder_->parse(s, n, vs, c, dt);
     }
+  } else {
+    // Reference parameter in macro
+    const auto &args = c.top_args();
+    return args[iarg_]->parse(s, n, vs, c, dt);
+  }
 }
 
 inline std::shared_ptr<Ope> Reference::get_core_operator() const {
-    return rule_->holder_;
+  return rule_->holder_;
 }
 
 inline size_t BackReference::parse_core(const char *s, size_t n,
                                         SemanticValues &vs, Context &c,
                                         std::any &dt) const {
-    auto size = static_cast<int>(c.capture_scope_stack_size);
-    for (auto i = size - 1; i >= 0; i--) {
-        auto index = static_cast<size_t>(i);
-        const auto &cs = c.capture_scope_stack[index];
-        if (cs.find(name_) != cs.end()) {
-            const auto &lit = cs.at(name_);
-            std::once_flag init_is_word;
-            auto is_word = false;
-            return parse_literal(s, n, vs, c, dt, lit, init_is_word, is_word, false);
-        }
+  for (auto it = c.capture_entries.rbegin(); it != c.capture_entries.rend();
+       ++it) {
+    if (it->first == name_) {
+      const auto &lit = it->second;
+      std::once_flag init_is_word;
+      auto is_word = false;
+      static const std::string empty;
+      return parse_literal(s, n, vs, c, dt, lit, init_is_word, is_word, false,
+                           empty);
     }
+  }
 
-    c.error_info.message_pos = s;
-    c.error_info.message = "undefined back reference '$" + name_ + "'...";
-    return static_cast<size_t>(-1);
+  c.error_info.message_pos = s;
+  c.error_info.message = "undefined back reference '$" + name_ + "'...";
+  return static_cast<size_t>(-1);
 }
 
 inline Definition &
 PrecedenceClimbing::get_reference_for_binop(Context &c) const {
-    if (rule_.is_macro) {
-        // Reference parameter in macro
-        const auto &args = c.top_args();
-        auto iarg = dynamic_cast<Reference &>(*binop_).iarg_;
-        auto arg = args[iarg];
-        return *dynamic_cast<Reference &>(*arg).rule_;
-    }
+  if (rule_.is_macro) {
+    // Reference parameter in macro
+    const auto &args = c.top_args();
+    auto iarg = dynamic_cast<Reference &>(*binop_).iarg_;
+    auto arg = args[iarg];
+    return *dynamic_cast<Reference &>(*arg).rule_;
+  }
 
-    return *dynamic_cast<Reference &>(*binop_).rule_;
+  return *dynamic_cast<Reference &>(*binop_).rule_;
 }
 
 inline size_t PrecedenceClimbing::parse_expression(const char *s, size_t n,
                                                    SemanticValues &vs,
                                                    Context &c, std::any &dt,
                                                    size_t min_prec) const {
-    auto len = atom_->parse(s, n, vs, c, dt);
-    if (fail(len)) { return len; }
+  auto len = atom_->parse(s, n, vs, c, dt);
+  if (fail(len)) { return len; }
 
-    std::string tok;
-    auto &rule = get_reference_for_binop(c);
-    auto action = std::move(rule.action);
+  std::string tok;
+  auto &rule = get_reference_for_binop(c);
+  auto action = std::move(rule.action);
 
-    rule.action = [&](SemanticValues &vs2, std::any &dt2) {
-        tok = vs2.token();
-        if (action) {
-            return action(vs2, dt2);
-        } else if (!vs2.empty()) {
-            return vs2[0];
-        }
-        return std::any();
-    };
-    auto action_se = scope_exit([&]() { rule.action = std::move(action); });
+  rule.action = [&](SemanticValues &vs2, std::any &dt2,
+                    const std::any &predicate_data2) {
+    tok = vs2.token();
+    if (action) {
+      return action(vs2, dt2, predicate_data2);
+    } else if (!vs2.empty()) {
+      return vs2[0];
+    }
+    return std::any();
+  };
+  auto action_se = scope_exit([&]() { rule.action = std::move(action); });
 
-    auto i = len;
-    while (i < n) {
-        std::vector<std::any> save_values(vs.begin(), vs.end());
-        auto save_tokens = vs.tokens;
+  auto i = len;
+  while (i < n) {
+    std::vector<std::any> save_values(vs.begin(), vs.end());
+    auto save_tokens = vs.tokens;
 
-        auto chvs = c.push_semantic_values_scope();
-        auto chlen = binop_->parse(s + i, n - i, chvs, c, dt);
-        c.pop_semantic_values_scope();
+    auto chvs = c.push_semantic_values_scope();
+    auto chlen = binop_->parse(s + i, n - i, chvs, c, dt);
+    c.pop_semantic_values_scope();
 
-        if (fail(chlen)) { break; }
+    if (fail(chlen)) { break; }
 
-        auto it = info_.find(tok);
-        if (it == info_.end()) { break; }
+    auto it = info_.find(tok);
+    if (it == info_.end()) { break; }
 
-        auto level = std::get<0>(it->second);
-        auto assoc = std::get<1>(it->second);
+    auto level = std::get<0>(it->second);
+    auto assoc = std::get<1>(it->second);
 
-        if (level < min_prec) { break; }
+    if (level < min_prec) { break; }
 
-        vs.emplace_back(std::move(chvs[0]));
-        i += chlen;
+    vs.emplace_back(std::move(chvs[0]));
+    i += chlen;
 
-        auto next_min_prec = level;
-        if (assoc == 'L') { next_min_prec = level + 1; }
+    auto next_min_prec = level;
+    if (assoc == 'L') { next_min_prec = level + 1; }
 
-        chvs = c.push_semantic_values_scope();
-        chlen = parse_expression(s + i, n - i, chvs, c, dt, next_min_prec);
-        c.pop_semantic_values_scope();
+    chvs = c.push_semantic_values_scope();
+    chlen = parse_expression(s + i, n - i, chvs, c, dt, next_min_prec);
+    c.pop_semantic_values_scope();
 
-        if (fail(chlen)) {
-            vs.assign(save_values.begin(), save_values.end());
-            vs.tokens = save_tokens;
-            i = chlen;
-            break;
-        }
-
-        vs.emplace_back(std::move(chvs[0]));
-        i += chlen;
-
-        std::any val;
-        if (rule_.action) {
-            vs.sv_ = std::string_view(s, i);
-            val = rule_.action(vs, dt);
-        } else if (!vs.empty()) {
-            val = vs[0];
-        }
-        vs.clear();
-        vs.emplace_back(std::move(val));
+    if (fail(chlen)) {
+      vs.assign(save_values.begin(), save_values.end());
+      vs.tokens = save_tokens;
+      i = chlen;
+      break;
     }
 
-    return i;
+    vs.emplace_back(std::move(chvs[0]));
+    i += chlen;
+
+    std::any val;
+    if (rule_.action) {
+      vs.sv_ = std::string_view(s, i);
+      static const std::any empty_predicate_data;
+      val = rule_.action(vs, dt, empty_predicate_data);
+    } else if (!vs.empty()) {
+      val = vs[0];
+    }
+    vs.clear();
+    vs.emplace_back(std::move(val));
+  }
+
+  return i;
 }
 
 inline size_t Recovery::parse_core(const char *s, size_t n,
                                    SemanticValues & /*vs*/, Context &c,
                                    std::any & /*dt*/) const {
-    const auto &rule = dynamic_cast<Reference &>(*ope_);
+  const auto &rule = dynamic_cast<Reference &>(*ope_);
 
-    // Custom error message
-    if (c.log) {
-        auto label = dynamic_cast<Reference *>(rule.args_[0].get());
-        if (label && !label->rule_->error_message.empty()) {
-            c.error_info.message_pos = s;
-            c.error_info.message = label->rule_->error_message;
-            c.error_info.label = label->rule_->name;
-        }
+  // Custom error message
+  if (c.log || c.error_reporter) {
+    auto label = dynamic_cast<Reference *>(rule.args_[0].get());
+    if (label && !label->rule_->error_message.empty()) {
+      c.error_info.message_pos = s;
+      c.error_info.message =
+          resolve_capture_placeholders(label->rule_->error_message, c);
+      c.error_info.label = label->rule_->name;
     }
+  }
 
-    // Recovery
-    auto len = static_cast<size_t>(-1);
-    {
-        auto save_log = c.log;
-        c.log = nullptr;
-        auto se = scope_exit([&]() { c.log = save_log; });
+  // Recovery
+  auto len = static_cast<size_t>(-1);
+  {
+    auto save_log = c.log;
+    auto save_reporter = c.error_reporter;
+    c.log = nullptr;
+    c.error_reporter = nullptr;
+    auto se = scope_exit([&]() {
+      c.log = save_log;
+      c.error_reporter = save_reporter;
+    });
 
-        SemanticValues dummy_vs;
-        std::any dummy_dt;
+    SemanticValues dummy_vs;
+    std::any dummy_dt;
 
-        len = rule.parse(s, n, dummy_vs, c, dummy_dt);
+    len = rule.parse(s, n, dummy_vs, c, dummy_dt);
+  }
+
+  if (success(len)) {
+    c.recovered = true;
+
+    if (c.log || c.error_reporter) {
+      c.error_info.output_log(c.log, c.error_reporter, c.s, c.l);
+      c.error_info.clear();
     }
+  }
 
-    if (success(len)) {
-        c.recovered = true;
+  // Cut
+  if (!c.cut_stack.empty()) {
+    c.cut_stack.back() = true;
 
-        if (c.log) {
-            c.error_info.output_log(c.log, c.s, c.l);
-            c.error_info.clear();
-        }
+    if (c.cut_stack.size() == 1) {
+      // TODO: Remove unneeded entries in packrat memoise table
     }
+  }
 
-    // Cut
-    if (!c.cut_stack.empty()) {
-        c.cut_stack.back() = true;
-
-        if (c.cut_stack.size() == 1) {
-            // TODO: Remove unneeded entries in packrat memoise table
-        }
-    }
-
-    return len;
+  return len;
 }
 
 inline void Sequence::accept(Visitor &v) { v.visit(*this); }
@@ -3100,196 +4165,1024 @@ inline void Recovery::accept(Visitor &v) { v.visit(*this); }
 inline void Cut::accept(Visitor &v) { v.visit(*this); }
 
 inline void AssignIDToDefinition::visit(Holder &ope) {
-    auto p = static_cast<void *>(ope.outer_);
-    if (ids.count(p)) { return; }
-    auto id = ids.size();
-    ids[p] = id;
-    ope.outer_->id = id;
-    ope.ope_->accept(*this);
+  auto p = static_cast<void *>(ope.outer_);
+  if (ids.count(p)) { return; }
+  auto id = ids.size();
+  ids[p] = id;
+  ope.outer_->id = id;
+  ope.ope_->accept(*this);
 }
 
 inline void AssignIDToDefinition::visit(Reference &ope) {
-    if (ope.rule_) {
-        for (auto arg : ope.args_) {
-            arg->accept(*this);
-        }
-        ope.rule_->accept(*this);
+  if (ope.rule_) {
+    for (const auto &arg : ope.args_) {
+      arg->accept(*this);
     }
+    ope.rule_->accept(*this);
+  }
 }
 
 inline void AssignIDToDefinition::visit(PrecedenceClimbing &ope) {
-    ope.atom_->accept(*this);
-    ope.binop_->accept(*this);
+  ope.atom_->accept(*this);
+  ope.binop_->accept(*this);
 }
 
 inline void TokenChecker::visit(Reference &ope) {
-    if (ope.is_macro_) {
-        for (auto arg : ope.args_) {
-            arg->accept(*this);
-        }
-    } else {
-        has_rule_ = true;
+  if (ope.is_macro_) {
+    for (const auto &arg : ope.args_) {
+      arg->accept(*this);
     }
+  } else {
+    has_rule_ = true;
+  }
 }
 
 inline void FindLiteralToken::visit(Reference &ope) {
-    if (ope.is_macro_) {
-        ope.rule_->accept(*this);
-        for (auto arg : ope.args_) {
-            arg->accept(*this);
-        }
+  if (ope.is_macro_) {
+    ope.rule_->accept(*this);
+    for (const auto &arg : ope.args_) {
+      arg->accept(*this);
     }
+  }
+}
+
+inline void ComputeCanBeEmpty::visit(Reference &ope) {
+  result = ope.rule_ && ope.rule_->can_be_empty;
 }
 
 inline void DetectLeftRecursion::visit(Reference &ope) {
-    if (ope.name_ == name_) {
-        error_s = ope.s_;
-    } else if (!refs_.count(ope.name_)) {
-        refs_.insert(ope.name_);
-        if (ope.rule_) {
-            ope.rule_->accept(*this);
-            if (done_ == false) { return; }
-        }
+  // Macro parameter reference: what it denotes lives in an enclosing
+  // instantiation (e.g. B(X) <- C(X) where X is itself a param ref).
+  auto param = !ope.rule_ && !macro_args_stack_.empty()
+                   ? resolve_macro_arg(ope.iarg_)
+                   : ResolvedArg{};
+
+  if (ope.name_ == name_) {
+    error_s = ope.s_;
+  } else if (param.ope) {
+    visit_in_defining_scope(param);
+    if (done_ == false) { return; }
+  } else if (ope.is_macro_ &&
+             macro_args_stack_.size() >= max_macro_inst_depth) {
+    // Unbounded instantiation chain; stop descending.
+  } else if (ope.rule_ &&
+             refs_
+                 .emplace(ope.rule_, ope.is_macro_ ? intern_macro_inst(ope) : 0)
+                 .second) {
+    if (ope.is_macro_) { macro_args_stack_.push_back(&ope.args_); }
+    ope.rule_->accept(*this);
+    if (ope.is_macro_) { macro_args_stack_.pop_back(); }
+    if (done_ == false) { return; }
+  }
+  // If the referenced rule can match empty, don't mark as done —
+  // the sequence may continue past this element to find LR.
+  if (!ope.rule_ && !macro_args_stack_.empty()) {
+    if (param.ope) {
+      // ComputeCanBeEmpty never consults the frame stack, so the scope it
+      // runs in cannot matter.
+      ComputeCanBeEmpty cbe;
+      param.ope->accept(cbe);
+      done_ = !cbe.result;
+    } else {
+      done_ = true;
     }
-    done_ = true;
+  } else {
+    done_ = !(ope.rule_ && ope.rule_->can_be_empty);
+  }
+}
+
+inline size_t DetectLeftRecursion::intern_macro_inst(const Reference &ope) {
+  // Resolve bare parameter references to what the enclosing instantiation was
+  // given, so a macro passing its own parameter through interns to the same
+  // instantiation instead of a fresh one at every nesting level.
+  std::vector<std::shared_ptr<Ope>> args;
+  args.reserve(ope.args_.size());
+  for (const auto &arg : ope.args_) {
+    auto ref = dynamic_cast<Reference *>(arg.get());
+    auto resolved = ref && !ref->rule_ && !macro_args_stack_.empty()
+                        ? resolve_macro_arg(ref->iarg_).ope
+                        : nullptr;
+    args.push_back(resolved ? resolved : arg);
+  }
+  auto [it, inserted] = macro_inst_ids_.emplace(macro_inst_key(ope.rule_, args),
+                                                next_macro_inst_);
+  if (inserted) { next_macro_inst_++; }
+  return it->second;
+}
+
+inline void
+DetectLeftRecursion::visit_in_defining_scope(const ResolvedArg &arg) {
+  // The frames below the one holding it are the scope it was written in.
+  // `W(X) <- Y(X / 'x')` passes Y an argument whose own `X` means W's
+  // parameter, not Y's -- leaving Y's frame visible would resolve that `X`
+  // right back to `X / 'x'`, forever.
+  auto saved = macro_args_stack_;
+  auto se = scope_exit([&]() { macro_args_stack_ = std::move(saved); });
+  macro_args_stack_.resize(arg.depth);
+  arg.ope->accept(*this);
+}
+
+inline DetectLeftRecursion::ResolvedArg
+DetectLeftRecursion::resolve_macro_arg(size_t iarg) const {
+  for (int i = static_cast<int>(macro_args_stack_.size()) - 1; i >= 0; i--) {
+    auto &args = *macro_args_stack_[i];
+    if (iarg >= args.size()) { return {}; }
+    auto ref = dynamic_cast<Reference *>(args[iarg].get());
+    if (ref && !ref->rule_) {
+      // Another param ref — resolve using parent level's args
+      iarg = ref->iarg_;
+      continue;
+    }
+    return {args[iarg], static_cast<size_t>(i)};
+  }
+  return {};
 }
 
 inline void HasEmptyElement::visit(Sequence &ope) {
-    auto save_is_empty = false;
-    const char *save_error_s = nullptr;
-    std::string save_error_name;
+  auto save_is_empty = false;
+  const char *save_error_s = nullptr;
+  std::string save_error_name;
 
-    auto it = ope.opes_.begin();
-    while (it != ope.opes_.end()) {
-        (*it)->accept(*this);
-        if (!is_empty) {
-            ++it;
-            while (it != ope.opes_.end()) {
-                DetectInfiniteLoop vis(refs_, has_error_cache_);
-                (*it)->accept(vis);
-                if (vis.has_error) {
-                    is_empty = true;
-                    error_s = vis.error_s;
-                    error_name = vis.error_name;
-                }
-                ++it;
-            }
-            return;
+  auto it = ope.opes_.begin();
+  while (it != ope.opes_.end()) {
+    (*it)->accept(*this);
+    if (!is_empty) {
+      ++it;
+      while (it != ope.opes_.end()) {
+        DetectInfiniteLoop vis(refs_, has_error_cache_);
+        (*it)->accept(vis);
+        if (vis.has_error) {
+          is_empty = true;
+          error_s = vis.error_s;
+          error_name = vis.error_name;
         }
-
-        save_is_empty = is_empty;
-        save_error_s = error_s;
-        save_error_name = error_name;
-
-        is_empty = false;
-        error_name.clear();
         ++it;
+      }
+      return;
     }
 
-    is_empty = save_is_empty;
-    error_s = save_error_s;
-    error_name = save_error_name;
+    save_is_empty = is_empty;
+    save_error_s = error_s;
+    save_error_name = error_name;
+
+    is_empty = false;
+    error_name.clear();
+    ++it;
+  }
+
+  is_empty = save_is_empty;
+  error_s = save_error_s;
+  error_name = save_error_name;
 }
 
 inline void HasEmptyElement::visit(Reference &ope) {
-    auto it = std::find_if(refs_.begin(), refs_.end(),
-                           [&](const std::pair<const char *, std::string> &ref) {
-                               return ope.name_ == ref.second;
-                           });
-    if (it != refs_.end()) { return; }
+  auto it = std::find_if(refs_.begin(), refs_.end(),
+                         [&](const std::pair<const char *, std::string> &ref) {
+                           return ope.name_ == ref.second;
+                         });
+  if (it != refs_.end()) { return; }
 
-    if (ope.rule_) {
-        refs_.emplace_back(ope.s_, ope.name_);
-        ope.rule_->accept(*this);
-        refs_.pop_back();
-    }
+  if (ope.rule_) {
+    refs_.emplace_back(ope.s_, ope.name_);
+    ope.rule_->accept(*this);
+    refs_.pop_back();
+  }
 }
 
 inline void DetectInfiniteLoop::visit(Reference &ope) {
-    auto it1 = std::find_if(refs_.begin(), refs_.end(),
-                           [&](const std::pair<const char *, std::string> &ref) {
-                               return ope.name_ == ref.second;
-                           });
-    if (it1 != refs_.end()) { return; }
+  auto it = std::find_if(refs_.begin(), refs_.end(),
+                         [&](const std::pair<const char *, std::string> &ref) {
+                           return ope.name_ == ref.second;
+                         });
+  if (it != refs_.end()) { return; }
 
-    if (ope.rule_) {
-        auto it = has_error_cache_.find(ope.name_);
-        if (it != has_error_cache_.end()) {
-            has_error = it->second;
-        } else {
-            refs_.emplace_back(ope.s_, ope.name_);
-            ope.rule_->accept(*this);
-            refs_.pop_back();
-            has_error_cache_[ope.name_] = has_error;
-        }
+  if (ope.rule_) {
+    auto it = has_error_cache_.find(ope.name_);
+    if (it != has_error_cache_.end()) {
+      has_error = it->second;
+    } else {
+      refs_.emplace_back(ope.s_, ope.name_);
+      ope.rule_->accept(*this);
+      refs_.pop_back();
+      has_error_cache_[ope.name_] = has_error;
     }
+  }
 
-    if (ope.is_macro_) {
-        for (auto arg : ope.args_) {
-            arg->accept(*this);
-        }
+  if (ope.is_macro_) {
+    for (const auto &arg : ope.args_) {
+      arg->accept(*this);
     }
+  }
 }
 
 inline void ReferenceChecker::visit(Reference &ope) {
-    auto it = std::find(params_.begin(), params_.end(), ope.name_);
-    if (it != params_.end()) { return; }
+  auto it = std::find(params_.begin(), params_.end(), ope.name_);
+  if (it != params_.end()) { return; }
 
-    if (!grammar_.count(ope.name_)) {
+  if (!grammar_.count(ope.name_)) {
+    error_s[ope.name_] = ope.s_;
+    error_message[ope.name_] = "'" + ope.name_ + "' is not defined.";
+  } else {
+    if (!referenced.count(ope.name_)) { referenced.insert(ope.name_); }
+    const auto &rule = grammar_.at(ope.name_);
+    if (rule.is_macro) {
+      if (!ope.is_macro_ || ope.args_.size() != rule.params.size()) {
         error_s[ope.name_] = ope.s_;
-        error_message[ope.name_] = "'" + ope.name_ + "' is not defined.";
-    } else {
-        if (!referenced.count(ope.name_)) { referenced.insert(ope.name_); }
-        const auto &rule = grammar_.at(ope.name_);
-        if (rule.is_macro) {
-            if (!ope.is_macro_ || ope.args_.size() != rule.params.size()) {
-                error_s[ope.name_] = ope.s_;
-                error_message[ope.name_] = "incorrect number of arguments.";
-            }
-        } else if (ope.is_macro_) {
-            error_s[ope.name_] = ope.s_;
-            error_message[ope.name_] = "'" + ope.name_ + "' is not macro.";
-        }
-        for (auto arg : ope.args_) {
-            arg->accept(*this);
-        }
+        error_message[ope.name_] = "incorrect number of arguments.";
+      }
+    } else if (ope.is_macro_) {
+      error_s[ope.name_] = ope.s_;
+      error_message[ope.name_] = "'" + ope.name_ + "' is not macro.";
     }
+    for (const auto &arg : ope.args_) {
+      arg->accept(*this);
+    }
+  }
+}
+
+inline void ComputeFirstSet::visit(Reference &ope) {
+  if (!ope.rule_) {
+    // Macro parameter reference — can't predict what it will match
+    result_.any_char = true;
+    return;
+  }
+
+  auto it = cache_.find(ope.rule_);
+  FirstSet computed;
+  const FirstSet *rule_fs;
+  if (it != cache_.end()) {
+    rule_fs = &it->second;
+  } else {
+    if (!refs_.insert(ope.rule_).second) {
+      cycle_count_++; // cycle / left recursion
+      return;
+    }
+    auto save = std::exchange(result_, FirstSet{});
+    auto saved_cycle_count = cycle_count_;
+    ope.rule_->accept(*this);
+    computed = std::move(result_);
+    result_ = std::move(save);
+    refs_.erase(ope.rule_);
+    if (cycle_count_ == saved_cycle_count) {
+      // Cycle-free: cached value is complete and safe to reuse.
+      it = cache_.try_emplace(ope.rule_, std::move(computed)).first;
+      rule_fs = &it->second;
+    } else {
+      // Cycle was hit during this rule's computation — its result may be
+      // missing contributions from rules that were on the call stack.
+      // Use the value here but do not cache it for other call contexts.
+      rule_fs = &computed;
+    }
+  }
+
+  result_.merge(*rule_fs);
+  if (!result_.first_literal) {
+    result_.first_literal = rule_fs->first_literal;
+  }
+  if (!result_.first_rule) {
+    result_.first_rule = rule_fs->first_rule
+                             ? rule_fs->first_rule
+                             : (ope.rule_->is_token() ? ope.rule_ : nullptr);
+  }
+}
+
+inline void SetupFirstSets::visit(Reference &ope) {
+  if (!ope.rule_) { return; }
+  ope.rule_->accept(*this); // re-entry is guarded at the rule's Holder
+}
+
+// Guard rule setup by Definition so a SetupFirstSets shared across all rules
+// visits each rule's body at most once for the whole grammar. Without this the
+// per-rule setup re-walks every reachable rule once per referencing rule, which
+// is O(N^2) for grammars with dense cross-references.
+inline void SetupFirstSets::visit(Holder &ope) {
+  if (!visited_rules_.insert(ope.outer_).second) { return; }
+  ope.ope_->accept(*this);
+}
+
+inline void SetupFirstSets::visit(Sequence &ope) {
+  ope.kw_guard_.reset();
+  setup_keyword_guarded_identifier(ope);
+  for (const auto &op : ope.opes_) {
+    op->accept(*this);
+  }
+}
+
+inline void SetupFirstSets::setup_keyword_guarded_identifier(Sequence &seq) {
+  // Detect pattern: NotPredicate(Reference→PrioritizedChoice<literals>)
+  //                 TokenBoundary(Sequence[CharacterClass,
+  //                 Repetition(CharacterClass)])
+  // This is the pattern used by: PlainIdentifier <- !ReservedKeyword
+  // <[a-z_]i[a-z0-9_]i*>
+  if (seq.opes_.size() != 2) { return; }
+
+  // Child 0 must be NotPredicate
+  auto *not_pred = dynamic_cast<NotPredicate *>(seq.opes_[0].get());
+  if (!not_pred) { return; }
+
+  // NotPredicate's child must be Reference to a rule
+  auto *ref = dynamic_cast<Reference *>(not_pred->ope_.get());
+  if (!ref || !ref->rule_) { return; }
+
+  // The referenced rule's inner operator (Holder) must contain
+  // PrioritizedChoice
+  auto *holder = dynamic_cast<Holder *>(ref->get_core_operator().get());
+  if (!holder) { return; }
+  auto *choice = dynamic_cast<PrioritizedChoice *>(holder->ope_.get());
+  if (!choice) { return; }
+
+  // Extract keywords from PrioritizedChoice alternatives
+  std::vector<std::string> exact_keywords;
+  std::vector<std::string> prefix_keywords;
+
+  for (const auto &alt : choice->opes_) {
+    auto *lit = dynamic_cast<LiteralString *>(alt.get());
+    if (lit) {
+      if (!lit->ignore_case_) { return; }
+      exact_keywords.push_back(to_lower(lit->lit_));
+      continue;
+    }
+    // Check for compound keyword (Sequence of LiteralStrings)
+    auto *sub_seq = dynamic_cast<Sequence *>(alt.get());
+    if (sub_seq && !sub_seq->opes_.empty()) {
+      auto *first_lit = dynamic_cast<LiteralString *>(sub_seq->opes_[0].get());
+      if (first_lit) {
+        auto all_ignore_case_lits =
+            std::all_of(sub_seq->opes_.begin(), sub_seq->opes_.end(),
+                        [](const auto &child) {
+                          auto *l = dynamic_cast<LiteralString *>(child.get());
+                          return l && l->ignore_case_;
+                        });
+        if (all_ignore_case_lits) {
+          prefix_keywords.push_back(to_lower(first_lit->lit_));
+          continue;
+        }
+      }
+    }
+    // Unrecognized alternative — bail out
+    return;
+  }
+
+  if (exact_keywords.empty()) { return; }
+
+  // Child 1 must be TokenBoundary
+  auto *tb = dynamic_cast<TokenBoundary *>(seq.opes_[1].get());
+  if (!tb) { return; }
+
+  // TokenBoundary content: Sequence[CharacterClass, Repetition(CharacterClass)]
+  // or just CharacterClass (single char identifier)
+  CharacterClass *first_cc = nullptr;
+  CharacterClass *rest_cc = nullptr;
+
+  auto *inner_seq = dynamic_cast<Sequence *>(tb->ope_.get());
+  if (inner_seq && inner_seq->opes_.size() == 2) {
+    first_cc = dynamic_cast<CharacterClass *>(inner_seq->opes_[0].get());
+    auto *rep = dynamic_cast<Repetition *>(inner_seq->opes_[1].get());
+    if (rep) { rest_cc = dynamic_cast<CharacterClass *>(rep->ope_.get()); }
+  }
+
+  if (!first_cc || !rest_cc) { return; }
+  if (!first_cc->is_ascii_only() || !rest_cc->is_ascii_only()) { return; }
+
+  // All conditions met — set up the fast path
+  auto kw = std::make_unique<KeywordGuardData>();
+  kw->identifier_first = first_cc->ascii_bitset();
+  kw->identifier_rest = rest_cc->ascii_bitset();
+
+  // Compute keyword length range for early-out in hot path
+  size_t min_len = SIZE_MAX, max_len = 0;
+  for (const auto &k : exact_keywords) {
+    min_len = std::min(min_len, k.size());
+    max_len = std::max(max_len, k.size());
+  }
+  for (const auto &k : prefix_keywords) {
+    min_len = std::min(min_len, k.size());
+    max_len = std::max(max_len, k.size());
+  }
+  kw->min_keyword_len = min_len;
+  kw->max_keyword_len = max_len;
+
+  kw->exact_keywords = std::move(exact_keywords);
+  kw->prefix_keywords = std::move(prefix_keywords);
+  seq.kw_guard_ = std::move(kw);
+}
+
+// Compute which rules benefit from packrat memoization.
+// A rule benefits if it's reachable from 2+ alternatives of the same
+// PrioritizedChoice (backtracking will re-visit it at the same position).
+inline void Definition::initialize_packrat_filter() const {
+  std::call_once(packrat_filter_init_, [&]() {
+    auto def_count = definition_ids_.size();
+    if (def_count == 0) { return; }
+
+    // Collect rule IDs that can be invoked at the *same start position* as
+    // the given Ope subtree (leftmost reachability). A packrat cache hit
+    // requires the same rule to be queried twice at the same position, and
+    // in a PEG that only happens when alternatives of a choice share a
+    // leftmost prefix — rules reachable only past a consuming element can
+    // never be re-queried by a sibling alternative.
+    struct CollectLeftmostRules : public TraversalVisitor {
+      using TraversalVisitor::visit;
+      std::vector<bool> reachable; // indexed by def_id
+      std::vector<bool>
+          visited_rules; // indexed by def_id; guards Holder cycles
+
+      CollectLeftmostRules(size_t n)
+          : reachable(n, false), visited_rules(n, false) {}
+
+      // Collect from the position element `from` starts at: element `from`
+      // itself, plus what follows for as long as elements can match empty —
+      // only up to (and including) the first one that must consume input.
+      void collect(const std::vector<std::shared_ptr<Ope>> &opes, size_t from) {
+        for (auto i = from; i < opes.size(); i++) {
+          opes[i]->accept(*this);
+          ComputeCanBeEmpty empty_vis;
+          opes[i]->accept(empty_vis);
+          if (!empty_vis.result) { break; }
+        }
+      }
+
+      void visit(Sequence &ope) override { collect(ope.opes_, 0); }
+      void visit(Holder &ope) override {
+        auto id = ope.outer_->id;
+        if (id < reachable.size()) {
+          reachable[id] = true;
+
+          // Grammars built directly via the combinator API embed rules through
+          // WeakHolder rather than Reference, so a recursive rule forms a
+          // Holder cycle with no Reference to break it. Guard re-entry to avoid
+          // infinite recursion (reachability is monotone, so revisiting a rule
+          // we have already traversed adds nothing).
+          if (visited_rules[id]) { return; }
+          visited_rules[id] = true;
+        }
+        ope.ope_->accept(*this);
+      }
+      void visit(Reference &ope) override {
+        if (ope.rule_ && ope.rule_->id < reachable.size() &&
+            !reachable[ope.rule_->id]) {
+          reachable[ope.rule_->id] = true;
+          ope.rule_->accept(*this);
+        }
+      }
+    };
+
+    // Find rules that benefit: queried by 2+ alternatives of the same choice
+    // at the same position
+    std::vector<bool> benefits(def_count, false);
+
+    struct FindBacktrackRules : public TraversalVisitor {
+      using TraversalVisitor::visit;
+      std::vector<bool> &benefits;
+      size_t def_count;
+      std::vector<bool> visited_rules; // indexed by def_id
+
+      FindBacktrackRules(std::vector<bool> &b, size_t n)
+          : benefits(b), def_count(n), visited_rules(n, false) {}
+
+      using Elements = std::vector<std::shared_ptr<Ope>>;
+
+      // An alternative's top-level elements, so a shared prefix can be walked
+      // element by element. By value: this runs once per grammar.
+      static Elements elements_of(const std::shared_ptr<Ope> &alt) {
+        if (auto *seq = dynamic_cast<Sequence *>(alt.get())) {
+          return seq->opes_;
+        }
+        return {alt};
+      }
+
+      // `group` holds alternatives that agree on their first `k` elements, so
+      // every one of them reaches element k at the same input position — that
+      // is exactly when a packrat cache entry can hit. k == 0 is the plain
+      // "alternatives of one choice" case; deeper k is what a shared prefix
+      // like `'(' _ PATTERN _ ',' _` hides.
+      void mark_aligned(const std::vector<Elements> &group, size_t k) {
+        if (group.size() < 2) { return; }
+
+        std::vector<std::vector<bool>> reachable;
+        reachable.reserve(group.size());
+        for (const auto &seq : group) {
+          CollectLeftmostRules clr(def_count);
+          clr.collect(seq, k);
+          reachable.push_back(std::move(clr.reachable));
+        }
+        for (size_t id = 0; id < def_count; id++) {
+          size_t count = 0;
+          for (const auto &alt : reachable) {
+            if (alt[id]) { count++; }
+          }
+          if (count >= 2) { benefits[id] = true; }
+        }
+
+        // Only alternatives that also agree on element k stay aligned past it.
+        std::map<std::string, std::vector<Elements>> aligned;
+        for (const auto &seq : group) {
+          if (k < seq.size()) {
+            aligned[OpeSignature::get(*seq[k])].push_back(seq);
+          }
+        }
+        for (const auto &[sig, sub] : aligned) {
+          mark_aligned(sub, k + 1);
+        }
+      }
+
+      void visit(PrioritizedChoice &ope) override {
+        std::vector<Elements> group;
+        group.reserve(ope.opes_.size());
+        for (const auto &op : ope.opes_) {
+          group.push_back(elements_of(op));
+        }
+        mark_aligned(group, 0);
+
+        // Recurse into alternatives
+        for (auto &op : ope.opes_) {
+          op->accept(*this);
+        }
+      }
+      void visit(Holder &ope) override {
+        auto id = ope.outer_->id;
+        if (id < visited_rules.size() && !visited_rules[id]) {
+          visited_rules[id] = true;
+          ope.ope_->accept(*this);
+        }
+      }
+      void visit(Reference &ope) override {
+        if (ope.rule_) { ope.rule_->accept(*this); }
+      }
+    };
+
+    FindBacktrackRules finder(benefits, def_count);
+    holder_->accept(finder);
+    if (whitespaceOpe) { whitespaceOpe->accept(finder); }
+    if (wordOpe) { wordOpe->accept(finder); }
+
+    // Left-recursive rules read and write the packrat cache directly during
+    // seed-growing, so they must stay in the cached set. Macros are the
+    // exception: they use lr_memo only, keyed by instantiation.
+    for (const auto &[ptr, id] : definition_ids_) {
+      auto *def = static_cast<Definition *>(ptr);
+      if (def->is_left_recursive && !def->is_macro && id < def_count) {
+        benefits[id] = true;
+      }
+    }
+
+    // Compact index: def_id -> slot in the cache tables (-1 = guard only)
+    packrat_index_.assign(def_count, -1);
+    int32_t k = 0;
+    for (size_t id = 0; id < def_count; id++) {
+      if (benefits[id]) { packrat_index_[id] = k++; }
+    }
+    packrat_cached_count_ = static_cast<size_t>(k);
+  });
 }
 
 inline void LinkReferences::visit(Reference &ope) {
-    // Check if the reference is a macro parameter
-    auto found_param = false;
-    for (size_t i = 0; i < params_.size(); i++) {
-        const auto &param = params_[i];
-        if (param == ope.name_) {
-            ope.iarg_ = i;
-            found_param = true;
-            break;
-        }
+  // Check if the reference is a macro parameter
+  auto found_param = false;
+  for (size_t i = 0; i < params_.size(); i++) {
+    const auto &param = params_[i];
+    if (param == ope.name_) {
+      ope.iarg_ = i;
+      found_param = true;
+      break;
     }
+  }
 
-    // Check if the reference is a definition rule
-    if (!found_param && grammar_.count(ope.name_)) {
-        auto &rule = grammar_.at(ope.name_);
-        ope.rule_ = &rule;
-    }
+  // Check if the reference is a definition rule
+  if (!found_param && grammar_.count(ope.name_)) {
+    auto &rule = grammar_.at(ope.name_);
+    ope.rule_ = &rule;
+  }
 
-    for (auto arg : ope.args_) {
-        arg->accept(*this);
-    }
+  for (const auto &arg : ope.args_) {
+    arg->accept(*this);
+  }
 }
 
 inline void FindReference::visit(Reference &ope) {
-    for (size_t i = 0; i < args_.size(); i++) {
-        const auto &name = params_[i];
-        if (name == ope.name_) {
-            found_ope = args_[i];
-            return;
-        }
+  for (size_t i = 0; i < args_.size(); i++) {
+    const auto &name = params_[i];
+    if (name == ope.name_) {
+      found_ope = args_[i];
+      return;
     }
-    found_ope = ope.shared_from_this();
+  }
+  found_ope = ope.shared_from_this();
 }
 
+/*-----------------------------------------------------------------------------
+ *  Grammar serialization
+ *
+ *  Serialize a compiled Grammar (the operator tree) to a byte blob and back,
+ *  letting an application skip the meta-parse on startup by embedding a
+ *  prebuilt blob. Structure only: semantic callbacks (actions / enter / leave /
+ *  predicate, attached by enable_ast() etc.) are NOT serialized and must be
+ *  re-applied after deserialize. References resolve by name (no pointer fixup);
+ *  first-sets and keyword guards are recomputed on load (O(N)). The
+ *  `precedence` instruction is supported (its operator table is structural).
+ *  Grammars using the `User` operator or a Capture with a match action are
+ *  rejected. The blob is specific to this peglib version's layout.
+ *---------------------------------------------------------------------------*/
+
+struct GrammarBlob {
+  enum Tag : uint8_t {
+    T_Sequence,
+    T_Choice,
+    T_Repetition,
+    T_And,
+    T_Not,
+    T_Dictionary,
+    T_Literal,
+    T_CharClass,
+    T_Char,
+    T_AnyChar,
+    T_CaptureScope,
+    T_Capture,
+    T_TokenBoundary,
+    T_Ignore,
+    T_BackRef,
+    T_Reference,
+    T_Whitespace,
+    T_Recovery,
+    T_Cut,
+    T_PrecedenceClimbing,
+    T_Null
+  };
+
+  struct Writer {
+    std::vector<uint8_t> b;
+    void u8(uint8_t v) { b.push_back(v); }
+    void u32(uint32_t v) {
+      for (int i = 0; i < 4; i++)
+        b.push_back((v >> (8 * i)) & 0xff);
+    }
+    void u64(uint64_t v) {
+      for (int i = 0; i < 8; i++)
+        b.push_back((v >> (8 * i)) & 0xff);
+    }
+    void str(const std::string &s) {
+      u32((uint32_t)s.size());
+      b.insert(b.end(), s.begin(), s.end());
+    }
+  };
+
+  static void write_ope(Writer &w, const std::shared_ptr<Ope> &o) {
+    if (!o) {
+      w.u8(T_Null);
+      return;
+    }
+    Ope *p = o.get();
+    if (auto x = dynamic_cast<Sequence *>(p)) {
+      w.u8(T_Sequence);
+      w.u32((uint32_t)x->opes_.size());
+      for (auto &c : x->opes_)
+        write_ope(w, c);
+    } else if (auto x = dynamic_cast<PrioritizedChoice *>(p)) {
+      w.u8(T_Choice);
+      w.u8(x->for_label_ ? 1 : 0);
+      w.u32((uint32_t)x->opes_.size());
+      for (auto &c : x->opes_)
+        write_ope(w, c);
+    } else if (auto x = dynamic_cast<Repetition *>(p)) {
+      w.u8(T_Repetition);
+      w.u64(x->min_);
+      w.u64(x->max_);
+      write_ope(w, x->ope_);
+    } else if (auto x = dynamic_cast<AndPredicate *>(p)) {
+      w.u8(T_And);
+      write_ope(w, x->ope_);
+    } else if (auto x = dynamic_cast<NotPredicate *>(p)) {
+      w.u8(T_Not);
+      write_ope(w, x->ope_);
+    } else if (auto x = dynamic_cast<Dictionary *>(p)) {
+      w.u8(T_Dictionary);
+      w.u8(x->trie_.ignore_case_ ? 1 : 0);
+      // Recover words in their original choice-index order. The Trie stores
+      // each full word's id (its index in the constructor vector), which
+      // parse_core reports as vs.choice(). Iterating dic_ directly yields
+      // sorted key order and would renumber the choices, so place each word at
+      // its id.
+      std::vector<std::string> words(x->trie_.items_count());
+      for (auto &kv : x->trie_.dic_)
+        if (kv.second.match && kv.second.id < words.size())
+          words[kv.second.id] = kv.first;
+      w.u32((uint32_t)words.size());
+      for (auto &s : words)
+        w.str(s);
+    } else if (auto x = dynamic_cast<LiteralString *>(p)) {
+      w.u8(T_Literal);
+      w.u8(x->ignore_case_ ? 1 : 0);
+      w.str(x->lit_);
+    } else if (auto x = dynamic_cast<CharacterClass *>(p)) {
+      w.u8(T_CharClass);
+      w.u8(x->negated_ ? 1 : 0);
+      w.u8(x->ignore_case_ ? 1 : 0);
+      w.u32((uint32_t)x->ranges_.size());
+      for (auto &r : x->ranges_) {
+        w.u32((uint32_t)r.first);
+        w.u32((uint32_t)r.second);
+      }
+    } else if (auto x = dynamic_cast<Character *>(p)) {
+      w.u8(T_Char);
+      w.u32((uint32_t)x->ch_);
+    } else if (dynamic_cast<AnyCharacter *>(p)) {
+      w.u8(T_AnyChar);
+    } else if (auto x = dynamic_cast<CaptureScope *>(p)) {
+      w.u8(T_CaptureScope);
+      write_ope(w, x->ope_);
+    } else if (auto x = dynamic_cast<Capture *>(p)) {
+      if (x->match_action_) {
+        throw std::runtime_error(
+            "GrammarBlob: Capture with a match action is not serializable");
+      }
+      w.u8(T_Capture);
+      write_ope(w, x->ope_);
+    } else if (auto x = dynamic_cast<TokenBoundary *>(p)) {
+      w.u8(T_TokenBoundary);
+      write_ope(w, x->ope_);
+    } else if (auto x = dynamic_cast<Ignore *>(p)) {
+      w.u8(T_Ignore);
+      write_ope(w, x->ope_);
+    } else if (auto x = dynamic_cast<BackReference *>(p)) {
+      w.u8(T_BackRef);
+      w.str(x->name_);
+    } else if (auto x = dynamic_cast<Reference *>(p)) {
+      w.u8(T_Reference);
+      w.u8(x->is_macro_ ? 1 : 0);
+      w.str(x->name_);
+      w.u32((uint32_t)x->args_.size());
+      for (auto &a : x->args_)
+        write_ope(w, a);
+    } else if (auto x = dynamic_cast<Whitespace *>(p)) {
+      w.u8(T_Whitespace);
+      write_ope(w, x->ope_);
+    } else if (auto x = dynamic_cast<Recovery *>(p)) {
+      w.u8(T_Recovery);
+      write_ope(w, x->ope_);
+    } else if (dynamic_cast<Cut *>(p)) {
+      w.u8(T_Cut);
+    } else if (auto x = dynamic_cast<PrecedenceClimbing *>(p)) {
+      w.u8(T_PrecedenceClimbing);
+      write_ope(w, x->atom_);
+      write_ope(w, x->binop_);
+      w.u32((uint32_t)x->info_.size());
+      for (auto &[key, pri] : x->info_) {
+        w.str(std::string(key));
+        w.u64((uint64_t)pri.first);
+        w.u8((uint8_t)pri.second);
+      }
+    } else {
+      throw std::runtime_error(
+          "GrammarBlob: operator not serializable (a custom User operator or "
+          "a Capture with a match action)");
+    }
+  }
+
+  struct Reader {
+    const uint8_t *p, *end;
+    uint8_t u8() {
+      if (p >= end)
+        throw std::runtime_error("GrammarBlob: unexpected end of blob");
+      return *p++;
+    }
+    uint32_t u32() {
+      uint32_t v = 0;
+      for (int i = 0; i < 4; i++)
+        v |= (uint32_t)u8() << (8 * i);
+      return v;
+    }
+    uint64_t u64() {
+      uint64_t v = 0;
+      for (int i = 0; i < 8; i++)
+        v |= (uint64_t)u8() << (8 * i);
+      return v;
+    }
+    std::string str() {
+      uint32_t n = u32();
+      std::string s((const char *)p, (const char *)p + n);
+      p += n;
+      return s;
+    }
+  };
+
+  static std::shared_ptr<Ope> read_ope(Reader &r, Grammar &g,
+                                       Definition *owner) {
+    switch (r.u8()) {
+    case T_Null: return nullptr;
+    case T_Sequence: {
+      uint32_t n = r.u32();
+      std::vector<std::shared_ptr<Ope>> v;
+      for (uint32_t i = 0; i < n; i++)
+        v.push_back(read_ope(r, g, owner));
+      return std::make_shared<Sequence>(std::move(v));
+    }
+    case T_Choice: {
+      bool fl = r.u8();
+      uint32_t n = r.u32();
+      std::vector<std::shared_ptr<Ope>> v;
+      for (uint32_t i = 0; i < n; i++)
+        v.push_back(read_ope(r, g, owner));
+      auto c = std::make_shared<PrioritizedChoice>(std::move(v));
+      c->for_label_ = fl;
+      return c;
+    }
+    case T_Repetition: {
+      uint64_t mn = r.u64(), mx = r.u64();
+      auto o = read_ope(r, g, owner);
+      return std::make_shared<Repetition>(o, mn, mx);
+    }
+    case T_And: return std::make_shared<AndPredicate>(read_ope(r, g, owner));
+    case T_Not: return std::make_shared<NotPredicate>(read_ope(r, g, owner));
+    case T_Dictionary: {
+      bool ic = r.u8();
+      uint32_t n = r.u32();
+      std::vector<std::string> words;
+      for (uint32_t i = 0; i < n; i++)
+        words.push_back(r.str());
+      return std::make_shared<Dictionary>(words, ic);
+    }
+    case T_Literal: {
+      bool ic = r.u8();
+      std::string s = r.str();
+      return std::make_shared<LiteralString>(std::move(s), ic);
+    }
+    case T_CharClass: {
+      bool neg = r.u8(), ic = r.u8();
+      uint32_t n = r.u32();
+      std::vector<std::pair<char32_t, char32_t>> ranges;
+      for (uint32_t i = 0; i < n; i++) {
+        auto lo = r.u32(), hi = r.u32();
+        ranges.emplace_back((char32_t)lo, (char32_t)hi);
+      }
+      return std::make_shared<CharacterClass>(ranges, neg, ic);
+    }
+    case T_Char: return std::make_shared<Character>((char32_t)r.u32());
+    case T_AnyChar: return std::make_shared<AnyCharacter>();
+    case T_CaptureScope:
+      return std::make_shared<CaptureScope>(read_ope(r, g, owner));
+    case T_Capture: {
+      auto o = read_ope(r, g, owner);
+      return std::make_shared<Capture>(o, nullptr);
+    }
+    case T_TokenBoundary:
+      return std::make_shared<TokenBoundary>(read_ope(r, g, owner));
+    case T_Ignore: return std::make_shared<Ignore>(read_ope(r, g, owner));
+    case T_BackRef: return std::make_shared<BackReference>(r.str());
+    case T_Reference: {
+      bool im = r.u8();
+      std::string nm = r.str();
+      uint32_t n = r.u32();
+      std::vector<std::shared_ptr<Ope>> args;
+      for (uint32_t i = 0; i < n; i++)
+        args.push_back(read_ope(r, g, owner));
+      return std::make_shared<Reference>(g, nm, nullptr, im, args);
+    }
+    case T_Whitespace:
+      return std::make_shared<Whitespace>(read_ope(r, g, owner));
+    case T_Recovery: return std::make_shared<Recovery>(read_ope(r, g, owner));
+    case T_Cut: return std::make_shared<Cut>();
+    case T_PrecedenceClimbing: {
+      if (!owner) {
+        throw std::runtime_error(
+            "GrammarBlob: 'precedence' operator outside a rule body");
+      }
+      auto atom = read_ope(r, g, owner);
+      auto binop = read_ope(r, g, owner);
+      uint32_t n = r.u32();
+      auto pc = std::make_shared<PrecedenceClimbing>(
+          atom, binop, PrecedenceClimbing::BinOpeInfo{}, *owner);
+      // info_ keys are string_views; back them with owned strings whose
+      // addresses stay stable (reserve avoids reallocation, and the node is
+      // never moved once held by shared_ptr).
+      pc->info_keys_.reserve(n);
+      for (uint32_t i = 0; i < n; i++) {
+        std::string key = r.str();
+        auto level = (size_t)r.u64();
+        auto assoc = (char)r.u8();
+        pc->info_keys_.push_back(std::move(key));
+        pc->info_[pc->info_keys_.back()] = std::pair(level, assoc);
+      }
+      return pc;
+    }
+    default: throw std::runtime_error("GrammarBlob: bad operator tag");
+    }
+  }
+
+  static const uint32_t MAGIC = 0x50454732; // "PEG2"
+
+  static std::vector<uint8_t> serialize(const Grammar &g,
+                                        const std::string &start) {
+    Writer w;
+    w.u32(MAGIC);
+    w.str(start);
+    w.u32((uint32_t)g.size());
+    // Grammar is an unordered_map, whose iteration order is implementation
+    // defined: walking it directly yields different bytes for the same grammar
+    // on different standard libraries, so a blob generated on one platform
+    // cannot be byte-compared on another. Emit the definitions by name.
+    // deserialize() rebuilds the map from the names, so the order carries no
+    // meaning of its own.
+    std::vector<const Grammar::value_type *> defs;
+    defs.reserve(g.size());
+    for (auto &kv : g)
+      defs.push_back(&kv);
+    std::sort(defs.begin(), defs.end(),
+              [](const auto *a, const auto *b) { return a->first < b->first; });
+    for (auto *kv : defs) {
+      const auto &name = kv->first;
+      const auto &def = kv->second;
+      w.str(name);
+      uint8_t flags =
+          (def.ignoreSemanticValue ? 1 : 0) | (def.is_macro ? 2 : 0) |
+          (def.no_ast_opt ? 4 : 0) | (def.eoi_check ? 8 : 0) |
+          (def.enablePackratParsing ? 16 : 0) |
+          (def.is_left_recursive ? 32 : 0) | (def.can_be_empty ? 64 : 0) |
+          (def.disable_action ? 128 : 0);
+      w.u8(flags);
+      uint8_t flags2 = (def.no_whitespace ? 1 : 0);
+      w.u8(flags2);
+      w.u32((uint32_t)def.params.size());
+      for (auto &s : def.params)
+        w.str(s);
+      w.str(def.ast_name);
+      w.str(def.error_message);
+      write_ope(w, const_cast<Definition &>(def).get_core_operator());
+    }
+    return std::move(w.b);
+  }
+
+  static std::shared_ptr<Grammar> deserialize(const std::vector<uint8_t> &blob,
+                                              std::string &start_out) {
+    Reader r{blob.data(), blob.data() + blob.size()};
+    if (r.u32() != MAGIC)
+      throw std::runtime_error("GrammarBlob: bad magic / not a grammar blob");
+    start_out = r.str();
+    uint32_t ndef = r.u32();
+    auto g = std::make_shared<Grammar>();
+    // Create each Definition before reading its body: a PrecedenceClimbing node
+    // needs a stable reference to its owning rule at construction. Grammar is a
+    // node-based map, so references stay valid as later rules are inserted.
+    for (uint32_t i = 0; i < ndef; i++) {
+      std::string name = r.str();
+      uint8_t flags = r.u8();
+      uint8_t flags2 = r.u8();
+      uint32_t np = r.u32();
+      std::vector<std::string> params;
+      for (uint32_t k = 0; k < np; k++)
+        params.push_back(r.str());
+      std::string ast_name = r.str();
+      std::string err = r.str();
+
+      auto &def = (*g)[name];
+      def.name = name;
+      def.ignoreSemanticValue = flags & 1;
+      def.is_macro = flags & 2;
+      def.no_ast_opt = flags & 4;
+      def.eoi_check = flags & 8;
+      def.enablePackratParsing = flags & 16;
+      def.is_left_recursive = flags & 32;
+      def.can_be_empty = flags & 64;
+      def.disable_action = flags & 128;
+      def.no_whitespace = flags2 & 1;
+      def.params = std::move(params);
+      def.ast_name = std::move(ast_name);
+      def.error_message = std::move(err);
+
+      auto body = read_ope(r, *g, &def);
+      def <= body;
+    }
+    for (auto &x : *g) {
+      LinkReferences vis(*g, x.second.params);
+      x.second.accept(vis);
+      // TraversalVisitor descends only into a PrecedenceClimbing's atom_. In
+      // the from-source path binop_ is linked while the body is still a
+      // Sequence, before precedence lowering; a deserialized node is built
+      // already lowered so its binop_ reference must be linked explicitly here.
+      auto core = x.second.get_core_operator();
+      if (auto pc = std::dynamic_pointer_cast<PrecedenceClimbing>(core)) {
+        pc->binop_->accept(vis);
+      }
+    }
+    {
+      SetupFirstSets vis; // shared across rules -> O(N)
+      for (auto &x : *g)
+        x.second.accept(vis);
+    }
+    // Re-derive automatic whitespace/word skipping on the start rule from the
+    // %whitespace / %word definitions, exactly as ParserGenerator does. Sharing
+    // the (already linked and first-set) definition operators avoids leaving
+    // references inside the skipping ope unlinked, and keeps the blob smaller.
+    if (g->count(WHITESPACE_DEFINITION_NAME)) {
+      (*g)[start_out].whitespaceOpe =
+          wsp((*g)[WHITESPACE_DEFINITION_NAME].get_core_operator());
+    }
+    if (g->count(WORD_DEFINITION_NAME)) {
+      (*g)[start_out].wordOpe = (*g)[WORD_DEFINITION_NAME].get_core_operator();
+    }
+    return g;
+  }
+};
+
 /*-----------------------------------------------------------------------------
  *  PEG parser generator
  *---------------------------------------------------------------------------*/
@@ -3298,955 +5191,1106 @@ using Rules = std::unordered_map<std::string, std::shared_ptr<Ope>>;
 
 class ParserGenerator {
 public:
-    struct ParserContext {
-        std::shared_ptr<Grammar> grammar;
-        std::string start;
-        bool enablePackratParsing = false;
-    };
+  struct ParserContext {
+    std::shared_ptr<Grammar> grammar;
+    std::string start;
+    bool enablePackratParsing = false;
+  };
 
-    static ParserContext parse(const char *s, size_t n, const Rules &rules,
-                               Log log, std::string_view start) {
-        return get_instance().perform_core(s, n, rules, log, std::string(start));
-    }
+  static ParserContext parse(const char *s, size_t n, const Rules &rules,
+                             Log log, std::string_view start,
+                             bool enable_left_recursion = true) {
+    return get_instance().perform_core(s, n, rules, log, std::string(start),
+                                       enable_left_recursion);
+  }
 
-    // For debugging purpose
-    static bool parse_test(const char *d, const char *s) {
-        Data data;
-        std::any dt = &data;
+  // For debugging purpose
+  static bool parse_test(const char *d, const char *s) {
+    Data data;
+    std::any dt = &data;
 
-        auto n = strlen(s);
-        auto r = get_instance().g[d].parse(s, n, dt);
-        return r.ret && r.len == n;
-    }
+    auto n = strlen(s);
+    auto r = get_instance().g[d].parse(s, n, dt);
+    return r.ret && r.len == n;
+  }
 
 #if defined(__cpp_lib_char8_t)
-    static bool parse_test(const char *d, const char8_t *s) {
-        return parse_test(d, reinterpret_cast<const char *>(s));
-    }
+  static bool parse_test(const char *d, const char8_t *s) {
+    return parse_test(d, reinterpret_cast<const char *>(s));
+  }
 #endif
 
 private:
-    static ParserGenerator &get_instance() {
-        static ParserGenerator instance;
-        return instance;
-    }
+  static ParserGenerator &get_instance() {
+    static ParserGenerator instance;
+    return instance;
+  }
 
-    ParserGenerator() {
-        make_grammar();
-        setup_actions();
+  ParserGenerator() {
+    make_grammar();
+    setup_actions();
+    // Apply First-Set filtering to the bootstrap meta-grammar itself so that
+    // parsing a grammar (the bulk of load_grammar) skips alternatives whose
+    // next byte cannot match. This is safe -- First-Set filtering only skips
+    // alternatives that would have failed anyway, so no semantic action that
+    // would have committed is skipped (unlike packrat, which is unsound here).
+    {
+      SetupFirstSets vis;
+      for (auto &x : g) {
+        x.second.accept(vis);
+      }
     }
+  }
 
-    struct Instruction {
-        std::string type;
-        std::any data;
-        std::string_view sv;
+  struct Instruction {
+    std::string type;
+    std::any data;
+    std::string_view sv;
+  };
+
+  struct Data {
+    std::shared_ptr<Grammar> grammar;
+    std::string start;
+    const char *start_pos = nullptr;
+
+    std::vector<std::pair<std::string, const char *>> duplicates_of_definition;
+
+    std::vector<std::pair<std::string, const char *>> duplicates_of_instruction;
+    std::map<std::string, std::vector<Instruction>> instructions;
+
+    std::vector<std::pair<std::string, const char *>> undefined_back_references;
+    std::vector<std::set<std::string_view>> captures_stack{{}};
+
+    std::set<std::string_view> captures_in_current_definition;
+    bool enablePackratParsing = true;
+
+    Data() : grammar(std::make_shared<Grammar>()) {}
+  };
+
+  class SyntaxErrorException : public std::runtime_error {
+  public:
+    SyntaxErrorException(const char *what_arg, std::pair<size_t, size_t> r)
+        : std::runtime_error(what_arg), r_(r) {}
+
+    std::pair<size_t, size_t> line_info() const { return r_; }
+
+  private:
+    std::pair<size_t, size_t> r_;
+  };
+
+  void make_grammar() {
+    // Setup PEG syntax parser
+    g["Grammar"] <= seq(g["Spacing"], oom(g["Definition"]), g["EndOfFile"]);
+    // Left-factored: parse the rule name (IdentCont) once, then optionally the
+    // macro parameter list. `opt(Parameters)` pushes a value only for a macro
+    // (so the value layout matches the old two-alternative form), and Spacing
+    // (~, no value) consumes the gap before LEFTARROW that Identifier used to.
+    g["Definition"] <= seq(g["Ignore"], g["IdentCont"], opt(g["Parameters"]),
+                           g["Spacing"], g["LEFTARROW"], g["Expression"],
+                           opt(g["Instruction"]));
+    g["Expression"] <= seq(g["Sequence"], zom(seq(g["SLASH"], g["Sequence"])));
+    g["Sequence"] <= zom(cho(g["CUT"], g["Prefix"]));
+    g["Prefix"] <= seq(opt(cho(g["AND"], g["NOT"])), g["SuffixWithLabel"]);
+    g["SuffixWithLabel"] <=
+        seq(g["Suffix"], opt(seq(g["LABEL"], g["Identifier"])));
+    g["Suffix"] <= seq(g["Primary"], opt(g["Loop"]));
+    g["Loop"] <= cho(g["QUESTION"], g["STAR"], g["PLUS"], g["Repetition"]);
+    // Left-factored: a macro reference (`Name(args)`) and a plain reference
+    // (`Name`) share the leading `Ignore IdentCont`, so parse it once and let
+    // `opt(Arguments)` decide. opt() pushes the argument list only for a macro
+    // reference, so vs.size() distinguishes the two in the action.
+    g["Primary"] <=
+        cho(seq(g["Ignore"], g["IdentCont"], opt(g["Arguments"]), g["Spacing"],
+                npd(seq(opt(g["Parameters"]), g["LEFTARROW"]))),
+            seq(g["OPEN"], g["Expression"], g["CLOSE"]),
+            seq(g["BeginTok"], g["Expression"], g["EndTok"]), g["CapScope"],
+            seq(g["BeginCap"], g["Expression"], g["EndCap"]), g["BackRef"],
+            g["DictionaryI"], g["LiteralI"], g["Dictionary"], g["Literal"],
+            g["NegatedClassI"], g["NegatedClass"], g["ClassI"], g["Class"],
+            g["DOT"]);
+
+    g["Identifier"] <= seq(g["IdentCont"], g["Spacing"]);
+    g["IdentCont"] <= tok(seq(g["IdentStart"], zom(g["IdentRest"])));
+
+    const static std::vector<std::pair<char32_t, char32_t>> range = {
+        {0x0080, 0xFFFF}};
+    g["IdentStart"] <= seq(npd(lit(u8(u8"↑"))), npd(lit(u8(u8"⇑"))),
+                           cho(cls("a-zA-Z_%"), cls(range)));
+
+    g["IdentRest"] <= cho(g["IdentStart"], cls("0-9"));
+
+    g["Dictionary"] <= seq(g["LiteralD"], oom(seq(g["PIPE"], g["LiteralD"])));
+
+    g["DictionaryI"] <=
+        seq(g["LiteralID"], oom(seq(g["PIPE"], g["LiteralID"])));
+
+    auto lit_ope = cho(seq(cls("'"), tok(zom(seq(npd(cls("'")), g["Char"]))),
+                           cls("'"), g["Spacing"]),
+                       seq(cls("\""), tok(zom(seq(npd(cls("\"")), g["Char"]))),
+                           cls("\""), g["Spacing"]));
+    g["Literal"] <= lit_ope;
+    g["LiteralD"] <= lit_ope;
+
+    auto lit_case_ignore_ope =
+        cho(seq(cls("'"), tok(zom(seq(npd(cls("'")), g["Char"]))), lit("'i"),
+                g["Spacing"]),
+            seq(cls("\""), tok(zom(seq(npd(cls("\"")), g["Char"]))), lit("\"i"),
+                g["Spacing"]));
+    g["LiteralI"] <= lit_case_ignore_ope;
+    g["LiteralID"] <= lit_case_ignore_ope;
+
+    // NOTE: The original Brian Ford's paper uses 'zom' instead of 'oom'.
+    g["Class"] <= seq(chr('['), npd(chr('^')),
+                      tok(oom(seq(npd(chr(']')), g["Range"]))), chr(']'),
+                      g["Spacing"]);
+    g["ClassI"] <= seq(chr('['), npd(chr('^')),
+                       tok(oom(seq(npd(chr(']')), g["Range"]))), lit("]i"),
+                       g["Spacing"]);
+
+    g["NegatedClass"] <= seq(lit("[^"),
+                             tok(oom(seq(npd(chr(']')), g["Range"]))), chr(']'),
+                             g["Spacing"]);
+    g["NegatedClassI"] <= seq(lit("[^"),
+                              tok(oom(seq(npd(chr(']')), g["Range"]))),
+                              lit("]i"), g["Spacing"]);
+
+    // NOTE: This is different from The original Brian Ford's paper, and this
+    // modification allows us to specify `[+-]` as a valid char class.
+    g["Range"] <= cho(seq(g["Char"], chr('-'), npd(chr(']')), g["Char"]),
+                      g["ClassEscape"], g["PosixClass"], g["Char"]);
+
+    g["ClassEscape"] <= seq(chr('\\'), cls("dDwWsS"));
+    g["PosixClass"] <=
+        seq(lit("[:"), opt(chr('^')), oom(cls("a-z")), lit(":]"));
+
+    g["Char"] <=
+        cho(seq(chr('\\'), cls("fnrtv'\"[]\\^-")),
+            seq(chr('\\'), cls("0-3"), cls("0-7"), cls("0-7")),
+            seq(chr('\\'), cls("0-7"), opt(cls("0-7"))),
+            seq(lit("\\x"), cls("0-9a-fA-F"), opt(cls("0-9a-fA-F"))),
+            seq(lit("\\u"),
+                cho(seq(cho(seq(chr('0'), cls("0-9a-fA-F")), lit("10")),
+                        rep(cls("0-9a-fA-F"), 4, 4)),
+                    rep(cls("0-9a-fA-F"), 4, 5))),
+            seq(npd(chr('\\')), dot()));
+
+    g["Repetition"] <=
+        seq(g["BeginBracket"], g["RepetitionRange"], g["EndBracket"]);
+    g["RepetitionRange"] <= cho(seq(g["Number"], g["COMMA"], g["Number"]),
+                                seq(g["Number"], g["COMMA"]), g["Number"],
+                                seq(g["COMMA"], g["Number"]));
+    g["Number"] <= seq(oom(cls("0-9")), g["Spacing"]);
+
+    g["CapScope"] <= seq(g["BeginCapScope"], g["Expression"], g["EndCapScope"]);
+
+    g["LEFTARROW"] <= seq(cho(lit("<-"), lit(u8(u8"←"))), g["Spacing"]);
+    ~g["SLASH"] <= seq(chr('/'), g["Spacing"]);
+    ~g["PIPE"] <= seq(chr('|'), g["Spacing"]);
+    g["AND"] <= seq(chr('&'), g["Spacing"]);
+    g["NOT"] <= seq(chr('!'), g["Spacing"]);
+    g["QUESTION"] <= seq(chr('?'), g["Spacing"]);
+    g["STAR"] <= seq(chr('*'), g["Spacing"]);
+    g["PLUS"] <= seq(chr('+'), g["Spacing"]);
+    ~g["OPEN"] <= seq(chr('('), g["Spacing"]);
+    ~g["CLOSE"] <= seq(chr(')'), g["Spacing"]);
+    g["DOT"] <= seq(chr('.'), g["Spacing"]);
+
+    g["CUT"] <= seq(lit(u8(u8"↑")), g["Spacing"]);
+    ~g["LABEL"] <= seq(cho(chr('^'), lit(u8(u8"⇑"))), g["Spacing"]);
+
+    ~g["Spacing"] <= zom(cho(g["Space"], g["Comment"]));
+    g["Comment"] <= seq(chr('#'), zom(seq(npd(g["EndOfLine"]), dot())),
+                        opt(g["EndOfLine"]));
+    g["Space"] <= cho(chr(' '), chr('\t'), g["EndOfLine"]);
+    g["EndOfLine"] <= cho(lit("\r\n"), chr('\n'), chr('\r'));
+    g["EndOfFile"] <= npd(dot());
+
+    ~g["BeginTok"] <= seq(chr('<'), g["Spacing"]);
+    ~g["EndTok"] <= seq(chr('>'), g["Spacing"]);
+
+    ~g["BeginCapScope"] <= seq(chr('$'), chr('('), g["Spacing"]);
+    ~g["EndCapScope"] <= seq(chr(')'), g["Spacing"]);
+
+    g["BeginCap"] <= seq(chr('$'), tok(g["IdentCont"]), chr('<'), g["Spacing"]);
+    ~g["EndCap"] <= seq(chr('>'), g["Spacing"]);
+
+    g["BackRef"] <= seq(chr('$'), tok(g["IdentCont"]), g["Spacing"]);
+
+    g["IGNORE"] <= chr('~');
+
+    g["Ignore"] <= opt(g["IGNORE"]);
+    g["Parameters"] <= seq(g["OPEN"], g["Identifier"],
+                           zom(seq(g["COMMA"], g["Identifier"])), g["CLOSE"]);
+    g["Arguments"] <= seq(g["OPEN"], g["Expression"],
+                          zom(seq(g["COMMA"], g["Expression"])), g["CLOSE"]);
+    ~g["COMMA"] <= seq(chr(','), g["Spacing"]);
+
+    // Instruction grammars
+    g["Instruction"] <=
+        seq(g["BeginBracket"],
+            opt(seq(g["InstructionItem"], zom(seq(g["InstructionItemSeparator"],
+                                                  g["InstructionItem"])))),
+            g["EndBracket"]);
+    g["InstructionItem"] <= cho(g["PrecedenceClimbing"], g["ErrorMessage"],
+                                g["NoAstOpt"], g["NoWhitespace"], g["AstName"]);
+    ~g["InstructionItemSeparator"] <= seq(chr(';'), g["Spacing"]);
+
+    ~g["SpacesZom"] <= zom(g["Space"]);
+    ~g["SpacesOom"] <= oom(g["Space"]);
+    ~g["BeginBracket"] <= seq(chr('{'), g["Spacing"]);
+    ~g["EndBracket"] <= seq(chr('}'), g["Spacing"]);
+
+    // PrecedenceClimbing instruction
+    g["PrecedenceClimbing"] <=
+        seq(lit("precedence"), g["SpacesOom"], g["PrecedenceInfo"],
+            zom(seq(g["SpacesOom"], g["PrecedenceInfo"])), g["SpacesZom"]);
+    g["PrecedenceInfo"] <=
+        seq(g["PrecedenceAssoc"],
+            oom(seq(ign(g["SpacesOom"]), g["PrecedenceOpe"])));
+    g["PrecedenceOpe"] <=
+        cho(seq(cls("'"),
+                tok(zom(seq(npd(cho(g["Space"], cls("'"))), g["Char"]))),
+                cls("'")),
+            seq(cls("\""),
+                tok(zom(seq(npd(cho(g["Space"], cls("\""))), g["Char"]))),
+                cls("\"")),
+            tok(oom(seq(npd(cho(g["PrecedenceAssoc"], g["Space"], chr('}'))),
+                        dot()))));
+    g["PrecedenceAssoc"] <= cls("LR");
+
+    // Error message instruction
+    g["ErrorMessage"] <= seq(lit("error_message"), g["SpacesOom"],
+                             g["LiteralD"], g["SpacesZom"]);
+
+    // No Ast node optimization instruction
+    g["NoAstOpt"] <= seq(lit("no_ast_opt"), g["SpacesZom"]);
+
+    // No whitespace skipping instruction
+    g["NoWhitespace"] <= seq(lit("no_whitespace"), g["SpacesZom"]);
+
+    // AST node name override instruction: `{ ast_name: NodeTag }`
+    g["AstName"] <= seq(lit("ast_name"), g["SpacesZom"], lit(":"),
+                        g["SpacesZom"], g["Identifier"], g["SpacesZom"]);
+
+    // Set definition names
+    for (auto &x : g) {
+      x.second.name = x.first;
+    }
+  }
+
+  void setup_actions() {
+    g["Definition"] = [&](const SemanticValues &vs, std::any &dt) {
+      auto &data = *std::any_cast<Data *>(dt);
+
+      // Macro iff the optional Parameters matched: its value (the parameter
+      // name list) then sits at vs[2]. A plain definition has LEFTARROW's value
+      // there instead.
+      auto is_macro = vs[2].type() == typeid(std::vector<std::string>);
+      auto ignore = std::any_cast<bool>(vs[0]);
+      auto name = std::any_cast<std::string>(vs[1]);
+
+      std::vector<std::string> params;
+      std::shared_ptr<Ope> ope;
+      auto has_instructions = false;
+
+      if (is_macro) {
+        params = std::any_cast<std::vector<std::string>>(vs[2]);
+        ope = std::any_cast<std::shared_ptr<Ope>>(vs[4]);
+        if (vs.size() == 6) { has_instructions = true; }
+      } else {
+        ope = std::any_cast<std::shared_ptr<Ope>>(vs[3]);
+        if (vs.size() == 5) { has_instructions = true; }
+      }
+
+      if (has_instructions) {
+        auto index = is_macro ? 5 : 4;
+        std::unordered_set<std::string> types;
+        for (const auto &instruction :
+             std::any_cast<std::vector<Instruction>>(vs[index])) {
+          const auto &type = instruction.type;
+          if (types.find(type) == types.end()) {
+            data.instructions[name].push_back(instruction);
+            types.insert(instruction.type);
+          } else {
+            data.duplicates_of_instruction.emplace_back(type,
+                                                        instruction.sv.data());
+          }
+        }
+      }
+
+      auto &grammar = *data.grammar;
+      if (!grammar.count(name)) {
+        auto &rule = grammar[name];
+        rule <= ope;
+        rule.name = name;
+        rule.s_ = vs.sv().data();
+        rule.line_ = line_info(vs.ss, rule.s_);
+        rule.ignoreSemanticValue = ignore;
+        rule.is_macro = is_macro;
+        rule.params = params;
+
+        // Reserved `%`-prefixed rules (%whitespace, %word, ...) are directives,
+        // not parseable entry points, so they must not become the start rule.
+        if (data.start.empty() && name[0] != '%') {
+          data.start = rule.name;
+          data.start_pos = rule.s_;
+        }
+      } else {
+        data.duplicates_of_definition.emplace_back(name, vs.sv().data());
+      }
     };
 
-    struct Data {
-        std::shared_ptr<Grammar> grammar;
-        std::string start;
-        const char *start_pos = nullptr;
-
-        std::vector<std::pair<std::string, const char *>> duplicates_of_definition;
-
-        std::vector<std::pair<std::string, const char *>> duplicates_of_instruction;
-        std::map<std::string, std::vector<Instruction>> instructions;
-
-        std::vector<std::pair<std::string, const char *>> undefined_back_references;
-        std::vector<std::set<std::string_view>> captures_stack{{}};
-
-        std::set<std::string_view> captures_in_current_definition;
-        bool enablePackratParsing = true;
-
-        Data() : grammar(std::make_shared<Grammar>()) {}
+    g["Definition"].enter = [](const Context & /*c*/, const char * /*s*/,
+                               size_t /*n*/, std::any &dt) {
+      auto &data = *std::any_cast<Data *>(dt);
+      data.captures_in_current_definition.clear();
     };
 
-    void make_grammar() {
-        // Setup PEG syntax parser
-        g["Grammar"] <= seq(g["Spacing"], oom(g["Definition"]), g["EndOfFile"]);
-        g["Definition"] <=
-            cho(seq(g["Ignore"], g["IdentCont"], g["Parameters"], g["LEFTARROW"],
-                    g["Expression"], opt(g["Instruction"])),
-                seq(g["Ignore"], g["Identifier"], g["LEFTARROW"], g["Expression"],
-                    opt(g["Instruction"])));
-        g["Expression"] <= seq(g["Sequence"], zom(seq(g["SLASH"], g["Sequence"])));
-        g["Sequence"] <= zom(cho(g["CUT"], g["Prefix"]));
-        g["Prefix"] <= seq(opt(cho(g["AND"], g["NOT"])), g["SuffixWithLabel"]);
-        g["SuffixWithLabel"] <=
-            seq(g["Suffix"], opt(seq(g["LABEL"], g["Identifier"])));
-        g["Suffix"] <= seq(g["Primary"], opt(g["Loop"]));
-        g["Loop"] <= cho(g["QUESTION"], g["STAR"], g["PLUS"], g["Repetition"]);
-        g["Primary"] <= cho(seq(g["Ignore"], g["IdentCont"], g["Arguments"],
-                                npd(g["LEFTARROW"])),
-                            seq(g["Ignore"], g["Identifier"],
-                                npd(seq(opt(g["Parameters"]), g["LEFTARROW"]))),
-                            seq(g["OPEN"], g["Expression"], g["CLOSE"]),
-                            seq(g["BeginTok"], g["Expression"], g["EndTok"]),
-                            g["CapScope"],
-                            seq(g["BeginCap"], g["Expression"], g["EndCap"]),
-                            g["BackRef"], g["DictionaryI"], g["LiteralI"],
-                            g["Dictionary"], g["Literal"], g["NegatedClassI"],
-                            g["NegatedClass"], g["ClassI"], g["Class"], g["DOT"]);
-
-        g["Identifier"] <= seq(g["IdentCont"], g["Spacing"]);
-        g["IdentCont"] <= tok(seq(g["IdentStart"], zom(g["IdentRest"])));
-
-        const static std::vector<std::pair<char32_t, char32_t>> range = {
-            {0x0080, 0xFFFF}};
-        g["IdentStart"] <= seq(npd(lit(u8(u8"↑"))), npd(lit(u8(u8"⇑"))),
-                               cho(cls("a-zA-Z_%"), cls(range)));
-
-        g["IdentRest"] <= cho(g["IdentStart"], cls("0-9"));
-
-        g["Dictionary"] <= seq(g["LiteralD"], oom(seq(g["PIPE"], g["LiteralD"])));
-
-        g["DictionaryI"] <=
-            seq(g["LiteralID"], oom(seq(g["PIPE"], g["LiteralID"])));
-
-        auto lit_ope = cho(seq(cls("'"), tok(zom(seq(npd(cls("'")), g["Char"]))),
-                               cls("'"), g["Spacing"]),
-                           seq(cls("\""), tok(zom(seq(npd(cls("\"")), g["Char"]))),
-                               cls("\""), g["Spacing"]));
-        g["Literal"] <= lit_ope;
-        g["LiteralD"] <= lit_ope;
-
-        auto lit_case_ignore_ope =
-            cho(seq(cls("'"), tok(zom(seq(npd(cls("'")), g["Char"]))), lit("'i"),
-                    g["Spacing"]),
-                seq(cls("\""), tok(zom(seq(npd(cls("\"")), g["Char"]))), lit("\"i"),
-                    g["Spacing"]));
-        g["LiteralI"] <= lit_case_ignore_ope;
-        g["LiteralID"] <= lit_case_ignore_ope;
-
-        // NOTE: The original Brian Ford's paper uses 'zom' instead of 'oom'.
-        g["Class"] <= seq(chr('['), npd(chr('^')),
-                          tok(oom(seq(npd(chr(']')), g["Range"]))), chr(']'),
-                          g["Spacing"]);
-        g["ClassI"] <= seq(chr('['), npd(chr('^')),
-                           tok(oom(seq(npd(chr(']')), g["Range"]))), lit("]i"),
-                           g["Spacing"]);
-
-        g["NegatedClass"] <= seq(lit("[^"),
-                                 tok(oom(seq(npd(chr(']')), g["Range"]))), chr(']'),
-                                 g["Spacing"]);
-        g["NegatedClassI"] <= seq(lit("[^"),
-                                  tok(oom(seq(npd(chr(']')), g["Range"]))),
-                                  lit("]i"), g["Spacing"]);
-
-        // NOTE: This is different from The original Brian Ford's paper, and this
-        // modification allows us to specify `[+-]` as a valid char class.
-        g["Range"] <=
-            cho(seq(g["Char"], chr('-'), npd(chr(']')), g["Char"]), g["Char"]);
-
-        g["Char"] <=
-            cho(seq(chr('\\'), cls("fnrtv'\"[]\\^")),
-                seq(chr('\\'), cls("0-3"), cls("0-7"), cls("0-7")),
-                seq(chr('\\'), cls("0-7"), opt(cls("0-7"))),
-                seq(lit("\\x"), cls("0-9a-fA-F"), opt(cls("0-9a-fA-F"))),
-                seq(lit("\\u"),
-                    cho(seq(cho(seq(chr('0'), cls("0-9a-fA-F")), lit("10")),
-                            rep(cls("0-9a-fA-F"), 4, 4)),
-                        rep(cls("0-9a-fA-F"), 4, 5))),
-                seq(npd(chr('\\')), dot()));
-
-        g["Repetition"] <=
-            seq(g["BeginBracket"], g["RepetitionRange"], g["EndBracket"]);
-        g["RepetitionRange"] <= cho(seq(g["Number"], g["COMMA"], g["Number"]),
-                                    seq(g["Number"], g["COMMA"]), g["Number"],
-                                    seq(g["COMMA"], g["Number"]));
-        g["Number"] <= seq(oom(cls("0-9")), g["Spacing"]);
-
-        g["CapScope"] <= seq(g["BeginCapScope"], g["Expression"], g["EndCapScope"]);
-
-        g["LEFTARROW"] <= seq(cho(lit("<-"), lit(u8(u8"←"))), g["Spacing"]);
-        ~g["SLASH"] <= seq(chr('/'), g["Spacing"]);
-        ~g["PIPE"] <= seq(chr('|'), g["Spacing"]);
-        g["AND"] <= seq(chr('&'), g["Spacing"]);
-        g["NOT"] <= seq(chr('!'), g["Spacing"]);
-        g["QUESTION"] <= seq(chr('?'), g["Spacing"]);
-        g["STAR"] <= seq(chr('*'), g["Spacing"]);
-        g["PLUS"] <= seq(chr('+'), g["Spacing"]);
-        ~g["OPEN"] <= seq(chr('('), g["Spacing"]);
-        ~g["CLOSE"] <= seq(chr(')'), g["Spacing"]);
-        g["DOT"] <= seq(chr('.'), g["Spacing"]);
-
-        g["CUT"] <= seq(lit(u8(u8"↑")), g["Spacing"]);
-        ~g["LABEL"] <= seq(cho(chr('^'), lit(u8(u8"⇑"))), g["Spacing"]);
-
-        ~g["Spacing"] <= zom(cho(g["Space"], g["Comment"]));
-        g["Comment"] <=
-            seq(chr('#'), zom(seq(npd(g["EndOfLine"]), dot())), g["EndOfLine"]);
-        g["Space"] <= cho(chr(' '), chr('\t'), g["EndOfLine"]);
-        g["EndOfLine"] <= cho(lit("\r\n"), chr('\n'), chr('\r'));
-        g["EndOfFile"] <= npd(dot());
-
-        ~g["BeginTok"] <= seq(chr('<'), g["Spacing"]);
-        ~g["EndTok"] <= seq(chr('>'), g["Spacing"]);
-
-        ~g["BeginCapScope"] <= seq(chr('$'), chr('('), g["Spacing"]);
-        ~g["EndCapScope"] <= seq(chr(')'), g["Spacing"]);
-
-        g["BeginCap"] <= seq(chr('$'), tok(g["IdentCont"]), chr('<'), g["Spacing"]);
-        ~g["EndCap"] <= seq(chr('>'), g["Spacing"]);
-
-        g["BackRef"] <= seq(chr('$'), tok(g["IdentCont"]), g["Spacing"]);
-
-        g["IGNORE"] <= chr('~');
-
-        g["Ignore"] <= opt(g["IGNORE"]);
-        g["Parameters"] <= seq(g["OPEN"], g["Identifier"],
-                               zom(seq(g["COMMA"], g["Identifier"])), g["CLOSE"]);
-        g["Arguments"] <= seq(g["OPEN"], g["Expression"],
-                              zom(seq(g["COMMA"], g["Expression"])), g["CLOSE"]);
-        ~g["COMMA"] <= seq(chr(','), g["Spacing"]);
-
-        // Instruction grammars
-        g["Instruction"] <=
-            seq(g["BeginBracket"],
-                opt(seq(g["InstructionItem"], zom(seq(g["InstructionItemSeparator"],
-                                                      g["InstructionItem"])))),
-                g["EndBracket"]);
-        g["InstructionItem"] <=
-            cho(g["PrecedenceClimbing"], g["ErrorMessage"], g["NoAstOpt"]);
-        ~g["InstructionItemSeparator"] <= seq(chr(';'), g["Spacing"]);
-
-        ~g["SpacesZom"] <= zom(g["Space"]);
-        ~g["SpacesOom"] <= oom(g["Space"]);
-        ~g["BeginBracket"] <= seq(chr('{'), g["Spacing"]);
-        ~g["EndBracket"] <= seq(chr('}'), g["Spacing"]);
-
-        // PrecedenceClimbing instruction
-        g["PrecedenceClimbing"] <=
-            seq(lit("precedence"), g["SpacesOom"], g["PrecedenceInfo"],
-                zom(seq(g["SpacesOom"], g["PrecedenceInfo"])), g["SpacesZom"]);
-        g["PrecedenceInfo"] <=
-            seq(g["PrecedenceAssoc"],
-                oom(seq(ign(g["SpacesOom"]), g["PrecedenceOpe"])));
-        g["PrecedenceOpe"] <=
-            cho(seq(cls("'"),
-                    tok(zom(seq(npd(cho(g["Space"], cls("'"))), g["Char"]))),
-                    cls("'")),
-                seq(cls("\""),
-                    tok(zom(seq(npd(cho(g["Space"], cls("\""))), g["Char"]))),
-                    cls("\"")),
-                tok(oom(seq(npd(cho(g["PrecedenceAssoc"], g["Space"], chr('}'))),
-                            dot()))));
-        g["PrecedenceAssoc"] <= cls("LR");
-
-        // Error message instruction
-        g["ErrorMessage"] <= seq(lit("error_message"), g["SpacesOom"],
-                                 g["LiteralD"], g["SpacesZom"]);
-
-        // No Ast node optimization instruction
-        g["NoAstOpt"] <= seq(lit("no_ast_opt"), g["SpacesZom"]);
-
-        // Set definition names
-        for (auto &x : g) {
-            x.second.name = x.first;
+    g["Expression"] = [&](const SemanticValues &vs) {
+      if (vs.size() == 1) {
+        return std::any_cast<std::shared_ptr<Ope>>(vs[0]);
+      } else {
+        std::vector<std::shared_ptr<Ope>> opes;
+        for (auto i = 0u; i < vs.size(); i++) {
+          opes.emplace_back(std::any_cast<std::shared_ptr<Ope>>(vs[i]));
         }
-    }
+        const std::shared_ptr<Ope> ope =
+            std::make_shared<PrioritizedChoice>(opes);
+        return ope;
+      }
+    };
 
-    void setup_actions() {
-        g["Definition"] = [&](const SemanticValues &vs, std::any &dt) {
-            auto &data = *std::any_cast<Data *>(dt);
-
-            auto is_macro = vs.choice() == 0;
-            auto ignore = std::any_cast<bool>(vs[0]);
-            auto name = std::any_cast<std::string>(vs[1]);
-
-            std::vector<std::string> params;
-            std::shared_ptr<Ope> ope;
-            auto has_instructions = false;
-
-            if (is_macro) {
-                params = std::any_cast<std::vector<std::string>>(vs[2]);
-                ope = std::any_cast<std::shared_ptr<Ope>>(vs[4]);
-                if (vs.size() == 6) { has_instructions = true; }
-            } else {
-                ope = std::any_cast<std::shared_ptr<Ope>>(vs[3]);
-                if (vs.size() == 5) { has_instructions = true; }
-            }
-
-            if (has_instructions) {
-                auto index = is_macro ? 5 : 4;
-                std::unordered_set<std::string> types;
-                for (const auto &instruction :
-                     std::any_cast<std::vector<Instruction>>(vs[index])) {
-                    const auto &type = instruction.type;
-                    if (types.find(type) == types.end()) {
-                        data.instructions[name].push_back(instruction);
-                        types.insert(instruction.type);
-                        if (type == "declare_symbol" || type == "check_symbol") {
-                            if (!TokenChecker::is_token(*ope)) { ope = tok(ope); }
-                        }
-                    } else {
-                        data.duplicates_of_instruction.emplace_back(type,
-                                                                    instruction.sv.data());
-                    }
-                }
-            }
-
-            auto &grammar = *data.grammar;
-            if (!grammar.count(name)) {
-                auto &rule = grammar[name];
-                rule <= ope;
-                rule.name = name;
-                rule.s_ = vs.sv().data();
-                rule.line_ = line_info(vs.ss, rule.s_);
-                rule.ignoreSemanticValue = ignore;
-                rule.is_macro = is_macro;
-                rule.params = params;
-
-                if (data.start.empty()) {
-                    data.start = rule.name;
-                    data.start_pos = rule.s_;
-                }
-            } else {
-                data.duplicates_of_definition.emplace_back(name, vs.sv().data());
-            }
-        };
-
-        g["Definition"].enter = [](const Context & /*c*/, const char * /*s*/,
-                                   size_t /*n*/, std::any &dt) {
-            auto &data = *std::any_cast<Data *>(dt);
-            data.captures_in_current_definition.clear();
-        };
-
-        g["Expression"] = [&](const SemanticValues &vs) {
-            if (vs.size() == 1) {
-                return std::any_cast<std::shared_ptr<Ope>>(vs[0]);
-            } else {
-                std::vector<std::shared_ptr<Ope>> opes;
-                for (auto i = 0u; i < vs.size(); i++) {
-                    opes.emplace_back(std::any_cast<std::shared_ptr<Ope>>(vs[i]));
-                }
-                const std::shared_ptr<Ope> ope =
-                    std::make_shared<PrioritizedChoice>(opes);
-                return ope;
-            }
-        };
-
-        g["Sequence"] = [&](const SemanticValues &vs) {
-            if (vs.empty()) {
-                return npd(lit(""));
-            } else if (vs.size() == 1) {
-                return std::any_cast<std::shared_ptr<Ope>>(vs[0]);
-            } else {
-                std::vector<std::shared_ptr<Ope>> opes;
-                for (const auto &x : vs) {
-                    opes.emplace_back(std::any_cast<std::shared_ptr<Ope>>(x));
-                }
-                const std::shared_ptr<Ope> ope = std::make_shared<Sequence>(opes);
-                return ope;
-            }
-        };
-
-        g["Prefix"] = [&](const SemanticValues &vs) {
-            std::shared_ptr<Ope> ope;
-            if (vs.size() == 1) {
-                ope = std::any_cast<std::shared_ptr<Ope>>(vs[0]);
-            } else {
-                assert(vs.size() == 2);
-                auto tok = std::any_cast<char>(vs[0]);
-                ope = std::any_cast<std::shared_ptr<Ope>>(vs[1]);
-                if (tok == '&') {
-                    ope = apd(ope);
-                } else { // '!'
-                    ope = npd(ope);
-                }
-            }
-            return ope;
-        };
-
-        g["SuffixWithLabel"] = [&](const SemanticValues &vs, std::any &dt) {
-            auto ope = std::any_cast<std::shared_ptr<Ope>>(vs[0]);
-            if (vs.size() == 1) {
-                return ope;
-            } else {
-                assert(vs.size() == 2);
-                auto &data = *std::any_cast<Data *>(dt);
-                const auto &ident = std::any_cast<std::string>(vs[1]);
-                auto label = ref(*data.grammar, ident, vs.sv().data(), false, {});
-                auto recovery = rec(ref(*data.grammar, RECOVER_DEFINITION_NAME,
-                                        vs.sv().data(), true, {label}));
-                return cho4label_(ope, recovery);
-            }
-        };
-
-        struct Loop {
-            enum class Type { opt = 0, zom, oom, rep };
-            Type type;
-            std::pair<size_t, size_t> range;
-        };
-
-        g["Suffix"] = [&](const SemanticValues &vs) {
-            auto ope = std::any_cast<std::shared_ptr<Ope>>(vs[0]);
-            if (vs.size() == 1) {
-                return ope;
-            } else {
-                assert(vs.size() == 2);
-                auto loop = std::any_cast<Loop>(vs[1]);
-                switch (loop.type) {
-                    case Loop::Type::opt: return opt(ope);
-                    case Loop::Type::zom: return zom(ope);
-                    case Loop::Type::oom: return oom(ope);
-                    default: // Regex-like repetition
-                        return rep(ope, loop.range.first, loop.range.second);
-                }
-            }
-        };
-
-        g["Loop"] = [&](const SemanticValues &vs) {
-            switch (vs.choice()) {
-                case 0: // Option
-                    return Loop{Loop::Type::opt, std::pair<size_t, size_t>()};
-                case 1: // Zero or More
-                    return Loop{Loop::Type::zom, std::pair<size_t, size_t>()};
-                case 2: // One or More
-                    return Loop{Loop::Type::oom, std::pair<size_t, size_t>()};
-                default: // Regex-like repetition
-                    return Loop{Loop::Type::rep,
-                                std::any_cast<std::pair<size_t, size_t>>(vs[0])};
-            }
-        };
-
-        g["Primary"] = [&](const SemanticValues &vs, std::any &dt) {
-            auto &data = *std::any_cast<Data *>(dt);
-
-            switch (vs.choice()) {
-                case 0:   // Macro Reference
-                case 1: { // Reference
-                    auto is_macro = vs.choice() == 0;
-                    auto ignore = std::any_cast<bool>(vs[0]);
-                    const auto &ident = std::any_cast<std::string>(vs[1]);
-
-                    std::vector<std::shared_ptr<Ope>> args;
-                    if (is_macro) {
-                        args = std::any_cast<std::vector<std::shared_ptr<Ope>>>(vs[2]);
-                    }
-
-                    auto ope = ref(*data.grammar, ident, vs.sv().data(), is_macro, args);
-                    if (ident == RECOVER_DEFINITION_NAME) { ope = rec(ope); }
-
-                    if (ignore) {
-                        return ign(ope);
-                    } else {
-                        return ope;
-                    }
-                }
-                case 2: { // (Expression)
-                    return std::any_cast<std::shared_ptr<Ope>>(vs[0]);
-                }
-                case 3: { // TokenBoundary
-                    return tok(std::any_cast<std::shared_ptr<Ope>>(vs[0]));
-                }
-                case 4: { // CaptureScope
-                    return csc(std::any_cast<std::shared_ptr<Ope>>(vs[0]));
-                }
-                case 5: { // Capture
-                    const auto &name = std::any_cast<std::string_view>(vs[0]);
-                    auto ope = std::any_cast<std::shared_ptr<Ope>>(vs[1]);
-
-                    data.captures_stack.back().insert(name);
-                    data.captures_in_current_definition.insert(name);
-
-                    return cap(ope, [name](const char *a_s, size_t a_n, Context &c) {
-                        auto &cs = c.capture_scope_stack[c.capture_scope_stack_size - 1];
-                        cs[name] = std::string(a_s, a_n);
-                    });
-                }
-                default: {
-                    return std::any_cast<std::shared_ptr<Ope>>(vs[0]);
-                }
-            }
-        };
-
-        g["IdentCont"] = [](const SemanticValues &vs) {
-            return std::string(vs.sv().data(), vs.sv().length());
-        };
-
-        g["Dictionary"] = [](const SemanticValues &vs) {
-            auto items = vs.transform<std::string>();
-            return dic(items, false);
-        };
-        g["DictionaryI"] = [](const SemanticValues &vs) {
-            auto items = vs.transform<std::string>();
-            return dic(items, true);
-        };
-
-        g["Literal"] = [](const SemanticValues &vs) {
-            const auto &tok = vs.tokens.front();
-            return lit(resolve_escape_sequence(tok.data(), tok.size()));
-        };
-        g["LiteralI"] = [](const SemanticValues &vs) {
-            const auto &tok = vs.tokens.front();
-            return liti(resolve_escape_sequence(tok.data(), tok.size()));
-        };
-        g["LiteralD"] = [](const SemanticValues &vs) {
-            auto &tok = vs.tokens.front();
-            return resolve_escape_sequence(tok.data(), tok.size());
-        };
-        g["LiteralID"] = [](const SemanticValues &vs) {
-            auto &tok = vs.tokens.front();
-            return resolve_escape_sequence(tok.data(), tok.size());
-        };
-
-        g["Class"] = [](const SemanticValues &vs) {
-            auto ranges = vs.transform<std::pair<char32_t, char32_t>>();
-            return cls(ranges);
-        };
-        g["ClassI"] = [](const SemanticValues &vs) {
-            auto ranges = vs.transform<std::pair<char32_t, char32_t>>();
-            return cls(ranges, true);
-        };
-        g["NegatedClass"] = [](const SemanticValues &vs) {
-            auto ranges = vs.transform<std::pair<char32_t, char32_t>>();
-            return ncls(ranges);
-        };
-        g["NegatedClassI"] = [](const SemanticValues &vs) {
-            auto ranges = vs.transform<std::pair<char32_t, char32_t>>();
-            return ncls(ranges, true);
-        };
-        g["Range"] = [](const SemanticValues &vs) {
-            switch (vs.choice()) {
-                case 0: {
-                    auto s1 = std::any_cast<std::string>(vs[0]);
-                    auto s2 = std::any_cast<std::string>(vs[1]);
-                    auto cp1 = decode_codepoint(s1.data(), s1.length());
-                    auto cp2 = decode_codepoint(s2.data(), s2.length());
-                    return std::pair(cp1, cp2);
-                }
-                case 1: {
-                    auto s = std::any_cast<std::string>(vs[0]);
-                    auto cp = decode_codepoint(s.data(), s.length());
-                    return std::pair(cp, cp);
-                }
-            }
-            return std::pair<char32_t, char32_t>(0, 0);
-        };
-        g["Char"] = [](const SemanticValues &vs) {
-            return resolve_escape_sequence(vs.sv().data(), vs.sv().length());
-        };
-
-        g["RepetitionRange"] = [&](const SemanticValues &vs) {
-            switch (vs.choice()) {
-                case 0: { // Number COMMA Number
-                    auto min = std::any_cast<size_t>(vs[0]);
-                    auto max = std::any_cast<size_t>(vs[1]);
-                    return std::pair(min, max);
-                }
-                case 1: // Number COMMA
-                    return std::pair(std::any_cast<size_t>(vs[0]),
-                                     std::numeric_limits<size_t>::max());
-                case 2: { // Number
-                    auto n = std::any_cast<size_t>(vs[0]);
-                    return std::pair(n, n);
-                }
-                default: // COMMA Number
-                    return std::pair(std::numeric_limits<size_t>::min(),
-                                     std::any_cast<size_t>(vs[0]));
-            }
-        };
-        g["Number"] = [&](const SemanticValues &vs) {
-            return vs.token_to_number<size_t>();
-        };
-
-        g["CapScope"].enter = [](const Context & /*c*/, const char * /*s*/,
-                                 size_t /*n*/, std::any &dt) {
-            auto &data = *std::any_cast<Data *>(dt);
-            data.captures_stack.emplace_back();
-        };
-        g["CapScope"].leave = [](const Context & /*c*/, const char * /*s*/,
-                                 size_t /*n*/, size_t /*matchlen*/,
-                                 std::any & /*value*/, std::any &dt) {
-            auto &data = *std::any_cast<Data *>(dt);
-            data.captures_stack.pop_back();
-        };
-
-        g["AND"] = [](const SemanticValues &vs) { return *vs.sv().data(); };
-        g["NOT"] = [](const SemanticValues &vs) { return *vs.sv().data(); };
-        g["QUESTION"] = [](const SemanticValues &vs) { return *vs.sv().data(); };
-        g["STAR"] = [](const SemanticValues &vs) { return *vs.sv().data(); };
-        g["PLUS"] = [](const SemanticValues &vs) { return *vs.sv().data(); };
-
-        g["DOT"] = [](const SemanticValues & /*vs*/) { return dot(); };
-
-        g["CUT"] = [](const SemanticValues & /*vs*/) { return cut(); };
-
-        g["BeginCap"] = [](const SemanticValues &vs) { return vs.token(); };
-
-        g["BackRef"] = [&](const SemanticValues &vs, std::any &dt) {
-            auto &data = *std::any_cast<Data *>(dt);
-
-            // Undefined back reference check
-            {
-                auto found = false;
-                auto it = data.captures_stack.rbegin();
-                while (it != data.captures_stack.rend()) {
-                    if (it->find(vs.token()) != it->end()) {
-                        found = true;
-                        break;
-                    }
-                    ++it;
-                }
-                if (!found) {
-                    auto ptr = vs.token().data() - 1; // include '$' symbol
-                    data.undefined_back_references.emplace_back(vs.token(), ptr);
-                }
-            }
-
-            // NOTE: Disable packrat parsing if a back reference is not defined in
-            // captures in the current definition rule.
-            if (data.captures_in_current_definition.find(vs.token()) ==
-                data.captures_in_current_definition.end()) {
-                data.enablePackratParsing = false;
-            }
-
-            return bkr(vs.token_to_string());
-        };
-
-        g["Ignore"] = [](const SemanticValues &vs) { return vs.size() > 0; };
-
-        g["Parameters"] = [](const SemanticValues &vs) {
-            return vs.transform<std::string>();
-        };
-
-        g["Arguments"] = [](const SemanticValues &vs) {
-            return vs.transform<std::shared_ptr<Ope>>();
-        };
-
-        g["PrecedenceClimbing"] = [](const SemanticValues &vs) {
-            PrecedenceClimbing::BinOpeInfo binOpeInfo;
-            size_t level = 1;
-            for (auto v : vs) {
-                auto tokens = std::any_cast<std::vector<std::string_view>>(v);
-                auto assoc = tokens[0][0];
-                for (size_t i = 1; i < tokens.size(); i++) {
-                    binOpeInfo[tokens[i]] = std::pair(level, assoc);
-                }
-                level++;
-            }
-            Instruction instruction;
-            instruction.type = "precedence";
-            instruction.data = binOpeInfo;
-            instruction.sv = vs.sv();
-            return instruction;
-        };
-        g["PrecedenceInfo"] = [](const SemanticValues &vs) {
-            return vs.transform<std::string_view>();
-        };
-        g["PrecedenceOpe"] = [](const SemanticValues &vs) { return vs.token(); };
-        g["PrecedenceAssoc"] = [](const SemanticValues &vs) { return vs.token(); };
-
-        g["ErrorMessage"] = [](const SemanticValues &vs) {
-            Instruction instruction;
-            instruction.type = "error_message";
-            instruction.data = std::any_cast<std::string>(vs[0]);
-            instruction.sv = vs.sv();
-            return instruction;
-        };
-
-        g["NoAstOpt"] = [](const SemanticValues &vs) {
-            Instruction instruction;
-            instruction.type = "no_ast_opt";
-            instruction.sv = vs.sv();
-            return instruction;
-        };
-
-        g["Instruction"] = [](const SemanticValues &vs) {
-            return vs.transform<Instruction>();
-        };
-    }
-
-    bool apply_precedence_instruction(Definition &rule,
-                                      const PrecedenceClimbing::BinOpeInfo &info,
-                                      const char *s, Log log) {
-        try {
-            auto &seq = dynamic_cast<Sequence &>(*rule.get_core_operator());
-            auto atom = seq.opes_[0];
-            auto &rep = dynamic_cast<Repetition &>(*seq.opes_[1]);
-            auto &seq1 = dynamic_cast<Sequence &>(*rep.ope_);
-            auto binop = seq1.opes_[0];
-            auto atom1 = seq1.opes_[1];
-
-            auto atom_name = dynamic_cast<Reference &>(*atom).name_;
-            auto binop_name = dynamic_cast<Reference &>(*binop).name_;
-            auto atom1_name = dynamic_cast<Reference &>(*atom1).name_;
-
-            if (!rep.is_zom() || atom_name != atom1_name || atom_name == binop_name) {
-                if (log) {
-                    auto line = line_info(s, rule.s_);
-                    log(line.first, line.second,
-                        "'precedence' instruction cannot be applied to '" + rule.name +
-                            "'.",
-                        "");
-                }
-                return false;
-            }
-
-            rule.holder_->ope_ = pre(atom, binop, info, rule);
-            rule.disable_action = true;
-        } catch (...) {
-            if (log) {
-                auto line = line_info(s, rule.s_);
-                log(line.first, line.second,
-                    "'precedence' instruction cannot be applied to '" + rule.name +
-                        "'.",
-                    "");
-            }
-            return false;
+    g["Sequence"] = [&](const SemanticValues &vs) {
+      if (vs.empty()) {
+        return npd(lit(""));
+      } else if (vs.size() == 1) {
+        return std::any_cast<std::shared_ptr<Ope>>(vs[0]);
+      } else {
+        std::vector<std::shared_ptr<Ope>> opes;
+        for (const auto &x : vs) {
+          opes.emplace_back(std::any_cast<std::shared_ptr<Ope>>(x));
         }
-        return true;
-    }
+        const std::shared_ptr<Ope> ope = std::make_shared<Sequence>(opes);
+        return ope;
+      }
+    };
 
-    ParserContext perform_core(const char *s, size_t n, const Rules &rules,
-                               Log log, std::string requested_start) {
-        Data data;
-        auto &grammar = *data.grammar;
+    g["Prefix"] = [&](const SemanticValues &vs) {
+      std::shared_ptr<Ope> ope;
+      if (vs.size() == 1) {
+        ope = std::any_cast<std::shared_ptr<Ope>>(vs[0]);
+      } else {
+        assert(vs.size() == 2);
+        auto tok = std::any_cast<char>(vs[0]);
+        ope = std::any_cast<std::shared_ptr<Ope>>(vs[1]);
+        if (tok == '&') {
+          ope = apd(ope);
+        } else { // '!'
+          ope = npd(ope);
+        }
+      }
+      return ope;
+    };
 
-        // Built-in macros
-        {
-            // `%recover`
-            {
-                auto &rule = grammar[RECOVER_DEFINITION_NAME];
-                rule <= ref(grammar, "x", "", false, {});
-                rule.name = RECOVER_DEFINITION_NAME;
-                rule.s_ = "[native]";
-                rule.ignoreSemanticValue = true;
-                rule.is_macro = true;
-                rule.params = {"x"};
-            }
+    g["SuffixWithLabel"] = [&](const SemanticValues &vs, std::any &dt) {
+      auto ope = std::any_cast<std::shared_ptr<Ope>>(vs[0]);
+      if (vs.size() == 1) {
+        return ope;
+      } else {
+        assert(vs.size() == 2);
+        auto &data = *std::any_cast<Data *>(dt);
+        const auto &ident = std::any_cast<std::string>(vs[1]);
+        auto label = ref(*data.grammar, ident, vs.sv().data(), false, {});
+        auto recovery = rec(ref(*data.grammar, RECOVER_DEFINITION_NAME,
+                                vs.sv().data(), true, {label}));
+        return cho4label_(ope, recovery);
+      }
+    };
+
+    struct Loop {
+      enum class Type { opt = 0, zom, oom, rep };
+      Type type;
+      std::pair<size_t, size_t> range;
+    };
+
+    g["Suffix"] = [&](const SemanticValues &vs) {
+      auto ope = std::any_cast<std::shared_ptr<Ope>>(vs[0]);
+      if (vs.size() == 1) {
+        return ope;
+      } else {
+        assert(vs.size() == 2);
+        auto loop = std::any_cast<Loop>(vs[1]);
+        switch (loop.type) {
+        case Loop::Type::opt: return opt(ope);
+        case Loop::Type::zom: return zom(ope);
+        case Loop::Type::oom: return oom(ope);
+        default: // Regex-like repetition
+          return rep(ope, loop.range.first, loop.range.second);
+        }
+      }
+    };
+
+    g["Loop"] = [&](const SemanticValues &vs) {
+      switch (vs.choice()) {
+      case 0: // Option
+        return Loop{Loop::Type::opt, std::pair<size_t, size_t>()};
+      case 1: // Zero or More
+        return Loop{Loop::Type::zom, std::pair<size_t, size_t>()};
+      case 2: // One or More
+        return Loop{Loop::Type::oom, std::pair<size_t, size_t>()};
+      default: // Regex-like repetition
+        return Loop{Loop::Type::rep,
+                    std::any_cast<std::pair<size_t, size_t>>(vs[0])};
+      }
+    };
+
+    g["Primary"] = [&](const SemanticValues &vs, std::any &dt) {
+      auto &data = *std::any_cast<Data *>(dt);
+
+      switch (vs.choice()) {
+      case 0: { // Reference / Macro reference (left-factored)
+        // Macro reference iff opt(Arguments) matched and pushed the arg list.
+        auto is_macro = vs.size() > 2;
+        auto ignore = std::any_cast<bool>(vs[0]);
+        const auto &ident = std::any_cast<std::string>(vs[1]);
+
+        std::vector<std::shared_ptr<Ope>> args;
+        if (is_macro) {
+          args = std::any_cast<std::vector<std::shared_ptr<Ope>>>(vs[2]);
         }
 
-        std::any dt = &data;
-        auto r = g["Grammar"].parse(s, n, dt, nullptr, log);
+        auto ope = ref(*data.grammar, ident, vs.sv().data(), is_macro, args);
+        if (ident == RECOVER_DEFINITION_NAME) { ope = rec(ope); }
 
-        if (!r.ret) {
-            if (log) {
-                if (r.error_info.message_pos) {
-                    auto line = line_info(s, r.error_info.message_pos);
-                    log(line.first, line.second, r.error_info.message,
-                        r.error_info.label);
-                } else {
-                    auto line = line_info(s, r.error_info.error_pos);
-                    log(line.first, line.second, "syntax error", r.error_info.label);
-                }
-            }
-            return {};
+        if (ignore) {
+          return ign(ope);
+        } else {
+          return ope;
         }
+      }
+      case 1: { // (Expression)
+        return std::any_cast<std::shared_ptr<Ope>>(vs[0]);
+      }
+      case 2: { // TokenBoundary
+        return tok(std::any_cast<std::shared_ptr<Ope>>(vs[0]));
+      }
+      case 3: { // CaptureScope
+        return csc(std::any_cast<std::shared_ptr<Ope>>(vs[0]));
+      }
+      case 4: { // Capture
+        const auto &name = std::any_cast<std::string_view>(vs[0]);
+        auto ope = std::any_cast<std::shared_ptr<Ope>>(vs[1]);
 
-        // User provided rules
-        for (auto [user_name, user_rule] : rules) {
-            auto name = user_name;
-            auto ignore = false;
-            if (!name.empty() && name[0] == '~') {
-                ignore = true;
-                name.erase(0, 1);
-            }
-            if (!name.empty()) {
-                auto &rule = grammar[name];
-                rule <= user_rule;
-                rule.name = name;
-                rule.ignoreSemanticValue = ignore;
-            }
+        data.captures_stack.back().insert(name);
+        data.captures_in_current_definition.insert(name);
+
+        return cap(ope, [name](const char *a_s, size_t a_n, Context &c) {
+          c.capture_entries.emplace_back(name, std::string(a_s, a_n));
+        });
+      }
+      default: {
+        return std::any_cast<std::shared_ptr<Ope>>(vs[0]);
+      }
+      }
+    };
+
+    g["IdentCont"] = [](const SemanticValues &vs) {
+      return std::string(vs.sv().data(), vs.sv().length());
+    };
+
+    g["Dictionary"] = [](const SemanticValues &vs) {
+      auto items = vs.transform<std::string>();
+      return dic(items, false);
+    };
+    g["DictionaryI"] = [](const SemanticValues &vs) {
+      auto items = vs.transform<std::string>();
+      return dic(items, true);
+    };
+
+    g["Literal"] = [](const SemanticValues &vs) {
+      const auto &tok = vs.tokens.front();
+      return lit(resolve_escape_sequence(tok.data(), tok.size()));
+    };
+    g["LiteralI"] = [](const SemanticValues &vs) {
+      const auto &tok = vs.tokens.front();
+      return liti(resolve_escape_sequence(tok.data(), tok.size()));
+    };
+    g["LiteralD"] = [](const SemanticValues &vs) {
+      auto &tok = vs.tokens.front();
+      return resolve_escape_sequence(tok.data(), tok.size());
+    };
+    g["LiteralID"] = [](const SemanticValues &vs) {
+      auto &tok = vs.tokens.front();
+      return resolve_escape_sequence(tok.data(), tok.size());
+    };
+
+    // A Range produces either a single range (std::pair) or a range list
+    // (std::vector<std::pair>) for `\d`-style escapes and POSIX classes.
+    auto collect_ranges = [](const SemanticValues &vs) {
+      std::vector<std::pair<char32_t, char32_t>> ranges;
+      for (const auto &v : vs) {
+        if (v.type() == typeid(std::pair<char32_t, char32_t>)) {
+          ranges.push_back(std::any_cast<std::pair<char32_t, char32_t>>(v));
+        } else {
+          const auto &vec =
+              std::any_cast<const std::vector<std::pair<char32_t, char32_t>> &>(
+                  v);
+          ranges.insert(ranges.end(), vec.begin(), vec.end());
         }
+      }
+      return ranges;
+    };
 
-        // Check duplicated definitions
-        auto ret = true;
-
-        if (!data.duplicates_of_definition.empty()) {
-            for (const auto &[name, ptr] : data.duplicates_of_definition) {
-                if (log) {
-                    auto line = line_info(s, ptr);
-                    log(line.first, line.second,
-                        "The definition '" + name + "' is already defined.", "");
-                }
-            }
-            ret = false;
+    g["Class"] = [collect_ranges](const SemanticValues &vs) {
+      return cls(collect_ranges(vs));
+    };
+    g["ClassI"] = [collect_ranges](const SemanticValues &vs) {
+      return cls(collect_ranges(vs), true);
+    };
+    g["NegatedClass"] = [collect_ranges](const SemanticValues &vs) {
+      return ncls(collect_ranges(vs));
+    };
+    g["NegatedClassI"] = [collect_ranges](const SemanticValues &vs) {
+      return ncls(collect_ranges(vs), true);
+    };
+    g["Range"] = [](const SemanticValues &vs) -> std::any {
+      switch (vs.choice()) {
+      case 0: {
+        auto s1 = std::any_cast<std::string>(vs[0]);
+        auto s2 = std::any_cast<std::string>(vs[1]);
+        auto cp1 = decode_codepoint(s1.data(), s1.length());
+        auto cp2 = decode_codepoint(s2.data(), s2.length());
+        if (cp1 > cp2) {
+          throw SyntaxErrorException("characer range is out of order...",
+                                     vs.line_info());
         }
+        return std::pair(cp1, cp2);
+      }
+      case 1: // ClassEscape
+      case 2: // PosixClass
+        return vs[0];
+      case 3: {
+        auto s = std::any_cast<std::string>(vs[0]);
+        auto cp = decode_codepoint(s.data(), s.length());
+        return std::pair(cp, cp);
+      }
+      }
+      return std::pair<char32_t, char32_t>(0, 0);
+    };
+    g["ClassEscape"] = [](const SemanticValues &vs) {
+      auto ch = vs.sv()[1];
+      const char *name = nullptr;
+      switch (ch) {
+      case 'd':
+      case 'D': name = "digit"; break;
+      case 's':
+      case 'S': name = "space"; break;
+      default: name = "word"; break;
+      }
+      auto ranges = *predefined_character_class(name);
+      if (ch == 'D' || ch == 'S' || ch == 'W') {
+        ranges = complement_character_ranges(ranges);
+      }
+      return ranges;
+    };
+    g["PosixClass"] = [](const SemanticValues &vs) {
+      auto sv = vs.sv(); // `[:name:]` or `[:^name:]`
+      auto negated = sv[2] == '^';
+      auto name = sv.substr(negated ? 3 : 2, sv.size() - (negated ? 5 : 4));
+      auto ranges = predefined_character_class(name);
+      if (!ranges) {
+        auto msg = "invalid POSIX character class '" + std::string(name) + "'";
+        throw SyntaxErrorException(msg.c_str(), vs.line_info());
+      }
+      return negated ? complement_character_ranges(*ranges) : *ranges;
+    };
+    g["Char"] = [](const SemanticValues &vs) {
+      return resolve_escape_sequence(vs.sv().data(), vs.sv().length());
+    };
 
-        // Check duplicated instructions
-        if (!data.duplicates_of_instruction.empty()) {
-            for (const auto &[type, ptr] : data.duplicates_of_instruction) {
-                if (log) {
-                    auto line = line_info(s, ptr);
-                    log(line.first, line.second,
-                        "The instruction '" + type + "' is already defined.", "");
-                }
-            }
-            ret = false;
+    g["RepetitionRange"] = [&](const SemanticValues &vs) {
+      switch (vs.choice()) {
+      case 0: { // Number COMMA Number
+        auto min = std::any_cast<size_t>(vs[0]);
+        auto max = std::any_cast<size_t>(vs[1]);
+        return std::pair(min, max);
+      }
+      case 1: // Number COMMA
+        return std::pair(std::any_cast<size_t>(vs[0]),
+                         std::numeric_limits<size_t>::max());
+      case 2: { // Number
+        auto n = std::any_cast<size_t>(vs[0]);
+        return std::pair(n, n);
+      }
+      default: // COMMA Number
+        return std::pair(std::numeric_limits<size_t>::min(),
+                         std::any_cast<size_t>(vs[0]));
+      }
+    };
+    g["Number"] = [&](const SemanticValues &vs) {
+      return vs.token_to_number<size_t>();
+    };
+
+    g["CapScope"].enter = [](const Context & /*c*/, const char * /*s*/,
+                             size_t /*n*/, std::any &dt) {
+      auto &data = *std::any_cast<Data *>(dt);
+      data.captures_stack.emplace_back();
+    };
+    g["CapScope"].leave = [](const Context & /*c*/, const char * /*s*/,
+                             size_t /*n*/, size_t /*matchlen*/,
+                             std::any & /*value*/, std::any &dt) {
+      auto &data = *std::any_cast<Data *>(dt);
+      data.captures_stack.pop_back();
+    };
+
+    g["AND"] = [](const SemanticValues &vs) { return *vs.sv().data(); };
+    g["NOT"] = [](const SemanticValues &vs) { return *vs.sv().data(); };
+    g["QUESTION"] = [](const SemanticValues &vs) { return *vs.sv().data(); };
+    g["STAR"] = [](const SemanticValues &vs) { return *vs.sv().data(); };
+    g["PLUS"] = [](const SemanticValues &vs) { return *vs.sv().data(); };
+
+    g["DOT"] = [](const SemanticValues & /*vs*/) { return dot(); };
+
+    g["CUT"] = [](const SemanticValues & /*vs*/) { return cut(); };
+
+    g["BeginCap"] = [](const SemanticValues &vs) { return vs.token(); };
+
+    g["BackRef"] = [&](const SemanticValues &vs, std::any &dt) {
+      auto &data = *std::any_cast<Data *>(dt);
+
+      // Undefined back reference check
+      {
+        auto found = false;
+        auto it = data.captures_stack.rbegin();
+        while (it != data.captures_stack.rend()) {
+          if (it->find(vs.token()) != it->end()) {
+            found = true;
+            break;
+          }
+          ++it;
         }
-
-        // Check undefined back references
-        if (!data.undefined_back_references.empty()) {
-            for (const auto &[name, ptr] : data.undefined_back_references) {
-                if (log) {
-                    auto line = line_info(s, ptr);
-                    log(line.first, line.second,
-                        "The back reference '" + name + "' is undefined.", "");
-                }
-            }
-            ret = false;
+        if (!found) {
+          auto ptr = vs.token().data() - 1; // include '$' symbol
+          data.undefined_back_references.emplace_back(vs.token(), ptr);
         }
+      }
 
-        // Set root definition
-        auto start = data.start;
+      // NOTE: Disable packrat parsing if a back reference is not defined in
+      // captures in the current definition rule.
+      if (data.captures_in_current_definition.find(vs.token()) ==
+          data.captures_in_current_definition.end()) {
+        data.enablePackratParsing = false;
+      }
 
-        if (!requested_start.empty()) {
-            if (grammar.count(requested_start)) {
-                start = requested_start;
-            } else {
-                if (log) {
-                    auto line = line_info(s, s);
-                    log(line.first, line.second,
-                        "The specified start rule '" + requested_start +
-                            "' is undefined.",
-                        "");
-                }
-                ret = false;
-            }
+      return bkr(vs.token_to_string());
+    };
+
+    g["Ignore"] = [](const SemanticValues &vs) { return vs.size() > 0; };
+
+    g["Parameters"] = [](const SemanticValues &vs) {
+      return vs.transform<std::string>();
+    };
+
+    g["Arguments"] = [](const SemanticValues &vs) {
+      return vs.transform<std::shared_ptr<Ope>>();
+    };
+
+    g["PrecedenceClimbing"] = [](const SemanticValues &vs) {
+      PrecedenceClimbing::BinOpeInfo binOpeInfo;
+      size_t level = 1;
+      for (const auto &v : vs) {
+        auto tokens = std::any_cast<std::vector<std::string_view>>(v);
+        auto assoc = tokens[0][0];
+        for (size_t i = 1; i < tokens.size(); i++) {
+          binOpeInfo[tokens[i]] = std::pair(level, assoc);
         }
+        level++;
+      }
+      Instruction instruction;
+      instruction.type = "precedence";
+      instruction.data = binOpeInfo;
+      instruction.sv = vs.sv();
+      return instruction;
+    };
+    g["PrecedenceInfo"] = [](const SemanticValues &vs) {
+      return vs.transform<std::string_view>();
+    };
+    g["PrecedenceOpe"] = [](const SemanticValues &vs) { return vs.token(); };
+    g["PrecedenceAssoc"] = [](const SemanticValues &vs) { return vs.token(); };
 
-        if (!ret) { return {}; }
+    g["ErrorMessage"] = [](const SemanticValues &vs) {
+      Instruction instruction;
+      instruction.type = "error_message";
+      instruction.data = std::any_cast<std::string>(vs[0]);
+      instruction.sv = vs.sv();
+      return instruction;
+    };
 
-        auto &start_rule = grammar[start];
+    g["NoAstOpt"] = [](const SemanticValues &vs) {
+      Instruction instruction;
+      instruction.type = "no_ast_opt";
+      instruction.sv = vs.sv();
+      return instruction;
+    };
 
-        // Check if the start rule has ignore operator
-        {
-            if (start_rule.ignoreSemanticValue) {
-                if (log) {
-                    auto line = line_info(s, start_rule.s_);
-                    log(line.first, line.second,
-                        "Ignore operator cannot be applied to '" + start_rule.name + "'.",
-                        "");
-                }
-                ret = false;
-            }
-        }
+    g["NoWhitespace"] = [](const SemanticValues &vs) {
+      Instruction instruction;
+      instruction.type = "no_whitespace";
+      instruction.sv = vs.sv();
+      return instruction;
+    };
 
-        if (!ret) { return {}; }
+    g["AstName"] = [](const SemanticValues &vs) {
+      Instruction instruction;
+      instruction.type = "ast_name";
+      instruction.data = std::any_cast<std::string>(vs[0]);
+      instruction.sv = vs.sv();
+      return instruction;
+    };
 
-        // Check missing definitions
-        auto referenced = std::unordered_set<std::string>{
-            WHITESPACE_DEFINITION_NAME,
-            WORD_DEFINITION_NAME,
-            RECOVER_DEFINITION_NAME,
-            start_rule.name,
-        };
+    g["Instruction"] = [](const SemanticValues &vs) {
+      return vs.transform<Instruction>();
+    };
+  }
 
-        for (auto &[_, rule] : grammar) {
-            ReferenceChecker vis(grammar, rule.params);
-            rule.accept(vis);
-            referenced.insert(vis.referenced.begin(), vis.referenced.end());
-            for (const auto &[name, ptr] : vis.error_s) {
-                if (log) {
-                    auto line = line_info(s, ptr);
-                    log(line.first, line.second, vis.error_message[name], "");
-                }
-                ret = false;
-            }
-        }
+  bool apply_precedence_instruction(Definition &rule,
+                                    const PrecedenceClimbing::BinOpeInfo &info,
+                                    const char *s, Log log) {
+    try {
+      auto &seq = dynamic_cast<Sequence &>(*rule.get_core_operator());
+      auto atom = seq.opes_[0];
+      auto &rep = dynamic_cast<Repetition &>(*seq.opes_[1]);
+      auto &seq1 = dynamic_cast<Sequence &>(*rep.ope_);
+      auto binop = seq1.opes_[0];
+      auto atom1 = seq1.opes_[1];
 
-        for (auto &[name, rule] : grammar) {
-            if (!referenced.count(name)) {
-                if (log) {
-                    auto line = line_info(s, rule.s_);
-                    auto msg = "'" + name + "' is not referenced.";
-                    log(line.first, line.second, msg, "");
-                }
-            }
-        }
+      auto atom_name = dynamic_cast<Reference &>(*atom).name_;
+      auto binop_name = dynamic_cast<Reference &>(*binop).name_;
+      auto atom1_name = dynamic_cast<Reference &>(*atom1).name_;
 
-        if (!ret) { return {}; }
-
-        // Link references
-        for (auto &x : grammar) {
-            auto &rule = x.second;
-            LinkReferences vis(grammar, rule.params);
-            rule.accept(vis);
-        }
-
-        // Check left recursion
-        ret = true;
-
-        for (auto &[name, rule] : grammar) {
-            DetectLeftRecursion vis(name);
-            rule.accept(vis);
-            if (vis.error_s) {
-                if (log) {
-                    auto line = line_info(s, vis.error_s);
-                    log(line.first, line.second, "'" + name + "' is left recursive.", "");
-                }
-                ret = false;
-            }
-        }
-
-        if (!ret) { return {}; }
-
-        // Check infinite loop
-        if (detect_infiniteLoop(data, start_rule, log, s)) { return {}; }
-
-        // Automatic whitespace skipping
-        if (grammar.count(WHITESPACE_DEFINITION_NAME)) {
-            for (auto &x : grammar) {
-                auto &rule = x.second;
-                auto ope = rule.get_core_operator();
-                if (IsLiteralToken::check(*ope)) { rule <= tok(ope); }
-            }
-
-            auto &rule = grammar[WHITESPACE_DEFINITION_NAME];
-            start_rule.whitespaceOpe = wsp(rule.get_core_operator());
-
-            if (detect_infiniteLoop(data, rule, log, s)) { return {}; }
-        }
-
-        // Word expression
-        if (grammar.count(WORD_DEFINITION_NAME)) {
-            auto &rule = grammar[WORD_DEFINITION_NAME];
-            start_rule.wordOpe = rule.get_core_operator();
-
-            if (detect_infiniteLoop(data, rule, log, s)) { return {}; }
-        }
-
-        // Apply instructions
-        for (const auto &[name, instructions] : data.instructions) {
-            auto &rule = grammar[name];
-
-            for (const auto &instruction : instructions) {
-                if (instruction.type == "precedence") {
-                    const auto &info =
-                        std::any_cast<PrecedenceClimbing::BinOpeInfo>(instruction.data);
-
-                    if (!apply_precedence_instruction(rule, info, s, log)) { return {}; }
-                } else if (instruction.type == "error_message") {
-                    rule.error_message = std::any_cast<std::string>(instruction.data);
-                } else if (instruction.type == "no_ast_opt") {
-                    rule.no_ast_opt = true;
-                }
-            }
-        }
-
-        return {data.grammar, start, data.enablePackratParsing};
-    }
-
-    bool detect_infiniteLoop(const Data &data, Definition &rule, const Log &log,
-                             const char *s) const {
-        std::vector<std::pair<const char *, std::string>> refs;
-        std::unordered_map<std::string, bool> has_error_cache;
-        DetectInfiniteLoop vis(data.start_pos, rule.name, refs, has_error_cache);
-        rule.accept(vis);
-        if (vis.has_error) {
-            if (log) {
-                auto line = line_info(s, vis.error_s);
-                log(line.first, line.second,
-                    "infinite loop is detected in '" + vis.error_name + "'.", "");
-            }
-            return true;
+      if (!rep.is_zom() || atom_name != atom1_name || atom_name == binop_name) {
+        if (log) {
+          auto line = line_info(s, rule.s_);
+          log(line.first, line.second,
+              "'precedence' instruction cannot be applied to '" + rule.name +
+                  "'.",
+              "");
         }
         return false;
+      }
+
+      rule.holder_->ope_ = pre(atom, binop, info, rule);
+      rule.disable_action = true;
+    } catch (...) {
+      if (log) {
+        auto line = line_info(s, rule.s_);
+        log(line.first, line.second,
+            "'precedence' instruction cannot be applied to '" + rule.name +
+                "'.",
+            "");
+      }
+      return false;
+    }
+    return true;
+  }
+
+  ParserContext perform_core(const char *s, size_t n, const Rules &rules,
+                             Log log, std::string requested_start,
+                             bool enable_left_recursion = true) {
+    Data data;
+    auto &grammar = *data.grammar;
+
+    // Built-in macros
+    {
+      // `%recover`
+      {
+        auto &rule = grammar[RECOVER_DEFINITION_NAME];
+        rule <= ref(grammar, "x", "", false, {});
+        rule.name = RECOVER_DEFINITION_NAME;
+        rule.s_ = "[native]";
+        rule.ignoreSemanticValue = true;
+        rule.is_macro = true;
+        rule.params = {"x"};
+      }
     }
 
-    Grammar g;
+    try {
+      std::any dt = &data;
+      auto r = g["Grammar"].parse(s, n, dt, nullptr, log);
+
+      if (!r.ret) {
+        if (log) {
+          if (r.error_info.message_pos) {
+            auto line = line_info(s, r.error_info.message_pos);
+            log(line.first, line.second, r.error_info.message,
+                r.error_info.label);
+          } else {
+            auto line = line_info(s, r.error_info.error_pos);
+            log(line.first, line.second, "syntax error", r.error_info.label);
+          }
+        }
+        return {};
+      }
+    } catch (const SyntaxErrorException &e) {
+      if (log) {
+        auto line = e.line_info();
+        log(line.first, line.second, e.what(), "");
+      }
+      return {};
+    }
+
+    // User provided rules
+    for (auto [user_name, user_rule] : rules) {
+      auto name = user_name;
+      auto ignore = false;
+      if (!name.empty() && name[0] == '~') {
+        ignore = true;
+        name.erase(0, 1);
+      }
+      if (!name.empty()) {
+        auto &rule = grammar[name];
+        rule <= user_rule;
+        rule.name = name;
+        rule.ignoreSemanticValue = ignore;
+      }
+    }
+
+    // Check duplicated definitions
+    auto ret = true;
+
+    if (!data.duplicates_of_definition.empty()) {
+      for (const auto &[name, ptr] : data.duplicates_of_definition) {
+        if (log) {
+          auto line = line_info(s, ptr);
+          log(line.first, line.second,
+              "the definition '" + name + "' is already defined.", "");
+        }
+      }
+      ret = false;
+    }
+
+    // Check duplicated instructions
+    if (!data.duplicates_of_instruction.empty()) {
+      for (const auto &[type, ptr] : data.duplicates_of_instruction) {
+        if (log) {
+          auto line = line_info(s, ptr);
+          log(line.first, line.second,
+              "the instruction '" + type + "' is already defined.", "");
+        }
+      }
+      ret = false;
+    }
+
+    // Check undefined back references
+    if (!data.undefined_back_references.empty()) {
+      for (const auto &[name, ptr] : data.undefined_back_references) {
+        if (log) {
+          auto line = line_info(s, ptr);
+          log(line.first, line.second,
+              "the back reference '" + name + "' is undefined.", "");
+        }
+      }
+      ret = false;
+    }
+
+    // Set root definition
+    auto start = data.start;
+
+    if (!requested_start.empty()) {
+      if (grammar.count(requested_start)) {
+        start = requested_start;
+      } else {
+        if (log) {
+          auto line = line_info(s, s);
+          log(line.first, line.second,
+              "the specified start rule '" + requested_start +
+                  "' is undefined.",
+              "");
+        }
+        ret = false;
+      }
+    }
+
+    if (!ret) { return {}; }
+
+    auto &start_rule = grammar[start];
+
+    // Check if the start rule has ignore operator
+    {
+      if (start_rule.ignoreSemanticValue) {
+        if (log) {
+          auto line = line_info(s, start_rule.s_);
+          log(line.first, line.second,
+              "ignore operator cannot be applied to '" + start_rule.name + "'.",
+              "");
+        }
+        ret = false;
+      }
+    }
+
+    if (!ret) { return {}; }
+
+    // Check missing definitions
+    auto referenced = std::unordered_set<std::string>{
+        WHITESPACE_DEFINITION_NAME,
+        WORD_DEFINITION_NAME,
+        RECOVER_DEFINITION_NAME,
+        start_rule.name,
+    };
+
+    for (auto &[_, rule] : grammar) {
+      ReferenceChecker vis(grammar, rule.params);
+      rule.accept(vis);
+      referenced.insert(vis.referenced.begin(), vis.referenced.end());
+      for (const auto &[name, ptr] : vis.error_s) {
+        if (log) {
+          auto line = line_info(s, ptr);
+          log(line.first, line.second, vis.error_message[name], "");
+        }
+        ret = false;
+      }
+    }
+
+    for (auto &[name, rule] : grammar) {
+      if (!referenced.count(name)) {
+        if (log) {
+          auto line = line_info(s, rule.s_);
+          auto msg = "'" + name + "' is not referenced.";
+          log(line.first, line.second, msg, "");
+        }
+      }
+    }
+
+    if (!ret) { return {}; }
+
+    // Link references
+    for (auto &x : grammar) {
+      auto &rule = x.second;
+      LinkReferences vis(grammar, rule.params);
+      rule.accept(vis);
+    }
+
+    // Compute can_be_empty for each rule (fixed-point iteration)
+    {
+      bool changed = true;
+      while (changed) {
+        changed = false;
+        for (auto &[name, rule] : grammar) {
+          ComputeCanBeEmpty vis;
+          rule.accept(vis);
+          if (vis.result != rule.can_be_empty) {
+            rule.can_be_empty = vis.result;
+            changed = true;
+          }
+        }
+      }
+    }
+
+    // Check left recursion
+    if (enable_left_recursion) {
+      for (auto &[name, rule] : grammar) {
+        DetectLeftRecursion vis(name);
+        rule.accept(vis);
+        if (vis.error_s) { rule.is_left_recursive = true; }
+      }
+    } else {
+      ret = true;
+
+      for (auto &[name, rule] : grammar) {
+        DetectLeftRecursion vis(name);
+        rule.accept(vis);
+        if (vis.error_s) {
+          if (log) {
+            auto line = line_info(s, vis.error_s);
+            log(line.first, line.second, "'" + name + "' is left recursive.",
+                "");
+          }
+          ret = false;
+        }
+      }
+
+      if (!ret) { return {}; }
+    }
+
+    // Check infinite loop
+    if (detect_infiniteLoop(data, start_rule, log, s)) { return {}; }
+
+    // Automatic whitespace skipping
+    if (grammar.count(WHITESPACE_DEFINITION_NAME)) {
+      for (auto &x : grammar) {
+        auto &rule = x.second;
+        auto ope = rule.get_core_operator();
+        if (IsLiteralToken::check(*ope)) { rule <= tok(ope); }
+      }
+
+      auto &rule = grammar[WHITESPACE_DEFINITION_NAME];
+      start_rule.whitespaceOpe = wsp(rule.get_core_operator());
+
+      if (detect_infiniteLoop(data, rule, log, s)) { return {}; }
+    }
+
+    // Word expression
+    if (grammar.count(WORD_DEFINITION_NAME)) {
+      auto &rule = grammar[WORD_DEFINITION_NAME];
+      start_rule.wordOpe = rule.get_core_operator();
+
+      if (detect_infiniteLoop(data, rule, log, s)) { return {}; }
+    }
+
+    // Apply instructions
+    for (const auto &[name, instructions] : data.instructions) {
+      auto &rule = grammar[name];
+
+      for (const auto &instruction : instructions) {
+        if (instruction.type == "precedence") {
+          const auto &info =
+              std::any_cast<PrecedenceClimbing::BinOpeInfo>(instruction.data);
+
+          if (!apply_precedence_instruction(rule, info, s, log)) { return {}; }
+        } else if (instruction.type == "error_message") {
+          rule.error_message = std::any_cast<std::string>(instruction.data);
+        } else if (instruction.type == "no_ast_opt") {
+          rule.no_ast_opt = true;
+        } else if (instruction.type == "no_whitespace") {
+          rule.no_whitespace = true;
+        } else if (instruction.type == "ast_name") {
+          rule.ast_name = std::any_cast<std::string>(instruction.data);
+        }
+      }
+    }
+
+    // Setup First-Set and ISpan optimizations. A single visitor is shared
+    // across all rules so its first-set cache and visited-rule set persist:
+    // each rule's first-sets are computed once (O(N)) instead of re-walking
+    // every reachable rule once per referencing rule (O(N^2)).
+    {
+      SetupFirstSets vis;
+      for (auto &x : grammar) {
+        x.second.accept(vis);
+      }
+    }
+
+    return {data.grammar, start, data.enablePackratParsing};
+  }
+
+  bool detect_infiniteLoop(const Data &data, Definition &rule, const Log &log,
+                           const char *s) const {
+    std::vector<std::pair<const char *, std::string>> refs;
+    std::unordered_map<std::string, bool> has_error_cache;
+    DetectInfiniteLoop vis(data.start_pos, rule.name, refs, has_error_cache);
+    rule.accept(vis);
+    if (vis.has_error) {
+      if (log) {
+        auto line = line_info(s, vis.error_s);
+        log(line.first, line.second,
+            "infinite loop is detected in '" + vis.error_name + "'.", "");
+      }
+      return true;
+    }
+    return false;
+  }
+
+  Grammar g;
 };
 
 /*-----------------------------------------------------------------------------
@@ -4254,163 +6298,175 @@ private:
  *---------------------------------------------------------------------------*/
 
 template <typename Annotation> struct AstBase : public Annotation {
-    AstBase(const char *path, size_t line, size_t column, const char *name,
-            const std::vector<std::shared_ptr<AstBase>> &nodes,
-            size_t position = 0, size_t length = 0, size_t choice_count = 0,
-            size_t choice = 0)
-        : path(path ? path : ""), line(line), column(column), name(name),
-          position(position), length(length), choice_count(choice_count),
-          choice(choice), original_name(name),
-          original_choice_count(choice_count), original_choice(choice),
-          tag(str2tag(name)), original_tag(tag), is_token(false), nodes(nodes) {}
+  AstBase(const char *path, size_t line, size_t column, const char *name,
+          const std::vector<std::shared_ptr<AstBase>> &nodes,
+          size_t position = 0, size_t length = 0, size_t choice_count = 0,
+          size_t choice = 0, bool preserve_position = false)
+      : path(path ? path : ""), line(line), column(column), name(name),
+        position(position), length(length), choice_count(choice_count),
+        choice(choice), original_name(name),
+        original_choice_count(choice_count), original_choice(choice),
+        tag(str2tag(name)), original_tag(tag), is_token(false),
+        preserve_position(preserve_position), nodes(nodes) {}
 
-    AstBase(const char *path, size_t line, size_t column, const char *name,
-            const std::string_view &token, size_t position = 0, size_t length = 0,
-            size_t choice_count = 0, size_t choice = 0)
-        : path(path ? path : ""), line(line), column(column), name(name),
-          position(position), length(length), choice_count(choice_count),
-          choice(choice), original_name(name),
-          original_choice_count(choice_count), original_choice(choice),
-          tag(str2tag(name)), original_tag(tag), is_token(true), token(token) {}
+  AstBase(const char *path, size_t line, size_t column, const char *name,
+          const std::string_view &token, size_t position = 0, size_t length = 0,
+          size_t choice_count = 0, size_t choice = 0,
+          bool preserve_position = false)
+      : path(path ? path : ""), line(line), column(column), name(name),
+        position(position), length(length), choice_count(choice_count),
+        choice(choice), original_name(name),
+        original_choice_count(choice_count), original_choice(choice),
+        tag(str2tag(name)), original_tag(tag), is_token(true),
+        preserve_position(preserve_position), token(token) {}
 
-    AstBase(const AstBase &ast, const char *original_name, size_t position = 0,
-            size_t length = 0, size_t original_choice_count = 0,
-            size_t original_choice = 0)
-        : path(ast.path), line(ast.line), column(ast.column), name(ast.name),
-          position(position), length(length), choice_count(ast.choice_count),
-          choice(ast.choice), original_name(original_name),
-          original_choice_count(original_choice_count),
-          original_choice(original_choice), tag(ast.tag),
-          original_tag(str2tag(original_name)), is_token(ast.is_token),
-          token(ast.token), nodes(ast.nodes), parent(ast.parent) {}
+  AstBase(const AstBase &ast, const char *original_name, size_t position = 0,
+          size_t length = 0, size_t original_choice_count = 0,
+          size_t original_choice = 0)
+      : path(ast.path), line(ast.line), column(ast.column), name(ast.name),
+        position(position), length(length), choice_count(ast.choice_count),
+        choice(ast.choice), original_name(original_name),
+        original_choice_count(original_choice_count),
+        original_choice(original_choice), tag(ast.tag),
+        original_tag(str2tag(original_name)), is_token(ast.is_token),
+        preserve_position(ast.preserve_position), token(ast.token),
+        nodes(ast.nodes), parent(ast.parent) {}
 
-    const std::string path;
-    const size_t line = 1;
-    const size_t column = 1;
+  const std::string path;
+  const size_t line = 1;
+  const size_t column = 1;
 
-    const std::string name;
-    size_t position;
-    size_t length;
-    const size_t choice_count;
-    const size_t choice;
-    const std::string original_name;
-    const size_t original_choice_count;
-    const size_t original_choice;
-    const unsigned int tag;
-    const unsigned int original_tag;
+  const std::string name;
+  size_t position;
+  size_t length;
+  const size_t choice_count;
+  const size_t choice;
+  const std::string original_name;
+  const size_t original_choice_count;
+  const size_t original_choice;
+  const unsigned int tag;
+  const unsigned int original_tag;
 
-    const bool is_token;
-    const std::string_view token;
+  const bool is_token;
+  const bool preserve_position;
+  const std::string_view token;
 
-    std::vector<std::shared_ptr<AstBase<Annotation>>> nodes;
-    std::weak_ptr<AstBase<Annotation>> parent;
+  std::vector<std::shared_ptr<AstBase<Annotation>>> nodes;
+  std::weak_ptr<AstBase<Annotation>> parent;
 
-    std::string token_to_string() const {
-        assert(is_token);
-        return std::string(token);
-    }
+  std::string token_to_string() const {
+    assert(is_token);
+    return std::string(token);
+  }
 
-    template <typename T> T token_to_number() const {
-        return token_to_number_<T>(token);
-    }
+  template <typename T> T token_to_number() const {
+    return token_to_number_<T>(token);
+  }
 };
 
 template <typename T>
 void ast_to_s_core(const std::shared_ptr<T> &ptr, std::string &s, int level,
                    std::function<std::string(const T &ast, int level)> fn) {
-    const auto &ast = *ptr;
-    for (auto i = 0; i < level; i++) {
-        s += "  ";
-    }
-    auto name = ast.original_name;
-    if (ast.original_choice_count > 0) {
-        name += "/" + std::to_string(ast.original_choice);
-    }
-    if (ast.name != ast.original_name) { name += "[" + ast.name + "]"; }
-    if (ast.is_token) {
-        s += "- " + name + " (";
-        s += ast.token;
-        s += ")\n";
-    } else {
-        s += "+ " + name + "\n";
-    }
-    if (fn) { s += fn(ast, level + 1); }
-    for (auto node : ast.nodes) {
-        ast_to_s_core(node, s, level + 1, fn);
-    }
+  const auto &ast = *ptr;
+  for (auto i = 0; i < level; i++) {
+    s += "  ";
+  }
+  auto name = ast.original_name;
+  if (ast.original_choice_count > 0) {
+    name += "/" + std::to_string(ast.original_choice);
+  }
+  if (ast.name != ast.original_name) { name += "[" + ast.name + "]"; }
+  if (ast.is_token) {
+    s += "- " + name + " (";
+    s += ast.token;
+    s += ")\n";
+  } else {
+    s += "+ " + name + "\n";
+  }
+  if (fn) { s += fn(ast, level + 1); }
+  for (const auto &node : ast.nodes) {
+    ast_to_s_core(node, s, level + 1, fn);
+  }
 }
 
 template <typename T>
 std::string
 ast_to_s(const std::shared_ptr<T> &ptr,
          std::function<std::string(const T &ast, int level)> fn = nullptr) {
-    std::string s;
-    ast_to_s_core(ptr, s, 0, fn);
-    return s;
+  std::string s;
+  ast_to_s_core(ptr, s, 0, fn);
+  return s;
 }
 
 struct AstOptimizer {
-    AstOptimizer(bool mode, const std::vector<std::string> &rules = {})
-        : mode_(mode), rules_(rules) {}
+  AstOptimizer(bool mode, const std::vector<std::string> &rules = {})
+      : mode_(mode), rules_(rules) {}
 
-    template <typename T>
-    std::shared_ptr<T> optimize(std::shared_ptr<T> original,
-                                std::shared_ptr<T> parent = nullptr) {
-        auto found =
-            std::find(rules_.begin(), rules_.end(), original->name) != rules_.end();
-        auto opt = mode_ ? !found : found;
+  template <typename T>
+  std::shared_ptr<T> optimize(std::shared_ptr<T> original,
+                              std::shared_ptr<T> parent = nullptr) {
+    auto found =
+        std::find(rules_.begin(), rules_.end(), original->name) != rules_.end();
+    auto opt = mode_ ? !found : found;
 
-        if (opt && original->nodes.size() == 1) {
-            auto child = optimize(original->nodes[0], parent);
-            auto ast = std::make_shared<T>(*child, original->name.data(),
-                                           original->choice_count, original->position,
-                                           original->length, original->choice);
-            for (auto node : ast->nodes) {
-                node->parent = ast;
-            }
-            return ast;
-        }
-
-        auto ast = std::make_shared<T>(*original);
-        ast->parent = parent;
-        ast->nodes.clear();
-        for (auto node : original->nodes) {
-            auto child = optimize(node, ast);
-            ast->nodes.push_back(child);
-        }
-        return ast;
+    if (opt && original->nodes.size() == 1) {
+      auto child = optimize(original->nodes[0], parent);
+      auto pos =
+          child->preserve_position ? child->position : original->position;
+      auto len = child->preserve_position ? child->length : original->length;
+      auto ast = std::make_shared<T>(*child, original->name.data(), pos, len,
+                                     original->choice_count, original->choice);
+      for (auto &node : ast->nodes) {
+        node->parent = ast;
+      }
+      return ast;
     }
 
+    auto ast = std::make_shared<T>(*original);
+    ast->parent = parent;
+    ast->nodes.clear();
+    for (const auto &node : original->nodes) {
+      auto child = optimize(node, ast);
+      ast->nodes.push_back(child);
+    }
+    return ast;
+  }
+
 private:
-    const bool mode_;
-    const std::vector<std::string> rules_;
+  const bool mode_;
+  const std::vector<std::string> rules_;
 };
 
 struct EmptyType {};
 using Ast = AstBase<EmptyType>;
 
 template <typename T = Ast> void add_ast_action(Definition &rule) {
-    rule.action = [&](const SemanticValues &vs) {
-        auto line = vs.line_info();
+  rule.action = [&](const SemanticValues &vs) {
+    auto line = vs.line_info();
 
-        if (rule.is_token()) {
-            return std::make_shared<T>(
-                vs.path, line.first, line.second, rule.name.data(), vs.token(),
-                std::distance(vs.ss, vs.sv().data()), vs.sv().length(),
-                vs.choice_count(), vs.choice());
-        }
+    // `{ ast_name: X }` overrides the node's name/tag (falls back to the
+    // rule's own name when unset).
+    const char *node_name =
+        rule.ast_name.empty() ? rule.name.data() : rule.ast_name.data();
 
-        auto ast =
-            std::make_shared<T>(vs.path, line.first, line.second, rule.name.data(),
-                                vs.transform<std::shared_ptr<T>>(),
-                                std::distance(vs.ss, vs.sv().data()),
-                                vs.sv().length(), vs.choice_count(), vs.choice());
+    if (rule.is_token()) {
+      return std::make_shared<T>(
+          vs.path, line.first, line.second, node_name, vs.token(),
+          std::distance(vs.ss, vs.sv().data()), vs.sv().length(),
+          vs.choice_count(), vs.choice(), rule.no_ast_opt);
+    }
 
-        for (auto node : ast->nodes) {
-            node->parent = ast;
-        }
-        return ast;
-    };
+    auto ast = std::make_shared<T>(vs.path, line.first, line.second, node_name,
+                                   vs.transform<std::shared_ptr<T>>(),
+                                   std::distance(vs.ss, vs.sv().data()),
+                                   vs.sv().length(), vs.choice_count(),
+                                   vs.choice(), rule.no_ast_opt);
+
+    for (auto &node : ast->nodes) {
+      node->parent = ast;
+    }
+    return ast;
+  };
 }
 
 #define PEG_EXPAND(...) __VA_ARGS__
@@ -4550,229 +6606,272 @@ template <typename T = Ast> void add_ast_action(Definition &rule) {
 
 class parser {
 public:
-    parser() = default;
+  parser() = default;
 
-    parser(const char *s, size_t n, const Rules &rules,
-           std::string_view start = {}) {
-        load_grammar(s, n, rules, start);
-    }
+  parser(const char *s, size_t n, const Rules &rules,
+         std::string_view start = {}) {
+    load_grammar(s, n, rules, start);
+  }
 
-    parser(const char *s, size_t n, std::string_view start = {})
-        : parser(s, n, Rules(), start) {}
+  parser(const char *s, size_t n, std::string_view start = {})
+      : parser(s, n, Rules(), start) {}
 
-    parser(std::string_view sv, const Rules &rules, std::string_view start = {})
-        : parser(sv.data(), sv.size(), rules, start) {}
+  parser(std::string_view sv, const Rules &rules, std::string_view start = {})
+      : parser(sv.data(), sv.size(), rules, start) {}
 
-    parser(std::string_view sv, std::string_view start = {})
-        : parser(sv.data(), sv.size(), Rules(), start) {}
+  parser(std::string_view sv, std::string_view start = {})
+      : parser(sv.data(), sv.size(), Rules(), start) {}
 
 #if defined(__cpp_lib_char8_t)
-    parser(std::u8string_view sv, const Rules &rules, std::string_view start = {})
-        : parser(reinterpret_cast<const char *>(sv.data()), sv.size(), rules,
-                 start) {}
+  parser(std::u8string_view sv, const Rules &rules, std::string_view start = {})
+      : parser(reinterpret_cast<const char *>(sv.data()), sv.size(), rules,
+               start) {}
 
-    parser(std::u8string_view sv, std::string_view start = {})
-        : parser(reinterpret_cast<const char *>(sv.data()), sv.size(), Rules(),
-                 start) {}
+  parser(std::u8string_view sv, std::string_view start = {})
+      : parser(reinterpret_cast<const char *>(sv.data()), sv.size(), Rules(),
+               start) {}
 #endif
 
-    operator bool() { return grammar_ != nullptr; }
+  operator bool() const { return grammar_ != nullptr; }
 
-    bool load_grammar(const char *s, size_t n, const Rules &rules,
-                      std::string_view start = {}) {
-        auto cxt = ParserGenerator::parse(s, n, rules, log_, start);
-        grammar_ = cxt.grammar;
-        start_ = cxt.start;
-        enablePackratParsing_ = cxt.enablePackratParsing;
-        return grammar_ != nullptr;
+  bool load_grammar(const char *s, size_t n, const Rules &rules,
+                    std::string_view start = {}) {
+    auto cxt =
+        ParserGenerator::parse(s, n, rules, log_, start, enableLeftRecursion_);
+    grammar_ = cxt.grammar;
+    start_ = cxt.start;
+    enablePackratParsing_ = cxt.enablePackratParsing;
+    return grammar_ != nullptr;
+  }
+
+  bool load_grammar(const char *s, size_t n, std::string_view start = {}) {
+    return load_grammar(s, n, Rules(), start);
+  }
+
+  bool load_grammar(std::string_view sv, const Rules &rules,
+                    std::string_view start = {}) {
+    return load_grammar(sv.data(), sv.size(), rules, start);
+  }
+
+  bool load_grammar(std::string_view sv, std::string_view start = {}) {
+    return load_grammar(sv.data(), sv.size(), Rules(), start);
+  }
+
+  // Serialize the loaded grammar to a portable byte blob (see GrammarBlob).
+  // Semantic callbacks are not included; throws if the grammar is not
+  // serializable (uses the `User` operator or a Capture with a match action).
+  std::vector<uint8_t> serialize_grammar() const {
+    return GrammarBlob::serialize(*grammar_, start_);
+  }
+
+  // Load a grammar from a blob produced by serialize_grammar() / GrammarBlob,
+  // skipping the meta-parse. Re-apply enable_ast() etc. afterwards as needed.
+  bool load_blob(const std::vector<uint8_t> &blob) {
+    try {
+      grammar_ = GrammarBlob::deserialize(blob, start_);
+    } catch (const std::exception &) { return false; }
+    if (grammar_ != nullptr) {
+      // Symmetry with load_grammar(): restore the parser-level packrat flag
+      // from the blob so a later enable_packrat_parsing() re-applies it
+      // instead of resetting the start rule to the false member default.
+      enablePackratParsing_ = (*grammar_)[start_].enablePackratParsing;
     }
+    return grammar_ != nullptr;
+  }
 
-    bool load_grammar(const char *s, size_t n, std::string_view start = {}) {
-        return load_grammar(s, n, Rules(), start);
+  bool parse_n(const char *s, size_t n, const char *path = nullptr) const {
+    if (grammar_ != nullptr) {
+      const auto &rule = (*grammar_)[start_];
+      auto result = rule.parse(s, n, path, log_, error_reporter_);
+      return post_process(s, n, result);
     }
+    return false;
+  }
 
-    bool load_grammar(std::string_view sv, const Rules &rules,
-                      std::string_view start = {}) {
-        return load_grammar(sv.data(), sv.size(), rules, start);
-    }
-
-    bool load_grammar(std::string_view sv, std::string_view start = {}) {
-        return load_grammar(sv.data(), sv.size(), start);
-    }
-
-    bool parse_n(const char *s, size_t n, const char *path = nullptr) const {
-        if (grammar_ != nullptr) {
-            const auto &rule = (*grammar_)[start_];
-            auto result = rule.parse(s, n, path, log_);
-            return post_process(s, n, result);
-        }
-        return false;
-    }
-
-    bool parse_n(const char *s, size_t n, std::any &dt,
-                 const char *path = nullptr) const {
-        if (grammar_ != nullptr) {
-            const auto &rule = (*grammar_)[start_];
-            auto result = rule.parse(s, n, dt, path, log_);
-            return post_process(s, n, result);
-        }
-        return false;
-    }
-
-    template <typename T>
-    bool parse_n(const char *s, size_t n, T &val,
-                 const char *path = nullptr) const {
-        if (grammar_ != nullptr) {
-            const auto &rule = (*grammar_)[start_];
-            auto result = rule.parse_and_get_value(s, n, val, path, log_);
-            return post_process(s, n, result);
-        }
-        return false;
-    }
-
-    template <typename T>
-    bool parse_n(const char *s, size_t n, std::any &dt, T &val,
-                 const char *path = nullptr) const {
-        if (grammar_ != nullptr) {
-            const auto &rule = (*grammar_)[start_];
-            auto result = rule.parse_and_get_value(s, n, dt, val, path, log_);
-            return post_process(s, n, result);
-        }
-        return false;
-    }
-
-    bool parse(std::string_view sv, const char *path = nullptr) const {
-        return parse_n(sv.data(), sv.size(), path);
-    }
-
-    bool parse(std::string_view sv, std::any &dt,
+  bool parse_n(const char *s, size_t n, std::any &dt,
                const char *path = nullptr) const {
-        return parse_n(sv.data(), sv.size(), dt, path);
+    if (grammar_ != nullptr) {
+      const auto &rule = (*grammar_)[start_];
+      auto result = rule.parse(s, n, dt, path, log_, error_reporter_);
+      return post_process(s, n, result);
     }
+    return false;
+  }
 
-    template <typename T>
-    bool parse(std::string_view sv, T &val, const char *path = nullptr) const {
-        return parse_n(sv.data(), sv.size(), val, path);
-    }
-
-    template <typename T>
-    bool parse(std::string_view sv, std::any &dt, T &val,
+  template <typename T>
+  bool parse_n(const char *s, size_t n, T &val,
                const char *path = nullptr) const {
-        return parse_n(sv.data(), sv.size(), dt, val, path);
+    if (grammar_ != nullptr) {
+      const auto &rule = (*grammar_)[start_];
+      auto result =
+          rule.parse_and_get_value(s, n, val, path, log_, error_reporter_);
+      return post_process(s, n, result);
     }
+    return false;
+  }
+
+  template <typename T>
+  bool parse_n(const char *s, size_t n, std::any &dt, T &val,
+               const char *path = nullptr) const {
+    if (grammar_ != nullptr) {
+      const auto &rule = (*grammar_)[start_];
+      auto result =
+          rule.parse_and_get_value(s, n, dt, val, path, log_, error_reporter_);
+      return post_process(s, n, result);
+    }
+    return false;
+  }
+
+  bool parse(std::string_view sv, const char *path = nullptr) const {
+    return parse_n(sv.data(), sv.size(), path);
+  }
+
+  bool parse(std::string_view sv, std::any &dt,
+             const char *path = nullptr) const {
+    return parse_n(sv.data(), sv.size(), dt, path);
+  }
+
+  template <typename T>
+  bool parse(std::string_view sv, T &val, const char *path = nullptr) const {
+    return parse_n(sv.data(), sv.size(), val, path);
+  }
+
+  template <typename T>
+  bool parse(std::string_view sv, std::any &dt, T &val,
+             const char *path = nullptr) const {
+    return parse_n(sv.data(), sv.size(), dt, val, path);
+  }
 
 #if defined(__cpp_lib_char8_t)
-    bool parse(std::u8string_view sv, const char *path = nullptr) const {
-        return parse_n(reinterpret_cast<const char *>(sv.data()), sv.size(), path);
-    }
+  bool parse(std::u8string_view sv, const char *path = nullptr) const {
+    return parse_n(reinterpret_cast<const char *>(sv.data()), sv.size(), path);
+  }
 
-    bool parse(std::u8string_view sv, std::any &dt,
-               const char *path = nullptr) const {
-        return parse_n(reinterpret_cast<const char *>(sv.data()), sv.size(), dt,
-                       path);
-    }
+  bool parse(std::u8string_view sv, std::any &dt,
+             const char *path = nullptr) const {
+    return parse_n(reinterpret_cast<const char *>(sv.data()), sv.size(), dt,
+                   path);
+  }
 
-    template <typename T>
-    bool parse(std::u8string_view sv, T &val, const char *path = nullptr) const {
-        return parse_n(reinterpret_cast<const char *>(sv.data()), sv.size(), val,
-                       path);
-    }
+  template <typename T>
+  bool parse(std::u8string_view sv, T &val, const char *path = nullptr) const {
+    return parse_n(reinterpret_cast<const char *>(sv.data()), sv.size(), val,
+                   path);
+  }
 
-    template <typename T>
-    bool parse(std::u8string_view sv, std::any &dt, T &val,
-               const char *path = nullptr) const {
-        return parse_n(reinterpret_cast<const char *>(sv.data()), sv.size(), dt,
-                       val, path);
-    }
+  template <typename T>
+  bool parse(std::u8string_view sv, std::any &dt, T &val,
+             const char *path = nullptr) const {
+    return parse_n(reinterpret_cast<const char *>(sv.data()), sv.size(), dt,
+                   val, path);
+  }
 #endif
 
-    Definition &operator[](const char *s) { return (*grammar_)[s]; }
+  Definition &operator[](const char *s) { return (*grammar_)[s]; }
 
-    const Definition &operator[](const char *s) const { return (*grammar_)[s]; }
+  const Definition &operator[](const char *s) const { return (*grammar_)[s]; }
 
-    const Grammar &get_grammar() const { return *grammar_; }
+  const Grammar &get_grammar() const { return *grammar_; }
 
-    void disable_eoi_check() {
-        if (grammar_ != nullptr) {
-            auto &rule = (*grammar_)[start_];
-            rule.eoi_check = false;
-        }
+  void disable_eoi_check() {
+    if (grammar_ != nullptr) {
+      auto &rule = (*grammar_)[start_];
+      rule.eoi_check = false;
     }
+  }
 
-    void enable_packrat_parsing() {
-        if (grammar_ != nullptr) {
-            auto &rule = (*grammar_)[start_];
-            rule.enablePackratParsing = enablePackratParsing_;
-        }
+  void enable_left_recursion(bool enable = true) {
+    enableLeftRecursion_ = enable;
+  }
+
+  void enable_packrat_parsing() {
+    if (grammar_ != nullptr) {
+      auto &rule = (*grammar_)[start_];
+      rule.enablePackratParsing = enablePackratParsing_;
     }
+  }
 
-    void enable_trace(TracerEnter tracer_enter, TracerLeave tracer_leave) {
-        if (grammar_ != nullptr) {
-            auto &rule = (*grammar_)[start_];
-            rule.tracer_enter = tracer_enter;
-            rule.tracer_leave = tracer_leave;
-        }
+  void enable_trace(TracerEnter tracer_enter, TracerLeave tracer_leave) {
+    if (grammar_ != nullptr) {
+      auto &rule = (*grammar_)[start_];
+      rule.tracer_enter = tracer_enter;
+      rule.tracer_leave = tracer_leave;
     }
+  }
 
-    void enable_trace(TracerEnter tracer_enter, TracerLeave tracer_leave,
-                      TracerStartOrEnd tracer_start,
-                      TracerStartOrEnd tracer_end) {
-        if (grammar_ != nullptr) {
-            auto &rule = (*grammar_)[start_];
-            rule.tracer_enter = tracer_enter;
-            rule.tracer_leave = tracer_leave;
-            rule.tracer_start = tracer_start;
-            rule.tracer_end = tracer_end;
-        }
+  void enable_trace(TracerEnter tracer_enter, TracerLeave tracer_leave,
+                    TracerStartOrEnd tracer_start,
+                    TracerStartOrEnd tracer_end) {
+    if (grammar_ != nullptr) {
+      auto &rule = (*grammar_)[start_];
+      rule.tracer_enter = tracer_enter;
+      rule.tracer_leave = tracer_leave;
+      rule.tracer_start = tracer_start;
+      rule.tracer_end = tracer_end;
     }
+  }
 
-    void set_verbose_trace(bool verbose_trace) {
-        if (grammar_ != nullptr) {
-            auto &rule = (*grammar_)[start_];
-            rule.verbose_trace = verbose_trace;
-        }
+  void set_verbose_trace(bool verbose_trace) {
+    if (grammar_ != nullptr) {
+      auto &rule = (*grammar_)[start_];
+      rule.verbose_trace = verbose_trace;
     }
+  }
 
-    template <typename T = Ast> parser &enable_ast() {
-        for (auto &[_, rule] : *grammar_) {
-            if (!rule.action) { add_ast_action<T>(rule); }
-        }
-        return *this;
+  template <typename T = Ast> parser &enable_ast() {
+    for (auto &[_, rule] : *grammar_) {
+      if (!rule.action) { add_ast_action<T>(rule); }
     }
+    return *this;
+  }
 
-    template <typename T>
-    std::shared_ptr<T> optimize_ast(std::shared_ptr<T> ast,
-                                    bool opt_mode = true) const {
-        return AstOptimizer(opt_mode, get_no_ast_opt_rules()).optimize(ast);
-    }
+  template <typename T>
+  std::shared_ptr<T> optimize_ast(std::shared_ptr<T> ast,
+                                  bool opt_mode = true) const {
+    return AstOptimizer(opt_mode, get_no_ast_opt_rules()).optimize(ast);
+  }
 
-    void set_logger(Log log) { log_ = log; }
+  void set_logger(Log log) { log_ = log; }
 
-    void set_logger(
-        std::function<void(size_t line, size_t col, const std::string &msg)>
-            log) {
-        log_ = [log](size_t line, size_t col, const std::string &msg,
-                     const std::string & /*rule*/) { log(line, col, msg); };
-    }
+  // Receive structured error information instead of (or in addition to) the
+  // formatted string passed to the logger.
+  void set_error_reporter(ErrorReporter reporter) {
+    error_reporter_ = reporter;
+  }
+
+  void set_logger(
+      std::function<void(size_t line, size_t col, const std::string &msg)>
+          log) {
+    log_ = [log](size_t line, size_t col, const std::string &msg,
+                 const std::string & /*rule*/) { log(line, col, msg); };
+  }
 
 private:
-    bool post_process(const char *s, size_t n, Definition::Result &r) const {
-        if (log_ && !r.ret) { r.error_info.output_log(log_, s, n); }
-        return r.ret && !r.recovered;
+  bool post_process(const char *s, size_t n, Definition::Result &r) const {
+    if ((log_ || error_reporter_) && !r.ret) {
+      r.error_info.output_log(log_, error_reporter_, s, n);
     }
+    return r.ret && !r.recovered;
+  }
 
-    std::vector<std::string> get_no_ast_opt_rules() const {
-        std::vector<std::string> rules;
-        for (auto &[name, rule] : *grammar_) {
-            if (rule.no_ast_opt) { rules.push_back(name); }
-        }
-        return rules;
+  std::vector<std::string> get_no_ast_opt_rules() const {
+    std::vector<std::string> rules;
+    for (auto &[name, rule] : *grammar_) {
+      // The optimizer keeps nodes by their emitted name, so honor the
+      // `ast_name` override when present (else the rule's own name).
+      if (rule.no_ast_opt) {
+        rules.push_back(rule.ast_name.empty() ? name : rule.ast_name);
+      }
     }
+    return rules;
+  }
 
-    std::shared_ptr<Grammar> grammar_;
-    std::string start_;
-    bool enablePackratParsing_ = false;
-    Log log_;
+  std::shared_ptr<Grammar> grammar_;
+  std::string start_;
+  bool enableLeftRecursion_ = true;
+  bool enablePackratParsing_ = false;
+  Log log_;
+  ErrorReporter error_reporter_;
 };
 
 /*-----------------------------------------------------------------------------
@@ -4780,59 +6879,59 @@ private:
  *---------------------------------------------------------------------------*/
 
 inline void enable_tracing(parser &parser, std::ostream &os) {
-    parser.enable_trace(
-        [&](auto &ope, auto s, auto, auto &, auto &c, auto &, auto &trace_data) {
-            auto prev_pos = std::any_cast<size_t>(trace_data);
-            auto pos = static_cast<size_t>(s - c.s);
-            auto backtrack = (pos < prev_pos ? "*" : "");
-            std::string indent;
-            auto level = c.trace_ids.size() - 1;
-            while (level--) {
-                indent += "│";
-            }
-            std::string name;
-            {
-                name = peg::TraceOpeName::get(const_cast<peg::Ope &>(ope));
+  parser.enable_trace(
+      [&](auto &ope, auto s, auto, auto &, auto &c, auto &, auto &trace_data) {
+        auto prev_pos = std::any_cast<size_t>(trace_data);
+        auto pos = static_cast<size_t>(s - c.s);
+        auto backtrack = (pos < prev_pos ? "*" : "");
+        std::string indent;
+        auto level = c.trace_ids.size() - 1;
+        while (level--) {
+          indent += "│";
+        }
+        std::string name;
+        {
+          name = peg::TraceOpeName::get(const_cast<peg::Ope &>(ope));
 
-                auto lit = dynamic_cast<const peg::LiteralString *>(&ope);
-                if (lit) { name += " '" + peg::escape_characters(lit->lit_) + "'"; }
-            }
-            os << "E " << pos + 1 << backtrack << "\t" << indent << "┌" << name
-               << " #" << c.trace_ids.back() << std::endl;
-            trace_data = static_cast<size_t>(pos);
-        },
-        [&](auto &ope, auto s, auto, auto &sv, auto &c, auto &, auto len,
-            auto &) {
-            auto pos = static_cast<size_t>(s - c.s);
-            if (len != static_cast<size_t>(-1)) { pos += len; }
-            std::string indent;
-            auto level = c.trace_ids.size() - 1;
-            while (level--) {
-                indent += "│";
-            }
-            auto ret = len != static_cast<size_t>(-1) ? "└o " : "└x ";
-            auto name = peg::TraceOpeName::get(const_cast<peg::Ope &>(ope));
-            std::stringstream choice;
-            if (sv.choice_count() > 0) {
-                choice << " " << sv.choice() << "/" << sv.choice_count();
-            }
-            std::string token;
-            if (!sv.tokens.empty()) {
-                token += ", token '";
-                token += sv.tokens[0];
-                token += "'";
-            }
-            std::string matched;
-            if (peg::success(len) &&
-                peg::TokenChecker::is_token(const_cast<peg::Ope &>(ope))) {
-                matched = ", match '" + peg::escape_characters(s, len) + "'";
-            }
-            os << "L " << pos + 1 << "\t" << indent << ret << name << " #"
-               << c.trace_ids.back() << choice.str() << token << matched
-               << std::endl;
-        },
-        [&](auto &trace_data) { trace_data = static_cast<size_t>(0); },
-        [&](auto &) {});
+          auto lit = dynamic_cast<const peg::LiteralString *>(&ope);
+          if (lit) { name += " '" + peg::escape_characters(lit->lit_) + "'"; }
+        }
+        os << "E " << pos + 1 << backtrack << "\t" << indent << "┌" << name
+           << " #" << c.trace_ids.back() << std::endl;
+        trace_data = static_cast<size_t>(pos);
+      },
+      [&](auto &ope, auto s, auto, auto &sv, auto &c, auto &, auto len,
+          auto &) {
+        auto pos = static_cast<size_t>(s - c.s);
+        if (len != static_cast<size_t>(-1)) { pos += len; }
+        std::string indent;
+        auto level = c.trace_ids.size() - 1;
+        while (level--) {
+          indent += "│";
+        }
+        auto ret = len != static_cast<size_t>(-1) ? "└o " : "└x ";
+        auto name = peg::TraceOpeName::get(const_cast<peg::Ope &>(ope));
+        std::stringstream choice;
+        if (sv.choice_count() > 0) {
+          choice << " " << sv.choice() << "/" << sv.choice_count();
+        }
+        std::string token;
+        if (!sv.tokens.empty()) {
+          token += ", token '";
+          token += sv.tokens[0];
+          token += "'";
+        }
+        std::string matched;
+        if (peg::success(len) &&
+            peg::TokenChecker::is_token(const_cast<peg::Ope &>(ope))) {
+          matched = ", match '" + peg::escape_characters(s, len) + "'";
+        }
+        os << "L " << pos + 1 << "\t" << indent << ret << name << " #"
+           << c.trace_ids.back() << choice.str() << token << matched
+           << std::endl;
+      },
+      [&](auto &trace_data) { trace_data = static_cast<size_t>(0); },
+      [&](auto &) {});
 }
 
 /*-----------------------------------------------------------------------------
@@ -4840,98 +6939,98 @@ inline void enable_tracing(parser &parser, std::ostream &os) {
  *---------------------------------------------------------------------------*/
 
 inline void enable_profiling(parser &parser, std::ostream &os) {
-    struct Stats {
-        struct Item {
-            std::string name;
-            size_t success;
-            size_t fail;
-        };
-        std::vector<Item> items;
-        std::map<std::string, size_t> index;
-        size_t total = 0;
-        std::chrono::steady_clock::time_point start;
+  struct Stats {
+    struct Item {
+      std::string name;
+      size_t success;
+      size_t fail;
     };
+    std::vector<Item> items;
+    std::map<std::string, size_t> index;
+    size_t total = 0;
+    std::chrono::steady_clock::time_point start;
+  };
 
-    parser.enable_trace(
-        [&](auto &ope, auto, auto, auto &, auto &, auto &, std::any &trace_data) {
-            if (auto holder = dynamic_cast<const peg::Holder *>(&ope)) {
-                auto &stats = *std::any_cast<Stats *>(trace_data);
+  parser.enable_trace(
+      [&](auto &ope, auto, auto, auto &, auto &, auto &, std::any &trace_data) {
+        if (auto holder = dynamic_cast<const peg::Holder *>(&ope)) {
+          auto &stats = *std::any_cast<Stats *>(trace_data);
 
-                auto &name = holder->name();
-                if (stats.index.find(name) == stats.index.end()) {
-                    stats.index[name] = stats.index.size();
-                    stats.items.push_back({name, 0, 0});
-                }
-                stats.total++;
+          auto &name = holder->name();
+          if (stats.index.find(name) == stats.index.end()) {
+            stats.index[name] = stats.index.size();
+            stats.items.push_back({name, 0, 0});
+          }
+          stats.total++;
+        }
+      },
+      [&](auto &ope, auto, auto, auto &, auto &, auto &, auto len,
+          std::any &trace_data) {
+        if (auto holder = dynamic_cast<const peg::Holder *>(&ope)) {
+          auto &stats = *std::any_cast<Stats *>(trace_data);
+
+          auto &name = holder->name();
+          auto index = stats.index[name];
+          auto &stat = stats.items[index];
+          if (len != static_cast<size_t>(-1)) {
+            stat.success++;
+          } else {
+            stat.fail++;
+          }
+
+          if (index == 0) {
+            auto end = std::chrono::steady_clock::now();
+            auto nano = std::chrono::duration_cast<std::chrono::microseconds>(
+                            end - stats.start)
+                            .count();
+            auto sec = nano / 1000000.0;
+            os << "duration: " << sec << "s (" << nano << "µs)" << std::endl
+               << std::endl;
+
+            char buff[BUFSIZ];
+            size_t total_success = 0;
+            size_t total_fail = 0;
+            for (auto &[name, success, fail] : stats.items) {
+              total_success += success;
+              total_fail += fail;
             }
-        },
-        [&](auto &ope, auto, auto, auto &, auto &, auto &, auto len,
-            std::any &trace_data) {
-            if (auto holder = dynamic_cast<const peg::Holder *>(&ope)) {
-                auto &stats = *std::any_cast<Stats *>(trace_data);
 
-                auto &name = holder->name();
-                auto index = stats.index[name];
-                auto &stat = stats.items[index];
-                if (len != static_cast<size_t>(-1)) {
-                    stat.success++;
-                } else {
-                    stat.fail++;
-                }
+            os << "  id       total      %     success        fail  "
+                  "definition"
+               << std::endl;
 
-                if (index == 0) {
-                    auto end = std::chrono::steady_clock::now();
-                    auto nano = std::chrono::duration_cast<std::chrono::microseconds>(
-                                    end - stats.start)
-                                    .count();
-                    auto sec = nano / 1000000.0;
-                    os << "duration: " << sec << "s (" << nano << "µs)" << std::endl
-                       << std::endl;
+            auto grand_total = total_success + total_fail;
+            snprintf(buff, BUFSIZ, "%4s  %10zu  %5s  %10zu  %10zu  %s", "",
+                     grand_total, "", total_success, total_fail,
+                     "Total counters");
+            os << buff << std::endl;
 
-                    char buff[BUFSIZ];
-                    size_t total_success = 0;
-                    size_t total_fail = 0;
-                    for (auto &[name_, success, fail] : stats.items) {
-                        total_success += success;
-                        total_fail += fail;
-                    }
+            snprintf(buff, BUFSIZ, "%4s  %10s  %5s  %10.2f  %10.2f  %s", "", "",
+                     "", total_success * 100.0 / grand_total,
+                     total_fail * 100.0 / grand_total, "% success/fail");
+            os << buff << std::endl << std::endl;
+            ;
 
-                    os << "  id       total      %     success        fail  "
-                          "definition"
-                       << std::endl;
-
-                    auto grand_total = total_success + total_fail;
-                    snprintf(buff, BUFSIZ, "%4s  %10zu  %5s  %10zu  %10zu  %s", "",
-                             grand_total, "", total_success, total_fail,
-                             "Total counters");
-                    os << buff << std::endl;
-
-                    snprintf(buff, BUFSIZ, "%4s  %10s  %5s  %10.2f  %10.2f  %s", "", "",
-                             "", total_success * 100.0 / grand_total,
-                             total_fail * 100.0 / grand_total, "% success/fail");
-                    os << buff << std::endl << std::endl;
-                    ;
-
-                    size_t id = 0;
-                    for (auto &[name_, success, fail] : stats.items) {
-                        auto total = success + fail;
-                        auto ratio = total * 100.0 / stats.total;
-                        snprintf(buff, BUFSIZ, "%4zu  %10zu  %5.2f  %10zu  %10zu  %s", id,
-                                 total, ratio, success, fail, name.c_str());
-                        os << buff << std::endl;
-                        id++;
-                    }
-                }
+            size_t id = 0;
+            for (auto &[name, success, fail] : stats.items) {
+              auto total = success + fail;
+              auto ratio = total * 100.0 / stats.total;
+              snprintf(buff, BUFSIZ, "%4zu  %10zu  %5.2f  %10zu  %10zu  %s", id,
+                       total, ratio, success, fail, name.c_str());
+              os << buff << std::endl;
+              id++;
             }
-        },
-        [&](auto &trace_data) {
-            auto stats = new Stats{};
-            stats->start = std::chrono::steady_clock::now();
-            trace_data = stats;
-        },
-        [&](auto &trace_data) {
-            auto stats = std::any_cast<Stats *>(trace_data);
-            delete stats;
-        });
+          }
+        }
+      },
+      [&](auto &trace_data) {
+        auto stats = new Stats{};
+        stats->start = std::chrono::steady_clock::now();
+        trace_data = stats;
+      },
+      [&](auto &trace_data) {
+        auto stats = std::any_cast<Stats *>(trace_data);
+        delete stats;
+      });
 }
 } // namespace peg
diff --git a/libcockatrice_utility/libcockatrice/utility/playmat_params.h b/libcockatrice_utility/libcockatrice/utility/playmat_params.h
new file mode 100644
index 000000000..c64a6f2ae
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/playmat_params.h
@@ -0,0 +1,52 @@
+#ifndef COCKATRICE_PLAYMAT_PARAMS_H
+#define COCKATRICE_PLAYMAT_PARAMS_H
+
+#include "card_ref.h"
+
+#include <cmath>
+
+/**
+ * @struct PlaymatParams
+ * @ingroup Decks
+ * @brief Positioning parameters for a playmat card image.
+ *
+ * Controls how the cropped card art is positioned within the
+ * combined table+stack play area. The coordinate system is
+ * relative to the cropped art source image.
+ */
+struct PlaymatParams
+{
+    double marginPctL = 0.07;     ///< Left margin as fraction of card width (0.0–0.95).
+    double marginPctR = 0.07;     ///< Right margin as fraction of card width (0.0–0.95).
+    double verticalOffset = 0.33; ///< Vertical position within card (0.0=top, 1.0=bottom).
+    double zoom = 1.0;            ///< Scale factor (0.1–4.0).
+
+    bool operator==(const PlaymatParams &other) const
+    {
+        return qFuzzyCompare(marginPctL, other.marginPctL) && qFuzzyCompare(marginPctR, other.marginPctR) &&
+               qFuzzyCompare(verticalOffset, other.verticalOffset) && qFuzzyCompare(zoom, other.zoom);
+    }
+
+    bool operator!=(const PlaymatParams &other) const
+    {
+        return !(*this == other);
+    }
+};
+
+/**
+ * @struct PlaymatInfo
+ * @ingroup Decks
+ * @brief A resolved playmat (card + positioning parameters).
+ */
+struct PlaymatInfo
+{
+    CardRef card;         ///< The card whose art is used as playmat.
+    PlaymatParams params; ///< Positioning parameters for the playmat card image.
+
+    bool operator==(const PlaymatInfo &other) const
+    {
+        return card == other.card && params == other.params;
+    }
+};
+
+#endif // COCKATRICE_PLAYMAT_PARAMS_H
diff --git a/libcockatrice_utility/libcockatrice/utility/qt_utils.h b/libcockatrice_utility/libcockatrice/utility/qt_utils.h
new file mode 100644
index 000000000..8e5212031
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/qt_utils.h
@@ -0,0 +1,38 @@
+#ifndef COCKATRICE_QT_UTILS_H
+#define COCKATRICE_QT_UTILS_H
+#include <QLayout>
+#include <QObject>
+
+namespace QtUtils
+{
+template <typename T> T *findParentOfType(const QObject *obj)
+{
+    const QObject *p = obj ? obj->parent() : nullptr;
+    while (p) {
+        if (auto casted = qobject_cast<T *>(const_cast<QObject *>(p))) {
+            return casted;
+        }
+        p = p->parent();
+    }
+    return nullptr;
+}
+
+static inline void clearLayoutRec(QLayout *l)
+{
+    if (!l) {
+        return;
+    }
+    QLayoutItem *it;
+    while ((it = l->takeAt(0)) != nullptr) {
+        if (QWidget *w = it->widget()) {
+            w->deleteLater();
+        }
+        if (QLayout *sub = it->layout()) {
+            clearLayoutRec(sub);
+        }
+        delete it;
+    }
+}
+} // namespace QtUtils
+
+#endif // COCKATRICE_QT_UTILS_H
diff --git a/libcockatrice_utility/libcockatrice/utility/report_categories.cpp b/libcockatrice_utility/libcockatrice/utility/report_categories.cpp
new file mode 100644
index 000000000..f3576d7fd
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/report_categories.cpp
@@ -0,0 +1,19 @@
+#include "report_categories.h"
+
+#include <QList>
+#include <qnamespace.h>
+
+namespace ReportCategories
+{
+const QStringList &keys()
+{
+    static const QStringList categories = {"cheating",    "bug_abuse", "harassment", "verbal_abuse",
+                                           "hate_speech", "spam",      "other"};
+    return categories;
+}
+
+bool isValid(const QString &key)
+{
+    return keys().contains(key, Qt::CaseInsensitive);
+}
+} // namespace ReportCategories
\ No newline at end of file
diff --git a/libcockatrice_utility/libcockatrice/utility/report_categories.h b/libcockatrice_utility/libcockatrice/utility/report_categories.h
new file mode 100644
index 000000000..5758c3dcf
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/report_categories.h
@@ -0,0 +1,24 @@
+#ifndef REPORT_CATEGORIES_H
+#define REPORT_CATEGORIES_H
+
+#include <QString>
+#include <QStringList>
+
+/**
+ * Canonical report categories, shared by the client and the server.
+ *
+ * This is the single source of truth for the category keys exchanged over the
+ * wire (Command_Report.category) and stored in the reports table. The server
+ * only accepts keys from this list and the client report dialog only offers
+ * keys from this list, so the two sides cannot drift apart again.
+ */
+namespace ReportCategories
+{
+/** @brief The complete list of valid category keys, in canonical order. */
+const QStringList &keys();
+
+/** @brief Whether @a key is a valid report category (case-insensitive). */
+bool isValid(const QString &key);
+} // namespace ReportCategories
+
+#endif // REPORT_CATEGORIES_H
\ No newline at end of file
diff --git a/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.cpp b/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.cpp
new file mode 100644
index 000000000..50340c350
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.cpp
@@ -0,0 +1,89 @@
+#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);
+    return it != backoffUntil.constEnd() && now < it.value();
+}
+
+int ServerRateLimiter::rounds(const QString &host) const
+{
+    return retryRounds.value(host, 0);
+}
+
+QDateTime ServerRateLimiter::deadline(const QString &host) const
+{
+    return backoffUntil.value(host);
+}
+
+QDateTime ServerRateLimiter::earliestDeadline(const QDateTime &now) const
+{
+    QDateTime earliest;
+    for (auto it = backoffUntil.cbegin(); it != backoffUntil.cend(); ++it) {
+        if (now < it.value() && (!earliest.isValid() || it.value() < earliest)) {
+            earliest = it.value();
+        }
+    }
+    return earliest;
+}
+
+QDateTime ServerRateLimiter::on429(const QString &host, const QDateTime &now, qint64 retryAfterMs)
+{
+    QDateTime existing = backoffUntil.value(host);
+    int round = retryRounds.value(host, 0);
+
+    if (!existing.isValid() || now >= existing) {
+        if (last429.value(host).isValid() && now >= last429.value(host).addMSecs(RESET_GRACE_MS)) {
+            round = 0;
+        }
+        round = qMin(round + 1, MAX_RETRIES);
+        retryRounds.insert(host, round);
+    }
+    last429.insert(host, now);
+
+    qint64 delay;
+    if (round >= MAX_RETRIES) {
+        delay = EXHAUSTED_BACKOFF_MS;
+    } else {
+        delay = qMax<qint64>(MIN_429_BACKOFF_MS, retryAfterMs);
+        delay = qMin<qint64>(delay, MAX_BACKOFF_MS);
+    }
+
+    QDateTime deadline = now.addMSecs(delay);
+    if (existing.isValid() && existing > deadline) {
+        deadline = existing; // never shorten an active backoff
+    }
+    backoffUntil.insert(host, deadline);
+
+    return deadline;
+}
+
+void ServerRateLimiter::onSuccess(const QString &host)
+{
+    backoffUntil.remove(host);
+    retryRounds.remove(host);
+    last429.remove(host);
+}
+
+void ServerRateLimiter::clearExpired(const QDateTime &now)
+{
+    auto it = backoffUntil.begin();
+    while (it != backoffUntil.end()) {
+        if (now < it.value()) {
+            ++it;
+            continue;
+        }
+
+        QString host = it.key();
+        bool budgetStillFresh = last429.value(host).isValid() && now < last429.value(host).addMSecs(RESET_GRACE_MS);
+        it = backoffUntil.erase(it);
+        if (!budgetStillFresh) {
+            retryRounds.remove(host);
+            last429.remove(host);
+        }
+    }
+}
diff --git a/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.h b/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.h
new file mode 100644
index 000000000..cae26983d
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/server_rate_limiter.h
@@ -0,0 +1,74 @@
+#ifndef SERVER_RATE_LIMITER_H
+#define SERVER_RATE_LIMITER_H
+
+#include <QDateTime>
+#include <QMap>
+#include <QString>
+#include <QtGlobal>
+
+/**
+ * @class ServerRateLimiter
+ * @ingroup Utility
+ * @brief Tracks per-server backoff state triggered by HTTP 429 responses.
+ *
+ * Keeps a monotonic backoff deadline per host and a retry-round budget that
+ * escalates once per backoff window (a burst of concurrent 429s counts as a
+ * single round). The budget is refreshed after a long period without 429s so a
+ * server is not permanently blacklisted after a past overload.
+ */
+class ServerRateLimiter
+{
+public:
+    static constexpr int MAX_RETRIES = 5;              ///< Max 429 rounds per host before the budget is exhausted
+    static constexpr int MIN_429_BACKOFF_MS = 30000;   ///< Minimum wait after a 429 (scryfall documented cool-down)
+    static constexpr int MAX_BACKOFF_MS = 60000;       ///< Cap for a single backoff period
+    static constexpr int EXHAUSTED_BACKOFF_MS = 60000; ///< Cool-down once the retry budget is exhausted
+    static constexpr qint64 RESET_GRACE_MS = 300000;   ///< Idle time after which the retry budget refreshes
+
+    /**
+     * @brief Checks whether a host is currently in backoff.
+     * @param host The host to check
+     * @param now The current time
+     * @return True if requests to the host should be paused
+     */
+    [[nodiscard]] bool isRateLimited(const QString &host, const QDateTime &now) const;
+
+    /** @return The number of consecutive 429 rounds recorded for the host. */
+    [[nodiscard]] int rounds(const QString &host) const;
+
+    /** @return The current backoff deadline for the host, or an invalid QDateTime. */
+    [[nodiscard]] QDateTime deadline(const QString &host) const;
+
+    /** @return The earliest active backoff deadline across all hosts, or an invalid QDateTime. */
+    [[nodiscard]] QDateTime earliestDeadline(const QDateTime &now) const;
+
+    /**
+     * @brief Registers a 429 response for the given host.
+     * @param host The host that returned 429
+     * @param now The time the response was received
+     * @param retryAfterMs A Retry-After hint in milliseconds, or 0 if absent
+     * @return The new backoff deadline for the host
+     *
+     * The round counter only escalates once the previous backoff window has
+     * fully passed, so concurrent 429s from a burst do not consume the whole
+     * budget. The deadline is extended monotonically and never shortened.
+     */
+    QDateTime on429(const QString &host, const QDateTime &now, qint64 retryAfterMs = 0);
+
+    /** @brief Clears all penalty state for a host after a successful request. */
+    void onSuccess(const QString &host);
+
+    /**
+     * @brief Removes expired backoffs, refreshing the round budget of hosts
+     *        that have been idle past the reset grace period.
+     * @param now The current time
+     */
+    void clearExpired(const QDateTime &now);
+
+private:
+    QMap<QString, QDateTime> backoffUntil; ///< When each host may be contacted again
+    QMap<QString, int> retryRounds;        ///< Consecutive 429 rounds per host
+    QMap<QString, QDateTime> last429;      ///< When each host was last rate limited
+};
+
+#endif // SERVER_RATE_LIMITER_H
diff --git a/libcockatrice_utility/libcockatrice/utility/string_limits.h b/libcockatrice_utility/libcockatrice/utility/string_limits.h
new file mode 100644
index 000000000..5079ec46d
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/string_limits.h
@@ -0,0 +1,44 @@
+#ifndef STRING_LIMITS_H
+#define STRING_LIMITS_H
+
+#include <QString>
+#include <algorithm>
+#include <string>
+
+/** @brief Max size for short strings, like names and things that are generally a single phrase. */
+constexpr int MAX_NAME_LENGTH = 0xff;
+/** @brief Max size for chat messages and text contents. */
+constexpr int MAX_TEXT_LENGTH = 0xfff;
+/** @brief Max size for deck files and pictures (about 2 megabytes). */
+constexpr int MAX_FILE_LENGTH = 0x1fffff;
+
+/** @brief Returns a QString from a std::string, truncated to at most MAX_NAME_LENGTH bytes. */
+inline QString nameFromStdString(const std::string &_string)
+{
+    return QString::fromUtf8(_string.data(), std::min(int(_string.size()), MAX_NAME_LENGTH));
+}
+/** @brief Returns a QString from a std::string, truncated to at most MAX_TEXT_LENGTH bytes. */
+inline QString textFromStdString(const std::string &_string)
+{
+    return QString::fromUtf8(_string.data(), std::min(int(_string.size()), MAX_TEXT_LENGTH));
+}
+/** @brief Returns a QString from a std::string, truncated to at most MAX_TEXT_LENGTH bytes, keeping the tail. */
+inline QString textTailFromStdString(const std::string &_string)
+{
+    if (int(_string.size()) <= MAX_TEXT_LENGTH) {
+        return QString::fromUtf8(_string.data(), int(_string.size()));
+    }
+
+    int start = int(_string.size()) - MAX_TEXT_LENGTH;
+    while (start < int(_string.size()) && (static_cast<unsigned char>(_string[start]) & 0xC0) == 0x80) {
+        ++start;
+    }
+    return QString::fromUtf8(_string.data() + start, int(_string.size()) - start);
+}
+/** @brief Returns a QString from a std::string, truncated to at most MAX_FILE_LENGTH bytes. */
+inline QString fileFromStdString(const std::string &_string)
+{
+    return QString::fromUtf8(_string.data(), std::min(int(_string.size()), MAX_FILE_LENGTH));
+}
+
+#endif // STRING_LIMITS_H
diff --git a/libcockatrice_utility/libcockatrice/utility/translation_loader.cpp b/libcockatrice_utility/libcockatrice/utility/translation_loader.cpp
new file mode 100644
index 000000000..41c6107b3
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/translation_loader.cpp
@@ -0,0 +1,176 @@
+#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")
+
+QList<QString> TranslationLoader::qtTranslationCandidates()
+{
+    QStringList candidates;
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+    // Qt 6.8 exposes every path listed in qt.conf, path() only returns the first one.
+    candidates << QLibraryInfo::paths(QLibraryInfo::TranslationsPath);
+#else
+    candidates << QLibraryInfo::path(QLibraryInfo::TranslationsPath);
+#endif
+
+    // A relocated Qt can report a prefix-relative path that does not exist, so probe the usual
+    // install layouts as well instead of trusting that single report.
+    const QString prefix = QLibraryInfo::path(QLibraryInfo::PrefixPath);
+    const QString dataPath = QLibraryInfo::path(QLibraryInfo::DataPath);
+    candidates << prefix + QStringLiteral("/share/qt6/translations")
+               << prefix + QStringLiteral("/share/qt/translations") << prefix + QStringLiteral("/translations")
+               << dataPath + QStringLiteral("/translations");
+
+    QList<QString> uniqueCandidates;
+    for (const QString &candidate : candidates) {
+        if (!candidate.isEmpty() && !uniqueCandidates.contains(candidate)) {
+            uniqueCandidates << candidate;
+        }
+    }
+    return uniqueCandidates;
+}
+
+QList<QString> TranslationLoader::qtTranslationPaths()
+{
+    QList<QString> existingPaths;
+    for (const QString &candidate : qtTranslationCandidates()) {
+        if (QFileInfo::exists(candidate)) {
+            existingPaths << candidate;
+        }
+    }
+    return existingPaths;
+}
+
+QList<QString> TranslationLoader::applicationTranslationPaths(const QString &_installedPath)
+{
+    // A build tree keeps the .qm files next to the executable, the installed layout puts them in
+    // _installedPath. Searching both keeps a developer build translated as well.
+    const QString executableDirectory = QCoreApplication::applicationDirPath();
+
+    QList<QString> paths;
+    for (const QString &path : {_installedPath, executableDirectory}) {
+        if (!path.isEmpty() && !paths.contains(path)) {
+            paths << path;
+        }
+    }
+    return paths;
+}
+
+QList<QString> TranslationLoader::availableLanguages(const QString &_prefix, const QList<QString> &_directories)
+{
+    const QRegularExpression filePattern(
+        QRegularExpression::anchoredPattern(QRegularExpression::escape(_prefix) + QStringLiteral("_(.*)\\.qm")));
+
+    QSet<QString> languages;
+    for (const QString &directory : _directories) {
+        if (directory.isEmpty()) {
+            continue;
+        }
+        const QDir dir(directory);
+        for (const QString &fileName : dir.entryList(QDir::Files)) {
+            const auto match = filePattern.match(fileName);
+            if (match.hasMatch()) {
+                languages.insert(match.captured(1));
+            }
+        }
+    }
+
+    QList<QString> sortedLanguages(languages.cbegin(), languages.cend());
+    std::sort(sortedLanguages.begin(), sortedLanguages.end());
+    return sortedLanguages;
+}
+
+TranslationLoadResult
+TranslationLoader::loadFrom(QTranslator &_translator, const QString &_nameHint, const QList<QString> &_directories)
+{
+    bool anyDirectoryExists = false;
+
+    for (const QString &directory : _directories) {
+        if (directory.isEmpty() || !QFileInfo::exists(directory)) {
+            continue;
+        }
+        anyDirectoryExists = true;
+        if (_translator.load(_nameHint, directory)) {
+            return TranslationLoadResult::Loaded;
+        }
+    }
+
+    return anyDirectoryExists ? TranslationLoadResult::Missing : TranslationLoadResult::NoDirectory;
+}
+
+TranslationLoadResult TranslationLoader::loadQt(QTranslator &_translator, const QString &_lang)
+{
+    // An unset language is the default for English, which has no translation file to begin with.
+    if (_lang.isEmpty()) {
+        return TranslationLoadResult::Missing;
+    }
+
+    const QString nameHint = QStringLiteral("qt_") + _lang;
+    const auto result = loadFrom(_translator, nameHint, qtTranslationPaths());
+
+    switch (result) {
+        case TranslationLoadResult::Loaded:
+            qCInfo(TranslationLoaderLog) << "Loaded Qt translation" << nameHint << "at" << _translator.filePath();
+            break;
+        case TranslationLoadResult::Missing:
+            qCDebug(TranslationLoaderLog)
+                << "No Qt translation" << nameHint << "in" << QStringList(qtTranslationPaths());
+            break;
+        case TranslationLoadResult::NoDirectory:
+            qCWarning(TranslationLoaderLog)
+                << "No Qt translations directory exists, looked in" << QStringList(qtTranslationPaths());
+            break;
+    }
+
+    return result;
+}
+
+TranslationLoadResult TranslationLoader::loadApplication(QTranslator &_translator,
+                                                         const QString &_prefix,
+                                                         const QString &_lang,
+                                                         const QList<QString> &_directories)
+{
+    if (_lang.isEmpty()) {
+        return TranslationLoadResult::Missing;
+    }
+
+    const QString nameHint = _prefix + QLatin1Char('_') + _lang;
+    const auto result = loadFrom(_translator, nameHint, _directories);
+
+    switch (result) {
+        case TranslationLoadResult::Loaded:
+            qCInfo(TranslationLoaderLog) << "Loaded" << _prefix << "translation" << nameHint << "at"
+                                         << _translator.filePath();
+            break;
+        case TranslationLoadResult::Missing:
+            qCDebug(TranslationLoaderLog)
+                << "No" << _prefix << "translation" << nameHint << "in" << QStringList(_directories);
+            break;
+        case TranslationLoadResult::NoDirectory:
+            qCWarning(TranslationLoaderLog)
+                << "No translation directory exists, looked in" << QStringList(_directories);
+            break;
+    }
+
+    return result;
+}
diff --git a/libcockatrice_utility/libcockatrice/utility/translation_loader.h b/libcockatrice_utility/libcockatrice/utility/translation_loader.h
new file mode 100644
index 000000000..645489696
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/translation_loader.h
@@ -0,0 +1,92 @@
+#ifndef TRANSLATION_LOADER_H
+#define TRANSLATION_LOADER_H
+
+#include <QList>
+#include <QLoggingCategory>
+#include <QString>
+
+class QTranslator;
+
+Q_DECLARE_LOGGING_CATEGORY(TranslationLoaderLog)
+
+/** @brief The outcome of a translation load attempt. */
+enum class TranslationLoadResult
+{
+    Loaded,     /**< A translation file was found and loaded into the translator. */
+    Missing,    /**< The search directories exist but hold no file for this language. */
+    NoDirectory /**< Not a single search directory exists, so no lookup could be attempted. */
+};
+
+namespace TranslationLoader
+{
+/**
+ * @brief Every directory that may hold Qt's own translations, in order of preference.
+ *
+ * More than one entry is needed because a relocated Qt (Flatpak, AppImage, a bundled SDK) can report
+ * a prefix-relative translations path that does not exist: the KDE runtime reports /usr/translations
+ * while its qt_*.qm files live in /usr/share/qt6/translations.
+ */
+QList<QString> qtTranslationCandidates();
+
+/**
+ * @brief The candidates that actually exist, most likely first, so no caller searches a path that is
+ *        not there.
+ */
+QList<QString> qtTranslationPaths();
+
+/**
+ * @brief The directories to search for an application's own translation files, in order of preference.
+ *
+ * @param _installedPath The location the platform installs the translation files in, derived from the
+ *        executable's path.
+ * @return The installed location, followed by the executable's own directory: a build tree keeps the
+ *         .qm files next to the binary instead of in the installed layout, so a developer build would
+ *         otherwise find no translations at all.
+ */
+QList<QString> applicationTranslationPaths(const QString &_installedPath);
+
+/**
+ * @brief Loads the first _nameHint + language translation file found in _directories into _translator.
+ *
+ * QTranslator discards whatever it held before every load, so each translation file needs its own
+ * translator; loading a second file into the first one silently drops the first.
+ *
+ * @param _translator The translator to load into.
+ * @param _nameHint The translation file name without its language and suffix, e.g. "qt_de" or "cockatrice_de".
+ * @param _directories The directories to search, in order of preference.
+ * @return What the search found.
+ */
+TranslationLoadResult loadFrom(QTranslator &_translator, const QString &_nameHint, const QList<QString> &_directories);
+
+/**
+ * @brief Loads Qt's own translation for _lang, which covers the strings of Qt's own dialogs.
+ *
+ * @param _translator The translator to load into; must not also be used for an application translation.
+ * @param _lang The language code, e.g. "de". An empty language loads nothing.
+ * @return What the search found.
+ */
+TranslationLoadResult loadQt(QTranslator &_translator, const QString &_lang);
+
+/**
+ * @brief The language codes of the <_prefix>_<lang>.qm files in _directories, sorted by code.
+ *
+ * Lets a language selector offer exactly the languages that can be loaded.
+ */
+QList<QString> availableLanguages(const QString &_prefix, const QList<QString> &_directories);
+
+/**
+ * @brief Loads the <_prefix>_<_lang>.qm translation file from _directories into _translator.
+ *
+ * @param _translator The translator to load into; must not also be used for Qt's own translation.
+ * @param _prefix The translation file prefix, e.g. "cockatrice" or "oracle".
+ * @param _lang The language code, e.g. "de". An empty language loads nothing.
+ * @param _directories The directories to search, in order of preference.
+ * @return What the search found.
+ */
+TranslationLoadResult loadApplication(QTranslator &_translator,
+                                      const QString &_prefix,
+                                      const QString &_lang,
+                                      const QList<QString> &_directories);
+} // namespace TranslationLoader
+
+#endif // TRANSLATION_LOADER_H
diff --git a/libcockatrice_utility/libcockatrice/utility/trice_limits.h b/libcockatrice_utility/libcockatrice/utility/trice_limits.h
deleted file mode 100644
index fa7ce7489..000000000
--- a/libcockatrice_utility/libcockatrice/utility/trice_limits.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef TRICE_LIMITS_H
-#define TRICE_LIMITS_H
-
-#include <QString>
-
-// max size for short strings, like names and things that are generally a single phrase
-constexpr int MAX_NAME_LENGTH = 0xff;
-// max size for chat messages and text contents
-constexpr int MAX_TEXT_LENGTH = 0xfff;
-// max size for deck files and pictures
-constexpr int MAX_FILE_LENGTH = 0x1fffff; // about 2 megabytes
-
-constexpr uint MINIMUM_DIE_SIDES = 2;
-constexpr uint MAXIMUM_DIE_SIDES = 1000000;
-constexpr uint MINIMUM_DICE_TO_ROLL = 1;
-constexpr uint MAXIMUM_DICE_TO_ROLL = 100;
-
-// optimized functions to get qstrings that are at most that long
-static inline QString nameFromStdString(const std::string &_string)
-{
-    return QString::fromUtf8(_string.data(), std::min(int(_string.size()), MAX_NAME_LENGTH));
-}
-static inline QString textFromStdString(const std::string &_string)
-{
-    return QString::fromUtf8(_string.data(), std::min(int(_string.size()), MAX_TEXT_LENGTH));
-}
-static inline QString fileFromStdString(const std::string &_string)
-{
-    return QString::fromUtf8(_string.data(), std::min(int(_string.size()), MAX_FILE_LENGTH));
-}
-
-#endif // TRICE_LIMITS_H
diff --git a/libcockatrice_utility/libcockatrice/utility/warning_categories.cpp b/libcockatrice_utility/libcockatrice/utility/warning_categories.cpp
new file mode 100644
index 000000000..ad0fc86f0
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/warning_categories.cpp
@@ -0,0 +1,28 @@
+#include "warning_categories.h"
+
+#include <QChar>
+#include <QStringList>
+#include <qnamespace.h>
+
+QList<WarningCategory> parseWarningCategories(const QString &value)
+{
+    QList<WarningCategory> categories;
+    const QStringList entries = value.split(',', Qt::SkipEmptyParts);
+    for (const QString &entry : entries) {
+        const QStringList parts = entry.split('|');
+        WarningCategory category;
+        category.name = parts.first().trimmed();
+        if (category.name.isEmpty()) {
+            continue;
+        }
+        if (parts.size() > 1) {
+            bool ok = false;
+            const int il = parts.at(1).trimmed().toInt(&ok);
+            if (ok && il > 0) {
+                category.startingIl = il;
+            }
+        }
+        categories.append(category);
+    }
+    return categories;
+}
diff --git a/libcockatrice_utility/libcockatrice/utility/warning_categories.h b/libcockatrice_utility/libcockatrice/utility/warning_categories.h
new file mode 100644
index 000000000..ce5308cf4
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/warning_categories.h
@@ -0,0 +1,28 @@
+#ifndef WARNING_CATEGORIES_H
+#define WARNING_CATEGORIES_H
+
+#include <QList>
+#include <QString>
+
+/**
+ * A warning category the server offers to moderators, optionally carrying a
+ * recommended starting intervention level (see the moderator guide).
+ */
+struct WarningCategory
+{
+    QString name;
+    int startingIl = 1;
+};
+
+/**
+ * Parses the `server/officialwarnings` setting value into warning categories.
+ *
+ * Entries are separated by commas. Each entry is a category name, optionally
+ * followed by "|" and the recommended starting intervention level:
+ *   "Abusive Language|1,Cheating|2,Spamming"
+ * Entries without an explicit level default to intervention level 1.
+ * Empty entries are skipped.
+ */
+QList<WarningCategory> parseWarningCategories(const QString &value);
+
+#endif // WARNING_CATEGORIES_H
diff --git a/libcockatrice_utility/libcockatrice/utility/zone_names.h b/libcockatrice_utility/libcockatrice/utility/zone_names.h
new file mode 100644
index 000000000..d1463de6a
--- /dev/null
+++ b/libcockatrice_utility/libcockatrice/utility/zone_names.h
@@ -0,0 +1,19 @@
+#ifndef ZONE_NAMES_H
+#define ZONE_NAMES_H
+
+namespace ZoneNames
+{
+// Protocol-level zone identifiers shared between client and server.
+// These must match exactly across all components.
+
+constexpr const char *TABLE = "table";
+constexpr const char *GRAVE = "grave";
+constexpr const char *EXILE = "rfg"; // "removed from game"
+constexpr const char *HAND = "hand";
+constexpr const char *DECK = "deck";
+constexpr const char *SIDEBOARD = "sb";
+constexpr const char *STACK = "stack";
+
+} // namespace ZoneNames
+
+#endif // ZONE_NAMES_H
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index 3bb4de5df..0df345812 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -23,14 +23,14 @@ set(oracle_SOURCES
     src/pages.cpp
     src/pagetemplates.cpp
     src/parsehelpers.cpp
-    src/qt-json/json.cpp
+    src/raw_json_scanner.cpp
     ../cockatrice/src/client/settings/cache_settings.cpp
     ../cockatrice/src/client/settings/card_counter_settings.cpp
     ../cockatrice/src/client/settings/shortcuts_settings.cpp
     ../cockatrice/src/client/network/update/client/release_channel.cpp
+    ../cockatrice/src/interface/pixel_map_generator.cpp
+    ../cockatrice/src/interface/theme_config.cpp
     ../cockatrice/src/interface/theme_manager.cpp
-    ../cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp
-    ../cockatrice/src/interface/widgets/quick_settings/settings_popup_widget.cpp
     ${VERSION_STRING_CPP}
 )
 
@@ -63,11 +63,7 @@ set(oracle_RESOURCES oracle.qrc)
 # ------------------------
 # Qt resources
 # ------------------------
-if(Qt6_FOUND)
-  qt6_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES})
-elseif(Qt5_FOUND)
-  qt5_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES})
-endif()
+qt6_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES})
 
 # ------------------------
 # Include directories
@@ -83,6 +79,9 @@ 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()
@@ -93,6 +92,9 @@ 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()
@@ -105,37 +107,18 @@ set(ORACLE_MAC_QM_INSTALL_DIR "oracle.app/Contents/Resources/translations")
 set(ORACLE_UNIX_QM_INSTALL_DIR "share/oracle/translations")
 set(ORACLE_WIN32_QM_INSTALL_DIR "translations")
 
-if(Qt6_FOUND)
-  # Qt6 Translations are linked after the executable is created in manual mode
-  qt6_add_executable(
-    oracle
-    WIN32
-    MACOSX_BUNDLE
-    ${oracle_SOURCES}
-    ${oracle_RESOURCES_RCC}
-    ${oracle_MOC_SRCS}
-    MANUAL_FINALIZATION
-  )
-elseif(Qt5_FOUND)
-  # Qt5 Translations need to be linked at executable creation time
-  if(Qt5LinguistTools_FOUND)
-    if(UPDATE_TRANSLATIONS)
-      qt5_create_translation(oracle_QM ${translate_SRCS} ${oracle_TS})
-    else()
-      qt5_add_translation(oracle_QM ${oracle_TS})
-    endif()
-  endif()
-  add_executable(oracle WIN32 MACOSX_BUNDLE ${oracle_MOC_SRCS} ${oracle_QM} ${oracle_RESOURCES_RCC} ${oracle_SOURCES})
-  if(UNIX)
-    if(APPLE)
-      install(FILES ${oracle_QM} DESTINATION ${ORACLE_MAC_QM_INSTALL_DIR})
-    else()
-      install(FILES ${oracle_QM} DESTINATION ${ORACLE_UNIX_QM_INSTALL_DIR})
-    endif()
-  elseif(WIN32)
-    install(FILES ${oracle_QM} DESTINATION ${ORACLE_WIN32_QM_INSTALL_DIR})
-  endif()
-endif()
+# Qt6 Translations are linked after the executable is created in manual mode
+qt6_add_executable(
+  oracle
+  WIN32
+  MACOSX_BUNDLE
+  ${oracle_SOURCES}
+  ${oracle_RESOURCES_RCC}
+  ${oracle_MOC_SRCS}
+  MANUAL_FINALIZATION
+)
+
+target_precompile_headers(oracle PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtwidgets_pch.h")
 
 # ------------------------
 # Link libraries
@@ -144,10 +127,14 @@ target_link_libraries(
   oracle
   PUBLIC libcockatrice_card
   PUBLIC libcockatrice_settings
-  PUBLIC libcockatrice_network
+  PUBLIC libcockatrice_protocol
   PUBLIC ${ORACLE_QT_MODULES}
 )
 
+# Only user_level.h is needed from the network headers (pulled in transitively
+# by pixel_map_generator.h); nothing from the network libraries is linked.
+target_include_directories(oracle PRIVATE ${CMAKE_SOURCE_DIR}/libcockatrice_network)
+
 if(ZLIB_FOUND)
   target_link_libraries(oracle PUBLIC ${ZLIB_LIBRARIES})
 endif()
@@ -234,10 +221,19 @@ if(WIN32)
   list(APPEND libSearchDirs ${QT_LIBRARY_DIR})
 
   install(
-    DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
+    DIRECTORY "$<TARGET_FILE_DIR:oracle>/"
     DESTINATION ./
     FILES_MATCHING
     PATTERN "*.dll"
+    PATTERN "*.pdb" EXCLUDE
+    PATTERN "*.dir*" EXCLUDE
+    PATTERN "*_autogen*" EXCLUDE
+    PATTERN "*.tlog*" EXCLUDE
+    PATTERN "CMakeFiles*" EXCLUDE
+    PATTERN "x64*" EXCLUDE
+    PATTERN ".qt*" EXCLUDE
+    PATTERN ".qsb*" EXCLUDE
+    PATTERN ".lupdate*" EXCLUDE
   )
 
   # Qt plugins: iconengines, platforms, styles, tls (Qt6)
@@ -284,7 +280,7 @@ endif()
 # ------------------------
 # Qt translations
 # ------------------------
-if(Qt6_FOUND AND Qt6LinguistTools_FOUND)
+if(Qt6LinguistTools_FOUND)
   #Qt6 Translations happen after the executable is built up
   if(UPDATE_TRANSLATIONS)
     qt6_add_translations(
@@ -309,8 +305,18 @@ if(Qt6_FOUND AND Qt6LinguistTools_FOUND)
   elseif(WIN32)
     install(FILES ${oracle_QM} DESTINATION ${ORACLE_WIN32_QM_INSTALL_DIR})
   endif()
+
+  # Qt attaches the .qm files to the default build target only, so building the executable on its own
+  # (CLion, --target oracle) leaves it without any translations: nothing is translated and the
+  # language selector in the wizard stays empty.
+  # Depend on Qt's own lrelease target instead of attaching the .qm custom commands to a second
+  # target: two independent targets owning the same outputs race on MSBuild/Makefiles and are an
+  # error on Xcode. Older Qt versions already add this dependency themselves.
+  foreach(_lrelease_target Oracle_lrelease oracle_lrelease)
+    if(TARGET ${_lrelease_target})
+      add_dependencies(oracle ${_lrelease_target})
+    endif()
+  endforeach()
 endif()
 
-if(Qt6_FOUND)
-  qt6_finalize_target(oracle)
-endif()
+qt6_finalize_target(oracle)
diff --git a/oracle/oracle_en@source.ts b/oracle/oracle_en@source.ts
index 3bdd8bef8..09020f02c 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/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="239"/>
         <source>Introduction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <location filename="src/pages.cpp" line="240"/>
         <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/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="242"/>
         <source>Interface language:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="243"/>
         <source>Version:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27,177 +27,206 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="317"/>
         <source>Source selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <location filename="src/pages.cpp" line="318"/>
         <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/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="322"/>
         <source>Download URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="323"/>
         <source>Local file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="324"/>
         <source>Restore default URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="325"/>
         <source>Choose file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="335"/>
         <source>Load sets file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="375"/>
         <source>The provided URL is not valid.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
-        <source>Downloading (0MB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="394"/>
         <source>Please choose a file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
-        <source>Downloading (%1MB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="469"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="524"/>
         <source>Parsing file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="100"/>
         <source>Xz extraction failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="108"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="120"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="126"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>Zip extraction failed: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="144"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="164"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <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"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="635"/>
+        <location filename="src/pages.cpp" line="657"/>
         <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/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="952"/>
         <source>Save spoiler database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="957"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="962"/>
+        <source>spoiler</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="967"/>
         <source>Spoilers import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="968"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="970"/>
         <source>Download URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="971"/>
+        <source>Local file:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="972"/>
         <source>Restore default URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="973"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="975"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="977"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -205,42 +234,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="907"/>
         <source>Save token database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="912"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="917"/>
+        <source>tokens</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="922"/>
         <source>Tokens import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="923"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="925"/>
         <source>Download URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="926"/>
+        <source>Local file:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="927"/>
         <source>Restore default URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="928"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="930"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="932"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -248,7 +292,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="770"/>
         <source>Dummy set containing tokens</source>
         <translation type="unfinished"></translation>
     </message>
@@ -264,22 +308,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="248"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="249"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="250"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <location filename="src/pages.cpp" line="251"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -287,73 +331,76 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="789"/>
+        <location filename="src/pages.cpp" line="874"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="780"/>
+        <location filename="src/pages.cpp" line="789"/>
         <source>No set has been imported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="795"/>
         <source>Sets imported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
-        <source>A cockatrice database file of %1 MB has been downloaded.</source>
+        <location filename="src/pages.cpp" line="797"/>
+        <source>A Cockatrice card database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="800"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <location filename="src/pages.cpp" line="803"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="804"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="806"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="808"/>
         <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="820"/>
+        <location filename="src/pages.cpp" line="823"/>
         <source>Import finished: %1 cards.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="828"/>
+        <location filename="src/pages.cpp" line="831"/>
         <source>%1: %2 cards imported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="841"/>
         <source>Save card database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="842"/>
         <source>XML; card database (*.xml)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="874"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -361,34 +408,57 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
-        <source>Downloading (0MB)</source>
+        <location filename="src/pagetemplates.cpp" line="115"/>
+        <source>Downloading (0 MB)</source>
+        <oldsource>Downloading (0MB)</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -537,7 +607,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="24"/>
         <source>English</source>
         <translation type="unfinished"></translation>
     </message>
@@ -545,12 +615,12 @@
 <context>
     <name>main</name>
     <message>
-        <location filename="src/main.cpp" line="62"/>
+        <location filename="src/main.cpp" line="48"/>
         <source>Only run in spoiler mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="63"/>
+        <location filename="src/main.cpp" line="49"/>
         <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 5def0c887..cae2ee37d 100644
--- a/oracle/src/main.cpp
+++ b/oracle/src/main.cpp
@@ -5,11 +5,16 @@
 
 #include <../../cockatrice/src/client/settings/cache_settings.h>
 #include <QApplication>
+#include <QCommandLineOption>
 #include <QCommandLineParser>
+#include <QCoreApplication>
+#include <QGuiApplication>
 #include <QIcon>
-#include <QLibraryInfo>
+#include <QString>
 #include <QTimer>
 #include <QTranslator>
+#include <libcockatrice/settings/personal_settings.h>
+#include <libcockatrice/utility/translation_loader.h>
 
 QTranslator *translator, *qtTranslator;
 ThemeManager *themeManager;
@@ -21,30 +26,15 @@ bool isBackgrounded;
 
 void installNewTranslator()
 {
-    QString lang = SettingsCache::instance().getLang();
+    QString lang = SettingsCache::instance().personal().getLang();
 
-    QString qtNameHint = "qt_" + lang;
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-    QString qtTranslationPath = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
-#else
-    QString qtTranslationPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-#endif
-
-    bool qtTranslationLoaded = qtTranslator->load(qtNameHint, qtTranslationPath);
-    if (!qtTranslationLoaded) {
-        qDebug() << "Unable to load qt translation" << qtNameHint << "at" << qtTranslationPath;
-    } else {
-        qDebug() << "Loaded qt translation" << qtNameHint << "at" << qtTranslationPath;
-    }
+    // Qt's own strings and ours need a translator each: QTranslator discards its previous contents
+    // on every load, so loading both files into one translator silently drops the first of them.
+    TranslationLoader::loadQt(*qtTranslator, lang);
     qApp->installTranslator(qtTranslator);
 
-    QString appNameHint = translationPrefix + "_" + lang;
-    bool appTranslationLoaded = qtTranslator->load(appNameHint, translationPath);
-    if (!appTranslationLoaded) {
-        qDebug() << "Unable to load" << translationPrefix << "translation" << appNameHint << "at" << translationPath;
-    } else {
-        qDebug() << "Loaded" << translationPrefix << "translation" << appNameHint << "at" << translationPath;
-    }
+    TranslationLoader::loadApplication(*translator, translationPrefix, lang,
+                                       TranslationLoader::applicationTranslationPaths(translationPath));
     qApp->installTranslator(translator);
 }
 
@@ -53,8 +43,8 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 
     QCoreApplication::setOrganizationName("Cockatrice");
-    QCoreApplication::setOrganizationDomain("cockatrice");
-    // this can't be changed, as it influences the default save path for cards.xml
+    QCoreApplication::setOrganizationDomain("Cockatrice");
+    // This can't be changed, as it influences the default save path for cards.xml
     QCoreApplication::setApplicationName("Cockatrice");
 
     // If the program is opened with the -s flag, it will only do spoilers. Otherwise it will do MTGJSON/Tokens
@@ -85,7 +75,8 @@ int main(int argc, char *argv[])
 
     QIcon icon("theme:appicon.svg");
     wizard.setWindowIcon(icon);
-    // set name of the app desktop file; used by wayland to load the window icon
+    // Base name of the installed oracle.desktop; wayland reads the window icon from it and
+    // xdg-desktop-portal registers it as the app ID, so the case has to match the file name.
     QGuiApplication::setDesktopFileName("oracle");
 
     wizard.show();
diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp
index f316e439d..3382e36d6 100644
--- a/oracle/src/oracleimporter.cpp
+++ b/oracle/src/oracleimporter.cpp
@@ -1,23 +1,46 @@
 #include "oracleimporter.h"
 
-#include "client/settings/cache_settings.h"
-#include "libcockatrice/interfaces/noop_card_preference_provider.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_set_priority_controller.h"
 #include "parsehelpers.h"
-#include "qt-json/json.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"}};
+
+static const QList<AllowedCount> kSingletonCounts = {{1, "legal"}, {0, "banned"}};
 
 SplitCardPart::SplitCardPart(const QString &_name,
                              const QString &_text,
-                             const QVariantHash &_properties,
-                             const PrintingInfo &_printingInfo)
-    : name(_name), text(_text), properties(_properties), printingInfo(_printingInfo)
+                             const QHash<QString, QString> &_properties,
+                             const PrintingInfo &_printingInfo,
+                             const QString &_localizedText)
+    : name(_name), text(_text), localizedText(_localizedText), properties(_properties), printingInfo(_printingInfo)
 {
 }
 
@@ -27,6 +50,42 @@ OracleImporter::OracleImporter(QObject *parent) : QObject(parent)
 {
 }
 
+void OracleImporter::setCardLang(const QString &lang)
+{
+    cardLang = lang.trimmed().toLower();
+    localizationEnabled = cardLang != "en" && CardLocalization::supportedLanguages().contains(cardLang);
+}
+
+/**
+ * @brief Maps the MTGJSON foreignData language names to the short codes used by
+ *        Scryfall and stored in cards.xml (e.g. "German" -> "de").
+ * @param language The language name found in the MTGJSON foreignData entries.
+ * @return The short language code, or an empty string if unknown.
+ */
+static QString mtgjsonLanguageToCode(const QString &language)
+{
+    static const QHash<QString, QString> map = {
+        {"Chinese Simplified", "zhs"},
+        {"Chinese Traditional", "zht"},
+        {"English", "en"},
+        {"French", "fr"},
+        {"German", "de"},
+        {"Greek", "grc"},
+        {"Ancient Greek", "grc"},
+        {"Hebrew", "he"},
+        {"Italian", "it"},
+        {"Japanese", "ja"},
+        {"Korean", "ko"},
+        {"Latin", "la"},
+        {"Phyrexian", "ph"},
+        {"Portuguese (Brazil)", "pt"},
+        {"Russian", "ru"},
+        {"Sanskrit", "sa"},
+        {"Spanish", "es"},
+    };
+    return map.value(language);
+}
+
 static CardSet::Priority getSetPriority(const QString &setType, const QString &shortName)
 {
     if (!setTypePriorities.contains(setType.toLower())) {
@@ -39,31 +98,37 @@ static CardSet::Priority getSetPriority(const QString &setType, const QString &s
     return priority;
 }
 
-bool OracleImporter::readSetsFromByteArray(const QByteArray &data)
+bool OracleImporter::readSetsFromByteArray(QByteArray data)
 {
-    bool ok;
-    auto setsMap = QtJson::Json::parse(QString(data), ok).toMap().value("data").toMap();
-    if (!ok) {
-        qDebug() << "error: QtJson::Json::parse()";
+    const RawJson::ScanProgressCallback progress =
+        progressReporting
+            ? [this](
+                  qsizetype bytesRead,
+                  qsizetype
+                      totalBytes) { emit dataReadProgress(static_cast<int>(bytesRead), static_cast<int>(totalBytes)); }
+            : RawJson::ScanProgressCallback{};
+
+    RawJson::ScanError error;
+    const QList<RawJson::SetRange> ranges = RawJson::scanSetRanges(data, &error, progress);
+    if (error.isError()) {
+        qDebug() << "error: RawJson::scanSetRanges():" << error.message;
         return false;
     }
 
     QList<SetToDownload> newSetList;
+    newSetList.reserve(ranges.size());
 
-    QListIterator it(setsMap.values());
-
-    while (it.hasNext()) {
-        QVariantMap map = it.next().toMap();
-        QString shortName = map.value("code").toString().toUpper();
-        QString longName = map.value("name").toString();
-        QList<QVariant> setCards = map.value("cards").toList();
-        QString setType = map.value("type").toString();
-        QDate releaseDate = map.value("releaseDate").toDate();
+    for (const RawJson::SetRange &range : ranges) {
+        QString shortName = range.code.toUpper();
+        QString longName = range.name;
+        QString setType = range.type;
+        QDate releaseDate = QDate::fromString(range.releaseDate, Qt::ISODate);
         CardSet::Priority priority = getSetPriority(setType, shortName);
         // capitalize set type
         if (setType.length() > 0) {
             // basic grammar for words that aren't capitalized, like in "From the Vault"
-            const QStringList noCapitalize = {"the", "a", "an", "on", "to", "for", "of", "in", "and", "with", "or"};
+            static const QStringList noCapitalize = {"the", "a",  "an",  "on",   "to", "for",
+                                                     "of",  "in", "and", "with", "or"};
             QStringList words = setType.split("_");
             setType.clear();
             bool first = false;
@@ -71,13 +136,15 @@ bool OracleImporter::readSetsFromByteArray(const QByteArray &data)
                 if (first && noCapitalize.contains(item)) {
                     setType += item + QString(" ");
                 } else {
-                    setType += item[0].toUpper() + item.mid(1, -1) + QString(" ");
+                    setType += item[0].toUpper() + item.mid(1) + QString(" ");
                     first = true;
                 }
             }
             setType = setType.trimmed();
         }
-        newSetList.append(SetToDownload(shortName, longName, setCards, priority, setType, releaseDate));
+        SetToDownload set(shortName, longName, priority, setType, releaseDate);
+        set.setRawRange(range.dataRange);
+        newSetList.append(set);
     }
 
     std::sort(newSetList.begin(), newSetList.end());
@@ -86,19 +153,34 @@ bool OracleImporter::readSetsFromByteArray(const QByteArray &data)
         return false;
     }
     allSets = newSetList;
+    rawSetsData = std::move(data);
     return true;
 }
 
+/**
+ * The priority order used to pick a card's main type when a card has multiple
+ * types (e.g. "Artifact Creature") or multiple faces (e.g. split/adventure cards).
+ * A lower index means a higher priority.
+ */
+static const QStringList MAIN_CARD_TYPE_PRIORITY = {"Planeswalker", "Creature", "Land",       "Sorcery",
+                                                    "Instant",      "Artifact", "Enchantment"};
+
+/**
+ * Returns the priority (index) of the given main card type. Known types map to their
+ * position in {@link mainCardTypePriority()}, unknown types map to -1 (lowest priority).
+ */
+static int mainCardTypePriority(const QString &mainCardType)
+{
+    return MAIN_CARD_TYPE_PRIORITY.indexOf(mainCardType);
+}
+
 static QString getMainCardType(const QStringList &typeList)
 {
     if (typeList.isEmpty()) {
         return {};
     }
 
-    static const QStringList typePriority = {"Planeswalker", "Creature", "Land",       "Sorcery",
-                                             "Instant",      "Artifact", "Enchantment"};
-
-    for (const auto &type : typePriority) {
+    for (const auto &type : MAIN_CARD_TYPE_PRIORITY) {
         if (typeList.contains(type)) {
             return type;
         }
@@ -119,28 +201,26 @@ static void sortAndReduceColors(QString &colors)
     std::sort(colors.begin(), colors.end(),
               [](const QChar a, const QChar b) { return colorOrder.value(a, INT_MAX) < colorOrder.value(b, INT_MAX); });
     // reduce
-    QChar lastChar = '\0';
-    for (int i = 0; i < colors.size(); ++i) {
-        if (colors.at(i) == lastChar)
-            colors.remove(i, 1);
-        else
-            lastChar = colors.at(i);
-    }
+    auto last = std::unique(colors.begin(), colors.end());
+    colors.erase(last, colors.end());
 }
 
 CardInfoPtr OracleImporter::addCard(QString name,
                                     const QString &text,
                                     bool isToken,
-                                    QVariantHash properties,
+                                    QHash<QString, QString> properties,
                                     const QList<CardRelation *> &relatedCards,
                                     const PrintingInfo &printingInfo)
 {
     // Workaround for card name weirdness
     name = name.replace("Æ", "AE");
     name = name.replace("’", "'");
-    if (cards.contains(name)) {
-        CardInfoPtr card = cards.value(name);
+    auto existingIt = cards.constFind(name);
+    if (existingIt != cards.constEnd()) {
+        CardInfoPtr card = existingIt.value();
         card->addToSet(printingInfo.getSet(), printingInfo);
+        // Only merge legalities when the card has none yet, so multi-format
+        // printings don't overwrite each other's legality lists.
         if (card->getProperties().filter(formatRegex).empty()) {
             card->combineLegalities(properties);
         }
@@ -148,7 +228,7 @@ CardInfoPtr OracleImporter::addCard(QString name,
     }
 
     // Remove {} around mana costs, except if it's split cost
-    QString manacost = properties.value("manacost").toString();
+    QString manacost = properties.value("manacost");
     if (!manacost.isEmpty()) {
         QStringList symbols = manacost.split("}");
         QString formattedCardCost;
@@ -165,12 +245,12 @@ CardInfoPtr OracleImporter::addCard(QString name,
     }
 
     // fix colors
-    QString allColors = properties.value("colors").toString();
+    QString allColors = properties.value("colors");
     if (allColors.size() > 1) {
         sortAndReduceColors(allColors);
         properties.insert("colors", allColors);
     }
-    QString allColorIdent = properties.value("coloridentity").toString();
+    QString allColorIdent = properties.value("coloridentity");
     if (allColorIdent.size() > 1) {
         sortAndReduceColors(allColorIdent);
         properties.insert("coloridentity", allColorIdent);
@@ -178,29 +258,30 @@ CardInfoPtr OracleImporter::addCard(QString name,
 
     // DETECT CARD POSITIONING INFO
 
-    bool landscapeOrientation = properties.value("maintype").toString() == "Battle" ||
-                                properties.value("layout").toString() == "split" ||
-                                properties.value("layout").toString() == "planar";
+    QString layoutVal = properties.value("layout");
+    bool landscapeOrientation =
+        properties.value("maintype") == "Battle" || layoutVal == "split" || layoutVal == "planar";
 
     // cards that enter the field tapped
     bool cipt = parseCipt(name, text) || landscapeOrientation;
 
     // table row
     int tableRow = 1;
-    QString mainCardType = properties.value("maintype").toString();
-    if (mainCardType == "Land")
+    QString mainCardType = properties.value("maintype");
+    if (mainCardType == "Land") {
         tableRow = 0;
-    else if (mainCardType == "Sorcery" || mainCardType == "Instant")
+    } else if (mainCardType == "Sorcery" || mainCardType == "Instant") {
         tableRow = 3;
-    else if (mainCardType == "Creature")
+    } else if (mainCardType == "Creature") {
         tableRow = 2;
+    }
 
     // card side
-    QString side = properties.value("side").toString() == "b" ? "back" : "front";
+    QString side = properties.value("side") == "b" ? "back" : "front";
     properties.insert("side", side);
 
     // upsideDown (flip cards)
-    QString layout = properties.value("layout").toString();
+    QString layout = properties.value("layout");
     bool upsideDown = layout == "flip" && side == "back";
 
     // insert the card and its properties
@@ -218,12 +299,110 @@ CardInfoPtr OracleImporter::addCard(QString name,
     return newCard;
 }
 
-static QString getStringPropertyFromMap(const QVariantMap &card, const QString &propertyName)
+static QString getJsonString(const QJsonObject &obj, const QString &key)
 {
-    return card.contains(propertyName) ? card.value(propertyName).toString() : QString("");
+    // QVariant coerces numbers to text, while QJsonValue::toString() returns a
+    // null string for them — MTGJSON fields like manaValue and convertedManaCost
+    // carry those types.
+    return obj.value(key).toVariant().toString();
 }
 
-int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList<QVariant> &cardsList)
+static QString normalizeCardName(QString name)
+{
+    // Mirror of the name cleanup applied in addCard(), so collected localization
+    // keys line up with the card map keys (Æ → AE, curly apostrophe → straight).
+    name = name.replace("Æ", "AE");
+    name = name.replace("’", "'");
+    return name;
+}
+
+static QString matchingForeignEntryText(const QJsonObject &card, const QString &cardLang)
+{
+    // Multi-face cards (split/aftermath/adventure/prepare) expose each face as a
+    // separate card object, each with its own foreignData entry carrying that
+    // face's rules text; single-face cards carry the full text in one entry.
+    const QJsonArray foreignData = card.value("foreignData").toArray();
+    for (const QJsonValue &entryValue : foreignData) {
+        const QJsonObject entry = entryValue.toObject();
+        // MTGJSON reports languages by long-form name ("German"); match the
+        // short code ("de") that Scryfall and cards.xml use.
+        if (mtgjsonLanguageToCode(getJsonString(entry, "language")) == cardLang) {
+            return getJsonString(entry, "text");
+        }
+    }
+    return QString();
+}
+
+void OracleImporter::collectForeignData(const QString &cardKey,
+                                        const CardSetPtr &currentSet,
+                                        const QJsonObject &card,
+                                        bool collectText)
+{
+    if (!localizationEnabled) {
+        return;
+    }
+
+    LocalizedCardEntry incoming;
+    bool found = false;
+    const QJsonArray foreignData = card.value("foreignData").toArray();
+    for (const QJsonValue &entryValue : foreignData) {
+        const QJsonObject entry = entryValue.toObject();
+        // MTGJSON reports languages by long-form name ("German"); match the
+        // short code ("de") that Scryfall and cards.xml use.
+        if (mtgjsonLanguageToCode(getJsonString(entry, "language")) != cardLang) {
+            continue;
+        }
+        incoming.name = getJsonString(entry, "name");
+        incoming.text = collectText ? getJsonString(entry, "text") : QString();
+        found = true;
+        break;
+    }
+    if (!found) {
+        return;
+    }
+
+    // Prefer the entry from the highest-priority set (lower enum value = more
+    // authoritative); printings of equal priority keep the first one seen.
+    incoming.priority = currentSet->getPriority();
+    const auto existing = localizedEntries.constFind(cardKey);
+    if (existing == localizedEntries.constEnd() || incoming.priority < existing->priority) {
+        localizedEntries.insert(cardKey, incoming);
+    }
+}
+
+void OracleImporter::applyLocalizedData()
+{
+    if (!localizationEnabled) {
+        return;
+    }
+    for (auto it = localizedEntries.constBegin(); it != localizedEntries.constEnd(); ++it) {
+        CardInfoPtr card = cards.value(it.key());
+        if (card.isNull()) {
+            continue;
+        }
+        const LocalizedCardEntry &entry = it.value();
+        if (!entry.name.isEmpty()) {
+            card->setLocalizedName(cardLang, entry.name);
+        }
+        if (!entry.text.isEmpty()) {
+            card->setLocalizedText(cardLang, entry.text);
+        }
+    }
+    localizedEntries.clear();
+
+    for (auto it = splitLocalizedTexts.constBegin(); it != splitLocalizedTexts.constEnd(); ++it) {
+        CardInfoPtr card = cards.value(it.key());
+        if (card.isNull()) {
+            continue;
+        }
+        if (!it.value().text.isEmpty()) {
+            card->setLocalizedText(cardLang, it.value().text);
+        }
+    }
+    splitLocalizedTexts.clear();
+}
+
+int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QJsonArray &cardsList)
 {
     // mtgjson name => xml name
     static const QMap<QString, QString> cardProperties{
@@ -234,14 +413,14 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
 
     // mtgjson name => xml name
     static const QMap<QString, QString> setInfoProperties{
-        {"number", "num"}, {"rarity", "rarity"}, {"isOnlineOnly", "isOnlineOnly"}, {"isRebalanced", "isRebalanced"}};
+        {"number", "num"}, {"rarity", "rarity"}, {"artist", "artist"}};
 
     // mtgjson name => xml name
     static const QMap<QString, QString> identifierProperties{{"multiverseId", "muid"}, {"scryfallId", "uuid"}};
 
     static const QString ptSeparator = "/";
     static constexpr bool isToken = false;
-    static const QList<QString> setsWithCardsWithSameNameButDifferentText = {"UST"};
+    static const QSet<QString> setsWithCardsWithSameNameButDifferentText = {"UST"};
 
     int numCards = 0;
 
@@ -249,16 +428,16 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
     QMap<QString, QPair<QList<SplitCardPart>, QString>> splitCards;
 
     // Keeps track of all names encountered so far
-    QList<QString> allNameProps;
+    QSet<QString> allNameProps;
 
-    for (const QVariant &cardVar : cardsList) {
-        QVariantMap card = cardVar.toMap();
+    for (const QJsonValue &cardVal : cardsList) {
+        QJsonObject card = cardVal.toObject();
 
         /* Currently used layouts are:
          * augment, double_faced_token, flip, host, leveler, meld, normal, planar,
          * saga, scheme, split, token, transform, vanguard
          */
-        QString layout = getStringPropertyFromMap(card, "layout");
+        QString layout = getJsonString(card, "layout");
 
         // don't import tokens from the json file
         if (layout == "token") {
@@ -266,50 +445,49 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
         }
 
         // normal cards handling
-        QString name = getStringPropertyFromMap(card, "name");
-        QString text = getStringPropertyFromMap(card, "text");
-        QString faceName = getStringPropertyFromMap(card, "faceName");
+        QString name = getJsonString(card, "name");
+        QString text = getJsonString(card, "text");
+        QString faceName = getJsonString(card, "faceName");
         if (faceName.isEmpty()) {
             faceName = name;
         }
 
         // card properties
-        QVariantHash properties;
+        QHash<QString, QString> properties;
         for (auto i = cardProperties.cbegin(), end = cardProperties.cend(); i != end; ++i) {
-            QString mtgjsonProperty = i.key();
-            QString xmlPropertyName = i.value();
-            QString propertyValue = getStringPropertyFromMap(card, mtgjsonProperty);
-            if (!propertyValue.isEmpty())
-                properties.insert(xmlPropertyName, propertyValue);
+            QString propertyValue = getJsonString(card, i.key());
+            if (!propertyValue.isEmpty()) {
+                properties.insert(i.value(), propertyValue);
+            }
         }
 
         // per-set properties
-        PrintingInfo printingInfo = PrintingInfo(currentSet);
+        QHash<QString, QString> printingProps;
         for (auto i = setInfoProperties.cbegin(), end = setInfoProperties.cend(); i != end; ++i) {
-            QString mtgjsonProperty = i.key();
-            QString xmlPropertyName = i.value();
-            QString propertyValue = getStringPropertyFromMap(card, mtgjsonProperty);
-            if (!propertyValue.isEmpty())
-                printingInfo.setProperty(xmlPropertyName, propertyValue);
+            QString propertyValue = getJsonString(card, i.key());
+            if (!propertyValue.isEmpty()) {
+                printingProps.insert(i.value(), propertyValue);
+            }
         }
 
         // handle flavorNames specially due to double-faced cards
-        QString faceFlavorName = getStringPropertyFromMap(card, "faceFlavorName");
-        QString flavorName = !faceFlavorName.isEmpty() ? faceFlavorName : getStringPropertyFromMap(card, "flavorName");
+        QString faceFlavorName = getJsonString(card, "faceFlavorName");
+        QString flavorName = !faceFlavorName.isEmpty() ? faceFlavorName : getJsonString(card, "flavorName");
         if (!flavorName.isEmpty()) {
-            printingInfo.setProperty("flavorName", flavorName);
+            printingProps.insert("flavorName", flavorName);
         }
 
         // Identifiers
+        QJsonObject identifiers = card.value("identifiers").toObject();
         for (auto i = identifierProperties.cbegin(), end = identifierProperties.cend(); i != end; ++i) {
-            QString mtgjsonProperty = i.key();
-            QString xmlPropertyName = i.value();
-            QString propertyValue = getStringPropertyFromMap(card.value("identifiers").toMap(), mtgjsonProperty);
+            QString propertyValue = getJsonString(identifiers, i.key());
             if (!propertyValue.isEmpty()) {
-                printingInfo.setProperty(xmlPropertyName, propertyValue);
+                printingProps.insert(i.value(), propertyValue);
             }
         }
 
+        PrintingInfo printingInfo(currentSet, LazyPropertiesHash(printingProps));
+
         QString numComponent;
         const QString numProperty = printingInfo.getProperty("num");
         const QChar lastChar = numProperty.isEmpty() ? QChar() : numProperty.back();
@@ -320,21 +498,26 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
             allNameProps.contains(faceName) && layout == "normal" && lastChar.isLetter()) {
             numComponent = " (" + QString(lastChar).toLower() + ")";
         }
-        allNameProps.append(faceName);
+        allNameProps.insert(faceName);
 
         // special handling properties
-        QString colors = card.value("colors").toStringList().join("");
+        QString colors;
+        for (const QJsonValue &color : card.value("colors").toArray()) {
+            colors += color.toString();
+        }
         if (!colors.isEmpty()) {
             properties.insert("colors", colors);
         }
 
-        // special handling properties
-        QString colorIdentity = card.value("colorIdentity").toStringList().join("");
+        QString colorIdentity;
+        for (const QJsonValue &color : card.value("colorIdentity").toArray()) {
+            colorIdentity += color.toString();
+        }
         if (!colorIdentity.isEmpty()) {
             properties.insert("coloridentity", colorIdentity);
         }
 
-        const auto &mainCardType = getMainCardType(card.value("types").toStringList());
+        const auto &mainCardType = getMainCardType(card.value("types").toVariant().toStringList());
         if (mainCardType.isEmpty()) {
             qDebug() << "warning: no mainCardType for card:" << name;
         } else {
@@ -343,41 +526,47 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
 
         // Depending on whether power and/or toughness are present, the format
         // is either P/T (most common), P (no toughness), or /T (no power).
-        QString power = getStringPropertyFromMap(card, "power");
-        QString toughness = getStringPropertyFromMap(card, "toughness");
+        QString power = getJsonString(card, "power");
+        QString toughness = getJsonString(card, "toughness");
         if (toughness.isEmpty() && !power.isEmpty()) {
             properties.insert("pt", power);
         } else if (!toughness.isEmpty()) {
             properties.insert("pt", power + ptSeparator + toughness);
         }
 
-        auto legalities = card.value("legalities").toMap();
-        for (auto i = legalities.cbegin(), end = legalities.cend(); i != end; ++i) {
+        auto legalities = card.value("legalities").toObject();
+        for (auto i = legalities.constBegin(), end = legalities.constEnd(); i != end; ++i) {
             properties.insert(QString("format-%1").arg(i.key()), i.value().toString().toLower());
         }
 
         // split cards are considered a single card, enqueue for later merging
-        if (layout == "split" || layout == "aftermath" || layout == "adventure") {
-            auto _faceName = getStringPropertyFromMap(card, "faceName");
-            SplitCardPart split(_faceName, text, properties, printingInfo);
+        if (layout == "split" || layout == "aftermath" || layout == "adventure" || layout == "prepare") {
+            auto _faceName = getJsonString(card, "faceName");
+            // MTGJSON exposes each face as a separate card object, each with its
+            // own foreignData entry holding that face's rules text; collect it so
+            // the per-face texts can be joined the same way as the English text.
+            const QString faceLocalizedText =
+                localizationEnabled ? matchingForeignEntryText(card, cardLang) : QString();
+            SplitCardPart split(_faceName, text, properties, printingInfo, faceLocalizedText);
             auto found_iter = splitCards.find(name + numProperty);
             if (found_iter == splitCards.end()) {
                 splitCards.insert(name + numProperty, {{split}, name});
-            } else if (layout == "adventure") {
-                found_iter->first.insert(0, split);
             } else {
                 found_iter->first.append(split);
             }
+            // MTGJSON's foreignData name is the joined name present on every
+            // face, so collect the name once.
+            collectForeignData(normalizeCardName(name), currentSet, card, false);
         } else {
             // relations
             QList<CardRelation *> relatedCards;
 
             // add other face for split cards as card relation
-            if (!getStringPropertyFromMap(card, "side").isEmpty()) {
-                auto faceManaValue = getStringPropertyFromMap(card, "faceManaValue");
+            if (!getJsonString(card, "side").isEmpty()) {
+                auto faceManaValue = getJsonString(card, "faceManaValue");
                 if (faceManaValue.isEmpty()) {
                     // check the old name for the property, for backwards compatibility purposes
-                    faceManaValue = getStringPropertyFromMap(card, "faceConvertedManaCost");
+                    faceManaValue = getJsonString(card, "faceConvertedManaCost");
                 }
                 properties["cmc"] = faceManaValue;
 
@@ -397,20 +586,23 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
                 name = faceName;
             }
 
-            // mtgjon related cards
-            if (card.contains("relatedCards")) {
-                QVariantMap givenRelated = card.value("relatedCards").toMap();
+            // mtgjson related cards
+            QJsonObject givenRelated = card.value("relatedCards").toObject();
+            if (!givenRelated.isEmpty()) {
                 // conjured cards from a spellbook
-                if (givenRelated.contains("spellbook")) {
-                    auto spbk = givenRelated.value("spellbook").toStringList();
-                    for (const QString &spbkName : spbk) {
-                        relatedCards.append(
-                            new CardRelation(spbkName, CardRelationType::DoesNotAttach, false, false, 1, true));
+                QJsonArray spellbook = givenRelated.value("spellbook").toArray();
+                if (!spellbook.isEmpty()) {
+                    for (const QJsonValue &spbkVal : spellbook) {
+                        relatedCards.append(new CardRelation(spbkVal.toString(), CardRelationType::DoesNotAttach, false,
+                                                             false, 1, true));
                     }
                 }
             }
 
-            CardInfoPtr newCard = addCard(name + numComponent, text, isToken, properties, relatedCards, printingInfo);
+            collectForeignData(normalizeCardName(name + numComponent), currentSet, card);
+
+            CardInfoPtr newCard =
+                addCard(name + numComponent, text, isToken, std::move(properties), relatedCards, printingInfo);
             numCards++;
         }
     }
@@ -418,12 +610,13 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
     // split cards handling
     static const QString splitCardPropSeparator = QString(" // ");
     static const QString splitCardTextSeparator = QString("\n\n---\n\n");
-    static const QList<CardRelation *> noRelatedCards = {};
 
     QList<QPair<QList<SplitCardPart>, QString>> partsAndNames = splitCards.values();
     for (auto [splitCardParts, name] : partsAndNames) {
         QString text;
-        QVariantHash properties;
+        QString localizedText;
+        bool localizedTextComplete = true;
+        QHash<QString, QString> properties;
         PrintingInfo printingInfo;
 
         for (const SplitCardPart &tmp : splitCardParts) {
@@ -432,22 +625,44 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
             }
             text.append(tmp.getText());
 
+            // Build the cardLang text by joining each face's translated text with
+            // the same separator as the English text. Any face missing a complete
+            // translation abandons the whole join, falling back to the English text.
+            if (localizedTextComplete) {
+                const QString partLocalizedText = tmp.getLocalizedText();
+                if (partLocalizedText.isEmpty()) {
+                    localizedTextComplete = false;
+                } else {
+                    if (!localizedText.isEmpty()) {
+                        localizedText.append(splitCardTextSeparator);
+                    }
+                    localizedText.append(partLocalizedText);
+                }
+            }
+
             if (properties.isEmpty()) {
                 properties = tmp.getProperties();
                 printingInfo = tmp.getPrintingInfo();
             } else {
-                const QVariantHash &tmpProps = tmp.getProperties();
+                const QHash<QString, QString> &tmpProps = tmp.getProperties();
                 for (auto i = tmpProps.cbegin(), end = tmpProps.cend(); i != end; ++i) {
                     QString prop = i.key();
-                    QString originalPropertyValue = properties.value(prop).toString();
-                    QString thisCardPropertyValue = i.value().toString();
+                    QString originalPropertyValue = properties.value(prop);
+                    QString thisCardPropertyValue = i.value();
                     if (!thisCardPropertyValue.isEmpty() && originalPropertyValue != thisCardPropertyValue) {
                         if (originalPropertyValue.isEmpty()) { // don't create //es if one field is empty
                             properties.insert(prop, thisCardPropertyValue);
-                        } else if (prop == "colors") { // the card is both colors
+                        } else if (prop == "colors" || prop == "coloridentity") { // the card is both colors
                             properties.insert(prop, originalPropertyValue + thisCardPropertyValue);
-                        } else if (prop == "maintype") { // don't create maintypes with //es in them
-                            continue;
+                        } else if (prop == "maintype") {
+                            // Use the same priority as getMainCardType() to pick the
+                            // "best" type across faces — e.g. Creature over Instant
+                            // for adventure cards like Bonecrusher Giant.
+                            int currentPriority = mainCardTypePriority(originalPropertyValue);
+                            int newPriority = mainCardTypePriority(thisCardPropertyValue);
+                            if (newPriority >= 0 && (currentPriority < 0 || newPriority < currentPriority)) {
+                                properties.insert(prop, thisCardPropertyValue);
+                            }
                         } else {
                             properties.insert(prop,
                                               originalPropertyValue + splitCardPropSeparator + thisCardPropertyValue);
@@ -456,17 +671,112 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
                 }
             }
         }
-        CardInfoPtr newCard = addCard(name, text, isToken, properties, noRelatedCards, printingInfo);
+        CardInfoPtr newCard = addCard(name, text, isToken, std::move(properties), {}, printingInfo);
+        if (localizationEnabled && localizedTextComplete && !localizedText.isEmpty()) {
+            // Same priority policy as collectForeignData(): the joined text from the
+            // highest-priority set seen so far wins, applied once all printings are in.
+            LocalizedCardEntry entry;
+            entry.text = localizedText;
+            entry.priority = currentSet->getPriority();
+            const QString entryKey = normalizeCardName(name);
+            const auto existing = splitLocalizedTexts.constFind(entryKey);
+            if (existing == splitLocalizedTexts.constEnd() || entry.priority < existing->priority) {
+                splitLocalizedTexts.insert(entryKey, entry);
+            }
+        }
         numCards++;
     }
 
     return numCards;
 }
 
+static FormatRulesNameMap buildDefaultMagicFormats()
+{
+    // Predefined common exceptions
+    CardCondition superTypeIsBasic;
+    superTypeIsBasic.field = "type";
+    superTypeIsBasic.matchType = "regex";
+    superTypeIsBasic.value = R"(\bBasic\b[^—]+\bLand\b)";
+
+    ExceptionRule basicLands;
+    basicLands.conditions.append(superTypeIsBasic);
+
+    CardCondition anyNumberAllowed;
+    anyNumberAllowed.field = "text";
+    anyNumberAllowed.matchType = "contains";
+    anyNumberAllowed.value = "A deck can have any number of";
+
+    ExceptionRule mayContainAnyNumber;
+    mayContainAnyNumber.conditions.append(anyNumberAllowed);
+
+    FormatRulesNameMap defaultFormatRulesNameMap;
+
+    // ----------------- Helper lambda to create format -----------------
+    auto makeFormat = [&](const QString &name, int minDeck = 60, int maxDeck = -1, int maxSideboardSize = 15,
+                          const QList<AllowedCount> &allowedCounts = kConstructedCounts) -> FormatRulesPtr {
+        FormatRulesPtr f(new FormatRules);
+        f->formatName = name;
+        f->allowedCounts = allowedCounts;
+        f->minDeckSize = minDeck;
+        f->maxDeckSize = maxDeck;
+        f->maxSideboardSize = maxSideboardSize;
+        f->exceptions.append(basicLands);
+        f->exceptions.append(mayContainAnyNumber);
+        defaultFormatRulesNameMap.insert(name.toLower(), f);
+        return f;
+    };
+
+    // ----------------- Standard formats -----------------
+    makeFormat("Standard");
+    makeFormat("Modern");
+    makeFormat("Legacy");
+    makeFormat("Pioneer");
+    makeFormat("Historic");
+    makeFormat("Timeless");
+    makeFormat("Future");
+    makeFormat("OldSchool");
+    makeFormat("Premodern");
+    makeFormat("Pauper");
+    makeFormat("Penny");
+
+    // ----------------- Singleton formats -----------------
+    makeFormat("Commander", 100, 100, 15, kSingletonCounts);
+    makeFormat("Duel", 100, 100, 15, kSingletonCounts);
+    makeFormat("Brawl", 60, 60, 15, kSingletonCounts);
+    makeFormat("StandardBrawl", 60, 60, 15, kSingletonCounts);
+    makeFormat("Oathbreaker", 60, 60, 15, kSingletonCounts);
+    makeFormat("PauperCommander", 100, 100, 15, kSingletonCounts);
+    makeFormat("Predh", 100, 100, 15, kSingletonCounts);
+
+    // ----------------- Restricted formats -----------------
+    makeFormat("Vintage", 60, -1, 15, {{4, "legal"}, {1, "restricted"}, {0, "banned"}});
+
+    return defaultFormatRulesNameMap;
+}
+
+const FormatRulesNameMap &OracleImporter::createDefaultMagicFormats()
+{
+    static const FormatRulesNameMap cached = buildDefaultMagicFormats();
+    return cached;
+}
+
 int OracleImporter::startImport()
 {
     static ICardSetPriorityController *noOpController = new NoopCardSetPriorityController();
 
+    importCancelled.storeRelease(0);
+
+    // Pre-allocate the cards hash to avoid rehashing during import. Keys are
+    // distinct card names while raw ranges only count printings (AllPrintings
+    // ~100k printings vs ~35k names), so this over-reserves somewhat; an exact
+    // distinct-name count would require eagerly parsing, which the lazy reader
+    // deliberately avoids. It's a capacity hint, so the overshoot is harmless.
+    int estimatedCards = 0;
+    for (const SetToDownload &curSetToParse : allSets) {
+        estimatedCards += curSetToParse.getRawRange().cardCount;
+    }
+    cards.reserve(estimatedCards);
+
     // add an empty set for tokens
     CardSetPtr tokenSet =
         CardSet::newInstance(noOpController, CardSet::TOKENS_SETNAME, tr("Dummy set containing tokens"), "Tokens");
@@ -475,19 +785,61 @@ int OracleImporter::startImport()
     int setIndex = 0;
 
     for (const SetToDownload &curSetToParse : allSets) {
+        if (importCancelled.loadAcquire()) {
+            // The wizard was closed mid-import: stop at the next set boundary so
+            // the caller can wait for this future without processing every set.
+            break;
+        }
+
         CardSetPtr newSet = CardSet::newInstance(noOpController, curSetToParse.getShortName(),
                                                  curSetToParse.getLongName(), curSetToParse.getSetType(),
                                                  curSetToParse.getReleaseDate(), curSetToParse.getPriority());
-        if (!sets.contains(newSet->getShortName()))
-            sets.insert(newSet->getShortName(), newSet);
 
-        int numCardsInSet = importCardsFromSet(newSet, curSetToParse.getCards());
+        // parse only this set's slice of the raw document so the whole JSON tree is
+        // never kept in memory at once
+        const RawJson::SetDataRange &rawRange = curSetToParse.getRawRange();
+        const qsizetype rangeEnd = rawRange.start + rawRange.length;
+        if (rawRange.start < 0 || rawRange.length <= 0 || rangeEnd > rawSetsData.size()) {
+            // rawSetsData is cleared by releaseSetData() while SetToDownload copies
+            // taken from getSets() keep their ranges, and nothing else enforces the
+            // pairing — so never index past the buffer on stale/mismatched ranges.
+            qWarning() << "error: out-of-bounds raw range for set" << curSetToParse.getShortName() << "skipping";
+            ++setIndex;
+            emit setIndexChanged(0, setIndex, curSetToParse.getLongName());
+            continue;
+        }
+        // sliced() shares the buffer instead of deep-copying the slice; the largest
+        // sets in AllPrintings are tens of MB, so the copy is worth avoiding here.
+        const QByteArray setBytes = rawSetsData.sliced(rawRange.start, rawRange.length);
+        QJsonParseError parseError;
+        const QJsonDocument setDoc = QJsonDocument::fromJson(setBytes, &parseError);
+        if (parseError.error != QJsonParseError::NoError) {
+            qWarning() << "error: parsing card data for set" << curSetToParse.getShortName() << ":"
+                       << parseError.errorString();
+            ++setIndex;
+            // Keep the progress accounting honest: a set that failed to parse
+            // still advanced the index, so report it (with zero imported cards)
+            // rather than letting SaveSetsPage's bar stall per failed set.
+            emit setIndexChanged(0, setIndex, curSetToParse.getLongName());
+            continue;
+        }
+
+        // Only add the set to the database once its slice parsed cleanly;
+        // a set that fails here must not persist as an empty set in cards.xml.
+        if (!sets.contains(newSet->getShortName())) {
+            sets.insert(newSet->getShortName(), newSet);
+        }
+
+        const QJsonArray setCards = setDoc.object().value("cards").toArray();
+        int numCardsInSet = importCardsFromSet(newSet, setCards);
 
         ++setIndex;
 
         emit setIndexChanged(numCardsInSet, setIndex, curSetToParse.getLongName());
     }
 
+    applyLocalizedData();
+
     emit setIndexChanged(0, setIndex, QString());
 
     // total number of sets
@@ -496,8 +848,15 @@ int OracleImporter::startImport()
 
 bool OracleImporter::saveToFile(const QString &fileName, const QString &sourceUrl, const QString &sourceVersion)
 {
-    CockatriceXml4Parser parser(new NoopCardPreferenceProvider());
-    return parser.saveToFile(sets, cards, fileName, sourceUrl, sourceVersion);
+    CockatriceXml4Parser parser(new NoopCardSetPriorityController());
+
+    return parser.saveToFile(createDefaultMagicFormats(), sets, cards, fileName, sourceUrl, sourceVersion);
+}
+
+void OracleImporter::releaseSetData()
+{
+    allSets.clear();
+    rawSetsData.clear();
 }
 
 void OracleImporter::clear()
@@ -505,4 +864,7 @@ void OracleImporter::clear()
     sets.clear();
     cards.clear();
     allSets.clear();
+    rawSetsData.clear();
+    localizedEntries.clear();
+    splitLocalizedTexts.clear();
 }
diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h
index 3ec6da6e1..d872e184e 100644
--- a/oracle/src/oracleimporter.h
+++ b/oracle/src/oracleimporter.h
@@ -1,12 +1,29 @@
 #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 <QRegularExpression>
-#include <QVariant>
+#include <QObject>
+#include <QString>
+#include <QStringList>
 #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"};
@@ -22,6 +39,7 @@ const QMap<QString, CardSet::Priority> setTypePriorities{
     {"archenemy", CardSet::PriorityReprint},
     {"arsenal", CardSet::PriorityReprint},
     {"box", CardSet::PriorityReprint},
+    {"eternal", CardSet::PriorityReprint},
     {"from_the_vault", CardSet::PriorityReprint},
     {"masterpiece", CardSet::PriorityReprint},
     {"masters", CardSet::PriorityReprint},
@@ -43,10 +61,12 @@ class SetToDownload
 {
 private:
     QString shortName, longName;
-    QList<QVariant> cards;
     QDate releaseDate;
     QString setType;
     CardSet::Priority priority;
+    // Byte range of this set's object within the importer's raw JSON text. Parsing
+    // one set at a time keeps peak memory low instead of holding the whole document.
+    RawJson::SetDataRange rawRange;
 
 public:
     const QString &getShortName() const
@@ -57,10 +77,6 @@ public:
     {
         return longName;
     }
-    const QList<QVariant> &getCards() const
-    {
-        return cards;
-    }
     const QString &getSetType() const
     {
         return setType;
@@ -73,16 +89,23 @@ public:
     {
         return priority;
     }
+    const RawJson::SetDataRange &getRawRange() const
+    {
+        return rawRange;
+    }
     SetToDownload(QString _shortName,
                   QString _longName,
-                  QList<QVariant> _cards,
                   CardSet::Priority _priority,
                   QString _setType = QString(),
                   const QDate &_releaseDate = QDate())
-        : shortName(std::move(_shortName)), longName(std::move(_longName)), cards(std::move(_cards)),
-          releaseDate(_releaseDate), setType(std::move(_setType)), priority(_priority)
+        : shortName(std::move(_shortName)), longName(std::move(_longName)), releaseDate(_releaseDate),
+          setType(std::move(_setType)), priority(_priority)
     {
     }
+    void setRawRange(const RawJson::SetDataRange &_rawRange)
+    {
+        rawRange = _rawRange;
+    }
     bool operator<(const SetToDownload &set) const
     {
         return longName.compare(set.longName, Qt::CaseInsensitive) < 0;
@@ -94,8 +117,9 @@ class SplitCardPart
 public:
     SplitCardPart(const QString &_name,
                   const QString &_text,
-                  const QVariantHash &_properties,
-                  const PrintingInfo &_printingInfo);
+                  const QHash<QString, QString> &_properties,
+                  const PrintingInfo &_printingInfo,
+                  const QString &_localizedText = QString());
     inline const QString &getName() const
     {
         return name;
@@ -104,7 +128,14 @@ public:
     {
         return text;
     }
-    inline const QVariantHash &getProperties() const
+    /**
+     * @brief The cardLang rules text of this face's foreignData entry, if any.
+     */
+    inline const QString &getLocalizedText() const
+    {
+        return localizedText;
+    }
+    inline const QHash<QString, QString> &getProperties() const
     {
         return properties;
     }
@@ -116,10 +147,18 @@ public:
 private:
     QString name;
     QString text;
-    QVariantHash properties;
+    QString localizedText;
+    QHash<QString, QString> properties;
     PrintingInfo printingInfo;
 };
 
+struct LocalizedCardEntry
+{
+    QString name;
+    QString text;
+    CardSet::Priority priority = CardSet::PriorityLowest;
+};
+
 class OracleImporter : public QObject
 {
     Q_OBJECT
@@ -138,22 +177,131 @@ private:
 
     QList<SetToDownload> allSets;
 
+    /**
+     * The raw JSON text of the source document, retained for lazy per-set
+     * parsing during startImport(). Frees the card data as each set is imported.
+     */
+    QByteArray rawSetsData;
+
+    /**
+     * 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.
+     */
+    bool progressReporting = true;
+
+    /**
+     * Atomic "please stop importing" flag. startImport() checks it between sets
+     * so a wizard being closed mid-import can be torn down without waiting for
+     * the whole import (or racing it).
+     */
+    QAtomicInt importCancelled;
+
+    /**
+     * The ISO-639 language code whose foreignData is imported; "en" by default.
+     */
+    QString cardLang = "en";
+
+    /**
+     * Whether cardLang is a supported language other than English, so per-card
+     * foreignData scanning can be skipped entirely when disabled.
+     */
+    bool localizationEnabled = false;
+
+    /**
+     * Localized name/text collected per imported card key while parsing sets,
+     * applied to the CardInfo objects by applyLocalizedData() once all
+     * printings have been seen so the best-priority one wins.
+     */
+    QMap<QString, LocalizedCardEntry> localizedEntries;
+
+    /**
+     * cardLang rules text collected for split-card names while parsing sets,
+     * applied by applyLocalizedData(). Kept apart from localizedEntries because
+     * MTGJSON emits each split face as its own card object with the joined name
+     * on every foreignData entry: names and the per-face text join have different
+     * completeness and must not overwrite each other under the same key.
+     */
+    QMap<QString, LocalizedCardEntry> splitLocalizedTexts;
+
     CardInfoPtr addCard(QString name,
                         const QString &text,
                         bool isToken,
-                        QVariantHash properties,
+                        QHash<QString, QString> properties,
                         const QList<CardRelation *> &relatedCards,
                         const PrintingInfo &printingInfo);
+
+    /**
+     * Records the first foreignData entry matching cardLang for the given card
+     * key, keeping the entry from the highest-priority set seen so far.
+     *
+     * Multi-face cards (split, adventure, aftermath, prepare) pass collectText =
+     * false: MTGJSON emits one foreignData entry per face with the same joined
+     * name but only that face's text, so the name is collected here while the
+     * per-face texts are joined during the split-card merge.
+     */
+    void collectForeignData(const QString &cardKey,
+                            const CardSetPtr &currentSet,
+                            const QJsonObject &card,
+                            bool collectText = true);
 signals:
     void setIndexChanged(int cardsImported, int setIndex, const QString &setName);
     void dataReadProgress(int bytesRead, int totalBytes);
 
 public:
     explicit OracleImporter(QObject *parent = nullptr);
-    bool readSetsFromByteArray(const QByteArray &data);
+    /**
+     * @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.
+     */
+    void setProgressReporting(bool enabled)
+    {
+        progressReporting = enabled;
+    }
+    /**
+     * Selects the ISO-639 language code whose foreignData is imported.
+     * English (the default) and unsupported codes disable localization.
+     */
+    void setCardLang(const QString &lang);
+    const QString &getCardLang() const
+    {
+        return cardLang;
+    }
+    /**
+     * Scans the given JSON document for set metadata. Takes the data by value so
+     * the wizard can hand over its decompressed buffer without copying it.
+     */
+    bool readSetsFromByteArray(QByteArray data);
     int startImport();
+    /**
+     * @brief Requests an in-flight startImport() to stop at the next set boundary.
+     *
+     * Works by setting an atomic flag that startImport() polls between sets, so
+     * cancelImport() followed by a short waitForFinished() on the running future is
+     * safe the moment the wizard is about to be destroyed.
+     */
+    void cancelImport()
+    {
+        importCancelled.storeRelease(1);
+    }
+    /**
+     * Applies the collected localized names/texts to the imported cards.
+     * Called automatically at the end of startImport(); exposed separately so
+     * tests can drive it after importing sets directly.
+     */
+    void applyLocalizedData();
     bool saveToFile(const QString &fileName, const QString &sourceUrl, const QString &sourceVersion);
-    int importCardsFromSet(const CardSetPtr &currentSet, const QList<QVariant> &cardsList);
+    int importCardsFromSet(const CardSetPtr &currentSet, const QJsonArray &cardsList);
+    /**
+     * @brief Returns the default format rules. The result is memoized on first use and must be treated as immutable.
+     */
+    const FormatRulesNameMap &createDefaultMagicFormats();
     const CardNameMap &getCardList() const
     {
         return cards;
@@ -162,6 +310,11 @@ public:
     {
         return allSets;
     }
+    const QByteArray &getRawSetsData() const
+    {
+        return rawSetsData;
+    }
+    void releaseSetData();
     void clear();
 };
 
diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp
index 46e4722c6..05f08ce64 100644
--- a/oracle/src/oraclewizard.cpp
+++ b/oracle/src/oraclewizard.cpp
@@ -6,25 +6,52 @@
 #include "pages.h"
 #include "pagetemplates.h"
 
-#include <QCheckBox>
-#include <QFileDialog>
-#include <QGridLayout>
-#include <QLineEdit>
-#include <QNetworkReply>
-#include <QPushButton>
-#include <QScrollBar>
-#include <QtConcurrent>
-#include <QtGui>
+#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 <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)
 {
     // define a dummy context that will be used where needed
     QString dummy = QT_TRANSLATE_NOOP("i18n", "English");
 
-    settings = new QSettings(SettingsCache::instance().getSettingsPath() + "global.ini", QSettings::IniFormat, this);
-    connect(&SettingsCache::instance(), &SettingsCache::langChanged, this, &OracleWizard::updateLanguage);
+#ifdef Q_OS_WIN
+    setWizardStyle(QWizard::ModernStyle);
+#endif
+
+    QString oracleSettingsFile = SettingsCache::instance().getSettingsPath() + "oracle.ini";
+    settings = new QSettings(oracleSettingsFile, QSettings::IniFormat, this);
+
+    // We moved the oracle-specific settings from global.ini to a separate oracle.ini after 2.10
+    if (!QFile::exists(oracleSettingsFile)) {
+        migrateOracleSettings();
+    }
+
+    connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this, &OracleWizard::updateLanguage);
 
     importer = new OracleImporter(this);
+    // Import card text in the language the client displays, if supported:
+    // foreignData for any other language is never imported.
+    importer->setCardLang(SettingsCache::instance().cardsDisplay().getCardLang());
 
     nam = new QNetworkAccessManager(this);
 
@@ -48,6 +75,27 @@ OracleWizard::OracleWizard(QWidget *parent) : QWizard(parent)
     }
 
     retranslateUi();
+    startRaiseServer();
+}
+
+/**
+ * Migrates the oracle-specific settings from global.ini to oracle.ini
+ */
+void OracleWizard::migrateOracleSettings()
+{
+    QString filePath = SettingsCache::instance().getSettingsPath() + "global.ini";
+    auto globalSettings = QSettings(filePath, QSettings::IniFormat, this);
+
+    auto tryMigrateValue = [this, &globalSettings](const QString &name) {
+        QVariant variant = globalSettings.value(name);
+        if (variant.isValid()) {
+            settings->setValue(name, variant.toString());
+        }
+    };
+
+    tryMigrateValue("allsetsurl");
+    tryMigrateValue("tokensurl");
+    tryMigrateValue("spoilersurl");
 }
 
 void OracleWizard::updateLanguage()
@@ -78,6 +126,72 @@ void OracleWizard::accept()
     QDialog::accept();
 }
 
+void OracleWizard::reject()
+{
+    // The wizard is being closed while a page may still run a worker on the
+    // importer. Ask it to stop before the wizard (and the importer child) is
+    // destroyed, so the worker thread never touches freed memory.
+    if (auto *active = dynamic_cast<OracleWizardPage *>(currentPage())) {
+        active->cancelWork();
+    }
+    QWizard::reject();
+}
+
+void OracleWizard::runInBackground()
+{
+    backgroundMode = true;
+    hide();
+    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 c913094e3..ea652bdc5 100644
--- a/oracle/src/oraclewizard.h
+++ b/oracle/src/oraclewizard.h
@@ -1,21 +1,17 @@
 #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
 {
@@ -23,6 +19,7 @@ class OracleWizard : public QWizard
 public:
     explicit OracleWizard(QWidget *parent = nullptr);
     void accept() override;
+    void reject() override;
     void enableButtons();
     void disableButtons();
     void retranslateUi();
@@ -52,12 +49,7 @@ public:
     }
     bool saveTokensToFile(const QString &fileName);
 
-    void runInBackground()
-    {
-        backgroundMode = true;
-        hide();
-        currentPage()->initializePage();
-    }
+    void runInBackground();
 
 public:
     OracleImporter *importer;
@@ -69,12 +61,22 @@ public:
 
 private slots:
     void updateLanguage();
+    void handleRaiseRequest();
 
 private:
     QByteArray tokensData;
     QString cardSourceUrl;
     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 0b500a29a..5807793be 100644
--- a/oracle/src/pages.cpp
+++ b/oracle/src/pages.cpp
@@ -5,30 +5,59 @@
 #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 <QStandardPaths>
+#include <QSettings>
+#include <QSharedPointer>
 #include <QTextEdit>
-#include <QtConcurrent>
-#include <QtGui>
+#include <QTextStream>
+#include <QTimer>
+#include <QTranslator>
+#include <QUrl>
+#include <QVariant>
+#include <QWizard>
+#include <QtConcurrentRun>
+#include <QtGlobal>
+#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"
@@ -54,6 +83,114 @@
 #define ALLSETS_URL "https://www.mtgjson.com/api/v5/AllPrintings.json"
 #endif
 
+/**
+ * @brief Emits one machine-readable 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.
+ */
+static void emitProgress(const char *stage, qint64 done, qint64 total)
+{
+    QTextStream out(stdout);
+    out << "PROGRESS " << stage << ' ' << done << ' ' << total << '\n';
+    out.flush();
+}
+
+namespace
+{
+
+/**
+ * @brief Decompresses and dispatches a sets-file payload on a worker thread.
+ *
+ * Iteratively unwraps xz/zip compression, then either hands the JSON to the
+ * importer (which reports scan progress via dataReadProgress) or returns the raw
+ * XML for the plain-XML path. Must never touch the wizard or the page: the caller
+ * consumes the returned LoadSetsResult on the UI thread in importFinished().
+ */
+LoadSetsResult loadSetsData(const QPointer<OracleImporter> &importer, QByteArray data)
+{
+    LoadSetsResult result;
+
+    while (true) {
+        if (data.startsWith(XZ_SIGNATURE)) {
+#ifdef HAS_LZMA
+            QBuffer inBuffer(&data);
+            QByteArray decompressed;
+            QBuffer outBuffer(&decompressed);
+            inBuffer.open(QBuffer::ReadOnly);
+            outBuffer.open(QBuffer::WriteOnly);
+            XzDecompressor xz;
+            if (!xz.decompress(&inBuffer, &outBuffer)) {
+                result.errorMessage = LoadSetsPage::tr("Xz extraction failed.");
+                result.offerUncompressedFallback = true;
+                return result;
+            }
+            data = decompressed;
+            continue;
+#else
+            result.errorMessage =
+                LoadSetsPage::tr("Sorry, this version of Oracle does not support xz compressed files.");
+            result.offerUncompressedFallback = true;
+            return result;
+#endif
+        }
+
+        if (data.startsWith(ZIP_SIGNATURE)) {
+#ifdef HAS_ZLIB
+            QBuffer inBuffer(&data);
+            UnZip uz;
+            const UnZip::ErrorCode openEc = uz.openArchive(&inBuffer);
+            if (openEc != UnZip::Ok) {
+                result.errorMessage = LoadSetsPage::tr("Failed to open Zip archive: %1.").arg(uz.formatError(openEc));
+                result.offerUncompressedFallback = true;
+                return result;
+            }
+            if (uz.fileList().size() != 1) {
+                result.errorMessage =
+                    LoadSetsPage::tr("Zip extraction failed: the Zip archive doesn't contain exactly one file.");
+                result.offerUncompressedFallback = true;
+                return result;
+            }
+            const QString fileName = uz.fileList().at(0);
+            QByteArray decompressed;
+            QBuffer outBuffer(&decompressed);
+            outBuffer.open(QBuffer::ReadWrite);
+            const UnZip::ErrorCode ec = uz.extractFile(fileName, &outBuffer);
+            uz.closeArchive();
+            if (ec != UnZip::Ok) {
+                result.errorMessage = LoadSetsPage::tr("Zip extraction failed: %1.").arg(uz.formatError(ec));
+                result.offerUncompressedFallback = true;
+                return result;
+            }
+            data = decompressed;
+            continue;
+#else
+            result.errorMessage = LoadSetsPage::tr("Sorry, this version of Oracle does not support zipped files.");
+            result.offerUncompressedFallback = true;
+            return result;
+#endif
+        }
+        break;
+    }
+
+    if (data.startsWith("<")) {
+        result.ok = true;
+        result.plainXml = true;
+        result.xmlData = std::move(data);
+        return result;
+    }
+
+    if (data.startsWith("{")) {
+        result.ok = importer && importer->readSetsFromByteArray(std::move(data));
+        return result;
+    }
+
+    result.errorMessage = LoadSetsPage::tr("Failed to interpret downloaded data.");
+    return result;
+}
+
+} // namespace
+
 #define TOKENS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Token/master/tokens.xml"
 #define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml"
 
@@ -100,28 +237,25 @@ void IntroPage::initializePage()
 
 QStringList IntroPage::findQmFiles()
 {
-    QDir dir(translationPath);
-    QStringList fileNames = dir.entryList(QStringList(translationPrefix + "_*.qm"), QDir::Files, QDir::Name);
-    fileNames.replaceInStrings(QRegularExpression(translationPrefix + "_(.*)\\.qm"), "\\1");
-    return fileNames;
+    return TranslationLoader::availableLanguages(translationPrefix,
+                                                 TranslationLoader::applicationTranslationPaths(translationPath));
 }
 
 QString IntroPage::languageName(const QString &lang)
 {
     QTranslator qTranslator;
 
-    QString appNameHint = translationPrefix + "_" + lang;
-    bool appTranslationLoaded = qTranslator.load(appNameHint, translationPath);
-    if (!appTranslationLoaded) {
-        qDebug() << "Unable to load" << translationPrefix << "translation" << appNameHint << "at" << translationPath;
-    }
+    // Only the language name is needed here, so the file is loaded without logging a line per
+    // language: findQmFiles() asked for languages whose files exist in the first place.
+    TranslationLoader::loadFrom(qTranslator, translationPrefix + "_" + lang,
+                                TranslationLoader::applicationTranslationPaths(translationPath));
 
     return qTranslator.translate("i18n", DEFAULT_LANG_NAME);
 }
 
 void IntroPage::languageBoxChanged(int index)
 {
-    SettingsCache::instance().setLang(languageBox->itemData(index).toString());
+    SettingsCache::instance().personal().setLang(languageBox->itemData(index).toString());
 }
 
 void IntroPage::retranslateUi()
@@ -183,6 +317,11 @@ LoadSetsPage::LoadSetsPage(QWidget *parent) : OracleWizardPage(parent)
     setLayout(layout);
 }
 
+bool LoadSetsPage::isComplete() const
+{
+    return !loadActive;
+}
+
 void LoadSetsPage::initializePage()
 {
     urlLineEdit->setText(wizard()->settings->value("allsetsurl", ALLSETS_URL).toString());
@@ -287,7 +426,7 @@ bool LoadSetsPage::validatePage()
             return false;
         }
 
-        progressLabel->setText(tr("Downloading (0MB)"));
+        progressLabel->setText(tr("Downloading (0 MB)"));
         // show an infinite progressbar
         progressBar->setMaximum(0);
         progressBar->setMinimum(0);
@@ -306,18 +445,13 @@ bool LoadSetsPage::validatePage()
             return false;
         }
 
-        if (!setsFile.open(QIODevice::ReadOnly)) {
-            QMessageBox::critical(nullptr, tr("Error"), tr("Cannot open file '%1'.").arg(fileLineEdit->text()));
-            return false;
-        }
-
         wizard()->disableButtons();
         setEnabled(false);
 
         wizard()->setCardSourceUrl(setsFile.fileName());
         wizard()->setCardSourceVersion("unknown");
 
-        readSetsFromByteArray(setsFile.readAll());
+        readSetsFromFile(setsFile.fileName());
     }
 
     return false;
@@ -330,7 +464,9 @@ void LoadSetsPage::downloadSetsFile(const QUrl &url)
     const auto urlString = url.toString();
     if (urlString == ALLSETS_URL || urlString == ALLSETS_URL_FALLBACK) {
         const auto versionUrl = QUrl::fromUserInput(MTGJSON_VERSION_URL);
-        auto *versionReply = wizard()->nam->get(QNetworkRequest(versionUrl));
+        QNetworkRequest request = QNetworkRequest(versionUrl);
+        request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
+        auto *versionReply = wizard()->nam->get(request);
         connect(versionReply, &QNetworkReply::finished, [this, versionReply]() {
             if (versionReply->error() == QNetworkReply::NoError) {
                 auto data = versionReply->readAll();
@@ -354,7 +490,9 @@ void LoadSetsPage::downloadSetsFile(const QUrl &url)
 
     wizard()->setCardSourceUrl(url.toString());
 
-    auto *reply = wizard()->nam->get(QNetworkRequest(url));
+    QNetworkRequest request = QNetworkRequest(url);
+    request.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING));
+    auto *reply = wizard()->nam->get(request);
 
     connect(reply, &QNetworkReply::finished, this, &LoadSetsPage::actDownloadFinishedSetsFile);
     connect(reply, &QNetworkReply::downloadProgress, this, &LoadSetsPage::actDownloadProgressSetsFile);
@@ -362,11 +500,12 @@ void LoadSetsPage::downloadSetsFile(const QUrl &url)
 
 void LoadSetsPage::actDownloadProgressSetsFile(qint64 received, qint64 total)
 {
+    emitProgress("download", received, total);
     if (total > 0) {
         progressBar->setMaximum(static_cast<int>(total));
         progressBar->setValue(static_cast<int>(received));
     }
-    progressLabel->setText(tr("Downloading (%1MB)").arg((int)received / (1024 * 1024)));
+    progressLabel->setText(tr("Downloading (%1 MB)").arg((int)received / (1024 * 1024)));
 }
 
 void LoadSetsPage::actDownloadFinishedSetsFile()
@@ -407,106 +546,97 @@ void LoadSetsPage::actDownloadFinishedSetsFile()
     reply->deleteLater();
 }
 
-void LoadSetsPage::readSetsFromByteArray(QByteArray _data)
+void LoadSetsPage::updateParsingProgress(int bytesRead, int totalBytes)
 {
-    // show an infinite progressbar
+    if (totalBytes <= 0) {
+        return;
+    }
+    progressBar->setRange(0, totalBytes);
+    progressBar->setValue(bytesRead);
+    const int percent = static_cast<int>((100.0 * bytesRead) / totalBytes);
+    progressLabel->setText(tr("Parsing file (%1%)").arg(percent));
+}
+
+void LoadSetsPage::scanProgressToStdout(int bytesRead, int totalBytes)
+{
+    emitProgress("scan", bytesRead, totalBytes);
+}
+
+void LoadSetsPage::beginLoadSets(bool compressedFile)
+{
+    // Show an infinite progressbar while the worker decompresses; the scan
+    // steals the label via dataReadProgress as soon as it starts.
     progressBar->setMaximum(0);
     progressBar->setMinimum(0);
     progressBar->setValue(0);
-    progressLabel->setText(tr("Parsing file"));
+    progressLabel->setText(compressedFile ? tr("Extracting file...") : tr("Parsing file"));
     progressLabel->show();
     progressBar->show();
 
+    // Keep Next disabled (via completeChanged) until the worker reports in;
+    // updateButtonStates() re-evaluates button state whenever we re-enable.
+    loadActive = true;
+    emit completeChanged();
+
     wizard()->downloadedPlainXml = false;
     wizard()->xmlData.clear();
-    readSetsFromByteArrayRef(_data);
+
+    if (wizard()->backgroundMode) {
+        connect(wizard()->importer, &OracleImporter::dataReadProgress, this, &LoadSetsPage::scanProgressToStdout,
+                Qt::UniqueConnection);
+    } else {
+        connect(wizard()->importer, &OracleImporter::dataReadProgress, this, &LoadSetsPage::updateParsingProgress,
+                Qt::UniqueConnection);
+    }
 }
 
-void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &_data)
+void LoadSetsPage::readSetsFromByteArray(QByteArray _data)
 {
-    // unzip the file if needed
-    if (_data.startsWith(XZ_SIGNATURE)) {
-#ifdef HAS_LZMA
-        // zipped file
-        auto *inBuffer = new QBuffer(&_data);
-        auto newData = QByteArray();
-        auto *outBuffer = new QBuffer(&newData);
-        inBuffer->open(QBuffer::ReadOnly);
-        outBuffer->open(QBuffer::WriteOnly);
-        XzDecompressor xz;
-        if (!xz.decompress(inBuffer, outBuffer)) {
-            zipDownloadFailed(tr("Xz extraction failed."));
-            return;
+    const bool compressed = _data.startsWith(XZ_SIGNATURE) || _data.startsWith(ZIP_SIGNATURE);
+    beginLoadSets(compressed);
+
+    // Decompress and scan off the UI thread so a large download can't freeze the window.
+    const QPointer<OracleImporter> importer = wizard()->importer;
+    future = QtConcurrent::run(
+        [importer, data = std::move(_data)]() mutable { return loadSetsData(importer, std::move(data)); });
+    watcher.setFuture(future);
+}
+
+void LoadSetsPage::readSetsFromFile(const QString &fileName)
+{
+    // Peek at the header on the UI thread so the status text can distinguish
+    // "Extracting file..." from a plain JSON parse; the full read happens in the worker.
+    QFile headerFile(fileName);
+    bool compressed = false;
+    if (headerFile.open(QIODevice::ReadOnly)) {
+        const QByteArray header = headerFile.read(6);
+        compressed = header.startsWith(XZ_SIGNATURE) || header.startsWith(ZIP_SIGNATURE);
+    }
+    beginLoadSets(compressed);
+
+    // Read, decompress and scan off the UI thread (a plain JSON can be hundreds
+    // of MB, so even the read itself must not block the window).
+    const QPointer<OracleImporter> importer = wizard()->importer;
+    future = QtConcurrent::run([importer, fileName]() mutable -> LoadSetsResult {
+        QFile file(fileName);
+        if (!file.open(QIODevice::ReadOnly)) {
+            LoadSetsResult readError;
+            readError.errorMessage = LoadSetsPage::tr("Cannot open file '%1'.").arg(fileName);
+            return readError;
         }
-        _data.clear();
-        readSetsFromByteArrayRef(newData);
-        return;
-#else
-        zipDownloadFailed(tr("Sorry, this version of Oracle does not support xz compressed files."));
+        return loadSetsData(importer, file.readAll());
+    });
+    watcher.setFuture(future);
+}
 
-        wizard()->enableButtons();
-        setEnabled(true);
-        progressLabel->hide();
-        progressBar->hide();
-        return;
-#endif
-    } else if (_data.startsWith(ZIP_SIGNATURE)) {
-#ifdef HAS_ZLIB
-        // zipped file
-        auto *inBuffer = new QBuffer(&_data);
-        auto newData = QByteArray();
-        auto *outBuffer = new QBuffer(&newData);
-        QString fileName;
-        UnZip::ErrorCode ec;
-        UnZip uz;
-
-        ec = uz.openArchive(inBuffer);
-        if (ec != UnZip::Ok) {
-            zipDownloadFailed(tr("Failed to open Zip archive: %1.").arg(uz.formatError(ec)));
-            return;
-        }
-
-        if (uz.fileList().size() != 1) {
-            zipDownloadFailed(tr("Zip extraction failed: the Zip archive doesn't contain exactly one file."));
-            return;
-        }
-        fileName = uz.fileList().at(0);
-
-        outBuffer->open(QBuffer::ReadWrite);
-        ec = uz.extractFile(fileName, outBuffer);
-        if (ec != UnZip::Ok) {
-            zipDownloadFailed(tr("Zip extraction failed: %1.").arg(uz.formatError(ec)));
-            uz.closeArchive();
-            return;
-        }
-        _data.clear();
-        readSetsFromByteArrayRef(newData);
-        return;
-#else
-        zipDownloadFailed(tr("Sorry, this version of Oracle does not support zipped files."));
-
-        wizard()->enableButtons();
-        setEnabled(true);
-        progressLabel->hide();
-        progressBar->hide();
-        return;
-#endif
-    } else if (_data.startsWith("{")) {
-        // Start the computation.
-        jsonData = std::move(_data);
-        future = QtConcurrent::run([this] { return wizard()->importer->readSetsFromByteArray(std::move(jsonData)); });
-        watcher.setFuture(future);
-    } else if (_data.startsWith("<")) {
-        // save xml file and don't do any processing
-        wizard()->downloadedPlainXml = true;
-        wizard()->xmlData = std::move(_data);
-        importFinished();
-    } else {
-        wizard()->enableButtons();
-        setEnabled(true);
-        progressLabel->hide();
-        progressBar->hide();
-        QMessageBox::critical(this, tr("Error"), tr("Failed to interpret downloaded data."));
+void LoadSetsPage::cancelWork()
+{
+    // The scan is short-lived; just wait it out before the wizard (and its
+    // importer) can be torn down underneath the worker thread.
+    if (future.isRunning()) {
+        future.cancel();
+        watcher.cancel();
+        future.waitForFinished();
     }
 }
 
@@ -532,17 +662,65 @@ void LoadSetsPage::zipDownloadFailed(const QString &message)
 
 void LoadSetsPage::importFinished()
 {
+    loadActive = false;
+    emit completeChanged();
     wizard()->enableButtons();
     setEnabled(true);
-    progressLabel->hide();
-    progressBar->hide();
 
-    if (wizard()->downloadedPlainXml || watcher.future().result()) {
-        wizard()->next();
-    } else {
-        QMessageBox::critical(this, tr("Error"),
-                              tr("The file was retrieved successfully, but it does not contain any sets data."));
+    const LoadSetsResult result = watcher.result();
+
+    if (result.plainXml) {
+        wizard()->downloadedPlainXml = true;
+        wizard()->xmlData = result.xmlData;
     }
+
+    if (wizard()->backgroundMode) {
+        progressLabel->hide();
+        progressBar->hide();
+        if (!result.errorMessage.isEmpty()) {
+            qWarning() << result.errorMessage;
+        } else if (!result.ok && !result.plainXml) {
+            qWarning() << tr("The file was retrieved successfully, but it does not contain any sets data.");
+        }
+        emit readyToContinue();
+        return;
+    }
+
+    const auto fail = [this](const QString &message) {
+        progressLabel->hide();
+        progressBar->hide();
+        QMessageBox::critical(this, tr("Error"), message);
+    };
+
+    if (!result.errorMessage.isEmpty()) {
+        if (result.offerUncompressedFallback) {
+            zipDownloadFailed(result.errorMessage);
+            return;
+        }
+        fail(result.errorMessage);
+        return;
+    }
+
+    if (!result.ok && !result.plainXml) {
+        fail(tr("The file was retrieved successfully, but it does not contain any sets data."));
+        return;
+    }
+
+    // Snap the bar to 100% and hold it there for a moment so the completed state
+    // is actually visible before the next page's own import progress takes over
+    // (a zero-length deferral can still fire before the repaint is delivered).
+    progressBar->setMaximum(1);
+    progressBar->setValue(1);
+    progressLabel->setText(tr("Parsing file (100%)"));
+    QTimer::singleShot(500, this, [this] {
+        if (wizard()->currentPage() == this) {
+            // Leave the page pristine: hide the completed load bar so a later
+            // Back from the save page doesn't show stale progress.
+            progressLabel->hide();
+            progressBar->hide();
+            wizard()->next();
+        }
+    });
 }
 
 SaveSetsPage::SaveSetsPage(QWidget *parent) : OracleWizardPage(parent)
@@ -550,46 +728,113 @@ SaveSetsPage::SaveSetsPage(QWidget *parent) : OracleWizardPage(parent)
     pathLabel = new QLabel(this);
     saveLabel = new QLabel(this);
 
+    progressBar = new QProgressBar(this);
+    progressBar->hide();
+
     defaultPathCheckBox = new QCheckBox(this);
 
     messageLog = new QTextEdit(this);
     messageLog->setReadOnly(true);
 
     auto *layout = new QGridLayout(this);
-    layout->addWidget(messageLog, 0, 0);
-    layout->addWidget(saveLabel, 1, 0);
-    layout->addWidget(pathLabel, 2, 0);
-    layout->addWidget(defaultPathCheckBox, 3, 0);
+    layout->addWidget(progressBar, 0, 0);
+    layout->addWidget(messageLog, 1, 0);
+    layout->addWidget(saveLabel, 2, 0);
+    layout->addWidget(pathLabel, 3, 0);
+    layout->addWidget(defaultPathCheckBox, 4, 0);
 
     setLayout(layout);
 }
 
+bool SaveSetsPage::isComplete() const
+{
+    return !importActive;
+}
+
 void SaveSetsPage::cleanupPage()
 {
+    cancelWork();
+    disconnect(wizard()->importer, &OracleImporter::setIndexChanged, this, &SaveSetsPage::updateTotalProgress);
+    disconnect(&importWatcher, &QFutureWatcher<int>::finished, this, &SaveSetsPage::importFinished);
     wizard()->importer->clear();
-    disconnect(wizard()->importer, &OracleImporter::setIndexChanged, nullptr, nullptr);
 }
 
 void SaveSetsPage::initializePage()
 {
-    messageLog->clear();
-
     retranslateUi();
     if (wizard()->downloadedPlainXml) {
         messageLog->hide();
-    } else {
-        messageLog->show();
-        connect(wizard()->importer, &OracleImporter::setIndexChanged, this, &SaveSetsPage::updateTotalProgress);
-
-        int setsImported = wizard()->importer->startImport();
-
-        if (setsImported == 0) {
-            QMessageBox::critical(this, tr("Error"), tr("No set has been imported."));
+        progressBar->hide();
+        if (wizard()->backgroundMode) {
+            emit readyToContinue();
         }
+        return;
+    }
+
+    messageLog->clear();
+    messageLog->show();
+    progressBar->show();
+
+    totalSets = wizard()->importer->getSets().size();
+    progressBar->setRange(0, totalSets);
+    progressBar->setValue(0);
+
+    connect(wizard()->importer, &OracleImporter::setIndexChanged, this, &SaveSetsPage::updateTotalProgress,
+            Qt::UniqueConnection);
+    connect(&importWatcher, &QFutureWatcher<int>::finished, this, &SaveSetsPage::importFinished, Qt::UniqueConnection);
+
+    wizard()->disableButtons();
+    importActive = true;
+    emit completeChanged();
+
+    const QPointer<OracleImporter> importer = wizard()->importer;
+    importFuture = QtConcurrent::run([importer] { return importer ? importer->startImport() : 0; });
+    importWatcher.setFuture(importFuture);
+}
+
+void SaveSetsPage::cancelWork()
+{
+    if (!importActive) {
+        return;
+    }
+    // Ask the worker to stop at the next set boundary, then wait it out so the
+    // wizard (and the importer it owns) is never torn down under a running thread.
+    importActive = false;
+    emit completeChanged();
+    wizard()->importer->cancelImport();
+    importFuture.cancel();
+    importWatcher.cancel();
+    importFuture.waitForFinished();
+}
+
+void SaveSetsPage::importFinished()
+{
+    if (!importActive) {
+        return;
+    }
+    importActive = false;
+    emit completeChanged();
+
+    wizard()->enableButtons();
+
+    const int setsImported = importWatcher.result();
+    const QPointer<OracleImporter> importer = wizard()->importer;
+    if (importer) {
+        importer->releaseSetData();
     }
 
     if (wizard()->backgroundMode) {
+        if (setsImported == 0) {
+            qWarning() << tr("No set has been imported.");
+        }
         emit readyToContinue();
+        return;
+    }
+
+    progressBar->setValue(progressBar->maximum());
+
+    if (setsImported == 0) {
+        QMessageBox::critical(this, tr("Error"), tr("No set has been imported."));
     }
 }
 
@@ -597,7 +842,7 @@ void SaveSetsPage::retranslateUi()
 {
     setTitle(tr("Sets imported"));
     if (wizard()->downloadedPlainXml) {
-        setSubTitle(tr("A cockatrice database file of %1 MB has been downloaded.")
+        setSubTitle(tr("A Cockatrice card database file of %1 MB has been downloaded.")
                         .arg(qRound(wizard()->xmlData.size() / 1000000.0)));
     } else {
         setSubTitle(tr("The following sets have been found:"));
@@ -611,13 +856,28 @@ void SaveSetsPage::retranslateUi()
     setButtonText(QWizard::NextButton, tr("&Save"));
 }
 
-void SaveSetsPage::updateTotalProgress(int cardsImported, int /* setIndex */, const QString &setName)
+void SaveSetsPage::updateTotalProgress(int cardsImported, int setIndex, const QString &setName)
 {
+    if (!importActive) {
+        return;
+    }
     if (setName.isEmpty()) {
-        messageLog->append("<b>" + tr("Import finished: %1 cards.").arg(wizard()->importer->getCardList().size()) +
-                           "</b>");
+        progressBar->setValue(progressBar->maximum());
+        const int cardCount = wizard()->importer->getCardList().size();
+        if (wizard()->backgroundMode) {
+            qInfo() << tr("Import finished: %1 cards.").arg(cardCount);
+        } else {
+            messageLog->append("<b>" + tr("Import finished: %1 cards.").arg(cardCount) + "</b>");
+        }
+        emitProgress("import", totalSets, totalSets);
     } else {
-        messageLog->append(tr("%1: %2 cards imported").arg(setName).arg(cardsImported));
+        progressBar->setValue(setIndex);
+        if (wizard()->backgroundMode) {
+            qInfo() << tr("%1: %2 cards imported").arg(setName).arg(cardsImported);
+        } else {
+            messageLog->append(tr("%1: %2 cards imported").arg(setName).arg(cardsImported));
+        }
+        emitProgress("import", setIndex, totalSets);
     }
 
     messageLog->verticalScrollBar()->setValue(messageLog->verticalScrollBar()->maximum());
@@ -763,4 +1023,4 @@ void LoadSpoilersPage::retranslateUi()
     pathLabel->setText(tr("The spoiler database will be saved at the following location:") + "<br>" +
                        SettingsCache::instance().getSpoilerCardDatabasePath());
     defaultPathCheckBox->setText(tr("Save to a custom path (not recommended)"));
-}
\ No newline at end of file
+}
diff --git a/oracle/src/pages.h b/oracle/src/pages.h
index 066cc2e1b..221f032d3 100644
--- a/oracle/src/pages.h
+++ b/oracle/src/pages.h
@@ -3,24 +3,24 @@
 
 #include "pagetemplates.h"
 
+#include <QByteArray>
 #include <QFuture>
 #include <QFutureWatcher>
-#include <QTimer>
-#include <QWizard>
-#include <utility>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+#include <qtmetamacros.h>
 
 class QCheckBox;
-class QGroupBox;
 class QComboBox;
 class QLabel;
 class QLineEdit;
 class QRadioButton;
 class QProgressBar;
-class QNetworkAccessManager;
 class QTextEdit;
-class QVBoxLayout;
-class OracleImporter;
-class QSettings;
+class QPushButton;
+class QUrl;
+class QWidget;
 
 class IntroPage : public OracleWizardPage
 {
@@ -57,19 +57,31 @@ protected:
     void initializePage() override;
 };
 
+/** @brief Result of a worker-thread sets-file load (read + decompress + dispatch). */
+struct LoadSetsResult
+{
+    bool ok = false;                        ///< JSON scan produced set data (or plain XML was handled)
+    bool plainXml = false;                  ///< input was a plain Cockatrice XML database
+    QByteArray xmlData;                     ///< raw XML for the plain-XML path
+    QString errorMessage;                   ///< set when the input could not be processed
+    bool offerUncompressedFallback = false; ///< decompression-only failure: offer the uncompressed URL
+};
+
 class LoadSetsPage : public OracleWizardPage
 {
     Q_OBJECT
 public:
     explicit LoadSetsPage(QWidget *parent = nullptr);
     void retranslateUi() override;
+    bool isComplete() const override;
 
 protected:
     void initializePage() override;
     bool validatePage() override;
     void readSetsFromByteArray(QByteArray _data);
-    void readSetsFromByteArrayRef(QByteArray &_data);
+    void readSetsFromFile(const QString &fileName);
     void downloadSetsFile(const QUrl &url);
+    void cancelWork() override;
 
 private:
     QRadioButton *urlRadioButton;
@@ -81,15 +93,19 @@ private:
     QLabel *progressLabel;
     QProgressBar *progressBar;
 
-    QFutureWatcher<bool> watcher;
-    QFuture<bool> future;
-    QByteArray jsonData;
+    QFutureWatcher<LoadSetsResult> watcher;
+    QFuture<LoadSetsResult> future;
+    bool loadActive = false;
+
+    void beginLoadSets(bool compressedFile = false);
 
 private slots:
     void actLoadSetsFile();
     void actRestoreDefaultUrl();
     void actDownloadProgressSetsFile(qint64 received, qint64 total);
     void actDownloadFinishedSetsFile();
+    void updateParsingProgress(int bytesRead, int totalBytes);
+    void scanProgressToStdout(int bytesRead, int totalBytes);
     void importFinished();
     void zipDownloadFailed(const QString &message);
 };
@@ -100,19 +116,28 @@ class SaveSetsPage : public OracleWizardPage
 public:
     explicit SaveSetsPage(QWidget *parent = nullptr);
     void retranslateUi() override;
+    bool isComplete() const override;
 
 private:
     QTextEdit *messageLog;
+    QProgressBar *progressBar;
     QCheckBox *defaultPathCheckBox;
     QLabel *pathLabel;
     QLabel *saveLabel;
 
+    QFutureWatcher<int> importWatcher;
+    QFuture<int> importFuture;
+    int totalSets = 0;
+    bool importActive = false;
+
 protected:
     void initializePage() override;
     void cleanupPage() override;
     bool validatePage() override;
+    void cancelWork() override;
 
 private slots:
+    void importFinished();
     void updateTotalProgress(int cardsImported, int setIndex, const QString &setName);
 };
 
diff --git a/oracle/src/pagetemplates.cpp b/oracle/src/pagetemplates.cpp
index 4a27fef30..d37818dcb 100644
--- a/oracle/src/pagetemplates.cpp
+++ b/oracle/src/pagetemplates.cpp
@@ -3,17 +3,32 @@
 #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 <QtGui>
+#include <QSettings>
+#include <QSharedPointer>
+#include <QUrl>
+#include <QVariant>
+#include <qlogging.h>
+#include <qnamespace.h>
+
+class QWidget;
 
 SimpleDownloadFilePage::SimpleDownloadFilePage(QWidget *parent) : OracleWizardPage(parent)
 {
@@ -112,7 +127,7 @@ bool SimpleDownloadFilePage::validatePage()
             return false;
         }
 
-        progressLabel->setText(tr("Downloading (0MB)"));
+        progressLabel->setText(tr("Downloading (0 MB)"));
         // show an infinite progressbar
         progressBar->setMaximum(0);
         progressBar->setMinimum(0);
diff --git a/oracle/src/pagetemplates.h b/oracle/src/pagetemplates.h
index 79dcdd632..2a996801d 100644
--- a/oracle/src/pagetemplates.h
+++ b/oracle/src/pagetemplates.h
@@ -1,15 +1,21 @@
 #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
 {
@@ -20,6 +26,14 @@ public:
     }
     virtual void retranslateUi() = 0;
 
+    /**
+     * @brief Asks an active page to stop any background worker before the wizard
+     *        (and its importer) can be torn down underneath it. Default is a no-op.
+     */
+    virtual void cancelWork()
+    {
+    }
+
 signals:
     void readyToContinue();
 
@@ -27,7 +41,7 @@ protected:
     inline OracleWizard *wizard()
     {
         return (OracleWizard *)QWizardPage::wizard();
-    };
+    }
 };
 
 class SimpleDownloadFilePage : public OracleWizardPage
diff --git a/oracle/src/parsehelpers.cpp b/oracle/src/parsehelpers.cpp
index a97bf67c9..2c897031f 100644
--- a/oracle/src/parsehelpers.cpp
+++ b/oracle/src/parsehelpers.cpp
@@ -1,7 +1,11 @@
 #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
@@ -20,7 +24,7 @@
  * Note that "...enters tapped unless..." returns false.
  *
  * @param name The name of the card
- * @param text The oracle text of the card
+ * @param text The Oracle text of the card
  */
 bool parseCipt(const QString &name, const QString &text)
 {
diff --git a/oracle/src/qt-json/AUTHORS b/oracle/src/qt-json/AUTHORS
deleted file mode 100644
index 29a85929f..000000000
--- a/oracle/src/qt-json/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-Eeli Reilin <eeli@emicode.fi>
-Luis Gustavo S. Barreto <gustavosbarreto@gmail.com>
-Stephen Kockentiedt <Stephen@Kockentiedt.name>
diff --git a/oracle/src/qt-json/LICENSE b/oracle/src/qt-json/LICENSE
deleted file mode 100644
index 3c42b515a..000000000
--- a/oracle/src/qt-json/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright 2011 Eeli Reilin. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice, 
-      this list of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation 
-      and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY EXPRESS OR 
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 
-EVENT SHALL EELI REILIN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The views and conclusions contained in the software and documentation 
-are those of the authors and should not be interpreted as representing 
-official policies, either expressed or implied, of Eeli Reilin.
-
diff --git a/oracle/src/qt-json/README b/oracle/src/qt-json/README
deleted file mode 100644
index b60c1599b..000000000
--- a/oracle/src/qt-json/README
+++ /dev/null
@@ -1,96 +0,0 @@
-########################################################################
-1. INTRODUCTION
-
-The Json class is a simple class for parsing JSON data into a QVariant 
-hierarchies. Now, we can also reverse the process and serialize
-QVariant hierarchies into valid JSON data.
-
-
-########################################################################
-2. HOW TO USE
-
-The parser is really easy to use. Let's say we have the following 
-QString of JSON data:
-
-------------------------------------------------------------------------
-{
-   "encoding" : "UTF-8",
-   "plug-ins" : [
-      "python",
-      "c++",
-      "ruby"
-   ],
-   "indent" : {
-      "length" : 3,
-      "use_space" : true
-   }
-}
-------------------------------------------------------------------------
-
-We would first call the parse-method:
-
-------------------------------------------------------------------------
-//Say that we're using the QtJson namespace
-using namespace QtJson;
-bool ok;
-//json is a QString containing the JSON data
-QVariantMap result = Json::parse(json, ok).toMap();
-
-if(!ok) {
-    qFatal("An error occurred during parsing");
-    exit(1);
-}
-------------------------------------------------------------------------
-
-Assuming the parsing process completed without errors, we would then
-go through the hierarchy:
-
-------------------------------------------------------------------------
-qDebug() << "encoding:" << result["encoding"].toString();
-qDebug() << "plugins:";
-
-foreach(QVariant plugin, result["plug-ins"].toList()) {
-    qDebug() << "\t-" << plugin.toString();
-}
-
-QVariantMap nestedMap = result["indent"].toMap();
-qDebug() << "length:" << nestedMap["length"].toInt();
-qDebug() << "use_space:" << nestedMap["use_space"].toBool();
-------------------------------------------------------------------------
-
-The previous code would print out the following:
-
-------------------------------------------------------------------------
-encoding: "UTF-8"
-plugins:
-  - "python"
-  - "c++"
-  - "ruby"
-length: 3
-use_space: true
-------------------------------------------------------------------------
-
-To write JSON data from Qt object is as simple as parsing:
-
-------------------------------------------------------------------------
-QVariantMap map;
-map["name"] = "Name";
-map["age"] = 22;
-
-QByteArray data = Json::serialize(map);
-------------------------------------------------------------------------
-
-The byte array 'data' contains valid JSON data:
-
-------------------------------------------------------------------------
-{
-        name: "Luis Gustavo",
-        age: 22,
-}
-------------------------------------------------------------------------
-
-
-########################################################################
-4. CONTRIBUTING
-
-The code is available to download at GitHub. Contribute if you dare!
diff --git a/oracle/src/qt-json/json.cpp b/oracle/src/qt-json/json.cpp
deleted file mode 100644
index 2fffd0f70..000000000
--- a/oracle/src/qt-json/json.cpp
+++ /dev/null
@@ -1,573 +0,0 @@
-/* Copyright 2011 Eeli Reilin. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL EELI REILIN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation
- * are those of the authors and should not be interpreted as representing
- * official policies, either expressed or implied, of Eeli Reilin.
- */
-
-/**
- * \file json.cpp
- */
-
-#include "json.h"
-
-#include <QMetaType>
-#include <iostream>
-
-namespace QtJson
-{
-
-static QString sanitizeString(QString str)
-{
-    str.replace(QLatin1String("\\"), QLatin1String("\\\\"));
-    str.replace(QLatin1String("\""), QLatin1String("\\\""));
-    str.replace(QLatin1String("\b"), QLatin1String("\\b"));
-    str.replace(QLatin1String("\f"), QLatin1String("\\f"));
-    str.replace(QLatin1String("\n"), QLatin1String("\\n"));
-    str.replace(QLatin1String("\r"), QLatin1String("\\r"));
-    str.replace(QLatin1String("\t"), QLatin1String("\\t"));
-    return QString(QLatin1String("\"%1\"")).arg(str);
-}
-
-static QByteArray join(const QList<QByteArray> &list, const QByteArray &sep)
-{
-    QByteArray res;
-    for (const QByteArray &i : list) {
-        if (!res.isEmpty()) {
-            res += sep;
-        }
-        res += i;
-    }
-    return res;
-}
-
-/**
- * parse
- */
-QVariant Json::parse(const QString &json)
-{
-    bool success = true;
-    return Json::parse(json, success);
-}
-
-/**
- * parse
- */
-QVariant Json::parse(const QString &json, bool &success)
-{
-    success = true;
-
-    // Return an empty QVariant if the JSON data is either null or empty
-    if (!json.isNull() || !json.isEmpty()) {
-        // We'll start from index 0
-        int index = 0;
-
-        // Parse the first value
-        QVariant value = Json::parseValue(json, index, success);
-
-        // Return the parsed value
-        return value;
-    } else {
-        // Return the empty QVariant
-        return QVariant();
-    }
-}
-
-QByteArray Json::serialize(const QVariant &data)
-{
-    bool success = true;
-    return Json::serialize(data, success);
-}
-
-QByteArray Json::serialize(const QVariant &data, bool &success)
-{
-    QByteArray str;
-    success = true;
-
-    if (!data.isValid()) // invalid or null?
-    {
-        str = "null";
-    }
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-    else if ((data.typeId() == QMetaType::Type::QVariantList) ||
-             (data.typeId() == QMetaType::Type::QStringList)) // variant is a list?
-#else
-    else if ((data.type() == QVariant::List) || (data.type() == QVariant::StringList))  // variant is a list?
-#endif
-    {
-        QList<QByteArray> values;
-        const QVariantList list = data.toList();
-        for (const QVariant &v : list) {
-            QByteArray serializedValue = serialize(v);
-            if (serializedValue.isNull()) {
-                success = false;
-                break;
-            }
-            values << serializedValue;
-        }
-
-        str = "[ " + join(values, ", ") + " ]";
-    }
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-    else if ((data.typeId() == QMetaType::Type::QVariantHash)) // variant is a list?
-#else
-    else if (data.type() == QVariant::Hash)                                             // variant is a hash?
-#endif
-    {
-        const QVariantHash vhash = data.toHash();
-        QHashIterator<QString, QVariant> it(vhash);
-        str = "{ ";
-        QList<QByteArray> pairs;
-
-        while (it.hasNext()) {
-            it.next();
-            QByteArray serializedValue = serialize(it.value());
-
-            if (serializedValue.isNull()) {
-                success = false;
-                break;
-            }
-
-            pairs << sanitizeString(it.key()).toUtf8() + " : " + serializedValue;
-        }
-
-        str += join(pairs, ", ");
-        str += " }";
-    }
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-    else if ((data.typeId() == QMetaType::Type::QVariantMap)) // variant is a list?
-#else
-    else if (data.type() == QVariant::Map)                                              // variant is a map?
-#endif
-    {
-        const QVariantMap vmap = data.toMap();
-        QMapIterator<QString, QVariant> it(vmap);
-        str = "{ ";
-        QList<QByteArray> pairs;
-        while (it.hasNext()) {
-            it.next();
-            QByteArray serializedValue = serialize(it.value());
-            if (serializedValue.isNull()) {
-                success = false;
-                break;
-            }
-            pairs << sanitizeString(it.key()).toUtf8() + " : " + serializedValue;
-        }
-        str += join(pairs, ", ");
-        str += " }";
-    }
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-    else if ((data.typeId() == QMetaType::Type::QString) ||
-             (data.typeId() == QMetaType::Type::QByteArray)) // variant is a list?
-#else
-    else if ((data.type() == QVariant::String) || (data.type() == QVariant::ByteArray)) // a string or a byte array?
-#endif
-    {
-        str = sanitizeString(data.toString()).toUtf8();
-    }
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-    else if (data.typeId() == QMetaType::Type::Double)
-#else
-    else if (data.type() == QVariant::Double)                                           // double?
-#endif
-    {
-        str = QByteArray::number(data.toDouble(), 'g', 20);
-        if (!str.contains(".") && !str.contains("e")) {
-            str += ".0";
-        }
-    }
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-    else if (data.typeId() == QMetaType::Type::Bool)
-#else
-    else if (data.type() == QVariant::Bool)                                             // boolean value?
-#endif
-    {
-        str = data.toBool() ? "true" : "false";
-    }
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
-    else if (data.typeId() == QMetaType::Type::ULongLong)
-#else
-    else if (data.type() == QVariant::ULongLong)                                        // large unsigned number?
-#endif
-    {
-        str = QByteArray::number(data.value<qulonglong>());
-    } else if (data.canConvert<qlonglong>()) // any signed number?
-    {
-        str = QByteArray::number(data.value<qlonglong>());
-    } else if (data.canConvert<long>()) {
-        str = QString::number(data.value<long>()).toUtf8();
-    } else if (data.canConvert<QString>()) // can value be converted to string?
-    {
-        // this will catch QDate, QDateTime, QUrl, ...
-        str = sanitizeString(data.toString()).toUtf8();
-    } else {
-        success = false;
-    }
-    if (success) {
-        return str;
-    } else {
-        return QByteArray();
-    }
-}
-
-/**
- * parseValue
- */
-QVariant Json::parseValue(const QString &json, int &index, bool &success)
-{
-    // Determine what kind of data we should parse by
-    // checking out the upcoming token
-    switch (Json::lookAhead(json, index)) {
-        case JsonTokenString:
-            return Json::parseString(json, index, success);
-        case JsonTokenNumber:
-            return Json::parseNumber(json, index);
-        case JsonTokenCurlyOpen:
-            return Json::parseObject(json, index, success);
-        case JsonTokenSquaredOpen:
-            return Json::parseArray(json, index, success);
-        case JsonTokenTrue:
-            Json::nextToken(json, index);
-            return QVariant(true);
-        case JsonTokenFalse:
-            Json::nextToken(json, index);
-            return QVariant(false);
-        case JsonTokenNull:
-            Json::nextToken(json, index);
-            return QVariant();
-        case JsonTokenNone:
-            break;
-    }
-
-    // If there were no tokens, flag the failure and return an empty QVariant
-    success = false;
-    return QVariant();
-}
-
-/**
- * parseObject
- */
-QVariant Json::parseObject(const QString &json, int &index, bool &success)
-{
-    QVariantMap map;
-    int token;
-
-    // Get rid of the whitespace and increment index
-    Json::nextToken(json, index);
-
-    // Loop through all of the key/value pairs of the object
-    bool done = false;
-    while (!done) {
-        // Get the upcoming token
-        token = Json::lookAhead(json, index);
-
-        if (token == JsonTokenNone) {
-            success = false;
-            return QVariantMap();
-        } else if (token == JsonTokenComma) {
-            Json::nextToken(json, index);
-        } else if (token == JsonTokenCurlyClose) {
-            Json::nextToken(json, index);
-            return map;
-        } else {
-            // Parse the key/value pair's name
-            QString name = Json::parseString(json, index, success).toString();
-
-            if (!success) {
-                return QVariantMap();
-            }
-
-            // Get the next token
-            token = Json::nextToken(json, index);
-
-            // If the next token is not a colon, flag the failure
-            // return an empty QVariant
-            if (token != JsonTokenColon) {
-                success = false;
-                return QVariant(QVariantMap());
-            }
-
-            // Parse the key/value pair's value
-            QVariant value = Json::parseValue(json, index, success);
-
-            if (!success) {
-                return QVariantMap();
-            }
-
-            // Assign the value to the key in the map
-            map[name] = value;
-        }
-    }
-
-    // Return the map successfully
-    return QVariant(map);
-}
-
-/**
- * parseArray
- */
-QVariant Json::parseArray(const QString &json, int &index, bool &success)
-{
-    QVariantList list;
-
-    Json::nextToken(json, index);
-
-    bool done = false;
-    while (!done) {
-        int token = Json::lookAhead(json, index);
-
-        if (token == JsonTokenNone) {
-            success = false;
-            return QVariantList();
-        } else if (token == JsonTokenComma) {
-            Json::nextToken(json, index);
-        } else if (token == JsonTokenSquaredClose) {
-            Json::nextToken(json, index);
-            break;
-        } else {
-            QVariant value = Json::parseValue(json, index, success);
-
-            if (!success) {
-                return QVariantList();
-            }
-
-            list.push_back(value);
-        }
-    }
-
-    return QVariant(list);
-}
-
-/**
- * parseString
- */
-QVariant Json::parseString(const QString &json, int &index, bool &success)
-{
-    QString s;
-    QChar c;
-
-    Json::eatWhitespace(json, index);
-
-    c = json[index++];
-
-    bool complete = false;
-    while (!complete) {
-        if (index == json.size()) {
-            break;
-        }
-
-        c = json[index++];
-
-        if (c == '\"') {
-            complete = true;
-            break;
-        } else if (c == '\\') {
-            if (index == json.size()) {
-                break;
-            }
-
-            c = json[index++];
-
-            if (c == '\"') {
-                s.append('\"');
-            } else if (c == '\\') {
-                s.append('\\');
-            } else if (c == '/') {
-                s.append('/');
-            } else if (c == 'b') {
-                s.append('\b');
-            } else if (c == 'f') {
-                s.append('\f');
-            } else if (c == 'n') {
-                s.append('\n');
-            } else if (c == 'r') {
-                s.append('\r');
-            } else if (c == 't') {
-                s.append('\t');
-            } else if (c == 'u') {
-                int remainingLength = json.size() - index;
-
-                if (remainingLength >= 4) {
-                    QString unicodeStr = json.mid(index, 4);
-
-                    int symbol = unicodeStr.toInt(0, 16);
-
-                    s.append(QChar(symbol));
-
-                    index += 4;
-                } else {
-                    break;
-                }
-            }
-        } else {
-            s.append(c);
-        }
-    }
-
-    if (!complete) {
-        success = false;
-        return QVariant();
-    }
-
-    return QVariant(s);
-}
-
-/**
- * parseNumber
- */
-QVariant Json::parseNumber(const QString &json, int &index)
-{
-    Json::eatWhitespace(json, index);
-
-    int lastIndex = Json::lastIndexOfNumber(json, index);
-    int charLength = (lastIndex - index) + 1;
-    QString numberStr;
-
-    numberStr = json.mid(index, charLength);
-
-    index = lastIndex + 1;
-
-    if (numberStr.contains('.')) {
-        return QVariant(numberStr.toDouble(NULL));
-    } else if (numberStr.startsWith('-')) {
-        return QVariant(numberStr.toLongLong(NULL));
-    } else {
-        return QVariant(numberStr.toULongLong(NULL));
-    }
-}
-
-/**
- * lastIndexOfNumber
- */
-int Json::lastIndexOfNumber(const QString &json, int index)
-{
-    static const QString numericCharacters("0123456789+-.eE");
-    int lastIndex;
-
-    for (lastIndex = index; lastIndex < json.size(); lastIndex++) {
-        if (numericCharacters.indexOf(json[lastIndex]) == -1) {
-            break;
-        }
-    }
-
-    return lastIndex - 1;
-}
-
-/**
- * eatWhitespace
- */
-void Json::eatWhitespace(const QString &json, int &index)
-{
-    static const QString whitespaceChars(" \t\n\r");
-    for (; index < json.size(); index++) {
-        if (whitespaceChars.indexOf(json[index]) == -1) {
-            break;
-        }
-    }
-}
-
-/**
- * lookAhead
- */
-int Json::lookAhead(const QString &json, int index)
-{
-    int saveIndex = index;
-    return Json::nextToken(json, saveIndex);
-}
-
-/**
- * nextToken
- */
-int Json::nextToken(const QString &json, int &index)
-{
-    Json::eatWhitespace(json, index);
-
-    if (index == json.size()) {
-        return JsonTokenNone;
-    }
-
-    QChar c = json[index];
-    index++;
-    switch (c.toLatin1()) {
-        case '{':
-            return JsonTokenCurlyOpen;
-        case '}':
-            return JsonTokenCurlyClose;
-        case '[':
-            return JsonTokenSquaredOpen;
-        case ']':
-            return JsonTokenSquaredClose;
-        case ',':
-            return JsonTokenComma;
-        case '"':
-            return JsonTokenString;
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-        case '-':
-            return JsonTokenNumber;
-        case ':':
-            return JsonTokenColon;
-    }
-
-    index--;
-
-    int remainingLength = json.size() - index;
-
-    // True
-    if (remainingLength >= 4) {
-        if (json[index] == 't' && json[index + 1] == 'r' && json[index + 2] == 'u' && json[index + 3] == 'e') {
-            index += 4;
-            return JsonTokenTrue;
-        }
-    }
-
-    // False
-    if (remainingLength >= 5) {
-        if (json[index] == 'f' && json[index + 1] == 'a' && json[index + 2] == 'l' && json[index + 3] == 's' &&
-            json[index + 4] == 'e') {
-            index += 5;
-            return JsonTokenFalse;
-        }
-    }
-
-    // Null
-    if (remainingLength >= 4) {
-        if (json[index] == 'n' && json[index + 1] == 'u' && json[index + 2] == 'l' && json[index + 3] == 'l') {
-            index += 4;
-            return JsonTokenNull;
-        }
-    }
-
-    return JsonTokenNone;
-}
-
-} // namespace QtJson
diff --git a/oracle/src/qt-json/json.h b/oracle/src/qt-json/json.h
deleted file mode 100644
index cf0499d4e..000000000
--- a/oracle/src/qt-json/json.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/* Copyright 2011 Eeli Reilin. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, 
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation 
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY EXPRESS OR 
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 
- * EVENT SHALL EELI REILIN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation 
- * are those of the authors and should not be interpreted as representing 
- * official policies, either expressed or implied, of Eeli Reilin.
- */
-
-/**
- * \file json.h
- */
-
-#ifndef JSON_H
-#define JSON_H
-
-#include <QVariant>
-#include <QString>
-
-namespace QtJson
-{
-
-/**
- * \enum JsonToken
- */
-enum JsonToken
-{
-        JsonTokenNone = 0,
-        JsonTokenCurlyOpen = 1,
-        JsonTokenCurlyClose = 2,
-        JsonTokenSquaredOpen = 3,
-        JsonTokenSquaredClose = 4,
-        JsonTokenColon = 5,
-        JsonTokenComma = 6,
-        JsonTokenString = 7,
-        JsonTokenNumber = 8,
-        JsonTokenTrue = 9,
-        JsonTokenFalse = 10,
-        JsonTokenNull = 11
-};
-
-/**
- * \class Json
- * \brief A JSON data parser
- *
- * Json parses a JSON data into a QVariant hierarchy.
- */
-class Json
-{
-        public:
-                /**
-                 * Parse a JSON string
-                 *
-                 * \param json The JSON data
-                 */
-                static QVariant parse(const QString &json);
-
-                /**
-                 * Parse a JSON string
-                 *
-                 * \param json The JSON data
-                 * \param success The success of the parsing
-                 */
-                static QVariant parse(const QString &json, bool &success);
-
-                /**
-                * This method generates a textual JSON representation
-                *
-                * \param data The JSON data generated by the parser.
-                * \param success The success of the serialization
-                */
-                static QByteArray serialize(const QVariant &data);
-
-                /**
-                * This method generates a textual JSON representation
-                *
-                * \param data The JSON data generated by the parser.
-                * \param success The success of the serialization
-                *
-                * \return QByteArray Textual JSON representation
-                */
-                static QByteArray serialize(const QVariant &data, bool &success);
-
-        private:
-                /**
-                 * Parses a value starting from index
-                 *
-                 * \param json The JSON data
-                 * \param index The start index
-                 * \param success The success of the parse process
-                 *
-                 * \return QVariant The parsed value
-                 */
-                static QVariant parseValue(const QString &json, int &index,
-                                                                   bool &success);
-
-                /**
-                 * Parses an object starting from index
-                 *
-                 * \param json The JSON data
-                 * \param index The start index
-                 * \param success The success of the object parse
-                 *
-                 * \return QVariant The parsed object map
-                 */
-                static QVariant parseObject(const QString &json, int &index,
-                                                                           bool &success);
-
-                /**
-                 * Parses an array starting from index
-                 *
-                 * \param json The JSON data
-                 * \param index The starting index
-                 * \param success The success of the array parse
-                 *
-                 * \return QVariant The parsed variant array
-                 */
-                static QVariant parseArray(const QString &json, int &index,
-                                                                           bool &success);
-
-                /**
-                 * Parses a string starting from index
-                 *
-                 * \param json The JSON data
-                 * \param index The starting index
-                 * \param success The success of the string parse
-                 *
-                 * \return QVariant The parsed string
-                 */
-                static QVariant parseString(const QString &json, int &index,
-                                                                        bool &success);
-
-                /**
-                 * Parses a number starting from index
-                 *
-                 * \param json The JSON data
-                 * \param index The starting index
-                 *
-                 * \return QVariant The parsed number
-                 */
-                static QVariant parseNumber(const QString &json, int &index);
-
-                /**
-                 * Get the last index of a number starting from index
-                 *
-                 * \param json The JSON data
-                 * \param index The starting index
-                 *
-                 * \return The last index of the number
-                 */
-                static int lastIndexOfNumber(const QString &json, int index);
-
-                /**
-                 * Skip unwanted whitespace symbols starting from index
-                 *
-                 * \param json The JSON data
-                 * \param index The start index
-                 */
-                static void eatWhitespace(const QString &json, int &index);
-
-                /**
-                 * Check what token lies ahead
-                 *
-                 * \param json The JSON data
-                 * \param index The starting index
-                 *
-                 * \return int The upcoming token
-                 */
-                static int lookAhead(const QString &json, int index);
-
-                /**
-                 * Get the next JSON token
-                 *
-                 * \param json The JSON data
-                 * \param index The starting index
-                 *
-                 * \return int The next JSON token
-                 */
-                static int nextToken(const QString &json, int &index);
-};
-
-
-} //end namespace
-
-#endif //JSON_H
diff --git a/oracle/src/raw_json_scanner.cpp b/oracle/src/raw_json_scanner.cpp
new file mode 100644
index 000000000..2396b59ae
--- /dev/null
+++ b/oracle/src/raw_json_scanner.cpp
@@ -0,0 +1,681 @@
+#include "raw_json_scanner.h"
+
+#include <QByteArray>
+#include <QChar>
+#include <QSharedPointer>
+#include <QStringLiteral>
+#include <algorithm>
+#include <cstring>
+
+namespace
+{
+
+// Nesting cap matching QJsonDocument's limit, so a pathologically deep document
+// fails shallowly instead of overflowing the stack through the recursive
+// skipValue/skipArray/skipObject walk (Qt's parser caps at 1024 for the same
+// reason and reports DeepNesting).
+constexpr int kMaxNestingDepth = 1024;
+
+/**
+ * @brief Throttled byte-position reporting for scanSetRanges().
+ *
+ * Threaded through the skip walk so progress can be reported without materializing
+ * the whole document. Reports are rate-limited so a GUI showing progress isn't
+ * flooded with interrupts: a callback is invoked at most ~100 times per scan
+ * regardless of element count. The closing stretch (the last ~1%) is reported
+ * more finely so a large document doesn't stall the progress bar on the final
+ * percent before the scan wraps up.
+ */
+struct ScanProgress
+{
+    const char *begin = nullptr;
+    qsizetype size = 0;
+    RawJson::ScanProgressCallback callback;
+    qsizetype step = 1;
+    qsizetype lastReported = 0;
+
+    /**
+     * @brief Reports the scanner's absolute offset, unless within @p step bytes
+     * of the previous report and not yet at the end of the document.
+     */
+    void report(const char *p)
+    {
+        if (!callback) {
+            return;
+        }
+        const qsizetype offset = p - begin;
+        if (offset == lastReported) {
+            return; // the final element often already sits exactly at the end
+        }
+        const qsizetype reportingStep = offset >= size - step ? std::max<qsizetype>(1, step / 16) : step;
+        if (offset - lastReported < reportingStep && offset < size) {
+            return;
+        }
+        lastReported = offset;
+        callback(offset, size);
+    }
+};
+
+inline bool isWhitespace(char c)
+{
+    return c == ' ' || c == '\t' || c == '\r' || c == '\n';
+}
+
+const char *skipWhitespace(const char *p, const char *end)
+{
+    while (p < end && isWhitespace(*p)) {
+        ++p;
+    }
+    return p;
+}
+
+inline bool isHexDigit(char c)
+{
+    return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F');
+}
+
+inline quint8 hexValue(char c)
+{
+    if (c >= '0' && c <= '9') {
+        return c - '0';
+    }
+    if (c >= 'a' && c <= 'f') {
+        return c - 'a' + 10;
+    }
+    return c - 'A' + 10;
+}
+
+/**
+ * @brief Skips past a JSON string without decoding it, validating escapes.
+ * @param p In: pointing at the opening quote. Out: pointing past the closing quote.
+ */
+bool skipString(const char *&p, const char *end)
+{
+    ++p; // opening quote
+    for (;;) {
+        const void *quote = memchr(p, '"', static_cast<size_t>(end - p));
+        if (!quote) {
+            return false; // unterminated string
+        }
+        // Backslash escapes can only appear before the closing quote, so bound
+        // the scan to the string extent instead of the rest of the document.
+        const void *backslash = memchr(p, '\\', static_cast<size_t>(static_cast<const char *>(quote) - p));
+        if (!backslash) {
+            p = static_cast<const char *>(quote) + 1;
+            return true;
+        }
+        const char *b = static_cast<const char *>(backslash);
+        if (end - b < 2) {
+            return false;
+        }
+        const char escaped = b[1];
+        if (escaped == 'u') {
+            if (end - b < 6) {
+                return false;
+            }
+            quint32 codepoint = 0;
+            for (int i = 0; i < 4; ++i) {
+                if (!isHexDigit(b[2 + i])) {
+                    return false;
+                }
+                codepoint = codepoint * 16 + hexValue(b[2 + i]);
+            }
+            p = b + 6;
+            if (codepoint >= 0xD800 && codepoint <= 0xDBFF) {
+                // expect the low-surrogate escape for the second half
+                if (end - p < 6 || p[0] != '\\' || p[1] != 'u') {
+                    return false; // unpaired high surrogate
+                }
+                quint32 low = 0;
+                for (int i = 0; i < 4; ++i) {
+                    if (!isHexDigit(p[2 + i])) {
+                        return false;
+                    }
+                    low = low * 16 + hexValue(p[2 + i]);
+                }
+                if (low < 0xDC00 || low > 0xDFFF) {
+                    return false;
+                }
+                p += 6;
+            } else if (codepoint >= 0xDC00 && codepoint <= 0xDFFF) {
+                return false; // unpaired low surrogate
+            }
+            continue;
+        }
+        switch (escaped) {
+            case '"':
+            case '\\':
+            case '/':
+            case 'b':
+            case 'f':
+            case 'n':
+            case 'r':
+            case 't':
+                p = b + 2;
+                continue;
+            default:
+                return false; // invalid escape
+        }
+    }
+}
+
+/**
+ * @brief Decodes a JSON string into @p out, validating it as it goes.
+ * @param p In: pointing at the opening quote. Out: pointing past the closing quote.
+ */
+bool decodeString(const char *&p, const char *end, QString &out)
+{
+    out.clear();
+    QByteArray utf8;
+    auto flush = [&out, &utf8]() {
+        if (!utf8.isEmpty()) {
+            out += QString::fromUtf8(utf8);
+            utf8.clear();
+        }
+    };
+
+    ++p; // opening quote
+    while (p < end) {
+        const char c = *p;
+        if (c == '\\') {
+            flush();
+            ++p; // escaped character
+            if (p >= end) {
+                return false;
+            }
+            const char escaped = *p;
+            if (escaped == 'u') {
+                ++p; // first hex digit
+                if (p + 4 > end) {
+                    return false;
+                }
+                quint32 codepoint = 0;
+                for (int i = 0; i < 4; ++i) {
+                    if (!isHexDigit(p[i])) {
+                        return false;
+                    }
+                    codepoint = codepoint * 16 + hexValue(p[i]);
+                }
+                p += 4;
+                if (codepoint >= 0xD800 && codepoint <= 0xDBFF) {
+                    // expect a low-surrogate escape for the second half
+                    if (p + 6 > end || p[0] != '\\' || p[1] != 'u') {
+                        return false; // unpaired high surrogate
+                    }
+                    quint32 low = 0;
+                    for (int i = 0; i < 4; ++i) {
+                        if (!isHexDigit(p[2 + i])) {
+                            return false;
+                        }
+                        low = low * 16 + hexValue(p[2 + i]);
+                    }
+                    if (low < 0xDC00 || low > 0xDFFF) {
+                        return false;
+                    }
+                    out += QChar(codepoint);
+                    out += QChar(low);
+                    p += 6;
+                } else if (codepoint >= 0xDC00 && codepoint <= 0xDFFF) {
+                    return false; // unpaired low surrogate
+                } else {
+                    out += QChar(codepoint);
+                }
+                continue;
+            }
+            switch (escaped) {
+                case '"':
+                    out += '"';
+                    break;
+                case '\\':
+                    out += '\\';
+                    break;
+                case '/':
+                    out += '/';
+                    break;
+                case 'b':
+                    out += '\b';
+                    break;
+                case 'f':
+                    out += '\f';
+                    break;
+                case 'n':
+                    out += '\n';
+                    break;
+                case 'r':
+                    out += '\r';
+                    break;
+                case 't':
+                    out += '\t';
+                    break;
+                default:
+                    return false;
+            }
+            ++p;
+            continue;
+        }
+        if (c == '"') {
+            ++p;
+            flush();
+            return true;
+        }
+        // Deliberately accept unescaped control characters (e.g. a tab inside
+        // a set name): QJsonDocument and skipString accept them too, so
+        // rejecting them here would fail the whole document on a byte that
+        // Qt is fine with — the very total-failure mode this scanner avoids.
+        utf8 += c;
+        ++p;
+    }
+    return false;
+}
+
+/**
+ * @brief Reads a set-metadata field, tolerating null and non-string values.
+ *
+ * A set's metadata may carry null or non-string values in otherwise-valid
+ * payloads ("releaseDate": null, "type": 7). The token itself was already
+ * structurally validated by skipValue, so a non-string value is accepted and
+ * leaves @p out at its default (empty) — one bad set must not abort the
+ * import of every other set in the document.
+ */
+bool decodeStringMember(const char *&fs, const char *&fe, QString &out)
+{
+    if (fs >= fe) {
+        return false;
+    }
+    if (*fs != '"') {
+        return true;
+    }
+    return decodeString(fs, fe, out);
+}
+
+bool matchLiteral(const char *&p, const char *end, const char *literal, int length)
+{
+    if (end - p < length || memcmp(p, literal, static_cast<size_t>(length)) != 0) {
+        return false;
+    }
+    const char *after = p + length;
+    if (after < end && (QChar::isLetter(*after) || QChar::isDigit(*after) || *after == '_')) {
+        return false;
+    }
+    p = after;
+    return true;
+}
+
+bool skipNumber(const char *&p, const char *end)
+{
+    // JSON number: -?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?
+    if (p < end && *p == '-') {
+        ++p;
+    }
+    if (p < end && *p == '0') {
+        ++p;
+    } else if (p < end && *p >= '1' && *p <= '9') {
+        ++p;
+        while (p < end && QChar::isDigit(*p)) {
+            ++p;
+        }
+    } else {
+        return false;
+    }
+    if (p < end && *p == '.') {
+        ++p;
+        if (p >= end || !QChar::isDigit(*p)) {
+            return false;
+        }
+        while (p < end && QChar::isDigit(*p)) {
+            ++p;
+        }
+    }
+    if (p < end && (*p == 'e' || *p == 'E')) {
+        ++p;
+        if (p < end && (*p == '+' || *p == '-')) {
+            ++p;
+        }
+        if (p >= end || !QChar::isDigit(*p)) {
+            return false;
+        }
+        while (p < end && QChar::isDigit(*p)) {
+            ++p;
+        }
+    }
+    return true;
+}
+
+bool skipValue(const char *&p, const char *end, int depth, ScanProgress &scan);
+bool skipObject(const char *&p, const char *end, int depth, ScanProgress &scan);
+bool skipArray(const char *&p, const char *end, int depth, ScanProgress &scan);
+
+bool skipPrimitive(const char *&p, const char *end)
+{
+    if (p >= end) {
+        return false;
+    }
+    const char c = *p;
+    if (c == '"') {
+        return skipString(p, end);
+    }
+    if (c == 't') {
+        return matchLiteral(p, end, "true", 4);
+    }
+    if (c == 'f') {
+        return matchLiteral(p, end, "false", 5);
+    }
+    if (c == 'n') {
+        return matchLiteral(p, end, "null", 4);
+    }
+    if (c == '-' || (c >= '0' && c <= '9')) {
+        return skipNumber(p, end);
+    }
+    return false;
+}
+
+bool skipObject(const char *&p, const char *end, int depth, ScanProgress &scan)
+{
+    if (depth <= 0) {
+        return false; // nest deeper than the cap
+    }
+    ++p; // '{'
+    p = skipWhitespace(p, end);
+    if (p < end && *p == '}') {
+        ++p;
+        return true;
+    }
+    for (;;) {
+        p = skipWhitespace(p, end);
+        if (p >= end || *p != '"') {
+            return false;
+        }
+        if (!skipString(p, end)) {
+            return false;
+        }
+        p = skipWhitespace(p, end);
+        if (p >= end || *p != ':') {
+            return false;
+        }
+        ++p;
+        if (!skipValue(p, end, depth - 1, scan)) {
+            return false;
+        }
+        scan.report(p);
+        p = skipWhitespace(p, end);
+        if (p >= end) {
+            return false;
+        }
+        if (*p == ',') {
+            ++p;
+            continue;
+        }
+        if (*p == '}') {
+            ++p;
+            return true;
+        }
+        return false;
+    }
+}
+
+bool skipArray(const char *&p, const char *end, int depth, ScanProgress &scan)
+{
+    if (depth <= 0) {
+        return false; // nest deeper than the cap
+    }
+    ++p; // '['
+    p = skipWhitespace(p, end);
+    if (p < end && *p == ']') {
+        ++p;
+        return true;
+    }
+    for (;;) {
+        if (!skipValue(p, end, depth - 1, scan)) {
+            return false;
+        }
+        scan.report(p);
+        p = skipWhitespace(p, end);
+        if (p >= end) {
+            return false;
+        }
+        if (*p == ',') {
+            ++p;
+            continue;
+        }
+        if (*p == ']') {
+            ++p;
+            return true;
+        }
+        return false;
+    }
+}
+
+bool skipValue(const char *&p, const char *end, int depth, ScanProgress &scan)
+{
+    p = skipWhitespace(p, end);
+    if (p >= end) {
+        return false;
+    }
+    const char c = *p;
+    if (c == '{') {
+        // pass depth through: skipObject consumes the single decrement for this level
+        return skipObject(p, end, depth, scan);
+    }
+    if (c == '[') {
+        return skipArray(p, end, depth, scan);
+    }
+    // a primitive is a leaf, so it never wastes a nesting level
+    return skipPrimitive(p, end);
+}
+
+/**
+ * @brief Iterates the members of the object starting at @p p.
+ *
+ * For each member invokes @p memberCallback with the key and the byte range of
+ * its value. Advancing @p p is unaffected by the callback.
+ */
+template <typename F>
+bool forEachObjectMember(const char *&p, const char *end, int depth, F &&memberCallback, ScanProgress &scan)
+{
+    if (depth <= 0) {
+        return false; // nest deeper than the cap
+    }
+    ++p; // '{'
+    p = skipWhitespace(p, end);
+    if (p < end && *p == '}') {
+        ++p;
+        return true;
+    }
+    for (;;) {
+        p = skipWhitespace(p, end);
+        if (p >= end || *p != '"') {
+            return false;
+        }
+        QString key;
+        if (!decodeString(p, end, key)) {
+            return false;
+        }
+        p = skipWhitespace(p, end);
+        if (p >= end || *p != ':') {
+            return false;
+        }
+        ++p;
+        const char *valueStart = skipWhitespace(p, end);
+        const char *valueEnd = valueStart;
+        if (!skipValue(valueEnd, end, depth - 1, scan)) {
+            return false;
+        }
+        if (!memberCallback(key, valueStart, valueEnd)) {
+            return false;
+        }
+        p = valueEnd;
+        p = skipWhitespace(p, end);
+        if (p >= end) {
+            return false;
+        }
+        if (*p == ',') {
+            ++p;
+            continue;
+        }
+        if (*p == '}') {
+            ++p;
+            return true;
+        }
+        return false;
+    }
+}
+
+// Counts the direct elements of an array value; returns -1 if the array is malformed.
+int countArrayElements(const char *p, const char *end, int depth, ScanProgress &scan)
+{
+    if (depth <= 0) {
+        return -1; // nest deeper than the cap
+    }
+    ++p; // '['
+    p = skipWhitespace(p, end);
+    int count = 0;
+    if (p < end && *p == ']') {
+        return 0;
+    }
+    for (;;) {
+        if (!skipValue(p, end, depth - 1, scan)) {
+            return -1;
+        }
+        scan.report(p);
+        ++count;
+        p = skipWhitespace(p, end);
+        if (p >= end) {
+            return -1;
+        }
+        if (*p == ',') {
+            ++p;
+            continue;
+        }
+        if (*p == ']') {
+            return count;
+        }
+        return -1;
+    }
+}
+
+} // namespace
+
+namespace RawJson
+{
+
+QList<SetRange> scanSetRanges(const QByteArray &json, ScanError *error, const ScanProgressCallback &progress)
+{
+    QList<SetRange> ranges;
+    if (error) {
+        *error = ScanError{};
+    }
+
+    const auto fail = [&](const QString &message) -> QList<SetRange> {
+        if (error) {
+            error->message = message;
+        }
+        return {};
+    };
+
+    const char *begin = json.constData();
+    const char *end = begin + json.size();
+    if (begin >= end) {
+        return fail(QStringLiteral("empty JSON document"));
+    }
+
+    // Throttle reports to ~100 per scan so a GUI thread unthrottling them never
+    // drowns under per-card interrupts, whatever the document size.
+    ScanProgress scan;
+    scan.begin = begin;
+    scan.size = end - begin;
+    scan.step = std::max<qsizetype>(1, scan.size / 100);
+    scan.callback = progress;
+
+    const char *p = skipWhitespace(begin, end);
+    if (p >= end || *p != '{') {
+        return fail(QStringLiteral("top-level JSON must be an object"));
+    }
+
+    bool foundData = false;
+    bool malformedSetData = false;
+
+    const auto topLevelCallback = [&](const QString &key, const char *valueStart, const char *valueEnd) {
+        if (key == QStringLiteral("data")) {
+            foundData = true;
+            if (valueStart >= valueEnd || *valueStart != '{') {
+                malformedSetData = true;
+                return false;
+            }
+            const char *setP = valueStart;
+            const bool ok = forEachObjectMember(
+                setP, valueEnd, kMaxNestingDepth - 1,
+                [&](const QString &setCode, const char *setStart, const char *setEnd) {
+                    if (setStart >= setEnd || *setStart != '{') {
+                        malformedSetData = true;
+                        return false;
+                    }
+                    SetRange range;
+                    range.dataRange.start = setStart - begin;
+                    range.dataRange.length = setEnd - setStart;
+                    range.code = setCode;
+
+                    const char *memberP = setStart;
+                    const bool metaOk = forEachObjectMember(
+                        memberP, setEnd, kMaxNestingDepth - 2,
+                        [&](const QString &field, const char *fs, const char *fe) {
+                            if (field == QStringLiteral("code")) {
+                                return decodeStringMember(fs, fe, range.code);
+                            }
+                            if (field == QStringLiteral("name")) {
+                                return decodeStringMember(fs, fe, range.name);
+                            }
+                            if (field == QStringLiteral("type")) {
+                                return decodeStringMember(fs, fe, range.type);
+                            }
+                            if (field == QStringLiteral("releaseDate")) {
+                                return decodeStringMember(fs, fe, range.releaseDate);
+                            }
+                            if (field == QStringLiteral("cards")) {
+                                if (fs >= fe) {
+                                    return false;
+                                }
+                                if (*fs != '[') {
+                                    // e.g. "cards": null — treat as an empty array,
+                                    // matching Qt's tolerance.
+                                    return true;
+                                }
+                                range.dataRange.cardCount = countArrayElements(fs, fe, kMaxNestingDepth - 2, scan);
+                                return range.dataRange.cardCount >= 0;
+                            }
+                            return true;
+                        },
+                        scan);
+                    if (!metaOk) {
+                        malformedSetData = true;
+                        return false;
+                    }
+                    ranges.append(range);
+                    return true;
+                },
+                scan);
+            if (!ok) {
+                malformedSetData = true;
+                return false;
+            }
+        }
+        return true;
+    };
+
+    if (!forEachObjectMember(p, end, kMaxNestingDepth, topLevelCallback, scan)) {
+        return fail(malformedSetData ? QStringLiteral("malformed set data") : QStringLiteral("malformed JSON"));
+    }
+    p = skipWhitespace(p, end);
+    if (p != end) {
+        return fail(QStringLiteral("trailing content after top-level JSON object"));
+    }
+    if (!foundData) {
+        return fail(QStringLiteral("missing \"data\" object"));
+    }
+    if (ranges.isEmpty()) {
+        return fail(QStringLiteral("no sets found in \"data\""));
+    }
+    scan.report(end);
+    return ranges;
+}
+
+} // namespace RawJson
\ No newline at end of file
diff --git a/oracle/src/raw_json_scanner.h b/oracle/src/raw_json_scanner.h
new file mode 100644
index 000000000..18030d834
--- /dev/null
+++ b/oracle/src/raw_json_scanner.h
@@ -0,0 +1,91 @@
+#ifndef RAW_JSON_SCANNER_H
+#define RAW_JSON_SCANNER_H
+
+#include <QList>
+#include <QString>
+#include <QtGlobal>
+#include <functional>
+
+class QByteArray;
+
+namespace RawJson
+{
+
+/**
+ * @brief The byte extent of a set's object inside the scanned document, plus
+ * the size of its cards array. This is the slice SetToDownload needs for lazy
+ * per-set parsing; the metadata strings live in SetRange alongside it.
+ */
+struct SetDataRange
+{
+    /** @brief Byte offset of the set's object within the scanned buffer. */
+    qsizetype start = -1;
+    /** @brief Byte length of the set's object, including the surrounding braces. */
+    qsizetype length = 0;
+    /** @brief Number of entries in the set's "cards" array. */
+    int cardCount = 0;
+};
+
+struct SetRange
+{
+    /** @brief The byte slice of this set within the document. */
+    SetDataRange dataRange;
+    QString code;
+    QString name;
+    QString type;
+    QString releaseDate;
+};
+
+struct ScanError
+{
+    bool isError() const
+    {
+        return !message.isEmpty();
+    }
+    QString message;
+};
+
+/**
+ * @brief Optional progress callback receiving @c (bytesRead, totalBytes) while
+ * the document is walked. Invoked from the scanning thread; the caller decides
+ * how the throttled offsets are relayed to a GUI event loop.
+ */
+using ScanProgressCallback = std::function<void(qsizetype bytesRead, qsizetype totalBytes)>;
+
+/**
+ * @brief Scans a full MTGJSON document without materializing the JSON tree.
+ *
+ * Splits the top-level "data" object into per-set byte ranges and reads each
+ * set's metadata directly from the raw bytes. The Oracle importer can then
+ * parse one set at a time during import, keeping peak memory far below a single
+ * QJsonDocument::fromJson() over the whole file.
+ *
+ * The whole document is structurally validated while scanning (strings,
+ * escapes, braces, and a trailing-content check) and nesting depth is capped at
+ * 1024 to match QJsonDocument, so pathologically deep documents fail shallowly
+ * instead of exhausting the stack. Verdicts agree with QJsonDocument::fromJson
+ * on structurally malformed input; unlike Qt, string metadata fields
+ * ("name", "type", "releaseDate", "code") tolerate null / non-string values by
+ * defaulting to empty rather than rejecting the whole document, so one broken
+ * set cannot abort the import of the rest.
+ *
+ * Following QJsonDocument::fromJson's convention, the parsed ranges are
+ * returned by value and any failure is reported through the @p error out
+ * parameter.
+ *
+ * @param json The raw MTGJSON document bytes.
+ * @param error Out parameter. Set to an error ScanError when the document
+ *              cannot be parsed, otherwise left empty. Passing a null
+ *              pointer disables error reporting.
+ * @param progress Optional progress callback. When non-empty it is invoked as
+ *                 the scanner advances through the document, throttled to a
+ *                 tiny fraction of the total size.
+ * @return The detected per-set ranges, or an empty list on failure.
+ */
+QList<SetRange> scanSetRanges(const QByteArray &json,
+                              ScanError *error = nullptr,
+                              const ScanProgressCallback &progress = ScanProgressCallback());
+
+} // namespace RawJson
+
+#endif // RAW_JSON_SCANNER_H
\ No newline at end of file
diff --git a/oracle/src/zip/unzip.cpp b/oracle/src/zip/unzip.cpp
index 1e5910051..8e52ece18 100755
--- a/oracle/src/zip/unzip.cpp
+++ b/oracle/src/zip/unzip.cpp
@@ -245,7 +245,6 @@ UnZip::ErrorCode UnzipPrivate::openArchive(QIODevice* dev)
  \internal Parses a local header record and makes some consistency check
  with the information stored in the Central Directory record for this entry
  that has been previously parsed.
- \todo Optional consistency check (as a ExtractionOptions flag)
 
  local file header signature     4 bytes  (0x04034b50)
  version needed to extract       2 bytes
@@ -262,6 +261,7 @@ UnZip::ErrorCode UnzipPrivate::openArchive(QIODevice* dev)
  file name (variable size)
  extra field (variable size)
 */
+//! \todo Optional consistency check (as a ExtractionOptions flag)
 UnZip::ErrorCode UnzipPrivate::parseLocalHeaderRecord(const QString& path, const ZipEntryP& entry)
 {
     Q_ASSERT(device);
diff --git a/oracle/translations/oracle_de.ts b/oracle/translations/oracle_de.ts
index b3f1d9259..196315a36 100644
--- a/oracle/translations/oracle_de.ts
+++ b/oracle/translations/oracle_de.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Einführung</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>Dieser Assistent wird eine Liste aller Editionen, Karten und Spielsteine importieren, die von Cockatrice genutzt werden.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation>Interfacesprache:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>Version:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Quellenauswahl</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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>Bitte geben Sie eine kompatible Quelle für die Liste der Editionen und Karten an. Sie können eine URL-Adresse zum Herunterladen angeben oder eine existierende Datei von Ihrem Computer verwenden.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>Lokale Datei:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>Standard-URL wiederherstellen</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Datei auswählen...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>Editionsdatei wird geladen</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation>Sets Datei (%1)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Fehler</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>Die eingegebene URL ist nicht gültig.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>Herunterladen (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
-        <translation>Bitte wählen Sie eine Datei.</translation>
+        <translation>Bitte wähle eine Datei aus.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Datei &apos;%1&apos; kann nicht geöffnet werden.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>Herunterladen (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Netzwerkfehler: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Datei wird verarbeitet</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation>Fehler beim Extrahieren der xz Datei.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Es tut uns Leid, diese Version von Oracle unterstützt keine xz komprimierten Dateien.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Fehler beim Öffnen des Zip Archivs: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Fehler beim Extrahieren: Das Zip Archiv enthält mehr als eine Datei.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Fehler beim Extrahieren: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Es tut uns Leid, diese Version von Oracle unterstützt keine Zip Archive.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Interpretation der heruntergeladenen Daten fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Möchten Sie stattdessen die unkomprimierte Datei herunterladen?</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Die Datei wurde erfolgreich abgerufen, sie enthält aber keine Editionsdaten.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation>Speichere Spoilerdatenbank</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; Spoilerdatenbank (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation>Spoiler</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation>Spoilerimport</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Bitte geben Sie eine kompatible Quelle für Spoilerdaten an.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation>Lokale Datei:</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation>Standard-URL wiederherstellen</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation>Datei auswählen...</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>Die Spoilerdatenbank wird in folgendem Pfad gespeichert:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Speichere in benutzerdefiniertem Pfad (nicht empfohlen)</translation>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation>Speichere Spielsteindatenbank</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; Spielsteindatenbank (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation>Spielsteine</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation>Spielsteinimport</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Bitte geben Sie eine kompatible Quelle für Spielsteindaten an.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation>Lokale Datei:</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>Standard-URL wiederherstellen</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation>Datei auswählen...</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation>Die Spielsteindatenbank wird in folgendem Pfad gespeichert:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Speichere in benutzerdefiniertem Pfad (nicht empfohlen)</translation>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>Platzhalter Edition mit Spielsteinen</translation>
     </message>
@@ -254,7 +284,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>Oracle Importer</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation>Fertig</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation>Der Wizard ist fertig.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Sie können nun Cockatrice mit den aktuellen Karten verwenden.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <location filename="src/pages.cpp" line="139"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Falls die Datenbanken nicht automatisch neu geladen werden, starten Sie bitte Cockatrice neu.</translation>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>Es wurden keine Editionen importiert.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>Editionen wurden importiert</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>Eine Cockatrice-Datenbankdatei der Größe %1 MB wurde heruntergeladen.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation>Die folgenden Sets wurden gefunden:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <location filename="src/pages.cpp" line="582"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Drücken Sie &quot;Speichern&quot;, um die importierten Karten in der Datenbank zu speichern.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation>Die Kartendatenbank wird in folgendem Pfad gespeichert:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Speichere in benutzerdefiniertem Pfad (nicht empfohlen)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>Importieren abgeschlossen: %1 Karten.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 Karten importiert.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>Kartendatenbank speichern</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; Kartendatenbank (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>Die Datei konnte nicht gespeichert werden:
 %1 </translation>
@@ -360,34 +390,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation>Lade %1 Datei</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation>%1 Datei (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation>Die bereitgestellte URL ist nicht gültig:</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation>Herunterladen (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation>Bitte wähle eine Datei aus.</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation>Datei &apos;%1&apos; kann nicht geöffnet werden.</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation>Herunterladen (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation>Netzwerkfehler: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation>Die Datei konnte nicht in %1 gespeichert werden</translation>
     </message>
@@ -536,7 +588,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>Deutsch (German)</translation>
     </message>
diff --git a/oracle/translations/oracle_el.ts b/oracle/translations/oracle_el.ts
index 568bc8172..d3a2e081c 100644
--- a/oracle/translations/oracle_el.ts
+++ b/oracle/translations/oracle_el.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Εισαγωγή</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>Αυτός ο αυτόματος οδηγός θα εισάγει τη λίστα των σετ, καρτών και δειγμάτων (tokens) που θα χρησιμοποιηθούν από το Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>Έκδοση:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Επιλογή πηγής</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>URL λήψης:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>Τοπικό αρχείο:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>Επαναφορά προκαθορισμένης διεύθυνσης URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Επιλέξτε αρχείο...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>Φόρτωση αρχείων</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>Η παρεχόμενη διεύθυνση URL δεν είναι έγκυρη.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>Λήψη (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>Παρακαλώ διαλέξτε έναν αρχείο.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Δεν είναι δυνατό να ανοίξει το αρχείο &apos;% 1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>Λήψη (% 1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Σφάλμα δικτύου: % 1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Ανάλυση αρχείου</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Αποτυχία ανοίγματος αρχείου Zip:% 1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Η εξαγωγή zip απέτυχε: το αρχείο Zip δεν περιέχει ακριβώς ένα αρχείο.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Η εξαγωγή zip απέτυχε: % 1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Λυπούμαστε, αυτή η έκδοση του Oracle δεν υποστηρίζει αρχεία τύπου zipped.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Το αρχείο ανακτήθηκε με επιτυχία, αλλά δεν περιέχει σύνολα δεδομένων.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>URL λήψης:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>Επαναφορά προκαθορισμένης διεύθυνσης URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>Εικονικό σετ που περιέχει tokens</translation>
     </message>
@@ -254,7 +284,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>Εισαγωγέας Oracle</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <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"/>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>Δεν έχει εισαχθεί κανένα σετ.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>Εισαγόμενα σετς</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>Η εισαγωγή ολοκληρώθηκε: % 1 κάρτες.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 κάρτες εισήχθησαν</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>Αποθήκευση κάρτας βάσης δεδομένων</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; κάρτα βάσης δεδομένων (* .xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>Δεν ήταν δυνατή η αποθήκευση του αρχείου στο %1</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>Ελληνικά (Greek)</translation>
     </message>
diff --git a/oracle/translations/oracle_en_US.ts b/oracle/translations/oracle_en_US.ts
index f25fb6209..394e10b92 100644
--- a/oracle/translations/oracle_en_US.ts
+++ b/oracle/translations/oracle_en_US.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Introduction</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation>Interface language:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>Version:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Source selection</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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>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.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>Local file:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>Restore default URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Choose file...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>Load sets file</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation>Sets file (%1)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>The provided URL is not valid.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>Downloading (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>Please choose a file.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Cannot open file &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>Downloading (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Network error: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Parsing file</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation>Xz extraction failed.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Sorry, this version of Oracle does not support xz compressed files.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Failed to open Zip archive: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Zip extraction failed: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Sorry, this version of Oracle does not support zipped files.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Failed to interpret downloaded data.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Do you want to download the uncompressed file instead?</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>The file was retrieved successfully, but it does not contain any sets data.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation>Save spoiler database</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; spoiler database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation>spoiler</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation>Spoilers import</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Please specify a compatible source for spoiler data.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation>Local file:</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation>Restore default URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation>Choose file...</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>The spoiler database will be saved at the following location:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Save to a custom path (not recommended)</translation>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation>Save token database</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; token database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation>tokens</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation>Tokens import</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Please specify a compatible source for token data.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation>Local file:</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>Restore default URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation>Choose file...</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation>The token database will be saved at the following location:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Save to a custom path (not recommended)</translation>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>Dummy set containing tokens</translation>
     </message>
@@ -254,7 +284,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>Oracle Importer</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation>Finished</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation>The wizard has finished.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>You can now start using Cockatrice with the newly updated cards.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <location filename="src/pages.cpp" line="139"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</translation>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>No set has been imported.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>Sets imported</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>A cockatrice database file of %1 MB has been downloaded.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation>The following sets have been found:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <location filename="src/pages.cpp" line="582"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation>The card database will be saved at the following location:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Save to a custom path (not recommended)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation>&amp;Save</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>Import finished: %1 cards.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 cards imported</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>Save card database</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; card database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>The file could not be saved to %1</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation>Load %1 file</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation>%1 file (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation>The provided URL is not valid: </translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation>Downloading (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation>Please choose a file.</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation>Cannot open file &apos;%1&apos;.</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation>Downloading (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation>Network error: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation>The file could not be saved to %1</translation>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>English</translation>
     </message>
diff --git a/oracle/translations/oracle_es.ts b/oracle/translations/oracle_es.ts
index 390e23ba7..c11c1740a 100644
--- a/oracle/translations/oracle_es.ts
+++ b/oracle/translations/oracle_es.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Introducción</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>Este instalador importará la lista de ediciones, cartas y fichas que va a usar Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation>Idioma de la interfaz:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>Versión:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Seleccionar origen</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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>Por favor especifica un origen compatible para la lista de sets y cartas. Puedes especificar la URL de donde descargarla o usar un archivo existente de tu ordenador.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>URL de descarga:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>Archivo local:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>Restablecer URL predeterminada</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Elegir archivo...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>Cargar archivo de ediciones</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
-        <translation type="unfinished"/>
+        <translation>Archivo de ediciones (%1)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Error</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>La URL suministrada no es válida.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>Descargando (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>Por favor elija un archivo.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>No se puede abrir el archivo &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>Descargando (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Error de red: %1</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Procesando archivo</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation>Extracción de Xz fallida</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Lo sentimos, esta versión de Oracle no soporta archivos comprimidos xz</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Error al abrir el archivo Zip: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Fallo al extraer el contenido: el Zip contiene más de un archivo.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Error al extraer el contenido del Zip: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Lo sentimos, esta versión de Oracle no soporta archivos comprimidos.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>No se pudieron interpretar los datos descargados.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>¿Prefieres descargar el archivo sin comprimir?</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>El archivo fue cargado correctamente pero no contiene datos sobre ningún set.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation>Guardar la base de datos de spoilers</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; base de datos de spoilers (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation>spoiler</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation>Importar spoilers</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Por favor elija un origen compatible para los datos de los spoilers.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation>URL de descarga:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation>Archivo local:</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation>Restaurar URL por defecto</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation>Elegir archivo...</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>La base de datos de los spoilers será guardada en la siguiente ubicación:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Guardar en una ruta personalizada (no recomendado)</translation>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation>Guardar base de datos de fichas</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; base de datos de fichas (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation>fichas</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation>Importar tokens</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Por favor elija un origen compatible para los datos de las fichas.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>URL de descarga:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation>Archivo local:</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>Restablecer URL predeterminada</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation>Elegir archivo...</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation>La base de datos de las fichas será guardada en la siguiente ubicación:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Guardar en una ruta personalizada (no recomendado)</translation>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>Set dedicado para tokens</translation>
     </message>
@@ -254,7 +284,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>Importador de Oracle</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation>Completado</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation>El asistente ha terminado.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Ahora puedes usar Cockatrice con las cartas actualizadas.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <location filename="src/pages.cpp" line="139"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Si las bases de datos de cartas no se recargan automáticamente, reinicia el cliente de Cockatrice.</translation>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>Ningún set ha sido importado.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>Sets importados</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>Se ha descargado un archivo de base de datos cockatrice de %1 MB.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation>Las siguientes ediciones han sido encontradas:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <location filename="src/pages.cpp" line="582"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Pulsa &quot;Guardar&quot; para guardar las cartas importadas en la base de datos de Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation>La base de datos de cartas ha sido guardada en la siguiente ubicación:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Guardar en una ruta personalizada (no recomendado)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation>&amp;Guardar</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>Importación terminada: %1 cartas.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 cartas importadas</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>Guardar base de datos de cartas</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; base de datos de cartas (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>El archivo no ha podido ser guardado en %1</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation>Cargar archivo de %1</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation>archivo de %1 (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation>La URL proporcionada no es válida:</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation>Descargando (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation>Por favor elija un archivo.</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation>No se puede abrir el archivo &apos;%1&apos;.</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation>Descargando (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation>Error de red: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation>El archivo no ha podido ser guardado en %1</translation>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>Español (Spanish)</translation>
     </message>
@@ -550,7 +602,7 @@
     <message>
         <location filename="src/main.cpp" line="63"/>
         <source>Run in no-confirm background mode</source>
-        <translation type="unfinished"/>
+        <translation>Ejecutar en modo del segundo plano sin confirmación</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/oracle/translations/oracle_et.ts b/oracle/translations/oracle_et.ts
index dc6b079be..5a5e915db 100644
--- a/oracle/translations/oracle_et.ts
+++ b/oracle/translations/oracle_et.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Sissejuhatus</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>See võlur impordib Cockatrice’is kasutatava nimekirja komplektidest, kaartidest ja märgistustest.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>Versioon:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Allika valik</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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>Palun täpsusta ühilduv allikas komplektide ja kaartide nimekirja jaoks. Võid täpsustada URL-i aadressi, mis laaditakse alla või kasutada olemasolevat faili oma arvutist.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>Allalaadimise URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>Fail arvutis:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>Taasta tavaURL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Valige fail....</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>Lae komplektide kaust</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Viga</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>Antud URl pole kehtiv.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>Allalaadimine (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>Palun valige fail.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Ei suudeta avada &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>Allalaadimine (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Võrgu viga: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Faili hankimine</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation>Xzi lahtipakkimine nurjus.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Vabandame, aga antud Oracle’i versioon ei toeta xz kokkupakitud faile.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Zip-arhiivi avamine ebaõnnestus: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Zip-i lahtipakkimine ebaõnnestus: Zip-arhiiv sisaldab rohkem faile kui üks.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Zipi lahtipakkimine ebaõnnestus: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Vabandame, aga antud Oracle versioon ei toeta kokkupakitud faile.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Soovid alla laadida hoopis pakkimata faili?</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Fail on edukalt alla laetud, ent ei sisalda andmeid.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation>Salvesta spoileri andmebaas</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; spoileri andmebaas (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation>Spoilerite import</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Täpsusta spoileri andmetega ühilduv allikas.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation>Allalaadimise URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation>Taasta tavaURL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>Spoileri andmebaas salvestatakse järgmisesse asukohta:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salvesta enda määratud asukohta (pole soovitatav)</translation>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation>Salvesta märgistuste andmebaas</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; märgistuste andmebaas (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation>Märgistuste importimine</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Täpsusta märgistuste andmetega ühilduv allikas.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>Allalaadimise URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>Taasta tavaURL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation>Märgistuste andmebaas salvestatakse järgmisesse asukohta:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salvesta enda määratud asukohta (pole soovitatav)</translation>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>Nukk-komplekt mis sisaldab märgistusi</translation>
     </message>
@@ -254,7 +284,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>Oracle sissetooja</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation>Võlur on lõpetanud.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Nüüd saad Cockatrice’i kasutada uhiuute kaartidega.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <location filename="src/pages.cpp" line="139"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Kui kaardi andmebaasid ei lae ise, taaskäivita Cockatrice’i klient.</translation>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>Komplekti pole sisse toodud.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>Allalaetud komplektid</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation>Leiti järgmised komplektid:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <location filename="src/pages.cpp" line="582"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Vajuta „Salvesta“, et salvestada imporditud kaardid Cockatrice’i andmebaasi.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation>Kaardi andmebaas salvestatakse järgmisesse asukohta:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salvesta enda määratud asukohta (pole soovitatav)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation>&amp;Salvesta</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>%1 kaarti imporditi edukalt.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: imporditi %2 kaarti</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>Salvesta kaartide andmebaas</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; kaartide andmebaas (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>Faili salvestamine asukohta %1 ebaõnnestus</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation>Allalaadimine (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation>Allalaadimine (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation>Võrgu viga: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation>Faili salvestamine asukohta %1 nurjus</translation>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>Eesti Keel (Estonian)</translation>
     </message>
diff --git a/oracle/translations/oracle_fi.ts b/oracle/translations/oracle_fi.ts
index defa76c63..e2a193ca4 100644
--- a/oracle/translations/oracle_fi.ts
+++ b/oracle/translations/oracle_fi.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Johdanto</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>Tämä työkalu asentaa Cockatricessa käytettävät setit, kortit ja tokenit.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation>Käyttöliittymän kieli:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>Versio:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Lähteen määritys</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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>Ole hyvä ja määritä lähde setti- ja korttilistalle. Voit määrittää ladattavan URL-osoitteen tai käyttää tietokoneellasi olevaa tiedostoa.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>Ladattavan tiedoston URL-osoite:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>Paikallinen tiedosto:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>Palauta oletus-URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Valitse tiedosto...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>Ladatta ekspansiotiedosto</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Virhe</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>Määritetty URL on virheellinen.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>Ladataan (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>Valitse tiedosto.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Ei voida avata tiedostoa &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>Ladataan (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Yhteysvirhe: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Jäsennellään tiedostoa</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation>Xz purku epäonnistui.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Pahoittelut. Tämä versio Oraclesta ei tue xz-pakattuja tiedostoja.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Zip-tiedoston avaaminen epäonnistui: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Zip-tiedoston purkaminen epäonnistui: Zip-tiedosto ei sisällä tarkalleen yhtä tiedostoa.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Zip-tiedoston purkaminen epäonnistuie: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Pahoittelut. Tämä versio Oraclesta ei tue Zip-pakattuja tiedostoja.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Ladattujen tietojen tulkitseminen epäonnistui.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Haluatko sensijaan ladata pakkaamattoman tiedoston?</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Tiedosto palautettiin onnistuneesti, mutta se ei sisällä yhdenkään ekspansion dataa.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation>Tallenna spoileritietokanta</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; spoileritietokanta (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation>Spoilerien lataus</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Ole hyvä ja osoita yhteensopiva spoileridatan lähde.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation>Ladattavan tiedoston URL-osoite:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation>Palauta oletus-URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>Spoileritietokanta tallennetaan seuraavaan sijaintiin:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Tallenna mukautettuun sijaintiin (ei-suositeltu)</translation>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation>Tallenna tokenitietokanta</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; tokenitietokanta (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation>Tokenien lataus</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Ole hyvä ja osoita yhteensopiva tokenidatan lähde.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>Ladattavan tiedoston URL-osoite:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>Palauta oletus-URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation>Tokenitietokanta tallennetaan seuraavaan sijaintiin:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Tallenna mukautettuun sijaintiin (ei-suositeltu)</translation>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>Tokeneja sisältävä mallisetti</translation>
     </message>
@@ -254,7 +284,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>Oracle-lataaja</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation>Valmis</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation>Asennusohjelma on valmis.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Voit nyt käyttää Cockatricea juuri päivitetyillä korteilla.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <location filename="src/pages.cpp" line="139"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Jos korttitietokannat eivät päivity automaattisesti, käynnistä Cockatrice uudelleen.</translation>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>Yhtään settiä ei ladattu.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>Ladatut ekspansiot</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>Cockatrice tietokantatiedosto kooltaan %1 MB on ladattu.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation>Seuraavat setit löydettiin:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <location filename="src/pages.cpp" line="582"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Paina &quot;Tallenna&quot; varastoidaksesi ladatut kortit Cockatricen tietokantaan.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation>Korttitietokanta tallennetaan seuraavaan sijaintiin:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Tallenna mukautettuun sijaintiin (ei-suositeltu)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation>&amp;Tallenna</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>Lataaminen valmis: %1 kortit.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 kortit ladattu</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>Tallenna korttitietokanta</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; korttitietokanta (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>Tiedostoa ei voitu tallentaa osoitteeseen %1</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation>Ladataan (0 MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation>Ladataan (%1 MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation>Yhteysvirhe: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation>Tiedostoa ei voitu tallentaa osoitteeseen %1</translation>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>Suomi (Finnish)</translation>
     </message>
diff --git a/oracle/translations/oracle_fr.ts b/oracle/translations/oracle_fr.ts
index 131dc0eb4..590a0b879 100644
--- a/oracle/translations/oracle_fr.ts
+++ b/oracle/translations/oracle_fr.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Introduction</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>Cet assistant va importer la liste des éditions, cartes et jetons qui seront utilisés par Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation>Langage de l&apos;interface :</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>Version :</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Choix du fichier source</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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>Veuillez spécifier une source compatible pour la liste d&apos;éditions et de cartes. Vous pouvez spécifier une URL qui sera utilisée pour télécharger un fichier ou utiliser un fichier existant sur votre ordinateur.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>URL de téléchargement :</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>Fichier local :</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>Restaurer l&apos;URL par défaut</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Choisissez un fichier...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>Charger une liste d&apos;éditions</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation>Choisir le fichier (%1)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Erreur</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>L&apos;URL fournie n&apos;est pas valable</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>Téléchargement en cours (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>Choisissez un fichier.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Impossible d&apos;ouvrir le fichier &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>Téléchargement (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Erreur réseau : %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Traitement du fichier.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation>L&apos;extraction du zip à échoué.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Désolé, cette version d&apos;Oracle ne supporte pas les fichiers zip.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Impossible d&apos;ouvrir l&apos;archive zip: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Extraction zip échouée: l&apos;archive zip contient plus qu&apos;un fichier.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>L&apos;extraction du zip a échoué : %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Désolé, cette version d&apos;Oracle ne supporte pas les fichiers zip.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Échec lors de l&apos;interprétation des données téléchargées.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Voulez-vous télécharger le fichier non compressé à la place ?</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Le fichier a été trouvé, mais ne contient aucune éditions.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation>Enregistrer la base de données des spoilers</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML ; base de données des spoilers (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation>spoiler</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation>Importation des spoilers</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Veuillez spécifier une source compatible pour les spoilers.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation>URL de téléchargement :</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation>Fichier local:</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation>Restaurer l&apos;URL par défaut</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation>Choisissez un fichier...</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>La base de données des spoilers sera enregistrée à l&apos;emplacement suivant :</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Sauvegarder à un emplacement personnalisé (non recommandé)</translation>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation>Enregistrer la base de données des jetons</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML ; base de données des jetons (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation>jetons</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation>Importation des jetons</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Veuillez spécifier une source compatible pour les jetons.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>URL de téléchargement:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation>Ficher local:</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>Restaurer l&apos;URL par défaut</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation>Choisissez un ficher...</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation>La base de données des jetons sera enregistrée à l&apos;emplacement suivant :</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Sauvegarder à un emplacement personnalisé (non recommandé)</translation>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>Fausse édition contenant les jetons</translation>
     </message>
@@ -254,7 +284,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>Importateur Oracle</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation>Terminé</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation>L&apos;assistant a terminé.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Vous pouvez maintenant commencer à utiliser Cockatrice avec les cartes mises à jour.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <location filename="src/pages.cpp" line="139"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Si les bases de données de cartes ne rechargent pas automatiquement, redémarrez le client Cockatrice.</translation>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>Aucune édition n&apos;a été importé.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>Éditions importées</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>Un fichier de base de données Cockatrice de %1 MB a été téléchargé.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation>Les éditions suivantes ont été trouvées :</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <location filename="src/pages.cpp" line="582"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Cliquez sur « Enregistrer » pour enregistrer les cartes importées dans la base de données de Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation>La base de données des cartes sera enregistrée à l&apos;emplacement suivant :</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Sauvegarder à un emplacement personnalisé (non recommandé)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>Import terminé: %1 cartes.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 cartes ajoutées.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>Sauvegarder la base de carte</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML ; base de données de cartes (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>Le fichier n&apos;a pu être sauvegarder au chemin &apos;%1&apos;</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation>Chargez le fichier %1</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation>fichier %1 (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation>L&apos;URL fournie n&apos;est pas valide :</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation>Téléchargement (0 Mo)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation>Merci de choisir un fichier.</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation>Le fichier &apos;%1&apos; ne peut pas être ouvert.</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation>Téléchargement (%1 Mo)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation>Erreur réseau : %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation>Le fichier n&apos;a pas pu être enregistré dans %1</translation>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>Français (French)</translation>
     </message>
diff --git a/oracle/translations/oracle_it.ts b/oracle/translations/oracle_it.ts
index fe925eba6..e266209d1 100644
--- a/oracle/translations/oracle_it.ts
+++ b/oracle/translations/oracle_it.ts
@@ -2,23 +2,23 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Introduzione</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>Questo wizard importerà la lista di set, carte
 e pedine che verranno usate da Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation>Lingua dell&apos;interfaccia:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>Versione:</translation>
     </message>
@@ -26,134 +26,134 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Selezione sorgente</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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>Specifica una sorgente compatibile per la lista dei set e delle carte. Puoi specificare un indirizzo URL da cui scaricare il file o selezionare un file già presente nel tuo computer.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>Indirizzo download:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>File nel pc:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>Usa l&apos;indirizzo predefinito</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Scegli file...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>Carica file dei set</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation>File dei set (%1)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Errore</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>L&apos;indirizzo specificato non è valido.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>Scaricamento (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>Seleziona un file.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Impossibile aprire il file &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>Scaricamento (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Errore di rete: %1</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Analisi dei file</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation>Estrazione da file xz fallita.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Spiacente, ma questa versione di Oracle non supporta i file xz.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Impossibile aprire il file Zip: %1</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Estrazione file Zip fallita: lo Zip non contiene un solo file.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Estrazione file Zip fallita: %1</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Spiacente, ma questa versione di Oracle non supporta i file zip.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Impossibile interpretare i dati scaricati.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Vuoi provare a scaricare il file non compresso?</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Il file è stato analizzato correttamente, ma non contiene i dati di nessun set.</translation>
     </message>
@@ -161,42 +161,57 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation>Salva archivio spoiler</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; archivio spoiler (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation>spoiler</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation>Importazione spoiler</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Specifica una sorgente compatibile per gli spoiler.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation>Indirizzo download:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation>File nel pc:</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation>Usa l&apos;indirizzo predefinito</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation>Scegli file...</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>L&apos;archivio degli spoiler verrà salvato nel seguente percorso:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salva in un percorso diverso (sconsigliato)</translation>
     </message>
@@ -204,42 +219,57 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation>Salva archivio pedine</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; archivio pedine (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation>pedine</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation>Importazione pedine</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Specifica una sorgente compatibile per le pedine.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>Indirizzo download:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation>File nel pc:</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>Usa l&apos;indirizzo predefinito</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation>Scegli file...</translation>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation>L&apos;archivio delle pedine verrà salvato nel seguente percorso:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salva in un percorso diverso (sconsigliato)</translation>
     </message>
@@ -247,7 +277,7 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>Set finto contenente i token</translation>
     </message>
@@ -255,7 +285,7 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>OracleWizard</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="106"/>
+        <location filename="src/oraclewizard.cpp" line="101"/>
         <source>Oracle Importer</source>
         <translation>Oracle Importer</translation>
     </message>
@@ -263,22 +293,22 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation>Finito</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation>Il wizard è completato.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Adesso puoi iniziare ad usare Cockatrice con le nuove carte aggiornate.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <location filename="src/pages.cpp" line="139"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Se il database delle carte non si ricarica in automatico, riavvia il programma Cockatrice.</translation>
     </message>
@@ -286,73 +316,73 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>Nessun set importato.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>Set importati</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>È stato scaricato un file database di Cockatrice di %1 MB.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation>Sono stati trovati i seguenti set:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <location filename="src/pages.cpp" line="582"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Premi &quot;Salva&quot; per salvare le carte importate nel database di Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation>L&apos;archivio delle carte verrà salvato nel seguente percorso:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salva in un percorso diverso (sconsigliato)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation>&amp;Salva</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>Importazione conclusa: %1 carte.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 carte importate</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>Salva archivio carte</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; archivio carte (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>Impossibile salvare il file su %1</translation>
     </message>
@@ -360,34 +390,56 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation>Carica %1 file</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation>%1 file (%1)</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation>L&apos;indirizzo fornito non è valido:</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation>Scaricamento (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation>Seleziona un file.</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation>Impossibile aprire il file &apos;%1&apos;.</translation>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation>Scaricamento (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation>Errore di rete: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation>Impossibile salvare il file su %1</translation>
     </message>
@@ -536,7 +588,7 @@ e pedine che verranno usate da Cockatrice.</translation>
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>Italiano (Italian)</translation>
     </message>
diff --git a/oracle/translations/oracle_ja.ts b/oracle/translations/oracle_ja.ts
index 6a4aae75b..a437db796 100644
--- a/oracle/translations/oracle_ja.ts
+++ b/oracle/translations/oracle_ja.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>はじめに</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>このウィザードでは、Cockatriceで使用されるカードやトークン、セットのリストをインポートします。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation>インターフェース言語:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>バージョン:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>ソース選択</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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>セットとカードのリストの互換性のあるソースを指定してください。ダウンロードするURLアドレスを指定するか、コンピューターから既存のファイルを使用できます。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>ダウンロードURL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>ローカルファイル:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>デフォルトのURLを復元</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>ファイルを選択...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>カードセットファイルを開く</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>エラー</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>指定されたURLは無効です。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>ダウンロード中 (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>ファイルを選択してください。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>&apos;%1&apos;を開けませんでした。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>ダウンロード中 (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>ネットワークエラー: %1。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>ファイルの解析</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation>Xz展開に失敗。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>このバージョンのOracleはxz圧縮ファイルをサポートしていません。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>ZIPアーカイブの展開に失敗: %1。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>ZIP展開に失敗:Zipアーカイブに含まれるファイルが1つだけではありません。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>ZIP展開に失敗: %1。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>申し訳ありませんが現バージョンのOracleはzip形式のファイルをサポートしていません。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>代わりに非圧縮ファイルをダウンロードしますか？</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>ファイルは正常に取得されましたが、カードセットのデータが含まれていませんでした。</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation>スポイラーデータベースを保存</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; スポイラーデータベース (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation>スポイラーインポート</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>互換性のあるスポイラーデータのソースを指定してください。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation>ダウンロードURL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation>デフォルトのURLを復元</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>スポイラーデータベースは、以下の場所に保存されます:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>別のパスに保存（非推奨）</translation>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation>トークンデータベースを保存</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; トークンデータベース (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation>トークンのインポート</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>トークンデータのソースを選択してください。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>ダウンロードURL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>デフォルトのURLを復元</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation>トークンデータベースは以下の場所に保存されます。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>別のパスに保存（非推奨）</translation>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>ダミーセットを含むトークン</translation>
     </message>
@@ -254,7 +284,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>Oracle Importer - オラクル・インポーター</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation>完了しました！</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation>ウィザードが完了しました。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Cockatriceで新しく更新されたカードを使うことが出来ます。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <location filename="src/pages.cpp" line="139"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>カードデータベースが自動的に再読込されない場合は、Cockatriceを再起動して下さい。</translation>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>セットはインポートされませんでした。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>カードセットインポート</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation>次のセットが見つかりました:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <location filename="src/pages.cpp" line="582"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>”保存”をクリックするとインポートしたカードをCockatriceデータベースに保存します。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation>カードデータベースは以下の場所に保存されます:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>別のパスに保存（非推奨）</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation>保存</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>%1枚のカードがインポートされました。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2枚のカードがインポートされました。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>カードデータベースを保存</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; card database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>%1に保存できませんでした。</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation>ダウンロード中 (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation>ダウンロード中 (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation>ネットワークエラー: %1。</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation>%1に保存できませんでした。</translation>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>日本語 (Japanese)</translation>
     </message>
diff --git a/oracle/translations/oracle_ko.ts b/oracle/translations/oracle_ko.ts
index 3712cfe87..3b0b0187c 100644
--- a/oracle/translations/oracle_ko.ts
+++ b/oracle/translations/oracle_ko.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>개요</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation type="unfinished"/>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>확장판 목록 파일 주소 입력</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>다운로드 주소:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>파일 위치:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>기본 주소로 복원</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>파일 선택...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>확장판 목록 파일 불러오기</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>오류</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>잘못된 주소를 입력하셨습니다.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>다운로드 중 (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>확장판 목록 파일을 선택해 주세요.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>파일 &apos;%1&apos;을(를) 열 수 없습니다.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>다운로드 중 (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>네트워크 오류 : %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>목록 파싱중</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>압축파일 열기 실패 : %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>압축 풀기 실패 : 압축 파일에 확장판 목록 파일 이외의 파일이 있습니다.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>압축 풀기 실패 : %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>죄송합니다. 본 버전에서는 압축 파일을 지원하지 않습니다.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>파일을 성공적으로 다운로드 하였으나 확장판 정보가 들어있지 않습니다.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>웹 주소:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>기본 주소로 복원</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>토큰 정보가 들어있는 더미 확장판</translation>
     </message>
@@ -254,7 +284,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>오라클</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <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"/>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>아무 확장판도 불러오지 못했습니다.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>확장판 불러오기 완료</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>총 %1장의 카드 불러오기 완료</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1에서 %2장의 카드 불러옴</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>카드 데이터베이스 저장</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>카드 데이터베이스 XML 파일 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>파일을 %1에 저장 할 수 없습니다.</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>한국어 (Korean)</translation>
     </message>
diff --git a/oracle/translations/oracle_nb.ts b/oracle/translations/oracle_nb.ts
index 86318983b..698076fd5 100644
--- a/oracle/translations/oracle_nb.ts
+++ b/oracle/translations/oracle_nb.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Introduksjon</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation type="unfinished"/>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Kilde valg</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>Nedlastings URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>Lokal fil</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>Gjenopprett standard URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Velg fil...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>Last set fil...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Feil</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>URL du anga er ikke gyldig.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>Laster ned (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>Vennligst velg en fil</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Kunne ikke åpme &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>Laster ned (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Nettverks feil: %1</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Tolker fil.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Kunne ikke åpne Zip Arkiv: %1</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Zip ekstraksjon feilet: Zip arkivet inneholder ikke nøyaktig en fil</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Zip ekstraksjon feilet: %1</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Beklager, denne versjonen av Oracle støtter ikke Zip filer.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Filen ble hentet riktig, men den inneholder ikke noe set data</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>Nedlastings URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>Gjenopprett standard URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>Dummy sett som inneholder tokens</translation>
     </message>
@@ -254,7 +284,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>Oracle importerer</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <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"/>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>Ingen set har blitt importert.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>Set importert</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>Importering fullført: %1 kort.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 kort importert.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>Lagre kort database.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; kort database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>Filen kunne ikke lagres til %1</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>Norsk Bokmål (Norwegian Bokmål)</translation>
     </message>
diff --git a/oracle/translations/oracle_nl.ts b/oracle/translations/oracle_nl.ts
index c48b65964..3fd3cc543 100644
--- a/oracle/translations/oracle_nl.ts
+++ b/oracle/translations/oracle_nl.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Introductie</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>Deze wizard importeert de lijst met sets, kaarten en tokens die door Cockatrice zullen worden gebruikt.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation>Interface taal:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>Versie:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Bron selectie</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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>Gelieve een compatibele bron te vermelden voor de lijst van sets en kaarten. U kunt een URL-adres opgeven dat wordt gedownload of een bestaand bestand van uw computer gebruiken.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>Lokaal bestand</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>Herstel standaard URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Bestand kiezen...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>Bestand laden</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation>Sets bestand (%1)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Fout</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>De ingevoerde URL is niet geldig.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>Downloaden (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>Gelieve een bestand te kiezen.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Bestand &apos;%1&apos; kan niet geopend worden.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>Downloaden (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Netwerk fout: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Parsen van bestand</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation>Xz extractie mislukt.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Sorry, deze versie van Oracle ondersteunt geen xz gecomprimeerde bestanden.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Zip archief kan niet geopend worden: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Uitpakken van Zip niet gelukt: het archief moet precies één bestand bevatten.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Uitpakken van Zip niet gelukt: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Sorry, deze versie van Oracle ondersteunt geen gecomprimeerde bestanden.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Lezen van gedownloade data mislukt.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Wilt u het ongecomprimeerde bestand downloaden?</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Het bestand is succesvol binnengehaald, maar bevat geen set data.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation>Opslaan spoiler database</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; spoiler database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation>Spoilers import</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Gelieve een compatibele bron voor spoilergegevens te specificeren.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation>Herstel standaard URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>De spoiler database wordt op de volgende locatie opgeslagen:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Opslaan naar een aangepaste locatie (niet aanbevolen)</translation>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation>token database opslaan</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; token database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation>Tokens import</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Gelieve een compatibele bron voor tokengegevens op te geven.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>Download URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>Herstel standaard URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation>De token database wordt op de volgende locatie opgeslagen:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Opslaan naar een aangepaste locatie (niet aanbevolen)</translation>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>Token voorbeeldset</translation>
     </message>
@@ -254,7 +284,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>Oracle importer</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation>Klaar</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation>De wizard is klaar.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>U kunt nu beginnen met het gebruik van Cockatrice met de nieuw bijgewerkte kaarten.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <location filename="src/pages.cpp" line="139"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Als de kaartendatabases niet automatisch herladen, start dan de Cockatrice client opnieuw op.</translation>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>Er zijn geen sets geïmporteerd.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>Sets geïmporteerd</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>Een cockatrice database bestand van %1 MB is gedownload.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation>De volgende sets zijn gevonden:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <location filename="src/pages.cpp" line="582"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Druk op &quot;Opslaan&quot; om de geïmporteerde kaarten op te slaan in de Cockatrice database.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation>De kaartendatabase wordt op de volgende locatie opgeslagen:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Opslaan naar een aangepaste locatie (niet aanbevolen)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation>&amp;Opslaan</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>Import klaar: %1 kaarten.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 kaarten geïmporteerd</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>Kaartendatabase opslaan</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; kaart database (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>Het bestand kon niet worden opgeslagen in %1</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation>De ingevoerde URL is niet geldig:</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation>Downloaden (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation>Downloaden (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation>Netwerk fout: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation>Het bestand kon niet worden opgeslagen naar %1</translation>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>Nederlands (Dutch)</translation>
     </message>
diff --git a/oracle/translations/oracle_pl.ts b/oracle/translations/oracle_pl.ts
index 72a28dec4..cad6309a9 100644
--- a/oracle/translations/oracle_pl.ts
+++ b/oracle/translations/oracle_pl.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Wprowadzenie</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>Ten kreator zaimportuje listę dodatków, kart oraz tokenów które zostaną użyte przez Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation>Język interfejsu:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>Wersja:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Wybór źródła</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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>Proszę podać źródło listy edycji i kart. Można podać adres URL, z którego zostanie pobrana, lub istniejący plik na komputerze.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>Pobierz URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>Plik lokalny:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>Przywróć domyślny URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Wybierz plik…</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>Wczytaj listę dodatków</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Błąd</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>Podano nieprawidłowy URL.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>Pobieranie (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>Proszę wybrać plik.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Nie można otworzyć pliku &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>Pobieranie (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Błąd sieci: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Analizowanie pliku</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation>Rozpakowanie XZ nie udało się.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Przepraszamy, ta wersja Oracle nie obsługuje plików spakowanych w archiwum xz.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Otwieranie archiwum Zip zakończone niepowodzeniem: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Rozpakowanie pliku Zip nieudane: archiwum nie zawiera dokładnie jednego pliku.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Rozpakowanie Zip nieudane: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Przepraszamy, ta wersja Oracle nie obsługuje plików spakowanych w archiwum Zip.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Interpretacja pobranych danych nie udała się.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Czy chcesz zamiast tego pobrać plik nieskompresowany?</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Plik został pobrany z powodzeniem, ale nie zawiera informacji o dodatkach.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation>Zapisz bazę danych spoilerów.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; baza danych spoilerów (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation>Import spoilerów</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Proszę wybrać kompatybilne źródło danych ze spoilerami.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation>URL pobierania: </translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation>Przywróć domyślny URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>Baza danych spoilerów zostanie zapisana w tym miejscu:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Zapisz do niestandardowej ścieżki (niezalecane)</translation>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation>Zapisz bazę danych tokenów.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; baza danych tokenów (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation>Import tokenów</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Proszę wybrać kompatybilne źródło danych z tokenami.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>Pobierz odnośnik:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>Przywróć domyślny URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation>Baza danych tokenów zostanie zapisana w tym miejscu:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Zapisz do niestandardowej ścieżki (niezalecane)</translation>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>Dodatek-atrapa, zawierający tokeny.</translation>
     </message>
@@ -254,7 +284,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>Oracle – kreator importu</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation>Zakończone</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation>Kreator zakończył swoją pracę.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Możesz teraz korzystać z Cockatrice z nowo zaktualizowanymi kartami.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <location filename="src/pages.cpp" line="139"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Jeżeli bazy kart nie przeładują się automatycznie, zrestartuj klienta Cockatrice.</translation>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>Nie zaimportowano żadnego dodatku.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>Zaimportowane dodatki</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>Baza danych Cockatrice mająca %1 MB została pobrana.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation>Następujące dodatki zostały znalezione:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <location filename="src/pages.cpp" line="582"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Kliknij &quot;Zapisz&quot; aby zapisać zaimportowane karty w bazie danych Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation>Baza danych kart zostanie zapisana w tym miejscu:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Zapisz do niestandardowej ścieżki (niezalecane)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>Import zakończony: %1 kart.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: zaimportowano %2 kart</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>Zapisz bazę kart</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML, baza kart (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>Plik nie mógł zostać zapisany do %1</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation>Pobieranie (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation>Pobieranie (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation>Błąd sieci: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation>Plik nie mógł zostać zapisany do %1</translation>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>Polski (Polish)</translation>
     </message>
diff --git a/oracle/translations/oracle_pt.ts b/oracle/translations/oracle_pt.ts
index 6c43458f0..069f3013e 100644
--- a/oracle/translations/oracle_pt.ts
+++ b/oracle/translations/oracle_pt.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Introdução</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation type="unfinished"/>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Selecção da fonte</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>URL de download:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>Ficheiro local:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>URL para repor definições de origem</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Escolher ficheiro...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>Carregar ficheiro das edições</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>O URL fornecido não é válido.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>A efectuar download (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>Por favor escolha um ficheiro.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Impossível abrir ficheiro &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>A efectuar download (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Erro da rede: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Ficheiro de análise</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Abrir archivo zip falhou: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Extracção do ZIP falhada: o arquivo ZIP não contem exactamente um ficheiro.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Extração do Zip falhada: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Pedimos desculpa, mas esta versão do Oracle não suporta ficheiros zipados.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>O ficheiro foi recuperado com sucesso, mas não contem nenhum dado sobre expansões.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>URL de download:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>URL para repor definições de origem</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>Set básico contendo fichas</translation>
     </message>
@@ -254,7 +284,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>Importar Oracle</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <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"/>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>Nenhuma expansão foi importada.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>Edições importadas</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>Importação terminada: %1 cartas.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1. %2 cartas importadas</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>Guardar base de dados das cartas</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; Base de dados de cartas (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>O ficheiro não pode ser gravado em %1</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>Português (Portuguese)</translation>
     </message>
diff --git a/oracle/translations/oracle_pt_BR.ts b/oracle/translations/oracle_pt_BR.ts
index f4cc27e75..30c4e5e65 100644
--- a/oracle/translations/oracle_pt_BR.ts
+++ b/oracle/translations/oracle_pt_BR.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Introdução</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>Esse recurso irá importar a lista de coleções, cartas e fichas que serão utilizadas pelo Cokatrice.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation>Idioma da interface:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>Versão:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Selecione a origem</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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>Por  favor especifique uma fonte compatível de expansões e cartas. Você pode especificar um endereço URL que será baixado ou usar um arquivo existente no seu computador.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>Endereço para download:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>Arquivo local:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>Restaurar URL padrão</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Escolha o arquivo...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>Carregar arquivos de expansão</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation>Arquivo de expansões (%1)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Erro</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>A URL escolhida não é valida</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>Baixando (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>Por favor, escolha um arquivo;</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Não pode abrir arquivo &apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>Baixando (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Erro na conexão com a internet: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Analisando arquivo</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation>Extração de arquivo .xz falhou</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Desculpe, esta versão do Oracle não suporta arquivos comprimidos no formato .xz</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Falhou em abrir o arquivo Zip: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>A extração do arquivo ZIP falhou: o arquivo ZIP não contém exatamente um arquivo.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Extração do arquivo Zip falhou: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Desculpe, esta versão do Oracle não suporta arquivos compactados.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Falha ao interpretar dados baixados</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Gostaria de baixar os arquivos descomprimidos, em vez disso?</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>O arquivo foi recebido com sucesso, mas não contém qualquer informação de expansão.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation>Salvar base de dados de spoiler</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; base de dados de spoilers (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation>Importar spoilers</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Por favor, selecione uma fonte compatível para os dados de spoilers.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation>Endereço para download:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation>Restaurar URL padrão</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>A base de dados de spoilers será salva no seguinte diretório:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salvar em diretório customizado (não recomendado)</translation>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation>Salvar base de dados de tokens</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; base de dados de token (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation>Importar tokens</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>Por favor especifique uma fonte compatível para os dados de tokens.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>Endereço para download:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>Restaurar URL padrão</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation>A base de dados de tokens será salva no seguinte diretório:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salvar em diretório customizado (não recomendado)</translation>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>Esta expansão contém fichas.</translation>
     </message>
@@ -254,7 +284,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>Importador Oracle</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation>Finalizado</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation>O recurso terminou.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Agora você pode começar a usar o Cockatrice com as novas cartas atualizadas.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <location filename="src/pages.cpp" line="139"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>Se a base de dados das cartas não for atualizada automaticamente, reinicie o cliente do Cockatrice.</translation>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>O set não foi importado.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>Expansões importadas</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>Um arquivo de %1 MB de banco de dados do cockatrice foi baixado.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation>As seguintes expansões foram encontradas:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <location filename="src/pages.cpp" line="582"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>Aperte &quot;Salvar&quot; para guardar as cartas importadas na base de dados do Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation>A base de dados de cartas será salva no seguinte diretório:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>Salvar em diretório customizado (não recomendado)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation>&amp;Salvar</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>Importação finalizada: %1 cartas.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 cartas importadas</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>Carta salva no banco de dados</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; banco de dados de cartas (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>O arquivo não pode ser salvo para %1</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation>Baixando (0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation>Baixando (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation>Erro de rede: %1</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation>O arquivo não pode ser salvo em %1</translation>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>Português do Brasil (Brazilian Portuguese)</translation>
     </message>
diff --git a/oracle/translations/oracle_ru.ts b/oracle/translations/oracle_ru.ts
index 013f5dfce..4e1bcd3c6 100644
--- a/oracle/translations/oracle_ru.ts
+++ b/oracle/translations/oracle_ru.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Введение</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>Эта программа импортирует перечень выпусков, карт и фишек, которые будут использоваться в Cockatrice.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation>Язык интерфейса:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>Версия</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Выбор источника</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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>Пожалуйста, укажите источник для перечня сетов и карт. Вы можете использовать ссылку или уже существующий локальный файл.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>Ссылка на скачивание:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>Локальный файл:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>Восстановить ссылку по умолчанию</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Выбрать файл..</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>Загрузить файл сетов</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation>Файл (%1)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>Предоставленная ссылка некорректна.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>Загрузка (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>Пожалуйста, выберите файл.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Не удалось открыть файл &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>Загрузка (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Ошибка сети: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Ожидание файла</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation>Ошибка распаковки архива</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Данная версия Oracle не поддерживает архивы xz</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Не удалось загрузить zip-архив: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Ошибка распаковки: zip-архив содержит больше одного файла.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Ошибка распаковки zip-архива: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Данная версия Oracle не поддерживает zip-архивы.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>Ошибка в обработке загруженных данных</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Хотите вместо этого загрузить новую несжатую копию?</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Файл успешно получен, но в нем не содержится данных о сетах.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation>Сохранить базу карт</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; база карт (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation>Импорт карт</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Укажите совместимый ресурс для импорта базы карт</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation>Ссылка на скачивание:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation>Восстановить ссылку по умолчанию</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>База карт будет сохранена в следующей директории:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>Ссылка на скачивание:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>Восстановить ссылку по умолчанию</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>Пример сета с фишками</translation>
     </message>
@@ -254,7 +284,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>Импортер Oracle</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <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"/>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>Не было импортировано ни одного сета.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>Импортировано сетов</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>Импорт завершен: %1 карт.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1: %2 карт импортировано</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>Сохранить базу карт</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>База карт (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>Не удалось сохранить файл в %1</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>Русский (Russian)</translation>
     </message>
diff --git a/oracle/translations/oracle_sr.ts b/oracle/translations/oracle_sr.ts
index 2e6cfa1be..9532030b3 100644
--- a/oracle/translations/oracle_sr.ts
+++ b/oracle/translations/oracle_sr.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Uvod</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation type="unfinished"/>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Odabir izvora</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>URL za preuzimanje:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>Lokalni fajl:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>Povrati uobičajeni URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Izaberite fajl...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Greška</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>Dati URL nije važeći.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>Preuzimanje (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>Molimo Vas izaberite fajl.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Nemoguće otvori fajl &apos;%1&apos;.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>Preuzimanje (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Mrežna greška: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Parsiranje fajla</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Neuspeh u otvaranju Zip arhive: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Izvinite, ova verzija Oracle-a ne podržava zip fajlove.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <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"/>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>URL za preuzimanje:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation type="unfinished"/>
     </message>
@@ -254,7 +284,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"/>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <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"/>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>Srpski (Serbian)</translation>
     </message>
diff --git a/oracle/translations/oracle_tr.ts b/oracle/translations/oracle_tr.ts
index 06b4e1359..e65124c40 100644
--- a/oracle/translations/oracle_tr.ts
+++ b/oracle/translations/oracle_tr.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>Açıklama</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>Bu sihirbaz Cockatrice tarafından kullanılacak setlerin, kartların ve tokenlerin listesini içe aktaracaktır.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation>Arayüz dili:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>Sürüm:</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>Kaynak seçimi</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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>Lütfen set ve kart listesi için uyumlu bir kaynak belirtin. İndirilecek bir URL adresi belirtebilir veya bilgisayarınızdaki mevcut bir dosyayı kullanabilirsiniz.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>İndirme Bağlantısı:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>Yerel dosya:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>Varsayılan URL&apos;yi geri yükle</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>Dosya seç...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>Set dosyasını yükle</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>Hata</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>Paylaşılan bağlantı geçerli değil.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>İndiriliyor (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>Lütfen dosya seçin.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>Dosya açılamıyor &apos;1%&apos;.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>İndiriliyor (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>Bağlantı hatası: %1</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>Dosya ayrıştırılıyor</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation>Xz çıkarma işlemi başarısız oldu.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>Maalesef, Oracle&apos;ın bu sürümü xz sıkıştırılmış dosyaları desteklemiyor.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>Zip dosyası açılamadı: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>Zip çıkarma işlemi başarısız oldu: Zip arşivi tam olarak bir dosya içermiyor.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>Zip çıkarma işlemi başarısız oldu: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>Maalesef, Oracle&apos;ın bu sürümü zip dosyalarını desteklemiyor.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>İndirilen veriler işlenemedi.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>Bunun yerine sıkıştırılmamış dosyayı indirmek ister misiniz?</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>Dosya başarıyla alındı, ancak herhangi bir set verisi içermiyor.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation>Spoiler veritabanını kaydet</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML; spoiler veritabanı (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation>Spoilers içe aktar</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>Lütfen spoiler verileri için uyumlu bir kaynak belirtin.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation>İndirme Bağlantısı:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation>Varsayılan bağlantıyı geri yükle</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation type="unfinished"/>
     </message>
@@ -254,7 +284,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"/>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <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"/>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <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"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation type="unfinished"/>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>Türkçe (Turkish)</translation>
     </message>
diff --git a/oracle/translations/oracle_yue.ts b/oracle/translations/oracle_yue.ts
index 822a012fb..d13848c34 100644
--- a/oracle/translations/oracle_yue.ts
+++ b/oracle/translations/oracle_yue.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>介绍</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>此嚮導將會導入Cockatrice中用到的系列，卡牌和衍生物列表。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation>介面語言:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>版本：</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>選擇來源</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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>請選擇合適的牌組和卡片清單來源。您可以輸入下載URL或使用電腦中已有的檔案。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>下载URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>本地檔案：</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>恢復常用URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>選擇檔案...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>载入牌组檔案</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>所提供的url無效.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>下載中 (0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>請選擇檔案</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>不能開啟檔案 &apos;%1</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>下載中 (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>網路出錯: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>分析檔案中</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation>xz解壓縮失敗.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>很抱歉,現前Oracle版本不支援xc壓縮檔案</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>未能開啟壓縮文件: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>解壓縮失敗:這壓縮文件擁有超過一個檔案.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>解壓縮失敗: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>很抱歉,現前Oracle版本不支援壓縮檔案.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>不能分析下載資料.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>你是否想另再下載未經壓縮的檔案?</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>雖然檔案成功取回, 但是檔案並未含有任何牌組資料.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation>儲存預覽資料庫</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML ; 預覽資料庫(*.XML)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation>導入預覽卡牌</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>請指定預覽資料合用來源.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation>下载URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation>恢復常用URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>預覽資料庫將會儲藏於以下位置</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>儲存到自訂路徑(不建議)</translation>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation>儲存衍生物資料庫</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; 衍生物資料庫 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation>導入衍生物</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>請指定衍生物資料合用來源.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>下载URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>恢復常用URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation>衍生物資料庫將會儲藏於以下位置:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>儲存到自訂路徑(不建議)</translation>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>包含衍生物的虚拟牌組</translation>
     </message>
@@ -254,7 +284,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>Oracle導入器</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation>嚮導程序工作完成</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Cockatrice已載入更新了卡牌, 現在已經可以使用.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <location filename="src/pages.cpp" line="139"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>如果卡牌資料庫尚未能自動更新,請把cockatrice用戶端重新開啟.</translation>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>沒有牌組被導入。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>已導入牌組</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>有%1MB大小的Cockatrice資料庫檔案已被下載</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation>已找到以下牌组：</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <location filename="src/pages.cpp" line="582"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>要將導入卡牌保存於Cockatrice資料庫內請按&quot;儲藏&quot;.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation>卡牌資料庫將被儲藏於以下位置</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>儲存到自訂路徑(不建議)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation>&amp;儲存</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>導入過程完成:成功導入%1張卡牌.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1:成功導入%2張卡牌.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>儲存卡牌資料庫</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; 卡牌資料庫 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>檔案未能儲藏於%1。</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation>出現錯誤</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation>下載中(0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation>下載中 (%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation>網路出錯: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation>檔案未能儲藏於%1</translation>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation type="unfinished"/>
     </message>
diff --git a/oracle/translations/oracle_zh-Hans.ts b/oracle/translations/oracle_zh-Hans.ts
index 62a49d3c6..75ebdc138 100644
--- a/oracle/translations/oracle_zh-Hans.ts
+++ b/oracle/translations/oracle_zh-Hans.ts
@@ -2,22 +2,22 @@
 <context>
     <name>IntroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="215"/>
+        <location filename="src/pages.cpp" line="127"/>
         <source>Introduction</source>
         <translation>介绍</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="216"/>
+        <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>此向导将会导入Cockatrice中用到的系列，卡牌和衍生物列表.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="218"/>
+        <location filename="src/pages.cpp" line="130"/>
         <source>Interface language:</source>
         <translation>界面语言:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="219"/>
+        <location filename="src/pages.cpp" line="131"/>
         <source>Version:</source>
         <translation>版本：</translation>
     </message>
@@ -25,134 +25,134 @@
 <context>
     <name>LoadSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="288"/>
+        <location filename="src/pages.cpp" line="200"/>
         <source>Source selection</source>
         <translation>选择来源</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="289"/>
+        <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>请选择合适的牌组和卡片清单来源。您可以输入下载URL或使用电脑中已有的档案。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="293"/>
+        <location filename="src/pages.cpp" line="205"/>
         <source>Download URL:</source>
         <translation>下载URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="294"/>
+        <location filename="src/pages.cpp" line="206"/>
         <source>Local file:</source>
         <translation>本地文件：</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="295"/>
+        <location filename="src/pages.cpp" line="207"/>
         <source>Restore default URL</source>
         <translation>恢复常用URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="296"/>
+        <location filename="src/pages.cpp" line="208"/>
         <source>Choose file...</source>
         <translation>选择档案...</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="306"/>
+        <location filename="src/pages.cpp" line="218"/>
         <source>Load sets file</source>
         <translation>载入牌组档案</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="316"/>
+        <location filename="src/pages.cpp" line="228"/>
         <source>Sets file (%1)</source>
         <oldsource>Sets JSON file (%1)</oldsource>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
-        <location filename="src/oraclewizard.cpp" line="365"/>
-        <location filename="src/oraclewizard.cpp" line="370"/>
-        <location filename="src/oraclewizard.cpp" line="438"/>
-        <location filename="src/oraclewizard.cpp" line="569"/>
-        <location filename="src/oraclewizard.cpp" line="582"/>
-        <location filename="src/oraclewizard.cpp" line="603"/>
+        <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>出现错误</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="346"/>
+        <location filename="src/pages.cpp" line="258"/>
         <source>The provided URL is not valid.</source>
         <translation>所提供的url无效.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="350"/>
+        <location filename="src/pages.cpp" line="262"/>
         <source>Downloading (0MB)</source>
         <translation>下载中(0MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="365"/>
+        <location filename="src/pages.cpp" line="277"/>
         <source>Please choose a file.</source>
         <translation>请选择档案.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="370"/>
+        <location filename="src/pages.cpp" line="282"/>
         <source>Cannot open file &apos;%1&apos;.</source>
         <translation>不能开启档案 &apos;%1</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="429"/>
+        <location filename="src/pages.cpp" line="345"/>
         <source>Downloading (%1MB)</source>
         <translation>下载中(%1MB)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="438"/>
+        <location filename="src/pages.cpp" line="354"/>
         <source>Network error: %1.</source>
         <translation>网路出错: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="476"/>
+        <location filename="src/pages.cpp" line="392"/>
         <source>Parsing file</source>
         <translation>分析档案中</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="498"/>
+        <location filename="src/pages.cpp" line="414"/>
         <source>Xz extraction failed.</source>
         <translation>xz解压缩失败。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="505"/>
+        <location filename="src/pages.cpp" line="421"/>
         <source>Sorry, this version of Oracle does not support xz compressed files.</source>
         <translation>很抱歉,现前Oracle版本不支援xc压缩档案</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="525"/>
+        <location filename="src/pages.cpp" line="441"/>
         <source>Failed to open Zip archive: %1.</source>
         <translation>未能开启压缩文件: %1.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="530"/>
+        <location filename="src/pages.cpp" line="446"/>
         <source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
         <translation>解压缩失败:这压缩文件拥有超过一个档案.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="538"/>
+        <location filename="src/pages.cpp" line="454"/>
         <source>Zip extraction failed: %1.</source>
         <translation>解压缩失败：%1。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="546"/>
+        <location filename="src/pages.cpp" line="462"/>
         <source>Sorry, this version of Oracle does not support zipped files.</source>
         <translation>很抱歉,现前Oracle版本不支援压缩档案.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="569"/>
+        <location filename="src/pages.cpp" line="485"/>
         <source>Failed to interpret downloaded data.</source>
         <translation>不能分析下载资料.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="582"/>
+        <location filename="src/pages.cpp" line="498"/>
         <source>Do you want to download the uncompressed file instead?</source>
         <translation>你是否想另再下载未经压缩的档案?</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="604"/>
+        <location filename="src/pages.cpp" line="520"/>
         <source>The file was retrieved successfully, but it does not contain any sets data.</source>
         <translation>虽然档案成功取回, 但是档案并未含有任何牌组资料.</translation>
     </message>
@@ -160,42 +160,57 @@
 <context>
     <name>LoadSpoilersPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="790"/>
+        <location filename="src/pages.cpp" line="716"/>
         <source>Save spoiler database</source>
         <translation>储存预览资料库</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="795"/>
+        <location filename="src/pages.cpp" line="721"/>
         <source>XML; spoiler database (*.xml)</source>
         <translation>XML ; 预览资料库(*.XML)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="800"/>
+        <location filename="src/pages.cpp" line="726"/>
+        <source>spoiler</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="731"/>
         <source>Spoilers import</source>
         <translation>导入预览卡牌</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="801"/>
+        <location filename="src/pages.cpp" line="732"/>
         <source>Please specify a compatible source for spoiler data.</source>
         <translation>请指定预览资料合用来源.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="803"/>
+        <location filename="src/pages.cpp" line="734"/>
         <source>Download URL:</source>
         <translation>下载URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="804"/>
+        <location filename="src/pages.cpp" line="735"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="736"/>
         <source>Restore default URL</source>
         <translation>恢复常用URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="805"/>
+        <location filename="src/pages.cpp" line="737"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="739"/>
         <source>The spoiler database will be saved at the following location:</source>
         <translation>预览资料库将会储藏于以下位置:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="807"/>
+        <location filename="src/pages.cpp" line="741"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>保存到自定义路径(不推荐)</translation>
     </message>
@@ -203,42 +218,57 @@
 <context>
     <name>LoadTokensPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="753"/>
+        <location filename="src/pages.cpp" line="671"/>
         <source>Save token database</source>
         <translation>储存衍生物资料库</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="758"/>
+        <location filename="src/pages.cpp" line="676"/>
         <source>XML; token database (*.xml)</source>
         <translation>XML; 衍生物资料库 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="763"/>
+        <location filename="src/pages.cpp" line="681"/>
+        <source>tokens</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="686"/>
         <source>Tokens import</source>
         <translation>导入衍生物</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="764"/>
+        <location filename="src/pages.cpp" line="687"/>
         <source>Please specify a compatible source for token data.</source>
         <translation>请指定衍生物资料合用来源.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="766"/>
+        <location filename="src/pages.cpp" line="689"/>
         <source>Download URL:</source>
         <translation>下载URL:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="767"/>
+        <location filename="src/pages.cpp" line="690"/>
+        <source>Local file:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="691"/>
         <source>Restore default URL</source>
         <translation>恢复常用URL</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="768"/>
+        <location filename="src/pages.cpp" line="692"/>
+        <source>Choose file...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pages.cpp" line="694"/>
         <source>The token database will be saved at the following location:</source>
         <translation>衍生物资料库将会储藏于以下位置:</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="770"/>
+        <location filename="src/pages.cpp" line="696"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>保存到自定义路径(不推荐)</translation>
     </message>
@@ -246,7 +276,7 @@
 <context>
     <name>OracleImporter</name>
     <message>
-        <location filename="src/oracleimporter.cpp" line="466"/>
+        <location filename="src/oracleimporter.cpp" line="542"/>
         <source>Dummy set containing tokens</source>
         <translation>包含衍生物的虚拟牌组</translation>
     </message>
@@ -254,7 +284,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>Oracle导入器</translation>
     </message>
@@ -262,22 +292,22 @@
 <context>
     <name>OutroPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="224"/>
+        <location filename="src/pages.cpp" line="136"/>
         <source>Finished</source>
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="225"/>
+        <location filename="src/pages.cpp" line="137"/>
         <source>The wizard has finished.</source>
         <translation>向导程式工作完成.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="226"/>
+        <location filename="src/pages.cpp" line="138"/>
         <source>You can now start using Cockatrice with the newly updated cards.</source>
         <translation>Cockatrice已载入更新了卡牌, 现在已经可以使用.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="227"/>
+        <location filename="src/pages.cpp" line="139"/>
         <source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
         <translation>如果卡牌资料库尚未能自动更新,请把cockatrice用户端重新开启.</translation>
     </message>
@@ -285,73 +315,73 @@
 <context>
     <name>SaveSetsPage</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="563"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="646"/>
+        <location filename="src/pages.cpp" line="563"/>
         <source>No set has been imported.</source>
         <translation>没有牌组被导入。</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="656"/>
+        <location filename="src/pages.cpp" line="574"/>
         <source>Sets imported</source>
         <translation>已导入牌组</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="658"/>
+        <location filename="src/pages.cpp" line="576"/>
         <source>A cockatrice database file of %1 MB has been downloaded.</source>
         <translation>有%1MB大小的Cockatrice资料库档案已被下载.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="661"/>
+        <location filename="src/pages.cpp" line="579"/>
         <source>The following sets have been found:</source>
         <translation>已找到以下牌组：</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="664"/>
+        <location filename="src/pages.cpp" line="582"/>
         <source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
         <translation>要将导入卡牌保存于Cockatrice资料库内请按&quot;储藏&quot;.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="665"/>
+        <location filename="src/pages.cpp" line="583"/>
         <source>The card database will be saved at the following location:</source>
         <translation>卡牌资料库将被储藏于以下位置</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="667"/>
+        <location filename="src/pages.cpp" line="585"/>
         <source>Save to a custom path (not recommended)</source>
         <translation>保存到自定义路径(不推荐)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="669"/>
+        <location filename="src/pages.cpp" line="587"/>
         <source>&amp;Save</source>
         <translation>&amp;储存</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="675"/>
+        <location filename="src/pages.cpp" line="593"/>
         <source>Import finished: %1 cards.</source>
         <translation>导入过程完成:成功导入%1张卡牌.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="678"/>
+        <location filename="src/pages.cpp" line="596"/>
         <source>%1: %2 cards imported</source>
         <translation>%1:成功导入%2张卡牌.</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="687"/>
+        <location filename="src/pages.cpp" line="605"/>
         <source>Save card database</source>
         <translation>储存卡牌资料库</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="688"/>
+        <location filename="src/pages.cpp" line="606"/>
         <source>XML; card database (*.xml)</source>
         <translation>XML; 卡牌资料库 (*.xml)</translation>
     </message>
     <message>
-        <location filename="src/oraclewizard.cpp" line="720"/>
+        <location filename="src/pages.cpp" line="638"/>
         <source>The file could not be saved to %1</source>
         <translation>档案未能储藏于%1。</translation>
     </message>
@@ -359,34 +389,56 @@
 <context>
     <name>SimpleDownloadFilePage</name>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
-        <location filename="src/pagetemplates.cpp" line="113"/>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="72"/>
+        <source>Load %1 file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="82"/>
+        <source>%1 file (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="111"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>Error</source>
         <translation>出现错误</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="73"/>
+        <location filename="src/pagetemplates.cpp" line="111"/>
         <source>The provided URL is not valid: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="77"/>
+        <location filename="src/pagetemplates.cpp" line="115"/>
         <source>Downloading (0MB)</source>
         <translation>下载中(0MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="104"/>
+        <location filename="src/pagetemplates.cpp" line="129"/>
+        <source>Please choose a file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="134"/>
+        <source>Cannot open file &apos;%1&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="src/pagetemplates.cpp" line="159"/>
         <source>Downloading (%1MB)</source>
         <translation>下载中(%1MB)</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="113"/>
+        <location filename="src/pagetemplates.cpp" line="168"/>
         <source>Network error: %1.</source>
         <translation>网路出错: %1.</translation>
     </message>
     <message>
-        <location filename="src/pagetemplates.cpp" line="169"/>
+        <location filename="src/pagetemplates.cpp" line="224"/>
         <source>The file could not be saved to %1</source>
         <translation>档案未能储藏于%1</translation>
     </message>
@@ -535,7 +587,7 @@
 <context>
     <name>i18n</name>
     <message>
-        <location filename="src/oraclewizard.cpp" line="58"/>
+        <location filename="src/oraclewizard.cpp" line="22"/>
         <source>English</source>
         <translation>简体中文 (Chinese Simplified)</translation>
     </message>
diff --git a/qt6.imp b/qt6.imp
new file mode 100644
index 000000000..4f09d6406
--- /dev/null
+++ b/qt6.imp
@@ -0,0 +1,2471 @@
+# 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 6e4191beb..b45608d86 100644
--- a/servatrice/CMakeLists.txt
+++ b/servatrice/CMakeLists.txt
@@ -6,7 +6,9 @@ project(Servatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${
 
 set(servatrice_SOURCES
     src/email_parser.cpp
+    src/event_loop_watchdog.cpp
     src/main.cpp
+    src/metrics_registry.cpp
     src/servatrice.cpp
     src/servatrice_connection_pool.cpp
     src/servatrice_database_interface.cpp
@@ -25,6 +27,14 @@ 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)
@@ -43,11 +53,7 @@ if(APPLE)
   set(servatrice_SOURCES ${servatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
 endif(APPLE)
 
-if(Qt6_FOUND)
-  qt6_add_resources(servatrice_RESOURCES_RCC ${servatrice_RESOURCES})
-elseif(Qt5_FOUND)
-  qt5_add_resources(servatrice_RESOURCES_RCC ${servatrice_RESOURCES})
-endif()
+qt6_add_resources(servatrice_RESOURCES_RCC ${servatrice_RESOURCES})
 
 set(QT_DONT_USE_QTGUI TRUE)
 
@@ -99,6 +105,8 @@ set(DESKTOPDIR
 # Build servatrice binary and link it
 add_executable(servatrice MACOSX_BUNDLE ${servatrice_MOC_SRCS} ${servatrice_RESOURCES_RCC} ${servatrice_SOURCES})
 
+target_precompile_headers(servatrice PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h")
+
 if(CMAKE_HOST_SYSTEM MATCHES "FreeBSD")
   target_link_libraries(
     servatrice libcockatrice_deck_list libcockatrice_network_server_remote Threads::Threads ${SERVATRICE_QT_MODULES}
@@ -184,10 +192,19 @@ if(WIN32)
   set(qtconf_dest_dir .)
 
   install(
-    DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/"
+    DIRECTORY "$<TARGET_FILE_DIR:servatrice>/"
     DESTINATION ./
     FILES_MATCHING
     PATTERN "*.dll"
+    PATTERN "*.pdb" EXCLUDE
+    PATTERN "*.dir*" EXCLUDE
+    PATTERN "*_autogen*" EXCLUDE
+    PATTERN "*.tlog*" EXCLUDE
+    PATTERN "CMakeFiles*" EXCLUDE
+    PATTERN "x64*" EXCLUDE
+    PATTERN ".qt*" EXCLUDE
+    PATTERN ".qsb*" EXCLUDE
+    PATTERN ".lupdate*" EXCLUDE
   )
 
   # Qt plugins: platforms, sqldrivers, tls (Qt6)
diff --git a/servatrice/migrations/servatrice_0034_to_0035.sql b/servatrice/migrations/servatrice_0034_to_0035.sql
new file mode 100644
index 000000000..acaad9c8b
--- /dev/null
+++ b/servatrice/migrations/servatrice_0034_to_0035.sql
@@ -0,0 +1,19 @@
+ALTER TABLE `cockatrice_users` ADD COLUMN `card_art_params` TEXT DEFAULT NULL, ALGORITHM=INSTANT;
+
+CREATE TABLE IF NOT EXISTS `cockatrice_card_art_name_rules` (
+    `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+    `card_name` varchar(255) NOT NULL,
+    `card_provider_id` varchar(255) NOT NULL,
+    `mode` enum('ALLOW','DENY') NOT NULL,
+    `reason` varchar(255) DEFAULT NULL,
+    `created_by` int(7) unsigned DEFAULT NULL,
+    `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uniq_provider_card_name` (`card_provider_id`, `card_name`),
+    KEY `idx_mode` (`mode`),
+    FOREIGN KEY (`created_by`) REFERENCES `cockatrice_users`(`id`)
+    ON DELETE SET NULL
+    ON UPDATE CASCADE
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+UPDATE cockatrice_schema_version SET version=35 WHERE version=34;
diff --git a/servatrice/migrations/servatrice_0035_to_0036.sql b/servatrice/migrations/servatrice_0035_to_0036.sql
new file mode 100644
index 000000000..9727eeba5
--- /dev/null
+++ b/servatrice/migrations/servatrice_0035_to_0036.sql
@@ -0,0 +1,53 @@
+-- Servatrice db migration from version 35 to version 36
+
+CREATE TABLE IF NOT EXISTS `cockatrice_reports` (
+ `id`                  int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `reporter_id`         int(7) unsigned NULL,
+ `reporter_name`       varchar(35) NOT NULL,
+ `reported_user_id`    int(7) unsigned NULL,
+ `reported_user_name`  varchar(35) NOT NULL,
+ `game_id`             int(7) unsigned NULL,
+ `room_id`             int(7) unsigned NULL,
+ `category`            varchar(255) NOT NULL,
+ `description`         text NOT NULL,
+ `chat_log`            mediumtext NULL,
+ `created_at`          datetime NOT NULL,
+ `resolution_time`     datetime NULL,
+ `status`              enum('open','assigned','resolved','dismissed') NOT NULL DEFAULT 'open',
+ `assigned_to`         int(7) unsigned NULL,
+ `resolved_by`         int(7) unsigned NULL,
+ `resolution_note`     text,
+ `notified`            tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ INDEX `idx_status`    (`status`),
+ INDEX `idx_created`   (`created_at`),
+ INDEX `idx_reporter_id_created` (`reporter_id`, `created_at`),
+ INDEX `idx_reported_user_name` (`reported_user_name`),
+ INDEX `idx_status_created` (`status`, `created_at`),
+ FOREIGN KEY (`reporter_id`)      REFERENCES `cockatrice_users`(`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+ FOREIGN KEY (`reported_user_id`) REFERENCES `cockatrice_users`(`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+ FOREIGN KEY (`assigned_to`)      REFERENCES `cockatrice_users`(`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+ FOREIGN KEY (`resolved_by`)      REFERENCES `cockatrice_users`(`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `cockatrice_report_comments` (
+ `id`                  int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `report_id`           int(11) unsigned NOT NULL,
+ `author_name`         varchar(35) NOT NULL,
+ `author_id`           int(7) unsigned NULL,
+ `comment_text`        text NOT NULL,
+ `created_at`          datetime NOT NULL,
+ `is_moderator`        tinyint(1) NOT NULL DEFAULT 0,
+ `notified`            tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ INDEX `idx_report_id` (`report_id`),
+ INDEX `idx_notified`  (`notified`),
+ FOREIGN KEY (`report_id`) REFERENCES `cockatrice_reports`(`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ FOREIGN KEY (`author_id`) REFERENCES `cockatrice_users`(`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
+
+ALTER TABLE `cockatrice_users`
+  ADD COLUMN `force_password_change` tinyint(1) NOT NULL DEFAULT 0
+  AFTER `passwordLastChangedDate`;
+
+UPDATE cockatrice_schema_version SET version=36 WHERE version=35;
diff --git a/servatrice/migrations/servatrice_0036_to_0037.sql b/servatrice/migrations/servatrice_0036_to_0037.sql
new file mode 100644
index 000000000..576ab53b4
--- /dev/null
+++ b/servatrice/migrations/servatrice_0036_to_0037.sql
@@ -0,0 +1,71 @@
+-- Servatrice db migration from version 36 to version 37
+
+-- Deck sharing (temporary share links + permanent public decks).
+--
+-- This feature was developed behind several intermediate migrations that have
+-- never shipped, so they are folded into this single 36 -> 37 migration:
+-- temporary share links, permanent public-deck visibility, preview metadata,
+-- and per-deck tags.
+
+-- 1. Temporary deck shares: a named bundle of decks that can be fetched by
+-- anyone who knows the (unguessable) token, until the share expires.
+CREATE TABLE IF NOT EXISTS `cockatrice_deck_share` (
+  `id` int(7) unsigned zerofill NOT NULL auto_increment,
+  `token` varchar(64) COLLATE utf8mb4_bin NOT NULL,
+  `name` varchar(64) NOT NULL,
+  `created_by` int(7) unsigned NULL,
+  `created_at` datetime NOT NULL,
+  `expires_at` datetime NOT NULL,
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `token` (`token`),
+  KEY `expires_at` (`expires_at`),
+  FOREIGN KEY(`created_by`) REFERENCES `cockatrice_users`(`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
+
+-- Individual decks inside a share bundle. Content is materialized at share
+-- time so expiring/deleting a share can cascade cleanly. The metadata columns
+-- are nullable because Qt's MySQL driver binds empty QStrings as NULL when
+-- using prepared statements.
+CREATE TABLE IF NOT EXISTS `cockatrice_deck_share_item` (
+  `id` int(7) unsigned zerofill NOT NULL auto_increment,
+  `share_id` int(7) unsigned zerofill NOT NULL,
+  `name` varchar(50) NOT NULL,
+  `tags` text NULL,
+  `banner_card` varchar(255) NULL,
+  `game_format` varchar(50) NULL,
+  `color_identity` varchar(5) NULL,
+  `content` text NOT NULL,
+  `position` int(7) NOT NULL,
+  PRIMARY KEY  (`id`),
+  KEY `share_id` (`share_id`),
+  FOREIGN KEY(`share_id`) REFERENCES `cockatrice_deck_share`(`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
+
+-- 2. Permanent deck sharing: add public visibility flags to the deck storage
+-- tables. A deck is visible to other users if it is marked public, or if any
+-- ancestor folder is marked public (inherited). Existing decks default to
+-- private, so the upgrade does not expose any data.
+ALTER TABLE `cockatrice_decklist_files`
+  ADD COLUMN `is_public` tinyint(1) NOT NULL DEFAULT 0 AFTER `content`;
+
+ALTER TABLE `cockatrice_decklist_folders`
+  ADD COLUMN `is_public` tinyint(1) NOT NULL DEFAULT 0 AFTER `name`;
+
+-- 3. Per-deck preview metadata so clients can render another user's public
+-- decks (e.g. in a visual deck storage grid) without downloading each deck
+-- list. The metadata is derived by the server from the deck content (the color
+-- identity is supplied by the uploading client); decks uploaded before this
+-- migration have empty values until they are re-uploaded.
+ALTER TABLE `cockatrice_decklist_files`
+  ADD COLUMN `banner_card_name` varchar(255) NULL AFTER `is_public`,
+  ADD COLUMN `banner_card_provider` varchar(32) NULL AFTER `banner_card_name`,
+  ADD COLUMN `color_identity` varchar(5) NULL AFTER `banner_card_provider`;
+
+-- 4. Per-deck tags for public decks. The server renders the deck's own tags
+-- into a JSON array, so another user's public decks can filter by tag without
+-- downloading each deck list. Decks uploaded before this migration have NULL
+-- tags until they are re-uploaded.
+ALTER TABLE `cockatrice_decklist_files`
+  ADD COLUMN `tags` text NULL AFTER `color_identity`;
+
+UPDATE cockatrice_schema_version SET version=37 WHERE version=36;
diff --git a/servatrice/scripts/account_monitor/.gitignore b/servatrice/scripts/account_monitor/.gitignore
new file mode 100644
index 000000000..40cd3839a
--- /dev/null
+++ b/servatrice/scripts/account_monitor/.gitignore
@@ -0,0 +1,5 @@
+# Local state - never commit these
+state.json
+state.json.tmp
+venv/
+__pycache__/
diff --git a/servatrice/scripts/account_monitor/README.md b/servatrice/scripts/account_monitor/README.md
new file mode 100644
index 000000000..e2c01d0ba
--- /dev/null
+++ b/servatrice/scripts/account_monitor/README.md
@@ -0,0 +1,163 @@
+# Account registration monitor
+
+Posts a Discord message whenever a new account is registered in Servatrice
+(`cockatrice_users`). Each message includes the username, real name (if set),
+email, and registration time.
+
+It runs as a periodic read-only query against the production database. It does
+not modify the database and does not touch the running Servatrice process.
+
+## How it decides what is "new"
+
+Accounts get an auto-increment `id`, so "new since last time" is just
+`id > last_seen_id`. The monitor stores that single high-water-mark id in its
+state file. Each run it posts every account above the mark, oldest first, then
+advances the mark to the highest id it posted.
+
+Because the mark only moves forward and an id is posted exactly once, there are
+no duplicate messages and nothing is missed, even if the monitor is down for a
+while. The state file holds a single number, so it never grows.
+
+The first run (when no state file exists yet) records the current maximum id as
+the baseline and posts nothing. This prevents the entire existing user base from
+being dumped into the channel. Only accounts registered after that baseline are
+posted.
+
+If a post to Discord fails, the monitor stops there without advancing the mark
+past it, so that account and everything after it are retried on the next run.
+
+## Privacy note
+
+Messages contain personal data (real name and email). Discord stores message
+content on their servers, so post only to a private channel that the right
+people can see, and treat the webhook URL as a secret. It lives in the config
+ini alongside the database password, so keep that file readable only by the user
+that runs the monitor.
+
+## Setup
+
+The monitor reads its database credentials and the webhook from a
+servatrice-style ini file passed with `--config` (or the `CONFIG_FILE` env var).
+You can point it at your existing `servatrice.ini`, or keep a small separate ini
+just for the monitor.
+
+### 1. Create a read-only database user
+
+Run as a DB admin. Adjust the host (`'%'` allows any host; restrict it to the
+machine running the monitor if you can) and the table prefix if yours is not the
+default `cockatrice`.
+
+```sql
+CREATE USER 'account_monitor'@'%' IDENTIFIED BY 'a-strong-password';
+GRANT SELECT (id, name, realname, email, registrationDate)
+  ON servatrice.cockatrice_users TO 'account_monitor'@'%';
+FLUSH PRIVILEGES;
+```
+
+Using a read-only user is recommended over pointing `--config` at the real
+`servatrice.ini`, because Servatrice's own DB account usually has write access
+the monitor does not need.
+
+### 2. Create the Discord webhook and add it to the config
+
+In Discord: open the target channel, then Edit Channel -> Integrations ->
+Webhooks -> New Webhook. Name it, pick the channel, and copy the webhook URL.
+
+Add a `[discord]` section with the URL to the ini you will pass to `--config`.
+If you want the read-only user above, set the `[database]` section to use it. A
+small dedicated `monitor.ini` looks like this:
+
+```ini
+[database]
+hostname=127.0.0.1
+database=servatrice
+user=account_monitor
+password=a-strong-password
+prefix=cockatrice
+
+[discord]
+new_user_activation_webhook=https://discord.com/api/webhooks/XXXX/YYYY
+```
+
+If you would rather use one file, add the `[discord]` section to the real
+`servatrice.ini` instead. Servatrice ignores sections it does not use. Note that
+Servatrice (a Qt app) rewrites ini values it touches in quoted, backslash-escaped
+form, for example `"https\://..."`. The monitor strips that encoding from the
+webhook automatically, so either the plain or the escaped form works.
+
+### 3. Install
+
+```bash
+cd servatrice/scripts/account_monitor
+python3 -m venv venv
+./venv/bin/pip install -r requirements.txt
+```
+
+### 4. Verify before scheduling
+
+```bash
+# Confirm the webhook works (sends one test message to the channel)
+./venv/bin/python ./account_monitor.py --config /path/to/monitor.ini --test-webhook
+
+# Confirm DB access and see what it would do, without posting or writing state
+./venv/bin/python ./account_monitor.py --config /path/to/monitor.ini --dry-run --verbose
+```
+
+The first real run seeds the baseline and posts nothing:
+
+```bash
+./venv/bin/python ./account_monitor.py --config /path/to/monitor.ini
+```
+
+After that, test it end to end by registering a throwaway account and confirming
+a message appears on the next run.
+
+## Run it every 2 minutes with cron
+
+Edit the crontab of the user that owns the script directory (`crontab -e`) and
+add one line. This runs the monitor every 2 minutes, using the venv's Python and
+your config ini, and appends output to a log:
+
+```cron
+*/2 * * * * cd /opt/cockatrice/servatrice/scripts/account_monitor && ./venv/bin/python ./account_monitor.py --config /etc/servatrice/servatrice.ini >> /var/log/account_monitor.log 2>&1
+```
+
+Adjust the three paths to your install: the script directory after `cd`, and the
+`--config` and log paths. The `*/2` field is what makes it run every 2 minutes;
+change it to `*/5` for every 5, and so on.
+
+By default the high-water-mark is stored in `state.json` next to the script, so
+the directory must be writable by the cron user. To put it elsewhere, set
+`STATE_FILE`:
+
+```cron
+*/2 * * * * STATE_FILE=/var/lib/account_monitor/state.json cd /opt/cockatrice/servatrice/scripts/account_monitor && ./venv/bin/python ./account_monitor.py --config /etc/servatrice/servatrice.ini >> /var/log/account_monitor.log 2>&1
+```
+
+The interval only controls how often it checks; it is not a lookback window, so
+a longer interval never causes missed accounts. The query is cheap: an indexed
+range scan on the primary key for `id > last_seen`.
+
+## Options
+
+- `--config PATH` / `-c PATH` — read DB settings from `[database]` and the webhook from `[discord] new_user_activation_webhook` of a servatrice-style ini (falls back to the `CONFIG_FILE` env var).
+- `--dry-run` — query and log what would be posted; no Discord posts, no state write.
+- `--test-webhook` — send one test message to the webhook and exit (does not need DB credentials).
+- `--verbose` — debug logging.
+
+## Configuration reference
+
+Settings come from the `--config` ini, with environment variables available as
+overrides if you need them (env takes precedence over the ini).
+
+| Setting | ini (`--config`) | Environment override |
+| --- | --- | --- |
+| DB host | `[database] hostname` | `DB_HOST` |
+| DB port | `[database] port` (optional) | `DB_PORT` |
+| DB name | `[database] database` | `DB_NAME` |
+| DB user | `[database] user` | `DB_USER` |
+| DB password | `[database] password` | `DB_PASSWORD` |
+| Table prefix | `[database] prefix` | `DB_TABLE_PREFIX` |
+| Webhook URL | `[discord] new_user_activation_webhook` | `DISCORD_WEBHOOK_URL` |
+| DB TLS | — | `DB_SSL` / `DB_SSL_CA` |
+| State file path | — | `STATE_FILE` (default: `state.json` next to the script) |
diff --git a/servatrice/scripts/account_monitor/account_monitor.py b/servatrice/scripts/account_monitor/account_monitor.py
new file mode 100755
index 000000000..47cf23fd3
--- /dev/null
+++ b/servatrice/scripts/account_monitor/account_monitor.py
@@ -0,0 +1,350 @@
+#!/usr/bin/env python3
+"""Post a Discord message when a new Servatrice account is registered.
+
+Accounts get an auto-increment `id`, so "what is new since last time" is simply
+`id > last_seen_id`. The monitor stores that single high-water-mark id in a
+small state file. Each run it posts every account above the mark (oldest
+first), then advances the mark. This means no duplicate posts, nothing missed
+across downtime, and a state file that never grows (it holds one number).
+
+On the very first run (no state file yet) it records the current maximum id as
+the baseline and posts nothing, so existing users are not dumped into the
+channel. From then on only newly-registered accounts are posted.
+
+Intended to be run on a schedule (cron). Pass a servatrice-style ini with
+--config (or CONFIG_FILE) for the database credentials and webhook; see
+README.md.
+"""
+
+import argparse
+import configparser
+import json
+import logging
+import os
+import re
+import sys
+import time
+import urllib.error
+import urllib.request
+
+import pymysql
+
+log = logging.getLogger("account_monitor")
+
+# Columns we use. `id` drives the high-water-mark; `name` is the login/username,
+# `realname` is the optional display name, `registrationDate` is when the account
+# row was created.
+NEW_ACCOUNTS_QUERY = (
+    "SELECT id, name, realname, email, registrationDate "
+    "FROM `{prefix}_users` WHERE id > %s ORDER BY id ASC"
+)
+
+EMBED_COLOR = 0x5865F2  # discord blurple
+DISCORD_MAX_EMBED_FIELD = 1024
+POST_DELAY_SECONDS = 1.0  # gap between webhook posts to stay under rate limits
+MAX_RATELIMIT_RETRIES = 5
+
+
+def _clean_ini_value(value):
+    """Undo Qt QSettings ini encoding of a value.
+
+    Qt apps (including Servatrice) write ini values that contain special
+    characters wrapped in double quotes and backslash-escaped, e.g. a webhook
+    URL stored as "https\\://...". configparser returns that text literally, so
+    strip the wrapping quotes and remove the backslash escapes. This is applied
+    to the webhook URL only, where it is safe (URLs contain no quotes or
+    backslashes); DB values are left untouched so passwords are never altered.
+    """
+    value = value.strip()
+    if len(value) >= 2 and value[0] == value[-1] and value[0] in "\"'":
+        value = value[1:-1]
+    return re.sub(r"\\(.)", r"\1", value)
+
+
+def load_config_file(path):
+    """Read DB and Discord settings from a servatrice-style ini.
+
+    Pulls the [database] section (hostname/database/user/password/prefix/port)
+    and the Discord webhook from [discord] new_user_activation_webhook. Returns
+    a dict using this module's internal config keys; only keys actually present
+    (and non-empty) in the file are returned, so missing values fall back to
+    defaults or the environment.
+    """
+    # interpolation=None so a '%' in a password is not treated as a token.
+    parser = configparser.ConfigParser(interpolation=None)
+    if not parser.read(path):
+        log.error("Config file not found or unreadable: %s", path)
+        sys.exit(2)
+
+    result = {}
+    if parser.has_section("database"):
+        db = parser["database"]
+        db_mapping = {
+            "hostname": "db_host",
+            "database": "db_name",
+            "user": "db_user",
+            "password": "db_password",
+            "prefix": "db_prefix",
+            "port": "db_port",  # not in stock servatrice.ini, but honored if present
+        }
+        result.update({cfg_key: db[ini_key] for ini_key, cfg_key in db_mapping.items() if db.get(ini_key)})
+
+    if parser.has_section("discord") and parser["discord"].get("new_user_activation_webhook"):
+        result["webhook_url"] = _clean_ini_value(parser["discord"]["new_user_activation_webhook"])
+
+    return result
+
+
+def get_config(config_path=None, require_db=True):
+    """Build configuration from defaults, an optional ini file, then env vars.
+
+    Precedence, highest first: environment variables, the ini file, built-in
+    defaults. Database credentials and the Discord webhook may come from either
+    the ini file or the environment; the state file is environment-only.
+    """
+    cfg = {
+        "db_host": "localhost",
+        "db_port": 3306,
+        "db_name": "servatrice",
+        "db_user": None,
+        "db_password": None,
+        "db_prefix": "cockatrice",
+        "db_ssl": False,
+        "db_ssl_ca": None,
+        "webhook_url": None,
+        "state_file": os.path.join(os.path.dirname(os.path.abspath(__file__)), "state.json"),
+    }
+
+    if config_path:
+        cfg.update(load_config_file(config_path))
+
+    env_map = {
+        "DB_HOST": "db_host",
+        "DB_PORT": "db_port",
+        "DB_NAME": "db_name",
+        "DB_USER": "db_user",
+        "DB_PASSWORD": "db_password",
+        "DB_TABLE_PREFIX": "db_prefix",
+        "DB_SSL_CA": "db_ssl_ca",
+        "DISCORD_WEBHOOK_URL": "webhook_url",
+        "STATE_FILE": "state_file",
+    }
+    for env_key, cfg_key in env_map.items():
+        if os.environ.get(env_key):
+            cfg[cfg_key] = os.environ[env_key]
+    if os.environ.get("DB_SSL"):
+        cfg["db_ssl"] = os.environ["DB_SSL"].lower() in ("1", "true", "yes")
+
+    cfg["db_port"] = int(cfg["db_port"])
+
+    required = {"webhook_url": "DISCORD_WEBHOOK_URL or [discord] new_user_activation_webhook"}
+    if require_db:
+        required["db_user"] = "DB_USER or [database] user"
+        required["db_password"] = "DB_PASSWORD or [database] password"
+    missing = [label for key, label in required.items() if not cfg[key]]
+    if missing:
+        log.error("Missing required configuration: %s", "; ".join(missing))
+        sys.exit(2)
+
+    if cfg["webhook_url"] and not cfg["webhook_url"].lower().startswith(("http://", "https://")):
+        log.error("Webhook URL does not look like an http(s) URL: %r", cfg["webhook_url"])
+        sys.exit(2)
+    return cfg
+
+
+def connect(cfg):
+    """Open a read-only connection to the Servatrice database."""
+    ssl = None
+    if cfg["db_ssl"]:
+        ssl = {"ca": cfg["db_ssl_ca"]} if cfg["db_ssl_ca"] else {}
+    return pymysql.connect(
+        host=cfg["db_host"],
+        port=cfg["db_port"],
+        user=cfg["db_user"],
+        password=cfg["db_password"],
+        database=cfg["db_name"],
+        charset="utf8mb4",
+        cursorclass=pymysql.cursors.DictCursor,
+        connect_timeout=15,
+        read_timeout=30,
+        ssl=ssl,
+    )
+
+
+def fetch_max_id(conn, prefix):
+    """Return the highest account id currently in the table, or 0 if empty."""
+    with conn.cursor() as cur:
+        cur.execute("SELECT MAX(id) AS max_id FROM `{prefix}_users`".format(prefix=prefix))
+        row = cur.fetchone()
+    return int(row["max_id"]) if row and row["max_id"] is not None else 0
+
+
+def fetch_new_accounts(conn, prefix, last_id):
+    """Return detail rows for accounts with id > last_id, oldest first."""
+    with conn.cursor() as cur:
+        cur.execute(NEW_ACCOUNTS_QUERY.format(prefix=prefix), (last_id,))
+        return cur.fetchall()
+
+
+def load_state(path):
+    """Load the high-water-mark id. Returns (last_id, is_first_run)."""
+    if not os.path.exists(path):
+        return 0, True
+    with open(path, "r", encoding="utf-8") as fh:
+        data = json.load(fh)
+    return int(data.get("last_id", 0)), False
+
+
+def save_state(path, last_id):
+    """Atomically persist the high-water-mark id."""
+    directory = os.path.dirname(path)
+    if directory:
+        os.makedirs(directory, exist_ok=True)
+    tmp = path + ".tmp"
+    with open(tmp, "w", encoding="utf-8") as fh:
+        json.dump({"version": 2, "last_id": int(last_id)}, fh)
+    os.replace(tmp, path)
+
+
+def build_embed(row):
+    """Build a Discord embed dict for one newly-registered account."""
+    fields = [
+        {"name": "Username", "value": str(row["name"]) or "(none)", "inline": False},
+    ]
+    realname = (row.get("realname") or "").strip()
+    if realname:
+        fields.append({"name": "Real name", "value": realname[:DISCORD_MAX_EMBED_FIELD], "inline": False})
+    fields.append({"name": "Email", "value": str(row.get("email") or "(none)"), "inline": False})
+    reg = row.get("registrationDate")
+    fields.append({"name": "Reg time", "value": str(reg) if reg is not None else "(unknown)", "inline": False})
+    return {
+        "title": "New account registered",
+        "color": EMBED_COLOR,
+        "fields": fields,
+    }
+
+
+def post_embed(webhook_url, embed):
+    """POST a single embed to the Discord webhook, honoring 429 rate limits."""
+    payload = json.dumps({"embeds": [embed]}).encode("utf-8")
+    for attempt in range(MAX_RATELIMIT_RETRIES):
+        req = urllib.request.Request(
+            webhook_url,
+            data=payload,
+            headers={"Content-Type": "application/json", "User-Agent": "servatrice-account-monitor/1.0"},
+            method="POST",
+        )
+        try:
+            with urllib.request.urlopen(req, timeout=30) as resp:
+                if resp.status in (200, 204):
+                    return True
+                log.warning("Unexpected Discord status %s", resp.status)
+                return False
+        except urllib.error.HTTPError as err:
+            if err.code == 429:
+                retry_after = _retry_after_seconds(err)
+                log.warning("Rate limited by Discord; sleeping %.2fs", retry_after)
+                time.sleep(retry_after)
+                continue
+            log.error("Discord webhook HTTP %s: %s", err.code, err.read().decode("utf-8", "replace")[:500])
+            return False
+        except urllib.error.URLError as err:
+            log.error("Discord webhook connection error: %s", err)
+            return False
+    log.error("Gave up posting after %d rate-limit retries", MAX_RATELIMIT_RETRIES)
+    return False
+
+
+def _retry_after_seconds(err):
+    """Extract the retry delay (seconds) from a Discord 429 response."""
+    header = err.headers.get("Retry-After")
+    if header:
+        try:
+            return float(header)
+        except ValueError:
+            pass
+    try:
+        body = json.loads(err.read().decode("utf-8", "replace"))
+        return float(body.get("retry_after", 1.0))
+    except (ValueError, json.JSONDecodeError):
+        return 1.0
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Post new Servatrice account registrations to Discord.")
+    parser.add_argument(
+        "--config", "-c",
+        help="Path to a servatrice-style ini; reads DB settings from its [database] "
+             "section (hostname/database/user/password/prefix) and the webhook from "
+             "[discord] new_user_activation_webhook. Defaults to the CONFIG_FILE env "
+             "var if set.",
+    )
+    parser.add_argument("--dry-run", action="store_true", help="Log what would be posted; do not post or write state.")
+    parser.add_argument("--test-webhook", action="store_true", help="Send a single test message to the webhook and exit.")
+    parser.add_argument("--verbose", action="store_true", help="Enable debug logging.")
+    args = parser.parse_args()
+
+    logging.basicConfig(
+        level=logging.DEBUG if args.verbose else logging.INFO,
+        format="%(asctime)s %(levelname)s %(message)s",
+    )
+
+    config_path = args.config or os.environ.get("CONFIG_FILE")
+
+    if args.test_webhook:
+        cfg = get_config(config_path, require_db=False)
+        ok = post_embed(
+            cfg["webhook_url"],
+            {"title": "Account monitor test", "color": EMBED_COLOR,
+             "description": "If you can see this, the webhook is configured correctly."},
+        )
+        sys.exit(0 if ok else 1)
+
+    cfg = get_config(config_path)
+
+    try:
+        conn = connect(cfg)
+    except pymysql.MySQLError as err:
+        log.error("Database connection failed: %s", err)
+        sys.exit(1)
+
+    try:
+        last_id, first_run = load_state(cfg["state_file"])
+
+        if first_run:
+            baseline = fetch_max_id(conn, cfg["db_prefix"])
+            log.info("First run: seeding high-water-mark at id=%d; posting nothing.", baseline)
+            if not args.dry_run:
+                save_state(cfg["state_file"], baseline)
+            return
+
+        rows = fetch_new_accounts(conn, cfg["db_prefix"], last_id)
+        if not rows:
+            log.info("No new accounts since id=%d.", last_id)
+            return
+
+        log.info("Found %d new account(s) since id=%d.", len(rows), last_id)
+
+        # Post oldest first. Advance the mark only past accounts we successfully
+        # posted; on the first failure, stop so nothing after it is posted out of
+        # order or skipped. The failed account (and the rest) retry next run.
+        for row in rows:
+            if args.dry_run:
+                log.info("[dry-run] would post: id=%s name=%s email=%s reg=%s",
+                         row["id"], row["name"], row.get("email"), row.get("registrationDate"))
+                continue
+            if not post_embed(cfg["webhook_url"], build_embed(row)):
+                log.error("Failed to post account id=%s; stopping. Will retry from here next run.", row["id"])
+                break
+            last_id = row["id"]
+            log.info("Posted account id=%s (%s)", row["id"], row["name"])
+            time.sleep(POST_DELAY_SECONDS)
+
+        if not args.dry_run:
+            save_state(cfg["state_file"], last_id)
+    finally:
+        conn.close()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/servatrice/scripts/account_monitor/requirements.txt b/servatrice/scripts/account_monitor/requirements.txt
new file mode 100644
index 000000000..24d93c7a7
--- /dev/null
+++ b/servatrice/scripts/account_monitor/requirements.txt
@@ -0,0 +1 @@
+PyMySQL==1.2.0
diff --git a/servatrice/servatrice.ini.example b/servatrice/servatrice.ini.example
index fac743c39..3ee52dd21 100644
--- a/servatrice/servatrice.ini.example
+++ b/servatrice/servatrice.ini.example
@@ -41,6 +41,12 @@ 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
@@ -79,8 +85,10 @@ requiredfeatures=""
 
 ; You can define custom warnings that users are sent when the moderation staff uses the right client warn user
 ; menu option.  This list is comma seperated that each item will appear in the drop down list for staff members
-; to choose from.  Example: "Flaming,Foul Language"
-officialwarnings="Flaming,Spamming,Causing Drama,Abusive Language"
+; to choose from.  Each entry may optionally carry a recommended starting intervention level (see the moderator
+; guide) by appending "|" and the level number.  Entries without an explicit level default to intervention
+; level 1.  Example: "Flaming,Foul Language"
+officialwarnings="Abusive Language|1,Calling Out User|1,Causing Drama|1,Cheating|2,Disrespecting Staff|1,Disrupting a Draft|1,Inappropriate Avatar|3,Inappropriate Game Name|1,Kicking Without Valid Reason|1,Spamming|1,Targeted Harassment|2"
 
 ; Maximum time in seconds a player can stay connected but idle.  Default is 3600 (0 = disabled)
 ; Clients will be notified at the 90% time period of pending disconnection if they do not take action.
@@ -242,6 +250,16 @@ 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"
 
@@ -373,6 +391,26 @@ command_counting_interval=10
 ; Maximum number of game commands in an interval before new commands gets dropped; default is 20
 max_command_count_per_interval=20
 
+[reporting]
+; Maximum number of user reports a single user can file per day; default is 10; set to 0 to disable the limit
+max_reports_per_day=10
+
+; Maximum number of report comments a single user can post per hour; default is 30; set to 0 to disable the limit
+max_comments_per_hour=30
+
+[metrics]
+; Command containers that take longer than this many milliseconds are logged
+; as slow commands. Set to 0 to disable the log line. A latency spike produces
+; one warning per slow container with no rate limiting of its own -- a bad
+; patch can briefly flood the log, which is how you notice it.
+slow_command_ms=500
+
+; Each socket pool thread runs a watchdog heartbeat. If a heartbeat arrives
+; this many milliseconds late, the stall is logged and exposed as
+; servatrice_eventloop_* metrics in the Developer tab. Set to 0 to disable
+; the watchdogs.
+stall_warn_ms=2000
+
 [logging]
 ; Admin/Moderators can query the stored logs for information when looking up reports by various players. This
 ; option can allow or disallow them from doing so.
@@ -430,3 +468,24 @@ ssl_cert=ssl_cert.pem
 
 ; Filename of the private key for the server-to-server certificate
 ssl_key=ssl_key.pem
+
+
+[deck_share]
+
+; How many days a created deck share link remains valid before it expires.
+; Default: 7
+expiry_days=7
+
+; How often (in minutes) the server checks for and removes expired deck shares.
+; A value of 0 disables the automatic cleanup.
+; Default: 60
+cleanup_interval=60
+
+; Maximum number of decks a single share link can contain.
+; Default: 50
+max_decks_per_share=50
+
+; Maximum number of share links a single user may create per day.
+; A value of 0 disables the limit.
+; Default: 50
+max_shares_per_day=50
diff --git a/servatrice/servatrice.sql b/servatrice/servatrice.sql
index fa644dbc0..4fbc1d8bd 100644
--- a/servatrice/servatrice.sql
+++ b/servatrice/servatrice.sql
@@ -20,11 +20,14 @@ CREATE TABLE IF NOT EXISTS `cockatrice_schema_version` (
   PRIMARY KEY  (`version`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
 
-INSERT INTO cockatrice_schema_version VALUES(34);
+INSERT INTO cockatrice_schema_version VALUES(37);
 
 -- users and user data tables
 CREATE TABLE IF NOT EXISTS `cockatrice_users` (
   `id` int(7) unsigned zerofill NOT NULL auto_increment,
+  -- Bitfield of staff levels: 1 = admin (implies moderator), 2 = moderator,
+  -- 4 = judge, 8 = developer. Operators set these by hand with
+  -- "UPDATE cockatrice_users SET admin = ...".
   `admin` tinyint(1) NOT NULL,
   `name` varchar(35) NOT NULL,
   `realname` varchar(255) NOT NULL,
@@ -41,8 +44,10 @@ CREATE TABLE IF NOT EXISTS `cockatrice_users` (
   `privlevelStartDate` datetime NOT NULL,
   `privlevelEndDate` datetime NOT NULL,
   `passwordLastChangedDate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `force_password_change` tinyint(1) NOT NULL DEFAULT 0,
   `leftPawnColorOverride` varchar(255),
   `rightPawnColorOverride` varchar(255),
+  `card_art_params` TEXT DEFAULT NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `name` (`name`),
   KEY `token` (`token`),
@@ -61,16 +66,56 @@ CREATE TABLE IF NOT EXISTS `cockatrice_decklist_files` (
   `name` varchar(50) NOT NULL,
   `upload_time` datetime NOT NULL,
   `content` text NOT NULL,
+  `is_public` tinyint(1) NOT NULL DEFAULT 0,
+  `banner_card_name` varchar(255) NULL,
+  `banner_card_provider` varchar(32) NULL,
+  `color_identity` varchar(5) NULL,
+  `tags` text NULL,
   PRIMARY KEY  (`id`),
   KEY `FolderPlusUser` (`id_folder`,`id_user`),
   FOREIGN KEY(`id_user`) REFERENCES `cockatrice_users`(`id`)  ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
 
+-- Temporary deck shares: a named bundle of decks that can be fetched by
+-- anyone who knows the (unguessable) token, until the share expires.
+CREATE TABLE IF NOT EXISTS `cockatrice_deck_share` (
+  `id` int(7) unsigned zerofill NOT NULL auto_increment,
+  `token` varchar(64) COLLATE utf8mb4_bin NOT NULL,
+  `name` varchar(64) NOT NULL,
+  `created_by` int(7) unsigned NULL,
+  `created_at` datetime NOT NULL,
+  `expires_at` datetime NOT NULL,
+  PRIMARY KEY  (`id`),
+  UNIQUE KEY `token` (`token`),
+  KEY `expires_at` (`expires_at`),
+  FOREIGN KEY(`created_by`) REFERENCES `cockatrice_users`(`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
+
+-- Individual decks inside a share bundle. Content is materialized at share
+-- time so expiring/deleting a share can cascade cleanly. The metadata columns
+-- are nullable because Qt's MySQL driver binds empty QStrings as NULL when
+-- using prepared statements.
+CREATE TABLE IF NOT EXISTS `cockatrice_deck_share_item` (
+  `id` int(7) unsigned zerofill NOT NULL auto_increment,
+  `share_id` int(7) unsigned zerofill NOT NULL,
+  `name` varchar(50) NOT NULL,
+  `tags` text NULL,
+  `banner_card` varchar(255) NULL,
+  `game_format` varchar(50) NULL,
+  `color_identity` varchar(5) NULL,
+  `content` text NOT NULL,
+  `position` int(7) NOT NULL,
+  PRIMARY KEY  (`id`),
+  KEY `share_id` (`share_id`),
+  FOREIGN KEY(`share_id`) REFERENCES `cockatrice_deck_share`(`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
+
 CREATE TABLE IF NOT EXISTS `cockatrice_decklist_folders` (
   `id` int(7) unsigned zerofill NOT NULL auto_increment,
   `id_parent` int(7) unsigned zerofill NOT NULL,
   `id_user` int(7) unsigned NULL,
   `name` varchar(30) NOT NULL,
+  `is_public` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY  (`id`),
   KEY `ParentPlusUser` (`id_parent`,`id_user`),
   FOREIGN KEY(`id_user`) REFERENCES `cockatrice_users`(`id`)  ON DELETE CASCADE ON UPDATE CASCADE
@@ -232,6 +277,52 @@ CREATE TABLE IF NOT EXISTS `cockatrice_warnings` (
   INDEX `idx_user_name` (`user_name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
 
+CREATE TABLE IF NOT EXISTS `cockatrice_reports` (
+ `id`                  int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `reporter_id`         int(7) unsigned NULL,
+ `reporter_name`       varchar(35) NOT NULL,
+ `reported_user_id`    int(7) unsigned NULL,
+ `reported_user_name`  varchar(35) NOT NULL,
+ `game_id`             int(7) unsigned NULL,
+ `room_id`             int(7) unsigned NULL,
+ `category`            varchar(255) NOT NULL,
+ `description`         text NOT NULL,
+ `chat_log`            mediumtext NULL,
+ `created_at`          datetime NOT NULL,
+ `resolution_time`     datetime NULL,
+ `status`              enum('open','assigned','resolved','dismissed') NOT NULL DEFAULT 'open',
+ `assigned_to`         int(7) unsigned NULL,
+ `resolved_by`         int(7) unsigned NULL,
+ `resolution_note`     text,
+ `notified`            tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ INDEX `idx_status`    (`status`),
+ INDEX `idx_created`   (`created_at`),
+ INDEX `idx_reporter_id_created` (`reporter_id`, `created_at`),
+ INDEX `idx_reported_user_name` (`reported_user_name`),
+ INDEX `idx_status_created` (`status`, `created_at`),
+ FOREIGN KEY (`reporter_id`)      REFERENCES `cockatrice_users`(`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+ FOREIGN KEY (`reported_user_id`) REFERENCES `cockatrice_users`(`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+ FOREIGN KEY (`assigned_to`)      REFERENCES `cockatrice_users`(`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+ FOREIGN KEY (`resolved_by`)      REFERENCES `cockatrice_users`(`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `cockatrice_report_comments` (
+ `id`                  int(11) unsigned NOT NULL AUTO_INCREMENT,
+ `report_id`           int(11) unsigned NOT NULL,
+ `author_name`         varchar(35) NOT NULL,
+ `author_id`           int(7) unsigned NULL,
+ `comment_text`        text NOT NULL,
+ `created_at`          datetime NOT NULL,
+ `is_moderator`        tinyint(1) NOT NULL DEFAULT 0,
+ `notified`            tinyint(1) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ INDEX `idx_report_id` (`report_id`),
+ INDEX `idx_notified`  (`notified`),
+ FOREIGN KEY (`report_id`) REFERENCES `cockatrice_reports`(`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+ FOREIGN KEY (`author_id`) REFERENCES `cockatrice_users`(`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
+
 CREATE TABLE IF NOT EXISTS `cockatrice_log` (
   `log_time` datetime NOT NULL,
   `sender_id` int(7) unsigned NULL,
@@ -300,3 +391,19 @@ CREATE TABLE IF NOT EXISTS `cockatrice_audit` (
   PRIMARY KEY  (`id`),
   KEY `user_name` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;
+
+CREATE TABLE IF NOT EXISTS `cockatrice_card_art_name_rules` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `card_name` varchar(255) NOT NULL,
+  `card_provider_id` varchar(255) NOT NULL,
+  `mode` enum('ALLOW','DENY') NOT NULL,
+  `reason` varchar(255) DEFAULT NULL,
+  `created_by` int(7) unsigned DEFAULT NULL,
+  `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uniq_provider_card_name` (`card_provider_id`, `card_name`),
+  KEY `idx_mode` (`mode`),
+  FOREIGN KEY (`created_by`) REFERENCES `cockatrice_users`(`id`)
+  ON DELETE SET NULL
+  ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci;
diff --git a/servatrice/src/deck_tag_serialization.h b/servatrice/src/deck_tag_serialization.h
new file mode 100644
index 000000000..162b0604d
--- /dev/null
+++ b/servatrice/src/deck_tag_serialization.h
@@ -0,0 +1,39 @@
+#ifndef DECK_TAG_SERIALIZATION_H
+#define DECK_TAG_SERIALIZATION_H
+
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonValue>
+#include <QString>
+#include <QStringList>
+
+/**
+ * @brief Encodes deck tags as a compact JSON array for storage in a text column.
+ *
+ * Deck tags are stored as JSON (rather than a delimited string) so tag names may
+ * contain any character, and decoded uniformly everywhere they are read.
+ */
+inline QString serializeDeckTags(const QStringList &tags)
+{
+    QJsonArray array;
+    for (const QString &tag : tags) {
+        array.append(tag);
+    }
+    return QString::fromUtf8(QJsonDocument(array).toJson(QJsonDocument::Compact));
+}
+
+/** @brief Decodes deck tags previously written by serializeDeckTags. */
+inline QStringList deserializeDeckTags(const QString &serialized)
+{
+    QStringList tags;
+    if (serialized.isEmpty()) {
+        return tags;
+    }
+    const QJsonArray array = QJsonDocument::fromJson(serialized.toUtf8()).array();
+    for (const QJsonValue &tag : array) {
+        tags.append(tag.toString());
+    }
+    return tags;
+}
+
+#endif // DECK_TAG_SERIALIZATION_H
diff --git a/servatrice/src/email_parser.cpp b/servatrice/src/email_parser.cpp
index d8c30d852..44c788e67 100644
--- a/servatrice/src/email_parser.cpp
+++ b/servatrice/src/email_parser.cpp
@@ -1,6 +1,8 @@
 #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
new file mode 100644
index 000000000..a2f20ff1c
--- /dev/null
+++ b/servatrice/src/event_loop_watchdog.cpp
@@ -0,0 +1,36 @@
+/**
+ * @file event_loop_watchdog.cpp
+ * @ingroup Servatrice
+ */
+
+#include "event_loop_watchdog.h"
+
+#include "servatrice.h"
+
+#include <QTimer>
+#include <QtGlobal>
+#include <utility>
+
+EventLoopWatchdog::EventLoopWatchdog(Servatrice *_servatrice, QString _threadName)
+    : QObject(nullptr), servatrice(_servatrice), threadName(std::move(_threadName))
+{
+}
+
+void EventLoopWatchdog::start()
+{
+    heartbeatTimer = new QTimer(this);
+    sinceLastTick.start();
+    connect(heartbeatTimer, &QTimer::timeout, this, &EventLoopWatchdog::checkHeartbeat);
+    heartbeatTimer->start(HeartbeatIntervalMs);
+}
+
+void EventLoopWatchdog::checkHeartbeat()
+{
+    const qint64 elapsedMs = sinceLastTick.restart();
+    const qint64 overshootMs = qMax<qint64>(0, elapsedMs - HeartbeatIntervalMs);
+    if (overshootMs < servatrice->getMetricsStallWarnMs()) {
+        return;
+    }
+
+    servatrice->observeEventLoopStall(threadName, overshootMs);
+}
diff --git a/servatrice/src/event_loop_watchdog.h b/servatrice/src/event_loop_watchdog.h
new file mode 100644
index 000000000..d05430eaa
--- /dev/null
+++ b/servatrice/src/event_loop_watchdog.h
@@ -0,0 +1,51 @@
+/**
+ * @file event_loop_watchdog.h
+ * @ingroup Servatrice
+ */
+
+#ifndef EVENT_LOOP_WATCHDOG_H
+#define EVENT_LOOP_WATCHDOG_H
+
+#include <QElapsedTimer>
+#include <QObject>
+#include <QString>
+#include <qtmetamacros.h>
+
+class Servatrice;
+class QTimer;
+
+/**
+ * @brief Detects blocked or overloaded worker event loops.
+ *
+ * One instance lives in each socket pool thread. A heartbeat timer tick that
+ * arrives late means the loop spent that time elsewhere: busy work, a queued
+ * slot, or a hard wedge. Overshoots past the configured threshold bump
+ * lock-free counters on the metrics registry and log one warning per stall,
+ * so a stuck pool thread becomes visible instead of silent lag.
+ */
+class EventLoopWatchdog : public QObject
+{
+    Q_OBJECT
+public:
+    /// How often the heartbeat expects to fire. Small enough to catch short stalls.
+    static constexpr int HeartbeatIntervalMs = 500;
+
+    EventLoopWatchdog(Servatrice *_servatrice, QString _threadName);
+
+    /**
+     * Starts the heartbeat timer. Must be invoked queued after the instance
+     * was moved to its target thread so the timer lives there too.
+     */
+    void start();
+
+private slots:
+    void checkHeartbeat();
+
+private:
+    Servatrice *servatrice;
+    QString threadName;
+    QElapsedTimer sinceLastTick;
+    QTimer *heartbeatTimer = nullptr;
+};
+
+#endif
diff --git a/servatrice/src/isl_interface.cpp b/servatrice/src/isl_interface.cpp
index 2269ff314..a78ee9e72 100644
--- a/servatrice/src/isl_interface.cpp
+++ b/servatrice/src/isl_interface.cpp
@@ -1,10 +1,34 @@
 #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>
@@ -16,11 +40,17 @@
 #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)
 {
     socket = new QSslSocket(this);
@@ -73,8 +103,9 @@ IslInterface::~IslInterface()
         QMapIterator<QString, ServerInfo_User_Container> roomUsers(room->getExternalUsers());
         while (roomUsers.hasNext()) {
             roomUsers.next();
-            if (roomUsers.value().getUserInfo()->server_id() == serverId)
+            if (roomUsers.value().getUserInfo()->server_id() == serverId) {
                 emit externalRoomUserLeft(room->getId(), roomUsers.key());
+            }
         }
         room->usersLock.unlock();
     }
@@ -84,8 +115,9 @@ IslInterface::~IslInterface()
     QMapIterator<QString, Server_AbstractUserInterface *> extUsers(server->getExternalUsers());
     while (extUsers.hasNext()) {
         extUsers.next();
-        if (extUsers.value()->getUserInfo()->server_id() == serverId)
+        if (extUsers.value()->getUserInfo()->server_id() == serverId) {
             emit externalUserLeft(extUsers.key());
+        }
     }
     server->clientsLock.unlock();
 }
@@ -98,11 +130,12 @@ void IslInterface::initServer()
 
     QList<ServerProperties> serverList = server->getServerList();
     int listIndex = -1;
-    for (int i = 0; i < serverList.size(); ++i)
+    for (int i = 0; i < serverList.size(); ++i) {
         if (serverList[i].address == socket->peerAddress()) {
             listIndex = i;
             break;
         }
+    }
     if (listIndex == -1) {
         logger->logMessage(
             QString("[ISL] address %1 unknown, terminating connection").arg(socket->peerAddress().toString()));
@@ -112,22 +145,19 @@ void IslInterface::initServer()
 
     socket->startServerEncryption();
     if (!socket->waitForEncrypted(5000)) {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
         QList<QSslError> sslErrors(socket->sslHandshakeErrors());
-#else
-        QList<QSslError> sslErrors(socket->sslErrors());
-#endif
-        if (sslErrors.isEmpty())
-            qDebug() << "[ISL] SSL handshake timeout, terminating connection";
-        else
-            qDebug() << "[ISL] SSL errors:" << sslErrors;
+        if (sslErrors.isEmpty()) {
+            qCDebug(IslInterfaceLog) << "SSL handshake timeout, terminating connection";
+        } else {
+            qCWarning(IslInterfaceLog) << "SSL errors:" << sslErrors;
+        }
         deleteLater();
         return;
     }
 
-    if (serverList[listIndex].cert == socket->peerCertificate())
+    if (serverList[listIndex].cert == socket->peerCertificate()) {
         logger->logMessage(QString("[ISL] Peer authenticated as " + serverList[listIndex].hostname));
-    else {
+    } else {
         logger->logMessage(QString("[ISL] Authentication failed, terminating connection"));
         deleteLater();
         return;
@@ -139,8 +169,9 @@ void IslInterface::initServer()
 
     server->clientsLock.lockForRead();
     QMapIterator<QString, Server_ProtocolHandler *> userIterator(server->getUsers());
-    while (userIterator.hasNext())
+    while (userIterator.hasNext()) {
         event.add_user_list()->CopyFrom(userIterator.next().value()->copyUserInfo(true, true));
+    }
     server->clientsLock.unlock();
 
     server->roomsLock.lockForRead();
@@ -161,7 +192,7 @@ void IslInterface::initServer()
 
     server->islLock.lockForWrite();
     if (server->islConnectionExists(serverId)) {
-        qDebug() << "[ISL] Duplicate connection to #" << serverId << "terminating connection";
+        qCDebug(IslInterfaceLog) << "Duplicate connection to #" << serverId << "terminating connection";
         deleteLater();
     } else {
         transmitMessage(message);
@@ -184,31 +215,28 @@ void IslInterface::initClient()
     expectedErrors.append(QSslError(QSslError::SelfSignedCertificate, peerCert));
     socket->ignoreSslErrors(expectedErrors);
 
-    qDebug() << "[ISL] Connecting to #" << serverId << ":" << peerAddress << ":" << peerPort;
+    qCDebug(IslInterfaceLog) << "Connecting to #" << serverId << ":" << peerAddress << ":" << peerPort;
 
     socket->connectToHostEncrypted(peerAddress, peerPort, peerHostName);
     if (!socket->waitForConnected(5000)) {
-        qDebug() << "[ISL] Socket error:" << socket->errorString();
+        qCDebug(IslInterfaceLog) << "Socket error:" << socket->errorString();
         deleteLater();
         return;
     }
     if (!socket->waitForEncrypted(5000)) {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
         QList<QSslError> sslErrors(socket->sslHandshakeErrors());
-#else
-        QList<QSslError> sslErrors(socket->sslErrors());
-#endif
-        if (sslErrors.isEmpty())
-            qDebug() << "[ISL] SSL handshake timeout, terminating connection";
-        else
-            qDebug() << "[ISL] SSL errors:" << sslErrors;
+        if (sslErrors.isEmpty()) {
+            qCDebug(IslInterfaceLog) << "SSL handshake timeout, terminating connection";
+        } else {
+            qCWarning(IslInterfaceLog) << "SSL errors:" << sslErrors;
+        }
         deleteLater();
         return;
     }
 
     server->islLock.lockForWrite();
     if (server->islConnectionExists(serverId)) {
-        qDebug() << "[ISL] Duplicate connection to #" << serverId << "terminating connection";
+        qCDebug(IslInterfaceLog) << "Duplicate connection to #" << serverId << "terminating connection";
         deleteLater();
         return;
     }
@@ -220,8 +248,9 @@ void IslInterface::initClient()
 void IslInterface::flushOutputBuffer()
 {
     QMutexLocker locker(&outputBufferMutex);
-    if (outputBuffer.isEmpty())
+    if (outputBuffer.isEmpty()) {
         return;
+    }
     server->incTxBytes(outputBuffer.size());
     socket->write(outputBuffer);
     socket->flush();
@@ -241,26 +270,39 @@ 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
+            } else {
                 return;
+            }
         }
-        if (inputBuffer.size() < messageLength)
+        if (inputBuffer.size() < messageLength) {
             return;
+        }
 
         IslMessage newMessage;
-        newMessage.ParseFromArray(inputBuffer.data(), messageLength);
+        bool ok = newMessage.ParseFromArray(inputBuffer.data(), messageLength);
         inputBuffer.remove(0, messageLength);
         messageInProgress = false;
 
-        processMessage(newMessage);
+        if (ok) {
+            processMessage(newMessage);
+        } else {
+            qCWarning(IslInterfaceLog) << "parsing error!";
+        }
     } while (!inputBuffer.isEmpty());
 }
 
 void IslInterface::catchSocketError(QAbstractSocket::SocketError socketError)
 {
-    qDebug() << "[ISL] Socket error:" << socketError;
+    qCWarning(IslInterfaceLog) << "Socket error:" << socketError;
 
     server->islLock.lockForWrite();
     server->removeIslInterface(serverId);
@@ -278,7 +320,10 @@ void IslInterface::transmitMessage(const IslMessage &item)
     unsigned int size = static_cast<unsigned int>(item.ByteSize());
 #endif
     buf.resize(size + 4);
-    item.SerializeToArray(buf.data() + 4, size);
+    if (!item.SerializeToArray(buf.data() + 4, size)) {
+        qCWarning(IslInterfaceLog) << "transmit error!";
+        return;
+    }
     buf.data()[3] = (unsigned char)size;
     buf.data()[2] = (unsigned char)(size >> 8);
     buf.data()[1] = (unsigned char)(size >> 16);
@@ -376,7 +421,7 @@ void IslInterface::processSessionEvent(const SessionEvent &event, qint64 session
             QReadLocker clientsLocker(&server->clientsLock);
             Server_AbstractUserInterface *client = server->getUsersBySessionId().value(sessionId);
             if (!client) {
-                qDebug() << "IslInterface::processSessionEvent: session id" << sessionId << "not found";
+                qCDebug(IslInterfaceLog) << "IslInterface::processSessionEvent: session id" << sessionId << "not found";
                 break;
             }
             const Event_GameJoined &gameJoined = event.GetExtension(Event_GameJoined::ext);
@@ -390,7 +435,8 @@ void IslInterface::processSessionEvent(const SessionEvent &event, qint64 session
             QReadLocker clientsLocker(&server->clientsLock);
             Server_AbstractUserInterface *client = server->getUsersBySessionId().value(sessionId);
             if (!client) {
-                qDebug() << "IslInterface::processSessionEvent: session id" << sessionId << "not found";
+                qCWarning(IslInterfaceLog)
+                    << "IslInterface::processSessionEvent: session id" << sessionId << "not found";
                 break;
             }
 
@@ -438,7 +484,7 @@ void IslInterface::processRoomCommand(const CommandContainer &cont, qint64 sessi
 
 void IslInterface::processMessage(const IslMessage &item)
 {
-    qDebug() << getSafeDebugString(item);
+    qCDebug(IslInterfaceLog) << getSafeDebugString(item);
 
     switch (item.message_type()) {
         case IslMessage::ROOM_COMMAND_CONTAINER: {
diff --git a/servatrice/src/isl_interface.h b/servatrice/src/isl_interface.h
index 27e5b8293..f7680c0a2 100644
--- a/servatrice/src/isl_interface.h
+++ b/servatrice/src/isl_interface.h
@@ -1,21 +1,26 @@
 #ifndef ISL_INTERFACE_H
 #define ISL_INTERFACE_H
 
-#include "servatrice.h"
-
+#include <QAbstractSocket>
+#include <QByteArray>
+#include <QMutex>
+#include <QObject>
 #include <QSslCertificate>
-#include <QWaitCondition>
+#include <QString>
+
+// 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 <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;
@@ -24,6 +29,11 @@ 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 b1294a04c..eb019a2b7 100644
--- a/servatrice/src/main.cpp
+++ b/servatrice/src/main.cpp
@@ -18,6 +18,7 @@
  *   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"
@@ -25,15 +26,29 @@
 #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 <QtGlobal>
+#include <QObject>
+#include <QSharedPointer>
+#include <QString>
+#include <QThread>
+#include <QVariant>
+#include <QVector>
+#include <google/protobuf/stubs/common.h>
 #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;
@@ -69,19 +84,22 @@ void testRNG()
     for (int i = 0; i <= maxMax - min; ++i) {
         std::cerr << (min + i);
         for (auto &number : numbers) {
-            if (i < number.size())
+            if (i < number.size()) {
                 std::cerr << "\t" << number[i];
-            else
+            } else {
                 std::cerr << "\t";
+            }
         }
         std::cerr << std::endl;
     }
     std::cerr << std::endl << "Chi^2 =";
-    for (double j : chisq)
+    for (double j : chisq) {
         std::cerr << "\t" << QString::number(j, 'f', 3).toStdString();
+    }
     std::cerr << std::endl << "k =";
-    for (int j = 0; j < chisq.size(); ++j)
+    for (int j = 0; j < chisq.size(); ++j) {
         std::cerr << "\t" << (j - min + minMax);
+    }
     std::cerr << std::endl << std::endl;
 }
 
@@ -90,8 +108,9 @@ void testHash()
     const int n = 5000;
     std::cerr << "Benchmarking password hash function (n =" << n << ")..." << std::endl;
     QDateTime startTime = QDateTime::currentDateTime();
-    for (int i = 0; i < n; ++i)
+    for (int i = 0; i < n; ++i) {
         PasswordHasher::computeHash("aaaaaa", "aaaaaaaaaaaaaaaa");
+    }
     QDateTime endTime = QDateTime::currentDateTime();
     std::cerr << startTime.secsTo(endTime) << "secs" << std::endl;
 }
@@ -157,14 +176,15 @@ int main(int argc, char *argv[])
     QMetaObject::invokeMethod(logger, "startLog", Qt::BlockingQueuedConnection,
                               Q_ARG(QString, settingsCache->value("server/logfile", QString("server.log")).toString()));
 
-    if (logToConsole)
+    if (logToConsole) {
         qInstallMessageHandler(myMessageOutput);
-    else
+    } else {
         qInstallMessageHandler(myMessageOutput2);
+    }
 
     signalhandler = new SignalHandler();
 
-    rng = new RNG_SFMT;
+    rng = new RNG_SFMT(CryptoUtil::randomUInt64());
 
     std::cerr << "Servatrice " << VERSION_STRING << " starting." << std::endl;
     std::cerr << "-------------------------" << std::endl;
diff --git a/servatrice/src/metrics_registry.cpp b/servatrice/src/metrics_registry.cpp
new file mode 100644
index 000000000..51abb7e3e
--- /dev/null
+++ b/servatrice/src/metrics_registry.cpp
@@ -0,0 +1,71 @@
+#include "metrics_registry.h"
+
+#include <QList>
+#include <stddef.h>
+
+void MetricsRegistry::observeCommand(int typeId, qint64 elapsedMs)
+{
+    if (typeId < 0 || typeId >= MaxTypes) {
+        typeId = MaxTypes - 1; // overflow slot keeps misrouted ids visible
+    }
+    if (elapsedMs < 0) {
+        elapsedMs = 0;
+    }
+
+    TypeStats &stats = slotFor(typeId);
+    stats.count.fetch_add(1, std::memory_order_relaxed);
+    stats.totalMs.fetch_add(elapsedMs, std::memory_order_relaxed);
+    totalCommandsCounter.fetch_add(1, std::memory_order_relaxed);
+    totalTimeCounter.fetch_add(elapsedMs, std::memory_order_relaxed);
+}
+
+void MetricsRegistry::observeGameStartDurationMs(qint64 elapsedMs)
+{
+    if (elapsedMs < 0) {
+        elapsedMs = 0;
+    }
+
+    gameStartStats.count.fetch_add(1, std::memory_order_relaxed);
+    gameStartStats.totalMs.fetch_add(elapsedMs, std::memory_order_relaxed);
+}
+
+MetricsRegistry::TypeStats &MetricsRegistry::slotFor(int typeId)
+{
+    return typeSlots[static_cast<size_t>(typeId)];
+}
+
+const MetricsRegistry::TypeStats &MetricsRegistry::slotFor(int typeId) const
+{
+    return typeSlots[static_cast<size_t>(typeId)];
+}
+
+int MetricsRegistry::activeTypeCount() const
+{
+    int active = 0;
+    for (int type = 0; type < MaxTypes; ++type) {
+        if (slotFor(type).count.load(std::memory_order_relaxed) > 0) {
+            ++active;
+        }
+    }
+    return active;
+}
+
+QList<MetricsRegistry::ActiveTypeStats> MetricsRegistry::collectActiveStats() const
+{
+    QList<ActiveTypeStats> result;
+    for (int type = 0; type < MaxTypes; ++type) {
+        const TypeStats &stats = slotFor(type);
+        const qint64 count = stats.count.load(std::memory_order_relaxed);
+        if (count == 0) {
+            continue;
+        }
+        result.append({type, count, stats.totalMs.load(std::memory_order_relaxed)});
+    }
+    return result;
+}
+
+MetricsRegistry::GameStartSnapshot MetricsRegistry::getGameStartSnapshot() const
+{
+    return {gameStartStats.count.load(std::memory_order_relaxed),
+            gameStartStats.totalMs.load(std::memory_order_relaxed)};
+}
\ No newline at end of file
diff --git a/servatrice/src/metrics_registry.h b/servatrice/src/metrics_registry.h
new file mode 100644
index 000000000..1175d03c4
--- /dev/null
+++ b/servatrice/src/metrics_registry.h
@@ -0,0 +1,120 @@
+/**
+ * @file metrics_registry.h
+ * @ingroup Servatrice
+ */
+
+#ifndef METRICS_REGISTRY_H
+#define METRICS_REGISTRY_H
+
+#include <QList>
+#include <QtGlobal>
+#include <array>
+#include <atomic>
+
+/**
+ * @brief Lock-free accumulation of command processing statistics.
+ *
+ * observeCommand() is called once per processed command from whichever socket
+ * thread handled it. It uses relaxed atomic adds on preallocated storage only,
+ * so it introduces no locks, allocations, or shared cache-line ping-pong
+ * beyond the unavoidable counter updates.
+ *
+ * Reading happens rarely (metrics scraping), accepts momentary tears between
+ * related counters, and therefore also needs no synchronization.
+ *
+ * Only counts and totals are retained. An earlier Prometheus-style cumulative
+ * histogram (per-type, time-bucketed) was cut because nothing in the server
+ * ever wrote it out; it belongs to the future /metrics exporter that needs it.
+ */
+class MetricsRegistry
+{
+public:
+    /**
+     * Extension numbers are only unique per command kind, so recorded ids
+     * combine the kind index with the protobuf extension number.
+     *
+     * The stride is only as wide as it needs to be: 1280 is the first round
+     * number above the largest extension actually in use (ModeratorCommand =
+     * 1206) and keeps the preallocated TypeStats array small. Bump it if a new
+     * command exceeds it.
+     */
+    static constexpr int KindStride = 1280;
+
+    static constexpr int NumKinds = 6;
+
+    static constexpr const char *KindNames[NumKinds] = {"session", "room", "game", "moderator", "admin", "developer"};
+
+    /// Upper bound on distinct command type ids (see typeIdFor).
+    static constexpr int MaxTypes = NumKinds * KindStride;
+
+    /// Guard against typeIdFor() overflowing into the neighbouring kind's slots.
+    static_assert(KindStride > 1206, "KindStride must exceed the highest command extension number in use");
+
+    static int typeIdFor(int kindIndex, int extensionNumber)
+    {
+        return kindIndex * KindStride + extensionNumber;
+    }
+
+    void observeCommand(int typeId, qint64 elapsedMs);
+
+    /**
+     * Records how long one game start took to bring every player's zones
+     * online. Kept separate from command timings because it is triggered by
+     * the server itself and can dwarf any single command when decks are huge.
+     */
+    void observeGameStartDurationMs(qint64 elapsedMs);
+
+    /// Total number of observed commands across all types.
+    qint64 totalCommands() const
+    {
+        return totalCommandsCounter.load(std::memory_order_relaxed);
+    }
+
+    /// Cumulative processing milliseconds across all types.
+    qint64 totalTimeMs() const
+    {
+        return totalTimeCounter.load(std::memory_order_relaxed);
+    }
+
+    /// Number of distinct type slots that have seen at least one sample.
+    int activeTypeCount() const;
+
+    struct ActiveTypeStats
+    {
+        int typeId;
+        qint64 count;
+        qint64 totalMs;
+    };
+
+    /**
+     * Returns stats for every type slot that has seen at least one sample.
+     * Callers resolve the numeric type id to a human-readable label via
+     * typeIdFor()/KindNames as needed.
+     */
+    QList<ActiveTypeStats> collectActiveStats() const;
+
+    struct GameStartSnapshot
+    {
+        qint64 count;
+        qint64 totalMs;
+    };
+
+    GameStartSnapshot getGameStartSnapshot() const;
+
+private:
+    struct TypeStats
+    {
+        std::atomic<qint64> count{0};
+        std::atomic<qint64> totalMs{0};
+    };
+
+    TypeStats &slotFor(int typeId);
+    const TypeStats &slotFor(int typeId) const;
+
+    std::array<TypeStats, MaxTypes> typeSlots{};
+    TypeStats gameStartStats{};
+    std::atomic<qint64> totalCommandsCounter{0};
+    std::atomic<qint64> totalTimeCounter{0};
+};
+
+#endif
\ No newline at end of file
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index ea3d783bd..9ec9ef5bc 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -20,11 +20,16 @@
 #include "servatrice.h"
 
 #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"
@@ -32,19 +37,40 @@
 #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 <iostream>
-#include <libcockatrice/deck_list/deck_list.h>
+#include <QVariant>
+#include <QtGlobal>
+#include <compare>
+#include <game/server_game.h>
+#include <google/protobuf/stubs/port.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,
@@ -63,6 +89,7 @@ Servatrice_GameServer::Servatrice_GameServer(Servatrice *_server,
         server->addDatabaseInterface(newThread, newDatabaseInterface);
 
         newThread->start();
+        server->watchWorkerThread(newThread);
         QMetaObject::invokeMethod(newDatabaseInterface, "initDatabase", Qt::BlockingQueuedConnection,
                                   Q_ARG(QSqlDatabase, _sqlDatabase));
 
@@ -86,7 +113,6 @@ void Servatrice_GameServer::incomingConnection(qintptr socketDescriptor)
     Servatrice_ConnectionPool *pool = findLeastUsedConnectionPool();
 
     auto ssi = new TcpServerSocketInterface(server, pool->getDatabaseInterface());
-    connect(ssi, SIGNAL(incTxBytes(qint64)), this, SLOT(incTxBytes(qint64)));
     ssi->moveToThread(pool->thread());
     pool->addClient();
     connect(ssi, SIGNAL(destroyed()), pool, SLOT(removeClient()));
@@ -131,6 +157,7 @@ Servatrice_WebsocketGameServer::Servatrice_WebsocketGameServer(Servatrice *_serv
         server->addDatabaseInterface(newThread, newDatabaseInterface);
 
         newThread->start();
+        server->watchWorkerThread(newThread);
         QMetaObject::invokeMethod(newDatabaseInterface, "initDatabase", Qt::BlockingQueuedConnection,
                                   Q_ARG(QSqlDatabase, _sqlDatabase));
 
@@ -156,7 +183,6 @@ void Servatrice_WebsocketGameServer::onNewConnection()
     Servatrice_ConnectionPool *pool = findLeastUsedConnectionPool();
 
     auto ssi = new WebsocketServerSocketInterface(server, pool->getDatabaseInterface());
-    connect(ssi, SIGNAL(incTxBytes(quint64)), this, SLOT(incTxBytes(quint64)));
     /*
      * Due to a Qt limitation, websockets can't be moved to another thread.
      * This will hopefully change in Qt6 if QtWebSocket will be integrated in QtNetwork
@@ -226,6 +252,13 @@ bool Servatrice::initServer()
 {
 
     serverId = getServerID();
+
+    // METRICS (always active. Slow-command logging and stall watchdogs are
+    // controlled by their respective thresholds below). Read up front so the
+    // values are available before any pool thread is started and watchdogged.
+    metricsSlowCommandMs = settingsCache->value("metrics/slow_command_ms", 500).toInt();
+    metricsStallWarnMs = qMax(0, settingsCache->value("metrics/stall_warn_ms", 2000).toInt());
+
     if (getAuthenticationMethodString() == "sql") {
         qDebug() << "Authenticating method: sql";
         authenticationMethod = AuthenticationSql;
@@ -254,13 +287,8 @@ bool Servatrice::initServer()
     qDebug() << "Accept registered users only:" << getRegOnlyServerEnabled();
     qDebug() << "Registration enabled:" << getRegistrationEnabled();
     if (getRegistrationEnabled()) {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
         QStringList emailBlackListFilters = getEmailBlackList().split(",", Qt::SkipEmptyParts);
         QStringList emailWhiteListFilters = getEmailWhiteList().split(",", Qt::SkipEmptyParts);
-#else
-        QStringList emailBlackListFilters = getEmailBlackList().split(",", QString::SkipEmptyParts);
-        QStringList emailWhiteListFilters = getEmailWhiteList().split(",", QString::SkipEmptyParts);
-#endif
         qDebug() << "Email blacklist:" << emailBlackListFilters;
         qDebug() << "Email whitelist:" << emailWhiteListFilters;
         qDebug() << "Require email address to register:" << getRequireEmailForRegistrationEnabled();
@@ -310,6 +338,11 @@ 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 "
@@ -323,8 +356,9 @@ bool Servatrice::initServer()
             query2->bindValue(":id_room", query->value(0).toInt());
             servatriceDatabaseInterface->execSqlQuery(query2);
             QStringList gameTypes;
-            while (query2->next())
+            while (query2->next()) {
                 gameTypes.append(query2->value(0).toString());
+            }
             addRoom(new Server_Room(query->value(0).toInt(), query->value(7).toInt(), query->value(1).toString(),
                                     query->value(2).toString(), query->value(3).toString().toLower(),
                                     query->value(4).toString().toLower(), static_cast<bool>(query->value(5).toInt()),
@@ -367,21 +401,25 @@ bool Servatrice::initServer()
             qDebug() << "Connecting to ISL network.";
             qDebug() << "Loading certificate...";
             QFile certFile(getISLNetworkSSLCertFile());
-            if (!certFile.open(QIODevice::ReadOnly))
+            if (!certFile.open(QIODevice::ReadOnly)) {
                 throw QString("Error opening certificate file: %1").arg(getISLNetworkSSLCertFile());
+            }
             QSslCertificate cert(&certFile);
 
             const QDateTime currentTime = QDateTime::currentDateTime();
-            if (currentTime < cert.effectiveDate() || currentTime > cert.expiryDate() || cert.isBlacklisted())
+            if (currentTime < cert.effectiveDate() || currentTime > cert.expiryDate() || cert.isBlacklisted()) {
                 throw QString("Invalid certificate.");
+            }
 
             qDebug() << "Loading private key...";
             QFile keyFile(getISLNetworkSSLKeyFile());
-            if (!keyFile.open(QIODevice::ReadOnly))
+            if (!keyFile.open(QIODevice::ReadOnly)) {
                 throw QString("Error opening private key file: %1").arg(getISLNetworkSSLKeyFile());
+            }
             QSslKey key(&keyFile, QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
-            if (key.isNull())
+            if (key.isNull()) {
                 throw QString("Invalid private key.");
+            }
 
             QMutableListIterator<ServerProperties> serverIterator(serverList);
             while (serverIterator.hasNext()) {
@@ -406,10 +444,11 @@ bool Servatrice::initServer()
 
             qDebug() << "Starting ISL server on port" << getISLNetworkPort();
             islServer = new Servatrice_IslServer(this, cert, key, this);
-            if (islServer->listen(QHostAddress::Any, static_cast<quint16>(getISLNetworkPort())))
+            if (islServer->listen(QHostAddress::Any, static_cast<quint16>(getISLNetworkPort()))) {
                 qDebug() << "ISL server listening.";
-            else
+            } else {
                 throw QString("islServer->listen()");
+            }
         }
     } catch (QString &error) {
         qDebug() << "ERROR --" << error;
@@ -427,6 +466,14 @@ bool Servatrice::initServer()
         statusUpdateClock->start(getServerStatusUpdateTime());
     }
 
+    deckShareCleanupClock = new QTimer(this);
+    connect(deckShareCleanupClock, SIGNAL(timeout()), this, SLOT(cleanupExpiredDeckShares()));
+    const int deckShareCleanupInterval = getDeckShareCleanupInterval();
+    if (deckShareCleanupInterval > 0) {
+        qDebug() << "Starting deck share cleanup clock, interval" << deckShareCleanupInterval << "ms";
+        deckShareCleanupClock->start(deckShareCleanupInterval);
+    }
+
     // SOCKET SERVER
     if (getNumberOfTCPPools() > 0) {
         gameServer =
@@ -434,9 +481,9 @@ bool Servatrice::initServer()
         gameServer->setMaxPendingConnections(1000);
         QHostAddress tcpHost = getServerTCPHost();
         qDebug() << "Starting server on host" << tcpHost.toString() << "port" << getServerTCPPort();
-        if (gameServer->listen(tcpHost, static_cast<quint16>(getServerTCPPort())))
+        if (gameServer->listen(tcpHost, static_cast<quint16>(getServerTCPPort()))) {
             qDebug() << "Server listening.";
-        else {
+        } else {
             qDebug() << "gameServer->listen(): Error:" << gameServer->errorString();
             return false;
         }
@@ -450,9 +497,9 @@ bool Servatrice::initServer()
         QHostAddress webSocketHost = getServerWebSocketHost();
         qDebug() << "Starting websocket server on host" << webSocketHost.toString() << "port"
                  << getServerWebSocketPort();
-        if (websocketGameServer->listen(webSocketHost, static_cast<quint16>(getServerWebSocketPort())))
+        if (websocketGameServer->listen(webSocketHost, static_cast<quint16>(getServerWebSocketPort()))) {
             qDebug() << "Websocket server listening.";
-        else {
+        } else {
             qDebug() << "websocketGameServer->listen(): Error:" << websocketGameServer->errorString();
             return false;
         }
@@ -460,17 +507,64 @@ bool Servatrice::initServer()
 
     if (getIdleClientTimeout() > 0) {
         qDebug() << "Idle client timeout value:" << getIdleClientTimeout();
-        if (getIdleClientTimeout() < 300)
+        if (getIdleClientTimeout() < 300) {
             qDebug() << "WARNING: It is not recommended to set the IdleClientTimeout value very low.  Doing so will "
                         "cause clients to very quickly be disconnected.  Many players when connected may be searching "
                         "for card details outside the client in the middle of matches or possibly drafting outside the "
                         "client and short time out values will remove these players.";
+        }
     }
 
     setRequiredFeatures(getRequiredFeatures());
+
     return true;
 }
 
+void Servatrice::observeGameStartDurationMs(qint64 elapsedMs)
+{
+    metricsRegistry.observeGameStartDurationMs(elapsedMs);
+}
+
+void Servatrice::observeEventLoopStall(const QString &threadName, qint64 overshootMs)
+{
+    eventLoopStallsTotal.fetch_add(1, std::memory_order_relaxed);
+    eventLoopLastStallMs.store(overshootMs, std::memory_order_relaxed);
+    qint64 prevMax = eventLoopMaxStallMs.load(std::memory_order_relaxed);
+    while (overshootMs > prevMax &&
+           !eventLoopMaxStallMs.compare_exchange_weak(prevMax, overshootMs, std::memory_order_relaxed)) {
+        // retry until the max is at least as high as the new sample
+    }
+
+    qWarning() << "Event loop stall in" << threadName << "- heartbeat overshot by" << overshootMs << "ms";
+}
+
+void Servatrice::watchWorkerThread(QThread *thread)
+{
+    if (metricsStallWarnMs <= 0) {
+        return; // watchdogs disabled via metrics/stall_warn_ms = 0
+    }
+
+    auto *watchdog = new EventLoopWatchdog(this, thread->objectName());
+    connect(thread, &QThread::finished, watchdog, &QObject::deleteLater);
+    watchdog->moveToThread(thread);
+    QMetaObject::invokeMethod(watchdog, &EventLoopWatchdog::start, Qt::QueuedConnection);
+}
+
+qint64 Servatrice::getCardsInGamesTotal() const
+{
+    qint64 total = 0;
+    QReadLocker roomsLocker(&roomsLock); // locking order: roomsLock before gamesLock/gameMutex
+    QMapIterator<int, Server_Room *> roomIterator(rooms);
+    while (roomIterator.hasNext()) {
+        Server_Room *room = roomIterator.next().value();
+        QReadLocker gamesLocker(&room->gamesLock);
+        for (auto *game : room->getGames()) {
+            total += game->getCardsInGame();
+        }
+    }
+    return total;
+}
+
 void Servatrice::addDatabaseInterface(QThread *thread, Servatrice_DatabaseInterface *databaseInterface)
 {
     databaseInterfaces.insert(thread, databaseInterface);
@@ -512,13 +606,32 @@ QList<ServerProperties> Servatrice::getServerList() const
     return result;
 }
 
+std::shared_ptr<const Response_ReportStats> Servatrice::getCachedReportStats() const
+{
+    QMutexLocker locker(&reportStatsMutex);
+    if (!reportStatsTimestamp.isValid() ||
+        reportStatsTimestamp.secsTo(QDateTime::currentDateTime()) >= reportStatsCacheTtlSeconds) {
+        return nullptr;
+    }
+    return reportStatsCache;
+}
+
+void Servatrice::cacheReportStats(const Response_ReportStats &stats)
+{
+    QMutexLocker locker(&reportStatsMutex);
+    reportStatsCache = std::make_shared<const Response_ReportStats>(stats);
+    reportStatsTimestamp = QDateTime::currentDateTime();
+}
+
 int Servatrice::getUsersWithAddress(const QHostAddress &address) const
 {
     int result = 0;
     QReadLocker locker(&clientsLock);
-    for (auto client : clients)
-        if (static_cast<AbstractServerSocketInterface *>(client)->getPeerAddress() == address)
+    for (auto client : clients) {
+        if (static_cast<AbstractServerSocketInterface *>(client)->getPeerAddress() == address) {
             ++result;
+        }
+    }
 
     return result;
 }
@@ -527,21 +640,24 @@ QList<AbstractServerSocketInterface *> Servatrice::getUsersWithAddressAsList(con
 {
     QList<AbstractServerSocketInterface *> result;
     QReadLocker locker(&clientsLock);
-    for (auto client : clients)
-        if (static_cast<AbstractServerSocketInterface *>(client)->getPeerAddress() == address)
+    for (auto client : clients) {
+        if (static_cast<AbstractServerSocketInterface *>(client)->getPeerAddress() == address) {
             result.append(static_cast<AbstractServerSocketInterface *>(client));
+        }
+    }
     return result;
 }
 
 void Servatrice::updateLoginMessage()
 {
-    if (!servatriceDatabaseInterface->checkSql())
+    if (!servatriceDatabaseInterface->checkSql()) {
         return;
+    }
 
     QSqlQuery *query = servatriceDatabaseInterface->prepareQuery(
         "select message from {prefix}_servermessages where id_server = :id_server order by timest desc limit 1");
     query->bindValue(":id_server", serverId);
-    if (servatriceDatabaseInterface->execSqlQuery(query))
+    if (servatriceDatabaseInterface->execSqlQuery(query)) {
         if (query->next()) {
             const QString newLoginMessage = query->value(0).toString();
 
@@ -553,10 +669,12 @@ void Servatrice::updateLoginMessage()
             event.set_message(newLoginMessage.toStdString());
             SessionEvent *se = Server_ProtocolHandler::prepareSessionEvent(event);
             QMapIterator<QString, Server_ProtocolHandler *> usersIterator(users);
-            while (usersIterator.hasNext())
+            while (usersIterator.hasNext()) {
                 usersIterator.next().value()->sendProtocolItem(*se);
+            }
             delete se;
         }
+    }
 }
 
 void Servatrice::setRequiredFeatures(const QString &featureList)
@@ -564,23 +682,26 @@ void Servatrice::setRequiredFeatures(const QString &featureList)
     FeatureSet features;
     serverRequiredFeatureList.clear();
     features.initalizeFeatureList(serverRequiredFeatureList);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     QStringList listReqFeatures = featureList.split(",", Qt::SkipEmptyParts);
-#else
-    QStringList listReqFeatures = featureList.split(",", QString::SkipEmptyParts);
-#endif
-    if (!listReqFeatures.isEmpty())
+    if (!listReqFeatures.isEmpty()) {
         for (const QString &reqFeature : listReqFeatures) {
             features.enableRequiredFeature(serverRequiredFeatureList, reqFeature);
         }
+    }
 
     qDebug() << "Set required client features to:" << serverRequiredFeatureList;
 }
 
+void Servatrice::cleanupExpiredDeckShares()
+{
+    servatriceDatabaseInterface->cleanupExpiredDeckShares();
+}
+
 void Servatrice::statusUpdate()
 {
-    if (!servatriceDatabaseInterface->checkSql())
+    if (!servatriceDatabaseInterface->checkSql()) {
         return;
+    }
 
     const int uc = getUsersCount(); // for correct mutex locking order
 
@@ -620,43 +741,40 @@ void Servatrice::statusUpdate()
             auto servDbSelQuery = servatriceDatabaseInterface->prepareQuery("select a.name, b.email, b.token from "
                                                                             "{prefix}_activation_emails a left join "
                                                                             "{prefix}_users b on a.name = b.name");
-            if (!servatriceDatabaseInterface->execSqlQuery(servDbSelQuery))
+            if (!servatriceDatabaseInterface->execSqlQuery(servDbSelQuery)) {
                 return;
+            }
 
-            auto *queryDelete =
-                servatriceDatabaseInterface->prepareQuery("delete from {prefix}_activation_emails where name = :name");
-
+            // 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.
             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();
 
-                if (smtpClient->enqueueActivationTokenMail(userName, emailAddress, token)) {
-                    queryDelete->bindValue(":name", userName);
-                    servatriceDatabaseInterface->execSqlQuery(queryDelete);
-                }
+                smtpClient->enqueueActivationTokenMail(userName, emailAddress, token);
             }
         }
 
         if (getEnableForgotPassword()) {
             auto *forgotPwQuery = servatriceDatabaseInterface->prepareQuery(
-                "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))
+                "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");
+            if (!servatriceDatabaseInterface->execSqlQuery(forgotPwQuery)) {
                 return;
+            }
 
-            QSqlQuery *queryDelete = servatriceDatabaseInterface->prepareQuery(
-                "update {prefix}_forgot_password set emailed = 1 where name = :name");
-
+            // 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 QString userName = forgotPwQuery->value(0).toString();
-                const auto emailAddress = EmailParser::getParsedEmailAddress(forgotPwQuery->value(1).toString());
-                const QString token = forgotPwQuery->value(2).toString();
+                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();
 
-                if (smtpClient->enqueueForgotPasswordTokenMail(userName, emailAddress, token)) {
-                    queryDelete->bindValue(":name", userName);
-                    servatriceDatabaseInterface->execSqlQuery(queryDelete);
-                }
+                smtpClient->enqueueForgotPasswordTokenMail(userName, emailAddress, token, rowId);
             }
         }
 
@@ -664,8 +782,90 @@ 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;
+    event.set_reason(shutdownReason.toStdString());
+    event.set_minutes(static_cast<google::protobuf::uint32>(shutdownMinutes));
+    return Server_ProtocolHandler::prepareSessionEvent(event);
+}
+
+SessionEvent *Servatrice::getLoginSessionEvent() const
+{
+    // Notify newly logged-in users of a pending server shutdown
+    QMutexLocker locker(&shutdownStateMutex);
+    if (shutdownTimer && shutdownMinutes > 0) {
+        return makeShutdownEvent();
+    }
+    return nullptr;
+}
+
 void Servatrice::scheduleShutdown(const QString &reason, int minutes)
 {
+    shutdownStateMutex.lock();
     shutdownReason = reason;
     shutdownMinutes = minutes;
     nextShutdownMessageMinutes = shutdownMinutes;
@@ -674,6 +874,7 @@ void Servatrice::scheduleShutdown(const QString &reason, int minutes)
         connect(shutdownTimer, SIGNAL(timeout()), this, SLOT(shutdownTimeout()));
         shutdownTimer->start(60000);
     }
+    shutdownStateMutex.unlock();
     shutdownTimeout();
 }
 
@@ -693,17 +894,16 @@ void Servatrice::incRxBytes(quint64 num)
 
 void Servatrice::shutdownTimeout()
 {
+    QMutexLocker locker(&shutdownStateMutex);
     // Show every time counter cut in half & every minute for last 5 minutes
     if (shutdownMinutes <= 5 || shutdownMinutes == nextShutdownMessageMinutes) {
-        if (shutdownMinutes == nextShutdownMessageMinutes)
+        if (shutdownMinutes == nextShutdownMessageMinutes) {
             nextShutdownMessageMinutes = shutdownMinutes / 2;
+        }
 
         SessionEvent *se;
         if (shutdownMinutes) {
-            Event_ServerShutdown event;
-            event.set_reason(shutdownReason.toStdString());
-            event.set_minutes(static_cast<google::protobuf::uint32>(shutdownMinutes));
-            se = Server_ProtocolHandler::prepareSessionEvent(event);
+            se = makeShutdownEvent();
         } else {
             Event_ConnectionClosed event;
             event.set_reason(Event_ConnectionClosed::SERVER_SHUTDOWN);
@@ -711,8 +911,9 @@ void Servatrice::shutdownTimeout()
         }
 
         clientsLock.lockForRead();
-        for (auto &client : clients)
+        for (auto &client : clients) {
             client->sendProtocolItem(*se);
+        }
         clientsLock.unlock();
         delete se;
 
@@ -768,12 +969,14 @@ void Servatrice::doSendIslMessage(const IslMessage &msg, int _serverId)
 
     if (_serverId == -1) {
         QMapIterator<int, IslInterface *> islIterator(islInterfaces);
-        while (islIterator.hasNext())
+        while (islIterator.hasNext()) {
             islIterator.next().value()->transmitMessage(msg);
+        }
     } else {
         IslInterface *interface = islInterfaces.value(_serverId);
-        if (interface)
+        if (interface) {
             interface->transmitMessage(msg);
+        }
     }
 }
 
@@ -964,6 +1167,27 @@ int Servatrice::getServerStatusUpdateTime() const
     return settingsCache->value("server/statusupdate", 15000).toInt();
 }
 
+int Servatrice::getDeckShareExpiryDays() const
+{
+    return qMax(1, settingsCache->value("deck_share/expiry_days", 7).toInt());
+}
+
+int Servatrice::getDeckShareCleanupInterval() const
+{
+    // default: every 60 minutes
+    return settingsCache->value("deck_share/cleanup_interval", 60).toInt() * 60000;
+}
+
+int Servatrice::getDeckShareMaxDecksPerShare() const
+{
+    return settingsCache->value("deck_share/max_decks_per_share", 50).toInt();
+}
+
+int Servatrice::getDeckShareMaxSharesPerDay() const
+{
+    return settingsCache->value("deck_share/max_shares_per_day", 50).toInt();
+}
+
 int Servatrice::getNumberOfTCPPools() const
 {
     return settingsCache->value("server/number_pools", 1).toInt();
@@ -977,10 +1201,11 @@ bool Servatrice::permitCreateGameAsJudge() const
 QHostAddress Servatrice::getServerTCPHost() const
 {
     QString host = settingsCache->value("server/host", "any").toString();
-    if (host == "any")
+    if (host == "any") {
         return QHostAddress::Any;
-    else
+    } else {
         return QHostAddress(host);
+    }
 }
 
 int Servatrice::getServerTCPPort() const
@@ -996,10 +1221,11 @@ int Servatrice::getNumberOfWebSocketPools() const
 QHostAddress Servatrice::getServerWebSocketHost() const
 {
     QString host = settingsCache->value("server/websocket_host", "any").toString();
-    if (host == "any")
+    if (host == "any") {
         return QHostAddress::Any;
-    else
+    } else {
         return QHostAddress(host);
+    }
 }
 
 int Servatrice::getServerWebSocketPort() const
diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h
index 62fb382cb..205a4f04d 100644
--- a/servatrice/src/servatrice.h
+++ b/servatrice/src/servatrice.h
@@ -20,30 +20,47 @@
 #ifndef SERVATRICE_H
 #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
 {
@@ -140,6 +157,7 @@ public:
 private slots:
     void statusUpdate();
     void shutdownTimeout();
+    void cleanupExpiredDeckShares();
 
 protected:
     void doSendIslMessage(const IslMessage &msg, int _serverId) override;
@@ -153,25 +171,39 @@ private:
     AuthenticationMethod authenticationMethod;
     DatabaseType databaseType;
     QTimer *pingClock, *statusUpdateClock;
+    QTimer *deckShareCleanupClock;
     Servatrice_GameServer *gameServer;
     Servatrice_WebsocketGameServer *websocketGameServer;
     Servatrice_IslServer *islServer;
     mutable QMutex loginMessageMutex;
     QString loginMessage;
+    mutable QMutex shutdownStateMutex;
     QString dbPrefix;
     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;
     quint64 txBytes, rxBytes;
+    MetricsRegistry metricsRegistry;
+    int metricsSlowCommandMs = 500;
+    int metricsStallWarnMs = 2000;
+    std::atomic<qint64> eventLoopStallsTotal{0}; ///< heartbeat overshoots past the warn threshold
+    std::atomic<qint64> eventLoopLastStallMs{0}; ///< overshoot of the most recent stall
+    std::atomic<qint64> eventLoopMaxStallMs{0};  ///< worst overshoot seen since process start
 
     QString shutdownReason;
     int shutdownMinutes;
     int nextShutdownMessageMinutes;
     QTimer *shutdownTimer;
 
+    mutable QMutex reportStatsMutex;
+    QDateTime reportStatsTimestamp;
+    std::shared_ptr<const Response_ReportStats> reportStatsCache;
+    static constexpr int reportStatsCacheTtlSeconds = 60;
+
     mutable QMutex serverListMutex;
     QList<ServerProperties> serverList;
     void updateServerList();
@@ -201,6 +233,12 @@ 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);
@@ -216,6 +254,8 @@ public:
         QMutexLocker locker(&loginMessageMutex);
         return loginMessage;
     }
+    SessionEvent *getLoginSessionEvent() const override;
+    SessionEvent *makeShutdownEvent() const;
     QString getRequiredFeatures() const override;
     QString getAuthenticationMethodString() const;
     QString getDBTypeString() const;
@@ -256,6 +296,10 @@ public:
     int getMaxGameInactivityTime() const override;
     int getMaxPlayerInactivityTime() const override;
     int getClientKeepAlive() const override;
+    int getDeckShareExpiryDays() const;
+    int getDeckShareCleanupInterval() const;
+    int getDeckShareMaxDecksPerShare() const;
+    int getDeckShareMaxSharesPerDay() const;
     int getMaxUsersPerAddress() const;
     int getMessageCountingInterval() const override;
     int getMaxMessageCountPerInterval() const override;
@@ -275,11 +319,59 @@ public:
     void incRxBytes(quint64 num);
     void addDatabaseInterface(QThread *thread, Servatrice_DatabaseInterface *databaseInterface);
 
+    // Metrics (see [metrics] section in servatrice.ini.example)
+    MetricsRegistry &getMetricsRegistry()
+    {
+        return metricsRegistry;
+    }
+    /**
+     * Sums cards across all zones of all running games. Each game takes its
+     * own gameMutex -- the hot per-game lock every game action contends on --
+     * and then iterates every player's zones, so the scrape cost is really
+     * O(total cards in play) plus one mutex acquisition per live game. Keep
+     * scrapes infrequent in big multiplayer rooms.
+     */
+    qint64 getCardsInGamesTotal() const;
+    int getMetricsSlowCommandMs() const
+    {
+        return metricsSlowCommandMs;
+    }
+    /// Heartbeat overshoot that counts as a stall. A value of 0 disables the watchdogs.
+    int getMetricsStallWarnMs() const
+    {
+        return metricsStallWarnMs;
+    }
+    void observeGameStartDurationMs(qint64 elapsedMs) override;
+    qint64 getEventLoopStallsTotal() const
+    {
+        return eventLoopStallsTotal.load(std::memory_order_relaxed);
+    }
+    qint64 getEventLoopLastStallMs() const
+    {
+        return eventLoopLastStallMs.load(std::memory_order_relaxed);
+    }
+    qint64 getEventLoopMaxStallMs() const
+    {
+        return eventLoopMaxStallMs.load(std::memory_order_relaxed);
+    }
+    /// Records one heartbeat overshoot and logs a single warning for it.
+    void observeEventLoopStall(const QString &threadName, qint64 overshootMs);
+    /**
+     * Installs an EventLoopWatchdog in @p thread. Called once per socket pool
+     * thread right after it starts.
+     */
+    void watchWorkerThread(QThread *thread);
+
     bool islConnectionExists(int _serverId) const;
     void addIslInterface(int _serverId, IslInterface *interface);
     void removeIslInterface(int _serverId);
     QReadWriteLock islLock;
 
+    // The moderation queue statistics are shared between all connected moderators and
+    // cached briefly to avoid re-running several full-table queries on every refresh.
+    std::shared_ptr<const Response_ReportStats> getCachedReportStats() const;
+    void cacheReportStats(const Response_ReportStats &stats);
+
     QList<ServerProperties> getServerList() const;
 };
 
diff --git a/servatrice/src/servatrice_connection_pool.h b/servatrice/src/servatrice_connection_pool.h
index 7479122cf..ddd12fc95 100644
--- a/servatrice/src/servatrice_connection_pool.h
+++ b/servatrice/src/servatrice_connection_pool.h
@@ -4,6 +4,7 @@
 #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 bad16bec3..ac3a19c8e 100644
--- a/servatrice/src/servatrice_database_interface.cpp
+++ b/servatrice/src/servatrice_database_interface.cpp
@@ -1,17 +1,48 @@
 #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 "serversocketinterface.h"
+#include "server.h"
+#include "server_protocolhandler.h"
 #include "settingscache.h"
 
+#include <QByteArray>
 #include <QChar>
 #include <QDateTime>
 #include <QDebug>
+#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");
 
 Servatrice_DatabaseInterface::Servatrice_DatabaseInterface(int _instanceId, Servatrice *_server)
     : instanceId(_instanceId), sqlDatabase(QSqlDatabase()), server(_server)
@@ -52,21 +83,21 @@ bool Servatrice_DatabaseInterface::initDatabase(const QString &type,
 
 bool Servatrice_DatabaseInterface::openDatabase()
 {
-    if (sqlDatabase.isOpen())
+    if (sqlDatabase.isOpen()) {
         sqlDatabase.close();
+    }
 
     const QString poolStr = instanceId == -1 ? QString("main") : QString("pool %1").arg(instanceId);
-    qDebug().noquote() << QString("[%1] Opening database...").arg(poolStr);
+    qCDebug(DatabaseInterfaceLog).noquote() << poolStr << "Opening database...";
     if (!sqlDatabase.open()) {
-        qCritical() << QString("[%1] Error opening database: %2").arg(poolStr).arg(sqlDatabase.lastError().text());
+        qCCritical(DatabaseInterfaceLog) << poolStr << "Error opening database:" << sqlDatabase.lastError().text();
         return false;
     }
 
     QSqlQuery *versionQuery = prepareQuery("select version from {prefix}_schema_version limit 1");
     if (!execSqlQuery(versionQuery)) {
-        qCritical() << QString("[%1] Error opening database: unable to load database schema version (hint: ensure the "
-                               "cockatrice_schema_version exists)")
-                           .arg(poolStr);
+        qCCritical(DatabaseInterfaceLog) << poolStr << "Error opening database: unable to load database schema version"
+                                         << "(hint: ensure the cockatrice_schema_version exists)";
         return false;
     }
 
@@ -74,24 +105,50 @@ bool Servatrice_DatabaseInterface::openDatabase()
         const int dbversion = versionQuery->value(0).toInt();
         const int expectedversion = DATABASE_SCHEMA_VERSION;
         if (dbversion < expectedversion) {
-            qCritical() << QString("[%1] Error opening database: the database schema version is too old, you need to "
-                                   "run the migrations to update it from version %2 to version %3")
-                               .arg(poolStr)
-                               .arg(dbversion)
-                               .arg(expectedversion);
+            qCCritical(DatabaseInterfaceLog) << poolStr
+                                             << "Error opening database: the database schema version is too old, you "
+                                                "need to run the migrations to update it from version"
+                                             << dbversion << "to version" << expectedversion;
             return false;
         } else if (dbversion > expectedversion) {
-            qCritical() << QString("[%1] Error opening database: the database schema version %2 is too new, you need "
-                                   "to update servatrice (this servatrice actually uses version %3)")
-                               .arg(poolStr)
-                               .arg(dbversion)
-                               .arg(expectedversion);
+            qCCritical(DatabaseInterfaceLog)
+                << poolStr << "Error opening database: the database schema version" << dbversion
+                << "is too new, you need to update Servatrice" << "(Currently running Servatrice actually uses version"
+                << expectedversion << ")";
             return false;
         }
     } else {
-        qCritical() << QString("[%1] Error opening database: unable to load database schema version (hint: ensure the "
-                               "cockatrice_schema_version contains a single record)")
-                           .arg(poolStr);
+        qCCritical(DatabaseInterfaceLog) << poolStr
+                                         << "Error opening database: unable to load database schema version (hint: "
+                                            "ensure the cockatrice_schema_version contains a single record)";
+        return false;
+    }
+
+    if (sqlDatabase.driverName() != "QMYSQL") {
+        qCCritical(DatabaseInterfaceLog)
+            << poolStr
+            << "Error opening database: connection is not a MySQL/MariaDB database, Servatrice only "
+               "supports the QMYSQL driver (actual driver:"
+            << sqlDatabase.driverName() << ").";
+        return false;
+    }
+
+    bool strictModeCheckOk = false;
+    const bool strictModeEnabled = isStrictModeEnabled(strictModeCheckOk);
+    if (!strictModeCheckOk) {
+        qCCritical(DatabaseInterfaceLog) << poolStr
+                                         << "Error opening database: unable to determine whether MySQL/MariaDB strict "
+                                            "mode is enabled";
+        return false;
+    }
+    if (strictModeEnabled) {
+        qCCritical(DatabaseInterfaceLog) << poolStr
+                                         << "Error opening database: MySQL/MariaDB strict mode is enabled, which "
+                                            "breaks most Servatrice database operations. Please disable strict mode "
+                                            "by removing STRICT_TRANS_TABLES and STRICT_ALL_TABLES from sql_mode, "
+                                            "for example by adding 'sql_mode=NO_ENGINE_SUBSTITUTION' under [mysqld] "
+                                            "in your my.cnf (or my.ini on Windows) and restarting the database "
+                                            "server.";
         return false;
     }
 
@@ -101,6 +158,25 @@ bool Servatrice_DatabaseInterface::openDatabase()
     return true;
 }
 
+bool Servatrice_DatabaseInterface::isStrictModeEnabled(bool &ok) const
+{
+    ok = true;
+
+    QSqlQuery query(sqlDatabase);
+    if (!query.exec("SELECT @@GLOBAL.sql_mode")) {
+        ok = false;
+        return false;
+    }
+
+    const QStringList modes = query.next() ? query.value(0).toString().split(',') : QStringList();
+    for (const QString &mode : modes) {
+        if (mode.trimmed() == "STRICT_TRANS_TABLES" || mode.trimmed() == "STRICT_ALL_TABLES") {
+            return true;
+        }
+    }
+    return false;
+}
+
 bool Servatrice_DatabaseInterface::checkSql()
 {
     if (!sqlDatabase.isValid()) {
@@ -114,9 +190,7 @@ bool Servatrice_DatabaseInterface::checkSql()
 
     if (query.lastError().isValid()) {
         const auto &poolStr = instanceId == -1 ? QString("main") : QString("pool %1").arg(instanceId);
-        qCritical() << QString("[%1] Error executing query: %2, resetting connection")
-                           .arg(poolStr)
-                           .arg(query.lastError().text());
+        qCCritical(DatabaseInterfaceLog) << poolStr << "Error executing query:" << query.lastError().text();
 
         sqlDatabase.close();
         return openDatabase();
@@ -142,10 +216,11 @@ QSqlQuery *Servatrice_DatabaseInterface::prepareQuery(const QString &queryText)
 
 bool Servatrice_DatabaseInterface::execSqlQuery(QSqlQuery *query)
 {
-    if (query->exec())
+    if (query->exec()) {
         return true;
+    }
     const QString poolStr = instanceId == -1 ? QString("main") : QString("pool %1").arg(instanceId);
-    qCritical() << QString("[%1] Error executing query: %2").arg(poolStr).arg(query->lastError().text());
+    qCCritical(DatabaseInterfaceLog) << poolStr << "Error executing query:" << query->lastError().text();
     sqlDatabase.close();
     openDatabase();
     return false;
@@ -154,8 +229,9 @@ bool Servatrice_DatabaseInterface::execSqlQuery(QSqlQuery *query)
 bool Servatrice_DatabaseInterface::usernameIsValid(const QString &user, QString &error)
 {
     int minNameLength = settingsCache->value("users/minnamelength", 6).toInt();
-    if (minNameLength < 1)
+    if (minNameLength < 1) {
         minNameLength = 1;
+    }
     int maxNameLength = settingsCache->value("users/maxnamelength", 12).toInt();
     bool allowLowercase = settingsCache->value("users/allowlowercase", true).toBool();
     bool allowUppercase = settingsCache->value("users/allowuppercase", true).toBool();
@@ -163,11 +239,7 @@ bool Servatrice_DatabaseInterface::usernameIsValid(const QString &user, QString
     bool allowPunctuationPrefix = settingsCache->value("users/allowpunctuationprefix", false).toBool();
     QString allowedPunctuation = settingsCache->value("users/allowedpunctuation", "_").toString();
     QString disallowedWordsStr = settingsCache->value("users/disallowedwords", "").toString();
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     QStringList disallowedWords = disallowedWordsStr.split(",", Qt::SkipEmptyParts);
-#else
-    QStringList disallowedWords = disallowedWordsStr.split(",", QString::SkipEmptyParts);
-#endif
     disallowedWords.removeDuplicates();
     QVariant displayDisallowedWords = settingsCache->value("users/displaydisallowedwords");
     QString disallowedRegExpStr;
@@ -191,29 +263,36 @@ bool Servatrice_DatabaseInterface::usernameIsValid(const QString &user, QString
                 .arg(disallowedWordsStr)
                 .arg(disallowedRegExpStr);
 
-    if (user.length() < minNameLength || user.length() > maxNameLength)
+    if (user.length() < minNameLength || user.length() > maxNameLength) {
         return false;
+    }
 
-    if (!allowPunctuationPrefix && allowedPunctuation.contains(user.at(0)))
+    if (!allowPunctuationPrefix && allowedPunctuation.contains(user.at(0))) {
         return false;
+    }
 
     for (const QString &word : disallowedWords) {
-        if (user.contains(word, Qt::CaseInsensitive))
+        if (user.contains(word, Qt::CaseInsensitive)) {
             return false;
+        }
     }
 
     for (const QRegularExpression &regExp : settingsCache->disallowedRegExp) {
-        if (regExp.match(user).hasMatch())
+        if (regExp.match(user).hasMatch()) {
             return false;
+        }
     }
 
     QString regEx("\\A[");
-    if (allowLowercase)
+    if (allowLowercase) {
         regEx.append("a-z");
-    if (allowUppercase)
+    }
+    if (allowUppercase) {
         regEx.append("A-Z");
-    if (allowNumerics)
+    }
+    if (allowNumerics) {
         regEx.append("0-9");
+    }
     regEx.append(QRegularExpression::escape(allowedPunctuation));
     regEx.append("]+\\z");
 
@@ -229,8 +308,9 @@ bool Servatrice_DatabaseInterface::registerUser(const QString &userName,
                                                 const QString &country,
                                                 bool active)
 {
-    if (!checkSql())
+    if (!checkSql()) {
         return false;
+    }
 
     QString passwordSha512;
     if (passwordNeedsHash) {
@@ -256,7 +336,8 @@ bool Servatrice_DatabaseInterface::registerUser(const QString &userName,
     query->bindValue(":token", token);
 
     if (!execSqlQuery(query)) {
-        qDebug() << "Failed to insert user: " << query->lastError() << " sql: " << query->lastQuery();
+        qCWarning(DatabaseInterfaceLog) << "Failed to insert user: " << query->lastError()
+                                        << " sql: " << query->lastQuery();
         return false;
     }
 
@@ -265,8 +346,9 @@ bool Servatrice_DatabaseInterface::registerUser(const QString &userName,
 
 bool Servatrice_DatabaseInterface::activateUser(const QString &userName, const QString &token)
 {
-    if (!checkSql())
+    if (!checkSql()) {
         return false;
+    }
 
     QSqlQuery *activateQuery =
         prepareQuery("select name from {prefix}_users where active=0 and name=:username and token=:token");
@@ -274,8 +356,8 @@ bool Servatrice_DatabaseInterface::activateUser(const QString &userName, const Q
     activateQuery->bindValue(":username", userName);
     activateQuery->bindValue(":token", token);
     if (!execSqlQuery(activateQuery)) {
-        qDebug() << "Account activation failed: SQL error." << activateQuery->lastError()
-                 << " sql: " << activateQuery->lastQuery();
+        qCWarning(DatabaseInterfaceLog) << "Account activation failed: SQL error." << activateQuery->lastError()
+                                        << " sql: " << activateQuery->lastQuery();
         return false;
     }
 
@@ -288,7 +370,8 @@ bool Servatrice_DatabaseInterface::activateUser(const QString &userName, const Q
             query->bindValue(":userName", userName);
 
             if (!execSqlQuery(query)) {
-                qDebug() << "Failed to activate user: " << query->lastError() << " sql: " << query->lastQuery();
+                qCWarning(DatabaseInterfaceLog)
+                    << "Failed to activate user: " << query->lastError() << " sql: " << query->lastQuery();
                 return false;
             }
 
@@ -311,34 +394,39 @@ AuthenticationResult Servatrice_DatabaseInterface::checkUserPassword(Server_Prot
             return UnknownUser;
         case Servatrice::AuthenticationPassword: {
             QString configPassword = settingsCache->value("authentication/password").toString();
-            if (configPassword == password)
+            if (configPassword == password) {
                 return PasswordRight;
+            }
 
             return NotLoggedIn;
         }
         case Servatrice::AuthenticationSql: {
-            if (!checkSql())
+            if (!checkSql()) {
                 return UnknownUser;
+            }
 
-            if (!usernameIsValid(user, reasonStr))
+            if (!usernameIsValid(user, reasonStr)) {
                 return UsernameInvalid;
+            }
 
-            if (checkUserIsBanned(handler->getAddress(), user, clientId, reasonStr, banSecondsLeft))
+            if (checkUserIsBanned(handler->getAddress(), user, clientId, reasonStr, banSecondsLeft)) {
                 return UserIsBanned;
+            }
 
-            QSqlQuery *passwordQuery =
-                prepareQuery("select password_sha512, active from {prefix}_users where name = :name");
+            QSqlQuery *passwordQuery = prepareQuery(
+                "select password_sha512, active, force_password_change from {prefix}_users where name = :name");
             passwordQuery->bindValue(":name", user);
             if (!execSqlQuery(passwordQuery)) {
-                qDebug("Login denied: SQL error");
+                qCWarning(DatabaseInterfaceLog) << "Login denied: SQL error";
                 return NotLoggedIn;
             }
 
             if (passwordQuery->next()) {
                 const QString correctPasswordSha512 = passwordQuery->value(0).toString();
                 const bool userIsActive = passwordQuery->value(1).toBool();
+                const bool forceChange = passwordQuery->value(2).toBool();
                 if (!userIsActive) {
-                    qDebug("Login denied: user not active");
+                    qCWarning(DatabaseInterfaceLog) << "Login denied: user not active";
                     return UserIsInactive;
                 }
                 QString hashedPassword;
@@ -348,14 +436,18 @@ AuthenticationResult Servatrice_DatabaseInterface::checkUserPassword(Server_Prot
                     hashedPassword = password;
                 }
                 if (correctPasswordSha512 == hashedPassword) {
-                    qDebug("Login accepted: password right");
+                    if (forceChange) {
+                        qCDebug(DatabaseInterfaceLog) << "Login accepted but password change required";
+                        return PasswordChangeRequired;
+                    }
+                    qCDebug(DatabaseInterfaceLog) << "Login accepted: password right";
                     return PasswordRight;
                 } else {
-                    qDebug("Login denied: password wrong");
+                    qCDebug(DatabaseInterfaceLog) << "Login denied: password wrong";
                     return NotLoggedIn;
                 }
             } else {
-                qDebug("Login accepted: unknown user");
+                qCDebug(DatabaseInterfaceLog) << "Login accepted: unknown user";
                 return UnknownUser;
             }
         }
@@ -369,11 +461,12 @@ bool Servatrice_DatabaseInterface::checkUserIsBanned(const QString &ipAddress,
                                                      QString &banReason,
                                                      int &banSecondsRemaining)
 {
-    if (server->getAuthenticationMethod() != Servatrice::AuthenticationSql)
+    if (server->getAuthenticationMethod() != Servatrice::AuthenticationSql) {
         return false;
+    }
 
     if (!checkSql()) {
-        qDebug("Failed to check if user is banned. Database invalid.");
+        qCWarning(DatabaseInterfaceLog) << "Failed to check if user is banned. Database invalid.";
         return false;
     }
 
@@ -386,8 +479,9 @@ bool Servatrice_DatabaseInterface::checkUserIsIdBanned(const QString &clientId,
                                                        QString &banReason,
                                                        int &banSecondsRemaining)
 {
-    if (clientId.isEmpty())
+    if (clientId.isEmpty()) {
         return false;
+    }
 
     QSqlQuery *idBanQuery =
         prepareQuery("select"
@@ -404,7 +498,7 @@ bool Servatrice_DatabaseInterface::checkUserIsIdBanned(const QString &clientId,
     idBanQuery->bindValue(":id", clientId);
     idBanQuery->bindValue(":id2", clientId);
     if (!execSqlQuery(idBanQuery)) {
-        qDebug() << "Id ban check failed: SQL error." << idBanQuery->lastError();
+        qCWarning(DatabaseInterfaceLog) << "Id ban check failed: SQL error." << idBanQuery->lastError();
         return false;
     }
 
@@ -414,7 +508,7 @@ bool Servatrice_DatabaseInterface::checkUserIsIdBanned(const QString &clientId,
         if ((secondsLeft > 0) || permanentBan) {
             banReason = idBanQuery->value(2).toString();
             banSecondsRemaining = permanentBan ? 0 : secondsLeft;
-            qDebug() << "User is banned by client id" << clientId;
+            qCDebug(DatabaseInterfaceLog) << "User is banned by client id" << clientId;
             return true;
         }
     }
@@ -432,7 +526,7 @@ bool Servatrice_DatabaseInterface::checkUserIsNameBanned(const QString &userName
     nameBanQuery->bindValue(":name1", userName);
     nameBanQuery->bindValue(":name2", userName);
     if (!execSqlQuery(nameBanQuery)) {
-        qDebug() << "Name ban check failed: SQL error" << nameBanQuery->lastError();
+        qCWarning(DatabaseInterfaceLog) << "Name ban check failed: SQL error" << nameBanQuery->lastError();
         return false;
     }
 
@@ -442,7 +536,7 @@ bool Servatrice_DatabaseInterface::checkUserIsNameBanned(const QString &userName
         if ((secondsLeft > 0) || permanentBan) {
             banReason = nameBanQuery->value(2).toString();
             banSecondsRemaining = permanentBan ? 0 : secondsLeft;
-            qDebug() << "Username" << userName << "is banned by name";
+            qCDebug(DatabaseInterfaceLog) << "Username" << userName << "is banned by name";
             return true;
         }
     }
@@ -468,7 +562,7 @@ bool Servatrice_DatabaseInterface::checkUserIsIpBanned(const QString &ipAddress,
     ipBanQuery->bindValue(":address", ipAddress);
     ipBanQuery->bindValue(":address2", ipAddress);
     if (!execSqlQuery(ipBanQuery)) {
-        qDebug() << "IP ban check failed: SQL error." << ipBanQuery->lastError();
+        qCWarning(DatabaseInterfaceLog) << "IP ban check failed: SQL error." << ipBanQuery->lastError();
         return false;
     }
 
@@ -478,7 +572,7 @@ bool Servatrice_DatabaseInterface::checkUserIsIpBanned(const QString &ipAddress,
         if ((secondsLeft > 0) || permanentBan) {
             banReason = ipBanQuery->value(2).toString();
             banSecondsRemaining = permanentBan ? 0 : secondsLeft;
-            qDebug() << "User is banned by address" << ipAddress;
+            qCDebug(DatabaseInterfaceLog) << "User is banned by address" << ipAddress;
             return true;
         }
     }
@@ -492,8 +586,9 @@ bool Servatrice_DatabaseInterface::activeUserExists(const QString &user)
 
         QSqlQuery *query = prepareQuery("select 1 from {prefix}_users where name = :name and active = 1");
         query->bindValue(":name", user);
-        if (!execSqlQuery(query))
+        if (!execSqlQuery(query)) {
             return false;
+        }
         return query->next();
     }
     return false;
@@ -506,8 +601,9 @@ bool Servatrice_DatabaseInterface::userExists(const QString &user)
 
         QSqlQuery *query = prepareQuery("select 1 from {prefix}_users where name = :name");
         query->bindValue(":name", user);
-        if (!execSqlQuery(query))
+        if (!execSqlQuery(query)) {
             return false;
+        }
         return query->next();
     }
     return false;
@@ -540,10 +636,12 @@ int Servatrice_DatabaseInterface::getUserIdInDB(const QString &name)
     if (server->getAuthenticationMethod() == Servatrice::AuthenticationSql) {
         QSqlQuery *query = prepareQuery("select id from {prefix}_users where name = :name and active = 1");
         query->bindValue(":name", name);
-        if (!execSqlQuery(query))
+        if (!execSqlQuery(query)) {
             return -1;
-        if (!query->next())
+        }
+        if (!query->next()) {
             return -1;
+        }
         return query->value(0).toInt();
     }
     return -1;
@@ -551,11 +649,13 @@ int Servatrice_DatabaseInterface::getUserIdInDB(const QString &name)
 
 bool Servatrice_DatabaseInterface::isInBuddyList(const QString &whoseList, const QString &who)
 {
-    if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone)
+    if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone) {
         return false;
+    }
 
-    if (!checkSql())
+    if (!checkSql()) {
         return false;
+    }
 
     int id1 = getUserIdInDB(whoseList);
     int id2 = getUserIdInDB(who);
@@ -564,18 +664,21 @@ bool Servatrice_DatabaseInterface::isInBuddyList(const QString &whoseList, const
         prepareQuery("select 1 from {prefix}_buddylist where id_user1 = :id_user1 and id_user2 = :id_user2");
     query->bindValue(":id_user1", id1);
     query->bindValue(":id_user2", id2);
-    if (!execSqlQuery(query))
+    if (!execSqlQuery(query)) {
         return false;
+    }
     return query->next();
 }
 
 bool Servatrice_DatabaseInterface::isInIgnoreList(const QString &whoseList, const QString &who)
 {
-    if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone)
+    if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone) {
         return false;
+    }
 
-    if (!checkSql())
+    if (!checkSql()) {
         return false;
+    }
 
     int id1 = getUserIdInDB(whoseList);
     int id2 = getUserIdInDB(who);
@@ -584,8 +687,9 @@ bool Servatrice_DatabaseInterface::isInIgnoreList(const QString &whoseList, cons
         prepareQuery("select 1 from {prefix}_ignorelist where id_user1 = :id_user1 and id_user2 = :id_user2");
     query->bindValue(":id_user1", id1);
     query->bindValue(":id_user2", id2);
-    if (!execSqlQuery(query))
+    if (!execSqlQuery(query)) {
         return false;
+    }
     return query->next();
 }
 
@@ -593,29 +697,38 @@ ServerInfo_User Servatrice_DatabaseInterface::evalUserQueryResult(const QSqlQuer
 {
     ServerInfo_User result;
 
-    if (withId)
+    if (withId) {
         result.set_id(query->value(0).toInt());
+    }
     result.set_name(query->value(1).toString().toStdString());
 
     const int is_admin = query->value(2).toInt();
     int userLevel = ServerInfo_User::IsUser | ServerInfo_User::IsRegistered;
-    if (is_admin & 1)
+    if (is_admin & 1) {
         userLevel |= ServerInfo_User::IsAdmin | ServerInfo_User::IsModerator;
-    else if (is_admin & 2)
+    } else if (is_admin & 2) {
         userLevel |= ServerInfo_User::IsModerator;
+    }
 
-    if (is_admin & 4)
+    if (is_admin & 4) {
         userLevel |= ServerInfo_User::IsJudge;
+    }
+
+    if (is_admin & 8) {
+        userLevel |= ServerInfo_User::IsDeveloper;
+    }
 
     result.set_user_level(userLevel);
 
     const QString country = query->value(3).toString();
-    if (!country.isEmpty())
+    if (!country.isEmpty()) {
         result.set_country(country.toStdString());
+    }
 
     const QString privlevel = query->value(4).toString();
-    if (!privlevel.isEmpty())
+    if (!privlevel.isEmpty()) {
         result.set_privlevel(privlevel.toStdString());
+    }
 
     const auto &pawn_left_override = query->value(5).toString();
     const auto &pawn_right_override = query->value(6).toString();
@@ -628,12 +741,14 @@ ServerInfo_User Servatrice_DatabaseInterface::evalUserQueryResult(const QSqlQuer
 
     if (complete) {
         const QString realName = query->value(7).toString();
-        if (!realName.isEmpty())
+        if (!realName.isEmpty()) {
             result.set_real_name(realName.toStdString());
+        }
 
         const QByteArray avatarBmp = query->value(8).toByteArray();
-        if (avatarBmp.size())
+        if (avatarBmp.size()) {
             result.set_avatar_bmp(avatarBmp.data(), avatarBmp.size());
+        }
 
         const QDateTime regDate = query->value(9).toDateTime();
         if (!regDate.toString(Qt::ISODate).isEmpty()) {
@@ -643,12 +758,41 @@ ServerInfo_User Servatrice_DatabaseInterface::evalUserQueryResult(const QSqlQuer
         }
 
         const QString email = query->value(10).toString();
-        if (!email.isEmpty())
+        if (!email.isEmpty()) {
             result.set_email(email.toStdString());
+        }
 
         const QString clientid = query->value(11).toString();
-        if (!clientid.isEmpty())
+        if (!clientid.isEmpty()) {
             result.set_clientid(clientid.toStdString());
+        }
+
+        const QString cardArtParamsJson = query->value(12).toString();
+        if (!cardArtParamsJson.isEmpty()) {
+            const QJsonDocument doc = QJsonDocument::fromJson(cardArtParamsJson.toUtf8());
+            if (doc.isObject()) {
+                const QJsonObject obj = doc.object();
+                auto *cap = result.mutable_card_art_params();
+                if (obj.contains("card_name")) {
+                    cap->set_card_name(obj["card_name"].toString().toStdString());
+                }
+                if (obj.contains("card_provider_id")) {
+                    cap->set_card_provider_id(obj["card_provider_id"].toString().toStdString());
+                }
+                if (obj.contains("marginPctL")) {
+                    cap->set_margin_pct_l(obj["marginPctL"].toDouble(0.33));
+                }
+                if (obj.contains("marginPctR")) {
+                    cap->set_margin_pct_r(obj["marginPctR"].toDouble(0.02));
+                }
+                if (obj.contains("verticalOffset")) {
+                    cap->set_vertical_offset(obj["verticalOffset"].toDouble(0.35));
+                }
+                if (obj.contains("zoom")) {
+                    cap->set_zoom(obj["zoom"].toDouble(1.0));
+                }
+            }
+        }
     }
     return result;
 }
@@ -660,23 +804,27 @@ ServerInfo_User Servatrice_DatabaseInterface::getUserData(const QString &name, b
     result.set_user_level(ServerInfo_User::IsUser);
 
     if (server->getAuthenticationMethod() == Servatrice::AuthenticationSql) {
-        if (!checkSql())
+        if (!checkSql()) {
             return result;
+        }
 
         QSqlQuery *query = prepareQuery("select id, name, admin, country, privlevel, leftPawnColorOverride, "
                                         "rightPawnColorOverride, realname, avatar_bmp, registrationDate, "
-                                        "email, clientid from {prefix}_users where "
+                                        "email, clientid, card_art_params from {prefix}_users where "
                                         "name = :name and active = 1");
         query->bindValue(":name", name);
-        if (!execSqlQuery(query))
+        if (!execSqlQuery(query)) {
             return result;
+        }
 
-        if (query->next())
+        if (query->next()) {
             return evalUserQueryResult(query, true, withId);
-        else
+        } else {
             return result;
-    } else
+        }
+    } else {
         return result;
+    }
 }
 
 void Servatrice_DatabaseInterface::clearSessionTables()
@@ -720,11 +868,13 @@ qint64 Servatrice_DatabaseInterface::startSession(const QString &userName,
                                                   const QString &clientId,
                                                   const QString &connectionType)
 {
-    if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone)
+    if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone) {
         return -1;
+    }
 
-    if (!checkSql())
+    if (!checkSql()) {
         return -1;
+    }
 
     QSqlQuery *query = prepareQuery("insert into {prefix}_sessions (user_name, id_server, ip_address, start_time, "
                                     "clientid, connection_type) values(:user_name, :id_server, :ip_address, NOW(), "
@@ -734,18 +884,21 @@ qint64 Servatrice_DatabaseInterface::startSession(const QString &userName,
     query->bindValue(":ip_address", address);
     query->bindValue(":client_id", clientId);
     query->bindValue(":connection_type", connectionType);
-    if (execSqlQuery(query))
+    if (execSqlQuery(query)) {
         return query->lastInsertId().toInt();
+    }
     return -1;
 }
 
 void Servatrice_DatabaseInterface::endSession(qint64 sessionId)
 {
-    if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone)
+    if (server->getAuthenticationMethod() == Servatrice::AuthenticationNone) {
         return;
+    }
 
-    if (!checkSql())
+    if (!checkSql()) {
         return;
+    }
 
     auto *query = prepareQuery("update {prefix}_sessions set end_time=NOW() where id = :id_session");
     query->bindValue(":id_session", sessionId);
@@ -764,8 +917,9 @@ QMap<QString, ServerInfo_User> Servatrice_DatabaseInterface::getBuddyList(const
                                         "left join {prefix}_buddylist b on a.id = b.id_user2 left join {prefix}_users "
                                         "c on b.id_user1 = c.id where c.name = :name");
         query->bindValue(":name", name);
-        if (!execSqlQuery(query))
+        if (!execSqlQuery(query)) {
             return result;
+        }
 
         while (query->next()) {
             const ServerInfo_User &temp = evalUserQueryResult(query, false);
@@ -787,8 +941,9 @@ QMap<QString, ServerInfo_User> Servatrice_DatabaseInterface::getIgnoreList(const
                                         "left join {prefix}_ignorelist b on a.id = b.id_user2 left join {prefix}_users "
                                         "c on b.id_user1 = c.id where c.name = :name");
         query->bindValue(":name", name);
-        if (!execSqlQuery(query))
+        if (!execSqlQuery(query)) {
             return result;
+        }
 
         while (query->next()) {
             ServerInfo_User temp = evalUserQueryResult(query, false);
@@ -800,11 +955,13 @@ QMap<QString, ServerInfo_User> Servatrice_DatabaseInterface::getIgnoreList(const
 
 int Servatrice_DatabaseInterface::getNextGameId()
 {
-    if (!sqlDatabase.isValid())
+    if (!sqlDatabase.isValid()) {
         return server->getNextLocalGameId();
+    }
 
-    if (!checkSql())
+    if (!checkSql()) {
         return -1;
+    }
 
     QSqlQuery *query = prepareQuery("insert into {prefix}_games (time_started) values (now())");
 
@@ -817,8 +974,9 @@ int Servatrice_DatabaseInterface::getNextGameId()
 
 int Servatrice_DatabaseInterface::getNextReplayId()
 {
-    if (!checkSql())
+    if (!checkSql()) {
         return -1;
+    }
 
     QSqlQuery *query = prepareQuery("insert into {prefix}_replays (id_game) values (NULL)");
 
@@ -836,11 +994,13 @@ void Servatrice_DatabaseInterface::storeGameInformation(const QString &roomName,
                                                         const QSet<QString> &allSpectatorsEver,
                                                         const QList<GameReplay *> &replayList)
 {
-    if (!checkSql())
+    if (!checkSql()) {
         return;
+    }
 
-    if (!settingsCache->value("game/store_replays", 1).toBool())
+    if (!settingsCache->value("game/store_replays", 1).toBool()) {
         return;
+    }
 
     QVariantList gameIds1, playerNames, gameIds2, userIds, replayNames;
     QSetIterator<QString> playerIterator(allPlayersEver);
@@ -853,8 +1013,9 @@ void Servatrice_DatabaseInterface::storeGameInformation(const QString &roomName,
     QSetIterator<QString> allUsersIterator(allUsersInGame);
     while (allUsersIterator.hasNext()) {
         int id = getUserIdInDB(allUsersIterator.next());
-        if (id == -1)
+        if (id == -1) {
             continue;
+        }
         gameIds2.append(gameInfo.game_id());
         userIds.append(id);
         replayNames.append(QString::fromStdString(gameInfo.description()));
@@ -869,12 +1030,17 @@ void Servatrice_DatabaseInterface::storeGameInformation(const QString &roomName,
         const unsigned int size = static_cast<unsigned int>(replayList[i]->ByteSize());
 #endif
         blob.resize(size);
-        replayList[i]->SerializeToArray(blob.data(), size);
+        qulonglong replayId = replayList[i]->replay_id();
+        if (replayList[i]->SerializeToArray(blob.data(), size)) {
 
-        replayIds.append(QVariant((qulonglong)replayList[i]->replay_id()));
-        replayGameIds.append(gameInfo.game_id());
-        replayDurations.append(replayList[i]->duration_seconds());
-        replayBlobs.append(blob);
+            replayIds.append(QVariant(replayId));
+            replayGameIds.append(gameInfo.game_id());
+            replayDurations.append(replayList[i]->duration_seconds());
+            replayBlobs.append(blob);
+        } else {
+            qCWarning(DatabaseInterfaceLog)
+                << "failed to serialise replay, id:" << replayId << "game:" << gameInfo.game_id();
+        }
     }
 
     {
@@ -888,8 +1054,9 @@ void Servatrice_DatabaseInterface::storeGameInformation(const QString &roomName,
         query->bindValue(":password", gameInfo.with_password() ? 1 : 0);
         query->bindValue(":game_types", roomGameTypes.isEmpty() ? QString("") : roomGameTypes.join(", "));
         query->bindValue(":player_count", gameInfo.max_players());
-        if (!execSqlQuery(query))
+        if (!execSqlQuery(query)) {
             return;
+        }
     }
     {
         QSqlQuery *query =
@@ -926,8 +1093,9 @@ DeckList *Servatrice_DatabaseInterface::getDeckFromDatabase(int deckId, int user
     query->bindValue(":id", deckId);
     query->bindValue(":id_user", userId);
     execSqlQuery(query);
-    if (!query->next())
+    if (!query->next()) {
         throw Response::RespNameNotFound;
+    }
 
     DeckList *deck = new DeckList;
     deck->loadFromString_Native(query->value(0).toString());
@@ -935,6 +1103,183 @@ DeckList *Servatrice_DatabaseInterface::getDeckFromDatabase(int deckId, int user
     return deck;
 }
 
+bool Servatrice_DatabaseInterface::createDeckShare(const QString &token,
+                                                   const QString &name,
+                                                   int userId,
+                                                   const QList<DeckShareItemRecord> &items,
+                                                   int expiryDays,
+                                                   qint64 &expiresAt)
+{
+    checkSql();
+
+    if (items.isEmpty()) {
+        return false;
+    }
+
+    if (!sqlDatabase.transaction()) {
+        return false;
+    }
+
+    QSqlQuery *query = prepareQuery("insert into {prefix}_deck_share (token, name, created_by, created_at, expires_at) "
+                                    "values (:token, :name, :created_by, NOW(), DATE_ADD(NOW(), INTERVAL :days DAY))");
+    query->bindValue(":token", token);
+    query->bindValue(":name", name);
+    query->bindValue(":created_by", userId < 1 ? QVariant() : userId);
+    query->bindValue(":days", expiryDays);
+    if (!execSqlQuery(query)) {
+        // A failed execSqlQuery has already closed and reopened the connection,
+        // which implicitly discards the transaction; rollback below is a no-op.
+        sqlDatabase.rollback();
+        return false;
+    }
+
+    const int shareId = query->lastInsertId().toInt();
+
+    // Read the expiry back from the database so the value returned to the client
+    // matches the server clock rather than being approximated client-side.
+    QSqlQuery *expiryQuery = prepareQuery("select UNIX_TIMESTAMP(expires_at) from {prefix}_deck_share where id = :id");
+    expiryQuery->bindValue(":id", shareId);
+    if (!execSqlQuery(expiryQuery) || !expiryQuery->next()) {
+        // See the note above: after a failed execSqlQuery the transaction is
+        // already gone because the connection was torn down.
+        sqlDatabase.rollback();
+        return false;
+    }
+    expiresAt = expiryQuery->value(0).toLongLong();
+
+    for (int i = 0; i < items.size(); ++i) {
+        const DeckShareItemRecord &item = items.at(i);
+        QSqlQuery *itemQuery = prepareQuery("insert into {prefix}_deck_share_item (share_id, name, tags, banner_card, "
+                                            "game_format, color_identity, content, position) values (:share_id, :name, "
+                                            ":tags, :banner_card, :game_format, :color_identity, :content, :position)");
+        itemQuery->bindValue(":share_id", shareId);
+        itemQuery->bindValue(":name", item.name);
+        itemQuery->bindValue(":tags", serializeDeckTags(item.tags));
+        itemQuery->bindValue(":banner_card", item.bannerCard);
+        itemQuery->bindValue(":game_format", item.gameFormat);
+        itemQuery->bindValue(":color_identity", item.colorIdentity);
+        itemQuery->bindValue(":content", item.content);
+        itemQuery->bindValue(":position", i);
+        if (!execSqlQuery(itemQuery)) {
+            // See the note above: the transaction is already gone after the
+            // reconnect performed by a failed execSqlQuery.
+            sqlDatabase.rollback();
+            return false;
+        }
+    }
+
+    if (!sqlDatabase.commit()) {
+        sqlDatabase.rollback();
+        return false;
+    }
+    return true;
+}
+
+bool Servatrice_DatabaseInterface::getDeckShareList(const QString &token,
+                                                    QString &name,
+                                                    qint64 &expiresAt,
+                                                    QList<DeckShareItemRecord> &items)
+{
+    checkSql();
+
+    QSqlQuery *query =
+        prepareQuery("select id, name, UNIX_TIMESTAMP(expires_at) from {prefix}_deck_share where token = "
+                     ":token and expires_at > now()");
+    query->bindValue(":token", token);
+    execSqlQuery(query);
+    if (!query->next()) {
+        return false;
+    }
+
+    const int shareId = query->value(0).toInt();
+    name = query->value(1).toString();
+    expiresAt = query->value(2).toLongLong();
+    items.clear();
+
+    QSqlQuery *itemQuery =
+        prepareQuery("select id, name, tags, banner_card, game_format, color_identity from {prefix}_deck_share_item "
+                     "where share_id = :share_id order by position");
+    itemQuery->bindValue(":share_id", shareId);
+    execSqlQuery(itemQuery);
+    while (itemQuery->next()) {
+        DeckShareItemRecord item;
+        item.id = itemQuery->value(0).toInt();
+        item.name = itemQuery->value(1).toString();
+        item.tags = deserializeDeckTags(itemQuery->value(2).toString());
+        item.bannerCard = itemQuery->value(3).toString();
+        item.gameFormat = itemQuery->value(4).toString();
+        item.colorIdentity = itemQuery->value(5).toString();
+        items.append(item);
+    }
+
+    return true;
+}
+
+bool Servatrice_DatabaseInterface::getDeckShareItem(const QString &token, int itemId, QString &content)
+{
+    checkSql();
+
+    QSqlQuery *query = prepareQuery("select i.content from {prefix}_deck_share_item i join {prefix}_deck_share s on "
+                                    "s.id = i.share_id where s.token = :token and s.expires_at > now() and i.id = :id");
+    query->bindValue(":token", token);
+    query->bindValue(":id", itemId);
+    execSqlQuery(query);
+    if (!query->next()) {
+        return false;
+    }
+
+    content = query->value(0).toString();
+    return true;
+}
+
+void Servatrice_DatabaseInterface::cleanupExpiredDeckShares()
+{
+    checkSql();
+
+    QSqlQuery *query = prepareQuery("delete from {prefix}_deck_share where expires_at < now()");
+    execSqlQuery(query);
+}
+
+bool Servatrice_DatabaseInterface::getDeckSharesForUser(int userId, QList<DeckShareSummaryRecord> &shares)
+{
+    checkSql();
+
+    QSqlQuery *query = prepareQuery("select s.id, s.name, UNIX_TIMESTAMP(s.created_at), "
+                                    "UNIX_TIMESTAMP(s.expires_at), count(i.id) from {prefix}_deck_share s left join "
+                                    "{prefix}_deck_share_item i on i.share_id = s.id "
+                                    "where s.created_by = :created_by and s.expires_at > now() "
+                                    "group by s.id, s.name, s.created_at, s.expires_at order by s.created_at desc");
+    query->bindValue(":created_by", userId);
+    if (!execSqlQuery(query)) {
+        return false;
+    }
+
+    shares.clear();
+    while (query->next()) {
+        DeckShareSummaryRecord summary;
+        summary.id = query->value(0).toInt();
+        summary.name = query->value(1).toString();
+        summary.creationTime = query->value(2).toLongLong();
+        summary.expiresAt = query->value(3).toLongLong();
+        summary.itemCount = query->value(4).toInt();
+        shares.append(summary);
+    }
+    return true;
+}
+
+bool Servatrice_DatabaseInterface::deleteDeckShare(int shareId, int userId)
+{
+    checkSql();
+
+    QSqlQuery *query = prepareQuery("delete from {prefix}_deck_share where id = :id and created_by = :created_by");
+    query->bindValue(":id", shareId);
+    query->bindValue(":created_by", userId);
+    if (!execSqlQuery(query)) {
+        return false;
+    }
+    return query->numRowsAffected() > 0;
+}
+
 void Servatrice_DatabaseInterface::logMessage(const int senderId,
                                               const QString &senderName,
                                               const QString &senderIp,
@@ -946,23 +1291,27 @@ void Servatrice_DatabaseInterface::logMessage(const int senderId,
     QString targetTypeString;
     switch (targetType) {
         case MessageTargetRoom:
-            if (!settingsCache->value("logging/log_user_msg_room", 0).toBool())
+            if (!settingsCache->value("logging/log_user_msg_room", 0).toBool()) {
                 return;
+            }
             targetTypeString = "room";
             break;
         case MessageTargetGame:
-            if (!settingsCache->value("logging/log_user_msg_game", 0).toBool())
+            if (!settingsCache->value("logging/log_user_msg_game", 0).toBool()) {
                 return;
+            }
             targetTypeString = "game";
             break;
         case MessageTargetChat:
-            if (!settingsCache->value("logging/log_user_msg_chat", 0).toBool())
+            if (!settingsCache->value("logging/log_user_msg_chat", 0).toBool()) {
                 return;
+            }
             targetTypeString = "chat";
             break;
         case MessageTargetIslRoom:
-            if (!settingsCache->value("logging/log_user_msg_isl", 0).toBool())
+            if (!settingsCache->value("logging/log_user_msg_isl", 0).toBool()) {
                 return;
+            }
             targetTypeString = "room";
             break;
         default:
@@ -995,10 +1344,22 @@ bool Servatrice_DatabaseInterface::changeUserPassword(const QString &user,
                                             "passwordLastChangedDate = NOW() where name = :name");
     passwordQuery->bindValue(":password", passwordSha512);
     passwordQuery->bindValue(":name", user);
-    if (execSqlQuery(passwordQuery))
-        return true;
+    if (!execSqlQuery(passwordQuery)) {
+        return false;
+    }
+    return passwordQuery->numRowsAffected() > 0;
+}
 
-    return false;
+void Servatrice_DatabaseInterface::setForcePasswordChange(const QString &user, bool force)
+{
+    if (!checkSql()) {
+        return;
+    }
+
+    QSqlQuery *query = prepareQuery("UPDATE {prefix}_users SET force_password_change = :force WHERE name = :name");
+    query->bindValue(":force", force ? 1 : 0);
+    query->bindValue(":name", user);
+    execSqlQuery(query);
 }
 
 bool Servatrice_DatabaseInterface::changeUserPassword(const QString &user,
@@ -1007,26 +1368,30 @@ bool Servatrice_DatabaseInterface::changeUserPassword(const QString &user,
                                                       const QString &newPassword,
                                                       bool newPasswordNeedsHash)
 {
-    if (server->getAuthenticationMethod() != Servatrice::AuthenticationSql)
+    if (server->getAuthenticationMethod() != Servatrice::AuthenticationSql) {
         return false;
+    }
 
-    if (!checkSql())
+    if (!checkSql()) {
         return false;
+    }
 
     QString error;
-    if (!usernameIsValid(user, error))
+    if (!usernameIsValid(user, error)) {
         return false;
+    }
 
     QSqlQuery *passwordQuery = prepareQuery("select password_sha512 from {prefix}_users where name = :name");
     passwordQuery->bindValue(":name", user);
 
     if (!execSqlQuery(passwordQuery)) {
-        qDebug("Change password denied: SQL error");
+        qCWarning(DatabaseInterfaceLog) << "Change password denied: SQL error";
         return false;
     }
 
-    if (!passwordQuery->next())
+    if (!passwordQuery->next()) {
         return false;
+    }
 
     const QString correctPasswordSha512 = passwordQuery->value(0).toString();
     QString oldPasswordSha512 = oldPassword;
@@ -1034,8 +1399,9 @@ bool Servatrice_DatabaseInterface::changeUserPassword(const QString &user,
         QString salt = correctPasswordSha512.left(16);
         oldPasswordSha512 = PasswordHasher::computeHash(oldPassword, salt);
     }
-    if (correctPasswordSha512 != oldPasswordSha512)
+    if (correctPasswordSha512 != oldPasswordSha512) {
         return false;
+    }
 
     return changeUserPassword(user, newPassword, newPasswordNeedsHash);
 }
@@ -1044,23 +1410,28 @@ int Servatrice_DatabaseInterface::getActiveUserCount(QString connectionType)
 {
     int userCount = 0;
 
-    if (!checkSql())
+    if (!checkSql()) {
         return userCount;
+    }
 
     QString text = "select count(*) from {prefix}_sessions where id_server = :serverid AND end_time is NULL";
-    if (!connectionType.isEmpty())
+    if (!connectionType.isEmpty()) {
         text += " AND connection_type = :connection_type";
+    }
     QSqlQuery *query = prepareQuery(text);
 
     query->bindValue(":serverid", server->getServerID());
-    if (!connectionType.isEmpty())
+    if (!connectionType.isEmpty()) {
         query->bindValue(":connection_type", connectionType);
+    }
 
-    if (!execSqlQuery(query))
+    if (!execSqlQuery(query)) {
         return userCount;
+    }
 
-    if (query->next())
+    if (query->next()) {
         userCount = query->value(0).toInt();
+    }
 
     return userCount;
 }
@@ -1068,8 +1439,9 @@ int Servatrice_DatabaseInterface::getActiveUserCount(QString connectionType)
 void Servatrice_DatabaseInterface::updateUsersClientID(const QString &userName, const QString &userClientID)
 {
 
-    if (!checkSql())
+    if (!checkSql()) {
         return;
+    }
 
     QSqlQuery *query = prepareQuery("update {prefix}_users set clientid = :clientid where name = :username");
     query->bindValue(":clientid", userClientID);
@@ -1080,15 +1452,16 @@ void Servatrice_DatabaseInterface::updateUsersClientID(const QString &userName,
 void Servatrice_DatabaseInterface::updateUsersLastLoginData(const QString &userName, const QString &clientVersion)
 {
 
-    if (!checkSql())
+    if (!checkSql()) {
         return;
+    }
 
     int usersID = 0;
 
     QSqlQuery *query = prepareQuery("select id from {prefix}_users where name = :user_name");
     query->bindValue(":user_name", userName);
     if (!execSqlQuery(query)) {
-        qDebug("Failed to locate user id when updating users last login data: SQL Error");
+        qCWarning(DatabaseInterfaceLog) << "Failed to locate user id when updating users last login data: SQL Error";
         return;
     }
 
@@ -1100,8 +1473,9 @@ void Servatrice_DatabaseInterface::updateUsersLastLoginData(const QString &userN
         int userCount = 0;
         query = prepareQuery("select count(id) from {prefix}_user_analytics where id = :user_id");
         query->bindValue(":user_id", usersID);
-        if (!execSqlQuery(query))
+        if (!execSqlQuery(query)) {
             return;
+        }
 
         if (query->next()) {
             userCount = query->value(0).toInt();
@@ -1128,8 +1502,9 @@ QList<ServerInfo_Ban> Servatrice_DatabaseInterface::getUserBanHistory(const QStr
     QList<ServerInfo_Ban> results;
     ServerInfo_Ban banDetails;
 
-    if (!checkSql())
+    if (!checkSql()) {
         return results;
+    }
 
     QSqlQuery *query =
         prepareQuery("SELECT A.id_admin, A.time_from, A.minutes, A.reason, A.visible_reason, B.name AS name_admin FROM "
@@ -1137,7 +1512,7 @@ QList<ServerInfo_Ban> Servatrice_DatabaseInterface::getUserBanHistory(const QStr
     query->bindValue(":user_name", userName);
 
     if (!execSqlQuery(query)) {
-        qDebug("Failed to collect ban history information: SQL Error");
+        qCWarning(DatabaseInterfaceLog) << "Failed to collect ban history information: SQL Error";
         return results;
     }
 
@@ -1159,8 +1534,9 @@ bool Servatrice_DatabaseInterface::addWarning(const QString userName,
                                               const QString warningReason,
                                               const QString clientID)
 {
-    if (!checkSql())
+    if (!checkSql()) {
         return false;
+    }
 
     int userID = getUserIdInDB(userName);
     QSqlQuery *query =
@@ -1172,7 +1548,7 @@ bool Servatrice_DatabaseInterface::addWarning(const QString userName,
     query->bindValue(":warn_reason", warningReason);
     query->bindValue(":client_id", clientID);
     if (!execSqlQuery(query)) {
-        qDebug("Failed to collect create warning history information: SQL Error");
+        qCWarning(DatabaseInterfaceLog) << "Failed to collect create warning history information: SQL Error";
         return false;
     }
 
@@ -1184,8 +1560,9 @@ QList<ServerInfo_Warning> Servatrice_DatabaseInterface::getUserWarnHistory(const
     QList<ServerInfo_Warning> results;
     ServerInfo_Warning warnDetails;
 
-    if (!checkSql())
+    if (!checkSql()) {
         return results;
+    }
 
     int userID = getUserIdInDB(userName);
     QSqlQuery *query =
@@ -1193,7 +1570,7 @@ QList<ServerInfo_Warning> Servatrice_DatabaseInterface::getUserWarnHistory(const
     query->bindValue(":user_id", userID);
 
     if (!execSqlQuery(query)) {
-        qDebug("Failed to collect warning history information: SQL Error");
+        qCWarning(DatabaseInterfaceLog) << "Failed to collect warning history information: SQL Error";
         return results;
     }
 
@@ -1208,6 +1585,204 @@ QList<ServerInfo_Warning> Servatrice_DatabaseInterface::getUserWarnHistory(const
     return results;
 }
 
+QList<ServerInfo_UserSession> Servatrice_DatabaseInterface::getUserSessions(const QString &userName, int limit)
+{
+    QList<ServerInfo_UserSession> results;
+
+    if (!checkSql()) {
+        return results;
+    }
+
+    QSqlQuery *query = prepareQuery("SELECT user_name, ip_address, clientid, "
+                                    "UNIX_TIMESTAMP(start_time), UNIX_TIMESTAMP(end_time), connection_type "
+                                    "FROM {prefix}_sessions WHERE user_name = :user_name "
+                                    "ORDER BY start_time DESC LIMIT :limit");
+    query->bindValue(":user_name", userName);
+    query->bindValue(":limit", limit);
+
+    if (!execSqlQuery(query)) {
+        qCWarning(DatabaseInterfaceLog) << "Failed to collect session history information: SQL Error";
+        return results;
+    }
+
+    while (query->next()) {
+        ServerInfo_UserSession sessionDetails;
+        sessionDetails.set_user_name(query->value(0).toString().toStdString());
+        sessionDetails.set_ip_address(query->value(1).toString().toStdString());
+        sessionDetails.set_clientid(query->value(2).toString().toStdString());
+        sessionDetails.set_start_time(query->value(3).toLongLong());
+        if (!query->value(4).isNull()) {
+            sessionDetails.set_end_time(query->value(4).toLongLong());
+        }
+        sessionDetails.set_connection_type(query->value(5).toString().toStdString());
+        results << sessionDetails;
+    }
+
+    return results;
+}
+
+QList<ServerInfo_UserAlt> Servatrice_DatabaseInterface::getUserAlts(const QString &userName)
+{
+    QList<ServerInfo_UserAlt> results;
+
+    if (!checkSql()) {
+        return results;
+    }
+
+    // Seed account identifiers used to find related accounts
+    QSqlQuery *seedQuery = prepareQuery("SELECT email, clientid FROM {prefix}_users WHERE name = :user_name");
+    seedQuery->bindValue(":user_name", userName);
+    if (!execSqlQuery(seedQuery) || !seedQuery->next()) {
+        return results;
+    }
+    const QString seedEmail = seedQuery->value(0).toString();
+    const QString seedClientId = seedQuery->value(1).toString();
+
+    QString queryString = "SELECT u.name, u.email, u.clientid, UNIX_TIMESTAMP(u.registrationDate), "
+                          "UNIX_TIMESTAMP(a.last_login), "
+                          "(SELECT COUNT(*) FROM {prefix}_warnings w WHERE w.user_id = u.id), "
+                          "(SELECT COUNT(*) FROM {prefix}_bans b WHERE b.user_name = u.name), "
+                          "u.active "
+                          "FROM {prefix}_users u "
+                          "LEFT JOIN {prefix}_user_analytics a ON a.id = u.id "
+                          "WHERE u.name = :user_name";
+    if (!seedEmail.isEmpty()) {
+        queryString.append(" OR u.email = :seed_email");
+    }
+    if (!seedClientId.isEmpty()) {
+        queryString.append(" OR u.clientid = :seed_clientid");
+    }
+    queryString.append(" OR u.name IN (SELECT DISTINCT s.user_name FROM {prefix}_sessions s "
+                       "WHERE s.ip_address IN (SELECT DISTINCT s2.ip_address FROM {prefix}_sessions s2 "
+                       "WHERE s2.user_name = :user_name"
+                       " AND s2.start_time >= DATE_SUB(NOW(), INTERVAL 6 MONTH))"
+                       " AND s.start_time >= DATE_SUB(NOW(), INTERVAL 6 MONTH)) "
+                       "ORDER BY u.name LIMIT 200");
+
+    QSqlQuery *query = prepareQuery(queryString);
+    query->bindValue(":user_name", userName);
+    if (!seedEmail.isEmpty()) {
+        query->bindValue(":seed_email", seedEmail);
+    }
+    if (!seedClientId.isEmpty()) {
+        query->bindValue(":seed_clientid", seedClientId);
+    }
+
+    if (!execSqlQuery(query)) {
+        qCWarning(DatabaseInterfaceLog) << "Failed to collect user alt information: SQL Error";
+        return results;
+    }
+
+    while (query->next()) {
+        ServerInfo_UserAlt altDetails;
+        altDetails.set_user_name(query->value(0).toString().toStdString());
+        altDetails.set_email(query->value(1).toString().toStdString());
+        altDetails.set_clientid(query->value(2).toString().toStdString());
+        altDetails.set_registration_time(query->value(3).toLongLong());
+        if (!query->value(4).isNull()) {
+            altDetails.set_last_login(query->value(4).toLongLong());
+        }
+        altDetails.set_warn_count(query->value(5).toInt());
+        altDetails.set_ban_count(query->value(6).toInt());
+        altDetails.set_is_active(query->value(7).toBool());
+        results << altDetails;
+    }
+
+    return results;
+}
+
+QList<ServerInfo_ModeratorLogin> Servatrice_DatabaseInterface::getModeratorLastLogins()
+{
+    QList<ServerInfo_ModeratorLogin> results;
+
+    if (!checkSql()) {
+        return results;
+    }
+
+    QSqlQuery *query = prepareQuery("SELECT u.name, u.admin, UNIX_TIMESTAMP(a.last_login) "
+                                    "FROM {prefix}_users u "
+                                    "LEFT JOIN {prefix}_user_analytics a ON a.id = u.id "
+                                    "WHERE (u.admin & 15) <> 0 ORDER BY u.name");
+
+    if (!execSqlQuery(query)) {
+        qCWarning(DatabaseInterfaceLog) << "Failed to collect moderator login information: SQL Error";
+        return results;
+    }
+
+    while (query->next()) {
+        ServerInfo_ModeratorLogin loginDetails;
+        loginDetails.set_user_name(query->value(0).toString().toStdString());
+
+        const int isAdmin = query->value(1).toInt();
+        int userLevel = ServerInfo_User::IsUser | ServerInfo_User::IsRegistered;
+        if (isAdmin & 1) {
+            userLevel |= ServerInfo_User::IsAdmin | ServerInfo_User::IsModerator;
+        } else if (isAdmin & 2) {
+            userLevel |= ServerInfo_User::IsModerator;
+        }
+        if (isAdmin & 4) {
+            userLevel |= ServerInfo_User::IsJudge;
+        }
+        if (isAdmin & 8) {
+            userLevel |= ServerInfo_User::IsDeveloper;
+        }
+        loginDetails.set_user_level(userLevel);
+
+        if (!query->value(2).isNull()) {
+            loginDetails.set_last_login(query->value(2).toLongLong());
+        }
+        results << loginDetails;
+    }
+
+    return results;
+}
+
+Servatrice_DatabaseInterface::UptimeSnapshot Servatrice_DatabaseInterface::getLatestUptimeSnapshot(int serverId)
+{
+    UptimeSnapshot snapshot;
+
+    if (!checkSql()) {
+        return snapshot;
+    }
+
+    QSqlQuery *query = prepareQuery("SELECT users_count, mods_count, games_count, tx_bytes, rx_bytes, uptime, "
+                                    "UNIX_TIMESTAMP(timest) FROM {prefix}_uptime "
+                                    "WHERE id_server = :id_server ORDER BY timest DESC LIMIT 1");
+    query->bindValue(":id_server", serverId);
+
+    if (!execSqlQuery(query)) {
+        qCWarning(DatabaseInterfaceLog) << "Failed to collect server stats snapshot: SQL Error";
+        return snapshot;
+    }
+
+    if (query->next()) {
+        snapshot.valid = true;
+        snapshot.usersCount = query->value(0).toULongLong();
+        snapshot.modsCount = query->value(1).toULongLong();
+        snapshot.gamesCount = query->value(2).toULongLong();
+        snapshot.txBytes = query->value(3).toULongLong();
+        snapshot.rxBytes = query->value(4).toULongLong();
+        snapshot.uptimeSecs = query->value(5).toULongLong();
+        snapshot.timest = query->value(6).toULongLong();
+    }
+
+    return snapshot;
+}
+
+bool Servatrice_DatabaseInterface::removeUserAvatar(const QString &userName)
+{
+    if (!checkSql()) {
+        return false;
+    }
+
+    QSqlQuery *query = prepareQuery("UPDATE {prefix}_users SET avatar_bmp = '' WHERE name = :user_name");
+    query->bindValue(":user_name", userName);
+    if (!execSqlQuery(query)) {
+        return false;
+    }
+    return query->numRowsAffected() > 0;
+}
+
 QList<ServerInfo_ChatMessage> Servatrice_DatabaseInterface::getMessageLogHistory(const QString &user,
                                                                                  const QString &ipaddress,
                                                                                  const QString &gamename,
@@ -1223,8 +1798,9 @@ QList<ServerInfo_ChatMessage> Servatrice_DatabaseInterface::getMessageLogHistory
     QList<ServerInfo_ChatMessage> results;
     ServerInfo_ChatMessage chatMessage;
 
-    if (!checkSql())
+    if (!checkSql()) {
         return results;
+    }
 
     if (user.isEmpty() && ipaddress.isEmpty() && gameid.isEmpty() && gamename.isEmpty()) {
         // To ensure quick results and minimal lag, require an indexed field
@@ -1233,48 +1809,58 @@ QList<ServerInfo_ChatMessage> Servatrice_DatabaseInterface::getMessageLogHistory
 
     // BUILD QUERY STRING BASED ON PASSED IN VALUES
     QString queryString = "SELECT * FROM {prefix}_log WHERE `sender_ip` IS NOT NULL";
-    if (!user.isEmpty())
+    if (!user.isEmpty()) {
         queryString.append(" AND (`sender_name` = :user_name OR `target_name` = :user_name)");
+    }
 
-    if (!ipaddress.isEmpty())
+    if (!ipaddress.isEmpty()) {
         queryString.append(" AND `sender_ip` = :ip_to_find");
+    }
 
-    if (!gameid.isEmpty())
+    if (!gameid.isEmpty()) {
         queryString.append(" AND (`target_id` = :game_id AND `target_type` = 'game')");
+    }
 
-    if (!gamename.isEmpty())
+    if (!gamename.isEmpty()) {
         queryString.append(" AND (`target_name` = :game_name AND `target_type` = 'game')");
+    }
 
-    if (!message.isEmpty())
+    if (!message.isEmpty()) {
         queryString.append(" AND `log_message` LIKE :log_message");
+    }
 
     if (chat || game || room) {
         queryString.append(" AND (");
 
-        if (chat)
+        if (chat) {
             queryString.append("`target_type` = 'chat'");
+        }
 
         if (game) {
-            if (chat)
+            if (chat) {
                 queryString.append(" OR `target_type` = 'game'");
-            else
+            } else {
                 queryString.append("`target_type` = 'game'");
+            }
         }
 
         if (room) {
-            if (game || chat)
+            if (game || chat) {
                 queryString.append(" OR `target_type` = 'room'");
-            else
+            } else {
                 queryString.append("`target_type` = 'room'");
+            }
         }
         queryString.append(")");
     }
 
-    if (range)
+    if (range) {
         queryString.append(" AND log_time >= DATE_SUB(now(), INTERVAL :range_time HOUR)");
+    }
 
-    if (maxresults)
+    if (maxresults) {
         queryString.append(" LIMIT :limit_size");
+    }
 
     QSqlQuery *query = prepareQuery(queryString);
     if (!user.isEmpty()) {
@@ -1300,7 +1886,7 @@ QList<ServerInfo_ChatMessage> Servatrice_DatabaseInterface::getMessageLogHistory
     }
 
     if (!execSqlQuery(query)) {
-        qDebug("Failed to collect log history information: SQL Error");
+        qCWarning(DatabaseInterfaceLog) << "Failed to collect log history information: SQL Error";
         return results;
     }
 
@@ -1321,86 +1907,101 @@ QList<ServerInfo_ChatMessage> Servatrice_DatabaseInterface::getMessageLogHistory
 
 int Servatrice_DatabaseInterface::checkNumberOfUserAccounts(const QString &email)
 {
-    if (!checkSql())
+    if (!checkSql()) {
         return 0;
+    }
 
     QSqlQuery *query = prepareQuery("SELECT count(email) FROM {prefix}_users WHERE email = :user_email");
     query->bindValue(":user_email", email);
 
     if (!execSqlQuery(query)) {
-        qDebug("Failed to identify the number of users accounts for users email address: SQL Error");
+        qCWarning(DatabaseInterfaceLog)
+            << "Failed to identify the number of users accounts for users email address: SQL Error";
         return 0;
     }
 
-    if (query->next())
+    if (query->next()) {
         return query->value(0).toInt();
+    }
 
     return 0;
 }
 
 bool Servatrice_DatabaseInterface::addForgotPassword(const QString &user)
 {
-    if (!checkSql())
+    if (!checkSql()) {
         return false;
+    }
 
-    if (!updateUserToken(PasswordHasher::generateActivationToken(), user))
+    if (!updateUserToken(PasswordHasher::generateActivationToken(), user)) {
         return false;
+    }
 
     QSqlQuery *query = prepareQuery("insert into {prefix}_forgot_password (name,requestDate) values (:username,NOW())");
     query->bindValue(":username", user);
-    if (execSqlQuery(query))
+    if (execSqlQuery(query)) {
         return true;
+    }
 
     return false;
 }
 
 bool Servatrice_DatabaseInterface::removeForgotPassword(const QString &user)
 {
-    if (!checkSql())
+    if (!checkSql()) {
         return false;
+    }
 
     QSqlQuery *query = prepareQuery("delete from {prefix}_forgot_password where name = :username");
     query->bindValue(":username", user);
-    if (execSqlQuery(query))
+    if (execSqlQuery(query)) {
         return true;
+    }
 
     return false;
 }
 
 bool Servatrice_DatabaseInterface::doesForgotPasswordExist(const QString &user)
 {
-    if (!checkSql())
+    if (!checkSql()) {
         return false;
+    }
 
     QSqlQuery *query = prepareQuery("select count(name) from {prefix}_forgot_password where name = :user_name AND "
                                     "requestDate > (now() - interval :minutes minute)");
     query->bindValue(":user_name", user);
     query->bindValue(":minutes", QString::number(server->getForgotPasswordTokenLife()));
 
-    if (!execSqlQuery(query))
+    if (!execSqlQuery(query)) {
         return false;
+    }
 
-    if (query->next())
-        if (query->value("count(name)").toInt() > 0)
+    if (query->next()) {
+        if (query->value("count(name)").toInt() > 0) {
             return true;
+        }
+    }
 
     return false;
 }
 
 bool Servatrice_DatabaseInterface::updateUserToken(const QString &token, const QString &user)
 {
-    if (!checkSql())
+    if (!checkSql()) {
         return false;
+    }
 
-    if (token.isEmpty() || user.isEmpty())
+    if (token.isEmpty() || user.isEmpty()) {
         return false;
+    }
 
     QSqlQuery *query = prepareQuery("update {prefix}_users set token = :token where name = :user_name");
     query->bindValue(":user_name", user);
     query->bindValue(":token", token);
 
-    if (execSqlQuery(query))
+    if (execSqlQuery(query)) {
         return true;
+    }
 
     return false;
 }
@@ -1410,22 +2011,27 @@ bool Servatrice_DatabaseInterface::validateTableColumnStringData(const QString &
                                                                  const QString &_user,
                                                                  const QString &_datatocheck)
 {
-    if (!checkSql())
+    if (!checkSql()) {
         return false;
+    }
 
-    if (table.isEmpty() || column.isEmpty() || _user.isEmpty() || _datatocheck.isEmpty())
+    if (table.isEmpty() || column.isEmpty() || _user.isEmpty() || _datatocheck.isEmpty()) {
         return false;
+    }
 
     QString formatedQuery = QString("select %1 from %2 where name = :user_name").arg(column).arg(table);
     QSqlQuery *query = prepareQuery(formatedQuery);
     query->bindValue(":user_name", _user);
 
-    if (!execSqlQuery(query))
+    if (!execSqlQuery(query)) {
         return false;
+    }
 
-    if (query->next())
-        if (query->value(column).toString().toLower() == _datatocheck.toLower())
+    if (query->next()) {
+        if (query->value(column).toString().toLower() == _datatocheck.toLower()) {
             return true;
+        }
+    }
 
     return false;
 }
@@ -1437,14 +2043,17 @@ void Servatrice_DatabaseInterface::addAuditRecord(const QString &user,
                                                   const QString &details,
                                                   const bool &results = false)
 {
-    if (!checkSql())
+    if (!checkSql()) {
         return;
+    }
 
-    if (!server->getEnableAudit())
+    if (!server->getEnableAudit()) {
         return;
+    }
 
-    if (user.isEmpty() || ipaddress.isEmpty() || clientid.isEmpty() || action.isEmpty())
+    if (user.isEmpty() || ipaddress.isEmpty() || clientid.isEmpty() || action.isEmpty()) {
         return;
+    }
 
     QSqlQuery *query = prepareQuery("insert into {prefix}_audit "
                                     "(id_server,name,ip_address,clientid,incidentDate,action,results,details) values "
diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h
index 68080404c..0509d1a03 100644
--- a/servatrice/src/servatrice_database_interface.h
+++ b/servatrice/src/servatrice_database_interface.h
@@ -1,19 +1,52 @@
 #ifndef SERVATRICE_DATABASE_INTERFACE_H
 #define SERVATRICE_DATABASE_INTERFACE_H
 
-#include <QChar>
+#include "libcockatrice/protocol/pb/serverinfo_user.pb.h"
+
 #include <QHash>
-#include <QObject>
+#include <QList>
 #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>
 
-#define DATABASE_SCHEMA_VERSION 34
+class QSqlQuery;
+
+#define DATABASE_SCHEMA_VERSION 37
 
 class Servatrice;
 
+/** @brief Metadata of a single deck inside a temporary deck share bundle. */
+struct DeckShareItemRecord
+{
+    int id = -1;           ///< Database id, used for downloads.
+    QString name;          ///< Deck name.
+    QStringList tags;      ///< Deck tags.
+    QString bannerCard;    ///< Banner card name (deck image).
+    QString gameFormat;    ///< Game format the deck was built for.
+    QString colorIdentity; ///< Color identity, e.g. "WUBRG".
+    QString content;       ///< Deck content (native format); empty in list queries.
+};
+
+/** @brief Summary of a share bundle owned by a user. */
+struct DeckShareSummaryRecord
+{
+    int id = -1;             ///< Database id, used for revocation.
+    QString name;            ///< Share name.
+    qint64 creationTime = 0; ///< Unix timestamp at which the share was created.
+    qint64 expiresAt = 0;    ///< Unix timestamp at which the share expires.
+    int itemCount = 0;       ///< Number of decks in the bundle.
+};
+
 class Servatrice_DatabaseInterface : public Server_DatabaseInterface
 {
     Q_OBJECT
@@ -29,6 +62,7 @@ private:
     bool checkUserIsIpBanned(const QString &ipAddress, QString &banReason, int &banSecondsRemaining);
     /** Must be called after checkSql and server is known to be in auth mode. */
     bool checkUserIsNameBanned(QString const &userName, QString &banReason, int &banSecondsRemaining);
+    bool isStrictModeEnabled(bool &ok) const;
 
 protected:
     AuthenticationResult checkUserPassword(Server_ProtocolHandler *handler,
@@ -76,6 +110,37 @@ public:
                               const QList<GameReplay *> &replayList) override;
     DeckList *getDeckFromDatabase(int deckId, int userId) override;
 
+    /**
+     * @brief Creates a new temporary deck share bundle.
+     * @param expiresAt Receives the actual expiry read back from the database.
+     * @return false on failure.
+     */
+    bool createDeckShare(const QString &token,
+                         const QString &name,
+                         int userId,
+                         const QList<DeckShareItemRecord> &items,
+                         int expiryDays,
+                         qint64 &expiresAt);
+    /** @brief Lists the share bundles created by a user, newest first. */
+    bool getDeckSharesForUser(int userId, QList<DeckShareSummaryRecord> &shares);
+    /**
+     * @brief Deletes one of a user's own share bundles (cascades to its items).
+     * @return false if no such bundle belongs to the user.
+     */
+    bool deleteDeckShare(int shareId, int userId);
+    /**
+     * @brief Looks up a valid (non-expired) share bundle by token.
+     * @return false if the token is unknown or expired.
+     */
+    bool getDeckShareList(const QString &token, QString &name, qint64 &expiresAt, QList<DeckShareItemRecord> &items);
+    /**
+     * @brief Fetches the content of one item of a valid share bundle.
+     * @return false if the token is unknown/expired or the item does not belong to the bundle.
+     */
+    bool getDeckShareItem(const QString &token, int itemId, QString &content);
+    /** @brief Deletes all expired share bundles (cascades to their items). */
+    void cleanupExpiredDeckShares();
+
     int getNextGameId() override;
     int getNextReplayId() override;
     int getActiveUserCount(QString connectionType = QString()) override;
@@ -119,6 +184,7 @@ public:
                             bool oldPasswordNeedsHash,
                             const QString &newPassword,
                             bool newPasswordNeedsHash) override;
+    void setForcePasswordChange(const QString &user, bool force) override;
     QList<ServerInfo_Ban> getUserBanHistory(const QString userName);
     bool
     addWarning(const QString userName, const QString adminName, const QString warningReason, const QString clientID);
@@ -133,6 +199,25 @@ public:
                                                        bool &room,
                                                        int &range,
                                                        int &maxresults);
+    QList<ServerInfo_UserSession> getUserSessions(const QString &userName, int limit);
+    QList<ServerInfo_UserAlt> getUserAlts(const QString &userName);
+    QList<ServerInfo_ModeratorLogin> getModeratorLastLogins();
+
+    // Uptime snapshot as recorded by Servatrice::statusUpdate() into the
+    // {prefix}_uptime table. valid is false when no snapshot exists yet.
+    struct UptimeSnapshot
+    {
+        bool valid = false;
+        quint64 usersCount = 0;
+        quint64 modsCount = 0;
+        quint64 gamesCount = 0;
+        quint64 txBytes = 0;
+        quint64 rxBytes = 0;
+        quint64 uptimeSecs = 0;
+        quint64 timest = 0;
+    };
+    UptimeSnapshot getLatestUptimeSnapshot(int serverId);
+    bool removeUserAvatar(const QString &userName);
     bool addForgotPassword(const QString &user);
     bool removeForgotPassword(const QString &user) override;
     bool doesForgotPasswordExist(const QString &user);
diff --git a/servatrice/src/server_logger.cpp b/servatrice/src/server_logger.cpp
index 9e40ac7b4..1972444f1 100644
--- a/servatrice/src/server_logger.cpp
+++ b/servatrice/src/server_logger.cpp
@@ -6,8 +6,16 @@
 #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)
@@ -39,33 +47,33 @@ void ServerLogger::startLog(const QString &logFileName)
             logFile = 0;
             return;
         }
-    } else
+    } else {
         logFile = 0;
+    }
 
     connect(this, SIGNAL(sigFlushBuffer()), this, SLOT(flushBuffer()), Qt::QueuedConnection);
 }
 
 void ServerLogger::logMessage(const QString &message, void *caller)
 {
-    if (!logFile)
+    if (!logFile) {
         return;
+    }
 
     QString callerString;
-    if (caller)
+    if (caller) {
         callerString = QString::number((qulonglong)caller, 16) + " ";
+    }
 
     // filter out all log entries based on values in configuration file
     bool shouldWeWriteLog = settingsCache->value("server/writelog", 1).toBool();
     QString logFilters = settingsCache->value("server/logfilters").toString();
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     QStringList listlogFilters = logFilters.split(",", Qt::SkipEmptyParts);
-#else
-    QStringList listlogFilters = logFilters.split(",", QString::SkipEmptyParts);
-#endif
     bool shouldWeSkipLine = false;
 
-    if (!shouldWeWriteLog)
+    if (!shouldWeWriteLog) {
         return;
+    }
 
     if (!logFilters.trimmed().isEmpty()) {
         shouldWeSkipLine = true;
@@ -77,8 +85,9 @@ void ServerLogger::logMessage(const QString &message, void *caller)
         }
     }
 
-    if (shouldWeSkipLine)
+    if (shouldWeSkipLine) {
         return;
+    }
 
     bufferMutex.lock();
     buffer.append(QDateTime::currentDateTime().toString() + " " + callerString + message);
@@ -88,8 +97,9 @@ void ServerLogger::logMessage(const QString &message, void *caller)
 
 void ServerLogger::flushBuffer()
 {
-    if (flushRunning)
+    if (flushRunning) {
         return;
+    }
 
     flushRunning = true;
     QTextStream stream(logFile);
@@ -107,20 +117,24 @@ void ServerLogger::flushBuffer()
         stream << message << "\n";
         stream.flush();
 
-        if (logToConsole)
+        if (logToConsole) {
             std::cout << message.toStdString() << std::endl;
+        }
     }
 }
 
 void ServerLogger::rotateLogs()
 {
-    if (!logFile)
+    if (!logFile) {
         return;
+    }
 
     flushBuffer();
 
     logFile->close();
-    logFile->open(QIODevice::Append);
+    if (!logFile->open(QIODevice::Append)) {
+        std::cerr << "ERROR: Failed to open log file for writing!" << std::endl;
+    }
 }
 
 QFile *ServerLogger::logFile;
diff --git a/servatrice/src/server_logger.h b/servatrice/src/server_logger.h
index 0ad092b66..f2875a6a3 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 <QThread>
-#include <QWaitCondition>
+#include <qtmetamacros.h>
 
 class QFile;
-class Server_ProtocolHandler;
 
 class ServerLogger : public QObject
 {
diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp
index 4b33aad12..5f5d1ced5 100644
--- a/servatrice/src/serversocketinterface.cpp
+++ b/servatrice/src/serversocketinterface.cpp
@@ -20,36 +20,100 @@
 
 #include "serversocketinterface.h"
 
+#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 <QRegularExpression>
+#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 <QSqlError>
 #include <QSqlQuery>
 #include <QString>
-#include <game/server_player.h>
+#include <QStringLiteral>
+#include <QTextStream>
+#include <QVariant>
+#include <QtGlobal>
+#include <algorithm>
+#include <exception>
+#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>
 #include <libcockatrice/protocol/pb/command_deck_del.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_del_dir.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_download.pb.h>
+#include <libcockatrice/protocol/pb/command_deck_download_public.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_list.pb.h>
+#include <libcockatrice/protocol/pb/command_deck_list_other_user.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_new_dir.pb.h>
+#include <libcockatrice/protocol/pb/command_deck_set_visibility.pb.h>
+#include <libcockatrice/protocol/pb/command_deck_share_create.pb.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/command_deck_share_list_mine.pb.h>
+#include <libcockatrice/protocol/pb/command_deck_share_remove.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
+#include <libcockatrice/protocol/pb/command_get_server_stats.pb.h>
 #include <libcockatrice/protocol/pb/command_replay_delete_match.pb.h>
 #include <libcockatrice/protocol/pb/command_replay_download.pb.h>
+#include <libcockatrice/protocol/pb/command_replay_download_by_game_id.pb.h>
 #include <libcockatrice/protocol/pb/command_replay_get_code.pb.h>
 #include <libcockatrice/protocol/pb/command_replay_list.pb.h>
 #include <libcockatrice/protocol/pb/command_replay_modify_match.pb.h>
 #include <libcockatrice/protocol/pb/command_replay_submit_code.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_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>
 #include <libcockatrice/protocol/pb/commands.pb.h>
 #include <libcockatrice/protocol/pb/event_add_to_list.pb.h>
 #include <libcockatrice/protocol/pb/event_connection_closed.pb.h>
@@ -57,34 +121,70 @@
 #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_message.pb.h>
 #include <libcockatrice/protocol/pb/response_ban_history.pb.h>
+#include <libcockatrice/protocol/pb/response_card_art_rule_entry.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_download.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_list.pb.h>
+#include <libcockatrice/protocol/pb/response_deck_share_create.pb.h>
+#include <libcockatrice/protocol/pb/response_deck_share_download.pb.h>
+#include <libcockatrice/protocol/pb/response_deck_share_list.pb.h>
+#include <libcockatrice/protocol/pb/response_deck_share_list_mine.pb.h>
 #include <libcockatrice/protocol/pb/response_deck_upload.pb.h>
 #include <libcockatrice/protocol/pb/response_forgotpasswordrequest.pb.h>
 #include <libcockatrice/protocol/pb/response_get_admin_notes.pb.h>
+#include <libcockatrice/protocol/pb/response_get_server_stats.pb.h>
+#include <libcockatrice/protocol/pb/response_moderator_last_logins.pb.h>
 #include <libcockatrice/protocol/pb/response_password_salt.pb.h>
 #include <libcockatrice/protocol/pb/response_register.pb.h>
+#include <libcockatrice/protocol/pb/response_remove_user_avatar.pb.h>
 #include <libcockatrice/protocol/pb/response_replay_download.pb.h>
+#include <libcockatrice/protocol/pb/response_replay_download_by_game_id.pb.h>
 #include <libcockatrice/protocol/pb/response_replay_get_code.pb.h>
 #include <libcockatrice/protocol/pb/response_replay_list.pb.h>
+#include <libcockatrice/protocol/pb/response_report_details.pb.h>
+#include <libcockatrice/protocol/pb/response_report_list.pb.h>
+#include <libcockatrice/protocol/pb/response_report_my_list.pb.h>
+#include <libcockatrice/protocol/pb/response_report_stats.pb.h>
+#include <libcockatrice/protocol/pb/response_report_user_info.pb.h>
+#include <libcockatrice/protocol/pb/response_reset_user_password.pb.h>
+#include <libcockatrice/protocol/pb/response_user_alts.pb.h>
+#include <libcockatrice/protocol/pb/response_user_sessions.pb.h>
 #include <libcockatrice/protocol/pb/response_viewlog_history.pb.h>
 #include <libcockatrice/protocol/pb/response_warn_history.pb.h>
 #include <libcockatrice/protocol/pb/response_warn_list.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_ban.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_chat_message.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_deckstorage.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_moderator_login.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_replay.pb.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
-#include <libcockatrice/utility/trice_limits.h>
+#include <libcockatrice/protocol/pb/serverinfo_user_alt.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_user_session.pb.h>
+#include <libcockatrice/utility/passwordhasher.h>
+#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");
+inline Q_LOGGING_CATEGORY(WebsocketServerSocketInterfaceLog, "websocket_server_socket_interface");
 
 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)
@@ -112,8 +212,9 @@ bool AbstractServerSocketInterface::initSession()
 
     // allow unlimited number of connections from the trusted sources
     QString trustedSources = settingsCache->value("security/trusted_sources", "127.0.0.1,::1").toString();
-    if (trustedSources.contains(getAddress(), Qt::CaseInsensitive))
+    if (trustedSources.contains(getAddress(), Qt::CaseInsensitive)) {
         return true;
+    }
 
     int maxUsers = servatrice->getMaxUsersPerAddress();
     if ((maxUsers > 0) && (servatrice->getUsersWithAddress(getPeerAddress()) > maxUsers)) {
@@ -130,7 +231,7 @@ bool AbstractServerSocketInterface::initSession()
 
 void AbstractServerSocketInterface::catchSocketError(QAbstractSocket::SocketError socketError)
 {
-    qDebug() << "Socket error:" << socketError;
+    qCWarning(AbstractServerSocketInterfaceLog) << "Socket error:" << socketError;
 
     prepareDestroy();
 }
@@ -154,6 +255,77 @@ void AbstractServerSocketInterface::logDebugMessage(const QString &message)
     logger->logMessage(message, this);
 }
 
+void AbstractServerSocketInterface::processCommandContainer(const CommandContainer &cont)
+{
+    QElapsedTimer timer;
+    timer.start();
+    Server_ProtocolHandler::processCommandContainer(cont);
+    const qint64 elapsedMs = timer.nsecsElapsed() / 1000000;
+
+    // The base dispatch is an if/else-if chain — at most one family is
+    // actually processed.  Recording every family in the container would
+    // let an unauthenticated client stampforge developer/moderator/admin
+    // samples by batching them alongside a session command the server
+    // actually runs.  Mirror the base's selection and skip entirely when
+    // deleted or when no family matched.
+    if (deleted) {
+        return;
+    }
+
+    // When getPbExtension returns -1 (no extension set) and the kind is
+    // non-zero, typeIdFor wraps into the previous kind's range instead of
+    // hitting the typeId < 0 guard in observeCommand.  Skip such entries.
+    int kind = -1;
+    if (cont.game_command_size()) {
+        kind = 2;
+    } else if (cont.room_command_size()) {
+        kind = 1;
+    } else if (cont.session_command_size()) {
+        kind = 0;
+    } else if (cont.moderator_command_size()) {
+        kind = 3;
+    } else if (cont.admin_command_size()) {
+        kind = 4;
+    } else if (cont.developer_command_size()) {
+        kind = 5;
+    }
+
+    if (kind >= 0) {
+        auto recordDispatched = [&](int familyKind, const auto &cmds) {
+            for (const auto &cmd : cmds) {
+                const int ext = getPbExtension(cmd);
+                if (ext >= 0) {
+                    servatrice->getMetricsRegistry().observeCommand(MetricsRegistry::typeIdFor(familyKind, ext),
+                                                                    elapsedMs);
+                }
+            }
+        };
+
+        if (kind == 0) {
+            recordDispatched(kind, cont.session_command());
+        } else if (kind == 1) {
+            recordDispatched(kind, cont.room_command());
+        } else if (kind == 2) {
+            recordDispatched(kind, cont.game_command());
+        } else if (kind == 3) {
+            recordDispatched(kind, cont.moderator_command());
+        } else if (kind == 4) {
+            recordDispatched(kind, cont.admin_command());
+        } else {
+            recordDispatched(kind, cont.developer_command());
+        }
+    }
+
+    const int slowCommandMs = servatrice->getMetricsSlowCommandMs();
+    if (slowCommandMs > 0 && elapsedMs >= slowCommandMs) {
+        const ServerInfo_User *info = getUserInfo();
+        const QString user = authState == PasswordRight && info ? QString::fromStdString(info->name())
+                                                                : QStringLiteral("unauthenticated");
+        qCWarning(AbstractServerSocketInterfaceLog) << "slow command container from" << user << "processed in"
+                                                    << elapsedMs << "ms (" << cont.ByteSizeLong() << "bytes)";
+    }
+}
+
 Response::ResponseCode AbstractServerSocketInterface::processExtendedSessionCommand(int cmdType,
                                                                                     const SessionCommand &cmd,
                                                                                     ResponseContainer &rc)
@@ -165,6 +337,12 @@ Response::ResponseCode AbstractServerSocketInterface::processExtendedSessionComm
             return cmdRemoveFromList(cmd.GetExtension(Command_RemoveFromList::ext), rc);
         case SessionCommand::DECK_LIST:
             return cmdDeckList(cmd.GetExtension(Command_DeckList::ext), rc);
+        case SessionCommand::DECK_LIST_OTHER_USER:
+            return cmdDeckListOtherUser(cmd.GetExtension(Command_DeckListOtherUser::ext), rc);
+        case SessionCommand::DECK_SET_VISIBILITY:
+            return cmdDeckSetVisibility(cmd.GetExtension(Command_DeckSetVisibility::ext), rc);
+        case SessionCommand::DECK_DOWNLOAD_PUBLIC:
+            return cmdDeckDownloadPublic(cmd.GetExtension(Command_DeckDownloadPublic::ext), rc);
         case SessionCommand::DECK_NEW_DIR:
             return cmdDeckNewDir(cmd.GetExtension(Command_DeckNewDir::ext), rc);
         case SessionCommand::DECK_DEL_DIR:
@@ -206,11 +384,31 @@ Response::ResponseCode AbstractServerSocketInterface::processExtendedSessionComm
             return cmdAccountEdit(cmd.GetExtension(Command_AccountEdit::ext), rc);
         case SessionCommand::ACCOUNT_IMAGE:
             return cmdAccountImage(cmd.GetExtension(Command_AccountImage::ext), rc);
+        case SessionCommand::SET_CARD_ART_PARAMS:
+            return cmdSetCardArtParams(cmd.GetExtension(Command_SetCardArtParams::ext), rc);
+        case SessionCommand::DECK_SHARE_CREATE:
+            return cmdDeckShareCreate(cmd.GetExtension(Command_DeckShareCreate::ext), rc);
+        case SessionCommand::DECK_SHARE_LIST:
+            return cmdDeckShareList(cmd.GetExtension(Command_DeckShareList::ext), rc);
+        case SessionCommand::DECK_SHARE_LIST_MINE:
+            return cmdDeckShareListMine(cmd.GetExtension(Command_DeckShareListMine::ext), rc);
+        case SessionCommand::DECK_SHARE_REMOVE:
+            return cmdDeckShareRemove(cmd.GetExtension(Command_DeckShareRemove::ext), rc);
+        case SessionCommand::DECK_SHARE_DOWNLOAD:
+            return cmdDeckShareDownload(cmd.GetExtension(Command_DeckShareDownload::ext), rc);
         case SessionCommand::ACCOUNT_PASSWORD:
             return cmdAccountPassword(cmd.GetExtension(Command_AccountPassword::ext), rc);
         case SessionCommand::REQUEST_PASSWORD_SALT:
             return cmdRequestPasswordSalt(cmd.GetExtension(Command_RequestPasswordSalt::ext), rc);
             break;
+        case SessionCommand::REPORT:
+            return cmdReport(cmd.GetExtension(Command_Report::ext), rc);
+        case SessionCommand::REPORT_MY_LIST:
+            return cmdReportMyList(cmd.GetExtension(Command_ReportMyList::ext), rc);
+        case SessionCommand::REPORT_ADD_COMMENT:
+            return cmdReportAddComment(cmd.GetExtension(Command_ReportAddComment::ext), rc);
+        case SessionCommand::REPORT_DETAILS:
+            return cmdReportDetails(cmd.GetExtension(Command_ReportDetails::ext), rc);
         default:
             return Response::RespFunctionNotAllowed;
     }
@@ -231,16 +429,44 @@ Response::ResponseCode AbstractServerSocketInterface::processExtendedModeratorCo
             return cmdGetWarnHistory(cmd.GetExtension(Command_GetWarnHistory::ext), rc);
         case ModeratorCommand::WARN_LIST:
             return cmdGetWarnList(cmd.GetExtension(Command_GetWarnList::ext), rc);
+        case ModeratorCommand::REPORT_LIST:
+            return cmdReportList(cmd.GetExtension(Command_ReportList::ext), rc);
+        case ModeratorCommand::REPORT_ASSIGN:
+            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);
+            return cmdGetLogHistory(cmd.GetExtension(Command_ViewLogHistory::ext), rc, true);
         case ModeratorCommand::GRANT_REPLAY_ACCESS:
             return cmdGrantReplayAccess(cmd.GetExtension(Command_GrantReplayAccess::ext), rc);
+        case ModeratorCommand::REPLAY_DOWNLOAD_BY_GAME_ID:
+            return cmdReplayDownloadByGameId(cmd.GetExtension(Command_ReplayDownloadByGameId::ext), rc);
         case ModeratorCommand::FORCE_ACTIVATE_USER:
             return cmdForceActivateUser(cmd.GetExtension(Command_ForceActivateUser::ext), rc);
         case ModeratorCommand::GET_ADMIN_NOTES:
             return cmdGetAdminNotes(cmd.GetExtension(Command_GetAdminNotes::ext), rc);
         case ModeratorCommand::UPDATE_ADMIN_NOTES:
             return cmdUpdateAdminNotes(cmd.GetExtension(Command_UpdateAdminNotes::ext), rc);
+        case ModeratorCommand::ADD_CARD_ART_RULE:
+            return cmdAddCardArtRule(cmd.GetExtension((Command_AddCardArtRule::ext)), rc);
+        case ModeratorCommand::REMOVE_CARD_ART_RULE:
+            return cmdRemoveCardArtRule(cmd.GetExtension((Command_RemoveCardArtRule::ext)), rc);
+        case ModeratorCommand::LIST_CARD_ART_RULES:
+            return cmdListCardArtRules(cmd.GetExtension((Command_ListCardArtRules::ext)), rc);
+        case ModeratorCommand::REPORT_USER_INFO:
+            return cmdReportUserInfo(cmd.GetExtension(Command_ReportUserInfo::ext), rc);
+        case ModeratorCommand::REPORT_STATS:
+            return cmdReportStats(cmd.GetExtension(Command_ReportStats::ext), rc);
+        case ModeratorCommand::GET_USER_SESSIONS:
+            return cmdGetUserSessions(cmd.GetExtension(Command_GetUserSessions::ext), rc);
+        case ModeratorCommand::GET_USER_ALTS:
+            return cmdGetUserAlts(cmd.GetExtension(Command_GetUserAlts::ext), rc);
+        case ModeratorCommand::GET_MODERATOR_LAST_LOGINS:
+            return cmdGetModeratorLastLogins(cmd.GetExtension(Command_GetModeratorLastLogins::ext), rc);
+        case ModeratorCommand::REMOVE_USER_AVATAR:
+            return cmdRemoveUserAvatar(cmd.GetExtension(Command_RemoveUserAvatar::ext), rc);
         default:
             return Response::RespFunctionNotAllowed;
     }
@@ -258,6 +484,28 @@ AbstractServerSocketInterface::processExtendedAdminCommand(int cmdType, const Ad
             return cmdReloadConfig(cmd.GetExtension(Command_ReloadConfig::ext), rc);
         case AdminCommand::ADJUST_MOD:
             return cmdAdjustMod(cmd.GetExtension(Command_AdjustMod::ext), rc);
+        case AdminCommand::RESET_USER_PASSWORD:
+            return cmdResetUserPassword(cmd.GetExtension(Command_ResetUserPassword::ext), rc);
+        default:
+            return Response::RespFunctionNotAllowed;
+    }
+}
+
+// DEVELOPER FUNCTIONS.
+// Permission is checked by processDeveloperCommandContainer. Only stats-style
+// queries live here, never community moderation or server administration.
+Response::ResponseCode AbstractServerSocketInterface::processExtendedDeveloperCommand(int cmdType,
+                                                                                      const DeveloperCommand &cmd,
+                                                                                      ResponseContainer &rc)
+{
+    switch ((DeveloperCommand::DeveloperCommandType)cmdType) {
+        case DeveloperCommand::GET_SERVER_STATS:
+            return cmdGetServerStats(cmd.GetExtension(Command_GetServerStats::ext), rc);
+        case DeveloperCommand::VIEWLOG_HISTORY: {
+            // Same query as the moderator log view, carried by the developer
+            // command family, but narrows out private chats and sender IPs.
+            return cmdGetLogHistory(cmd.GetExtension(Command_ViewLogHistory::dev_ext), rc, false);
+        }
         default:
             return Response::RespFunctionNotAllowed;
     }
@@ -265,39 +513,52 @@ AbstractServerSocketInterface::processExtendedAdminCommand(int cmdType, const Ad
 
 Response::ResponseCode AbstractServerSocketInterface::cmdAddToList(const Command_AddToList &cmd, ResponseContainer &rc)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
     QString list = nameFromStdString(cmd.list());
     QString user = nameFromStdString(cmd.user_name());
 
-    if ((list != "buddy") && (list != "ignore"))
+    if ((list != "buddy") && (list != "ignore")) {
         return Response::RespContextError;
+    }
 
-    if (list == "buddy")
-        if (databaseInterface->isInBuddyList(QString::fromStdString(userInfo->name()), user))
+    if (list == "buddy") {
+        if (databaseInterface->isInBuddyList(QString::fromStdString(userInfo->name()), user)) {
             return Response::RespContextError;
-    if (list == "ignore")
-        if (databaseInterface->isInIgnoreList(QString::fromStdString(userInfo->name()), user))
+        }
+    }
+    if (list == "ignore") {
+        if (databaseInterface->isInIgnoreList(QString::fromStdString(userInfo->name()), user)) {
             return Response::RespContextError;
+        }
+    }
 
     int id1 = userInfo->id();
     int id2 = sqlInterface->getUserIdInDB(user);
-    if (id2 < 0)
+    if (id2 < 0) {
         return Response::RespNameNotFound;
-    if (id1 == id2)
+    }
+    if (id1 == id2) {
         return Response::RespContextError;
+    }
 
     QSqlQuery *query =
         sqlInterface->prepareQuery("insert into {prefix}_" + list + "list (id_user1, id_user2) values(:id1, :id2)");
     query->bindValue(":id1", id1);
     query->bindValue(":id2", id2);
-    if (!sqlInterface->execSqlQuery(query))
+    if (!sqlInterface->execSqlQuery(query)) {
         return Response::RespInternalError;
+    }
 
     Event_AddToList event;
     event.set_list_name(cmd.list());
     event.mutable_user_info()->CopyFrom(databaseInterface->getUserData(user));
+    // The buddy/ignore list entry is only used to display the user's basic
+    // profile: never leak the target's email address or client id.
+    event.mutable_user_info()->clear_email();
+    event.mutable_user_info()->clear_clientid();
     rc.enqueuePreResponseItem(ServerMessage::SESSION_EVENT, prepareSessionEvent(event));
 
     return Response::RespOk;
@@ -306,33 +567,41 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAddToList(const Command
 Response::ResponseCode AbstractServerSocketInterface::cmdRemoveFromList(const Command_RemoveFromList &cmd,
                                                                         ResponseContainer &rc)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
     QString list = nameFromStdString(cmd.list());
     QString user = nameFromStdString(cmd.user_name());
 
-    if ((list != "buddy") && (list != "ignore"))
+    if ((list != "buddy") && (list != "ignore")) {
         return Response::RespContextError;
+    }
 
-    if (list == "buddy")
-        if (!databaseInterface->isInBuddyList(QString::fromStdString(userInfo->name()), user))
+    if (list == "buddy") {
+        if (!databaseInterface->isInBuddyList(QString::fromStdString(userInfo->name()), user)) {
             return Response::RespContextError;
-    if (list == "ignore")
-        if (!databaseInterface->isInIgnoreList(QString::fromStdString(userInfo->name()), user))
+        }
+    }
+    if (list == "ignore") {
+        if (!databaseInterface->isInIgnoreList(QString::fromStdString(userInfo->name()), user)) {
             return Response::RespContextError;
+        }
+    }
 
     int id1 = userInfo->id();
     int id2 = sqlInterface->getUserIdInDB(user);
-    if (id2 < 0)
+    if (id2 < 0) {
         return Response::RespNameNotFound;
+    }
 
     QSqlQuery *query =
         sqlInterface->prepareQuery("delete from {prefix}_" + list + "list where id_user1 = :id1 and id_user2 = :id2");
     query->bindValue(":id1", id1);
     query->bindValue(":id2", id2);
-    if (!sqlInterface->execSqlQuery(query))
+    if (!sqlInterface->execSqlQuery(query)) {
         return Response::RespInternalError;
+    }
 
     Event_RemoveFromList event;
     event.set_list_name(cmd.list());
@@ -344,25 +613,30 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRemoveFromList(const Co
 
 int AbstractServerSocketInterface::getDeckPathId(int basePathId, QStringList path)
 {
-    if (path.isEmpty())
+    if (path.isEmpty()) {
         return 0;
-    if (path[0].isEmpty())
+    }
+    if (path[0].isEmpty()) {
         return 0;
+    }
 
     QSqlQuery *query = sqlInterface->prepareQuery("select id from {prefix}_decklist_folders where id_parent = "
                                                   ":id_parent and name = :name and id_user = :id_user");
     query->bindValue(":id_parent", basePathId);
     query->bindValue(":name", path.takeFirst());
     query->bindValue(":id_user", userInfo->id());
-    if (!sqlInterface->execSqlQuery(query))
+    if (!sqlInterface->execSqlQuery(query)) {
         return -1;
-    if (!query->next())
+    }
+    if (!query->next()) {
         return -1;
+    }
     int id = query->value(0).toInt();
-    if (path.isEmpty())
+    if (path.isEmpty()) {
         return id;
-    else
+    } else {
         return getDeckPathId(id, path);
+    }
 }
 
 int AbstractServerSocketInterface::getDeckPathId(const QString &path)
@@ -370,42 +644,73 @@ int AbstractServerSocketInterface::getDeckPathId(const QString &path)
     return getDeckPathId(0, path.split("/"));
 }
 
-bool AbstractServerSocketInterface::deckListHelper(int folderId, ServerInfo_DeckStorage_Folder *folder)
+bool AbstractServerSocketInterface::deckListHelper(int folderId,
+                                                   ServerInfo_DeckStorage_Folder *folder,
+                                                   int userId,
+                                                   bool inheritedPublic,
+                                                   bool publicOnly)
 {
-    QSqlQuery *query = sqlInterface->prepareQuery(
-        "select id, name from {prefix}_decklist_folders where id_parent = :id_parent and id_user = :id_user");
+    QSqlQuery *query = sqlInterface->prepareQuery("select id, name, is_public from {prefix}_decklist_folders where "
+                                                  "id_parent = :id_parent and id_user = :id_user");
     query->bindValue(":id_parent", folderId);
-    query->bindValue(":id_user", userInfo->id());
-    if (!sqlInterface->execSqlQuery(query))
+    query->bindValue(":id_user", userId);
+    if (!sqlInterface->execSqlQuery(query)) {
         return false;
-
-    QMap<int, QString> results;
-    while (query->next())
-        results[query->value(0).toInt()] = query->value(1).toString();
-
-    for (int key : results.keys()) {
-        ServerInfo_DeckStorage_TreeItem *newItem = folder->add_items();
-        newItem->set_id(key);
-        newItem->set_name(results.value(key).toStdString());
-
-        if (!deckListHelper(newItem->id(), newItem->mutable_folder()))
-            return false;
     }
 
-    query = sqlInterface->prepareQuery("select id, name, upload_time from {prefix}_decklist_files where id_folder = "
-                                       ":id_folder and id_user = :id_user");
+    QList<std::pair<int, std::pair<QString, bool>>> folderRows;
+    while (query->next()) {
+        folderRows.append({query->value(0).toInt(), {query->value(1).toString(), query->value(2).toBool()}});
+    }
+    std::sort(folderRows.begin(), folderRows.end(), [](const auto &a, const auto &b) { return a.first < b.first; });
+
+    for (const auto &[folderIdValue, folderInfo] : folderRows) {
+        const QString name = folderInfo.first;
+        const bool ownPublic = folderInfo.second;
+        const bool effectivePublic = inheritedPublic || ownPublic;
+
+        ServerInfo_DeckStorage_TreeItem *newItem = folder->add_items();
+        newItem->set_id(folderIdValue);
+        newItem->set_name(name.toStdString());
+        newItem->mutable_folder()->set_is_public(ownPublic);
+
+        if (!deckListHelper(newItem->id(), newItem->mutable_folder(), userId, effectivePublic, publicOnly)) {
+            return false;
+        }
+
+        if (publicOnly && !effectivePublic && newItem->mutable_folder()->items_size() == 0) {
+            folder->mutable_items()->RemoveLast();
+        }
+    }
+
+    query = sqlInterface->prepareQuery("select id, name, upload_time, is_public, banner_card_name, "
+                                       "banner_card_provider, color_identity, tags from {prefix}_decklist_files where "
+                                       "id_folder = :id_folder and id_user = :id_user");
     query->bindValue(":id_folder", folderId);
-    query->bindValue(":id_user", userInfo->id());
-    if (!sqlInterface->execSqlQuery(query))
+    query->bindValue(":id_user", userId);
+    if (!sqlInterface->execSqlQuery(query)) {
         return false;
+    }
 
     while (query->next()) {
+        const bool ownPublic = query->value(3).toBool();
+        if (publicOnly && !(inheritedPublic || ownPublic)) {
+            continue;
+        }
+
         ServerInfo_DeckStorage_TreeItem *newItem = folder->add_items();
         newItem->set_id(query->value(0).toInt());
         newItem->set_name(query->value(1).toString().toStdString());
 
         ServerInfo_DeckStorage_File *newFile = newItem->mutable_file();
         newFile->set_creation_time(query->value(2).toDateTime().toSecsSinceEpoch());
+        newFile->set_is_public(ownPublic);
+        newFile->set_banner_card_name(query->value(4).toString().toStdString());
+        newFile->set_banner_card_provider(query->value(5).toString().toStdString());
+        newFile->set_color_identity(query->value(6).toString().toStdString());
+        for (const QString &tag : deserializeDeckTags(query->value(7).toString())) {
+            newFile->add_tags(tag.toStdString());
+        }
     }
 
     return true;
@@ -417,45 +722,205 @@ bool AbstractServerSocketInterface::deckListHelper(int folderId, ServerInfo_Deck
 Response::ResponseCode AbstractServerSocketInterface::cmdDeckList(const Command_DeckList & /*cmd*/,
                                                                   ResponseContainer &rc)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
     sqlInterface->checkSql();
 
     Response_DeckList *re = new Response_DeckList;
     ServerInfo_DeckStorage_Folder *root = re->mutable_root();
 
-    if (!deckListHelper(0, root))
+    if (!deckListHelper(0, root, userInfo->id(), false, false)) {
         return Response::RespContextError;
+    }
 
     rc.setResponseExtension(re);
     return Response::RespOk;
 }
 
+Response::ResponseCode AbstractServerSocketInterface::cmdDeckListOtherUser(const Command_DeckListOtherUser &cmd,
+                                                                           ResponseContainer &rc)
+{
+    if (authState != PasswordRight) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    sqlInterface->checkSql();
+
+    const QString userName = nameFromStdString(cmd.user_name());
+    const int userId = sqlInterface->getUserIdInDB(userName);
+    if (userId == -1) {
+        return Response::RespNameNotFound;
+    }
+
+    Response_DeckList *re = new Response_DeckList;
+    ServerInfo_DeckStorage_Folder *root = re->mutable_root();
+
+    if (!deckListHelper(0, root, userId, false, true)) {
+        return Response::RespContextError;
+    }
+
+    rc.setResponseExtension(re);
+    return Response::RespOk;
+}
+
+int AbstractServerSocketInterface::getDeckOwnerId(int deckId)
+{
+    QSqlQuery *query = sqlInterface->prepareQuery("select id_user from {prefix}_decklist_files where id = :id");
+    query->bindValue(":id", deckId);
+    if (!sqlInterface->execSqlQuery(query)) {
+        return -1;
+    }
+    if (!query->next()) {
+        return -1;
+    }
+    return query->value(0).toInt();
+}
+
+bool AbstractServerSocketInterface::isDeckEffectivelyPublic(int deckId)
+{
+    QSqlQuery *query =
+        sqlInterface->prepareQuery("select is_public, id_folder from {prefix}_decklist_files where id = :id");
+    query->bindValue(":id", deckId);
+    if (!sqlInterface->execSqlQuery(query)) {
+        return false;
+    }
+    if (!query->next()) {
+        return false;
+    }
+    if (query->value(0).toBool()) {
+        return true;
+    }
+
+    int folderId = query->value(1).toInt();
+    int guard = 0;
+    while (folderId != 0 && guard < 100) {
+        QSqlQuery *folderQuery =
+            sqlInterface->prepareQuery("select is_public, id_parent from {prefix}_decklist_folders where id = :id");
+        folderQuery->bindValue(":id", folderId);
+        if (!sqlInterface->execSqlQuery(folderQuery)) {
+            return false;
+        }
+        if (!folderQuery->next()) {
+            return false;
+        }
+        if (folderQuery->value(0).toBool()) {
+            return true;
+        }
+        folderId = folderQuery->value(1).toInt();
+        ++guard;
+    }
+    return false;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdDeckSetVisibility(const Command_DeckSetVisibility &cmd,
+                                                                           ResponseContainer & /*rc*/)
+{
+    if (authState != PasswordRight) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    sqlInterface->checkSql();
+
+    if (cmd.has_deck_id()) {
+        QSqlQuery *query =
+            sqlInterface->prepareQuery("select 1 from {prefix}_decklist_files where id = :id and id_user = :id_user");
+        query->bindValue(":id", cmd.deck_id());
+        query->bindValue(":id_user", userInfo->id());
+        sqlInterface->execSqlQuery(query);
+        if (!query->next()) {
+            return Response::RespNameNotFound;
+        }
+
+        query = sqlInterface->prepareQuery("update {prefix}_decklist_files set is_public = :is_public where id = :id "
+                                           "and id_user = :id_user");
+        query->bindValue(":is_public", cmd.is_public() ? 1 : 0);
+        query->bindValue(":id", cmd.deck_id());
+        query->bindValue(":id_user", userInfo->id());
+        if (!sqlInterface->execSqlQuery(query)) {
+            return Response::RespContextError;
+        }
+    } else if (cmd.has_folder_path()) {
+        const int folderId = getDeckPathId(nameFromStdString(cmd.folder_path()));
+        if (folderId == -1 || folderId == 0) {
+            return Response::RespNameNotFound;
+        }
+
+        QSqlQuery *query =
+            sqlInterface->prepareQuery("update {prefix}_decklist_folders set is_public = :is_public where id = :id "
+                                       "and id_user = :id_user");
+        query->bindValue(":is_public", cmd.is_public() ? 1 : 0);
+        query->bindValue(":id", folderId);
+        query->bindValue(":id_user", userInfo->id());
+        if (!sqlInterface->execSqlQuery(query)) {
+            return Response::RespContextError;
+        }
+    } else {
+        return Response::RespInvalidData;
+    }
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdDeckDownloadPublic(const Command_DeckDownloadPublic &cmd,
+                                                                            ResponseContainer &rc)
+{
+    if (authState != PasswordRight) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    sqlInterface->checkSql();
+
+    const int deckId = cmd.deck_id();
+    const int ownerId = getDeckOwnerId(deckId);
+    if (ownerId == -1 || !isDeckEffectivelyPublic(deckId)) {
+        return Response::RespNameNotFound;
+    }
+
+    DeckList *deck;
+    try {
+        deck = sqlInterface->getDeckFromDatabase(deckId, ownerId);
+    } catch (Response::ResponseCode &r) {
+        return r;
+    }
+
+    Response_DeckDownload *re = new Response_DeckDownload;
+    re->set_deck(deck->writeToString_Native().toStdString());
+    rc.setResponseExtension(re);
+    delete deck;
+
+    return Response::RespOk;
+}
+
 Response::ResponseCode AbstractServerSocketInterface::cmdDeckNewDir(const Command_DeckNewDir &cmd,
                                                                     ResponseContainer & /*rc*/)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
     sqlInterface->checkSql();
 
     QString path = nameFromStdString(cmd.path());
     int folderId = getDeckPathId(path);
-    if (folderId == -1)
+    if (folderId == -1) {
         return Response::RespNameNotFound;
+    }
 
     QString name = nameFromStdString(cmd.dir_name());
-    if (path.length() + name.length() + 1 > MAX_NAME_LENGTH)
+    if (path.length() + name.length() + 1 > MAX_NAME_LENGTH) {
         return Response::RespContextError; // do not allow creation of paths that would be too long to delete
+    }
 
     QSqlQuery *query = sqlInterface->prepareQuery(
         "insert into {prefix}_decklist_folders (id_parent, id_user, name) values(:id_parent, :id_user, :name)");
     query->bindValue(":id_parent", folderId);
     query->bindValue(":id_user", userInfo->id());
     query->bindValue(":name", name);
-    if (!sqlInterface->execSqlQuery(query))
+    if (!sqlInterface->execSqlQuery(query)) {
         return Response::RespContextError;
+    }
     return Response::RespOk;
 }
 
@@ -466,8 +931,9 @@ void AbstractServerSocketInterface::deckDelDirHelper(int basePathId)
         sqlInterface->prepareQuery("select id from {prefix}_decklist_folders where id_parent = :id_parent");
     query->bindValue(":id_parent", basePathId);
     sqlInterface->execSqlQuery(query);
-    while (query->next())
+    while (query->next()) {
         deckDelDirHelper(query->value(0).toInt());
+    }
 
     query = sqlInterface->prepareQuery("delete from {prefix}_decklist_files where id_folder = :id_folder");
     query->bindValue(":id_folder", basePathId);
@@ -482,8 +948,9 @@ void AbstractServerSocketInterface::sendServerMessage(const QString userName, co
 {
     AbstractServerSocketInterface *user =
         static_cast<AbstractServerSocketInterface *>(server->getUsers().value(userName));
-    if (!user)
+    if (!user) {
         return;
+    }
 
     Event_UserMessage event;
     event.set_sender_name("Servatrice");
@@ -497,22 +964,25 @@ void AbstractServerSocketInterface::sendServerMessage(const QString userName, co
 Response::ResponseCode AbstractServerSocketInterface::cmdDeckDelDir(const Command_DeckDelDir &cmd,
                                                                     ResponseContainer & /*rc*/)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
     sqlInterface->checkSql();
 
     int basePathId = getDeckPathId(nameFromStdString(cmd.path()));
-    if ((basePathId == -1) || (basePathId == 0))
+    if ((basePathId == -1) || (basePathId == 0)) {
         return Response::RespNameNotFound;
+    }
     deckDelDirHelper(basePathId);
     return Response::RespOk;
 }
 
 Response::ResponseCode AbstractServerSocketInterface::cmdDeckDel(const Command_DeckDel &cmd, ResponseContainer & /*rc*/)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
     sqlInterface->checkSql();
     QSqlQuery *query =
@@ -520,8 +990,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckDel(const Command_D
     query->bindValue(":id", cmd.deck_id());
     query->bindValue(":id_user", userInfo->id());
     sqlInterface->execSqlQuery(query);
-    if (!query->next())
+    if (!query->next()) {
         return Response::RespNameNotFound;
+    }
 
     query = sqlInterface->prepareQuery("delete from {prefix}_decklist_files where id = :id");
     query->bindValue(":id", cmd.deck_id());
@@ -530,67 +1001,138 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckDel(const Command_D
     return Response::RespOk;
 }
 
+namespace
+{
+/** @brief Keeps only the WUBRG colors from a color identity string, deduplicated. */
+QString sanitizeColorIdentity(const QString &colorIdentity)
+{
+    QString sanitized;
+    for (const QChar &color : colorIdentity) {
+        const QChar upper = color.toUpper();
+        if (QStringLiteral("WUBRG").contains(upper) && !sanitized.contains(upper)) {
+            sanitized.append(upper);
+        }
+    }
+    return sanitized;
+}
+} // namespace
+
 Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Command_DeckUpload &cmd,
                                                                     ResponseContainer &rc)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
-    if (!cmd.has_deck_list())
+    if (!cmd.has_deck_list()) {
         return Response::RespInvalidData;
+    }
+
+    if (cmd.deck_list().size() > static_cast<std::string::size_type>(MAX_FILE_LENGTH)) {
+        return Response::RespInvalidData;
+    }
 
     sqlInterface->checkSql();
 
     QString deckStr = fileFromStdString(cmd.deck_list());
     DeckList deck;
-    if (!deck.loadFromString_Native(deckStr))
+    if (!deck.loadFromString_Native(deckStr)) {
         return Response::RespContextError;
+    }
 
     QString deckName = deck.getName();
-    if (deckName.isEmpty())
+    if (deckName.isEmpty()) {
         deckName = "Unnamed deck";
+    }
+
+    // The server derives the banner card and tags from the deck itself. Only the
+    // color identity must come from the client, since the server has no card
+    // database to compute it. All values are bounded to the column sizes.
+    const QString bannerCardName = deck.getBannerCard().name.left(255);
+    const QString bannerCardProvider = deck.getBannerCard().providerId.left(32);
+    const QString tagsJson = serializeDeckTags(deck.getTags());
+    const QString colorIdentity = sanitizeColorIdentity(nameFromStdString(cmd.color_identity()));
 
     if (cmd.has_path()) {
         int folderId = getDeckPathId(nameFromStdString(cmd.path()));
-        if (folderId == -1)
+        if (folderId == -1) {
             return Response::RespNameNotFound;
+        }
 
         QSqlQuery *query =
             sqlInterface->prepareQuery("insert into {prefix}_decklist_files (id_folder, id_user, name, upload_time, "
-                                       "content) values(:id_folder, :id_user, :name, NOW(), :content)");
+                                       "content, is_public, banner_card_name, banner_card_provider, color_identity, "
+                                       "tags) values(:id_folder, :id_user, :name, NOW(), :content, :is_public, "
+                                       ":banner_card_name, :banner_card_provider, :color_identity, :tags)");
         query->bindValue(":id_folder", folderId);
         query->bindValue(":id_user", userInfo->id());
         query->bindValue(":name", deckName);
         query->bindValue(":content", deckStr);
-        sqlInterface->execSqlQuery(query);
+        query->bindValue(":is_public", cmd.has_is_public() && cmd.is_public() ? 1 : 0);
+        query->bindValue(":banner_card_name", bannerCardName);
+        query->bindValue(":banner_card_provider", bannerCardProvider);
+        query->bindValue(":color_identity", colorIdentity);
+        query->bindValue(":tags", tagsJson);
+        if (!sqlInterface->execSqlQuery(query)) {
+            return Response::RespContextError;
+        }
 
         Response_DeckUpload *re = new Response_DeckUpload;
         ServerInfo_DeckStorage_TreeItem *fileInfo = re->mutable_new_file();
         fileInfo->set_id(query->lastInsertId().toInt());
         fileInfo->set_name(deckName.toStdString());
         fileInfo->mutable_file()->set_creation_time(QDateTime::currentDateTime().toSecsSinceEpoch());
+        fileInfo->mutable_file()->set_is_public(cmd.has_is_public() && cmd.is_public());
         rc.setResponseExtension(re);
     } else if (cmd.has_deck_id()) {
-        QSqlQuery *query =
-            sqlInterface->prepareQuery("update {prefix}_decklist_files set name=:name, upload_time=NOW(), "
-                                       "content=:content where id = :id_deck and id_user = :id_user");
+        QString updateQuery = "update {prefix}_decklist_files set name=:name, upload_time=NOW(), content=:content, "
+                              "banner_card_name=:banner_card_name, banner_card_provider=:banner_card_provider, "
+                              "color_identity=:color_identity, tags=:tags";
+        if (cmd.has_is_public()) {
+            updateQuery += ", is_public=:is_public";
+        }
+        updateQuery += " where id = :id_deck and id_user = :id_user";
+
+        QSqlQuery *query = sqlInterface->prepareQuery(updateQuery);
         query->bindValue(":id_deck", cmd.deck_id());
         query->bindValue(":id_user", userInfo->id());
         query->bindValue(":name", deckName);
         query->bindValue(":content", deckStr);
-        sqlInterface->execSqlQuery(query);
+        query->bindValue(":banner_card_name", bannerCardName);
+        query->bindValue(":banner_card_provider", bannerCardProvider);
+        query->bindValue(":color_identity", colorIdentity);
+        query->bindValue(":tags", tagsJson);
+        if (cmd.has_is_public()) {
+            query->bindValue(":is_public", cmd.is_public() ? 1 : 0);
+        }
+        if (!sqlInterface->execSqlQuery(query)) {
+            return Response::RespContextError;
+        }
 
-        if (query->numRowsAffected() == 0)
+        if (query->numRowsAffected() == 0) {
             return Response::RespNameNotFound;
+        }
+
+        QSqlQuery *visibilityQuery =
+            sqlInterface->prepareQuery("select is_public from {prefix}_decklist_files where id = :id and "
+                                       "id_user = :id_user");
+        visibilityQuery->bindValue(":id", cmd.deck_id());
+        visibilityQuery->bindValue(":id_user", userInfo->id());
+        if (!sqlInterface->execSqlQuery(visibilityQuery)) {
+            return Response::RespContextError;
+        }
+        const bool isPublic = visibilityQuery->next() && visibilityQuery->value(0).toBool();
 
         Response_DeckUpload *re = new Response_DeckUpload;
         ServerInfo_DeckStorage_TreeItem *fileInfo = re->mutable_new_file();
         fileInfo->set_id(cmd.deck_id());
         fileInfo->set_name(deckName.toStdString());
         fileInfo->mutable_file()->set_creation_time(QDateTime::currentDateTime().toSecsSinceEpoch());
+        fileInfo->mutable_file()->set_is_public(isPublic);
         rc.setResponseExtension(re);
-    } else
+    } else {
         return Response::RespInvalidData;
+    }
 
     return Response::RespOk;
 }
@@ -598,8 +1140,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Comman
 Response::ResponseCode AbstractServerSocketInterface::cmdDeckDownload(const Command_DeckDownload &cmd,
                                                                       ResponseContainer &rc)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
     DeckList *deck;
     try {
@@ -616,11 +1159,254 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckDownload(const Comm
     return Response::RespOk;
 }
 
+namespace
+{
+/** @brief Builds a cryptographically random, URL-safe share token. */
+QString generateShareToken()
+{
+    QByteArray bytes(32, Qt::Uninitialized);
+    QRandomGenerator::system()->fillRange(reinterpret_cast<quint32 *>(bytes.data()), bytes.size() / sizeof(quint32));
+    return QString::fromLatin1(bytes.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals));
+}
+
+/** @brief Extracts the share metadata for a deck, materializing its content. */
+DeckShareItemRecord makeShareItemFromDeck(const DeckList &deck, const QString &colorIdentity)
+{
+    DeckShareItemRecord item;
+    item.name = deck.getName();
+    if (item.name.isEmpty()) {
+        item.name = "Unnamed deck";
+    }
+    item.tags = deck.getTags();
+    item.bannerCard = deck.getBannerCard().name;
+    item.gameFormat = deck.getGameFormat();
+    item.colorIdentity = sanitizeColorIdentity(colorIdentity);
+    item.content = deck.writeToString_Native();
+    return item;
+}
+} // namespace
+
+Response::ResponseCode AbstractServerSocketInterface::cmdDeckShareCreate(const Command_DeckShareCreate &cmd,
+                                                                         ResponseContainer &rc)
+{
+    if (authState != PasswordRight) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    sqlInterface->checkSql();
+
+    const int maxItems = servatrice->getDeckShareMaxDecksPerShare();
+    if (maxItems > 0 && cmd.items_size() > maxItems) {
+        return Response::RespInvalidData;
+    }
+
+    // Per-user rate limit so share links cannot be used to build an unbounded
+    // word-of-mouth leak of public decks.
+    const int maxSharesPerDay = servatrice->getDeckShareMaxSharesPerDay();
+    if (maxSharesPerDay > 0) {
+        QSqlQuery *countQuery = sqlInterface->prepareQuery("select count(*) from {prefix}_deck_share where "
+                                                           "created_by = :created_by and created_at >= "
+                                                           "DATE_SUB(NOW(), INTERVAL 1 DAY)");
+        countQuery->bindValue(":created_by", userInfo->id());
+        if (!sqlInterface->execSqlQuery(countQuery) || !countQuery->next()) {
+            return Response::RespContextError;
+        }
+        if (countQuery->value(0).toInt() >= maxSharesPerDay) {
+            return Response::RespTooManyRequests;
+        }
+    }
+
+    QList<DeckShareItemRecord> items;
+    if (cmd.items_size() > 0) {
+        for (const DeckShareItem &shareItem : cmd.items()) {
+            if (shareItem.has_deck_list()) {
+                DeckList deck;
+                if (!deck.loadFromString_Native(fileFromStdString(shareItem.deck_list()))) {
+                    return Response::RespContextError;
+                }
+                items.append(makeShareItemFromDeck(deck, nameFromStdString(shareItem.color_identity())));
+            } else if (shareItem.has_deck_id()) {
+                DeckList *deck;
+                try {
+                    deck = sqlInterface->getDeckFromDatabase(shareItem.deck_id(), userInfo->id());
+                } catch (Response::ResponseCode &r) {
+                    return r;
+                }
+                items.append(makeShareItemFromDeck(*deck, nameFromStdString(shareItem.color_identity())));
+                delete deck;
+            } else {
+                return Response::RespInvalidData;
+            }
+        }
+    } else if (cmd.has_folder_path()) {
+        const int folderId = getDeckPathId(nameFromStdString(cmd.folder_path()));
+        if (folderId == -1) {
+            return Response::RespNameNotFound;
+        }
+
+        // Drain the deck list before resolving each deck: getDeckFromDatabase
+        // issues its own query on the same cached statement set.
+        QSqlQuery *query =
+            sqlInterface->prepareQuery("select id, color_identity from {prefix}_decklist_files where id_folder = "
+                                       ":id_folder and id_user = :id_user");
+        query->bindValue(":id_folder", folderId);
+        query->bindValue(":id_user", userInfo->id());
+        if (!sqlInterface->execSqlQuery(query)) {
+            return Response::RespContextError;
+        }
+        QList<std::pair<int, QString>> deckRows;
+        while (query->next()) {
+            deckRows.append({query->value(0).toInt(), query->value(1).toString()});
+        }
+        for (const auto &[deckId, colorIdentity] : deckRows) {
+            DeckList *deck;
+            try {
+                deck = sqlInterface->getDeckFromDatabase(deckId, userInfo->id());
+            } catch (Response::ResponseCode &r) {
+                return r;
+            }
+            items.append(makeShareItemFromDeck(*deck, colorIdentity));
+            delete deck;
+        }
+    } else {
+        return Response::RespInvalidData;
+    }
+
+    if (items.isEmpty() || (maxItems > 0 && items.size() > maxItems)) {
+        return Response::RespInvalidData;
+    }
+
+    QString shareName = nameFromStdString(cmd.name());
+    if (shareName.isEmpty()) {
+        shareName = "Shared decks";
+    }
+
+    const QString token = generateShareToken();
+    qint64 expiresAt = 0;
+    if (!sqlInterface->createDeckShare(token, shareName, userInfo->id(), items, servatrice->getDeckShareExpiryDays(),
+                                       expiresAt)) {
+        return Response::RespInvalidData;
+    }
+
+    Response_DeckShareCreate *re = new Response_DeckShareCreate;
+    re->set_token(token.toStdString());
+    re->set_expires_at(expiresAt);
+    re->set_item_count(items.size());
+    rc.setResponseExtension(re);
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdDeckShareListMine(const Command_DeckShareListMine & /*cmd*/,
+                                                                           ResponseContainer &rc)
+{
+    if (authState != PasswordRight) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    sqlInterface->checkSql();
+
+    QList<DeckShareSummaryRecord> shares;
+    if (!sqlInterface->getDeckSharesForUser(userInfo->id(), shares)) {
+        return Response::RespContextError;
+    }
+
+    Response_DeckShareListMine *re = new Response_DeckShareListMine;
+    for (const DeckShareSummaryRecord &share : shares) {
+        ServerInfo_DeckShareSummary *summary = re->add_shares();
+        summary->set_id(share.id);
+        summary->set_name(share.name.toStdString());
+        summary->set_creation_time(share.creationTime);
+        summary->set_expires_at(share.expiresAt);
+        summary->set_item_count(share.itemCount);
+    }
+    rc.setResponseExtension(re);
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdDeckShareRemove(const Command_DeckShareRemove &cmd,
+                                                                         ResponseContainer & /*rc*/)
+{
+    if (authState != PasswordRight) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    if (!cmd.has_share_id()) {
+        return Response::RespInvalidData;
+    }
+
+    sqlInterface->checkSql();
+
+    if (!sqlInterface->deleteDeckShare(cmd.share_id(), userInfo->id())) {
+        return Response::RespNameNotFound;
+    }
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdDeckShareList(const Command_DeckShareList &cmd,
+                                                                       ResponseContainer &rc)
+{
+    if (authState != PasswordRight) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    sqlInterface->checkSql();
+
+    QString name;
+    qint64 expiresAt = 0;
+    QList<DeckShareItemRecord> items;
+    if (!sqlInterface->getDeckShareList(nameFromStdString(cmd.token()), name, expiresAt, items)) {
+        return Response::RespNameNotFound;
+    }
+
+    Response_DeckShareList *re = new Response_DeckShareList;
+    re->set_name(name.toStdString());
+    re->set_expires_at(expiresAt);
+    for (const DeckShareItemRecord &item : items) {
+        ServerInfo_DeckShareItem *itemInfo = re->add_items();
+        itemInfo->set_id(item.id);
+        itemInfo->set_name(item.name.toStdString());
+        for (const QString &tag : item.tags) {
+            itemInfo->add_tags(tag.toStdString());
+        }
+        itemInfo->set_banner_card(item.bannerCard.toStdString());
+        itemInfo->set_game_format(item.gameFormat.toStdString());
+        itemInfo->set_color_identity(item.colorIdentity.toStdString());
+    }
+    rc.setResponseExtension(re);
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdDeckShareDownload(const Command_DeckShareDownload &cmd,
+                                                                           ResponseContainer &rc)
+{
+    if (authState != PasswordRight) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    sqlInterface->checkSql();
+
+    QString content;
+    if (!sqlInterface->getDeckShareItem(nameFromStdString(cmd.token()), cmd.item_id(), content)) {
+        return Response::RespNameNotFound;
+    }
+
+    Response_DeckShareDownload *re = new Response_DeckShareDownload;
+    re->set_deck(content.toStdString());
+    rc.setResponseExtension(re);
+
+    return Response::RespOk;
+}
+
 Response::ResponseCode AbstractServerSocketInterface::cmdReplayList(const Command_ReplayList & /*cmd*/,
                                                                     ResponseContainer &rc)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
     Response_ReplayList *re = new Response_ReplayList;
 
@@ -649,8 +1435,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplayList(const Comman
                 sqlInterface->prepareQuery("select player_name from {prefix}_games_players where id_game = :id_game");
             query2->bindValue(":id_game", gameId);
             sqlInterface->execSqlQuery(query2);
-            while (query2->next())
+            while (query2->next()) {
                 matchInfo->add_player_names(query2->value(0).toString().toStdString());
+            }
         }
         {
             QSqlQuery *query3 =
@@ -673,8 +1460,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplayList(const Comman
 Response::ResponseCode AbstractServerSocketInterface::cmdReplayDownload(const Command_ReplayDownload &cmd,
                                                                         ResponseContainer &rc)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
     {
         QSqlQuery *query =
@@ -682,18 +1470,22 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplayDownload(const Co
                                        "a.id_game = b.id_game where b.id = :id_replay and a.id_player = :id_player");
         query->bindValue(":id_replay", cmd.replay_id());
         query->bindValue(":id_player", userInfo->id());
-        if (!sqlInterface->execSqlQuery(query))
+        if (!sqlInterface->execSqlQuery(query)) {
             return Response::RespInternalError;
-        if (!query->next())
+        }
+        if (!query->next()) {
             return Response::RespAccessDenied;
+        }
     }
 
     QSqlQuery *query = sqlInterface->prepareQuery("select replay from {prefix}_replays where id = :id_replay");
     query->bindValue(":id_replay", cmd.replay_id());
-    if (!sqlInterface->execSqlQuery(query))
+    if (!sqlInterface->execSqlQuery(query)) {
         return Response::RespInternalError;
-    if (!query->next())
+    }
+    if (!query->next()) {
         return Response::RespNameNotFound;
+    }
 
     QByteArray data = query->value(0).toByteArray();
 
@@ -707,11 +1499,13 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplayDownload(const Co
 Response::ResponseCode AbstractServerSocketInterface::cmdReplayModifyMatch(const Command_ReplayModifyMatch &cmd,
                                                                            ResponseContainer & /*rc*/)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
-    if (!sqlInterface->checkSql())
+    if (!sqlInterface->checkSql()) {
         return Response::RespInternalError;
+    }
 
     QSqlQuery *query = sqlInterface->prepareQuery("update {prefix}_replays_access set do_not_hide=:do_not_hide where "
                                                   "id_player = :id_player and id_game = :id_game");
@@ -719,27 +1513,31 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplayModifyMatch(const
     query->bindValue(":id_game", cmd.game_id());
     query->bindValue(":do_not_hide", cmd.do_not_hide());
 
-    if (!sqlInterface->execSqlQuery(query))
+    if (!sqlInterface->execSqlQuery(query)) {
         return Response::RespInternalError;
+    }
     return query->numRowsAffected() > 0 ? Response::RespOk : Response::RespNameNotFound;
 }
 
 Response::ResponseCode AbstractServerSocketInterface::cmdReplayDeleteMatch(const Command_ReplayDeleteMatch &cmd,
                                                                            ResponseContainer & /*rc*/)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
-    if (!sqlInterface->checkSql())
+    if (!sqlInterface->checkSql()) {
         return Response::RespInternalError;
+    }
 
     QSqlQuery *query = sqlInterface->prepareQuery(
         "delete from {prefix}_replays_access where id_player = :id_player and id_game = :id_game");
     query->bindValue(":id_player", userInfo->id());
     query->bindValue(":id_game", cmd.game_id());
 
-    if (!sqlInterface->execSqlQuery(query))
+    if (!sqlInterface->execSqlQuery(query)) {
         return Response::RespInternalError;
+    }
     return query->numRowsAffected() > 0 ? Response::RespOk : Response::RespNameNotFound;
 }
 
@@ -759,8 +1557,9 @@ QString AbstractServerSocketInterface::createHashForReplay(int gameId)
         sqlInterface->prepareQuery("select replay from {prefix}_replays where id_game = :id_game limit 3");
     query->bindValue(":id_game", gameId);
 
-    if (!sqlInterface->execSqlQuery(query))
+    if (!sqlInterface->execSqlQuery(query)) {
         return "";
+    }
 
     QByteArray replaysBytes;
     while (query->next()) {
@@ -778,8 +1577,9 @@ QString AbstractServerSocketInterface::createHashForReplay(int gameId)
 Response::ResponseCode AbstractServerSocketInterface::cmdReplayGetCode(const Command_ReplayGetCode &cmd,
                                                                        ResponseContainer &rc)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
     // Check that user has access to replay match
     {
@@ -787,10 +1587,12 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplayGetCode(const Com
             "select 1 from {prefix}_replays_access where id_game = :id_game and id_player = :id_player");
         query->bindValue(":id_game", cmd.game_id());
         query->bindValue(":id_player", userInfo->id());
-        if (!sqlInterface->execSqlQuery(query))
+        if (!sqlInterface->execSqlQuery(query)) {
             return Response::RespInternalError;
-        if (!query->next())
+        }
+        if (!query->next()) {
             return Response::RespAccessDenied;
+        }
     }
 
     QString hash = createHashForReplay(cmd.game_id());
@@ -811,6 +1613,10 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplayGetCode(const Com
 Response::ResponseCode AbstractServerSocketInterface::cmdReplaySubmitCode(const Command_ReplaySubmitCode &cmd,
                                                                           ResponseContainer & /*rc*/)
 {
+    if (authState != PasswordRight) {
+        return Response::RespFunctionNotAllowed;
+    }
+
     // code is of the form <game-id>-<hash>
     QString code = QString::fromStdString(cmd.replay_code());
     QStringList split = code.split("-");
@@ -875,12 +1681,13 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplaySubmitCode(const
 // MODERATOR FUNCTIONS.
 // May be called by admins and moderators. Permission is checked by the calling function.
 Response::ResponseCode AbstractServerSocketInterface::cmdGetLogHistory(const Command_ViewLogHistory &cmd,
-                                                                       ResponseContainer &rc)
+                                                                       ResponseContainer &rc,
+                                                                       bool allowPrivateChat)
 {
 
     QList<ServerInfo_ChatMessage> messageList;
     QString userName = nameFromStdString(cmd.user_name());
-    QString ipAddress = nameFromStdString(cmd.ip_address());
+    QString ipAddress = allowPrivateChat ? nameFromStdString(cmd.ip_address()) : QString();
     QString gameName = nameFromStdString(cmd.game_name());
     QString gameID = nameFromStdString(cmd.game_id());
     QString message = textFromStdString(cmd.message());
@@ -889,12 +1696,25 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetLogHistory(const Com
     bool roomType = false;
 
     for (int i = 0; i != cmd.log_location_size(); ++i) {
-        if (nameFromStdString(cmd.log_location(i)).simplified() == "room")
+        if (nameFromStdString(cmd.log_location(i)).simplified() == "room") {
             roomType = true;
-        if (nameFromStdString(cmd.log_location(i)).simplified() == "game")
+        }
+        if (nameFromStdString(cmd.log_location(i)).simplified() == "game") {
             gameType = true;
-        if (nameFromStdString(cmd.log_location(i)).simplified() == "chat")
+        }
+        if (nameFromStdString(cmd.log_location(i)).simplified() == "chat" && allowPrivateChat) {
             chatType = true;
+        }
+    }
+
+    // For callers that must not see private conversations, never leave the
+    // target-type filter empty: if the request only asked for "chat" (or for
+    // nothing at all) the query below would carry no target_type restriction
+    // and would return every row, private messages included. Fall back to the
+    // game/room diagnostics the caller is allowed to see.
+    if (!allowPrivateChat && !gameType && !roomType) {
+        gameType = true;
+        roomType = true;
     }
 
     int dateRange = cmd.date_range();
@@ -905,8 +1725,13 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetLogHistory(const Com
     if (servatrice->getEnableLogQuery()) {
         QListIterator<ServerInfo_ChatMessage> messageIterator(sqlInterface->getMessageLogHistory(
             userName, ipAddress, gameName, gameID, message, chatType, gameType, roomType, dateRange, maximumResults));
-        while (messageIterator.hasNext())
-            re->add_log_message()->CopyFrom(messageIterator.next());
+        while (messageIterator.hasNext()) {
+            ServerInfo_ChatMessage chatMessage = messageIterator.next();
+            if (!allowPrivateChat) {
+                chatMessage.clear_sender_ip();
+            }
+            re->add_log_message()->CopyFrom(chatMessage);
+        }
     } else {
         ServerInfo_ChatMessage chatMessage;
 
@@ -944,8 +1769,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetLogHistory(const Com
         messageList << chatMessage;
 
         QListIterator<ServerInfo_ChatMessage> messageIterator(messageList);
-        while (messageIterator.hasNext())
+        while (messageIterator.hasNext()) {
             re->add_log_message()->CopyFrom(messageIterator.next());
+        }
     }
 
     rc.setResponseExtension(re);
@@ -960,8 +1786,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetBanHistory(const Com
 
     Response_BanHistory *re = new Response_BanHistory;
     QListIterator<ServerInfo_Ban> banIterator(sqlInterface->getUserBanHistory(userName));
-    while (banIterator.hasNext())
+    while (banIterator.hasNext()) {
         re->add_ban_list()->CopyFrom(banIterator.next());
+    }
     rc.setResponseExtension(re);
     return Response::RespOk;
 }
@@ -972,13 +1799,10 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetWarnList(const Comma
     Response_WarnList *re = new Response_WarnList;
 
     QString officialWarnings = settingsCache->value("server/officialwarnings").toString();
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
-    QStringList warningsList = officialWarnings.split(",", Qt::SkipEmptyParts);
-#else
-    QStringList warningsList = officialWarnings.split(",", QString::SkipEmptyParts);
-#endif
-    for (const QString &warning : warningsList) {
-        re->add_warning(warning.toStdString());
+    const QList<WarningCategory> categories = parseWarningCategories(officialWarnings);
+    for (const WarningCategory &category : categories) {
+        re->add_warning(category.name.toStdString());
+        re->add_warning_il(category.startingIl);
     }
     re->set_user_name(nameFromStdString(cmd.user_name()).toStdString());
     re->set_user_clientid(nameFromStdString(cmd.user_clientid()).toStdString());
@@ -994,8 +1818,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetWarnHistory(const Co
 
     Response_WarnHistory *re = new Response_WarnHistory;
     QListIterator<ServerInfo_Warning> warnIterator(sqlInterface->getUserWarnHistory(userName));
-    while (warnIterator.hasNext())
+    while (warnIterator.hasNext()) {
         re->add_warn_list()->CopyFrom(warnIterator.next());
+    }
     rc.setResponseExtension(re);
     return Response::RespOk;
 }
@@ -1055,16 +1880,18 @@ Response::ResponseCode AbstractServerSocketInterface::cmdWarnUser(const Command_
 Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Command_BanFromServer &cmd,
                                                                        ResponseContainer & /*rc*/)
 {
-    if (!sqlInterface->checkSql())
+    if (!sqlInterface->checkSql()) {
         return Response::RespInternalError;
+    }
 
     QString userName = nameFromStdString(cmd.user_name()).simplified();
     QString address = nameFromStdString(cmd.address()).simplified();
     QString clientId = nameFromStdString(cmd.clientid()).simplified();
     QString visibleReason = textFromStdString(cmd.visible_reason());
 
-    if (userName.isEmpty() && address.isEmpty() && clientId.isEmpty())
+    if (userName.isEmpty() && address.isEmpty() && clientId.isEmpty()) {
         return Response::RespOk;
+    }
 
     int amountRemove = cmd.remove_messages();
     if (amountRemove != 0) {
@@ -1072,8 +1899,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Com
     }
     QString trustedSources = settingsCache->value("server/trusted_sources", "127.0.0.1,::1").toString();
     int minutes = cmd.minutes();
-    if (trustedSources.contains(address, Qt::CaseInsensitive))
+    if (trustedSources.contains(address, Qt::CaseInsensitive)) {
         address = "";
+    }
 
     QSqlQuery *query = sqlInterface->prepareQuery(
         "insert into {prefix}_bans (user_name, ip_address, id_admin, time_from, minutes, reason, visible_reason, "
@@ -1094,8 +1922,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Com
     if (!userName.isEmpty()) {
         AbstractServerSocketInterface *user =
             static_cast<AbstractServerSocketInterface *>(server->getUsers().value(userName));
-        if (user && !userList.contains(user))
+        if (user && !userList.contains(user)) {
             userList.append(user);
+        }
     }
 
     if (userName.isEmpty() && address.isEmpty() && (!clientId.isEmpty())) {
@@ -1104,14 +1933,15 @@ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Com
         clientIdQuery->bindValue(":client_id", nameFromStdString(cmd.clientid()));
         sqlInterface->execSqlQuery(clientIdQuery);
         if (!sqlInterface->execSqlQuery(clientIdQuery)) {
-            qDebug("ClientID username ban lookup failed: SQL Error");
+            qCWarning(AbstractServerSocketInterfaceLog) << "ClientID username ban lookup failed: SQL Error";
         } else {
             while (clientIdQuery->next()) {
                 userName = clientIdQuery->value(0).toString();
                 AbstractServerSocketInterface *user =
                     static_cast<AbstractServerSocketInterface *>(server->getUsers().value(userName));
-                if (user && !userList.contains(user))
+                if (user && !userList.contains(user)) {
                     userList.append(user);
+                }
             }
         }
     }
@@ -1120,10 +1950,12 @@ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Com
     if (!userList.isEmpty()) {
         Event_ConnectionClosed event;
         event.set_reason(Event_ConnectionClosed::BANNED);
-        if (cmd.has_visible_reason())
+        if (cmd.has_visible_reason()) {
             event.set_reason_str(visibleReason.toStdString());
-        if (minutes)
+        }
+        if (minutes) {
             event.set_end_time(QDateTime::currentDateTime().addSecs(60 * minutes).toSecsSinceEpoch());
+        }
         for (int i = 0; i < userList.size(); ++i) {
             SessionEvent *se = userList[i]->prepareSessionEvent(event);
             userList[i]->sendProtocolItem(*se);
@@ -1135,12 +1967,15 @@ Response::ResponseCode AbstractServerSocketInterface::cmdBanFromServer(const Com
     for (QString &moderator : moderatorList) {
         QString notificationMessage =
             QString::fromStdString(userInfo->name()).simplified() + " has placed a ban with the following information";
-        if (!userName.isEmpty())
+        if (!userName.isEmpty()) {
             notificationMessage.append("\n    Username: " + userName);
-        if (!address.isEmpty())
+        }
+        if (!address.isEmpty()) {
             notificationMessage.append("\n    IP Address: " + address);
-        if (!clientId.isEmpty())
+        }
+        if (!clientId.isEmpty()) {
             notificationMessage.append("\n    Client ID: " + clientId);
+        }
 
         notificationMessage.append("\n    Length: " + QString::number(minutes) + " minute(s)");
         notificationMessage.append("\n    Internal Reason: " + textFromStdString(cmd.reason()));
@@ -1151,18 +1986,1175 @@ 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)
+{
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    const bool unresolvedOnly = cmd.unresolved_only();
+    const int offset = static_cast<int>(cmd.offset());
+    const int limit = qMin(static_cast<int>(cmd.limit()), 1000);
+
+    // 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
+    QString whereClause;
+    if (unresolvedOnly) {
+        whereClause = "WHERE r.status = 'open' OR r.status = 'assigned' ";
+    }
+
+    // Total count query
+    QSqlQuery *countQuery = sqlInterface->prepareQuery("SELECT COUNT(*) FROM {prefix}_reports r " + whereClause);
+    int totalCount = 0;
+    if (sqlInterface->execSqlQuery(countQuery) && countQuery->next()) {
+        totalCount = countQuery->value(0).toInt();
+    }
+
+    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, "
+                       "(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 "
+                       "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 ";
+
+    if (unresolvedOnly) {
+        queryStr += "WHERE r.status = 'open' OR r.status = 'assigned' ";
+    }
+
+    queryStr += "ORDER BY r.created_at DESC LIMIT :limit OFFSET :offset";
+
+    QSqlQuery *query = sqlInterface->prepareQuery(queryStr);
+    query->bindValue(":limit", limit);
+    query->bindValue(":offset", offset);
+    if (!sqlInterface->execSqlQuery(query)) {
+        return Response::RespInternalError;
+    }
+
+    Response_ReportList *re = new Response_ReportList;
+    re->set_total_count(totalCount);
+
+    while (query->next()) {
+        ServerInfo_Report *info = re->add_reports();
+
+        info->set_report_id(query->value(0).toInt());
+        info->set_reporter_name(query->value(1).toString().toStdString());
+        info->set_reported_user_name(query->value(2).toString().toStdString());
+
+        if (!query->value(3).isNull()) {
+            info->set_game_id(query->value(3).toInt());
+        }
+
+        info->set_category(query->value(4).toString().toStdString());
+        info->set_description(query->value(5).toString().toStdString());
+        info->set_report_time(query->value(6).toDateTime().toSecsSinceEpoch());
+        info->set_status(query->value(7).toString().toStdString());
+
+        if (!query->value(8).isNull()) {
+            info->set_resolution_note(query->value(8).toString().toStdString());
+        }
+
+        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());
+        }
+
+        if (!query->value(11).isNull()) {
+            info->set_room_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::cmdReportAssign(const Command_ReportAssign &cmd,
+                                                                      ResponseContainer & /*rc*/)
+{
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    int reportId = cmd.report_id();
+    int modId = userInfo->id();
+
+    QSqlQuery *lookupQuery = sqlInterface->prepareQuery("SELECT status FROM {prefix}_reports WHERE id = :id");
+    lookupQuery->bindValue(":id", reportId);
+
+    if (!sqlInterface->execSqlQuery(lookupQuery)) {
+        return Response::RespInternalError;
+    }
+
+    if (!lookupQuery->next()) {
+        return Response::RespNameNotFound;
+    }
+
+    if (lookupQuery->value(0).toString() != "open") {
+        return Response::RespInvalidData;
+    }
+
+    QSqlQuery *query = sqlInterface->prepareQuery("UPDATE {prefix}_reports "
+                                                  "SET status = 'assigned', assigned_to = :mod_id "
+                                                  "WHERE id = :id AND status = 'open'");
+
+    query->bindValue(":mod_id", modId);
+    query->bindValue(":id", reportId);
+
+    if (!sqlInterface->execSqlQuery(query)) {
+        return Response::RespInternalError;
+    }
+
+    if (query->numRowsAffected() == 0) {
+        // The report was taken by another moderator between the lookup and this update.
+        return Response::RespInvalidData;
+    }
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdReportResolve(const Command_ReportResolve &cmd,
+                                                                       ResponseContainer & /*rc*/)
+{
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    int reportId = cmd.report_id();
+    QString note = textFromStdString(cmd.resolution_note());
+    bool dismissed = cmd.dismissed();
+
+    QString newStatus = dismissed ? "dismissed" : "resolved";
+
+    QSqlQuery *query = sqlInterface->prepareQuery("UPDATE {prefix}_reports "
+                                                  "SET status = :status, resolution_note = :note, "
+                                                  "resolution_time = NOW(), resolved_by = :mod_id "
+                                                  "WHERE id = :id AND status IN ('open', 'assigned')");
+
+    query->bindValue(":status", newStatus);
+    query->bindValue(":note", note);
+    query->bindValue(":mod_id", userInfo->id());
+    query->bindValue(":id", reportId);
+
+    if (!sqlInterface->execSqlQuery(query)) {
+        return Response::RespInternalError;
+    }
+
+    if (query->numRowsAffected() == 0) {
+        return Response::RespInvalidData;
+    }
+
+    sqlInterface->addAuditRecord(QString::number(reportId), this->getAddress(),
+                                 QString::fromStdString(userInfo->clientid()),
+                                 dismissed ? "REPORT_DISMISSED" : "REPORT_RESOLVED",
+                                 QString("Report #%1 %2").arg(reportId).arg(newStatus), true);
+
+    // Notifying the reporter is best-effort: the resolve already succeeded. If any of the lookup
+    // queries below fail, the report is simply left with notified = 0 and the notification is
+    // delivered later via sendPendingReportNotifications.
+    QSqlQuery *lookupQuery =
+        sqlInterface->prepareQuery("SELECT reporter_id, reported_user_name FROM {prefix}_reports WHERE id = :id");
+    lookupQuery->bindValue(":id", reportId);
+
+    QString reporterName;
+    QString reportedUser;
+    if (sqlInterface->execSqlQuery(lookupQuery) && lookupQuery->next()) {
+        int reporterId = lookupQuery->value(0).toInt();
+        reportedUser = lookupQuery->value(1).toString();
+
+        QSqlQuery *nameQuery = sqlInterface->prepareQuery("SELECT name FROM {prefix}_users WHERE id = :id");
+        nameQuery->bindValue(":id", reporterId);
+        if (sqlInterface->execSqlQuery(nameQuery) && nameQuery->next()) {
+            reporterName = nameQuery->value(0).toString();
+        }
+    }
+
+    const QString ownName = QString::fromStdString(userInfo->name());
+    if (!reporterName.isEmpty()) {
+        if (reporterName == ownName) {
+            // Resolving your own report: no self-notification needed, but mark it as notified
+            // so it is not delivered on the next login via sendPendingReportNotifications.
+            QSqlQuery *notifiedQuery =
+                sqlInterface->prepareQuery("UPDATE {prefix}_reports SET notified = 1 WHERE id = :id");
+            notifiedQuery->bindValue(":id", reportId);
+            sqlInterface->execSqlQuery(notifiedQuery);
+        } else {
+            QReadLocker clientsLocker(&servatrice->clientsLock);
+            AbstractServerSocketInterface *reporter =
+                static_cast<AbstractServerSocketInterface *>(server->getUsers().value(reporterName));
+            if (reporter) {
+                Event_NotifyUser event;
+                event.set_type(Event_NotifyUser::REPORT_RESOLVED);
+                event.set_custom_title(dismissed ? tr("Report Dismissed").toStdString()
+                                                 : tr("Report Resolved").toStdString());
+
+                QString content = dismissed ? tr("Your report about %1 has been dismissed.").arg(reportedUser)
+                                            : tr("Your report about %1 has been resolved.").arg(reportedUser);
+                if (!note.isEmpty()) {
+                    content += "\n" + tr("Note: %1").arg(note);
+                }
+                event.set_custom_content(content.toStdString());
+
+                SessionEvent *se = reporter->prepareSessionEvent(event);
+                reporter->sendProtocolItem(*se);
+                delete se;
+
+                // Only mark the report as notified if the reporter is still connected; otherwise the
+                // notification is delivered on their next login via sendPendingReportNotifications.
+                QSqlQuery *notifiedQuery =
+                    sqlInterface->prepareQuery("UPDATE {prefix}_reports SET notified = 1 WHERE id = :id");
+                notifiedQuery->bindValue(":id", reportId);
+                sqlInterface->execSqlQuery(notifiedQuery);
+            }
+        }
+    }
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdReportUserInfo(const Command_ReportUserInfo &cmd,
+                                                                        ResponseContainer &rc)
+{
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    QString userName = nameFromStdString(cmd.user_name());
+
+    QSqlQuery *userQuery = sqlInterface->prepareQuery("SELECT u.admin, u.active, u.registrationDate, u.adminnotes "
+                                                      "FROM {prefix}_users u "
+                                                      "WHERE u.name = :name");
+    userQuery->bindValue(":name", userName);
+
+    if (!sqlInterface->execSqlQuery(userQuery)) {
+        return Response::RespInternalError;
+    }
+
+    if (!userQuery->next()) {
+        return Response::RespNameNotFound;
+    }
+
+    Response_ReportUserInfo *re = new Response_ReportUserInfo;
+    re->set_user_name(cmd.user_name());
+
+    re->set_is_admin(userQuery->value(0).toBool());
+    re->set_is_active(userQuery->value(1).toBool());
+    re->set_registration_time(userQuery->value(2).toDateTime().toSecsSinceEpoch());
+
+    if (!userQuery->value(3).isNull()) {
+        re->set_admin_notes(userQuery->value(3).toString().toStdString());
+    }
+
+    QSqlQuery *reportCountQuery =
+        sqlInterface->prepareQuery("SELECT COUNT(*) FROM {prefix}_reports WHERE reported_user_name = :name");
+    reportCountQuery->bindValue(":name", userName);
+    if (sqlInterface->execSqlQuery(reportCountQuery) && reportCountQuery->next()) {
+        re->set_total_reports(reportCountQuery->value(0).toInt());
+    }
+
+    QSqlQuery *banCountQuery = sqlInterface->prepareQuery("SELECT COUNT(*) FROM {prefix}_bans WHERE user_name = :name");
+    banCountQuery->bindValue(":name", userName);
+    if (sqlInterface->execSqlQuery(banCountQuery) && banCountQuery->next()) {
+        re->set_total_bans(banCountQuery->value(0).toInt());
+    }
+
+    QSqlQuery *warnCountQuery =
+        sqlInterface->prepareQuery("SELECT COUNT(*) FROM {prefix}_warnings WHERE user_name = :name");
+    warnCountQuery->bindValue(":name", userName);
+    if (sqlInterface->execSqlQuery(warnCountQuery) && warnCountQuery->next()) {
+        re->set_total_warns(warnCountQuery->value(0).toInt());
+    }
+
+    QSqlQuery *lastLoginQuery = sqlInterface->prepareQuery("SELECT UNIX_TIMESTAMP(a.last_login) "
+                                                           "FROM {prefix}_user_analytics a "
+                                                           "JOIN {prefix}_users u ON u.id = a.id "
+                                                           "WHERE u.name = :name");
+    lastLoginQuery->bindValue(":name", userName);
+    if (sqlInterface->execSqlQuery(lastLoginQuery) && lastLoginQuery->next() && !lastLoginQuery->value(0).isNull()) {
+        re->set_last_login(lastLoginQuery->value(0).toLongLong());
+    }
+
+    QSqlQuery *recentQuery =
+        sqlInterface->prepareQuery("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, ru.name AS assigned_mod_name "
+                                   "FROM {prefix}_reports r "
+                                   "LEFT JOIN {prefix}_users ru ON r.assigned_to = ru.id "
+                                   "WHERE r.reported_user_name = :name "
+                                   "ORDER BY r.created_at DESC LIMIT 10");
+    recentQuery->bindValue(":name", userName);
+
+    if (sqlInterface->execSqlQuery(recentQuery)) {
+        while (recentQuery->next()) {
+            ServerInfo_Report *info = re->add_recent_reports();
+            info->set_report_id(recentQuery->value(0).toInt());
+            info->set_reporter_name(recentQuery->value(1).toString().toStdString());
+            info->set_reported_user_name(recentQuery->value(2).toString().toStdString());
+
+            if (!recentQuery->value(3).isNull()) {
+                info->set_game_id(recentQuery->value(3).toInt());
+            }
+
+            info->set_category(recentQuery->value(4).toString().toStdString());
+            info->set_description(recentQuery->value(5).toString().toStdString());
+            info->set_report_time(recentQuery->value(6).toDateTime().toSecsSinceEpoch());
+            info->set_status(recentQuery->value(7).toString().toStdString());
+
+            if (!recentQuery->value(8).isNull()) {
+                info->set_resolution_note(recentQuery->value(8).toString().toStdString());
+            }
+
+            if (!recentQuery->value(9).isNull()) {
+                info->set_assigned_mod_name(recentQuery->value(9).toString().toStdString());
+            }
+        }
+    }
+
+    rc.setResponseExtension(re);
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdGetServerStats(const Command_GetServerStats & /*cmd */,
+                                                                        ResponseContainer &rc)
+{
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    // Servatrice::statusUpdate() periodically snapshots server health into the
+    // uptime table. Serve the freshest snapshot for this server.
+    const auto snapshot = sqlInterface->getLatestUptimeSnapshot(servatrice->getServerID());
+    if (!snapshot.valid) {
+        // No snapshot yet (fresh server, or statusUpdate() has not ticked).
+        return Response::RespInternalError;
+    }
+
+    auto *re = new Response_GetServerStats;
+    re->set_users_count(snapshot.usersCount);
+    re->set_mods_count(snapshot.modsCount);
+    re->set_games_count(snapshot.gamesCount);
+    re->set_tx_bytes(snapshot.txBytes);
+    re->set_rx_bytes(snapshot.rxBytes);
+    re->set_uptime_secs(snapshot.uptimeSecs);
+    re->set_timest(snapshot.timest);
+
+    // Live metrics from the in-process MetricsRegistry (resets on server restart)
+    re->set_cards_in_games(static_cast<google::protobuf::uint64>(servatrice->getCardsInGamesTotal()));
+    re->set_eventloop_stalls_total(static_cast<google::protobuf::uint64>(servatrice->getEventLoopStallsTotal()));
+    re->set_eventloop_last_stall_ms(static_cast<google::protobuf::uint64>(servatrice->getEventLoopLastStallMs()));
+    re->set_eventloop_max_stall_ms(static_cast<google::protobuf::uint64>(servatrice->getEventLoopMaxStallMs()));
+    re->set_total_commands(static_cast<google::protobuf::uint64>(servatrice->getMetricsRegistry().totalCommands()));
+    re->set_total_command_time_ms(
+        static_cast<google::protobuf::uint64>(servatrice->getMetricsRegistry().totalTimeMs()));
+    re->set_active_command_types(servatrice->getMetricsRegistry().activeTypeCount());
+
+    const auto gameStart = servatrice->getMetricsRegistry().getGameStartSnapshot();
+    re->set_game_start_count(static_cast<google::protobuf::uint64>(gameStart.count));
+    re->set_game_start_total_ms(static_cast<google::protobuf::uint64>(gameStart.totalMs));
+
+    // Per-command breakdown: resolve protobuf extension names via the descriptor pool
+    static const char *messageNames[] = {"SessionCommand",   "RoomCommand",  "GameCommand",
+                                         "ModeratorCommand", "AdminCommand", "DeveloperCommand"};
+    const auto activeStats = servatrice->getMetricsRegistry().collectActiveStats();
+    for (const auto &stat : activeStats) {
+        const int kind = stat.typeId / MetricsRegistry::KindStride;
+        const int number = stat.typeId % MetricsRegistry::KindStride;
+
+        QString label;
+        if (kind >= 0 && kind < MetricsRegistry::NumKinds) {
+            const google::protobuf::DescriptorPool *pool = google::protobuf::DescriptorPool::generated_pool();
+            const google::protobuf::Descriptor *message = pool->FindMessageTypeByName(messageNames[kind]);
+            const google::protobuf::FieldDescriptor *extension =
+                message ? pool->FindExtensionByNumber(message, number) : nullptr;
+            if (extension) {
+                label = QString::fromLatin1(MetricsRegistry::KindNames[kind]) + QStringLiteral("/") +
+                        QString::fromStdString(std::string(extension->message_type()->name()));
+            }
+        }
+        if (label.isEmpty()) {
+            label = QString::number(stat.typeId);
+        }
+
+        CommandStats *cs = re->add_command_stats();
+        cs->set_kind_index(static_cast<google::protobuf::uint32>(kind));
+        cs->set_extension_number(static_cast<google::protobuf::uint32>(number));
+        cs->set_command_name(label.toStdString());
+        cs->set_count(static_cast<google::protobuf::uint64>(stat.count));
+        cs->set_total_ms(static_cast<google::protobuf::uint64>(stat.totalMs));
+    }
+
+    rc.setResponseExtension(re);
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdReportStats(const Command_ReportStats & /*cmd */,
+                                                                     ResponseContainer &rc)
+{
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    if (const auto cached = servatrice->getCachedReportStats()) {
+        rc.setResponseExtension(new Response_ReportStats(*cached));
+        return Response::RespOk;
+    }
+
+    Response_ReportStats *re = new Response_ReportStats;
+
+    QSqlQuery *overviewQuery = sqlInterface->prepareQuery(
+        "SELECT COUNT(*) AS total, "
+        "SUM(status IN ('open', 'assigned')) AS pending, "
+        "SUM(status = 'assigned') AS assigned, "
+        "SUM(status IN ('resolved', 'dismissed')) AS resolved, "
+        "SUM(created_at >= DATE_SUB(NOW(), INTERVAL 1 DAY)) AS last24h, "
+        "SUM(created_at >= DATE_SUB(NOW(), INTERVAL 7 DAY)) AS last7d, "
+        "SUM(created_at >= DATE_SUB(NOW(), INTERVAL 30 DAY)) AS last30d, "
+        "SUM(created_at >= DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY)) AS this_week "
+        "FROM {prefix}_reports");
+    if (!sqlInterface->execSqlQuery(overviewQuery) || !overviewQuery->next()) {
+        delete re;
+        return Response::RespInternalError;
+    }
+
+    re->set_total_reports(overviewQuery->value(0).toInt());
+    re->set_total_pending(overviewQuery->value(1).toInt());
+    re->set_total_assigned(overviewQuery->value(2).toInt());
+    re->set_total_resolved(overviewQuery->value(3).toInt());
+    re->set_reports_last_24h(overviewQuery->value(4).toInt());
+    re->set_reports_last_7d(overviewQuery->value(5).toInt());
+    re->set_reports_last_30d(overviewQuery->value(6).toInt());
+    re->set_reports_this_week(overviewQuery->value(7).toInt());
+
+    bool allQueriesOk = true;
+
+    QSqlQuery *lastWeekQuery =
+        sqlInterface->prepareQuery("SELECT COUNT(*) FROM {prefix}_reports WHERE created_at >= DATE_SUB(CURDATE(), "
+                                   "INTERVAL WEEKDAY(CURDATE()) + 7 DAY) "
+                                   "AND created_at < DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY)");
+    if (sqlInterface->execSqlQuery(lastWeekQuery) && lastWeekQuery->next()) {
+        re->set_reports_last_week(lastWeekQuery->value(0).toInt());
+    } else {
+        allQueriesOk = false;
+    }
+
+    QSqlQuery *avgResQuery = sqlInterface->prepareQuery(
+        "SELECT AVG(TIMESTAMPDIFF(HOUR, created_at, resolution_time)) "
+        "FROM {prefix}_reports WHERE status IN ('resolved','dismissed') AND resolution_time IS NOT NULL");
+    if (sqlInterface->execSqlQuery(avgResQuery) && avgResQuery->next()) {
+        if (!avgResQuery->value(0).isNull()) {
+            re->set_avg_resolution_hours(avgResQuery->value(0).toDouble());
+        }
+    } else {
+        allQueriesOk = false;
+    }
+
+    QSqlQuery *catQuery = sqlInterface->prepareQuery(
+        "SELECT category, COUNT(*) AS cnt FROM {prefix}_reports GROUP BY category ORDER BY cnt DESC LIMIT 10");
+    if (sqlInterface->execSqlQuery(catQuery)) {
+        while (catQuery->next()) {
+            ReportCategoryCount *cc = re->add_category_counts();
+            cc->set_category(catQuery->value(0).toString().toStdString());
+            cc->set_count(catQuery->value(1).toInt());
+        }
+    } else {
+        allQueriesOk = false;
+    }
+
+    QSqlQuery *topReportedQuery =
+        sqlInterface->prepareQuery("SELECT reported_user_name, COUNT(*) AS cnt FROM {prefix}_reports "
+                                   "GROUP BY reported_user_name ORDER BY cnt DESC LIMIT 10");
+    if (sqlInterface->execSqlQuery(topReportedQuery)) {
+        while (topReportedQuery->next()) {
+            ReportTopUser *tu = re->add_top_reported_users();
+            tu->set_user_name(topReportedQuery->value(0).toString().toStdString());
+            tu->set_count(topReportedQuery->value(1).toInt());
+        }
+    } else {
+        allQueriesOk = false;
+    }
+
+    QSqlQuery *topReporterQuery =
+        sqlInterface->prepareQuery("SELECT reporter_name, COUNT(*) AS cnt FROM {prefix}_reports "
+                                   "GROUP BY reporter_name ORDER BY cnt DESC LIMIT 10");
+    if (sqlInterface->execSqlQuery(topReporterQuery)) {
+        while (topReporterQuery->next()) {
+            ReportTopUser *tu = re->add_top_reporters();
+            tu->set_user_name(topReporterQuery->value(0).toString().toStdString());
+            tu->set_count(topReporterQuery->value(1).toInt());
+        }
+    } else {
+        allQueriesOk = false;
+    }
+
+    if (allQueriesOk) {
+        servatrice->cacheReportStats(*re);
+    }
+
+    rc.setResponseExtension(re);
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdGetUserSessions(const Command_GetUserSessions &cmd,
+                                                                         ResponseContainer &rc)
+{
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    const QString userName = nameFromStdString(cmd.user_name());
+    if (userName.isEmpty()) {
+        return Response::RespContextError;
+    }
+
+    Response_UserSessions *re = new Response_UserSessions;
+    const int limit = qMin(static_cast<int>(cmd.limit()), 500);
+    const QList<ServerInfo_UserSession> sessions = sqlInterface->getUserSessions(userName, limit);
+    for (const ServerInfo_UserSession &session : sessions) {
+        re->add_sessions()->CopyFrom(session);
+    }
+    rc.setResponseExtension(re);
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdGetUserAlts(const Command_GetUserAlts &cmd,
+                                                                     ResponseContainer &rc)
+{
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    const QString userName = nameFromStdString(cmd.user_name());
+    if (userName.isEmpty()) {
+        return Response::RespContextError;
+    }
+
+    Response_UserAlts *re = new Response_UserAlts;
+    const QList<ServerInfo_UserAlt> alts = sqlInterface->getUserAlts(userName);
+    for (const ServerInfo_UserAlt &alt : alts) {
+        re->add_alts()->CopyFrom(alt);
+    }
+    rc.setResponseExtension(re);
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdGetModeratorLastLogins(const Command_GetModeratorLastLogins &,
+                                                                                ResponseContainer &rc)
+{
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    Response_ModeratorLastLogins *re = new Response_ModeratorLastLogins;
+    const QList<ServerInfo_ModeratorLogin> logins = sqlInterface->getModeratorLastLogins();
+    for (const ServerInfo_ModeratorLogin &login : logins) {
+        re->add_logins()->CopyFrom(login);
+    }
+    rc.setResponseExtension(re);
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdResetUserPassword(const Command_ResetUserPassword &cmd,
+                                                                           ResponseContainer &rc)
+{
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    const QString userName = nameFromStdString(cmd.user_name()).simplified();
+    if (userName.isEmpty()) {
+        return Response::RespContextError;
+    }
+
+    // Look up the target user's privilege level to prevent escalation.
+    QSqlQuery *privQuery = sqlInterface->prepareQuery("SELECT admin FROM {prefix}_users WHERE name = :name");
+    privQuery->bindValue(":name", userName);
+    if (!sqlInterface->execSqlQuery(privQuery) || !privQuery->next()) {
+        return Response::RespNameNotFound;
+    }
+    const int targetAdmin = privQuery->value(0).toInt();
+    const bool targetIsAdmin = targetAdmin & 1;
+    const bool targetIsMod = targetAdmin & 2;
+
+    const bool callerIsAdmin = userInfo->user_level() & ServerInfo_User::IsAdmin;
+
+    // A moderator must not reset the password of an admin or another moderator.
+    if (!callerIsAdmin && (targetIsAdmin || targetIsMod)) {
+        return Response::RespAccessDenied;
+    }
+
+    const QString tempPassword = PasswordHasher::generateRandomSalt();
+    if (!sqlInterface->changeUserPassword(userName, tempPassword, true)) {
+        return Response::RespInternalError;
+    }
+    sqlInterface->setForcePasswordChange(userName, true);
+
+    sqlInterface->addAuditRecord(userName, this->getAddress(), QString::fromStdString(userInfo->clientid()),
+                                 "PASSWORD_RESET", "Admin password reset", true);
+
+    // Notify the affected user if they are currently online.
+    QReadLocker clientsLocker(&servatrice->clientsLock);
+    AbstractServerSocketInterface *targetSession =
+        static_cast<AbstractServerSocketInterface *>(server->getUsers().value(userName));
+    if (targetSession) {
+        Event_NotifyUser event;
+        event.set_type(Event_NotifyUser::CUSTOM);
+        event.set_custom_title(tr("Password Reset").toStdString());
+        event.set_custom_content(tr("An administrator has reset your password. Please log in with the new "
+                                    "password provided to you and change it immediately.")
+                                     .toStdString());
+        SessionEvent *se = targetSession->prepareSessionEvent(event);
+        targetSession->sendProtocolItem(*se);
+        delete se;
+    }
+
+    Response_ResetUserPassword *re = new Response_ResetUserPassword;
+    re->set_user_name(userName.toStdString());
+    re->set_temporary_password(tempPassword.toStdString());
+    rc.setResponseExtension(re);
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdRemoveUserAvatar(const Command_RemoveUserAvatar &cmd,
+                                                                          ResponseContainer &rc)
+{
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    const QString userName = nameFromStdString(cmd.user_name()).simplified();
+    if (userName.isEmpty()) {
+        return Response::RespContextError;
+    }
+
+    if (!sqlInterface->removeUserAvatar(userName)) {
+        return Response::RespInternalError;
+    }
+
+    sqlInterface->addAuditRecord(userName, this->getAddress(), QString::fromStdString(userInfo->clientid()),
+                                 "REMOVE_USER_AVATAR", "Moderator removed user avatar", true);
+
+    Response_RemoveUserAvatar *re = new Response_RemoveUserAvatar;
+    re->set_user_name(userName.toStdString());
+    rc.setResponseExtension(re);
+    return Response::RespOk;
+}
+
+void AbstractServerSocketInterface::sendPendingReportNotifications(ResponseContainer &rc)
+{
+    if (!sqlInterface->checkSql()) {
+        return;
+    }
+
+    QSqlQuery *query = sqlInterface->prepareQuery("SELECT id, reported_user_name, status, resolution_note "
+                                                  "FROM {prefix}_reports "
+                                                  "WHERE reporter_id = :reporter_id AND notified = 0 "
+                                                  "AND status IN ('resolved', 'dismissed')");
+    query->bindValue(":reporter_id", userInfo->id());
+
+    if (!sqlInterface->execSqlQuery(query)) {
+        return;
+    }
+
+    while (query->next()) {
+        const int reportId = query->value(0).toInt();
+        const QString reportedUser = query->value(1).toString();
+        const bool dismissed = query->value(2).toString() == "dismissed";
+        const QString note = query->value(3).toString();
+
+        Event_NotifyUser event;
+        event.set_type(Event_NotifyUser::REPORT_RESOLVED);
+        event.set_custom_title(dismissed ? tr("Report Dismissed").toStdString() : tr("Report Resolved").toStdString());
+
+        QString content = dismissed ? tr("Your report about %1 has been dismissed.").arg(reportedUser)
+                                    : tr("Your report about %1 has been resolved.").arg(reportedUser);
+        if (!note.isEmpty()) {
+            content += "\n" + tr("Note: %1").arg(note);
+        }
+        event.set_custom_content(content.toStdString());
+
+        rc.enqueuePreResponseItem(ServerMessage::SESSION_EVENT, prepareSessionEvent(event));
+
+        QSqlQuery *notifiedQuery =
+            sqlInterface->prepareQuery("UPDATE {prefix}_reports SET notified = 1 WHERE id = :id");
+        notifiedQuery->bindValue(":id", reportId);
+        sqlInterface->execSqlQuery(notifiedQuery);
+    }
+
+    QSqlQuery *commentQuery = sqlInterface->prepareQuery("SELECT c.id, c.report_id, c.author_name, c.comment_text "
+                                                         "FROM {prefix}_report_comments c "
+                                                         "JOIN {prefix}_reports r ON r.id = c.report_id "
+                                                         "WHERE c.notified = 0 "
+                                                         "AND c.author_id != :user_id "
+                                                         "AND ((c.is_moderator = 1 AND r.reporter_id = :user_id) "
+                                                         "OR (c.is_moderator = 0 AND r.assigned_to = :user_id) "
+                                                         "OR (c.is_moderator = 1 AND r.assigned_to = :user_id)) "
+                                                         "ORDER BY c.created_at ASC");
+    commentQuery->bindValue(":user_id", userInfo->id());
+
+    if (!sqlInterface->execSqlQuery(commentQuery)) {
+        return;
+    }
+
+    while (commentQuery->next()) {
+        const qlonglong commentId = commentQuery->value(0).toLongLong();
+        const int reportId = commentQuery->value(1).toInt();
+        const QString authorName = commentQuery->value(2).toString();
+        const QString commentText = commentQuery->value(3).toString();
+
+        Event_NotifyUser event;
+        event.set_type(Event_NotifyUser::REPORT_COMMENT);
+        event.set_custom_title(tr("New Comment on Report #%1").arg(reportId).toStdString());
+        event.set_custom_content(tr("%1 commented:\n%2").arg(authorName, commentText).toStdString());
+
+        rc.enqueuePreResponseItem(ServerMessage::SESSION_EVENT, prepareSessionEvent(event));
+
+        QSqlQuery *notifiedQuery =
+            sqlInterface->prepareQuery("UPDATE {prefix}_report_comments SET notified = 1 WHERE id = :id");
+        notifiedQuery->bindValue(":id", commentId);
+        sqlInterface->execSqlQuery(notifiedQuery);
+    }
+}
+
+void AbstractServerSocketInterface::onLogin(ResponseContainer &rc)
+{
+    sendPendingReportNotifications(rc);
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdReportMyList(const Command_ReportMyList & /*cmd */,
+                                                                      ResponseContainer &rc)
+{
+    if (authState != PasswordRight) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    sendPendingReportNotifications(rc);
+
+    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, "
+                       "(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 "
+                       "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";
+
+    QSqlQuery *query = sqlInterface->prepareQuery(queryStr);
+    query->bindValue(":reporter_id", userInfo->id());
+
+    if (!sqlInterface->execSqlQuery(query)) {
+        return Response::RespInternalError;
+    }
+
+    Response_ReportMyList *re = new Response_ReportMyList;
+
+    while (query->next()) {
+        ServerInfo_Report *info = re->add_reports();
+
+        info->set_report_id(query->value(0).toInt());
+        info->set_reporter_name(query->value(1).toString().toStdString());
+        info->set_reported_user_name(query->value(2).toString().toStdString());
+
+        if (!query->value(3).isNull()) {
+            info->set_game_id(query->value(3).toInt());
+        }
+
+        info->set_category(query->value(4).toString().toStdString());
+        info->set_description(query->value(5).toString().toStdString());
+        info->set_report_time(query->value(6).toDateTime().toSecsSinceEpoch());
+        info->set_status(query->value(7).toString().toStdString());
+
+        if (!query->value(8).isNull()) {
+            info->set_resolution_note(query->value(8).toString().toStdString());
+        }
+
+        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());
+        }
+
+        if (!query->value(11).isNull()) {
+            info->set_room_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)
+{
+    if (authState != PasswordRight) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    const int reportId = cmd.report_id();
+
+    // 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";
+    QSqlQuery *query = sqlInterface->prepareQuery(queryStr);
+    query->bindValue(":id", reportId);
+
+    if (!sqlInterface->execSqlQuery(query)) {
+        return Response::RespInternalError;
+    }
+
+    if (!query->next()) {
+        return Response::RespNameNotFound;
+    }
+
+    const bool isMod = userInfo->user_level() & ServerInfo_User::IsModerator;
+    const int reporterId = query->value(1).toInt();
+    if (reporterId != userInfo->id() && !isMod) {
+        return Response::RespAccessDenied;
+    }
+
+    ServerInfo_Report *info = new ServerInfo_Report;
+    info->set_report_id(query->value(0).toInt());
+    info->set_reporter_name(query->value(2).toString().toStdString());
+    info->set_reported_user_name(query->value(3).toString().toStdString());
+
+    if (!query->value(4).isNull()) {
+        info->set_game_id(query->value(4).toInt());
+    }
+
+    info->set_category(query->value(5).toString().toStdString());
+    info->set_description(query->value(6).toString().toStdString());
+    info->set_report_time(query->value(7).toDateTime().toSecsSinceEpoch());
+    info->set_status(query->value(8).toString().toStdString());
+
+    if (!query->value(9).isNull()) {
+        info->set_resolution_note(query->value(9).toString().toStdString());
+    }
+
+    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());
+    }
+
+    if (!query->value(12).isNull()) {
+        info->set_chat_log(query->value(12).toString().toStdString());
+    }
+
+    if (!query->value(13).isNull()) {
+        info->set_room_id(query->value(13).toInt());
+    }
+
+    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());
+    }
+
+    QSqlQuery *commentQuery =
+        sqlInterface->prepareQuery("SELECT c.author_name, c.comment_text, c.created_at, c.is_moderator "
+                                   "FROM {prefix}_report_comments c "
+                                   "WHERE c.report_id = :report_id ORDER BY c.created_at ASC");
+    commentQuery->bindValue(":report_id", reportId);
+
+    if (sqlInterface->execSqlQuery(commentQuery)) {
+        while (commentQuery->next()) {
+            ServerInfo_ReportComment *comment = info->add_comments();
+            comment->set_author_name(commentQuery->value(0).toString().toStdString());
+            comment->set_comment_text(commentQuery->value(1).toString().toStdString());
+            comment->set_comment_time(commentQuery->value(2).toDateTime().toSecsSinceEpoch());
+            comment->set_is_moderator(commentQuery->value(3).toBool());
+        }
+    }
+
+    Response_ReportDetails *re = new Response_ReportDetails;
+    re->set_allocated_report(info);
+    rc.setResponseExtension(re);
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdReportAddComment(const Command_ReportAddComment &cmd,
+                                                                          ResponseContainer & /*rc*/)
+{
+    if (authState != PasswordRight) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    int reportId = cmd.report_id();
+    QString commentText = textFromStdString(cmd.comment()).trimmed();
+
+    if (commentText.isEmpty()) {
+        return Response::RespInvalidData;
+    }
+
+    const int maxCommentsPerHour = settingsCache->value("reporting/max_comments_per_hour", 30).toInt();
+    if (maxCommentsPerHour > 0) {
+        QSqlQuery *countQuery =
+            sqlInterface->prepareQuery("SELECT COUNT(*) FROM {prefix}_report_comments WHERE author_id = :id "
+                                       "AND created_at >= DATE_SUB(NOW(), INTERVAL 1 HOUR)");
+        countQuery->bindValue(":id", userInfo->id());
+        if (sqlInterface->execSqlQuery(countQuery) && countQuery->next() &&
+            countQuery->value(0).toInt() >= maxCommentsPerHour) {
+            return Response::RespTooManyRequests;
+        }
+    }
+
+    QSqlQuery *checkQuery = sqlInterface->prepareQuery(
+        "SELECT reporter_id, reporter_name, assigned_to, status FROM {prefix}_reports WHERE id = :id");
+    checkQuery->bindValue(":id", reportId);
+
+    if (!sqlInterface->execSqlQuery(checkQuery)) {
+        return Response::RespInternalError;
+    }
+
+    if (!checkQuery->next()) {
+        return Response::RespNameNotFound;
+    }
+
+    int reporterId = checkQuery->value(0).toInt();
+    QString reporterName = checkQuery->value(1).toString();
+    int assignedToId = checkQuery->value(2).toInt();
+
+    bool isMod = userInfo->user_level() & ServerInfo_User::IsModerator;
+
+    // Only the reporter (by id) or a moderator may comment on a report.
+    if (reporterId != userInfo->id() && !isMod) {
+        return Response::RespAccessDenied;
+    }
+
+    QString reportStatus = checkQuery->value(3).toString();
+    if (reportStatus == "resolved" || reportStatus == "dismissed") {
+        return Response::RespInvalidData;
+    }
+
+    QSqlQuery *insertQuery = sqlInterface->prepareQuery(
+        "INSERT INTO {prefix}_report_comments (report_id, author_name, author_id, comment_text, created_at, "
+        "is_moderator) "
+        "VALUES (:report_id, :author_name, :author_id, :comment_text, NOW(), :is_moderator)");
+    insertQuery->bindValue(":report_id", reportId);
+    insertQuery->bindValue(":author_name", QString::fromStdString(userInfo->name()));
+    insertQuery->bindValue(":author_id", userInfo->id());
+    insertQuery->bindValue(":comment_text", commentText);
+    insertQuery->bindValue(":is_moderator", isMod);
+
+    if (!sqlInterface->execSqlQuery(insertQuery)) {
+        return Response::RespInternalError;
+    }
+
+    const qlonglong commentId = insertQuery->lastInsertId().toLongLong();
+
+    QStringList recipients;
+    if (isMod) {
+        // A moderator comment reaches both the reporter and (if assigned) the assigned moderator.
+        recipients.append(reporterName);
+        if (assignedToId > 0) {
+            QSqlQuery *modNameQuery = sqlInterface->prepareQuery("SELECT name FROM {prefix}_users WHERE id = :id");
+            modNameQuery->bindValue(":id", assignedToId);
+            if (sqlInterface->execSqlQuery(modNameQuery) && modNameQuery->next()) {
+                recipients.append(modNameQuery->value(0).toString());
+            }
+        }
+    } else if (assignedToId > 0) {
+        QSqlQuery *modNameQuery = sqlInterface->prepareQuery("SELECT name FROM {prefix}_users WHERE id = :id");
+        modNameQuery->bindValue(":id", assignedToId);
+        if (sqlInterface->execSqlQuery(modNameQuery) && modNameQuery->next()) {
+            recipients.append(modNameQuery->value(0).toString());
+        }
+    }
+
+    const QString ownName = QString::fromStdString(userInfo->name());
+    bool allNotified = !recipients.isEmpty();
+    QReadLocker clientsLocker(&servatrice->clientsLock);
+    for (const QString &notifyName : recipients) {
+        if (notifyName == ownName) {
+            continue;
+        }
+
+        AbstractServerSocketInterface *notify =
+            static_cast<AbstractServerSocketInterface *>(server->getUsers().value(notifyName));
+        if (!notify) {
+            // The recipient is offline; leave `notified` = 0 so the notification is
+            // delivered on their next login via sendPendingReportNotifications.
+            allNotified = false;
+            continue;
+        }
+
+        Event_NotifyUser event;
+        event.set_type(Event_NotifyUser::REPORT_COMMENT);
+        event.set_custom_title(tr("New Comment on Report #%1").arg(reportId).toStdString());
+        event.set_custom_content(
+            tr("%1 commented:\n%2").arg(QString::fromStdString(userInfo->name()), commentText).toStdString());
+
+        SessionEvent *se = notify->prepareSessionEvent(event);
+        notify->sendProtocolItem(*se);
+        delete se;
+    }
+
+    if (allNotified) {
+        QSqlQuery *notifiedQuery =
+            sqlInterface->prepareQuery("UPDATE {prefix}_report_comments SET notified = 1 WHERE id = :id");
+        notifiedQuery->bindValue(":id", commentId);
+        sqlInterface->execSqlQuery(notifiedQuery);
+    }
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode
+AbstractServerSocketInterface::cmdReplayDownloadByGameId(const Command_ReplayDownloadByGameId &cmd,
+                                                         ResponseContainer &rc)
+{
+    if (authState != PasswordRight) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    QSqlQuery *query = sqlInterface->prepareQuery("SELECT r.id, r.replay FROM {prefix}_replays r "
+                                                  "WHERE r.id_game = :game_id ORDER BY r.id DESC LIMIT 1");
+    query->bindValue(":game_id", cmd.game_id());
+
+    if (!sqlInterface->execSqlQuery(query)) {
+        return Response::RespInternalError;
+    }
+
+    if (!query->next()) {
+        return Response::RespNameNotFound;
+    }
+
+    int replayId = query->value(0).toInt();
+    QByteArray data = query->value(1).toByteArray();
+
+    Response_ReplayDownloadByGameId *re = new Response_ReplayDownloadByGameId;
+    re->set_replay_data(data.data(), data.size());
+    re->set_replay_id(replayId);
+    rc.setResponseExtension(re);
+
+    return Response::RespOk;
+}
+
 Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const Command_Register &cmd,
                                                                          ResponseContainer &rc)
 {
     QString userName = nameFromStdString(cmd.user_name());
     QString clientId = nameFromStdString(cmd.clientid());
-    qDebug() << "Got register command for user:" << userName;
+    qCDebug(AbstractServerSocketInterfaceLog) << "Got register command for user:" << userName;
 
     bool registrationEnabled = settingsCache->value("registration/enabled", false).toBool();
     if (!registrationEnabled) {
-        if (servatrice->getEnableRegistrationAudit())
+        if (servatrice->getEnableRegistrationAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "REGISTER_ACCOUNT", "Server functionality disabled", false);
+        }
 
         return Response::RespRegistrationDisabled;
     }
@@ -1172,13 +3164,8 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
     const auto parsedEmailParts = EmailParser::parseEmailAddress(nameFromStdString(cmd.email()));
     const auto emailUser = parsedEmailParts.first;
     const auto emailDomain = parsedEmailParts.second;
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     const QStringList emailBlackListFilters = emailBlackList.split(",", Qt::SkipEmptyParts);
     const QStringList emailWhiteListFilters = emailWhiteList.split(",", Qt::SkipEmptyParts);
-#else
-    const QStringList emailBlackListFilters = emailBlackList.split(",", QString::SkipEmptyParts);
-    const QStringList emailWhiteListFilters = emailWhiteList.split(",", QString::SkipEmptyParts);
-#endif
 
     bool requireEmailForRegistration = settingsCache->value("registration/requireemail", true).toBool();
     if (requireEmailForRegistration && emailUser.isEmpty()) {
@@ -1200,19 +3187,21 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
 
     // If a blacklist exists, ensure the email address domain is NOT in the blacklist
     if (!emailBlackListFilters.isEmpty() && emailBlackListFilters.contains(emailDomain, Qt::CaseInsensitive)) {
-        if (servatrice->getEnableRegistrationAudit())
+        if (servatrice->getEnableRegistrationAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "REGISTER_ACCOUNT", "Email used is blacklisted", false);
+        }
 
         return Response::RespEmailBlackListed;
     }
 
-    // TODO: Move this method outside of the db interface
+    //! \todo Move this method outside of the db interface.
     QString errorString;
     if (!sqlInterface->usernameIsValid(userName, errorString)) {
-        if (servatrice->getEnableRegistrationAudit())
+        if (servatrice->getEnableRegistrationAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "REGISTER_ACCOUNT", "Username is invalid", false);
+        }
 
         Response_Register *re = new Response_Register;
         re->set_denied_reason_str(errorString.toStdString());
@@ -1221,17 +3210,19 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
     }
 
     if (userName.toLower().simplified() == "servatrice") {
-        if (servatrice->getEnableRegistrationAudit())
+        if (servatrice->getEnableRegistrationAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "REGISTER_ACCOUNT", "Username is invalid", false);
+        }
 
         return Response::RespUsernameInvalid;
     }
 
     if (sqlInterface->userExists(userName)) {
-        if (servatrice->getEnableRegistrationAudit())
+        if (servatrice->getEnableRegistrationAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "REGISTER_ACCOUNT", "Username already exists", false);
+        }
 
         return Response::RespUserAlreadyExists;
     }
@@ -1239,10 +3230,11 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
     const auto parsedEmailAddress = EmailParser::getParsedEmailAddress(parsedEmailParts);
     if (servatrice->getMaxAccountsPerEmail() > 0 &&
         sqlInterface->checkNumberOfUserAccounts(parsedEmailAddress) >= servatrice->getMaxAccountsPerEmail()) {
-        if (servatrice->getEnableRegistrationAudit())
+        if (servatrice->getEnableRegistrationAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "REGISTER_ACCOUNT", "Too many usernames registered with this email address",
                                          false);
+        }
 
         return Response::RespTooManyRequests;
     }
@@ -1250,23 +3242,26 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
     QString banReason;
     int banSecondsRemaining;
     if (sqlInterface->checkUserIsBanned(this->getAddress(), userName, clientId, banReason, banSecondsRemaining)) {
-        if (servatrice->getEnableRegistrationAudit())
+        if (servatrice->getEnableRegistrationAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "REGISTER_ACCOUNT", "User is banned", false);
+        }
 
         Response_Register *re = new Response_Register;
         re->set_denied_reason_str(banReason.toStdString());
-        if (banSecondsRemaining != 0)
+        if (banSecondsRemaining != 0) {
             re->set_denied_end_time(QDateTime::currentDateTime().addSecs(banSecondsRemaining).toSecsSinceEpoch());
+        }
         rc.setResponseExtension(re);
         return Response::RespUserIsBanned;
     }
 
     if (tooManyRegistrationAttempts(this->getAddress())) {
-        if (servatrice->getEnableRegistrationAudit())
+        if (servatrice->getEnableRegistrationAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "REGISTER_ACCOUNT", "Too many registration attempts from this ip address",
                                          false);
+        }
 
         return Response::RespTooManyRequests;
     }
@@ -1276,8 +3271,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
     QString password;
     bool passwordNeedsHash = false;
     if (cmd.has_password()) {
-        if (cmd.password().length() > MAX_NAME_LENGTH)
+        if (cmd.password().length() > MAX_NAME_LENGTH) {
             return Response::RespRegistrationFailed;
+        }
         password = QString::fromStdString(cmd.password());
         passwordNeedsHash = true;
         if (!isPasswordLongEnough(password.length())) {
@@ -1298,31 +3294,35 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
                                                    country, !requireEmailActivation);
 
     if (regSucceeded) {
-        qDebug() << "Accepted register command for user:" << userName;
+        qCDebug(AbstractServerSocketInterfaceLog) << "Accepted register command for user:" << userName;
         if (requireEmailActivation) {
             QSqlQuery *query =
                 sqlInterface->prepareQuery("insert into {prefix}_activation_emails (name) values(:name)");
             query->bindValue(":name", userName);
-            if (!sqlInterface->execSqlQuery(query))
+            if (!sqlInterface->execSqlQuery(query)) {
                 return Response::RespRegistrationFailed;
+            }
 
-            if (servatrice->getEnableRegistrationAudit())
+            if (servatrice->getEnableRegistrationAudit()) {
                 sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                              "REGISTER_ACCOUNT", "", true);
+            }
 
             return Response::RespRegistrationAcceptedNeedsActivation;
         } else {
 
-            if (servatrice->getEnableRegistrationAudit())
+            if (servatrice->getEnableRegistrationAudit()) {
                 sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                              "REGISTER_ACCOUNT", "", true);
+            }
 
             return Response::RespRegistrationAccepted;
         }
     } else {
-        if (servatrice->getEnableRegistrationAudit())
+        if (servatrice->getEnableRegistrationAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "REGISTER_ACCOUNT", "Unknown reason for failure", false);
+        }
 
         return Response::RespRegistrationFailed;
     }
@@ -1330,7 +3330,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRegisterAccount(const C
 
 bool AbstractServerSocketInterface::tooManyRegistrationAttempts(const QString &ipAddress)
 {
-    // TODO: implement
+    //! \todo Implement registration attempt limiting.
     Q_UNUSED(ipAddress);
     return false;
 }
@@ -1342,24 +3342,27 @@ Response::ResponseCode AbstractServerSocketInterface::cmdActivateAccount(const C
     QString token = nameFromStdString(cmd.token());
     QString clientId = nameFromStdString(cmd.clientid());
 
-    if (clientId.isEmpty())
+    if (clientId.isEmpty()) {
         clientId = "UNKNOWN";
+    }
 
     if (sqlInterface->activateUser(userName, token)) {
-        qDebug() << "Accepted activation for user" << userName;
+        qCDebug(AbstractServerSocketInterfaceLog) << "Accepted activation for user" << userName;
 
-        if (servatrice->getEnableRegistrationAudit())
+        if (servatrice->getEnableRegistrationAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "ACTIVATE_ACCOUNT", "", true);
+        }
 
         return Response::RespActivationAccepted;
     } else {
-        qDebug() << "Failed activation for user" << userName;
+        qCDebug(AbstractServerSocketInterfaceLog) << "Failed activation for user" << userName;
 
-        if (servatrice->getEnableRegistrationAudit())
+        if (servatrice->getEnableRegistrationAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "ACTIVATE_ACCOUNT", "Failed to activate account, incorrect activation token",
                                          false);
+        }
 
         return Response::RespActivationFailed;
     }
@@ -1368,8 +3371,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdActivateAccount(const C
 Response::ResponseCode AbstractServerSocketInterface::cmdAccountEdit(const Command_AccountEdit &cmd,
                                                                      ResponseContainer & /* rc */)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
     QString realName = nameFromStdString(cmd.real_name());
     const auto parsedEmailAddress = EmailParser::getParsedEmailAddress(nameFromStdString(cmd.email()));
@@ -1378,8 +3382,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountEdit(const Comma
     bool checkedPassword = false;
     QString userName = QString::fromStdString(userInfo->name());
     if (cmd.has_password_check()) {
-        if (cmd.password_check().length() > MAX_NAME_LENGTH)
+        if (cmd.password_check().length() > MAX_NAME_LENGTH) {
             return Response::RespWrongPassword;
+        }
         QString password = QString::fromStdString(cmd.password_check());
         QString clientId = QString::fromStdString(userInfo->clientid());
         QString reasonStr{};
@@ -1410,8 +3415,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountEdit(const Comma
         queryList << "country=:country";
     }
 
-    if (queryList.isEmpty())
+    if (queryList.isEmpty()) {
         return Response::RespOk;
+    }
 
     QString queryText = QString("update {prefix}_users set %1 where name=:userName").arg(queryList.join(", "));
     QSqlQuery *query = sqlInterface->prepareQuery(queryText);
@@ -1429,8 +3435,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountEdit(const Comma
     }
     query->bindValue(":userName", userName);
 
-    if (!sqlInterface->execSqlQuery(query))
+    if (!sqlInterface->execSqlQuery(query)) {
         return Response::RespInternalError;
+    }
 
     if (cmd.has_real_name()) {
         userInfo->set_real_name(realName.toStdString());
@@ -1448,8 +3455,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountEdit(const Comma
 Response::ResponseCode AbstractServerSocketInterface::cmdAccountImage(const Command_AccountImage &cmd,
                                                                       ResponseContainer & /* rc */)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
     size_t length = qMin(cmd.image().length(), (size_t)MAX_FILE_LENGTH);
     QByteArray image(cmd.image().c_str(), length);
@@ -1458,31 +3466,203 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountImage(const Comm
     QSqlQuery *query = sqlInterface->prepareQuery("update {prefix}_users set avatar_bmp=:image where id=:id");
     query->bindValue(":image", image);
     query->bindValue(":id", id);
-    if (!sqlInterface->execSqlQuery(query))
+    if (!sqlInterface->execSqlQuery(query)) {
         return Response::RespInternalError;
+    }
 
     userInfo->set_avatar_bmp(cmd.image().c_str(), length);
     return Response::RespOk;
 }
 
+bool AbstractServerSocketInterface::isCardNameAllowed(const QString &cardName, const QString &cardProviderId)
+{
+    QSqlQuery *q = sqlInterface->prepareQuery(
+        "SELECT mode FROM {prefix}_card_art_name_rules WHERE card_name = :name AND card_provider_id = :provider");
+
+    q->bindValue(":name", cardName);
+    q->bindValue(":provider", cardProviderId);
+
+    if (!sqlInterface->execSqlQuery(q)) {
+        qWarning() << "Card art rule lookup failed; failing open for" << cardName;
+        return true;
+    }
+
+    if (!q->next()) {
+        return true; // default allow
+    }
+
+    return q->value(0).toString() != "DENY";
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdSetCardArtParams(const Command_SetCardArtParams &cmd,
+                                                                          ResponseContainer & /* rc */)
+{
+    if (authState != PasswordRight) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    const QString cardName = QString::fromStdString(cmd.card_name());
+    const QString cardProviderId = QString::fromStdString(cmd.card_provider_id());
+
+    if (cardName.length() > MAX_NAME_LENGTH || cardProviderId.length() > MAX_NAME_LENGTH) {
+        return Response::RespInvalidData;
+    }
+
+    if (cardName.isEmpty()) {
+        // Removal path
+        QSqlQuery *q = sqlInterface->prepareQuery("UPDATE {prefix}_users SET card_art_params = NULL WHERE id = :id");
+        q->bindValue(":id", userInfo->id());
+        if (!sqlInterface->execSqlQuery(q)) {
+            return Response::RespInternalError;
+        }
+        userInfo->clear_card_art_params();
+        server->broadcastUserInfoUpdate(this);
+        return Response::RespOk;
+    }
+
+    if (!isCardNameAllowed(cardName, cardProviderId)) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    // Clamp everything to sane ranges server-side so a malicious client
+    // can't store garbage that breaks other clients' rendering.
+    const double marginPctL = qBound(0.0, cmd.margin_pct_l(), 0.95);
+    const double marginPctR = qBound(0.0, cmd.margin_pct_r(), 0.95);
+    const double verticalOffset = qBound(0.0, cmd.vertical_offset(), 1.0);
+    const double zoom = qBound(0.1, cmd.zoom(), 4.0);
+
+    QJsonObject obj;
+    obj["card_name"] = cardName;
+    obj["card_provider_id"] = cardProviderId;
+    obj["marginPctL"] = marginPctL;
+    obj["marginPctR"] = marginPctR;
+    obj["verticalOffset"] = verticalOffset;
+    obj["zoom"] = zoom;
+    const QString json = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact));
+
+    QSqlQuery *query = sqlInterface->prepareQuery("update {prefix}_users set card_art_params=:params where id=:id");
+    query->bindValue(":params", json);
+    query->bindValue(":id", userInfo->id());
+    if (!sqlInterface->execSqlQuery(query)) {
+        return Response::RespInternalError;
+    }
+
+    // Keep the in-memory userInfo in sync
+    auto *cap = userInfo->mutable_card_art_params();
+    cap->set_card_name(cmd.card_name());
+    cap->set_card_provider_id(cmd.card_provider_id());
+    cap->set_margin_pct_l(marginPctL);
+    cap->set_margin_pct_r(marginPctR);
+    cap->set_vertical_offset(verticalOffset);
+    cap->set_zoom(zoom);
+
+    const QString name = QString::fromStdString(userInfo->name());
+    server->broadcastUserInfoUpdate(this);
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdAddCardArtRule(const Command_AddCardArtRule &cmd,
+                                                                        ResponseContainer &)
+{
+    const QString cardName = QString::fromStdString(cmd.card_name());
+    const QString cardProviderId = QString::fromStdString(cmd.card_provider_id());
+    const QString mode = QString::fromStdString(cmd.mode());
+
+    if (mode != "ALLOW" && mode != "DENY") {
+        return Response::RespInvalidData;
+    }
+    if (cardName.isEmpty() || cardName.length() > MAX_NAME_LENGTH || cardProviderId.length() > MAX_NAME_LENGTH) {
+        return Response::RespInvalidData;
+    }
+
+    QSqlQuery *q = sqlInterface->prepareQuery("INSERT INTO {prefix}_card_art_name_rules "
+                                              "(card_name, card_provider_id, mode, reason, created_by) "
+                                              "VALUES (:name, :provider, :mode, :reason, :uid) "
+                                              "ON DUPLICATE KEY UPDATE mode=:mode2, reason=:reason2");
+
+    q->bindValue(":name", cardName);
+    q->bindValue(":provider", cardProviderId);
+    q->bindValue(":mode", mode);
+    q->bindValue(":mode2", mode);
+    q->bindValue(":reason", QString::fromStdString(cmd.reason()));
+    q->bindValue(":reason2", QString::fromStdString(cmd.reason()));
+    q->bindValue(":uid", userInfo->id());
+
+    if (!sqlInterface->execSqlQuery(q)) {
+        return Response::RespInternalError;
+    }
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdRemoveCardArtRule(const Command_RemoveCardArtRule &cmd,
+                                                                           ResponseContainer &)
+{
+    auto cardName = QString::fromStdString(cmd.card_name());
+    auto cardProviderId = QString::fromStdString(cmd.card_provider_id());
+    if (cardName.length() > MAX_NAME_LENGTH || cardProviderId.length() > MAX_NAME_LENGTH) {
+        return Response::RespInvalidData;
+    }
+    QSqlQuery *q = sqlInterface->prepareQuery(
+        "DELETE FROM {prefix}_card_art_name_rules WHERE card_name=:name AND card_provider_id=:provider");
+
+    q->bindValue(":name", cardName);
+    q->bindValue(":provider", cardProviderId);
+
+    if (!sqlInterface->execSqlQuery(q)) {
+        return Response::RespInternalError;
+    }
+
+    return Response::RespOk;
+}
+
+Response::ResponseCode AbstractServerSocketInterface::cmdListCardArtRules(const Command_ListCardArtRules &,
+                                                                          ResponseContainer &rc)
+{
+    QSqlQuery *q = sqlInterface->prepareQuery(
+        "SELECT card_name, card_provider_id, mode, reason FROM {prefix}_card_art_name_rules");
+
+    if (!sqlInterface->execSqlQuery(q)) {
+        return Response::RespInternalError;
+    }
+
+    auto *re = new Response_ListCardArtRules;
+
+    while (q->next()) {
+        auto *entry = re->add_entries();
+        entry->set_card_name(q->value(0).toString().toStdString());
+        entry->set_card_provider_id(q->value(1).toString().toStdString());
+        entry->set_mode(q->value(2).toString().toStdString());
+        entry->set_reason(q->value(3).toString().toStdString());
+    }
+
+    rc.setResponseExtension(re);
+    return Response::RespOk;
+}
+
 Response::ResponseCode AbstractServerSocketInterface::cmdAccountPassword(const Command_AccountPassword &cmd,
                                                                          ResponseContainer & /* rc */)
 {
-    if (authState != PasswordRight)
+    if (authState != PasswordRight) {
         return Response::RespFunctionNotAllowed;
+    }
 
-    if (cmd.old_password().length() > MAX_NAME_LENGTH)
+    if (cmd.old_password().length() > MAX_NAME_LENGTH) {
         return Response::RespWrongPassword;
+    }
     QString oldPassword = QString::fromStdString(cmd.old_password());
     QString newPassword;
     bool newPasswordNeedsHash = false;
     if (cmd.has_new_password()) {
-        if (cmd.new_password().length() > MAX_NAME_LENGTH)
+        if (cmd.new_password().length() > MAX_NAME_LENGTH) {
             return Response::RespContextError;
+        }
         newPassword = QString::fromStdString(cmd.new_password());
         newPasswordNeedsHash = true;
-        if (!isPasswordLongEnough(newPassword.length()))
+        if (!isPasswordLongEnough(newPassword.length())) {
             return Response::RespPasswordTooShort;
+        }
     } else if (cmd.hashed_new_password().length() > MAX_NAME_LENGTH) {
         return Response::RespContextError;
     } else {
@@ -1490,8 +3670,11 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAccountPassword(const C
     }
 
     QString userName = QString::fromStdString(userInfo->name());
-    if (!databaseInterface->changeUserPassword(userName, oldPassword, true, newPassword, newPasswordNeedsHash))
+    if (!databaseInterface->changeUserPassword(userName, oldPassword, true, newPassword, newPasswordNeedsHash)) {
         return Response::RespWrongPassword;
+    }
+
+    databaseInterface->setForcePasswordChange(userName, false);
 
     return Response::RespOk;
 }
@@ -1502,12 +3685,13 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordRequest(c
     const QString userName = nameFromStdString(cmd.user_name());
     const QString clientId = nameFromStdString(cmd.clientid());
 
-    qDebug() << "Received reset password request from user:" << userName;
+    qCDebug(AbstractServerSocketInterfaceLog) << "Received reset password request from user:" << userName;
 
     if (!servatrice->getEnableForgotPassword()) {
-        if (servatrice->getEnableForgotPasswordAudit())
+        if (servatrice->getEnableForgotPasswordAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "PASSWORD_RESET_REQUEST", "Server functionality disabled", false);
+        }
 
         return Response::RespFunctionNotAllowed;
     }
@@ -1520,9 +3704,10 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordRequest(c
     }
 
     if (!sqlInterface->userExists(userName)) {
-        if (servatrice->getEnableForgotPasswordAudit())
+        if (servatrice->getEnableForgotPasswordAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "PASSWORD_RESET_REQUEST", "User does not exist", false);
+        }
 
         return Response::RespFunctionNotAllowed;
     }
@@ -1537,9 +3722,10 @@ Response::ResponseCode AbstractServerSocketInterface::continuePasswordRequest(co
 {
     if (sqlInterface->doesForgotPasswordExist(userName)) {
 
-        if (servatrice->getEnableForgotPasswordAudit())
+        if (servatrice->getEnableForgotPasswordAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "PASSWORD_RESET_REQUEST", "Request already exists", true);
+        }
 
         Response_ForgotPasswordRequest *re = new Response_ForgotPasswordRequest;
         re->set_challenge_email(false);
@@ -1550,9 +3736,10 @@ Response::ResponseCode AbstractServerSocketInterface::continuePasswordRequest(co
     QString banReason;
     int banTimeRemaining;
     if (sqlInterface->checkUserIsBanned(this->getAddress(), userName, clientId, banReason, banTimeRemaining)) {
-        if (servatrice->getEnableForgotPasswordAudit())
+        if (servatrice->getEnableForgotPasswordAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "PASSWORD_RESET_REQUEST", "User is banned", false);
+        }
 
         return Response::RespFunctionNotAllowed;
     }
@@ -1584,21 +3771,23 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordReset(con
     Q_UNUSED(rc);
     QString userName = nameFromStdString(cmd.user_name());
     QString clientId = nameFromStdString(cmd.clientid());
-    qDebug() << "Received reset password reset from user:" << userName;
+    qCDebug(AbstractServerSocketInterfaceLog) << "Received reset password reset from user:" << userName;
 
     if (!sqlInterface->doesForgotPasswordExist(userName)) {
-        if (servatrice->getEnableForgotPasswordAudit())
+        if (servatrice->getEnableForgotPasswordAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "PASSWORD_RESET", "Request does not exist for user", false);
+        }
 
         return Response::RespFunctionNotAllowed;
     }
 
     if (!sqlInterface->validateTableColumnStringData("{prefix}_users", "token", userName,
                                                      nameFromStdString(cmd.token()))) {
-        if (servatrice->getEnableForgotPasswordAudit())
+        if (servatrice->getEnableForgotPasswordAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), userName.simplified(),
                                          "PASSWORD_RESET", "Failed token validation", false);
+        }
 
         return Response::RespFunctionNotAllowed;
     }
@@ -1606,8 +3795,9 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordReset(con
     QString password;
     bool passwordNeedsHash = false;
     if (cmd.has_new_password()) {
-        if (cmd.new_password().length() > MAX_NAME_LENGTH)
+        if (cmd.new_password().length() > MAX_NAME_LENGTH) {
             return Response::RespContextError;
+        }
         password = QString::fromStdString(cmd.new_password());
         passwordNeedsHash = true;
     } else if (cmd.hashed_new_password().length() > MAX_NAME_LENGTH) {
@@ -1617,10 +3807,12 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForgotPasswordReset(con
     }
 
     if (sqlInterface->changeUserPassword(nameFromStdString(cmd.user_name()), password, passwordNeedsHash)) {
-        if (servatrice->getEnableForgotPasswordAudit())
+        if (servatrice->getEnableForgotPasswordAudit()) {
             sqlInterface->addAuditRecord(userName.simplified(), this->getAddress(), clientId.simplified(),
                                          "PASSWORD_RESET", "", true);
+        }
 
+        sqlInterface->setForcePasswordChange(nameFromStdString(cmd.user_name()), false);
         sqlInterface->removeForgotPassword(nameFromStdString(cmd.user_name()));
         return Response::RespOk;
     }
@@ -1635,7 +3827,7 @@ AbstractServerSocketInterface::cmdForgotPasswordChallenge(const Command_ForgotPa
     const QString userName = nameFromStdString(cmd.user_name());
     const QString clientId = nameFromStdString(cmd.clientid());
 
-    qDebug() << "Received reset password challenge from user:" << userName;
+    qCDebug(AbstractServerSocketInterfaceLog) << "Received reset password challenge from user:" << userName;
 
     if (!servatrice->getEnableForgotPasswordChallenge()) {
         if (servatrice->getEnableForgotPasswordAudit()) {
@@ -1689,6 +3881,99 @@ Response::ResponseCode AbstractServerSocketInterface::cmdRequestPasswordSalt(con
     return Response::RespOk;
 }
 
+Response::ResponseCode AbstractServerSocketInterface::cmdReport(const Command_Report &cmd, ResponseContainer & /*rc*/)
+{
+    if (authState != PasswordRight) {
+        return Response::RespFunctionNotAllowed;
+    }
+
+    if (!sqlInterface->checkSql()) {
+        return Response::RespInternalError;
+    }
+
+    if (!cmd.has_reported_user() || !cmd.has_category() || !cmd.has_description()) {
+        return Response::RespInvalidData;
+    }
+
+    QString reporterName = QString::fromStdString(userInfo->name());
+    QString reportedUser = nameFromStdString(cmd.reported_user());
+    QString category = nameFromStdString(cmd.category());
+    QString description = textFromStdString(cmd.description());
+    QString chatLog = textTailFromStdString(cmd.chat_log());
+
+    if (reportedUser.isEmpty() || category.isEmpty() || description.isEmpty()) {
+        return Response::RespInvalidData;
+    }
+
+    if (!ReportCategories::isValid(category)) {
+        return Response::RespInvalidData;
+    }
+
+    const int maxReportsPerDay = settingsCache->value("reporting/max_reports_per_day", 10).toInt();
+    if (maxReportsPerDay > 0) {
+        QSqlQuery *countQuery =
+            sqlInterface->prepareQuery("SELECT COUNT(*) FROM {prefix}_reports WHERE reporter_id = :id "
+                                       "AND created_at >= DATE_SUB(NOW(), INTERVAL 1 DAY)");
+        countQuery->bindValue(":id", userInfo->id());
+        if (sqlInterface->execSqlQuery(countQuery) && countQuery->next() &&
+            countQuery->value(0).toInt() >= maxReportsPerDay) {
+            return Response::RespTooManyRequests;
+        }
+    }
+
+    int reportedUserId = -1;
+    QSqlQuery *lookupQuery = sqlInterface->prepareQuery("SELECT id FROM {prefix}_users WHERE name = :name");
+    lookupQuery->bindValue(":name", reportedUser);
+    if (sqlInterface->execSqlQuery(lookupQuery) && lookupQuery->next()) {
+        reportedUserId = lookupQuery->value(0).toInt();
+    }
+
+    if (reportedUserId == -1) {
+        return Response::RespNameNotFound;
+    }
+
+    int roomId = 0;
+    const int gameId = cmd.game_id();
+    if (gameId > 0) {
+        QReadLocker roomsLocker(&servatrice->roomsLock);
+        const QMap<int, Server_Room *> &rooms = servatrice->getRooms();
+        for (auto it = rooms.constBegin(); it != rooms.constEnd(); ++it) {
+            QReadLocker gamesLocker(&it.value()->gamesLock);
+            if (it.value()->getGames().contains(gameId)) {
+                roomId = it.key();
+                break;
+            }
+        }
+    }
+
+    QSqlQuery *query =
+        sqlInterface->prepareQuery("insert into {prefix}_reports "
+                                   "(reporter_id, reporter_name, reported_user_id, reported_user_name, "
+                                   "game_id, room_id, category, description, chat_log, created_at, status) "
+                                   "values "
+                                   "(:reporter_id, :reporter_name, :reported_user_id, :reported_user_name, "
+                                   ":game_id, :room_id, :category, :description, :chat_log, NOW(), 'open')");
+
+    query->bindValue(":reporter_id", userInfo->id());
+    query->bindValue(":reporter_name", reporterName);
+    query->bindValue(":reported_user_id", reportedUserId);
+    query->bindValue(":reported_user_name", reportedUser);
+
+    query->bindValue(":game_id", gameId > 0 ? gameId : QVariant());
+
+    query->bindValue(":room_id", roomId > 0 ? roomId : QVariant());
+
+    query->bindValue(":category", category);
+    query->bindValue(":description", description);
+    query->bindValue(":chat_log", chatLog.isEmpty() ? QVariant() : chatLog);
+
+    if (!sqlInterface->execSqlQuery(query)) {
+        return Response::RespInternalError;
+    }
+
+    return Response::RespOk;
+}
+
 // ADMIN FUNCTIONS.
 // Permission is checked by the calling function.
 
@@ -1757,7 +4042,7 @@ bool AbstractServerSocketInterface::removeAdminFlagFromUser(const QString &userN
     if (user) {
         Event_ConnectionClosed event;
         event.set_reason(Event_ConnectionClosed::DEMOTED);
-        event.set_reason_str("Your moderator and/or judge status has been revoked.");
+        event.set_reason_str("Your moderator, judge, and/or developer status has been revoked.");
         event.set_end_time(QDateTime::currentDateTime().toSecsSinceEpoch());
 
         SessionEvent *se = user->prepareSessionEvent(event);
@@ -1799,6 +4084,18 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAdjustMod(const Command
         }
     }
 
+    if (cmd.has_should_be_developer()) {
+        if (cmd.should_be_developer()) {
+            if (!addAdminFlagToUser(userName, 8)) {
+                return Response::RespInternalError;
+            }
+        } else {
+            if (!removeAdminFlagFromUser(userName, 8)) {
+                return Response::RespInternalError;
+            }
+        }
+    }
+
     return Response::RespOk;
 }
 
@@ -1930,13 +4227,8 @@ TcpServerSocketInterface::TcpServerSocketInterface(Servatrice *_server,
     socket->setSocketOption(QAbstractSocket::LowDelayOption, 1);
     connect(socket, SIGNAL(readyRead()), this, SLOT(readClient()));
     connect(socket, SIGNAL(disconnected()), this, SLOT(catchSocketDisconnected()));
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
     connect(socket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)), this,
             SLOT(catchSocketError(QAbstractSocket::SocketError)));
-#else
-    connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this,
-            SLOT(catchSocketError(QAbstractSocket::SocketError)));
-#endif
 }
 
 TcpServerSocketInterface::~TcpServerSocketInterface()
@@ -1970,8 +4262,9 @@ void TcpServerSocketInterface::initSessionDeprecated()
 void TcpServerSocketInterface::flushOutputQueue()
 {
     QMutexLocker locker(&outputQueueMutex);
-    if (outputQueue.isEmpty())
+    if (outputQueue.isEmpty()) {
         return;
+    }
 
     int totalBytes = 0;
     while (!outputQueue.isEmpty()) {
@@ -1985,13 +4278,16 @@ void TcpServerSocketInterface::flushOutputQueue()
         unsigned int size = static_cast<unsigned int>(item.ByteSize());
 #endif
         buf.resize(size + 4);
-        item.SerializeToArray(buf.data() + 4, size);
-        buf.data()[3] = (unsigned char)size;
-        buf.data()[2] = (unsigned char)(size >> 8);
-        buf.data()[1] = (unsigned char)(size >> 16);
-        buf.data()[0] = (unsigned char)(size >> 24);
-        // In case socket->write() calls catchSocketError(), the mutex must not be locked during this call.
-        writeToSocket(buf);
+        if (item.SerializeToArray(buf.data() + 4, size)) {
+            buf.data()[3] = (unsigned char)size;
+            buf.data()[2] = (unsigned char)(size >> 8);
+            buf.data()[1] = (unsigned char)(size >> 16);
+            buf.data()[0] = (unsigned char)(size >> 24);
+            // In case socket->write() calls catchSocketError(), the mutex must not be locked during this call.
+            writeToSocket(buf);
+        } else {
+            qCWarning(TcpServerSocketInterfaceLog) << "serialisation error!";
+        }
 
         totalBytes += size + 4;
         locker.relock();
@@ -2015,57 +4311,76 @@ 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
+            } else {
                 return;
+            }
         }
-        if (inputBuffer.size() < messageLength || messageLength < 0)
+        if (inputBuffer.size() < messageLength) {
             return;
+        }
 
         CommandContainer newCommandContainer;
+        bool ok;
         try {
-            newCommandContainer.ParseFromArray(inputBuffer.data(), messageLength);
+            ok = newCommandContainer.ParseFromArray(inputBuffer.data(), messageLength);
         } catch (std::exception &e) {
-            qDebug() << "Caught std::exception in" << __FILE__ << __LINE__ <<
+            qCWarning(TcpServerSocketInterfaceLog) << "Caught std::exception in" << __FILE__ << __LINE__ <<
 #ifdef _MSC_VER // Visual Studio
-                __FUNCTION__;
+                __FUNCTION__
 #else
-                __PRETTY_FUNCTION__;
+                __PRETTY_FUNCTION__
 #endif
-            qDebug() << "Exception:" << e.what();
-            qDebug() << "Message coming from:" << getAddress();
-            qDebug() << "Message length:" << messageLength;
-            qDebug() << "Message content:" << inputBuffer.toHex();
+                                                   << Qt::endl
+                                                   << "Exception:" << e.what() << Qt::endl
+                                                   << "Message coming from:" << getAddress() << Qt::endl
+                                                   << "Message length:" << messageLength << Qt::endl
+                                                   << "Message content:" << inputBuffer.toHex();
         } catch (...) {
-            qDebug() << "Unhandled exception in" << __FILE__ << __LINE__ <<
+            qCWarning(TcpServerSocketInterfaceLog) << "Unhandled exception in" << __FILE__ << __LINE__ <<
 #ifdef _MSC_VER // Visual Studio
-                __FUNCTION__;
+                __FUNCTION__
 #else
-                __PRETTY_FUNCTION__;
+                __PRETTY_FUNCTION__
 #endif
-            qDebug() << "Message coming from:" << getAddress();
+                                                   << Qt::endl
+                                                   << "Message coming from:" << getAddress();
         }
-
         inputBuffer.remove(0, messageLength);
         messageInProgress = false;
 
-        // dirty hack to make v13 client display the correct error message
-        if (handshakeStarted)
-            processCommandContainer(newCommandContainer);
-        else if (!newCommandContainer.has_cmd_id()) {
-            handshakeStarted = true;
-            if (!initTcpSession())
-                prepareDestroy();
+        if (ok) {
+            // dirty hack to make v13 client display the correct error message
+            if (handshakeStarted) {
+                processCommandContainer(newCommandContainer);
+            } else if (!newCommandContainer.has_cmd_id()) {
+                handshakeStarted = true;
+                if (!initTcpSession()) {
+                    prepareDestroy();
+                }
+            }
+            // end of hack
+        } else {
+            qCWarning(TcpServerSocketInterfaceLog) << "parsing error!";
         }
-        // end of hack
+
     } while (!inputBuffer.isEmpty());
 }
 
 bool TcpServerSocketInterface::initTcpSession()
 {
-    if (!initSession())
+    if (!initSession()) {
         return false;
+    }
 
     // limit the number of websocket users based on configuration settings
     bool enforceUserLimit = settingsCache->value("security/enable_max_user_limit", false).toBool();
@@ -2109,19 +4424,22 @@ void WebsocketServerSocketInterface::initConnection(void *_socket)
     }
     socket = (QWebSocket *)_socket;
     socket->setParent(this);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
     // https://bugreports.qt.io/browse/QTBUG-70693
     socket->setMaxAllowedIncomingMessageSize(1500000); // 1.5MB
-#endif
 
     address = socket->peerAddress();
 
     QByteArray websocketIPHeader = settingsCache->value("server/web_socket_ip_header", "").toByteArray();
     if (websocketIPHeader.length() > 0 && socket->request().hasRawHeader(websocketIPHeader)) {
-        QString header(socket->request().rawHeader(websocketIPHeader));
-        QHostAddress parsed(header);
-        if (!parsed.isNull()) {
-            address = parsed;
+        // 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;
+            }
         }
     }
 
@@ -2139,14 +4457,16 @@ void WebsocketServerSocketInterface::initConnection(void *_socket)
         QString("Incoming websocket connection: %1 (%2)").arg(address.toString()).arg(socket->peerAddress().toString()),
         this);
 
-    if (!initWebsocketSession())
+    if (!initWebsocketSession()) {
         prepareDestroy();
+    }
 }
 
 bool WebsocketServerSocketInterface::initWebsocketSession()
 {
-    if (!initSession())
+    if (!initSession()) {
         return false;
+    }
 
     // limit the number of websocket users based on configuration settings
     bool enforceUserLimit = settingsCache->value("security/enable_max_user_limit", false).toBool();
@@ -2173,8 +4493,9 @@ bool WebsocketServerSocketInterface::initWebsocketSession()
 void WebsocketServerSocketInterface::flushOutputQueue()
 {
     QMutexLocker locker(&outputQueueMutex);
-    if (outputQueue.isEmpty())
+    if (outputQueue.isEmpty()) {
         return;
+    }
 
     qint64 totalBytes = 0;
     while (!outputQueue.isEmpty()) {
@@ -2188,9 +4509,12 @@ void WebsocketServerSocketInterface::flushOutputQueue()
         unsigned int size = static_cast<unsigned int>(item.ByteSize());
 #endif
         buf.resize(size);
-        item.SerializeToArray(buf.data(), size);
-        // In case socket->write() calls catchSocketError(), the mutex must not be locked during this call.
-        writeToSocket(buf);
+        if (item.SerializeToArray(buf.data(), size)) {
+            // In case socket->write() calls catchSocketError(), the mutex must not be locked during this call.
+            writeToSocket(buf);
+        } else {
+            qCWarning(TcpServerSocketInterfaceLog) << "serialisation error!";
+        }
 
         totalBytes += size;
         locker.relock();
@@ -2206,30 +4530,37 @@ void WebsocketServerSocketInterface::binaryMessageReceived(const QByteArray &mes
     servatrice->incRxBytes(message.size());
 
     CommandContainer newCommandContainer;
+    bool ok;
     try {
-        newCommandContainer.ParseFromArray(message.data(), message.size());
+        ok = newCommandContainer.ParseFromArray(message.data(), message.size());
     } catch (std::exception &e) {
-        qDebug() << "Caught std::exception in" << __FILE__ << __LINE__ <<
+        qCWarning(WebsocketServerSocketInterfaceLog) << "Caught std::exception in" << __FILE__ << __LINE__ <<
 #ifdef _MSC_VER // Visual Studio
-            __FUNCTION__;
+            __FUNCTION__
 #else
-            __PRETTY_FUNCTION__;
+            __PRETTY_FUNCTION__
 #endif
-        qDebug() << "Exception:" << e.what();
-        qDebug() << "Message coming from:" << getAddress();
-        qDebug() << "Message length:" << message.size();
-        qDebug() << "Message content:" << message.toHex();
+                                                     << Qt::endl
+                                                     << "Exception:" << e.what() << Qt::endl
+                                                     << "Message coming from:" << getAddress() << Qt::endl
+                                                     << "Message length:" << message.size() << Qt::endl
+                                                     << "Message content:" << message.toHex();
     } catch (...) {
-        qDebug() << "Unhandled exception in" << __FILE__ << __LINE__ <<
+        qCWarning(WebsocketServerSocketInterfaceLog) << "Unhandled exception in" << __FILE__ << __LINE__ <<
 #ifdef _MSC_VER // Visual Studio
-            __FUNCTION__;
+            __FUNCTION__
 #else
-            __PRETTY_FUNCTION__;
+            __PRETTY_FUNCTION__
 #endif
-        qDebug() << "Message coming from:" << getAddress();
+                                                     << Qt::endl
+                                                     << "Message coming from:" << getAddress();
     }
 
-    processCommandContainer(newCommandContainer);
+    if (ok) {
+        processCommandContainer(newCommandContainer);
+    } else {
+        qCWarning(WebsocketServerSocketInterfaceLog) << "parsing error!";
+    }
 }
 
 bool AbstractServerSocketInterface::isPasswordLongEnough(const int passwordLength)
diff --git a/servatrice/src/serversocketinterface.h b/servatrice/src/serversocketinterface.h
index e10aa0dde..7de742c66 100644
--- a/servatrice/src/serversocketinterface.h
+++ b/servatrice/src/serversocketinterface.h
@@ -20,40 +20,94 @@
 #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 <server_protocolhandler.h>
 
 class Servatrice;
 class Servatrice_DatabaseInterface;
 class DeckList;
 class ServerInfo_DeckStorage_Folder;
-
 class Command_AddToList;
 class Command_RemoveFromList;
 class Command_DeckList;
+class Command_DeckListOtherUser;
 class Command_DeckNewDir;
 class Command_DeckDelDir;
 class Command_DeckDel;
 class Command_DeckDownload;
+class Command_DeckDownloadPublic;
 class Command_DeckUpload;
+class Command_DeckSetVisibility;
+class Command_DeckShareCreate;
+class Command_DeckShareList;
+class Command_DeckShareListMine;
+class Command_DeckShareRemove;
+class Command_DeckShareDownload;
 class Command_ReplayList;
 class Command_ReplayDownload;
 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
 {
@@ -67,8 +121,9 @@ signals:
     void incTxBytes(qint64 amount);
 
 protected:
-    void logDebugMessage(const QString &message);
+    void logDebugMessage(const QString &message) override;
     bool tooManyRegistrationAttempts(const QString &ipAddress);
+    void processCommandContainer(const CommandContainer &cont) override;
 
     virtual void writeToSocket(QByteArray &data) = 0;
     virtual void flushSocket() = 0;
@@ -84,8 +139,16 @@ private:
     Response::ResponseCode cmdRemoveFromList(const Command_RemoveFromList &cmd, ResponseContainer &rc);
     int getDeckPathId(int basePathId, QStringList path);
     int getDeckPathId(const QString &path);
-    bool deckListHelper(int folderId, ServerInfo_DeckStorage_Folder *folder);
+    bool deckListHelper(int folderId,
+                        ServerInfo_DeckStorage_Folder *folder,
+                        int userId,
+                        bool inheritedPublic,
+                        bool publicOnly);
+    int getDeckOwnerId(int deckId);
+    bool isDeckEffectivelyPublic(int deckId);
     Response::ResponseCode cmdDeckList(const Command_DeckList &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdDeckListOtherUser(const Command_DeckListOtherUser &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdDeckSetVisibility(const Command_DeckSetVisibility &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdDeckNewDir(const Command_DeckNewDir &cmd, ResponseContainer &rc);
     void deckDelDirHelper(int basePathId);
     void sendServerMessage(const QString userName, const QString message);
@@ -94,6 +157,12 @@ private:
     Response::ResponseCode cmdDeckUpload(const Command_DeckUpload &cmd, ResponseContainer &rc);
     DeckList *getDeckFromDatabase(int deckId);
     Response::ResponseCode cmdDeckDownload(const Command_DeckDownload &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdDeckDownloadPublic(const Command_DeckDownloadPublic &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdDeckShareCreate(const Command_DeckShareCreate &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdDeckShareList(const Command_DeckShareList &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdDeckShareListMine(const Command_DeckShareListMine &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdDeckShareRemove(const Command_DeckShareRemove &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdDeckShareDownload(const Command_DeckShareDownload &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdReplayList(const Command_ReplayList &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdReplayDownload(const Command_ReplayDownload &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdReplayModifyMatch(const Command_ReplayModifyMatch &cmd, ResponseContainer &rc);
@@ -102,13 +171,20 @@ private:
     Response::ResponseCode cmdReplayGetCode(const Command_ReplayGetCode &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdReplaySubmitCode(const Command_ReplaySubmitCode &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdBanFromServer(const Command_BanFromServer &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdReportList(const Command_ReportList &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdWarnUser(const Command_WarnUser &cmd, ResponseContainer &rc);
-    Response::ResponseCode cmdGetLogHistory(const Command_ViewLogHistory &cmd, ResponseContainer &rc);
+    Response::ResponseCode
+    cmdGetLogHistory(const Command_ViewLogHistory &cmd, ResponseContainer &rc, bool allowPrivateChat);
     Response::ResponseCode cmdGetBanHistory(const Command_GetBanHistory &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdGetWarnList(const Command_GetWarnList &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdGetWarnHistory(const Command_GetWarnHistory &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdShutdownServer(const Command_ShutdownServer &cmd, ResponseContainer &rc);
     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);
     Response::ResponseCode cmdActivateAccount(const Command_Activate &cmd, ResponseContainer & /* rc */);
     Response::ResponseCode cmdReloadConfig(const Command_ReloadConfig & /* cmd */, ResponseContainer & /*rc*/);
@@ -122,13 +198,29 @@ private:
     Response::ResponseCode cmdForgotPasswordChallenge(const Command_ForgotPasswordChallenge &cmd,
                                                       ResponseContainer &rc);
     Response::ResponseCode cmdRequestPasswordSalt(const Command_RequestPasswordSalt &cmd, ResponseContainer &rc);
-    Response::ResponseCode processExtendedSessionCommand(int cmdType, const SessionCommand &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdReport(const Command_Report &cmd, ResponseContainer &);
+    Response::ResponseCode cmdReportMyList(const Command_ReportMyList &cmd, ResponseContainer &rc);
+    void sendPendingReportNotifications(ResponseContainer &rc);
+    void onLogin(ResponseContainer &rc) override;
+    Response::ResponseCode cmdReportDetails(const Command_ReportDetails &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdReportAddComment(const Command_ReportAddComment &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdReplayDownloadByGameId(const Command_ReplayDownloadByGameId &cmd, ResponseContainer &rc);
     Response::ResponseCode
-    processExtendedModeratorCommand(int cmdType, const ModeratorCommand &cmd, ResponseContainer &rc);
-    Response::ResponseCode processExtendedAdminCommand(int cmdType, const AdminCommand &cmd, ResponseContainer &rc);
+    processExtendedSessionCommand(int cmdType, const SessionCommand &cmd, ResponseContainer &rc) override;
+    Response::ResponseCode
+    processExtendedModeratorCommand(int cmdType, const ModeratorCommand &cmd, ResponseContainer &rc) override;
+    Response::ResponseCode
+    processExtendedAdminCommand(int cmdType, const AdminCommand &cmd, ResponseContainer &rc) override;
+    Response::ResponseCode
+    processExtendedDeveloperCommand(int cmdType, const DeveloperCommand &cmd, ResponseContainer &rc) override;
 
     Response::ResponseCode cmdAccountEdit(const Command_AccountEdit &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdAccountImage(const Command_AccountImage &cmd, ResponseContainer &rc);
+    bool isCardNameAllowed(const QString &cardName, const QString &cardProviderId);
+    Response::ResponseCode cmdSetCardArtParams(const Command_SetCardArtParams &cmd, ResponseContainer &);
+    Response::ResponseCode cmdAddCardArtRule(const Command_AddCardArtRule &cmd, ResponseContainer &);
+    Response::ResponseCode cmdRemoveCardArtRule(const Command_RemoveCardArtRule &cmd, ResponseContainer &);
+    Response::ResponseCode cmdListCardArtRules(const Command_ListCardArtRules &, ResponseContainer &rc);
     Response::ResponseCode cmdAccountPassword(const Command_AccountPassword &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdGrantReplayAccess(const Command_GrantReplayAccess &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdForceActivateUser(const Command_ForceActivateUser &cmd, ResponseContainer &rc);
@@ -136,6 +228,14 @@ private:
     Response::ResponseCode cmdGetAdminNotes(const Command_GetAdminNotes &cmd, ResponseContainer &rc);
     Response::ResponseCode cmdUpdateAdminNotes(const Command_UpdateAdminNotes &cmd, ResponseContainer &rc);
 
+    Response::ResponseCode cmdGetUserSessions(const Command_GetUserSessions &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdGetUserAlts(const Command_GetUserAlts &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdGetModeratorLastLogins(const Command_GetModeratorLastLogins &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdResetUserPassword(const Command_ResetUserPassword &cmd, ResponseContainer &rc);
+    Response::ResponseCode cmdRemoveUserAvatar(const Command_RemoveUserAvatar &cmd, ResponseContainer &rc);
+
+    Response::ResponseCode cmdGetServerStats(const Command_GetServerStats &cmd, ResponseContainer &rc);
+
     bool addAdminFlagToUser(const QString &user, int flag);
     bool removeAdminFlagFromUser(const QString &user, int flag);
 
@@ -152,9 +252,9 @@ public:
     bool initSession();
 
     virtual QHostAddress getPeerAddress() const = 0;
-    virtual QString getAddress() const = 0;
+    QString getAddress() const override = 0;
 
-    void transmitProtocolItem(const ServerMessage &item);
+    void transmitProtocolItem(const ServerMessage &item) override;
 };
 
 class TcpServerSocketInterface : public AbstractServerSocketInterface
diff --git a/servatrice/src/settingscache.cpp b/servatrice/src/settingscache.cpp
index 14bfaebfb..4ecac7319 100644
--- a/servatrice/src/settingscache.cpp
+++ b/servatrice/src/settingscache.cpp
@@ -4,6 +4,13 @@
 #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)
@@ -11,12 +18,7 @@ SettingsCache::SettingsCache(const QString &fileName, QSettings::Format format,
     // first, figure out if we are running in portable mode
     isPortableBuild = QFile::exists(qApp->applicationDirPath() + "/portable.dat");
 
-    QStringList disallowedRegExpStr =
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
-        value("users/disallowedregexp", "").toString().split(",", Qt::SkipEmptyParts);
-#else
-        value("users/disallowedregexp", "").toString().split(",", QString::SkipEmptyParts);
-#endif
+    QStringList disallowedRegExpStr = value("users/disallowedregexp", "").toString().split(",", Qt::SkipEmptyParts);
     disallowedRegExpStr.removeDuplicates();
     for (const QString &regExpStr : disallowedRegExpStr) {
         disallowedRegExp.append(QRegularExpression(QString("\\A%1\\z").arg(regExpStr)));
@@ -35,14 +37,16 @@ QString SettingsCache::guessConfigurationPath()
 
     // application directory path
     guessFileName = QCoreApplication::applicationDirPath() + "/" + fileName;
-    if (QFile::exists(guessFileName))
+    if (QFile::exists(guessFileName)) {
         return guessFileName;
+    }
 
 #ifdef Q_OS_UNIX
     // /etc
     guessFileName = "/etc/servatrice/" + fileName;
-    if (QFile::exists(guessFileName))
+    if (QFile::exists(guessFileName)) {
         return guessFileName;
+    }
 #endif
 
     guessFileName = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/" + fileName;
diff --git a/servatrice/src/settingscache.h b/servatrice/src/settingscache.h
index 6922d3508..817a62bfa 100644
--- a/servatrice/src/settingscache.h
+++ b/servatrice/src/settingscache.h
@@ -5,6 +5,9 @@
 #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 f7cb207a9..32cd5b206 100644
--- a/servatrice/src/signalhandler.cpp
+++ b/servatrice/src/signalhandler.cpp
@@ -5,6 +5,10 @@
 #include "settingscache.h"
 
 #include <QSocketNotifier>
+#include <QThread>
+#include <QtGlobal>
+#include <qobjectdefs.h>
+#include <qsystemdetection.h>
 
 #ifdef Q_OS_UNIX
 #include <cstdio>
@@ -86,10 +90,11 @@ void SignalHandler::sigSegvHandler(int sig)
     fprintf(stderr, "Error: signal %d:\n", sig);
     backtrace_symbols_fd(array, size, STDERR_FILENO);
 
-    if (sig == SIGSEGV)
+    if (sig == SIGSEGV) {
         logger->logMessage("CRASH: SIGSEGV");
-    else if (sig == SIGABRT)
+    } else if (sig == SIGABRT) {
         logger->logMessage("CRASH: SIGABRT");
+    }
 
     logger->deleteLater();
     loggerThread->wait();
diff --git a/servatrice/src/signalhandler.h b/servatrice/src/signalhandler.h
index bf8d9e52a..82652a43a 100644
--- a/servatrice/src/signalhandler.h
+++ b/servatrice/src/signalhandler.h
@@ -2,6 +2,7 @@
 #define SIGNALHANDLER_H
 
 #include <QObject>
+#include <qtmetamacros.h>
 
 class QSocketNotifier;
 
diff --git a/servatrice/src/smtp/qxtmailmessage.cpp b/servatrice/src/smtp/qxtmailmessage.cpp
index ca003d875..ff376c1a9 100644
--- a/servatrice/src/smtp/qxtmailmessage.cpp
+++ b/servatrice/src/smtp/qxtmailmessage.cpp
@@ -27,9 +27,8 @@
  * \class QxtMailMessage
  * \inmodule QxtNetwork
  * \brief The QxtMailMessage class encapsulates an e-mail according to RFC 2822 and related specifications
- * TODO: {implicitshared}
  */
-
+//! \todo {implicitshared}
 #include "qxtmailmessage.h"
 
 #include "qxtmail_p.h"
diff --git a/servatrice/src/smtp/qxtsmtp.cpp b/servatrice/src/smtp/qxtsmtp.cpp
index 951492d7a..a4da649f7 100644
--- a/servatrice/src/smtp/qxtsmtp.cpp
+++ b/servatrice/src/smtp/qxtsmtp.cpp
@@ -54,13 +54,8 @@ QxtSmtp::QxtSmtp(QObject *parent) : QObject(parent)
     // QObject::connect(socket(), SIGNAL(encrypted()), &qxt_d(), SLOT(ehlo()));
     QObject::connect(socket(), SIGNAL(connected()), this, SIGNAL(connected()));
     QObject::connect(socket(), SIGNAL(disconnected()), this, SIGNAL(disconnected()));
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
     QObject::connect(socket(), SIGNAL(errorOccurred(QAbstractSocket::SocketError)), &qxt_d(),
                      SLOT(socketError(QAbstractSocket::SocketError)));
-#else
-    QObject::connect(socket(), SIGNAL(error(QAbstractSocket::SocketError)), &qxt_d(),
-                     SLOT(socketError(QAbstractSocket::SocketError)));
-#endif
     QObject::connect(this, SIGNAL(authenticated()), &qxt_d(), SLOT(sendNext()));
     QObject::connect(socket(), SIGNAL(readyRead()), &qxt_d(), SLOT(socketRead()));
 }
@@ -99,6 +94,38 @@ 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;
@@ -334,11 +361,7 @@ void QxtSmtpPrivate::authenticate()
         state = Authenticated;
         emit qxt_p().authenticated();
     } else {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
         QStringList auth = extensions["AUTH"].toUpper().split(' ', Qt::SkipEmptyParts);
-#else
-        QStringList auth = extensions["AUTH"].toUpper().split(' ', QString::SkipEmptyParts);
-#endif
         if (auth.contains("CRAM-MD5")) {
             authCramMD5();
         } else if (auth.contains("PLAIN")) {
diff --git a/servatrice/src/smtp/qxtsmtp.h b/servatrice/src/smtp/qxtsmtp.h
index 747e22df9..d264d1047 100644
--- a/servatrice/src/smtp/qxtsmtp.h
+++ b/servatrice/src/smtp/qxtsmtp.h
@@ -66,6 +66,8 @@ 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 ee7214904..82824e496 100644
--- a/servatrice/src/smtpclient.cpp
+++ b/servatrice/src/smtpclient.cpp
@@ -1,15 +1,62 @@
 #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 &)));
@@ -32,104 +79,153 @@ SmtpClient::~SmtpClient()
 {
     if (smtp) {
         delete smtp;
-        smtp = 0;
+        smtp = nullptr;
     }
 }
 
+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)
 {
-    QString email = settingsCache->value("smtp/email", "").toString();
-    QString name = settingsCache->value("smtp/name", "").toString();
+    if (pendingEmails.contains(pendingKey(nickname, EmailType::Activation, token))) {
+        qCDebug(SmtpClientLog) << "Activation email already pending for" << nickname << "- skipping";
+        return false;
+    }
+
     QString subject = settingsCache->value("smtp/subject", "").toString();
     QString body = settingsCache->value("smtp/body", "").toString();
+    QString email = settingsCache->value("smtp/email", "").toString();
 
-    if (email.isEmpty()) {
-        qDebug() << "[MAIL] Missing sender email in configuration";
+    if (!validateEmailFields(email, subject, body, recipient, token, nickname)) {
         return false;
     }
 
-    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;
+    return enqueue(buildEmail(nickname, EmailType::Activation, subject, body, recipient, token, email));
 }
 
-bool SmtpClient::enqueueForgotPasswordTokenMail(const QString &nickname, const QString &recipient, const QString &token)
+bool SmtpClient::enqueueForgotPasswordTokenMail(const QString &nickname,
+                                                const QString &recipient,
+                                                const QString &token,
+                                                qint64 rowId)
 {
-    QString email = settingsCache->value("smtp/email", "").toString();
-    QString name = settingsCache->value("smtp/name", "").toString();
+    if (pendingEmails.contains(pendingKey(nickname, EmailType::ForgotPassword, token))) {
+        qCDebug(SmtpClientLog) << "Password reset email already pending for" << nickname << "- skipping";
+        return false;
+    }
+
     QString subject = settingsCache->value("forgotpassword/subject", "").toString();
     QString body = settingsCache->value("forgotpassword/body", "").toString();
+    QString email = settingsCache->value("smtp/email", "").toString();
 
-    if (email.isEmpty()) {
-        qDebug() << "[MAIL] Missing sender email in configuration";
+    if (!validateEmailFields(email, subject, body, recipient, token, nickname)) {
         return false;
     }
 
-    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;
+    return enqueue(buildEmail(nickname, EmailType::ForgotPassword, subject, body, recipient, token, email, rowId));
 }
 
 void SmtpClient::sendAllEmails()
 {
     // still connected from the previous round
-    if (smtp->socket()->state() == QAbstractSocket::ConnectedState)
+    if (smtp->socket()->state() == QAbstractSocket::ConnectedState ||
+        smtp->socket()->state() == QAbstractSocket::ConnectingState ||
+        smtp->socket()->state() == QAbstractSocket::HostLookupState ||
+        smtp->socket()->state() == QAbstractSocket::ClosingState) {
         return;
+    }
 
-    if (smtp->pendingMessages() == 0)
+    if (pendingEmails.isEmpty()) {
         return;
+    }
+
+    // Respect connection-level backoff after auth/conn/encryption failures.
+    if (connectionAttempts > 0 && QDateTime::currentDateTime() < connectionBackoffUntil) {
+        return;
+    }
 
     QString connectionType = settingsCache->value("smtp/connection", "tcp").toString();
     QString host = settingsCache->value("smtp/host", "localhost").toString();
@@ -141,74 +237,307 @@ 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)
+        if (acceptAllCerts) {
             smtp->sslSocket()->setPeerVerifyMode(QSslSocket::QueryPeer);
+        }
         smtp->connectToSecureHost(host, port);
     } else {
         smtp->connectToHost(host, port);
     }
 }
 
-void SmtpClient::authenticated()
+void SmtpClient::relayoutForSending()
 {
-    qDebug() << "[MAIL] authenticated";
-}
+    // 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();
 
-void SmtpClient::authenticationFailed(const QByteArray &msg)
-{
-    qDebug() << "[MAIL] authenticationFailed" << QString(msg);
-}
-
-void SmtpClient::connected()
-{
-    qDebug() << "[MAIL] connected";
-}
-
-void SmtpClient::connectionFailed(const QByteArray &msg)
-{
-    qDebug() << "[MAIL] connectionFailed" << QString(msg);
-}
-
-void SmtpClient::disconnected()
-{
-    qDebug() << "[MAIL] disconnected";
-}
-
-void SmtpClient::encrypted()
-{
-    qDebug() << "[MAIL] encrypted";
-}
-
-void SmtpClient::encryptionFailed(const QByteArray &msg)
-{
-    qDebug() << "[MAIL] encryptionFailed" << QString(msg);
-    qDebug() << "[MAIL] Try enabling the \"acceptallcerts\" option in servatrice.ini";
+    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()
 {
-    qDebug() << "[MAIL] 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);
+}
+
+void SmtpClient::authenticationFailed(const QByteArray &msg)
+{
+    qCWarning(SmtpClientLog) << "authenticationFailed" << QString::fromUtf8(msg);
+    idleTimer->stop();
+    recordConnectionFailure();
+    mailIdToUser.clear();
+    smtp->disconnectFromHost();
+}
+
+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.
+}
+
+void SmtpClient::connectionFailed(const QByteArray &msg)
+{
+    qCWarning(SmtpClientLog) << "connectionFailed" << QString::fromUtf8(msg);
+    idleTimer->stop();
+    recordConnectionFailure();
+    mailIdToUser.clear();
+    smtp->disconnectFromHost();
+}
+
+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();
+}
+
+void SmtpClient::encrypted()
+{
+    qCDebug(SmtpClientLog) << "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();
+    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)
 {
-    qDebug() << "[MAIL] mailFailed id=" << mailID << " errorCode=" << errorCode << "msg=" << QString(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);
 }
 
 void SmtpClient::mailSent(int mailID)
 {
-    qDebug() << "[MAIL] mailSent" << 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);
 }
 
 void SmtpClient::recipientRejected(int mailID, const QString &address, const QByteArray &msg)
 {
-    qDebug() << "[MAIL] recipientRejected id=" << mailID << " address=" << address << "msg=" << QString(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);
+    }
 }
 
 void SmtpClient::senderRejected(int mailID, const QString &address, const QByteArray &msg)
 {
-    qDebug() << "[MAIL] senderRejected id=" << mailID << " address=" << address << "msg=" << QString(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);
+    }
 }
diff --git a/servatrice/src/smtpclient.h b/servatrice/src/smtpclient.h
index be97ed44d..9fc11bf36 100644
--- a/servatrice/src/smtpclient.h
+++ b/servatrice/src/smtpclient.h
@@ -1,24 +1,67 @@
 #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 QxtMailMessage;
+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 SmtpClient : public QObject
 {
     Q_OBJECT
 public:
-    SmtpClient(QObject *parent = 0);
-    ~SmtpClient();
+    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);
 
 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);
@@ -28,10 +71,55 @@ 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
\ No newline at end of file
+#endif
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6a5eacf54..22dbedb98 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,17 +1,11 @@
+# NOTE: Qt modules for tests are defined centrally in cmake/FindQtRuntime.cmake (the _TEST_NEEDED variable).
+# If a new test needs additional Qt modules, add them there — not in individual test CMakeLists.txt files.
 enable_testing()
-add_test(NAME dummy_test COMMAND dummy_test)
-add_test(NAME expression_test COMMAND expression_test)
 
-add_test(NAME test_age_formatting COMMAND test_age_formatting)
-add_test(NAME password_hash_test COMMAND password_hash_test)
+include(GoogleTest)
 
 # Find GTest
 
-add_executable(dummy_test dummy_test.cpp)
-add_executable(expression_test expression_test.cpp)
-add_executable(test_age_formatting test_age_formatting.cpp)
-add_executable(password_hash_test password_hash_test.cpp)
-
 find_package(GTest)
 
 if(NOT GTEST_FOUND)
@@ -36,21 +30,360 @@ 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")
-  set(GTEST_BOTH_LIBRARIES gtest)
-  add_dependencies(dummy_test gtest)
-  add_dependencies(expression_test gtest)
-  add_dependencies(test_age_formatting gtest)
-  add_dependencies(password_hash_test gtest)
+  # 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)
 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})
-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(test_age_formatting Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
-target_link_libraries(
-  password_hash_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}
+
+# --- 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(
+    ${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_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
+  )
+endif()
+
+# 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
+  )
+endif()
+
+add_subdirectory(card_zone_algorithms)
 add_subdirectory(carddatabase)
+add_subdirectory(deck_list_model)
+add_subdirectory(deck_list_zones)
 add_subdirectory(loading_from_clipboard)
+add_subdirectory(movecard_tests)
 add_subdirectory(oracle)
+add_subdirectory(settings)
+
+# theme_migration_test compiles client sources, whose headers are only reachable from a client build.
+if(WITH_CLIENT)
+  add_subdirectory(theme_migration)
+endif()
+
+# picture_loader_benchmark links libcockatrice_settings, which only exists when
+# a client/UI-capable target is being built.
+if(WITH_ORACLE OR WITH_CLIENT)
+  add_subdirectory(picture_loader_benchmark)
+endif()
diff --git a/tests/card_update_progress_test.cpp b/tests/card_update_progress_test.cpp
new file mode 100644
index 000000000..849cf623c
--- /dev/null
+++ b/tests/card_update_progress_test.cpp
@@ -0,0 +1,93 @@
+#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
new file mode 100644
index 000000000..945f8a0ed
--- /dev/null
+++ b/tests/card_zone_algorithms/CMakeLists.txt
@@ -0,0 +1,4 @@
+cockatrice_add_test(
+  NAME card_zone_algorithms_test SOURCES card_zone_algorithms_test.cpp INCLUDE_DIRS
+  ${CMAKE_SOURCE_DIR}/cockatrice/src/game/zones
+)
diff --git a/tests/card_zone_algorithms/card_zone_algorithms_test.cpp b/tests/card_zone_algorithms/card_zone_algorithms_test.cpp
new file mode 100644
index 000000000..4f5282235
--- /dev/null
+++ b/tests/card_zone_algorithms/card_zone_algorithms_test.cpp
@@ -0,0 +1,189 @@
+#include "card_zone_algorithms.h"
+
+#include <gtest/gtest.h>
+#include <string>
+#include <vector>
+
+struct MockCardRef
+{
+};
+
+struct MockCard
+{
+    int idSet = 0;
+    bool idWasCalled = false;
+    MockCardRef cardRefSet{};
+    bool cardRefWasCalled = false;
+    bool resetStateCalled = false;
+    bool resetStateKeepAnnotations = false;
+    bool visibleSet = false;
+
+    void setId(int id)
+    {
+        idSet = id;
+        idWasCalled = true;
+    }
+
+    void setCardRef(MockCardRef ref)
+    {
+        cardRefSet = ref;
+        cardRefWasCalled = true;
+    }
+
+    void resetState(bool keepAnnotations)
+    {
+        resetStateCalled = true;
+        resetStateKeepAnnotations = keepAnnotations;
+    }
+
+    void setVisible(bool visible)
+    {
+        visibleSet = visible;
+    }
+};
+
+class MockCardList
+{
+    std::vector<MockCard *> cards;
+    bool contentsKnown;
+
+public:
+    explicit MockCardList(bool _contentsKnown) : contentsKnown(_contentsKnown)
+    {
+    }
+
+    int size() const
+    {
+        return static_cast<int>(cards.size());
+    }
+
+    void insert(int index, MockCard *card)
+    {
+        cards.insert(cards.begin() + index, card);
+    }
+
+    bool getContentsKnown() const
+    {
+        return contentsKnown;
+    }
+
+    MockCard *at(int index) const
+    {
+        return cards.at(index);
+    }
+};
+
+class AddCardAlgorithmTest : public ::testing::Test
+{
+protected:
+    MockCardList knownList{true};
+    MockCardList unknownList{false};
+};
+
+TEST_F(AddCardAlgorithmTest, NegativeIndexClampsToEnd)
+{
+    MockCard a, b;
+    CardZoneAlgorithms::addCardToList(knownList, &a, 0, false);
+    CardZoneAlgorithms::addCardToList(knownList, &b, -1, false);
+
+    EXPECT_EQ(knownList.at(0), &a);
+    EXPECT_EQ(knownList.at(1), &b);
+    EXPECT_EQ(knownList.size(), 2);
+}
+
+TEST_F(AddCardAlgorithmTest, IndexBeyondSizeClampsToEnd)
+{
+    MockCard a, b;
+    CardZoneAlgorithms::addCardToList(knownList, &a, 0, false);
+    CardZoneAlgorithms::addCardToList(knownList, &b, 999, false);
+
+    EXPECT_EQ(knownList.at(0), &a);
+    EXPECT_EQ(knownList.at(1), &b);
+    EXPECT_EQ(knownList.size(), 2);
+}
+
+TEST_F(AddCardAlgorithmTest, ContentsKnownPreservesIdentity)
+{
+    MockCard card;
+    CardZoneAlgorithms::addCardToList(knownList, &card, 0, false);
+
+    EXPECT_FALSE(card.idWasCalled);
+    EXPECT_FALSE(card.cardRefWasCalled);
+    EXPECT_TRUE(card.visibleSet);
+}
+
+TEST_F(AddCardAlgorithmTest, ContentsUnknownClearsIdentity)
+{
+    MockCard card;
+    CardZoneAlgorithms::addCardToList(unknownList, &card, 0, false);
+
+    EXPECT_TRUE(card.idWasCalled);
+    EXPECT_EQ(card.idSet, -1);
+    EXPECT_TRUE(card.cardRefWasCalled);
+}
+
+TEST_F(AddCardAlgorithmTest, MidListInsertionPreservesOrder)
+{
+    MockCard a, b, c;
+    CardZoneAlgorithms::addCardToList(knownList, &a, 0, false);
+    CardZoneAlgorithms::addCardToList(knownList, &b, 1, false);
+    CardZoneAlgorithms::addCardToList(knownList, &c, 1, false);
+
+    EXPECT_EQ(knownList.size(), 3);
+    EXPECT_EQ(knownList.at(0), &a);
+    EXPECT_EQ(knownList.at(1), &c);
+    EXPECT_EQ(knownList.at(2), &b);
+}
+
+// Reconnecting to a game rebuilds zones from a ServerInfo_Zone. Non-coordinate zones
+// (hand, piles, stack) report x == 0 on every card, so inserting each rebuilt card at
+// that index would reverse the received server order. Appending (-1) keeps it.
+TEST_F(AddCardAlgorithmTest, RebuildInsertAtZeroReversesServerOrder)
+{
+    MockCard a, b, c;
+    CardZoneAlgorithms::addCardToList(knownList, &a, 0, false);
+    CardZoneAlgorithms::addCardToList(knownList, &b, 0, false);
+    CardZoneAlgorithms::addCardToList(knownList, &c, 0, false);
+
+    EXPECT_EQ(knownList.size(), 3);
+    EXPECT_EQ(knownList.at(0), &c);
+    EXPECT_EQ(knownList.at(1), &b);
+    EXPECT_EQ(knownList.at(2), &a);
+}
+
+TEST_F(AddCardAlgorithmTest, RebuildAppendPreservesServerOrder)
+{
+    MockCard a, b, c;
+    CardZoneAlgorithms::addCardToList(knownList, &a, -1, false);
+    CardZoneAlgorithms::addCardToList(knownList, &b, -1, false);
+    CardZoneAlgorithms::addCardToList(knownList, &c, -1, false);
+
+    EXPECT_EQ(knownList.size(), 3);
+    EXPECT_EQ(knownList.at(0), &a);
+    EXPECT_EQ(knownList.at(1), &b);
+    EXPECT_EQ(knownList.at(2), &c);
+}
+
+TEST_F(AddCardAlgorithmTest, KeepAnnotationsFalsePassedThrough)
+{
+    MockCard card;
+    CardZoneAlgorithms::addCardToList(knownList, &card, 0, false);
+
+    EXPECT_TRUE(card.resetStateCalled);
+    EXPECT_FALSE(card.resetStateKeepAnnotations);
+}
+
+TEST_F(AddCardAlgorithmTest, KeepAnnotationsTruePassedThrough)
+{
+    MockCard card;
+    CardZoneAlgorithms::addCardToList(knownList, &card, 0, true);
+
+    EXPECT_TRUE(card.resetStateCalled);
+    EXPECT_TRUE(card.resetStateKeepAnnotations);
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt
index 4eeffc363..22171a9e8 100644
--- a/tests/carddatabase/CMakeLists.txt
+++ b/tests/carddatabase/CMakeLists.txt
@@ -6,47 +6,49 @@ project(CardDatabaseTests VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MI
 # ------------------------
 add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
 
-# ------------------------
-# Qt modules
-# ------------------------
-set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VERSION_NAME}::Network
-                    ${COCKATRICE_QT_VERSION_NAME}::Widgets ${COCKATRICE_QT_VERSION_NAME}::Svg
-)
-
 # ------------------------
 # Card Database Test
 # ------------------------
-add_executable(carddatabase_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} carddatabase_test.cpp mocks.cpp)
-
-target_link_libraries(
+cockatrice_add_test(
+  NAME
   carddatabase_test
-  PRIVATE libcockatrice_card
-  PRIVATE Threads::Threads
-  PRIVATE ${GTEST_BOTH_LIBRARIES}
-  PRIVATE ${TEST_QT_MODULES}
+  SOURCES
+  ${VERSION_STRING_CPP}
+  carddatabase_test.cpp
+  mocks.cpp
+  LIBS
+  libcockatrice_card
 )
 
-add_test(NAME carddatabase_test COMMAND carddatabase_test)
-
 # ------------------------
 # Filter String Test
+# (guard must match the condition for libcockatrice_filters in the root CMakeLists.txt)
 # ------------------------
-add_executable(filter_string_test ${MOCKS_SOURCES} ${VERSION_STRING_CPP} filter_string_test.cpp mocks.cpp)
-
-target_link_libraries(
-  filter_string_test
-  PRIVATE libcockatrice_filters
-  PRIVATE Threads::Threads
-  PRIVATE ${GTEST_BOTH_LIBRARIES}
-  PRIVATE ${TEST_QT_MODULES}
-)
-
-add_test(NAME filter_string_test COMMAND filter_string_test)
-
-# ------------------------
-# Dependencies on gtest
-# ------------------------
-if(NOT GTEST_FOUND)
-  add_dependencies(carddatabase_test gtest)
-  add_dependencies(filter_string_test gtest)
+if(WITH_ORACLE OR WITH_CLIENT)
+  cockatrice_add_test(
+    NAME
+    filter_string_test
+    SOURCES
+    ${VERSION_STRING_CPP}
+    filter_string_test.cpp
+    mocks.cpp
+    LIBS
+    libcockatrice_filters
+  )
 endif()
+
+# ------------------------
+# Load Benchmark (manual, not run in CI)
+# ------------------------
+cockatrice_add_manual_test(
+  NAME
+  load_benchmark
+  SOURCES
+  ${VERSION_STRING_CPP}
+  load_benchmark.cpp
+  mocks.cpp
+  LIBS
+  libcockatrice_card
+  libcockatrice_models
+  MANUAL
+)
diff --git a/tests/carddatabase/carddatabase_test.cpp b/tests/carddatabase/carddatabase_test.cpp
index 3fa0e3834..1b48d934b 100644
--- a/tests/carddatabase/carddatabase_test.cpp
+++ b/tests/carddatabase/carddatabase_test.cpp
@@ -1,9 +1,35 @@
-#include "mocks.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/set/card_set.h"
+#include "libcockatrice/card/set/card_set_list.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
 {
@@ -33,6 +59,455 @@ TEST(CardDatabaseTest, LoadXml)
     ASSERT_EQ(0, db->query()->getAllMainCardTypes().size()) << "Types not empty after clear";
     ASSERT_EQ(NotLoaded, db->getLoadStatus()) << "Incorrect status after clear";
 }
+
+TEST(CardDatabaseTest, Xml4LocalizedDataRoundTrip)
+{
+    NoopCardSetPriorityController controller;
+    CardSetPtr set =
+        CardSet::newInstance(&controller, "TST", "Test Set", "expansion", QDate(), CardSet::PriorityPrimary);
+
+    QHash<QString, QString> props;
+    props["manacost"] = "1R";
+    PrintingInfo printing(set, LazyPropertiesHash(props));
+    SetToPrintingsMap setsInfo;
+    setsInfo["TST"].append(printing);
+
+    CardInfo::UiAttributes attributes = {.tableRow = 1};
+    CardInfoPtr card =
+        CardInfo::newInstance("Lightning Bolt", "Deal 3 damage.", false, {}, {}, {}, setsInfo, attributes);
+    card->setLocalizedName("de", "Blitzschlag");
+    card->setLocalizedText("de", "Blitzschlag fügt 3 Schadenspunkte zu.");
+
+    SetNameMap sets;
+    sets.insert("TST", set);
+    CardNameMap cards;
+    cards.insert("Lightning Bolt", card);
+
+    QTemporaryDir tempDir;
+    const QString fileName = tempDir.filePath("cards.xml");
+    CockatriceXml4Parser writer(&controller);
+    ASSERT_TRUE(writer.saveToFile({}, sets, cards, fileName));
+
+    CardDatabaseData data;
+    CockatriceXml4Parser parser(&controller);
+    QFile file(fileName);
+    ASSERT_TRUE(file.open(QIODevice::ReadOnly));
+    parser.parseFileInto(file, data);
+
+    CardInfoPtr loaded = data.cards.value("Lightning Bolt");
+    ASSERT_FALSE(loaded.isNull());
+    ASSERT_EQ(loaded->getName(), "Lightning Bolt");
+    ASSERT_EQ(loaded->getLocalizedName("de"), "Blitzschlag");
+    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 c3e8c6fb7..95225e28c 100644
--- a/tests/carddatabase/filter_string_test.cpp
+++ b/tests/carddatabase/filter_string_test.cpp
@@ -1,10 +1,29 @@
-#include "mocks.h"
+#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 "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)                                                                                            \
@@ -71,8 +90,142 @@ QUERY(Color2, cat, "c:gw", true)
 QUERY(Color3, cat, "c!g", true)
 QUERY(Color4, cat, "c!gw", false)
 
+QUERY(SetCodeCaseInsensitive1, cat, "set:cat", true)
+QUERY(SetCodeCaseInsensitive2, cat, "set:CAT", true)
+QUERY(SetCodeCaseInsensitive3, cat, "set:CAt", true)
+QUERY(SetCodeShortForm, cat, "e:cat", true)
+QUERY(SetCodeWrongSet, cat, "set:who", false)
+QUERY(SetCodeWrongSet2, doctor, "set:cat", false)
+
+QUERY(BracketNextToUnquotedString, cat, "(o:woof OR o:meow)", true)
+
+CardInfoPtr localizedCat()
+{
+    CardInfoPtr localized = CardInfo::newInstance("Cat", "Meow!", false, {}, {}, {}, {}, {});
+    localized->setLocalizedName("de", "Kater");
+    localized->setLocalizedText("de", "miaut");
+    return localized;
+}
+
+TEST_F(CardQuery, SearchLanguageEnglishMatchesOnlyEnglish)
+{
+    const CardData localized = localizedCat();
+    ASSERT_TRUE(FilterString("Cat", CardSearchLanguage{"de", SearchLanguageMode::English}).check(localized));
+    ASSERT_FALSE(FilterString("Kater", CardSearchLanguage{"de", SearchLanguageMode::English}).check(localized));
+}
+
+TEST_F(CardQuery, SearchLanguageSelectedMatchesLocalizedNameAndText)
+{
+    const CardData localized = localizedCat();
+    ASSERT_TRUE(FilterString("Kater", CardSearchLanguage{"de", SearchLanguageMode::Selected}).check(localized));
+    ASSERT_TRUE(FilterString("o:miaut", CardSearchLanguage{"de", SearchLanguageMode::Selected}).check(localized));
+    ASSERT_FALSE(FilterString("Cat", CardSearchLanguage{"de", SearchLanguageMode::Selected}).check(localized));
+}
+
+TEST_F(CardQuery, SearchLanguageSelectedFallsBackToEnglishForUntranslatedCards)
+{
+    const CardData localized = localizedCat();
+    ASSERT_TRUE(FilterString("Cat", CardSearchLanguage{"fr", SearchLanguageMode::Selected}).check(localized));
+    ASSERT_FALSE(FilterString("Kater", CardSearchLanguage{"fr", SearchLanguageMode::Selected}).check(localized));
+}
+
+TEST_F(CardQuery, SearchLanguageBothMatchesEitherLanguage)
+{
+    const CardData localized = localizedCat();
+    ASSERT_TRUE(FilterString("Cat", CardSearchLanguage{"de", SearchLanguageMode::Both}).check(localized));
+    ASSERT_TRUE(FilterString("Kater", CardSearchLanguage{"de", SearchLanguageMode::Both}).check(localized));
+}
+
+TEST_F(CardQuery, SearchLanguageIsBoundPerInstance)
+{
+    const CardData localized = localizedCat();
+
+    FilterString germanQuery("Kater", CardSearchLanguage{"de", SearchLanguageMode::Selected});
+    ASSERT_TRUE(germanQuery.check(localized));
+
+    // Constructing an English-bound instance afterwards must not change the
+    // language the earlier instance searches in.
+    FilterString englishQuery("Kater", CardSearchLanguage{"", SearchLanguageMode::English});
+    ASSERT_FALSE(englishQuery.check(localized));
+    ASSERT_TRUE(germanQuery.check(localized));
+}
+
 } // namespace
 
+class SetQuery : public ::testing::Test
+{
+protected:
+    void SetUp() override
+    {
+        // EOE and EOC share a release date, like a set and its Commander counterpart.
+        const QDate sharedReleaseDate(2026, 3, 13);
+        mainSet = CardSet::newInstance(&controller, "EOE", "Edge of Eternities", "expansion", sharedReleaseDate,
+                                       CardSet::PriorityPrimary);
+        commanderSet = CardSet::newInstance(&controller, "EOC", "Edge of Eternities Commander", "commander",
+                                            sharedReleaseDate, CardSet::PrioritySecondary);
+        oldSet = CardSet::newInstance(&controller, "OLD", "Older Set", "expansion", QDate(2020, 1, 1),
+                                      CardSet::PriorityPrimary);
+
+        inBothSets = newCardWithPrintings({{"EOE", mainSet}, {"EOC", commanderSet}});
+        onlyInCommanderSet = newCardWithPrintings({{"EOC", commanderSet}});
+        onlyInOldSet = newCardWithPrintings({{"OLD", oldSet}});
+
+        // SetExpression resolves set codes to release dates through the global set list.
+        auto *database = CardDatabaseManager::getInstance();
+        database->addSet(mainSet);
+        database->addSet(commanderSet);
+        database->addSet(oldSet);
+    }
+
+    CardInfoPtr newCardWithPrintings(const QList<QPair<QString, CardSetPtr>> &printings)
+    {
+        SetToPrintingsMap setsInfo;
+        for (const auto &printing : printings) {
+            setsInfo[printing.first].append(PrintingInfo(printing.second));
+        }
+        return CardInfo::newInstance("Test Card", "", false, {}, {}, {}, setsInfo, CardInfo::UiAttributes());
+    }
+
+    NoopCardSetPriorityController controller;
+    CardSetPtr mainSet;
+    CardSetPtr commanderSet;
+    CardSetPtr oldSet;
+    CardInfoPtr inBothSets;
+    CardInfoPtr onlyInCommanderSet;
+    CardInfoPtr onlyInOldSet;
+};
+
+TEST_F(SetQuery, ExactMatchSeparatesSameDaySets)
+{
+    EXPECT_TRUE(FilterString("set:EOE").check(inBothSets));
+    EXPECT_TRUE(FilterString("e:EOE").check(inBothSets));
+    EXPECT_TRUE(FilterString("set:EOC").check(inBothSets));
+    EXPECT_FALSE(FilterString("set:EOE").check(onlyInCommanderSet));
+    EXPECT_TRUE(FilterString("set:EOC").check(onlyInCommanderSet));
+}
+
+TEST_F(SetQuery, ExactMatchIsCaseInsensitive)
+{
+    EXPECT_TRUE(FilterString("set:eoe").check(inBothSets));
+    EXPECT_TRUE(FilterString("set:EoE").check(inBothSets));
+    EXPECT_FALSE(FilterString("set:eoe").check(onlyInCommanderSet));
+}
+
+TEST_F(SetQuery, NotEqualsMatchesPrintingsOutsideTheSet)
+{
+    EXPECT_FALSE(FilterString("set!EOE").check(inBothSets));
+    EXPECT_TRUE(FilterString("set!EOE").check(onlyInCommanderSet));
+}
+
+TEST_F(SetQuery, ComparisonMatchesByReleaseDate)
+{
+    // OLD (2020) predates EOE/EOC (2026-03-13), so comparison operators still use release dates.
+    EXPECT_TRUE(FilterString("set<EOE").check(onlyInOldSet));
+    EXPECT_FALSE(FilterString("set>EOE").check(onlyInOldSet));
+    EXPECT_TRUE(FilterString("set>=EOE").check(inBothSets));
+    EXPECT_FALSE(FilterString("set<EOE").check(inBothSets));
+}
+
 int main(int argc, char **argv)
 {
     ::testing::InitGoogleTest(&argc, argv);
diff --git a/tests/carddatabase/load_benchmark.cpp b/tests/carddatabase/load_benchmark.cpp
new file mode 100644
index 000000000..5492b9531
--- /dev/null
+++ b/tests/carddatabase/load_benchmark.cpp
@@ -0,0 +1,240 @@
+/*
+ * Standalone benchmark for card database loading.
+ *
+ * Measures wall-clock cost and model churn:
+ *   - Cold load (XML -> write cache)
+ *   - Warm load (read cache)
+ *
+ * Run:
+ *   load_benchmark [--carddb PATH] [--tokens PATH] [--spoilers PATH] [--custom DIR]
+ *
+ * All arguments are optional; they default to the XDG Cockatrice data location
+ * (~/.local/share/Cockatrice/Cockatrice/...).
+ */
+
+#include "libcockatrice/card/card_info.h"
+#include "libcockatrice/card/set/card_set_list.h"
+
+#include <QAbstractItemModel>
+#include <QCoreApplication>
+#include <QDebug>
+#include <QDir>
+#include <QElapsedTimer>
+#include <QFile>
+#include <QHash>
+#include <QList>
+#include <QLoggingCategory>
+#include <QObject>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+#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)
+{
+    QString base = QDir::homePath() + "/.local/share/Cockatrice/Cockatrice/";
+    return base + file;
+}
+
+class CliCardDatabasePathProvider : public ICardDatabasePathProvider
+{
+public:
+    QString cardDb;
+    QString tokens;
+    QString spoilers;
+    QString custom;
+
+    QString getCardDatabasePath() const override
+    {
+        return cardDb;
+    }
+    QString getTokenDatabasePath() const override
+    {
+        return tokens;
+    }
+    QString getSpoilerCardDatabasePath() const override
+    {
+        return spoilers;
+    }
+    QString getCustomCardDatabasePath() const override
+    {
+        return custom;
+    }
+};
+
+namespace
+{
+struct ChurnCounters
+{
+    qint64 cardAddedEmissions = 0;
+    qint64 cardRemovedEmissions = 0;
+    qint64 modelRowsInserted = 0;
+    qint64 modelRowsRemoved = 0;
+    qint64 loadingFinishedSignals = 0;
+    qint64 databaseResetSignals = 0;
+    qint64 modelResets = 0;
+};
+
+struct RunResult
+{
+    qint64 elapsedMs = 0;
+    qint64 cardCount = 0;
+    qint64 setCount = 0;
+    LoadStatus status = NotLoaded;
+    ChurnCounters churn;
+    qint64 propsQueried = 0;
+    qint64 propTotal = 0;
+};
+
+void deleteCache(const QString &cardDbPath)
+{
+    const QString cachePath = cardDbPath + ".cache";
+    if (QFile::exists(cachePath)) {
+        QFile::remove(cachePath);
+    }
+}
+
+RunResult runLoad(CardDatabase *db, ChurnCounters &counters)
+{
+    const ChurnCounters before = counters;
+
+    QElapsedTimer timer;
+    timer.start();
+
+    db->loadCardDatabases();
+
+    RunResult result;
+    result.elapsedMs = timer.elapsed();
+    result.cardCount = db->getCardList().size();
+    result.setCount = db->getSetList().size();
+    result.status = db->getLoadStatus();
+
+    result.churn.cardAddedEmissions = counters.cardAddedEmissions - before.cardAddedEmissions;
+    result.churn.cardRemovedEmissions = counters.cardRemovedEmissions - before.cardRemovedEmissions;
+    result.churn.modelRowsInserted = counters.modelRowsInserted - before.modelRowsInserted;
+    result.churn.modelRowsRemoved = counters.modelRowsRemoved - before.modelRowsRemoved;
+    result.churn.loadingFinishedSignals = counters.loadingFinishedSignals - before.loadingFinishedSignals;
+    result.churn.databaseResetSignals = counters.databaseResetSignals - before.databaseResetSignals;
+    result.churn.modelResets = counters.modelResets - before.modelResets;
+
+    for (const CardInfoPtr &card : db->getCardList()) {
+        result.propTotal += card->getPropertiesHash().size();
+        if (!card->getProperty("colors").isEmpty()) {
+            ++result.propsQueried;
+        }
+    }
+
+    return result;
+}
+
+void printResult(const QString &label, const RunResult &r)
+{
+    qInfo() << "----------------------------------------";
+    qInfo() << label;
+    qInfo() << "  Load wall-clock time :" << r.elapsedMs << "ms";
+    qInfo() << "  Cards loaded        :" << r.cardCount;
+    qInfo() << "  Sets loaded         :" << r.setCount;
+    qInfo() << "  Load status         :" << r.status;
+    qInfo() << "  Properties queried  :" << r.propsQueried << "/" << r.cardCount
+            << " cards, total props:" << r.propTotal;
+    qInfo() << "  CHURN during load:";
+    qInfo() << "    cardAdded emissions        :" << r.churn.cardAddedEmissions;
+    qInfo() << "    cardRemoved emissions      :" << r.churn.cardRemovedEmissions;
+    qInfo() << "    model rowsInserted         :" << r.churn.modelRowsInserted;
+    qInfo() << "    model rowsRemoved          :" << r.churn.modelRowsRemoved;
+    qInfo() << "    loadingFinished signals    :" << r.churn.loadingFinishedSignals;
+    qInfo() << "    databaseReset signals      :" << r.churn.databaseResetSignals;
+    qInfo() << "    model resets (batch)       :" << r.churn.modelResets;
+}
+} // namespace
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    QStringList args = app.arguments();
+    CliCardDatabasePathProvider pathProvider;
+    pathProvider.cardDb = defaultXdgPath("cards.xml");
+    pathProvider.tokens = defaultXdgPath("tokens.xml");
+    pathProvider.spoilers = defaultXdgPath("spoiler.xml");
+    pathProvider.custom = defaultXdgPath("customsets/");
+
+    for (int i = 1; i < args.size(); ++i) {
+        const QString &a = args.at(i);
+        if (a == "--carddb" && i + 1 < args.size()) {
+            pathProvider.cardDb = args.at(++i);
+        } else if (a == "--tokens" && i + 1 < args.size()) {
+            pathProvider.tokens = args.at(++i);
+        } else if (a == "--spoilers" && i + 1 < args.size()) {
+            pathProvider.spoilers = args.at(++i);
+        } else if (a == "--custom" && i + 1 < args.size()) {
+            pathProvider.custom = args.at(++i);
+        } else if (a == "--help" || a == "-h") {
+            qInfo() << "Usage: load_benchmark [--carddb PATH] [--tokens PATH] [--spoilers PATH] [--custom DIR]";
+            return 0;
+        }
+    }
+
+    QLoggingCategory::setFilterRules("card_database.loading=true\n"
+                                     "card_database.loading.success=true\n");
+
+    qInfo() << "=== Card Database Load Benchmark ===";
+    qInfo() << "carddb      :" << pathProvider.cardDb;
+    qInfo() << "tokens      :" << pathProvider.tokens;
+    qInfo() << "spoilers    :" << pathProvider.spoilers;
+    qInfo() << "custom      :" << pathProvider.custom;
+    qInfo() << "";
+
+    ChurnCounters counters;
+
+    auto runScenario = [&](bool deleteCacheBefore) -> RunResult {
+        if (deleteCacheBefore) {
+            deleteCache(pathProvider.cardDb);
+        }
+
+        // Fresh database each scenario so signals don't accumulate across scenarios
+        // for the churn counters, but we keep the same counters object to get a
+        // running total if desired.
+        CardDatabase db(nullptr, new NoopCardPreferenceProvider(), &pathProvider, new NoopCardSetPriorityController());
+
+        // Re-wire churn counters for this db instance
+        QObject::connect(&db, &CardDatabase::cardAdded, &app,
+                         [&counters](const CardInfoPtr &) { ++counters.cardAddedEmissions; });
+        QObject::connect(&db, &CardDatabase::cardRemoved, &app,
+                         [&counters](CardInfoPtr) { ++counters.cardRemovedEmissions; });
+        QObject::connect(&db, &CardDatabase::cardDatabaseLoadingFinished, &app,
+                         [&counters]() { ++counters.loadingFinishedSignals; });
+        QObject::connect(&db, &CardDatabase::cardDatabaseReset, &app,
+                         [&counters]() { ++counters.databaseResetSignals; });
+
+        CardDatabaseModel model(&db, false);
+        QObject::connect(&model, &QAbstractItemModel::rowsInserted, &app,
+                         [&counters](const QModelIndex &, int, int) { ++counters.modelRowsInserted; });
+        QObject::connect(&model, &QAbstractItemModel::rowsRemoved, &app,
+                         [&counters](const QModelIndex &, int, int) { ++counters.modelRowsRemoved; });
+        QObject::connect(&model, &QAbstractItemModel::modelReset, &app, [&counters]() { ++counters.modelResets; });
+
+        return runLoad(&db, counters);
+    };
+
+    // ---- Scenario 1: Cold load (XML -> write cache) ----
+    printResult("Scenario 1: Cold load (XML -> cache)", runScenario(true));
+
+    // ---- Scenario 2: Warm load (read cache) ----
+    printResult("Scenario 2: Warm load (read cache)", runScenario(false));
+
+    // Teardown
+    deleteCache(pathProvider.cardDb);
+
+    qInfo() << "----------------------------------------";
+    qInfo() << "Done.";
+
+    return 0;
+}
diff --git a/tests/carddatabase/mocks.h b/tests/carddatabase/mocks.h
index 016642005..b7cfe8243 100644
--- a/tests/carddatabase/mocks.h
+++ b/tests/carddatabase/mocks.h
@@ -7,7 +7,7 @@
 
 #define PICTURELOADER_H
 
-#include <libcockatrice/card/database/card_database.h>
+#include "libcockatrice/card/card_info.h"
 
 class CardPictureLoader
 {
diff --git a/tests/clamped_arithmetic_test.cpp b/tests/clamped_arithmetic_test.cpp
new file mode 100644
index 000000000..e5fd070b0
--- /dev/null
+++ b/tests/clamped_arithmetic_test.cpp
@@ -0,0 +1,45 @@
+/** @file clamped_arithmetic_test.cpp
+ *  @brief Tests for shared helpers in clamped_arithmetic.h.
+ *  @ingroup Tests
+ */
+
+#include <gtest/gtest.h>
+#include <libcockatrice/utility/clamped_arithmetic.h>
+#include <limits>
+#include <string>
+
+TEST(AddClamped, AddsWithinBounds)
+{
+    EXPECT_EQ(addClamped(5, 3, 0, 100), 8);
+    EXPECT_EQ(addClamped(10, -3, 0, 100), 7);
+}
+
+TEST(AddClamped, ClampsToUpperAndLowerBound)
+{
+    EXPECT_EQ(addClamped(99, 5, 0, 100), 100);  // saturates at max
+    EXPECT_EQ(addClamped(2, -10, 0, 100), 0);   // saturates at min
+    EXPECT_EQ(addClamped(999, 1, 0, 999), 999); // crossing the counter cap holds at the bound
+}
+
+TEST(AddClamped, IntOverflowDoesNotWrap)
+{
+    // The 64-bit intermediate must prevent signed-int overflow UB.
+    constexpr int intMax = std::numeric_limits<int>::max();
+    constexpr int intMin = std::numeric_limits<int>::min();
+    EXPECT_EQ(addClamped(intMax, 1, intMin, intMax), intMax);
+    EXPECT_EQ(addClamped(intMax, intMax, intMin, intMax), intMax);
+}
+
+TEST(AddClamped, IntUnderflowDoesNotWrap)
+{
+    constexpr int intMax = std::numeric_limits<int>::max();
+    constexpr int intMin = std::numeric_limits<int>::min();
+    EXPECT_EQ(addClamped(intMin, -1, intMin, intMax), intMin);
+    EXPECT_EQ(addClamped(intMin, intMin, intMin, intMax), intMin);
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/deck_hash_performance_test.cpp b/tests/deck_hash_performance_test.cpp
new file mode 100644
index 000000000..135c218c5
--- /dev/null
+++ b/tests/deck_hash_performance_test.cpp
@@ -0,0 +1,85 @@
+#include "gtest/gtest.h"
+#include <QChar>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <string>
+
+static constexpr int amount = 1e5;
+QString repeatDeck;
+QString numberDeck;
+QString uniquesDeck;
+QString uniquesXorDeck;
+QString duplicatesDeck;
+
+TEST(DeckHashTest, RepeatTest)
+{
+    DeckList decklist(repeatDeck);
+    for (int i = 0; i < amount; ++i) {
+        decklist.getDeckHash();
+        decklist.refreshDeckHash();
+    }
+    auto hash = decklist.getDeckHash().toStdString();
+    ASSERT_EQ(hash, "5cac19qm") << "The hash does not match!";
+}
+
+TEST(DeckHashTest, NumberTest)
+{
+    DeckList decklist(numberDeck);
+    auto hash = decklist.getDeckHash().toStdString();
+    ASSERT_EQ(hash, "e0m38p19") << "The hash does not match!";
+}
+
+TEST(DeckHashTest, UniquesTest)
+{
+    DeckList decklist(uniquesDeck);
+    auto hash = decklist.getDeckHash().toStdString();
+    ASSERT_EQ(hash, "88prk025") << "The hash does not match!";
+}
+
+TEST(DeckHashTest, UniquesTestXor)
+{
+    DeckList decklist(uniquesXorDeck);
+    auto hash = decklist.getDeckHash().toStdString();
+    ASSERT_EQ(hash, "hkn6q4pf") << "The hash does not match!";
+}
+
+TEST(DeckHashTest, DuplicatesTest)
+{
+    DeckList decklist(duplicatesDeck);
+    auto hash = decklist.getDeckHash().toStdString();
+    ASSERT_EQ(hash, "ekt6tg1h") << "The hash does not match!";
+}
+
+int main(int argc, char **argv)
+{
+    const QString deckStart =
+        R"(<?xml version="1.0"?><cockatrice_deck version="1"><deckname></deckname><comments></comments><zone name="main">)";
+    const QString deckEnd = R"(</zone></cockatrice_deck>)";
+
+    repeatDeck =
+        deckStart +
+        R"(<card number="1" name="Mountain"/><card number="2" name="Island"/></zone><zone name="side"><card number="3" name="Forest"/>)" +
+        deckEnd;
+    numberDeck = deckStart + QString(R"(<card number="%1" name="Island"/>)").arg(amount) + deckEnd;
+
+    QStringList deckString{deckStart};
+    QStringList deckStringXor = deckString;
+    int len = QString::number(amount).length();
+    for (int i = 0; i < amount; ++i) {
+        // creates already sorted list
+        deckString << R"(<card number="1" name="card )" << QString::number(i).rightJustified(len, '0') << R"("/>)";
+        // xor in order to mess with sorting
+        deckStringXor << R"(<card number="1" name="card )" << QString::number(i ^ amount) << R"("/>)";
+    }
+    deckString << deckEnd;
+    deckStringXor << deckEnd;
+    uniquesDeck = deckString.join("");
+    uniquesXorDeck = deckStringXor.join("");
+
+    duplicatesDeck = deckStart + QString(R"(<card number="1" name="card"/>)").repeated(amount) + deckEnd;
+
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/deck_list_model/CMakeLists.txt b/tests/deck_list_model/CMakeLists.txt
new file mode 100644
index 000000000..cd7d693f3
--- /dev/null
+++ b/tests/deck_list_model/CMakeLists.txt
@@ -0,0 +1,23 @@
+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
+)
+
+cockatrice_add_test(
+  NAME
+  deck_list_model_zone_integration_test
+  SOURCES
+  ${VERSION_STRING_CPP}
+  deck_list_model_zone_integration_test.cpp
+  LIBS
+  libcockatrice_models
+  libcockatrice_card
+  libcockatrice_deck_list
+)
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
new file mode 100644
index 000000000..95df74702
--- /dev/null
+++ b/tests/deck_list_model/deck_list_model_custom_zones_test.cpp
@@ -0,0 +1,285 @@
+/**
+ * @file deck_list_model_custom_zones_test.cpp
+ * @brief Tests for the deck list model's custom-zone shadow-tree helpers.
+ *
+ * DeckListModelCustomZones centralizes every "what is / where is a custom zone"
+ * decision for the model's shadow tree: type testing, mirroring from the deck
+ * tree, name lookup, and the sort-with-custom-zones-last ordering. These tests
+ * exercise that logic directly on hand-built shadow trees, independent of the
+ * 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
+{
+
+DecklistModelCardNode *cardNode(InnerDecklistNode *parent, const QString &name, int number)
+{
+    // The underlying data node is detached; only the model wrapper is attached to the shadow tree.
+    auto *data = new DecklistCardNode(name, number, nullptr);
+    return new DecklistModelCardNode(data, parent);
+}
+
+QStringList childNames(const InnerDecklistNode *node)
+{
+    QStringList names;
+    for (int i = 0; i < node->size(); ++i) {
+        names.append(node->at(i)->getName());
+    }
+    return names;
+}
+
+} // namespace
+
+// =====================================================================================================================
+// isCustomZone
+// =====================================================================================================================
+
+TEST(DeckListModelCustomZones, IsCustomZoneDistinguishesZoneFromGroup)
+{
+    InnerDecklistNode root;
+    auto *board = new InnerDecklistNode(DECK_ZONE_MAIN, &root);
+    auto *group = new InnerDecklistNode("Creature", board);
+    auto *zone = new DecklistModelSubZoneNode("Removal", board);
+
+    auto *card = cardNode(group, "A", 1);
+
+    EXPECT_FALSE(DeckListModelCustomZones::isCustomZone(board));
+    EXPECT_FALSE(DeckListModelCustomZones::isCustomZone(group));
+    EXPECT_FALSE(DeckListModelCustomZones::isCustomZone(card));
+    EXPECT_TRUE(DeckListModelCustomZones::isCustomZone(zone));
+}
+
+// =====================================================================================================================
+// findSubZoneByName
+// =====================================================================================================================
+
+TEST(DeckListModelCustomZones, FindSubZoneByNameFindsAcrossBoards)
+{
+    InnerDecklistNode root;
+    auto *main = new InnerDecklistNode(DECK_ZONE_MAIN, &root);
+    auto *side = new InnerDecklistNode(DECK_ZONE_SIDE, &root);
+    new DecklistModelSubZoneNode("Removal", main);
+    new DecklistModelSubZoneNode("Utility", side);
+    new InnerDecklistNode("Plain", main); // not a custom zone
+
+    auto *removal = DeckListModelCustomZones::findSubZoneByName(&root, "Removal");
+    ASSERT_NE(removal, nullptr);
+    EXPECT_EQ(removal->getName(), QString("Removal"));
+
+    auto *utility = DeckListModelCustomZones::findSubZoneByName(&root, "Utility");
+    ASSERT_NE(utility, nullptr);
+    EXPECT_EQ(utility->getName(), QString("Utility"));
+
+    // Names are deck-unique; a plain group or built-in board is not matched.
+    EXPECT_EQ(DeckListModelCustomZones::findSubZoneByName(&root, "Plain"), nullptr);
+    EXPECT_EQ(DeckListModelCustomZones::findSubZoneByName(&root, DECK_ZONE_MAIN), nullptr);
+    EXPECT_EQ(DeckListModelCustomZones::findSubZoneByName(&root, "Missing"), nullptr);
+}
+
+// =====================================================================================================================
+// mirrorCustomZones
+// =====================================================================================================================
+
+TEST(DeckListModelCustomZones, MirrorCustomZonesCopiesCardsFlat)
+{
+    // Deck-tree board zone: one direct card plus one nested custom zone.
+    auto *deckBoard = new InnerDecklistNode(DECK_ZONE_MAIN);
+    new DecklistCardNode("Direct", 2, deckBoard);
+
+    auto *deckZone = new InnerDecklistNode("Removal", deckBoard);
+    auto *deckCard1 = new DecklistCardNode("Bolt", 3, deckZone);
+    auto *deckCard2 = new DecklistCardNode("Swords", 1, deckZone);
+
+    InnerDecklistNode shadowRoot;
+    auto *shadowBoard = new InnerDecklistNode(DECK_ZONE_MAIN, &shadowRoot);
+
+    DeckListModelCustomZones::mirrorCustomZones(deckBoard, shadowBoard);
+
+    // Only the custom zone is mirrored as a sub-zone; the direct card is not.
+    ASSERT_EQ(shadowBoard->size(), 1);
+    auto *shadowZone = dynamic_cast<DecklistModelSubZoneNode *>(shadowBoard->at(0));
+    ASSERT_NE(shadowZone, nullptr);
+    EXPECT_EQ(shadowZone->getName(), QString("Removal"));
+
+    // Cards live flat (un-grouped) inside the mirrored zone, wrapping the same data nodes.
+    ASSERT_EQ(shadowZone->size(), 2);
+    auto *shadowCard1 = dynamic_cast<DecklistModelCardNode *>(shadowZone->at(0));
+    auto *shadowCard2 = dynamic_cast<DecklistModelCardNode *>(shadowZone->at(1));
+    ASSERT_NE(shadowCard1, nullptr);
+    ASSERT_NE(shadowCard2, nullptr);
+    EXPECT_EQ(shadowCard1->getDataNode(), deckCard1);
+    EXPECT_EQ(shadowCard2->getDataNode(), deckCard2);
+}
+
+TEST(DeckListModelCustomZones, MirrorCustomZonesWithNoCustomZonesIsNoop)
+{
+    // A board zone with only direct cards has nothing to mirror.
+    auto *deckBoard = new InnerDecklistNode(DECK_ZONE_MAIN);
+    new DecklistCardNode("Direct", 2, deckBoard);
+
+    InnerDecklistNode shadowRoot;
+    auto *shadowBoard = new InnerDecklistNode(DECK_ZONE_MAIN, &shadowRoot);
+
+    DeckListModelCustomZones::mirrorCustomZones(deckBoard, shadowBoard);
+    EXPECT_EQ(shadowBoard->size(), 0);
+}
+
+TEST(DeckListModelCustomZones, MirrorCustomZonesFlattensNestedSubzones)
+{
+    // Cards deeper than one level under a custom zone still get a model row.
+    auto *deckBoard = new InnerDecklistNode(DECK_ZONE_MAIN);
+    auto *deckZone = new InnerDecklistNode("Removal", deckBoard);
+    auto *deckCard1 = new DecklistCardNode("Bolt", 1, deckZone);
+    auto *deeper = new InnerDecklistNode("Deeper", deckZone);
+    auto *deckCard2 = new DecklistCardNode("Swords", 1, deeper);
+
+    InnerDecklistNode shadowRoot;
+    auto *shadowBoard = new InnerDecklistNode(DECK_ZONE_MAIN, &shadowRoot);
+
+    DeckListModelCustomZones::mirrorCustomZones(deckBoard, shadowBoard);
+
+    ASSERT_EQ(shadowBoard->size(), 1);
+    auto *shadowZone = dynamic_cast<DecklistModelSubZoneNode *>(shadowBoard->at(0));
+    ASSERT_NE(shadowZone, nullptr);
+    EXPECT_EQ(shadowZone->getName(), QString("Removal"));
+
+    // Both cards are flattened into the mirrored zone, preserving order.
+    ASSERT_EQ(shadowZone->size(), 2);
+    auto *shadowCard1 = dynamic_cast<DecklistModelCardNode *>(shadowZone->at(0));
+    auto *shadowCard2 = dynamic_cast<DecklistModelCardNode *>(shadowZone->at(1));
+    ASSERT_NE(shadowCard1, nullptr);
+    ASSERT_NE(shadowCard2, nullptr);
+    EXPECT_EQ(shadowCard1->getDataNode(), deckCard1);
+    EXPECT_EQ(shadowCard2->getDataNode(), deckCard2);
+}
+
+// =====================================================================================================================
+// findGroupChild
+// =====================================================================================================================
+
+TEST(DeckListModelCustomZones, FindGroupChildSkipsCustomZones)
+{
+    InnerDecklistNode root;
+    auto *board = new InnerDecklistNode(DECK_ZONE_MAIN, &root);
+    auto *group = new InnerDecklistNode("Creature", board);
+    new DecklistModelSubZoneNode("Creature", board);
+
+    EXPECT_EQ(DeckListModelCustomZones::findGroupChild(board, "Creature"), group);
+    EXPECT_EQ(DeckListModelCustomZones::findGroupChild(board, "Missing"), nullptr);
+    EXPECT_EQ(DeckListModelCustomZones::findGroupChild(&root, DECK_ZONE_MAIN), board);
+}
+
+// =====================================================================================================================
+// sortWithCustomZonesLast
+// =====================================================================================================================
+
+TEST(DeckListModelCustomZones, SortBoardKeepsCustomZonesAfterGroupsAscending)
+{
+    InnerDecklistNode root;
+    auto *board = new InnerDecklistNode(DECK_ZONE_MAIN, &root);
+    new DecklistModelSubZoneNode("Zebra", board);
+    new InnerDecklistNode("Creature", board);
+    new InnerDecklistNode("Instant", board);
+    new DecklistModelSubZoneNode("Alpha", board);
+
+    root.setSortMethod(DeckSortMethod::ByName);
+
+    auto mapping = DeckListModelCustomZones::sortWithCustomZonesLast(&root, board, Qt::AscendingOrder);
+
+    // Groups sort first (by name), then custom zones (by name), always after groups.
+    EXPECT_EQ(childNames(board), (QStringList{"Creature", "Instant", "Alpha", "Zebra"}));
+
+    // Some non-identity movement occurred.
+    EXPECT_FALSE(mapping.isEmpty());
+}
+
+TEST(DeckListModelCustomZones, SortBoardKeepsCustomZonesAfterGroupsDescending)
+{
+    InnerDecklistNode root;
+    auto *board = new InnerDecklistNode(DECK_ZONE_MAIN, &root);
+    new DecklistModelSubZoneNode("Zebra", board);
+    new InnerDecklistNode("Creature", board);
+    new InnerDecklistNode("Instant", board);
+    new DecklistModelSubZoneNode("Alpha", board);
+
+    root.setSortMethod(DeckSortMethod::ByName);
+
+    (void)DeckListModelCustomZones::sortWithCustomZonesLast(&root, board, Qt::DescendingOrder);
+
+    // Groups still lead (descending), custom zones still last.
+    EXPECT_EQ(childNames(board), (QStringList{"Instant", "Creature", "Zebra", "Alpha"}));
+}
+
+TEST(DeckListModelCustomZones, SortBoardMappingIsConsistent)
+{
+    InnerDecklistNode root;
+    auto *board = new InnerDecklistNode(DECK_ZONE_MAIN, &root);
+
+    QList<AbstractDecklistNode *> originalOrder;
+    auto *g0 = new InnerDecklistNode("Creature", board);
+    originalOrder.append(g0);
+    auto *z0 = new DecklistModelSubZoneNode("Zebra", board);
+    originalOrder.append(z0);
+    auto *g1 = new InnerDecklistNode("Instant", board);
+    originalOrder.append(g1);
+    auto *z1 = new DecklistModelSubZoneNode("Alpha", board);
+    originalOrder.append(z1);
+
+    root.setSortMethod(DeckSortMethod::ByName);
+
+    auto mapping = DeckListModelCustomZones::sortWithCustomZonesLast(&root, board, Qt::AscendingOrder);
+
+    // The mapping reports, for each final row, the original row of the node now sitting there.
+    ASSERT_EQ(mapping.size(), board->size());
+    for (const auto &move : mapping) {
+        const int preSortRow = move.first;
+        const int finalRow = move.second;
+        ASSERT_GE(preSortRow, 0);
+        ASSERT_LT(preSortRow, originalOrder.size());
+        EXPECT_EQ(board->at(finalRow), originalOrder[preSortRow]) << "row " << finalRow;
+    }
+
+    // Final order sanity: groups first in name order, then custom zones.
+    EXPECT_EQ(childNames(board), (QStringList{"Creature", "Instant", "Alpha", "Zebra"}));
+}
+
+TEST(DeckListModelCustomZones, SortPlainNodeDoesNotReorderCustomZones)
+{
+    // A non-board node (e.g. a group whose children are cards) is sorted plainly;
+    // custom zones are not a special case there. Cards sort by name.
+    InnerDecklistNode root;
+    auto *board = new InnerDecklistNode(DECK_ZONE_MAIN, &root);
+    auto *group = new InnerDecklistNode("Creature", board);
+    cardNode(group, "Swords", 1);
+    cardNode(group, "Bolt", 3);
+
+    root.setSortMethod(DeckSortMethod::ByName);
+
+    auto mapping = DeckListModelCustomZones::sortWithCustomZonesLast(&root, group, Qt::AscendingOrder);
+    EXPECT_EQ(childNames(group), (QStringList{"Bolt", "Swords"}));
+    ASSERT_EQ(mapping.size(), 2);
+    EXPECT_EQ(mapping[0].first, 1); // "Bolt" was originally at row 1
+    EXPECT_EQ(mapping[0].second, 0);
+    EXPECT_EQ(mapping[1].first, 0);
+    EXPECT_EQ(mapping[1].second, 1);
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
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
new file mode 100644
index 000000000..63c904910
--- /dev/null
+++ b/tests/deck_list_model/deck_list_model_zone_integration_test.cpp
@@ -0,0 +1,296 @@
+#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>
+#include <libcockatrice/card/game_specific_terms.h>
+#include <libcockatrice/card/printing/exact_card.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 <libcockatrice/models/deck_list/deck_list_model.h>
+#include <qnamespace.h>
+#include <string>
+
+class QModelIndex;
+
+namespace
+{
+
+int totalCustomZoneRows(const DeckListModel &model)
+{
+    int count = 0;
+    const int rootRows = model.rowCount(QModelIndex());
+    for (int r = 0; r < rootRows; ++r) {
+        const QModelIndex board = model.index(r, 0, QModelIndex());
+        const int childRows = model.rowCount(board);
+        for (int c = 0; c < childRows; ++c) {
+            const QModelIndex child = model.index(c, 0, board);
+            if (child.data(DeckRoles::IsCustomZoneRole).toBool()) {
+                ++count;
+            }
+        }
+    }
+    return count;
+}
+
+QModelIndex findBoardIndex(const DeckListModel &model, const QString &boardName)
+{
+    for (int r = 0; r < model.rowCount(QModelIndex()); ++r) {
+        const QModelIndex idx = model.index(r, 0, QModelIndex());
+        if (idx.data(DeckRoles::IsCardRole).toBool()) {
+            continue;
+        }
+        const QString name = idx.sibling(idx.row(), DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString();
+        if (name == boardName) {
+            return idx;
+        }
+    }
+    return {};
+}
+
+QModelIndex findZoneRow(const DeckListModel &model, const QModelIndex &board)
+{
+    for (int r = 0; r < model.rowCount(board); ++r) {
+        const QModelIndex child = model.index(r, 0, board);
+        if (child.data(DeckRoles::IsCustomZoneRole).toBool()) {
+            return child;
+        }
+    }
+    return {};
+}
+
+} // namespace
+
+// The "Add to Zone" combobox/submenu lists getCustomZoneNames(), which reads the
+// deck tree. These verify the source data a freshly-created zone populates.
+
+TEST(DeckListModelZoneIntegration, CreateZoneThenReadCustomZoneNames)
+{
+    QSharedPointer<DeckList> deck(new DeckList());
+    DeckListModel model(nullptr, deck);
+    auto *tree = deck->getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    EXPECT_EQ(model.getCustomZoneNames(DECK_ZONE_MAIN), (QStringList{"Removal"}));
+}
+
+TEST(DeckListModelZoneIntegration, CreateTwoZonesThenReadBoth)
+{
+    QSharedPointer<DeckList> deck(new DeckList());
+    DeckListModel model(nullptr, deck);
+    auto *tree = deck->getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Utility"), nullptr);
+    EXPECT_EQ(model.getCustomZoneNames(DECK_ZONE_MAIN), (QStringList{"Removal", "Utility"}));
+}
+
+// Mirroring regression: rebuildTree must mirror each custom zone exactly once.
+TEST(DeckListModelZoneIntegration, RebuildTreeMirrorsEachZoneOnce)
+{
+    QSharedPointer<DeckList> deck(new DeckList());
+    DeckListModel model(nullptr, deck);
+    auto *tree = deck->getTree();
+
+    // One direct mainboard card plus two nested custom zones.
+    tree->addCard("Lightning Bolt", 2, DECK_ZONE_MAIN, -1);
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    tree->addCard("Swords to Plowshares", 1, "Removal", -1);
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Utility"), nullptr);
+
+    model.rebuildTree();
+
+    EXPECT_EQ(model.getCustomZoneNames(DECK_ZONE_MAIN), (QStringList{"Removal", "Utility"}));
+    EXPECT_EQ(totalCustomZoneRows(model), 2);
+}
+
+// =====================================================================================================================
+// Model behaviour: addCard routing, findCard lookup, removeRows guard, empty-zone survival.
+// =====================================================================================================================
+
+TEST(DeckListModelZoneIntegration, AddCardRoutesIntoMirroredCustomZone)
+{
+    QSharedPointer<DeckList> deck(new DeckList());
+    DeckListModel model(nullptr, deck);
+    auto *tree = deck->getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    model.rebuildTree();
+
+    QModelIndex added = model.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), "Removal");
+    ASSERT_TRUE(added.isValid());
+
+    // The card is a direct child of the mirrored custom zone, not a new top-level zone.
+    const QModelIndex zoneParent = added.parent();
+    ASSERT_TRUE(zoneParent.isValid());
+    EXPECT_TRUE(zoneParent.data(DeckRoles::IsCustomZoneRole).toBool());
+    EXPECT_EQ(zoneParent.sibling(zoneParent.row(), DeckListModelColumns::CARD_NAME).data(Qt::DisplayRole).toString(),
+              QString("Removal"));
+
+    // No "Removal" top-level zone appeared in the deck tree.
+    auto *listRoot = tree->getRoot();
+    bool topLevelRemoval = false;
+    for (int i = 0; i < listRoot->size(); ++i) {
+        if (auto *zone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i))) {
+            topLevelRemoval |= zone->getName() == "Removal";
+        }
+    }
+    EXPECT_FALSE(topLevelRemoval);
+}
+
+TEST(DeckListModelZoneIntegration, AddCardToUnmirroredCustomZoneRebuildsNotCreatesTopLevel)
+{
+    QSharedPointer<DeckList> deck(new DeckList());
+    DeckListModel model(nullptr, deck);
+    auto *tree = deck->getTree();
+
+    // The zone exists on the deck tree but the shadow tree has never mirrored it.
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+
+    QModelIndex added = model.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), "Removal");
+    ASSERT_TRUE(added.isValid());
+
+    const QModelIndex zoneParent = added.parent();
+    ASSERT_TRUE(zoneParent.isValid());
+    EXPECT_TRUE(zoneParent.data(DeckRoles::IsCustomZoneRole).toBool());
+    EXPECT_EQ(zoneParent.sibling(zoneParent.row(), DeckListModelColumns::CARD_NAME).data(Qt::DisplayRole).toString(),
+              QString("Removal"));
+}
+
+TEST(DeckListModelZoneIntegration, AddCardCreatesGroupSeparatelyFromSameNamedZone)
+{
+    QSharedPointer<DeckList> deck(new DeckList());
+    DeckListModel model(nullptr, deck);
+    auto *tree = deck->getTree();
+
+    // A custom zone named exactly like a grouping criterion.
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Creature"), nullptr);
+    model.rebuildTree();
+
+    CardInfoPtr bear = CardInfo::newInstance("Grizzly Bears");
+    bear->setProperty(Mtg::MainCardType, "Creature");
+
+    QModelIndex added = model.addCard(ExactCard(bear), DECK_ZONE_MAIN);
+    ASSERT_TRUE(added.isValid());
+
+    // The card lands in a *group* node called "Creature", not swallowed by the custom zone.
+    const QModelIndex groupParent = added.parent();
+    ASSERT_TRUE(groupParent.isValid());
+    EXPECT_FALSE(groupParent.data(DeckRoles::IsCustomZoneRole).toBool());
+    EXPECT_EQ(groupParent.sibling(groupParent.row(), DeckListModelColumns::CARD_NAME).data(Qt::DisplayRole).toString(),
+              QString("Creature"));
+
+    // The board keeps both rows: the "Creature" group and the "Creature" custom zone.
+    const QModelIndex boardIndex = groupParent.parent();
+    ASSERT_TRUE(boardIndex.isValid());
+    EXPECT_EQ(model.rowCount(boardIndex), 2);
+}
+
+TEST(DeckListModelZoneIntegration, FindCardResolvesCardInsideCustomZone)
+{
+    QSharedPointer<DeckList> deck(new DeckList());
+    DeckListModel model(nullptr, deck);
+    auto *tree = deck->getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    model.rebuildTree();
+
+    // findCard resolves through the card database; register the card we add.
+    const QString cardName = "Swords to Plowshares";
+    CardInfoPtr info = CardInfo::newInstance(cardName);
+    CardDatabaseManager::getInstance()->addCard(info);
+
+    QModelIndex added = model.addCard(ExactCard(info), "Removal");
+    ASSERT_TRUE(added.isValid());
+
+    QModelIndex found = model.findCard(cardName, "Removal");
+    EXPECT_TRUE(found.isValid());
+    EXPECT_EQ(found, added);
+}
+
+TEST(DeckListModelZoneIntegration, RemoveRowsRefusesCustomZoneRow)
+{
+    QSharedPointer<DeckList> deck(new DeckList());
+    DeckListModel model(nullptr, deck);
+    auto *tree = deck->getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    tree->addCard("Lightning Bolt", 2, DECK_ZONE_MAIN, -1);
+    model.rebuildTree();
+
+    const QModelIndex mainIndex = findBoardIndex(model, DECK_ZONE_MAIN);
+    ASSERT_TRUE(mainIndex.isValid());
+    const QModelIndex zoneRow = findZoneRow(model, mainIndex);
+    ASSERT_TRUE(zoneRow.isValid());
+
+    EXPECT_FALSE(model.removeRow(zoneRow.row(), zoneRow.parent()));
+    EXPECT_EQ(model.rowCount(mainIndex), 2); // the zone survives, alongside the card group
+}
+
+TEST(DeckListModelZoneIntegration, EmptyCustomZoneSurvivesMirrorAndPruning)
+{
+    QSharedPointer<DeckList> deck(new DeckList());
+    DeckListModel model(nullptr, deck);
+    auto *tree = deck->getTree();
+
+    // An empty custom zone must be mirrored (the stack deliberately keeps it alive).
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    model.rebuildTree();
+
+    const QModelIndex mainIndex = findBoardIndex(model, DECK_ZONE_MAIN);
+    ASSERT_TRUE(mainIndex.isValid());
+    EXPECT_EQ(model.rowCount(mainIndex), 1);
+    EXPECT_TRUE(findZoneRow(model, mainIndex).isValid());
+}
+
+// Regression: a board card named like the requested zone must not be mistaken for
+// a zone. Previously `findChild` matched any child by name, so a mainboard card
+// called "Lightning Bolt" made addCard believe a "Lightning Bolt" zone existed and
+// recurse through rebuildTree forever.
+TEST(DeckListModelZoneIntegration, AddCardToCardNamedZoneDoesNotRecurse)
+{
+    QSharedPointer<DeckList> deck(new DeckList());
+    DeckListModel model(nullptr, deck);
+    auto *tree = deck->getTree();
+
+    tree->addCard("Lightning Bolt", 2, DECK_ZONE_MAIN, -1);
+
+    QModelIndex added = model.addCard(ExactCard(CardInfo::newInstance("Swords to Plowshares")), "Lightning Bolt");
+    ASSERT_TRUE(added.isValid());
+}
+
+// Regression: adding to a custom zone that holds a nested sub-zone mirrored the
+// nested cards as flattened shadow rows, so the sorted shadow row index pointed
+// past the deck zone's direct children. The card must be appended to the deck
+// zone instead of being written out of range.
+TEST(DeckListModelZoneIntegration, AddCardToCustomZoneWithNestedSubZoneAppends)
+{
+    QSharedPointer<DeckList> deck(new DeckList());
+    DeckListModel model(nullptr, deck);
+    auto *tree = deck->getTree();
+
+    auto *removal = tree->addCustomZone(DECK_ZONE_MAIN, "Removal");
+    ASSERT_NE(removal, nullptr);
+    auto *deeper = new InnerDecklistNode("Deeper", removal);
+    new DecklistCardNode("Lightning Bolt", 2, deeper, -1);
+    model.rebuildTree();
+
+    QModelIndex added = model.addCard(ExactCard(CardInfo::newInstance("Swords to Plowshares")), "Removal");
+    ASSERT_TRUE(added.isValid());
+    ASSERT_TRUE(added.parent().data(DeckRoles::IsCustomZoneRole).toBool());
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/deck_list_zones/CMakeLists.txt b/tests/deck_list_zones/CMakeLists.txt
new file mode 100644
index 000000000..7af8fd187
--- /dev/null
+++ b/tests/deck_list_zones/CMakeLists.txt
@@ -0,0 +1 @@
+cockatrice_add_test(NAME deck_list_zones_test SOURCES deck_list_zones_test.cpp LIBS libcockatrice_deck_list)
diff --git a/tests/deck_list_zones/deck_list_zones_test.cpp b/tests/deck_list_zones/deck_list_zones_test.cpp
new file mode 100644
index 000000000..1903b70df
--- /dev/null
+++ b/tests/deck_list_zones/deck_list_zones_test.cpp
@@ -0,0 +1,400 @@
+/**
+ * @file deck_list_zones_test.cpp
+ * @brief Tests for custom deck zones (deck-unique zones nested under a board zone).
+ *
+ * Custom zones allow players to organize cards within a board (e.g. "Removal" under
+ * the mainboard) without changing the board semantics: cards in a custom zone under
+ * "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
+{
+
+/**
+ * @brief Collects (board zone name, card node) pairs via forEachCard.
+ */
+struct BoardCardPair
+{
+    QString boardZone;
+    QString cardName;
+    int amount;
+};
+
+QList<BoardCardPair> collectBoardCardPairs(const DeckList &deck)
+{
+    QList<BoardCardPair> result;
+    deck.forEachCard([&result](InnerDecklistNode *boardZone, DecklistCardNode *card) {
+        result.append({boardZone->getName(), card->getName(), card->getNumber()});
+    });
+    return result;
+}
+
+bool hasPair(const QList<BoardCardPair> &pairs, const QString &boardZone, const QString &cardName)
+{
+    for (const auto &pair : pairs) {
+        if (pair.boardZone == boardZone && pair.cardName == cardName) {
+            return true;
+        }
+    }
+    return false;
+}
+
+int totalCards(const QList<BoardCardPair> &pairs)
+{
+    int total = 0;
+    for (const auto &pair : pairs) {
+        total += pair.amount;
+    }
+    return total;
+}
+
+} // namespace
+
+// =====================================================================================================================
+// Zone creation
+// =====================================================================================================================
+
+TEST(DeckListZones, AddCustomZoneNestsUnderBoard)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    auto *zone = tree->addCustomZone(DECK_ZONE_MAIN, "Removal");
+    ASSERT_NE(zone, nullptr);
+    EXPECT_EQ(zone->getName(), QString("Removal"));
+    ASSERT_NE(zone->getParent(), nullptr);
+    EXPECT_EQ(zone->getParent()->getName(), QString(DECK_ZONE_MAIN));
+
+    // The custom zone is nested, not a new top-level zone.
+    auto topLevelZones = tree->getZoneNodes();
+    QStringList topLevelNames;
+    for (auto *node : topLevelZones) {
+        topLevelNames.append(node->getName());
+    }
+    EXPECT_FALSE(topLevelNames.contains("Removal"));
+
+    // It is discoverable through the board zone.
+    auto customZones = tree->getCustomZones(DECK_ZONE_MAIN);
+    ASSERT_EQ(customZones.size(), 1);
+    EXPECT_EQ(customZones.first()->getName(), QString("Removal"));
+}
+
+TEST(DeckListZones, CustomZoneNamesAreDeckUnique)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    // Same name on a different board is rejected.
+    EXPECT_EQ(tree->addCustomZone(DECK_ZONE_SIDE, "Removal"), nullptr);
+    // A name that collides with a built-in board zone is rejected.
+    EXPECT_EQ(tree->addCustomZone(DECK_ZONE_MAIN, DECK_ZONE_MAIN), nullptr);
+    EXPECT_EQ(tree->addCustomZone(DECK_ZONE_MAIN, DECK_ZONE_SIDE), nullptr);
+    EXPECT_EQ(tree->addCustomZone(DECK_ZONE_MAIN, DECK_ZONE_MAYBEBOARD), nullptr);
+    EXPECT_EQ(tree->addCustomZone(DECK_ZONE_MAIN, DECK_ZONE_TOKENS), nullptr);
+}
+
+TEST(DeckListZones, AddCustomZoneUnknownBoardFails)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    EXPECT_EQ(tree->addCustomZone("not_a_board", "Removal"), nullptr);
+}
+
+TEST(DeckListZones, MaybeboardIsLazilyCreated)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAYBEBOARD, "Candidates"), nullptr);
+
+    // The maybeboard board zone now exists, with the custom zone nested inside.
+    auto customZones = tree->getCustomZones(DECK_ZONE_MAYBEBOARD);
+    ASSERT_EQ(customZones.size(), 1);
+    EXPECT_EQ(customZones.first()->getName(), QString("Candidates"));
+}
+
+// =====================================================================================================================
+// Card placement
+// =====================================================================================================================
+
+TEST(DeckListZones, AddCardToCustomZoneKeepsBoardSemantics)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    tree->addCard("Lightning Bolt", 4, "Removal", -1);
+
+    // The card is reported as a mainboard card.
+    auto pairs = collectBoardCardPairs(deck);
+    EXPECT_TRUE(hasPair(pairs, DECK_ZONE_MAIN, "Lightning Bolt"));
+    EXPECT_FALSE(hasPair(pairs, DECK_ZONE_SIDE, "Lightning Bolt"));
+
+    // It is physically nested inside the custom zone.
+    auto customZones = tree->getCustomZones(DECK_ZONE_MAIN);
+    ASSERT_EQ(customZones.size(), 1);
+    ASSERT_EQ(customZones.first()->size(), 1);
+    auto *card = dynamic_cast<const DecklistCardNode *>(customZones.first()->at(0));
+    ASSERT_NE(card, nullptr);
+    EXPECT_EQ(card->getName(), QString("Lightning Bolt"));
+    EXPECT_EQ(card->getNumber(), 4);
+
+    // Zone-scoped queries include it.
+    EXPECT_TRUE(deck.getCardList({DECK_ZONE_MAIN}).contains("Lightning Bolt"));
+    EXPECT_FALSE(deck.getCardList({DECK_ZONE_SIDE}).contains("Lightning Bolt"));
+    EXPECT_EQ(deck.getCardNodes({DECK_ZONE_MAIN}).size(), 1);
+}
+
+TEST(DeckListZones, LegacyTopLevelZoneStillWorks)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    // Unknown zone names create a legacy top-level zone (backwards compatibility).
+    tree->addCard("Legacy Card", 2, "custom_legacy_zone", -1);
+
+    auto pairs = collectBoardCardPairs(deck);
+    EXPECT_TRUE(hasPair(pairs, "custom_legacy_zone", "Legacy Card"));
+    EXPECT_EQ(deck.getCardList({}).count("Legacy Card"), 1);
+}
+
+// =====================================================================================================================
+// Zone management
+// =====================================================================================================================
+
+TEST(DeckListZones, RenameCustomZone)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    tree->addCard("Lightning Bolt", 2, "Removal", -1);
+
+    EXPECT_TRUE(tree->renameCustomZone("Removal", "Bolt Zone"));
+    EXPECT_TRUE(hasPair(collectBoardCardPairs(deck), DECK_ZONE_MAIN, "Lightning Bolt"));
+    EXPECT_EQ(tree->getCustomZones(DECK_ZONE_MAIN).size(), 1);
+    EXPECT_EQ(tree->getCustomZones(DECK_ZONE_MAIN).first()->getName(), QString("Bolt Zone"));
+
+    // Renaming to a taken name fails.
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Other"), nullptr);
+    EXPECT_FALSE(tree->renameCustomZone("Bolt Zone", "Other"));
+    // Renaming a nonexistent zone fails.
+    EXPECT_FALSE(tree->renameCustomZone("Ghost Zone", "Whatever"));
+}
+
+TEST(DeckListZones, MoveCustomZoneMovesCards)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    tree->addCard("Lightning Bolt", 2, "Removal", -1);
+
+    EXPECT_TRUE(tree->moveCustomZone("Removal", DECK_ZONE_SIDE));
+
+    auto pairs = collectBoardCardPairs(deck);
+    EXPECT_TRUE(hasPair(pairs, DECK_ZONE_SIDE, "Lightning Bolt"));
+    EXPECT_FALSE(hasPair(pairs, DECK_ZONE_MAIN, "Lightning Bolt"));
+
+    // The custom zone is now nested under side.
+    EXPECT_EQ(tree->getCustomZones(DECK_ZONE_MAIN).size(), 0);
+    EXPECT_EQ(tree->getCustomZones(DECK_ZONE_SIDE).size(), 1);
+
+    // Moving to an unknown board fails.
+    EXPECT_FALSE(tree->moveCustomZone("Removal", "not_a_board"));
+}
+
+TEST(DeckListZones, MoveCustomZoneFailsForUnknownBoard)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    tree->addCard("Lightning Bolt", 2, "Removal", -1);
+
+    EXPECT_FALSE(tree->moveCustomZone("Removal", "not_a_board"));
+
+    // The zone is still under main.
+    EXPECT_EQ(tree->getCustomZones(DECK_ZONE_MAIN).size(), 1);
+}
+
+// Regression: findCustomZoneByName walks every top-level zone, so a custom zone
+// an imported deck carries under a non-standard board (tokens) is still found and
+// movable. The pre-fix manager-level moveCustomZone only scanned the standard
+// boards and returned false for these with no feedback.
+TEST(DeckListZones, MoveCustomZoneNestedUnderTokensBoard)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+    auto *root = tree->getRoot();
+
+    auto *tokens = new InnerDecklistNode(DECK_ZONE_TOKENS, root);
+    auto *removal = new InnerDecklistNode("Removal", tokens);
+    new DecklistCardNode("Lightning Bolt", 2, removal, -1);
+
+    EXPECT_TRUE(tree->findCustomZoneByName("Removal"));
+    EXPECT_TRUE(tree->moveCustomZone("Removal", DECK_ZONE_SIDE));
+
+    auto pairs = collectBoardCardPairs(deck);
+    EXPECT_FALSE(hasPair(pairs, DECK_ZONE_TOKENS, "Lightning Bolt"));
+    EXPECT_TRUE(hasPair(pairs, DECK_ZONE_SIDE, "Lightning Bolt"));
+}
+
+TEST(DeckListZones, RemoveCustomZoneRemovesCards)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    tree->addCard("Lightning Bolt", 2, "Removal", -1);
+
+    EXPECT_TRUE(tree->removeCustomZone("Removal"));
+    EXPECT_EQ(tree->getCustomZones(DECK_ZONE_MAIN).size(), 0);
+    EXPECT_TRUE(deck.getCardList({DECK_ZONE_MAIN}).isEmpty());
+    EXPECT_FALSE(tree->removeCustomZone("Removal"));
+}
+
+TEST(DeckListZones, EmptyCustomZoneIsKeptOnCardDeletion)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    auto *card = tree->addCard("Lightning Bolt", 1, "Removal", -1);
+
+    // Deleting the last card must not delete the empty custom zone.
+    EXPECT_TRUE(tree->deleteNode(card));
+    EXPECT_EQ(tree->getCustomZones(DECK_ZONE_MAIN).size(), 1);
+}
+
+// =====================================================================================================================
+// Deck-wide behavior
+// =====================================================================================================================
+
+TEST(DeckListZones, HashCountsCustomZoneCardsByBoard)
+{
+    // Deck A: cards directly in main and side.
+    DeckList direct;
+    direct.addCard("Mountain", DECK_ZONE_MAIN);
+    direct.addCard("Lightning Bolt", DECK_ZONE_MAIN);
+    direct.addCard("Island", DECK_ZONE_SIDE);
+
+    // Deck B: identical, but organized in custom zones.
+    DeckList organized;
+    auto *tree = organized.getTree();
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Lands"), nullptr);
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_SIDE, "Side Tech"), nullptr);
+    tree->addCard("Mountain", 1, "Lands", -1);
+    tree->addCard("Lightning Bolt", 1, "Removal", -1);
+    tree->addCard("Island", 1, "Side Tech", -1);
+
+    EXPECT_EQ(direct.getDeckHash(), organized.getDeckHash());
+}
+
+TEST(DeckListZones, SideboardSizeCountsCustomZoneCards)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_SIDE, "Side Tech"), nullptr);
+    tree->addCard("Island", 3, "Side Tech", -1);
+    tree->addCard("Forest", 2, DECK_ZONE_SIDE, -1);
+
+    EXPECT_EQ(deck.getSideboardSize(), 5);
+}
+
+TEST(DeckListZones, PlainExportIncludesMainAndSideCustomZones)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_SIDE, "Side Tech"), nullptr);
+    tree->addCard("Lightning Bolt", 2, "Removal", -1);
+    tree->addCard("Island", 1, "Side Tech", -1);
+
+    const QString plain = deck.writeToString_Plain(false, false);
+    EXPECT_TRUE(plain.contains("2 Lightning Bolt"));
+    EXPECT_TRUE(plain.contains("1 Island"));
+}
+
+TEST(DeckListZones, PlainExportSkipsMaybeboardCustomZones)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAYBEBOARD, "Candidates"), nullptr);
+    tree->addCard("Wish Card", 4, "Candidates", -1);
+    tree->addCard("Mountain", 1, DECK_ZONE_MAIN, -1);
+
+    const QString plain = deck.writeToString_Plain(false, false);
+    EXPECT_FALSE(plain.contains("Wish Card"));
+    EXPECT_TRUE(plain.contains("1 Mountain"));
+}
+
+TEST(DeckListZones, NativeRoundTripPreservesCustomZones)
+{
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr);
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_SIDE, "Side Tech"), nullptr);
+    tree->addCard("Lightning Bolt", 2, "Removal", -1);
+    tree->addCard("Island", 3, "Side Tech", -1);
+    tree->addCard("Mountain", 1, DECK_ZONE_MAIN, -1);
+
+    // Round-trip through the native format.
+    DeckList restored(deck.writeToString_Native());
+    auto *restoredTree = restored.getTree();
+
+    EXPECT_EQ(restored.getDeckHash(), deck.getDeckHash());
+    EXPECT_EQ(restoredTree->getCustomZones(DECK_ZONE_MAIN).size(), 1);
+    EXPECT_EQ(restoredTree->getCustomZones(DECK_ZONE_MAIN).first()->getName(), QString("Removal"));
+    EXPECT_EQ(restoredTree->getCustomZones(DECK_ZONE_SIDE).size(), 1);
+
+    auto pairs = collectBoardCardPairs(restored);
+    EXPECT_TRUE(hasPair(pairs, DECK_ZONE_MAIN, "Lightning Bolt"));
+    EXPECT_TRUE(hasPair(pairs, DECK_ZONE_SIDE, "Island"));
+    EXPECT_TRUE(hasPair(pairs, DECK_ZONE_MAIN, "Mountain"));
+    EXPECT_EQ(totalCards(pairs), 6);
+}
+
+TEST(DeckListZones, MaybeboardCustomZoneCardsAreExcludedFromHash)
+{
+    // Maybeboard cards are editor-only and must never affect the deck hash.
+    DeckList deck;
+    auto *tree = deck.getTree();
+
+    ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAYBEBOARD, "Candidates"), nullptr);
+    tree->addCard("Wish Card", 4, "Candidates", -1);
+    tree->addCard("Mountain", 1, DECK_ZONE_MAIN, -1);
+
+    DeckList expected;
+    expected.addCard("Mountain", DECK_ZONE_MAIN);
+
+    EXPECT_EQ(deck.getDeckHash(), expected.getDeckHash());
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/dummy_test.cpp b/tests/dummy_test.cpp
deleted file mode 100644
index 31a01bcff..000000000
--- a/tests/dummy_test.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#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 4fbe98cb9..b3c4b586c 100644
--- a/tests/expression_test.cpp
+++ b/tests/expression_test.cpp
@@ -1,6 +1,7 @@
 #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
new file mode 100644
index 000000000..b404a2c9e
--- /dev/null
+++ b/tests/lag_monitor_test.cpp
@@ -0,0 +1,105 @@
+#include "client/lag_monitor.h"
+
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QEvent>
+#include <QLoggingCategory>
+#include <gtest/gtest.h>
+#include <qnumeric.h>
+#include <string>
+
+namespace
+{
+
+/// Timestamps are taken at recording time; allow generous scheduler slack.
+constexpr qint64 TIMESTAMP_SLACK_MS = 10000;
+
+} // namespace
+
+class LagMonitorTest : public ::testing::Test
+{
+protected:
+    LagMonitor monitor;
+};
+
+TEST_F(LagMonitorTest, GapAtOrBelowThresholdIsIgnored)
+{
+    monitor.recordGap(0);
+    monitor.recordGap(LagMonitor::TICK_INTERVAL_MS);
+    monitor.recordGap(LagMonitor::STALL_THRESHOLD_MS);
+
+    EXPECT_TRUE(monitor.recentStalls().isEmpty());
+}
+
+TEST_F(LagMonitorTest, GapAboveThresholdIsRecorded)
+{
+    monitor.recordGap(LagMonitor::STALL_THRESHOLD_MS + 1);
+
+    const QList<LagMonitor::StallRecord> stalls = monitor.recentStalls();
+    ASSERT_EQ(1, stalls.size());
+    EXPECT_EQ(LagMonitor::STALL_THRESHOLD_MS + 1, stalls.first().durationMs);
+}
+
+TEST_F(LagMonitorTest, RecordedTimestampIsFresh)
+{
+    monitor.recordGap(LagMonitor::STALL_THRESHOLD_MS + 1);
+
+    const qint64 now = QDateTime::currentMSecsSinceEpoch();
+    ASSERT_EQ(1, monitor.recentStalls().size());
+    EXPECT_LE(qAbs(monitor.recentStalls().first().timestampMsSinceEpoch - now), TIMESTAMP_SLACK_MS);
+}
+
+TEST_F(LagMonitorTest, RecordsAreTrimmedToMaxOldestFirst)
+{
+    for (int i = 0; i < LagMonitor::MAX_RECORDED_STALLS + 5; ++i) {
+        monitor.recordGap(LagMonitor::STALL_THRESHOLD_MS + 1 + i);
+    }
+
+    const QList<LagMonitor::StallRecord> stalls = monitor.recentStalls();
+    ASSERT_EQ(LagMonitor::MAX_RECORDED_STALLS, stalls.size());
+    EXPECT_EQ(LagMonitor::STALL_THRESHOLD_MS + 6, stalls.first().durationMs);
+    EXPECT_EQ(LagMonitor::STALL_THRESHOLD_MS + 5 + LagMonitor::MAX_RECORDED_STALLS, stalls.last().durationMs);
+}
+
+TEST_F(LagMonitorTest, GapAtPlausibilityCapIsKept)
+{
+    monitor.recordGap(LagMonitor::MAX_PLAUSIBLE_STALL_MS);
+
+    ASSERT_EQ(1, monitor.recentStalls().size());
+    EXPECT_EQ(LagMonitor::MAX_PLAUSIBLE_STALL_MS, monitor.recentStalls().first().durationMs);
+}
+
+TEST_F(LagMonitorTest, GapBeyondPlausibilityCapIsDropped)
+{
+    monitor.recordGap(LagMonitor::MAX_PLAUSIBLE_STALL_MS + 1);
+
+    EXPECT_TRUE(monitor.recentStalls().isEmpty());
+}
+
+TEST_F(LagMonitorTest, ClearStallsEmptiesList)
+{
+    monitor.recordGap(LagMonitor::STALL_THRESHOLD_MS + 1);
+    ASSERT_EQ(1, monitor.recentStalls().size());
+
+    monitor.clearStalls();
+
+    EXPECT_TRUE(monitor.recentStalls().isEmpty());
+}
+
+TEST_F(LagMonitorTest, ApplicationStateChangeDoesNotRecordAStall)
+{
+    QObject probe;
+    QEvent event(QEvent::ApplicationStateChange);
+
+    QCoreApplication::sendEvent(&probe, &event);
+
+    EXPECT_TRUE(monitor.recentStalls().isEmpty());
+}
+
+int main(int argc, char **argv)
+{
+    QLoggingCategory::setFilterRules("lag_monitor.*=false");
+    QCoreApplication app(argc, argv);
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/latency_tracker_test.cpp b/tests/latency_tracker_test.cpp
new file mode 100644
index 000000000..a77051799
--- /dev/null
+++ b/tests/latency_tracker_test.cpp
@@ -0,0 +1,153 @@
+#include <QList>
+#include <QtGlobal>
+#include <gtest/gtest.h>
+#include <initializer_list>
+#include <libcockatrice/network/client/abstract/latency_tracker.h>
+#include <string>
+
+TEST(LatencyTrackerTest, EmptyTrackerYieldsZeroedStats)
+{
+    LatencyTracker tracker;
+
+    const auto stats = tracker.stats();
+
+    EXPECT_EQ(0, stats.sampleCount);
+    EXPECT_EQ(0, stats.lastMs);
+    EXPECT_EQ(0, stats.medianMs);
+    EXPECT_EQ(0, stats.p95Ms);
+    EXPECT_EQ(0, stats.maxMs);
+}
+
+TEST(LatencyTrackerTest, SingleSampleIsEveryStatistic)
+{
+    LatencyTracker tracker;
+    tracker.addSample(42);
+
+    const auto stats = tracker.stats();
+
+    EXPECT_EQ(1, stats.sampleCount);
+    EXPECT_EQ(42, stats.lastMs);
+    EXPECT_EQ(42, stats.medianMs);
+    EXPECT_EQ(42, stats.p95Ms);
+    EXPECT_EQ(42, stats.maxMs);
+}
+
+TEST(LatencyTrackerTest, OddSizedWindowMedianAndP95)
+{
+    LatencyTracker tracker;
+    for (qint64 ms : {qint64(50), qint64(10), qint64(30), qint64(20), qint64(40)}) {
+        tracker.addSample(ms);
+    }
+
+    const auto stats = tracker.stats();
+
+    EXPECT_EQ(5, stats.sampleCount);
+    EXPECT_EQ(40, stats.lastMs);
+    EXPECT_EQ(30, stats.medianMs);
+    // nearest-rank p95 of 5 samples: ceil(4.75) = 5th smallest
+    EXPECT_EQ(50, stats.p95Ms);
+    EXPECT_EQ(50, stats.maxMs);
+}
+
+TEST(LatencyTrackerTest, EvenSizedWindowMedianIsAverageOfMiddleTwo)
+{
+    LatencyTracker tracker;
+    for (qint64 ms : {qint64(10), qint64(20), qint64(30), qint64(40)}) {
+        tracker.addSample(ms);
+    }
+
+    const auto stats = tracker.stats();
+
+    EXPECT_EQ(4, stats.sampleCount);
+    EXPECT_EQ(25, stats.medianMs);
+    // nearest-rank p95 of 4 samples: ceil(3.8) = 4th smallest
+    EXPECT_EQ(40, stats.p95Ms);
+}
+
+TEST(LatencyTrackerTest, WindowEvictsOldestSamples)
+{
+    LatencyTracker tracker;
+    for (int i = 0; i <= 99; ++i) {
+        tracker.addSample(i);
+    }
+
+    const auto stats = tracker.stats();
+
+    EXPECT_EQ(LatencyTracker::WindowSize, stats.sampleCount);
+    EXPECT_EQ(99, stats.lastMs);
+    EXPECT_EQ(99, stats.maxMs);
+    // window now contains 36..99 (64 samples)
+    EXPECT_EQ(67, stats.medianMs); // (67 + 68) / 2 with integer division
+    EXPECT_EQ(96, stats.p95Ms);    // ceil(0.95 * 64) - 1 = index 60 -> 36 + 60
+}
+
+TEST(LatencyTrackerTest, ClearResetsAllState)
+{
+    LatencyTracker tracker;
+    for (int i = 0; i <= 99; ++i) {
+        tracker.addSample(i);
+    }
+
+    tracker.clear();
+    const auto cleared = tracker.stats();
+    EXPECT_EQ(0, cleared.sampleCount);
+
+    tracker.addSample(7);
+    const auto stats = tracker.stats();
+    EXPECT_EQ(1, stats.sampleCount);
+    EXPECT_EQ(7, stats.lastMs);
+    EXPECT_EQ(7, stats.medianMs);
+}
+
+TEST(LatencyTrackerTest, LastSampleSurvivesWraparound)
+{
+    LatencyTracker tracker;
+    for (int i = 0; i < LatencyTracker::WindowSize; ++i) {
+        tracker.addSample(i);
+    }
+    tracker.addSample(1000);
+
+    EXPECT_EQ(1000, tracker.stats().lastMs);
+}
+
+TEST(LatencyTrackerTest, RecentSamplesAreChronologicalOldestFirst)
+{
+    LatencyTracker tracker;
+    for (qint64 ms : {qint64(50), qint64(10), qint64(30)}) {
+        tracker.addSample(ms);
+    }
+
+    const QList<qint64> samples = tracker.recentSamples();
+
+    EXPECT_EQ((QList<qint64>{50, 10, 30}), samples);
+}
+
+TEST(LatencyTrackerTest, RecentSamplesFollowRingBufferWraparound)
+{
+    LatencyTracker tracker;
+    for (int i = 0; i <= 99; ++i) {
+        tracker.addSample(i);
+    }
+
+    const QList<qint64> samples = tracker.recentSamples();
+
+    ASSERT_EQ(LatencyTracker::WindowSize, samples.size());
+    EXPECT_EQ(36, samples.first());
+    EXPECT_EQ(99, samples.last());
+}
+
+TEST(LatencyTrackerTest, RecentSamplesEmptyOnFreshAndClearedTracker)
+{
+    LatencyTracker tracker;
+    EXPECT_TRUE(tracker.recentSamples().isEmpty());
+
+    tracker.addSample(5);
+    tracker.clear();
+    EXPECT_TRUE(tracker.recentSamples().isEmpty());
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/loader_local_matching_test.cpp b/tests/loader_local_matching_test.cpp
new file mode 100644
index 000000000..13d3e5bb3
--- /dev/null
+++ b/tests/loader_local_matching_test.cpp
@@ -0,0 +1,230 @@
+#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>
+#include <QFileInfo>
+#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
+{
+
+/**
+ * @brief Builds an ExactCard with the requested identity fields.
+ *
+ * Mirrors how the client constructs cards: the set short name feeds tryLoad()'s
+ * setName, and the "num" printing property feeds the collector number.
+ */
+ExactCard cardFor(const QString &name, const QString &setShortName, const QString &collectorNumber)
+{
+    CardSetPtr set;
+    if (!setShortName.isEmpty()) {
+        set = CardSet::newInstance(new NoopCardSetPriorityController(), setShortName, setShortName);
+    }
+
+    LazyPropertiesHash properties;
+    if (!collectorNumber.isEmpty()) {
+        properties.insert("num", collectorNumber);
+    }
+
+    return ExactCard(CardInfo::newInstance(name), PrintingInfo(set, properties));
+}
+
+class LocalMatcherTest : public ::testing::Test
+{
+protected:
+    QTemporaryDir tempDir;                    ///< Sandboxed "pics" root for every test.
+    CardPictureLoaderLocal *loader = nullptr; ///< Constructed per test against the sandboxed paths.
+
+    QString picsPath() const
+    {
+        return tempDir.path() + "/pics";
+    }
+
+    void SetUp() override
+    {
+        // The loader ctor snapshots the global picture paths once, so point them at the
+        // sandbox before constructing it.
+        SettingsCache::instance().paths().setPicsPath(picsPath());
+        SettingsCache::instance().paths().setCustomPicsPath(picsPath() + "/CUSTOM/");
+
+        loader = new CardPictureLoaderLocal(nullptr);
+    }
+
+    void TearDown() override
+    {
+        delete loader;
+        loader = nullptr;
+    }
+
+    /**
+     * @brief Destroys and rebuilds the loader so the CUSTOM index is re-scanned.
+     *
+     * The CUSTOM-folder index is snapshotted at construction; rebuild it after
+     * writing files so freshly placed images are discoverable.
+     */
+    void rebuildLoader()
+    {
+        delete loader;
+        loader = new CardPictureLoaderLocal(nullptr);
+    }
+
+    /**
+     * @brief Writes a valid 1x1 PNG under the sandboxed pics path.
+     */
+    void writePngUnderPics(const QString &relativePath, const QColor &color = Qt::red)
+    {
+        const QString fullPath = picsPath() + "/" + relativePath;
+        ASSERT_TRUE(QDir().mkpath(QFileInfo(fullPath).absolutePath()));
+
+        QImage image(1, 1, QImage::Format_RGB32);
+        image.fill(color);
+
+        QImageWriter writer(fullPath, "PNG");
+        ASSERT_TRUE(writer.write(image));
+    }
+};
+
+TEST_F(LocalMatcherTest, ExactMatchBareFileWinsOverSuffixedCompanion)
+{
+    writePngUnderPics("downloadedPics/TestCard.png");
+    writePngUnderPics("downloadedPics/TestCard (1).png");
+
+    const QImage image = loader->tryLoad(cardFor("TestCard", "", ""));
+
+    EXPECT_FALSE(image.isNull()) << "The bare TestCard.png must be picked over its suffixed companion";
+}
+
+TEST_F(LocalMatcherTest, SuffixedFileWithoutExactMatchIsNotLoaded)
+{
+    // The pre-refactor prefix match would have accepted "TestCard (1).png" for "TestCard".
+    writePngUnderPics("downloadedPics/TestCard (1).png");
+
+    const QImage image = loader->tryLoad(cardFor("TestCard", "", ""));
+
+    EXPECT_TRUE(image.isNull()) << "A suffixed file must not satisfy an exact card-name lookup";
+}
+
+TEST_F(LocalMatcherTest, SetFolderLookupIgnoresSuffixedFiles)
+{
+    writePngUnderPics("M10/TestCard (1).png");
+
+    const QImage image = loader->tryLoad(cardFor("TestCard", "M10", ""));
+
+    EXPECT_TRUE(image.isNull()) << "Set-folder lookups must also require an exact name match";
+}
+
+TEST_F(LocalMatcherTest, SetFolderLookupStillResolvesExactFile)
+{
+    writePngUnderPics("M10/TestCard.png");
+    writePngUnderPics("M10/TestCard (1).png");
+
+    const QImage image = loader->tryLoad(cardFor("TestCard", "M10", ""));
+
+    EXPECT_FALSE(image.isNull()) << "The exact file in the set folder must still resolve";
+}
+
+TEST_F(LocalMatcherTest, RootDownloadedPicsFallbackResolvesSchemeFilename)
+{
+    // Non-set-folder export schemes (Name_Set_Collector) write straight into downloadedPics/.
+    writePngUnderPics("downloadedPics/TestCard_M10_1.png");
+
+    const QImage image = loader->tryLoad(cardFor("TestCard", "M10", "1"));
+
+    EXPECT_FALSE(image.isNull()) << "downloadedPics/TestCard_M10_1.png must resolve via the root fallback";
+}
+
+TEST_F(LocalMatcherTest, RootFallbackResolvesDashSeparatedVariant)
+{
+    writePngUnderPics("downloadedPics/TestCard-M10-1.png");
+
+    const QImage image = loader->tryLoad(cardFor("TestCard", "M10", "1"));
+
+    EXPECT_FALSE(image.isNull()) << "The dash-separated import variant must resolve via the root fallback";
+}
+
+TEST_F(LocalMatcherTest, DownloadedPicsSetSubfolderStillResolves)
+{
+    writePngUnderPics("downloadedPics/M10/TestCard_M10_1.png");
+
+    const QImage image = loader->tryLoad(cardFor("TestCard", "M10", "1"));
+
+    EXPECT_FALSE(image.isNull()) << "The set-subfolder export scheme must keep resolving";
+}
+
+TEST_F(LocalMatcherTest, SetFolderCandidateTakesPrecedenceOverRootFallback)
+{
+    writePngUnderPics("M10/TestCard_M10_1.png", Qt::red);
+    writePngUnderPics("downloadedPics/TestCard_M10_1.png", Qt::blue);
+
+    const QImage image = loader->tryLoad(cardFor("TestCard", "M10", "1"));
+
+    ASSERT_FALSE(image.isNull());
+    EXPECT_EQ(image.pixelColor(0, 0), QColor(Qt::red)) << "The set-folder candidate must be preferred";
+}
+
+TEST_F(LocalMatcherTest, CustomSubfolderResolvesExactFile)
+{
+    // Images in the CUSTOM folder are indexed by their full file path (extension included),
+    // unlike the extension-less candidate paths built from the naming schemes.
+    writePngUnderPics("CUSTOM/poker/TestCard.png");
+    rebuildLoader();
+
+    const QImage image = loader->tryLoad(cardFor("TestCard", "", ""));
+
+    EXPECT_FALSE(image.isNull()) << "A CUSTOM-folder image in a subdirectory must resolve";
+}
+
+TEST_F(LocalMatcherTest, CustomSubfolderIgnoresSuffixedFiles)
+{
+    writePngUnderPics("CUSTOM/poker/TestCard (1).png");
+    rebuildLoader();
+
+    const QImage image = loader->tryLoad(cardFor("TestCard", "", ""));
+
+    EXPECT_TRUE(image.isNull()) << "A suffixed CUSTOM-folder file must not satisfy an exact name lookup";
+}
+
+} // namespace
+
+int main(int argc, char **argv)
+{
+    // Redirect SettingsCache reads/writes (app-data location) away from the real user profile.
+    QStandardPaths::setTestModeEnabled(true);
+
+    // Some CI containers run as a uid without a passwd entry (e.g. GitHub's docker
+    // runner), so HOME resolves to "/" and the test-mode qttest data dir cannot be
+    // created. SettingsCache's QSettings then silently drops every write, reads come
+    // back empty, and the paths the loader searches are "". Give the test a writable
+    // HOME for the duration of the run so settings behave like on a normal machine.
+    QTemporaryDir home;
+    if (home.isValid()) {
+        qputenv("HOME", home.path().toLocal8Bit());
+    }
+
+    QCoreApplication app(argc, argv);
+    QLoggingCategory::setFilterRules("card_picture_loader.*=false\nsettings_cache.*=false");
+
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
\ No newline at end of file
diff --git a/tests/loading_from_clipboard/CMakeLists.txt b/tests/loading_from_clipboard/CMakeLists.txt
index 40e85c66e..88711e457 100644
--- a/tests/loading_from_clipboard/CMakeLists.txt
+++ b/tests/loading_from_clipboard/CMakeLists.txt
@@ -1,15 +1,13 @@
 add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
-add_executable(loading_from_clipboard_test clipboard_testing.cpp loading_from_clipboard_test.cpp)
 
-if(NOT GTEST_FOUND)
-  add_dependencies(loading_from_clipboard_test gtest)
-endif()
-
-set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Concurrent ${COCKATRICE_QT_VERSION_NAME}::Network
-                    ${COCKATRICE_QT_VERSION_NAME}::Widgets
+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
 )
-
-target_link_libraries(
-  loading_from_clipboard_test libcockatrice_deck_list 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 2342bc088..3f652a495 100644
--- a/tests/loading_from_clipboard/clipboard_testing.cpp
+++ b/tests/loading_from_clipboard/clipboard_testing.cpp
@@ -1,24 +1,41 @@
 #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>
 
+DeckList getDeckList(const QString &clipboard)
+{
+    DeckList deckList;
+    QString cp(clipboard);
+    QTextStream stream(&cp); // text stream requires local copy
+    deckList.loadFromStream_Plain(stream, false, CardNameNormalizer());
+    return deckList;
+}
+
 void testEmpty(const QString &clipboard)
 {
-    QString cp(clipboard);
-    DeckList deckList;
-    QTextStream stream(&cp); // text stream requires local copy
-    deckList.loadFromStream_Plain(stream, false);
+    DeckList deckList = getDeckList(clipboard);
 
     ASSERT_TRUE(deckList.getCardList().isEmpty());
 }
 
+void testHash(const QString &clipboard, const std::string &hash)
+{
+    DeckList deckList = getDeckList(clipboard);
+
+    ASSERT_EQ(deckList.getDeckHash().toStdString(), hash);
+}
+
 void testDeck(const QString &clipboard, const Result &result)
 {
-    QString cp(clipboard);
-    DeckList deckList;
-    QTextStream stream(&cp); // text stream requires local copy
-    deckList.loadFromStream_Plain(stream, false);
+    DeckList deckList = getDeckList(clipboard);
 
     ASSERT_EQ(result.name, deckList.getName().toStdString());
     ASSERT_EQ(result.comments, deckList.getComments().toStdString());
diff --git a/tests/loading_from_clipboard/clipboard_testing.h b/tests/loading_from_clipboard/clipboard_testing.h
index 5e9cff915..c9852e5d7 100644
--- a/tests/loading_from_clipboard/clipboard_testing.h
+++ b/tests/loading_from_clipboard/clipboard_testing.h
@@ -1,8 +1,11 @@
 #ifndef CLIPBOARD_TESTING_H
 #define CLIPBOARD_TESTING_H
 
-#include "gtest/gtest.h"
-#include <libcockatrice/deck_list/deck_list.h>
+#include <QList>
+#include <QString>
+#include <QVector>
+#include <string>
+#include <utility>
 
 // 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>>;
@@ -21,7 +24,7 @@ struct Result
 };
 
 void testEmpty(const QString &clipboard);
-
+void testHash(const QString &clipboard, const std::string &hash);
 void testDeck(const QString &clipboard, const Result &result);
 
 #endif // CLIPBOARD_TESTING_H
diff --git a/tests/loading_from_clipboard/loading_from_clipboard_test.cpp b/tests/loading_from_clipboard/loading_from_clipboard_test.cpp
index 6f9762be9..e1797818e 100644
--- a/tests/loading_from_clipboard/loading_from_clipboard_test.cpp
+++ b/tests/loading_from_clipboard/loading_from_clipboard_test.cpp
@@ -1,5 +1,11 @@
 #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.
 
@@ -74,6 +80,20 @@ 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"
@@ -203,6 +223,22 @@ TEST(LoadingFromClipboardTest, emptyMainBoard)
     testEmpty(clipboard);
 }
 
+TEST(LoadingFromClipboardTest, emptyHash)
+{
+    QString clipboard("");
+
+    testHash(clipboard, "r8sq7riu");
+}
+
+TEST(LoadingFromClipboardTest, deckHash)
+{
+    QString clipboard("1 Mountain\n"
+                      "2 Island\n"
+                      "SB: 3 Forest\n");
+
+    testHash(clipboard, "5cac19qm");
+}
+
 int main(int argc, char **argv)
 {
     ::testing::InitGoogleTest(&argc, argv);
diff --git a/tests/metrics_registry_test.cpp b/tests/metrics_registry_test.cpp
new file mode 100644
index 000000000..39a8f8aaf
--- /dev/null
+++ b/tests/metrics_registry_test.cpp
@@ -0,0 +1,84 @@
+#include <QCoreApplication>
+#include <QList>
+#include <gtest/gtest.h>
+#include <metrics_registry.h>
+#include <string>
+
+TEST(MetricsRegistryTest, EmptyRegistryHasZeroedCounters)
+{
+    MetricsRegistry registry;
+
+    EXPECT_EQ(0, registry.totalCommands());
+    EXPECT_EQ(0, registry.totalTimeMs());
+    EXPECT_EQ(0, registry.activeTypeCount());
+    EXPECT_EQ(0, registry.getGameStartSnapshot().count);
+}
+
+TEST(MetricsRegistryTest, SampleIsRecordedInTotalsAndSlot)
+{
+    MetricsRegistry registry;
+    registry.observeCommand(MetricsRegistry::typeIdFor(0, 1000), 7);
+
+    EXPECT_EQ(1, registry.totalCommands());
+    EXPECT_EQ(7, registry.totalTimeMs());
+    EXPECT_EQ(1, registry.activeTypeCount());
+
+    const auto stats = registry.collectActiveStats();
+    ASSERT_EQ(1, stats.size());
+    EXPECT_EQ(MetricsRegistry::typeIdFor(0, 1000), stats[0].typeId);
+    EXPECT_EQ(1, stats[0].count);
+    EXPECT_EQ(7, stats[0].totalMs);
+}
+
+TEST(MetricsRegistryTest, KindEncodingSeparatesSameExtensionNumber)
+{
+    MetricsRegistry registry;
+    const int sessionPing = MetricsRegistry::typeIdFor(0, 1000);
+    const int roomLeaveRoom = MetricsRegistry::typeIdFor(1, 1000);
+    ASSERT_NE(sessionPing, roomLeaveRoom);
+
+    registry.observeCommand(sessionPing, 1);
+    registry.observeCommand(roomLeaveRoom, 5000);
+
+    EXPECT_EQ(2, registry.activeTypeCount());
+}
+
+TEST(MetricsRegistryTest, OutOfRangeIdsLandInOverflowSlot)
+{
+    MetricsRegistry registry;
+    registry.observeCommand(-1, 4);
+    registry.observeCommand(MetricsRegistry::MaxTypes + 12345, 4);
+
+    EXPECT_EQ(2, registry.totalCommands());
+    EXPECT_EQ(1, registry.activeTypeCount()); // both collapsed into one slot
+    EXPECT_EQ(8, registry.totalTimeMs());
+}
+
+TEST(MetricsRegistryTest, NegativeDurationsAreClamped)
+{
+    MetricsRegistry registry;
+    registry.observeCommand(MetricsRegistry::typeIdFor(0, 1000), -50);
+
+    EXPECT_EQ(0, registry.totalTimeMs());
+}
+
+TEST(MetricsRegistryTest, GameStartTrackedSeparatelyFromCommands)
+{
+    MetricsRegistry registry;
+    registry.observeGameStartDurationMs(120);
+
+    EXPECT_EQ(0, registry.totalCommands());
+    EXPECT_EQ(0, registry.totalTimeMs());
+    EXPECT_EQ(0, registry.activeTypeCount());
+
+    const auto snapshot = registry.getGameStartSnapshot();
+    EXPECT_EQ(1, snapshot.count);
+    EXPECT_EQ(120, snapshot.totalMs);
+}
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
\ No newline at end of file
diff --git a/tests/movecard_tests/CMakeLists.txt b/tests/movecard_tests/CMakeLists.txt
new file mode 100755
index 000000000..68d8fc84c
--- /dev/null
+++ b/tests/movecard_tests/CMakeLists.txt
@@ -0,0 +1,11 @@
+cockatrice_add_test(
+  NAME
+  reverse_card_move_test
+  SOURCES
+  reverse_card_move_test.cpp
+  LIBS
+  libcockatrice_network_server_remote
+  libcockatrice_rng
+  LABELS
+  server
+)
diff --git a/tests/movecard_tests/reverse_card_move_test.cpp b/tests/movecard_tests/reverse_card_move_test.cpp
new file mode 100644
index 000000000..6bed20d18
--- /dev/null
+++ b/tests/movecard_tests/reverse_card_move_test.cpp
@@ -0,0 +1,111 @@
+#include "game/game_config.h"
+#include "game/server_abstract_player.h"
+#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
+
+TEST(ReverseCardMoveTest, MoveCardFromBottomTest)
+{
+    ServerInfo_User user;
+    user.set_name("test-user");
+
+    // instantiate a fake server instance
+    FakeServer server;
+    Server_Room room(0, 0, "", "", "", "", false, "", {}, &server);
+    GameConfig config{.creatorInfo = user,
+                      .gameId = 1,
+                      .description = QString(),
+                      .password = QString(),
+                      .maxPlayers = 2,
+                      .gameTypes = QList<int>(),
+                      .onlyBuddies = false,
+                      .onlyRegistered = false,
+                      .spectatorsAllowed = false,
+                      .spectatorsNeedPassword = false,
+                      .spectatorsCanTalk = false,
+                      .spectatorsSeeEverything = false,
+                      .startingLifeTotal = 20,
+                      .shareDecklistsOnLoad = false};
+    Server_Game game(config, &room);
+    Server_AbstractPlayer player(&game, 1, user, false, nullptr);
+    Server_CardZone deckZone(&player, ZoneNames::DECK, true, ServerInfo_Zone::PublicZone);
+    Server_CardZone exileZone(&player, ZoneNames::EXILE, true, ServerInfo_Zone::PublicZone);
+
+    // setup the deck with 20 useless cards
+    for (int i = 0; i < 20; i++) {
+        auto *cardUseless = new Server_Card({"Card Useless", "card-Useless"}, player.newCardId(), i, 0);
+        deckZone.insertCard(cardUseless, i, 0);
+    }
+
+    // add 4 cards to the end of it
+    auto *cardA = new Server_Card({"Card A", "card-a"}, player.newCardId(), 20, 0);
+    auto *cardB = new Server_Card({"Card B", "card-b"}, player.newCardId(), 21, 0);
+    auto *cardC = new Server_Card({"Card C", "card-c"}, player.newCardId(), 22, 0);
+    auto *cardD = new Server_Card({"Card D", "card-d"}, player.newCardId(), 23, 0);
+
+    deckZone.insertCard(cardA, 20, 0);
+    deckZone.insertCard(cardB, 21, 0);
+    deckZone.insertCard(cardC, 22, 0);
+    deckZone.insertCard(cardD, 23, 0);
+
+    // try to move them, with the expected client given order (n-3, n-2, n-1, n)
+    CardToMove moveA;
+    moveA.set_card_id(cardA->getId());
+    CardToMove moveB;
+    moveB.set_card_id(cardB->getId());
+    CardToMove moveC;
+    moveC.set_card_id(cardC->getId());
+    CardToMove moveD;
+    moveD.set_card_id(cardD->getId());
+
+    QList<const CardToMove *> cardsToMove = {&moveA, &moveB, &moveC, &moveD};
+    GameEventStorage ges;
+
+    const auto response = player.moveCard(ges, &deckZone, cardsToMove, &exileZone, 0, 0, false, false, false);
+
+    EXPECT_EQ(response, Response::RespOk);
+
+    int positionA;
+    int positionB;
+    int positionC;
+    int positionD;
+    // find the cards in the destination zone and check they are the right card
+    EXPECT_EQ(exileZone.getCard(cardA->getId(), &positionA), cardA);
+    EXPECT_EQ(exileZone.getCard(cardB->getId(), &positionB), cardB);
+    EXPECT_EQ(exileZone.getCard(cardC->getId(), &positionC), cardC);
+    EXPECT_EQ(exileZone.getCard(cardD->getId(), &positionD), cardD);
+
+    // check that they are at the expected index
+    EXPECT_EQ(cardA->getX(), 3);
+    EXPECT_EQ(cardB->getX(), 2);
+    EXPECT_EQ(cardC->getX(), 1);
+    EXPECT_EQ(cardD->getX(), 0);
+
+    // also check if the given positions are correct
+    EXPECT_EQ(positionA, 3);
+    EXPECT_EQ(positionB, 2);
+    EXPECT_EQ(positionC, 1);
+    EXPECT_EQ(positionD, 0);
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/movecard_tests/server_test_helpers.h b/tests/movecard_tests/server_test_helpers.h
new file mode 100644
index 000000000..fd2ed6c17
--- /dev/null
+++ b/tests/movecard_tests/server_test_helpers.h
@@ -0,0 +1,42 @@
+#include "server.h"
+#include "server_database_interface.h"
+
+class MockDatabaseInterface : public Server_DatabaseInterface
+{
+public:
+    AuthenticationResult checkUserPassword(Server_ProtocolHandler *,
+                                           const QString &,
+                                           const QString &,
+                                           const QString &,
+                                           QString &,
+                                           int &,
+                                           bool) override
+    {
+        return NotLoggedIn;
+    }
+    ServerInfo_User getUserData(const QString &, bool) override
+    {
+        return ServerInfo_User();
+    }
+    int getNextGameId() override
+    {
+        return 1;
+    }
+    int getNextReplayId() override
+    {
+        return 1;
+    }
+    int getActiveUserCount(QString) override
+    {
+        return 1;
+    }
+};
+
+class FakeServer : public Server
+{
+public:
+    FakeServer()
+    {
+        setDatabaseInterface(new MockDatabaseInterface());
+    }
+};
diff --git a/tests/oracle/CMakeLists.txt b/tests/oracle/CMakeLists.txt
index b89663d6f..6958673f7 100644
--- a/tests/oracle/CMakeLists.txt
+++ b/tests/oracle/CMakeLists.txt
@@ -1,11 +1,64 @@
-add_executable(parse_cipt_test ../../oracle/src/parsehelpers.cpp parse_cipt_test.cpp)
+cockatrice_add_test(NAME parse_cipt_test SOURCES ../../oracle/src/parsehelpers.cpp parse_cipt_test.cpp)
 
-if(NOT GTEST_FOUND)
-  add_dependencies(parse_cipt_test gtest)
+# 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
+)
+
+# 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()
+  message(STATUS "Oracle tests: zlib not found; zip download benchmark disabled")
 endif()
 
-set(TEST_QT_MODULES ${COCKATRICE_QT_VERSION_NAME}::Widgets)
+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()
 
-target_link_libraries(parse_cipt_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
-
-add_test(NAME parse_cipt_test COMMAND parse_cipt_test)
+cockatrice_add_manual_test(
+  NAME
+  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
+  ${_ORACLE_BENCH_EXTRA_LIBRARIES}
+  MANUAL
+)
diff --git a/tests/oracle/oracle_importer_benchmark_test.cpp b/tests/oracle/oracle_importer_benchmark_test.cpp
new file mode 100644
index 000000000..c2a4aaf4b
--- /dev/null
+++ b/tests/oracle/oracle_importer_benchmark_test.cpp
@@ -0,0 +1,592 @@
+#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"
+#endif
+#if defined(HAS_ZLIB)
+#include "../../oracle/src/zip/unzip.h"
+#endif
+#if defined(Q_OS_MACOS)
+#include <mach/mach.h>
+#include <sys/resource.h>
+#endif
+
+// Helper: build a synthetic MTGJSON-style JSON with the given number of sets and cards per set
+static QByteArray buildSyntheticData(int numSets, int cardsPerSet)
+{
+    QJsonObject dataObj;
+    for (int s = 0; s < numSets; ++s) {
+        QJsonArray cardsArray;
+        for (int c = 0; c < cardsPerSet; ++c) {
+            QJsonObject card;
+            card["name"] = QString("Card %1").arg(s * cardsPerSet + c);
+            card["text"] = "This is a test card with some rules text.";
+            card["layout"] = "normal";
+            card["manaCost"] = "{W}";
+            card["type"] = "Creature — Human";
+            card["power"] = "2";
+            card["toughness"] = "2";
+            card["colors"] = QJsonArray{"W"};
+            card["colorIdentity"] = QJsonArray{"W"};
+            card["types"] = QJsonArray{"Creature"};
+            // Real MTGJSON types: floats, not strings. This
+            // exercises the QVariant coercion in the property reader.
+            card["convertedManaCost"] = 1.0;
+            card["manaValue"] = 1.0;
+
+            QJsonObject legalities;
+            legalities["standard"] = "legal";
+            legalities["modern"] = "legal";
+            legalities["legacy"] = "legal";
+            legalities["vintage"] = "legal";
+            legalities["commander"] = "legal";
+            card["legalities"] = legalities;
+
+            QJsonObject identifiers;
+            identifiers["scryfallId"] = QString("id-%1-%2").arg(s).arg(c);
+            card["identifiers"] = identifiers;
+
+            // In AllPrintings, number and rarity are flat fields on the card
+            // object, exactly as set below.
+            card["number"] = QString::number(c + 1);
+            card["rarity"] = "common";
+
+            cardsArray.append(card);
+        }
+
+        QJsonObject setObj;
+        setObj["code"] = QString("T%1").arg(s, 2, 10, QChar('0'));
+        setObj["name"] = QString("Test Set %1").arg(s);
+        setObj["type"] = "expansion";
+        setObj["releaseDate"] = "2024-01-01";
+        setObj["cards"] = cardsArray;
+
+        dataObj[QString("T%1").arg(s, 2, 10, QChar('0'))] = setObj;
+    }
+
+    QJsonObject root;
+    root["data"] = dataObj;
+    return QJsonDocument(root).toJson(QJsonDocument::Compact);
+}
+
+// ============================================================================
+// Import throughput benchmark
+// ============================================================================
+
+TEST(OracleBenchmark, ImportThroughput)
+{
+    static constexpr int numSets = 10;
+    static constexpr int cardsPerSet = 500;
+
+    QByteArray data = buildSyntheticData(numSets, cardsPerSet);
+
+    OracleImporter importer;
+
+    // Phase 1: Parse JSON
+    QElapsedTimer timer;
+    timer.start();
+    bool ok = importer.readSetsFromByteArray(data);
+    ASSERT_TRUE(ok);
+    qint64 parseMs = timer.elapsed();
+
+    // Phase 2: Import cards
+    timer.restart();
+    int importedSets = importer.startImport();
+    qint64 importMs = timer.elapsed();
+
+    int totalImported = 0;
+    for (const auto &card : importer.getCardList()) {
+        Q_UNUSED(card);
+        totalImported++;
+    }
+
+    // The fixture generates globally unique card names, so the expected
+    // counts are exact: a regression here means cards were dropped.
+    ASSERT_EQ(importedSets, numSets);
+    ASSERT_EQ(totalImported, numSets * cardsPerSet);
+    // Real-data probe: numeric convertedManaCost must be coerced to text
+    // (regression for the QJsonValue::toString() reader in #7214).
+    auto probeCard = importer.getCardList().value("Card 0");
+    ASSERT_FALSE(probeCard.isNull());
+    ASSERT_EQ(probeCard->getProperty("cmc"), "1");
+
+    qDebug().noquote()
+        << QString("Oracle Import Benchmark: %1 sets, %2 unique cards").arg(importedSets).arg(totalImported);
+    qDebug().noquote() << QString("  JSON parse:  %1 ms").arg(parseMs);
+    qDebug().noquote() << QString("  Card import: %1 ms").arg(importMs);
+    qDebug().noquote() << QString("  Total:       %1 ms").arg(parseMs + importMs);
+    if (importMs > 0) {
+        qDebug().noquote() << QString("  Throughput:  %1 cards/sec")
+                                  .arg(static_cast<double>(totalImported) / importMs * 1000.0, 0, 'f', 0);
+    }
+}
+
+// ============================================================================
+// readSetsFromByteArray benchmark
+// ============================================================================
+
+TEST(OracleBenchmark, ParseJsonThroughput)
+{
+    static constexpr int numSets = 20;
+    static constexpr int cardsPerSet = 1000;
+
+    QByteArray data = buildSyntheticData(numSets, cardsPerSet);
+
+    // Run 5 iterations and report average
+    static constexpr int iterations = 5;
+    qint64 totalMs = 0;
+
+    for (int i = 0; i < iterations; ++i) {
+        OracleImporter importer;
+        QByteArray source = data;
+        QElapsedTimer timer;
+        timer.start();
+        bool ok = importer.readSetsFromByteArray(std::move(source));
+        ASSERT_TRUE(ok);
+        totalMs += timer.elapsed();
+    }
+
+    qint64 avgMs = totalMs / iterations;
+    qDebug().noquote() << QString("Parse Benchmark (%1 iterations): avg %2 ms for %3 sets x %4 cards")
+                              .arg(iterations)
+                              .arg(avgMs)
+                              .arg(numSets)
+                              .arg(cardsPerSet);
+}
+
+// ============================================================================
+// Split card merging benchmark
+// ============================================================================
+
+TEST(OracleBenchmark, SplitCardMerging)
+{
+    static constexpr int numSplitCards = 1000;
+
+    QJsonArray cardsList;
+    for (int i = 0; i < numSplitCards; ++i) {
+        QJsonObject face1;
+        face1["name"] = QString("Fire %1 // Ice %1").arg(i);
+        face1["text"] = "Fire side text.";
+        face1["layout"] = "split";
+        face1["side"] = "a";
+        face1["faceName"] = QString("Fire %1").arg(i);
+        face1["colors"] = QJsonArray{"R"};
+        face1["colorIdentity"] = QJsonArray{"R"};
+        face1["types"] = QJsonArray{"Instant"};
+        face1["manaCost"] = "{R}";
+        face1["legalities"] = QJsonObject{{"standard", "not_legal"}};
+        face1["identifiers"] = QJsonObject{{"scryfallId", QString("f-%1").arg(i)}};
+        face1["number"] = QString::number(i + 1);
+        face1["rarity"] = "uncommon";
+
+        QJsonObject face2;
+        face2["name"] = QString("Fire %1 // Ice %1").arg(i);
+        face2["text"] = "Ice side text.";
+        face2["layout"] = "split";
+        face2["side"] = "b";
+        face2["faceName"] = QString("Ice %1").arg(i);
+        face2["colors"] = QJsonArray{"U"};
+        face2["colorIdentity"] = QJsonArray{"U"};
+        face2["types"] = QJsonArray{"Instant"};
+        face2["manaCost"] = "{U}";
+        face2["legalities"] = QJsonObject{{"standard", "not_legal"}};
+        face2["identifiers"] = QJsonObject{{"scryfallId", QString("i-%1").arg(i)}};
+        face2["number"] = QString::number(i + 1);
+        face2["rarity"] = "uncommon";
+
+        cardsList.append(face1);
+        cardsList.append(face2);
+    }
+
+    NoopCardSetPriorityController controller;
+    OracleImporter importer;
+    CardSetPtr set = CardSet::newInstance(&controller, "TST", "Split Test");
+
+    QElapsedTimer timer;
+    timer.start();
+    int count = importer.importCardsFromSet(set, cardsList);
+    qint64 ms = timer.elapsed();
+
+    ASSERT_EQ(count, numSplitCards);
+    qDebug().noquote() << QString("Split Card Merge Benchmark: %1 cards in %2 ms (%3 cards/sec)")
+                              .arg(count)
+                              .arg(ms)
+                              .arg(ms > 0 ? static_cast<double>(count) / ms * 1000.0 : 0.0, 0, 'f', 0);
+}
+
+// ============================================================================
+// sortAndReduceColors microbenchmark
+// ============================================================================
+
+// We can't call sortAndReduceColors directly (it's static), so we benchmark
+// through importCardsFromSet with color properties.
+
+TEST(OracleBenchmark, ImportCardsWithColors)
+{
+    static constexpr int numCards = 10000;
+
+    NoopCardSetPriorityController controller;
+    OracleImporter importer;
+    CardSetPtr set = CardSet::newInstance(&controller, "TST", "Color Test");
+
+    QJsonArray cardsList;
+    for (int i = 0; i < numCards; ++i) {
+        QJsonObject card;
+        card["name"] = QString("Color Card %1").arg(i);
+        card["text"] = "Rules text.";
+        card["layout"] = "normal";
+        card["manaCost"] = "{W}";
+        card["type"] = "Creature — Human";
+        card["types"] = QJsonArray{"Creature"};
+        card["colors"] = QJsonArray{"B", "R", "G", "W", "U"};
+        card["colorIdentity"] = QJsonArray{"B", "R", "G", "W", "U"};
+        card["number"] = QString::number(i + 1);
+        card["rarity"] = "common";
+        card["legalities"] = QJsonObject{{"standard", "legal"}};
+        card["identifiers"] = QJsonObject{{"scryfallId", QString("c-%1").arg(i)}};
+        cardsList.append(card);
+    }
+
+    QElapsedTimer timer;
+    timer.start();
+    int count = importer.importCardsFromSet(set, cardsList);
+    qint64 ms = timer.elapsed();
+
+    ASSERT_EQ(count, numCards);
+    qDebug().noquote() << QString("Import with Colors Benchmark: %1 cards in %2 ms (%3 cards/sec)")
+                              .arg(count)
+                              .arg(ms)
+                              .arg(ms > 0 ? static_cast<double>(count) / ms * 1000.0 : 0.0, 0, 'f', 0);
+}
+
+// ============================================================================
+// RAM usage measurement
+// ============================================================================
+
+// Mirrors the default AllPrintings URL selection in oracle/src/pages.cpp.
+#if defined(HAS_LZMA)
+static const QUrl kDefaultAllPrintingsUrl("https://www.mtgjson.com/api/v5/AllPrintings.json.xz");
+#elif defined(HAS_ZLIB)
+static const QUrl kDefaultAllPrintingsUrl("https://www.mtgjson.com/api/v5/AllPrintings.json.zip");
+#else
+static const QUrl kDefaultAllPrintingsUrl("https://www.mtgjson.com/api/v5/AllPrintings.json");
+#endif
+
+// Magic bytes also from oracle/src/pages.cpp
+static const QByteArray kXzSignature("\xFD\x37\x7A\x58\x5A", 6);
+static const QByteArray kZipSignature("PK");
+
+struct MemorySnapshot
+{
+    qint64 peakRssKb = -1; // process high-water mark (VmHWM on Linux, ru_maxrss on macOS)
+    qint64 rssKb = -1;     // current resident set size
+    bool available = false;
+
+    static MemorySnapshot current()
+    {
+        MemorySnapshot snap;
+#if defined(Q_OS_LINUX)
+        QFile statusFile("/proc/self/status");
+        if (statusFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            // /proc files report size() == 0, so atEnd() is immediately true: read everything first.
+            const QList<QByteArray> lines = statusFile.readAll().split('\n');
+            for (const QByteArray &line : lines) {
+                if (line.startsWith("VmHWM:")) {
+                    snap.peakRssKb = line.mid(6).trimmed().split(' ').value(0).toLongLong();
+                } else if (line.startsWith("VmRSS:")) {
+                    snap.rssKb = line.mid(6).trimmed().split(' ').value(0).toLongLong();
+                }
+            }
+            snap.available = snap.peakRssKb >= 0;
+        }
+#elif defined(Q_OS_MACOS)
+        struct rusage usage;
+        if (getrusage(RUSAGE_SELF, &usage) == 0) {
+            snap.peakRssKb = usage.ru_maxrss / 1024; // bytes -> kB
+            snap.available = snap.peakRssKb >= 0;
+        }
+        // getrusage has no current-RSS equivalent; task_info's resident_size
+        // is the closest macOS analog to Linux VmRSS.
+        mach_task_basic_info info = {};
+        mach_msg_type_number_t count = MACH_TASK_BASIC_INFO_COUNT;
+        if (task_info(mach_task_self(), MACH_TASK_BASIC_INFO, reinterpret_cast<task_info_t>(&info), &count) ==
+            KERN_SUCCESS) {
+            snap.rssKb = info.resident_size / 1024;
+        }
+#endif
+        return snap;
+    }
+};
+
+static QString formatKb(qint64 kb)
+{
+    if (kb < 0) {
+        return "N/A";
+    }
+    return QString("%1 MB").arg(kb / 1024.0, 0, 'f', 1);
+}
+
+static void logRamPhase(const QString &phase, const MemorySnapshot &baseline, const MemorySnapshot &current)
+{
+    if (!baseline.available || !current.available) {
+        qDebug().noquote() << QString("  %1: memory stats unavailable on this platform").arg(phase);
+        return;
+    }
+    // VmHWM / ru_maxrss are monotonically non-decreasing high-water marks, so a
+    // peak-based delta between phases is ~0.0 MB by construction once the
+    // fixture build has set the process peak. The live signals are current RSS
+    // and the process peak; the delta is meaningful only where the baseline was
+    // taken immediately before the phase it measures (e.g. the import phase,
+    // which compares afterParse against afterImport).
+    QString rssDelta = "N/A";
+    if (current.rssKb >= 0 && baseline.rssKb >= 0) {
+        rssDelta = formatKb(current.rssKb - baseline.rssKb);
+    }
+    qDebug().noquote() << QString("  %1: current RSS %2 | delta vs baseline %3 | process peak %4")
+                              .arg(phase)
+                              .arg(formatKb(current.rssKb))
+                              .arg(rssDelta)
+                              .arg(formatKb(current.peakRssKb));
+}
+
+// Decompresses the download payload when the default URL is a compressed build,
+// mirroring the wizard's magic-byte handling in oracle/src/pages.cpp.
+static QByteArray decompressSetsData(const QByteArray &payload)
+{
+    if (payload.startsWith(kXzSignature)) {
+#if defined(HAS_LZMA)
+        QBuffer inBuffer(const_cast<QByteArray *>(&payload));
+        QByteArray out;
+        QBuffer outBuffer(&out);
+        inBuffer.open(QIODevice::ReadOnly);
+        outBuffer.open(QIODevice::WriteOnly);
+        XzDecompressor xz;
+        if (!xz.decompress(&inBuffer, &outBuffer)) {
+            qDebug() << "RAM benchmark: xz decompression failed";
+            return {};
+        }
+        return out;
+#else
+        qDebug() << "RAM benchmark: download is xz-compressed but this build has no LZMA support";
+        return {};
+#endif
+    }
+    if (payload.startsWith(kZipSignature)) {
+#if defined(HAS_ZLIB)
+        QBuffer inBuffer(const_cast<QByteArray *>(&payload));
+        inBuffer.open(QIODevice::ReadOnly);
+        UnZip unzip;
+        if (unzip.openArchive(&inBuffer) != UnZip::Ok) {
+            qDebug() << "RAM benchmark: zip archive open failed";
+            return {};
+        }
+        if (unzip.fileList().size() != 1) {
+            qDebug() << "RAM benchmark: zip archive doesn't contain exactly one file";
+            return {};
+        }
+        QByteArray out;
+        QBuffer outBuffer(&out);
+        outBuffer.open(QIODevice::WriteOnly);
+        const auto errorCode = unzip.extractFile(unzip.fileList().value(0), &outBuffer);
+        unzip.closeArchive();
+        if (errorCode != UnZip::Ok) {
+            qDebug() << "RAM benchmark: zip extraction failed";
+            return {};
+        }
+        return out;
+#else
+        qDebug() << "RAM benchmark: download is zip-compressed but this build has no zlib support";
+        return {};
+#endif
+    }
+    return payload;
+}
+
+TEST(OracleBenchmark, ImportRamUsage)
+{
+    static constexpr int numSets = 30;
+    static constexpr int cardsPerSet = 2000; // ~60k cards, roughly AllPrintings scale
+
+    // Baseline must precede the fixture build: a high-water mark set while
+    // generating the synthetic JSON would otherwise mask the importer phases.
+    // Where memory stats are unavailable (Windows), skip before doing the
+    // 60k-card fixture build, which would otherwise be pure wasted work.
+    const MemorySnapshot baseline = MemorySnapshot::current();
+    if (!baseline.available) {
+        GTEST_SKIP() << "Memory stats unavailable on this platform";
+    }
+
+    const QByteArray data = buildSyntheticData(numSets, cardsPerSet);
+
+    // The fixture build leaves freed-but-unreturned arenas behind (current RSS
+    // rarely falls once glibc allocates). Baseline immediately after it so the
+    // parse phase measures only the importer's own growth (~40 MB) rather than
+    // swallowing the fixture builder's spike.
+    const MemorySnapshot afterFixture = MemorySnapshot::current();
+    logRamPhase("fixture build", baseline, afterFixture);
+
+    NoopCardSetPriorityController controller;
+    OracleImporter importer;
+
+    QElapsedTimer timer;
+    timer.start();
+    ASSERT_TRUE(importer.readSetsFromByteArray(std::move(data)));
+    const qint64 parseMs = timer.elapsed();
+    const MemorySnapshot afterParse = MemorySnapshot::current();
+
+    timer.restart();
+    const int importedSets = importer.startImport();
+    const qint64 importMs = timer.elapsed();
+    const MemorySnapshot afterImport = MemorySnapshot::current();
+
+    importer.releaseSetData();
+    const MemorySnapshot afterRelease = MemorySnapshot::current();
+
+    const int totalCards = importer.getCardList().size();
+    qDebug().noquote() << QString("Oracle RAM Benchmark (synthetic): %1 sets, %2 cards, %3 MB JSON")
+                              .arg(importedSets)
+                              .arg(totalCards)
+                              .arg(data.size() / (1024.0 * 1024.0), 0, 'f', 1);
+    qDebug().noquote() << QString("  JSON parse: %1 ms").arg(parseMs);
+    qDebug().noquote() << QString("  Card import: %1 ms").arg(importMs);
+    logRamPhase("parse", afterFixture, afterParse);
+    logRamPhase("import", afterParse, afterImport);
+    logRamPhase("after releaseSetData()", afterImport, afterRelease);
+
+    // Freeing the parsed tree rarely moves current RSS (allocator reuse), so the
+    // meaningful signal that release actually dropped the buffers is emptiness,
+    // not an RSS delta.
+    ASSERT_TRUE(importer.getSets().isEmpty());
+}
+
+TEST(OracleBenchmark, ImportRamUsageAllPrintings)
+{
+    // Only "1" enables the download: unset (the default and the CI setup) and
+    // an explicit "0" both disable it.
+    bool envOk = false;
+    const int enabled = qEnvironmentVariableIntValue("COCKATRICE_ORACLE_RAM_BENCHMARK", &envOk);
+    if (!envOk || enabled == 0) {
+        GTEST_SKIP() << "Set COCKATRICE_ORACLE_RAM_BENCHMARK=1 to download the real AllPrintings dataset for this "
+                        "RAM benchmark. Default URL: "
+                     << kDefaultAllPrintingsUrl.toDisplayString().toStdString();
+    }
+
+    // Baseline must precede the request so the phase covers the download +
+    // decompress step, including the payload materialized by readAll().
+    const MemorySnapshot baseline = MemorySnapshot::current();
+    if (!baseline.available) {
+        GTEST_SKIP() << "Memory stats unavailable on this platform";
+    }
+
+    QNetworkAccessManager nam;
+    QNetworkRequest request(kDefaultAllPrintingsUrl);
+    request.setHeader(QNetworkRequest::UserAgentHeader, "Cockatrice Oracle RAM benchmark");
+    QNetworkReply *reply = nam.get(request);
+
+    QEventLoop loop;
+    QTimer timeoutTimer;
+    timeoutTimer.setSingleShot(true);
+    bool timedOut = false;
+    QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
+    QObject::connect(&timeoutTimer, &QTimer::timeout, &loop, [&] {
+        timedOut = true;
+        reply->abort();
+    });
+    timeoutTimer.start(10 * 60 * 1000);
+    loop.exec();
+    timeoutTimer.stop();
+
+    // abort() leaves reply->error() as OperationCanceledError, so a timed-out
+    // download takes the same GTEST_SKIP path as any other network error
+    // instead of reading a truncated body and failing the parse below.
+    if (timedOut || reply->error() != QNetworkReply::NoError) {
+        GTEST_SKIP() << "Download failed: " << reply->errorString().toStdString();
+    }
+    const QByteArray payload = reply->readAll();
+    reply->deleteLater();
+
+    // mtgjson can answer 200 with an HTML page (mirrors the wizard's '<' check
+    // in pages.cpp); reject it before trying to decompress/parse.
+    if (payload.startsWith("<")) {
+        GTEST_SKIP() << "Download returned a non-JSON body (HTML page instead of data), skipping";
+    }
+
+    const QByteArray setsData = decompressSetsData(payload);
+    const MemorySnapshot afterDownload = MemorySnapshot::current();
+    if (setsData.isEmpty()) {
+        GTEST_SKIP() << "No data to import (download or decompression failed)";
+    }
+
+    NoopCardSetPriorityController controller;
+    OracleImporter importer;
+
+    QElapsedTimer timer;
+    timer.start();
+    ASSERT_TRUE(importer.readSetsFromByteArray(std::move(setsData)));
+    const qint64 parseMs = timer.elapsed();
+    const MemorySnapshot afterParse = MemorySnapshot::current();
+
+    timer.restart();
+    const int importedSets = importer.startImport();
+    const qint64 importMs = timer.elapsed();
+    const MemorySnapshot afterImport = MemorySnapshot::current();
+
+    importer.releaseSetData();
+    const MemorySnapshot afterRelease = MemorySnapshot::current();
+
+    const int totalCards = importer.getCardList().size();
+    qDebug().noquote() << QString("Oracle RAM Benchmark (real AllPrintings): %1 sets, %2 unique cards")
+                              .arg(importedSets)
+                              .arg(totalCards);
+    qDebug().noquote() << QString("  URL: %1").arg(kDefaultAllPrintingsUrl.toDisplayString());
+    qDebug().noquote() << QString("  Downloaded: %1 MB, decompressed: %2 MB")
+                              .arg(payload.size() / (1024.0 * 1024.0), 0, 'f', 1)
+                              .arg(setsData.size() / (1024.0 * 1024.0), 0, 'f', 1);
+    qDebug().noquote() << QString("  JSON parse: %1 ms").arg(parseMs);
+    qDebug().noquote() << QString("  Card import: %1 ms").arg(importMs);
+    logRamPhase("download+decompress", baseline, afterDownload);
+    logRamPhase("parse", afterDownload, afterParse);
+    logRamPhase("import", afterParse, afterImport);
+    logRamPhase("after releaseSetData()", afterImport, afterRelease);
+}
+
+int main(int argc, char **argv)
+{
+    // Required for the event loop used by the real-AllPrintings download benchmark
+    QCoreApplication app(argc, argv);
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/oracle/oracle_importer_test.cpp b/tests/oracle/oracle_importer_test.cpp
new file mode 100644
index 000000000..83d77d465
--- /dev/null
+++ b/tests/oracle/oracle_importer_test.cpp
@@ -0,0 +1,1147 @@
+#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 <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
+{
+protected:
+    void SetUp() override
+    {
+        controller = new NoopCardSetPriorityController();
+        importer = new OracleImporter();
+        set = CardSet::newInstance(controller, "TST", "Test Set");
+    }
+
+    void TearDown() override
+    {
+        delete importer;
+        delete controller;
+    }
+
+    // Helper: build a minimal card JSON object
+    QJsonObject makeCard(const QString &name,
+                         const QString &colors = "",
+                         const QString &colorIdentity = "",
+                         const QVariantMap &legalities = {})
+    {
+        QJsonObject card;
+        card["name"] = name;
+        card["text"] = "Rules text.";
+        card["layout"] = "normal";
+        card["manaCost"] = "{W}";
+        card["type"] = "Creature — Human";
+        card["types"] = QJsonArray{"Creature"};
+        card["number"] = "1";
+        card["rarity"] = "common";
+
+        if (!colors.isEmpty()) {
+            QJsonArray arr;
+            for (const QChar &c : colors) {
+                arr.append(QString(c));
+            }
+            card["colors"] = arr;
+        }
+        if (!colorIdentity.isEmpty()) {
+            QJsonArray arr;
+            for (const QChar &c : colorIdentity) {
+                arr.append(QString(c));
+            }
+            card["colorIdentity"] = arr;
+        }
+        if (!legalities.isEmpty()) {
+            QJsonObject legalObj;
+            for (auto it = legalities.constBegin(); it != legalities.constEnd(); ++it) {
+                legalObj[it.key()] = it.value().toString();
+            }
+            card["legalities"] = legalObj;
+        }
+
+        QJsonObject identifiers;
+        identifiers["scryfallId"] = QUuid::createUuid().toString(QUuid::WithoutBraces);
+        card["identifiers"] = identifiers;
+
+        return card;
+    }
+
+    // Helper: build a single MTGJSON foreignData entry
+    QJsonObject makeForeignEntry(const QString &language, const QString &name, const QString &text)
+    {
+        QJsonObject entry;
+        entry["language"] = language;
+        entry["name"] = name;
+        if (!text.isEmpty()) {
+            entry["text"] = text;
+        }
+        return entry;
+    }
+
+    NoopCardSetPriorityController *controller;
+    OracleImporter *importer;
+    CardSetPtr set;
+};
+
+// ============================================================================
+// sortAndReduceColors tests (tested via importCardsFromSet)
+// ============================================================================
+
+TEST_F(OracleImporterTest, SortAndReduceColorsSingleColor)
+{
+    QJsonArray cards{makeCard("Red Card", "R", "R")};
+    importer->importCardsFromSet(set, cards);
+
+    auto card = importer->getCardList().value("Red Card");
+    ASSERT_FALSE(card.isNull());
+    ASSERT_EQ(card->getProperty("colors"), "R");
+}
+
+TEST_F(OracleImporterTest, SortAndReduceColorsDeduplicates)
+{
+    QJsonArray cards{makeCard("Dedup Card", "WWUUB", "WU")};
+    importer->importCardsFromSet(set, cards);
+
+    auto card = importer->getCardList().value("Dedup Card");
+    ASSERT_FALSE(card.isNull());
+    ASSERT_EQ(card->getProperty("colors"), "WUB");
+}
+
+TEST_F(OracleImporterTest, SortAndReduceColorsSortsWUBRG)
+{
+    QJsonArray cards{makeCard("Sort Card", "RGW", "RGW")};
+    importer->importCardsFromSet(set, cards);
+
+    auto card = importer->getCardList().value("Sort Card");
+    ASSERT_FALSE(card.isNull());
+    ASSERT_EQ(card->getProperty("colors"), "WRG");
+}
+
+TEST_F(OracleImporterTest, SortAndReduceColorsAllFive)
+{
+    QJsonArray cards{makeCard("Five Color", "BRGWU", "BRGWU")};
+    importer->importCardsFromSet(set, cards);
+
+    auto card = importer->getCardList().value("Five Color");
+    ASSERT_FALSE(card.isNull());
+    ASSERT_EQ(card->getProperty("colors"), "WUBRG");
+}
+
+TEST_F(OracleImporterTest, SortAndReduceColorIdentity)
+{
+    QJsonArray cards{makeCard("Color Id Card", "W", "GWR")};
+    importer->importCardsFromSet(set, cards);
+
+    auto card = importer->getCardList().value("Color Id Card");
+    ASSERT_FALSE(card.isNull());
+    ASSERT_EQ(card->getProperty("coloridentity"), "WRG");
+}
+
+TEST_F(OracleImporterTest, SingleColorNotSorted)
+{
+    QJsonArray cards{makeCard("Single Card", "B", "B")};
+    importer->importCardsFromSet(set, cards);
+
+    auto card = importer->getCardList().value("Single Card");
+    ASSERT_FALSE(card.isNull());
+    ASSERT_EQ(card->getProperty("colors"), "B");
+}
+
+// ============================================================================
+// Legality guard tests
+// ============================================================================
+
+TEST_F(OracleImporterTest, NewCardKeepsLegalityProperties)
+{
+    // Verifies that format-* properties survive addCard on a fresh card
+    // (not the combineLegalities guard, which only runs on existing printings).
+    QVariantMap leg;
+    leg["standard"] = "legal";
+    leg["modern"] = "legal";
+    QJsonArray cards{makeCard("Legal Card", "", "", leg)};
+
+    importer->importCardsFromSet(set, cards);
+    auto card = importer->getCardList().value("Legal Card");
+    ASSERT_FALSE(card.isNull());
+    ASSERT_EQ(card->getProperty("format-standard"), "legal");
+    ASSERT_EQ(card->getProperty("format-modern"), "legal");
+}
+
+TEST_F(OracleImporterTest, LegalityMergeAllowedWhenCardHasNoLegalities)
+{
+    // First printing carries no legalities at all, so the guard's
+    // `properties.filter(formatRegex).empty()` predicate is true and the
+    // second printing's legalities must be merged in.
+    QJsonArray cards1{makeCard("Unmerged Card")};
+    importer->importCardsFromSet(set, cards1);
+
+    CardSetPtr set2 = CardSet::newInstance(controller, "TS2", "Second Set");
+    QVariantMap leg;
+    leg["standard"] = "legal";
+    QJsonArray cards2{makeCard("Unmerged Card", "", "", leg)};
+    importer->importCardsFromSet(set2, cards2);
+
+    auto card = importer->getCardList().value("Unmerged Card");
+    ASSERT_FALSE(card.isNull());
+    ASSERT_EQ(card->getProperty("format-standard"), "legal");
+}
+
+TEST_F(OracleImporterTest, LegalityGuardPreservesFirstPrinting)
+{
+    // First printing: standard=legal, modern=legal
+    QVariantMap leg1;
+    leg1["standard"] = "legal";
+    leg1["modern"] = "legal";
+    QJsonArray cards1{makeCard("Guarded Card", "", "", leg1)};
+    importer->importCardsFromSet(set, cards1);
+
+    // Second printing: standard=banned, modern=not_legal
+    CardSetPtr set2 = CardSet::newInstance(controller, "TS2", "Second Set");
+    QVariantMap leg2;
+    leg2["standard"] = "banned";
+    leg2["modern"] = "not_legal";
+    QJsonArray cards2{makeCard("Guarded Card", "", "", leg2)};
+    importer->importCardsFromSet(set2, cards2);
+
+    auto card = importer->getCardList().value("Guarded Card");
+    ASSERT_FALSE(card.isNull());
+    // Guard should preserve first printing's legalities
+    ASSERT_EQ(card->getProperty("format-standard"), "legal");
+    ASSERT_EQ(card->getProperty("format-modern"), "legal");
+}
+
+// ============================================================================
+// createDefaultMagicFormats tests
+// ============================================================================
+
+TEST_F(OracleImporterTest, CreateDefaultMagicFormatsContainsExpectedFormats)
+{
+    auto formats = importer->createDefaultMagicFormats();
+    ASSERT_TRUE(formats.contains("standard"));
+    ASSERT_TRUE(formats.contains("modern"));
+    ASSERT_TRUE(formats.contains("legacy"));
+    ASSERT_TRUE(formats.contains("vintage"));
+    ASSERT_TRUE(formats.contains("commander"));
+    ASSERT_TRUE(formats.contains("pauper"));
+    ASSERT_TRUE(formats.contains("pioneer"));
+    ASSERT_TRUE(formats.contains("brawl"));
+    ASSERT_TRUE(formats.contains("historic"));
+    ASSERT_TRUE(formats.contains("timeless"));
+    ASSERT_TRUE(formats.contains("duel"));
+    ASSERT_TRUE(formats.contains("oathbreaker"));
+}
+
+TEST_F(OracleImporterTest, CreateDefaultMagicFormatsSingletonDeckSizes)
+{
+    auto formats = importer->createDefaultMagicFormats();
+    auto commander = formats.value("commander");
+    ASSERT_FALSE(commander.isNull());
+    ASSERT_EQ(commander->minDeckSize, 100);
+    ASSERT_EQ(commander->maxDeckSize, 100);
+    ASSERT_EQ(commander->maxSideboardSize, 15);
+
+    auto brawl = formats.value("brawl");
+    ASSERT_FALSE(brawl.isNull());
+    ASSERT_EQ(brawl->minDeckSize, 60);
+    ASSERT_EQ(brawl->maxDeckSize, 60);
+}
+
+TEST_F(OracleImporterTest, CreateDefaultMagicFormatsVintageHasRestricted)
+{
+    auto formats = importer->createDefaultMagicFormats();
+    auto vintage = formats.value("vintage");
+    ASSERT_FALSE(vintage.isNull());
+    bool hasRestricted = false;
+    for (const auto &ac : vintage->allowedCounts) {
+        if (ac.label == "restricted") {
+            hasRestricted = true;
+            ASSERT_EQ(ac.max, 1);
+        }
+    }
+    ASSERT_TRUE(hasRestricted);
+}
+
+TEST_F(OracleImporterTest, CreateDefaultMagicFormatsRegexMatchesBasicLands)
+{
+    auto formats = importer->createDefaultMagicFormats();
+    auto standard = formats.value("standard");
+    ASSERT_FALSE(standard.isNull());
+    ASSERT_FALSE(standard->exceptions.isEmpty());
+
+    auto &basicLandsException = standard->exceptions.first();
+    ASSERT_FALSE(basicLandsException.conditions.isEmpty());
+
+    auto &condition = basicLandsException.conditions.first();
+    ASSERT_EQ(condition.field, "type");
+    ASSERT_EQ(condition.matchType, "regex");
+
+    // Verify the regex actually works (was broken before: \b = backspace, not word boundary)
+    QRegularExpression regex(condition.value);
+    ASSERT_TRUE(regex.isValid());
+    ASSERT_TRUE(regex.match("Basic Land — Forest").hasMatch());
+    ASSERT_TRUE(regex.match("Basic Snow Land — Mountain").hasMatch());
+    ASSERT_FALSE(regex.match("Creature — Elf Warrior").hasMatch());
+}
+
+TEST_F(OracleImporterTest, CreateDefaultMagicFormatsCaching)
+{
+    // The memoized map returns the same FormatRulesPtr instances, so the
+    // shared pointers must be identical across calls. This is the only
+    // observable effect of the cache: contents would match either way.
+    auto first = importer->createDefaultMagicFormats();
+    auto second = importer->createDefaultMagicFormats();
+    ASSERT_EQ(first.value("standard").data(), second.value("standard").data());
+}
+
+// ============================================================================
+// readSetsFromByteArray tests
+// ============================================================================
+
+TEST_F(OracleImporterTest, ReadSetsFromByteArrayValidJson)
+{
+    QJsonObject setObj;
+    setObj["code"] = "tst";
+    setObj["name"] = "Test Set";
+    setObj["type"] = "expansion";
+    setObj["releaseDate"] = "2024-01-01";
+    setObj["cards"] = QJsonArray();
+
+    QJsonObject root;
+    root["data"] = QJsonObject{{"TST", setObj}};
+
+    QByteArray data = QJsonDocument(root).toJson();
+    ASSERT_TRUE(importer->readSetsFromByteArray(data));
+    ASSERT_EQ(importer->getSets().size(), 1);
+    ASSERT_EQ(importer->getSets().first().getShortName(), "TST");
+}
+
+TEST_F(OracleImporterTest, ReadSetsFromByteArrayInvalidJson)
+{
+    QByteArray data = "not valid json";
+    ASSERT_FALSE(importer->readSetsFromByteArray(data));
+}
+
+TEST_F(OracleImporterTest, ReadSetsFromByteArrayEmptyData)
+{
+    QJsonObject root;
+    root["data"] = QJsonObject();
+
+    QByteArray data = QJsonDocument(root).toJson();
+    ASSERT_FALSE(importer->readSetsFromByteArray(data));
+}
+
+TEST_F(OracleImporterTest, ReadSetsFromByteArrayCapitalizesSetType)
+{
+    QJsonObject setObj;
+    setObj["code"] = "ftv";
+    setObj["name"] = "From The Vault";
+    setObj["type"] = "from_the_vault";
+    setObj["releaseDate"] = "2024-01-01";
+    setObj["cards"] = QJsonArray();
+
+    QJsonObject root;
+    root["data"] = QJsonObject{{"FTV", setObj}};
+
+    QByteArray data = QJsonDocument(root).toJson();
+    ASSERT_TRUE(importer->readSetsFromByteArray(data));
+    ASSERT_EQ(importer->getSets().first().getSetType(), "From the Vault");
+}
+
+TEST_F(OracleImporterTest, ReadSetsFromByteArraySortsSetsByName)
+{
+    // QJsonObject iterates keys in lexicographic order ("AAA" before "ZZZ"),
+    // so leaving the natural order matching the alphabetical sort makes the
+    // assertion pass trivially. Inverting it keeps the sort meaningful:
+    // iteration yields "AAA" (Zeta Set) first, then the sort by name must
+    // promote "ZZZ" (Alpha Set) to the front.
+    QJsonObject setA;
+    setA["code"] = "aaa";
+    setA["name"] = "Zeta Set";
+    setA["type"] = "expansion";
+    setA["releaseDate"] = "2024-01-01";
+    setA["cards"] = QJsonArray();
+
+    QJsonObject setB;
+    setB["code"] = "zzz";
+    setB["name"] = "Alpha Set";
+    setB["type"] = "expansion";
+    setB["releaseDate"] = "2024-01-01";
+    setB["cards"] = QJsonArray();
+
+    QJsonObject root;
+    root["data"] = QJsonObject{{"AAA", setA}, {"ZZZ", setB}};
+
+    QByteArray data = QJsonDocument(root).toJson();
+    ASSERT_TRUE(importer->readSetsFromByteArray(data));
+    auto sets = importer->getSets();
+    ASSERT_GE(sets.size(), 2);
+    ASSERT_EQ(sets.first().getShortName(), "ZZZ");
+}
+
+// ============================================================================
+// Split card coloridentity tests
+// ============================================================================
+
+TEST_F(OracleImporterTest, SplitCardColorIdentityConcatenated)
+{
+    QJsonObject leg{{"standard", "not_legal"}};
+
+    QJsonObject face1;
+    face1["name"] = "Fire // Ice";
+    face1["text"] = "Fire deals 2 damage.";
+    face1["layout"] = "split";
+    face1["side"] = "a";
+    face1["faceName"] = "Fire";
+    face1["colors"] = QJsonArray{"R"};
+    face1["colorIdentity"] = QJsonArray{"R"};
+    face1["types"] = QJsonArray{"Instant"};
+    face1["manaCost"] = "{R}";
+    face1["legalities"] = leg;
+    face1["identifiers"] = QJsonObject{{"scryfallId", "aaa"}};
+    face1["number"] = "1";
+    face1["rarity"] = "uncommon";
+
+    QJsonObject face2;
+    face2["name"] = "Fire // Ice";
+    face2["text"] = "Ice taps target artifact.";
+    face2["layout"] = "split";
+    face2["side"] = "b";
+    face2["faceName"] = "Ice";
+    face2["colors"] = QJsonArray{"U"};
+    face2["colorIdentity"] = QJsonArray{"U"};
+    face2["types"] = QJsonArray{"Instant"};
+    face2["manaCost"] = "{U}";
+    face2["legalities"] = leg;
+    face2["identifiers"] = QJsonObject{{"scryfallId", "bbb"}};
+    face2["number"] = "1";
+    face2["rarity"] = "uncommon";
+
+    QJsonArray cardsList{face1, face2};
+    int count = importer->importCardsFromSet(set, cardsList);
+    ASSERT_EQ(count, 1);
+
+    auto card = importer->getCardList().value("Fire // Ice");
+    ASSERT_FALSE(card.isNull());
+
+    // coloridentity should be "RU" (concatenated), then sorted to "UR"
+    // by sortAndReduceColors when it reaches addCard
+    ASSERT_EQ(card->getProperty("coloridentity"), "UR");
+}
+
+TEST_F(OracleImporterTest, SplitCardColorsConcatenated)
+{
+    QJsonObject leg{{"standard", "not_legal"}};
+
+    QJsonObject face1;
+    face1["name"] = "Fire // Ice";
+    face1["text"] = "Fire deals 2 damage.";
+    face1["layout"] = "split";
+    face1["side"] = "a";
+    face1["faceName"] = "Fire";
+    face1["colors"] = QJsonArray{"R"};
+    face1["colorIdentity"] = QJsonArray{"R"};
+    face1["types"] = QJsonArray{"Instant"};
+    face1["manaCost"] = "{R}";
+    face1["legalities"] = leg;
+    face1["identifiers"] = QJsonObject{{"scryfallId", "aaa"}};
+    face1["number"] = "1";
+    face1["rarity"] = "uncommon";
+
+    QJsonObject face2;
+    face2["name"] = "Fire // Ice";
+    face2["text"] = "Ice taps target artifact.";
+    face2["layout"] = "split";
+    face2["side"] = "b";
+    face2["faceName"] = "Ice";
+    face2["colors"] = QJsonArray{"U"};
+    face2["colorIdentity"] = QJsonArray{"U"};
+    face2["types"] = QJsonArray{"Instant"};
+    face2["manaCost"] = "{U}";
+    face2["legalities"] = leg;
+    face2["identifiers"] = QJsonObject{{"scryfallId", "bbb"}};
+    face2["number"] = "1";
+    face2["rarity"] = "uncommon";
+
+    QJsonArray cardsList{face1, face2};
+    importer->importCardsFromSet(set, cardsList);
+
+    auto card = importer->getCardList().value("Fire // Ice");
+    ASSERT_FALSE(card.isNull());
+
+    QString colors = card->getProperty("colors");
+    ASSERT_FALSE(colors.contains("//")) << "colors should not contain '//', got: " << colors.toStdString();
+    ASSERT_TRUE(colors.contains("R"));
+    ASSERT_TRUE(colors.contains("U"));
+}
+
+// ============================================================================
+// Mana cost formatting tests
+// ============================================================================
+
+TEST_F(OracleImporterTest, ManaCostStripsBraces)
+{
+    QJsonObject card = makeCard("Mana Card");
+    card["manaCost"] = "{2}{W}{B}";
+    QJsonArray cards{card};
+
+    importer->importCardsFromSet(set, cards);
+    auto result = importer->getCardList().value("Mana Card");
+    ASSERT_FALSE(result.isNull());
+    ASSERT_EQ(result->getProperty("manacost"), "2WB");
+}
+
+// cmc comes through as a JSON number ("convertedManaCost"/"manaValue" are
+// floats in AllPrintings), so this pins the number-to-text coercion that
+// QJsonValue::toString() dropped in #7214.
+TEST_F(OracleImporterTest, NumericManaValueCoercedToCmc)
+{
+    QJsonObject card = makeCard("Cmc Card");
+    card["manaValue"] = 3;
+    QJsonArray cards{card};
+
+    importer->importCardsFromSet(set, cards);
+    auto result = importer->getCardList().value("Cmc Card");
+    ASSERT_FALSE(result.isNull());
+    ASSERT_EQ(result->getProperty("cmc"), "3");
+}
+
+TEST_F(OracleImporterTest, LegacyConvertedManaCostCoercedToCmc)
+{
+    QJsonObject card = makeCard("Legacy Cmc Card");
+    card["convertedManaCost"] = 3.0;
+    QJsonArray cards{card};
+
+    importer->importCardsFromSet(set, cards);
+    auto result = importer->getCardList().value("Legacy Cmc Card");
+    ASSERT_FALSE(result.isNull());
+    ASSERT_EQ(result->getProperty("cmc"), "3");
+}
+
+// ============================================================================
+// Card deduplication tests
+// ============================================================================
+
+TEST_F(OracleImporterTest, DuplicateCardNameReturnsExisting)
+{
+    QJsonArray cards{makeCard("Dupe Card")};
+    importer->importCardsFromSet(set, cards);
+
+    CardSetPtr set2 = CardSet::newInstance(controller, "TS2", "Second Set");
+    QJsonArray cards2{makeCard("Dupe Card")};
+    importer->importCardsFromSet(set2, cards2);
+
+    ASSERT_EQ(importer->getCardList().size(), 1);
+}
+
+TEST_F(OracleImporterTest, AELigatureReplaced)
+{
+    QJsonObject card = makeCard(QString::fromUtf8("\xC3\x86ther Vial")); // Æther Vial
+    QJsonArray cards{card};
+
+    importer->importCardsFromSet(set, cards);
+    // Æ is replaced with AE, resulting in "AEther Vial"
+    ASSERT_FALSE(importer->getCardList().contains(QString::fromUtf8("\xC3\x86ther Vial")));
+    ASSERT_TRUE(importer->getCardList().contains("AEther Vial"));
+}
+
+TEST_F(OracleImporterTest, ApostropheNormalized)
+{
+    QJsonObject card = makeCard(QString::fromUtf8("Jace\u2019s Ingenuity"));
+    QJsonArray cards{card};
+
+    importer->importCardsFromSet(set, cards);
+    ASSERT_TRUE(importer->getCardList().contains("Jace's Ingenuity"));
+}
+
+// ============================================================================
+// RawJson scanner tests
+// ============================================================================
+
+TEST_F(OracleImporterTest, ScanSetRangesMatchFullJsonParse)
+{
+    QJsonObject root;
+    QJsonObject data;
+    data["AAA"] = makeCard("Alpha Card");
+    data["BBB"] = makeCard("Beta Card");
+    root["data"] = data;
+
+    const QByteArray bytes = QJsonDocument(root).toJson(QJsonDocument::Compact);
+
+    RawJson::ScanError error;
+    const QList<RawJson::SetRange> ranges = RawJson::scanSetRanges(bytes, &error);
+    ASSERT_FALSE(error.isError()) << error.message.toStdString();
+    ASSERT_EQ(ranges.size(), 2);
+
+    const QJsonObject wholeData = QJsonDocument::fromJson(bytes).object().value("data").toObject();
+    for (const RawJson::SetRange &range : ranges) {
+        QJsonParseError parseError;
+        const QJsonDocument sliceDoc = QJsonDocument::fromJson(
+            QByteArray(bytes.constData() + range.dataRange.start, range.dataRange.length), &parseError);
+        ASSERT_EQ(parseError.error, QJsonParseError::NoError)
+            << range.code.toStdString() << ": " << parseError.errorString().toStdString();
+        ASSERT_EQ(sliceDoc.object(), wholeData.value(range.code).toObject()) << "set " << range.code.toStdString();
+    }
+}
+
+TEST_F(OracleImporterTest, ScanSetRangesDecodesEscapesAndCountsCards)
+{
+    const QByteArray json = "{\"data\":{\"KEY\":{\"code\":\"zzz\",\"name\":\"\\u00c9tude \\ud83d\\ude00\","
+                            "\"type\":\"expansion\",\"releaseDate\":\"2024-01-05\","
+                            "\"cards\":[{\"name\":\"a\"},{\"name\":\"b\"},{\"name\":\"c\"}]}}}";
+
+    RawJson::ScanError error;
+    const QList<RawJson::SetRange> ranges = RawJson::scanSetRanges(json, &error);
+    ASSERT_FALSE(error.isError());
+    ASSERT_EQ(ranges.size(), 1);
+
+    const RawJson::SetRange &range = ranges.first();
+    ASSERT_EQ(range.code, "zzz"); // inner "code" wins over the object key
+    const QString expectedName = QString::fromUtf8("\xC3\x89tude ") + QChar(0xD83D) + QChar(0xDE00);
+    ASSERT_EQ(range.name, expectedName);
+    ASSERT_EQ(range.type, "expansion");
+    ASSERT_EQ(range.releaseDate, "2024-01-05");
+    ASSERT_EQ(range.dataRange.cardCount, 3);
+
+    QJsonParseError parseError;
+    const QJsonDocument sliceDoc = QJsonDocument::fromJson(
+        QByteArray(json.constData() + range.dataRange.start, range.dataRange.length), &parseError);
+    ASSERT_EQ(parseError.error, QJsonParseError::NoError);
+    ASSERT_EQ(sliceDoc.object().value("name").toString(), expectedName);
+    ASSERT_EQ(sliceDoc.object().value("cards").toArray().size(), 3);
+}
+
+TEST_F(OracleImporterTest, ScanSetRangesRejectsInvalidJson)
+{
+    const QList<QByteArray> invalid = {"not json",
+                                       "[]",
+                                       "{\"data\":[]}",
+                                       "{\"data\":{}}",
+                                       "{\"other\":{}}",
+                                       "{\"data\":{\"A\":{\"code\":\"a\",\"name\":\"ok\",\"type\":\"x\","
+                                       "\"releaseDate\":\"2024-01-01\",\"cards\":[]}}} trailing",
+                                       "{\"data\":{\"A\":{\"cards\":[{\"name\":\"\\uZZZZ\"}]}}}",
+                                       "{\"data\":{\"A\":{\"cards\":[{\"name\":\"bad \\q escape\"}]}}}",
+                                       "{\"data\":{\"A\":{\"cards\":[{\"name\":\"\\ud800\"}]}}}"};
+
+    for (const QByteArray &json : invalid) {
+        RawJson::ScanError error;
+        RawJson::scanSetRanges(json, &error);
+        EXPECT_TRUE(error.isError()) << "expected failure for: " << json.constData();
+    }
+}
+
+TEST_F(OracleImporterTest, ScanSetRangesMatchesFullJsonParseVerdicts)
+{
+    // Verdicts must agree with QJsonDocument::fromJson for the inputs below —
+    // including the metadata quirks ("name": null, "type": 7, "releaseDate": null,
+    // "cards": null) that used to make the scanner reject sets Qt accepts.
+    const QList<QByteArray> inputs = {
+        "{\"data\":{\"A\":{\"code\":\"a\",\"name\":\"ok\",\"type\":\"x\",\"releaseDate\":\"2024-01-01\",\"cards\":[{"
+        "\"n\":1}]}}}",
+        "{\"data\":{\"A\":{\"code\":\"a\",\"name\":null,\"type\":\"x\",\"releaseDate\":\"2024-01-01\",\"cards\":[]}}}",
+        "{\"data\":{\"A\":{\"code\":\"a\",\"name\":\"ok\",\"type\":null,\"releaseDate\":\"2024-01-01\",\"cards\":[]}}}",
+        "{\"data\":{\"A\":{\"code\":\"a\",\"name\":\"ok\",\"type\":7,\"releaseDate\":\"2024-01-01\",\"cards\":null}}}",
+        "{\"data\":{\"A\":{\"code\":\"a\",\"name\":\"ok\",\"releaseDate\":\"2024-01-01\",\"cards\":[1,2,3]}}}",
+        // unescaped control character inside a string: QJsonDocument and
+        // skipString both accept it, so the scanner must not reject the whole doc
+        "{\"data\":{\"A\":{\"code\":\"a\",\"name\":\"N\tX\",\"releaseDate\":\"2024-01-01\",\"cards\":[{\"n\":1}]}}}",
+        // structurally invalid JSON (both parsers must reject)
+        "not json",
+        "{\"data\":{\"A\":{\"name\":\"unterminated}}",
+    };
+
+    for (const QByteArray &input : inputs) {
+        QJsonParseError qtError;
+        QJsonDocument::fromJson(input, &qtError);
+        const bool qtOk = qtError.error == QJsonParseError::NoError;
+
+        RawJson::ScanError scanError;
+        const QList<RawJson::SetRange> ranges = RawJson::scanSetRanges(input, &scanError);
+        EXPECT_EQ(qtOk, !scanError.isError()) << "verdict mismatch for: " << input.constData();
+        if (scanError.isError()) {
+            continue;
+        }
+        for (const RawJson::SetRange &range : ranges) {
+            QJsonParseError sliceError;
+            QJsonDocument::fromJson(QByteArray(input.constData() + range.dataRange.start, range.dataRange.length),
+                                    &sliceError);
+            EXPECT_EQ(sliceError.error, QJsonParseError::NoError) << "bad range slice for: " << input.constData();
+        }
+    }
+}
+
+TEST_F(OracleImporterTest, ScanSetRangesRejectsDeepNesting)
+{
+    // Far beyond the shared 1024 container cap: Qt reports DeepNesting and the
+    // scanner must reject too, without overflowing the stack through its
+    // recursive skipValue walk.
+    QString nesting;
+    nesting.reserve(10000);
+    for (int i = 0; i < 5000; ++i) {
+        nesting += '[';
+    }
+    for (int i = 0; i < 5000; ++i) {
+        nesting += ']';
+    }
+    const QByteArray json = ("{\"data\":{\"A\":{\"code\":\"a\",\"cards\":" + nesting + "}}}").toUtf8();
+
+    QJsonParseError qtError;
+    QJsonDocument::fromJson(json, &qtError);
+    ASSERT_NE(qtError.error, QJsonParseError::NoError) << "expected Qt to reject deep nesting";
+
+    RawJson::ScanError scanError;
+    RawJson::scanSetRanges(json, &scanError);
+    ASSERT_TRUE(scanError.isError()) << "scanner accepted a document Qt rejects as too deeply nested";
+}
+
+TEST_F(OracleImporterTest, ScanSetRangesAcceptsQtMaxNesting)
+{
+    // Pins the boundary rather than only the far-past case: a depth Qt still
+    // accepts must be accepted by the scanner too. Before the fix the scanner's
+    // cap was roughly half of Qt's (each level cost two decrements), so a
+    // depth of 1000 here was rejected even though QJsonDocument parses it.
+    constexpr int depth = 1000;
+    QString nesting;
+    nesting.reserve(2 * depth);
+    for (int i = 0; i < depth; ++i) {
+        nesting += '[';
+    }
+    for (int i = 0; i < depth; ++i) {
+        nesting += ']';
+    }
+    const QByteArray json = ("{\"data\":{\"A\":{\"code\":\"a\",\"cards\":" + nesting + "}}}").toUtf8();
+
+    QJsonParseError qtError;
+    QJsonDocument::fromJson(json, &qtError);
+    ASSERT_EQ(qtError.error, QJsonParseError::NoError) << "expected Qt to accept depth " << depth;
+
+    RawJson::ScanError scanError;
+    RawJson::scanSetRanges(json, &scanError);
+    ASSERT_FALSE(scanError.isError()) << "scanner rejected a document Qt accepts at depth " << depth;
+}
+
+// ============================================================================
+// Lazy per-set parsing tests
+// ============================================================================
+
+TEST_F(OracleImporterTest, StartImportParsesSetsLazily)
+{
+    QJsonObject setObj = makeCard("Lazy Import Card");
+    QJsonArray cards;
+    cards.append(setObj);
+    QJsonObject dataSet;
+    dataSet["code"] = "tst";
+    dataSet["name"] = "Test Set";
+    dataSet["type"] = "expansion";
+    dataSet["releaseDate"] = "2024-01-01";
+    dataSet["cards"] = cards;
+
+    QJsonObject root;
+    root["data"] = QJsonObject{{"TST", dataSet}};
+
+    const QByteArray data = QJsonDocument(root).toJson(QJsonDocument::Compact);
+    ASSERT_TRUE(importer->readSetsFromByteArray(data));
+    ASSERT_FALSE(importer->getRawSetsData().isEmpty());
+
+    const int importedSets = importer->startImport();
+    ASSERT_EQ(importedSets, 1);
+    ASSERT_EQ(importer->getCardList().size(), 1);
+    ASSERT_FALSE(importer->getCardList().value("Lazy Import Card").isNull());
+}
+
+// ============================================================================
+// Scan progress reporting tests
+// ============================================================================
+
+TEST(OracleScanProgress, ScanProgressReportsMonotonicBytesToTotal)
+{
+    QJsonObject setObj;
+    setObj["code"] = "tst";
+    setObj["name"] = "Test Set";
+    setObj["type"] = "expansion";
+    setObj["releaseDate"] = "2024-01-01";
+    QJsonArray cards;
+    for (int i = 0; i < 40; ++i) {
+        QJsonObject card;
+        card["name"] = QString("Card %1").arg(i);
+        card["text"] = "Some rules text used to bulk up the card payload.";
+        card["layout"] = "normal";
+        cards.append(card);
+    }
+    setObj["cards"] = cards;
+
+    QJsonObject root;
+    root["data"] = QJsonObject{{"TST", setObj}};
+
+    const QByteArray data = QJsonDocument(root).toJson(QJsonDocument::Compact);
+
+    QList<QPair<qsizetype, qsizetype>> reports;
+    RawJson::ScanError error;
+    const QList<RawJson::SetRange> ranges =
+        RawJson::scanSetRanges(data, &error, [&reports](qsizetype bytesRead, qsizetype totalBytes) {
+            reports.append({bytesRead, totalBytes});
+        });
+
+    ASSERT_FALSE(error.isError()) << error.message.toStdString();
+    ASSERT_EQ(ranges.size(), 1);
+    ASSERT_FALSE(reports.isEmpty());
+    ASSERT_GT(reports.size(), 1);
+
+    qsizetype last = 0;
+    for (const auto &[bytesRead, totalBytes] : reports) {
+        ASSERT_EQ(totalBytes, data.size());
+        ASSERT_GE(bytesRead, last) << "scan progress must be monotonic";
+        ASSERT_LE(bytesRead, totalBytes) << "scan progress must not overshoot the document size";
+        last = bytesRead;
+    }
+    ASSERT_EQ(reports.constLast().first, data.size()) << "scan must end at 100%";
+    ASSERT_LE(reports.size(), 160) << "scan reports must be throttled";
+}
+
+TEST(OracleScanProgress, ScanWithoutCallbackStillParses)
+{
+    QJsonObject setObj;
+    setObj["code"] = "tst";
+    setObj["name"] = "Test Set";
+    setObj["type"] = "expansion";
+    setObj["releaseDate"] = "2024-01-01";
+    setObj["cards"] = QJsonArray();
+
+    QJsonObject root;
+    root["data"] = QJsonObject{{"TST", setObj}};
+
+    const QByteArray data = QJsonDocument(root).toJson(QJsonDocument::Compact);
+
+    RawJson::ScanError error;
+    const QList<RawJson::SetRange> ranges = RawJson::scanSetRanges(data, &error);
+
+    ASSERT_FALSE(error.isError()) << error.message.toStdString();
+    ASSERT_EQ(ranges.size(), 1);
+    ASSERT_EQ(ranges.first().code, "tst");
+}
+
+TEST_F(OracleImporterTest, ReadSetsFromByteArrayEmitsScanProgress)
+{
+    QJsonObject setObj;
+    setObj["code"] = "tst";
+    setObj["name"] = "Test Set";
+    setObj["type"] = "expansion";
+    setObj["releaseDate"] = "2024-01-01";
+    QJsonArray cards;
+    for (int i = 0; i < 40; ++i) {
+        QJsonObject card;
+        card["name"] = QString("Card %1").arg(i);
+        cards.append(card);
+    }
+    setObj["cards"] = cards;
+
+    QJsonObject root;
+    root["data"] = QJsonObject{{"TST", setObj}};
+
+    const QByteArray data = QJsonDocument(root).toJson(QJsonDocument::Compact);
+
+    QList<QPair<qsizetype, qsizetype>> emissions;
+    QObject::connect(importer, &OracleImporter::dataReadProgress,
+                     [&emissions](int bytesRead, int totalBytes) { emissions.append({bytesRead, totalBytes}); });
+
+    ASSERT_TRUE(importer->readSetsFromByteArray(data));
+    ASSERT_FALSE(emissions.isEmpty());
+    for (const auto &[bytesRead, totalBytes] : emissions) {
+        ASSERT_EQ(totalBytes, data.size());
+        ASSERT_GE(bytesRead, 0);
+        ASSERT_LE(bytesRead, totalBytes);
+    }
+    ASSERT_EQ(emissions.constLast().first, data.size());
+}
+
+TEST_F(OracleImporterTest, DisablingProgressReportingSuppressesScanEmissions)
+{
+    QJsonObject setObj;
+    setObj["code"] = "tst";
+    setObj["name"] = "Test Set";
+    setObj["type"] = "expansion";
+    setObj["releaseDate"] = "2024-01-01";
+    setObj["cards"] = QJsonArray();
+    QJsonObject root;
+    root["data"] = QJsonObject{{"TST", setObj}};
+    const QByteArray data = QJsonDocument(root).toJson(QJsonDocument::Compact);
+
+    int emissions = 0;
+    QObject::connect(importer, &OracleImporter::dataReadProgress, [&emissions](int, int) { ++emissions; });
+
+    importer->setProgressReporting(false);
+    ASSERT_TRUE(importer->readSetsFromByteArray(data));
+    ASSERT_EQ(emissions, 0);
+
+    importer->setProgressReporting(true);
+    ASSERT_TRUE(importer->readSetsFromByteArray(data));
+    ASSERT_GT(emissions, 0);
+}
+
+// Localized card text tests
+// ============================================================================
+
+TEST_F(OracleImporterTest, ImportsLocalizedTextForRequestedLanguage)
+{
+    QJsonObject card = makeCard("Lightning Bolt");
+    card["foreignData"] =
+        QJsonArray{makeForeignEntry("German", "Blitzschlag", "Blitzschlag fügt 3 Schadenspunkte zu.")};
+    QJsonArray cards{card};
+
+    importer->setCardLang("de");
+    importer->importCardsFromSet(set, cards);
+    importer->applyLocalizedData();
+
+    auto result = importer->getCardList().value("Lightning Bolt");
+    ASSERT_FALSE(result.isNull());
+    ASSERT_EQ(result->getLocalizedName("de"), "Blitzschlag");
+    ASSERT_EQ(result->getLocalizedText("de"), "Blitzschlag fügt 3 Schadenspunkte zu.");
+    // English identity untouched
+    ASSERT_EQ(result->getName(), "Lightning Bolt");
+    ASSERT_EQ(result->getText(), "Rules text.");
+}
+
+TEST_F(OracleImporterTest, ImportsLocalizedNameAndTextForMultiFaceCards)
+{
+    // MTGJSON reports multi-face cards (adventure/split/aftermath/prepare) as one
+    // card object per face; every face carries the joined name but only its own
+    // face's rules text in foreignData. The importer joins the per-face texts with
+    // the same separator as the English merge.
+    QJsonObject front = makeCard("Disruptive Stormbrood // Petty Revenge");
+    front["layout"] = "adventure";
+    front["faceName"] = "Disruptive Stormbrood";
+    front["side"] = "a";
+    front["foreignData"] = QJsonArray{
+        makeForeignEntry("German", "Disruptive Stormbrood // Kleinliche Rache",
+                         "Fliegend\nWenn diese Kreatur ins Spiel kommt, zerstöre bis zu ein Artefakt oder eine "
+                         "Verzauberung deiner Wahl.")};
+    QJsonObject back = makeCard("Disruptive Stormbrood // Petty Revenge");
+    back["layout"] = "adventure";
+    back["faceName"] = "Petty Revenge";
+    back["side"] = "b";
+    back["text"] = "Destroy target creature.";
+    back["foreignData"] = QJsonArray{makeForeignEntry("German", "Disruptive Stormbrood // Kleinliche Rache",
+                                                      "Zerstöre eine Kreatur deiner Wahl mit Stärke 3 oder weniger.")};
+    QJsonArray cards{front, back};
+
+    importer->setCardLang("de");
+    importer->importCardsFromSet(set, cards);
+    importer->applyLocalizedData();
+
+    auto result = importer->getCardList().value("Disruptive Stormbrood // Petty Revenge");
+    ASSERT_FALSE(result.isNull());
+    ASSERT_EQ(result->getLocalizedName("de"), "Disruptive Stormbrood // Kleinliche Rache");
+    ASSERT_EQ(result->getLocalizedText("de"),
+              "Fliegend\nWenn diese Kreatur ins Spiel kommt, zerstöre bis zu ein Artefakt oder eine Verzauberung "
+              "deiner Wahl.\n\n---\n\nZerstöre eine Kreatur deiner Wahl mit Stärke 3 oder weniger.");
+    // English identity untouched
+    ASSERT_EQ(result->getName(), "Disruptive Stormbrood // Petty Revenge");
+    ASSERT_EQ(result->getText(), "Rules text.\n\n---\n\nDestroy target creature.");
+}
+
+TEST_F(OracleImporterTest, MultiFaceCardsWithoutCompleteForeignTextKeepEnglishText)
+{
+    // Both faces must carry a foreignData text for the joined text; otherwise the
+    // rules text stays English while the localized name (from a later complete
+    // printing) is still applied.
+    QJsonObject front = makeCard("Wear // Tear");
+    front["layout"] = "split";
+    front["faceName"] = "Wear";
+    front["side"] = "a";
+    front["foreignData"] = QJsonArray{makeForeignEntry("German", "Verschleiß // Zerrreißung", "Verschleiß-Text.")};
+    QJsonObject back = makeCard("Wear // Tear");
+    back["layout"] = "split";
+    back["faceName"] = "Tear";
+    back["side"] = "b";
+    back["text"] = "Tear rules text.";
+    back["foreignData"] = QJsonArray{makeForeignEntry("German", "Verschleiß // Zerrreißung", "")};
+    QJsonArray cards{front, back};
+
+    importer->setCardLang("de");
+    importer->importCardsFromSet(set, cards);
+    importer->applyLocalizedData();
+
+    auto result = importer->getCardList().value("Wear // Tear");
+    ASSERT_FALSE(result.isNull());
+    // The joined name is still applied.
+    ASSERT_EQ(result->getLocalizedName("de"), "Verschleiß // Zerrreißung");
+    // The incomplete text must not become the card's localized text.
+    ASSERT_TRUE(result->getLocalizedTexts().isEmpty());
+    ASSERT_EQ(result->getText(), "Rules text.\n\n---\n\nTear rules text.");
+}
+
+TEST_F(OracleImporterTest, DefaultLanguageSkipsForeignData)
+{
+    QJsonObject card = makeCard("Lightning Bolt");
+    card["foreignData"] =
+        QJsonArray{makeForeignEntry("German", "Blitzschlag", "Blitzschlag fügt 3 Schadenspunkte zu.")};
+    QJsonArray cards{card};
+
+    // cardLang defaults to "en" — foreignData must never be imported
+    importer->importCardsFromSet(set, cards);
+    importer->applyLocalizedData();
+
+    auto result = importer->getCardList().value("Lightning Bolt");
+    ASSERT_FALSE(result.isNull());
+    ASSERT_TRUE(result->getLocalizedNames().isEmpty());
+    ASSERT_TRUE(result->getLocalizedTexts().isEmpty());
+}
+
+TEST_F(OracleImporterTest, UnsupportedLanguageSkipsForeignData)
+{
+    QJsonObject card = makeCard("Lightning Bolt");
+    card["foreignData"] = QJsonArray{makeForeignEntry("xx", "Kochanie", "Grzmot uderza.")};
+    QJsonArray cards{card};
+
+    importer->setCardLang("xx");
+    importer->importCardsFromSet(set, cards);
+    importer->applyLocalizedData();
+
+    auto result = importer->getCardList().value("Lightning Bolt");
+    ASSERT_FALSE(result.isNull());
+    ASSERT_TRUE(result->getLocalizedNames().isEmpty());
+}
+
+TEST_F(OracleImporterTest, NonMatchingLanguageNotCollected)
+{
+    QJsonObject card = makeCard("Lightning Bolt");
+    card["foreignData"] = QJsonArray{makeForeignEntry("French", "Éclair", "L'Éclair inflige 3 blessures.")};
+    QJsonArray cards{card};
+
+    importer->setCardLang("de");
+    importer->importCardsFromSet(set, cards);
+    importer->applyLocalizedData();
+
+    auto result = importer->getCardList().value("Lightning Bolt");
+    ASSERT_FALSE(result.isNull());
+    ASSERT_TRUE(result->getLocalizedNames().isEmpty());
+}
+
+TEST_F(OracleImporterTest, HigherPrioritySetWinsForReprint)
+{
+    // First printing in a reprint set, then another in a (more authoritative)
+    // core set: the core set's German text must win even though it was seen later.
+    QJsonObject reprintCard = makeCard("Lightning Bolt");
+    reprintCard["foreignData"] = QJsonArray{makeForeignEntry("German", "Blitzschlag", "Älterer deutscher Text.")};
+    CardSetPtr reprintSet =
+        CardSet::newInstance(controller, "TS2", "Second Set", QString(), QDate(), CardSet::PriorityReprint);
+    importer->setCardLang("de");
+    importer->importCardsFromSet(reprintSet, QJsonArray{reprintCard});
+
+    QJsonObject primaryCard = makeCard("Lightning Bolt");
+    primaryCard["foreignData"] =
+        QJsonArray{makeForeignEntry("German", "Blitzschlag", "Blitzschlag fügt 3 Schadenspunkte zu.")};
+    CardSetPtr primarySet =
+        CardSet::newInstance(controller, "TS3", "Third Set", QString(), QDate(), CardSet::PriorityPrimary);
+    importer->importCardsFromSet(primarySet, QJsonArray{primaryCard});
+    importer->applyLocalizedData();
+
+    auto result = importer->getCardList().value("Lightning Bolt");
+    ASSERT_FALSE(result.isNull());
+    ASSERT_EQ(result->getLocalizedName("de"), "Blitzschlag");
+    ASSERT_EQ(result->getLocalizedText("de"), "Blitzschlag fügt 3 Schadenspunkte zu.");
+    ASSERT_EQ(importer->getCardList().size(), 1);
+}
+
+TEST_F(OracleImporterTest, HigherPrioritySplitSetWinsForReprint)
+{
+    // Split cards print each face as its own card object; the joined text is
+    // collected per set with the same priority policy as single-face cards, so a
+    // reprint set's German text must yield to the core set's even when reprints
+    // are imported first.
+    QJsonObject reprintFront = makeCard("Wear // Tear");
+    reprintFront["layout"] = "split";
+    reprintFront["faceName"] = "Wear";
+    reprintFront["side"] = "a";
+    reprintFront["foreignData"] =
+        QJsonArray{makeForeignEntry("German", "Verschleiß // Zerrreißung", "Wear alter Text.")};
+    QJsonObject reprintBack = makeCard("Wear // Tear");
+    reprintBack["layout"] = "split";
+    reprintBack["faceName"] = "Tear";
+    reprintBack["side"] = "b";
+    reprintBack["foreignData"] =
+        QJsonArray{makeForeignEntry("German", "Verschleiß // Zerrreißung", "Tear alter Text.")};
+    CardSetPtr reprintSet =
+        CardSet::newInstance(controller, "TS2", "Second Set", QString(), QDate(), CardSet::PriorityReprint);
+    importer->setCardLang("de");
+    importer->importCardsFromSet(reprintSet, QJsonArray{reprintFront, reprintBack});
+
+    QJsonObject primaryFront = makeCard("Wear // Tear");
+    primaryFront["layout"] = "split";
+    primaryFront["faceName"] = "Wear";
+    primaryFront["side"] = "a";
+    primaryFront["foreignData"] =
+        QJsonArray{makeForeignEntry("German", "Verschleiß // Zerrreißung", "Wear neuer Text.")};
+    QJsonObject primaryBack = makeCard("Wear // Tear");
+    primaryBack["layout"] = "split";
+    primaryBack["faceName"] = "Tear";
+    primaryBack["side"] = "b";
+    primaryBack["foreignData"] =
+        QJsonArray{makeForeignEntry("German", "Verschleiß // Zerrreißung", "Tear neuer Text.")};
+    CardSetPtr primarySet =
+        CardSet::newInstance(controller, "TS3", "Third Set", QString(), QDate(), CardSet::PriorityPrimary);
+    importer->importCardsFromSet(primarySet, QJsonArray{primaryFront, primaryBack});
+    importer->applyLocalizedData();
+
+    auto result = importer->getCardList().value("Wear // Tear");
+    ASSERT_FALSE(result.isNull());
+    ASSERT_EQ(result->getLocalizedName("de"), "Verschleiß // Zerrreißung");
+    ASSERT_EQ(result->getLocalizedText("de"), "Wear neuer Text.\n\n---\n\nTear neuer Text.");
+    ASSERT_EQ(importer->getCardList().size(), 1);
+}
+
+TEST_F(OracleImporterTest, StartImportAppliesLocalizedData)
+{
+    QJsonObject card = makeCard("Lightning Bolt");
+    card["foreignData"] =
+        QJsonArray{makeForeignEntry("Portuguese (Brazil)", "Raio", "Raio causa 3 de dano a qualquer alvo.")};
+    QJsonObject dataSet;
+    dataSet["code"] = "tst";
+    dataSet["name"] = "Test Set";
+    dataSet["type"] = "expansion";
+    dataSet["releaseDate"] = "2024-01-01";
+    dataSet["cards"] = QJsonArray{card};
+
+    QJsonObject root;
+    root["data"] = QJsonObject{{"TST", dataSet}};
+
+    importer->setCardLang("pt");
+    ASSERT_TRUE(importer->readSetsFromByteArray(QJsonDocument(root).toJson(QJsonDocument::Compact)));
+    ASSERT_EQ(importer->startImport(), 1);
+
+    auto result = importer->getCardList().value("Lightning Bolt");
+    ASSERT_FALSE(result.isNull());
+    ASSERT_EQ(result->getLocalizedName("pt"), "Raio");
+    ASSERT_EQ(result->getLocalizedText("pt"), "Raio causa 3 de dano a qualquer alvo.");
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/oracle/parse_cipt_test.cpp b/tests/oracle/parse_cipt_test.cpp
index f5036f962..10268d659 100644
--- a/tests/oracle/parse_cipt_test.cpp
+++ b/tests/oracle/parse_cipt_test.cpp
@@ -1,6 +1,7 @@
 #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 38d9b6315..2a504b81c 100644
--- a/tests/password_hash_test.cpp
+++ b/tests/password_hash_test.cpp
@@ -1,25 +1,12 @@
 #include "gtest/gtest.h"
-#include <libcockatrice/rng/rng_abstract.h>
-#include <libcockatrice/rng/rng_sfmt.h>
+#include <QChar>
+#include <QString>
+#include <cstring>
 #include <libcockatrice/utility/passwordhasher.h>
-
-RNG_Abstract *rng;
+#include <string>
 
 namespace
 {
-class PasswordHashTest : public ::testing::Test
-{
-protected:
-    void SetUp() override
-    {
-        rng = new RNG_SFMT;
-    }
-
-    void TearDown() override
-    {
-        delete rng;
-    }
-};
 
 TEST(PasswordHashTest, RegressionTest)
 {
@@ -29,6 +16,29 @@ TEST(PasswordHashTest, RegressionTest)
     QString hash = PasswordHasher::computeHash(password, salt);
     ASSERT_EQ(hash, salt + expected) << "The computed hash value remains the same";
 }
+
+TEST(PasswordHashTest, SaltUsesAlphanumericCharset)
+{
+    static const char alphanum[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+    const QString salt = PasswordHasher::generateRandomSalt();
+    ASSERT_EQ(salt.size(), 16);
+    for (const QChar &c : salt) {
+        ASSERT_NE(strchr(alphanum, c.toLatin1()), nullptr);
+    }
+}
+
+TEST(PasswordHashTest, SaltsAreUnique)
+{
+    const QString salt1 = PasswordHasher::generateRandomSalt();
+    const QString salt2 = PasswordHasher::generateRandomSalt();
+    ASSERT_NE(salt1, salt2);
+}
+
+TEST(PasswordHashTest, TokenHasExpectedLength)
+{
+    const QString token = PasswordHasher::generateActivationToken();
+    ASSERT_EQ(token.size(), 16);
+}
 } // namespace
 
 int main(int argc, char **argv)
diff --git a/tests/picture_loader_benchmark/CMakeLists.txt b/tests/picture_loader_benchmark/CMakeLists.txt
new file mode 100644
index 000000000..0684f58f4
--- /dev/null
+++ b/tests/picture_loader_benchmark/CMakeLists.txt
@@ -0,0 +1,24 @@
+# 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
+  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
+  ../../cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp
+  ../../cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
+  ../../cockatrice/src/client/settings/cache_settings.h
+  picture_loader_benchmark.cpp
+  settings_cache_mock.cpp
+  LIBS
+  libcockatrice_card
+  libcockatrice_settings
+  libcockatrice_interfaces
+  libcockatrice_utility
+  INCLUDE_DIRS
+  ${CMAKE_SOURCE_DIR}/cockatrice/src
+  MANUAL
+)
diff --git a/tests/picture_loader_benchmark/picture_loader_benchmark.cpp b/tests/picture_loader_benchmark/picture_loader_benchmark.cpp
new file mode 100644
index 000000000..587cef65f
--- /dev/null
+++ b/tests/picture_loader_benchmark/picture_loader_benchmark.cpp
@@ -0,0 +1,561 @@
+/*
+ * Picture loader benchmark / regression suite against the real card image hosts.
+ *
+ * Deliberately not registered with ctest: it hits live Scryfall / Gatherer
+ * endpoints at ~10 requests per second and takes minutes. Run it by hand.
+ *
+ *   picture_loader_benchmark_test --carddb /path/to/cards.xml [options]
+ *
+ * Modes
+ * -----
+ * default : for every URL template in the configured download list (or for each
+ *           --url given), load #count pictures twice: once cold (network) and
+ *           once cached (served from the QNetworkDiskCache). Both passes must
+ *           load every card with zero failures. The cached pass must complete
+ *           well under the cold time, which is the regression gate for serving
+ *           cached pictures instead of re-fetching them. The cold pass must stay
+ *           above a pacing lower bound, the regression gate for burst-free
+ *           request throttling.
+ * --stress: two CardPictureLoaderWorker instances loading the same cards
+ *           concurrently against one host (~20 req/s aggregate), which forces
+ *           real 429 responses. Both workers must still complete 100% of their
+ *           cards via the shared backoff logic.
+ */
+
+#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 <atomic>
+#include <cstdio>
+#include <libcockatrice/card/database/card_database.h>
+#include <libcockatrice/card/printing/exact_card.h>
+#include <libcockatrice/card/printing/printing_info.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/settings/download_settings.h>
+#include <optional>
+#include <qsystemdetection.h>
+#include <utility>
+
+class BenchmarkCardDatabasePathProvider : public ICardDatabasePathProvider
+{
+public:
+    BenchmarkCardDatabasePathProvider(QString _cardsXml, QString _customSetsDir)
+        : cardsXml(std::move(_cardsXml)), customSetsDir(std::move(_customSetsDir))
+    {
+    }
+
+    QString getCardDatabasePath() const override
+    {
+        return cardsXml;
+    }
+
+    QString getCustomCardDatabasePath() const override
+    {
+        return customSetsDir;
+    }
+
+    QString getTokenDatabasePath() const override
+    {
+        return QString();
+    }
+
+    QString getSpoilerCardDatabasePath() const override
+    {
+        return QString();
+    }
+
+private:
+    QString cardsXml;
+    QString customSetsDir;
+};
+
+struct PassResult
+{
+    int enqueued = 0;
+    int finished = 0;
+    int failed = 0;
+    qint64 elapsedMs = 0;
+    QStringList failedCards;
+};
+
+static QList<ExactCard> selectCardsForTemplate(CardDatabase &db, const QString &urlTemplate, int maxCards)
+{
+    QList<ExactCard> selected;
+    const QList<CardInfoPtr> cards = db.getCardList().values();
+    for (const CardInfoPtr &card : cards) {
+        if (selected.size() >= maxCards) {
+            break;
+        }
+        const SetToPrintingsMap &sets = card->getSets();
+        if (sets.isEmpty()) {
+            continue;
+        }
+        const QList<PrintingInfo> printings = sets.first();
+        if (printings.isEmpty()) {
+            continue;
+        }
+        const ExactCard cardToLoad(card, printings.first());
+        if (CardPictureToLoad(cardToLoad).transformUrl(urlTemplate).isEmpty()) {
+            continue;
+        }
+        selected.append(cardToLoad);
+    }
+    return selected;
+}
+
+static PassResult runPass(CardPictureLoaderWorker *worker, const QList<ExactCard> &cards, int timeoutMs)
+{
+    PassResult result;
+    result.enqueued = cards.size();
+
+    QEventLoop loop;
+    QTimer watchdog;
+    watchdog.setSingleShot(true);
+    watchdog.setInterval(timeoutMs);
+    QObject::connect(&watchdog, &QTimer::timeout, &loop, &QEventLoop::quit);
+
+    QElapsedTimer clock;
+    QObject::connect(worker, &CardPictureLoaderWorker::imageLoaded, &loop,
+                     [&](const ExactCard &card, const QImage &image) {
+                         ++result.finished;
+                         if (image.isNull()) {
+                             ++result.failed;
+                             if (result.failedCards.size() < 10) {
+                                 result.failedCards.append(card.getName());
+                             }
+                         }
+                         if (result.finished >= result.enqueued) {
+                             loop.quit();
+                         }
+                     });
+
+    clock.start();
+    for (const ExactCard &card : cards) {
+        worker->enqueueImageLoad(card);
+    }
+    watchdog.start();
+    loop.exec();
+    result.elapsedMs = clock.elapsed();
+    return result;
+}
+
+struct StressResult
+{
+    PassResult a;
+    PassResult b;
+    int http429Count = 0;
+};
+
+struct LogCounters
+{
+    int http429 = 0;
+    QMutex mutex;
+};
+
+static std::atomic<LogCounters *> s_activeCounters{nullptr};
+static QtMessageHandler s_previousMessageHandler = nullptr;
+
+static void stressLogHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+{
+    if (LogCounters *counters = s_activeCounters.load(std::memory_order_acquire);
+        counters && msg.contains(QStringLiteral("Too many requests from"))) {
+        QMutexLocker locker(&counters->mutex);
+        ++counters->http429;
+    }
+    if (s_previousMessageHandler) {
+        s_previousMessageHandler(type, context, msg);
+    } else {
+        // qInstallMessageHandler() reports the built-in handler as nullptr, so a plain `if` would
+        // swallow every message - including the 429 warnings this run is meant to surface. Fall
+        // back to Qt's message pattern written to stderr instead.
+        std::fprintf(stderr, "%s\n", qPrintable(qFormatLogMessage(type, context, msg)));
+    }
+}
+
+// Stops a worker's thread and frees it. shutdownThread()'s bounded wait guarantees that the worker
+// object was freed by its finished() -> deleteLater chain, so the thread itself can then be deleted
+// safely. A worker whose thread refused to stop is left alone (and leaked) rather than freed while
+// still running.
+static void destroyWorker(CardPictureLoaderWorker *worker)
+{
+    if (!worker) {
+        return;
+    }
+    QThread *thread = worker->workerThread();
+    if (worker->shutdownThread()) {
+        delete thread;
+    }
+}
+
+static StressResult runStress(CardPictureLoaderWorker *workerA,
+                              CardPictureLoaderWorker *workerB,
+                              const QList<ExactCard> &cards,
+                              int timeoutMs)
+{
+    StressResult result;
+    result.a.enqueued = cards.size();
+    result.b.enqueued = cards.size();
+
+    int completed = 0;
+    QMutex completedMutex;
+
+    QEventLoop loop;
+    QTimer watchdog;
+    watchdog.setSingleShot(true);
+    watchdog.setInterval(timeoutMs);
+    QObject::connect(&watchdog, &QTimer::timeout, &loop, &QEventLoop::quit);
+
+    const auto finishOne = [&](PassResult &pass, const ExactCard &card, const QImage &image) {
+        ++pass.finished;
+        if (image.isNull()) {
+            ++pass.failed;
+            if (pass.failedCards.size() < 10) {
+                pass.failedCards.append(card.getName());
+            }
+        }
+        QMutexLocker locker(&completedMutex);
+        ++completed;
+        if (completed >= result.a.enqueued + result.b.enqueued) {
+            loop.quit();
+        }
+    };
+
+    QElapsedTimer clock;
+    QObject::connect(workerA, &CardPictureLoaderWorker::imageLoaded, &loop,
+                     [&](const ExactCard &card, const QImage &image) { finishOne(result.a, card, image); });
+    QObject::connect(workerB, &CardPictureLoaderWorker::imageLoaded, &loop,
+                     [&](const ExactCard &card, const QImage &image) { finishOne(result.b, card, image); });
+
+    // Count 429 responses as seen by the shared rate limiter.
+    LogCounters counters;
+    s_activeCounters = &counters;
+    s_previousMessageHandler = qInstallMessageHandler(stressLogHandler);
+
+    clock.start();
+    for (const ExactCard &card : cards) {
+        workerA->enqueueImageLoad(card);
+        workerB->enqueueImageLoad(card);
+    }
+    watchdog.start();
+    loop.exec();
+    const qint64 elapsedMs = clock.elapsed();
+    result.a.elapsedMs = elapsedMs;
+    result.b.elapsedMs = elapsedMs;
+
+    // Stop both workers before touching the counters or restoring the message handler: their
+    // threads log from stressLogHandler, and must not outlive the stack-local counters (which is
+    // guaranteed on the watchdog path, where requests and deferred retries are still pending).
+    destroyWorker(workerA);
+    destroyWorker(workerB);
+
+    result.http429Count = counters.http429;
+    s_activeCounters.store(nullptr, std::memory_order_release);
+    qInstallMessageHandler(s_previousMessageHandler);
+    return result;
+}
+
+static QString formatDuration(qint64 ms)
+{
+    return QStringLiteral("%1.%2 s").arg(ms / 1000).arg((ms % 1000) / 100);
+}
+
+static bool likelyRedirects(const QString &urlTemplate)
+{
+    return urlTemplate.contains(QStringLiteral("api.scryfall.com"));
+}
+
+static QString hostOf(const QString &urlTemplate)
+{
+    return QUrl(urlTemplate).host();
+}
+
+static void printUsage()
+{
+    std::printf("usage: picture_loader_benchmark_test --carddb <path> [options]\n"
+                "\n"
+                "Loads card pictures from the real configured hosts (not a mock server) and\n"
+                "verifies the picture loader's pacing / cache 429 behavior.\n"
+                "\n"
+                "options:\n"
+                "  --carddb <path>       cards.xml to load card data from (required)\n"
+                "  --count <N>           cards to load per template (default 300)\n"
+                "  --url <template>      test only this URL template; repeatable\n"
+                "  --stress              run the two-worker concurrency stress instead\n"
+                "  --stress-url <t>      template used by --stress (default: scryfall uuid)\n"
+                "  --timeout-min <N>     per-pass watchdog in minutes (default auto)\n"
+                "  --cache-dir <dir>     reuse this directory as the sandbox root; non-empty\n"
+                "                        cache skips the cold pacing lower bound\n"
+                "  --help                show this help\n");
+}
+
+int main(int argc, char **argv)
+{
+    QString cardDbArg;
+    QStringList explicitUrls;
+    int count = 300;
+    bool stress = false;
+    bool stressUrlSet = false;
+    QString stressUrl(QStringLiteral("https://api.scryfall.com/cards/!set:uuid!?format=image"));
+    QString cacheDirArg;
+    std::optional<int> timeoutMin;
+
+    QStringList args;
+    for (int i = 1; i < argc; ++i) {
+        args.append(QString::fromLocal8Bit(argv[i]));
+    }
+    for (int i = 0; i < args.size(); ++i) {
+        const QString &arg = args.at(i);
+        const auto value = [&]() -> QString { return i + 1 < args.size() ? args.at(++i) : QString(); };
+        if (arg == QLatin1String("--carddb")) {
+            cardDbArg = value();
+        } else if (arg == QLatin1String("--count")) {
+            count = value().toInt();
+        } else if (arg == QLatin1String("--url")) {
+            explicitUrls.append(value());
+        } else if (arg == QLatin1String("--stress")) {
+            stress = true;
+        } else if (arg == QLatin1String("--stress-url")) {
+            stressUrl = value();
+            stressUrlSet = true;
+        } else if (arg == QLatin1String("--timeout-min")) {
+            bool ok = false;
+            const int parsed = value().toInt(&ok);
+            if (!ok || parsed <= 0) {
+                std::fprintf(stderr, "error: --timeout-min must be a positive integer\n");
+                return 2;
+            }
+            timeoutMin = parsed;
+        } else if (arg == QLatin1String("--cache-dir")) {
+            cacheDirArg = value();
+        } else if (arg == QLatin1String("--help") || arg == QLatin1String("-h")) {
+            printUsage();
+            return 0;
+        } else {
+            std::fprintf(stderr, "unknown argument: %s\n", qPrintable(arg));
+            printUsage();
+            return 2;
+        }
+    }
+
+    if (cardDbArg.isEmpty()) {
+        std::fprintf(stderr, "error: --carddb is required (a cards.xml generated by Oracle)\n");
+        printUsage();
+        return 2;
+    }
+    if (count <= 0) {
+        std::fprintf(stderr, "error: --count must be positive\n");
+        return 2;
+    }
+
+    // In --stress mode an explicit --url selects the template to hammer, matching --url's meaning
+    // in the normal mode; only fall back to the built-in Scryfall template when neither --stress-url
+    // nor --url was supplied.
+    if (stress && !stressUrlSet && !explicitUrls.isEmpty()) {
+        stressUrl = explicitUrls.first();
+    }
+
+    QCoreApplication app(argc, argv);
+    // Unique names so a benchmark run can never read or write the real client's settings, cache or
+    // picture URLs on platforms where the XDG redirection below does not apply (macOS, Windows).
+    app.setApplicationName(QStringLiteral("Cockatrice-benchmark"));
+    app.setOrganizationName(QStringLiteral("Cockatrice-benchmark"));
+    app.setApplicationVersion(QStringLiteral("9.0.0-benchmark"));
+
+    // The ExactCard argument of imageLoaded crosses threads via a queued connection.
+    qRegisterMetaType<ExactCard>();
+
+    QTemporaryDir sandbox;
+    if (cacheDirArg.isEmpty() && !sandbox.isValid()) {
+        std::fprintf(stderr, "error: could not create a temporary sandbox directory\n");
+        return 2;
+    }
+    const QString rootDir = cacheDirArg.isEmpty() ? sandbox.path() : cacheDirArg;
+    QDir().mkpath(rootDir);
+    QDir().mkpath(rootDir + "/config");
+    QDir().mkpath(rootDir + "/data");
+    QDir().mkpath(rootDir + "/cache");
+
+#ifdef Q_OS_LINUX
+    // Redirect every QStandardPaths lookup (and therefore SettingsCache paths) into the sandbox so
+    // the benchmark never touches user config or caches. XDG_* only affects Qt's path resolution on
+    // Linux; elsewhere the unique application/organization names above keep the run isolated.
+    qputenv("XDG_CONFIG_HOME", (rootDir + "/config").toUtf8());
+    qputenv("XDG_DATA_HOME", (rootDir + "/data").toUtf8());
+    qputenv("XDG_CACHE_HOME", (rootDir + "/cache").toUtf8());
+#endif
+
+    // Derive the probe from SettingsCache rather than reconstructing it: Qt appends both the
+    // organization and the application name, so a hand-built path is easy to get wrong.
+    const bool warmStart = QDir(SettingsCache::instance().getNetworkCachePath())
+                               .entryList(QDir::Files | QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name)
+                               .size() > 0;
+
+    // Copied into the sandbox so the loader's binary cache ("cards.xml.cache")
+    // is written next to it instead of next to the user's file, and so a
+    // --cache-dir rerun can pick it up again.
+    const QString dataPath = SettingsCache::instance().getDataPath();
+    QDir().mkpath(dataPath);
+    const QString cardsXml = dataPath + "/cards.xml";
+    if (!QFile::exists(cardsXml)) {
+        if (!QFile::copy(cardDbArg, cardsXml)) {
+            std::fprintf(stderr, "error: could not copy %s to sandbox\n", qPrintable(cardDbArg));
+            return 2;
+        }
+    }
+    const QString customSetsDir = dataPath + "/customsets";
+    QDir().mkpath(customSetsDir);
+
+    auto *prefs = new NoopCardPreferenceProvider();
+    auto *priorityController = new NoopCardSetPriorityController();
+    auto *pathProvider = new BenchmarkCardDatabasePathProvider(cardsXml, customSetsDir);
+    CardDatabase db(nullptr, prefs, pathProvider, priorityController);
+    db.loadCardDatabases();
+    if (db.getLoadStatus() != Ok || db.getCardList().isEmpty()) {
+        std::fprintf(stderr, "error: failed to load card database from %s\n", qPrintable(cardsXml));
+        return 1;
+    }
+    const int availableCards = db.getCardList().size();
+
+    const QStringList urlsToTest =
+        explicitUrls.isEmpty() ? SettingsCache::instance().downloads().getAllURLs() : explicitUrls;
+
+    if (stress) {
+        const QList<ExactCard> cards = selectCardsForTemplate(db, stressUrl, count);
+        if (cards.isEmpty()) {
+            std::fprintf(stderr, "error: no cards satisfy template %s\n", qPrintable(stressUrl));
+            return 1;
+        }
+        SettingsCache::instance().downloads().setDownloadUrls({stressUrl});
+
+        std::printf("=== STRESS: 2 workers x %d cards, host %s ===\n", static_cast<int>(cards.size()),
+                    qPrintable(hostOf(stressUrl)));
+        auto *workerA = new CardPictureLoaderWorker();
+        auto *workerB = new CardPictureLoaderWorker();
+        const int timeoutMs = (timeoutMin.has_value() ? timeoutMin.value() : 15) * 60 * 1000;
+        const StressResult result = runStress(workerA, workerB, cards, timeoutMs);
+
+        const bool completeA = result.a.finished >= result.a.enqueued;
+        const bool completeB = result.b.finished >= result.b.enqueued;
+        const bool zeroFailures = result.a.failed == 0 && result.b.failed == 0;
+        const bool pass = completeA && completeB && zeroFailures;
+
+        std::printf("worker A: %d/%d loaded, %d failed (%.2f images/s)\n", result.a.finished, result.a.enqueued,
+                    result.a.failed,
+                    result.a.elapsedMs > 0
+                        ? static_cast<double>(result.a.finished) * 1000.0 / static_cast<double>(result.a.elapsedMs)
+                        : 0.0);
+        std::printf("worker B: %d/%d loaded, %d failed (%.2f images/s)\n", result.b.finished, result.b.enqueued,
+                    result.b.failed,
+                    result.b.elapsedMs > 0
+                        ? static_cast<double>(result.b.finished) * 1000.0 / static_cast<double>(result.b.elapsedMs)
+                        : 0.0);
+        std::printf("429 responses observed: %d\n", result.http429Count);
+        std::printf("elapsed: %s\n", qPrintable(formatDuration(result.a.elapsedMs)));
+        if (result.a.failed > 0) {
+            std::printf("  worker A failures: %s\n", qPrintable(result.a.failedCards.join(QStringLiteral(", "))));
+        }
+        if (result.b.failed > 0) {
+            std::printf("  worker B failures: %s\n", qPrintable(result.b.failedCards.join(QStringLiteral(", "))));
+        }
+        std::printf("RESULT: %s\n", pass ? "PASS" : "FAIL");
+        return pass ? 0 : 1;
+    }
+
+    bool allPass = true;
+    std::printf("=== PICTURE LOADER BENCHMARK (%d cards available, %d per template)%s ===\n", availableCards, count,
+                warmStart ? ", WARM cache from previous run" : "");
+
+    for (const QString &urlTemplate : urlsToTest) {
+        const QList<ExactCard> cards = selectCardsForTemplate(db, urlTemplate, count);
+        if (cards.isEmpty()) {
+            std::printf("SKIP  %-22s %-52s (no cards satisfy the template)\n", qPrintable(hostOf(urlTemplate)),
+                        qPrintable(urlTemplate));
+            continue;
+        }
+        SettingsCache::instance().downloads().setDownloadUrls({urlTemplate});
+
+        const bool redirects = likelyRedirects(urlTemplate);
+        const qint64 perCardMs = redirects ? 200 : 100;
+        const int timeoutMs =
+            (timeoutMin.has_value() ? timeoutMin.value() : (cards.size() * perCardMs * 8 + 60000) / 60000) * 60 * 1000;
+        const qint64 coldLowerMs = static_cast<qint64>(cards.size()) * perCardMs / 2;
+        // Decoding and cache-reading scale with the card count, so a flat budget would spuriously
+        // fail larger --count runs served entirely from a healthy cache.
+        const qint64 cachedUpperMs = qMax<qint64>(2000, static_cast<qint64>(cards.size()) * 10);
+
+        // A fresh worker per pass: if the cold pass hits the watchdog, its outstanding cards stay
+        // in the worker's currentlyLoading set, which would make the cached pass silently skip them
+        // and burn its own watchdog; late cold replies would also be misattributed to the cached
+        // pass.
+        auto *coldWorker = new CardPictureLoaderWorker();
+        const PassResult cold = runPass(coldWorker, cards, timeoutMs);
+        destroyWorker(coldWorker);
+
+        auto *cachedWorker = new CardPictureLoaderWorker();
+        const PassResult cached = runPass(cachedWorker, cards, timeoutMs);
+        destroyWorker(cachedWorker);
+
+        const bool coldComplete = cold.finished >= cold.enqueued;
+        const bool coldZeroFailures = cold.failed == 0;
+        const bool coldPaced = warmStart || cold.elapsedMs >= coldLowerMs;
+        const bool cachedComplete = cached.finished >= cached.enqueued;
+        const bool cachedZeroFailures = cached.failed == 0;
+        const bool cachedFast = cached.elapsedMs < cachedUpperMs;
+
+        const bool pass =
+            coldComplete && coldZeroFailures && coldPaced && cachedComplete && cachedZeroFailures && cachedFast;
+        allPass = allPass && pass;
+
+        std::printf("%s  %-22s %-52s cold %s (paced>=%s) cached %s (must be <%.0fs) | %d/%d %d/%d loaded, "
+                    "%d/%d failed\n",
+                    pass ? "PASS " : "FAIL ", qPrintable(hostOf(urlTemplate)), qPrintable(urlTemplate),
+                    qPrintable(formatDuration(cold.elapsedMs)), qPrintable(formatDuration(coldLowerMs)),
+                    qPrintable(formatDuration(cached.elapsedMs)), static_cast<double>(cachedUpperMs) / 1000.0,
+                    cold.finished, cold.enqueued, cached.finished, cached.enqueued, cold.failed, cached.failed);
+        if (cold.failed > 0) {
+            std::printf("  cold failures: %s\n", qPrintable(cold.failedCards.join(QStringLiteral(", "))));
+        }
+        if (cached.failed > 0) {
+            std::printf("  cached failures: %s\n", qPrintable(cached.failedCards.join(QStringLiteral(", "))));
+        }
+    }
+
+    if (cacheDirArg.isEmpty()) {
+        std::printf("cache root: %s (temporary; pass --cache-dir <dir> to persist it for a warm rerun)\n",
+                    qPrintable(rootDir));
+    } else {
+        std::printf("cache root: %s\n", qPrintable(rootDir));
+    }
+    std::printf("RESULT: %s\n", allPass ? "PASS" : "FAIL");
+    return allPass ? 0 : 1;
+}
diff --git a/tests/picture_loader_benchmark/settings_cache_mock.cpp b/tests/picture_loader_benchmark/settings_cache_mock.cpp
new file mode 100644
index 000000000..13e831b62
--- /dev/null
+++ b/tests/picture_loader_benchmark/settings_cache_mock.cpp
@@ -0,0 +1,206 @@
+/*
+ * Minimal SettingsCache implementation for the picture loader benchmark.
+ *
+ * The picture loader code insists on reading every URL, cache and path via
+ * SettingsCache::instance(). Compiling the real client SettingsCache would drag
+ * in the network update-checker graph, so instead we provide the SettingsCache
+ * member functions it actually uses, backed by the real libcockatrice_settings
+ * manager classes pointed at a sandboxed settings directory.
+ *
+ * The mock must be named SettingsCache: PathsSettings declares
+ * `friend class SettingsCache`, which is the only way to construct it.
+ *
+ * Paths resolved through QStandardPaths are redirected into the sandbox by
+ * setting the XDG_* environment variables before the first instance() call.
+ */
+
+#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>
+
+QString SettingsCache::getDataPath()
+{
+    return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
+}
+
+QString SettingsCache::getSettingsPath()
+{
+    return getDataPath() + "/settings/";
+}
+
+QString SettingsCache::getCachePath() const
+{
+    return QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
+}
+
+QString SettingsCache::getNetworkCachePath() const
+{
+    return getCachePath() + "/downloaded/";
+}
+
+QString SettingsCache::getCustomCardDatabasePath() const
+{
+    return paths().getCustomCardDatabasePath();
+}
+
+QString SettingsCache::getCardDatabasePath() const
+{
+    return paths().getCardDatabasePath();
+}
+
+QString SettingsCache::getSpoilerCardDatabasePath() const
+{
+    return paths().getSpoilerCardDatabasePath();
+}
+
+QString SettingsCache::getTokenDatabasePath() const
+{
+    return paths().getTokenDatabasePath();
+}
+
+int SettingsCache::getKeepAlive() const
+{
+    return 0;
+}
+
+int SettingsCache::getTimeOut() const
+{
+    return 0;
+}
+
+bool SettingsCache::getNotifyAboutUpdates() const
+{
+    return false;
+}
+
+void SettingsCache::setKnownMissingFeatures(const QString & /*_knownMissingFeatures*/)
+{
+}
+
+QString SettingsCache::getKnownMissingFeatures()
+{
+    return QString();
+}
+
+QString SettingsCache::getClientID()
+{
+    return QString();
+}
+
+DownloadSettings &SettingsCache::downloads() const
+{
+    return *downloadSettings;
+}
+
+CacheStorageSettings &SettingsCache::cacheStorage() const
+{
+    return *cacheStorageSettings;
+}
+
+CardsDisplaySettings &SettingsCache::cardsDisplay() const
+{
+    return *cardsDisplaySettings;
+}
+
+PathsSettings &SettingsCache::paths() const
+{
+    return *pathsSettings;
+}
+
+SettingsCache::SettingsCache()
+{
+    settings = nullptr;
+    isPortableBuild = false;
+
+    const QString settingsPath = getSettingsPath();
+    QDir().mkpath(settingsPath);
+
+    downloadSettings = new DownloadSettings(settingsPath, this);
+    cacheStorageSettings = new CacheStorageSettings(settingsPath, this);
+    cardsDisplaySettings = new CardsDisplaySettings(settingsPath, this);
+    pathsSettings = new PathsSettings(settingsPath, this);
+
+    // Picture downloads enabled, default host list, network disk cache storage.
+    downloadSettings->setPicDownload(true);
+    downloadSettings->resetToDefaultURLs();
+    cacheStorageSettings->setCardImageCacheMethod(
+        static_cast<int>(CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE));
+
+    loadPaths();
+}
+
+void SettingsCache::loadPaths()
+{
+    QString dataPath = getDataPath();
+    QSettings pathsIni(getSettingsPath() + "paths.ini", QSettings::IniFormat);
+
+    auto computePath = [&](const QString &key, const QString &defaultPath) -> QString {
+        QString val = pathsIni.value("paths/" + key).toString();
+        if (val.isEmpty() || !QDir(val).exists()) {
+            if (!QDir().mkpath(defaultPath)) {
+                qCInfo(SettingsCacheLog) << "[SettingsCache] Could not create folder:" << defaultPath;
+            }
+            val = defaultPath;
+            pathsIni.setValue("paths/" + key, val);
+        }
+        return val;
+    };
+
+    auto computeFilePath = [&](const QString &key, const QString &defaultPath) -> QString {
+        QString val = pathsIni.value("paths/" + key).toString();
+        if (!QFile::exists(val) || val.isEmpty()) {
+            val = defaultPath;
+            pathsIni.setValue("paths/" + key, val);
+        }
+        return val;
+    };
+
+    computePath("decks", dataPath + "/decks/");
+    computePath("filters", dataPath + "/filters/");
+    computePath("replays", dataPath + "/replays/");
+    computePath("themes", dataPath + "/themes/");
+    computePath("pics", dataPath + "/pics/");
+    computePath("redirects", getCachePath() + "/redirects/");
+
+    // customPicsPath derived from picsPath
+    QString picsPath = pathsIni.value("paths/pics").toString();
+    if (picsPath.endsWith("/")) {
+        computePath("customPics", picsPath + "CUSTOM/");
+    } else {
+        computePath("customPics", picsPath + "/CUSTOM/");
+    }
+
+    computePath("customSets", dataPath + "/customsets/");
+    computeFilePath("cardDatabase", dataPath + "/cards.xml");
+    computeFilePath("tokenDatabase", dataPath + "/tokens.xml");
+    computeFilePath("spoilerDatabase", dataPath + "/spoiler.xml");
+}
+
+void SettingsCache::setThemeName(const QString &_themeName)
+{
+    if (themeName != _themeName) {
+        themeName = _themeName;
+        emit themeChanged();
+    }
+}
+
+SettingsCache &SettingsCache::instance()
+{
+    static SettingsCache settingsCache;
+    return settingsCache;
+}
diff --git a/tests/playmat_resolver_test.cpp b/tests/playmat_resolver_test.cpp
new file mode 100644
index 000000000..6730ec137
--- /dev/null
+++ b/tests/playmat_resolver_test.cpp
@@ -0,0 +1,135 @@
+#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
+{
+
+PlaymatInfo makePlaymatInfo(const QString &name, const QString &providerId = QString())
+{
+    PlaymatInfo info;
+    info.card = {name, providerId};
+    return info;
+}
+
+} // namespace
+
+TEST(PlaymatResolverTest, EmptyChainReturnsEmpty)
+{
+    DeckList deck;
+    const PlaymatInfo resolved = resolveEffectivePlaymat(deck, {}, {}, PlaymatFallbackModeFixed, 0);
+    EXPECT_TRUE(resolved.card.isEmpty());
+}
+
+TEST(PlaymatResolverTest, OverrideWinsOverDeckAndFallback)
+{
+    DeckList deck;
+    deck.setPlaymat({{QStringLiteral("Deck Mat"), QStringLiteral("deck-provider")}, {}});
+
+    const PlaymatInfo force = makePlaymatInfo(QStringLiteral("Force Mat"), QStringLiteral("force-provider"));
+    const QList<PlaymatInfo> fallback = {makePlaymatInfo(QStringLiteral("Fallback Mat"))};
+
+    const PlaymatInfo resolved = resolveEffectivePlaymat(deck, force, fallback, PlaymatFallbackModeFixed, 0);
+    EXPECT_EQ(resolved.card.name, QStringLiteral("Force Mat"));
+    EXPECT_EQ(resolved.card.providerId, QStringLiteral("force-provider"));
+}
+
+TEST(PlaymatResolverTest, DeckWinsOverFallback)
+{
+    DeckList deck;
+    deck.setPlaymat({{QStringLiteral("Deck Mat"), QStringLiteral("deck-provider")}, {0.1, 0.2, 0.3, 1.5}});
+
+    const QList<PlaymatInfo> fallback = {makePlaymatInfo(QStringLiteral("Fallback Mat"))};
+
+    const PlaymatInfo resolved = resolveEffectivePlaymat(deck, {}, fallback, PlaymatFallbackModeFixed, 0);
+    EXPECT_EQ(resolved.card.name, QStringLiteral("Deck Mat"));
+    EXPECT_EQ(resolved.card.providerId, QStringLiteral("deck-provider"));
+    EXPECT_DOUBLE_EQ(resolved.params.marginPctL, 0.1);
+    EXPECT_DOUBLE_EQ(resolved.params.verticalOffset, 0.3);
+}
+
+TEST(PlaymatResolverTest, FallbackUsedWhenDeckHasNone)
+{
+    DeckList deck;
+    const QList<PlaymatInfo> fallback = {makePlaymatInfo(QStringLiteral("Fallback Mat"))};
+
+    const PlaymatInfo resolved = resolveEffectivePlaymat(deck, {}, fallback, PlaymatFallbackModeFixed, 0);
+    EXPECT_EQ(resolved.card.name, QStringLiteral("Fallback Mat"));
+}
+
+TEST(PlaymatResolverTest, FixedAlwaysUsesFirst)
+{
+    DeckList deck;
+    const QList<PlaymatInfo> fallback = {makePlaymatInfo(QStringLiteral("First")),
+                                         makePlaymatInfo(QStringLiteral("Second"))};
+
+    for (int i = 0; i < 5; ++i) {
+        const PlaymatInfo resolved = resolveEffectivePlaymat(deck, {}, fallback, PlaymatFallbackModeFixed, i);
+        EXPECT_EQ(resolved.card.name, QStringLiteral("First"));
+    }
+}
+
+TEST(PlaymatResolverTest, RoundRobinCyclesAndWraps)
+{
+    DeckList deck;
+    const QList<PlaymatInfo> fallback = {makePlaymatInfo(QStringLiteral("First")),
+                                         makePlaymatInfo(QStringLiteral("Second")),
+                                         makePlaymatInfo(QStringLiteral("Third"))};
+
+    const QStringList expected = {QStringLiteral("First"), QStringLiteral("Second"), QStringLiteral("Third"),
+                                  QStringLiteral("First"), QStringLiteral("Second"), QStringLiteral("Third")};
+    for (int i = 0; i < expected.size(); ++i) {
+        const PlaymatInfo resolved = resolveEffectivePlaymat(deck, {}, fallback, PlaymatFallbackModeRoundRobin, i);
+        EXPECT_EQ(resolved.card.name, expected.at(i));
+    }
+}
+
+TEST(PlaymatResolverTest, RoundRobinRespectsCursor)
+{
+    DeckList deck;
+    const QList<PlaymatInfo> fallback = {makePlaymatInfo(QStringLiteral("First")),
+                                         makePlaymatInfo(QStringLiteral("Second"))};
+
+    const PlaymatInfo resolved = resolveEffectivePlaymat(deck, {}, fallback, PlaymatFallbackModeRoundRobin, 5);
+    EXPECT_EQ(resolved.card.name, QStringLiteral("Second")); // 5 % 2 == 1
+}
+
+TEST(PlaymatResolverTest, RandomStaysWithinList)
+{
+    DeckList deck;
+    const QList<PlaymatInfo> fallback = {makePlaymatInfo(QStringLiteral("First")),
+                                         makePlaymatInfo(QStringLiteral("Second")),
+                                         makePlaymatInfo(QStringLiteral("Third"))};
+
+    for (int i = 0; i < 50; ++i) {
+        const PlaymatInfo resolved = resolveEffectivePlaymat(deck, {}, fallback, PlaymatFallbackModeRandom, i);
+        ASSERT_FALSE(resolved.card.name.isEmpty());
+        EXPECT_TRUE(fallback.contains(resolved));
+    }
+}
+
+TEST(PlaymatResolverTest, ForceWithEmptyCardIgnoresFallbackParamsButNotFallback)
+{
+    DeckList deck;
+    deck.setPlaymat({{QStringLiteral("Deck Mat")}, {}});
+
+    // An empty force entry must not mask the deck-configured playmat.
+    const PlaymatInfo emptyForce;
+    const PlaymatInfo resolved = resolveEffectivePlaymat(deck, emptyForce, {}, PlaymatFallbackModeFixed, 0);
+    EXPECT_EQ(resolved.card.name, QStringLiteral("Deck Mat"));
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/report_categories_test.cpp b/tests/report_categories_test.cpp
new file mode 100644
index 000000000..1e08938db
--- /dev/null
+++ b/tests/report_categories_test.cpp
@@ -0,0 +1,55 @@
+#include "gtest/gtest.h"
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <libcockatrice/utility/report_categories.h>
+#include <string>
+
+TEST(ReportCategoriesTest, CanonicalListIsNonEmptyAndStable)
+{
+    const QStringList categories = ReportCategories::keys();
+
+    ASSERT_FALSE(categories.isEmpty());
+    EXPECT_EQ("cheating", categories.at(0));
+    EXPECT_EQ("other", categories.last());
+}
+
+TEST(ReportCategoriesTest, CanonicalListContainsMergedClientAndServerCategories)
+{
+    const QStringList expected = {"cheating",    "bug_abuse", "harassment", "verbal_abuse",
+                                  "hate_speech", "spam",      "other"};
+    EXPECT_EQ(expected, ReportCategories::keys());
+    EXPECT_EQ(7, ReportCategories::keys().size());
+}
+
+TEST(ReportCategoriesTest, AllCanonicalKeysAreValid)
+{
+    for (const QString &category : ReportCategories::keys()) {
+        EXPECT_TRUE(ReportCategories::isValid(category)) << category.toStdString();
+    }
+}
+
+TEST(ReportCategoriesTest, LegacyCategoriesRemainValid)
+{
+    EXPECT_TRUE(ReportCategories::isValid("bug_abuse"));
+    EXPECT_TRUE(ReportCategories::isValid("verbal_abuse"));
+}
+
+TEST(ReportCategoriesTest, ValidationIsCaseInsensitive)
+{
+    EXPECT_TRUE(ReportCategories::isValid("Cheating"));
+    EXPECT_TRUE(ReportCategories::isValid("HATE_SPEECH"));
+}
+
+TEST(ReportCategoriesTest, UnknownAndEmptyCategoriesAreRejected)
+{
+    EXPECT_FALSE(ReportCategories::isValid(QString()));
+    EXPECT_FALSE(ReportCategories::isValid("hate speech"));
+    EXPECT_FALSE(ReportCategories::isValid("griefing"));
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
\ No newline at end of file
diff --git a/tests/server_card_counter_test.cpp b/tests/server_card_counter_test.cpp
new file mode 100644
index 000000000..6308d80b9
--- /dev/null
+++ b/tests/server_card_counter_test.cpp
@@ -0,0 +1,185 @@
+/** @file server_card_counter_test.cpp
+ *  @brief Tests for Server_Card counter operations.
+ *  @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>
+
+TEST(ServerCardCounter, IncrementNewCounter)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    EXPECT_TRUE(card.incrementCounter(1, 10));
+    EXPECT_EQ(card.getCounter(1), 10);
+}
+
+TEST(ServerCardCounter, IncrementExistingCounter)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    ASSERT_TRUE(card.setCounter(1, 50));
+    EXPECT_TRUE(card.incrementCounter(1, 10));
+    EXPECT_EQ(card.getCounter(1), 60);
+}
+
+TEST(ServerCardCounter, IncrementOverflowProtection)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    ASSERT_TRUE(card.setCounter(1, MAX_COUNTER_VALUE));
+    EXPECT_FALSE(card.incrementCounter(1, 1));
+    EXPECT_EQ(card.getCounter(1), MAX_COUNTER_VALUE);
+}
+
+TEST(ServerCardCounter, DecrementUnderflowProtection)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    ASSERT_TRUE(card.setCounter(1, 5));
+    EXPECT_TRUE(card.incrementCounter(1, -10));
+    EXPECT_EQ(card.getCounter(1), 0);
+    EXPECT_FALSE(card.getCounters().contains(1));
+}
+
+TEST(ServerCardCounter, ReturnsFalseWhenUnchanged)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    ASSERT_TRUE(card.setCounter(1, 50));
+    EXPECT_FALSE(card.incrementCounter(1, 0));
+    EXPECT_EQ(card.getCounter(1), 50);
+}
+
+TEST(ServerCardCounter, DecrementToZeroRemovesCounter)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    ASSERT_TRUE(card.setCounter(1, 10));
+    EXPECT_TRUE(card.incrementCounter(1, -10));
+    EXPECT_EQ(card.getCounter(1), 0);
+    EXPECT_FALSE(card.getCounters().contains(1));
+}
+
+TEST(ServerCardCounter, SetToZeroRemovesCounter)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    ASSERT_TRUE(card.setCounter(1, 10));
+    EXPECT_TRUE(card.setCounter(1, 0));
+    EXPECT_EQ(card.getCounter(1), 0);
+    EXPECT_FALSE(card.getCounters().contains(1));
+}
+
+TEST(ServerCardCounter, SetCounterReturnsFalseWhenUnchanged)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    ASSERT_TRUE(card.setCounter(1, 50));
+    EXPECT_FALSE(card.setCounter(1, 50));
+    EXPECT_EQ(card.getCounter(1), 50);
+}
+
+TEST(ServerCardCounter, SetCounterReturnsTrueWhenChanged)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    ASSERT_TRUE(card.setCounter(1, 50));
+    EXPECT_TRUE(card.setCounter(1, 100));
+    EXPECT_EQ(card.getCounter(1), 100);
+}
+
+TEST(ServerCardCounter, SetCounterEventNotPopulatedWhenUnchanged)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    ASSERT_TRUE(card.setCounter(1, 50));
+
+    Event_SetCardCounter event;
+    event.set_counter_id(999);
+    event.set_counter_value(999);
+
+    EXPECT_FALSE(card.setCounter(1, 50, &event));
+    EXPECT_EQ(event.counter_id(), 999);
+    EXPECT_EQ(event.counter_value(), 999);
+}
+
+TEST(ServerCardCounter, IncrementCounterPopulatesEvent)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    ASSERT_TRUE(card.setCounter(1, 50));
+
+    Event_SetCardCounter event;
+    EXPECT_TRUE(card.incrementCounter(1, 10, &event));
+
+    EXPECT_EQ(event.counter_id(), 1);
+    EXPECT_EQ(event.counter_value(), 60);
+}
+
+TEST(ServerCardCounter, IncrementCounterEventReflectsClampedValue)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    ASSERT_TRUE(card.setCounter(1, MAX_COUNTER_VALUE - 5));
+
+    Event_SetCardCounter event;
+    EXPECT_TRUE(card.incrementCounter(1, 10, &event));
+
+    EXPECT_EQ(event.counter_id(), 1);
+    EXPECT_EQ(event.counter_value(), MAX_COUNTER_VALUE);
+}
+
+TEST(ServerCardCounter, IncrementCounterNoEventWhenNullptr)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    ASSERT_TRUE(card.setCounter(1, 50));
+    EXPECT_TRUE(card.incrementCounter(1, 10, nullptr));
+    EXPECT_EQ(card.getCounter(1), 60);
+}
+
+TEST(ServerCardCounter, IncrementCounterEventNotPopulatedWhenUnchanged)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    ASSERT_TRUE(card.setCounter(1, MAX_COUNTER_VALUE));
+
+    Event_SetCardCounter event;
+    event.set_counter_id(999);
+    event.set_counter_value(999);
+
+    EXPECT_FALSE(card.incrementCounter(1, 1, &event));
+    EXPECT_EQ(event.counter_id(), 999);
+    EXPECT_EQ(event.counter_value(), 999);
+}
+
+TEST(ServerCardCounter, SetCounterClampsNegativeToZero)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    EXPECT_FALSE(card.setCounter(1, -5));
+    EXPECT_EQ(card.getCounter(1), 0);
+    EXPECT_FALSE(card.getCounters().contains(1));
+}
+
+TEST(ServerCardCounter, SetCounterClampsAboveMaxToMax)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    EXPECT_TRUE(card.setCounter(1, 1500));
+    EXPECT_EQ(card.getCounter(1), MAX_COUNTER_VALUE);
+}
+
+TEST(ServerCardCounter, IncrementDoesNotGoBelowZero)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    ASSERT_TRUE(card.setCounter(1, 5));
+    EXPECT_TRUE(card.incrementCounter(1, -10));
+    EXPECT_EQ(card.getCounter(1), 0);
+    EXPECT_FALSE(card.getCounters().contains(1));
+}
+
+TEST(ServerCardCounter, IncrementDoesNotExceedMax)
+{
+    Server_Card card(CardRef{"TestCard", ""}, 1, 0, 0);
+    ASSERT_TRUE(card.setCounter(1, MAX_COUNTER_VALUE - 5));
+    EXPECT_TRUE(card.incrementCounter(1, 10));
+    EXPECT_EQ(card.getCounter(1), MAX_COUNTER_VALUE);
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/server_counter_test.cpp b/tests/server_counter_test.cpp
new file mode 100644
index 000000000..492aecf66
--- /dev/null
+++ b/tests/server_counter_test.cpp
@@ -0,0 +1,90 @@
+/** @file server_counter_test.cpp
+ *  @brief Tests for Server_Counter operations.
+ *  @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)
+{
+    Server_Counter c(1, "test", color(), 10, std::numeric_limits<int>::max());
+    bool changed = c.incrementCount(1);
+    EXPECT_FALSE(changed);
+    EXPECT_EQ(c.getCount(), std::numeric_limits<int>::max());
+}
+
+TEST(ServerCounter, DecrementDoesNotUnderflow)
+{
+    Server_Counter c(1, "test", color(), 10, std::numeric_limits<int>::min());
+    bool changed = c.incrementCount(-1);
+    EXPECT_FALSE(changed);
+    EXPECT_EQ(c.getCount(), std::numeric_limits<int>::min());
+}
+
+TEST(ServerCounter, SetCountReturnsFalseWhenUnchanged)
+{
+    Server_Counter c(1, "test", color(), 10, 50);
+    bool changed = c.setCount(50);
+    EXPECT_FALSE(changed);
+}
+
+TEST(ServerCounter, IncrementReturnsChangeStatus)
+{
+    Server_Counter c(1, "test", color(), 10, 50);
+    EXPECT_TRUE(c.incrementCount(10));
+    EXPECT_EQ(c.getCount(), 60);
+    EXPECT_FALSE(c.incrementCount(0));
+    EXPECT_EQ(c.getCount(), 60);
+}
+
+TEST(ServerCounter, LargePositiveDeltaDoesNotOverflow)
+{
+    Server_Counter c(1, "test", color(), 10, std::numeric_limits<int>::max() - 10);
+    bool changed = c.incrementCount(std::numeric_limits<int>::max());
+    EXPECT_TRUE(changed); // Value changes from INT_MAX-10 to INT_MAX (clamped)
+    EXPECT_EQ(c.getCount(), std::numeric_limits<int>::max());
+}
+
+TEST(ServerCounter, LargeNegativeDeltaDoesNotUnderflow)
+{
+    Server_Counter c(1, "test", color(), 10, std::numeric_limits<int>::min() + 10);
+    bool changed = c.incrementCount(std::numeric_limits<int>::min());
+    EXPECT_TRUE(changed); // Value changes from INT_MIN+10 to INT_MIN (clamped)
+    EXPECT_EQ(c.getCount(), std::numeric_limits<int>::min());
+}
+
+TEST(ServerCounter, SetCountReturnsTrueWhenChanged)
+{
+    Server_Counter c(1, "test", color(), 10, 50);
+    EXPECT_TRUE(c.setCount(100));
+    EXPECT_EQ(c.getCount(), 100);
+}
+
+TEST(ServerCounter, BasicIncrementWorks)
+{
+    Server_Counter c(1, "test", color(), 10, 50);
+    EXPECT_TRUE(c.incrementCount(10));
+    EXPECT_EQ(c.getCount(), 60);
+    EXPECT_TRUE(c.incrementCount(-20));
+    EXPECT_EQ(c.getCount(), 40);
+}
+
+TEST(ServerCounter, MixedExtremesDoNotClamp)
+{
+    Server_Counter c(1, "test", color(), 10, std::numeric_limits<int>::max());
+    bool changed = c.incrementCount(std::numeric_limits<int>::min());
+    EXPECT_TRUE(changed);
+    EXPECT_EQ(c.getCount(), -1);
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/server_developer_role_test.cpp b/tests/server_developer_role_test.cpp
new file mode 100644
index 000000000..c77fc5b21
--- /dev/null
+++ b/tests/server_developer_role_test.cpp
@@ -0,0 +1,143 @@
+/** @file server_developer_role_test.cpp
+ *  @brief Tests for the developer 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_get_server_stats.pb.h>
+#include <libcockatrice/protocol/pb/commands.pb.h>
+#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
+// unit test can link against it.
+RNG_Abstract *rng = nullptr;
+
+namespace
+{
+
+class TestDeveloperHandler : public Server_ProtocolHandler
+{
+public:
+    explicit TestDeveloperHandler(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
+    processExtendedDeveloperCommand(int cmdType, const DeveloperCommand &, ResponseContainer &) override
+    {
+        ++dispatchCount;
+        // Fail closed for anything not explicitly handled.
+        if (cmdType != DeveloperCommand::GET_SERVER_STATS) {
+            return Response::RespFunctionNotAllowed;
+        }
+        return Response::RespOk;
+    }
+};
+
+class DeveloperRoleTest : public ::testing::Test
+{
+protected:
+    Server server;
+    TestDeveloperHandler handler{&server};
+
+    void setUserLevel(uint32_t level)
+    {
+        ServerInfo_User user;
+        user.set_user_level(level);
+        handler.setUserInfo(user);
+    }
+};
+
+TEST_F(DeveloperRoleTest, RejectsWhenNotLoggedIn)
+{
+    CommandContainer cont;
+    cont.add_developer_command();
+    handler.processCommandContainer(cont);
+    EXPECT_EQ(handler.lastResponseCode, Response::RespLoginNeeded);
+    EXPECT_EQ(handler.dispatchCount, 0);
+}
+
+TEST_F(DeveloperRoleTest, RejectsPlainUser)
+{
+    setUserLevel(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered);
+
+    CommandContainer cont;
+    cont.add_developer_command();
+    handler.processCommandContainer(cont);
+    EXPECT_EQ(handler.lastResponseCode, Response::RespLoginNeeded);
+    EXPECT_EQ(handler.dispatchCount, 0);
+}
+
+TEST_F(DeveloperRoleTest, RejectsModeratorThatIsNotDeveloper)
+{
+    setUserLevel(ServerInfo_User::IsModerator);
+
+    CommandContainer cont;
+    cont.add_developer_command();
+    handler.processCommandContainer(cont);
+    EXPECT_EQ(handler.lastResponseCode, Response::RespLoginNeeded);
+}
+
+TEST_F(DeveloperRoleTest, DispatchesToDeveloperCommandForDeveloper)
+{
+    setUserLevel(ServerInfo_User::IsDeveloper);
+
+    CommandContainer cont;
+    DeveloperCommand *cmd = cont.add_developer_command();
+    cmd->MutableExtension(Command_GetServerStats::ext);
+    handler.processCommandContainer(cont);
+    EXPECT_EQ(handler.lastResponseCode, Response::RespOk);
+    EXPECT_EQ(handler.dispatchCount, 1);
+}
+
+TEST_F(DeveloperRoleTest, FailClosedForUnknownDeveloperCommand)
+{
+    setUserLevel(ServerInfo_User::IsDeveloper);
+
+    CommandContainer cont;
+    cont.add_developer_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_game_join_test.cpp b/tests/server_game_join_test.cpp
new file mode 100644
index 000000000..8a2ae8c45
--- /dev/null
+++ b/tests/server_game_join_test.cpp
@@ -0,0 +1,179 @@
+/** @file server_game_join_test.cpp
+ *  @brief Tests for the moderator/judge game-entry restriction override in Server_Game::checkJoin.
+ *  @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
+
+namespace
+{
+
+class MockDatabaseInterface : public Server_DatabaseInterface
+{
+public:
+    AuthenticationResult checkUserPassword(Server_ProtocolHandler *,
+                                           const QString &,
+                                           const QString &,
+                                           const QString &,
+                                           QString &,
+                                           int &,
+                                           bool) override
+    {
+        return NotLoggedIn;
+    }
+    int getNextReplayId() override
+    {
+        return 1;
+    }
+    int getNextGameId() override
+    {
+        return 1;
+    }
+    int getActiveUserCount(QString) override
+    {
+        return 0;
+    }
+    ServerInfo_User getUserData(const QString &, bool) override
+    {
+        return ServerInfo_User();
+    }
+};
+
+class FakeServer : public Server
+{
+public:
+    FakeServer()
+    {
+        setDatabaseInterface(new MockDatabaseInterface());
+    }
+};
+
+class GameJoinOverrideTest : public ::testing::Test
+{
+protected:
+    FakeServer server;
+    Server_Room room{0, 0, "", "", "", "", false, "", {}, &server};
+    ServerInfo_User creator;
+    ServerInfo_User plainUser;
+    ServerInfo_User unregisteredJudge;
+    ServerInfo_User moderator;
+    ServerInfo_User judge;
+    Server_Game *game = nullptr;
+
+    void SetUp() override
+    {
+        creator.set_name("creator");
+        creator.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered);
+        plainUser.set_name("plain-user");
+        plainUser.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered);
+        unregisteredJudge.set_name("unregistered-judge");
+        unregisteredJudge.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsJudge);
+        moderator.set_name("moderator");
+        moderator.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered |
+                                 ServerInfo_User::IsModerator);
+        judge.set_name("judge");
+        judge.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered | ServerInfo_User::IsJudge);
+    }
+
+    void TearDown() override
+    {
+        delete game;
+    }
+
+    Server_Game *makeGame(bool passwordProtected, bool onlyRegistered, bool onlyBuddies, bool spectatorsAllowed)
+    {
+        GameConfig config{.creatorInfo = creator,
+                          .gameId = 1,
+                          .description = QString(),
+                          .password = passwordProtected ? "secret" : QString(),
+                          .maxPlayers = 2,
+                          .gameTypes = QList<int>(),
+                          .onlyBuddies = onlyBuddies,
+                          .onlyRegistered = onlyRegistered,
+                          .spectatorsAllowed = spectatorsAllowed,
+                          .spectatorsNeedPassword = true,
+                          .spectatorsCanTalk = false,
+                          .spectatorsSeeEverything = false,
+                          .startingLifeTotal = 20,
+                          .shareDecklistsOnLoad = false};
+        return new Server_Game(config, &room);
+    }
+};
+
+TEST_F(GameJoinOverrideTest, StaffBypassPasswordRestriction)
+{
+    game = makeGame(true, false, false, true);
+
+    // A plain user cannot override the password even with the override flag set.
+    EXPECT_EQ(game->checkJoin(&plainUser, "wrong", false, true, false), Response::RespWrongPassword);
+    // Moderators and judges may enter any game regardless of the password.
+    EXPECT_EQ(game->checkJoin(&moderator, "wrong", false, true, false), Response::RespOk);
+    EXPECT_EQ(game->checkJoin(&judge, "wrong", false, true, false), Response::RespOk);
+    // Without the override flag judges are still subject to the password.
+    EXPECT_EQ(game->checkJoin(&judge, "wrong", false, false, true), Response::RespWrongPassword);
+    EXPECT_EQ(game->checkJoin(&judge, "secret", false, false, true), Response::RespOk);
+}
+
+TEST_F(GameJoinOverrideTest, StaffBypassRegisteredOnlyRestriction)
+{
+    game = makeGame(false, true, false, true);
+
+    // Without the override flag the only-registered restriction still applies.
+    EXPECT_EQ(game->checkJoin(&unregisteredJudge, QString(), false, false, false), Response::RespUserLevelTooLow);
+    // An unregistered judge may enter when overriding restrictions.
+    EXPECT_EQ(game->checkJoin(&unregisteredJudge, QString(), false, true, false), Response::RespOk);
+}
+
+TEST_F(GameJoinOverrideTest, StaffBypassBuddiesOnlyRestriction)
+{
+    game = makeGame(false, false, true, true);
+
+    // A plain user who is not on the creator's buddy list gets rejected.
+    EXPECT_EQ(game->checkJoin(&plainUser, QString(), false, true, false), Response::RespOnlyBuddies);
+    // Moderators and judges bypass the buddies-only restriction.
+    EXPECT_EQ(game->checkJoin(&moderator, QString(), false, true, false), Response::RespOk);
+    EXPECT_EQ(game->checkJoin(&judge, QString(), false, true, false), Response::RespOk);
+}
+
+TEST_F(GameJoinOverrideTest, StaffBypassSpectatorsNotAllowedRestriction)
+{
+    game = makeGame(false, false, false, false);
+
+    // A plain user cannot spectate when the game disallows spectators.
+    EXPECT_EQ(game->checkJoin(&plainUser, QString(), true, false, false), Response::RespSpectatorsNotAllowed);
+    // Moderators and judges may spectate any game regardless of the password
+    // and the spectator restriction.
+    EXPECT_EQ(game->checkJoin(&moderator, "wrong", true, true, false), Response::RespOk);
+    EXPECT_EQ(game->checkJoin(&judge, "wrong", true, true, false), Response::RespOk);
+}
+
+TEST_F(GameJoinOverrideTest, JudgeOverrideDoesNotGrantJudgeJoinToPlainUser)
+{
+    game = makeGame(false, false, false, true);
+
+    // joining with join_as_judge still requires the judge flag even when overriding.
+    EXPECT_EQ(game->checkJoin(&plainUser, QString(), false, true, true), Response::RespUserLevelTooLow);
+    EXPECT_EQ(game->checkJoin(&judge, QString(), false, true, true), Response::RespOk);
+}
+
+} // 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/server_moderator_role_test.cpp b/tests/server_moderator_role_test.cpp
new file mode 100644
index 000000000..2517a2d86
--- /dev/null
+++ b/tests/server_moderator_role_test.cpp
@@ -0,0 +1,156 @@
+/** @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
new file mode 100644
index 000000000..8459c9690
--- /dev/null
+++ b/tests/server_rate_limiter_test.cpp
@@ -0,0 +1,155 @@
+#include "gtest/gtest.h"
+#include <QDateTime>
+#include <QString>
+#include <QTimeZone>
+#include <QtGlobal>
+#include <compare>
+#include <libcockatrice/utility/server_rate_limiter.h>
+#include <string>
+
+namespace
+{
+
+const QString HOST = "api.scryfall.com";
+
+QDateTime timeAt(qint64 secsFromEpoch)
+{
+    return QDateTime::fromMSecsSinceEpoch(secsFromEpoch * 1000, QTimeZone::UTC);
+}
+
+TEST(ServerRateLimiterTest, First429SetsThirtySecondBackoff)
+{
+    ServerRateLimiter limiter;
+    QDateTime now = timeAt(1000);
+
+    QDateTime deadline = limiter.on429(HOST, now);
+
+    EXPECT_TRUE(limiter.isRateLimited(HOST, now));
+    EXPECT_EQ(now.addSecs(30), deadline);
+    EXPECT_EQ(1, limiter.rounds(HOST));
+    EXPECT_FALSE(limiter.isRateLimited(HOST, deadline));
+}
+
+TEST(ServerRateLimiterTest, RetryAfterHeaderIsHonoredWhenLarger)
+{
+    ServerRateLimiter limiter;
+    QDateTime now = timeAt(1000);
+
+    QDateTime deadline = limiter.on429(HOST, now, 45 * 1000);
+
+    EXPECT_EQ(now.addSecs(45), deadline);
+}
+
+TEST(ServerRateLimiterTest, RetryAfterSmallerThanFloorIsIgnored)
+{
+    ServerRateLimiter limiter;
+    QDateTime now = timeAt(1000);
+
+    QDateTime deadline = limiter.on429(HOST, now, 5 * 1000);
+
+    EXPECT_EQ(now.addSecs(30), deadline);
+}
+
+TEST(ServerRateLimiterTest, Concurrent429sDoNotEscalateOrShorten)
+{
+    ServerRateLimiter limiter;
+    QDateTime now = timeAt(1000);
+
+    QDateTime first = limiter.on429(HOST, now);
+    limiter.on429(HOST, now.addMSecs(100));
+    limiter.on429(HOST, now.addMSecs(200));
+
+    // The burst counts as a single round, but each 429 slides the deadline forward.
+    EXPECT_EQ(1, limiter.rounds(HOST));
+    EXPECT_EQ(now.addMSecs(30200), limiter.deadline(HOST));
+    EXPECT_TRUE(limiter.deadline(HOST) >= first);
+}
+
+TEST(ServerRateLimiterTest, EscalatesAfterWindowPasses)
+{
+    ServerRateLimiter limiter;
+    QDateTime now = timeAt(1000);
+
+    limiter.on429(HOST, now);
+    limiter.on429(HOST, now.addSecs(31));
+
+    EXPECT_EQ(2, limiter.rounds(HOST));
+}
+
+TEST(ServerRateLimiterTest, BudgetExhaustionAppliesCooldown)
+{
+    ServerRateLimiter limiter;
+    QDateTime now = timeAt(1000);
+
+    QDateTime deadline;
+    for (int i = 0; i < ServerRateLimiter::MAX_RETRIES; ++i) {
+        deadline = limiter.on429(HOST, now.addSecs(31 * i));
+    }
+
+    EXPECT_EQ(ServerRateLimiter::MAX_RETRIES, limiter.rounds(HOST));
+    EXPECT_EQ(now.addSecs(31 * (ServerRateLimiter::MAX_RETRIES - 1) + 60), deadline);
+
+    // A 429 inside the exhausted cooldown does not escalate, but keeps sliding the cooldown forward.
+    limiter.on429(HOST, now.addSecs(31 * (ServerRateLimiter::MAX_RETRIES - 1) + 30));
+    EXPECT_EQ(ServerRateLimiter::MAX_RETRIES, limiter.rounds(HOST));
+    EXPECT_EQ(now.addSecs(31 * (ServerRateLimiter::MAX_RETRIES - 1) + 30 + 60), limiter.deadline(HOST));
+}
+
+TEST(ServerRateLimiterTest, SuccessClearsPenalty)
+{
+    ServerRateLimiter limiter;
+    QDateTime now = timeAt(1000);
+
+    limiter.on429(HOST, now);
+    limiter.onSuccess(HOST);
+
+    EXPECT_EQ(0, limiter.rounds(HOST));
+    EXPECT_FALSE(limiter.isRateLimited(HOST, now));
+}
+
+TEST(ServerRateLimiterTest, ClearExpiredRefreshesStaleBudget)
+{
+    ServerRateLimiter limiter;
+    QDateTime now = timeAt(1000);
+
+    limiter.on429(HOST, now);
+    limiter.clearExpired(now.addSecs(400));
+
+    EXPECT_EQ(0, limiter.rounds(HOST));
+    EXPECT_FALSE(limiter.isRateLimited(HOST, now.addSecs(400)));
+}
+
+TEST(ServerRateLimiterTest, ClearExpiredKeepsRecentBudget)
+{
+    ServerRateLimiter limiter;
+    QDateTime now = timeAt(1000);
+
+    for (int i = 0; i < ServerRateLimiter::MAX_RETRIES; ++i) {
+        limiter.on429(HOST, now.addSecs(31 * i));
+    }
+    limiter.clearExpired(now.addSecs(200));
+
+    EXPECT_EQ(ServerRateLimiter::MAX_RETRIES, limiter.rounds(HOST));
+    EXPECT_FALSE(limiter.isRateLimited(HOST, now.addSecs(200)));
+}
+
+TEST(ServerRateLimiterTest, EarliestDeadlineAcrossHosts)
+{
+    ServerRateLimiter limiter;
+    QDateTime now = timeAt(1000);
+
+    limiter.on429("api.scryfall.com", now, 40 * 1000);
+    limiter.on429("gatherer.wizards.com", now.addSecs(5));
+
+    EXPECT_EQ(now.addSecs(35), limiter.earliestDeadline(now));
+    EXPECT_EQ(now.addSecs(40), limiter.deadline("api.scryfall.com"));
+    EXPECT_EQ(now.addSecs(40), limiter.earliestDeadline(now.addSecs(36)));
+}
+
+} // namespace
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/settings/CMakeLists.txt b/tests/settings/CMakeLists.txt
new file mode 100644
index 000000000..98bed1f4b
--- /dev/null
+++ b/tests/settings/CMakeLists.txt
@@ -0,0 +1,14 @@
+cockatrice_add_test(NAME settings_manager_test SOURCES settings_manager_test.cpp LIBS libcockatrice_settings)
+
+cockatrice_add_test(
+  NAME
+  settings_defaults_test
+  SOURCES
+  settings_defaults_test.cpp
+  LIBS
+  libcockatrice_settings
+  DEFINITIONS
+  SETTINGS_UNIT_TEST
+)
+
+cockatrice_add_test(NAME settings_migration_test SOURCES settings_migration_test.cpp LIBS libcockatrice_settings)
diff --git a/tests/settings/settings_defaults_test.cpp b/tests/settings/settings_defaults_test.cpp
new file mode 100644
index 000000000..2ba9f3fbb
--- /dev/null
+++ b/tests/settings/settings_defaults_test.cpp
@@ -0,0 +1,755 @@
+#include "libcockatrice/card/card_localization.h"
+
+#include "gtest/gtest.h"
+#include <QDir>
+#include <QHash>
+#include <QList>
+#include <QString>
+#include <QStringList>
+#include <QTemporaryDir>
+#include <libcockatrice/settings/appearance_settings.h>
+#include <libcockatrice/settings/cache_storage_settings.h>
+#include <libcockatrice/settings/cards_display_settings.h>
+#include <libcockatrice/settings/chat_settings.h>
+#include <libcockatrice/settings/deck_editor_settings.h>
+#include <libcockatrice/settings/download_settings.h>
+#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
+{
+
+class SettingsDefaultsTest : public ::testing::Test
+{
+protected:
+    QTemporaryDir tempDir;
+    QString settingsPath;
+
+    void SetUp() override
+    {
+        settingsPath = tempDir.path() + "/";
+    }
+};
+
+// --- CacheStorageSettings ---
+
+TEST_F(SettingsDefaultsTest, CacheStorage_PixmapCacheSize_Default)
+{
+    CacheStorageSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getPixmapCacheSize(), PIXMAPCACHE_SIZE_DEFAULT);
+}
+
+TEST_F(SettingsDefaultsTest, CacheStorage_PixmapCacheSize_SetAndGet)
+{
+    CacheStorageSettings s(settingsPath, nullptr);
+    s.setPixmapCacheSize(1024);
+    ASSERT_EQ(s.getPixmapCacheSize(), 1024);
+}
+
+TEST_F(SettingsDefaultsTest, CacheStorage_NetworkCacheSizeInMB_Default)
+{
+    CacheStorageSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getNetworkCacheSizeInMB(), NETWORK_CACHE_SIZE_DEFAULT);
+}
+
+TEST_F(SettingsDefaultsTest, CacheStorage_RedirectCacheTtl_Default)
+{
+    CacheStorageSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getRedirectCacheTtl(), NETWORK_REDIRECT_CACHE_TTL_DEFAULT);
+}
+
+TEST_F(SettingsDefaultsTest, CacheStorage_CardPictureLoaderCacheMethod_Default)
+{
+    CacheStorageSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getCardPictureLoaderCacheMethod(), 0);
+}
+
+TEST_F(SettingsDefaultsTest, CacheStorage_LocalCardImageStorageNamingScheme_Default)
+{
+    CacheStorageSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getLocalCardImageStorageNamingScheme(), LOCAL_CARD_IMAGE_NAMING_SCHEME_DEFAULT);
+}
+
+// --- GameSettings ---
+
+TEST_F(SettingsDefaultsTest, Game_MaxPlayers_Default)
+{
+    GameSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getMaxPlayers(), 2);
+}
+
+TEST_F(SettingsDefaultsTest, Game_MaxPlayers_SetAndGet)
+{
+    GameSettings s(settingsPath, nullptr);
+    s.setMaxPlayers(4);
+    ASSERT_EQ(s.getMaxPlayers(), 4);
+}
+
+TEST_F(SettingsDefaultsTest, Game_DefaultStartingLifeTotal_Default)
+{
+    GameSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getDefaultStartingLifeTotal(), 20);
+}
+
+TEST_F(SettingsDefaultsTest, Game_RememberGameSettings_Default)
+{
+    GameSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getRememberGameSettings(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Game_LocalGameMaxPlayers_Default)
+{
+    GameSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getLocalGameMaxPlayers(), 1);
+}
+
+TEST_F(SettingsDefaultsTest, Game_LocalGameStartingLifeTotal_Default)
+{
+    GameSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getLocalGameStartingLifeTotal(), 20);
+}
+
+TEST_F(SettingsDefaultsTest, Game_LocalGameRememberSettings_Default)
+{
+    GameSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getLocalGameRememberSettings(), false);
+}
+
+// --- UpdatesSettings ---
+
+TEST_F(SettingsDefaultsTest, Updates_CheckUpdatesOnStartup_Default)
+{
+    UpdatesSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getCheckUpdatesOnStartup(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Updates_StartupCardUpdateCheckPromptForUpdate_Default)
+{
+    UpdatesSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getStartupCardUpdateCheckPromptForUpdate(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Updates_StartupCardUpdateCheckAlwaysUpdate_Default)
+{
+    UpdatesSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getStartupCardUpdateCheckAlwaysUpdate(), false);
+}
+
+TEST_F(SettingsDefaultsTest, Updates_CardUpdateCheckInterval_Default)
+{
+    UpdatesSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getCardUpdateCheckInterval(), 7);
+}
+
+TEST_F(SettingsDefaultsTest, Updates_AlwaysEnableNewSets_Default)
+{
+    UpdatesSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getAlwaysEnableNewSets(), false);
+}
+
+TEST_F(SettingsDefaultsTest, Updates_NotifyAboutUpdates_Default)
+{
+    UpdatesSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getNotifyAboutUpdates(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Updates_NotifyAboutNewVersion_Default)
+{
+    UpdatesSettings s(settingsPath, nullptr);
+    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);
+    ASSERT_EQ(s.getUpdateReleaseChannelIndex(), 0);
+}
+
+// --- SoundSettings ---
+
+TEST_F(SettingsDefaultsTest, Sound_SoundEnabled_Default)
+{
+    SoundSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getSoundEnabled(), false);
+}
+
+TEST_F(SettingsDefaultsTest, Sound_MasterVolume_Default)
+{
+    SoundSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getMasterVolume(), 100);
+}
+
+TEST_F(SettingsDefaultsTest, Sound_MasterVolume_SetAndGet)
+{
+    SoundSettings s(settingsPath, nullptr);
+    s.setMasterVolume(50);
+    ASSERT_EQ(s.getMasterVolume(), 50);
+}
+
+// --- TabsSettings ---
+
+TEST_F(SettingsDefaultsTest, Tabs_StartupTab_Default)
+{
+    TabsSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getStartupTabIndex(), static_cast<int>(StartupTab::StartupTabHome));
+}
+
+TEST_F(SettingsDefaultsTest, Tabs_StartupTab_SetAndGet)
+{
+    TabsSettings s(settingsPath, nullptr);
+    s.setStartupTabIndex(StartupTab::StartupTabServerRoom);
+    ASSERT_EQ(s.getStartupTabIndex(), static_cast<int>(StartupTab::StartupTabServerRoom));
+}
+
+TEST_F(SettingsDefaultsTest, Tabs_StartupServer_Default)
+{
+    TabsSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getStartupServerHost(), QString());
+    ASSERT_EQ(s.getStartupServerPort(), QString());
+    ASSERT_EQ(s.getStartupRoomName(), QString());
+}
+
+TEST_F(SettingsDefaultsTest, Tabs_StartupServer_SetAndGet)
+{
+    TabsSettings s(settingsPath, nullptr);
+    s.setStartupServerHost("server.cockatrice.us");
+    s.setStartupServerPort("4748");
+    s.setStartupRoomName("General");
+    ASSERT_EQ(s.getStartupServerHost(), QString("server.cockatrice.us"));
+    ASSERT_EQ(s.getStartupServerPort(), QString("4748"));
+    ASSERT_EQ(s.getStartupRoomName(), QString("General"));
+}
+
+TEST_F(SettingsDefaultsTest, Tabs_AllTabsOpen_Default)
+{
+    TabsSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getTabVisualDeckStorageOpen(), true);
+    ASSERT_EQ(s.getTabServerOpen(), true);
+    ASSERT_EQ(s.getTabAccountOpen(), true);
+    ASSERT_EQ(s.getTabDeckStorageOpen(), true);
+    ASSERT_EQ(s.getTabReplaysOpen(), true);
+    ASSERT_EQ(s.getTabAdminOpen(), true);
+    ASSERT_EQ(s.getTabLogOpen(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Tabs_ModerationOpen_Default)
+{
+    TabsSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getTabModerationOpen(), false);
+}
+
+TEST_F(SettingsDefaultsTest, Tabs_CardArtRulesOpen_Default)
+{
+    TabsSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getTabCardArtRulesOpen(), false);
+}
+
+// --- ChatSettings ---
+
+TEST_F(SettingsDefaultsTest, Chat_Mention_Default)
+{
+    ChatSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getChatMention(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Chat_MentionCompleter_Default)
+{
+    ChatSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getChatMentionCompleter(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Chat_MentionColor_Default)
+{
+    ChatSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getChatMentionColor(), QString("A6120D"));
+}
+
+TEST_F(SettingsDefaultsTest, Chat_HighlightColor_Default)
+{
+    ChatSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getChatHighlightColor(), QString("A6120D"));
+}
+
+TEST_F(SettingsDefaultsTest, Chat_MentionForeground_Default)
+{
+    ChatSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getChatMentionForeground(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Chat_HighlightForeground_Default)
+{
+    ChatSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getChatHighlightForeground(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Chat_ShowMessagePopup_Default)
+{
+    ChatSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getShowMessagePopup(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Chat_ShowMentionPopup_Default)
+{
+    ChatSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getShowMentionPopup(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Chat_RoomHistory_Default)
+{
+    ChatSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getRoomHistory(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Chat_IgnoreAllPrivateMessages_Default)
+{
+    ChatSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getIgnoreAllPrivateMessages(), false);
+}
+
+TEST_F(SettingsDefaultsTest, Chat_UseGameTime_Default)
+{
+    ChatSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getUseGameTime(), false);
+}
+
+// --- PersonalSettings ---
+
+TEST_F(SettingsDefaultsTest, Personal_Lang_Default)
+{
+    PersonalSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getLang(), QString(""));
+}
+
+TEST_F(SettingsDefaultsTest, Personal_ShowTipsOnStartup_Default)
+{
+    PersonalSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getShowTipsOnStartup(), true);
+}
+
+// --- DownloadSettings ---
+
+TEST_F(SettingsDefaultsTest, Download_PicDownload_Default)
+{
+    DownloadSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getPicDownload(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Download_DownloadSpoilersStatus_Default)
+{
+    DownloadSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getDownloadSpoilersStatus(), false);
+}
+
+TEST_F(SettingsDefaultsTest, Download_HostRequestLimits_Default)
+{
+    DownloadSettings s(settingsPath, nullptr);
+    ASSERT_TRUE(s.getHostRequestLimits().isEmpty());
+}
+
+TEST_F(SettingsDefaultsTest, Download_HostRequestLimits_SetAndGet)
+{
+    DownloadSettings s(settingsPath, nullptr);
+    s.setHostRequestLimits({{"api.scryfall.com", 5}});
+    const QHash<QString, int> limits = s.getHostRequestLimits();
+    ASSERT_EQ(limits.size(), 1);
+    ASSERT_EQ(limits.value("api.scryfall.com"), 5);
+}
+
+TEST_F(SettingsDefaultsTest, Download_HostRequestLimits_StackedHostCaps)
+{
+    DownloadSettings s(settingsPath, nullptr);
+    // The developer cap for the Scryfall API lowers the ceiling to 9; a user can
+    // reduce it further but can never raise it above the cap.
+    ASSERT_EQ(s.clampHostRequestLimit("api.scryfall.com", 9), 9);
+    ASSERT_EQ(s.clampHostRequestLimit("api.scryfall.com", 20), 9);
+    ASSERT_EQ(s.clampHostRequestLimit("api.scryfall.com", 5), 5);
+    ASSERT_EQ(s.clampHostRequestLimit("api.scryfall.com", 0), 1);
+    // Hosts without a developer cap fall back to the global default ceiling.
+    ASSERT_EQ(s.clampHostRequestLimit("gatherer.wizards.com", 10), 10);
+    ASSERT_EQ(s.clampHostRequestLimit("gatherer.wizards.com", 20), 10);
+    // The Scryfall CDN is unlocked: no upper bound (values are only floored).
+    ASSERT_EQ(s.clampHostRequestLimit("cards.scryfall.io", 20), 20);
+    ASSERT_EQ(s.clampHostRequestLimit("cards.scryfall.io", 0), 1);
+}
+
+// --- AppearanceSettings ---
+
+TEST_F(SettingsDefaultsTest, Appearance_ThemeName_Default)
+{
+    AppearanceSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getThemeName(), QString(""));
+}
+
+TEST_F(SettingsDefaultsTest, Appearance_ThemeName_SetAndGet)
+{
+    AppearanceSettings s(settingsPath, nullptr);
+    s.setThemeName("my_theme");
+    ASSERT_EQ(s.getThemeName(), QString("my_theme"));
+}
+
+TEST_F(SettingsDefaultsTest, Appearance_StyleUserList_Default)
+{
+    AppearanceSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getStyleUserList(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Appearance_MaxFontSize_Default)
+{
+    AppearanceSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getMaxFontSize(), 12);
+}
+
+TEST_F(SettingsDefaultsTest, Appearance_MaxFontSize_SetAndGet)
+{
+    AppearanceSettings s(settingsPath, nullptr);
+    s.setMaxFontSize(14);
+    ASSERT_EQ(s.getMaxFontSize(), 14);
+}
+
+TEST_F(SettingsDefaultsTest, Appearance_HomeTabBackgroundSource_Default)
+{
+    AppearanceSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getHomeTabBackgroundSource(), QString("themed"));
+}
+
+TEST_F(SettingsDefaultsTest, Appearance_HomeTabBackgroundShuffleFrequency_Default)
+{
+    AppearanceSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getHomeTabBackgroundShuffleFrequency(), 0);
+}
+
+TEST_F(SettingsDefaultsTest, Appearance_HomeTabDisplayCardName_Default)
+{
+    AppearanceSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getHomeTabDisplayCardName(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Appearance_HomeTabBackgroundDim_Default)
+{
+    AppearanceSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getHomeTabBackgroundDim(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Appearance_HomeTabBackgroundDim_SetAndGet)
+{
+    AppearanceSettings s(settingsPath, nullptr);
+    s.setHomeTabBackgroundDim(false);
+    ASSERT_EQ(s.getHomeTabBackgroundDim(), false);
+}
+
+// --- InterfaceSettings ---
+
+TEST_F(SettingsDefaultsTest, Interface_ShowStatusBar_Default)
+{
+    InterfaceSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getShowStatusBar(), false);
+}
+
+TEST_F(SettingsDefaultsTest, Interface_ShowShortcuts_Default)
+{
+    InterfaceSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getShowShortcuts(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Interface_ShowGameSelectorFilterToolbar_Default)
+{
+    InterfaceSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getShowGameSelectorFilterToolbar(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Interface_NotificationsEnabled_Default)
+{
+    InterfaceSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getNotificationsEnabled(), true);
+}
+
+TEST_F(SettingsDefaultsTest, Interface_SpectatorNotificationsEnabled_Default)
+{
+    InterfaceSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getSpectatorNotificationsEnabled(), false);
+}
+
+TEST_F(SettingsDefaultsTest, Interface_BuddyConnectNotificationsEnabled_Default)
+{
+    InterfaceSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getBuddyConnectNotificationsEnabled(), true);
+}
+
+// --- DeckEditorSettings ---
+
+TEST_F(SettingsDefaultsTest, DeckEditor_OpenDeckInNewTab_Default)
+{
+    DeckEditorSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getOpenDeckInNewTab(), false);
+}
+
+TEST_F(SettingsDefaultsTest, DeckEditor_BannerCardComboBoxVisible_Default)
+{
+    DeckEditorSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getBannerCardComboBoxVisible(), true);
+}
+
+TEST_F(SettingsDefaultsTest, DeckEditor_TagsWidgetVisible_Default)
+{
+    DeckEditorSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getTagsWidgetVisible(), true);
+}
+
+TEST_F(SettingsDefaultsTest, DeckEditor_DefaultDeckEditorType_Default)
+{
+    DeckEditorSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getDefaultDeckEditorType(), 1);
+}
+
+TEST_F(SettingsDefaultsTest, DeckEditor_VdeStartupTab_Default)
+{
+    DeckEditorSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getVdeStartupTab(), VdeStartupTabContext);
+}
+
+TEST_F(SettingsDefaultsTest, DeckEditor_VdeStartupTab_SetAndGet)
+{
+    DeckEditorSettings s(settingsPath, nullptr);
+    s.setVdeStartupTab(VdeStartupTabDeckDisplay);
+    ASSERT_EQ(s.getVdeStartupTab(), VdeStartupTabDeckDisplay);
+    s.setVdeStartupTab(VdeStartupTabDatabaseDisplay);
+    ASSERT_EQ(s.getVdeStartupTab(), VdeStartupTabDatabaseDisplay);
+    s.setVdeStartupTab(VdeStartupTabContext);
+    ASSERT_EQ(s.getVdeStartupTab(), VdeStartupTabContext);
+}
+
+// --- NetworkSettings ---
+
+TEST_F(SettingsDefaultsTest, Network_ClientID_Default)
+{
+    NetworkSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getClientID(), QString("notset"));
+}
+
+TEST_F(SettingsDefaultsTest, Network_ClientVersion_Default)
+{
+    NetworkSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getClientVersion(), QString("notset"));
+}
+
+TEST_F(SettingsDefaultsTest, Network_KeepAlive_Default)
+{
+    NetworkSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getKeepAlive(), 3);
+}
+
+TEST_F(SettingsDefaultsTest, Network_TimeOut_Default)
+{
+    NetworkSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getTimeOut(), 5);
+}
+
+TEST_F(SettingsDefaultsTest, Network_KnownMissingFeatures_Default)
+{
+    NetworkSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getKnownMissingFeatures(), QString(""));
+}
+
+// --- CardsDisplaySettings ---
+
+TEST_F(SettingsDefaultsTest, CardsDisplay_PrintingSelectorCardSize_Default)
+{
+    CardsDisplaySettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getPrintingSelectorCardSize(), 100);
+}
+
+TEST_F(SettingsDefaultsTest, CardsDisplay_VisualDeckStorageCardSize_Default)
+{
+    CardsDisplaySettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getVisualDeckStorageCardSize(), 100);
+}
+
+TEST_F(SettingsDefaultsTest, CardsDisplay_VisualDatabaseDisplayCardSize_Default)
+{
+    CardsDisplaySettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getVisualDatabaseDisplayCardSize(), 100);
+}
+
+TEST_F(SettingsDefaultsTest, CardsDisplay_VisualDeckEditorCardSize_Default)
+{
+    CardsDisplaySettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getVisualDeckEditorCardSize(), 100);
+}
+
+TEST_F(SettingsDefaultsTest, CardsDisplay_VisualDeckEditorShowCardCounts_Default)
+{
+    CardsDisplaySettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getVisualDeckEditorShowCardCounts(), true);
+}
+
+TEST_F(SettingsDefaultsTest, CardsDisplay_VisualDeckEditorShowCardCounts_SetAndGet)
+{
+    CardsDisplaySettings s(settingsPath, nullptr);
+    s.setVisualDeckEditorShowCardCounts(false);
+    ASSERT_EQ(s.getVisualDeckEditorShowCardCounts(), false);
+    s.setVisualDeckEditorShowCardCounts(true);
+    ASSERT_EQ(s.getVisualDeckEditorShowCardCounts(), true);
+}
+
+TEST_F(SettingsDefaultsTest, CardsDisplay_EDHRecCardSize_Default)
+{
+    CardsDisplaySettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getEDHRecCardSize(), 100);
+}
+
+TEST_F(SettingsDefaultsTest, CardsDisplay_ArchidektPreviewSize_Default)
+{
+    CardsDisplaySettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getArchidektPreviewSize(), 100);
+}
+
+TEST_F(SettingsDefaultsTest, CardsDisplay_SampleHandSize_Default)
+{
+    CardsDisplaySettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getSampleHandSize(), 7);
+}
+
+TEST_F(SettingsDefaultsTest, CardsDisplay_ArrowDrawAnimation_Default)
+{
+    CardsDisplaySettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getArrowDrawAnimation(), true);
+}
+
+TEST_F(SettingsDefaultsTest, CardsDisplay_CardLang_Default)
+{
+    CardsDisplaySettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getCardLang(), QString("en"));
+}
+
+TEST_F(SettingsDefaultsTest, CardsDisplay_CardLang_SetAndGet)
+{
+    CardsDisplaySettings s(settingsPath, nullptr);
+    s.setCardLang("de");
+    ASSERT_EQ(s.getCardLang(), QString("de"));
+}
+
+TEST_F(SettingsDefaultsTest, CardsDisplay_CardSearchLanguage_Default)
+{
+    CardsDisplaySettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getCardSearchLanguage(), static_cast<int>(SearchLanguageMode::English));
+}
+
+TEST_F(SettingsDefaultsTest, CardsDisplay_CardSearchLanguage_SetAndGet)
+{
+    CardsDisplaySettings s(settingsPath, nullptr);
+    s.setCardSearchLanguage(static_cast<int>(SearchLanguageMode::Selected));
+    ASSERT_EQ(s.getCardSearchLanguage(), static_cast<int>(SearchLanguageMode::Selected));
+}
+
+// --- VisualDeckStorageSettings ---
+
+TEST_F(SettingsDefaultsTest, VisualDeckStorage_SortingOrder_Default)
+{
+    VisualDeckStorageSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getVisualDeckStorageSortingOrder(), 0);
+}
+
+TEST_F(SettingsDefaultsTest, VisualDeckStorage_ShowFolders_Default)
+{
+    VisualDeckStorageSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getVisualDeckStorageShowFolders(), true);
+}
+
+TEST_F(SettingsDefaultsTest, VisualDeckStorage_DefaultTagsList_NotEmpty)
+{
+    VisualDeckStorageSettings s(settingsPath, nullptr);
+    ASSERT_GT(s.getVisualDeckStorageDefaultTagsList().size(), 0);
+}
+
+TEST_F(SettingsDefaultsTest, VisualDeckStorage_DefaultTagsList_SetAndGet)
+{
+    VisualDeckStorageSettings s(settingsPath, nullptr);
+    QStringList custom = {"Tag1", "Tag2"};
+    s.setVisualDeckStorageDefaultTagsList(custom);
+    ASSERT_EQ(s.getVisualDeckStorageDefaultTagsList(), custom);
+}
+
+TEST_F(SettingsDefaultsTest, VisualDeckStorage_ShowUploadTime_Default)
+{
+    VisualDeckStorageSettings s(settingsPath, nullptr);
+    ASSERT_EQ(s.getVisualDeckStorageShowUploadTime(), true);
+}
+
+TEST_F(SettingsDefaultsTest, VisualDeckStorage_ShowUploadTime_SetAndGet)
+{
+    VisualDeckStorageSettings s(settingsPath, nullptr);
+    s.setVisualDeckStorageShowUploadTime(false);
+    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)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/settings/settings_manager_test.cpp b/tests/settings/settings_manager_test.cpp
new file mode 100644
index 000000000..23d27aa78
--- /dev/null
+++ b/tests/settings/settings_manager_test.cpp
@@ -0,0 +1,175 @@
+#include "gtest/gtest.h"
+#include <QSettings>
+#include <QString>
+#include <QTemporaryDir>
+#include <QVariant>
+#include <functional>
+#include <libcockatrice/settings/settings_manager.h>
+#include <string>
+
+namespace
+{
+
+class SettingsManagerTest : public ::testing::Test
+{
+protected:
+    QTemporaryDir tempDir;
+    QString settingsPath;
+
+    void SetUp() override
+    {
+        settingsPath = tempDir.path() + "/";
+    }
+
+    void writeValue(const QString &file, const QString &key, const QVariant &value)
+    {
+        QSettings qs(file, QSettings::IniFormat);
+        qs.setValue(key, value);
+    }
+};
+
+TEST_F(SettingsManagerTest, GetValueNoDefaultReturnsInvalid)
+{
+    SettingsManager sm(settingsPath + "test.ini");
+    QVariant val = sm.getValue("nonexistent");
+    ASSERT_TRUE(val.isNull());
+}
+
+TEST_F(SettingsManagerTest, GetValueWithDefaultReturnsDefaultWhenMissing)
+{
+    SettingsManager sm(settingsPath + "test.ini");
+    QVariant val = sm.getValue("nonexistent", QString(), QString(), 42);
+    ASSERT_EQ(val.toInt(), 42);
+}
+
+TEST_F(SettingsManagerTest, GetValueWithDefaultReturnsStoredWhenPresent)
+{
+    writeValue(settingsPath + "test.ini", "mykey", 99);
+
+    SettingsManager sm(settingsPath + "test.ini");
+    QVariant val = sm.getValue("mykey", QString(), QString(), 42);
+    ASSERT_EQ(val.toInt(), 99);
+}
+
+TEST_F(SettingsManagerTest, GetValueWithGroup)
+{
+    writeValue(settingsPath + "grouped.ini", "group1/greeting", "world");
+
+    SettingsManager sm(settingsPath + "grouped.ini");
+    QVariant val = sm.getValue("greeting", "group1");
+    ASSERT_EQ(val.toString(), QString("world"));
+}
+
+TEST_F(SettingsManagerTest, GetValueWithGroupAndSubGroup)
+{
+    writeValue(settingsPath + "nested.ini", "outer/inner/depth", 1);
+
+    SettingsManager sm(settingsPath + "nested.ini");
+    QVariant val = sm.getValue("depth", "outer", "inner");
+    ASSERT_EQ(val.toInt(), 1);
+}
+
+TEST_F(SettingsManagerTest, DefaultGroupUsedInGetValue)
+{
+    writeValue(settingsPath + "defgroup.ini", "defaultGroup/key", "val");
+
+    SettingsManager sm(settingsPath + "defgroup.ini", "defaultGroup");
+    QVariant val = sm.getValue("key");
+    ASSERT_EQ(val.toString(), QString("val"));
+}
+
+TEST_F(SettingsManagerTest, DefaultGroupScopesGetValue)
+{
+    writeValue(settingsPath + "scoped.ini", "key", "ungrouped");
+    writeValue(settingsPath + "scoped.ini", "defaultGroup/key", "grouped");
+
+    SettingsManager sm(settingsPath + "scoped.ini", "defaultGroup");
+    QVariant val = sm.getValue("key");
+    ASSERT_EQ(val.toString(), QString("grouped"));
+}
+
+TEST_F(SettingsManagerTest, DefaultSubGroupUsedInGetValue)
+{
+    writeValue(settingsPath + "sub.ini", "top/bottom/key", "nested");
+
+    SettingsManager sm(settingsPath + "sub.ini", "top", "bottom");
+    QVariant val = sm.getValue("key");
+    ASSERT_EQ(val.toString(), QString("nested"));
+}
+
+TEST_F(SettingsManagerTest, BatchWriteWritesAllValues)
+{
+    SettingsManager sm(settingsPath + "batch.ini");
+    sm.batchWrite([&](QSettings &qs) {
+        qs.setValue("a", 1);
+        qs.setValue("b", 2);
+        qs.setValue("c", 3);
+    });
+
+    SettingsManager sm2(settingsPath + "batch.ini");
+    ASSERT_EQ(sm2.getValue("a", QString(), QString(), 0).toInt(), 1);
+    ASSERT_EQ(sm2.getValue("b", QString(), QString(), 0).toInt(), 2);
+    ASSERT_EQ(sm2.getValue("c", QString(), QString(), 0).toInt(), 3);
+}
+
+TEST_F(SettingsManagerTest, BatchWriteWithGroup)
+{
+    SettingsManager sm(settingsPath + "batch_group.ini");
+    sm.batchWrite([&](QSettings &qs) {
+        qs.beginGroup("section");
+        qs.setValue("x", 10);
+        qs.endGroup();
+    });
+
+    SettingsManager sm2(settingsPath + "batch_group.ini");
+    ASSERT_EQ(sm2.getValue("x", "section", QString(), 0).toInt(), 10);
+}
+
+TEST_F(SettingsManagerTest, SyncPersistsToDisk)
+{
+    QString filePath = settingsPath + "sync_test.ini";
+    {
+        SettingsManager sm(filePath);
+        sm.batchWrite([&](QSettings &qs) { qs.setValue("persist", "yes"); });
+    }
+    {
+        QSettings qs(filePath, QSettings::IniFormat);
+        ASSERT_EQ(qs.value("persist").toString(), QString("yes"));
+    }
+}
+
+TEST_F(SettingsManagerTest, MultipleReadsAfterWrite)
+{
+    SettingsManager sm(settingsPath + "multi.ini");
+    sm.batchWrite([&](QSettings &qs) { qs.setValue("k1", 1); });
+
+    QVariant v1 = sm.getValue("k1", QString(), QString(), 0);
+    QVariant v2 = sm.getValue("nonexistent", QString(), QString(), 99);
+
+    ASSERT_EQ(v1.toInt(), 1);
+    ASSERT_EQ(v2.toInt(), 99);
+}
+
+TEST_F(SettingsManagerTest, ValuesDeletedViaQSettingsAreReadAsDefault)
+{
+    writeValue(settingsPath + "del.ini", "deleteMe", "present");
+
+    SettingsManager sm(settingsPath + "del.ini");
+    ASSERT_EQ(sm.getValue("deleteMe", QString(), QString(), "default").toString(), QString("present"));
+
+    // Delete via QSettings directly (deleteValue is protected)
+    {
+        QSettings qs(settingsPath + "del.ini", QSettings::IniFormat);
+        qs.remove("deleteMe");
+    }
+
+    ASSERT_EQ(sm.getValue("deleteMe", QString(), QString(), "default").toString(), QString("default"));
+}
+
+} // namespace
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/settings/settings_migration_test.cpp b/tests/settings/settings_migration_test.cpp
new file mode 100644
index 000000000..440e49b74
--- /dev/null
+++ b/tests/settings/settings_migration_test.cpp
@@ -0,0 +1,932 @@
+#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
+{
+
+class SettingsMigrationTest : public ::testing::Test
+{
+protected:
+    QTemporaryDir tempDir;
+    QString settingsPath;
+
+    void SetUp() override
+    {
+        // Mirror the production layout: the settings folder lives inside the data folder, so
+        // migration backups (siblings of settings/) stay isolated inside tempDir instead of
+        // landing in the shared system temp directory.
+        settingsPath = tempDir.path() + "/settings/";
+        QDir().mkpath(settingsPath);
+
+        // Isolate the settings used by the legacy migration tests inside the temporary
+        // directory so the tests never read or write the real user config (registry on
+        // Windows, plist on macOS, .conf on Linux), which would otherwise be shared
+        // across CI jobs and flaky. Default-format QSettings is forced to IniFormat and
+        // its UserScope path is redirected here; setPath wins over the XDG_CONFIG_HOME
+        // default on Unix, so every platform resolves to <tempDir>/config/...
+        const QString configDir = tempDir.path() + "/config";
+        QDir().mkpath(configDir);
+        qputenv("XDG_CONFIG_HOME", configDir.toUtf8());
+        QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, configDir);
+    }
+
+    bool fileExists(const QString &name) const
+    {
+        return QFile::exists(settingsPath + name);
+    }
+
+    QVariant readFromIni(const QString &fileName, const QString &key) const
+    {
+        QSettings ini(settingsPath + fileName, QSettings::IniFormat);
+        return ini.value(key);
+    }
+
+    // Checks for the exact legacy key in the raw INI content. On Windows, INI keys are
+    // case-insensitive, so reading back a lower-case legacy key would match its migrated
+    // camelCase counterpart and hide regressions. Checking the file bytes directly keeps
+    // the comparison case-sensitive on every platform.
+    bool iniFileHasKeyCaseSensitive(const QString &fileName, const QString &key) const
+    {
+        QFile f(settingsPath + fileName);
+        if (!f.open(QIODevice::ReadOnly)) {
+            return false;
+        }
+        const QString valueName = key.section('/', -1);
+        const QStringList lines = QString::fromUtf8(f.readAll()).split('\n');
+        for (const auto &line : lines) {
+            if (line.startsWith(valueName + '=')) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    // The migration backups are timestamped, so tests address them by index rather than by name.
+    QStringList backupFolderNames() const
+    {
+        return QDir(tempDir.path())
+            .entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name)
+            .filter(QStringLiteral("settings-backup-"));
+    }
+
+    QVariant readFromBackup(const QString &folderName, const QString &fileName, const QString &key) const
+    {
+        QSettings ini(QDir::cleanPath(tempDir.path() + '/' + folderName + '/' + fileName), QSettings::IniFormat);
+        return ini.value(key);
+    }
+
+    bool backupFileExists(const QString &folderName, const QString &fileName) const
+    {
+        return QFile::exists(QDir::cleanPath(tempDir.path() + '/' + folderName + '/' + fileName));
+    }
+};
+
+TEST_F(SettingsMigrationTest, NoGlobalIniDoesNothing)
+{
+    bool result = SettingsMigration::migrateSettingsFromGlobalIni(settingsPath);
+    ASSERT_FALSE(result);
+}
+
+TEST_F(SettingsMigrationTest, EmptyGlobalIniGetsBackedUp)
+{
+    {
+        QFile f(settingsPath + "global.ini");
+        ASSERT_TRUE(f.open(QIODevice::WriteOnly));
+        f.close();
+    }
+    bool result = SettingsMigration::migrateSettingsFromGlobalIni(settingsPath);
+    ASSERT_TRUE(result);
+    ASSERT_TRUE(fileExists("global.ini.old"));
+    ASSERT_TRUE(fileExists("global.ini"));
+
+    // No per-file INIs should be created
+    ASSERT_FALSE(fileExists("tabs.ini"));
+    ASSERT_FALSE(fileExists("sound.ini"));
+
+    // Sentinel should be in the new global.ini
+    ASSERT_EQ(readFromIni("global.ini", "migration/perfile_complete"), QVariant(true));
+}
+
+TEST_F(SettingsMigrationTest, MigratesAllSettingsGroups)
+{
+    {
+        QSettings g(settingsPath + "global.ini", QSettings::IniFormat);
+
+        // tabs
+        g.setValue("tabs/visualDeckStorage", false);
+        g.setValue("tabs/server", true);
+        g.setValue("tabs/account", true);
+        g.setValue("tabs/deckStorage", true);
+        g.setValue("tabs/replays", false);
+        g.setValue("tabs/admin", false);
+        g.setValue("tabs/log", true);
+
+        // sound
+        g.setValue("sound/enabled", true);
+        g.setValue("sound/theme", "custom_theme");
+        g.setValue("sound/mastervolume", 75);
+
+        // game
+        g.beginGroup("game");
+        g.setValue("maxplayers", 4);
+        g.setValue("gamedescription", "test game");
+        g.setValue("remembergamesettings", false);
+        g.setValue("gametypes", "commander");
+        g.setValue("onlybuddies", true);
+        g.endGroup();
+
+        // localgameoptions
+        g.beginGroup("localgameoptions");
+        g.setValue("maxplayers", 2);
+        g.setValue("startinglifetotal", 40);
+        g.endGroup();
+
+        // chat
+        g.beginGroup("chat");
+        g.setValue("mention", false);
+        g.setValue("mentioncolor", "FF0000");
+        g.setValue("showmessagepopups", false);
+        g.setValue("mentioncompleter", false);
+        g.setValue("roomhistory", false);
+        g.setValue("highlightcolor", "00FF00");
+        g.endGroup();
+
+        // legacy highlight words (under [personal])
+        g.setValue("personal/highlightWords", "alpha beta");
+
+        // cache storage (under [personal] group)
+        g.setValue("personal/pixmapCacheSize", 1024);
+        g.setValue("personal/networkCacheSize", 2048);
+        g.setValue("personal/redirectCacheTtl", 5);
+        g.setValue("personal/cardPictureLoaderCacheMethod", 1);
+        g.setValue("personal/localCardImageStorageNamingScheme", 2);
+
+        // updates (under [personal] group)
+        g.setValue("personal/startupUpdateCheck", false);
+        g.setValue("personal/startupCardUpdateCheckPromptForUpdate", false);
+        g.setValue("personal/startupCardUpdateCheckAlwaysUpdate", true);
+        g.setValue("personal/cardUpdateCheckInterval", 14);
+        g.setValue("personal/lastCardUpdateCheck", QDate(2024, 1, 1));
+        g.setValue("personal/alwaysEnableNewSets", true);
+        g.setValue("personal/updatenotification", false);
+        g.setValue("personal/newversionnotification", false);
+
+        // personal
+        g.setValue("personal/lang", "de");
+
+        // downloads (previously under [personal])
+        g.setValue("personal/picturedownload", true);
+        g.setValue("personal/downloadspoilers", true);
+
+        // interface (previously under [personal])
+        g.setValue("personal/showStatusBar", true);
+
+        // theme
+        g.setValue("theme/name", "custom_theme");
+        g.setValue("game/maxfontsize", 14);
+
+        // appearance
+        g.setValue("appearance/styleUserList", false);
+        g.setValue("home/background/displayCardName", false);
+        g.setValue("menu/showshortcuts", false);
+        g.setValue("menu/showgameselectorfiltertoolbar", false);
+
+        // deck editor
+        g.setValue("editor/openDeckInNewTab", false);
+        g.setValue("interface/deckeditortagswidgetvisible", false);
+        g.setValue("interface/defaultDeckEditorType", 0);
+        g.setValue("interface/visualdeckeditorsamplehandsize", 5);
+
+        // personal home
+        g.setValue("home/background", "custom_bg");
+        g.setValue("home/background/shuffleTimer", 30);
+
+        // personal tipOfDay
+        g.setValue("tipOfDay/showTips", false);
+        g.setValue("tipOfDay/seenTips", QStringList{"1", "2", "3"});
+
+        // network
+        g.setValue("personal/keepalive", 10);
+        g.setValue("personal/timeout", 30);
+        g.setValue("personal/clientid", "test-client-id");
+        g.setValue("personal/clientversion", "test-client-version");
+        g.setValue("interface/knownmissingfeatures", "feature1,feature2");
+
+        // cards
+        g.setValue("cards/displaycardnames", false);
+        g.setValue("cards/roundcardcorners", false);
+        g.setValue("cards/overrideallcardartwithpersonalpreference", true);
+        g.setValue("cards/bumpsetswithcardsindecktotop", false);
+        g.setValue("cards/autorotatesidewayslayoutcards", false);
+        g.setValue("cards/tapanimation", true);
+        g.setValue("cards/scaleCards", false);
+        g.setValue("cards/verticalCardOverlapPercent", 42);
+        g.setValue("cards/cardinfoviewmode", 1);
+        g.setValue("cards/printingselectorcardsize", 90);
+        g.setValue("cards/printingselectorsortorder", 3);
+        g.setValue("cards/printingselectornavigationbuttonsvisible", false);
+        // card counters (migrate into card_counters.ini)
+        g.setValue("cards/counters/0/color", QColor(Qt::red));
+
+        // interface
+        g.setValue("interface/usetearoffmenus", true);
+        g.setValue("interface/cardViewInitialRowsMax", 8);
+        g.setValue("interface/cardViewExpandedRowsMax", 12);
+        g.setValue("interface/closeEmptyCardView", false);
+        g.setValue("interface/focusCardViewSearchBar", false);
+        g.setValue("interface/keepGameChatFocus", true);
+        g.setValue("interface/notificationsenabled", false);
+        g.setValue("interface/specnotificationsenabled", true);
+        g.setValue("interface/buddyconnectnotificationsenabled", false);
+        g.setValue("interface/doubleclicktoplay", false);
+        g.setValue("interface/clickPlaysAllSelected", false);
+        g.setValue("interface/playtostack", false);
+        g.setValue("interface/doNotDeleteArrowsInSubPhases", false);
+        g.setValue("interface/startinghandsize", 5);
+        g.setValue("interface/annotatetokens", true);
+        g.setValue("interface/showlassoselectioncount", false);
+        g.setValue("interface/showpersistentselectioncount", false);
+        g.setValue("interface/tallyType", 2);
+        g.setValue("interface/leftjustified", true);
+        g.setValue("interface/min_players_multicolumn", 6);
+        g.setValue("interface/deckeditorbannercardcomboboxvisible", false);
+        // hand/table/replay/zoneview
+        g.setValue("hand/horizontal", true);
+        g.setValue("table/invert_vertical", true);
+        g.setValue("replay/rewindBufferingMs", 6000);
+        g.setValue("replay/fastForwardSpeed", 5);
+        g.setValue("zoneview/groupby", 2);
+        g.setValue("zoneview/sortby", 1);
+        g.setValue("zoneview/pileview", false);
+
+        // paths
+        g.beginGroup("paths");
+        g.setValue("decks", "/custom/decks");
+        g.setValue("pics", "/custom/pics");
+        g.endGroup();
+
+        // visual deck storage (under [interface] group)
+        g.setValue("interface/visualdeckstoragecardsize", 150);
+        g.setValue("interface/visualdeckstoragesortingorder", 2);
+        g.setValue("interface/visualdeckstorageshowfolders", false);
+        g.setValue("interface/visualdeckstorageshowtagfilter", false);
+        g.setValue("interface/visualdeckstoragedefaulttagslist", QStringList{"Alpha", "Beta"});
+        g.setValue("interface/visualdeckstoragesearchfoldernames", false);
+        g.setValue("interface/visualdeckstorageshowcoloridentity", false);
+        g.setValue("interface/visualdeckstorageshowbannercardcombobox", false);
+        g.setValue("interface/visualdeckstorageshowtagsondeckpreviews", false);
+        g.setValue("interface/visualdeckstoragedrawunusedcoloridentities", false);
+        g.setValue("interface/visualdeckstorageunusedcoloridentitiesopacity", 35);
+        g.setValue("interface/visualdeckstoragetooltiptype", 1);
+        g.setValue("interface/visualdeckstoragepromptforconversion", false);
+        g.setValue("interface/visualdeckstoragealwaysconvert", true);
+        g.setValue("interface/visualdeckstorageingame", false);
+        g.setValue("interface/visualdeckstorageselectionanimation", false);
+        g.setValue("interface/visualdatabasedisplayfiltertomostrecentsetsenabled", true);
+        g.setValue("interface/visualdatabasedisplayfiltertomostrecentsetsamount", 25);
+
+        // card sizes (migrate into cards_display.ini)
+        g.setValue("interface/visualdatabasedisplaycardsize", 80);
+        g.setValue("interface/visualdeckeditorcardsize", 70);
+        g.setValue("interface/edhreccardsize", 60);
+        g.setValue("interface/archidektpreviewsize", 50);
+
+        g.sync();
+    }
+
+    bool result = SettingsMigration::migrateSettingsFromGlobalIni(settingsPath);
+    ASSERT_TRUE(result);
+
+    // Original global.ini should be backed up
+    ASSERT_TRUE(fileExists("global.ini.old"));
+
+    // Verify each per-file INI was created and has correct values
+    ASSERT_TRUE(fileExists("tabs.ini"));
+    ASSERT_EQ(readFromIni("tabs.ini", "tabs/visualDeckStorage"), QVariant(false));
+    ASSERT_EQ(readFromIni("tabs.ini", "tabs/server"), QVariant(true));
+    ASSERT_EQ(readFromIni("tabs.ini", "tabs/log"), QVariant(true));
+
+    ASSERT_TRUE(fileExists("sound.ini"));
+    ASSERT_EQ(readFromIni("sound.ini", "sound/enabled"), QVariant(true));
+    ASSERT_EQ(readFromIni("sound.ini", "sound/theme"), QVariant("custom_theme"));
+    ASSERT_EQ(readFromIni("sound.ini", "sound/masterVolume"), QVariant(75));
+
+    ASSERT_TRUE(fileExists("game.ini"));
+    ASSERT_EQ(readFromIni("game.ini", "game/maxPlayers"), QVariant(4));
+    ASSERT_EQ(readFromIni("game.ini", "game/gameDescription"), QVariant("test game"));
+    ASSERT_EQ(readFromIni("game.ini", "game/rememberGameSettings"), QVariant(false));
+    ASSERT_EQ(readFromIni("game.ini", "game/gameTypes"), QVariant("commander"));
+    ASSERT_EQ(readFromIni("game.ini", "game/onlyBuddies"), QVariant(true));
+    ASSERT_EQ(readFromIni("game.ini", "localgameoptions/maxPlayers"), QVariant(2));
+    ASSERT_EQ(readFromIni("game.ini", "localgameoptions/startingLifeTotal"), QVariant(40));
+
+    ASSERT_TRUE(fileExists("chat.ini"));
+    ASSERT_EQ(readFromIni("chat.ini", "chat/mention"), QVariant(false));
+    ASSERT_EQ(readFromIni("chat.ini", "chat/mentionColor"), QVariant("FF0000"));
+    ASSERT_EQ(readFromIni("chat.ini", "chat/showMessagePopups"), QVariant(false));
+    ASSERT_EQ(readFromIni("chat.ini", "chat/mentionCompleter"), QVariant(false));
+    ASSERT_EQ(readFromIni("chat.ini", "chat/roomHistory"), QVariant(false));
+    ASSERT_EQ(readFromIni("chat.ini", "chat/highlightColor"), QVariant("00FF00"));
+    ASSERT_EQ(readFromIni("chat.ini", "chat/highlightWords"), QVariant("alpha beta"));
+
+    ASSERT_TRUE(fileExists("cache_storage.ini"));
+    ASSERT_EQ(readFromIni("cache_storage.ini", "cache_storage/pixmapCacheSize"), QVariant(1024));
+    ASSERT_EQ(readFromIni("cache_storage.ini", "cache_storage/networkCacheSize"), QVariant(2048));
+    ASSERT_EQ(readFromIni("cache_storage.ini", "cache_storage/redirectCacheTtl"), QVariant(5));
+    ASSERT_EQ(readFromIni("cache_storage.ini", "cache_storage/cardPictureLoaderCacheMethod"), QVariant(1));
+    ASSERT_EQ(readFromIni("cache_storage.ini", "cache_storage/localCardImageStorageNamingScheme"), QVariant(2));
+
+    ASSERT_TRUE(fileExists("updates.ini"));
+    ASSERT_EQ(readFromIni("updates.ini", "updates/startupUpdateCheck"), QVariant(false));
+    ASSERT_EQ(readFromIni("updates.ini", "updates/startupCardUpdateCheckPromptForUpdate"), QVariant(false));
+    ASSERT_EQ(readFromIni("updates.ini", "updates/startupCardUpdateCheckAlwaysUpdate"), QVariant(true));
+    ASSERT_EQ(readFromIni("updates.ini", "updates/cardUpdateCheckInterval"), QVariant(14));
+    ASSERT_EQ(readFromIni("updates.ini", "updates/lastCardUpdateCheck"), QVariant(QDate(2024, 1, 1)));
+    ASSERT_EQ(readFromIni("updates.ini", "updates/alwaysEnableNewSets"), QVariant(true));
+    ASSERT_EQ(readFromIni("updates.ini", "updates/updateNotification"), QVariant(false));
+    ASSERT_EQ(readFromIni("updates.ini", "updates/newVersionNotification"), QVariant(false));
+
+    ASSERT_TRUE(fileExists("personal.ini"));
+    ASSERT_EQ(readFromIni("personal.ini", "personal/lang"), QVariant("de"));
+    ASSERT_EQ(readFromIni("personal.ini", "tipOfDay/showTips"), QVariant(false));
+    ASSERT_EQ(readFromIni("personal.ini", "tipOfDay/seenTips"), QVariant(QStringList{"1", "2", "3"}));
+
+    ASSERT_TRUE(fileExists("downloads.ini"));
+    ASSERT_EQ(readFromIni("downloads.ini", "downloads/pictureDownload"), QVariant(true));
+    ASSERT_EQ(readFromIni("downloads.ini", "downloads/downloadSpoilers"), QVariant(true));
+
+    ASSERT_TRUE(fileExists("appearance.ini"));
+    ASSERT_EQ(readFromIni("appearance.ini", "appearance/themeName"), QVariant("custom_theme"));
+    ASSERT_EQ(readFromIni("appearance.ini", "appearance/maxFontSize"), QVariant(14));
+    ASSERT_EQ(readFromIni("appearance.ini", "appearance/styleUserList"), QVariant(false));
+    ASSERT_EQ(readFromIni("appearance.ini", "appearance/homeTabBackgroundSource"), QVariant("custom_bg"));
+    ASSERT_EQ(readFromIni("appearance.ini", "appearance/homeTabBackgroundShuffleFrequency"), QVariant(30));
+    ASSERT_EQ(readFromIni("appearance.ini", "appearance/homeTabDisplayCardName"), QVariant(false));
+
+    ASSERT_TRUE(fileExists("network.ini"));
+    ASSERT_EQ(readFromIni("network.ini", "network/keepAlive"), QVariant(10));
+    ASSERT_EQ(readFromIni("network.ini", "network/timeout"), QVariant(30));
+    ASSERT_EQ(readFromIni("network.ini", "network/clientId"), QVariant("test-client-id"));
+    ASSERT_EQ(readFromIni("network.ini", "network/clientVersion"), QVariant("test-client-version"));
+    ASSERT_EQ(readFromIni("network.ini", "network/knownMissingFeatures"), QVariant("feature1,feature2"));
+
+    ASSERT_TRUE(fileExists("cards_display.ini"));
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/displayCardNames"), QVariant(false));
+    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/autoRotateSidewaysLayoutCards"), QVariant(false));
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/tapAnimation"), QVariant(true));
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/scaleCards"), QVariant(false));
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/verticalCardOverlapPercent"), QVariant(42));
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/cardInfoViewMode"), QVariant(1));
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/cardSize/printingSelector"), QVariant(90));
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/printingSelector/sortOrder"), QVariant(3));
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/printingSelector/navigationButtonsVisible"), QVariant(false));
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/cardSize/visualDeckStorage"), QVariant(150));
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/cardSize/visualDatabaseDisplay"), QVariant(80));
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/cardSize/visualDeckEditor"), QVariant(70));
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/cardSize/edhrec"), QVariant(60));
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/cardSize/archidektPreview"), QVariant(50));
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/cardSize/sampleHandSize"), QVariant(5));
+
+    ASSERT_TRUE(fileExists("card_counters.ini"));
+    ASSERT_EQ(readFromIni("card_counters.ini", "cards/counters/0/color").toString(), QColor(Qt::red).name());
+    ASSERT_FALSE(readFromIni("global.ini", "cards/counters/0/color").isValid());
+
+    ASSERT_TRUE(fileExists("interface.ini"));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/useTearOffMenus"), QVariant(true));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/cardViewInitialRowsMax"), QVariant(8));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/cardViewExpandedRowsMax"), QVariant(12));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/closeEmptyCardView"), QVariant(false));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/focusCardViewSearchBar"), QVariant(false));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/keepGameChatFocus"), QVariant(true));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/notifications/enabled"), QVariant(false));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/notifications/spectatorsEnabled"), QVariant(true));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/notifications/buddyConnectEnabled"), QVariant(false));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/doubleClickToPlay"), QVariant(false));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/clickPlaysAllSelected"), QVariant(false));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/playToStack"), QVariant(false));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/doNotDeleteArrowsInSubPhases"), QVariant(false));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/startingHandSize"), QVariant(5));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/annotateTokens"), QVariant(true));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/showLassoSelectionCount"), QVariant(false));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/showPersistentSelectionCount"), QVariant(false));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/tallyType"), QVariant(2));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/leftJustified"), QVariant(true));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/minPlayersMulticolumn"), QVariant(6));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/showStatusBar"), QVariant(true));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/showShortcuts"), QVariant(false));
+    ASSERT_EQ(readFromIni("interface.ini", "interface/showGameSelectorFilterToolbar"), QVariant(false));
+    ASSERT_EQ(readFromIni("interface.ini", "hand/horizontal"), QVariant(true));
+    ASSERT_EQ(readFromIni("interface.ini", "table/invertVertical"), QVariant(true));
+    ASSERT_EQ(readFromIni("interface.ini", "replay/rewindBufferingMs"), QVariant(6000));
+    ASSERT_EQ(readFromIni("interface.ini", "replay/fastForwardSpeed"), QVariant(5));
+    ASSERT_EQ(readFromIni("interface.ini", "zoneview/groupBy"), QVariant(2));
+    ASSERT_EQ(readFromIni("interface.ini", "zoneview/sortBy"), QVariant(1));
+    ASSERT_EQ(readFromIni("interface.ini", "zoneview/pileView"), QVariant(false));
+
+    ASSERT_TRUE(fileExists("deck_editor.ini"));
+    ASSERT_EQ(readFromIni("deck_editor.ini", "deckeditor/openDeckInNewTab"), QVariant(false));
+    ASSERT_EQ(readFromIni("deck_editor.ini", "deckeditor/bannerCardComboBoxVisible"), QVariant(false));
+    ASSERT_EQ(readFromIni("deck_editor.ini", "deckeditor/tagsWidgetVisible"), QVariant(false));
+    ASSERT_EQ(readFromIni("deck_editor.ini", "deckeditor/defaultDeckEditorType"), QVariant(0));
+
+    ASSERT_TRUE(fileExists("paths.ini"));
+    ASSERT_EQ(readFromIni("paths.ini", "paths/decks"), QVariant("/custom/decks"));
+    ASSERT_EQ(readFromIni("paths.ini", "paths/pics"), QVariant("/custom/pics"));
+
+    ASSERT_TRUE(fileExists("visual_deck_storage.ini"));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDeckStorage/sortingOrder"), QVariant(2));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDeckStorage/showFolders"), QVariant(false));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDeckStorage/showTagFilter"), QVariant(false));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDeckStorage/defaultTagsList"),
+              QVariant(QStringList{"Alpha", "Beta"}));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDeckStorage/searchFolderNames"), QVariant(false));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDeckStorage/showColorIdentity"), QVariant(false));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDeckStorage/showBannerCardComboBox"),
+              QVariant(false));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDeckStorage/showTagsOnDeckPreviews"),
+              QVariant(false));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDeckStorage/drawUnusedColorIdentities"),
+              QVariant(false));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDeckStorage/unusedColorIdentitiesOpacity"),
+              QVariant(35));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDeckStorage/tooltipType"), QVariant(1));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDeckStorage/promptForConversion"),
+              QVariant(false));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDeckStorage/alwaysConvert"), QVariant(true));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDeckStorage/inGame"), QVariant(false));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDeckStorage/selectionAnimation"),
+              QVariant(false));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDatabaseDisplay/filterToMostRecentSetsEnabled"),
+              QVariant(true));
+    ASSERT_EQ(readFromIni("visual_deck_storage.ini", "interface/visualDatabaseDisplay/filterToMostRecentSetsAmount"),
+              QVariant(25));
+
+    // No legacy flat keys should remain in the per-file INIs
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("visual_deck_storage.ini", "interface/visualdeckstorageshowfolders"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("visual_deck_storage.ini", "interface/visualdeckstoragecardsize"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("deck_editor.ini", "deckeditor/sampleHandSize"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("deck_editor.ini", "deckeditor/cardSize"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("interface.ini", "interface/notificationsenabled"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("cards_display.ini", "cards/printingselectorsortorder"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("cards_display.ini", "cards/visualDeckStorage/cardSize"));
+
+    // No legacy non-camelCase keys should remain in the per-file INIs
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("game.ini", "game/gamedescription"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("game.ini", "localgameoptions/maxplayers"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("chat.ini", "chat/roomhistory"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("chat.ini", "chat/highlightwords"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("sound.ini", "sound/mastervolume"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("downloads.ini", "downloads/picturedownload"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("network.ini", "network/keepalive"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("network.ini", "network/knownmissingfeatures"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("updates.ini", "updates/updatenotification"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("cards_display.ini", "cards/displaycardnames"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("cards_display.ini", "cards/cardinfoviewmode"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("interface.ini", "interface/usetearoffmenus"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("interface.ini", "interface/doubleclicktoplay"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("interface.ini", "interface/min_players_multicolumn"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("interface.ini", "table/invert_vertical"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("interface.ini", "zoneview/groupby"));
+    ASSERT_FALSE(iniFileHasKeyCaseSensitive("interface.ini", "zoneview/pileview"));
+
+    // Verify sentinel was written
+    ASSERT_EQ(readFromIni("global.ini", "migration/perfile_complete"), QVariant(true));
+}
+
+TEST_F(SettingsMigrationTest, SecondCallDoesNothing)
+{
+    {
+        QSettings g(settingsPath + "global.ini", QSettings::IniFormat);
+        g.setValue("tabs/visualDeckStorage", true);
+        g.setValue("sound/enabled", true);
+        g.sync();
+    }
+
+    ASSERT_TRUE(SettingsMigration::migrateSettingsFromGlobalIni(settingsPath));
+    ASSERT_FALSE(SettingsMigration::migrateSettingsFromGlobalIni(settingsPath));
+}
+
+TEST_F(SettingsMigrationTest, SecondCallDoesNotOverwriteUserChanges)
+{
+    {
+        QSettings g(settingsPath + "global.ini", QSettings::IniFormat);
+        g.setValue("tabs/visualDeckStorage", true);
+        g.setValue("sound/enabled", true);
+        g.sync();
+    }
+
+    ASSERT_TRUE(SettingsMigration::migrateSettingsFromGlobalIni(settingsPath));
+
+    // User changes the value after migration
+    {
+        QSettings tabsIni(settingsPath + "tabs.ini", QSettings::IniFormat);
+        tabsIni.setValue("tabs/visualDeckStorage", false);
+        tabsIni.sync();
+    }
+
+    // Second migration should NOT overwrite the user's change
+    ASSERT_FALSE(SettingsMigration::migrateSettingsFromGlobalIni(settingsPath));
+
+    ASSERT_EQ(readFromIni("tabs.ini", "tabs/visualDeckStorage"), QVariant(false));
+}
+
+TEST_F(SettingsMigrationTest, PartialMigrationOnlyMigratesPresentKeys)
+{
+    {
+        QSettings g(settingsPath + "global.ini", QSettings::IniFormat);
+        g.setValue("tabs/visualDeckStorage", true);
+        g.setValue("tabs/server", false);
+        g.sync();
+    }
+
+    ASSERT_TRUE(SettingsMigration::migrateSettingsFromGlobalIni(settingsPath));
+
+    ASSERT_TRUE(fileExists("global.ini.old"));
+    ASSERT_TRUE(fileExists("tabs.ini"));
+    ASSERT_EQ(readFromIni("tabs.ini", "tabs/visualDeckStorage"), QVariant(true));
+    ASSERT_EQ(readFromIni("tabs.ini", "tabs/server"), QVariant(false));
+
+    // Other files should NOT exist since no keys were present for them
+    ASSERT_FALSE(fileExists("sound.ini"));
+    ASSERT_FALSE(fileExists("game.ini"));
+    ASSERT_FALSE(fileExists("chat.ini"));
+}
+
+TEST_F(SettingsMigrationTest, ThemeNameDefaultIsRewrittenToSystem)
+{
+    {
+        QSettings g(settingsPath + "global.ini", QSettings::IniFormat);
+        g.setValue("theme/name", "Default");
+        g.sync();
+    }
+
+    ASSERT_TRUE(SettingsMigration::migrateSettingsFromGlobalIni(settingsPath));
+
+    ASSERT_TRUE(fileExists("appearance.ini"));
+    ASSERT_EQ(readFromIni("appearance.ini", "appearance/themeName"), QVariant("System"));
+}
+
+TEST_F(SettingsMigrationTest, OtherThemeNamesAreLeftAlone)
+{
+    {
+        QSettings g(settingsPath + "global.ini", QSettings::IniFormat);
+        g.setValue("theme/name", "VelvetMarble");
+        g.sync();
+    }
+
+    ASSERT_TRUE(SettingsMigration::migrateSettingsFromGlobalIni(settingsPath));
+
+    ASSERT_TRUE(fileExists("appearance.ini"));
+    ASSERT_EQ(readFromIni("appearance.ini", "appearance/themeName"), QVariant("VelvetMarble"));
+}
+
+TEST_F(SettingsMigrationTest, KeyMapTranslationIsCorrect)
+{
+    {
+        QSettings g(settingsPath + "global.ini", QSettings::IniFormat);
+        g.setValue("personal/cardUpdateCheckInterval", 30);
+        g.setValue("personal/updatereleasechannel", 1);
+        g.sync();
+    }
+
+    ASSERT_TRUE(SettingsMigration::migrateSettingsFromGlobalIni(settingsPath));
+
+    ASSERT_TRUE(fileExists("global.ini.old"));
+    ASSERT_TRUE(fileExists("updates.ini"));
+    // The key should be translated from "personal/cardUpdateCheckInterval" to "updates/cardUpdateCheckInterval"
+    ASSERT_EQ(readFromIni("updates.ini", "updates/cardUpdateCheckInterval"), QVariant(30));
+    ASSERT_EQ(readFromIni("updates.ini", "updates/updateReleaseChannel"), QVariant(1));
+}
+
+TEST_F(SettingsMigrationTest, CardsKeysKeepGroupPrefix)
+{
+    {
+        QSettings g(settingsPath + "global.ini", QSettings::IniFormat);
+        g.setValue("cards/displaycardnames", false);
+        g.setValue("interface/deckeditorbannercardcomboboxvisible", true);
+        g.sync();
+    }
+
+    ASSERT_TRUE(SettingsMigration::migrateSettingsFromGlobalIni(settingsPath));
+
+    ASSERT_TRUE(fileExists("global.ini.old"));
+    ASSERT_TRUE(fileExists("cards_display.ini"));
+    ASSERT_TRUE(fileExists("deck_editor.ini"));
+    // "cards/displaycardnames" should be stored with its group prefix
+    ASSERT_EQ(readFromIni("cards_display.ini", "cards/displayCardNames"), QVariant(false));
+    // deck editor keys belong to the deck editor settings now
+    ASSERT_EQ(readFromIni("deck_editor.ini", "deckeditor/bannerCardComboBoxVisible"), QVariant(true));
+}
+
+TEST_F(SettingsMigrationTest, LegacyMigrationIsIdempotent)
+{
+    {
+        QSettings nativeSettings;
+        nativeSettings.setValue("server/previoushostlogin", "test_user");
+        nativeSettings.setValue("server/auto_connect", true);
+        nativeSettings.sync();
+    }
+
+    ASSERT_TRUE(SettingsMigration::migrateLegacySettings(settingsPath));
+
+    // Change the migrated value
+    {
+        QSettings serversIni(settingsPath + "servers.ini", QSettings::IniFormat);
+        serversIni.setValue("server/previousHostLogin", "modified_user");
+        serversIni.sync();
+    }
+
+    // Second migration should NOT overwrite the change
+    ASSERT_FALSE(SettingsMigration::migrateLegacySettings(settingsPath));
+    ASSERT_EQ(readFromIni("servers.ini", "server/previousHostLogin"), QVariant("modified_user"));
+}
+
+TEST_F(SettingsMigrationTest, LegacyMigrationCamelCasesKeys)
+{
+    {
+        QSettings nativeSettings;
+        nativeSettings.setValue("sets/AAA/sortkey", 2);
+        nativeSettings.setValue("sets/AAA/enabled", false);
+        nativeSettings.setValue("sets/AAA/isknown", false);
+        nativeSettings.setValue("server/previoushostlogin", "legacy_user");
+        nativeSettings.setValue("server/auto_connect", 1);
+        nativeSettings.setValue("server/fpport", "5080");
+        nativeSettings.setValue("messages/count", 1);
+        nativeSettings.setValue("messages/msg0", "hello");
+        nativeSettings.setValue("filter_games/hide_full_games", true);
+        nativeSettings.setValue("filter_games/min_players", 3);
+        nativeSettings.setValue("filter_games/max_players", 5);
+        nativeSettings.setValue("filter_games/game_type/deadbeef", true);
+        nativeSettings.sync();
+    }
+
+    ASSERT_TRUE(SettingsMigration::migrateLegacySettings(settingsPath));
+
+    ASSERT_TRUE(fileExists("cardDatabase.ini"));
+    ASSERT_EQ(readFromIni("cardDatabase.ini", "sets/AAA/sortKey"), QVariant(2));
+    ASSERT_EQ(readFromIni("cardDatabase.ini", "sets/AAA/enabled"), QVariant(false));
+    ASSERT_EQ(readFromIni("cardDatabase.ini", "sets/AAA/isKnown"), QVariant(false));
+
+    ASSERT_TRUE(fileExists("servers.ini"));
+    ASSERT_EQ(readFromIni("servers.ini", "server/previousHostLogin"), QVariant("legacy_user"));
+    ASSERT_EQ(readFromIni("servers.ini", "server/autoConnect"), QVariant(1));
+    ASSERT_EQ(readFromIni("servers.ini", "server/fpPort"), QVariant("5080"));
+
+    ASSERT_TRUE(fileExists("messages.ini"));
+    ASSERT_EQ(readFromIni("messages.ini", "messages/count"), QVariant(1));
+    ASSERT_EQ(readFromIni("messages.ini", "messages/msg0"), QVariant("hello"));
+
+    ASSERT_TRUE(fileExists("gamefilters.ini"));
+    ASSERT_EQ(readFromIni("gamefilters.ini", "filter_games/hideFullGames"), QVariant(true));
+    ASSERT_EQ(readFromIni("gamefilters.ini", "filter_games/minPlayers"), QVariant(3));
+    ASSERT_EQ(readFromIni("gamefilters.ini", "filter_games/maxPlayers"), QVariant(5));
+    ASSERT_EQ(readFromIni("gamefilters.ini", "filter_games/gameType/deadbeef"), QVariant(true));
+}
+
+TEST_F(SettingsMigrationTest, LegacyMigrationEmptyNativeFormatWritesSentinel)
+{
+    QSettings().clear();
+    QSettings().sync();
+
+    ASSERT_TRUE(SettingsMigration::migrateLegacySettings(settingsPath));
+    ASSERT_TRUE(fileExists("personal.ini"));
+    ASSERT_EQ(readFromIni("personal.ini", "migration/legacy_complete"), QVariant(true));
+    ASSERT_FALSE(fileExists("messages.ini"));
+    ASSERT_FALSE(fileExists("gamefilters.ini"));
+    ASSERT_FALSE(fileExists("cardDatabase.ini"));
+
+    // Second call should be a no-op
+    ASSERT_FALSE(SettingsMigration::migrateLegacySettings(settingsPath));
+}
+
+// --- migrateSettingsFromGlobalIni rename-failure test ---
+
+TEST_F(SettingsMigrationTest, RenameFailureWithExistingBackup)
+{
+    {
+        QSettings g(settingsPath + "global.ini", QSettings::IniFormat);
+        g.setValue("tabs/visualDeckStorage", true);
+        g.setValue("sound/enabled", true);
+        g.sync();
+    }
+
+    // Create a stale backup
+    {
+        QFile oldBackup(settingsPath + "global.ini.old");
+        ASSERT_TRUE(oldBackup.open(QIODevice::WriteOnly));
+        oldBackup.close();
+    }
+
+    // Migration should still succeed
+    ASSERT_TRUE(SettingsMigration::migrateSettingsFromGlobalIni(settingsPath));
+
+    // Per-file INIs should be created
+    ASSERT_TRUE(fileExists("tabs.ini"));
+    ASSERT_TRUE(fileExists("sound.ini"));
+
+    // Sentinel should be set in the new global.ini
+    ASSERT_EQ(readFromIni("global.ini", "migration/perfile_complete"), QVariant(true));
+
+    // Original data should be backed up (stale backup was replaced)
+    ASSERT_TRUE(fileExists("global.ini.old"));
+    ASSERT_EQ(readFromIni("global.ini.old", "tabs/visualDeckStorage"), QVariant(true));
+
+    // Second call should be a no-op
+    ASSERT_FALSE(SettingsMigration::migrateSettingsFromGlobalIni(settingsPath));
+}
+
+// --- pre-migration backup of the settings folder ---
+
+TEST_F(SettingsMigrationTest, BackupHoldsPreMigrationStateOfPerDomainFiles)
+{
+    // A user already migrated once, changed a setting, then ran an older build that wrote to
+    // global.ini again. Re-migrating clobbers the per-domain file, so the backup has to hold the
+    // pre-migration value.
+    {
+        QSettings tabs(settingsPath + "tabs.ini", QSettings::IniFormat);
+        tabs.setValue("tabs/visualDeckStorage", false);
+        tabs.sync();
+    }
+    {
+        QSettings g(settingsPath + "global.ini", QSettings::IniFormat);
+        g.setValue("tabs/visualDeckStorage", true);
+        g.sync();
+    }
+
+    const QString backupPath = SettingsMigration::backupSettingsDirectory(settingsPath);
+    ASSERT_FALSE(backupPath.isEmpty());
+    ASSERT_TRUE(SettingsMigration::migrateSettingsFromGlobalIni(settingsPath));
+
+    // The migration overwrote the user's change ...
+    ASSERT_EQ(readFromIni("tabs.ini", "tabs/visualDeckStorage"), QVariant(true));
+
+    // ... but the backup still holds it, so it can be restored by hand.
+    const QStringList backups = backupFolderNames();
+    ASSERT_EQ(backups.size(), 1);
+    ASSERT_EQ(readFromBackup(backups.at(0), "tabs.ini", "tabs/visualDeckStorage"), QVariant(false));
+    ASSERT_EQ(readFromBackup(backups.at(0), "global.ini", "tabs/visualDeckStorage"), QVariant(true));
+}
+
+TEST_F(SettingsMigrationTest, BackupIsASiblingOfTheSettingsFolder)
+{
+    {
+        QSettings g(settingsPath + "global.ini", QSettings::IniFormat);
+        g.setValue("sound/enabled", true);
+        g.sync();
+    }
+
+    const QString backupPath = SettingsMigration::backupSettingsDirectory(settingsPath);
+    ASSERT_FALSE(backupPath.isEmpty());
+
+    const QDir backupDir(backupPath);
+    ASSERT_TRUE(backupDir.dirName().startsWith("settings-backup-"));
+    // Same parent as the settings folder, and not inside it, so a backup is never copied into
+    // another backup and "Open settings folder" shows only live files.
+    ASSERT_EQ(QDir::cleanPath(backupDir.absolutePath() + "/.."), QDir::cleanPath(tempDir.path()));
+    ASSERT_FALSE(backupDir.absolutePath().startsWith(QDir::cleanPath(settingsPath) + '/'));
+    ASSERT_TRUE(backupFileExists(backupDir.dirName(), "global.ini"));
+}
+
+TEST_F(SettingsMigrationTest, BackupCopiesNestedFolders)
+{
+    ASSERT_TRUE(QDir().mkpath(settingsPath + "nested"));
+    {
+        QFile f(settingsPath + "nested/deep.ini");
+        ASSERT_TRUE(f.open(QIODevice::WriteOnly));
+        f.write("[visualDeckStorage]\nfirstDeck=1234\n");
+    }
+    {
+        QSettings g(settingsPath + "global.ini", QSettings::IniFormat);
+        g.setValue("sound/enabled", true);
+        g.sync();
+    }
+
+    const QString backupPath = SettingsMigration::backupSettingsDirectory(settingsPath);
+    ASSERT_FALSE(backupPath.isEmpty());
+
+    const QStringList backups = backupFolderNames();
+    ASSERT_EQ(backups.size(), 1);
+    ASSERT_TRUE(backupFileExists(backups.at(0), "nested/deep.ini"));
+    ASSERT_EQ(readFromBackup(backups.at(0), "nested/deep.ini", "visualDeckStorage/firstDeck"), QVariant("1234"));
+}
+
+TEST_F(SettingsMigrationTest, NoBackupWhenSettingsFolderIsEmpty)
+{
+    ASSERT_TRUE(SettingsMigration::backupSettingsDirectory(settingsPath).isEmpty());
+    ASSERT_TRUE(backupFolderNames().isEmpty());
+}
+
+TEST_F(SettingsMigrationTest, NoBackupWhenEverySettingsFileIsEmpty)
+{
+    // A fresh profile: QSettings has created global.ini, but it holds nothing worth preserving.
+    {
+        QFile f(settingsPath + "global.ini");
+        ASSERT_TRUE(f.open(QIODevice::WriteOnly));
+        f.close();
+    }
+
+    ASSERT_TRUE(SettingsMigration::backupSettingsDirectory(settingsPath).isEmpty());
+    ASSERT_TRUE(backupFolderNames().isEmpty());
+}
+
+TEST_F(SettingsMigrationTest, BackupFailsGracefullyOnMissingSettingsFolder)
+{
+    ASSERT_TRUE(SettingsMigration::backupSettingsDirectory(tempDir.path() + "/does-not-exist/").isEmpty());
+}
+
+TEST_F(SettingsMigrationTest, BackupKeepsEveryPreviousSnapshot)
+{
+    {
+        QSettings g(settingsPath + "global.ini", QSettings::IniFormat);
+        g.setValue("sound/enabled", true);
+        g.sync();
+    }
+
+    ASSERT_FALSE(SettingsMigration::backupSettingsDirectory(settingsPath).isEmpty());
+    ASSERT_FALSE(SettingsMigration::backupSettingsDirectory(settingsPath).isEmpty());
+
+    // A second snapshot in the same second must not merge into the first one.
+    const QStringList backups = backupFolderNames();
+    ASSERT_EQ(backups.size(), 2);
+    ASSERT_NE(backups.at(0), backups.at(1));
+}
+
+TEST_F(SettingsMigrationTest, IsMigrationPendingWhenGlobalIniHasKeys)
+{
+    {
+        QSettings g(settingsPath + "global.ini", QSettings::IniFormat);
+        g.setValue("sound/enabled", true);
+        g.sync();
+    }
+
+    ASSERT_TRUE(SettingsMigration::isMigrationPending(settingsPath));
+}
+
+TEST_F(SettingsMigrationTest, IsNotMigrationPendingAfterSentinelIsSet)
+{
+    {
+        QSettings g(settingsPath + "global.ini", QSettings::IniFormat);
+        g.setValue("sound/enabled", true);
+        g.sync();
+    }
+    ASSERT_TRUE(SettingsMigration::migrateSettingsFromGlobalIni(settingsPath));
+
+    // The sentinel-only global.ini and the legacy sentinel leave nothing to migrate.
+    {
+        QSettings personal(settingsPath + "personal.ini", QSettings::IniFormat);
+        personal.setValue("migration/legacy_complete", true);
+        personal.sync();
+    }
+    ASSERT_FALSE(SettingsMigration::isMigrationPending(settingsPath));
+}
+
+TEST_F(SettingsMigrationTest, IsMigrationPendingWhenOnlyLegacySettingsRemain)
+{
+    QSettings().setValue("server/host", "example.com");
+    QSettings().sync();
+
+    ASSERT_TRUE(SettingsMigration::isMigrationPending(settingsPath));
+}
+
+TEST_F(SettingsMigrationTest, IsNotMigrationPendingWithoutLegacyData)
+{
+    // Nothing to migrate: a fresh profile must not leave a backup folder behind on every start.
+    QSettings().clear();
+    QSettings().sync();
+
+    ASSERT_FALSE(SettingsMigration::isMigrationPending(settingsPath));
+}
+
+} // namespace
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    QCoreApplication app(argc, argv);
+    app.setOrganizationName("CockatriceTest");
+    app.setApplicationName("SettingsMigrationTest");
+    QSettings::setDefaultFormat(QSettings::IniFormat);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/single_instance_manager_test.cpp b/tests/single_instance_manager_test.cpp
new file mode 100644
index 000000000..bc8074580
--- /dev/null
+++ b/tests/single_instance_manager_test.cpp
@@ -0,0 +1,140 @@
+#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
+{
+constexpr int HANDSHAKE_TIMEOUT_MS = 5000;
+constexpr int MODAL_DIALOG_MS = 50;
+
+const QStringList PAYLOAD{QStringLiteral("cockatrice://joingame?hostname=127.0.0.1&port=4747&roomid=0&gameid=1")};
+
+/// Serializes a payload the way SingleInstanceManager::forwardToPrimary() does.
+QByteArray encodePayload(const QStringList &files)
+{
+    QByteArray payload;
+    QDataStream out(&payload, QIODevice::WriteOnly);
+    out << files;
+
+    QByteArray message;
+    QDataStream msgStream(&message, QIODevice::WriteOnly);
+    msgStream << static_cast<quint32>(payload.size());
+    message.append(payload);
+    return message;
+}
+} // namespace
+
+// Regression test for the use-after-free in SingleInstanceManager::handleNewConnection().
+//
+// The forwarded payload is handed to the handlers from inside the forwarding
+// socket's readyRead emission, which is what lets the "Join game?" confirmation
+// appear at all. A handler can spin a nested event loop (a modal QMessageBox),
+// and the sending instance exits as soon as it has the acknowledgment, so the
+// peer closes *while that loop runs*. deleteLater() called from inside such a
+// nested loop does not wait for the outer loop: Qt frees the object as soon as
+// the nested loop unwinds, still inside the readyRead emission, so Qt's own
+// signal dispatch and the handler lambda both end up holding a freed socket.
+// Nothing may therefore delete the socket from the disconnected signal, and the
+// teardown is queued until that frame has unwound.
+TEST(SingleInstanceManagerTest, HandlersRunSynchronouslyAndSocketIsNotTouchedAfterTheyReturn)
+{
+    // Scope the hand-off socket to this test process so a Cockatrice the
+    // developer happens to be running cannot claim it.
+    qputenv("USER", QByteArrayLiteral("cockatrice-test-") + QByteArray::number(QCoreApplication::applicationPid()));
+
+    SingleInstanceManager primary;
+    ASSERT_TRUE(primary.tryRun(QStringList())) << "could not become the primary instance";
+
+    auto *server = primary.findChild<QLocalServer *>();
+    ASSERT_NE(nullptr, server) << "the primary instance is not listening";
+
+    QLocalSocket sender;
+    QStringList handled;
+    QByteArray acknowledgment;
+    int handlerCalls = 0;
+    bool socketConnectedWhenHandled = false;
+    bool socketReleased = false;
+
+    // Waited on after the handlers return: the deferred teardown deletes the
+    // forwarding socket once the readyRead frame has unwound.
+    QEventLoop teardownLoop;
+
+    QEventLoop loop;
+    QObject::connect(&primary, &SingleInstanceManager::filesReceived, &primary, [&](const QStringList &files) {
+        ++handlerCalls;
+
+        // The payload must reach the handlers while the forwarding socket is
+        // still connected: deferring the emit would suppress the modal "Join
+        // game?" confirmation this hand-off exists to show.
+        auto *connection = server->findChild<QLocalSocket *>();
+        socketConnectedWhenHandled = connection != nullptr && connection->state() == QLocalSocket::ConnectedState;
+
+        // Observe the socket's destruction rather than polling for it. `destroyed`
+        // is emitted just before the object goes away, so this stays correct
+        // however the teardown ends up deleting it, and `&primary` keeps the
+        // observer alive even once the socket itself is gone.
+        if (connection != nullptr) {
+            QObject::connect(connection, &QObject::destroyed, &primary, [&] {
+                socketReleased = true;
+                teardownLoop.quit();
+            });
+        }
+
+        // The primary acknowledges the payload before handling it, so that a
+        // sender waiting on the acknowledgment never mistakes a busy primary
+        // for a dead one.
+        sender.waitForReadyRead(HANDSHAKE_TIMEOUT_MS);
+        acknowledgment = sender.readAll();
+
+        // Stand in for the modal "Join game?" confirmation: the sending instance
+        // goes away while this nested loop is running, which is what used to
+        // destroy the socket underneath this readyRead frame.
+        sender.abort();
+
+        QEventLoop modalDialog;
+        QTimer::singleShot(MODAL_DIALOG_MS, &modalDialog, &QEventLoop::quit);
+        modalDialog.exec();
+
+        handled = files;
+        loop.quit();
+    });
+
+    sender.connectToServer(server->serverName());
+    ASSERT_TRUE(sender.waitForConnected(HANDSHAKE_TIMEOUT_MS));
+    sender.write(encodePayload(PAYLOAD));
+    sender.flush();
+
+    QTimer::singleShot(HANDSHAKE_TIMEOUT_MS, &loop, &QEventLoop::quit);
+    loop.exec();
+
+    EXPECT_EQ(1, handlerCalls) << "the payload must be handed to the handlers exactly once";
+    EXPECT_EQ(PAYLOAD, handled);
+    EXPECT_TRUE(socketConnectedWhenHandled) << "the payload was not handled from inside the readyRead emission";
+    EXPECT_FALSE(acknowledgment.isEmpty()) << "the primary never acknowledged the payload";
+
+    // The deferred teardown must not be skipped, and must not delete the socket
+    // from inside the nested loop above: either would show up here as a crash or
+    // as a socket that outlives the hand-off and leaks a connection per payload.
+    QTimer::singleShot(HANDSHAKE_TIMEOUT_MS, &teardownLoop, &QEventLoop::quit);
+    teardownLoop.exec();
+    EXPECT_TRUE(socketReleased) << "the forwarding socket was never released after the hand-off";
+}
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/test_age_formatting.cpp b/tests/test_age_formatting.cpp
index e4fc64cf9..8602ffdc0 100644
--- a/tests/test_age_formatting.cpp
+++ b/tests/test_age_formatting.cpp
@@ -1,6 +1,8 @@
-#include "../cockatrice/src/interface/widgets/server/user/user_info_box.h"
-
 #include "gtest/gtest.h"
+#include <QDate>
+#include <QPair>
+#include <libcockatrice/utility/days_years_between.h>
+#include <string>
 
 namespace
 {
@@ -8,31 +10,31 @@ using dayyear = QPair<int, int>;
 
 TEST(AgeFormatting, Zero)
 {
-    auto got = UserInfoBox::getDaysAndYearsBetween(QDate(2000, 1, 1), QDate(2000, 1, 1));
+    auto got = getDaysAndYearsBetween(QDate(2000, 1, 1), QDate(2000, 1, 1));
     ASSERT_EQ(got, dayyear(0, 0)) << "these are the same day";
 }
 
 TEST(AgeFormatting, LeapDay)
 {
-    auto got = UserInfoBox::getDaysAndYearsBetween(QDate(2000, 2, 28), QDate(2000, 3, 1));
+    auto got = getDaysAndYearsBetween(QDate(2000, 2, 28), QDate(2000, 3, 1));
     ASSERT_EQ(got, dayyear(2, 0)) << "there is a leap day in between these days";
 }
 
 TEST(AgeFormatting, LeapYear)
 {
-    auto got = UserInfoBox::getDaysAndYearsBetween(QDate(2000, 1, 1), QDate(2001, 1, 1));
+    auto got = getDaysAndYearsBetween(QDate(2000, 1, 1), QDate(2001, 1, 1));
     ASSERT_EQ(got, dayyear(0, 1)) << "there is a leap day in between these dates, but that's fine";
 }
 
 TEST(AgeFormatting, LeapDayWithYear)
 {
-    auto got = UserInfoBox::getDaysAndYearsBetween(QDate(2000, 2, 28), QDate(2001, 3, 1));
+    auto got = getDaysAndYearsBetween(QDate(2000, 2, 28), QDate(2001, 3, 1));
     ASSERT_EQ(got, dayyear(1, 1)) << "there is a leap day in between these days but not in the last year";
 }
 
 TEST(AgeFormatting, LeapDayThisYear)
 {
-    auto got = UserInfoBox::getDaysAndYearsBetween(QDate(2003, 2, 28), QDate(2004, 3, 1));
+    auto got = getDaysAndYearsBetween(QDate(2003, 2, 28), QDate(2004, 3, 1));
     ASSERT_EQ(got, dayyear(2, 1)) << "there is a leap day in between these days this year";
 }
 } // namespace
diff --git a/tests/theme_migration/CMakeLists.txt b/tests/theme_migration/CMakeLists.txt
new file mode 100644
index 000000000..93493ee5f
--- /dev/null
+++ b/tests/theme_migration/CMakeLists.txt
@@ -0,0 +1,21 @@
+cockatrice_add_test(
+  NAME
+  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
+  ${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}
+  theme_migration_test.cpp
+  LIBS
+  libcockatrice_settings
+  libcockatrice_network
+  libcockatrice_network_server_remote
+  libcockatrice_protocol
+  INCLUDE_DIRS
+  ${CMAKE_SOURCE_DIR}/cockatrice/src
+)
diff --git a/tests/theme_migration/theme_migration_test.cpp b/tests/theme_migration/theme_migration_test.cpp
new file mode 100644
index 000000000..d77c2f62d
--- /dev/null
+++ b/tests/theme_migration/theme_migration_test.cpp
@@ -0,0 +1,158 @@
+#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.
+ThemeManager *themeManager = nullptr;
+
+namespace
+{
+const QString LEGACY = QStringLiteral("Default");
+const QString CURRENT = QStringLiteral("System");
+
+// Writes content at <themesPath>/<theme>/<relativePath>, creating parents.
+void writeThemeFile(const QString &themesPath,
+                    const QString &theme,
+                    const QString &relativePath,
+                    const QByteArray &content)
+{
+    const QString filePath = QDir(QDir(themesPath).absoluteFilePath(theme)).absoluteFilePath(relativePath);
+    ASSERT_TRUE(QDir().mkpath(QFileInfo(filePath).absolutePath()));
+    QFile file(filePath);
+    ASSERT_TRUE(file.open(QIODevice::WriteOnly));
+    file.write(content);
+    file.close();
+}
+
+QByteArray readThemeFile(const QString &themesPath, const QString &theme, const QString &relativePath)
+{
+    QFile file(QDir(QDir(themesPath).absoluteFilePath(theme)).absoluteFilePath(relativePath));
+    if (!file.open(QIODevice::ReadOnly)) {
+        return QByteArray();
+    }
+    return file.readAll();
+}
+
+class ThemeMigrationTest : public ::testing::Test
+{
+protected:
+    QTemporaryDir tmp;
+    QString themesPath;
+
+    void SetUp() override
+    {
+        ASSERT_TRUE(tmp.isValid());
+        themesPath = QDir(tmp.path()).absoluteFilePath("themes");
+        ASSERT_TRUE(QDir().mkpath(themesPath));
+    }
+};
+
+} // namespace
+
+TEST_F(ThemeMigrationTest, NoLegacyDirectoryIsANoOp)
+{
+    writeThemeFile(themesPath, CURRENT, "theme.cfg", "[Appearance]\n");
+
+    ThemeManager::migrateLegacyThemeDir(themesPath, CURRENT);
+
+    EXPECT_TRUE(QDir(QDir(themesPath).absoluteFilePath(CURRENT)).exists());
+    EXPECT_TRUE(QDir(QDir(themesPath).absoluteFilePath(LEGACY)).exists() == false);
+    EXPECT_EQ(readThemeFile(themesPath, CURRENT, "theme.cfg").toStdString(), std::string("[Appearance]\n"));
+}
+
+TEST_F(ThemeMigrationTest, RenamesDirectoryWhenTargetIsFree)
+{
+    // A customised "Default": stylesheet, zone graphics in a subdirectory and a
+    // palette, i.e. everything a user is liable to have personalised.
+    writeThemeFile(themesPath, LEGACY, "style.css", "QPushButton { color: red; }");
+    writeThemeFile(themesPath, LEGACY, "zones/handzone.png", "handzone-bytes");
+    writeThemeFile(themesPath, LEGACY, "zones/tablezone-dark.svg", "tablezone-bytes");
+    writeThemeFile(themesPath, LEGACY, "palette-dark.toml", "palette");
+
+    ThemeManager::migrateLegacyThemeDir(themesPath, LEGACY);
+
+    EXPECT_FALSE(QDir(QDir(themesPath).absoluteFilePath(LEGACY)).exists());
+    EXPECT_EQ(readThemeFile(themesPath, CURRENT, "style.css").toStdString(),
+              std::string("QPushButton { color: red; }"));
+    EXPECT_EQ(readThemeFile(themesPath, CURRENT, "zones/handzone.png").toStdString(), std::string("handzone-bytes"));
+    EXPECT_EQ(readThemeFile(themesPath, CURRENT, "zones/tablezone-dark.svg").toStdString(),
+              std::string("tablezone-bytes"));
+    EXPECT_EQ(readThemeFile(themesPath, CURRENT, "palette-dark.toml").toStdString(), std::string("palette"));
+}
+
+TEST_F(ThemeMigrationTest, RenamesForAnAlreadyMigratedUserWhoseDirectoryWasLeftBehind)
+{
+    // The settings value was rewritten to "System" on an earlier run, but the
+    // customised directory is still called "Default". The customisations are
+    // still reachable and must still be carried over.
+    writeThemeFile(themesPath, LEGACY, "style.css", "legacy-css");
+
+    ThemeManager::migrateLegacyThemeDir(themesPath, CURRENT);
+
+    EXPECT_FALSE(QDir(QDir(themesPath).absoluteFilePath(LEGACY)).exists());
+    EXPECT_EQ(readThemeFile(themesPath, CURRENT, "style.css").toStdString(), std::string("legacy-css"));
+}
+
+TEST_F(ThemeMigrationTest, MergesIntoAnExistingTargetWithoutOverwriting)
+{
+    // Post-rename re-customisation: "System" already exists and holds newer
+    // files. Those win; the legacy directory only fills the gaps.
+    writeThemeFile(themesPath, CURRENT, "style.css", "newer-css");
+    writeThemeFile(themesPath, CURRENT, "zones/handzone.png", "newer-handzone");
+    writeThemeFile(themesPath, LEGACY, "style.css", "legacy-css");
+    writeThemeFile(themesPath, LEGACY, "zones/handzone.png", "legacy-handzone");
+    writeThemeFile(themesPath, LEGACY, "zones/stackzone.png", "legacy-stackzone");
+    writeThemeFile(themesPath, LEGACY, "palette-light.toml", "legacy-palette");
+
+    ThemeManager::migrateLegacyThemeDir(themesPath, CURRENT);
+
+    EXPECT_FALSE(QDir(QDir(themesPath).absoluteFilePath(LEGACY)).exists());
+    EXPECT_EQ(readThemeFile(themesPath, CURRENT, "style.css").toStdString(), std::string("newer-css"));
+    EXPECT_EQ(readThemeFile(themesPath, CURRENT, "zones/handzone.png").toStdString(), std::string("newer-handzone"));
+    EXPECT_EQ(readThemeFile(themesPath, CURRENT, "zones/stackzone.png").toStdString(), std::string("legacy-stackzone"));
+    EXPECT_EQ(readThemeFile(themesPath, CURRENT, "palette-light.toml").toStdString(), std::string("legacy-palette"));
+}
+
+TEST_F(ThemeMigrationTest, LeavesAnotherThemesDefaultDirectoryAlone)
+{
+    // A user on an unrelated theme may legitimately have made a "Default"
+    // folder of their own; it must not be folded into "System".
+    writeThemeFile(themesPath, LEGACY, "style.css", "unrelated");
+
+    ThemeManager::migrateLegacyThemeDir(themesPath, QStringLiteral("Leather"));
+
+    EXPECT_TRUE(QDir(QDir(themesPath).absoluteFilePath(LEGACY)).exists());
+    EXPECT_EQ(readThemeFile(themesPath, LEGACY, "style.css").toStdString(), std::string("unrelated"));
+    EXPECT_FALSE(QDir(QDir(themesPath).absoluteFilePath(CURRENT)).exists());
+}
+
+TEST_F(ThemeMigrationTest, IsIdempotent)
+{
+    writeThemeFile(themesPath, LEGACY, "style.css", "css");
+
+    ThemeManager::migrateLegacyThemeDir(themesPath, LEGACY);
+    ASSERT_EQ(readThemeFile(themesPath, CURRENT, "style.css").toStdString(), std::string("css"));
+
+    ThemeManager::migrateLegacyThemeDir(themesPath, CURRENT);
+    ThemeManager::migrateLegacyThemeDir(themesPath, LEGACY);
+
+    EXPECT_EQ(readThemeFile(themesPath, CURRENT, "style.css").toStdString(), std::string("css"));
+}
+
+// Every test brings its own main(): GTest is not guaranteed to be found on the build machines, and
+// the fallback then links the bare gtest library without gtest_main.
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/translation_loader_test.cpp b/tests/translation_loader_test.cpp
new file mode 100644
index 000000000..745cd04bc
--- /dev/null
+++ b/tests/translation_loader_test.cpp
@@ -0,0 +1,267 @@
+#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.
+#ifndef TRANSLATION_LOADER_TEST_DIR
+#define TRANSLATION_LOADER_TEST_DIR ""
+#endif
+
+namespace
+{
+const QString testContext = QStringLiteral("TranslationLoaderTest");
+const QString firstMessage = QStringLiteral("Load into the first translator");
+const QString secondMessage = QStringLiteral("Load into the second translator");
+const QString germanFirstMessage = QStringLiteral("In den ersten Übersetzer laden");
+const QString germanSecondMessage = QStringLiteral("In den zweiten Übersetzer laden");
+
+QString translate(const QTranslator &_translator, const QString &_sourceText)
+{
+    return _translator.translate(testContext.toUtf8().constData(), _sourceText.toUtf8().constData());
+}
+
+QString testTranslationDirectory()
+{
+    return QString(TRANSLATION_LOADER_TEST_DIR);
+}
+
+// GTest's main() creates no QCoreApplication, which the search paths are derived from.
+const QCoreApplication &application()
+{
+    static int argc = 1;
+    static char executable[] = "translation_loader_test";
+    static char *argv[] = {executable, nullptr};
+    static const QCoreApplication app(argc, argv);
+    return app;
+}
+} // namespace
+
+TEST(TranslationLoaderTest, LoadsFromTheFirstDirectoryHoldingTheFile)
+{
+    QTemporaryDir emptyDir;
+    ASSERT_TRUE(emptyDir.isValid());
+
+    QTranslator translator;
+
+    // The first directory is searched but has no file, the second one has.
+    EXPECT_EQ(TranslationLoadResult::Loaded,
+              TranslationLoader::loadFrom(translator, QStringLiteral("translation_loader_test_de"),
+                                          {emptyDir.path(), testTranslationDirectory()}));
+    EXPECT_EQ(germanFirstMessage, translate(translator, firstMessage));
+}
+
+TEST(TranslationLoaderTest, LoadedTranslatorResolvesTheTranslatedString)
+{
+    QTranslator translator;
+
+    ASSERT_EQ(TranslationLoadResult::Loaded,
+              TranslationLoader::loadFrom(translator, QStringLiteral("translation_loader_test_de"),
+                                          {testTranslationDirectory()}));
+
+    EXPECT_EQ(germanFirstMessage, translate(translator, firstMessage));
+    EXPECT_EQ(germanSecondMessage, translate(translator, secondMessage));
+}
+
+TEST(TranslationLoaderTest, SeparateTranslatorsKeepTheirOwnFiles)
+{
+    // QTranslator discards its previous contents on every load, so a caller reusing one translator
+    // for two files keeps only the last of them. That is why Qt's translation and the application
+    // translation are loaded into translators of their own.
+    QTranslator firstTranslator;
+    QTranslator secondTranslator;
+
+    ASSERT_EQ(TranslationLoadResult::Loaded,
+              TranslationLoader::loadFrom(firstTranslator, QStringLiteral("translation_loader_test_de"),
+                                          {testTranslationDirectory()}));
+    ASSERT_EQ(TranslationLoadResult::Loaded,
+              TranslationLoader::loadFrom(secondTranslator, QStringLiteral("translation_loader_test_de"),
+                                          {testTranslationDirectory()}));
+
+    EXPECT_FALSE(firstTranslator.isEmpty());
+    EXPECT_FALSE(secondTranslator.isEmpty());
+    EXPECT_EQ(germanFirstMessage, translate(firstTranslator, firstMessage));
+    EXPECT_EQ(germanSecondMessage, translate(secondTranslator, secondMessage));
+}
+
+TEST(TranslationLoaderTest, ExistingDirectoryWithoutTheFileIsMissing)
+{
+    QTemporaryDir emptyDir;
+    ASSERT_TRUE(emptyDir.isValid());
+
+    QTranslator translator;
+
+    EXPECT_EQ(TranslationLoadResult::Missing,
+              TranslationLoader::loadFrom(translator, QStringLiteral("translation_loader_test_de"), {emptyDir.path()}));
+    EXPECT_TRUE(translator.isEmpty());
+}
+
+TEST(TranslationLoaderTest, NonexistentDirectoriesAreNotSearched)
+{
+    QTemporaryDir emptyDir;
+    ASSERT_TRUE(emptyDir.isValid());
+
+    QTranslator translator;
+    const QString missingDirectory = emptyDir.path() + QStringLiteral("/does-not-exist");
+
+    EXPECT_EQ(
+        TranslationLoadResult::NoDirectory,
+        TranslationLoader::loadFrom(translator, QStringLiteral("translation_loader_test_de"), {missingDirectory}));
+    EXPECT_EQ(TranslationLoadResult::NoDirectory,
+              TranslationLoader::loadFrom(translator, QStringLiteral("translation_loader_test_de"), {}));
+    EXPECT_TRUE(translator.isEmpty());
+}
+
+TEST(TranslationLoaderTest, EmptyDirectoryEntriesAreSkipped)
+{
+    QTranslator translator;
+
+    EXPECT_EQ(TranslationLoadResult::Loaded,
+              TranslationLoader::loadFrom(translator, QStringLiteral("translation_loader_test_de"),
+                                          {QString(), testTranslationDirectory()}));
+}
+
+TEST(TranslationLoaderTest, LanguageVariantsFallBackToTheBaseLanguage)
+{
+    QTranslator translator;
+
+    // Users pick languages such as en_US or zh-Hans that need not have a translation file of their
+    // own; a language without one falls back to the file without its country or script part.
+    EXPECT_EQ(TranslationLoadResult::Loaded,
+              TranslationLoader::loadFrom(translator, QStringLiteral("translation_loader_test_de_CH"),
+                                          {testTranslationDirectory()}));
+}
+
+TEST(TranslationLoaderTest, QtTranslationCandidatesCoverTheUsualInstallLayouts)
+{
+    const QList<QString> candidates = TranslationLoader::qtTranslationCandidates();
+
+    EXPECT_FALSE(candidates.isEmpty());
+    for (const QString &candidate : candidates) {
+        EXPECT_FALSE(candidate.isEmpty());
+    }
+    EXPECT_EQ(candidates.size(), QSet<QString>(candidates.cbegin(), candidates.cend()).size());
+
+    // A relocated Qt can report a prefix-relative translations path that does not exist (the KDE
+    // runtime reports /usr/translations while its files live in /usr/share/qt6/translations), so the
+    // layout Qt actually installs into has to be among the candidates.
+    const QString prefix = QLibraryInfo::path(QLibraryInfo::PrefixPath);
+    EXPECT_TRUE(candidates.contains(prefix + QStringLiteral("/share/qt6/translations")));
+}
+
+TEST(TranslationLoaderTest, QtTranslationPathsOnlyHoldExistingDirectories)
+{
+    const QList<QString> candidates = TranslationLoader::qtTranslationCandidates();
+    const QList<QString> paths = TranslationLoader::qtTranslationPaths();
+
+    for (const QString &path : paths) {
+        EXPECT_FALSE(path.isEmpty());
+        EXPECT_TRUE(QDir(path).exists()) << path.toStdString();
+    }
+
+    EXPECT_EQ(paths.size(), QSet<QString>(paths.cbegin(), paths.cend()).size());
+
+    // Every candidate that exists is searched, and nothing else is.
+    for (const QString &candidate : candidates) {
+        if (QDir(candidate).exists()) {
+            EXPECT_TRUE(paths.contains(candidate)) << candidate.toStdString();
+        }
+    }
+}
+
+TEST(TranslationLoaderTest, LoadApplicationUsesThePrefixAndTheLanguage)
+{
+    QTranslator translator;
+
+    ASSERT_EQ(TranslationLoadResult::Loaded,
+              TranslationLoader::loadApplication(translator, QStringLiteral("translation_loader_test"),
+                                                 QStringLiteral("de"), {testTranslationDirectory()}));
+    EXPECT_EQ(germanSecondMessage, translate(translator, secondMessage));
+}
+
+TEST(TranslationLoaderTest, ABuildTreeFindsTheTranslationsNextToTheExecutable)
+{
+    // The regression this guards: a build tree keeps the .qm files next to the executable rather than
+    // in the installed layout, so a developer build loaded no translation and offered no language.
+    // This test binary's .qm file sits in its own directory, just like cockatrice's ones do.
+    const QString executableDirectory = application().applicationDirPath();
+    const QList<QString> paths = TranslationLoader::applicationTranslationPaths(
+        executableDirectory + QStringLiteral("/../share/cockatrice/translations"));
+
+    ASSERT_EQ(2, paths.size());
+    EXPECT_EQ(executableDirectory + QStringLiteral("/../share/cockatrice/translations"), paths.at(0));
+    EXPECT_EQ(executableDirectory, paths.at(1));
+
+    const QList<QString> languages =
+        TranslationLoader::availableLanguages(QStringLiteral("translation_loader_test"), paths);
+    EXPECT_EQ(QStringList({QStringLiteral("de")}), QStringList(languages.cbegin(), languages.cend()));
+}
+
+TEST(TranslationLoaderTest, ApplicationTranslationPathsHoldNoDuplicates)
+{
+    const QString executableDirectory = application().applicationDirPath();
+
+    EXPECT_EQ(1, TranslationLoader::applicationTranslationPaths(executableDirectory).size());
+
+    // Without an installed layout to search there is nothing left but the executable's directory.
+    const QList<QString> withoutInstalledPath = TranslationLoader::applicationTranslationPaths(QString());
+    ASSERT_EQ(1, withoutInstalledPath.size());
+    EXPECT_EQ(executableDirectory, withoutInstalledPath.at(0));
+}
+
+TEST(TranslationLoaderTest, AvailableLanguagesListsTheTranslationsThatCanBeLoaded)
+{
+    const QList<QString> languages =
+        TranslationLoader::availableLanguages(QStringLiteral("translation_loader_test"), {testTranslationDirectory()});
+
+    EXPECT_EQ(QStringList({QStringLiteral("de")}), QStringList(languages.cbegin(), languages.cend()));
+
+    // Files of another application and files without a language code are not languages.
+    EXPECT_TRUE(TranslationLoader::availableLanguages(QStringLiteral("some_other_app"), {testTranslationDirectory()})
+                    .isEmpty());
+    EXPECT_TRUE(TranslationLoader::availableLanguages(QStringLiteral("translation_loader_test"), {}).isEmpty());
+}
+
+TEST(TranslationLoaderTest, LoadApplicationReportsAMissingTranslationDirectory)
+{
+    QTemporaryDir emptyDir;
+    ASSERT_TRUE(emptyDir.isValid());
+
+    QTranslator translator;
+
+    EXPECT_EQ(TranslationLoadResult::NoDirectory,
+              TranslationLoader::loadApplication(translator, QStringLiteral("translation_loader_test"),
+                                                 QStringLiteral("de"),
+                                                 {emptyDir.path() + QStringLiteral("/translations")}));
+}
+
+TEST(TranslationLoaderTest, UnsetLanguageLoadsNothing)
+{
+    QTranslator translator;
+
+    // An unset language is the default for English, which has no translation file to begin with:
+    // nothing is searched for and the translator is left untouched.
+    EXPECT_EQ(TranslationLoadResult::Missing,
+              TranslationLoader::loadApplication(translator, QStringLiteral("translation_loader_test"), QString(),
+                                                 {testTranslationDirectory()}));
+    EXPECT_EQ(TranslationLoadResult::Missing, TranslationLoader::loadQt(translator, QString()));
+    EXPECT_TRUE(translator.isEmpty());
+    EXPECT_TRUE(translator.filePath().isEmpty());
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tests/translation_loader_test.ts b/tests/translation_loader_test.ts
new file mode 100644
index 000000000..a02b2e753
--- /dev/null
+++ b/tests/translation_loader_test.ts
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de">
+<context>
+    <name>TranslationLoaderTest</name>
+    <message>
+        <source>Load into the first translator</source>
+        <translation>In den ersten Übersetzer laden</translation>
+    </message>
+    <message>
+        <source>Load into the second translator</source>
+        <translation>In den zweiten Übersetzer laden</translation>
+    </message>
+</context>
+</TS>
diff --git a/tests/warning_categories_test.cpp b/tests/warning_categories_test.cpp
new file mode 100644
index 000000000..549c373b5
--- /dev/null
+++ b/tests/warning_categories_test.cpp
@@ -0,0 +1,91 @@
+#include "gtest/gtest.h"
+#include <QList>
+#include <QString>
+#include <libcockatrice/utility/warning_categories.h>
+#include <string>
+
+TEST(WarningCategoriesTest, EmptyValueYieldsNoCategories)
+{
+    EXPECT_TRUE(parseWarningCategories(QString()).isEmpty());
+    EXPECT_TRUE(parseWarningCategories(QString("")).isEmpty());
+}
+
+TEST(WarningCategoriesTest, PlainNamesDefaultToInterventionLevelOne)
+{
+    const QList<WarningCategory> categories = parseWarningCategories("Flaming,Spamming,Causing Drama");
+
+    ASSERT_EQ(3, categories.size());
+    EXPECT_EQ("Flaming", categories.at(0).name);
+    EXPECT_EQ(1, categories.at(0).startingIl);
+    EXPECT_EQ("Spamming", categories.at(1).name);
+    EXPECT_EQ(1, categories.at(1).startingIl);
+    EXPECT_EQ("Causing Drama", categories.at(2).name);
+    EXPECT_EQ(1, categories.at(2).startingIl);
+}
+
+TEST(WarningCategoriesTest, ExplicitInterventionLevelsAreParsed)
+{
+    const QList<WarningCategory> categories = parseWarningCategories("Cheating|2,Inappropriate Avatar|3");
+
+    ASSERT_EQ(2, categories.size());
+    EXPECT_EQ("Cheating", categories.at(0).name);
+    EXPECT_EQ(2, categories.at(0).startingIl);
+    EXPECT_EQ("Inappropriate Avatar", categories.at(1).name);
+    EXPECT_EQ(3, categories.at(1).startingIl);
+}
+
+TEST(WarningCategoriesTest, MixedEntriesKeepDefaultsForThoseWithoutLevels)
+{
+    const QList<WarningCategory> categories = parseWarningCategories("Abusive Language|1,Cheating|2,Spamming");
+
+    ASSERT_EQ(3, categories.size());
+    EXPECT_EQ(1, categories.at(0).startingIl);
+    EXPECT_EQ(2, categories.at(1).startingIl);
+    EXPECT_EQ("Spamming", categories.at(2).name);
+    EXPECT_EQ(1, categories.at(2).startingIl);
+}
+
+TEST(WarningCategoriesTest, EmptyEntriesAreSkipped)
+{
+    const QList<WarningCategory> categories = parseWarningCategories("Spamming,,Cheating|2,");
+
+    ASSERT_EQ(2, categories.size());
+    EXPECT_EQ("Spamming", categories.at(0).name);
+    EXPECT_EQ("Cheating", categories.at(1).name);
+}
+
+TEST(WarningCategoriesTest, WhitespaceIsTrimmed)
+{
+    const QList<WarningCategory> categories = parseWarningCategories("  Abusive Language , Cheating | 2 ");
+
+    ASSERT_EQ(2, categories.size());
+    EXPECT_EQ("Abusive Language", categories.at(0).name);
+    EXPECT_EQ(1, categories.at(0).startingIl);
+    EXPECT_EQ("Cheating", categories.at(1).name);
+    EXPECT_EQ(2, categories.at(1).startingIl);
+}
+
+TEST(WarningCategoriesTest, InvalidInterventionLevelsFallBackToOne)
+{
+    const QList<WarningCategory> categories = parseWarningCategories("Spamming|abc,Cheating|0,Targeted Harassment|-3");
+
+    ASSERT_EQ(3, categories.size());
+    EXPECT_EQ(1, categories.at(0).startingIl);
+    EXPECT_EQ(1, categories.at(1).startingIl);
+    EXPECT_EQ(1, categories.at(2).startingIl);
+}
+
+TEST(WarningCategoriesTest, EntryWithOnlyLevelIsSkipped)
+{
+    const QList<WarningCategory> categories = parseWarningCategories("|2,Spamming|2");
+
+    ASSERT_EQ(1, categories.size());
+    EXPECT_EQ("Spamming", categories.at(0).name);
+    EXPECT_EQ(2, categories.at(0).startingIl);
+}
+
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
diff --git a/tools/generate_qt_mappings.py b/tools/generate_qt_mappings.py
new file mode 100755
index 000000000..42836b6da
--- /dev/null
+++ b/tools/generate_qt_mappings.py
@@ -0,0 +1,208 @@
+#!/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())
diff --git a/vcpkg b/vcpkg
index 623240005..9e593bb18 160000
--- a/vcpkg
+++ b/vcpkg
@@ -1 +1 @@
-Subproject commit 62324000504cdd27282f8275c99135cfb2bd1dc0
+Subproject commit 9e593bb18ea69cc5095e012465dcd675a822ed0d
diff --git a/vcpkg.json b/vcpkg.json
index ac7b75d07..f12227024 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,5 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+  "builtin-baseline": "9e593bb18ea69cc5095e012465dcd675a822ed0d",
   "dependencies": [
     "gtest",
     "liblzma",
diff --git a/webclient/.env b/webclient/.env
deleted file mode 100644
index 8592b28b4..000000000
--- a/webclient/.env
+++ /dev/null
@@ -1 +0,0 @@
-# Future template for server admin configuration
diff --git a/webclient/.env.development b/webclient/.env.development
deleted file mode 100644
index 2accbba81..000000000
--- a/webclient/.env.development
+++ /dev/null
@@ -1 +0,0 @@
-ESLINT_NO_DEV_ERRORS=true
diff --git a/webclient/.env.production b/webclient/.env.production
deleted file mode 100644
index 02269f00d..000000000
--- a/webclient/.env.production
+++ /dev/null
@@ -1 +0,0 @@
-DISABLE_ESLINT_PLUGIN=true
diff --git a/webclient/.env.test b/webclient/.env.test
deleted file mode 100644
index 8711f95ab..000000000
--- a/webclient/.env.test
+++ /dev/null
@@ -1 +0,0 @@
-CI=true
diff --git a/webclient/.eslintrc.js b/webclient/.eslintrc.js
deleted file mode 100644
index 98ce44430..000000000
--- a/webclient/.eslintrc.js
+++ /dev/null
@@ -1,48 +0,0 @@
-module.exports = {
-  "root": true,
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {"project": ["./tsconfig.json"]},
-  "plugins": [
-    "@typescript-eslint"
-  ],
-  "ignorePatterns": ["node_modules/*", "build/*", "public/pb/*"],
-  "env": {
-    "jest": true
-  },
-  "rules": {
-    "array-bracket-spacing": ["error", "never"],
-    "arrow-spacing": ["error", {"before": true, "after": true}],
-    "block-spacing": ["error", "always"],
-    "brace-style": ["error", "1tbs", {"allowSingleLine": false}],
-    "comma-spacing": ["error", {"before": false, "after": true}],
-    "comma-style": ["error", "last"],
-    "computed-property-spacing": ["error", "never"],
-    "curly": ["error", "all"],
-    "dot-location": ["error", "property"],
-    "eol-last": ["error"],
-    "func-names": ["warn"],
-    "indent": ["error", 2, {"SwitchCase": 1}],
-    "key-spacing": ["error", {"beforeColon": false, "afterColon": true}],
-    "keyword-spacing": ["error"],
-    "linebreak-style": ["error", (process.platform === "win32" ? "windows" : "unix")],
-    "max-len": ["error", {"code": 140}],
-    "no-eq-null": ["off"],
-    "no-func-assign": ["error"],
-    "no-inline-comments": ["error"],
-    "no-mixed-spaces-and-tabs": ["error"],
-    "no-multi-spaces": ["error"],
-    "no-spaced-func": ["error"],
-    "no-trailing-spaces": ["error"],
-    "no-var": ["error"],
-    "object-curly-spacing": ["error", "always"],
-    "one-var": ["error", "never"],
-    "one-var-declaration-per-line": ["error"],
-    "quotes": ["error", "single"],
-    "semi-spacing": ["error", {"before": false, "after": true}],
-    "space-before-blocks": ["error"],
-    "space-before-function-paren": ["error", {"asyncArrow": "always", "anonymous": "never", "named": "never"}],
-    "space-in-parens": ["error", "never"],
-    "space-infix-ops": ["error"],
-    "space-unary-ops": ["error", {"words": true, "nonwords": false}]
-  }
-}
\ No newline at end of file
diff --git a/webclient/.gitignore b/webclient/.gitignore
deleted file mode 100644
index 2b30e2c8d..000000000
--- a/webclient/.gitignore
+++ /dev/null
@@ -1,27 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# generated ./src files
-/src/proto-files.json
-/src/server-props.json
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
diff --git a/webclient/.npmrc b/webclient/.npmrc
deleted file mode 100644
index 521a9f7c0..000000000
--- a/webclient/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-legacy-peer-deps=true
diff --git a/webclient/README.md b/webclient/README.md
deleted file mode 100644
index 436ab4fad..000000000
--- a/webclient/README.md
+++ /dev/null
@@ -1,73 +0,0 @@
-## Application Architecture
-![Application Architecture](architecture.png?raw=true "Application Architecture")
-
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm start`
-
-Runs the app in the development mode.<br />
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.<br />
-You will also see any lint errors in the console.
-
-### `npm test`
-
-Launches the test runner in the interactive watch mode.<br />
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `npm run build`
-
-Builds the app for production to the `build` folder.<br />
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.<br />
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
-
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
-
-## Learn More
-
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-## To-Do List
-
-1) RefreshGuard modal
-  - there is no browser support for displaying custom output to window.onbeforeunload
-  - we should also display a custom modal explaining why they shouldnt refresh or navigate from the site
-  - ideally, the custom popup can be synced with the alert, so when the alert is closed, the modal closes too
-
-2) Disable AutoScrollToBottom when the user has scrolled up
-  - when the user scrolls back to bottom, it should renable
-  - renable after a period of inactivity (3 minutes?)
-
-3) Figure out how to type components w/ RouteComponentProps
-  - Component<RouteComponentProps<???, ???, ???>>
-
-4) clear input onSubmit
-
-5) figure out how to reflect server status changes in the ui
-
-6) Account page
-
-7) Register/Reset Password forms
-
-8) Message User
-
-9) Main Nav scheme
diff --git a/webclient/architecture.png b/webclient/architecture.png
deleted file mode 100644
index 0226eb201..000000000
Binary files a/webclient/architecture.png and /dev/null differ
diff --git a/webclient/package-lock.json b/webclient/package-lock.json
deleted file mode 100644
index b5d961a75..000000000
--- a/webclient/package-lock.json
+++ /dev/null
@@ -1,34745 +0,0 @@
-{
-  "name": "webclient",
-  "version": "1.0.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "webclient",
-      "version": "1.0.0",
-      "dependencies": {
-        "@emotion/react": "^11.8.2",
-        "@emotion/styled": "^11.8.1",
-        "@mui/icons-material": "^5.5.1",
-        "@mui/material": "^5.5.1",
-        "crypto-js": "^4.2.0",
-        "dexie": "^3.2.2",
-        "final-form": "^4.20.6",
-        "final-form-set-field-touched": "^1.0.1",
-        "i18next": "^22.0.4",
-        "i18next-browser-languagedetector": "^7.0.0",
-        "i18next-icu": "^2.0.3",
-        "intl-messageformat": "^10.2.1",
-        "lodash": "^4.17.21",
-        "prop-types": "^15.8.1",
-        "protobufjs": "^7.2.4",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
-        "react-final-form": "^6.5.8",
-        "react-final-form-listeners": "^1.0.3",
-        "react-i18next": "^12.0.0",
-        "react-redux": "^8.0.4",
-        "react-router-dom": "^6.2.2",
-        "react-scripts": "5.0.1",
-        "react-virtualized-auto-sizer": "^1.0.6",
-        "react-window": "^1.8.6",
-        "redux": "^4.1.2",
-        "redux-form": "^8.3.8",
-        "redux-thunk": "^2.4.1",
-        "rxjs": "^7.5.4",
-        "sanitize-html": "^2.7.3"
-      },
-      "devDependencies": {
-        "@babel/core": "^7.17.5",
-        "@mui/types": "^7.1.3",
-        "@testing-library/jest-dom": "^5.16.2",
-        "@testing-library/react": "^13.4.0",
-        "@types/jest": "29.2.0",
-        "@types/jquery": "^3.5.14",
-        "@types/lodash": "^4.14.179",
-        "@types/node": "18.11.7",
-        "@types/prop-types": "^15.7.4",
-        "@types/react": "18.0.24",
-        "@types/react-dom": "18.0.8",
-        "@types/react-redux": "^7.1.23",
-        "@types/react-router-dom": "^5.3.3",
-        "@types/react-virtualized-auto-sizer": "^1.0.1",
-        "@types/react-window": "^1.8.5",
-        "@types/redux-form": "^8.3.3",
-        "@typescript-eslint/eslint-plugin": "^5.14.0",
-        "@typescript-eslint/parser": "^5.14.0",
-        "fs-extra": "^10.0.1",
-        "husky": "^8.0.1",
-        "typescript": "^4.6.2"
-      }
-    },
-    "node_modules/@adobe/css-tools": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz",
-      "integrity": "sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==",
-      "dev": true
-    },
-    "node_modules/@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@apideck/better-ajv-errors": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz",
-      "integrity": "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==",
-      "dependencies": {
-        "json-schema": "^0.4.0",
-        "jsonpointer": "^5.0.0",
-        "leven": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "ajv": ">=8"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
-      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.27.1",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.1.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.0.tgz",
-      "integrity": "sha512-Gt9jszFJYq7qzXVK4slhc6NzJXnOVmRECWcVjF/T23rNXD9NtWQ0W3qxdg+p9wWIB+VQw3GYV/U2Ha9bRTfs4w==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz",
-      "integrity": "sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==",
-      "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.19.6",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helpers": "^7.19.4",
-        "@babel/parser": "^7.19.6",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.6",
-        "@babel/types": "^7.19.4",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/eslint-parser": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
-      "integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
-      "dependencies": {
-        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": ">=7.11.0",
-        "eslint": "^7.5.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
-      "dependencies": {
-        "@babel/types": "^7.23.0",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
-      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
-      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
-      "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.18.6",
-        "@babel/types": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz",
-      "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==",
-      "dependencies": {
-        "@babel/compat-data": "^7.20.0",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.21.3",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
-      "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.9",
-        "@babel/helper-split-export-declaration": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
-      "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "regexpu-core": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
-      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0-0"
-      }
-    },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
-      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
-      "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
-      "dependencies": {
-        "@babel/types": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz",
-      "integrity": "sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==",
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.19.4",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.6",
-        "@babel/types": "^7.19.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
-      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
-      "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
-      "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-wrap-function": "^7.18.9",
-        "@babel/types": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
-      "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/traverse": "^7.19.1",
-        "@babel/types": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
-      "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
-      "dependencies": {
-        "@babel/types": "^7.19.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
-      "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
-      "dependencies": {
-        "@babel/types": "^7.20.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-string-parser": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
-      "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
-      "dependencies": {
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.1.tgz",
-      "integrity": "sha512-FCvFTm0sWV8Fxhpp2McP5/W53GPllQ9QeQ7SiqGWjMf/LVG07lFa5+pgK05IRhVwtvafT22KF+ZSnM9I545CvQ==",
-      "dependencies": {
-        "@babel/template": "^7.27.1",
-        "@babel/types": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.2.tgz",
-      "integrity": "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==",
-      "dependencies": {
-        "@babel/types": "^7.27.1"
-      },
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
-      "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
-      "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.13.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz",
-      "integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==",
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-remap-async-to-generator": "^7.18.9",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
-      "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-decorators": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.0.tgz",
-      "integrity": "sha512-vnuRRS20ygSxclEYikHzVrP9nZDFXaSzvJxGLQNAiBX041TmhS4hOUHWNIpq/q4muENuEP9XPJFXTNFejhemkg==",
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-replace-supers": "^7.19.1",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/plugin-syntax-decorators": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
-      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
-      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
-      "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
-      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz",
-      "integrity": "sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==",
-      "dependencies": {
-        "@babel/compat-data": "^7.19.4",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.18.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
-      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
-      "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
-      "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
-      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz",
-      "integrity": "sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-flow": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz",
-      "integrity": "sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz",
-      "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
-      "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz",
-      "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
-      "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
-      "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-remap-async-to-generator": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
-      "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.0.tgz",
-      "integrity": "sha512-sXOohbpHZSk7GjxK9b3dKB7CfqUD5DwOH+DggKzOQ7TXYP+RCSbRykfjQmn/zq+rBjycVRtLf9pYhAaEJA786w==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
-      "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-compilation-targets": "^7.19.0",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-replace-supers": "^7.18.9",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
-      "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.0.tgz",
-      "integrity": "sha512-1dIhvZfkDVx/zn2S1aFwlruspTt4189j7fEkH0Y0VyuDM6bQt7bD6kLcz3l4IlLG+e5OReaBz9ROAbttRtUHqA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
-      "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
-      "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
-      "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
-      "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-flow-strip-types": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.19.0.tgz",
-      "integrity": "sha512-sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/plugin-syntax-flow": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.18.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
-      "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
-      "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-function-name": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
-      "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
-      "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz",
-      "integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==",
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz",
-      "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==",
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-simple-access": "^7.19.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz",
-      "integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==",
-      "dependencies": {
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-validator-identifier": "^7.19.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
-      "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
-      "dependencies": {
-        "@babel/helper-module-transforms": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
-      "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
-      "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
-      "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.18.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz",
-      "integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
-      "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-constant-elements": {
-      "version": "7.18.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.18.12.tgz",
-      "integrity": "sha512-Q99U9/ttiu+LMnRU8psd23HhvwXmKWDQIpocm0JKaICcZHnw+mdQbHm6xnSy7dOl8I5PELakYtNBubNQlBXbZw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-display-name": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz",
-      "integrity": "sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz",
-      "integrity": "sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/plugin-syntax-jsx": "^7.18.6",
-        "@babel/types": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz",
-      "integrity": "sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==",
-      "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz",
-      "integrity": "sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==",
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
-      "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "regenerator-transform": "^0.15.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
-      "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz",
-      "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
-      "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
-      "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
-      "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
-      "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
-      "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-typescript": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.0.tgz",
-      "integrity": "sha512-xOAsAFaun3t9hCwZ13Qe7gq423UgMZ6zAgmLxeGGapFqlT/X3L5qT2btjiVLlFn7gWtMaVyceS5VxGAuKbgizw==",
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/plugin-syntax-typescript": "^7.20.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
-      "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
-      "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-env": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz",
-      "integrity": "sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==",
-      "dependencies": {
-        "@babel/compat-data": "^7.19.4",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-validator-option": "^7.18.6",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-async-generator-functions": "^7.19.1",
-        "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-proposal-class-static-block": "^7.18.6",
-        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
-        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-        "@babel/plugin-proposal-json-strings": "^7.18.6",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-        "@babel/plugin-proposal-object-rest-spread": "^7.19.4",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-private-methods": "^7.18.6",
-        "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.18.6",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.18.6",
-        "@babel/plugin-transform-async-to-generator": "^7.18.6",
-        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-        "@babel/plugin-transform-block-scoping": "^7.19.4",
-        "@babel/plugin-transform-classes": "^7.19.0",
-        "@babel/plugin-transform-computed-properties": "^7.18.9",
-        "@babel/plugin-transform-destructuring": "^7.19.4",
-        "@babel/plugin-transform-dotall-regex": "^7.18.6",
-        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
-        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-        "@babel/plugin-transform-for-of": "^7.18.8",
-        "@babel/plugin-transform-function-name": "^7.18.9",
-        "@babel/plugin-transform-literals": "^7.18.9",
-        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
-        "@babel/plugin-transform-modules-amd": "^7.18.6",
-        "@babel/plugin-transform-modules-commonjs": "^7.18.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.19.0",
-        "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
-        "@babel/plugin-transform-new-target": "^7.18.6",
-        "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-parameters": "^7.18.8",
-        "@babel/plugin-transform-property-literals": "^7.18.6",
-        "@babel/plugin-transform-regenerator": "^7.18.6",
-        "@babel/plugin-transform-reserved-words": "^7.18.6",
-        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
-        "@babel/plugin-transform-spread": "^7.19.0",
-        "@babel/plugin-transform-sticky-regex": "^7.18.6",
-        "@babel/plugin-transform-template-literals": "^7.18.9",
-        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
-        "@babel/plugin-transform-unicode-escapes": "^7.18.10",
-        "@babel/plugin-transform-unicode-regex": "^7.18.6",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.19.4",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "core-js-compat": "^3.25.1",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-react": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.18.6.tgz",
-      "integrity": "sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-validator-option": "^7.18.6",
-        "@babel/plugin-transform-react-display-name": "^7.18.6",
-        "@babel/plugin-transform-react-jsx": "^7.18.6",
-        "@babel/plugin-transform-react-jsx-development": "^7.18.6",
-        "@babel/plugin-transform-react-pure-annotations": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-typescript": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz",
-      "integrity": "sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-validator-option": "^7.18.6",
-        "@babel/plugin-transform-typescript": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.1.tgz",
-      "integrity": "sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/runtime-corejs3": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.27.1.tgz",
-      "integrity": "sha512-909rVuj3phpjW6y0MCXAZ5iNeORePa6ldJvp2baWGcTjwqbBDDz6xoS5JHJ7lS88NlwLYj07ImL/8IUMtDZzTA==",
-      "dependencies": {
-        "core-js-pure": "^3.30.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
-      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
-      "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/parser": "^7.27.2",
-        "@babel/types": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
-      "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.0",
-        "@babel/types": "^7.23.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz",
-      "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==",
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
-    },
-    "node_modules/@csstools/normalize.css": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.0.0.tgz",
-      "integrity": "sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg=="
-    },
-    "node_modules/@csstools/postcss-cascade-layers": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
-      "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
-      "dependencies": {
-        "@csstools/selector-specificity": "^2.0.2",
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-color-function": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
-      "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-font-format-keywords": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
-      "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-hwb-function": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
-      "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-ic-unit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
-      "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-is-pseudo-class": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
-      "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
-      "dependencies": {
-        "@csstools/selector-specificity": "^2.0.0",
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-nested-calc": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
-      "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-normalize-display-values": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
-      "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-oklab-function": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
-      "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-progressive-custom-properties": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
-      "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3"
-      }
-    },
-    "node_modules/@csstools/postcss-stepped-value-functions": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
-      "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-text-decoration-shorthand": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
-      "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-trigonometric-functions": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
-      "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/postcss-unset-value": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
-      "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/@csstools/selector-specificity": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
-      "integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2",
-        "postcss-selector-parser": "^6.0.10"
-      }
-    },
-    "node_modules/@emotion/babel-plugin": {
-      "version": "11.10.5",
-      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz",
-      "integrity": "sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA==",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/plugin-syntax-jsx": "^7.17.12",
-        "@babel/runtime": "^7.18.3",
-        "@emotion/hash": "^0.9.0",
-        "@emotion/memoize": "^0.8.0",
-        "@emotion/serialize": "^1.1.1",
-        "babel-plugin-macros": "^3.1.0",
-        "convert-source-map": "^1.5.0",
-        "escape-string-regexp": "^4.0.0",
-        "find-root": "^1.1.0",
-        "source-map": "^0.5.7",
-        "stylis": "4.1.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@emotion/cache": {
-      "version": "11.10.5",
-      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.5.tgz",
-      "integrity": "sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA==",
-      "dependencies": {
-        "@emotion/memoize": "^0.8.0",
-        "@emotion/sheet": "^1.2.1",
-        "@emotion/utils": "^1.2.0",
-        "@emotion/weak-memoize": "^0.3.0",
-        "stylis": "4.1.3"
-      }
-    },
-    "node_modules/@emotion/hash": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz",
-      "integrity": "sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ=="
-    },
-    "node_modules/@emotion/is-prop-valid": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.0.tgz",
-      "integrity": "sha512-3aDpDprjM0AwaxGE09bOPkNxHpBd+kA6jty3RnaEXdweX1DF1U3VQpPYb0g1IStAuK7SVQ1cy+bNBBKp4W3Fjg==",
-      "dependencies": {
-        "@emotion/memoize": "^0.8.0"
-      }
-    },
-    "node_modules/@emotion/memoize": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.0.tgz",
-      "integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA=="
-    },
-    "node_modules/@emotion/react": {
-      "version": "11.10.5",
-      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.5.tgz",
-      "integrity": "sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A==",
-      "dependencies": {
-        "@babel/runtime": "^7.18.3",
-        "@emotion/babel-plugin": "^11.10.5",
-        "@emotion/cache": "^11.10.5",
-        "@emotion/serialize": "^1.1.1",
-        "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
-        "@emotion/utils": "^1.2.0",
-        "@emotion/weak-memoize": "^0.3.0",
-        "hoist-non-react-statics": "^3.3.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "react": ">=16.8.0"
-      },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        },
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@emotion/serialize": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.1.tgz",
-      "integrity": "sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==",
-      "dependencies": {
-        "@emotion/hash": "^0.9.0",
-        "@emotion/memoize": "^0.8.0",
-        "@emotion/unitless": "^0.8.0",
-        "@emotion/utils": "^1.2.0",
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/@emotion/sheet": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.1.tgz",
-      "integrity": "sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA=="
-    },
-    "node_modules/@emotion/styled": {
-      "version": "11.10.5",
-      "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.5.tgz",
-      "integrity": "sha512-8EP6dD7dMkdku2foLoruPCNkRevzdcBaY6q0l0OsbyJK+x8D9HWjX27ARiSIKNF634hY9Zdoedh8bJCiva8yZw==",
-      "dependencies": {
-        "@babel/runtime": "^7.18.3",
-        "@emotion/babel-plugin": "^11.10.5",
-        "@emotion/is-prop-valid": "^1.2.0",
-        "@emotion/serialize": "^1.1.1",
-        "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
-        "@emotion/utils": "^1.2.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "@emotion/react": "^11.0.0-rc.0",
-        "react": ">=16.8.0"
-      },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        },
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@emotion/unitless": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz",
-      "integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw=="
-    },
-    "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz",
-      "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==",
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
-    "node_modules/@emotion/utils": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz",
-      "integrity": "sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw=="
-    },
-    "node_modules/@emotion/weak-memoize": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz",
-      "integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg=="
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
-      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.4.0",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-    },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@formatjs/ecma402-abstract": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.13.0.tgz",
-      "integrity": "sha512-CQ8Ykd51jYD1n05dtoX6ns6B9n/+6ZAxnWUAonvHC4kkuAemROYBhHkEB4tm1uVrRlE7gLDqXkAnY51Y0pRCWQ==",
-      "dependencies": {
-        "@formatjs/intl-localematcher": "0.2.31",
-        "tslib": "2.4.0"
-      }
-    },
-    "node_modules/@formatjs/fast-memoize": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.6.tgz",
-      "integrity": "sha512-9CWZ3+wCkClKHX+i5j+NyoBVqGf0pIskTo6Xl6ihGokYM2yqSSS68JIgeo+99UIHc+7vi9L3/SDSz/dWI9SNlA==",
-      "dependencies": {
-        "tslib": "2.4.0"
-      }
-    },
-    "node_modules/@formatjs/icu-messageformat-parser": {
-      "version": "2.1.10",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.10.tgz",
-      "integrity": "sha512-KkRMxhifWkRC45dhM9tqm0GXbb6NPYTGVYY3xx891IKc6p++DQrZTnmkVSNNO47OEERLfuP2KkPFPJBuu8z/wg==",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.13.0",
-        "@formatjs/icu-skeleton-parser": "1.3.14",
-        "tslib": "2.4.0"
-      }
-    },
-    "node_modules/@formatjs/icu-skeleton-parser": {
-      "version": "1.3.14",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.14.tgz",
-      "integrity": "sha512-7bv60HQQcBb3+TSj+45tOb/CHV5z1hOpwdtS50jsSBXfB+YpGhnoRsZxSRksXeCxMy6xn6tA6VY2601BrrK+OA==",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.13.0",
-        "tslib": "2.4.0"
-      }
-    },
-    "node_modules/@formatjs/intl-localematcher": {
-      "version": "0.2.31",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.31.tgz",
-      "integrity": "sha512-9QTjdSBpQ7wHShZgsNzNig5qT3rCPvmZogS/wXZzKotns5skbXgs0I7J8cuN0PPqXyynvNVuN+iOKhNS2eb+ZA==",
-      "dependencies": {
-        "tslib": "2.4.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.7",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
-      "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
-    },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/console": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/console/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/console/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/console/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/console/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/console/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/console/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/@jest/console/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/console/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/console/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/console/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/core": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
-      "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
-      "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/reporters": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^27.5.1",
-        "jest-config": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-resolve-dependencies": "^27.5.1",
-        "jest-runner": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "jest-watcher": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "rimraf": "^3.0.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@jest/core/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/core/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/core/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/core/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/@jest/core/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/core/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/environment": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
-      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
-      "dependencies": {
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "jest-mock": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/environment/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/environment/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/environment/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/environment/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/environment/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/environment/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/@jest/environment/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/environment/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/expect-utils": {
-      "version": "29.2.2",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.2.2.tgz",
-      "integrity": "sha512-vwnVmrVhTmGgQzyvcpze08br91OL61t9O0lJMDyb6Y/D8EKQ9V7rGUb/p7PDt0GPzK0zFYqXWFo4EO2legXmkg==",
-      "dev": true,
-      "dependencies": {
-        "jest-get-type": "^29.2.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/fake-timers": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
-      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@sinonjs/fake-timers": "^8.0.1",
-        "@types/node": "*",
-        "jest-message-util": "^27.5.1",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/fake-timers/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/fake-timers/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/fake-timers/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/fake-timers/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/fake-timers/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/fake-timers/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/@jest/fake-timers/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/fake-timers/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/fake-timers/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/fake-timers/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/globals": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
-      "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "expect": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/@jest/globals/node_modules/diff-sequences": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/expect": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/jest-diff": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/jest-matcher-utils": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/reporters": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
-      "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
-      "dependencies": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.2.9",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^5.1.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.1.3",
-        "jest-haste-map": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
-        "slash": "^3.0.0",
-        "source-map": "^0.6.0",
-        "string-length": "^4.0.1",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^8.1.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/@jest/reporters/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/schemas": {
-      "version": "29.0.0",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.0.0.tgz",
-      "integrity": "sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA==",
-      "dev": true,
-      "dependencies": {
-        "@sinclair/typebox": "^0.24.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/source-map": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
-      "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
-      "dependencies": {
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9",
-        "source-map": "^0.6.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/source-map/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@jest/test-result": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-      "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/test-result/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/test-result/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/test-result/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/test-result/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/test-result/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/test-result/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/@jest/test-result/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/test-result/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/test-sequencer": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
-      "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
-      "dependencies": {
-        "@jest/test-result": "^27.5.1",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-runtime": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/transform": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
-      "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
-      "dependencies": {
-        "@babel/core": "^7.1.0",
-        "@jest/types": "^27.5.1",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
-        "slash": "^3.0.0",
-        "source-map": "^0.6.1",
-        "write-file-atomic": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/@jest/transform/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/types": {
-      "version": "29.2.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.2.1.tgz",
-      "integrity": "sha512-O/QNDQODLnINEPAI0cl9U6zUIDXEWXt6IC1o2N2QENuos7hlGUIthlKyV4p6ki3TvXFX071blj8HUhgLGquPjw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.0.0",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/types/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/types/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/types/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/types/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@jest/types/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/types/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/source-map": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25"
-      }
-    },
-    "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
-      }
-    },
-    "node_modules/@leichtgewicht/ip-codec": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
-    },
-    "node_modules/@mui/base": {
-      "version": "5.0.0-alpha.103",
-      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.103.tgz",
-      "integrity": "sha512-fJIyB2df3CHn7D26WHnutnY7vew6aytTlhmRJz6GX7ag19zU2GcOUhJAzY5qwWcrXKnlYgzimhEjaEnuiUWU4g==",
-      "dependencies": {
-        "@babel/runtime": "^7.19.0",
-        "@emotion/is-prop-valid": "^1.2.0",
-        "@mui/types": "^7.2.0",
-        "@mui/utils": "^5.10.9",
-        "@popperjs/core": "^2.11.6",
-        "clsx": "^1.2.1",
-        "prop-types": "^15.8.1",
-        "react-is": "^18.2.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui"
-      },
-      "peerDependencies": {
-        "@types/react": "^17.0.0 || ^18.0.0",
-        "react": "^17.0.0 || ^18.0.0",
-        "react-dom": "^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/core-downloads-tracker": {
-      "version": "5.10.11",
-      "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.11.tgz",
-      "integrity": "sha512-u5ff+UCFDHcR8MoQ8tuJR4c35vt7T/ki3aMEE2O3XQoGs8KJSrBiisFpFKyldg9/W2NSyoZxN+kxEGIfRxh+9Q==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui"
-      }
-    },
-    "node_modules/@mui/icons-material": {
-      "version": "5.10.9",
-      "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.10.9.tgz",
-      "integrity": "sha512-sqClXdEM39WKQJOQ0ZCPTptaZgqwibhj2EFV9N0v7BU1PO8y4OcX/a2wIQHn4fNuDjIZktJIBrmU23h7aqlGgg==",
-      "dependencies": {
-        "@babel/runtime": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui"
-      },
-      "peerDependencies": {
-        "@mui/material": "^5.0.0",
-        "@types/react": "^17.0.0 || ^18.0.0",
-        "react": "^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/material": {
-      "version": "5.10.11",
-      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.11.tgz",
-      "integrity": "sha512-KJ0wPCTbv6sFzwA3dgg0gowdfF+SRl7D510J9l6Nl/KFX0EawcewQudqKY4slYGFXniKa5PykqokpaWXsCCPqg==",
-      "dependencies": {
-        "@babel/runtime": "^7.19.0",
-        "@mui/base": "5.0.0-alpha.103",
-        "@mui/core-downloads-tracker": "^5.10.11",
-        "@mui/system": "^5.10.10",
-        "@mui/types": "^7.2.0",
-        "@mui/utils": "^5.10.9",
-        "@types/react-transition-group": "^4.4.5",
-        "clsx": "^1.2.1",
-        "csstype": "^3.1.1",
-        "prop-types": "^15.8.1",
-        "react-is": "^18.2.0",
-        "react-transition-group": "^4.4.5"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui"
-      },
-      "peerDependencies": {
-        "@emotion/react": "^11.5.0",
-        "@emotion/styled": "^11.3.0",
-        "@types/react": "^17.0.0 || ^18.0.0",
-        "react": "^17.0.0 || ^18.0.0",
-        "react-dom": "^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@emotion/react": {
-          "optional": true
-        },
-        "@emotion/styled": {
-          "optional": true
-        },
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/private-theming": {
-      "version": "5.10.9",
-      "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.10.9.tgz",
-      "integrity": "sha512-BN7/CnsVPVyBaQpDTij4uV2xGYHHHhOgpdxeYLlIu+TqnsVM7wUeF+37kXvHovxM6xmL5qoaVUD98gDC0IZnHg==",
-      "dependencies": {
-        "@babel/runtime": "^7.19.0",
-        "@mui/utils": "^5.10.9",
-        "prop-types": "^15.8.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui"
-      },
-      "peerDependencies": {
-        "@types/react": "^17.0.0 || ^18.0.0",
-        "react": "^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/styled-engine": {
-      "version": "5.10.8",
-      "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.8.tgz",
-      "integrity": "sha512-w+y8WI18EJV6zM/q41ug19cE70JTeO6sWFsQ7tgePQFpy6ToCVPh0YLrtqxUZXSoMStW5FMw0t9fHTFAqPbngw==",
-      "dependencies": {
-        "@babel/runtime": "^7.19.0",
-        "@emotion/cache": "^11.10.3",
-        "csstype": "^3.1.1",
-        "prop-types": "^15.8.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui"
-      },
-      "peerDependencies": {
-        "@emotion/react": "^11.4.1",
-        "@emotion/styled": "^11.3.0",
-        "react": "^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@emotion/react": {
-          "optional": true
-        },
-        "@emotion/styled": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/system": {
-      "version": "5.10.10",
-      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.10.tgz",
-      "integrity": "sha512-TXwtKN0adKpBrZmO+eilQWoPf2veh050HLYrN78Kps9OhlvO70v/2Kya0+mORFhu9yhpAwjHXO8JII/R4a5ZLA==",
-      "dependencies": {
-        "@babel/runtime": "^7.19.0",
-        "@mui/private-theming": "^5.10.9",
-        "@mui/styled-engine": "^5.10.8",
-        "@mui/types": "^7.2.0",
-        "@mui/utils": "^5.10.9",
-        "clsx": "^1.2.1",
-        "csstype": "^3.1.1",
-        "prop-types": "^15.8.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui"
-      },
-      "peerDependencies": {
-        "@emotion/react": "^11.5.0",
-        "@emotion/styled": "^11.3.0",
-        "@types/react": "^17.0.0 || ^18.0.0",
-        "react": "^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@emotion/react": {
-          "optional": true
-        },
-        "@emotion/styled": {
-          "optional": true
-        },
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/types": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.0.tgz",
-      "integrity": "sha512-lGXtFKe5lp3UxTBGqKI1l7G8sE2xBik8qCfrLHD5olwP/YU0/ReWoWT7Lp1//ri32dK39oPMrJN8TgbkCSbsNA==",
-      "peerDependencies": {
-        "@types/react": "*"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mui/utils": {
-      "version": "5.10.9",
-      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.10.9.tgz",
-      "integrity": "sha512-2tdHWrq3+WCy+G6TIIaFx3cg7PorXZ71P375ExuX61od1NOAJP1mK90VxQ8N4aqnj2vmO3AQDkV4oV2Ktvt4bA==",
-      "dependencies": {
-        "@babel/runtime": "^7.19.0",
-        "@types/prop-types": "^15.7.5",
-        "@types/react-is": "^16.7.1 || ^17.0.0",
-        "prop-types": "^15.8.1",
-        "react-is": "^18.2.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mui"
-      },
-      "peerDependencies": {
-        "react": "^17.0.0 || ^18.0.0"
-      }
-    },
-    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
-      "version": "5.1.1-v1",
-      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
-      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
-      "dependencies": {
-        "eslint-scope": "5.1.1"
-      }
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.8.tgz",
-      "integrity": "sha512-wxXRwf+IQ6zvHSJZ+5T2RQNEsq+kx4jKRXfFvdt3nBIUzJUAvXEFsUeoaohDe/Kr84MTjGwcuIUPNcstNJORsA==",
-      "dependencies": {
-        "ansi-html-community": "^0.0.8",
-        "common-path-prefix": "^3.0.0",
-        "core-js-pure": "^3.23.3",
-        "error-stack-parser": "^2.0.6",
-        "find-up": "^5.0.0",
-        "html-entities": "^2.1.0",
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "source-map": "^0.7.3"
-      },
-      "engines": {
-        "node": ">= 10.13"
-      },
-      "peerDependencies": {
-        "@types/webpack": "4.x || 5.x",
-        "react-refresh": ">=0.10.0 <1.0.0",
-        "sockjs-client": "^1.4.0",
-        "type-fest": ">=0.17.0 <4.0.0",
-        "webpack": ">=4.43.0 <6.0.0",
-        "webpack-dev-server": "3.x || 4.x",
-        "webpack-hot-middleware": "2.x",
-        "webpack-plugin-serve": "0.x || 1.x"
-      },
-      "peerDependenciesMeta": {
-        "@types/webpack": {
-          "optional": true
-        },
-        "sockjs-client": {
-          "optional": true
-        },
-        "type-fest": {
-          "optional": true
-        },
-        "webpack-dev-server": {
-          "optional": true
-        },
-        "webpack-hot-middleware": {
-          "optional": true
-        },
-        "webpack-plugin-serve": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@popperjs/core": {
-      "version": "2.11.6",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
-      "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
-    "node_modules/@protobufjs/aspromise": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
-      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="
-    },
-    "node_modules/@protobufjs/base64": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
-      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
-    },
-    "node_modules/@protobufjs/codegen": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
-      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
-    },
-    "node_modules/@protobufjs/eventemitter": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
-      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
-    },
-    "node_modules/@protobufjs/fetch": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
-      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
-      "dependencies": {
-        "@protobufjs/aspromise": "^1.1.1",
-        "@protobufjs/inquire": "^1.1.0"
-      }
-    },
-    "node_modules/@protobufjs/float": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
-      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="
-    },
-    "node_modules/@protobufjs/inquire": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
-      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="
-    },
-    "node_modules/@protobufjs/path": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
-      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="
-    },
-    "node_modules/@protobufjs/pool": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
-      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="
-    },
-    "node_modules/@protobufjs/utf8": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
-      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
-    },
-    "node_modules/@remix-run/router": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.0.2.tgz",
-      "integrity": "sha512-GRSOFhJzjGN+d4sKHTMSvNeUPoZiDHWmRnXfzaxrqe7dE/Nzlc8BiMSJdLDESZlndM7jIUrZ/F4yWqVYlI0rwQ==",
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/@rollup/plugin-babel": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
-      "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.10.4",
-        "@rollup/pluginutils": "^3.1.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "@types/babel__core": "^7.1.9",
-        "rollup": "^1.20.0||^2.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/babel__core": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@rollup/plugin-node-resolve": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz",
-      "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
-      "dependencies": {
-        "@rollup/pluginutils": "^3.1.0",
-        "@types/resolve": "1.17.1",
-        "builtin-modules": "^3.1.0",
-        "deepmerge": "^4.2.2",
-        "is-module": "^1.0.0",
-        "resolve": "^1.19.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0"
-      }
-    },
-    "node_modules/@rollup/plugin-replace": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz",
-      "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==",
-      "dependencies": {
-        "@rollup/pluginutils": "^3.1.0",
-        "magic-string": "^0.25.7"
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0 || ^2.0.0"
-      }
-    },
-    "node_modules/@rollup/pluginutils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
-      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
-      "dependencies": {
-        "@types/estree": "0.0.39",
-        "estree-walker": "^1.0.1",
-        "picomatch": "^2.2.2"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0"
-      }
-    },
-    "node_modules/@rollup/pluginutils/node_modules/@types/estree": {
-      "version": "0.0.39",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
-      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
-    },
-    "node_modules/@rushstack/eslint-patch": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz",
-      "integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg=="
-    },
-    "node_modules/@sinclair/typebox": {
-      "version": "0.24.51",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
-      "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="
-    },
-    "node_modules/@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-      "dependencies": {
-        "type-detect": "4.0.8"
-      }
-    },
-    "node_modules/@sinonjs/fake-timers": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
-      "dependencies": {
-        "@sinonjs/commons": "^1.7.0"
-      }
-    },
-    "node_modules/@surma/rollup-plugin-off-main-thread": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
-      "integrity": "sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==",
-      "dependencies": {
-        "ejs": "^3.1.6",
-        "json5": "^2.2.0",
-        "magic-string": "^0.25.0",
-        "string.prototype.matchall": "^4.0.6"
-      }
-    },
-    "node_modules/@svgr/babel-plugin-add-jsx-attribute": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz",
-      "integrity": "sha512-ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/babel-plugin-remove-jsx-attribute": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz",
-      "integrity": "sha512-yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/babel-plugin-remove-jsx-empty-expression": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz",
-      "integrity": "sha512-LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/babel-plugin-replace-jsx-attribute-value": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz",
-      "integrity": "sha512-PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/babel-plugin-svg-dynamic-title": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz",
-      "integrity": "sha512-zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/babel-plugin-svg-em-dimensions": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz",
-      "integrity": "sha512-cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/babel-plugin-transform-react-native-svg": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz",
-      "integrity": "sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/babel-plugin-transform-svg-component": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz",
-      "integrity": "sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/babel-preset": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.5.0.tgz",
-      "integrity": "sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig==",
-      "dependencies": {
-        "@svgr/babel-plugin-add-jsx-attribute": "^5.4.0",
-        "@svgr/babel-plugin-remove-jsx-attribute": "^5.4.0",
-        "@svgr/babel-plugin-remove-jsx-empty-expression": "^5.0.1",
-        "@svgr/babel-plugin-replace-jsx-attribute-value": "^5.0.1",
-        "@svgr/babel-plugin-svg-dynamic-title": "^5.4.0",
-        "@svgr/babel-plugin-svg-em-dimensions": "^5.4.0",
-        "@svgr/babel-plugin-transform-react-native-svg": "^5.4.0",
-        "@svgr/babel-plugin-transform-svg-component": "^5.5.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/core": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.5.0.tgz",
-      "integrity": "sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ==",
-      "dependencies": {
-        "@svgr/plugin-jsx": "^5.5.0",
-        "camelcase": "^6.2.0",
-        "cosmiconfig": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/hast-util-to-babel-ast": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz",
-      "integrity": "sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ==",
-      "dependencies": {
-        "@babel/types": "^7.12.6"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/plugin-jsx": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz",
-      "integrity": "sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA==",
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@svgr/babel-preset": "^5.5.0",
-        "@svgr/hast-util-to-babel-ast": "^5.5.0",
-        "svg-parser": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/plugin-svgo": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz",
-      "integrity": "sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ==",
-      "dependencies": {
-        "cosmiconfig": "^7.0.0",
-        "deepmerge": "^4.2.2",
-        "svgo": "^1.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@svgr/webpack": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz",
-      "integrity": "sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g==",
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/plugin-transform-react-constant-elements": "^7.12.1",
-        "@babel/preset-env": "^7.12.1",
-        "@babel/preset-react": "^7.12.5",
-        "@svgr/core": "^5.5.0",
-        "@svgr/plugin-jsx": "^5.5.0",
-        "@svgr/plugin-svgo": "^5.5.0",
-        "loader-utils": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      }
-    },
-    "node_modules/@testing-library/dom": {
-      "version": "8.19.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.19.0.tgz",
-      "integrity": "sha512-6YWYPPpxG3e/xOo6HIWwB/58HukkwIVTOaZ0VwdMVjhRUX/01E4FtQbck9GazOOj7MXHc5RBzMrU86iBJHbI+A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^4.2.0",
-        "aria-query": "^5.0.0",
-        "chalk": "^4.1.0",
-        "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.4.4",
-        "pretty-format": "^27.0.2"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@testing-library/dom/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@testing-library/dom/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@testing-library/jest-dom": {
-      "version": "5.16.5",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz",
-      "integrity": "sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA==",
-      "dev": true,
-      "dependencies": {
-        "@adobe/css-tools": "^4.0.1",
-        "@babel/runtime": "^7.9.2",
-        "@types/testing-library__jest-dom": "^5.9.1",
-        "aria-query": "^5.0.0",
-        "chalk": "^3.0.0",
-        "css.escape": "^1.5.1",
-        "dom-accessibility-api": "^0.5.6",
-        "lodash": "^4.17.15",
-        "redent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8",
-        "npm": ">=6",
-        "yarn": ">=1"
-      }
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@testing-library/react": {
-      "version": "13.4.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-13.4.0.tgz",
-      "integrity": "sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "@testing-library/dom": "^8.5.0",
-        "@types/react-dom": "^18.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "react": "^18.0.0",
-        "react-dom": "^18.0.0"
-      }
-    },
-    "node_modules/@tootallnate/once": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@trysound/sax": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
-      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/@types/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
-      "dev": true
-    },
-    "node_modules/@types/babel__core": {
-      "version": "7.1.19",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
-      "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "node_modules/@types/babel__generator": {
-      "version": "7.6.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
-      "dependencies": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__template": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__traverse": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.2.tgz",
-      "integrity": "sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg==",
-      "dependencies": {
-        "@babel/types": "^7.3.0"
-      }
-    },
-    "node_modules/@types/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-      "dependencies": {
-        "@types/connect": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/bonjour": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/connect": {
-      "version": "3.4.35",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-      "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
-      "dependencies": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/eslint": {
-      "version": "8.4.9",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.9.tgz",
-      "integrity": "sha512-jFCSo4wJzlHQLCpceUhUnXdrPuCNOjGFMQ8Eg6JXxlz3QaCKOb7eGi2cephQdM4XTYsNej69P9JDJ1zqNIbncQ==",
-      "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
-      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ=="
-    },
-    "node_modules/@types/express": {
-      "version": "4.17.14",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz",
-      "integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==",
-      "dependencies": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.18",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
-      }
-    },
-    "node_modules/@types/express-serve-static-core": {
-      "version": "4.17.31",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
-      "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
-      "dependencies": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*"
-      }
-    },
-    "node_modules/@types/graceful-fs": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/history": {
-      "version": "4.7.11",
-      "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
-      "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==",
-      "dev": true
-    },
-    "node_modules/@types/hoist-non-react-statics": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
-      "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
-      "dependencies": {
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0"
-      }
-    },
-    "node_modules/@types/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="
-    },
-    "node_modules/@types/http-proxy": {
-      "version": "1.17.9",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
-      "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="
-    },
-    "node_modules/@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "*"
-      }
-    },
-    "node_modules/@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
-      "dependencies": {
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "node_modules/@types/jest": {
-      "version": "29.2.0",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.2.0.tgz",
-      "integrity": "sha512-KO7bPV21d65PKwv3LLsD8Jn3E05pjNjRZvkm+YTacWhVmykAb07wW6IkZUmQAltwQafNcDUEUrMO2h3jeBSisg==",
-      "dev": true,
-      "dependencies": {
-        "expect": "^29.0.0",
-        "pretty-format": "^29.0.0"
-      }
-    },
-    "node_modules/@types/jest/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@types/jest/node_modules/pretty-format": {
-      "version": "29.2.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.2.1.tgz",
-      "integrity": "sha512-Y41Sa4aLCtKAXvwuIpTvcFBkyeYp2gdFWzXGA+ZNES3VwURIB165XO/z7CjETwzCCS53MjW/rLMyyqEnTtaOfA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.0.0",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@types/jquery": {
-      "version": "3.5.14",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz",
-      "integrity": "sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==",
-      "dev": true,
-      "dependencies": {
-        "@types/sizzle": "*"
-      }
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
-    },
-    "node_modules/@types/lodash": {
-      "version": "4.14.186",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.186.tgz",
-      "integrity": "sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==",
-      "dev": true
-    },
-    "node_modules/@types/mime": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
-      "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
-    },
-    "node_modules/@types/node": {
-      "version": "18.11.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.7.tgz",
-      "integrity": "sha512-LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ=="
-    },
-    "node_modules/@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
-    },
-    "node_modules/@types/prettier": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.1.tgz",
-      "integrity": "sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow=="
-    },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.5",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
-    },
-    "node_modules/@types/q": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
-      "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
-    },
-    "node_modules/@types/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="
-    },
-    "node_modules/@types/range-parser": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
-    },
-    "node_modules/@types/react": {
-      "version": "18.0.24",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.24.tgz",
-      "integrity": "sha512-wRJWT6ouziGUy+9uX0aW4YOJxAY0bG6/AOk5AW5QSvZqI7dk6VBIbXvcVgIw/W5Jrl24f77df98GEKTJGOLx7Q==",
-      "dependencies": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/@types/react-dom": {
-      "version": "18.0.8",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.8.tgz",
-      "integrity": "sha512-C3GYO0HLaOkk9dDAz3Dl4sbe4AKUGTCfFIZsz3n/82dPNN8Du533HzKatDxeUYWu24wJgMP1xICqkWk1YOLOIw==",
-      "dev": true,
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
-    "node_modules/@types/react-is": {
-      "version": "17.0.3",
-      "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-17.0.3.tgz",
-      "integrity": "sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==",
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
-    "node_modules/@types/react-redux": {
-      "version": "7.1.24",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz",
-      "integrity": "sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/hoist-non-react-statics": "^3.3.0",
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0",
-        "redux": "^4.0.0"
-      }
-    },
-    "node_modules/@types/react-router": {
-      "version": "5.1.19",
-      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.19.tgz",
-      "integrity": "sha512-Fv/5kb2STAEMT3wHzdKQK2z8xKq38EDIGVrutYLmQVVLe+4orDFquU52hQrULnEHinMKv9FSA6lf9+uNT1ITtA==",
-      "dev": true,
-      "dependencies": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*"
-      }
-    },
-    "node_modules/@types/react-router-dom": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
-      "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
-      "dev": true,
-      "dependencies": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*",
-        "@types/react-router": "*"
-      }
-    },
-    "node_modules/@types/react-transition-group": {
-      "version": "4.4.5",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.5.tgz",
-      "integrity": "sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==",
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
-    "node_modules/@types/react-virtualized-auto-sizer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.1.tgz",
-      "integrity": "sha512-GH8sAnBEM5GV9LTeiz56r4ZhMOUSrP43tAQNSRVxNexDjcNKLCEtnxusAItg1owFUFE6k0NslV26gqVClVvong==",
-      "dev": true,
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
-    "node_modules/@types/react-window": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@types/react-window/-/react-window-1.8.5.tgz",
-      "integrity": "sha512-V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw==",
-      "dev": true,
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
-    "node_modules/@types/redux-form": {
-      "version": "8.3.5",
-      "resolved": "https://registry.npmjs.org/@types/redux-form/-/redux-form-8.3.5.tgz",
-      "integrity": "sha512-SchB4i7nxgWNbJS4cXEZducztkvHzVrb5xlAXwfLpbrLPo6tMY06+kx1GqMv42+YnGy9TpCAkF51a21HatqWBA==",
-      "dev": true,
-      "dependencies": {
-        "@types/react": "*",
-        "redux": "^3.6.0 || ^4.0.0"
-      }
-    },
-    "node_modules/@types/resolve": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
-      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
-    },
-    "node_modules/@types/scheduler": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
-    },
-    "node_modules/@types/semver": {
-      "version": "7.3.13",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
-      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw=="
-    },
-    "node_modules/@types/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
-      "dependencies": {
-        "@types/express": "*"
-      }
-    },
-    "node_modules/@types/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
-      "dependencies": {
-        "@types/mime": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/sizzle": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
-      "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
-      "dev": true
-    },
-    "node_modules/@types/sockjs": {
-      "version": "0.3.33",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="
-    },
-    "node_modules/@types/testing-library__jest-dom": {
-      "version": "5.14.5",
-      "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.5.tgz",
-      "integrity": "sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/jest": "*"
-      }
-    },
-    "node_modules/@types/trusted-types": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz",
-      "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="
-    },
-    "node_modules/@types/use-sync-external-store": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz",
-      "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA=="
-    },
-    "node_modules/@types/ws": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-      "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/yargs": {
-      "version": "17.0.13",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.13.tgz",
-      "integrity": "sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@types/yargs-parser": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
-    },
-    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.41.0.tgz",
-      "integrity": "sha512-DXUS22Y57/LAFSg3x7Vi6RNAuLpTXwxB9S2nIA7msBb/Zt8p7XqMwdpdc1IU7CkOQUPgAqR5fWvxuKCbneKGmA==",
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "5.41.0",
-        "@typescript-eslint/type-utils": "5.41.0",
-        "@typescript-eslint/utils": "5.41.0",
-        "debug": "^4.3.4",
-        "ignore": "^5.2.0",
-        "regexpp": "^3.2.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^5.0.0",
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.41.0.tgz",
-      "integrity": "sha512-/qxT2Kd2q/A22JVIllvws4rvc00/3AT4rAo/0YgEN28y+HPhbJbk6X4+MAHEoZzpNyAOugIT7D/OLnKBW8FfhA==",
-      "dependencies": {
-        "@typescript-eslint/utils": "5.41.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.41.0.tgz",
-      "integrity": "sha512-HQVfix4+RL5YRWZboMD1pUfFN8MpRH4laziWkkAzyO1fvNOY/uinZcvo3QiFJVS/siNHupV8E5+xSwQZrl6PZA==",
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "5.41.0",
-        "@typescript-eslint/types": "5.41.0",
-        "@typescript-eslint/typescript-estree": "5.41.0",
-        "debug": "^4.3.4"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.41.0.tgz",
-      "integrity": "sha512-xOxPJCnuktUkY2xoEZBKXO5DBCugFzjrVndKdUnyQr3+9aDWZReKq9MhaoVnbL+maVwWJu/N0SEtrtEUNb62QQ==",
-      "dependencies": {
-        "@typescript-eslint/types": "5.41.0",
-        "@typescript-eslint/visitor-keys": "5.41.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.41.0.tgz",
-      "integrity": "sha512-L30HNvIG6A1Q0R58e4hu4h+fZqaO909UcnnPbwKiN6Rc3BUEx6ez2wgN7aC0cBfcAjZfwkzE+E2PQQ9nEuoqfA==",
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "5.41.0",
-        "@typescript-eslint/utils": "5.41.0",
-        "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "*"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/types": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.41.0.tgz",
-      "integrity": "sha512-5BejraMXMC+2UjefDvrH0Fo/eLwZRV6859SXRg+FgbhA0R0l6lDqDGAQYhKbXhPN2ofk2kY5sgGyLNL907UXpA==",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.41.0.tgz",
-      "integrity": "sha512-SlzFYRwFSvswzDSQ/zPkIWcHv8O5y42YUskko9c4ki+fV6HATsTODUPbRbcGDFYP86gaJL5xohUEytvyNNcXWg==",
-      "dependencies": {
-        "@typescript-eslint/types": "5.41.0",
-        "@typescript-eslint/visitor-keys": "5.41.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/utils": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.41.0.tgz",
-      "integrity": "sha512-QlvfwaN9jaMga9EBazQ+5DDx/4sAdqDkcs05AsQHMaopluVCUyu1bTRUVKzXbgjDlrRAQrYVoi/sXJ9fmG+KLQ==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.41.0",
-        "@typescript-eslint/types": "5.41.0",
-        "@typescript-eslint/typescript-estree": "5.41.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0",
-        "semver": "^7.3.7"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.41.0.tgz",
-      "integrity": "sha512-vilqeHj267v8uzzakbm13HkPMl7cbYpKVjgFWZPIOHIJHZtinvypUhJ5xBXfWYg4eFKqztbMMpOgFpT9Gfx4fw==",
-      "dependencies": {
-        "@typescript-eslint/types": "5.41.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@webassemblyjs/ast": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
-      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
-      "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA=="
-    },
-    "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ=="
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA=="
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
-      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
-      "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
-        "@webassemblyjs/helper-api-error": "1.13.2",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA=="
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
-      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/wasm-gen": "1.14.1"
-      }
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
-      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
-      "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
-      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ=="
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
-      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/helper-wasm-section": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-opt": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1",
-        "@webassemblyjs/wast-printer": "1.14.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
-      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
-      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
-      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-api-error": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
-      }
-    },
-    "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
-      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
-    },
-    "node_modules/abab": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
-    },
-    "node_modules/accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-globals": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-      "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/acorn-node": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
-      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
-      "dependencies": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      }
-    },
-    "node_modules/acorn-node/node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/address": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/address/-/address-1.2.1.tgz",
-      "integrity": "sha512-B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA==",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/adjust-sourcemap-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
-      "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "regex-parser": "^2.2.11"
-      },
-      "engines": {
-        "node": ">=8.9"
-      }
-    },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "dependencies": {
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ajv-formats/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-formats/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ansi-html-community": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "bin": {
-        "ansi-html": "bin/ansi-html"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/arg": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
-      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/aria-query": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.2.tgz",
-      "integrity": "sha512-JWydkr9MirMg2jGJstDqDgzoHqaFbv7n1ghfXYdtEgXWgdq3jz7IU3SQvtj9k3mAszQBiTpQhFdlH+JIRuGTzg==",
-      "dev": true,
-      "dependencies": {
-        "deep-equal": "^2.0.5"
-      }
-    },
-    "node_modules/array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
-      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.reduce": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz",
-      "integrity": "sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
-    },
-    "node_modules/ast-types-flow": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag=="
-    },
-    "node_modules/async": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-    },
-    "node_modules/at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/autoprefixer": {
-      "version": "10.4.13",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
-      "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-        }
-      ],
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "caniuse-lite": "^1.0.30001426",
-        "fraction.js": "^4.2.0",
-        "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "bin": {
-        "autoprefixer": "bin/autoprefixer"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/axe-core": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.5.0.tgz",
-      "integrity": "sha512-4+rr8eQ7+XXS5nZrKcMO/AikHL0hVqy+lHWAnE3xdHl+aguag8SOQ6eEqLexwLNWgXIMfunGuD3ON1/6Kyet0A==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/axobject-query": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
-      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA=="
-    },
-    "node_modules/babel-jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
-      "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
-      "dependencies": {
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^27.5.1",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.8.0"
-      }
-    },
-    "node_modules/babel-jest/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/babel-jest/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/babel-jest/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/babel-jest/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/babel-jest/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/babel-jest/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/babel-jest/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-jest/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-loader": {
-      "version": "8.2.5",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
-      "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
-      "dependencies": {
-        "find-cache-dir": "^3.3.1",
-        "loader-utils": "^2.0.0",
-        "make-dir": "^3.1.0",
-        "schema-utils": "^2.6.5"
-      },
-      "engines": {
-        "node": ">= 8.9"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "webpack": ">=2"
-      }
-    },
-    "node_modules/babel-loader/node_modules/schema-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.5",
-        "ajv": "^6.12.4",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-plugin-jest-hoist": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
-      "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
-      "dependencies": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.0.0",
-        "@types/babel__traverse": "^7.0.6"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/babel-plugin-macros": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
-      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
-      "dependencies": {
-        "@babel/runtime": "^7.12.5",
-        "cosmiconfig": "^7.0.0",
-        "resolve": "^1.19.0"
-      },
-      "engines": {
-        "node": ">=10",
-        "npm": ">=6"
-      }
-    },
-    "node_modules/babel-plugin-named-asset-import": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz",
-      "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==",
-      "peerDependencies": {
-        "@babel/core": "^7.1.0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
-      "dependencies": {
-        "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "semver": "^6.1.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "core-js-compat": "^3.25.1"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/babel-plugin-transform-react-remove-prop-types": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
-      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="
-    },
-    "node_modules/babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-      "dependencies": {
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/babel-preset-jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
-      "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
-      "dependencies": {
-        "babel-plugin-jest-hoist": "^27.5.1",
-        "babel-preset-current-node-syntax": "^1.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/babel-preset-react-app": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz",
-      "integrity": "sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==",
-      "dependencies": {
-        "@babel/core": "^7.16.0",
-        "@babel/plugin-proposal-class-properties": "^7.16.0",
-        "@babel/plugin-proposal-decorators": "^7.16.4",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.0",
-        "@babel/plugin-proposal-private-methods": "^7.16.0",
-        "@babel/plugin-transform-flow-strip-types": "^7.16.0",
-        "@babel/plugin-transform-react-display-name": "^7.16.0",
-        "@babel/plugin-transform-runtime": "^7.16.4",
-        "@babel/preset-env": "^7.16.4",
-        "@babel/preset-react": "^7.16.0",
-        "@babel/preset-typescript": "^7.16.0",
-        "@babel/runtime": "^7.16.3",
-        "babel-plugin-macros": "^3.1.0",
-        "babel-plugin-transform-react-remove-prop-types": "^0.4.24"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "node_modules/batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
-    },
-    "node_modules/bfj": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/bfj/-/bfj-7.0.2.tgz",
-      "integrity": "sha512-+e/UqUzwmzJamNF50tBV6tZPTORow7gQ96iFow+8b562OdMpEK0BcJEq2OSPEDmAbSMBQ7PKZ87ubFkgxpYWgw==",
-      "dependencies": {
-        "bluebird": "^3.5.5",
-        "check-types": "^11.1.1",
-        "hoopy": "^0.1.4",
-        "tryer": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      }
-    },
-    "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
-    },
-    "node_modules/body-parser": {
-      "version": "1.20.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
-      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.5",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.13.0",
-        "raw-body": "2.5.2",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/bonjour-service": {
-      "version": "1.0.14",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz",
-      "integrity": "sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==",
-      "dependencies": {
-        "array-flatten": "^2.1.2",
-        "dns-equal": "^1.0.0",
-        "fast-deep-equal": "^3.1.3",
-        "multicast-dns": "^7.2.5"
-      }
-    },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browser-process-hrtime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
-    },
-    "node_modules/browserslist": {
-      "version": "4.24.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
-      "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "caniuse-lite": "^1.0.30001716",
-        "electron-to-chromium": "^1.5.149",
-        "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.3"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "dependencies": {
-        "node-int64": "^0.4.0"
-      }
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-    },
-    "node_modules/builtin-modules": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
-      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-      "dependencies": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/camelcase-css": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
-      "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001718",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz",
-      "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ]
-    },
-    "node_modules/case-sensitive-paths-webpack-plugin": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
-      "integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chalk/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/char-regex": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/check-types": {
-      "version": "11.1.2",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.1.2.tgz",
-      "integrity": "sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ=="
-    },
-    "node_modules/chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/ci-info": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.5.0.tgz",
-      "integrity": "sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw=="
-    },
-    "node_modules/cjs-module-lexer": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="
-    },
-    "node_modules/clean-css": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz",
-      "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==",
-      "dependencies": {
-        "source-map": "~0.6.0"
-      },
-      "engines": {
-        "node": ">= 10.0"
-      }
-    },
-    "node_modules/clean-css/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/clsx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-      "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
-      }
-    },
-    "node_modules/coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "dependencies": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 4.0"
-      }
-    },
-    "node_modules/collect-v8-coverage": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-    },
-    "node_modules/colord": {
-      "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
-    },
-    "node_modules/colorette": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/common-path-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
-      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w=="
-    },
-    "node_modules/common-tags": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
-      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
-    },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/compression/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/compression/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/compression/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-    },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA=="
-    },
-    "node_modules/connect-history-api-fallback": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-      "dependencies": {
-        "safe-buffer": "5.2.1"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
-    },
-    "node_modules/cookie": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
-      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
-    },
-    "node_modules/core-js": {
-      "version": "3.26.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz",
-      "integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw==",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat": {
-      "version": "3.26.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz",
-      "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==",
-      "dependencies": {
-        "browserslist": "^4.21.4"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-pure": {
-      "version": "3.42.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.42.0.tgz",
-      "integrity": "sha512-007bM04u91fF4kMgwom2I5cQxAFIy8jVulgr9eozILl/SZE53QOqnW/+vviC+wQWLv+AunBG+8Q0TLoeSsSxRQ==",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
-    },
-    "node_modules/cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/crypto-js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
-      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
-    },
-    "node_modules/crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/css-blank-pseudo": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
-      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "bin": {
-        "css-blank-pseudo": "dist/cli.cjs"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/css-declaration-sorter": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
-      "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.9"
-      }
-    },
-    "node_modules/css-has-pseudo": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
-      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "bin": {
-        "css-has-pseudo": "dist/cli.cjs"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/css-loader": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz",
-      "integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==",
-      "dependencies": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.4.7",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
-        "postcss-modules-scope": "^3.0.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.2.0",
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/css-loader/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/css-minimizer-webpack-plugin": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
-      "integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==",
-      "dependencies": {
-        "cssnano": "^5.0.6",
-        "jest-worker": "^27.0.2",
-        "postcss": "^8.3.5",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@parcel/css": {
-          "optional": true
-        },
-        "clean-css": {
-          "optional": true
-        },
-        "csso": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/css-prefers-color-scheme": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
-      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
-      "bin": {
-        "css-prefers-color-scheme": "dist/cli.cjs"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/css-select": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
-    },
-    "node_modules/css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
-      "dependencies": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/css-tree/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/css.escape": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
-      "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==",
-      "dev": true
-    },
-    "node_modules/cssdb": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.0.2.tgz",
-      "integrity": "sha512-Vm4b6P/PifADu0a76H0DKRNVWq3Rq9xa/Nx6oEMUBJlwTUuZoZ3dkZxo8Gob3UEL53Cq+Ma1GBgISed6XEBs3w==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      }
-    },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/cssnano": {
-      "version": "5.1.14",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.14.tgz",
-      "integrity": "sha512-Oou7ihiTocbKqi0J1bB+TRJIQX5RMR3JghA8hcWSw9mjBLQ5Y3RWqEDoYG3sRNlAbCIXpqMoZGbq5KDR3vdzgw==",
-      "dependencies": {
-        "cssnano-preset-default": "^5.2.13",
-        "lilconfig": "^2.0.3",
-        "yaml": "^1.10.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/cssnano"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/cssnano-preset-default": {
-      "version": "5.2.13",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.13.tgz",
-      "integrity": "sha512-PX7sQ4Pb+UtOWuz8A1d+Rbi+WimBIxJTRyBdgGp1J75VU0r/HFQeLnMYgHiCAp6AR4rqrc7Y4R+1Rjk3KJz6DQ==",
-      "dependencies": {
-        "css-declaration-sorter": "^6.3.1",
-        "cssnano-utils": "^3.1.0",
-        "postcss-calc": "^8.2.3",
-        "postcss-colormin": "^5.3.0",
-        "postcss-convert-values": "^5.1.3",
-        "postcss-discard-comments": "^5.1.2",
-        "postcss-discard-duplicates": "^5.1.0",
-        "postcss-discard-empty": "^5.1.1",
-        "postcss-discard-overridden": "^5.1.0",
-        "postcss-merge-longhand": "^5.1.7",
-        "postcss-merge-rules": "^5.1.3",
-        "postcss-minify-font-values": "^5.1.0",
-        "postcss-minify-gradients": "^5.1.1",
-        "postcss-minify-params": "^5.1.4",
-        "postcss-minify-selectors": "^5.2.1",
-        "postcss-normalize-charset": "^5.1.0",
-        "postcss-normalize-display-values": "^5.1.0",
-        "postcss-normalize-positions": "^5.1.1",
-        "postcss-normalize-repeat-style": "^5.1.1",
-        "postcss-normalize-string": "^5.1.0",
-        "postcss-normalize-timing-functions": "^5.1.0",
-        "postcss-normalize-unicode": "^5.1.1",
-        "postcss-normalize-url": "^5.1.0",
-        "postcss-normalize-whitespace": "^5.1.1",
-        "postcss-ordered-values": "^5.1.3",
-        "postcss-reduce-initial": "^5.1.1",
-        "postcss-reduce-transforms": "^5.1.0",
-        "postcss-svgo": "^5.1.0",
-        "postcss-unique-selectors": "^5.1.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/cssnano-utils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
-      "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dependencies": {
-        "css-tree": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso/node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-      "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/csso/node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
-    },
-    "node_modules/csso/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/cssom": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
-    },
-    "node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dependencies": {
-        "cssom": "~0.3.6"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
-    },
-    "node_modules/csstype": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
-      "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
-    },
-    "node_modules/damerau-levenshtein": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
-      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA=="
-    },
-    "node_modules/data-urls": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
-      "dependencies": {
-        "abab": "^2.0.3",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decimal.js": {
-      "version": "10.4.2",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.2.tgz",
-      "integrity": "sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA=="
-    },
-    "node_modules/dedent": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="
-    },
-    "node_modules/deep-equal": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz",
-      "integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "es-get-iterator": "^1.1.1",
-        "get-intrinsic": "^1.0.1",
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.2",
-        "is-regex": "^1.1.1",
-        "isarray": "^2.0.5",
-        "object-is": "^1.1.4",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.3.0",
-        "side-channel": "^1.0.3",
-        "which-boxed-primitive": "^1.0.1",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
-    },
-    "node_modules/deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-      "dependencies": {
-        "execa": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-      "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/defined": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
-      "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
-    },
-    "node_modules/detect-port-alt": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
-      "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
-      "dependencies": {
-        "address": "^1.0.1",
-        "debug": "^2.6.0"
-      },
-      "bin": {
-        "detect": "bin/detect-port",
-        "detect-port": "bin/detect-port"
-      },
-      "engines": {
-        "node": ">= 4.2.1"
-      }
-    },
-    "node_modules/detect-port-alt/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/detect-port-alt/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/detective": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz",
-      "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==",
-      "dependencies": {
-        "acorn-node": "^1.8.2",
-        "defined": "^1.0.0",
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "detective": "bin/detective.js"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/dexie": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/dexie/-/dexie-3.2.2.tgz",
-      "integrity": "sha512-q5dC3HPmir2DERlX+toCBbHQXW5MsyrFqPFcovkH9N2S/UW/H3H5AWAB6iEOExeraAu+j+zRDG+zg/D7YhH0qg==",
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/didyoumean": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
-    },
-    "node_modules/diff-sequences": {
-      "version": "29.2.0",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.2.0.tgz",
-      "integrity": "sha512-413SY5JpYeSBZxmenGEmCVQ8mCgtFJF0w9PROdaS6z987XC2Pd2GOKqOITLtMftmyFZqgtCOb/QA7/Z3ZXfzIw==",
-      "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/dlv": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
-    },
-    "node_modules/dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="
-    },
-    "node_modules/dns-packet": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz",
-      "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==",
-      "dependencies": {
-        "@leichtgewicht/ip-codec": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/dom-accessibility-api": {
-      "version": "0.5.14",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.14.tgz",
-      "integrity": "sha512-NMt+m9zFMPZe0JcY9gN224Qvk6qLIdqex29clBvc/y75ZBX9YA9wNK3frsYvu2DI1xcCIwxwnX+TlsJ2DSOADg==",
-      "dev": true
-    },
-    "node_modules/dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "dependencies": {
-        "utila": "~0.4"
-      }
-    },
-    "node_modules/dom-helpers": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
-      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
-      "dependencies": {
-        "@babel/runtime": "^7.8.7",
-        "csstype": "^3.0.2"
-      }
-    },
-    "node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/domexception": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
-      "dependencies": {
-        "webidl-conversions": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/domexception/node_modules/webidl-conversions": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/dot-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/dotenv": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
-      "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/dotenv-expand": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
-      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="
-    },
-    "node_modules/duplexer": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
-    },
-    "node_modules/ejs": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
-      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
-      "dependencies": {
-        "jake": "^10.8.5"
-      },
-      "bin": {
-        "ejs": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.5.155",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.155.tgz",
-      "integrity": "sha512-ps5KcGGmwL8VaeJlvlDlu4fORQpv3+GIcF5I3f9tUKUlJ/wsysh6HU8P5L1XWRYeXfA0oJd4PyM8ds8zTFf6Ng=="
-    },
-    "node_modules/emittery": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-      "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
-    },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/enhanced-resolve": {
-      "version": "5.18.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
-      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
-      "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/error-stack-parser": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
-      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
-      "dependencies": {
-        "stackframe": "^1.3.4"
-      }
-    },
-    "node_modules/es-abstract": {
-      "version": "1.20.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-array-method-boxes-properly": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="
-    },
-    "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-get-iterator": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
-      "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.0",
-        "has-symbols": "^1.0.1",
-        "is-arguments": "^1.1.0",
-        "is-map": "^2.0.2",
-        "is-set": "^2.0.2",
-        "is-string": "^1.0.5",
-        "isarray": "^2.0.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es-module-lexer": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
-      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA=="
-    },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dependencies": {
-        "has": "^1.0.3"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="
-    },
-    "node_modules/escalade": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/escodegen/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-      "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/escodegen/node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-      "dependencies": {
-        "prelude-ls": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eslint": {
-      "version": "8.26.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz",
-      "integrity": "sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==",
-      "dependencies": {
-        "@eslint/eslintrc": "^1.3.3",
-        "@humanwhocodes/config-array": "^0.11.6",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.15.0",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-react-app": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz",
-      "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==",
-      "dependencies": {
-        "@babel/core": "^7.16.0",
-        "@babel/eslint-parser": "^7.16.3",
-        "@rushstack/eslint-patch": "^1.1.0",
-        "@typescript-eslint/eslint-plugin": "^5.5.0",
-        "@typescript-eslint/parser": "^5.5.0",
-        "babel-preset-react-app": "^10.0.1",
-        "confusing-browser-globals": "^1.0.11",
-        "eslint-plugin-flowtype": "^8.0.3",
-        "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-jest": "^25.3.0",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-react": "^7.27.1",
-        "eslint-plugin-react-hooks": "^4.3.0",
-        "eslint-plugin-testing-library": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^8.0.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "dependencies": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      }
-    },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
-      "dependencies": {
-        "debug": "^3.2.7"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/eslint-plugin-flowtype": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
-      "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
-      "dependencies": {
-        "lodash": "^4.17.21",
-        "string-natural-compare": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@babel/plugin-syntax-flow": "^7.14.5",
-        "@babel/plugin-transform-react-jsx": "^7.14.9",
-        "eslint": "^8.1.0"
-      }
-    },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
-      "dependencies": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/eslint-plugin-jest": {
-      "version": "25.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
-      "integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==",
-      "dependencies": {
-        "@typescript-eslint/experimental-utils": "^5.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/eslint-plugin": "^4.0.0 || ^5.0.0",
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@typescript-eslint/eslint-plugin": {
-          "optional": true
-        },
-        "jest": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.6.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz",
-      "integrity": "sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==",
-      "dependencies": {
-        "@babel/runtime": "^7.18.9",
-        "aria-query": "^4.2.2",
-        "array-includes": "^3.1.5",
-        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.4.3",
-        "axobject-query": "^2.2.0",
-        "damerau-levenshtein": "^1.0.8",
-        "emoji-regex": "^9.2.2",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.3.2",
-        "language-tags": "^1.0.5",
-        "minimatch": "^3.1.2",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
-      "dependencies": {
-        "@babel/runtime": "^7.10.2",
-        "@babel/runtime-corejs3": "^7.10.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      }
-    },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.31.10",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.10.tgz",
-      "integrity": "sha512-e4N/nc6AAlg4UKW/mXeYWd3R++qUano5/o+t+wnWxIf+bLsOaH3a4q74kX3nDjYym3VBN4HyO9nEn1GcAqgQOA==",
-      "dependencies": {
-        "array-includes": "^3.1.5",
-        "array.prototype.flatmap": "^1.3.0",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.5",
-        "object.fromentries": "^2.0.5",
-        "object.hasown": "^1.1.1",
-        "object.values": "^1.1.5",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.3",
-        "semver": "^6.3.0",
-        "string.prototype.matchall": "^4.0.7"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
-      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.4",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-      "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
-      "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-plugin-testing-library": {
-      "version": "5.9.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.9.1.tgz",
-      "integrity": "sha512-6BQp3tmb79jLLasPHJmy8DnxREe+2Pgf7L+7o09TSWPfdqqtQfRZmZNetr5mOs3yqZk/MRNxpN3RUpJe0wB4LQ==",
-      "dependencies": {
-        "@typescript-eslint/utils": "^5.13.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0",
-        "npm": ">=6"
-      },
-      "peerDependencies": {
-        "eslint": "^7.5.0 || ^8.0.0"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
-      }
-    },
-    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint-webpack-plugin": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz",
-      "integrity": "sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==",
-      "dependencies": {
-        "@types/eslint": "^7.29.0 || ^8.4.1",
-        "jest-worker": "^28.0.2",
-        "micromatch": "^4.0.5",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0",
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/jest-worker": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz",
-      "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==",
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-    },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/eslint/node_modules/eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-      "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/espree": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
-      "dependencies": {
-        "acorn": "^8.8.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esquery/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/esrecurse/node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estree-walker": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "engines": {
-        "node": ">=0.8.x"
-      }
-    },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/expect": {
-      "version": "29.2.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.2.2.tgz",
-      "integrity": "sha512-hE09QerxZ5wXiOhqkXy5d2G9ar+EqOyifnCXCpMNu+vZ6DG9TJ6CO2c2kPDSLqERTTWrO7OZj8EkYHQqSd78Yw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/expect-utils": "^29.2.2",
-        "jest-get-type": "^29.2.0",
-        "jest-matcher-utils": "^29.2.2",
-        "jest-message-util": "^29.2.1",
-        "jest-util": "^29.2.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/express": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
-      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
-      "dependencies": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.3",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.7.1",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~2.0.0",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.3.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.3",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.12",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.13.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.19.0",
-        "serve-static": "1.16.2",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
-      }
-    },
-    "node_modules/express/node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
-    },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/express/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "node_modules/fast-glob": {
-      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
-    },
-    "node_modules/fast-uri": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
-      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fastify"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fastify"
-        }
-      ]
-    },
-    "node_modules/fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "dependencies": {
-        "websocket-driver": ">=0.5.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/fb-watchman": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
-      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
-      "dependencies": {
-        "bser": "2.1.1"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/file-loader": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
-      "dependencies": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/filelist": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
-      "dependencies": {
-        "minimatch": "^5.0.1"
-      }
-    },
-    "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/filelist/node_modules/minimatch": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-      "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/filesize": {
-      "version": "8.0.7",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz",
-      "integrity": "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/final-form": {
-      "version": "4.20.7",
-      "resolved": "https://registry.npmjs.org/final-form/-/final-form-4.20.7.tgz",
-      "integrity": "sha512-ii3X9wNfyBYFnDPunYN5jh1/HAvtOZ9aJI/TVk0MB86hZuOeYkb+W5L3icgwW9WWNztZR6MDU3En6eoZTUoFPg==",
-      "dependencies": {
-        "@babel/runtime": "^7.10.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/final-form"
-      }
-    },
-    "node_modules/final-form-set-field-touched": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/final-form-set-field-touched/-/final-form-set-field-touched-1.0.1.tgz",
-      "integrity": "sha512-yvE5AAs9U3OgJQ9YF8NhSF0I0mJEECvOpkaXNqovloxji5Q6gOZ0DCIAyLAKHluGSpsXKUGORyBm8Hq0beZIqQ==",
-      "peerDependencies": {
-        "final-form": ">=1.2.0"
-      }
-    },
-    "node_modules/finalhandler": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~2.0.0",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
-      }
-    },
-    "node_modules/find-root": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
-    },
-    "node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.15.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
-      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.3"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.2.tgz",
-      "integrity": "sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA==",
-      "dependencies": {
-        "@babel/code-frame": "^7.8.3",
-        "@types/json-schema": "^7.0.5",
-        "chalk": "^4.1.0",
-        "chokidar": "^3.4.2",
-        "cosmiconfig": "^6.0.0",
-        "deepmerge": "^4.2.2",
-        "fs-extra": "^9.0.0",
-        "glob": "^7.1.6",
-        "memfs": "^3.1.2",
-        "minimatch": "^3.0.4",
-        "schema-utils": "2.7.0",
-        "semver": "^7.3.2",
-        "tapable": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=10",
-        "yarn": ">=1.0.0"
-      },
-      "peerDependencies": {
-        "eslint": ">= 6",
-        "typescript": ">= 2.7",
-        "vue-template-compiler": "*",
-        "webpack": ">= 4"
-      },
-      "peerDependenciesMeta": {
-        "eslint": {
-          "optional": true
-        },
-        "vue-template-compiler": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/cosmiconfig": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-      "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-      "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.1.0",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.7.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-      "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.4",
-        "ajv": "^6.12.2",
-        "ajv-keywords": "^3.4.1"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/tapable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fraction.js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-      "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "type": "patreon",
-        "url": "https://www.patreon.com/infusion"
-      }
-    },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q=="
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-own-enumerable-property-symbols": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
-      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="
-    },
-    "node_modules/get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
-    },
-    "node_modules/global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dependencies": {
-        "global-prefix": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "dependencies": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-prefix/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
-    },
-    "node_modules/grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
-    },
-    "node_modules/gzip-size": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
-      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
-      "dependencies": {
-        "duplexer": "^0.1.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
-    },
-    "node_modules/harmony-reflect": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
-      "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g=="
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-      "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/hoist-non-react-statics": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-      "dependencies": {
-        "react-is": "^16.7.0"
-      }
-    },
-    "node_modules/hoist-non-react-statics/node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "node_modules/hoopy": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
-    "node_modules/hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      }
-    },
-    "node_modules/hpack.js/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-    },
-    "node_modules/hpack.js/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/hpack.js/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "node_modules/hpack.js/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/html-encoding-sniffer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
-      "dependencies": {
-        "whatwg-encoding": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/html-entities": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
-      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA=="
-    },
-    "node_modules/html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
-    },
-    "node_modules/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
-      "dependencies": {
-        "camel-case": "^4.1.2",
-        "clean-css": "^5.2.2",
-        "commander": "^8.3.0",
-        "he": "^1.2.0",
-        "param-case": "^3.0.4",
-        "relateurl": "^0.2.7",
-        "terser": "^5.10.0"
-      },
-      "bin": {
-        "html-minifier-terser": "cli.js"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/html-parse-stringify": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
-      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
-      "dependencies": {
-        "void-elements": "3.1.0"
-      }
-    },
-    "node_modules/html-webpack-plugin": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
-      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
-      "dependencies": {
-        "@types/html-minifier-terser": "^6.0.0",
-        "html-minifier-terser": "^6.0.2",
-        "lodash": "^4.17.21",
-        "pretty-error": "^4.0.0",
-        "tapable": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/html-webpack-plugin"
-      },
-      "peerDependencies": {
-        "webpack": "^5.20.0"
-      }
-    },
-    "node_modules/htmlparser2": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="
-    },
-    "node_modules/http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-      "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
-    },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-      "dependencies": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/http-proxy-middleware": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz",
-      "integrity": "sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==",
-      "dependencies": {
-        "@types/http-proxy": "^1.17.8",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@types/express": "^4.17.13"
-      },
-      "peerDependenciesMeta": {
-        "@types/express": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/husky": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
-      "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==",
-      "dev": true,
-      "bin": {
-        "husky": "lib/bin.js"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/typicode"
-      }
-    },
-    "node_modules/i18next": {
-      "version": "22.0.4",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-22.0.4.tgz",
-      "integrity": "sha512-TOp7BTMKDbUkOHMzDlVsCYWpyaFkKakrrO3HNXfSz4EeJaWwnBScRmgQSTaWHScXVHBUFXTvShrCW8uryBYFcg==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://locize.com"
-        },
-        {
-          "type": "individual",
-          "url": "https://locize.com/i18next.html"
-        },
-        {
-          "type": "individual",
-          "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
-        }
-      ],
-      "dependencies": {
-        "@babel/runtime": "^7.17.2"
-      }
-    },
-    "node_modules/i18next-browser-languagedetector": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-7.0.0.tgz",
-      "integrity": "sha512-RrH7z5/DbhzhgCLDFIKXBTZlb2aXi38ZHa5e5oZaPt9zGLWmgAX49mzkQL/E7R6Y9fTE8QbZFuyMV0ronu4H/Q==",
-      "dependencies": {
-        "@babel/runtime": "^7.19.4"
-      }
-    },
-    "node_modules/i18next-icu": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/i18next-icu/-/i18next-icu-2.0.3.tgz",
-      "integrity": "sha512-sZ0VCWDnHysUYQL8j/0rVOxv6rLR+SBoaqQQ2UVNfLyJCuf/bAjYPkoUQgyuDkWFo1xZjeCf4G6GBNr7gD61bQ==",
-      "peerDependencies": {
-        "intl-messageformat": "^9.0.0"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/icss-utils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/idb": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.0.tgz",
-      "integrity": "sha512-Wsk07aAxDsntgYJY4h0knZJuTxM73eQ4reRAO+Z1liOh8eMCJ/MoDS8fCui1vGT9mnjtl1sOu3I2i/W1swPYZg=="
-    },
-    "node_modules/identity-obj-proxy": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
-      "integrity": "sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==",
-      "dependencies": {
-        "harmony-reflect": "^1.4.6"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/immer": {
-      "version": "9.0.16",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.16.tgz",
-      "integrity": "sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/immer"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "dependencies": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/intl-messageformat": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.2.1.tgz",
-      "integrity": "sha512-1lrJG2qKzcC1TVzYu1VuB1yiY68LU5rwpbHa2THCzA67Vutkz7+1lv5U20K3Lz5RAiH78zxNztMEtchokMWv8A==",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "1.13.0",
-        "@formatjs/fast-memoize": "1.2.6",
-        "@formatjs/icu-messageformat-parser": "2.1.10",
-        "tslib": "2.4.0"
-      }
-    },
-    "node_modules/invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "node_modules/ipaddr.js": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-      "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
-      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
-    },
-    "node_modules/is-promise": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-      "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-root": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
-      "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-set": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
-      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz",
-      "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==",
-      "dev": true,
-      "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.20.0",
-        "for-each": "^0.3.3",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
-    },
-    "node_modules/is-weakmap": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
-      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakset": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
-      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dependencies": {
-        "is-docker": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
-    },
-    "node_modules/istanbul-lib-coverage": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-      "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/istanbul-reports": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
-      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
-      "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jake": {
-      "version": "10.8.5",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
-      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
-      "dependencies": {
-        "async": "^3.2.3",
-        "chalk": "^4.0.2",
-        "filelist": "^1.0.1",
-        "minimatch": "^3.0.4"
-      },
-      "bin": {
-        "jake": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jake/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jake/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jake/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jake/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jake/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jake/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
-      "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
-      "dependencies": {
-        "@jest/core": "^27.5.1",
-        "import-local": "^3.0.2",
-        "jest-cli": "^27.5.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-changed-files": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
-      "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "execa": "^5.0.0",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-changed-files/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-circus": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
-      "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^0.7.0",
-        "expect": "^27.5.1",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-circus/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-circus/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-circus/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-circus/node_modules/diff-sequences": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/expect": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-circus/node_modules/jest-diff": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/jest-matcher-utils": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
-      "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
-      "dependencies": {
-        "@jest/core": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "import-local": "^3.0.2",
-        "jest-config": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "prompts": "^2.0.1",
-        "yargs": "^16.2.0"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-cli/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-cli/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-cli/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-cli/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-cli/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-cli/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-cli/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-cli/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-config": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
-      "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
-      "dependencies": {
-        "@babel/core": "^7.8.0",
-        "@jest/test-sequencer": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "babel-jest": "^27.5.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^27.5.1",
-        "jest-environment-jsdom": "^27.5.1",
-        "jest-environment-node": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-jasmine2": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-runner": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "parse-json": "^5.2.0",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "peerDependencies": {
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-config/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-config/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-config/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-config/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-config/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-config/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-config/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-config/node_modules/jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-config/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-config/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-diff": {
-      "version": "29.2.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.2.1.tgz",
-      "integrity": "sha512-gfh/SMNlQmP3MOUgdzxPOd4XETDJifADpT937fN1iUGz+9DgOu2eUPHH25JDkLVcLwwqxv3GzVyK4VBUr9fjfA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^29.2.0",
-        "jest-get-type": "^29.2.0",
-        "pretty-format": "^29.2.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-diff/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-diff/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-diff/node_modules/pretty-format": {
-      "version": "29.2.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.2.1.tgz",
-      "integrity": "sha512-Y41Sa4aLCtKAXvwuIpTvcFBkyeYp2gdFWzXGA+ZNES3VwURIB165XO/z7CjETwzCCS53MjW/rLMyyqEnTtaOfA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.0.0",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-diff/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-docblock": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
-      "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
-      "dependencies": {
-        "detect-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-each": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
-      "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-each/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-each/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-each/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-each/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-each/node_modules/jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-environment-jsdom": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
-      "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jsdom": "^16.6.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-environment-jsdom/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-environment-jsdom/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-environment-jsdom/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-environment-jsdom/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-environment-jsdom/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-environment-jsdom/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-environment-jsdom/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-environment-jsdom/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-environment-jsdom/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-environment-node": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
-      "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-environment-node/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-environment-node/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-environment-node/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-environment-node/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-environment-node/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-environment-node/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-environment-node/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-environment-node/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-environment-node/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-get-type": {
-      "version": "29.2.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.2.0.tgz",
-      "integrity": "sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-haste-map": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
-      "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/graceful-fs": "^4.1.2",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^27.5.1",
-        "jest-serializer": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.7"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
-      }
-    },
-    "node_modules/jest-haste-map/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-haste-map/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-haste-map/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-haste-map/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-haste-map/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-haste-map/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-haste-map/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-haste-map/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-haste-map/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-jasmine2": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
-      "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/source-map": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "expect": "^27.5.1",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-jasmine2/node_modules/diff-sequences": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/expect": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/jest-diff": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/jest-matcher-utils": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-jasmine2/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-leak-detector": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
-      "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
-      "dependencies": {
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-leak-detector/node_modules/jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils": {
-      "version": "29.2.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.2.2.tgz",
-      "integrity": "sha512-4DkJ1sDPT+UX2MR7Y3od6KtvRi9Im1ZGLGgdLFLm4lPexbTaCgJW5NN3IOXlQHF7NSHY/VHhflQ+WoKtD/vyCw==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^29.2.1",
-        "jest-get-type": "^29.2.0",
-        "pretty-format": "^29.2.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-matcher-utils/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/pretty-format": {
-      "version": "29.2.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.2.1.tgz",
-      "integrity": "sha512-Y41Sa4aLCtKAXvwuIpTvcFBkyeYp2gdFWzXGA+ZNES3VwURIB165XO/z7CjETwzCCS53MjW/rLMyyqEnTtaOfA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.0.0",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-message-util": {
-      "version": "29.2.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.2.1.tgz",
-      "integrity": "sha512-Dx5nEjw9V8C1/Yj10S/8ivA8F439VS8vTq1L7hEgwHFn9ovSKNpYW/kwNh7UglaEgXO42XxzKJB+2x0nSglFVw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.2.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.2.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-message-util/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/pretty-format": {
-      "version": "29.2.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.2.1.tgz",
-      "integrity": "sha512-Y41Sa4aLCtKAXvwuIpTvcFBkyeYp2gdFWzXGA+ZNES3VwURIB165XO/z7CjETwzCCS53MjW/rLMyyqEnTtaOfA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.0.0",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-mock": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
-      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-mock/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-mock/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-mock/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-mock/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-mock/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-mock/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-mock/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-mock/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "jest-resolve": "*"
-      },
-      "peerDependenciesMeta": {
-        "jest-resolve": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-regex-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
-      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-resolve": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
-      "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^1.1.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
-      "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-snapshot": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-resolve-dependencies/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-resolve-dependencies/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-resolve-dependencies/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-resolve-dependencies/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-resolve-dependencies/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-resolve-dependencies/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-resolve-dependencies/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-resolve-dependencies/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-resolve/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runner": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
-      "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
-      "dependencies": {
-        "@jest/console": "^27.5.1",
-        "@jest/environment": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^27.5.1",
-        "jest-environment-jsdom": "^27.5.1",
-        "jest-environment-node": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-leak-detector": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
-        "source-map-support": "^0.5.6",
-        "throat": "^6.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-runner/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-runner/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-runner/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-runner/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runner/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
-      "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
-      "dependencies": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/globals": "^27.5.1",
-        "@jest/source-map": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "execa": "^5.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-mock": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-runtime/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-serializer": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
-      "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
-      "dependencies": {
-        "@types/node": "*",
-        "graceful-fs": "^4.2.9"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-snapshot": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
-      "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
-      "dependencies": {
-        "@babel/core": "^7.7.2",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/babel__traverse": "^7.0.4",
-        "@types/prettier": "^2.1.5",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^27.5.1",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^27.5.1",
-        "semver": "^7.3.2"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-snapshot/node_modules/diff-sequences": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-      "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/expect": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-      "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/jest-diff": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-      "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/jest-matcher-utils": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-      "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/jest-message-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-      "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^27.5.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-util": {
-      "version": "29.2.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.2.1.tgz",
-      "integrity": "sha512-P5VWDj25r7kj7kl4pN2rG/RN2c1TLfYYYZYULnS/35nFDjBai+hBeo3MDrYZS7p6IoY3YHZnt2vq4L6mKnLk0g==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.2.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-util/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-util/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-util/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-util/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-validate": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
-      "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^27.5.1",
-        "leven": "^3.1.0",
-        "pretty-format": "^27.5.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-validate/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-validate/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-validate/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-validate/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-validate/node_modules/jest-get-type": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-      "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-watch-typeahead": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
-      "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==",
-      "dependencies": {
-        "ansi-escapes": "^4.3.1",
-        "chalk": "^4.0.0",
-        "jest-regex-util": "^28.0.0",
-        "jest-watcher": "^28.0.0",
-        "slash": "^4.0.0",
-        "string-length": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "jest": "^27.0.0 || ^28.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/@jest/console": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz",
-      "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==",
-      "dependencies": {
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^28.1.3",
-        "jest-util": "^28.1.3",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/@jest/console/node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/@jest/schemas": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
-      "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
-      "dependencies": {
-        "@sinclair/typebox": "^0.24.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/@jest/test-result": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz",
-      "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==",
-      "dependencies": {
-        "@jest/console": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/@jest/types": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz",
-      "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==",
-      "dependencies": {
-        "@jest/schemas": "^28.1.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-watch-typeahead/node_modules/emittery": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
-      "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/jest-message-util": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz",
-      "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^28.1.3",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^28.1.3",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/jest-message-util/node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/jest-regex-util": {
-      "version": "28.0.2",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-      "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==",
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/jest-util": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz",
-      "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==",
-      "dependencies": {
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/jest-watcher": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz",
-      "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==",
-      "dependencies": {
-        "@jest/test-result": "^28.1.3",
-        "@jest/types": "^28.1.3",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.10.2",
-        "jest-util": "^28.1.3",
-        "string-length": "^4.0.1"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/jest-watcher/node_modules/string-length": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-      "dependencies": {
-        "char-regex": "^1.0.2",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/jest-watcher/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/pretty-format": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-      "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-      "dependencies": {
-        "@jest/schemas": "^28.1.3",
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/string-length": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
-      "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
-      "dependencies": {
-        "char-regex": "^2.0.0",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/string-length/node_modules/char-regex": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
-      "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==",
-      "engines": {
-        "node": ">=12.20"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/strip-ansi": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-      "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/strip-ansi/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-watcher": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
-      "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
-      "dependencies": {
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "jest-util": "^27.5.1",
-        "string-length": "^4.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/@jest/types": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-      "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^16.0.0",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/@types/yargs": {
-      "version": "16.0.4",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jest-watcher/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/jest-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-      "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-      "dependencies": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/js-sdsl": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
-      "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q=="
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsdom": {
-      "version": "16.7.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
-      "dependencies": {
-        "abab": "^2.0.5",
-        "acorn": "^8.2.4",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.4.4",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.1",
-        "domexception": "^2.0.1",
-        "escodegen": "^2.0.0",
-        "form-data": "^3.0.0",
-        "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^2.0.0",
-        "webidl-conversions": "^6.1.0",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.5.0",
-        "ws": "^7.4.6",
-        "xml-name-validator": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "node_modules/json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
-    },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/jsonpointer": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
-      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jsx-ast-utils": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz",
-      "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==",
-      "dependencies": {
-        "array-includes": "^3.1.5",
-        "object.assign": "^4.1.3"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/klona": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/language-subtag-registry": {
-      "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
-      "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w=="
-    },
-    "node_modules/language-tags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
-      "dependencies": {
-        "language-subtag-registry": "~0.3.2"
-      }
-    },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/lilconfig": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz",
-      "integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
-    },
-    "node_modules/loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "engines": {
-        "node": ">=6.11.5"
-      }
-    },
-    "node_modules/loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
-    },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
-    },
-    "node_modules/lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="
-    },
-    "node_modules/lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
-    },
-    "node_modules/long": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-5.2.0.tgz",
-      "integrity": "sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w=="
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "dependencies": {
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/lz-string": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
-      "integrity": "sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==",
-      "dev": true,
-      "bin": {
-        "lz-string": "bin/bin.js"
-      }
-    },
-    "node_modules/magic-string": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
-      "dependencies": {
-        "sourcemap-codec": "^1.4.8"
-      }
-    },
-    "node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/makeerror": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "dependencies": {
-        "tmpl": "1.0.5"
-      }
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/memfs": {
-      "version": "3.4.9",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.9.tgz",
-      "integrity": "sha512-3rm8kbrzpUGRyPKSGuk387NZOwQ90O4rI9tsWQkzNW7BLSnKGp23RsEsKK8N8QVCrtJoAMqy3spxHC4os4G6PQ==",
-      "dependencies": {
-        "fs-monkey": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/memoize-one": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
-      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
-    },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
-      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/mini-css-extract-plugin": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz",
-      "integrity": "sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==",
-      "dependencies": {
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node_modules/multicast-dns": {
-      "version": "7.2.5",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
-      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
-      "dependencies": {
-        "dns-packet": "^5.2.2",
-        "thunky": "^1.0.2"
-      },
-      "bin": {
-        "multicast-dns": "cli.js"
-      }
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
-    },
-    "node_modules/no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
-      "engines": {
-        "node": ">= 6.13.0"
-      }
-    },
-    "node_modules/node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/nth-check": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-      "dependencies": {
-        "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
-      }
-    },
-    "node_modules/nwsapi": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
-      "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-hash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.fromentries": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
-      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz",
-      "integrity": "sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ==",
-      "dependencies": {
-        "array.prototype.reduce": "^1.0.4",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
-      "integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
-      "dependencies": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
-    },
-    "node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/open": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
-      "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-retry": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
-      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
-      "dependencies": {
-        "@types/retry": "0.12.0",
-        "retry": "^0.13.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/param-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-      "dependencies": {
-        "dot-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parse-srcset": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz",
-      "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q=="
-    },
-    "node_modules/parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
-    },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
-      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
-    },
-    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/pirates": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-up": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
-      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
-      "dependencies": {
-        "find-up": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/pkg-up/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-up/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pkg-up/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/pkg-up/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.8",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/postcss-attribute-case-insensitive": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
-      "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-browser-comments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz",
-      "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "peerDependencies": {
-        "browserslist": ">=4",
-        "postcss": ">=8"
-      }
-    },
-    "node_modules/postcss-calc": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
-      "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.2"
-      }
-    },
-    "node_modules/postcss-clamp": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
-      "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=7.6.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.6"
-      }
-    },
-    "node_modules/postcss-color-functional-notation": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
-      "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-color-hex-alpha": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
-      "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-color-rebeccapurple": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
-      "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-colormin": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz",
-      "integrity": "sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==",
-      "dependencies": {
-        "browserslist": "^4.16.6",
-        "caniuse-api": "^3.0.0",
-        "colord": "^2.9.1",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-convert-values": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
-      "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-custom-media": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
-      "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3"
-      }
-    },
-    "node_modules/postcss-custom-properties": {
-      "version": "12.1.10",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.10.tgz",
-      "integrity": "sha512-U3BHdgrYhCrwTVcByFHs9EOBoqcKq4Lf3kXwbTi4hhq0qWhl/pDWq2THbv/ICX/Fl9KqeHBb8OVrTf2OaYF07A==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-custom-selectors": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
-      "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3"
-      }
-    },
-    "node_modules/postcss-dir-pseudo-class": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
-      "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-discard-comments": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
-      "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-discard-duplicates": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
-      "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-discard-empty": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
-      "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-discard-overridden": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
-      "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-double-position-gradients": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
-      "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-env-function": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
-      "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-flexbugs-fixes": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz",
-      "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==",
-      "peerDependencies": {
-        "postcss": "^8.1.4"
-      }
-    },
-    "node_modules/postcss-focus-visible": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
-      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-focus-within": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
-      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-font-variant": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
-      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-gap-properties": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
-      "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-image-set-function": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
-      "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-import": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz",
-      "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==",
-      "dependencies": {
-        "postcss-value-parser": "^4.0.0",
-        "read-cache": "^1.0.0",
-        "resolve": "^1.1.7"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.0"
-      }
-    },
-    "node_modules/postcss-initial": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
-      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
-      "peerDependencies": {
-        "postcss": "^8.0.0"
-      }
-    },
-    "node_modules/postcss-js": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz",
-      "integrity": "sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==",
-      "dependencies": {
-        "camelcase-css": "^2.0.1"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >= 16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3.3"
-      }
-    },
-    "node_modules/postcss-lab-function": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
-      "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
-      "dependencies": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-load-config": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
-      "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
-      "dependencies": {
-        "lilconfig": "^2.0.5",
-        "yaml": "^1.10.2"
-      },
-      "engines": {
-        "node": ">= 10"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": ">=8.0.9",
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "postcss": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/postcss-loader": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
-      "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
-      "dependencies": {
-        "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.5",
-        "semver": "^7.3.5"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "postcss": "^7.0.0 || ^8.0.1",
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/postcss-loader/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/postcss-logical": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
-      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4"
-      }
-    },
-    "node_modules/postcss-media-minmax": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
-      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-merge-longhand": {
-      "version": "5.1.7",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
-      "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0",
-        "stylehacks": "^5.1.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-merge-rules": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.3.tgz",
-      "integrity": "sha512-LbLd7uFC00vpOuMvyZop8+vvhnfRGpp2S+IMQKeuOZZapPRY4SMq5ErjQeHbHsjCUgJkRNrlU+LmxsKIqPKQlA==",
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "caniuse-api": "^3.0.0",
-        "cssnano-utils": "^3.1.0",
-        "postcss-selector-parser": "^6.0.5"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-minify-font-values": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
-      "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-minify-gradients": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
-      "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
-      "dependencies": {
-        "colord": "^2.9.1",
-        "cssnano-utils": "^3.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-minify-params": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
-      "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "cssnano-utils": "^3.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-minify-selectors": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
-      "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.5"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
-      "dependencies": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-scope": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-modules-values": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-      "dependencies": {
-        "icss-utils": "^5.0.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/postcss-nested": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.0.tgz",
-      "integrity": "sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": ">=12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.14"
-      }
-    },
-    "node_modules/postcss-nesting": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
-      "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
-      "dependencies": {
-        "@csstools/selector-specificity": "^2.0.0",
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-normalize": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize/-/postcss-normalize-10.0.1.tgz",
-      "integrity": "sha512-+5w18/rDev5mqERcG3W5GZNMJa1eoYYNGo8gB7tEwaos0ajk3ZXAI4mHGcNT47NE+ZnZD1pEpUOFLvltIwmeJA==",
-      "dependencies": {
-        "@csstools/normalize.css": "*",
-        "postcss-browser-comments": "^4",
-        "sanitize.css": "*"
-      },
-      "engines": {
-        "node": ">= 12"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4",
-        "postcss": ">= 8"
-      }
-    },
-    "node_modules/postcss-normalize-charset": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
-      "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-display-values": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
-      "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-positions": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
-      "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-repeat-style": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
-      "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-string": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
-      "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-timing-functions": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
-      "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-unicode": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
-      "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
-      "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
-      "dependencies": {
-        "normalize-url": "^6.0.1",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-normalize-whitespace": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
-      "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-opacity-percentage": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz",
-      "integrity": "sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w==",
-      "funding": [
-        {
-          "type": "kofi",
-          "url": "https://ko-fi.com/mrcgrtz"
-        },
-        {
-          "type": "liberapay",
-          "url": "https://liberapay.com/mrcgrtz"
-        }
-      ],
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      }
-    },
-    "node_modules/postcss-ordered-values": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
-      "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
-      "dependencies": {
-        "cssnano-utils": "^3.1.0",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-overflow-shorthand": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
-      "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-page-break": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
-      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
-      "peerDependencies": {
-        "postcss": "^8"
-      }
-    },
-    "node_modules/postcss-place": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
-      "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-preset-env": {
-      "version": "7.8.2",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.2.tgz",
-      "integrity": "sha512-rSMUEaOCnovKnwc5LvBDHUDzpGP+nrUeWZGWt9M72fBvckCi45JmnJigUr4QG4zZeOHmOCNCZnd2LKDvP++ZuQ==",
-      "dependencies": {
-        "@csstools/postcss-cascade-layers": "^1.1.0",
-        "@csstools/postcss-color-function": "^1.1.1",
-        "@csstools/postcss-font-format-keywords": "^1.0.1",
-        "@csstools/postcss-hwb-function": "^1.0.2",
-        "@csstools/postcss-ic-unit": "^1.0.1",
-        "@csstools/postcss-is-pseudo-class": "^2.0.7",
-        "@csstools/postcss-nested-calc": "^1.0.0",
-        "@csstools/postcss-normalize-display-values": "^1.0.1",
-        "@csstools/postcss-oklab-function": "^1.1.1",
-        "@csstools/postcss-progressive-custom-properties": "^1.3.0",
-        "@csstools/postcss-stepped-value-functions": "^1.0.1",
-        "@csstools/postcss-text-decoration-shorthand": "^1.0.0",
-        "@csstools/postcss-trigonometric-functions": "^1.0.2",
-        "@csstools/postcss-unset-value": "^1.0.2",
-        "autoprefixer": "^10.4.11",
-        "browserslist": "^4.21.3",
-        "css-blank-pseudo": "^3.0.3",
-        "css-has-pseudo": "^3.0.4",
-        "css-prefers-color-scheme": "^6.0.3",
-        "cssdb": "^7.0.1",
-        "postcss-attribute-case-insensitive": "^5.0.2",
-        "postcss-clamp": "^4.1.0",
-        "postcss-color-functional-notation": "^4.2.4",
-        "postcss-color-hex-alpha": "^8.0.4",
-        "postcss-color-rebeccapurple": "^7.1.1",
-        "postcss-custom-media": "^8.0.2",
-        "postcss-custom-properties": "^12.1.9",
-        "postcss-custom-selectors": "^6.0.3",
-        "postcss-dir-pseudo-class": "^6.0.5",
-        "postcss-double-position-gradients": "^3.1.2",
-        "postcss-env-function": "^4.0.6",
-        "postcss-focus-visible": "^6.0.4",
-        "postcss-focus-within": "^5.0.4",
-        "postcss-font-variant": "^5.0.0",
-        "postcss-gap-properties": "^3.0.5",
-        "postcss-image-set-function": "^4.0.7",
-        "postcss-initial": "^4.0.1",
-        "postcss-lab-function": "^4.2.1",
-        "postcss-logical": "^5.0.4",
-        "postcss-media-minmax": "^5.0.0",
-        "postcss-nesting": "^10.2.0",
-        "postcss-opacity-percentage": "^1.1.2",
-        "postcss-overflow-shorthand": "^3.0.4",
-        "postcss-page-break": "^3.0.4",
-        "postcss-place": "^7.0.5",
-        "postcss-pseudo-class-any-link": "^7.1.6",
-        "postcss-replace-overflow-wrap": "^4.0.0",
-        "postcss-selector-not": "^6.0.1",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-pseudo-class-any-link": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
-      "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-reduce-initial": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.1.tgz",
-      "integrity": "sha512-//jeDqWcHPuXGZLoolFrUXBDyuEGbr9S2rMo19bkTIjBQ4PqkaO+oI8wua5BOUxpfi97i3PCoInsiFIEBfkm9w==",
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "caniuse-api": "^3.0.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-reduce-transforms": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
-      "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-replace-overflow-wrap": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
-      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
-      "peerDependencies": {
-        "postcss": "^8.0.3"
-      }
-    },
-    "node_modules/postcss-selector-not": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
-      "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "engines": {
-        "node": "^12 || ^14 || >=16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-svgo": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
-      "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0",
-        "svgo": "^2.7.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-      "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
-    },
-    "node_modules/postcss-svgo/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/svgo": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
-      "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
-      "dependencies": {
-        "@trysound/sax": "0.2.0",
-        "commander": "^7.2.0",
-        "css-select": "^4.1.3",
-        "css-tree": "^1.1.3",
-        "csso": "^4.2.0",
-        "picocolors": "^1.0.0",
-        "stable": "^0.1.8"
-      },
-      "bin": {
-        "svgo": "bin/svgo"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/postcss-unique-selectors": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
-      "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.5"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/pretty-bytes": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
-      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pretty-error": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
-      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
-      "dependencies": {
-        "lodash": "^4.17.20",
-        "renderkid": "^3.0.0"
-      }
-    },
-    "node_modules/pretty-format": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^17.0.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
-      }
-    },
-    "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/pretty-format/node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
-    "node_modules/promise": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz",
-      "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==",
-      "dependencies": {
-        "asap": "~2.0.6"
-      }
-    },
-    "node_modules/prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/prop-types/node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "node_modules/protobufjs": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz",
-      "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "@protobufjs/aspromise": "^1.1.2",
-        "@protobufjs/base64": "^1.1.2",
-        "@protobufjs/codegen": "^2.0.4",
-        "@protobufjs/eventemitter": "^1.1.0",
-        "@protobufjs/fetch": "^1.1.0",
-        "@protobufjs/float": "^1.0.2",
-        "@protobufjs/inquire": "^1.1.0",
-        "@protobufjs/path": "^1.1.2",
-        "@protobufjs/pool": "^1.1.0",
-        "@protobufjs/utf8": "^1.1.0",
-        "@types/node": ">=13.7.0",
-        "long": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/proxy-addr/node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
-    },
-    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
-      "engines": {
-        "node": ">=0.6.0",
-        "teleport": ">=0.2.0"
-      }
-    },
-    "node_modules/qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
-      "dependencies": {
-        "side-channel": "^1.0.6"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/raf": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
-      "dependencies": {
-        "performance-now": "^2.1.0"
-      }
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/raw-body": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
-      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/raw-body/node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-app-polyfill": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz",
-      "integrity": "sha512-sZ41cxiU5llIB003yxxQBYrARBqe0repqPTTYBTmMqTz9szeBbE37BehCE891NZsmdZqqP+xWKdT3eo3vOzN8w==",
-      "dependencies": {
-        "core-js": "^3.19.2",
-        "object-assign": "^4.1.1",
-        "promise": "^8.1.0",
-        "raf": "^3.4.1",
-        "regenerator-runtime": "^0.13.9",
-        "whatwg-fetch": "^3.6.2"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/react-dev-utils": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
-      "integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==",
-      "dependencies": {
-        "@babel/code-frame": "^7.16.0",
-        "address": "^1.1.2",
-        "browserslist": "^4.18.1",
-        "chalk": "^4.1.2",
-        "cross-spawn": "^7.0.3",
-        "detect-port-alt": "^1.1.6",
-        "escape-string-regexp": "^4.0.0",
-        "filesize": "^8.0.6",
-        "find-up": "^5.0.0",
-        "fork-ts-checker-webpack-plugin": "^6.5.0",
-        "global-modules": "^2.0.0",
-        "globby": "^11.0.4",
-        "gzip-size": "^6.0.0",
-        "immer": "^9.0.7",
-        "is-root": "^2.1.0",
-        "loader-utils": "^3.2.0",
-        "open": "^8.4.0",
-        "pkg-up": "^3.1.0",
-        "prompts": "^2.4.2",
-        "react-error-overlay": "^6.0.11",
-        "recursive-readdir": "^2.2.2",
-        "shell-quote": "^1.7.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/react-dev-utils/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/loader-utils": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
-      "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
-      "engines": {
-        "node": ">= 12.13.0"
-      }
-    },
-    "node_modules/react-dev-utils/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
-      },
-      "peerDependencies": {
-        "react": "^18.2.0"
-      }
-    },
-    "node_modules/react-error-overlay": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
-      "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
-    },
-    "node_modules/react-final-form": {
-      "version": "6.5.9",
-      "resolved": "https://registry.npmjs.org/react-final-form/-/react-final-form-6.5.9.tgz",
-      "integrity": "sha512-x3XYvozolECp3nIjly+4QqxdjSSWfcnpGEL5K8OBT6xmGrq5kBqbA6+/tOqoom9NwqIPPbxPNsOViFlbKgowbA==",
-      "dependencies": {
-        "@babel/runtime": "^7.15.4"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/final-form"
-      },
-      "peerDependencies": {
-        "final-form": "^4.20.4",
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
-    "node_modules/react-final-form-listeners": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/react-final-form-listeners/-/react-final-form-listeners-1.0.3.tgz",
-      "integrity": "sha512-OrdCNxSS4JQS/EXD+R530kZKFqaPfa+WcXPgVro/h4BpaBDF/Ja+BtHyCzDezCIb5rWaGGdOJIj+tN2YdtvrXg==",
-      "dependencies": {
-        "@babel/runtime": "^7.12.5"
-      },
-      "peerDependencies": {
-        "final-form": ">=4.0.0",
-        "prop-types": "^15.6.0",
-        "react": "^15.3.0 || ^16.0.0 || ^17.0.0",
-        "react-final-form": ">=3.0.0"
-      }
-    },
-    "node_modules/react-i18next": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-12.0.0.tgz",
-      "integrity": "sha512-/O7N6aIEAl1FaWZBNvhdIo9itvF/MO/nRKr9pYqRc9LhuC1u21SlfwpiYQqvaeNSEW3g3qUXLREOWMt+gxrWbg==",
-      "dependencies": {
-        "@babel/runtime": "^7.14.5",
-        "html-parse-stringify": "^3.0.1"
-      },
-      "peerDependencies": {
-        "i18next": ">= 19.0.0",
-        "react": ">= 16.8.0"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "node_modules/react-redux": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.0.4.tgz",
-      "integrity": "sha512-yMfQ7mX6bWuicz2fids6cR1YT59VTuT8MKyyE310wJQlINKENCeT1UcPdEiX6znI5tF8zXyJ/VYvDgeGuaaNwQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.12.1",
-        "@types/hoist-non-react-statics": "^3.3.1",
-        "@types/use-sync-external-store": "^0.0.3",
-        "hoist-non-react-statics": "^3.3.2",
-        "react-is": "^18.0.0",
-        "use-sync-external-store": "^1.0.0"
-      },
-      "peerDependencies": {
-        "@types/react": "^16.8 || ^17.0 || ^18.0",
-        "@types/react-dom": "^16.8 || ^17.0 || ^18.0",
-        "react": "^16.8 || ^17.0 || ^18.0",
-        "react-dom": "^16.8 || ^17.0 || ^18.0",
-        "react-native": ">=0.59",
-        "redux": "^4"
-      },
-      "peerDependenciesMeta": {
-        "@types/react": {
-          "optional": true
-        },
-        "@types/react-dom": {
-          "optional": true
-        },
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        },
-        "redux": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-refresh": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
-      "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-router": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.4.2.tgz",
-      "integrity": "sha512-Rb0BAX9KHhVzT1OKhMvCDMw776aTYM0DtkxqUBP8dNBom3mPXlfNs76JNGK8wKJ1IZEY1+WGj+cvZxHVk/GiKw==",
-      "dependencies": {
-        "@remix-run/router": "1.0.2"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "peerDependencies": {
-        "react": ">=16.8"
-      }
-    },
-    "node_modules/react-router-dom": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.4.2.tgz",
-      "integrity": "sha512-yM1kjoTkpfjgczPrcyWrp+OuQMyB1WleICiiGfstnQYo/S8hPEEnVjr/RdmlH6yKK4Tnj1UGXFSa7uwAtmDoLQ==",
-      "dependencies": {
-        "@remix-run/router": "1.0.2",
-        "react-router": "6.4.2"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "peerDependencies": {
-        "react": ">=16.8",
-        "react-dom": ">=16.8"
-      }
-    },
-    "node_modules/react-scripts": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
-      "integrity": "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==",
-      "dependencies": {
-        "@babel/core": "^7.16.0",
-        "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
-        "@svgr/webpack": "^5.5.0",
-        "babel-jest": "^27.4.2",
-        "babel-loader": "^8.2.3",
-        "babel-plugin-named-asset-import": "^0.3.8",
-        "babel-preset-react-app": "^10.0.1",
-        "bfj": "^7.0.2",
-        "browserslist": "^4.18.1",
-        "camelcase": "^6.2.1",
-        "case-sensitive-paths-webpack-plugin": "^2.4.0",
-        "css-loader": "^6.5.1",
-        "css-minimizer-webpack-plugin": "^3.2.0",
-        "dotenv": "^10.0.0",
-        "dotenv-expand": "^5.1.0",
-        "eslint": "^8.3.0",
-        "eslint-config-react-app": "^7.0.1",
-        "eslint-webpack-plugin": "^3.1.1",
-        "file-loader": "^6.2.0",
-        "fs-extra": "^10.0.0",
-        "html-webpack-plugin": "^5.5.0",
-        "identity-obj-proxy": "^3.0.0",
-        "jest": "^27.4.3",
-        "jest-resolve": "^27.4.2",
-        "jest-watch-typeahead": "^1.0.0",
-        "mini-css-extract-plugin": "^2.4.5",
-        "postcss": "^8.4.4",
-        "postcss-flexbugs-fixes": "^5.0.2",
-        "postcss-loader": "^6.2.1",
-        "postcss-normalize": "^10.0.1",
-        "postcss-preset-env": "^7.0.1",
-        "prompts": "^2.4.2",
-        "react-app-polyfill": "^3.0.0",
-        "react-dev-utils": "^12.0.1",
-        "react-refresh": "^0.11.0",
-        "resolve": "^1.20.0",
-        "resolve-url-loader": "^4.0.0",
-        "sass-loader": "^12.3.0",
-        "semver": "^7.3.5",
-        "source-map-loader": "^3.0.0",
-        "style-loader": "^3.3.1",
-        "tailwindcss": "^3.0.2",
-        "terser-webpack-plugin": "^5.2.5",
-        "webpack": "^5.64.4",
-        "webpack-dev-server": "^4.6.0",
-        "webpack-manifest-plugin": "^4.0.2",
-        "workbox-webpack-plugin": "^6.4.1"
-      },
-      "bin": {
-        "react-scripts": "bin/react-scripts.js"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
-      },
-      "peerDependencies": {
-        "react": ">= 16",
-        "typescript": "^3.2.1 || ^4"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-scripts/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/react-transition-group": {
-      "version": "4.4.5",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
-      "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
-      "dependencies": {
-        "@babel/runtime": "^7.5.5",
-        "dom-helpers": "^5.0.1",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.6.2"
-      },
-      "peerDependencies": {
-        "react": ">=16.6.0",
-        "react-dom": ">=16.6.0"
-      }
-    },
-    "node_modules/react-virtualized-auto-sizer": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.7.tgz",
-      "integrity": "sha512-Mxi6lwOmjwIjC1X4gABXMJcKHsOo0xWl3E3ugOgufB8GJU+MqrtY35aBuvCYv/razQ1Vbp7h1gWJjGjoNN5pmA==",
-      "engines": {
-        "node": ">8.0.0"
-      },
-      "peerDependencies": {
-        "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0-rc",
-        "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0-rc"
-      }
-    },
-    "node_modules/react-window": {
-      "version": "1.8.7",
-      "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.7.tgz",
-      "integrity": "sha512-JHEZbPXBpKMmoNO1bNhoXOOLg/ujhL/BU4IqVU9r8eQPcy5KQnGHIHDRkJ0ns9IM5+Aq5LNwt3j8t3tIrePQzA==",
-      "dependencies": {
-        "@babel/runtime": "^7.0.0",
-        "memoize-one": ">=3.1.1 <6"
-      },
-      "engines": {
-        "node": ">8.0.0"
-      },
-      "peerDependencies": {
-        "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
-    "node_modules/read-cache": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
-      "dependencies": {
-        "pify": "^2.3.0"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/recursive-readdir": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
-      "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
-      "dependencies": {
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dev": true,
-      "dependencies": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/redux": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz",
-      "integrity": "sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==",
-      "dependencies": {
-        "@babel/runtime": "^7.9.2"
-      }
-    },
-    "node_modules/redux-form": {
-      "version": "8.3.8",
-      "resolved": "https://registry.npmjs.org/redux-form/-/redux-form-8.3.8.tgz",
-      "integrity": "sha512-PzXhA0d+awIc4PkuhbDa6dCEiraMrGMyyDlYEVNX6qEyW/G2SqZXrjav5zrpXb0CCeqQSc9iqwbMtYQXbJbOAQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.9.2",
-        "es6-error": "^4.1.1",
-        "hoist-non-react-statics": "^3.3.2",
-        "invariant": "^2.2.4",
-        "is-promise": "^2.1.0",
-        "lodash": "^4.17.15",
-        "prop-types": "^15.6.1",
-        "react-is": "^16.4.2"
-      },
-      "engines": {
-        "node": ">=8.10"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/redux-form"
-      },
-      "peerDependencies": {
-        "immutable": "^3.8.2 || ^4.0.0",
-        "react": "^16.4.2 || ^17.0.0",
-        "react-redux": "^6.0.1 || ^7.0.0",
-        "redux": "^3.7.2 || ^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "immutable": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/redux-form/node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-    },
-    "node_modules/redux-thunk": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz",
-      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==",
-      "peerDependencies": {
-        "redux": "^4"
-      }
-    },
-    "node_modules/regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
-    },
-    "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
-      "dependencies": {
-        "regenerate": "^1.4.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regenerator-runtime": {
-      "version": "0.13.10",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
-      "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="
-    },
-    "node_modules/regenerator-transform": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
-      "dependencies": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
-    "node_modules/regex-parser": {
-      "version": "2.2.11",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
-      "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q=="
-    },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      }
-    },
-    "node_modules/regexpu-core": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
-      "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
-      "dependencies": {
-        "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsgen": "^0.7.1",
-        "regjsparser": "^0.9.1",
-        "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/regjsgen": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
-      "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="
-    },
-    "node_modules/regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
-      "dependencies": {
-        "jsesc": "~0.5.0"
-      },
-      "bin": {
-        "regjsparser": "bin/parser"
-      }
-    },
-    "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
-    "node_modules/relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/renderkid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
-      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
-      "dependencies": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
-    },
-    "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "dependencies": {
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-cwd/node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/resolve-url-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
-      "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
-      "dependencies": {
-        "adjust-sourcemap-loader": "^4.0.0",
-        "convert-source-map": "^1.7.0",
-        "loader-utils": "^2.0.0",
-        "postcss": "^7.0.35",
-        "source-map": "0.6.1"
-      },
-      "engines": {
-        "node": ">=8.9"
-      },
-      "peerDependencies": {
-        "rework": "1.0.1",
-        "rework-visit": "1.0.0"
-      },
-      "peerDependenciesMeta": {
-        "rework": {
-          "optional": true
-        },
-        "rework-visit": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/picocolors": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-      "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-    },
-    "node_modules/resolve-url-loader/node_modules/postcss": {
-      "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-      "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-      "dependencies": {
-        "picocolors": "^0.2.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve.exports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/retry": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rollup": {
-      "version": "2.79.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
-      "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/rollup-plugin-terser": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
-      "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
-      "dependencies": {
-        "@babel/code-frame": "^7.10.4",
-        "jest-worker": "^26.2.1",
-        "serialize-javascript": "^4.0.0",
-        "terser": "^5.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^2.0.0"
-      }
-    },
-    "node_modules/rollup-plugin-terser/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/rollup-plugin-terser/node_modules/jest-worker": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
-      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      }
-    },
-    "node_modules/rollup-plugin-terser/node_modules/serialize-javascript": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/rollup-plugin-terser/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/rxjs": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
-      "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "node_modules/sanitize-html": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.17.0.tgz",
-      "integrity": "sha512-dLAADUSS8rBwhaevT12yCezvioCA+bmUTPH/u57xKPT8d++voeYE6HeluA/bPbQ15TwDBG2ii+QZIEmYx8VdxA==",
-      "dependencies": {
-        "deepmerge": "^4.2.2",
-        "escape-string-regexp": "^4.0.0",
-        "htmlparser2": "^8.0.0",
-        "is-plain-object": "^5.0.0",
-        "parse-srcset": "^1.0.2",
-        "postcss": "^8.3.11"
-      }
-    },
-    "node_modules/sanitize-html/node_modules/dom-serializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-      "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
-        "entities": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/sanitize-html/node_modules/domhandler": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-      "dependencies": {
-        "domelementtype": "^2.3.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/sanitize-html/node_modules/domutils": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
-      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
-      "dependencies": {
-        "dom-serializer": "^2.0.0",
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/sanitize-html/node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/sanitize-html/node_modules/htmlparser2": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
-      "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3",
-        "domutils": "^3.0.1",
-        "entities": "^4.4.0"
-      }
-    },
-    "node_modules/sanitize.css": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/sanitize.css/-/sanitize.css-13.0.0.tgz",
-      "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA=="
-    },
-    "node_modules/sass-loader": {
-      "version": "12.6.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
-      "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
-      "dependencies": {
-        "klona": "^2.0.4",
-        "neo-async": "^2.6.2"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
-        "sass": "^1.3.0",
-        "sass-embedded": "*",
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "fibers": {
-          "optional": true
-        },
-        "node-sass": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
-    "node_modules/saxes": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-      "dependencies": {
-        "xmlchars": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
-    },
-    "node_modules/selfsigned": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
-      "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
-      "dependencies": {
-        "node-forge": "^1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/send": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/send/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/send/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/send/node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "node_modules/serialize-javascript": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "node_modules/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
-      "dependencies": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
-    },
-    "node_modules/serve-index/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/serve-index/node_modules/setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-    },
-    "node_modules/serve-index/node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-static": {
-      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
-      "dependencies": {
-        "encodeurl": "~2.0.0",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.19.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/shell-quote": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.4.tgz",
-      "integrity": "sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "node_modules/sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/sockjs": {
-      "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-      "dependencies": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^8.3.2",
-        "websocket-driver": "^0.7.4"
-      }
-    },
-    "node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
-    },
-    "node_modules/source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-loader": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz",
-      "integrity": "sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==",
-      "dependencies": {
-        "abab": "^2.0.5",
-        "iconv-lite": "^0.6.3",
-        "source-map-js": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/source-map-support/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
-    },
-    "node_modules/spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "dependencies": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dependencies": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      }
-    },
-    "node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
-    },
-    "node_modules/stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility"
-    },
-    "node_modules/stack-utils": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
-      "dependencies": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/stack-utils/node_modules/escape-string-regexp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/stackframe": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
-      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="
-    },
-    "node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-length": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-      "dependencies": {
-        "char-regex": "^1.0.2",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/string-natural-compare": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz",
-      "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw=="
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/string-width/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/string.prototype.matchall": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz",
-      "integrity": "sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.1",
-        "side-channel": "^1.0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/stringify-object": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
-      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
-      "dependencies": {
-        "get-own-enumerable-property-symbols": "^3.0.0",
-        "is-obj": "^1.0.1",
-        "is-regexp": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
-      "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "dependencies": {
-        "min-indent": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/style-loader": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
-      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==",
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/stylehacks": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
-      "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/stylis": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.1.3.tgz",
-      "integrity": "sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA=="
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/supports-hyperlinks": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
-      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
-      "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/svg-parser": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
-      "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ=="
-    },
-    "node_modules/svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "deprecated": "This SVGO version is no longer supported. Upgrade to v2.x.x.",
-      "dependencies": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      },
-      "bin": {
-        "svgo": "bin/svgo"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/svgo/node_modules/css-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^3.2.1",
-        "domutils": "^1.7.0",
-        "nth-check": "^1.0.2"
-      }
-    },
-    "node_modules/svgo/node_modules/css-what": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
-      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/svgo/node_modules/dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/svgo/node_modules/domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dependencies": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "node_modules/svgo/node_modules/domutils/node_modules/domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
-    },
-    "node_modules/svgo/node_modules/nth-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-      "dependencies": {
-        "boolbase": "~1.0.0"
-      }
-    },
-    "node_modules/symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
-    },
-    "node_modules/tailwindcss": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.1.tgz",
-      "integrity": "sha512-Uw+GVSxp5CM48krnjHObqoOwlCt5Qo6nw1jlCRwfGy68dSYb/LwS9ZFidYGRiM+w6rMawkZiu1mEMAsHYAfoLg==",
-      "dependencies": {
-        "arg": "^5.0.2",
-        "chokidar": "^3.5.3",
-        "color-name": "^1.1.4",
-        "detective": "^5.2.1",
-        "didyoumean": "^1.2.2",
-        "dlv": "^1.1.3",
-        "fast-glob": "^3.2.12",
-        "glob-parent": "^6.0.2",
-        "is-glob": "^4.0.3",
-        "lilconfig": "^2.0.6",
-        "micromatch": "^4.0.5",
-        "normalize-path": "^3.0.0",
-        "object-hash": "^3.0.0",
-        "picocolors": "^1.0.0",
-        "postcss": "^8.4.17",
-        "postcss-import": "^14.1.0",
-        "postcss-js": "^4.0.0",
-        "postcss-load-config": "^3.1.4",
-        "postcss-nested": "6.0.0",
-        "postcss-selector-parser": "^6.0.10",
-        "postcss-value-parser": "^4.2.0",
-        "quick-lru": "^5.1.1",
-        "resolve": "^1.22.1"
-      },
-      "bin": {
-        "tailwind": "lib/cli.js",
-        "tailwindcss": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=12.13.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.9"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/tailwindcss/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/temp-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
-      "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tempy": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz",
-      "integrity": "sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==",
-      "dependencies": {
-        "is-stream": "^2.0.0",
-        "temp-dir": "^2.0.0",
-        "type-fest": "^0.16.0",
-        "unique-string": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/tempy/node_modules/type-fest": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
-      "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terminal-link": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "supports-hyperlinks": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/terser": {
-      "version": "5.39.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.2.tgz",
-      "integrity": "sha512-yEPUmWve+VA78bI71BW70Dh0TuV4HHd+I5SHOAfS1+QBOmvmCiiffgjR8ryyEd3KIfvPGFqoADt8LdQ6XpXIvg==",
-      "dependencies": {
-        "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.14.0",
-        "commander": "^2.20.0",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser-webpack-plugin": {
-      "version": "5.3.14",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
-      "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^4.3.0",
-        "serialize-javascript": "^6.0.2",
-        "terser": "^5.31.1"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        },
-        "uglify-js": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/ajv": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
-      "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/terser/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-    },
-    "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dependencies": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
-    },
-    "node_modules/throat": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="
-    },
-    "node_modules/thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
-    },
-    "node_modules/tmpl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
-    "node_modules/tough-cookie": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tough-cookie/node_modules/universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
-      "dependencies": {
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tryer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
-    },
-    "node_modules/tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
-    "node_modules/tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-      }
-    },
-    "node_modules/tsutils/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dependencies": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "dependencies": {
-        "unicode-canonical-property-names-ecmascript": "^2.0.0",
-        "unicode-property-aliases-ecmascript": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "dependencies": {
-        "crypto-random-string": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="
-    },
-    "node_modules/upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "engines": {
-        "node": ">=4",
-        "yarn": "*"
-      }
-    },
-    "node_modules/update-browserslist-db": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
-      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "escalade": "^3.2.0",
-        "picocolors": "^1.1.1"
-      },
-      "bin": {
-        "update-browserslist-db": "cli.js"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4.21.0"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dependencies": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "node_modules/use-sync-external-store": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-    },
-    "node_modules/util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dependencies": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="
-    },
-    "node_modules/utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
-    "node_modules/v8-to-istanbul": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
-      "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0",
-        "source-map": "^0.7.3"
-      },
-      "engines": {
-        "node": ">=10.12.0"
-      }
-    },
-    "node_modules/v8-to-istanbul/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/void-elements": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
-      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/w3c-hr-time": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-      "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
-      "dependencies": {
-        "browser-process-hrtime": "^1.0.0"
-      }
-    },
-    "node_modules/w3c-xmlserializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
-      "dependencies": {
-        "xml-name-validator": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/walker": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-      "dependencies": {
-        "makeerror": "1.0.12"
-      }
-    },
-    "node_modules/watchpack": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz",
-      "integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dependencies": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-      "engines": {
-        "node": ">=10.4"
-      }
-    },
-    "node_modules/webpack": {
-      "version": "5.99.9",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.9.tgz",
-      "integrity": "sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==",
-      "dependencies": {
-        "@types/eslint-scope": "^3.7.7",
-        "@types/estree": "^1.0.6",
-        "@types/json-schema": "^7.0.15",
-        "@webassemblyjs/ast": "^1.14.1",
-        "@webassemblyjs/wasm-edit": "^1.14.1",
-        "@webassemblyjs/wasm-parser": "^1.14.1",
-        "acorn": "^8.14.0",
-        "browserslist": "^4.24.0",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.17.1",
-        "es-module-lexer": "^1.2.1",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.11",
-        "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^4.3.2",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.3.11",
-        "watchpack": "^2.4.1",
-        "webpack-sources": "^3.2.3"
-      },
-      "bin": {
-        "webpack": "bin/webpack.js"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-middleware": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
-      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
-      "dependencies": {
-        "colorette": "^2.0.10",
-        "memfs": "^3.4.3",
-        "mime-types": "^2.1.31",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/webpack-dev-server": {
-      "version": "4.11.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz",
-      "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==",
-      "dependencies": {
-        "@types/bonjour": "^3.5.9",
-        "@types/connect-history-api-fallback": "^1.3.5",
-        "@types/express": "^4.17.13",
-        "@types/serve-index": "^1.9.1",
-        "@types/serve-static": "^1.13.10",
-        "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.5.1",
-        "ansi-html-community": "^0.0.8",
-        "bonjour-service": "^1.0.11",
-        "chokidar": "^3.5.3",
-        "colorette": "^2.0.10",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^2.0.0",
-        "default-gateway": "^6.0.3",
-        "express": "^4.17.3",
-        "graceful-fs": "^4.2.6",
-        "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.3",
-        "ipaddr.js": "^2.0.1",
-        "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "rimraf": "^3.0.2",
-        "schema-utils": "^4.0.0",
-        "selfsigned": "^2.1.1",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.24",
-        "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^5.3.1",
-        "ws": "^8.4.2"
-      },
-      "bin": {
-        "webpack-dev-server": "bin/webpack-dev-server.js"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.37.0 || ^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/webpack-dev-server/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.18.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
-      "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-manifest-plugin": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz",
-      "integrity": "sha512-YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow==",
-      "dependencies": {
-        "tapable": "^2.0.0",
-        "webpack-sources": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12.22.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.44.2 || ^5.47.0"
-      }
-    },
-    "node_modules/webpack-manifest-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-manifest-plugin/node_modules/webpack-sources": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
-      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
-      "dependencies": {
-        "source-list-map": "^2.0.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/webpack/node_modules/ajv": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/webpack/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/webpack/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/webpack/node_modules/schema-utils": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
-      "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "dependencies": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-      "dependencies": {
-        "iconv-lite": "0.4.24"
-      }
-    },
-    "node_modules/whatwg-encoding/node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/whatwg-fetch": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
-      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
-    },
-    "node_modules/whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
-    },
-    "node_modules/whatwg-url": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
-      "dependencies": {
-        "lodash": "^4.7.0",
-        "tr46": "^2.1.0",
-        "webidl-conversions": "^6.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-collection": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
-      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
-      "dev": true,
-      "dependencies": {
-        "is-map": "^2.0.1",
-        "is-set": "^2.0.1",
-        "is-weakmap": "^2.0.1",
-        "is-weakset": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-typed-array": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
-      "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==",
-      "dev": true,
-      "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.20.0",
-        "for-each": "^0.3.3",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/word-wrap": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
-      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/workbox-background-sync": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.5.4.tgz",
-      "integrity": "sha512-0r4INQZMyPky/lj4Ou98qxcThrETucOde+7mRGJl13MPJugQNKeZQOdIJe/1AchOP23cTqHcN/YVpD6r8E6I8g==",
-      "dependencies": {
-        "idb": "^7.0.1",
-        "workbox-core": "6.5.4"
-      }
-    },
-    "node_modules/workbox-broadcast-update": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.5.4.tgz",
-      "integrity": "sha512-I/lBERoH1u3zyBosnpPEtcAVe5lwykx9Yg1k6f8/BGEPGaMMgZrwVrqL1uA9QZ1NGGFoyE6t9i7lBjOlDhFEEw==",
-      "dependencies": {
-        "workbox-core": "6.5.4"
-      }
-    },
-    "node_modules/workbox-build": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.5.4.tgz",
-      "integrity": "sha512-kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA==",
-      "dependencies": {
-        "@apideck/better-ajv-errors": "^0.3.1",
-        "@babel/core": "^7.11.1",
-        "@babel/preset-env": "^7.11.0",
-        "@babel/runtime": "^7.11.2",
-        "@rollup/plugin-babel": "^5.2.0",
-        "@rollup/plugin-node-resolve": "^11.2.1",
-        "@rollup/plugin-replace": "^2.4.1",
-        "@surma/rollup-plugin-off-main-thread": "^2.2.3",
-        "ajv": "^8.6.0",
-        "common-tags": "^1.8.0",
-        "fast-json-stable-stringify": "^2.1.0",
-        "fs-extra": "^9.0.1",
-        "glob": "^7.1.6",
-        "lodash": "^4.17.20",
-        "pretty-bytes": "^5.3.0",
-        "rollup": "^2.43.1",
-        "rollup-plugin-terser": "^7.0.0",
-        "source-map": "^0.8.0-beta.0",
-        "stringify-object": "^3.3.0",
-        "strip-comments": "^2.0.1",
-        "tempy": "^0.6.0",
-        "upath": "^1.2.0",
-        "workbox-background-sync": "6.5.4",
-        "workbox-broadcast-update": "6.5.4",
-        "workbox-cacheable-response": "6.5.4",
-        "workbox-core": "6.5.4",
-        "workbox-expiration": "6.5.4",
-        "workbox-google-analytics": "6.5.4",
-        "workbox-navigation-preload": "6.5.4",
-        "workbox-precaching": "6.5.4",
-        "workbox-range-requests": "6.5.4",
-        "workbox-recipes": "6.5.4",
-        "workbox-routing": "6.5.4",
-        "workbox-strategies": "6.5.4",
-        "workbox-streams": "6.5.4",
-        "workbox-sw": "6.5.4",
-        "workbox-window": "6.5.4"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/workbox-build/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/workbox-build/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/workbox-build/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-    },
-    "node_modules/workbox-build/node_modules/source-map": {
-      "version": "0.8.0-beta.0",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
-      "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
-      "dependencies": {
-        "whatwg-url": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/workbox-build/node_modules/tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/workbox-build/node_modules/webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
-    },
-    "node_modules/workbox-build/node_modules/whatwg-url": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
-      "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
-      "dependencies": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "node_modules/workbox-cacheable-response": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.5.4.tgz",
-      "integrity": "sha512-DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug==",
-      "dependencies": {
-        "workbox-core": "6.5.4"
-      }
-    },
-    "node_modules/workbox-core": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.5.4.tgz",
-      "integrity": "sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q=="
-    },
-    "node_modules/workbox-expiration": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.5.4.tgz",
-      "integrity": "sha512-jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ==",
-      "dependencies": {
-        "idb": "^7.0.1",
-        "workbox-core": "6.5.4"
-      }
-    },
-    "node_modules/workbox-google-analytics": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.5.4.tgz",
-      "integrity": "sha512-8AU1WuaXsD49249Wq0B2zn4a/vvFfHkpcFfqAFHNHwln3jK9QUYmzdkKXGIZl9wyKNP+RRX30vcgcyWMcZ9VAg==",
-      "dependencies": {
-        "workbox-background-sync": "6.5.4",
-        "workbox-core": "6.5.4",
-        "workbox-routing": "6.5.4",
-        "workbox-strategies": "6.5.4"
-      }
-    },
-    "node_modules/workbox-navigation-preload": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz",
-      "integrity": "sha512-IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng==",
-      "dependencies": {
-        "workbox-core": "6.5.4"
-      }
-    },
-    "node_modules/workbox-precaching": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.5.4.tgz",
-      "integrity": "sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg==",
-      "dependencies": {
-        "workbox-core": "6.5.4",
-        "workbox-routing": "6.5.4",
-        "workbox-strategies": "6.5.4"
-      }
-    },
-    "node_modules/workbox-range-requests": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.5.4.tgz",
-      "integrity": "sha512-Je2qR1NXCFC8xVJ/Lux6saH6IrQGhMpDrPXWZWWS8n/RD+WZfKa6dSZwU+/QksfEadJEr/NfY+aP/CXFFK5JFg==",
-      "dependencies": {
-        "workbox-core": "6.5.4"
-      }
-    },
-    "node_modules/workbox-recipes": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.5.4.tgz",
-      "integrity": "sha512-QZNO8Ez708NNwzLNEXTG4QYSKQ1ochzEtRLGaq+mr2PyoEIC1xFW7MrWxrONUxBFOByksds9Z4//lKAX8tHyUA==",
-      "dependencies": {
-        "workbox-cacheable-response": "6.5.4",
-        "workbox-core": "6.5.4",
-        "workbox-expiration": "6.5.4",
-        "workbox-precaching": "6.5.4",
-        "workbox-routing": "6.5.4",
-        "workbox-strategies": "6.5.4"
-      }
-    },
-    "node_modules/workbox-routing": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.5.4.tgz",
-      "integrity": "sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg==",
-      "dependencies": {
-        "workbox-core": "6.5.4"
-      }
-    },
-    "node_modules/workbox-strategies": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.5.4.tgz",
-      "integrity": "sha512-DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw==",
-      "dependencies": {
-        "workbox-core": "6.5.4"
-      }
-    },
-    "node_modules/workbox-streams": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.5.4.tgz",
-      "integrity": "sha512-FXKVh87d2RFXkliAIheBojBELIPnWbQdyDvsH3t74Cwhg0fDheL1T8BqSM86hZvC0ZESLsznSYWw+Va+KVbUzg==",
-      "dependencies": {
-        "workbox-core": "6.5.4",
-        "workbox-routing": "6.5.4"
-      }
-    },
-    "node_modules/workbox-sw": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.5.4.tgz",
-      "integrity": "sha512-vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA=="
-    },
-    "node_modules/workbox-webpack-plugin": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.4.tgz",
-      "integrity": "sha512-LmWm/zoaahe0EGmMTrSLUi+BjyR3cdGEfU3fS6PN1zKFYbqAKuQ+Oy/27e4VSXsyIwAw8+QDfk1XHNGtZu9nQg==",
-      "dependencies": {
-        "fast-json-stable-stringify": "^2.1.0",
-        "pretty-bytes": "^5.4.1",
-        "upath": "^1.2.0",
-        "webpack-sources": "^1.4.3",
-        "workbox-build": "6.5.4"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.4.0 || ^5.9.0"
-      }
-    },
-    "node_modules/workbox-webpack-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/workbox-webpack-plugin/node_modules/webpack-sources": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-      "dependencies": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      }
-    },
-    "node_modules/workbox-window": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.5.4.tgz",
-      "integrity": "sha512-HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug==",
-      "dependencies": {
-        "@types/trusted-types": "^2.0.2",
-        "workbox-core": "6.5.4"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    },
-    "node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
-    "node_modules/ws": {
-      "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/xml-name-validator": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
-    },
-    "node_modules/xmlchars": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
-    },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    }
-  },
-  "dependencies": {
-    "@adobe/css-tools": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz",
-      "integrity": "sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==",
-      "dev": true
-    },
-    "@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-      "requires": {
-        "@jridgewell/gen-mapping": "^0.1.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      }
-    },
-    "@apideck/better-ajv-errors": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz",
-      "integrity": "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==",
-      "requires": {
-        "json-schema": "^0.4.0",
-        "jsonpointer": "^5.0.0",
-        "leven": "^3.1.0"
-      }
-    },
-    "@babel/code-frame": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
-      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.27.1",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.1.1"
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.0.tgz",
-      "integrity": "sha512-Gt9jszFJYq7qzXVK4slhc6NzJXnOVmRECWcVjF/T23rNXD9NtWQ0W3qxdg+p9wWIB+VQw3GYV/U2Ha9bRTfs4w=="
-    },
-    "@babel/core": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz",
-      "integrity": "sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==",
-      "requires": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.19.6",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helpers": "^7.19.4",
-        "@babel/parser": "^7.19.6",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.6",
-        "@babel/types": "^7.19.4",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
-        "semver": "^6.3.0"
-      }
-    },
-    "@babel/eslint-parser": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
-      "integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
-      "requires": {
-        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
-        }
-      }
-    },
-    "@babel/generator": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
-      "requires": {
-        "@babel/types": "^7.23.0",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
-        "jsesc": "^2.5.1"
-      },
-      "dependencies": {
-        "@jridgewell/gen-mapping": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-          "requires": {
-            "@jridgewell/set-array": "^1.0.1",
-            "@jridgewell/sourcemap-codec": "^1.4.10",
-            "@jridgewell/trace-mapping": "^0.3.9"
-          }
-        }
-      }
-    },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
-      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
-      "requires": {
-        "@babel/types": "^7.18.6"
-      }
-    },
-    "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
-      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
-      "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.18.6",
-        "@babel/types": "^7.18.9"
-      }
-    },
-    "@babel/helper-compilation-targets": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz",
-      "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==",
-      "requires": {
-        "@babel/compat-data": "^7.20.0",
-        "@babel/helper-validator-option": "^7.18.6",
-        "browserslist": "^4.21.3",
-        "semver": "^6.3.0"
-      }
-    },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
-      "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.9",
-        "@babel/helper-split-export-declaration": "^7.18.6"
-      }
-    },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
-      "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "regexpu-core": "^5.1.0"
-      }
-    },
-    "@babel/helper-define-polyfill-provider": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
-      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.17.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
-      }
-    },
-    "@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
-    },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
-      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
-      "requires": {
-        "@babel/types": "^7.18.6"
-      }
-    },
-    "@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "requires": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      }
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-member-expression-to-functions": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
-      "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
-      "requires": {
-        "@babel/types": "^7.18.9"
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
-      "requires": {
-        "@babel/types": "^7.18.6"
-      }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz",
-      "integrity": "sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==",
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.19.4",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.6",
-        "@babel/types": "^7.19.4"
-      }
-    },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
-      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
-      "requires": {
-        "@babel/types": "^7.18.6"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
-      "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="
-    },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
-      "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-wrap-function": "^7.18.9",
-        "@babel/types": "^7.18.9"
-      }
-    },
-    "@babel/helper-replace-supers": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
-      "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/traverse": "^7.19.1",
-        "@babel/types": "^7.19.0"
-      }
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
-      "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
-      "requires": {
-        "@babel/types": "^7.19.4"
-      }
-    },
-    "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
-      "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
-      "requires": {
-        "@babel/types": "^7.20.0"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "requires": {
-        "@babel/types": "^7.22.5"
-      }
-    },
-    "@babel/helper-string-parser": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA=="
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="
-    },
-    "@babel/helper-wrap-function": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
-      "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
-      "requires": {
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
-      }
-    },
-    "@babel/helpers": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.1.tgz",
-      "integrity": "sha512-FCvFTm0sWV8Fxhpp2McP5/W53GPllQ9QeQ7SiqGWjMf/LVG07lFa5+pgK05IRhVwtvafT22KF+ZSnM9I545CvQ==",
-      "requires": {
-        "@babel/template": "^7.27.1",
-        "@babel/types": "^7.27.1"
-      }
-    },
-    "@babel/parser": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.2.tgz",
-      "integrity": "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==",
-      "requires": {
-        "@babel/types": "^7.27.1"
-      }
-    },
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
-      "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
-      "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9"
-      }
-    },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz",
-      "integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==",
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-remap-async-to-generator": "^7.18.9",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      }
-    },
-    "@babel/plugin-proposal-class-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
-      "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-proposal-class-static-block": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
-      "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-decorators": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.0.tgz",
-      "integrity": "sha512-vnuRRS20ygSxclEYikHzVrP9nZDFXaSzvJxGLQNAiBX041TmhS4hOUHWNIpq/q4muENuEP9XPJFXTNFejhemkg==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-replace-supers": "^7.19.1",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/plugin-syntax-decorators": "^7.19.0"
-      }
-    },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
-      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-json-strings": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
-      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
-      "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
-      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz",
-      "integrity": "sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==",
-      "requires": {
-        "@babel/compat-data": "^7.19.4",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.18.8"
-      }
-    },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
-      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
-      "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-private-methods": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
-      "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      }
-    },
-    "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
-      "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-syntax-async-generators": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-bigint": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
-      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      }
-    },
-    "@babel/plugin-syntax-class-static-block": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-decorators": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz",
-      "integrity": "sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
-      }
-    },
-    "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
-      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-export-namespace-from": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.3"
-      }
-    },
-    "@babel/plugin-syntax-flow": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz",
-      "integrity": "sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-syntax-import-assertions": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz",
-      "integrity": "sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
-      }
-    },
-    "@babel/plugin-syntax-import-meta": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-json-strings": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-jsx": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
-      "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-syntax-logical-assignment-operators": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-nullish-coalescing-operator": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.10.4"
-      }
-    },
-    "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.8.0"
-      }
-    },
-    "@babel/plugin-syntax-private-property-in-object": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-top-level-await": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.14.5"
-      }
-    },
-    "@babel/plugin-syntax-typescript": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz",
-      "integrity": "sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
-      }
-    },
-    "@babel/plugin-transform-arrow-functions": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
-      "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-async-to-generator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
-      "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-remap-async-to-generator": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
-      "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-block-scoping": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.0.tgz",
-      "integrity": "sha512-sXOohbpHZSk7GjxK9b3dKB7CfqUD5DwOH+DggKzOQ7TXYP+RCSbRykfjQmn/zq+rBjycVRtLf9pYhAaEJA786w==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
-      }
-    },
-    "@babel/plugin-transform-classes": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
-      "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-compilation-targets": "^7.19.0",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-replace-supers": "^7.18.9",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "globals": "^11.1.0"
-      }
-    },
-    "@babel/plugin-transform-computed-properties": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
-      "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
-      }
-    },
-    "@babel/plugin-transform-destructuring": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.0.tgz",
-      "integrity": "sha512-1dIhvZfkDVx/zn2S1aFwlruspTt4189j7fEkH0Y0VyuDM6bQt7bD6kLcz3l4IlLG+e5OReaBz9ROAbttRtUHqA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
-      }
-    },
-    "@babel/plugin-transform-dotall-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
-      "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
-      "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
-      }
-    },
-    "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
-      "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
-      "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-flow-strip-types": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.19.0.tgz",
-      "integrity": "sha512-sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/plugin-syntax-flow": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-for-of": {
-      "version": "7.18.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
-      "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-function-name": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
-      "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-function-name": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9"
-      }
-    },
-    "@babel/plugin-transform-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
-      "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
-      }
-    },
-    "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
-      "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-modules-amd": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz",
-      "integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==",
-      "requires": {
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0"
-      }
-    },
-    "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz",
-      "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==",
-      "requires": {
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-simple-access": "^7.19.4"
-      }
-    },
-    "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz",
-      "integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==",
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-validator-identifier": "^7.19.1"
-      }
-    },
-    "@babel/plugin-transform-modules-umd": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
-      "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
-      "requires": {
-        "@babel/helper-module-transforms": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
-      "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0"
-      }
-    },
-    "@babel/plugin-transform-new-target": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
-      "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-object-super": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
-      "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-parameters": {
-      "version": "7.18.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz",
-      "integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-property-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
-      "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-react-constant-elements": {
-      "version": "7.18.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.18.12.tgz",
-      "integrity": "sha512-Q99U9/ttiu+LMnRU8psd23HhvwXmKWDQIpocm0JKaICcZHnw+mdQbHm6xnSy7dOl8I5PELakYtNBubNQlBXbZw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
-      }
-    },
-    "@babel/plugin-transform-react-display-name": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz",
-      "integrity": "sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-react-jsx": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz",
-      "integrity": "sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/plugin-syntax-jsx": "^7.18.6",
-        "@babel/types": "^7.19.0"
-      }
-    },
-    "@babel/plugin-transform-react-jsx-development": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz",
-      "integrity": "sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==",
-      "requires": {
-        "@babel/plugin-transform-react-jsx": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-react-pure-annotations": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz",
-      "integrity": "sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==",
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-regenerator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
-      "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "regenerator-transform": "^0.15.0"
-      }
-    },
-    "@babel/plugin-transform-reserved-words": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
-      "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-runtime": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz",
-      "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "semver": "^6.3.0"
-      }
-    },
-    "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
-      "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-spread": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
-      "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
-      }
-    },
-    "@babel/plugin-transform-sticky-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
-      "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/plugin-transform-template-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
-      "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
-      }
-    },
-    "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
-      "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
-      }
-    },
-    "@babel/plugin-transform-typescript": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.0.tgz",
-      "integrity": "sha512-xOAsAFaun3t9hCwZ13Qe7gq423UgMZ6zAgmLxeGGapFqlT/X3L5qT2btjiVLlFn7gWtMaVyceS5VxGAuKbgizw==",
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/plugin-syntax-typescript": "^7.20.0"
-      }
-    },
-    "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
-      "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
-      }
-    },
-    "@babel/plugin-transform-unicode-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
-      "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
-      "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
-      }
-    },
-    "@babel/preset-env": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz",
-      "integrity": "sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==",
-      "requires": {
-        "@babel/compat-data": "^7.19.4",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-validator-option": "^7.18.6",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-async-generator-functions": "^7.19.1",
-        "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-proposal-class-static-block": "^7.18.6",
-        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
-        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-        "@babel/plugin-proposal-json-strings": "^7.18.6",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-        "@babel/plugin-proposal-object-rest-spread": "^7.19.4",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-private-methods": "^7.18.6",
-        "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.18.6",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-        "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.18.6",
-        "@babel/plugin-transform-async-to-generator": "^7.18.6",
-        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-        "@babel/plugin-transform-block-scoping": "^7.19.4",
-        "@babel/plugin-transform-classes": "^7.19.0",
-        "@babel/plugin-transform-computed-properties": "^7.18.9",
-        "@babel/plugin-transform-destructuring": "^7.19.4",
-        "@babel/plugin-transform-dotall-regex": "^7.18.6",
-        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
-        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-        "@babel/plugin-transform-for-of": "^7.18.8",
-        "@babel/plugin-transform-function-name": "^7.18.9",
-        "@babel/plugin-transform-literals": "^7.18.9",
-        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
-        "@babel/plugin-transform-modules-amd": "^7.18.6",
-        "@babel/plugin-transform-modules-commonjs": "^7.18.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.19.0",
-        "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
-        "@babel/plugin-transform-new-target": "^7.18.6",
-        "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-parameters": "^7.18.8",
-        "@babel/plugin-transform-property-literals": "^7.18.6",
-        "@babel/plugin-transform-regenerator": "^7.18.6",
-        "@babel/plugin-transform-reserved-words": "^7.18.6",
-        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
-        "@babel/plugin-transform-spread": "^7.19.0",
-        "@babel/plugin-transform-sticky-regex": "^7.18.6",
-        "@babel/plugin-transform-template-literals": "^7.18.9",
-        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
-        "@babel/plugin-transform-unicode-escapes": "^7.18.10",
-        "@babel/plugin-transform-unicode-regex": "^7.18.6",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.19.4",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "core-js-compat": "^3.25.1",
-        "semver": "^6.3.0"
-      }
-    },
-    "@babel/preset-modules": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
-      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      }
-    },
-    "@babel/preset-react": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.18.6.tgz",
-      "integrity": "sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-validator-option": "^7.18.6",
-        "@babel/plugin-transform-react-display-name": "^7.18.6",
-        "@babel/plugin-transform-react-jsx": "^7.18.6",
-        "@babel/plugin-transform-react-jsx-development": "^7.18.6",
-        "@babel/plugin-transform-react-pure-annotations": "^7.18.6"
-      }
-    },
-    "@babel/preset-typescript": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz",
-      "integrity": "sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-validator-option": "^7.18.6",
-        "@babel/plugin-transform-typescript": "^7.18.6"
-      }
-    },
-    "@babel/runtime": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.1.tgz",
-      "integrity": "sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog=="
-    },
-    "@babel/runtime-corejs3": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.27.1.tgz",
-      "integrity": "sha512-909rVuj3phpjW6y0MCXAZ5iNeORePa6ldJvp2baWGcTjwqbBDDz6xoS5JHJ7lS88NlwLYj07ImL/8IUMtDZzTA==",
-      "requires": {
-        "core-js-pure": "^3.30.2"
-      }
-    },
-    "@babel/template": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
-      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
-      "requires": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/parser": "^7.27.2",
-        "@babel/types": "^7.27.1"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
-      "requires": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.0",
-        "@babel/types": "^7.23.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      }
-    },
-    "@babel/types": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz",
-      "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==",
-      "requires": {
-        "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1"
-      }
-    },
-    "@bcoe/v8-coverage": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
-      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
-    },
-    "@csstools/normalize.css": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.0.0.tgz",
-      "integrity": "sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg=="
-    },
-    "@csstools/postcss-cascade-layers": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
-      "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
-      "requires": {
-        "@csstools/selector-specificity": "^2.0.2",
-        "postcss-selector-parser": "^6.0.10"
-      }
-    },
-    "@csstools/postcss-color-function": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
-      "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
-      "requires": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "@csstools/postcss-font-format-keywords": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
-      "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "@csstools/postcss-hwb-function": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
-      "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "@csstools/postcss-ic-unit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
-      "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
-      "requires": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "@csstools/postcss-is-pseudo-class": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
-      "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
-      "requires": {
-        "@csstools/selector-specificity": "^2.0.0",
-        "postcss-selector-parser": "^6.0.10"
-      }
-    },
-    "@csstools/postcss-nested-calc": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
-      "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "@csstools/postcss-normalize-display-values": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
-      "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "@csstools/postcss-oklab-function": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
-      "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
-      "requires": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "@csstools/postcss-progressive-custom-properties": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
-      "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "@csstools/postcss-stepped-value-functions": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
-      "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "@csstools/postcss-text-decoration-shorthand": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
-      "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "@csstools/postcss-trigonometric-functions": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
-      "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "@csstools/postcss-unset-value": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
-      "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g=="
-    },
-    "@csstools/selector-specificity": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
-      "integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg=="
-    },
-    "@emotion/babel-plugin": {
-      "version": "11.10.5",
-      "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz",
-      "integrity": "sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/plugin-syntax-jsx": "^7.17.12",
-        "@babel/runtime": "^7.18.3",
-        "@emotion/hash": "^0.9.0",
-        "@emotion/memoize": "^0.8.0",
-        "@emotion/serialize": "^1.1.1",
-        "babel-plugin-macros": "^3.1.0",
-        "convert-source-map": "^1.5.0",
-        "escape-string-regexp": "^4.0.0",
-        "find-root": "^1.1.0",
-        "source-map": "^0.5.7",
-        "stylis": "4.1.3"
-      }
-    },
-    "@emotion/cache": {
-      "version": "11.10.5",
-      "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.5.tgz",
-      "integrity": "sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA==",
-      "requires": {
-        "@emotion/memoize": "^0.8.0",
-        "@emotion/sheet": "^1.2.1",
-        "@emotion/utils": "^1.2.0",
-        "@emotion/weak-memoize": "^0.3.0",
-        "stylis": "4.1.3"
-      }
-    },
-    "@emotion/hash": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz",
-      "integrity": "sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ=="
-    },
-    "@emotion/is-prop-valid": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.0.tgz",
-      "integrity": "sha512-3aDpDprjM0AwaxGE09bOPkNxHpBd+kA6jty3RnaEXdweX1DF1U3VQpPYb0g1IStAuK7SVQ1cy+bNBBKp4W3Fjg==",
-      "requires": {
-        "@emotion/memoize": "^0.8.0"
-      }
-    },
-    "@emotion/memoize": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.0.tgz",
-      "integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA=="
-    },
-    "@emotion/react": {
-      "version": "11.10.5",
-      "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.5.tgz",
-      "integrity": "sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A==",
-      "requires": {
-        "@babel/runtime": "^7.18.3",
-        "@emotion/babel-plugin": "^11.10.5",
-        "@emotion/cache": "^11.10.5",
-        "@emotion/serialize": "^1.1.1",
-        "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
-        "@emotion/utils": "^1.2.0",
-        "@emotion/weak-memoize": "^0.3.0",
-        "hoist-non-react-statics": "^3.3.1"
-      }
-    },
-    "@emotion/serialize": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.1.tgz",
-      "integrity": "sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==",
-      "requires": {
-        "@emotion/hash": "^0.9.0",
-        "@emotion/memoize": "^0.8.0",
-        "@emotion/unitless": "^0.8.0",
-        "@emotion/utils": "^1.2.0",
-        "csstype": "^3.0.2"
-      }
-    },
-    "@emotion/sheet": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.1.tgz",
-      "integrity": "sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA=="
-    },
-    "@emotion/styled": {
-      "version": "11.10.5",
-      "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.5.tgz",
-      "integrity": "sha512-8EP6dD7dMkdku2foLoruPCNkRevzdcBaY6q0l0OsbyJK+x8D9HWjX27ARiSIKNF634hY9Zdoedh8bJCiva8yZw==",
-      "requires": {
-        "@babel/runtime": "^7.18.3",
-        "@emotion/babel-plugin": "^11.10.5",
-        "@emotion/is-prop-valid": "^1.2.0",
-        "@emotion/serialize": "^1.1.1",
-        "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
-        "@emotion/utils": "^1.2.0"
-      }
-    },
-    "@emotion/unitless": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz",
-      "integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw=="
-    },
-    "@emotion/use-insertion-effect-with-fallbacks": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz",
-      "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A=="
-    },
-    "@emotion/utils": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz",
-      "integrity": "sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw=="
-    },
-    "@emotion/weak-memoize": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz",
-      "integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg=="
-    },
-    "@eslint/eslintrc": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
-      "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
-      "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.4.0",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-        },
-        "globals": {
-          "version": "13.17.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-          "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
-          "requires": {
-            "type-fest": "^0.20.2"
-          }
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
-        }
-      }
-    },
-    "@formatjs/ecma402-abstract": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.13.0.tgz",
-      "integrity": "sha512-CQ8Ykd51jYD1n05dtoX6ns6B9n/+6ZAxnWUAonvHC4kkuAemROYBhHkEB4tm1uVrRlE7gLDqXkAnY51Y0pRCWQ==",
-      "requires": {
-        "@formatjs/intl-localematcher": "0.2.31",
-        "tslib": "2.4.0"
-      }
-    },
-    "@formatjs/fast-memoize": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.6.tgz",
-      "integrity": "sha512-9CWZ3+wCkClKHX+i5j+NyoBVqGf0pIskTo6Xl6ihGokYM2yqSSS68JIgeo+99UIHc+7vi9L3/SDSz/dWI9SNlA==",
-      "requires": {
-        "tslib": "2.4.0"
-      }
-    },
-    "@formatjs/icu-messageformat-parser": {
-      "version": "2.1.10",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.10.tgz",
-      "integrity": "sha512-KkRMxhifWkRC45dhM9tqm0GXbb6NPYTGVYY3xx891IKc6p++DQrZTnmkVSNNO47OEERLfuP2KkPFPJBuu8z/wg==",
-      "requires": {
-        "@formatjs/ecma402-abstract": "1.13.0",
-        "@formatjs/icu-skeleton-parser": "1.3.14",
-        "tslib": "2.4.0"
-      }
-    },
-    "@formatjs/icu-skeleton-parser": {
-      "version": "1.3.14",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.14.tgz",
-      "integrity": "sha512-7bv60HQQcBb3+TSj+45tOb/CHV5z1hOpwdtS50jsSBXfB+YpGhnoRsZxSRksXeCxMy6xn6tA6VY2601BrrK+OA==",
-      "requires": {
-        "@formatjs/ecma402-abstract": "1.13.0",
-        "tslib": "2.4.0"
-      }
-    },
-    "@formatjs/intl-localematcher": {
-      "version": "0.2.31",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.31.tgz",
-      "integrity": "sha512-9QTjdSBpQ7wHShZgsNzNig5qT3rCPvmZogS/wXZzKotns5skbXgs0I7J8cuN0PPqXyynvNVuN+iOKhNS2eb+ZA==",
-      "requires": {
-        "tslib": "2.4.0"
-      }
-    },
-    "@humanwhocodes/config-array": {
-      "version": "0.11.7",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz",
-      "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==",
-      "requires": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      }
-    },
-    "@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="
-    },
-    "@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "requires": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "resolve-from": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
-        }
-      }
-    },
-    "@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="
-    },
-    "@jest/console": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz",
-      "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
-      "requires": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@jest/core": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz",
-      "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
-      "requires": {
-        "@jest/console": "^27.5.1",
-        "@jest/reporters": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^27.5.1",
-        "jest-config": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-resolve-dependencies": "^27.5.1",
-        "jest-runner": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "jest-watcher": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "rimraf": "^3.0.0",
-        "slash": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@jest/environment": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz",
-      "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
-      "requires": {
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "jest-mock": "^27.5.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@jest/expect-utils": {
-      "version": "29.2.2",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.2.2.tgz",
-      "integrity": "sha512-vwnVmrVhTmGgQzyvcpze08br91OL61t9O0lJMDyb6Y/D8EKQ9V7rGUb/p7PDt0GPzK0zFYqXWFo4EO2legXmkg==",
-      "dev": true,
-      "requires": {
-        "jest-get-type": "^29.2.0"
-      }
-    },
-    "@jest/fake-timers": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
-      "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
-      "requires": {
-        "@jest/types": "^27.5.1",
-        "@sinonjs/fake-timers": "^8.0.1",
-        "@types/node": "*",
-        "jest-message-util": "^27.5.1",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@jest/globals": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz",
-      "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
-      "requires": {
-        "@jest/environment": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "expect": "^27.5.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "diff-sequences": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-          "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="
-        },
-        "expect": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-          "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "jest-matcher-utils": "^27.5.1",
-            "jest-message-util": "^27.5.1"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-diff": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-          "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
-          "requires": {
-            "chalk": "^4.0.0",
-            "diff-sequences": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "pretty-format": "^27.5.1"
-          }
-        },
-        "jest-get-type": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="
-        },
-        "jest-matcher-utils": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-          "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
-          "requires": {
-            "chalk": "^4.0.0",
-            "jest-diff": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "pretty-format": "^27.5.1"
-          }
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@jest/reporters": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz",
-      "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
-      "requires": {
-        "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.2",
-        "graceful-fs": "^4.2.9",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^5.1.0",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.1.3",
-        "jest-haste-map": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
-        "slash": "^3.0.0",
-        "source-map": "^0.6.0",
-        "string-length": "^4.0.1",
-        "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^8.1.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@jest/schemas": {
-      "version": "29.0.0",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.0.0.tgz",
-      "integrity": "sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA==",
-      "dev": true,
-      "requires": {
-        "@sinclair/typebox": "^0.24.1"
-      }
-    },
-    "@jest/source-map": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz",
-      "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
-      "requires": {
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.2.9",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "@jest/test-result": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz",
-      "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
-      "requires": {
-        "@jest/console": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "collect-v8-coverage": "^1.0.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@jest/test-sequencer": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
-      "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
-      "requires": {
-        "@jest/test-result": "^27.5.1",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-runtime": "^27.5.1"
-      }
-    },
-    "@jest/transform": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz",
-      "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
-      "requires": {
-        "@babel/core": "^7.1.0",
-        "@jest/types": "^27.5.1",
-        "babel-plugin-istanbul": "^6.1.1",
-        "chalk": "^4.0.0",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "pirates": "^4.0.4",
-        "slash": "^3.0.0",
-        "source-map": "^0.6.1",
-        "write-file-atomic": "^3.0.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@jest/types": {
-      "version": "29.2.1",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.2.1.tgz",
-      "integrity": "sha512-O/QNDQODLnINEPAI0cl9U6zUIDXEWXt6IC1o2N2QENuos7hlGUIthlKyV4p6ki3TvXFX071blj8HUhgLGquPjw==",
-      "dev": true,
-      "requires": {
-        "@jest/schemas": "^29.0.0",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-      "requires": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
-    },
-    "@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A=="
-    },
-    "@jridgewell/source-map": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
-      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
-      "requires": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25"
-      },
-      "dependencies": {
-        "@jridgewell/gen-mapping": {
-          "version": "0.3.8",
-          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-          "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
-          "requires": {
-            "@jridgewell/set-array": "^1.2.1",
-            "@jridgewell/sourcemap-codec": "^1.4.10",
-            "@jridgewell/trace-mapping": "^0.3.24"
-          }
-        }
-      }
-    },
-    "@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
-    },
-    "@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-      "requires": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
-      }
-    },
-    "@leichtgewicht/ip-codec": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-      "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
-    },
-    "@mui/base": {
-      "version": "5.0.0-alpha.103",
-      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.103.tgz",
-      "integrity": "sha512-fJIyB2df3CHn7D26WHnutnY7vew6aytTlhmRJz6GX7ag19zU2GcOUhJAzY5qwWcrXKnlYgzimhEjaEnuiUWU4g==",
-      "requires": {
-        "@babel/runtime": "^7.19.0",
-        "@emotion/is-prop-valid": "^1.2.0",
-        "@mui/types": "^7.2.0",
-        "@mui/utils": "^5.10.9",
-        "@popperjs/core": "^2.11.6",
-        "clsx": "^1.2.1",
-        "prop-types": "^15.8.1",
-        "react-is": "^18.2.0"
-      }
-    },
-    "@mui/core-downloads-tracker": {
-      "version": "5.10.11",
-      "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.11.tgz",
-      "integrity": "sha512-u5ff+UCFDHcR8MoQ8tuJR4c35vt7T/ki3aMEE2O3XQoGs8KJSrBiisFpFKyldg9/W2NSyoZxN+kxEGIfRxh+9Q=="
-    },
-    "@mui/icons-material": {
-      "version": "5.10.9",
-      "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.10.9.tgz",
-      "integrity": "sha512-sqClXdEM39WKQJOQ0ZCPTptaZgqwibhj2EFV9N0v7BU1PO8y4OcX/a2wIQHn4fNuDjIZktJIBrmU23h7aqlGgg==",
-      "requires": {
-        "@babel/runtime": "^7.19.0"
-      }
-    },
-    "@mui/material": {
-      "version": "5.10.11",
-      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.11.tgz",
-      "integrity": "sha512-KJ0wPCTbv6sFzwA3dgg0gowdfF+SRl7D510J9l6Nl/KFX0EawcewQudqKY4slYGFXniKa5PykqokpaWXsCCPqg==",
-      "requires": {
-        "@babel/runtime": "^7.19.0",
-        "@mui/base": "5.0.0-alpha.103",
-        "@mui/core-downloads-tracker": "^5.10.11",
-        "@mui/system": "^5.10.10",
-        "@mui/types": "^7.2.0",
-        "@mui/utils": "^5.10.9",
-        "@types/react-transition-group": "^4.4.5",
-        "clsx": "^1.2.1",
-        "csstype": "^3.1.1",
-        "prop-types": "^15.8.1",
-        "react-is": "^18.2.0",
-        "react-transition-group": "^4.4.5"
-      }
-    },
-    "@mui/private-theming": {
-      "version": "5.10.9",
-      "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.10.9.tgz",
-      "integrity": "sha512-BN7/CnsVPVyBaQpDTij4uV2xGYHHHhOgpdxeYLlIu+TqnsVM7wUeF+37kXvHovxM6xmL5qoaVUD98gDC0IZnHg==",
-      "requires": {
-        "@babel/runtime": "^7.19.0",
-        "@mui/utils": "^5.10.9",
-        "prop-types": "^15.8.1"
-      }
-    },
-    "@mui/styled-engine": {
-      "version": "5.10.8",
-      "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.8.tgz",
-      "integrity": "sha512-w+y8WI18EJV6zM/q41ug19cE70JTeO6sWFsQ7tgePQFpy6ToCVPh0YLrtqxUZXSoMStW5FMw0t9fHTFAqPbngw==",
-      "requires": {
-        "@babel/runtime": "^7.19.0",
-        "@emotion/cache": "^11.10.3",
-        "csstype": "^3.1.1",
-        "prop-types": "^15.8.1"
-      }
-    },
-    "@mui/system": {
-      "version": "5.10.10",
-      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.10.tgz",
-      "integrity": "sha512-TXwtKN0adKpBrZmO+eilQWoPf2veh050HLYrN78Kps9OhlvO70v/2Kya0+mORFhu9yhpAwjHXO8JII/R4a5ZLA==",
-      "requires": {
-        "@babel/runtime": "^7.19.0",
-        "@mui/private-theming": "^5.10.9",
-        "@mui/styled-engine": "^5.10.8",
-        "@mui/types": "^7.2.0",
-        "@mui/utils": "^5.10.9",
-        "clsx": "^1.2.1",
-        "csstype": "^3.1.1",
-        "prop-types": "^15.8.1"
-      }
-    },
-    "@mui/types": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.0.tgz",
-      "integrity": "sha512-lGXtFKe5lp3UxTBGqKI1l7G8sE2xBik8qCfrLHD5olwP/YU0/ReWoWT7Lp1//ri32dK39oPMrJN8TgbkCSbsNA=="
-    },
-    "@mui/utils": {
-      "version": "5.10.9",
-      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.10.9.tgz",
-      "integrity": "sha512-2tdHWrq3+WCy+G6TIIaFx3cg7PorXZ71P375ExuX61od1NOAJP1mK90VxQ8N4aqnj2vmO3AQDkV4oV2Ktvt4bA==",
-      "requires": {
-        "@babel/runtime": "^7.19.0",
-        "@types/prop-types": "^15.7.5",
-        "@types/react-is": "^16.7.1 || ^17.0.0",
-        "prop-types": "^15.8.1",
-        "react-is": "^18.2.0"
-      }
-    },
-    "@nicolo-ribaudo/eslint-scope-5-internals": {
-      "version": "5.1.1-v1",
-      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
-      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
-      "requires": {
-        "eslint-scope": "5.1.1"
-      }
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "requires": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@pmmmwh/react-refresh-webpack-plugin": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.8.tgz",
-      "integrity": "sha512-wxXRwf+IQ6zvHSJZ+5T2RQNEsq+kx4jKRXfFvdt3nBIUzJUAvXEFsUeoaohDe/Kr84MTjGwcuIUPNcstNJORsA==",
-      "requires": {
-        "ansi-html-community": "^0.0.8",
-        "common-path-prefix": "^3.0.0",
-        "core-js-pure": "^3.23.3",
-        "error-stack-parser": "^2.0.6",
-        "find-up": "^5.0.0",
-        "html-entities": "^2.1.0",
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "source-map": "^0.7.3"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.7.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-          "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
-        }
-      }
-    },
-    "@popperjs/core": {
-      "version": "2.11.6",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
-      "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="
-    },
-    "@protobufjs/aspromise": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
-      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="
-    },
-    "@protobufjs/base64": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
-      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
-    },
-    "@protobufjs/codegen": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
-      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
-    },
-    "@protobufjs/eventemitter": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
-      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
-    },
-    "@protobufjs/fetch": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
-      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
-      "requires": {
-        "@protobufjs/aspromise": "^1.1.1",
-        "@protobufjs/inquire": "^1.1.0"
-      }
-    },
-    "@protobufjs/float": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
-      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="
-    },
-    "@protobufjs/inquire": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
-      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="
-    },
-    "@protobufjs/path": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
-      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="
-    },
-    "@protobufjs/pool": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
-      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="
-    },
-    "@protobufjs/utf8": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
-      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
-    },
-    "@remix-run/router": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.0.2.tgz",
-      "integrity": "sha512-GRSOFhJzjGN+d4sKHTMSvNeUPoZiDHWmRnXfzaxrqe7dE/Nzlc8BiMSJdLDESZlndM7jIUrZ/F4yWqVYlI0rwQ=="
-    },
-    "@rollup/plugin-babel": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
-      "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.10.4",
-        "@rollup/pluginutils": "^3.1.0"
-      }
-    },
-    "@rollup/plugin-node-resolve": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz",
-      "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
-      "requires": {
-        "@rollup/pluginutils": "^3.1.0",
-        "@types/resolve": "1.17.1",
-        "builtin-modules": "^3.1.0",
-        "deepmerge": "^4.2.2",
-        "is-module": "^1.0.0",
-        "resolve": "^1.19.0"
-      }
-    },
-    "@rollup/plugin-replace": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz",
-      "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==",
-      "requires": {
-        "@rollup/pluginutils": "^3.1.0",
-        "magic-string": "^0.25.7"
-      }
-    },
-    "@rollup/pluginutils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
-      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
-      "requires": {
-        "@types/estree": "0.0.39",
-        "estree-walker": "^1.0.1",
-        "picomatch": "^2.2.2"
-      },
-      "dependencies": {
-        "@types/estree": {
-          "version": "0.0.39",
-          "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
-          "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
-        }
-      }
-    },
-    "@rushstack/eslint-patch": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz",
-      "integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg=="
-    },
-    "@sinclair/typebox": {
-      "version": "0.24.51",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz",
-      "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA=="
-    },
-    "@sinonjs/commons": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-      "requires": {
-        "type-detect": "4.0.8"
-      }
-    },
-    "@sinonjs/fake-timers": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-      "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
-      "requires": {
-        "@sinonjs/commons": "^1.7.0"
-      }
-    },
-    "@surma/rollup-plugin-off-main-thread": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
-      "integrity": "sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==",
-      "requires": {
-        "ejs": "^3.1.6",
-        "json5": "^2.2.0",
-        "magic-string": "^0.25.0",
-        "string.prototype.matchall": "^4.0.6"
-      }
-    },
-    "@svgr/babel-plugin-add-jsx-attribute": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz",
-      "integrity": "sha512-ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg=="
-    },
-    "@svgr/babel-plugin-remove-jsx-attribute": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz",
-      "integrity": "sha512-yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg=="
-    },
-    "@svgr/babel-plugin-remove-jsx-empty-expression": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz",
-      "integrity": "sha512-LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA=="
-    },
-    "@svgr/babel-plugin-replace-jsx-attribute-value": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz",
-      "integrity": "sha512-PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ=="
-    },
-    "@svgr/babel-plugin-svg-dynamic-title": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz",
-      "integrity": "sha512-zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg=="
-    },
-    "@svgr/babel-plugin-svg-em-dimensions": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz",
-      "integrity": "sha512-cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw=="
-    },
-    "@svgr/babel-plugin-transform-react-native-svg": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz",
-      "integrity": "sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q=="
-    },
-    "@svgr/babel-plugin-transform-svg-component": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz",
-      "integrity": "sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ=="
-    },
-    "@svgr/babel-preset": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.5.0.tgz",
-      "integrity": "sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig==",
-      "requires": {
-        "@svgr/babel-plugin-add-jsx-attribute": "^5.4.0",
-        "@svgr/babel-plugin-remove-jsx-attribute": "^5.4.0",
-        "@svgr/babel-plugin-remove-jsx-empty-expression": "^5.0.1",
-        "@svgr/babel-plugin-replace-jsx-attribute-value": "^5.0.1",
-        "@svgr/babel-plugin-svg-dynamic-title": "^5.4.0",
-        "@svgr/babel-plugin-svg-em-dimensions": "^5.4.0",
-        "@svgr/babel-plugin-transform-react-native-svg": "^5.4.0",
-        "@svgr/babel-plugin-transform-svg-component": "^5.5.0"
-      }
-    },
-    "@svgr/core": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.5.0.tgz",
-      "integrity": "sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ==",
-      "requires": {
-        "@svgr/plugin-jsx": "^5.5.0",
-        "camelcase": "^6.2.0",
-        "cosmiconfig": "^7.0.0"
-      }
-    },
-    "@svgr/hast-util-to-babel-ast": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz",
-      "integrity": "sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ==",
-      "requires": {
-        "@babel/types": "^7.12.6"
-      }
-    },
-    "@svgr/plugin-jsx": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz",
-      "integrity": "sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA==",
-      "requires": {
-        "@babel/core": "^7.12.3",
-        "@svgr/babel-preset": "^5.5.0",
-        "@svgr/hast-util-to-babel-ast": "^5.5.0",
-        "svg-parser": "^2.0.2"
-      }
-    },
-    "@svgr/plugin-svgo": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz",
-      "integrity": "sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ==",
-      "requires": {
-        "cosmiconfig": "^7.0.0",
-        "deepmerge": "^4.2.2",
-        "svgo": "^1.2.2"
-      }
-    },
-    "@svgr/webpack": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz",
-      "integrity": "sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g==",
-      "requires": {
-        "@babel/core": "^7.12.3",
-        "@babel/plugin-transform-react-constant-elements": "^7.12.1",
-        "@babel/preset-env": "^7.12.1",
-        "@babel/preset-react": "^7.12.5",
-        "@svgr/core": "^5.5.0",
-        "@svgr/plugin-jsx": "^5.5.0",
-        "@svgr/plugin-svgo": "^5.5.0",
-        "loader-utils": "^2.0.0"
-      }
-    },
-    "@testing-library/dom": {
-      "version": "8.19.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.19.0.tgz",
-      "integrity": "sha512-6YWYPPpxG3e/xOo6HIWwB/58HukkwIVTOaZ0VwdMVjhRUX/01E4FtQbck9GazOOj7MXHc5RBzMrU86iBJHbI+A==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/runtime": "^7.12.5",
-        "@types/aria-query": "^4.2.0",
-        "aria-query": "^5.0.0",
-        "chalk": "^4.1.0",
-        "dom-accessibility-api": "^0.5.9",
-        "lz-string": "^1.4.4",
-        "pretty-format": "^27.0.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@testing-library/jest-dom": {
-      "version": "5.16.5",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz",
-      "integrity": "sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA==",
-      "dev": true,
-      "requires": {
-        "@adobe/css-tools": "^4.0.1",
-        "@babel/runtime": "^7.9.2",
-        "@types/testing-library__jest-dom": "^5.9.1",
-        "aria-query": "^5.0.0",
-        "chalk": "^3.0.0",
-        "css.escape": "^1.5.1",
-        "dom-accessibility-api": "^0.5.6",
-        "lodash": "^4.17.15",
-        "redent": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "@testing-library/react": {
-      "version": "13.4.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-13.4.0.tgz",
-      "integrity": "sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==",
-      "dev": true,
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "@testing-library/dom": "^8.5.0",
-        "@types/react-dom": "^18.0.0"
-      }
-    },
-    "@tootallnate/once": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="
-    },
-    "@trysound/sax": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
-      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="
-    },
-    "@types/aria-query": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
-      "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==",
-      "dev": true
-    },
-    "@types/babel__core": {
-      "version": "7.1.19",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
-      "integrity": "sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==",
-      "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "@types/babel__generator": {
-      "version": "7.6.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz",
-      "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==",
-      "requires": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@types/babel__template": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
-      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
-      "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@types/babel__traverse": {
-      "version": "7.18.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.2.tgz",
-      "integrity": "sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg==",
-      "requires": {
-        "@babel/types": "^7.3.0"
-      }
-    },
-    "@types/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-      "requires": {
-        "@types/connect": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/bonjour": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/connect": {
-      "version": "3.4.35",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/connect-history-api-fallback": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-      "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
-      "requires": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/eslint": {
-      "version": "8.4.9",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.9.tgz",
-      "integrity": "sha512-jFCSo4wJzlHQLCpceUhUnXdrPuCNOjGFMQ8Eg6JXxlz3QaCKOb7eGi2cephQdM4XTYsNej69P9JDJ1zqNIbncQ==",
-      "requires": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
-      }
-    },
-    "@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "requires": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
-    "@types/estree": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz",
-      "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ=="
-    },
-    "@types/express": {
-      "version": "4.17.14",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz",
-      "integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==",
-      "requires": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.18",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
-      }
-    },
-    "@types/express-serve-static-core": {
-      "version": "4.17.31",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
-      "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
-      "requires": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*"
-      }
-    },
-    "@types/graceful-fs": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
-      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/history": {
-      "version": "4.7.11",
-      "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz",
-      "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==",
-      "dev": true
-    },
-    "@types/hoist-non-react-statics": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
-      "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==",
-      "requires": {
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0"
-      }
-    },
-    "@types/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="
-    },
-    "@types/http-proxy": {
-      "version": "1.17.9",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
-      "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/istanbul-lib-coverage": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz",
-      "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="
-    },
-    "@types/istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
-      "requires": {
-        "@types/istanbul-lib-coverage": "*"
-      }
-    },
-    "@types/istanbul-reports": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
-      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
-      "requires": {
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "@types/jest": {
-      "version": "29.2.0",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.2.0.tgz",
-      "integrity": "sha512-KO7bPV21d65PKwv3LLsD8Jn3E05pjNjRZvkm+YTacWhVmykAb07wW6IkZUmQAltwQafNcDUEUrMO2h3jeBSisg==",
-      "dev": true,
-      "requires": {
-        "expect": "^29.0.0",
-        "pretty-format": "^29.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "29.2.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.2.1.tgz",
-          "integrity": "sha512-Y41Sa4aLCtKAXvwuIpTvcFBkyeYp2gdFWzXGA+ZNES3VwURIB165XO/z7CjETwzCCS53MjW/rLMyyqEnTtaOfA==",
-          "dev": true,
-          "requires": {
-            "@jest/schemas": "^29.0.0",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          }
-        }
-      }
-    },
-    "@types/jquery": {
-      "version": "3.5.14",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.14.tgz",
-      "integrity": "sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==",
-      "dev": true,
-      "requires": {
-        "@types/sizzle": "*"
-      }
-    },
-    "@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
-    },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
-    },
-    "@types/lodash": {
-      "version": "4.14.186",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.186.tgz",
-      "integrity": "sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==",
-      "dev": true
-    },
-    "@types/mime": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
-      "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
-    },
-    "@types/node": {
-      "version": "18.11.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.7.tgz",
-      "integrity": "sha512-LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ=="
-    },
-    "@types/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
-    },
-    "@types/prettier": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.1.tgz",
-      "integrity": "sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow=="
-    },
-    "@types/prop-types": {
-      "version": "15.7.5",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz",
-      "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="
-    },
-    "@types/q": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
-      "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
-    },
-    "@types/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="
-    },
-    "@types/range-parser": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
-    },
-    "@types/react": {
-      "version": "18.0.24",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.24.tgz",
-      "integrity": "sha512-wRJWT6ouziGUy+9uX0aW4YOJxAY0bG6/AOk5AW5QSvZqI7dk6VBIbXvcVgIw/W5Jrl24f77df98GEKTJGOLx7Q==",
-      "requires": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
-      }
-    },
-    "@types/react-dom": {
-      "version": "18.0.8",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.8.tgz",
-      "integrity": "sha512-C3GYO0HLaOkk9dDAz3Dl4sbe4AKUGTCfFIZsz3n/82dPNN8Du533HzKatDxeUYWu24wJgMP1xICqkWk1YOLOIw==",
-      "dev": true,
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@types/react-is": {
-      "version": "17.0.3",
-      "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-17.0.3.tgz",
-      "integrity": "sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==",
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@types/react-redux": {
-      "version": "7.1.24",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.24.tgz",
-      "integrity": "sha512-7FkurKcS1k0FHZEtdbbgN8Oc6b+stGSfZYjQGicofJ0j4U0qIn/jaSvnP2pLwZKiai3/17xqqxkkrxTgN8UNbQ==",
-      "dev": true,
-      "requires": {
-        "@types/hoist-non-react-statics": "^3.3.0",
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0",
-        "redux": "^4.0.0"
-      }
-    },
-    "@types/react-router": {
-      "version": "5.1.19",
-      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.19.tgz",
-      "integrity": "sha512-Fv/5kb2STAEMT3wHzdKQK2z8xKq38EDIGVrutYLmQVVLe+4orDFquU52hQrULnEHinMKv9FSA6lf9+uNT1ITtA==",
-      "dev": true,
-      "requires": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*"
-      }
-    },
-    "@types/react-router-dom": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz",
-      "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==",
-      "dev": true,
-      "requires": {
-        "@types/history": "^4.7.11",
-        "@types/react": "*",
-        "@types/react-router": "*"
-      }
-    },
-    "@types/react-transition-group": {
-      "version": "4.4.5",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.5.tgz",
-      "integrity": "sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==",
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@types/react-virtualized-auto-sizer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.1.tgz",
-      "integrity": "sha512-GH8sAnBEM5GV9LTeiz56r4ZhMOUSrP43tAQNSRVxNexDjcNKLCEtnxusAItg1owFUFE6k0NslV26gqVClVvong==",
-      "dev": true,
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@types/react-window": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@types/react-window/-/react-window-1.8.5.tgz",
-      "integrity": "sha512-V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw==",
-      "dev": true,
-      "requires": {
-        "@types/react": "*"
-      }
-    },
-    "@types/redux-form": {
-      "version": "8.3.5",
-      "resolved": "https://registry.npmjs.org/@types/redux-form/-/redux-form-8.3.5.tgz",
-      "integrity": "sha512-SchB4i7nxgWNbJS4cXEZducztkvHzVrb5xlAXwfLpbrLPo6tMY06+kx1GqMv42+YnGy9TpCAkF51a21HatqWBA==",
-      "dev": true,
-      "requires": {
-        "@types/react": "*",
-        "redux": "^3.6.0 || ^4.0.0"
-      }
-    },
-    "@types/resolve": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
-      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
-    },
-    "@types/scheduler": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
-    },
-    "@types/semver": {
-      "version": "7.3.13",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz",
-      "integrity": "sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw=="
-    },
-    "@types/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
-      "requires": {
-        "@types/express": "*"
-      }
-    },
-    "@types/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
-      "requires": {
-        "@types/mime": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/sizzle": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
-      "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
-      "dev": true
-    },
-    "@types/sockjs": {
-      "version": "0.3.33",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/stack-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
-      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="
-    },
-    "@types/testing-library__jest-dom": {
-      "version": "5.14.5",
-      "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.5.tgz",
-      "integrity": "sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ==",
-      "dev": true,
-      "requires": {
-        "@types/jest": "*"
-      }
-    },
-    "@types/trusted-types": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz",
-      "integrity": "sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="
-    },
-    "@types/use-sync-external-store": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz",
-      "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA=="
-    },
-    "@types/ws": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-      "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/yargs": {
-      "version": "17.0.13",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.13.tgz",
-      "integrity": "sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==",
-      "requires": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "@types/yargs-parser": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
-    },
-    "@typescript-eslint/eslint-plugin": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.41.0.tgz",
-      "integrity": "sha512-DXUS22Y57/LAFSg3x7Vi6RNAuLpTXwxB9S2nIA7msBb/Zt8p7XqMwdpdc1IU7CkOQUPgAqR5fWvxuKCbneKGmA==",
-      "requires": {
-        "@typescript-eslint/scope-manager": "5.41.0",
-        "@typescript-eslint/type-utils": "5.41.0",
-        "@typescript-eslint/utils": "5.41.0",
-        "debug": "^4.3.4",
-        "ignore": "^5.2.0",
-        "regexpp": "^3.2.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "@typescript-eslint/experimental-utils": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.41.0.tgz",
-      "integrity": "sha512-/qxT2Kd2q/A22JVIllvws4rvc00/3AT4rAo/0YgEN28y+HPhbJbk6X4+MAHEoZzpNyAOugIT7D/OLnKBW8FfhA==",
-      "requires": {
-        "@typescript-eslint/utils": "5.41.0"
-      }
-    },
-    "@typescript-eslint/parser": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.41.0.tgz",
-      "integrity": "sha512-HQVfix4+RL5YRWZboMD1pUfFN8MpRH4laziWkkAzyO1fvNOY/uinZcvo3QiFJVS/siNHupV8E5+xSwQZrl6PZA==",
-      "requires": {
-        "@typescript-eslint/scope-manager": "5.41.0",
-        "@typescript-eslint/types": "5.41.0",
-        "@typescript-eslint/typescript-estree": "5.41.0",
-        "debug": "^4.3.4"
-      }
-    },
-    "@typescript-eslint/scope-manager": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.41.0.tgz",
-      "integrity": "sha512-xOxPJCnuktUkY2xoEZBKXO5DBCugFzjrVndKdUnyQr3+9aDWZReKq9MhaoVnbL+maVwWJu/N0SEtrtEUNb62QQ==",
-      "requires": {
-        "@typescript-eslint/types": "5.41.0",
-        "@typescript-eslint/visitor-keys": "5.41.0"
-      }
-    },
-    "@typescript-eslint/type-utils": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.41.0.tgz",
-      "integrity": "sha512-L30HNvIG6A1Q0R58e4hu4h+fZqaO909UcnnPbwKiN6Rc3BUEx6ez2wgN7aC0cBfcAjZfwkzE+E2PQQ9nEuoqfA==",
-      "requires": {
-        "@typescript-eslint/typescript-estree": "5.41.0",
-        "@typescript-eslint/utils": "5.41.0",
-        "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
-      }
-    },
-    "@typescript-eslint/types": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.41.0.tgz",
-      "integrity": "sha512-5BejraMXMC+2UjefDvrH0Fo/eLwZRV6859SXRg+FgbhA0R0l6lDqDGAQYhKbXhPN2ofk2kY5sgGyLNL907UXpA=="
-    },
-    "@typescript-eslint/typescript-estree": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.41.0.tgz",
-      "integrity": "sha512-SlzFYRwFSvswzDSQ/zPkIWcHv8O5y42YUskko9c4ki+fV6HATsTODUPbRbcGDFYP86gaJL5xohUEytvyNNcXWg==",
-      "requires": {
-        "@typescript-eslint/types": "5.41.0",
-        "@typescript-eslint/visitor-keys": "5.41.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "@typescript-eslint/utils": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.41.0.tgz",
-      "integrity": "sha512-QlvfwaN9jaMga9EBazQ+5DDx/4sAdqDkcs05AsQHMaopluVCUyu1bTRUVKzXbgjDlrRAQrYVoi/sXJ9fmG+KLQ==",
-      "requires": {
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.41.0",
-        "@typescript-eslint/types": "5.41.0",
-        "@typescript-eslint/typescript-estree": "5.41.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0",
-        "semver": "^7.3.7"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "@typescript-eslint/visitor-keys": {
-      "version": "5.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.41.0.tgz",
-      "integrity": "sha512-vilqeHj267v8uzzakbm13HkPMl7cbYpKVjgFWZPIOHIJHZtinvypUhJ5xBXfWYg4eFKqztbMMpOgFpT9Gfx4fw==",
-      "requires": {
-        "@typescript-eslint/types": "5.41.0",
-        "eslint-visitor-keys": "^3.3.0"
-      }
-    },
-    "@webassemblyjs/ast": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
-      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
-      "requires": {
-        "@webassemblyjs/helper-numbers": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
-      }
-    },
-    "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA=="
-    },
-    "@webassemblyjs/helper-api-error": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ=="
-    },
-    "@webassemblyjs/helper-buffer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA=="
-    },
-    "@webassemblyjs/helper-numbers": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
-      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
-      "requires": {
-        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
-        "@webassemblyjs/helper-api-error": "1.13.2",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA=="
-    },
-    "@webassemblyjs/helper-wasm-section": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
-      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
-      "requires": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/wasm-gen": "1.14.1"
-      }
-    },
-    "@webassemblyjs/ieee754": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
-      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
-      "requires": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "@webassemblyjs/leb128": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
-      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
-      "requires": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/utf8": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ=="
-    },
-    "@webassemblyjs/wasm-edit": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
-      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
-      "requires": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/helper-wasm-section": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-opt": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1",
-        "@webassemblyjs/wast-printer": "1.14.1"
-      }
-    },
-    "@webassemblyjs/wasm-gen": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
-      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
-      "requires": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
-      }
-    },
-    "@webassemblyjs/wasm-opt": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
-      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
-      "requires": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-buffer": "1.14.1",
-        "@webassemblyjs/wasm-gen": "1.14.1",
-        "@webassemblyjs/wasm-parser": "1.14.1"
-      }
-    },
-    "@webassemblyjs/wasm-parser": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
-      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
-      "requires": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@webassemblyjs/helper-api-error": "1.13.2",
-        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
-        "@webassemblyjs/ieee754": "1.13.2",
-        "@webassemblyjs/leb128": "1.13.2",
-        "@webassemblyjs/utf8": "1.13.2"
-      }
-    },
-    "@webassemblyjs/wast-printer": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
-      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
-      "requires": {
-        "@webassemblyjs/ast": "1.14.1",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
-    },
-    "@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
-    },
-    "abab": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
-      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
-    },
-    "accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "requires": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      }
-    },
-    "acorn": {
-      "version": "8.14.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
-      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg=="
-    },
-    "acorn-globals": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
-      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
-      "requires": {
-        "acorn": "^7.1.1",
-        "acorn-walk": "^7.1.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
-        }
-      }
-    },
-    "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="
-    },
-    "acorn-node": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
-      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
-      "requires": {
-        "acorn": "^7.0.0",
-        "acorn-walk": "^7.0.0",
-        "xtend": "^4.0.2"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
-        }
-      }
-    },
-    "acorn-walk": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
-      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
-    },
-    "address": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/address/-/address-1.2.1.tgz",
-      "integrity": "sha512-B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA=="
-    },
-    "adjust-sourcemap-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
-      "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "regex-parser": "^2.2.11"
-      }
-    },
-    "agent-base": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-      "requires": {
-        "debug": "4"
-      }
-    },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-      "requires": {
-        "ajv": "^8.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-        }
-      }
-    },
-    "ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
-    },
-    "ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "requires": {
-        "type-fest": "^0.21.3"
-      }
-    },
-    "ansi-html-community": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw=="
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      }
-    },
-    "arg": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
-      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "aria-query": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.2.tgz",
-      "integrity": "sha512-JWydkr9MirMg2jGJstDqDgzoHqaFbv7n1ghfXYdtEgXWgdq3jz7IU3SQvtj9k3mAszQBiTpQhFdlH+JIRuGTzg==",
-      "dev": true,
-      "requires": {
-        "deep-equal": "^2.0.5"
-      }
-    },
-    "array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
-    },
-    "array-includes": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
-      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5",
-        "get-intrinsic": "^1.1.1",
-        "is-string": "^1.0.7"
-      }
-    },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
-    },
-    "array.prototype.flat": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
-      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "array.prototype.flatmap": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz",
-      "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "array.prototype.reduce": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz",
-      "integrity": "sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.2",
-        "es-array-method-boxes-properly": "^1.0.0",
-        "is-string": "^1.0.7"
-      }
-    },
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
-    },
-    "ast-types-flow": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag=="
-    },
-    "async": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-    },
-    "at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
-    },
-    "autoprefixer": {
-      "version": "10.4.13",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz",
-      "integrity": "sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==",
-      "requires": {
-        "browserslist": "^4.21.4",
-        "caniuse-lite": "^1.0.30001426",
-        "fraction.js": "^4.2.0",
-        "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.0",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-      "dev": true
-    },
-    "axe-core": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.5.0.tgz",
-      "integrity": "sha512-4+rr8eQ7+XXS5nZrKcMO/AikHL0hVqy+lHWAnE3xdHl+aguag8SOQ6eEqLexwLNWgXIMfunGuD3ON1/6Kyet0A=="
-    },
-    "axobject-query": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
-      "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA=="
-    },
-    "babel-jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz",
-      "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
-      "requires": {
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^27.5.1",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "babel-loader": {
-      "version": "8.2.5",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz",
-      "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
-      "requires": {
-        "find-cache-dir": "^3.3.1",
-        "loader-utils": "^2.0.0",
-        "make-dir": "^3.1.0",
-        "schema-utils": "^2.6.5"
-      },
-      "dependencies": {
-        "schema-utils": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-          "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-          "requires": {
-            "@types/json-schema": "^7.0.5",
-            "ajv": "^6.12.4",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
-      }
-    },
-    "babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
-      }
-    },
-    "babel-plugin-jest-hoist": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
-      "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
-      "requires": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.0.0",
-        "@types/babel__traverse": "^7.0.6"
-      }
-    },
-    "babel-plugin-macros": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
-      "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
-      "requires": {
-        "@babel/runtime": "^7.12.5",
-        "cosmiconfig": "^7.0.0",
-        "resolve": "^1.19.0"
-      }
-    },
-    "babel-plugin-named-asset-import": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz",
-      "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q=="
-    },
-    "babel-plugin-polyfill-corejs2": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
-      "requires": {
-        "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "semver": "^6.1.1"
-      }
-    },
-    "babel-plugin-polyfill-corejs3": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "core-js-compat": "^3.25.1"
-      }
-    },
-    "babel-plugin-polyfill-regenerator": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3"
-      }
-    },
-    "babel-plugin-transform-react-remove-prop-types": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz",
-      "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA=="
-    },
-    "babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
-      "requires": {
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
-      }
-    },
-    "babel-preset-jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
-      "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
-      "requires": {
-        "babel-plugin-jest-hoist": "^27.5.1",
-        "babel-preset-current-node-syntax": "^1.0.0"
-      }
-    },
-    "babel-preset-react-app": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz",
-      "integrity": "sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==",
-      "requires": {
-        "@babel/core": "^7.16.0",
-        "@babel/plugin-proposal-class-properties": "^7.16.0",
-        "@babel/plugin-proposal-decorators": "^7.16.4",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.0",
-        "@babel/plugin-proposal-private-methods": "^7.16.0",
-        "@babel/plugin-transform-flow-strip-types": "^7.16.0",
-        "@babel/plugin-transform-react-display-name": "^7.16.0",
-        "@babel/plugin-transform-runtime": "^7.16.4",
-        "@babel/preset-env": "^7.16.4",
-        "@babel/preset-react": "^7.16.0",
-        "@babel/preset-typescript": "^7.16.0",
-        "@babel/runtime": "^7.16.3",
-        "babel-plugin-macros": "^3.1.0",
-        "babel-plugin-transform-react-remove-prop-types": "^0.4.24"
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-    },
-    "batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
-    },
-    "bfj": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/bfj/-/bfj-7.0.2.tgz",
-      "integrity": "sha512-+e/UqUzwmzJamNF50tBV6tZPTORow7gQ96iFow+8b562OdMpEK0BcJEq2OSPEDmAbSMBQ7PKZ87ubFkgxpYWgw==",
-      "requires": {
-        "bluebird": "^3.5.5",
-        "check-types": "^11.1.1",
-        "hoopy": "^0.1.4",
-        "tryer": "^1.0.1"
-      }
-    },
-    "big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
-    },
-    "binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="
-    },
-    "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
-    },
-    "body-parser": {
-      "version": "1.20.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
-      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
-      "requires": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.5",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.13.0",
-        "raw-body": "2.5.2",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        }
-      }
-    },
-    "bonjour-service": {
-      "version": "1.0.14",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz",
-      "integrity": "sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==",
-      "requires": {
-        "array-flatten": "^2.1.2",
-        "dns-equal": "^1.0.0",
-        "fast-deep-equal": "^3.1.3",
-        "multicast-dns": "^7.2.5"
-      }
-    },
-    "boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "requires": {
-        "fill-range": "^7.1.1"
-      }
-    },
-    "browser-process-hrtime": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
-      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
-    },
-    "browserslist": {
-      "version": "4.24.5",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
-      "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
-      "requires": {
-        "caniuse-lite": "^1.0.30001716",
-        "electron-to-chromium": "^1.5.149",
-        "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.3"
-      }
-    },
-    "bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "requires": {
-        "node-int64": "^0.4.0"
-      }
-    },
-    "buffer-from": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-    },
-    "builtin-modules": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
-      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw=="
-    },
-    "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="
-    },
-    "call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
-      "requires": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
-    },
-    "camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-      "requires": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="
-    },
-    "camelcase-css": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
-      "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="
-    },
-    "caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      }
-    },
-    "caniuse-lite": {
-      "version": "1.0.30001718",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz",
-      "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw=="
-    },
-    "case-sensitive-paths-webpack-plugin": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
-      "integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw=="
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "dependencies": {
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
-        }
-      }
-    },
-    "char-regex": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
-      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="
-    },
-    "check-types": {
-      "version": "11.1.2",
-      "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.1.2.tgz",
-      "integrity": "sha512-tzWzvgePgLORb9/3a0YenggReLKAIb2owL03H2Xdoe5pKcUyWRSEQ8xfCar8t2SIAuEDwtmx2da1YB52YuHQMQ=="
-    },
-    "chokidar": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-      "requires": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "fsevents": "~2.3.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      }
-    },
-    "chrome-trace-event": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
-    },
-    "ci-info": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.5.0.tgz",
-      "integrity": "sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw=="
-    },
-    "cjs-module-lexer": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz",
-      "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="
-    },
-    "clean-css": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz",
-      "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==",
-      "requires": {
-        "source-map": "~0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "clsx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="
-    },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="
-    },
-    "coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "requires": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      }
-    },
-    "collect-v8-coverage": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-    },
-    "colord": {
-      "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
-    },
-    "colorette": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="
-    },
-    "common-path-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
-      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w=="
-    },
-    "common-tags": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
-      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA=="
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
-    },
-    "compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "requires": {
-        "mime-db": ">= 1.43.0 < 2"
-      }
-    },
-    "compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-      "requires": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-        }
-      }
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-    },
-    "confusing-browser-globals": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
-      "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA=="
-    },
-    "connect-history-api-fallback": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA=="
-    },
-    "content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-      "requires": {
-        "safe-buffer": "5.2.1"
-      }
-    },
-    "content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
-    },
-    "convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="
-    },
-    "cookie": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
-      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w=="
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
-    },
-    "core-js": {
-      "version": "3.26.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz",
-      "integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw=="
-    },
-    "core-js-compat": {
-      "version": "3.26.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz",
-      "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==",
-      "requires": {
-        "browserslist": "^4.21.4"
-      }
-    },
-    "core-js-pure": {
-      "version": "3.42.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.42.0.tgz",
-      "integrity": "sha512-007bM04u91fF4kMgwom2I5cQxAFIy8jVulgr9eozILl/SZE53QOqnW/+vviC+wQWLv+AunBG+8Q0TLoeSsSxRQ=="
-    },
-    "core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
-    },
-    "cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
-      "requires": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      }
-    },
-    "cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      }
-    },
-    "crypto-js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
-      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
-    },
-    "crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="
-    },
-    "css-blank-pseudo": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
-      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
-      "requires": {
-        "postcss-selector-parser": "^6.0.9"
-      }
-    },
-    "css-declaration-sorter": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
-      "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w=="
-    },
-    "css-has-pseudo": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
-      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
-      "requires": {
-        "postcss-selector-parser": "^6.0.9"
-      }
-    },
-    "css-loader": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz",
-      "integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==",
-      "requires": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.4.7",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
-        "postcss-modules-scope": "^3.0.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.2.0",
-        "semver": "^7.3.5"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "css-minimizer-webpack-plugin": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
-      "integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==",
-      "requires": {
-        "cssnano": "^5.0.6",
-        "jest-worker": "^27.0.2",
-        "postcss": "^8.3.5",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-        },
-        "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "css-prefers-color-scheme": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
-      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA=="
-    },
-    "css-select": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-      "requires": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      }
-    },
-    "css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
-    },
-    "css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
-      "requires": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="
-    },
-    "css.escape": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
-      "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==",
-      "dev": true
-    },
-    "cssdb": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.0.2.tgz",
-      "integrity": "sha512-Vm4b6P/PifADu0a76H0DKRNVWq3Rq9xa/Nx6oEMUBJlwTUuZoZ3dkZxo8Gob3UEL53Cq+Ma1GBgISed6XEBs3w=="
-    },
-    "cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
-    },
-    "cssnano": {
-      "version": "5.1.14",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.14.tgz",
-      "integrity": "sha512-Oou7ihiTocbKqi0J1bB+TRJIQX5RMR3JghA8hcWSw9mjBLQ5Y3RWqEDoYG3sRNlAbCIXpqMoZGbq5KDR3vdzgw==",
-      "requires": {
-        "cssnano-preset-default": "^5.2.13",
-        "lilconfig": "^2.0.3",
-        "yaml": "^1.10.2"
-      }
-    },
-    "cssnano-preset-default": {
-      "version": "5.2.13",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.13.tgz",
-      "integrity": "sha512-PX7sQ4Pb+UtOWuz8A1d+Rbi+WimBIxJTRyBdgGp1J75VU0r/HFQeLnMYgHiCAp6AR4rqrc7Y4R+1Rjk3KJz6DQ==",
-      "requires": {
-        "css-declaration-sorter": "^6.3.1",
-        "cssnano-utils": "^3.1.0",
-        "postcss-calc": "^8.2.3",
-        "postcss-colormin": "^5.3.0",
-        "postcss-convert-values": "^5.1.3",
-        "postcss-discard-comments": "^5.1.2",
-        "postcss-discard-duplicates": "^5.1.0",
-        "postcss-discard-empty": "^5.1.1",
-        "postcss-discard-overridden": "^5.1.0",
-        "postcss-merge-longhand": "^5.1.7",
-        "postcss-merge-rules": "^5.1.3",
-        "postcss-minify-font-values": "^5.1.0",
-        "postcss-minify-gradients": "^5.1.1",
-        "postcss-minify-params": "^5.1.4",
-        "postcss-minify-selectors": "^5.2.1",
-        "postcss-normalize-charset": "^5.1.0",
-        "postcss-normalize-display-values": "^5.1.0",
-        "postcss-normalize-positions": "^5.1.1",
-        "postcss-normalize-repeat-style": "^5.1.1",
-        "postcss-normalize-string": "^5.1.0",
-        "postcss-normalize-timing-functions": "^5.1.0",
-        "postcss-normalize-unicode": "^5.1.1",
-        "postcss-normalize-url": "^5.1.0",
-        "postcss-normalize-whitespace": "^5.1.1",
-        "postcss-ordered-values": "^5.1.3",
-        "postcss-reduce-initial": "^5.1.1",
-        "postcss-reduce-transforms": "^5.1.0",
-        "postcss-svgo": "^5.1.0",
-        "postcss-unique-selectors": "^5.1.1"
-      }
-    },
-    "cssnano-utils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
-      "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA=="
-    },
-    "csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "requires": {
-        "css-tree": "^1.1.2"
-      },
-      "dependencies": {
-        "css-tree": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-          "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-          "requires": {
-            "mdn-data": "2.0.14",
-            "source-map": "^0.6.1"
-          }
-        },
-        "mdn-data": {
-          "version": "2.0.14",
-          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-          "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "cssom": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
-      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw=="
-    },
-    "cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "requires": {
-        "cssom": "~0.3.6"
-      },
-      "dependencies": {
-        "cssom": {
-          "version": "0.3.8",
-          "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-          "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
-        }
-      }
-    },
-    "csstype": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
-      "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
-    },
-    "damerau-levenshtein": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
-      "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA=="
-    },
-    "data-urls": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
-      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
-      "requires": {
-        "abab": "^2.0.3",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.0.0"
-      }
-    },
-    "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "decimal.js": {
-      "version": "10.4.2",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.2.tgz",
-      "integrity": "sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA=="
-    },
-    "dedent": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
-      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="
-    },
-    "deep-equal": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.5.tgz",
-      "integrity": "sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "es-get-iterator": "^1.1.1",
-        "get-intrinsic": "^1.0.1",
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.2",
-        "is-regex": "^1.1.1",
-        "isarray": "^2.0.5",
-        "object-is": "^1.1.4",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.3.0",
-        "side-channel": "^1.0.3",
-        "which-boxed-primitive": "^1.0.1",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.2"
-      }
-    },
-    "deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
-    },
-    "deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
-    },
-    "default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-      "requires": {
-        "execa": "^5.0.0"
-      }
-    },
-    "define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-      "requires": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      }
-    },
-    "define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
-    },
-    "define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-      "requires": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "defined": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",
-      "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q=="
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
-    },
-    "depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-    },
-    "destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
-    },
-    "detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="
-    },
-    "detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
-    },
-    "detect-port-alt": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz",
-      "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
-      "requires": {
-        "address": "^1.0.1",
-        "debug": "^2.6.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        }
-      }
-    },
-    "detective": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz",
-      "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==",
-      "requires": {
-        "acorn-node": "^1.8.2",
-        "defined": "^1.0.0",
-        "minimist": "^1.2.6"
-      }
-    },
-    "dexie": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/dexie/-/dexie-3.2.2.tgz",
-      "integrity": "sha512-q5dC3HPmir2DERlX+toCBbHQXW5MsyrFqPFcovkH9N2S/UW/H3H5AWAB6iEOExeraAu+j+zRDG+zg/D7YhH0qg=="
-    },
-    "didyoumean": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
-    },
-    "diff-sequences": {
-      "version": "29.2.0",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.2.0.tgz",
-      "integrity": "sha512-413SY5JpYeSBZxmenGEmCVQ8mCgtFJF0w9PROdaS6z987XC2Pd2GOKqOITLtMftmyFZqgtCOb/QA7/Z3ZXfzIw==",
-      "dev": true
-    },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "requires": {
-        "path-type": "^4.0.0"
-      }
-    },
-    "dlv": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
-    },
-    "dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="
-    },
-    "dns-packet": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz",
-      "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==",
-      "requires": {
-        "@leichtgewicht/ip-codec": "^2.0.1"
-      }
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "dom-accessibility-api": {
-      "version": "0.5.14",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.14.tgz",
-      "integrity": "sha512-NMt+m9zFMPZe0JcY9gN224Qvk6qLIdqex29clBvc/y75ZBX9YA9wNK3frsYvu2DI1xcCIwxwnX+TlsJ2DSOADg==",
-      "dev": true
-    },
-    "dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
-      "requires": {
-        "utila": "~0.4"
-      }
-    },
-    "dom-helpers": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
-      "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
-      "requires": {
-        "@babel/runtime": "^7.8.7",
-        "csstype": "^3.0.2"
-      }
-    },
-    "dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      }
-    },
-    "domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
-    },
-    "domexception": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
-      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
-      "requires": {
-        "webidl-conversions": "^5.0.0"
-      },
-      "dependencies": {
-        "webidl-conversions": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
-          "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="
-        }
-      }
-    },
-    "domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "requires": {
-        "domelementtype": "^2.2.0"
-      }
-    },
-    "domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "requires": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      }
-    },
-    "dot-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-      "requires": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "dotenv": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
-      "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q=="
-    },
-    "dotenv-expand": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
-      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="
-    },
-    "duplexer": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
-    },
-    "ejs": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
-      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
-      "requires": {
-        "jake": "^10.8.5"
-      }
-    },
-    "electron-to-chromium": {
-      "version": "1.5.155",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.155.tgz",
-      "integrity": "sha512-ps5KcGGmwL8VaeJlvlDlu4fORQpv3+GIcF5I3f9tUKUlJ/wsysh6HU8P5L1XWRYeXfA0oJd4PyM8ds8zTFf6Ng=="
-    },
-    "emittery": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz",
-      "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg=="
-    },
-    "emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
-    },
-    "emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
-    },
-    "encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="
-    },
-    "enhanced-resolve": {
-      "version": "5.18.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
-      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
-      "requires": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      }
-    },
-    "entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "error-stack-parser": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
-      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
-      "requires": {
-        "stackframe": "^1.3.4"
-      }
-    },
-    "es-abstract": {
-      "version": "1.20.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz",
-      "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.1.3",
-        "get-symbol-description": "^1.0.0",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.2",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.4.3",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trimend": "^1.0.5",
-        "string.prototype.trimstart": "^1.0.5",
-        "unbox-primitive": "^1.0.2"
-      }
-    },
-    "es-array-method-boxes-properly": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="
-    },
-    "es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "requires": {
-        "get-intrinsic": "^1.2.4"
-      }
-    },
-    "es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
-    },
-    "es-get-iterator": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz",
-      "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.0",
-        "has-symbols": "^1.0.1",
-        "is-arguments": "^1.1.0",
-        "is-map": "^2.0.2",
-        "is-set": "^2.0.2",
-        "is-string": "^1.0.5",
-        "isarray": "^2.0.5"
-      }
-    },
-    "es-module-lexer": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
-      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA=="
-    },
-    "es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="
-    },
-    "escalade": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
-    },
-    "escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
-    },
-    "escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-      "requires": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-        },
-        "levn": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-          "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-          "requires": {
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2"
-          }
-        },
-        "optionator": {
-          "version": "0.8.3",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-          "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-          "requires": {
-            "deep-is": "~0.1.3",
-            "fast-levenshtein": "~2.0.6",
-            "levn": "~0.3.0",
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2",
-            "word-wrap": "~1.2.3"
-          }
-        },
-        "prelude-ls": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-          "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "optional": true
-        },
-        "type-check": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-          "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
-          "requires": {
-            "prelude-ls": "~1.1.2"
-          }
-        }
-      }
-    },
-    "eslint": {
-      "version": "8.26.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz",
-      "integrity": "sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==",
-      "requires": {
-        "@eslint/eslintrc": "^1.3.3",
-        "@humanwhocodes/config-array": "^0.11.6",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.4.0",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.15.0",
-        "grapheme-splitter": "^1.0.4",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-sdsl": "^4.1.4",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "eslint-scope": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-          "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^5.2.0"
-          }
-        },
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-        },
-        "glob-parent": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-          "requires": {
-            "is-glob": "^4.0.3"
-          }
-        },
-        "globals": {
-          "version": "13.17.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-          "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
-          "requires": {
-            "type-fest": "^0.20.2"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
-        }
-      }
-    },
-    "eslint-config-react-app": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz",
-      "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==",
-      "requires": {
-        "@babel/core": "^7.16.0",
-        "@babel/eslint-parser": "^7.16.3",
-        "@rushstack/eslint-patch": "^1.1.0",
-        "@typescript-eslint/eslint-plugin": "^5.5.0",
-        "@typescript-eslint/parser": "^5.5.0",
-        "babel-preset-react-app": "^10.0.1",
-        "confusing-browser-globals": "^1.0.11",
-        "eslint-plugin-flowtype": "^8.0.3",
-        "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-jest": "^25.3.0",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-react": "^7.27.1",
-        "eslint-plugin-react-hooks": "^4.3.0",
-        "eslint-plugin-testing-library": "^5.0.1"
-      }
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
-      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
-      "requires": {
-        "debug": "^3.2.7",
-        "resolve": "^1.20.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
-      "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
-      "requires": {
-        "debug": "^3.2.7"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-plugin-flowtype": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
-      "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==",
-      "requires": {
-        "lodash": "^4.17.21",
-        "string-natural-compare": "^3.0.1"
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.26.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
-      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
-      "requires": {
-        "array-includes": "^3.1.4",
-        "array.prototype.flat": "^1.2.5",
-        "debug": "^2.6.9",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.6",
-        "eslint-module-utils": "^2.7.3",
-        "has": "^1.0.3",
-        "is-core-module": "^2.8.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.values": "^1.1.5",
-        "resolve": "^1.22.0",
-        "tsconfig-paths": "^3.14.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        }
-      }
-    },
-    "eslint-plugin-jest": {
-      "version": "25.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
-      "integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==",
-      "requires": {
-        "@typescript-eslint/experimental-utils": "^5.0.0"
-      }
-    },
-    "eslint-plugin-jsx-a11y": {
-      "version": "6.6.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz",
-      "integrity": "sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==",
-      "requires": {
-        "@babel/runtime": "^7.18.9",
-        "aria-query": "^4.2.2",
-        "array-includes": "^3.1.5",
-        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.4.3",
-        "axobject-query": "^2.2.0",
-        "damerau-levenshtein": "^1.0.8",
-        "emoji-regex": "^9.2.2",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.3.2",
-        "language-tags": "^1.0.5",
-        "minimatch": "^3.1.2",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "aria-query": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz",
-          "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==",
-          "requires": {
-            "@babel/runtime": "^7.10.2",
-            "@babel/runtime-corejs3": "^7.10.2"
-          }
-        }
-      }
-    },
-    "eslint-plugin-react": {
-      "version": "7.31.10",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.10.tgz",
-      "integrity": "sha512-e4N/nc6AAlg4UKW/mXeYWd3R++qUano5/o+t+wnWxIf+bLsOaH3a4q74kX3nDjYym3VBN4HyO9nEn1GcAqgQOA==",
-      "requires": {
-        "array-includes": "^3.1.5",
-        "array.prototype.flatmap": "^1.3.0",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.5",
-        "object.fromentries": "^2.0.5",
-        "object.hasown": "^1.1.1",
-        "object.values": "^1.1.5",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.3",
-        "semver": "^6.3.0",
-        "string.prototype.matchall": "^4.0.7"
-      },
-      "dependencies": {
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-        },
-        "resolve": {
-          "version": "2.0.0-next.4",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-          "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
-          "requires": {
-            "is-core-module": "^2.9.0",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "eslint-plugin-react-hooks": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
-      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g=="
-    },
-    "eslint-plugin-testing-library": {
-      "version": "5.9.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.9.1.tgz",
-      "integrity": "sha512-6BQp3tmb79jLLasPHJmy8DnxREe+2Pgf7L+7o09TSWPfdqqtQfRZmZNetr5mOs3yqZk/MRNxpN3RUpJe0wB4LQ==",
-      "requires": {
-        "@typescript-eslint/utils": "^5.13.0"
-      }
-    },
-    "eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "requires": {
-        "eslint-visitor-keys": "^2.0.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-          "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
-        }
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-      "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="
-    },
-    "eslint-webpack-plugin": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz",
-      "integrity": "sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==",
-      "requires": {
-        "@types/eslint": "^7.29.0 || ^8.4.1",
-        "jest-worker": "^28.0.2",
-        "micromatch": "^4.0.5",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-worker": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz",
-          "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==",
-          "requires": {
-            "@types/node": "*",
-            "merge-stream": "^2.0.0",
-            "supports-color": "^8.0.0"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-        },
-        "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "espree": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-      "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
-      "requires": {
-        "acorn": "^8.8.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
-      }
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-    },
-    "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "requires": {
-        "estraverse": "^5.1.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-        }
-      }
-    },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "requires": {
-        "estraverse": "^5.2.0"
-      },
-      "dependencies": {
-        "estraverse": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
-        }
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
-    },
-    "estree-walker": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
-    },
-    "eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
-    },
-    "events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
-    },
-    "execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "requires": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      }
-    },
-    "exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="
-    },
-    "expect": {
-      "version": "29.2.2",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.2.2.tgz",
-      "integrity": "sha512-hE09QerxZ5wXiOhqkXy5d2G9ar+EqOyifnCXCpMNu+vZ6DG9TJ6CO2c2kPDSLqERTTWrO7OZj8EkYHQqSd78Yw==",
-      "dev": true,
-      "requires": {
-        "@jest/expect-utils": "^29.2.2",
-        "jest-get-type": "^29.2.0",
-        "jest-matcher-utils": "^29.2.2",
-        "jest-message-util": "^29.2.1",
-        "jest-util": "^29.2.1"
-      }
-    },
-    "express": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
-      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
-      "requires": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.3",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.7.1",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~2.0.0",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.3.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.3",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.12",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.13.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.19.0",
-        "serve-static": "1.16.2",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "array-flatten": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-          "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        }
-      }
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "fast-glob": {
-      "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-      "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
-      "requires": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      }
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
-    },
-    "fast-uri": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
-      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw=="
-    },
-    "fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-      "requires": {
-        "websocket-driver": ">=0.5.1"
-      }
-    },
-    "fb-watchman": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
-      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
-      "requires": {
-        "bser": "2.1.1"
-      }
-    },
-    "file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "requires": {
-        "flat-cache": "^3.0.4"
-      }
-    },
-    "file-loader": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      }
-    },
-    "filelist": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
-      "requires": {
-        "minimatch": "^5.0.1"
-      },
-      "dependencies": {
-        "brace-expansion": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-          "requires": {
-            "balanced-match": "^1.0.0"
-          }
-        },
-        "minimatch": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
-          "requires": {
-            "brace-expansion": "^2.0.1"
-          }
-        }
-      }
-    },
-    "filesize": {
-      "version": "8.0.7",
-      "resolved": "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz",
-      "integrity": "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ=="
-    },
-    "fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "final-form": {
-      "version": "4.20.7",
-      "resolved": "https://registry.npmjs.org/final-form/-/final-form-4.20.7.tgz",
-      "integrity": "sha512-ii3X9wNfyBYFnDPunYN5jh1/HAvtOZ9aJI/TVk0MB86hZuOeYkb+W5L3icgwW9WWNztZR6MDU3En6eoZTUoFPg==",
-      "requires": {
-        "@babel/runtime": "^7.10.0"
-      }
-    },
-    "final-form-set-field-touched": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/final-form-set-field-touched/-/final-form-set-field-touched-1.0.1.tgz",
-      "integrity": "sha512-yvE5AAs9U3OgJQ9YF8NhSF0I0mJEECvOpkaXNqovloxji5Q6gOZ0DCIAyLAKHluGSpsXKUGORyBm8Hq0beZIqQ=="
-    },
-    "finalhandler": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~2.0.0",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        }
-      }
-    },
-    "find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-      "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      }
-    },
-    "find-root": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
-    },
-    "find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "requires": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "requires": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      }
-    },
-    "flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
-    },
-    "follow-redirects": {
-      "version": "1.15.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
-      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ=="
-    },
-    "for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.3"
-      }
-    },
-    "fork-ts-checker-webpack-plugin": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.2.tgz",
-      "integrity": "sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA==",
-      "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@types/json-schema": "^7.0.5",
-        "chalk": "^4.1.0",
-        "chokidar": "^3.4.2",
-        "cosmiconfig": "^6.0.0",
-        "deepmerge": "^4.2.2",
-        "fs-extra": "^9.0.0",
-        "glob": "^7.1.6",
-        "memfs": "^3.1.2",
-        "minimatch": "^3.0.4",
-        "schema-utils": "2.7.0",
-        "semver": "^7.3.2",
-        "tapable": "^1.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "cosmiconfig": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
-          "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
-          "requires": {
-            "@types/parse-json": "^4.0.0",
-            "import-fresh": "^3.1.0",
-            "parse-json": "^5.0.0",
-            "path-type": "^4.0.0",
-            "yaml": "^1.7.2"
-          }
-        },
-        "fs-extra": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-          "requires": {
-            "at-least-node": "^1.0.0",
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^6.0.1",
-            "universalify": "^2.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "schema-utils": {
-          "version": "2.7.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
-          "requires": {
-            "@types/json-schema": "^7.0.4",
-            "ajv": "^6.12.2",
-            "ajv-keywords": "^3.4.1"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "tapable": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-          "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
-        }
-      }
-    },
-    "form-data": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
-      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
-    },
-    "fraction.js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-      "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA=="
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
-    },
-    "fs-extra": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-      "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-      "requires": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      }
-    },
-    "fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q=="
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "optional": true
-    },
-    "function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
-    },
-    "function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      }
-    },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
-    },
-    "gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-    },
-    "get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
-      "requires": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
-      }
-    },
-    "get-own-enumerable-property-symbols": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
-      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="
-    },
-    "get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="
-    },
-    "get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
-    },
-    "get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
-    "glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
-    },
-    "global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "requires": {
-        "global-prefix": "^3.0.0"
-      }
-    },
-    "global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "requires": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "dependencies": {
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-    },
-    "globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "requires": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      }
-    },
-    "gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "requires": {
-        "get-intrinsic": "^1.1.3"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
-    },
-    "grapheme-splitter": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
-    },
-    "gzip-size": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
-      "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
-      "requires": {
-        "duplexer": "^0.1.2"
-      }
-    },
-    "handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
-    },
-    "harmony-reflect": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
-      "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g=="
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
-    },
-    "has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-      "requires": {
-        "es-define-property": "^1.0.0"
-      }
-    },
-    "has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-    },
-    "has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "requires": {
-        "function-bind": "^1.1.2"
-      }
-    },
-    "he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
-    },
-    "hoist-non-react-statics": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-      "requires": {
-        "react-is": "^16.7.0"
-      },
-      "dependencies": {
-        "react-is": {
-          "version": "16.13.1",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-        }
-      }
-    },
-    "hoopy": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
-      "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ=="
-    },
-    "hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
-      "requires": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "html-encoding-sniffer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
-      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
-      "requires": {
-        "whatwg-encoding": "^1.0.5"
-      }
-    },
-    "html-entities": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
-      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA=="
-    },
-    "html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
-    },
-    "html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
-      "requires": {
-        "camel-case": "^4.1.2",
-        "clean-css": "^5.2.2",
-        "commander": "^8.3.0",
-        "he": "^1.2.0",
-        "param-case": "^3.0.4",
-        "relateurl": "^0.2.7",
-        "terser": "^5.10.0"
-      }
-    },
-    "html-parse-stringify": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
-      "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
-      "requires": {
-        "void-elements": "3.1.0"
-      }
-    },
-    "html-webpack-plugin": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
-      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
-      "requires": {
-        "@types/html-minifier-terser": "^6.0.0",
-        "html-minifier-terser": "^6.0.2",
-        "lodash": "^4.17.21",
-        "pretty-error": "^4.0.0",
-        "tapable": "^2.0.0"
-      }
-    },
-    "htmlparser2": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
-      }
-    },
-    "http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="
-    },
-    "http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-      "requires": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      }
-    },
-    "http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
-    },
-    "http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "requires": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-      "requires": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
-      }
-    },
-    "http-proxy-middleware": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz",
-      "integrity": "sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==",
-      "requires": {
-        "@types/http-proxy": "^1.17.8",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      }
-    },
-    "https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "requires": {
-        "agent-base": "6",
-        "debug": "4"
-      }
-    },
-    "human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
-    },
-    "husky": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
-      "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==",
-      "dev": true
-    },
-    "i18next": {
-      "version": "22.0.4",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-22.0.4.tgz",
-      "integrity": "sha512-TOp7BTMKDbUkOHMzDlVsCYWpyaFkKakrrO3HNXfSz4EeJaWwnBScRmgQSTaWHScXVHBUFXTvShrCW8uryBYFcg==",
-      "requires": {
-        "@babel/runtime": "^7.17.2"
-      }
-    },
-    "i18next-browser-languagedetector": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-7.0.0.tgz",
-      "integrity": "sha512-RrH7z5/DbhzhgCLDFIKXBTZlb2aXi38ZHa5e5oZaPt9zGLWmgAX49mzkQL/E7R6Y9fTE8QbZFuyMV0ronu4H/Q==",
-      "requires": {
-        "@babel/runtime": "^7.19.4"
-      }
-    },
-    "i18next-icu": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/i18next-icu/-/i18next-icu-2.0.3.tgz",
-      "integrity": "sha512-sZ0VCWDnHysUYQL8j/0rVOxv6rLR+SBoaqQQ2UVNfLyJCuf/bAjYPkoUQgyuDkWFo1xZjeCf4G6GBNr7gD61bQ=="
-    },
-    "iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      }
-    },
-    "icss-utils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="
-    },
-    "idb": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.0.tgz",
-      "integrity": "sha512-Wsk07aAxDsntgYJY4h0knZJuTxM73eQ4reRAO+Z1liOh8eMCJ/MoDS8fCui1vGT9mnjtl1sOu3I2i/W1swPYZg=="
-    },
-    "identity-obj-proxy": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
-      "integrity": "sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==",
-      "requires": {
-        "harmony-reflect": "^1.4.6"
-      }
-    },
-    "ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="
-    },
-    "immer": {
-      "version": "9.0.16",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.16.tgz",
-      "integrity": "sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ=="
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
-      "requires": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
-    },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
-    },
-    "internal-slot": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-      "requires": {
-        "get-intrinsic": "^1.1.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "intl-messageformat": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.2.1.tgz",
-      "integrity": "sha512-1lrJG2qKzcC1TVzYu1VuB1yiY68LU5rwpbHa2THCzA67Vutkz7+1lv5U20K3Lz5RAiH78zxNztMEtchokMWv8A==",
-      "requires": {
-        "@formatjs/ecma402-abstract": "1.13.0",
-        "@formatjs/fast-memoize": "1.2.6",
-        "@formatjs/icu-messageformat-parser": "2.1.10",
-        "tslib": "2.4.0"
-      }
-    },
-    "invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "ipaddr.js": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-      "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng=="
-    },
-    "is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-    },
-    "is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "requires": {
-        "has-bigints": "^1.0.1"
-      }
-    },
-    "is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "requires": {
-        "binary-extensions": "^2.0.0"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
-    },
-    "is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-    },
-    "is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ=="
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz",
-      "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==",
-      "dev": true
-    },
-    "is-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="
-    },
-    "is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-    },
-    "is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg=="
-    },
-    "is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="
-    },
-    "is-plain-obj": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="
-    },
-    "is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
-    },
-    "is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
-    },
-    "is-promise": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-      "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
-    },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-      "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA=="
-    },
-    "is-root": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
-      "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg=="
-    },
-    "is-set": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz",
-      "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==",
-      "dev": true
-    },
-    "is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
-    },
-    "is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "is-typed-array": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz",
-      "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==",
-      "dev": true,
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.20.0",
-        "for-each": "^0.3.3",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
-    },
-    "is-weakmap": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
-      "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==",
-      "dev": true
-    },
-    "is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-weakset": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz",
-      "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      }
-    },
-    "is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "requires": {
-        "is-docker": "^2.0.0"
-      }
-    },
-    "isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
-    },
-    "istanbul-lib-coverage": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="
-    },
-    "istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "requires": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      }
-    },
-    "istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-      "requires": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "requires": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "istanbul-reports": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
-      "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
-      "requires": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      }
-    },
-    "jake": {
-      "version": "10.8.5",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz",
-      "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==",
-      "requires": {
-        "async": "^3.2.3",
-        "chalk": "^4.0.2",
-        "filelist": "^1.0.1",
-        "minimatch": "^3.0.4"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
-      "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
-      "requires": {
-        "@jest/core": "^27.5.1",
-        "import-local": "^3.0.2",
-        "jest-cli": "^27.5.1"
-      }
-    },
-    "jest-changed-files": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
-      "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
-      "requires": {
-        "@jest/types": "^27.5.1",
-        "execa": "^5.0.0",
-        "throat": "^6.0.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-circus": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz",
-      "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
-      "requires": {
-        "@jest/environment": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^0.7.0",
-        "expect": "^27.5.1",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3",
-        "throat": "^6.0.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "diff-sequences": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-          "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="
-        },
-        "expect": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-          "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "jest-matcher-utils": "^27.5.1",
-            "jest-message-util": "^27.5.1"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-diff": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-          "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
-          "requires": {
-            "chalk": "^4.0.0",
-            "diff-sequences": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "pretty-format": "^27.5.1"
-          }
-        },
-        "jest-get-type": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="
-        },
-        "jest-matcher-utils": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-          "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
-          "requires": {
-            "chalk": "^4.0.0",
-            "jest-diff": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "pretty-format": "^27.5.1"
-          }
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-cli": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz",
-      "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
-      "requires": {
-        "@jest/core": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "import-local": "^3.0.2",
-        "jest-config": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "prompts": "^2.0.1",
-        "yargs": "^16.2.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-config": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz",
-      "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
-      "requires": {
-        "@babel/core": "^7.8.0",
-        "@jest/test-sequencer": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "babel-jest": "^27.5.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^27.5.1",
-        "jest-environment-jsdom": "^27.5.1",
-        "jest-environment-node": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-jasmine2": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-runner": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "parse-json": "^5.2.0",
-        "pretty-format": "^27.5.1",
-        "slash": "^3.0.0",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-get-type": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-diff": {
-      "version": "29.2.1",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.2.1.tgz",
-      "integrity": "sha512-gfh/SMNlQmP3MOUgdzxPOd4XETDJifADpT937fN1iUGz+9DgOu2eUPHH25JDkLVcLwwqxv3GzVyK4VBUr9fjfA==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^29.2.0",
-        "jest-get-type": "^29.2.0",
-        "pretty-format": "^29.2.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "29.2.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.2.1.tgz",
-          "integrity": "sha512-Y41Sa4aLCtKAXvwuIpTvcFBkyeYp2gdFWzXGA+ZNES3VwURIB165XO/z7CjETwzCCS53MjW/rLMyyqEnTtaOfA==",
-          "dev": true,
-          "requires": {
-            "@jest/schemas": "^29.0.0",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-              "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-docblock": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz",
-      "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
-      "requires": {
-        "detect-newline": "^3.0.0"
-      }
-    },
-    "jest-each": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz",
-      "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
-      "requires": {
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-get-type": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-environment-jsdom": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
-      "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
-      "requires": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jsdom": "^16.6.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-environment-node": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
-      "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
-      "requires": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "jest-mock": "^27.5.1",
-        "jest-util": "^27.5.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-get-type": {
-      "version": "29.2.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.2.0.tgz",
-      "integrity": "sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==",
-      "dev": true
-    },
-    "jest-haste-map": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
-      "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
-      "requires": {
-        "@jest/types": "^27.5.1",
-        "@types/graceful-fs": "^4.1.2",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "fsevents": "^2.3.2",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^27.5.1",
-        "jest-serializer": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.7"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-jasmine2": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
-      "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
-      "requires": {
-        "@jest/environment": "^27.5.1",
-        "@jest/source-map": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "expect": "^27.5.1",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "pretty-format": "^27.5.1",
-        "throat": "^6.0.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "diff-sequences": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-          "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="
-        },
-        "expect": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-          "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "jest-matcher-utils": "^27.5.1",
-            "jest-message-util": "^27.5.1"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-diff": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-          "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
-          "requires": {
-            "chalk": "^4.0.0",
-            "diff-sequences": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "pretty-format": "^27.5.1"
-          }
-        },
-        "jest-get-type": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="
-        },
-        "jest-matcher-utils": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-          "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
-          "requires": {
-            "chalk": "^4.0.0",
-            "jest-diff": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "pretty-format": "^27.5.1"
-          }
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-leak-detector": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
-      "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
-      "requires": {
-        "jest-get-type": "^27.5.1",
-        "pretty-format": "^27.5.1"
-      },
-      "dependencies": {
-        "jest-get-type": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="
-        }
-      }
-    },
-    "jest-matcher-utils": {
-      "version": "29.2.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.2.2.tgz",
-      "integrity": "sha512-4DkJ1sDPT+UX2MR7Y3od6KtvRi9Im1ZGLGgdLFLm4lPexbTaCgJW5NN3IOXlQHF7NSHY/VHhflQ+WoKtD/vyCw==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^29.2.1",
-        "jest-get-type": "^29.2.0",
-        "pretty-format": "^29.2.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "29.2.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.2.1.tgz",
-          "integrity": "sha512-Y41Sa4aLCtKAXvwuIpTvcFBkyeYp2gdFWzXGA+ZNES3VwURIB165XO/z7CjETwzCCS53MjW/rLMyyqEnTtaOfA==",
-          "dev": true,
-          "requires": {
-            "@jest/schemas": "^29.0.0",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-              "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-message-util": {
-      "version": "29.2.1",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.2.1.tgz",
-      "integrity": "sha512-Dx5nEjw9V8C1/Yj10S/8ivA8F439VS8vTq1L7hEgwHFn9ovSKNpYW/kwNh7UglaEgXO42XxzKJB+2x0nSglFVw==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.2.1",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.2.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "pretty-format": {
-          "version": "29.2.1",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.2.1.tgz",
-          "integrity": "sha512-Y41Sa4aLCtKAXvwuIpTvcFBkyeYp2gdFWzXGA+ZNES3VwURIB165XO/z7CjETwzCCS53MjW/rLMyyqEnTtaOfA==",
-          "dev": true,
-          "requires": {
-            "@jest/schemas": "^29.0.0",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-              "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-              "dev": true
-            }
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-mock": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz",
-      "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
-      "requires": {
-        "@jest/types": "^27.5.1",
-        "@types/node": "*"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-pnp-resolver": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w=="
-    },
-    "jest-regex-util": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
-      "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg=="
-    },
-    "jest-resolve": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz",
-      "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
-      "requires": {
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^27.5.1",
-        "jest-validate": "^27.5.1",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^1.1.0",
-        "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-resolve-dependencies": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
-      "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
-      "requires": {
-        "@jest/types": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-snapshot": "^27.5.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-runner": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz",
-      "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
-      "requires": {
-        "@jest/console": "^27.5.1",
-        "@jest/environment": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.8.1",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^27.5.1",
-        "jest-environment-jsdom": "^27.5.1",
-        "jest-environment-node": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-leak-detector": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-runtime": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "jest-worker": "^27.5.1",
-        "source-map-support": "^0.5.6",
-        "throat": "^6.0.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-runtime": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz",
-      "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
-      "requires": {
-        "@jest/environment": "^27.5.1",
-        "@jest/fake-timers": "^27.5.1",
-        "@jest/globals": "^27.5.1",
-        "@jest/source-map": "^27.5.1",
-        "@jest/test-result": "^27.5.1",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "execa": "^5.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-mock": "^27.5.1",
-        "jest-regex-util": "^27.5.1",
-        "jest-resolve": "^27.5.1",
-        "jest-snapshot": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-serializer": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz",
-      "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
-      "requires": {
-        "@types/node": "*",
-        "graceful-fs": "^4.2.9"
-      }
-    },
-    "jest-snapshot": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
-      "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
-      "requires": {
-        "@babel/core": "^7.7.2",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/traverse": "^7.7.2",
-        "@babel/types": "^7.0.0",
-        "@jest/transform": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/babel__traverse": "^7.0.4",
-        "@types/prettier": "^2.1.5",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^27.5.1",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^27.5.1",
-        "jest-get-type": "^27.5.1",
-        "jest-haste-map": "^27.5.1",
-        "jest-matcher-utils": "^27.5.1",
-        "jest-message-util": "^27.5.1",
-        "jest-util": "^27.5.1",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^27.5.1",
-        "semver": "^7.3.2"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "diff-sequences": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz",
-          "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ=="
-        },
-        "expect": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz",
-          "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "jest-matcher-utils": "^27.5.1",
-            "jest-message-util": "^27.5.1"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-diff": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz",
-          "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
-          "requires": {
-            "chalk": "^4.0.0",
-            "diff-sequences": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "pretty-format": "^27.5.1"
-          }
-        },
-        "jest-get-type": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="
-        },
-        "jest-matcher-utils": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
-          "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
-          "requires": {
-            "chalk": "^4.0.0",
-            "jest-diff": "^27.5.1",
-            "jest-get-type": "^27.5.1",
-            "pretty-format": "^27.5.1"
-          }
-        },
-        "jest-message-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz",
-          "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^27.5.1",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^27.5.1",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          }
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-util": {
-      "version": "29.2.1",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.2.1.tgz",
-      "integrity": "sha512-P5VWDj25r7kj7kl4pN2rG/RN2c1TLfYYYZYULnS/35nFDjBai+hBeo3MDrYZS7p6IoY3YHZnt2vq4L6mKnLk0g==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^29.2.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-validate": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz",
-      "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
-      "requires": {
-        "@jest/types": "^27.5.1",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^27.5.1",
-        "leven": "^3.1.0",
-        "pretty-format": "^27.5.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-get-type": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz",
-          "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-watch-typeahead": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz",
-      "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==",
-      "requires": {
-        "ansi-escapes": "^4.3.1",
-        "chalk": "^4.0.0",
-        "jest-regex-util": "^28.0.0",
-        "jest-watcher": "^28.0.0",
-        "slash": "^4.0.0",
-        "string-length": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "dependencies": {
-        "@jest/console": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz",
-          "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==",
-          "requires": {
-            "@jest/types": "^28.1.3",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "jest-message-util": "^28.1.3",
-            "jest-util": "^28.1.3",
-            "slash": "^3.0.0"
-          },
-          "dependencies": {
-            "slash": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-              "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
-            }
-          }
-        },
-        "@jest/schemas": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
-          "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
-          "requires": {
-            "@sinclair/typebox": "^0.24.1"
-          }
-        },
-        "@jest/test-result": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz",
-          "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==",
-          "requires": {
-            "@jest/console": "^28.1.3",
-            "@jest/types": "^28.1.3",
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "collect-v8-coverage": "^1.0.0"
-          }
-        },
-        "@jest/types": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz",
-          "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==",
-          "requires": {
-            "@jest/schemas": "^28.1.3",
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^17.0.8",
-            "chalk": "^4.0.0"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "emittery": {
-          "version": "0.10.2",
-          "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz",
-          "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-message-util": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz",
-          "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==",
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@jest/types": "^28.1.3",
-            "@types/stack-utils": "^2.0.0",
-            "chalk": "^4.0.0",
-            "graceful-fs": "^4.2.9",
-            "micromatch": "^4.0.4",
-            "pretty-format": "^28.1.3",
-            "slash": "^3.0.0",
-            "stack-utils": "^2.0.3"
-          },
-          "dependencies": {
-            "slash": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-              "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
-            }
-          }
-        },
-        "jest-regex-util": {
-          "version": "28.0.2",
-          "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz",
-          "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw=="
-        },
-        "jest-util": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz",
-          "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==",
-          "requires": {
-            "@jest/types": "^28.1.3",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "jest-watcher": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz",
-          "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==",
-          "requires": {
-            "@jest/test-result": "^28.1.3",
-            "@jest/types": "^28.1.3",
-            "@types/node": "*",
-            "ansi-escapes": "^4.2.1",
-            "chalk": "^4.0.0",
-            "emittery": "^0.10.2",
-            "jest-util": "^28.1.3",
-            "string-length": "^4.0.1"
-          },
-          "dependencies": {
-            "string-length": {
-              "version": "4.0.2",
-              "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-              "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-              "requires": {
-                "char-regex": "^1.0.2",
-                "strip-ansi": "^6.0.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "6.0.1",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-              "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-              "requires": {
-                "ansi-regex": "^5.0.1"
-              }
-            }
-          }
-        },
-        "pretty-format": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
-          "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
-          "requires": {
-            "@jest/schemas": "^28.1.3",
-            "ansi-regex": "^5.0.1",
-            "ansi-styles": "^5.0.0",
-            "react-is": "^18.0.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-              "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-            }
-          }
-        },
-        "slash": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-          "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="
-        },
-        "string-length": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
-          "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
-          "requires": {
-            "char-regex": "^2.0.0",
-            "strip-ansi": "^7.0.1"
-          },
-          "dependencies": {
-            "char-regex": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz",
-              "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw=="
-            }
-          }
-        },
-        "strip-ansi": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
-          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
-          "requires": {
-            "ansi-regex": "^6.0.1"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "6.0.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-              "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="
-            }
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-watcher": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz",
-      "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
-      "requires": {
-        "@jest/test-result": "^27.5.1",
-        "@jest/types": "^27.5.1",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "jest-util": "^27.5.1",
-        "string-length": "^4.0.1"
-      },
-      "dependencies": {
-        "@jest/types": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz",
-          "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
-          "requires": {
-            "@types/istanbul-lib-coverage": "^2.0.0",
-            "@types/istanbul-reports": "^3.0.0",
-            "@types/node": "*",
-            "@types/yargs": "^16.0.0",
-            "chalk": "^4.0.0"
-          }
-        },
-        "@types/yargs": {
-          "version": "16.0.4",
-          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
-          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
-          "requires": {
-            "@types/yargs-parser": "*"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-util": {
-          "version": "27.5.1",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz",
-          "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
-          "requires": {
-            "@jest/types": "^27.5.1",
-            "@types/node": "*",
-            "chalk": "^4.0.0",
-            "ci-info": "^3.2.0",
-            "graceful-fs": "^4.2.9",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "requires": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "js-sdsl": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz",
-      "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q=="
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsdom": {
-      "version": "16.7.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
-      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
-      "requires": {
-        "abab": "^2.0.5",
-        "acorn": "^8.2.4",
-        "acorn-globals": "^6.0.0",
-        "cssom": "^0.4.4",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^2.0.0",
-        "decimal.js": "^10.2.1",
-        "domexception": "^2.0.1",
-        "escodegen": "^2.0.0",
-        "form-data": "^3.0.0",
-        "html-encoding-sniffer": "^2.0.1",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.0",
-        "parse5": "6.0.1",
-        "saxes": "^5.0.1",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.0.0",
-        "w3c-hr-time": "^1.0.2",
-        "w3c-xmlserializer": "^2.0.0",
-        "webidl-conversions": "^6.1.0",
-        "whatwg-encoding": "^1.0.5",
-        "whatwg-mimetype": "^2.3.0",
-        "whatwg-url": "^8.5.0",
-        "ws": "^7.4.6",
-        "xml-name-validator": "^3.0.0"
-      }
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
-    },
-    "json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
-    },
-    "json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
-    },
-    "jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^2.0.0"
-      }
-    },
-    "jsonpointer": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
-      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ=="
-    },
-    "jsx-ast-utils": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz",
-      "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==",
-      "requires": {
-        "array-includes": "^3.1.5",
-        "object.assign": "^4.1.3"
-      }
-    },
-    "kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
-    },
-    "kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
-    },
-    "klona": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ=="
-    },
-    "language-subtag-registry": {
-      "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
-      "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w=="
-    },
-    "language-tags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
-      "requires": {
-        "language-subtag-registry": "~0.3.2"
-      }
-    },
-    "leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
-    },
-    "levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "requires": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      }
-    },
-    "lilconfig": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz",
-      "integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg=="
-    },
-    "lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
-    },
-    "loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="
-    },
-    "loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-      "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      }
-    },
-    "locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "requires": {
-        "p-locate": "^5.0.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
-    },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
-    },
-    "lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="
-    },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
-    },
-    "long": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-5.2.0.tgz",
-      "integrity": "sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w=="
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "requires": {
-        "tslib": "^2.0.3"
-      }
-    },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "lz-string": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz",
-      "integrity": "sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==",
-      "dev": true
-    },
-    "magic-string": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
-      "requires": {
-        "sourcemap-codec": "^1.4.8"
-      }
-    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "requires": {
-        "semver": "^6.0.0"
-      }
-    },
-    "makeerror": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "requires": {
-        "tmpl": "1.0.5"
-      }
-    },
-    "mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
-    },
-    "memfs": {
-      "version": "3.4.9",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.9.tgz",
-      "integrity": "sha512-3rm8kbrzpUGRyPKSGuk387NZOwQ90O4rI9tsWQkzNW7BLSnKGp23RsEsKK8N8QVCrtJoAMqy3spxHC4os4G6PQ==",
-      "requires": {
-        "fs-monkey": "^1.0.3"
-      }
-    },
-    "memoize-one": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
-      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
-    },
-    "merge-descriptors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
-      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="
-    },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
-    },
-    "merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
-    },
-    "micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "requires": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      }
-    },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-    },
-    "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "requires": {
-        "mime-db": "1.52.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-    },
-    "min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true
-    },
-    "mini-css-extract-plugin": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz",
-      "integrity": "sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==",
-      "requires": {
-        "schema-utils": "^4.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-        },
-        "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
-          }
-        }
-      }
-    },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
-    },
-    "minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="
-    },
-    "mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "requires": {
-        "minimist": "^1.2.6"
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "multicast-dns": {
-      "version": "7.2.5",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
-      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
-      "requires": {
-        "dns-packet": "^5.2.2",
-        "thunky": "^1.0.2"
-      }
-    },
-    "nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w=="
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
-    },
-    "negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
-    },
-    "neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
-    },
-    "no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "requires": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
-    },
-    "node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
-    },
-    "node-releases": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="
-    },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
-    },
-    "normalize-range": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
-      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="
-    },
-    "normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="
-    },
-    "npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "requires": {
-        "path-key": "^3.0.0"
-      }
-    },
-    "nth-check": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-      "requires": {
-        "boolbase": "^1.0.0"
-      }
-    },
-    "nwsapi": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
-      "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
-    },
-    "object-hash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="
-    },
-    "object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g=="
-    },
-    "object-is": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      }
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-    },
-    "object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "object.entries": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz",
-      "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
-    "object.fromentries": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.5.tgz",
-      "integrity": "sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz",
-      "integrity": "sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ==",
-      "requires": {
-        "array.prototype.reduce": "^1.0.4",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.1"
-      }
-    },
-    "object.hasown": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.1.tgz",
-      "integrity": "sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==",
-      "requires": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      }
-    },
-    "object.values": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
-      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1"
-      }
-    },
-    "obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
-    },
-    "on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
-    "open": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
-      "requires": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      }
-    },
-    "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "requires": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      }
-    },
-    "p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "requires": {
-        "yocto-queue": "^0.1.0"
-      }
-    },
-    "p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "requires": {
-        "p-limit": "^3.0.2"
-      }
-    },
-    "p-retry": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
-      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
-      "requires": {
-        "@types/retry": "0.12.0",
-        "retry": "^0.13.1"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
-    },
-    "param-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-      "requires": {
-        "dot-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      }
-    },
-    "parse-srcset": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz",
-      "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q=="
-    },
-    "parse5": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
-    },
-    "pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "requires": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "path-to-regexp": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
-      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
-    },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
-    },
-    "picocolors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
-    },
-    "picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
-    },
-    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
-    },
-    "pirates": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",
-      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="
-    },
-    "pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "requires": {
-        "find-up": "^4.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        }
-      }
-    },
-    "pkg-up": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
-      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
-      "requires": {
-        "find-up": "^3.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="
-        }
-      }
-    },
-    "postcss": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
-      "requires": {
-        "nanoid": "^3.3.8",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
-      }
-    },
-    "postcss-attribute-case-insensitive": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
-      "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
-      "requires": {
-        "postcss-selector-parser": "^6.0.10"
-      }
-    },
-    "postcss-browser-comments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz",
-      "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg=="
-    },
-    "postcss-calc": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
-      "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
-      "requires": {
-        "postcss-selector-parser": "^6.0.9",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-clamp": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
-      "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-color-functional-notation": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
-      "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-color-hex-alpha": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
-      "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-color-rebeccapurple": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
-      "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-colormin": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz",
-      "integrity": "sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==",
-      "requires": {
-        "browserslist": "^4.16.6",
-        "caniuse-api": "^3.0.0",
-        "colord": "^2.9.1",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-convert-values": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
-      "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
-      "requires": {
-        "browserslist": "^4.21.4",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-custom-media": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
-      "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-custom-properties": {
-      "version": "12.1.10",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.10.tgz",
-      "integrity": "sha512-U3BHdgrYhCrwTVcByFHs9EOBoqcKq4Lf3kXwbTi4hhq0qWhl/pDWq2THbv/ICX/Fl9KqeHBb8OVrTf2OaYF07A==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-custom-selectors": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
-      "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
-      "requires": {
-        "postcss-selector-parser": "^6.0.4"
-      }
-    },
-    "postcss-dir-pseudo-class": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
-      "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
-      "requires": {
-        "postcss-selector-parser": "^6.0.10"
-      }
-    },
-    "postcss-discard-comments": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
-      "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ=="
-    },
-    "postcss-discard-duplicates": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
-      "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw=="
-    },
-    "postcss-discard-empty": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
-      "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A=="
-    },
-    "postcss-discard-overridden": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
-      "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw=="
-    },
-    "postcss-double-position-gradients": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
-      "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
-      "requires": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-env-function": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
-      "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-flexbugs-fixes": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz",
-      "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ=="
-    },
-    "postcss-focus-visible": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
-      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
-      "requires": {
-        "postcss-selector-parser": "^6.0.9"
-      }
-    },
-    "postcss-focus-within": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
-      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
-      "requires": {
-        "postcss-selector-parser": "^6.0.9"
-      }
-    },
-    "postcss-font-variant": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
-      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA=="
-    },
-    "postcss-gap-properties": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
-      "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg=="
-    },
-    "postcss-image-set-function": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
-      "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-import": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz",
-      "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==",
-      "requires": {
-        "postcss-value-parser": "^4.0.0",
-        "read-cache": "^1.0.0",
-        "resolve": "^1.1.7"
-      }
-    },
-    "postcss-initial": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
-      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ=="
-    },
-    "postcss-js": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz",
-      "integrity": "sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==",
-      "requires": {
-        "camelcase-css": "^2.0.1"
-      }
-    },
-    "postcss-lab-function": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
-      "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
-      "requires": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-load-config": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
-      "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
-      "requires": {
-        "lilconfig": "^2.0.5",
-        "yaml": "^1.10.2"
-      }
-    },
-    "postcss-loader": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
-      "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
-      "requires": {
-        "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.5",
-        "semver": "^7.3.5"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "postcss-logical": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
-      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g=="
-    },
-    "postcss-media-minmax": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
-      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ=="
-    },
-    "postcss-merge-longhand": {
-      "version": "5.1.7",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
-      "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0",
-        "stylehacks": "^5.1.1"
-      }
-    },
-    "postcss-merge-rules": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.3.tgz",
-      "integrity": "sha512-LbLd7uFC00vpOuMvyZop8+vvhnfRGpp2S+IMQKeuOZZapPRY4SMq5ErjQeHbHsjCUgJkRNrlU+LmxsKIqPKQlA==",
-      "requires": {
-        "browserslist": "^4.21.4",
-        "caniuse-api": "^3.0.0",
-        "cssnano-utils": "^3.1.0",
-        "postcss-selector-parser": "^6.0.5"
-      }
-    },
-    "postcss-minify-font-values": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
-      "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-minify-gradients": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
-      "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
-      "requires": {
-        "colord": "^2.9.1",
-        "cssnano-utils": "^3.1.0",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-minify-params": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
-      "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
-      "requires": {
-        "browserslist": "^4.21.4",
-        "cssnano-utils": "^3.1.0",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-minify-selectors": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
-      "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
-      "requires": {
-        "postcss-selector-parser": "^6.0.5"
-      }
-    },
-    "postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="
-    },
-    "postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
-      "requires": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      }
-    },
-    "postcss-modules-scope": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-      "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-      "requires": {
-        "postcss-selector-parser": "^6.0.4"
-      }
-    },
-    "postcss-modules-values": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-      "requires": {
-        "icss-utils": "^5.0.0"
-      }
-    },
-    "postcss-nested": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.0.tgz",
-      "integrity": "sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==",
-      "requires": {
-        "postcss-selector-parser": "^6.0.10"
-      }
-    },
-    "postcss-nesting": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
-      "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
-      "requires": {
-        "@csstools/selector-specificity": "^2.0.0",
-        "postcss-selector-parser": "^6.0.10"
-      }
-    },
-    "postcss-normalize": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize/-/postcss-normalize-10.0.1.tgz",
-      "integrity": "sha512-+5w18/rDev5mqERcG3W5GZNMJa1eoYYNGo8gB7tEwaos0ajk3ZXAI4mHGcNT47NE+ZnZD1pEpUOFLvltIwmeJA==",
-      "requires": {
-        "@csstools/normalize.css": "*",
-        "postcss-browser-comments": "^4",
-        "sanitize.css": "*"
-      }
-    },
-    "postcss-normalize-charset": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
-      "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg=="
-    },
-    "postcss-normalize-display-values": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
-      "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-normalize-positions": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
-      "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-normalize-repeat-style": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
-      "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-normalize-string": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
-      "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-normalize-timing-functions": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
-      "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-normalize-unicode": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
-      "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
-      "requires": {
-        "browserslist": "^4.21.4",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-normalize-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
-      "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
-      "requires": {
-        "normalize-url": "^6.0.1",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-normalize-whitespace": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
-      "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-opacity-percentage": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz",
-      "integrity": "sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w=="
-    },
-    "postcss-ordered-values": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
-      "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
-      "requires": {
-        "cssnano-utils": "^3.1.0",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-overflow-shorthand": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
-      "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-page-break": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
-      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ=="
-    },
-    "postcss-place": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
-      "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-preset-env": {
-      "version": "7.8.2",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.2.tgz",
-      "integrity": "sha512-rSMUEaOCnovKnwc5LvBDHUDzpGP+nrUeWZGWt9M72fBvckCi45JmnJigUr4QG4zZeOHmOCNCZnd2LKDvP++ZuQ==",
-      "requires": {
-        "@csstools/postcss-cascade-layers": "^1.1.0",
-        "@csstools/postcss-color-function": "^1.1.1",
-        "@csstools/postcss-font-format-keywords": "^1.0.1",
-        "@csstools/postcss-hwb-function": "^1.0.2",
-        "@csstools/postcss-ic-unit": "^1.0.1",
-        "@csstools/postcss-is-pseudo-class": "^2.0.7",
-        "@csstools/postcss-nested-calc": "^1.0.0",
-        "@csstools/postcss-normalize-display-values": "^1.0.1",
-        "@csstools/postcss-oklab-function": "^1.1.1",
-        "@csstools/postcss-progressive-custom-properties": "^1.3.0",
-        "@csstools/postcss-stepped-value-functions": "^1.0.1",
-        "@csstools/postcss-text-decoration-shorthand": "^1.0.0",
-        "@csstools/postcss-trigonometric-functions": "^1.0.2",
-        "@csstools/postcss-unset-value": "^1.0.2",
-        "autoprefixer": "^10.4.11",
-        "browserslist": "^4.21.3",
-        "css-blank-pseudo": "^3.0.3",
-        "css-has-pseudo": "^3.0.4",
-        "css-prefers-color-scheme": "^6.0.3",
-        "cssdb": "^7.0.1",
-        "postcss-attribute-case-insensitive": "^5.0.2",
-        "postcss-clamp": "^4.1.0",
-        "postcss-color-functional-notation": "^4.2.4",
-        "postcss-color-hex-alpha": "^8.0.4",
-        "postcss-color-rebeccapurple": "^7.1.1",
-        "postcss-custom-media": "^8.0.2",
-        "postcss-custom-properties": "^12.1.9",
-        "postcss-custom-selectors": "^6.0.3",
-        "postcss-dir-pseudo-class": "^6.0.5",
-        "postcss-double-position-gradients": "^3.1.2",
-        "postcss-env-function": "^4.0.6",
-        "postcss-focus-visible": "^6.0.4",
-        "postcss-focus-within": "^5.0.4",
-        "postcss-font-variant": "^5.0.0",
-        "postcss-gap-properties": "^3.0.5",
-        "postcss-image-set-function": "^4.0.7",
-        "postcss-initial": "^4.0.1",
-        "postcss-lab-function": "^4.2.1",
-        "postcss-logical": "^5.0.4",
-        "postcss-media-minmax": "^5.0.0",
-        "postcss-nesting": "^10.2.0",
-        "postcss-opacity-percentage": "^1.1.2",
-        "postcss-overflow-shorthand": "^3.0.4",
-        "postcss-page-break": "^3.0.4",
-        "postcss-place": "^7.0.5",
-        "postcss-pseudo-class-any-link": "^7.1.6",
-        "postcss-replace-overflow-wrap": "^4.0.0",
-        "postcss-selector-not": "^6.0.1",
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-pseudo-class-any-link": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
-      "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
-      "requires": {
-        "postcss-selector-parser": "^6.0.10"
-      }
-    },
-    "postcss-reduce-initial": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.1.tgz",
-      "integrity": "sha512-//jeDqWcHPuXGZLoolFrUXBDyuEGbr9S2rMo19bkTIjBQ4PqkaO+oI8wua5BOUxpfi97i3PCoInsiFIEBfkm9w==",
-      "requires": {
-        "browserslist": "^4.21.4",
-        "caniuse-api": "^3.0.0"
-      }
-    },
-    "postcss-reduce-transforms": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
-      "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      }
-    },
-    "postcss-replace-overflow-wrap": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
-      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw=="
-    },
-    "postcss-selector-not": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
-      "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
-      "requires": {
-        "postcss-selector-parser": "^6.0.10"
-      }
-    },
-    "postcss-selector-parser": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-      "requires": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "postcss-svgo": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
-      "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
-      "requires": {
-        "postcss-value-parser": "^4.2.0",
-        "svgo": "^2.7.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-          "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
-        },
-        "css-tree": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-          "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
-          "requires": {
-            "mdn-data": "2.0.14",
-            "source-map": "^0.6.1"
-          }
-        },
-        "mdn-data": {
-          "version": "2.0.14",
-          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-          "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "svgo": {
-          "version": "2.8.0",
-          "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
-          "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
-          "requires": {
-            "@trysound/sax": "0.2.0",
-            "commander": "^7.2.0",
-            "css-select": "^4.1.3",
-            "css-tree": "^1.1.3",
-            "csso": "^4.2.0",
-            "picocolors": "^1.0.0",
-            "stable": "^0.1.8"
-          }
-        }
-      }
-    },
-    "postcss-unique-selectors": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
-      "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
-      "requires": {
-        "postcss-selector-parser": "^6.0.5"
-      }
-    },
-    "postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
-    },
-    "prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
-    },
-    "pretty-bytes": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
-      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="
-    },
-    "pretty-error": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
-      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
-      "requires": {
-        "lodash": "^4.17.20",
-        "renderkid": "^3.0.0"
-      }
-    },
-    "pretty-format": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
-      "requires": {
-        "ansi-regex": "^5.0.1",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^17.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
-        },
-        "react-is": {
-          "version": "17.0.2",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-          "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-        }
-      }
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
-    "promise": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz",
-      "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==",
-      "requires": {
-        "asap": "~2.0.6"
-      }
-    },
-    "prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "requires": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      }
-    },
-    "prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "requires": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      },
-      "dependencies": {
-        "react-is": {
-          "version": "16.13.1",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-        }
-      }
-    },
-    "protobufjs": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz",
-      "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==",
-      "requires": {
-        "@protobufjs/aspromise": "^1.1.2",
-        "@protobufjs/base64": "^1.1.2",
-        "@protobufjs/codegen": "^2.0.4",
-        "@protobufjs/eventemitter": "^1.1.0",
-        "@protobufjs/fetch": "^1.1.0",
-        "@protobufjs/float": "^1.0.2",
-        "@protobufjs/inquire": "^1.1.0",
-        "@protobufjs/path": "^1.1.2",
-        "@protobufjs/pool": "^1.1.0",
-        "@protobufjs/utf8": "^1.1.0",
-        "@types/node": ">=13.7.0",
-        "long": "^5.0.0"
-      }
-    },
-    "proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "requires": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "dependencies": {
-        "ipaddr.js": {
-          "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-          "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
-        }
-      }
-    },
-    "psl": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-    },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="
-    },
-    "qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
-      "requires": {
-        "side-channel": "^1.0.6"
-      }
-    },
-    "querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
-    },
-    "queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
-    },
-    "quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="
-    },
-    "raf": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
-      "requires": {
-        "performance-now": "^2.1.0"
-      }
-    },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
-    },
-    "raw-body": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
-      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
-      "requires": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "bytes": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
-        },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        }
-      }
-    },
-    "react": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",
-      "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",
-      "requires": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "react-app-polyfill": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz",
-      "integrity": "sha512-sZ41cxiU5llIB003yxxQBYrARBqe0repqPTTYBTmMqTz9szeBbE37BehCE891NZsmdZqqP+xWKdT3eo3vOzN8w==",
-      "requires": {
-        "core-js": "^3.19.2",
-        "object-assign": "^4.1.1",
-        "promise": "^8.1.0",
-        "raf": "^3.4.1",
-        "regenerator-runtime": "^0.13.9",
-        "whatwg-fetch": "^3.6.2"
-      }
-    },
-    "react-dev-utils": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz",
-      "integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==",
-      "requires": {
-        "@babel/code-frame": "^7.16.0",
-        "address": "^1.1.2",
-        "browserslist": "^4.18.1",
-        "chalk": "^4.1.2",
-        "cross-spawn": "^7.0.3",
-        "detect-port-alt": "^1.1.6",
-        "escape-string-regexp": "^4.0.0",
-        "filesize": "^8.0.6",
-        "find-up": "^5.0.0",
-        "fork-ts-checker-webpack-plugin": "^6.5.0",
-        "global-modules": "^2.0.0",
-        "globby": "^11.0.4",
-        "gzip-size": "^6.0.0",
-        "immer": "^9.0.7",
-        "is-root": "^2.1.0",
-        "loader-utils": "^3.2.0",
-        "open": "^8.4.0",
-        "pkg-up": "^3.1.0",
-        "prompts": "^2.4.2",
-        "react-error-overlay": "^6.0.11",
-        "recursive-readdir": "^2.2.2",
-        "shell-quote": "^1.7.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "loader-utils": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
-          "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "react-dom": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",
-      "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",
-      "requires": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
-      }
-    },
-    "react-error-overlay": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz",
-      "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
-    },
-    "react-final-form": {
-      "version": "6.5.9",
-      "resolved": "https://registry.npmjs.org/react-final-form/-/react-final-form-6.5.9.tgz",
-      "integrity": "sha512-x3XYvozolECp3nIjly+4QqxdjSSWfcnpGEL5K8OBT6xmGrq5kBqbA6+/tOqoom9NwqIPPbxPNsOViFlbKgowbA==",
-      "requires": {
-        "@babel/runtime": "^7.15.4"
-      }
-    },
-    "react-final-form-listeners": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/react-final-form-listeners/-/react-final-form-listeners-1.0.3.tgz",
-      "integrity": "sha512-OrdCNxSS4JQS/EXD+R530kZKFqaPfa+WcXPgVro/h4BpaBDF/Ja+BtHyCzDezCIb5rWaGGdOJIj+tN2YdtvrXg==",
-      "requires": {
-        "@babel/runtime": "^7.12.5"
-      }
-    },
-    "react-i18next": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-12.0.0.tgz",
-      "integrity": "sha512-/O7N6aIEAl1FaWZBNvhdIo9itvF/MO/nRKr9pYqRc9LhuC1u21SlfwpiYQqvaeNSEW3g3qUXLREOWMt+gxrWbg==",
-      "requires": {
-        "@babel/runtime": "^7.14.5",
-        "html-parse-stringify": "^3.0.1"
-      }
-    },
-    "react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
-    },
-    "react-redux": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-8.0.4.tgz",
-      "integrity": "sha512-yMfQ7mX6bWuicz2fids6cR1YT59VTuT8MKyyE310wJQlINKENCeT1UcPdEiX6znI5tF8zXyJ/VYvDgeGuaaNwQ==",
-      "requires": {
-        "@babel/runtime": "^7.12.1",
-        "@types/hoist-non-react-statics": "^3.3.1",
-        "@types/use-sync-external-store": "^0.0.3",
-        "hoist-non-react-statics": "^3.3.2",
-        "react-is": "^18.0.0",
-        "use-sync-external-store": "^1.0.0"
-      }
-    },
-    "react-refresh": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
-      "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A=="
-    },
-    "react-router": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.4.2.tgz",
-      "integrity": "sha512-Rb0BAX9KHhVzT1OKhMvCDMw776aTYM0DtkxqUBP8dNBom3mPXlfNs76JNGK8wKJ1IZEY1+WGj+cvZxHVk/GiKw==",
-      "requires": {
-        "@remix-run/router": "1.0.2"
-      }
-    },
-    "react-router-dom": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.4.2.tgz",
-      "integrity": "sha512-yM1kjoTkpfjgczPrcyWrp+OuQMyB1WleICiiGfstnQYo/S8hPEEnVjr/RdmlH6yKK4Tnj1UGXFSa7uwAtmDoLQ==",
-      "requires": {
-        "@remix-run/router": "1.0.2",
-        "react-router": "6.4.2"
-      }
-    },
-    "react-scripts": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
-      "integrity": "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==",
-      "requires": {
-        "@babel/core": "^7.16.0",
-        "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
-        "@svgr/webpack": "^5.5.0",
-        "babel-jest": "^27.4.2",
-        "babel-loader": "^8.2.3",
-        "babel-plugin-named-asset-import": "^0.3.8",
-        "babel-preset-react-app": "^10.0.1",
-        "bfj": "^7.0.2",
-        "browserslist": "^4.18.1",
-        "camelcase": "^6.2.1",
-        "case-sensitive-paths-webpack-plugin": "^2.4.0",
-        "css-loader": "^6.5.1",
-        "css-minimizer-webpack-plugin": "^3.2.0",
-        "dotenv": "^10.0.0",
-        "dotenv-expand": "^5.1.0",
-        "eslint": "^8.3.0",
-        "eslint-config-react-app": "^7.0.1",
-        "eslint-webpack-plugin": "^3.1.1",
-        "file-loader": "^6.2.0",
-        "fs-extra": "^10.0.0",
-        "fsevents": "^2.3.2",
-        "html-webpack-plugin": "^5.5.0",
-        "identity-obj-proxy": "^3.0.0",
-        "jest": "^27.4.3",
-        "jest-resolve": "^27.4.2",
-        "jest-watch-typeahead": "^1.0.0",
-        "mini-css-extract-plugin": "^2.4.5",
-        "postcss": "^8.4.4",
-        "postcss-flexbugs-fixes": "^5.0.2",
-        "postcss-loader": "^6.2.1",
-        "postcss-normalize": "^10.0.1",
-        "postcss-preset-env": "^7.0.1",
-        "prompts": "^2.4.2",
-        "react-app-polyfill": "^3.0.0",
-        "react-dev-utils": "^12.0.1",
-        "react-refresh": "^0.11.0",
-        "resolve": "^1.20.0",
-        "resolve-url-loader": "^4.0.0",
-        "sass-loader": "^12.3.0",
-        "semver": "^7.3.5",
-        "source-map-loader": "^3.0.0",
-        "style-loader": "^3.3.1",
-        "tailwindcss": "^3.0.2",
-        "terser-webpack-plugin": "^5.2.5",
-        "webpack": "^5.64.4",
-        "webpack-dev-server": "^4.6.0",
-        "webpack-manifest-plugin": "^4.0.2",
-        "workbox-webpack-plugin": "^6.4.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.5.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-          "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
-    "react-transition-group": {
-      "version": "4.4.5",
-      "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
-      "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
-      "requires": {
-        "@babel/runtime": "^7.5.5",
-        "dom-helpers": "^5.0.1",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.6.2"
-      }
-    },
-    "react-virtualized-auto-sizer": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.7.tgz",
-      "integrity": "sha512-Mxi6lwOmjwIjC1X4gABXMJcKHsOo0xWl3E3ugOgufB8GJU+MqrtY35aBuvCYv/razQ1Vbp7h1gWJjGjoNN5pmA=="
-    },
-    "react-window": {
-      "version": "1.8.7",
-      "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.7.tgz",
-      "integrity": "sha512-JHEZbPXBpKMmoNO1bNhoXOOLg/ujhL/BU4IqVU9r8eQPcy5KQnGHIHDRkJ0ns9IM5+Aq5LNwt3j8t3tIrePQzA==",
-      "requires": {
-        "@babel/runtime": "^7.0.0",
-        "memoize-one": ">=3.1.1 <6"
-      }
-    },
-    "read-cache": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
-      "requires": {
-        "pify": "^2.3.0"
-      }
-    },
-    "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "requires": {
-        "picomatch": "^2.2.1"
-      }
-    },
-    "recursive-readdir": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
-      "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
-      "requires": {
-        "minimatch": "^3.0.5"
-      }
-    },
-    "redent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dev": true,
-      "requires": {
-        "indent-string": "^4.0.0",
-        "strip-indent": "^3.0.0"
-      }
-    },
-    "redux": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz",
-      "integrity": "sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA==",
-      "requires": {
-        "@babel/runtime": "^7.9.2"
-      }
-    },
-    "redux-form": {
-      "version": "8.3.8",
-      "resolved": "https://registry.npmjs.org/redux-form/-/redux-form-8.3.8.tgz",
-      "integrity": "sha512-PzXhA0d+awIc4PkuhbDa6dCEiraMrGMyyDlYEVNX6qEyW/G2SqZXrjav5zrpXb0CCeqQSc9iqwbMtYQXbJbOAQ==",
-      "requires": {
-        "@babel/runtime": "^7.9.2",
-        "es6-error": "^4.1.1",
-        "hoist-non-react-statics": "^3.3.2",
-        "invariant": "^2.2.4",
-        "is-promise": "^2.1.0",
-        "lodash": "^4.17.15",
-        "prop-types": "^15.6.1",
-        "react-is": "^16.4.2"
-      },
-      "dependencies": {
-        "react-is": {
-          "version": "16.13.1",
-          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-          "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
-        }
-      }
-    },
-    "redux-thunk": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.1.tgz",
-      "integrity": "sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q=="
-    },
-    "regenerate": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
-      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
-    },
-    "regenerate-unicode-properties": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
-      "requires": {
-        "regenerate": "^1.4.2"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.13.10",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
-      "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="
-    },
-    "regenerator-transform": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
-      "requires": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
-    "regex-parser": {
-      "version": "2.2.11",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
-      "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q=="
-    },
-    "regexp.prototype.flags": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "functions-have-names": "^1.2.2"
-      }
-    },
-    "regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
-    },
-    "regexpu-core": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
-      "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
-      "requires": {
-        "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.1.0",
-        "regjsgen": "^0.7.1",
-        "regjsparser": "^0.9.1",
-        "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.0.0"
-      }
-    },
-    "regjsgen": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
-      "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="
-    },
-    "regjsparser": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
-      "requires": {
-        "jsesc": "~0.5.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="
-        }
-      }
-    },
-    "relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="
-    },
-    "renderkid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
-      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
-      "requires": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
-    },
-    "require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
-    },
-    "resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-      "requires": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      }
-    },
-    "resolve-cwd": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-      "requires": {
-        "resolve-from": "^5.0.0"
-      },
-      "dependencies": {
-        "resolve-from": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
-        }
-      }
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
-    },
-    "resolve-url-loader": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
-      "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
-      "requires": {
-        "adjust-sourcemap-loader": "^4.0.0",
-        "convert-source-map": "^1.7.0",
-        "loader-utils": "^2.0.0",
-        "postcss": "^7.0.35",
-        "source-map": "0.6.1"
-      },
-      "dependencies": {
-        "picocolors": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
-          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA=="
-        },
-        "postcss": {
-          "version": "7.0.39",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
-          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
-          "requires": {
-            "picocolors": "^0.2.1",
-            "source-map": "^0.6.1"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "resolve.exports": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
-      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="
-    },
-    "retry": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "rollup": {
-      "version": "2.79.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
-      "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
-      "requires": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "rollup-plugin-terser": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
-      "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
-      "requires": {
-        "@babel/code-frame": "^7.10.4",
-        "jest-worker": "^26.2.1",
-        "serialize-javascript": "^4.0.0",
-        "terser": "^5.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jest-worker": {
-          "version": "26.6.2",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
-          "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
-          "requires": {
-            "@types/node": "*",
-            "merge-stream": "^2.0.0",
-            "supports-color": "^7.0.0"
-          }
-        },
-        "serialize-javascript": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-          "requires": {
-            "randombytes": "^2.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "requires": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "rxjs": {
-      "version": "7.5.7",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz",
-      "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==",
-      "requires": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
-    "safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "sanitize-html": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.17.0.tgz",
-      "integrity": "sha512-dLAADUSS8rBwhaevT12yCezvioCA+bmUTPH/u57xKPT8d++voeYE6HeluA/bPbQ15TwDBG2ii+QZIEmYx8VdxA==",
-      "requires": {
-        "deepmerge": "^4.2.2",
-        "escape-string-regexp": "^4.0.0",
-        "htmlparser2": "^8.0.0",
-        "is-plain-object": "^5.0.0",
-        "parse-srcset": "^1.0.2",
-        "postcss": "^8.3.11"
-      },
-      "dependencies": {
-        "dom-serializer": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-          "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-          "requires": {
-            "domelementtype": "^2.3.0",
-            "domhandler": "^5.0.2",
-            "entities": "^4.2.0"
-          }
-        },
-        "domhandler": {
-          "version": "5.0.3",
-          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-          "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-          "requires": {
-            "domelementtype": "^2.3.0"
-          }
-        },
-        "domutils": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
-          "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
-          "requires": {
-            "dom-serializer": "^2.0.0",
-            "domelementtype": "^2.3.0",
-            "domhandler": "^5.0.3"
-          }
-        },
-        "entities": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-          "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
-        },
-        "htmlparser2": {
-          "version": "8.0.2",
-          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
-          "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
-          "requires": {
-            "domelementtype": "^2.3.0",
-            "domhandler": "^5.0.3",
-            "domutils": "^3.0.1",
-            "entities": "^4.4.0"
-          }
-        }
-      }
-    },
-    "sanitize.css": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/sanitize.css/-/sanitize.css-13.0.0.tgz",
-      "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA=="
-    },
-    "sass-loader": {
-      "version": "12.6.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
-      "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
-      "requires": {
-        "klona": "^2.0.4",
-        "neo-async": "^2.6.2"
-      }
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
-    "saxes": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
-      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
-      "requires": {
-        "xmlchars": "^2.2.0"
-      }
-    },
-    "scheduler": {
-      "version": "0.23.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",
-      "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",
-      "requires": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-      "requires": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      }
-    },
-    "select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
-    },
-    "selfsigned": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
-      "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
-      "requires": {
-        "node-forge": "^1"
-      }
-    },
-    "semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-    },
-    "send": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          },
-          "dependencies": {
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-            }
-          }
-        },
-        "encodeurl": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-          "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-        }
-      }
-    },
-    "serialize-javascript": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
-      "requires": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
-      "requires": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "depd": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-          "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="
-        },
-        "http-errors": {
-          "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.0",
-            "statuses": ">= 1.4.0 < 2"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        },
-        "setprototypeof": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-        },
-        "statuses": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-          "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.16.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
-      "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
-      "requires": {
-        "encodeurl": "~2.0.0",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.3",
-        "send": "0.19.0"
-      }
-    },
-    "set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-      "requires": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      }
-    },
-    "setprototypeof": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
-    },
-    "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "requires": {
-        "shebang-regex": "^3.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
-    },
-    "shell-quote": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.4.tgz",
-      "integrity": "sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw=="
-    },
-    "side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
-      "requires": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
-      }
-    },
-    "signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
-    },
-    "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
-    },
-    "sockjs": {
-      "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-      "requires": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^8.3.2",
-        "websocket-driver": "^0.7.4"
-      }
-    },
-    "source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
-    },
-    "source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="
-    },
-    "source-map-loader": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz",
-      "integrity": "sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==",
-      "requires": {
-        "abab": "^2.0.5",
-        "iconv-lite": "^0.6.3",
-        "source-map-js": "^1.0.1"
-      }
-    },
-    "source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        }
-      }
-    },
-    "sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
-    },
-    "spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "requires": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      }
-    },
-    "spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "requires": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
-    },
-    "stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="
-    },
-    "stack-utils": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz",
-      "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==",
-      "requires": {
-        "escape-string-regexp": "^2.0.0"
-      },
-      "dependencies": {
-        "escape-string-regexp": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
-          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="
-        }
-      }
-    },
-    "stackframe": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
-      "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="
-    },
-    "statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
-    },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "string-length": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
-      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
-      "requires": {
-        "char-regex": "^1.0.2",
-        "strip-ansi": "^6.0.0"
-      }
-    },
-    "string-natural-compare": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz",
-      "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw=="
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        }
-      }
-    },
-    "string.prototype.matchall": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz",
-      "integrity": "sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.1",
-        "get-intrinsic": "^1.1.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.1",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.19.5"
-      }
-    },
-    "stringify-object": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
-      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
-      "requires": {
-        "get-own-enumerable-property-symbols": "^3.0.0",
-        "is-obj": "^1.0.1",
-        "is-regexp": "^1.0.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="
-    },
-    "strip-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
-      "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw=="
-    },
-    "strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
-    },
-    "strip-indent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
-      "requires": {
-        "min-indent": "^1.0.0"
-      }
-    },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
-    },
-    "style-loader": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz",
-      "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ=="
-    },
-    "stylehacks": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
-      "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
-      "requires": {
-        "browserslist": "^4.21.4",
-        "postcss-selector-parser": "^6.0.4"
-      }
-    },
-    "stylis": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.1.3.tgz",
-      "integrity": "sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA=="
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "supports-hyperlinks": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
-      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
-      "requires": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
-    },
-    "svg-parser": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz",
-      "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ=="
-    },
-    "svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "requires": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      },
-      "dependencies": {
-        "css-select": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-          "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-          "requires": {
-            "boolbase": "^1.0.0",
-            "css-what": "^3.2.1",
-            "domutils": "^1.7.0",
-            "nth-check": "^1.0.2"
-          }
-        },
-        "css-what": {
-          "version": "3.4.2",
-          "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
-          "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="
-        },
-        "dom-serializer": {
-          "version": "0.2.2",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-          "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-          "requires": {
-            "domelementtype": "^2.0.1",
-            "entities": "^2.0.0"
-          }
-        },
-        "domutils": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-          "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-          "requires": {
-            "dom-serializer": "0",
-            "domelementtype": "1"
-          },
-          "dependencies": {
-            "domelementtype": {
-              "version": "1.3.1",
-              "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-              "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
-            }
-          }
-        },
-        "nth-check": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-          "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-          "requires": {
-            "boolbase": "~1.0.0"
-          }
-        }
-      }
-    },
-    "symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
-    },
-    "tailwindcss": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.1.tgz",
-      "integrity": "sha512-Uw+GVSxp5CM48krnjHObqoOwlCt5Qo6nw1jlCRwfGy68dSYb/LwS9ZFidYGRiM+w6rMawkZiu1mEMAsHYAfoLg==",
-      "requires": {
-        "arg": "^5.0.2",
-        "chokidar": "^3.5.3",
-        "color-name": "^1.1.4",
-        "detective": "^5.2.1",
-        "didyoumean": "^1.2.2",
-        "dlv": "^1.1.3",
-        "fast-glob": "^3.2.12",
-        "glob-parent": "^6.0.2",
-        "is-glob": "^4.0.3",
-        "lilconfig": "^2.0.6",
-        "micromatch": "^4.0.5",
-        "normalize-path": "^3.0.0",
-        "object-hash": "^3.0.0",
-        "picocolors": "^1.0.0",
-        "postcss": "^8.4.17",
-        "postcss-import": "^14.1.0",
-        "postcss-js": "^4.0.0",
-        "postcss-load-config": "^3.1.4",
-        "postcss-nested": "6.0.0",
-        "postcss-selector-parser": "^6.0.10",
-        "postcss-value-parser": "^4.2.0",
-        "quick-lru": "^5.1.1",
-        "resolve": "^1.22.1"
-      },
-      "dependencies": {
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "glob-parent": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-          "requires": {
-            "is-glob": "^4.0.3"
-          }
-        }
-      }
-    },
-    "tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
-    },
-    "temp-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
-      "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg=="
-    },
-    "tempy": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz",
-      "integrity": "sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==",
-      "requires": {
-        "is-stream": "^2.0.0",
-        "temp-dir": "^2.0.0",
-        "type-fest": "^0.16.0",
-        "unique-string": "^2.0.0"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.16.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
-          "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg=="
-        }
-      }
-    },
-    "terminal-link": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
-      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "supports-hyperlinks": "^2.0.0"
-      }
-    },
-    "terser": {
-      "version": "5.39.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.2.tgz",
-      "integrity": "sha512-yEPUmWve+VA78bI71BW70Dh0TuV4HHd+I5SHOAfS1+QBOmvmCiiffgjR8ryyEd3KIfvPGFqoADt8LdQ6XpXIvg==",
-      "requires": {
-        "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.14.0",
-        "commander": "^2.20.0",
-        "source-map-support": "~0.5.20"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
-        }
-      }
-    },
-    "terser-webpack-plugin": {
-      "version": "5.3.14",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
-      "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
-      "requires": {
-        "@jridgewell/trace-mapping": "^0.3.25",
-        "jest-worker": "^27.4.5",
-        "schema-utils": "^4.3.0",
-        "serialize-javascript": "^6.0.2",
-        "terser": "^5.31.1"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.17.1",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-          "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-          "requires": {
-            "fast-deep-equal": "^3.1.3",
-            "fast-uri": "^3.0.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-        },
-        "schema-utils": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
-          "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.9.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.1.0"
-          }
-        }
-      }
-    },
-    "test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "requires": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
-    },
-    "throat": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz",
-      "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="
-    },
-    "thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
-    },
-    "tmpl": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
-      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw=="
-    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
-    "toidentifier": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
-    },
-    "tough-cookie": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
-      "requires": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "dependencies": {
-        "universalify": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-          "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="
-        }
-      }
-    },
-    "tr46": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
-      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
-      "requires": {
-        "punycode": "^2.1.1"
-      }
-    },
-    "tryer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
-      "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="
-    },
-    "tsconfig-paths": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
-      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
-      "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="
-        }
-      }
-    },
-    "tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
-    "tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "requires": {
-        "tslib": "^1.8.1"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-        }
-      }
-    },
-    "type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "requires": {
-        "prelude-ls": "^1.2.1"
-      }
-    },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
-    },
-    "type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "requires": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
-    "typescript": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
-      "dev": true
-    },
-    "unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
-    "unicode-canonical-property-names-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="
-    },
-    "unicode-match-property-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
-      "requires": {
-        "unicode-canonical-property-names-ecmascript": "^2.0.0",
-        "unicode-property-aliases-ecmascript": "^2.0.0"
-      }
-    },
-    "unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="
-    },
-    "unicode-property-aliases-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="
-    },
-    "unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "requires": {
-        "crypto-random-string": "^2.0.0"
-      }
-    },
-    "universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
-    },
-    "unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="
-    },
-    "upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
-    },
-    "update-browserslist-db": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
-      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
-      "requires": {
-        "escalade": "^3.2.0",
-        "picocolors": "^1.1.1"
-      }
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "requires": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "use-sync-external-store": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
-      "integrity": "sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA=="
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-    },
-    "util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      }
-    },
-    "utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
-    },
-    "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-    },
-    "v8-to-istanbul": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
-      "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
-      "requires": {
-        "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0",
-        "source-map": "^0.7.3"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.7.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-          "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
-        }
-      }
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
-    },
-    "void-elements": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
-      "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="
-    },
-    "w3c-hr-time": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-      "requires": {
-        "browser-process-hrtime": "^1.0.0"
-      }
-    },
-    "w3c-xmlserializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
-      "requires": {
-        "xml-name-validator": "^3.0.0"
-      }
-    },
-    "walker": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-      "requires": {
-        "makeerror": "1.0.12"
-      }
-    },
-    "watchpack": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.4.tgz",
-      "integrity": "sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==",
-      "requires": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      }
-    },
-    "wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "requires": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "webidl-conversions": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="
-    },
-    "webpack": {
-      "version": "5.99.9",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.9.tgz",
-      "integrity": "sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==",
-      "requires": {
-        "@types/eslint-scope": "^3.7.7",
-        "@types/estree": "^1.0.6",
-        "@types/json-schema": "^7.0.15",
-        "@webassemblyjs/ast": "^1.14.1",
-        "@webassemblyjs/wasm-edit": "^1.14.1",
-        "@webassemblyjs/wasm-parser": "^1.14.1",
-        "acorn": "^8.14.0",
-        "browserslist": "^4.24.0",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.17.1",
-        "es-module-lexer": "^1.2.1",
-        "eslint-scope": "5.1.1",
-        "events": "^3.2.0",
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.11",
-        "json-parse-even-better-errors": "^2.3.1",
-        "loader-runner": "^4.2.0",
-        "mime-types": "^2.1.27",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^4.3.2",
-        "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.3.11",
-        "watchpack": "^2.4.1",
-        "webpack-sources": "^3.2.3"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.17.1",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-          "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-          "requires": {
-            "fast-deep-equal": "^3.1.3",
-            "fast-uri": "^3.0.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-        },
-        "schema-utils": {
-          "version": "4.3.2",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
-          "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.9.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.1.0"
-          }
-        }
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
-      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
-      "requires": {
-        "colorette": "^2.0.10",
-        "memfs": "^3.4.3",
-        "mime-types": "^2.1.31",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^4.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-        },
-        "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
-          }
-        }
-      }
-    },
-    "webpack-dev-server": {
-      "version": "4.11.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz",
-      "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==",
-      "requires": {
-        "@types/bonjour": "^3.5.9",
-        "@types/connect-history-api-fallback": "^1.3.5",
-        "@types/express": "^4.17.13",
-        "@types/serve-index": "^1.9.1",
-        "@types/serve-static": "^1.13.10",
-        "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.5.1",
-        "ansi-html-community": "^0.0.8",
-        "bonjour-service": "^1.0.11",
-        "chokidar": "^3.5.3",
-        "colorette": "^2.0.10",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^2.0.0",
-        "default-gateway": "^6.0.3",
-        "express": "^4.17.3",
-        "graceful-fs": "^4.2.6",
-        "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.3",
-        "ipaddr.js": "^2.0.1",
-        "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "rimraf": "^3.0.2",
-        "schema-utils": "^4.0.0",
-        "selfsigned": "^2.1.1",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.24",
-        "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^5.3.1",
-        "ws": "^8.4.2"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-        },
-        "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
-          }
-        },
-        "ws": {
-          "version": "8.18.2",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
-          "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ=="
-        }
-      }
-    },
-    "webpack-manifest-plugin": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz",
-      "integrity": "sha512-YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow==",
-      "requires": {
-        "tapable": "^2.0.0",
-        "webpack-sources": "^2.2.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "webpack-sources": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
-          "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
-          "requires": {
-            "source-list-map": "^2.0.1",
-            "source-map": "^0.6.1"
-          }
-        }
-      }
-    },
-    "webpack-sources": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="
-    },
-    "websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "requires": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      }
-    },
-    "websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="
-    },
-    "whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-      "requires": {
-        "iconv-lite": "0.4.24"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        }
-      }
-    },
-    "whatwg-fetch": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
-      "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="
-    },
-    "whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="
-    },
-    "whatwg-url": {
-      "version": "8.7.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
-      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
-      "requires": {
-        "lodash": "^4.7.0",
-        "tr46": "^2.1.0",
-        "webidl-conversions": "^6.1.0"
-      }
-    },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
-    "which-collection": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz",
-      "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==",
-      "dev": true,
-      "requires": {
-        "is-map": "^2.0.1",
-        "is-set": "^2.0.1",
-        "is-weakmap": "^2.0.1",
-        "is-weakset": "^2.0.1"
-      }
-    },
-    "which-typed-array": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
-      "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==",
-      "dev": true,
-      "requires": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-abstract": "^1.20.0",
-        "for-each": "^0.3.3",
-        "has-tostringtag": "^1.0.0",
-        "is-typed-array": "^1.1.9"
-      }
-    },
-    "word-wrap": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
-      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA=="
-    },
-    "workbox-background-sync": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.5.4.tgz",
-      "integrity": "sha512-0r4INQZMyPky/lj4Ou98qxcThrETucOde+7mRGJl13MPJugQNKeZQOdIJe/1AchOP23cTqHcN/YVpD6r8E6I8g==",
-      "requires": {
-        "idb": "^7.0.1",
-        "workbox-core": "6.5.4"
-      }
-    },
-    "workbox-broadcast-update": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.5.4.tgz",
-      "integrity": "sha512-I/lBERoH1u3zyBosnpPEtcAVe5lwykx9Yg1k6f8/BGEPGaMMgZrwVrqL1uA9QZ1NGGFoyE6t9i7lBjOlDhFEEw==",
-      "requires": {
-        "workbox-core": "6.5.4"
-      }
-    },
-    "workbox-build": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.5.4.tgz",
-      "integrity": "sha512-kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA==",
-      "requires": {
-        "@apideck/better-ajv-errors": "^0.3.1",
-        "@babel/core": "^7.11.1",
-        "@babel/preset-env": "^7.11.0",
-        "@babel/runtime": "^7.11.2",
-        "@rollup/plugin-babel": "^5.2.0",
-        "@rollup/plugin-node-resolve": "^11.2.1",
-        "@rollup/plugin-replace": "^2.4.1",
-        "@surma/rollup-plugin-off-main-thread": "^2.2.3",
-        "ajv": "^8.6.0",
-        "common-tags": "^1.8.0",
-        "fast-json-stable-stringify": "^2.1.0",
-        "fs-extra": "^9.0.1",
-        "glob": "^7.1.6",
-        "lodash": "^4.17.20",
-        "pretty-bytes": "^5.3.0",
-        "rollup": "^2.43.1",
-        "rollup-plugin-terser": "^7.0.0",
-        "source-map": "^0.8.0-beta.0",
-        "stringify-object": "^3.3.0",
-        "strip-comments": "^2.0.1",
-        "tempy": "^0.6.0",
-        "upath": "^1.2.0",
-        "workbox-background-sync": "6.5.4",
-        "workbox-broadcast-update": "6.5.4",
-        "workbox-cacheable-response": "6.5.4",
-        "workbox-core": "6.5.4",
-        "workbox-expiration": "6.5.4",
-        "workbox-google-analytics": "6.5.4",
-        "workbox-navigation-preload": "6.5.4",
-        "workbox-precaching": "6.5.4",
-        "workbox-range-requests": "6.5.4",
-        "workbox-recipes": "6.5.4",
-        "workbox-routing": "6.5.4",
-        "workbox-strategies": "6.5.4",
-        "workbox-streams": "6.5.4",
-        "workbox-sw": "6.5.4",
-        "workbox-window": "6.5.4"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fs-extra": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-          "requires": {
-            "at-least-node": "^1.0.0",
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^6.0.1",
-            "universalify": "^2.0.0"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
-        },
-        "source-map": {
-          "version": "0.8.0-beta.0",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
-          "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
-          "requires": {
-            "whatwg-url": "^7.0.0"
-          }
-        },
-        "tr46": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-          "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",
-          "requires": {
-            "punycode": "^2.1.0"
-          }
-        },
-        "webidl-conversions": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-          "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
-        },
-        "whatwg-url": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
-          "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
-          "requires": {
-            "lodash.sortby": "^4.7.0",
-            "tr46": "^1.0.1",
-            "webidl-conversions": "^4.0.2"
-          }
-        }
-      }
-    },
-    "workbox-cacheable-response": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.5.4.tgz",
-      "integrity": "sha512-DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug==",
-      "requires": {
-        "workbox-core": "6.5.4"
-      }
-    },
-    "workbox-core": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.5.4.tgz",
-      "integrity": "sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q=="
-    },
-    "workbox-expiration": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.5.4.tgz",
-      "integrity": "sha512-jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ==",
-      "requires": {
-        "idb": "^7.0.1",
-        "workbox-core": "6.5.4"
-      }
-    },
-    "workbox-google-analytics": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.5.4.tgz",
-      "integrity": "sha512-8AU1WuaXsD49249Wq0B2zn4a/vvFfHkpcFfqAFHNHwln3jK9QUYmzdkKXGIZl9wyKNP+RRX30vcgcyWMcZ9VAg==",
-      "requires": {
-        "workbox-background-sync": "6.5.4",
-        "workbox-core": "6.5.4",
-        "workbox-routing": "6.5.4",
-        "workbox-strategies": "6.5.4"
-      }
-    },
-    "workbox-navigation-preload": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz",
-      "integrity": "sha512-IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng==",
-      "requires": {
-        "workbox-core": "6.5.4"
-      }
-    },
-    "workbox-precaching": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.5.4.tgz",
-      "integrity": "sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg==",
-      "requires": {
-        "workbox-core": "6.5.4",
-        "workbox-routing": "6.5.4",
-        "workbox-strategies": "6.5.4"
-      }
-    },
-    "workbox-range-requests": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.5.4.tgz",
-      "integrity": "sha512-Je2qR1NXCFC8xVJ/Lux6saH6IrQGhMpDrPXWZWWS8n/RD+WZfKa6dSZwU+/QksfEadJEr/NfY+aP/CXFFK5JFg==",
-      "requires": {
-        "workbox-core": "6.5.4"
-      }
-    },
-    "workbox-recipes": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.5.4.tgz",
-      "integrity": "sha512-QZNO8Ez708NNwzLNEXTG4QYSKQ1ochzEtRLGaq+mr2PyoEIC1xFW7MrWxrONUxBFOByksds9Z4//lKAX8tHyUA==",
-      "requires": {
-        "workbox-cacheable-response": "6.5.4",
-        "workbox-core": "6.5.4",
-        "workbox-expiration": "6.5.4",
-        "workbox-precaching": "6.5.4",
-        "workbox-routing": "6.5.4",
-        "workbox-strategies": "6.5.4"
-      }
-    },
-    "workbox-routing": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.5.4.tgz",
-      "integrity": "sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg==",
-      "requires": {
-        "workbox-core": "6.5.4"
-      }
-    },
-    "workbox-strategies": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.5.4.tgz",
-      "integrity": "sha512-DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw==",
-      "requires": {
-        "workbox-core": "6.5.4"
-      }
-    },
-    "workbox-streams": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.5.4.tgz",
-      "integrity": "sha512-FXKVh87d2RFXkliAIheBojBELIPnWbQdyDvsH3t74Cwhg0fDheL1T8BqSM86hZvC0ZESLsznSYWw+Va+KVbUzg==",
-      "requires": {
-        "workbox-core": "6.5.4",
-        "workbox-routing": "6.5.4"
-      }
-    },
-    "workbox-sw": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.5.4.tgz",
-      "integrity": "sha512-vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA=="
-    },
-    "workbox-webpack-plugin": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.4.tgz",
-      "integrity": "sha512-LmWm/zoaahe0EGmMTrSLUi+BjyR3cdGEfU3fS6PN1zKFYbqAKuQ+Oy/27e4VSXsyIwAw8+QDfk1XHNGtZu9nQg==",
-      "requires": {
-        "fast-json-stable-stringify": "^2.1.0",
-        "pretty-bytes": "^5.4.1",
-        "upath": "^1.2.0",
-        "webpack-sources": "^1.4.3",
-        "workbox-build": "6.5.4"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
-          }
-        }
-      }
-    },
-    "workbox-window": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.5.4.tgz",
-      "integrity": "sha512-HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug==",
-      "requires": {
-        "@types/trusted-types": "^2.0.2",
-        "workbox-core": "6.5.4"
-      }
-    },
-    "wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        }
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-    },
-    "write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "requires": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
-    "ws": {
-      "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ=="
-    },
-    "xml-name-validator": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
-    },
-    "xmlchars": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
-    },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
-    },
-    "y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
-    },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
-    },
-    "yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "requires": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      }
-    },
-    "yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
-    },
-    "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
-    }
-  }
-}
diff --git a/webclient/package.json b/webclient/package.json
deleted file mode 100644
index a578fc9d9..000000000
--- a/webclient/package.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "name": "webclient",
-  "version": "1.0.0",
-  "private": true,
-  "scripts": {
-    "prebuild": "node prebuild.js",
-    "prestart": "node prebuild.js",
-    "build": "react-scripts build",
-    "start": "react-scripts start",
-    "test": "react-scripts test",
-    "test:watch": "react-scripts test",
-    "eject": "react-scripts eject",
-    "lint": "eslint \"./**/*.{ts,tsx}\"",
-    "lint:fix": "eslint \"./**/*.{ts,tsx}\" --fix",
-    "golden": "npm run lint && npm run test",
-    "prepare": "cd .. && husky install",
-    "translate": "node prebuild.js -i18nOnly"
-  },
-  "dependencies": {
-    "@emotion/react": "^11.8.2",
-    "@emotion/styled": "^11.8.1",
-    "@mui/icons-material": "^5.5.1",
-    "@mui/material": "^5.5.1",
-    "crypto-js": "^4.2.0",
-    "dexie": "^3.2.2",
-    "final-form": "^4.20.6",
-    "final-form-set-field-touched": "^1.0.1",
-    "i18next": "^22.0.4",
-    "i18next-browser-languagedetector": "^7.0.0",
-    "i18next-icu": "^2.0.3",
-    "intl-messageformat": "^10.2.1",
-    "lodash": "^4.17.21",
-    "prop-types": "^15.8.1",
-    "protobufjs": "^7.2.4",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-final-form": "^6.5.8",
-    "react-final-form-listeners": "^1.0.3",
-    "react-i18next": "^12.0.0",
-    "react-redux": "^8.0.4",
-    "react-router-dom": "^6.2.2",
-    "react-scripts": "5.0.1",
-    "react-virtualized-auto-sizer": "^1.0.6",
-    "react-window": "^1.8.6",
-    "redux": "^4.1.2",
-    "redux-form": "^8.3.8",
-    "redux-thunk": "^2.4.1",
-    "rxjs": "^7.5.4",
-    "sanitize-html": "^2.7.3"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.17.5",
-    "@mui/types": "^7.1.3",
-    "@testing-library/jest-dom": "^5.16.2",
-    "@testing-library/react": "^13.4.0",
-    "@types/jest": "29.2.0",
-    "@types/jquery": "^3.5.14",
-    "@types/lodash": "^4.14.179",
-    "@types/node": "18.11.7",
-    "@types/prop-types": "^15.7.4",
-    "@types/react": "18.0.24",
-    "@types/react-dom": "18.0.8",
-    "@types/react-redux": "^7.1.23",
-    "@types/react-router-dom": "^5.3.3",
-    "@types/react-virtualized-auto-sizer": "^1.0.1",
-    "@types/react-window": "^1.8.5",
-    "@types/redux-form": "^8.3.3",
-    "@typescript-eslint/eslint-plugin": "^5.14.0",
-    "@typescript-eslint/parser": "^5.14.0",
-    "fs-extra": "^10.0.1",
-    "husky": "^8.0.1",
-    "typescript": "^4.6.2"
-  },
-  "eslintConfig": {
-    "extends": "react-app"
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
-  "jest": {
-    "moduleNameMapper": {
-      "\\.(css|less)$": "identity-obj-proxy"
-    }
-  }
-}
diff --git a/webclient/prebuild.js b/webclient/prebuild.js
deleted file mode 100644
index 3b420f32c..000000000
--- a/webclient/prebuild.js
+++ /dev/null
@@ -1,112 +0,0 @@
-const fse = require('fs-extra');
-const path = require('path');
-const util = require('util');
-const exec = util.promisify(require('child_process').exec);
-
-const ROOT_DIR = './src';
-const PUBLIC_DIR = './public';
-
-const protoFilesDir = `${PUBLIC_DIR}/pb`;
-const i18nDefaultFile = `${ROOT_DIR}/i18n-default.json`;
-const serverPropsFile = `${ROOT_DIR}/server-props.json`;
-const masterProtoFile = `${ROOT_DIR}/proto-files.json`;
-
-const sharedFiles = [
-  ['../libcockatrice_protocol/libcockatrice/protocol/pb', protoFilesDir],
-  ['../cockatrice/resources/countries', `${ROOT_DIR}/images/countries`],
-];
-
-const i18nFileRegex = /\.i18n\.json$/;
-
-const i18nOnly = process.argv.indexOf('-i18nOnly') > -1;
-
-(async () => {
-  if (i18nOnly) {
-    await createI18NDefault();
-    return;
-  }
-
-  // make sure these files finish copying before master file is created
-  await copySharedFiles();
-
-  await createMasterProtoFile();
-  await createServerProps();
-  await createI18NDefault();
-})();
-
-async function copySharedFiles() {
-  try {
-    return await Promise.all(sharedFiles.map(([src, dest]) => fse.copy(src, dest, { overwrite: true })));
-  } catch (e) {
-    console.error(e);
-    process.exitCode = 1;
-  }
-}
-
-async function createMasterProtoFile() {
-  try {
-    fse.readdir(protoFilesDir, (err, files) => {
-      if (err) throw err;
-
-      fse.outputFile(masterProtoFile, JSON.stringify(files.filter(file => /\.proto$/.test(file))));
-    });
-  } catch (e) {
-    console.error(e);
-    process.exitCode = 1;
-  }
-}
-
-async function createServerProps() {
-  try {
-    fse.outputFile(serverPropsFile, JSON.stringify({
-      REACT_APP_VERSION: await getCommitHash(),
-    }));
-  } catch (e) {
-    console.error(e);
-    process.exitCode = 1;
-  }
-}
-
-async function createI18NDefault() {
-  try {
-    const files = getAllFiles(ROOT_DIR, i18nFileRegex);
-    const allJson = await Promise.all(files.map(file => fse.readJson(file)));
-
-    const rollup = allJson.reduce((acc, json) => {
-      const newKeys = Object.keys(json);
-
-      newKeys.forEach(key => {
-        if (acc[key]) {
-          throw new Error(`i18n key collision: ${key}\n${JSON.stringify(json)}`);
-        }
-
-        acc[key] = json[key];
-      });
-
-      return acc;
-    }, {});
-
-    fse.outputFile(i18nDefaultFile, JSON.stringify(rollup, null, 2));
-  } catch (e) {
-    console.error(e);
-    process.exitCode = 1;
-  }
-}
-
-async function getCommitHash() {
-  return (await exec('git rev-parse HEAD')).stdout.trim();
-}
-
-function getAllFiles(dirPath, regex = /./, allFiles = []) {
-  return fse.readdirSync(dirPath).reduce((files, file) => {
-    const filePath = dirPath + "/" + file;
-
-    if (fse.statSync(filePath).isDirectory()) {
-      files.concat(getAllFiles(filePath, regex, files));
-    } else if (regex.test(file)) {
-      files.push(path.join(__dirname, filePath));
-    }
-
-    return files;
-  }, allFiles);
-}
diff --git a/webclient/public/favicon.ico b/webclient/public/favicon.ico
deleted file mode 100644
index c2c86b859..000000000
Binary files a/webclient/public/favicon.ico and /dev/null differ
diff --git a/webclient/public/index.html b/webclient/public/index.html
deleted file mode 100644
index c050e82f4..000000000
--- a/webclient/public/index.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <link rel="stylesheet" type="text/css" href="%PUBLIC_URL%/reset.css">
-    <meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Webatrice: A Cockatrice Web Client"
-    />
-    <link rel="apple-touch-icon" href="logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>Webatrice</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>
diff --git a/webclient/public/locales/de/translation.json b/webclient/public/locales/de/translation.json
deleted file mode 100644
index 294f3fb9f..000000000
--- a/webclient/public/locales/de/translation.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
-  "Common": {
-    "language": "Deutsch (German)",
-    "disconnect": "Verbindung trennen",
-    "label": {
-      "confirmPassword": "Passwort bestätigen",
-      "confirmSure": "Sind Sie sicher?",
-      "country": "Land",
-      "delete": "Löschen",
-      "email": "E-Mail",
-      "hostName": "Name des Hosts",
-      "hostAddress": "Adresse des Hosts",
-      "password": "Passwort",
-      "passwordAgain": "Passwort Erneut",
-      "port": "Port",
-      "realName": "Richtiger Name",
-      "saveChanges": "Änderungen speichern",
-      "token": "Token",
-      "username": "Benutzername"
-    },
-    "validation": {
-      "minChars": "Mindestens {count} {count, plural, one {Zeichen} other {Zeichen}} benötigt",
-      "passwordsMustMatch": "Die Passwörter stimmen nicht überein",
-      "required": "Benötigt"
-    },
-    "countries": {
-      "AD": "Andorra",
-      "AE": "Vereinigte Arabische Emirate",
-      "AF": "Afghanistan",
-      "AG": "Antigua und Barbuda",
-      "AI": "Anguilla",
-      "AL": "Albanien",
-      "AM": "Armenien",
-      "AO": "Angola",
-      "AQ": "Antarktis",
-      "AR": "Argentinien",
-      "AS": "Amerikanisch-Samoa",
-      "AT": "Österreich",
-      "AU": "Australien",
-      "AW": "Aruba",
-      "AX": "Ålandinseln",
-      "AZ": "Aserbaidschan",
-      "BA": "Bosnien und Herzegowina",
-      "BB": "Barbados",
-      "BD": "Bangladesch",
-      "BE": "Belgien",
-      "BF": "Burkina Faso",
-      "BG": "Bulgarien",
-      "BH": "Bahrain",
-      "BI": "Burundi",
-      "BJ": "Benin",
-      "BL": "Saint-Barthélemy ",
-      "BM": "Bermuda",
-      "BN": "Brunei",
-      "BO": "Bolivien",
-      "BQ": "Bonaire, Sint Eustatius und Saba",
-      "BR": "Brasilien",
-      "BS": "Bahamas",
-      "BT": "Bhutan",
-      "BV": "Bouvetinsel",
-      "BW": "Botswana",
-      "BY": "Weißrussland",
-      "BZ": "Belize",
-      "CA": "Kanada",
-      "CC": "Kokosinseln",
-      "CD": "DR Kongo",
-      "CF": "Zentralafrikanische Republik",
-      "CG": "Republik Kongo",
-      "CH": "Schweiz",
-      "CI": "Elfenbeinküste",
-      "CK": "Cookinseln",
-      "CL": "Chile",
-      "CM": "Kamerun",
-      "CN": "China",
-      "CO": "Kolumbien",
-      "CR": "Costa Rica",
-      "CU": "Kuba",
-      "CV": "Kap Verde",
-      "CW": "Curaçao",
-      "CX": "Weihnachtsinsel",
-      "CY": "Zypern",
-      "CZ": "Tschechien",
-      "DE": "Deutschland",
-      "DJ": "Dschibuti",
-      "DK": "Dänemark",
-      "DM": "Dominica",
-      "DO": "Dominikanische Republik",
-      "DZ": "Algerien",
-      "EC": "Ecuador",
-      "EE": "Estland",
-      "EG": "Ägypten",
-      "EH": "Westsahara",
-      "ER": "Eritrea",
-      "ES": "Spanien",
-      "ET": "Äthiopien",
-      "FI": "Finnland",
-      "FJ": "Fiji",
-      "FK": "Falklandinseln",
-      "FM": "Mikronesien",
-      "FO": "Färöer",
-      "FR": "Frankreich",
-      "GA": "Gabun",
-      "GB": "Vereinigtes Königreich",
-      "GD": "Grenada",
-      "GE": "Georgien",
-      "GF": "Französisch-Guayana",
-      "GG": "Guernsey",
-      "GH": "Ghana",
-      "GI": "Gibraltar",
-      "GL": "Grönland",
-      "GM": "Gambia",
-      "GN": "Guinea",
-      "GP": "Guandeloupe",
-      "GQ": "Äquatorialguinea",
-      "GR": "Griechenland",
-      "GS": "Südgeorgien und die Südlichen Sandwichinseln",
-      "GT": "Guatemala",
-      "GU": "Guam",
-      "GW": "Guinea-Bissau",
-      "GY": "Guyana",
-      "HK": "Hongkong",
-      "HM": "Heard und McDonaldinseln",
-      "HN": "Honduras",
-      "HR": "Kroatien",
-      "HT": "Haiti",
-      "HU": "Ungarn",
-      "ID": "Indonesien",
-      "IE": "Irland",
-      "IL": "Israel",
-      "IM": "Insel Man",
-      "IN": "Indien",
-      "IO": " Britisches Territorium im Indischen Ozean",
-      "IQ": "Irak",
-      "IR": "Iran",
-      "IS": "Island",
-      "IT": "Italien",
-      "JE": "Jersey",
-      "JM": "Jamaika",
-      "JO": "Jordanien",
-      "JP": "Japan",
-      "KE": "Kenia",
-      "KG": "Kirgisistan",
-      "KH": "Kambodscha",
-      "KI": "Kiribati",
-      "KM": "Komoren",
-      "KN": "St. Kitts und Nevis",
-      "KP": "Nordkorea",
-      "KR": "Südkorea",
-      "KW": "Kuwait",
-      "KY": "Kaimaninseln",
-      "KZ": "Kasachstan",
-      "LA": "Laos",
-      "LB": "Libanon",
-      "LC": "St. Lucia",
-      "LI": "Liechtenstein",
-      "LK": "Sri Lanka",
-      "LR": "Liberia",
-      "LS": "Lesotho",
-      "LT": "Litauen",
-      "LU": "Luxemburg",
-      "LV": "Lettland",
-      "LY": "Libyen",
-      "MA": "Marokko",
-      "MC": "Monaco",
-      "MD": "Moldau",
-      "ME": "Montenegro",
-      "MF": "Saint-Martin (Französischer Teil)",
-      "MG": "Madagaskar",
-      "MH": "Marshallinseln",
-      "MK": "Nordmazedonien",
-      "ML": "Mali",
-      "MM": "Myanmar",
-      "MN": "Mongolei",
-      "MO": "Macau",
-      "MP": "Nördliche Marianen",
-      "MQ": "Martinique",
-      "MR": "Mauretanien",
-      "MS": "Montserrat",
-      "MT": "Malta",
-      "MU": "Mauritius",
-      "MV": "Malediven",
-      "MW": "Malawi",
-      "MX": "Mexiko",
-      "MY": "Malaysia",
-      "MZ": "Mosambik",
-      "NA": "Namibia",
-      "NC": "Neukaledonien",
-      "NE": "Niger",
-      "NF": "Norfolkinsel",
-      "NG": "Nigeria",
-      "NI": "Nicaragua",
-      "NL": "Niederlande",
-      "NO": "Norwegen",
-      "NP": "Nepal",
-      "NR": "Nauru",
-      "NU": "Niue",
-      "NZ": "Neuseeland",
-      "OM": "Oman",
-      "PA": "Panama",
-      "PE": "Peru",
-      "PF": "Französisch-Polynesien",
-      "PG": "Papua-Neuguinea",
-      "PH": "Philippinen",
-      "PK": "Pakistan",
-      "PL": "Polen",
-      "PM": "St. Pierre und Miquelon",
-      "PN": "Pitcairninseln",
-      "PR": "Puerto Rico",
-      "PS": "Palästina",
-      "PT": "Portugal",
-      "PW": "Palau",
-      "PY": "Paraguay",
-      "QA": "Katar",
-      "RE": "Réunion",
-      "RO": "Rumänien",
-      "RS": "Serbien",
-      "RU": "Russland",
-      "RW": "Ruanda",
-      "SA": "Saudi-Arabien",
-      "SB": "Salomonen",
-      "SC": "Seychellen",
-      "SD": "Sudan",
-      "SE": "Schweden",
-      "SG": "Singapur",
-      "SH": "St. Helena, Ascension und Tristan da Cunha",
-      "SI": "Slowenien",
-      "SJ": "Spitzbergen und Jan Mayen",
-      "SK": "Slowakei",
-      "SL": "Sierra Leone",
-      "SM": "San Marino",
-      "SN": "Senegal",
-      "SO": "Somalia",
-      "SR": "Suriname",
-      "SS": "Südsudan",
-      "ST": "São Tomé und Príncipe",
-      "SV": "El Salvador",
-      "SX": "Sint Maarten (Niederländischer Teil)",
-      "SY": "Syrien",
-      "SZ": "Eswatini",
-      "TC": "Turks- und Caicosinseln",
-      "TD": "Tschad",
-      "TF": "TAAF",
-      "TG": "Togo",
-      "TH": "Thailand",
-      "TJ": "Tadschikistan",
-      "TK": "Tokelau",
-      "TL": "Timor-Leste",
-      "TM": "Turkmenistan",
-      "TN": "Tunesien",
-      "TO": "Tonga",
-      "TR": "Türkei",
-      "TT": "Trinidad und Tobago",
-      "TV": "Tuvalu",
-      "TW": "Taiwan",
-      "TZ": "Tansania",
-      "UA": "Ukraine",
-      "UG": "Uganda",
-      "UM": "Kleinere abgelegene Inseln der Vereinigten Staaten",
-      "US": "Vereinigte Staaten von Amerika",
-      "UY": "Uruguay",
-      "UZ": "Usbekistan",
-      "VA": "Heiliger Stuhl",
-      "VC": "St. Vincent und die Grenadinen",
-      "VE": "Venezuela",
-      "VG": "Britische Jungferninseln",
-      "VI": "Amerikanische Jungferninseln",
-      "VN": "Vietnam",
-      "VU": "Vanuatu",
-      "WF": "Wallis und Futuna",
-      "WS": "Samoa",
-      "YE": "Jemen",
-      "YT": "Mayotte",
-      "XK": "Kosovo",
-      "ZA": "Südafrika",
-      "ZM": "Sambia",
-      "ZW": "Simbabwe",
-      "EU": "Europäische Union"
-    },
-    "languages": {
-      "en-US": "Englisch - US",
-      "fr": "Französisch",
-      "nl": "Niederländisch",
-      "pt_BR": "Portugiesisch - Brasilien"
-    }
-  },
-  "KnownHosts": {
-    "label": "Host",
-    "add": "Neuen Host hinzufügen",
-    "toast": "Host erfolgreich {mode, select, created {erstellt} deleted {gelöscht} other {bearbeitet}}."
-  },
-  "InitializeContainer": {
-    "title": "WUSSTEN SIE SCHON",
-    "subtitle": "<1>Cockatrice wird von Freiwilligen geleitet </1><1>die Kartenspiele lieben!</1>"
-  },
-  "LoginContainer": {
-    "header": {
-      "title": "Login",
-      "subtitle": "Ein plattformübergreifender, virtueller Tabletop für Multiplayer-Kartenspiele."
-    },
-    "footer": {
-      "registerPrompt": "Noch nicht registriert?",
-      "registerAction": "Einen Account erstellen",
-      "credit": "Cockatrice ist ein Open-Source-Projekt",
-      "version": "Version"
-    },
-    "content": {
-      "subtitle1": "Spielen Sie Kartenspiele im Multiplayer online.",
-      "subtitle2": "Plattformübergreifender, virtueller Tabletop für Kartenspiele im Multiplayer. Für immer kostenlos."
-    },
-    "toasts": {
-      "passwordResetSuccessToast": "Passwort erfolgreich zurückgesetzt",
-      "accountActivationSuccess": "Account erfolgreich aktiviert"
-    }
-  },
-  "UnsupportedContainer": {
-    "title": "Browser wird nicht unterstützt",
-    "subtitle1": "Bitte updaten Sie Ihren Browser und/oder überprüfen Sie Ihre Berechtigungen.",
-    "subtitle2": "Hinweis: Beim privaten Surfen werden bei einigen Browsern bestimmte Berechtigungen oder Funktionen deaktiviert."
-  },
-  "AccountActivationDialog": {
-    "title": "Aktivierung des Accounts",
-    "subtitle1": "Ihr Account wurde noch nicht aktiviert.",
-    "subtitle2": "Sie müssen das Aktivierungs-Token angeben, das Sie in der Aktivierungs-E-Mail erhalten haben."
-  },
-  "KnownHostDialog": {
-    "title": "{mode, select, edit {Bearbeiten} other {Hinzufügen}} Bekannter Host",
-    "subtitle": "Wenn Sie einen neuen Host hinzufügen, können Sie sich mit verschiedenen Servern verbinden. Geben Sie die unten stehenden Details in Ihre Hostliste ein."
-  },
-  "RegistrationDialog": {
-    "title": "Einen neuen Account erstellen"
-  },
-  "RequestPasswordResetDialog": {
-    "title": "Passwort-Zurücksetzung anfordern"
-  },
-  "ResetPasswordDialog": {
-    "title": "Passwort zurücksetzen"
-  },
-  "AccountActivationForm": {
-    "error": {
-      "failed": "Account-Aktivierung fehlgeschlagen"
-    },
-    "label": {
-      "activate": "Account aktivieren"
-    }
-  },
-  "KnownHostForm": {
-    "help": "Brauchen Sie Hilfe beim Hinzufügen eines neuen Hosts?",
-    "label": {
-      "add": "Host hinzufügen",
-      "find": "Host finden"
-    }
-  },
-  "LoginForm": {
-    "label": {
-      "autoConnect": "Automatisch verbinden",
-      "forgot": "Passwort vergessen",
-      "login": "Login",
-      "savePassword": "Passwort speichern",
-      "savedPassword": "Passwort gespeichert"
-    }
-  },
-  "RegisterForm": {
-    "label": {
-      "register": "Registrieren"
-    },
-    "toast": {
-      "registerSuccess": "Registrierung erfolgreich!"
-    }
-  },
-  "RequestPasswordResetForm": {
-    "error": "Anfrage zum Zurücksetzen des Passworts fehlgeschlagen",
-    "mfaEnabled": "Der Server hat Multi-Faktor-Authentifizierung aktiviert",
-    "request": "Rücksetzungs-Token anfordern",
-    "skipRequest": "Ich habe bereits ein Rücksetzungs-Token"
-  },
-  "ResetPasswordForm": {
-    "error": "Passwort-Zurücksetzung fehlgeschlagen",
-    "label": {
-      "reset": "Passwort zurücksetzen"
-    }
-  }
-}
\ No newline at end of file
diff --git a/webclient/public/locales/en_US/translation.json b/webclient/public/locales/en_US/translation.json
deleted file mode 100644
index 3c63e0abb..000000000
--- a/webclient/public/locales/en_US/translation.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
-  "Common": {
-    "language": "English",
-    "disconnect": "Disconnect",
-    "label": {
-      "confirmPassword": "Confirm Password",
-      "confirmSure": "Are you sure?",
-      "country": "Country",
-      "delete": "Delete",
-      "email": "Email",
-      "hostName": "Host Name",
-      "hostAddress": "Host Address",
-      "password": "Password",
-      "passwordAgain": "Password Again",
-      "port": "Port",
-      "realName": "Real Name",
-      "saveChanges": "Save Changes",
-      "token": "Token",
-      "username": "Username"
-    },
-    "validation": {
-      "minChars": "Minimum of {count} {count, plural, one {character} other {characters}} required",
-      "passwordsMustMatch": "Passwords don't match",
-      "required": "Required"
-    },
-    "countries": {
-      "AD": "Andorra",
-      "AE": "United Arab Emirates",
-      "AF": "Afghanistan",
-      "AG": "Antigua and Barbuda",
-      "AI": "Anguilla",
-      "AL": "Albania",
-      "AM": "Armenia",
-      "AO": "Angola",
-      "AQ": "Antarctica",
-      "AR": "Argentina",
-      "AS": "American Samoa",
-      "AT": "Austria",
-      "AU": "Australia",
-      "AW": "Aruba",
-      "AX": "Åland Islands",
-      "AZ": "Azerbaijan",
-      "BA": "Bosnia and Herzegovina",
-      "BB": "Barbados",
-      "BD": "Bangladesh",
-      "BE": "Belgium",
-      "BF": "Burkina Faso",
-      "BG": "Bulgaria",
-      "BH": "Bahrain",
-      "BI": "Burundi",
-      "BJ": "Benin",
-      "BL": "Saint Barthélemy",
-      "BM": "Bermuda",
-      "BN": "Brunei Darussalam",
-      "BO": "Bolivia",
-      "BQ": "Bonaire, Sint Eustatius and Saba",
-      "BR": "Brazil",
-      "BS": "Bahamas",
-      "BT": "Bhutan",
-      "BV": "Bouvet Island",
-      "BW": "Botswana",
-      "BY": "Belarus",
-      "BZ": "Belize",
-      "CA": "Canada",
-      "CC": "Cocos (Keeling) Islands",
-      "CD": "DR Congo",
-      "CF": "Central African Republic",
-      "CG": "Republic of the Congo",
-      "CH": "Switzerland",
-      "CI": "Ivory Coast",
-      "CK": "Cook Islands",
-      "CL": "Chile",
-      "CM": "Cameroon",
-      "CN": "China",
-      "CO": "Colombia",
-      "CR": "Costa Rica",
-      "CU": "Cuba",
-      "CV": "Cape Verde",
-      "CW": "Curaçao",
-      "CX": "Christmas Island",
-      "CY": "Cyprus",
-      "CZ": "Czechia",
-      "DE": "Germany",
-      "DJ": "Djibouti",
-      "DK": "Denmark",
-      "DM": "Dominica",
-      "DO": "Dominican Republic",
-      "DZ": "Algeria",
-      "EC": "Ecuador",
-      "EE": "Estonia",
-      "EG": "Egypt",
-      "EH": "Western Sahara",
-      "ER": "Eritrea",
-      "ES": "Spain",
-      "ET": "Ethiopia",
-      "FI": "Finland",
-      "FJ": "Fiji",
-      "FK": "Falkland Islands",
-      "FM": "Micronesia",
-      "FO": "Faroe Islands",
-      "FR": "France",
-      "GA": "Gabon",
-      "GB": "United Kingdom",
-      "GD": "Grenada",
-      "GE": "Georgia",
-      "GF": "French Guiana",
-      "GG": "Guernsey",
-      "GH": "Ghana",
-      "GI": "Gibraltar",
-      "GL": "Greenland",
-      "GM": "Gambia",
-      "GN": "Guinea",
-      "GP": "Guadeloupe",
-      "GQ": "Equatorial Guinea",
-      "GR": "Greece",
-      "GS": "South Georgia and the South Sandwich Islands",
-      "GT": "Guatemala",
-      "GU": "Guam",
-      "GW": "Guinea-Bissau",
-      "GY": "Guyana",
-      "HK": "Hong Kong",
-      "HM": "Heard Island and McDonald Islands",
-      "HN": "Honduras",
-      "HR": "Croatia",
-      "HT": "Haiti",
-      "HU": "Hungary",
-      "ID": "Indonesia",
-      "IE": "Ireland",
-      "IL": "Israel",
-      "IM": "Isle of Man",
-      "IN": "India",
-      "IO": "British Indian Ocean Territory",
-      "IQ": "Iraq",
-      "IR": "Iran",
-      "IS": "Iceland",
-      "IT": "Italy",
-      "JE": "Jersey",
-      "JM": "Jamaica",
-      "JO": "Jordan",
-      "JP": "Japan",
-      "KE": "Kenya",
-      "KG": "Kyrgyzstan",
-      "KH": "Cambodia",
-      "KI": "Kiribati",
-      "KM": "Comoros",
-      "KN": "Saint Kitts and Nevis",
-      "KP": "North Korea",
-      "KR": "South Korea",
-      "KW": "Kuwait",
-      "KY": "Cayman Islands",
-      "KZ": "Kazakhstan",
-      "LA": "Laos",
-      "LB": "Lebanon",
-      "LC": "Saint Lucia",
-      "LI": "Liechtenstein",
-      "LK": "Sri Lanka",
-      "LR": "Liberia",
-      "LS": "Lesotho",
-      "LT": "Lithuania",
-      "LU": "Luxembourg",
-      "LV": "Latvia",
-      "LY": "Libya",
-      "MA": "Morocco",
-      "MC": "Monaco",
-      "MD": "Moldova",
-      "ME": "Montenegro",
-      "MF": "Saint Martin (French part)",
-      "MG": "Madagascar",
-      "MH": "Marshall Islands",
-      "MK": "North Macedonia",
-      "ML": "Mali",
-      "MM": "Myanmar",
-      "MN": "Mongolia",
-      "MO": "Macao",
-      "MP": "Northern Mariana Islands",
-      "MQ": "Martinique",
-      "MR": "Mauritania",
-      "MS": "Montserrat",
-      "MT": "Malta",
-      "MU": "Mauritius",
-      "MV": "Maldives",
-      "MW": "Malawi",
-      "MX": "Mexico",
-      "MY": "Malaysia",
-      "MZ": "Mozambique",
-      "NA": "Namibia",
-      "NC": "New Caledonia",
-      "NE": "Niger",
-      "NF": "Norfolk Island",
-      "NG": "Nigeria",
-      "NI": "Nicaragua",
-      "NL": "Netherlands",
-      "NO": "Norway",
-      "NP": "Nepal",
-      "NR": "Nauru",
-      "NU": "Niue",
-      "NZ": "New Zealand",
-      "OM": "Oman",
-      "PA": "Panama",
-      "PE": "Peru",
-      "PF": "French Polynesia",
-      "PG": "Papua New Guinea",
-      "PH": "Philippines",
-      "PK": "Pakistan",
-      "PL": "Poland",
-      "PM": "Saint Pierre and Miquelon",
-      "PN": "Pitcairn",
-      "PR": "Puerto Rico",
-      "PS": "Palestine",
-      "PT": "Portugal",
-      "PW": "Palau",
-      "PY": "Paraguay",
-      "QA": "Qatar",
-      "RE": "Réunion",
-      "RO": "Romania",
-      "RS": "Serbia",
-      "RU": "Russia",
-      "RW": "Rwanda",
-      "SA": "Saudi Arabia",
-      "SB": "Solomon Islands",
-      "SC": "Seychelles",
-      "SD": "Sudan",
-      "SE": "Sweden",
-      "SG": "Singapore",
-      "SH": "Saint Helena, Ascension and Tristan da Cunha",
-      "SI": "Slovenia",
-      "SJ": "Svalbard and Jan Mayen",
-      "SK": "Slovakia",
-      "SL": "Sierra Leone",
-      "SM": "San Marino",
-      "SN": "Senegal",
-      "SO": "Somalia",
-      "SR": "Suriname",
-      "SS": "South Sudan",
-      "ST": "Sao Tome and Principe",
-      "SV": "El Salvador",
-      "SX": "Sint Maarten (Dutch part)",
-      "SY": "Syria",
-      "SZ": "Eswatini",
-      "TC": "Turks and Caicos Islands",
-      "TD": "Chad",
-      "TF": "TAAF",
-      "TG": "Togo",
-      "TH": "Thailand",
-      "TJ": "Tajikistan",
-      "TK": "Tokelau",
-      "TL": "Timor-Leste",
-      "TM": "Turkmenistan",
-      "TN": "Tunisia",
-      "TO": "Tonga",
-      "TR": "Turkey",
-      "TT": "Trinidad and Tobago",
-      "TV": "Tuvalu",
-      "TW": "Taiwan",
-      "TZ": "Tanzania",
-      "UA": "Ukraine",
-      "UG": "Uganda",
-      "UM": "United States Minor Outlying Islands",
-      "US": "United States",
-      "UY": "Uruguay",
-      "UZ": "Uzbekistan",
-      "VA": "Holy See",
-      "VC": "Saint Vincent and the Grenadines",
-      "VE": "Venezuela",
-      "VG": "British Virgin Islands",
-      "VI": "U.S. Virgin Islands",
-      "VN": "Viet Nam",
-      "VU": "Vanuatu",
-      "WF": "Wallis and Futuna",
-      "WS": "Samoa",
-      "YE": "Yemen",
-      "YT": "Mayotte",
-      "XK": "Kosovo",
-      "ZA": "South Africa",
-      "ZM": "Zambia",
-      "ZW": "Zimbabwe",
-      "EU": "European Union"
-    },
-    "languages": {
-      "en-US": "English - US",
-      "fr": "French",
-      "nl": "Dutch",
-      "pt_BR": "Portuguese - Brazil"
-    }
-  },
-  "KnownHosts": {
-    "label": "Host",
-    "add": "Add new host",
-    "toast": "Host successfully {mode, select, created {created} deleted {deleted} other {edited}}."
-  },
-  "InitializeContainer": {
-    "title": "DID YOU KNOW",
-    "subtitle": "<1>Cockatrice is run by volunteers</1><1>that love card games!</1>"
-  },
-  "LoginContainer": {
-    "header": {
-      "title": "Login",
-      "subtitle": "A cross-platform virtual tabletop for multiplayer card games."
-    },
-    "footer": {
-      "registerPrompt": "Not registered yet?",
-      "registerAction": "Create an account",
-      "credit": "Cockatrice is an open source project",
-      "version": "Version"
-    },
-    "content": {
-      "subtitle1": "Play multiplayer card games online.",
-      "subtitle2": "Cross-platform virtual tabletop for multiplayer card games. Forever free."
-    },
-    "toasts": {
-      "passwordResetSuccessToast": "Password Reset Successfully",
-      "accountActivationSuccess": "Account Activated Successfully"
-    }
-  },
-  "UnsupportedContainer": {
-    "title": "Unsupported Browser",
-    "subtitle1": "Please update your browser and/or check your permissions.",
-    "subtitle2": "Note: Private browsing causes some browsers to disable certain permissions or features."
-  },
-  "AccountActivationDialog": {
-    "title": "Account Activation",
-    "subtitle1": "Your account has not been activated yet.",
-    "subtitle2": "You need to provide the activation token received in the activation email."
-  },
-  "KnownHostDialog": {
-    "title": "{mode, select, edit {Edit} other {Add}} Known Host",
-    "subtitle": "Adding a new host allows you to connect to different servers. Enter the details below to your host list."
-  },
-  "RegistrationDialog": {
-    "title": "Create New Account"
-  },
-  "RequestPasswordResetDialog": {
-    "title": "Request Password Reset"
-  },
-  "ResetPasswordDialog": {
-    "title": "Reset Password"
-  },
-  "AccountActivationForm": {
-    "error": {
-      "failed": "Account activation failed"
-    },
-    "label": {
-      "activate": "Activate Account"
-    }
-  },
-  "KnownHostForm": {
-    "help": "Need help adding a new host?",
-    "label": {
-      "add": "Add Host",
-      "find": "Find Host"
-    }
-  },
-  "LoginForm": {
-    "label": {
-      "autoConnect": "Auto Connect",
-      "forgot": "Forgot Password",
-      "login": "Login",
-      "savePassword": "Save Password",
-      "savedPassword": "Saved Password"
-    }
-  },
-  "RegisterForm": {
-    "label": {
-      "register": "Register"
-    },
-    "toast": {
-      "registerSuccess": "Registration Successful!"
-    }
-  },
-  "RequestPasswordResetForm": {
-    "error": "Request password reset failed",
-    "mfaEnabled": "Server has multi-factor authentication enabled",
-    "request": "Request Reset Token",
-    "skipRequest": "I already have a reset token"
-  },
-  "ResetPasswordForm": {
-    "error": "Password reset failed",
-    "label": {
-      "reset": "Reset Password"
-    }
-  }
-}
\ No newline at end of file
diff --git a/webclient/public/locales/es/translation.json b/webclient/public/locales/es/translation.json
deleted file mode 100644
index 33a3db45c..000000000
--- a/webclient/public/locales/es/translation.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
-  "Common": {
-    "language": "Español (Spanish)",
-    "disconnect": "Desconectar",
-    "label": {
-      "confirmPassword": "Confirmar contraseña",
-      "confirmSure": "¿Estás seguro?",
-      "country": "País",
-      "delete": "Borrar",
-      "email": "e-mail",
-      "hostName": "Nombre del servidor",
-      "hostAddress": "Dirección del servidor",
-      "password": "Contraseña",
-      "passwordAgain": "Contraseña de nuevo",
-      "port": "Puerto",
-      "realName": "Nombre real",
-      "saveChanges": "Guardar cambios",
-      "token": "Ficha",
-      "username": "Nombre de usuario"
-    },
-    "validation": {
-      "minChars": "Se requiere un mínimo de {conteo} {conteo, plural, un {carácter} otros {caracteres}}",
-      "passwordsMustMatch": "Las contraseñas no coinciden",
-      "required": "Requerido"
-    },
-    "countries": {
-      "AD": "Andorra",
-      "AE": "Emiratos Árabes Unidos",
-      "AF": "Afganistán",
-      "AG": "Antigua y Barbuda",
-      "AI": "Anguila",
-      "AL": "Albania",
-      "AM": "Armenia",
-      "AO": "Angola",
-      "AQ": "Antártida",
-      "AR": "Argentina",
-      "AS": "Samoa americana",
-      "AT": "Austria",
-      "AU": "Australia",
-      "AW": "Aruba",
-      "AX": "Islas Aland",
-      "AZ": "Azerbaiján",
-      "BA": "Bosnia y Herzegovina",
-      "BB": "Barbados",
-      "BD": "Bangladés",
-      "BE": "Bélgica",
-      "BF": "Burkina Faso",
-      "BG": "Bulgaria",
-      "BH": "Baréin",
-      "BI": "Burundi",
-      "BJ": "Benín",
-      "BL": "San Bartolomé",
-      "BM": "Bermuda",
-      "BN": "Brunei Darussalam",
-      "BO": "Bolivia",
-      "BQ": "Bonaire, San Eustaquio y Saba",
-      "BR": "Brasil",
-      "BS": "Bahamas",
-      "BT": "Bután",
-      "BV": "Isla Bouvet",
-      "BW": "Botswana",
-      "BY": "Belorrusia",
-      "BZ": "Belice",
-      "CA": "Canadá",
-      "CC": "Islas (Keeling) Cocos",
-      "CD": "República Democrática del Congo",
-      "CF": "República Centroafricana",
-      "CG": "República del Congo",
-      "CH": "Suiza",
-      "CI": "Costa de Marfil",
-      "CK": "Islas Cook",
-      "CL": "Chile",
-      "CM": "Camerún",
-      "CN": "China",
-      "CO": "Colombia",
-      "CR": "Costa Rica",
-      "CU": "Cuba",
-      "CV": "Cabo Verde",
-      "CW": "Curazao",
-      "CX": "Isla de Navidad",
-      "CY": "Chipre",
-      "CZ": "República Checa",
-      "DE": "Alemania",
-      "DJ": "Djibouti",
-      "DK": "Dinamarca",
-      "DM": "Dominica",
-      "DO": "República Dominicana",
-      "DZ": "Argelia",
-      "EC": "Ecuador",
-      "EE": "Estonia",
-      "EG": "Egipto",
-      "EH": "Sáhara Occidental",
-      "ER": "Eritrea",
-      "ES": "España",
-      "ET": "Etiopía",
-      "FI": "Finlandia",
-      "FJ": "Fiji",
-      "FK": "Islas Falkland",
-      "FM": "Micronesia",
-      "FO": "Islas Faroe",
-      "FR": "Francia",
-      "GA": "Gabón",
-      "GB": "Reino Unido",
-      "GD": "Granada",
-      "GE": "Georgia",
-      "GF": "Guinea Francesa",
-      "GG": "Guernsey",
-      "GH": "Ghana",
-      "GI": "Gibraltar",
-      "GL": "Greenland",
-      "GM": "Gambía",
-      "GN": "Guinea",
-      "GP": "Guadalupe",
-      "GQ": "Guinea Ecuatorial",
-      "GR": "Grecia",
-      "GS": "Georgia del Sur y las islas Sandwich del sur",
-      "GT": "Guatemala",
-      "GU": "Guam",
-      "GW": "Guinea-Bisáu",
-      "GY": "Guyana",
-      "HK": "Hong Kong",
-      "HM": "Islas Heard y McDonald",
-      "HN": "Honduras",
-      "HR": "Croacia",
-      "HT": "Haití",
-      "HU": "Hungría",
-      "ID": "Indonesia",
-      "IE": "Irlanda",
-      "IL": "Israel",
-      "IM": "Isla de Man",
-      "IN": "India",
-      "IO": "Territorio Británico del Océano Índico",
-      "IQ": "Irak",
-      "IR": "Irán",
-      "IS": "Groenlandia",
-      "IT": "Italia",
-      "JE": "Jersey",
-      "JM": "Jamaica",
-      "JO": "Jordania",
-      "JP": "Japón",
-      "KE": "Kenya",
-      "KG": "Kirguistán",
-      "KH": "Camboya",
-      "KI": "Kiribati",
-      "KM": "Comoras",
-      "KN": "San Cristóbal y Nieves",
-      "KP": "Corea la Buena-Norte",
-      "KR": "Corea la Mala-Sur",
-      "KW": "Kuwait",
-      "KY": "Islas Caimán",
-      "KZ": "Kazajistán",
-      "LA": "Laos",
-      "LB": "Líbano",
-      "LC": "Santa Lucía",
-      "LI": "Principado de Liechtenstein",
-      "LK": "Sri Lanka",
-      "LR": "Liberia",
-      "LS": "Lesoto",
-      "LT": "Lituania",
-      "LU": "Luxemburgo",
-      "LV": "Letonia",
-      "LY": "Libia",
-      "MA": "Marruecos",
-      "MC": "Mónaci",
-      "MD": "Moldavia",
-      "ME": "Montenegro",
-      "MF": "San Martín (Parte francesa)",
-      "MG": "Madagascar",
-      "MH": "Islas Marshall",
-      "MK": "Macedonia del Norte",
-      "ML": "Malí",
-      "MM": "Birmania",
-      "MN": "Mongolia",
-      "MO": "Macao",
-      "MP": "Islas Marianas del Norte",
-      "MQ": "Martinica",
-      "MR": "Mauritania",
-      "MS": "Montserrat",
-      "MT": "Malta",
-      "MU": "Mauricio",
-      "MV": "Maldivas",
-      "MW": "Malawi",
-      "MX": "México",
-      "MY": "Malasia",
-      "MZ": "Mozambique",
-      "NA": "Namibia",
-      "NC": "Nueva Caledonia",
-      "NE": "Nigeria",
-      "NF": "Isla Norfolk",
-      "NG": "Nigeria",
-      "NI": "Nicaragua",
-      "NL": "Países Bajos (Holanda)",
-      "NO": "Noruega",
-      "NP": "Nepal",
-      "NR": "Nauru",
-      "NU": "Niue",
-      "NZ": "Nueva Zelanda",
-      "OM": "Omán",
-      "PA": "Panamá",
-      "PE": "Perú",
-      "PF": "Polinesia Francesa",
-      "PG": "Papúa Nueva Guinea",
-      "PH": "Filipinas",
-      "PK": "Pakistán",
-      "PL": "Polonia",
-      "PM": "San Pedro y Miquelón",
-      "PN": "Islas Pitcairn",
-      "PR": "Puerto Rico",
-      "PS": "Palestina",
-      "PT": "Portugal",
-      "PW": "Palaos",
-      "PY": "Paraguay",
-      "QA": "Catar",
-      "RE": "Reunión",
-      "RO": "Rumanía",
-      "RS": "Serbia",
-      "RU": "Rusia",
-      "RW": "Ruanda",
-      "SA": "Arabia Saudí",
-      "SB": "Islas Salomón",
-      "SC": "Islas Seychelles",
-      "SD": "Sudán",
-      "SE": "Suecia",
-      "SG": "Singapur",
-      "SH": "Santa Elena, Ascensión y Tristán de Acuña",
-      "SI": "Eslovenia",
-      "SJ": "Svalbard y Jan Mayen",
-      "SK": "Eslovaquia",
-      "SL": "Sierra Leona",
-      "SM": "San Marino",
-      "SN": "Senegal",
-      "SO": "Somalia",
-      "SR": "Surinam",
-      "SS": "Sudán del Sur",
-      "ST": "Santo Tomé y Príncipe",
-      "SV": "El Salvador",
-      "SX": "Sint Maarten (Países Bajos-Holanda)",
-      "SY": "Siria",
-      "SZ": "Esuatini",
-      "TC": "Islas Turcas y Caicos",
-      "TD": "Chad",
-      "TF": "Las Tierras Australes y Antárticas Francesas (TAAF)",
-      "TG": "Togo",
-      "TH": "Tailandia",
-      "TJ": "Tayikistán",
-      "TK": "Tokelau",
-      "TL": "Timor Oriental",
-      "TM": "Turkmenistán",
-      "TN": "Túnez",
-      "TO": "Tonga",
-      "TR": "Turquía",
-      "TT": "Trinidad y Tobago",
-      "TV": "Tuvalu",
-      "TW": "Taiwán",
-      "TZ": "Tanzania",
-      "UA": "Ucrania",
-      "UG": "Uganda",
-      "UM": "Islas Ultramarinas Menores de Estados Unidos",
-      "US": "Estados Unidos",
-      "UY": "Uruguay",
-      "UZ": "Uzbekistán",
-      "VA": "Ciudad del Vaticano",
-      "VC": "San Vicente y las Granadinas",
-      "VE": "Venezuela",
-      "VG": "Islas Vírgenes Británicas",
-      "VI": "Islas Vírgenes Estadounidenses",
-      "VN": "Vietnam",
-      "VU": "Vanuatu",
-      "WF": "Wallis y Futuna",
-      "WS": "Samoa",
-      "YE": "Yemen",
-      "YT": "Mayotte",
-      "XK": "Kósovo",
-      "ZA": "Sudáfrica",
-      "ZM": "Zambia",
-      "ZW": "Zimbabue",
-      "EU": "Unión Europea"
-    },
-    "languages": {
-      "en-US": "Inglés - US",
-      "fr": "Francés",
-      "nl": "Holandés",
-      "pt_BR": " Portugués - Brasil"
-    }
-  },
-  "KnownHosts": {
-    "label": "IP",
-    "add": "Añadir nueva dirección IP",
-    "toast": "Dirección IP correcta {modo, seleccionar, creado {creado} eliminado {eliminado} otro {editado}}."
-  },
-  "InitializeContainer": {
-    "title": "¿LO SABÍAS?",
-    "subtitle": "<1>¡Cockatrice está buscando voluntarios</1><1> que amen los juegos de cartas!"
-  },
-  "LoginContainer": {
-    "header": {
-      "title": "Conectar",
-      "subtitle": "Un tablero de mesa multiplataforma para juegos de cartas multijugador."
-    },
-    "footer": {
-      "registerPrompt": "¿No estás registrado aún?",
-      "registerAction": "Crear una cuenta",
-      "credit": "Cockatrice es un proyecto de fuente abierta",
-      "version": "Versión"
-    },
-    "content": {
-      "subtitle1": "Juega juegos de cartas multijugador en línea.",
-      "subtitle2": "Tablero multiplataforma virtual para juegos de cartas multijugador. Siempre gratuito."
-    },
-    "toasts": {
-      "passwordResetSuccessToast": "Reinicio de contraseña exitoso",
-      "accountActivationSuccess": "Cuenta activada con éxito"
-    }
-  },
-  "UnsupportedContainer": {
-    "title": "Navegador sin apoyo",
-    "subtitle1": "Por favor actualiza tu navegador y/o comprueba tus permisos.",
-    "subtitle2": "Nota: Los navegadores privados pueden causar que los navegadores deshabiliten ciertos permisos o funciones."
-  },
-  "AccountActivationDialog": {
-    "title": "Activación de la cuenta",
-    "subtitle1": "Tu cuenta aún no ha sido activada.",
-    "subtitle2": "Necesitas comprobar el mensaje de activación recibido en el e-mail de activación."
-  },
-  "KnownHostDialog": {
-    "title": "{modo, seleccionar, editar {Editar} otro {Agregar}} IP conocida",
-    "subtitle": "Añadir una nueva dirección IP te permite conectarte a diferentes servidores. Introduce los detalles a continuación a tu lista de IPs."
-  },
-  "RegistrationDialog": {
-    "title": "Crear nueva cuenta"
-  },
-  "RequestPasswordResetDialog": {
-    "title": "Requiere reinicio de contraseña"
-  },
-  "ResetPasswordDialog": {
-    "title": "Reiniciar contraseña"
-  },
-  "AccountActivationForm": {
-    "error": {
-      "failed": "La activación de la cuenta falló"
-    },
-    "label": {
-      "activate": "Activar cuenta"
-    }
-  },
-  "KnownHostForm": {
-    "help": "¿Necesitas ayuda al añadir una nueva dirección IP?",
-    "label": {
-      "add": "Añadir dirección IP",
-      "find": "Encontrar dirección IP"
-    }
-  },
-  "LoginForm": {
-    "label": {
-      "autoConnect": "Conectarse automáticamente",
-      "forgot": "Contraseña olvidada",
-      "login": "Conectar",
-      "savePassword": "Guardar contraseña",
-      "savedPassword": "Contraseña guardada"
-    }
-  },
-  "RegisterForm": {
-    "label": {
-      "register": "Registrarse"
-    },
-    "toast": {
-      "registerSuccess": "¡Te has registrado correctamente!"
-    }
-  },
-  "RequestPasswordResetForm": {
-    "error": "Solicitud de restablecimiento de contraseña fallida",
-    "mfaEnabled": "El servidor tiene habilitada la autenticación multifactor",
-    "request": "Se requiere reiniciar el token",
-    "skipRequest": "Ya tengo un reinicio de token"
-  },
-  "ResetPasswordForm": {
-    "error": "El reinicio de la contraseña falló",
-    "label": {
-      "reset": "Reiniciar contraseña"
-    }
-  }
-}
\ No newline at end of file
diff --git a/webclient/public/locales/fi/translation.json b/webclient/public/locales/fi/translation.json
deleted file mode 100644
index 12737731a..000000000
--- a/webclient/public/locales/fi/translation.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
-  "Common": {
-    "language": "Suomi (Finnish)",
-    "disconnect": "Katkaise yhteys",
-    "label": {
-      "confirmPassword": "Vahvista salasana",
-      "confirmSure": "Oletko varma?",
-      "country": "Maa",
-      "delete": "Poista",
-      "email": "Sähköposti",
-      "hostName": "Isännän Nimi",
-      "hostAddress": "Isännän Osoite",
-      "password": "Salasana",
-      "passwordAgain": "Salasana uudelleen",
-      "port": "Portti",
-      "realName": "Oikea nimi",
-      "saveChanges": "Tallenna muutokset",
-      "token": "Tokeni",
-      "username": "Käyttäjänimi"
-    },
-    "validation": {
-      "minChars": "Minimum of {count} {count, plural, one {character} other {characters}} required",
-      "passwordsMustMatch": "Passwords don't match",
-      "required": "Required"
-    },
-    "countries": {
-      "AD": "Andorra",
-      "AE": "United Arab Emirates",
-      "AF": "Afghanistan",
-      "AG": "Antigua and Barbuda",
-      "AI": "Anguilla",
-      "AL": "Albania",
-      "AM": "Armenia",
-      "AO": "Angola",
-      "AQ": "Antarctica",
-      "AR": "Argentina",
-      "AS": "American Samoa",
-      "AT": "Austria",
-      "AU": "Australia",
-      "AW": "Aruba",
-      "AX": "Åland Islands",
-      "AZ": "Azerbaijan",
-      "BA": "Bosnia and Herzegovina",
-      "BB": "Barbados",
-      "BD": "Bangladesh",
-      "BE": "Belgium",
-      "BF": "Burkina Faso",
-      "BG": "Bulgaria",
-      "BH": "Bahrain",
-      "BI": "Burundi",
-      "BJ": "Benin",
-      "BL": "Saint Barthélemy",
-      "BM": "Bermuda",
-      "BN": "Brunei Darussalam",
-      "BO": "Bolivia",
-      "BQ": "Bonaire, Sint Eustatius and Saba",
-      "BR": "Brazil",
-      "BS": "Bahamas",
-      "BT": "Bhutan",
-      "BV": "Bouvet Island",
-      "BW": "Botswana",
-      "BY": "Belarus",
-      "BZ": "Belize",
-      "CA": "Canada",
-      "CC": "Cocos (Keeling) Islands",
-      "CD": "DR Congo",
-      "CF": "Central African Republic",
-      "CG": "Republic of the Congo",
-      "CH": "Switzerland",
-      "CI": "Ivory Coast",
-      "CK": "Cook Islands",
-      "CL": "Chile",
-      "CM": "Cameroon",
-      "CN": "China",
-      "CO": "Colombia",
-      "CR": "Costa Rica",
-      "CU": "Cuba",
-      "CV": "Cape Verde",
-      "CW": "Curaçao",
-      "CX": "Christmas Island",
-      "CY": "Cyprus",
-      "CZ": "Czechia",
-      "DE": "Germany",
-      "DJ": "Djibouti",
-      "DK": "Denmark",
-      "DM": "Dominica",
-      "DO": "Dominican Republic",
-      "DZ": "Algeria",
-      "EC": "Ecuador",
-      "EE": "Estonia",
-      "EG": "Egypt",
-      "EH": "Western Sahara",
-      "ER": "Eritrea",
-      "ES": "Spain",
-      "ET": "Ethiopia",
-      "FI": "Finland",
-      "FJ": "Fiji",
-      "FK": "Falkland Islands",
-      "FM": "Micronesia",
-      "FO": "Faroe Islands",
-      "FR": "France",
-      "GA": "Gabon",
-      "GB": "United Kingdom",
-      "GD": "Grenada",
-      "GE": "Georgia",
-      "GF": "French Guiana",
-      "GG": "Guernsey",
-      "GH": "Ghana",
-      "GI": "Gibraltar",
-      "GL": "Greenland",
-      "GM": "Gambia",
-      "GN": "Guinea",
-      "GP": "Guadeloupe",
-      "GQ": "Equatorial Guinea",
-      "GR": "Greece",
-      "GS": "South Georgia and the South Sandwich Islands",
-      "GT": "Guatemala",
-      "GU": "Guam",
-      "GW": "Guinea-Bissau",
-      "GY": "Guyana",
-      "HK": "Hong Kong",
-      "HM": "Heard Island and McDonald Islands",
-      "HN": "Honduras",
-      "HR": "Croatia",
-      "HT": "Haiti",
-      "HU": "Hungary",
-      "ID": "Indonesia",
-      "IE": "Ireland",
-      "IL": "Israel",
-      "IM": "Isle of Man",
-      "IN": "India",
-      "IO": "British Indian Ocean Territory",
-      "IQ": "Iraq",
-      "IR": "Iran",
-      "IS": "Iceland",
-      "IT": "Italy",
-      "JE": "Jersey",
-      "JM": "Jamaica",
-      "JO": "Jordan",
-      "JP": "Japan",
-      "KE": "Kenya",
-      "KG": "Kyrgyzstan",
-      "KH": "Cambodia",
-      "KI": "Kiribati",
-      "KM": "Comoros",
-      "KN": "Saint Kitts and Nevis",
-      "KP": "North Korea",
-      "KR": "South Korea",
-      "KW": "Kuwait",
-      "KY": "Cayman Islands",
-      "KZ": "Kazakhstan",
-      "LA": "Laos",
-      "LB": "Lebanon",
-      "LC": "Saint Lucia",
-      "LI": "Liechtenstein",
-      "LK": "Sri Lanka",
-      "LR": "Liberia",
-      "LS": "Lesotho",
-      "LT": "Lithuania",
-      "LU": "Luxembourg",
-      "LV": "Latvia",
-      "LY": "Libya",
-      "MA": "Morocco",
-      "MC": "Monaco",
-      "MD": "Moldova",
-      "ME": "Montenegro",
-      "MF": "Saint Martin (French part)",
-      "MG": "Madagascar",
-      "MH": "Marshall Islands",
-      "MK": "North Macedonia",
-      "ML": "Mali",
-      "MM": "Myanmar",
-      "MN": "Mongolia",
-      "MO": "Macao",
-      "MP": "Northern Mariana Islands",
-      "MQ": "Martinique",
-      "MR": "Mauritania",
-      "MS": "Montserrat",
-      "MT": "Malta",
-      "MU": "Mauritius",
-      "MV": "Maldives",
-      "MW": "Malawi",
-      "MX": "Mexico",
-      "MY": "Malaysia",
-      "MZ": "Mozambique",
-      "NA": "Namibia",
-      "NC": "New Caledonia",
-      "NE": "Niger",
-      "NF": "Norfolk Island",
-      "NG": "Nigeria",
-      "NI": "Nicaragua",
-      "NL": "Netherlands",
-      "NO": "Norway",
-      "NP": "Nepal",
-      "NR": "Nauru",
-      "NU": "Niue",
-      "NZ": "New Zealand",
-      "OM": "Oman",
-      "PA": "Panama",
-      "PE": "Peru",
-      "PF": "French Polynesia",
-      "PG": "Papua New Guinea",
-      "PH": "Philippines",
-      "PK": "Pakistan",
-      "PL": "Poland",
-      "PM": "Saint Pierre and Miquelon",
-      "PN": "Pitcairn",
-      "PR": "Puerto Rico",
-      "PS": "Palestine",
-      "PT": "Portugal",
-      "PW": "Palau",
-      "PY": "Paraguay",
-      "QA": "Qatar",
-      "RE": "Réunion",
-      "RO": "Romania",
-      "RS": "Serbia",
-      "RU": "Russia",
-      "RW": "Rwanda",
-      "SA": "Saudi Arabia",
-      "SB": "Solomon Islands",
-      "SC": "Seychelles",
-      "SD": "Sudan",
-      "SE": "Sweden",
-      "SG": "Singapore",
-      "SH": "Saint Helena, Ascension and Tristan da Cunha",
-      "SI": "Slovenia",
-      "SJ": "Svalbard and Jan Mayen",
-      "SK": "Slovakia",
-      "SL": "Sierra Leone",
-      "SM": "San Marino",
-      "SN": "Senegal",
-      "SO": "Somalia",
-      "SR": "Suriname",
-      "SS": "South Sudan",
-      "ST": "Sao Tome and Principe",
-      "SV": "El Salvador",
-      "SX": "Sint Maarten (Dutch part)",
-      "SY": "Syria",
-      "SZ": "Eswatini",
-      "TC": "Turks and Caicos Islands",
-      "TD": "Chad",
-      "TF": "TAAF",
-      "TG": "Togo",
-      "TH": "Thailand",
-      "TJ": "Tajikistan",
-      "TK": "Tokelau",
-      "TL": "Timor-Leste",
-      "TM": "Turkmenistan",
-      "TN": "Tunisia",
-      "TO": "Tonga",
-      "TR": "Turkey",
-      "TT": "Trinidad and Tobago",
-      "TV": "Tuvalu",
-      "TW": "Taiwan",
-      "TZ": "Tanzania",
-      "UA": "Ukraine",
-      "UG": "Uganda",
-      "UM": "United States Minor Outlying Islands",
-      "US": "United States",
-      "UY": "Uruguay",
-      "UZ": "Uzbekistan",
-      "VA": "Holy See",
-      "VC": "Saint Vincent and the Grenadines",
-      "VE": "Venezuela",
-      "VG": "British Virgin Islands",
-      "VI": "U.S. Virgin Islands",
-      "VN": "Viet Nam",
-      "VU": "Vanuatu",
-      "WF": "Wallis and Futuna",
-      "WS": "Samoa",
-      "YE": "Yemen",
-      "YT": "Mayotte",
-      "XK": "Kosovo",
-      "ZA": "South Africa",
-      "ZM": "Zambia",
-      "ZW": "Zimbabwe",
-      "EU": "European Union"
-    },
-    "languages": {
-      "en-US": "English - US",
-      "fr": "French",
-      "nl": "Dutch",
-      "pt_BR": "Portuguese - Brazil"
-    }
-  },
-  "KnownHosts": {
-    "label": "Isäntä",
-    "add": "Lisää isäntä",
-    "toast": "Host successfully {mode, select, created {created} deleted {deleted} other {edited}}."
-  },
-  "InitializeContainer": {
-    "title": "TIESITKÖ",
-    "subtitle": "<1>Cockatricea pyörittävät vapaaehtoiset</1><1>jotka rakastavat korttipelejä!</1>"
-  },
-  "LoginContainer": {
-    "header": {
-      "title": "Kirjaudu sisään",
-      "subtitle": "Järjestelmäriippumaton virtuaalinen pöytä moninpelikorttipelejä varten."
-    },
-    "footer": {
-      "registerPrompt": "Etkö ole vielä rekisteröitynyt?",
-      "registerAction": "Luo tili",
-      "credit": "Cockatrice on avoimen lähdekoodin projekti",
-      "version": "Versio"
-    },
-    "content": {
-      "subtitle1": "Pelaa moninpelikorttipelejä verkossa.",
-      "subtitle2": "Järjestelmäriippumaton virtuaalinen pöytä moninpelikorttipelejä varten. Ikuisesti ilmainen."
-    },
-    "toasts": {
-      "passwordResetSuccessToast": "Salasanan Nollaus Onnistui",
-      "accountActivationSuccess": "Tilin Aktivointi Onnistui"
-    }
-  },
-  "UnsupportedContainer": {
-    "title": "Selainta ei tueta",
-    "subtitle1": "Päivitä selain ja/tai tarksita käyttöoikeudet.",
-    "subtitle2": "Huomautus: Yksityinen selaaminen saa jotkin selaimet poistamaan tietyt käyttöoikeudet tai ominaisuudet käytöstä."
-  },
-  "AccountActivationDialog": {
-    "title": "Tilin Aktivointi",
-    "subtitle1": "Your account has not been activated yet.",
-    "subtitle2": "You need to provide the activation token received in the activation email."
-  },
-  "KnownHostDialog": {
-    "title": "{mode, select, edit {Edit} other {Add}} Known Host",
-    "subtitle": "Uuden isännän lisääminen mahdollistaa yhdistämisen eri palvelimiin. Lisää alla olevat tiedot isäntäluetteloosi."
-  },
-  "RegistrationDialog": {
-    "title": "Luo Tili"
-  },
-  "RequestPasswordResetDialog": {
-    "title": "Request Password Reset"
-  },
-  "ResetPasswordDialog": {
-    "title": "Nollaa Salasana"
-  },
-  "AccountActivationForm": {
-    "error": {
-      "failed": "Tilin aktivointi epäonnistui"
-    },
-    "label": {
-      "activate": "Aktivoi Tili"
-    }
-  },
-  "KnownHostForm": {
-    "help": "Tarvitsetko apua isännän lisäämisessä?",
-    "label": {
-      "add": "Lisää Isäntä",
-      "find": "Etsi Isäntä"
-    }
-  },
-  "LoginForm": {
-    "label": {
-      "autoConnect": "Auto Connect",
-      "forgot": "Forgot Password",
-      "login": "Kirjaudu sisään",
-      "savePassword": "Save Password",
-      "savedPassword": "Saved Password"
-    }
-  },
-  "RegisterForm": {
-    "label": {
-      "register": "Register"
-    },
-    "toast": {
-      "registerSuccess": "Registration Successful!"
-    }
-  },
-  "RequestPasswordResetForm": {
-    "error": "Request password reset failed",
-    "mfaEnabled": "Server has multi-factor authentication enabled",
-    "request": "Request Reset Token",
-    "skipRequest": "I already have a reset token"
-  },
-  "ResetPasswordForm": {
-    "error": "Password reset failed",
-    "label": {
-      "reset": "Nollaa Salasana"
-    }
-  }
-}
\ No newline at end of file
diff --git a/webclient/public/locales/fr/translation.json b/webclient/public/locales/fr/translation.json
deleted file mode 100644
index aacd26d80..000000000
--- a/webclient/public/locales/fr/translation.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
-  "Common": {
-    "language": "Français (French)",
-    "disconnect": "Déconnecter",
-    "label": {
-      "confirmPassword": "Confirmer le mot de passe",
-      "confirmSure": "Êtes-vous sûr ?",
-      "country": "Pays",
-      "delete": "Effacer",
-      "email": "E-mail",
-      "hostName": "Nom d'hôte",
-      "hostAddress": "Adresse d'hôte",
-      "password": "Mot de passe",
-      "passwordAgain": "Mot de passe à nouveau",
-      "port": "Port",
-      "realName": "Nom réel",
-      "saveChanges": "Sauvegarder les changements",
-      "token": "Jeton",
-      "username": "Nom d'utilisateur"
-    },
-    "validation": {
-      "minChars": "Minimum de {count} {count, plural, one {caractère} other {caractères}} requis",
-      "passwordsMustMatch": "Les mots de passe ne correspondent pas.",
-      "required": "Requis"
-    },
-    "countries": {
-      "AD": "Andorre",
-      "AE": "Émirats arabes unis",
-      "AF": "Afghanistan",
-      "AG": "Antigua-et-Barbuda",
-      "AI": "Anguilla",
-      "AL": "Albanie",
-      "AM": "Arménie",
-      "AO": "Angola",
-      "AQ": "Antarctique",
-      "AR": "Argentine",
-      "AS": "Samoa américaines",
-      "AT": "Autriche",
-      "AU": "Australie",
-      "AW": "Aruba",
-      "AX": "Åland",
-      "AZ": "Azerbaijan",
-      "BA": "Bosnie-Herzégovine",
-      "BB": "Barbade",
-      "BD": "Bangladesh",
-      "BE": "Belgique",
-      "BF": "Burkina Faso",
-      "BG": "Bulgarie",
-      "BH": "Bahrain",
-      "BI": "Burundi",
-      "BJ": "Bénin",
-      "BL": "Saint Barthélemy",
-      "BM": "Bermudes",
-      "BN": "Brunéi Darussalam",
-      "BO": "Bolivie",
-      "BQ": "Pays-Bas caribéens",
-      "BR": "Brésil",
-      "BS": "Bahamas",
-      "BT": "Bhoutan",
-      "BV": "Île Bouvet",
-      "BW": "Botswana",
-      "BY": "Biélorussie",
-      "BZ": "Belize",
-      "CA": "Canada",
-      "CC": "Îles Cocos (Keeling)",
-      "CD": "République Démocratique du Congo",
-      "CF": "République Centrafricaine",
-      "CG": "République du Congo",
-      "CH": "Suisse",
-      "CI": "Côte d'Ivoire",
-      "CK": "Îles Cook",
-      "CL": "Chili",
-      "CM": "Cameroun",
-      "CN": "Chine",
-      "CO": "Colombie",
-      "CR": "Costa Rica",
-      "CU": "Cuba",
-      "CV": "Cap-Vert",
-      "CW": "Curaçao",
-      "CX": "Île Christmas",
-      "CY": "Chypre",
-      "CZ": "Tchéquie",
-      "DE": "Allemagne",
-      "DJ": "Djibouti",
-      "DK": "Danemark",
-      "DM": "Dominique",
-      "DO": "République dominicaine",
-      "DZ": "Algérie",
-      "EC": "Équateur",
-      "EE": "Estonie",
-      "EG": "Égypte",
-      "EH": "Sahara Occidental",
-      "ER": "Érythrée",
-      "ES": "Espagne",
-      "ET": "Éthiopie",
-      "FI": "Finlande",
-      "FJ": "Fidji",
-      "FK": "Îles Falkland",
-      "FM": "Micronésie",
-      "FO": "Îles Féroé",
-      "FR": "France",
-      "GA": "Gabon",
-      "GB": "Royaume-Uni",
-      "GD": "Grenade",
-      "GE": "Géorgie",
-      "GF": "Guyane Française",
-      "GG": "Guernsey",
-      "GH": "Ghana",
-      "GI": "Gibraltar",
-      "GL": "Groenland",
-      "GM": "Gambie",
-      "GN": "Guinée",
-      "GP": "Guadeloupe",
-      "GQ": "Guinée équatoriale",
-      "GR": "Grèce",
-      "GS": "Géorgie du Sud et les Îles Sandwich du Sud",
-      "GT": "Guatemala",
-      "GU": "Guam",
-      "GW": "Guinée-Bissau",
-      "GY": "Guyana",
-      "HK": "Hong Kong",
-      "HM": "Îles Heard et McDonald",
-      "HN": "Honduras",
-      "HR": "Croatie",
-      "HT": "Haïti",
-      "HU": "Hongrie",
-      "ID": "Indonésie",
-      "IE": "Irlande",
-      "IL": "Israël",
-      "IM": "Île de Man",
-      "IN": "Inde",
-      "IO": "Territoire britannique de l'océan Indien",
-      "IQ": "Irak",
-      "IR": "Iran",
-      "IS": "Islande",
-      "IT": "Italie",
-      "JE": "Jersey",
-      "JM": "Jamaïque",
-      "JO": "Jordanie",
-      "JP": "Japon",
-      "KE": "Kenya",
-      "KG": "Kirghizistan",
-      "KH": "Cambodge",
-      "KI": "Kiribati",
-      "KM": "Comores",
-      "KN": "Saint-Kitts-et-Nevis",
-      "KP": "République Populaire et Démocratique de Corée",
-      "KR": "Corée du Sud",
-      "KW": "Koweït",
-      "KY": "Îles Caïmans",
-      "KZ": "Kazakhstan",
-      "LA": "Laos",
-      "LB": "Liban",
-      "LC": "Sainte-Lucie",
-      "LI": "Liechtenstein",
-      "LK": "Sri Lanka",
-      "LR": "Liberia",
-      "LS": "Lesotho",
-      "LT": "Lituanie",
-      "LU": "Luxembourg",
-      "LV": "Lettonie",
-      "LY": "Lybie",
-      "MA": "Maroc",
-      "MC": "Monaco",
-      "MD": "Moldavie",
-      "ME": "Montenegro",
-      "MF": "Saint-Martin (Territoire Français)",
-      "MG": "Madagascar",
-      "MH": "Îles Marshall",
-      "MK": "Macédoine du Nord",
-      "ML": "Mali",
-      "MM": "Myanmar",
-      "MN": "Mongolie",
-      "MO": "Macao",
-      "MP": "Îles Mariannes du Nord",
-      "MQ": "Martinique",
-      "MR": "Mauritanie",
-      "MS": "Montserrat",
-      "MT": "Malte",
-      "MU": "Maurice",
-      "MV": "Maldives",
-      "MW": "Malawi",
-      "MX": "Mexique",
-      "MY": "Malaisie",
-      "MZ": "Mozambique",
-      "NA": "Namibie",
-      "NC": "Nouvelle Calédonie",
-      "NE": "Niger",
-      "NF": "Île Norfolk",
-      "NG": "Nigeria",
-      "NI": "Nicaragua",
-      "NL": "Pays-Bas",
-      "NO": "Norvège",
-      "NP": "Népal",
-      "NR": "Nauru",
-      "NU": "Niué",
-      "NZ": "Nouvelle-Zélande",
-      "OM": "Oman",
-      "PA": "Panama",
-      "PE": "Pérou",
-      "PF": "Polynésie Française",
-      "PG": "Papouasie-Nouvelle-Guinée",
-      "PH": "Philippines",
-      "PK": "Pakistan",
-      "PL": "Pologne",
-      "PM": "Saint Pierre et Miquelon",
-      "PN": "Îles Pitcairn",
-      "PR": "Porto Rico",
-      "PS": "Palestine",
-      "PT": "Portugal",
-      "PW": "Palaos",
-      "PY": "Paraguay",
-      "QA": "Qatar",
-      "RE": "La Réunion",
-      "RO": "Roumanie",
-      "RS": "Serbie",
-      "RU": "Russie",
-      "RW": "Rwanda",
-      "SA": "Arabie Saoudite",
-      "SB": "Îles Salomon",
-      "SC": "Seychelles",
-      "SD": "Soudan",
-      "SE": "Suède",
-      "SG": "Singapour",
-      "SH": "Sainte-Hélène",
-      "SI": "Slovénie",
-      "SJ": "Svalbard et Jan Mayen",
-      "SK": "Slovaquie",
-      "SL": "Sierra Leone",
-      "SM": "Saint-Marin",
-      "SN": "Sénégal",
-      "SO": "Somalie",
-      "SR": "Suriname",
-      "SS": "Soudan du Sud",
-      "ST": "Sao Tome et Principe",
-      "SV": "El Salvador",
-      "SX": "Sint Maarten (territoire des Pays-Bas)",
-      "SY": "Syrie",
-      "SZ": "Eswatini",
-      "TC": "Îles Turks et Caïques",
-      "TD": "Tchad",
-      "TF": "Terres australes et antarctiques françaises",
-      "TG": "Togo",
-      "TH": "Thailande",
-      "TJ": "Tajikistan",
-      "TK": "Tokelau",
-      "TL": "Timor-Leste",
-      "TM": "Turkmenistan",
-      "TN": "Tunisie",
-      "TO": "Tonga",
-      "TR": "Turquie",
-      "TT": "Trinité-et-Tobago",
-      "TV": "Tuvalu",
-      "TW": "Taïwan",
-      "TZ": "Tanzanie",
-      "UA": "Ukraine",
-      "UG": "Ouganda",
-      "UM": "Îles mineures éloignées des États-Unis",
-      "US": "États-Unis",
-      "UY": "Uruguay",
-      "UZ": "Ouzbekistan",
-      "VA": "Saint-Siège",
-      "VC": "Saint-Vincent et les Grenadines",
-      "VE": "Venezuela",
-      "VG": "Îles Vierges britanniques",
-      "VI": "Îles Vierges des États-Unis",
-      "VN": "Vietnam",
-      "VU": "Vanuatu",
-      "WF": "Wallis et Futuna",
-      "WS": "Samoa",
-      "YE": "Yemen",
-      "YT": "Mayotte",
-      "XK": "Kosovo",
-      "ZA": "Afrique du Sud",
-      "ZM": "Zambie",
-      "ZW": "Zimbabwe",
-      "EU": "Union Européenne"
-    },
-    "languages": {
-      "en-US": "Anglais - US",
-      "fr": "Français",
-      "nl": "Néerlandais",
-      "pt_BR": "Portugais - Brésil"
-    }
-  },
-  "KnownHosts": {
-    "label": "Hôte",
-    "add": "Ajouter un nouvel hôte",
-    "toast": "Hôte {mode, select, created {créé} deleted {effacé} other {édité}} avec succès."
-  },
-  "InitializeContainer": {
-    "title": "LE SAVIEZ-VOUS ?",
-    "subtitle": "<1>Cockatrice est géré par des volontaires</1><1>qui aiment les jeux de cartes !</1>"
-  },
-  "LoginContainer": {
-    "header": {
-      "title": "S'identifier",
-      "subtitle": "Un jeu de table virtuel multi-plate-forme pour jeux de cartes multijoueurs."
-    },
-    "footer": {
-      "registerPrompt": "Pas encore inscrit ?",
-      "registerAction": "Créer un compte",
-      "credit": "Cockatrice est un projet open source.",
-      "version": "Version"
-    },
-    "content": {
-      "subtitle1": "Jouer à des jeux de cartes multijoueurs en ligne.",
-      "subtitle2": "Jeu de table virtuel multi-plate-forme pour jeux de cartes multijoueurs. Gratuit pour toujours."
-    },
-    "toasts": {
-      "passwordResetSuccessToast": "Mot de passe réinitialisé avec succès",
-      "accountActivationSuccess": "Compte activé avec succès"
-    }
-  },
-  "UnsupportedContainer": {
-    "title": "Navigateur non supporté",
-    "subtitle1": "Veuillez mettre à jour votre navigateur et/ou vérifier vos permissions.",
-    "subtitle2": "Note : La navigation privée désactive certaines permissions ou fonctionnalités."
-  },
-  "AccountActivationDialog": {
-    "title": "Activation du compte",
-    "subtitle1": "Votre compte n'a pas encore été activé.",
-    "subtitle2": "Vous devez fournir le jeton d'activation reçu dans l'e-mail d'activation."
-  },
-  "KnownHostDialog": {
-    "title": "{mode, select, edit {Éditer} other {Ajouter}} un hôte connu",
-    "subtitle": "Ajouter un nouvel hôte vous permet de vous connecter à différents serveurs.  Entrez les détails ci-dessous dans votre liste d'hôtes."
-  },
-  "RegistrationDialog": {
-    "title": "Créer un nouveau compte"
-  },
-  "RequestPasswordResetDialog": {
-    "title": "Demander une réinitialisation du mot de passe"
-  },
-  "ResetPasswordDialog": {
-    "title": "Réinitialiser le mot de passe"
-  },
-  "AccountActivationForm": {
-    "error": {
-      "failed": "L'activation du compte a échoué."
-    },
-    "label": {
-      "activate": "Activer le compte"
-    }
-  },
-  "KnownHostForm": {
-    "help": "Besoin d'aide pour ajouter un nouvel hôte ?",
-    "label": {
-      "add": "Ajouter un hôte",
-      "find": "Trouver un hôte"
-    }
-  },
-  "LoginForm": {
-    "label": {
-      "autoConnect": "Connexion automatique",
-      "forgot": "Mot de passe oublié",
-      "login": "S'identifier",
-      "savePassword": "Enregistrer le mot de passe",
-      "savedPassword": "Mot de passe enregistré"
-    }
-  },
-  "RegisterForm": {
-    "label": {
-      "register": "S'enregistrer"
-    },
-    "toast": {
-      "registerSuccess": "Enregistrement réussi !"
-    }
-  },
-  "RequestPasswordResetForm": {
-    "error": "La demande de réinitialisation du mot de passe a échoué.",
-    "mfaEnabled": "L'authentification multifacteur est activée sur ce serveur.",
-    "request": "Réinitialiser jeton",
-    "skipRequest": "Je possède déjà un jeton de réinitialisation."
-  },
-  "ResetPasswordForm": {
-    "error": "La réinitialisation du mot de passe a échoué.",
-    "label": {
-      "reset": "Réinitialiser le mot de passe"
-    }
-  }
-}
\ No newline at end of file
diff --git a/webclient/public/locales/it/translation.json b/webclient/public/locales/it/translation.json
deleted file mode 100644
index 74734384b..000000000
--- a/webclient/public/locales/it/translation.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
-  "Common": {
-    "language": "Italiano (Italian)",
-    "disconnect": "Disconnetti",
-    "label": {
-      "confirmPassword": "Conferma Password",
-      "confirmSure": "Sei sicuro?",
-      "country": "Stato",
-      "delete": "Elimina",
-      "email": "Email",
-      "hostName": "Nome Host",
-      "hostAddress": "Indirizzo Host",
-      "password": "Password",
-      "passwordAgain": "Ripeti Password",
-      "port": "Porta",
-      "realName": "Nome reale",
-      "saveChanges": "Salva Cambiamenti",
-      "token": "Pedina",
-      "username": "Nome utente"
-    },
-    "validation": {
-      "minChars": "Minimo di {%n} carattere(i) richiesti",
-      "passwordsMustMatch": "Le password non coincidono.",
-      "required": "Richiesto"
-    },
-    "countries": {
-      "AD": "Andorra",
-      "AE": "Emirati Arabi Uniti",
-      "AF": "Afghanistan",
-      "AG": "Antigua e Barbuda",
-      "AI": "Anguilla",
-      "AL": "Albania",
-      "AM": "Armenia",
-      "AO": "Angola",
-      "AQ": "Antartide",
-      "AR": "Argentina",
-      "AS": "Samoa Americane",
-      "AT": "Austria",
-      "AU": "Australia",
-      "AW": "Aruba",
-      "AX": "Isole Åland",
-      "AZ": "Azerbaijan",
-      "BA": "Bosnia ed Erzegovina",
-      "BB": "Barbados",
-      "BD": "Bangledesh",
-      "BE": "Belgio",
-      "BF": "Burkina Faso",
-      "BG": "Bulgaria",
-      "BH": "Bahrein",
-      "BI": "Burundi",
-      "BJ": "Benin",
-      "BL": "Saint Barthélemy",
-      "BM": "Bermuda",
-      "BN": "Brunei",
-      "BO": "Bolivia",
-      "BQ": "Paesi Bassi Caraibici",
-      "BR": "Brasile",
-      "BS": "Bahamas",
-      "BT": "Bhutan",
-      "BV": "Isola Bouvet",
-      "BW": "Botswana",
-      "BY": "Bielorussia",
-      "BZ": "Belize",
-      "CA": "Canada",
-      "CC": "Isole Cocos (Keeling)",
-      "CD": "DR Congo",
-      "CF": "Repubblica Centrafricana",
-      "CG": "Repubblica del Congo",
-      "CH": "Svizzera",
-      "CI": "Costa D'Avorio",
-      "CK": "Isole Cook",
-      "CL": "Cile",
-      "CM": "Camerun",
-      "CN": "Cina",
-      "CO": "Colombia",
-      "CR": "Costa Rica",
-      "CU": "Cuba",
-      "CV": "Capo Verde",
-      "CW": "Curaçao",
-      "CX": "Isola Christmas",
-      "CY": "Cipro",
-      "CZ": "Repubblica Ceca",
-      "DE": "Germania",
-      "DJ": "Gibuti",
-      "DK": "Danimarca",
-      "DM": "Dominica",
-      "DO": "Repubblica Domenicana",
-      "DZ": "Algeria",
-      "EC": "Ecuador",
-      "EE": "Estonia",
-      "EG": "Egitto",
-      "EH": "Sahara Occidentale",
-      "ER": "Eritrea",
-      "ES": "Spagna",
-      "ET": "Etiopia",
-      "FI": "Finlandia",
-      "FJ": "Fiji",
-      "FK": "Isole Falkland",
-      "FM": "Micronesia",
-      "FO": "Isole Faroe",
-      "FR": "Francia",
-      "GA": "Gabon",
-      "GB": "Regno Unito",
-      "GD": "Grenada",
-      "GE": "Georgia",
-      "GF": "Guyana Francese",
-      "GG": "Guernsey",
-      "GH": "Ghana",
-      "GI": "Gibraltar",
-      "GL": "Groenlandia",
-      "GM": "Gambia",
-      "GN": "Guinea",
-      "GP": "Guadalupa",
-      "GQ": "Guinea Equatoriale",
-      "GR": "Grecia",
-      "GS": "Georgia del Sud e Isole Sandwich Australi",
-      "GT": "Guatemala",
-      "GU": "Guam",
-      "GW": "Guinea-Bissau",
-      "GY": "Guyana",
-      "HK": "Hong Kong",
-      "HM": "Isole Heard e McDonald",
-      "HN": "Honduras",
-      "HR": "Croazia",
-      "HT": "Haiti",
-      "HU": "Ungheria",
-      "ID": "Indonesia",
-      "IE": "Irlanda",
-      "IL": "Israele",
-      "IM": "Isola di Man",
-      "IN": "India",
-      "IO": "Territorio britannico dell'Oceano Indiano",
-      "IQ": "Iraq",
-      "IR": "Iran",
-      "IS": "Islanda",
-      "IT": "Italia",
-      "JE": "Jersey",
-      "JM": "Jamaica",
-      "JO": "Giordania",
-      "JP": "Giappone",
-      "KE": "Kenya",
-      "KG": "Kirghizistan",
-      "KH": "Cambogia",
-      "KI": "Kiribati",
-      "KM": "Comore",
-      "KN": "Saint Kitts e Nevis",
-      "KP": "Korea del Nord",
-      "KR": "Korea del Sud",
-      "KW": "Kuwait",
-      "KY": "Isole Cayman",
-      "KZ": "Kazakhstan",
-      "LA": "Laos",
-      "LB": "Lebano",
-      "LC": "Santa Lucia",
-      "LI": "Liechtenstein",
-      "LK": "Sri Lanka",
-      "LR": "Liberia",
-      "LS": "Lesotho",
-      "LT": "Lituania",
-      "LU": "Lussemburgo",
-      "LV": "Lettonia",
-      "LY": "Libia",
-      "MA": "Marocco",
-      "MC": "Monaco",
-      "MD": "Moldova",
-      "ME": "Montenegro",
-      "MF": "San Martino (parte Francese)",
-      "MG": "Madagascar",
-      "MH": "Isole Marshall",
-      "MK": "Macedonia del Nord",
-      "ML": "Mali",
-      "MM": "Birmania",
-      "MN": "Mongolia",
-      "MO": "Macao",
-      "MP": "Isole Marianne Settentrionali",
-      "MQ": "Martinica",
-      "MR": "Mauritania",
-      "MS": "Montserrat",
-      "MT": "Malta",
-      "MU": "Mauritius",
-      "MV": "Maldive",
-      "MW": "Malawi",
-      "MX": "Messico",
-      "MY": "Malesia",
-      "MZ": "Mozambico",
-      "NA": "Namibia",
-      "NC": "Nuova Caledonia",
-      "NE": "Niger",
-      "NF": "Isola Norfolk",
-      "NG": "Nigeria",
-      "NI": "Nicaragua",
-      "NL": "Paesi Bassi",
-      "NO": "Norvegia",
-      "NP": "Nepal",
-      "NR": "Nauru",
-      "NU": "Niue",
-      "NZ": "Nuova Zelanda",
-      "OM": "Oman",
-      "PA": "Panama",
-      "PE": "Peru",
-      "PF": "Polinesia Francese",
-      "PG": "Papua Nuova Guinea",
-      "PH": "Filippine",
-      "PK": "Pakistan",
-      "PL": "Polonia",
-      "PM": "Saint Pierre e Miquelon",
-      "PN": "Pitcairn",
-      "PR": "Porto Rico",
-      "PS": "Palestina",
-      "PT": "Portogallo",
-      "PW": "Palau",
-      "PY": "Paraguay",
-      "QA": "Qatar",
-      "RE": "La Riunione",
-      "RO": "Romania",
-      "RS": "Serbia",
-      "RU": "Russia",
-      "RW": "Rwanda",
-      "SA": "Arabia Saudita",
-      "SB": "Isole Salomone",
-      "SC": "Seychelles",
-      "SD": "Sudan",
-      "SE": "Svezia",
-      "SG": "Singapore",
-      "SH": "Sant'Elena, Ascensione e Tristan da Cunha",
-      "SI": "Slovenia",
-      "SJ": "Svalbard e Jan Mayen",
-      "SK": "Slovakia",
-      "SL": "Sierra Leone",
-      "SM": "San Marino",
-      "SN": "Senegal",
-      "SO": "Somalia",
-      "SR": "Suriname",
-      "SS": "Sud Sudan",
-      "ST": "Sao Tome e Principe",
-      "SV": "El Salvador",
-      "SX": "Sint Maarten (Parte Olandese)",
-      "SY": "Siria",
-      "SZ": "eSwatini",
-      "TC": "Turks e Caicos",
-      "TD": "Chad",
-      "TF": "TAAF",
-      "TG": "Togo",
-      "TH": "Thailand",
-      "TJ": "Tajikistan",
-      "TK": "Tokelau",
-      "TL": "Timor Est",
-      "TM": "Turkmenistan",
-      "TN": "Tunisia",
-      "TO": "Tonga",
-      "TR": "Turchia",
-      "TT": "Trinidad e Tobago",
-      "TV": "Tuvalu",
-      "TW": "Taiwan",
-      "TZ": "Tanzania",
-      "UA": "Ucraina",
-      "UG": "Uganda",
-      "UM": "Isole minori esterne degli Stati Uniti d'America",
-      "US": "Stati Uniti",
-      "UY": "Uruguay",
-      "UZ": "Uzbekistan",
-      "VA": "Vaticano",
-      "VC": "Saint Vincent e Grenadine",
-      "VE": "Venezuela",
-      "VG": "Isole Vergini britanniche",
-      "VI": "Isole Vergini americane",
-      "VN": "Viet Nam",
-      "VU": "Vanuatu",
-      "WF": "Wallis e Futuna",
-      "WS": "Samoa",
-      "YE": "Yemen",
-      "YT": "Mayotte",
-      "XK": "Kosovo",
-      "ZA": "Sud Africa",
-      "ZM": "Zambia",
-      "ZW": "Zimbabwe",
-      "EU": "Unione Europea"
-    },
-    "languages": {
-      "en-US": "Inglese - US",
-      "fr": "Francese",
-      "nl": "Olandese",
-      "pt_BR": "Portoghese - Brasile"
-    }
-  },
-  "KnownHosts": {
-    "label": "Host",
-    "add": "Aggiungi nuovo Host",
-    "toast": "Host {mode, select, created {creato} deleted {eliminato} other {modificato}} con successo."
-  },
-  "InitializeContainer": {
-    "title": "LO SAPEVI",
-    "subtitle": "<1>Cockatrice è gestita da volontari</1><1>che amano i giochi di carte!</1>"
-  },
-  "LoginContainer": {
-    "header": {
-      "title": "Accesso",
-      "subtitle": "Un portale digitale multi-piattaforma per giochi di carte multigiocatore"
-    },
-    "footer": {
-      "registerPrompt": "Non sei ancora registrato?",
-      "registerAction": "Crea un nuovo account",
-      "credit": "Cockatrice è un progetto open source",
-      "version": "Versione"
-    },
-    "content": {
-      "subtitle1": "Gioca online giochi di carte multigiocatore.",
-      "subtitle2": "Portale digitale multi-piattaforma per giochi di carte multigiocatore. Sempre gratis."
-    },
-    "toasts": {
-      "passwordResetSuccessToast": "Password reimpostata con successo",
-      "accountActivationSuccess": "Account attivato con successo"
-    }
-  },
-  "UnsupportedContainer": {
-    "title": "Browser non supportato",
-    "subtitle1": "Aggiornare il browser e/o controllare i permessi.",
-    "subtitle2": "Nota: la navigazione Privata può far si che il browser disabiliti certi permessi o funzionalità."
-  },
-  "AccountActivationDialog": {
-    "title": "Attivazione dell'account",
-    "subtitle1": "Il tuo account non è ancora stato attivato.",
-    "subtitle2": "È necessario fornire il codice ricevuto nell'e-mail di attivazione."
-  },
-  "KnownHostDialog": {
-    "title": "{modalità, seleziona, modifica {Modifica} altro {Aggiungi}} Host conosciuto",
-    "subtitle": "L'aggiunta di un nuovo host consente di connettersi a server diversi. Inserisci i dettagli di seguito nella lista degli host."
-  },
-  "RegistrationDialog": {
-    "title": "Crea un nuovo account"
-  },
-  "RequestPasswordResetDialog": {
-    "title": "Richiedi la reimpostazione della password"
-  },
-  "ResetPasswordDialog": {
-    "title": "Reimposta Password"
-  },
-  "AccountActivationForm": {
-    "error": {
-      "failed": "Attivazione dell'account non riuscita"
-    },
-    "label": {
-      "activate": "Attiva account"
-    }
-  },
-  "KnownHostForm": {
-    "help": "Hai bisogno di aiuto per aggiungere un nuovo host?",
-    "label": {
-      "add": "Aggiungi Host",
-      "find": "Trova Host"
-    }
-  },
-  "LoginForm": {
-    "label": {
-      "autoConnect": "Connessione automatica",
-      "forgot": "Password dimenticata",
-      "login": "Accesso",
-      "savePassword": "Salva Password",
-      "savedPassword": "Password salvata"
-    }
-  },
-  "RegisterForm": {
-    "label": {
-      "register": "Iscriviti"
-    },
-    "toast": {
-      "registerSuccess": "Iscrizione completata correttamente!"
-    }
-  },
-  "RequestPasswordResetForm": {
-    "error": "Richiesta reimpostazione password non riuscita",
-    "mfaEnabled": "Il server ha l'autenticazione a più fattori abilitata",
-    "request": "Richiedi il token di ripristino",
-    "skipRequest": "Ho già un token di ripristino"
-  },
-  "ResetPasswordForm": {
-    "error": "Reimpostazione della password non riuscita",
-    "label": {
-      "reset": "Reimposta Password"
-    }
-  }
-}
\ No newline at end of file
diff --git a/webclient/public/locales/nl/translation.json b/webclient/public/locales/nl/translation.json
deleted file mode 100644
index fffb18989..000000000
--- a/webclient/public/locales/nl/translation.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
-  "Common": {
-    "language": "Nederlands (Dutch)",
-    "disconnect": "Verbinding Verbreken",
-    "label": {
-      "confirmPassword": "Wachtwoord Bevestigen",
-      "confirmSure": "Weet je het zeker?",
-      "country": "Land",
-      "delete": "Verwijderen",
-      "email": "Email",
-      "hostName": "Hostnaam",
-      "hostAddress": "Hostaddres",
-      "password": "Wachtwoord",
-      "passwordAgain": "Wachtwoord Nogmaals",
-      "port": "Poort",
-      "realName": "Echte Naam",
-      "saveChanges": "Wijzigingen Opslaan",
-      "token": "Token",
-      "username": "Gebruikersnaam"
-    },
-    "validation": {
-      "minChars": "Minimum van {count} {count, plural, one {karakter} other {karakters}} verplicht",
-      "passwordsMustMatch": "Wachtwoorden komen niet overeen",
-      "required": "Verplicht"
-    },
-    "countries": {
-      "AD": "Andorra",
-      "AE": "United Arab Emirates",
-      "AF": "Afghanistan",
-      "AG": "Antigua and Barbuda",
-      "AI": "Anguilla",
-      "AL": "Albania",
-      "AM": "Armenia",
-      "AO": "Angola",
-      "AQ": "Antarctica",
-      "AR": "Argentina",
-      "AS": "American Samoa",
-      "AT": "Austria",
-      "AU": "Australia",
-      "AW": "Aruba",
-      "AX": "Åland Islands",
-      "AZ": "Azerbaijan",
-      "BA": "Bosnia and Herzegovina",
-      "BB": "Barbados",
-      "BD": "Bangladesh",
-      "BE": "Belgium",
-      "BF": "Burkina Faso",
-      "BG": "Bulgaria",
-      "BH": "Bahrain",
-      "BI": "Burundi",
-      "BJ": "Benin",
-      "BL": "Saint Barthélemy",
-      "BM": "Bermuda",
-      "BN": "Brunei Darussalam",
-      "BO": "Bolivia",
-      "BQ": "Bonaire, Sint Eustatius and Saba",
-      "BR": "Brazil",
-      "BS": "Bahamas",
-      "BT": "Bhutan",
-      "BV": "Bouvet Island",
-      "BW": "Botswana",
-      "BY": "Belarus",
-      "BZ": "Belize",
-      "CA": "Canada",
-      "CC": "Cocos (Keeling) Islands",
-      "CD": "DR Congo",
-      "CF": "Central African Republic",
-      "CG": "Republic of the Congo",
-      "CH": "Switzerland",
-      "CI": "Ivory Coast",
-      "CK": "Cook Islands",
-      "CL": "Chile",
-      "CM": "Cameroon",
-      "CN": "China",
-      "CO": "Colombia",
-      "CR": "Costa Rica",
-      "CU": "Cuba",
-      "CV": "Cape Verde",
-      "CW": "Curaçao",
-      "CX": "Christmas Island",
-      "CY": "Cyprus",
-      "CZ": "Czechia",
-      "DE": "Germany",
-      "DJ": "Djibouti",
-      "DK": "Denmark",
-      "DM": "Dominica",
-      "DO": "Dominican Republic",
-      "DZ": "Algeria",
-      "EC": "Ecuador",
-      "EE": "Estonia",
-      "EG": "Egypt",
-      "EH": "Western Sahara",
-      "ER": "Eritrea",
-      "ES": "Spain",
-      "ET": "Ethiopia",
-      "FI": "Finland",
-      "FJ": "Fiji",
-      "FK": "Falkland Islands",
-      "FM": "Micronesia",
-      "FO": "Faroe Islands",
-      "FR": "France",
-      "GA": "Gabon",
-      "GB": "United Kingdom",
-      "GD": "Grenada",
-      "GE": "Georgia",
-      "GF": "French Guiana",
-      "GG": "Guernsey",
-      "GH": "Ghana",
-      "GI": "Gibraltar",
-      "GL": "Greenland",
-      "GM": "Gambia",
-      "GN": "Guinea",
-      "GP": "Guadeloupe",
-      "GQ": "Equatorial Guinea",
-      "GR": "Greece",
-      "GS": "South Georgia and the South Sandwich Islands",
-      "GT": "Guatemala",
-      "GU": "Guam",
-      "GW": "Guinea-Bissau",
-      "GY": "Guyana",
-      "HK": "Hong Kong",
-      "HM": "Heard Island and McDonald Islands",
-      "HN": "Honduras",
-      "HR": "Croatia",
-      "HT": "Haiti",
-      "HU": "Hungary",
-      "ID": "Indonesia",
-      "IE": "Ireland",
-      "IL": "Israel",
-      "IM": "Isle of Man",
-      "IN": "India",
-      "IO": "British Indian Ocean Territory",
-      "IQ": "Iraq",
-      "IR": "Iran",
-      "IS": "Iceland",
-      "IT": "Italy",
-      "JE": "Jersey",
-      "JM": "Jamaica",
-      "JO": "Jordan",
-      "JP": "Japan",
-      "KE": "Kenya",
-      "KG": "Kyrgyzstan",
-      "KH": "Cambodia",
-      "KI": "Kiribati",
-      "KM": "Comoros",
-      "KN": "Saint Kitts and Nevis",
-      "KP": "North Korea",
-      "KR": "South Korea",
-      "KW": "Kuwait",
-      "KY": "Cayman Islands",
-      "KZ": "Kazakhstan",
-      "LA": "Laos",
-      "LB": "Lebanon",
-      "LC": "Saint Lucia",
-      "LI": "Liechtenstein",
-      "LK": "Sri Lanka",
-      "LR": "Liberia",
-      "LS": "Lesotho",
-      "LT": "Lithuania",
-      "LU": "Luxembourg",
-      "LV": "Latvia",
-      "LY": "Libya",
-      "MA": "Morocco",
-      "MC": "Monaco",
-      "MD": "Moldova",
-      "ME": "Montenegro",
-      "MF": "Saint Martin (French part)",
-      "MG": "Madagascar",
-      "MH": "Marshall Islands",
-      "MK": "North Macedonia",
-      "ML": "Mali",
-      "MM": "Myanmar",
-      "MN": "Mongolia",
-      "MO": "Macao",
-      "MP": "Northern Mariana Islands",
-      "MQ": "Martinique",
-      "MR": "Mauritania",
-      "MS": "Montserrat",
-      "MT": "Malta",
-      "MU": "Mauritius",
-      "MV": "Maldives",
-      "MW": "Malawi",
-      "MX": "Mexico",
-      "MY": "Malaysia",
-      "MZ": "Mozambique",
-      "NA": "Namibia",
-      "NC": "New Caledonia",
-      "NE": "Niger",
-      "NF": "Norfolk Island",
-      "NG": "Nigeria",
-      "NI": "Nicaragua",
-      "NL": "Netherlands",
-      "NO": "Norway",
-      "NP": "Nepal",
-      "NR": "Nauru",
-      "NU": "Niue",
-      "NZ": "New Zealand",
-      "OM": "Oman",
-      "PA": "Panama",
-      "PE": "Peru",
-      "PF": "French Polynesia",
-      "PG": "Papua New Guinea",
-      "PH": "Philippines",
-      "PK": "Pakistan",
-      "PL": "Poland",
-      "PM": "Saint Pierre and Miquelon",
-      "PN": "Pitcairn",
-      "PR": "Puerto Rico",
-      "PS": "Palestine",
-      "PT": "Portugal",
-      "PW": "Palau",
-      "PY": "Paraguay",
-      "QA": "Qatar",
-      "RE": "Réunion",
-      "RO": "Romania",
-      "RS": "Serbia",
-      "RU": "Russia",
-      "RW": "Rwanda",
-      "SA": "Saudi Arabia",
-      "SB": "Solomon Islands",
-      "SC": "Seychelles",
-      "SD": "Sudan",
-      "SE": "Sweden",
-      "SG": "Singapore",
-      "SH": "Saint Helena, Ascension and Tristan da Cunha",
-      "SI": "Slovenia",
-      "SJ": "Svalbard and Jan Mayen",
-      "SK": "Slovakia",
-      "SL": "Sierra Leone",
-      "SM": "San Marino",
-      "SN": "Senegal",
-      "SO": "Somalia",
-      "SR": "Suriname",
-      "SS": "South Sudan",
-      "ST": "Sao Tome and Principe",
-      "SV": "El Salvador",
-      "SX": "Sint Maarten (Dutch part)",
-      "SY": "Syria",
-      "SZ": "Eswatini",
-      "TC": "Turks and Caicos Islands",
-      "TD": "Chad",
-      "TF": "TAAF",
-      "TG": "Togo",
-      "TH": "Thailand",
-      "TJ": "Tajikistan",
-      "TK": "Tokelau",
-      "TL": "Timor-Leste",
-      "TM": "Turkmenistan",
-      "TN": "Tunisia",
-      "TO": "Tonga",
-      "TR": "Turkey",
-      "TT": "Trinidad and Tobago",
-      "TV": "Tuvalu",
-      "TW": "Taiwan",
-      "TZ": "Tanzania",
-      "UA": "Ukraine",
-      "UG": "Uganda",
-      "UM": "United States Minor Outlying Islands",
-      "US": "United States",
-      "UY": "Uruguay",
-      "UZ": "Uzbekistan",
-      "VA": "Holy See",
-      "VC": "Saint Vincent and the Grenadines",
-      "VE": "Venezuela",
-      "VG": "British Virgin Islands",
-      "VI": "U.S. Virgin Islands",
-      "VN": "Viet Nam",
-      "VU": "Vanuatu",
-      "WF": "Wallis and Futuna",
-      "WS": "Samoa",
-      "YE": "Yemen",
-      "YT": "Mayotte",
-      "XK": "Kosovo",
-      "ZA": "South Africa",
-      "ZM": "Zambia",
-      "ZW": "Zimbabwe",
-      "EU": "European Union"
-    },
-    "languages": {
-      "en-US": "English - US",
-      "fr": "French",
-      "nl": "Dutch",
-      "pt_BR": "Portuguese - Brazil"
-    }
-  },
-  "KnownHosts": {
-    "label": "Host",
-    "add": "Voeg nieuwe host toe",
-    "toast": "Host {mode, select created {toegevoegd} deleted {verwijderd} other {aangepast}}."
-  },
-  "InitializeContainer": {
-    "title": "WIST JE DAT",
-    "subtitle": "<1>Cockatrice word gerund door vrijwilligers</1><1>die van kaartspellen houden!</1>"
-  },
-  "LoginContainer": {
-    "header": {
-      "title": "Login",
-      "subtitle": "Een cross-platform virtual tabletop voor multiplayer kaartspellen."
-    },
-    "footer": {
-      "registerPrompt": "Nog niet geregistreerd?",
-      "registerAction": "Maak een account aan",
-      "credit": "Cockatrice is een open source project",
-      "version": "Versie"
-    },
-    "content": {
-      "subtitle1": "Speel multiplayer kaartspellen online.",
-      "subtitle2": "Cross-platform virtual tabletop voor multiplayer kaartspellen. Gratis en open source."
-    },
-    "toasts": {
-      "passwordResetSuccessToast": "Wachtwoord Opnieuw Ingesteld",
-      "accountActivationSuccess": "Account Succesvol Geactiveerd"
-    }
-  },
-  "UnsupportedContainer": {
-    "title": "Niet-ondersteunde Browser",
-    "subtitle1": "Update je browser en/of check je instellingen.",
-    "subtitle2": "Let op: Private browsing zorgt er voor dat sommige browsers bepaalde toestemmingen of functies uitschakelen."
-  },
-  "AccountActivationDialog": {
-    "title": "Account Activatie",
-    "subtitle1": "Je account is nog niet geactiveerd.",
-    "subtitle2": "Vul de activerings-token die je hebt ontvangen via de activerings-email in."
-  },
-  "KnownHostDialog": {
-    "title": "{mode, select, edit {Aanpassen} other {Toevoegen}} Bekende Host",
-    "subtitle": "Door een nieuwe host toe te voegen kun je verbinden met andere servers. Vul hieronder de gegevens in."
-  },
-  "RegistrationDialog": {
-    "title": "Maak Een Account Aan"
-  },
-  "RequestPasswordResetDialog": {
-    "title": "Opniew Wachtwoord Aanvragen"
-  },
-  "ResetPasswordDialog": {
-    "title": "Vraag Wachtwoord Opnieuw Aan"
-  },
-  "AccountActivationForm": {
-    "error": {
-      "failed": "Activering account mislukt"
-    },
-    "label": {
-      "activate": "Activeer Account"
-    }
-  },
-  "KnownHostForm": {
-    "help": "Hulp nodig met het toevoegen van een nieuwe host?",
-    "label": {
-      "add": "Voeg Host Toe",
-      "find": "Vind Host"
-    }
-  },
-  "LoginForm": {
-    "label": {
-      "autoConnect": "Verbind Automatisch",
-      "forgot": "Wachtwoord Vergeten",
-      "login": "Log in",
-      "savePassword": "Wachtwoord Opslaan",
-      "savedPassword": "Opgeslagen Wachtwoord"
-    }
-  },
-  "RegisterForm": {
-    "label": {
-      "register": "Registreer"
-    },
-    "toast": {
-      "registerSuccess": "Registratie Geslaagd!"
-    }
-  },
-  "RequestPasswordResetForm": {
-    "error": "Opniew wachtwoord aanvragen mislukt",
-    "mfaEnabled": "Server heeft multi-factor authenticatie ingeschakeld",
-    "request": "Vraag Reset Token Aan",
-    "skipRequest": "Ik heb al een reset token"
-  },
-  "ResetPasswordForm": {
-    "error": "Opnieuw wachtwoord aanvragen mislukt",
-    "label": {
-      "reset": "Vraag Wachtwoord Opnieuw Aan"
-    }
-  }
-}
\ No newline at end of file
diff --git a/webclient/public/locales/pl/translation.json b/webclient/public/locales/pl/translation.json
deleted file mode 100644
index abe400792..000000000
--- a/webclient/public/locales/pl/translation.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
-  "Common": {
-    "language": "Polski (Polish)",
-    "disconnect": "Rozłącz",
-    "label": {
-      "confirmPassword": "Potwierdź Hasło",
-      "confirmSure": "Czy na pewno?",
-      "country": "Kraj",
-      "delete": "Usuń",
-      "email": "Email",
-      "hostName": "Nazwa Hosta",
-      "hostAddress": "Adres Hosta",
-      "password": "Hasło",
-      "passwordAgain": "Hasło Ponownie:",
-      "port": "Port",
-      "realName": "Prawdziwe Imię",
-      "saveChanges": "Zapisz zmiany",
-      "token": "Token",
-      "username": "Nazwa użytkownika"
-    },
-    "validation": {
-      "minChars": "Minimum of {count} {count, plural, one {character} other {characters}} required",
-      "passwordsMustMatch": "Hasła nie są zgodne.",
-      "required": "Wymagane"
-    },
-    "countries": {
-      "AD": "Andora",
-      "AE": "Zjednoczone Emiraty Arabskie",
-      "AF": "Afganistan",
-      "AG": "Antigua i Barbuda",
-      "AI": "Anguilla",
-      "AL": "Albania",
-      "AM": "Armenia",
-      "AO": "Angola",
-      "AQ": "Antarktyka",
-      "AR": "Argentyna",
-      "AS": "Samoa Amerykańskie",
-      "AT": "Austria",
-      "AU": "Australia",
-      "AW": "Aruba",
-      "AX": "Wyspy Alandzkie",
-      "AZ": "Azerbejdżan",
-      "BA": "Bośnia i Hercegowina",
-      "BB": "Barbados",
-      "BD": "Bangladesz",
-      "BE": "Belgia",
-      "BF": "Burkina Faso",
-      "BG": "Bułgaria",
-      "BH": "Bahrajn",
-      "BI": "Burundi",
-      "BJ": "Benin",
-      "BL": "Saint-Barthélemy",
-      "BM": "Bermudy",
-      "BN": "Brunei",
-      "BO": "Boliwia",
-      "BQ": "Bonaire, Sint Eustatius i Saba",
-      "BR": "Brazylia",
-      "BS": "Bahamy",
-      "BT": "Bhutan",
-      "BV": "Wyspa Bouveta",
-      "BW": "Botwsana",
-      "BY": "Białoruś",
-      "BZ": "Belize",
-      "CA": "Kanada",
-      "CC": "Wyspy Kokosowe",
-      "CD": "Demokratyczna Republika Kongo",
-      "CF": "Republika Środkowoafrykańska",
-      "CG": "Kongo",
-      "CH": "Szwajcaria",
-      "CI": "Wybrzeże Kości Słoniowej",
-      "CK": "Wyspa Cooka",
-      "CL": "Chile",
-      "CM": "Kamerun",
-      "CN": "Chiny",
-      "CO": "Kolumbia",
-      "CR": "Kostaryka",
-      "CU": "Kuba",
-      "CV": "Republika Zielonego Przylądka",
-      "CW": "Curaçao",
-      "CX": "Wyspa Bożego Narodzenia",
-      "CY": "Cypr",
-      "CZ": "Czechy",
-      "DE": "Niemcy",
-      "DJ": "Dżibuti",
-      "DK": "Dania",
-      "DM": "Dominika",
-      "DO": "Dominikana",
-      "DZ": "Algieria",
-      "EC": "Ekwador",
-      "EE": "Estonia",
-      "EG": "Egipt",
-      "EH": "Sahara Zachodnia",
-      "ER": "Erytrea",
-      "ES": "Hiszpania",
-      "ET": "Etiopia",
-      "FI": "Finlandia",
-      "FJ": "Fidżi",
-      "FK": "Falklandy",
-      "FM": "Mikronezja",
-      "FO": "Wyspy Owcze",
-      "FR": "Francja",
-      "GA": "Gabon",
-      "GB": "Wielka Brytania",
-      "GD": "Grenada",
-      "GE": "Gruzja",
-      "GF": "Gujana Francuska",
-      "GG": "Guernsey",
-      "GH": "Ghana",
-      "GI": "Gibraltar",
-      "GL": "Grenlandia",
-      "GM": "Gambia",
-      "GN": "Gwinea",
-      "GP": "Gwadelupa",
-      "GQ": "Gwinea Równikowa",
-      "GR": "Grecja",
-      "GS": "Georgia Południowa i Sandwich Południowy",
-      "GT": "Gwatemala",
-      "GU": "Guam",
-      "GW": "Gwinea Bissau",
-      "GY": "Gujana",
-      "HK": "Hongkong",
-      "HM": "Wyspy Heard i McDonalda",
-      "HN": "Honduras",
-      "HR": "Chorwacja",
-      "HT": "Haiti",
-      "HU": "Węgry",
-      "ID": "Indonezja",
-      "IE": "Irlandia",
-      "IL": "Israel",
-      "IM": "Wyspa Man",
-      "IN": "Indie",
-      "IO": "Brytyjskie Terytorium Oceanu Indyjskiego",
-      "IQ": "Irak",
-      "IR": "Iran",
-      "IS": "Islandia",
-      "IT": "Włochy",
-      "JE": "Jersey",
-      "JM": "Jamajka",
-      "JO": "Jordania",
-      "JP": "Japonia",
-      "KE": "Kenia",
-      "KG": "Kirgistan",
-      "KH": "Kambodża",
-      "KI": "Kiribati",
-      "KM": "Komory",
-      "KN": "Saint Kitts i Nevis",
-      "KP": "Korea Północna",
-      "KR": "Korea Południowa",
-      "KW": "Kuwejt",
-      "KY": "Kajmany",
-      "KZ": "Kazachstan",
-      "LA": "Laos",
-      "LB": "Liban",
-      "LC": "Saint Lucia",
-      "LI": "Liechtenstein",
-      "LK": "Sri Lanka",
-      "LR": "Liberia",
-      "LS": "Lesotho",
-      "LT": "Litwa",
-      "LU": "Luksemburg",
-      "LV": "Łotwa",
-      "LY": "Libia",
-      "MA": "Maroko",
-      "MC": "Monako",
-      "MD": "Mołdawia",
-      "ME": "Czarnogóra",
-      "MF": "Saint-Martin",
-      "MG": "Madagaskar",
-      "MH": "Wyspy Marshalla",
-      "MK": "Macedonia Północna",
-      "ML": "Mali",
-      "MM": "Mjanma",
-      "MN": "Mongolia",
-      "MO": "Makau",
-      "MP": "Mariany Północne",
-      "MQ": "Martynika",
-      "MR": "Mauretania",
-      "MS": "Montserrat",
-      "MT": "Malta",
-      "MU": "Mauritius",
-      "MV": "Malediwy",
-      "MW": "Malawi",
-      "MX": "Meksyk",
-      "MY": "Malezja",
-      "MZ": "Mozambik",
-      "NA": "Namibia",
-      "NC": "Nowa Kaledonia",
-      "NE": "Niger",
-      "NF": "Wyspa Norfolk",
-      "NG": "Nigeria",
-      "NI": "Nikaragua",
-      "NL": "Holandia",
-      "NO": "Norwegia",
-      "NP": "Nepal",
-      "NR": "Nauru",
-      "NU": "Niue",
-      "NZ": "Nowa Zelandia",
-      "OM": "Oman",
-      "PA": "Panama",
-      "PE": "Peru",
-      "PF": "Polinezja Francuska",
-      "PG": "Papua-Nowa Gwinea",
-      "PH": "Filipiny",
-      "PK": "Pakistan",
-      "PL": "Polska",
-      "PM": "Saint-Pierre i Miquelon",
-      "PN": "Pitcairn",
-      "PR": "Portoryko",
-      "PS": "Palestyna",
-      "PT": "Portugalia",
-      "PW": "Palau",
-      "PY": "Paragwaj",
-      "QA": "Katar",
-      "RE": "Reunion",
-      "RO": "Rumunia",
-      "RS": "Serbia",
-      "RU": "Rosja",
-      "RW": "Rwanda",
-      "SA": "Arabia Saudyjska",
-      "SB": "Wyspy Solomona",
-      "SC": "Seszele",
-      "SD": "Sudan",
-      "SE": "Szwecja",
-      "SG": "Singapur",
-      "SH": "Wyspa Świętej Heleny, Wyspa Wniebowstąpienia i Tristan da Cunha",
-      "SI": "Słowenia",
-      "SJ": "Svalbard i Jan Mayen",
-      "SK": "Słowacja",
-      "SL": "Sierra Leone",
-      "SM": "San Marino",
-      "SN": "Senegal",
-      "SO": "Somalia",
-      "SR": "Surinam",
-      "SS": "Sudan Południowy",
-      "ST": "Wyspy Świętego Tomasza i Książęca",
-      "SV": "Salwador",
-      "SX": "Sint Maarten",
-      "SY": "Syria",
-      "SZ": "Eswatini",
-      "TC": "Turks i Caicos",
-      "TD": "Czad",
-      "TF": "FTPA",
-      "TG": "Togo",
-      "TH": "Tajlandia",
-      "TJ": "Tadżykistan",
-      "TK": "Tokelau",
-      "TL": "Timor Wschodni",
-      "TM": "Turkmenistan",
-      "TN": "Tunezja",
-      "TO": "Tonga",
-      "TR": "Turcja",
-      "TT": "Trynidad i Tobago",
-      "TV": "Tuvalu",
-      "TW": "Tajwan",
-      "TZ": "Tanzania",
-      "UA": "Ukraina",
-      "UG": "Uganda",
-      "UM": "Dalekie Wyspy Mniejsze Stanów Zjednoczonych",
-      "US": "Stany Zjednoczone",
-      "UY": "Urugwaj",
-      "UZ": "Uzbekistan",
-      "VA": "Watykan",
-      "VC": "Saint Vincent i Grenadyny",
-      "VE": "Wenezuela",
-      "VG": "Brytyjskie Wyspy Dziewicze",
-      "VI": "Wyspy Dziewicze Stanów Zjednoczonych",
-      "VN": "Wietnam",
-      "VU": "Vanuatu",
-      "WF": "Wallis i Futuna",
-      "WS": "Samoa",
-      "YE": "Jemen",
-      "YT": "Majotta",
-      "XK": "Kosowo",
-      "ZA": "Południowa Afryka",
-      "ZM": "Zambia",
-      "ZW": "Zimbambwe",
-      "EU": "Unia Europejska"
-    },
-    "languages": {
-      "en-US": "Angielski - USA",
-      "fr": "Francuski",
-      "nl": "Holenderski",
-      "pt_BR": "Portugalski - Brazylia"
-    }
-  },
-  "KnownHosts": {
-    "label": "Host",
-    "add": "Dodaj nowego hosta",
-    "toast": "Host successfully {mode, select, created {created} deleted {deleted} other {edited}}."
-  },
-  "InitializeContainer": {
-    "title": "WIEDZIAŁEŚ",
-    "subtitle": "<1>Cockatrice jest prowadzony przez ochotników</1><1>którzy uwielbiają karcianki!</1>"
-  },
-  "LoginContainer": {
-    "header": {
-      "title": "Login",
-      "subtitle": "Wieloplatformowy wirtualny stół do wieloosobowych gier karcianych."
-    },
-    "footer": {
-      "registerPrompt": "Jeszcze nie zarejestrowany?",
-      "registerAction": "Stwórz konto",
-      "credit": "Cockatrice jest projektem open source",
-      "version": "Wersja"
-    },
-    "content": {
-      "subtitle1": "Graj wieloosobowe karcianki online.",
-      "subtitle2": "Wieloplatformowy wirtualny stół do wieloosobowych gier karcianych. Zawsze darmowy i wolny."
-    },
-    "toasts": {
-      "passwordResetSuccessToast": "Hasło Pomyślnie Zresetowany",
-      "accountActivationSuccess": "Konto Pomyślnie Aktywowane"
-    }
-  },
-  "UnsupportedContainer": {
-    "title": "Nieobsługiwana Przeglądarka",
-    "subtitle1": "Proszę zaktualizuj swoją przeglądarkę i/lub sprawdź jej uprawnienia.",
-    "subtitle2": "Przeglądanie prywatne może wyłączyć niektóre uprawnienia lub funkcje."
-  },
-  "AccountActivationDialog": {
-    "title": "Aktywacja Konta",
-    "subtitle1": "Twoje konto nie zostało jeszcze aktywowane.",
-    "subtitle2": "Musisz podać token aktywujący, otrzymany w wiadomości email."
-  },
-  "KnownHostDialog": {
-    "title": "{mode, select, edit {Edit} other {Add}} Known Host",
-    "subtitle": "Dodanie nowego hosta pozwoli Ci połączyć się z innymi serwerami. Podaj jego dane poniżej aby dodać go do listy."
-  },
-  "RegistrationDialog": {
-    "title": "Stwórz Nowe Konto"
-  },
-  "RequestPasswordResetDialog": {
-    "title": "Żądanie Resetu Hasła"
-  },
-  "ResetPasswordDialog": {
-    "title": "Zresetuj hasło"
-  },
-  "AccountActivationForm": {
-    "error": {
-      "failed": "Aktywacja konta zakończona niepowodzeniem"
-    },
-    "label": {
-      "activate": "Aktywuj Konto"
-    }
-  },
-  "KnownHostForm": {
-    "help": "Potrzebujesz pomocy z dodaniem nowego hosta?",
-    "label": {
-      "add": "Dodaj Hosta",
-      "find": "Znajdź Hosta"
-    }
-  },
-  "LoginForm": {
-    "label": {
-      "autoConnect": "Połącz automatycznie",
-      "forgot": "Zapomniałem hasła",
-      "login": "Login",
-      "savePassword": "Zapisz hasło",
-      "savedPassword": "Zapisane Hasło"
-    }
-  },
-  "RegisterForm": {
-    "label": {
-      "register": "Zarejestruj się"
-    },
-    "toast": {
-      "registerSuccess": "Rejestracja powiodła się!"
-    }
-  },
-  "RequestPasswordResetForm": {
-    "error": "Żądanie resetu hasła nie powiodło się.",
-    "mfaEnabled": "Serwer ma włączone uwierzytelnianie wielkoskładnikowe",
-    "request": "Zażądaj Token Resetu",
-    "skipRequest": "Mam już token resetu"
-  },
-  "ResetPasswordForm": {
-    "error": "Żądanie resetu hasła nie powiodło się.",
-    "label": {
-      "reset": "Zresetuj hasło"
-    }
-  }
-}
\ No newline at end of file
diff --git a/webclient/public/locales/pt_BR/translation.json b/webclient/public/locales/pt_BR/translation.json
deleted file mode 100644
index 10ad08603..000000000
--- a/webclient/public/locales/pt_BR/translation.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
-  "Common": {
-    "language": "Português do Brasil (Brazilian Portuguese)",
-    "disconnect": "Desconectar",
-    "label": {
-      "confirmPassword": "Confirmar senha",
-      "confirmSure": "Você tem certeza?",
-      "country": "País",
-      "delete": "Excluir",
-      "email": "Email",
-      "hostName": "Nome do host",
-      "hostAddress": "Endereço do host",
-      "password": "Senha",
-      "passwordAgain": "Senha novamente",
-      "port": "Porta",
-      "realName": "Nome Real",
-      "saveChanges": "Salvar Mudanças",
-      "token": "Ficha",
-      "username": "Nome de usuário"
-    },
-    "validation": {
-      "minChars": "Mínimo de {count} {count, plural, one {caractere} other {caracteres}} necessários",
-      "passwordsMustMatch": "As senhas não correspondem",
-      "required": "Campo obrigatório"
-    },
-    "countries": {
-      "AD": "Andorra",
-      "AE": "Emirados Árabes Unidos",
-      "AF": "Afeganistão",
-      "AG": "Antígua e Barbuda",
-      "AI": "Anguila",
-      "AL": "Albânia",
-      "AM": "Armênia",
-      "AO": "Angola",
-      "AQ": "Antártica",
-      "AR": "Argentina",
-      "AS": "Samoa Americana",
-      "AT": "Áustria",
-      "AU": "Austrália",
-      "AW": "Aruba",
-      "AX": "Ilhas Aland",
-      "AZ": "Azerbaijão",
-      "BA": "Bósnia e Herzegovina",
-      "BB": "Barbados",
-      "BD": "Bangladesh",
-      "BE": "Bélgica",
-      "BF": "Burquina Faso",
-      "BG": "Bulgária",
-      "BH": "Bahrein",
-      "BI": "Burundi",
-      "BJ": "Benim",
-      "BL": "São Bartolomeu",
-      "BM": "Bermudas",
-      "BN": "Brunei",
-      "BO": "Bolivia",
-      "BQ": "Bonaire, Santo Eustáquio e Saba",
-      "BR": "Brasil",
-      "BS": "Bahamas",
-      "BT": "Butão",
-      "BV": "Ilha Bouvet",
-      "BW": "Botsuana",
-      "BY": "Bielorrússia",
-      "BZ": "Belize",
-      "CA": "Canadá",
-      "CC": "Ilhas Cocos (Keeling)",
-      "CD": "RD Congo",
-      "CF": "República Centro-Africana",
-      "CG": "República do Congo",
-      "CH": "Suiça",
-      "CI": "Costa do Marfim",
-      "CK": "Ilhas Cook",
-      "CL": "Chile",
-      "CM": "Camarões",
-      "CN": "China",
-      "CO": "Colômbia",
-      "CR": "Costa Rica",
-      "CU": "Cuba",
-      "CV": "Cabo Verde",
-      "CW": "Curaçao",
-      "CX": "Ilha Christmas",
-      "CY": "Chipre",
-      "CZ": "Tchéquia",
-      "DE": "Alemanha",
-      "DJ": "Djibuti",
-      "DK": "Dinamarca",
-      "DM": "Dominica",
-      "DO": "República Dominicana",
-      "DZ": "Argélia",
-      "EC": "Equador",
-      "EE": "Estônia",
-      "EG": "Egito",
-      "EH": "Saara Ocidental",
-      "ER": "Eritreia",
-      "ES": "Espanha",
-      "ET": "Etiópia",
-      "FI": "Finlândia",
-      "FJ": "Fiji",
-      "FK": "Ilhas Malvinas",
-      "FM": "Micronésia",
-      "FO": "Ilhas Faroé",
-      "FR": "França",
-      "GA": "Gabão",
-      "GB": "Reino Unido",
-      "GD": "Granada",
-      "GE": "Geórgia",
-      "GF": "Guiana Francesa",
-      "GG": "Guernsey",
-      "GH": "Gana",
-      "GI": "Gibraltar",
-      "GL": "Groenlândia",
-      "GM": "Gâmbia",
-      "GN": "Guiné",
-      "GP": "Guadalupe",
-      "GQ": "Guiné Equatorial",
-      "GR": "Grécia",
-      "GS": "Ilhas Geórgia do Sul e Sandwich do Sul",
-      "GT": "Guatemala",
-      "GU": "Guam",
-      "GW": "Guiné-Bissau",
-      "GY": "Guiana",
-      "HK": "Hong Kong",
-      "HM": "Ilha Head e Ilhas McDonald",
-      "HN": "Honduras",
-      "HR": "Croácia",
-      "HT": "Haiti",
-      "HU": "Hungria",
-      "ID": "Indonésia",
-      "IE": "Irlanda",
-      "IL": "Israel",
-      "IM": "Ilha de Man",
-      "IN": "Índia",
-      "IO": "Território Britânico do Oceano Índico",
-      "IQ": "Iraque",
-      "IR": "Irã",
-      "IS": "Islândia",
-      "IT": "Itália",
-      "JE": "Jersey",
-      "JM": "Jamaica",
-      "JO": "Jordânia",
-      "JP": "Japão",
-      "KE": "Quênia",
-      "KG": "Quirguistão",
-      "KH": "Cambodja",
-      "KI": "Quiribati",
-      "KM": "Comores",
-      "KN": "São Cristóvão e Névis",
-      "KP": "Coréia do Norte",
-      "KR": "Coreia do Sul",
-      "KW": "Kuwait",
-      "KY": "Ilhas Cayman",
-      "KZ": "Cazaquistão",
-      "LA": "Laos",
-      "LB": "Líbano",
-      "LC": "Santa Lúcia",
-      "LI": "Liechtenstein",
-      "LK": "Sri Lanka",
-      "LR": "Libéria",
-      "LS": "Lesoto",
-      "LT": "Lituânia",
-      "LU": "Luxemburgo",
-      "LV": "Letônia",
-      "LY": "Líbia",
-      "MA": "Marrocos",
-      "MC": "Mônaco",
-      "MD": "Moldávia",
-      "ME": "Montenegro",
-      "MF": "São Martinho (França)",
-      "MG": "Madagáscar",
-      "MH": "Ilhas Marshall",
-      "MK": "Macedônia do Norte",
-      "ML": "Mali",
-      "MM": "Mianmar",
-      "MN": "Mongólia",
-      "MO": "Macau",
-      "MP": "Ilhas Marianas do Norte",
-      "MQ": "Martinica",
-      "MR": "Mauritânia",
-      "MS": "Monserrate",
-      "MT": "Malta",
-      "MU": "Ilhas Maurício",
-      "MV": "Maldivas",
-      "MW": "Malawi",
-      "MX": "México",
-      "MY": "Malásia",
-      "MZ": "Moçambique",
-      "NA": "Namíbia",
-      "NC": "Nova Caledônia",
-      "NE": "Níger",
-      "NF": "Ilha Norfolk",
-      "NG": "Nigéria",
-      "NI": "Nicarágua",
-      "NL": "Holanda",
-      "NO": "Noruega",
-      "NP": "Nepal",
-      "NR": "Nauru",
-      "NU": "Niue",
-      "NZ": "Nova Zelândia",
-      "OM": "Omã",
-      "PA": "Panamá",
-      "PE": "Peru",
-      "PF": "Polinésia Francesa",
-      "PG": "Papua Nova Guiné",
-      "PH": "Filipinas",
-      "PK": "Paquistão",
-      "PL": "Polônia",
-      "PM": "Saint-Pierre e Miquelon",
-      "PN": "Ilhas Pitcairn",
-      "PR": "Porto Rico",
-      "PS": "Palestina",
-      "PT": "Portugal",
-      "PW": "Palau",
-      "PY": "Paraguai",
-      "QA": "Catar",
-      "RE": "Ilha da Reunião",
-      "RO": "Romênia",
-      "RS": "Sérvia",
-      "RU": "Rússia",
-      "RW": "Ruanda",
-      "SA": "Arábia Saudita",
-      "SB": "Ilhas Salomão",
-      "SC": "Seychelles",
-      "SD": "Sudão",
-      "SE": "Suécia",
-      "SG": "Cingapura",
-      "SH": "Santa Helena, Ascensão e Tristão da Cunha",
-      "SI": "Eslovênia",
-      "SJ": "Svalbard e Jan Mayen",
-      "SK": "Eslováquia",
-      "SL": "Serra Leoa",
-      "SM": "San Marino",
-      "SN": "Senegal",
-      "SO": "Somália",
-      "SR": "Suriname",
-      "SS": "Sudão do Sul",
-      "ST": "São Tomé e Príncipe",
-      "SV": "El Salvador",
-      "SX": "São Martinho (Holanda)",
-      "SY": "Síria",
-      "SZ": "Essuatíni",
-      "TC": "Ilhas Turcas e Caicos",
-      "TD": "Chad",
-      "TF": "TAAF",
-      "TG": "Togo",
-      "TH": "Tailândia",
-      "TJ": "Tajiquistão",
-      "TK": "Tokelau",
-      "TL": "Timor-Leste",
-      "TM": "Turcomenistão",
-      "TN": "Tunísia",
-      "TO": "Tonga",
-      "TR": "Turquia",
-      "TT": "Trindade e Tobago",
-      "TV": "Tuvalu",
-      "TW": "Taiwan",
-      "TZ": "Tanzânia",
-      "UA": "Ucrânia",
-      "UG": "Uganda",
-      "UM": "Ilhas Menores Distantes dos Estados Unidos",
-      "US": "Estados Unidos",
-      "UY": "Uruguai",
-      "UZ": "Uzbequistão",
-      "VA": "Santa Sé",
-      "VC": "São Vicente e Granadinas",
-      "VE": "Venezuela",
-      "VG": "Ilhas Virgens Britânicas",
-      "VI": "Ilhas Virgens Americanas",
-      "VN": "Vietnã",
-      "VU": "Vanuatu",
-      "WF": "Wallis e Futuna",
-      "WS": "Samoa",
-      "YE": "Iêmen",
-      "YT": "Mayotte",
-      "XK": "Kosovo",
-      "ZA": "África do Sul",
-      "ZM": "Zâmbia",
-      "ZW": "Zimbábue",
-      "EU": "União Européia"
-    },
-    "languages": {
-      "en-US": "Inglês - EUA",
-      "fr": "Francês",
-      "nl": "Holandês",
-      "pt_BR": "Português - Brasil"
-    }
-  },
-  "KnownHosts": {
-    "label": "Servidor",
-    "add": "Adicionar novo servidor",
-    "toast": "Servidor {mode, select, created {criado} deleted {deletado} other {editado}} com sucesso."
-  },
-  "InitializeContainer": {
-    "title": "VOCÊ SABIA?",
-    "subtitle": "<1>O Cockatrice é administrado por voluntários</1><1>que adoram jogos de cartas!</1>"
-  },
-  "LoginContainer": {
-    "header": {
-      "title": "Login",
-      "subtitle": "Uma mesa virtual multiplataforma para jogos multijogador de carta."
-    },
-    "footer": {
-      "registerPrompt": "Não registrou ainda?",
-      "registerAction": "Crie uma conta",
-      "credit": "Cockatrice é um projeto de código aberto",
-      "version": "Versão"
-    },
-    "content": {
-      "subtitle1": "Jogue jogos multijogador de cartas online.",
-      "subtitle2": "Mesa virtual multiplataforma para jogos multijogador de carta. Gratuito para sempre."
-    },
-    "toasts": {
-      "passwordResetSuccessToast": "Senha redefinida com sucesso",
-      "accountActivationSuccess": "Conta ativada com sucesso"
-    }
-  },
-  "UnsupportedContainer": {
-    "title": "Navegador não suportado",
-    "subtitle1": "Por favor atualize seu navegador de internet e/ou check as permissões",
-    "subtitle2": "Observação: a navegação privada faz com que alguns navegadores desativem determinadas permissões ou recursos."
-  },
-  "AccountActivationDialog": {
-    "title": "Ativação da conta",
-    "subtitle1": "Sua conta ainda não foi ativada.",
-    "subtitle2": "Você precisa fornecer o código de ativação recebido por email."
-  },
-  "KnownHostDialog": {
-    "title": "{mode, select, edit {Editar} other {Adicionar}} servidor conhecido",
-    "subtitle": "Adicionar um novo host permite que você se conecte a diferentes servidores. Insira os detalhes abaixo em sua lista de hosts."
-  },
-  "RegistrationDialog": {
-    "title": "Criar Nova Conta"
-  },
-  "RequestPasswordResetDialog": {
-    "title": "Solicitar redefinição de senha"
-  },
-  "ResetPasswordDialog": {
-    "title": "Redefinir Senha"
-  },
-  "AccountActivationForm": {
-    "error": {
-      "failed": "Falha na activação de conta"
-    },
-    "label": {
-      "activate": "Ativar Conta"
-    }
-  },
-  "KnownHostForm": {
-    "help": "Necessita de ajuda para adicionar um novo host?",
-    "label": {
-      "add": "Adicionar Host",
-      "find": "Buscar Host"
-    }
-  },
-  "LoginForm": {
-    "label": {
-      "autoConnect": "Conectar Automaticamente",
-      "forgot": "Esqueci minha senha",
-      "login": "Login",
-      "savePassword": "Salvar Senha",
-      "savedPassword": "Salvar Senha"
-    }
-  },
-  "RegisterForm": {
-    "label": {
-      "register": "Registrar"
-    },
-    "toast": {
-      "registerSuccess": "Registro bem-sucedido"
-    }
-  },
-  "RequestPasswordResetForm": {
-    "error": "Falha na solicitação de redefinição de senha",
-    "mfaEnabled": "O servidor tem autenticação de multi-fator ativada",
-    "request": "Solicitar código de redefinição",
-    "skipRequest": "Eu já tenho um código de redefinição"
-  },
-  "ResetPasswordForm": {
-    "error": "Falha na redefinição de senha",
-    "label": {
-      "reset": "Redefinir Senha"
-    }
-  }
-}
\ No newline at end of file
diff --git a/webclient/public/locales/ru/translation.json b/webclient/public/locales/ru/translation.json
deleted file mode 100644
index 5e92f790e..000000000
--- a/webclient/public/locales/ru/translation.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
-  "Common": {
-    "language": "Русский (Russian)",
-    "disconnect": "Прервать подключение",
-    "label": {
-      "confirmPassword": "Подтверждение пароля:",
-      "confirmSure": "Вы уверены?",
-      "country": "Страна:",
-      "delete": "Удалить",
-      "email": "Адрес email:",
-      "hostName": "Наименование сервера",
-      "hostAddress": "Адрес сервера",
-      "password": "Пароль:",
-      "passwordAgain": "Подтверждение пароля:",
-      "port": "&Порт:",
-      "realName": "Настоящее имя:",
-      "saveChanges": "Сохранить изменения",
-      "token": "Фишка",
-      "username": "Имя пользователя:"
-    },
-    "validation": {
-      "minChars": "Как минимум {count} {count, plural, one {character} other {characters}} необходимо",
-      "passwordsMustMatch": "Введенные пароли не совпадают.",
-      "required": "Необходимо"
-    },
-    "countries": {
-      "AD": "Андорра",
-      "AE": "ОАЭ",
-      "AF": "Афганистан",
-      "AG": "Антигуа и Барбуда",
-      "AI": "Ангилья",
-      "AL": "Албания",
-      "AM": "Армения",
-      "AO": "Ангола",
-      "AQ": "Антарктика",
-      "AR": "Аргентина",
-      "AS": "Американское Самоа",
-      "AT": "Австрия",
-      "AU": "Австралия",
-      "AW": "Аруба",
-      "AX": "Аландские острова",
-      "AZ": "Азербайджан",
-      "BA": "Босния и Герцеговина",
-      "BB": "Барбадос",
-      "BD": "Бангладеш",
-      "BE": "Бельгия",
-      "BF": "Буркина Фасо",
-      "BG": "Болгария",
-      "BH": "Бахрейн",
-      "BI": "Бурунди",
-      "BJ": "Бенин",
-      "BL": "Сен-Бартелеми",
-      "BM": "Бермуды",
-      "BN": "Бруней",
-      "BO": "Боливия",
-      "BQ": "Бонэйр",
-      "BR": "Бразилия",
-      "BS": "Багамы",
-      "BT": "Бутан",
-      "BV": "Остров Буве",
-      "BW": "Ботсвана",
-      "BY": "Беларусь",
-      "BZ": "Белиз",
-      "CA": "Канада",
-      "CC": "Кокосовые острова",
-      "CD": "ДР Конго",
-      "CF": "ЦАР",
-      "CG": "Республика Конго",
-      "CH": "Швейцария",
-      "CI": "Кот-д'Ивуар",
-      "CK": "Острова Кука",
-      "CL": "Чили",
-      "CM": "Камерун",
-      "CN": "Китай",
-      "CO": "Колумбия",
-      "CR": "Коста-Рика",
-      "CU": "Куба",
-      "CV": "Кабо-Верде",
-      "CW": "Кюрасао",
-      "CX": "Остров Рождества",
-      "CY": "Кипр",
-      "CZ": "Чехия",
-      "DE": "Германия",
-      "DJ": "Джибути",
-      "DK": "Дания",
-      "DM": "Доминика",
-      "DO": "Доминиканская Республика",
-      "DZ": "Алжир",
-      "EC": "Эквадор",
-      "EE": "Эстония",
-      "EG": "Египет",
-      "EH": "Западная Сахара",
-      "ER": "Эритрея",
-      "ES": "Испания",
-      "ET": "Эфиопия",
-      "FI": "Финляндия",
-      "FJ": "Фиджи",
-      "FK": "Фолклендские острова",
-      "FM": "Микронезия",
-      "FO": "Фарерские о-ва",
-      "FR": "Франция",
-      "GA": "Габон",
-      "GB": "Великобритания",
-      "GD": "Гренада",
-      "GE": "Грузия",
-      "GF": "Французская Гвиана",
-      "GG": "Гернси",
-      "GH": "Гана",
-      "GI": "Гибралтар",
-      "GL": "Гренландия",
-      "GM": "Гамбия",
-      "GN": "Гвинея",
-      "GP": "Гваделупа",
-      "GQ": "Экваториальная Гвинея",
-      "GR": "Греция",
-      "GS": "Южная Георгия и Южные Сандвичевы острова",
-      "GT": "Гватемала",
-      "GU": "Гуам",
-      "GW": "Гвинея-Бисау",
-      "GY": "Гайана",
-      "HK": "Гонконг",
-      "HM": "Остров Херд и остров Макдональд",
-      "HN": "Гондурас",
-      "HR": "Хорватия",
-      "HT": "Гаити",
-      "HU": "Венгрия",
-      "ID": "Индонезия",
-      "IE": "Ирландия",
-      "IL": "Израиль",
-      "IM": "о-в Мэн",
-      "IN": "Индия",
-      "IO": "Британская территория в Индийском океане ",
-      "IQ": "Ирак",
-      "IR": "Иран",
-      "IS": "Исландия",
-      "IT": "Италия",
-      "JE": "Джерси",
-      "JM": "Ямайка",
-      "JO": "Иордания",
-      "JP": "Япония",
-      "KE": "Кения",
-      "KG": "Киргизия",
-      "KH": "Камбоджия",
-      "KI": "Кирибати",
-      "KM": "Коморы",
-      "KN": "Сент-Китс и Невис",
-      "KP": "Северная Корея",
-      "KR": "Южная Корея",
-      "KW": "Кувейт",
-      "KY": "Каймановы острова",
-      "KZ": "Казахстан",
-      "LA": "Лаос",
-      "LB": "Ливан",
-      "LC": "Сент-Люсия",
-      "LI": "Лихтенштейн",
-      "LK": "Шри-Ланка",
-      "LR": "Либерия",
-      "LS": "Лесото",
-      "LT": "Литва",
-      "LU": "Люксембург",
-      "LV": "Латвия",
-      "LY": "Ливия",
-      "MA": "Морокко",
-      "MC": "Монако",
-      "MD": "Молдавия",
-      "ME": "Черногория",
-      "MF": "Сен-Мартен (владение Франции)",
-      "MG": "Мадагарскар",
-      "MH": "Маршалловы о-ва",
-      "MK": "Северная Македония",
-      "ML": "Мали",
-      "MM": "Мьянма (Бирма)",
-      "MN": "Монголия",
-      "MO": "Макао",
-      "MP": "Северные Марианские о-ва",
-      "MQ": "Мартиника",
-      "MR": "Мавритания",
-      "MS": "Монтсеррат",
-      "MT": "Мальта",
-      "MU": "о. Маврикий",
-      "MV": "Мальдивы",
-      "MW": "Малави",
-      "MX": "Мексика",
-      "MY": "Малазия",
-      "MZ": "Мозамбик",
-      "NA": "Намибия",
-      "NC": "Новая Каледония",
-      "NE": "Нигер",
-      "NF": "Остров Норфолк",
-      "NG": "Нигерия",
-      "NI": "Никарагуа",
-      "NL": "Нидерланды",
-      "NO": "Норвегия",
-      "NP": "Непал",
-      "NR": "Науру",
-      "NU": "Ниуэ",
-      "NZ": "Новая Зеландия",
-      "OM": "Оман",
-      "PA": "Панама",
-      "PE": "Перу",
-      "PF": "Французская Полинезия",
-      "PG": "Папуа-Новая Гвинея",
-      "PH": "Филиппины",
-      "PK": "Пакистан",
-      "PL": "Польша",
-      "PM": "Сен-Пьер и Микелон",
-      "PN": "о-ва Питкэрн",
-      "PR": "Пуэрто-Рико",
-      "PS": "Палестина",
-      "PT": "Португалия",
-      "PW": "Палау",
-      "PY": "Парагва",
-      "QA": "Катар",
-      "RE": "Реюньон",
-      "RO": "Румыния",
-      "RS": "Сербия",
-      "RU": "Российская Федерация",
-      "RW": "Руанда",
-      "SA": "Саудовская Аравия",
-      "SB": "Соломоновы о-ва",
-      "SC": "Сейшелы",
-      "SD": "Судан",
-      "SE": "Швеция",
-      "SG": "Сингапур",
-      "SH": "о. Св. Елены",
-      "SI": "Словения",
-      "SJ": "Шпицберген и Ян-Майен",
-      "SK": "Словакия",
-      "SL": "Сьерра-Леоне",
-      "SM": "Сан-Марино",
-      "SN": "Сенегал",
-      "SO": "Сомали",
-      "SR": "Суринам",
-      "SS": "Южный Судан",
-      "ST": "Сан-Томе и Принсипи",
-      "SV": "Сальвадор",
-      "SX": "Синт-Мартен (Дания)",
-      "SY": "Сирия",
-      "SZ": "Эсватини",
-      "TC": "Острова Теркс и Кайкос",
-      "TD": "Чад",
-      "TF": "Французские Южные и Антарктические территории",
-      "TG": "Того",
-      "TH": "Тайланд",
-      "TJ": "Таджикистан",
-      "TK": "Токелау",
-      "TL": "Восточный Тимор",
-      "TM": "Туркмения",
-      "TN": "Тунис",
-      "TO": "Тонго",
-      "TR": "Турция",
-      "TT": "Тринидад и Тобаго",
-      "TV": "Тувалу",
-      "TW": "Тайвань",
-      "TZ": "Танзания",
-      "UA": "Украина",
-      "UG": "Уганда",
-      "UM": "Внешние малые о-ва (США)",
-      "US": "США",
-      "UY": "Уругвай",
-      "UZ": "Узбекистан",
-      "VA": "Святой Престол",
-      "VC": "Сент-Винсент и Гренадины",
-      "VE": "Венесуэла",
-      "VG": "Британские Виргинские острова",
-      "VI": "Американские Виргинские острова",
-      "VN": "Вьетнам",
-      "VU": "Вануату",
-      "WF": "о-ва Уоллис и Футуна",
-      "WS": "Самоа",
-      "YE": "Йемен",
-      "YT": "Майотта",
-      "XK": "Косово",
-      "ZA": "ЮАР",
-      "ZM": "Замбия",
-      "ZW": "Зимбабве",
-      "EU": "Европейский Союз"
-    },
-    "languages": {
-      "en-US": "Английский - США",
-      "fr": "Французский",
-      "nl": "Датский",
-      "pt_BR": "Португальский - Бразилия"
-    }
-  },
-  "KnownHosts": {
-    "label": "&Хост",
-    "add": "Добавить новый сервер",
-    "toast": "Сервер успешно {mode, select, created {created} deleted {deleted} other {edited}}."
-  },
-  "InitializeContainer": {
-    "title": "ЗНАЕТЕ ЛИ ВЫ",
-    "subtitle": "<1>Cockatrice поддерживается энтузиастами</1><1>которые любят карточные игры!</1>"
-  },
-  "LoginContainer": {
-    "header": {
-      "title": "Логин",
-      "subtitle": "Кросс-платформенный виртуальный стол для мультиплеерных ККИ"
-    },
-    "footer": {
-      "registerPrompt": "Ещё не зарегистрированы?",
-      "registerAction": "Создать учетную запись",
-      "credit": "Cockatrice - проект с открытым исходным кодом",
-      "version": "Версия"
-    },
-    "content": {
-      "subtitle1": "Играйте в мультиплеерные ККИ онлайн",
-      "subtitle2": "Кросс-платформенный виртуальный стол для мультиплеерных ККИ. Всегда будет бесплатным."
-    },
-    "toasts": {
-      "passwordResetSuccessToast": "Пароль сброшен успешно",
-      "accountActivationSuccess": "Учетная запись активирована успешно"
-    }
-  },
-  "UnsupportedContainer": {
-    "title": "Браузер не поддерживается",
-    "subtitle1": "Обновите бразуер и/или проверьте права доступа",
-    "subtitle2": "Обратите внимание, что использование анонимных браузеров может привести к неработоспособности некоторых фич и проблемами с правами доступа"
-  },
-  "AccountActivationDialog": {
-    "title": "Активация учетной записи",
-    "subtitle1": "Ваша учетная запись не активирована",
-    "subtitle2": "Ваш аккаунт пока не активирован. Вам необходимо следовать указаниям по активации, отправленным на ваш email"
-  },
-  "KnownHostDialog": {
-    "title": "{модифицировать, выбрать, редактировать {Edit} другой {Add}} известный хост",
-    "subtitle": "Добавление нового хоста позволит вам присоединяться к различным серверам. Введите данные о сервере в ваш список хостов"
-  },
-  "RegistrationDialog": {
-    "title": "Создать новый аккаунт"
-  },
-  "RequestPasswordResetDialog": {
-    "title": "Запросить сброс пароля"
-  },
-  "ResetPasswordDialog": {
-    "title": "Сбросить пароль"
-  },
-  "AccountActivationForm": {
-    "error": {
-      "failed": "Не удалось активировать аккаунт"
-    },
-    "label": {
-      "activate": "Активировать аккаунт"
-    }
-  },
-  "KnownHostForm": {
-    "help": "Нужна помощь в добавлении нового хоста?",
-    "label": {
-      "add": "Добавить хост",
-      "find": "Найти хост"
-    }
-  },
-  "LoginForm": {
-    "label": {
-      "autoConnect": "Автоматическое подключение",
-      "forgot": "Забыли пароль",
-      "login": "Логин",
-      "savePassword": "Сохранить пароль",
-      "savedPassword": "Сохранённый пароль"
-    }
-  },
-  "RegisterForm": {
-    "label": {
-      "register": "Зарегистрироваться"
-    },
-    "toast": {
-      "registerSuccess": "Регистрация прошла успешно!"
-    }
-  },
-  "RequestPasswordResetForm": {
-    "error": "Не удалось запросить сброс пароля",
-    "mfaEnabled": "На сервере включена многофакторная аутентификация",
-    "request": "Запросить токен сброса",
-    "skipRequest": "У меня уже есть токен сброса"
-  },
-  "ResetPasswordForm": {
-    "error": "Не удалось сбросить пароль",
-    "label": {
-      "reset": "Сбросить пароля"
-    }
-  }
-}
\ No newline at end of file
diff --git a/webclient/public/locales/tok/translation.json b/webclient/public/locales/tok/translation.json
deleted file mode 100644
index 46437f558..000000000
--- a/webclient/public/locales/tok/translation.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
-  "Common": {
-    "language": "Toki Pona",
-    "disconnect": "mi o weka tan kulupu",
-    "label": {
-      "confirmPassword": "nimi ken li pona ala pona",
-      "confirmSure": "ni li pona ala pona",
-      "country": "ma",
-      "delete": "mi o weka e ni",
-      "email": "nimi Email",
-      "hostName": "nimi pi ilo lawa",
-      "hostAddress": "ma pi ilo lawa",
-      "password": "nimi ken pi kama sina",
-      "passwordAgain": "o pana sin e nimi ken pi kama sina",
-      "port": "nanpa pi ilo lawa",
-      "realName": "nimi sina lon",
-      "saveChanges": "mi o awen e ante sina",
-      "token": "ijo lili",
-      "username": "nimi sina"
-    },
-    "validation": {
-      "minChars": "Minimum of {count} {count, plural, one {character} other {characters}} required",
-      "passwordsMustMatch": "nimi ken nanpa wan li sama ala nimi ken nanpa tu",
-      "required": "o ni"
-    },
-    "countries": {
-      "AD": "ma Antola",
-      "AE": "United Arab Emirates",
-      "AF": "ma Akanisan",
-      "AG": "Antigua and Barbuda",
-      "AI": "Anguilla",
-      "AL": "ma Sipe",
-      "AM": "ma Aja",
-      "AO": "ma Ankola",
-      "AQ": "ma Antasika",
-      "AR": "ma Alensina",
-      "AS": "American Samoa",
-      "AT": "ma Esalasi",
-      "AU": "ma Oselija",
-      "AW": "Aruba",
-      "AX": "Åland Islands",
-      "AZ": "Azerbaijan",
-      "BA": "Bosnia and Herzegovina",
-      "BB": "ma Papeto",
-      "BD": "ma Panla",
-      "BE": "ma Pesije",
-      "BF": "ma Pukinapaso",
-      "BG": "ma Pokasi",
-      "BH": "ma Palani",
-      "BI": "Burundi",
-      "BJ": "ma Penen",
-      "BL": "Saint Barthélemy",
-      "BM": "ma Pemuta",
-      "BN": "Brunei Darussalam",
-      "BO": "Bolivia",
-      "BQ": "Bonaire, Sint Eustatius and Saba",
-      "BR": "ma Pasila",
-      "BS": "ma Pawama",
-      "BT": "ma Putan",
-      "BV": "Bouvet Island",
-      "BW": "ma Posuwana",
-      "BY": "ma Pelalusi",
-      "BZ": "Belize",
-      "CA": "ma Kanata",
-      "CC": "Cocos (Keeling) Islands",
-      "CD": "ma DR Konko",
-      "CF": "ma Santapiken",
-      "CG": "ma Konko",
-      "CH": "ma Suwasi",
-      "CI": "ma Kowisa",
-      "CK": "Cook Islands",
-      "CL": "ma Sile",
-      "CM": "ma Kamelun",
-      "CN": "ma Sonko",
-      "CO": "Colombia",
-      "CR": "ma Kosalika",
-      "CU": "ma Kupa",
-      "CV": "Cape Verde",
-      "CW": "Curaçao",
-      "CX": "Christmas Island",
-      "CY": "ma Kiposi",
-      "CZ": "ma Seki",
-      "DE": "ma Tosi",
-      "DJ": "ma Sipusi",
-      "DK": "ma Tansi",
-      "DM": "ma Watukupuli",
-      "DO": "ma Tominika",
-      "DZ": "ma Sasali",
-      "EC": "ma Ekato",
-      "EE": "ma Esi",
-      "EG": "ma Masu",
-      "EH": "Western Sahara",
-      "ER": "ma Eliteja",
-      "ES": "ma Epanja",
-      "ET": "ma Isijopija",
-      "FI": "ma Sumi",
-      "FJ": "ma Pisi",
-      "FK": "Falkland Islands",
-      "FM": "Micronesia",
-      "FO": "Faroe Islands",
-      "FR": "ma Kanse",
-      "GA": "ma Kapon",
-      "GB": "ma Juke",
-      "GD": "ma Kenata",
-      "GE": "ma Katelo",
-      "GF": "French Guiana",
-      "GG": "Guernsey",
-      "GH": "ma Kana",
-      "GI": "Gibraltar",
-      "GL": "ma Kalalinuna",
-      "GM": "ma Kanpija",
-      "GN": "ma Kine",
-      "GP": "Guadeloupe",
-      "GQ": "ma Kinejekatolija",
-      "GR": "ma Elena",
-      "GS": "South Georgia and the South Sandwich Islands",
-      "GT": "ma Katemala",
-      "GU": "Guam",
-      "GW": "ma Kinepisa",
-      "GY": "Guyana",
-      "HK": "Hong Kong",
-      "HM": "Heard Island and McDonald Islands",
-      "HN": "ma Ontula",
-      "HR": "ma Lowasi",
-      "HT": "ma Awisi",
-      "HU": "ma Mosijo",
-      "ID": "ma Intonesija",
-      "IE": "ma Alan",
-      "IL": "ma Isale",
-      "IM": "Isle of Man",
-      "IN": "ma Palata",
-      "IO": "British Indian Ocean Territory",
-      "IQ": "Iraq",
-      "IR": "Iran",
-      "IS": "ma Isilan",
-      "IT": "ma Italija",
-      "JE": "Jersey",
-      "JM": "ma Sameka",
-      "JO": "ma Utun",
-      "JP": "ma Nijon",
-      "KE": "ma Kenja",
-      "KG": "Kyrgyzstan",
-      "KH": "ma Kanpusi",
-      "KI": "ma Kilipasi",
-      "KM": "ma Komo",
-      "KN": "Saint Kitts and Nevis",
-      "KP": "North Korea",
-      "KR": "ma Anku",
-      "KW": "ma Kuwasi",
-      "KY": "Cayman Islands",
-      "KZ": "Kazakhstan",
-      "LA": "Laos",
-      "LB": "ma Lunpan",
-      "LC": "Saint Lucia",
-      "LI": "ma Lisensan",
-      "LK": "ma Lanka",
-      "LR": "ma Lapewija",
-      "LS": "ma Lesoto",
-      "LT": "ma Lijatuwa",
-      "LU": "ma Lusepu",
-      "LV": "ma Lawi",
-      "LY": "ma Lipija",
-      "MA": "ma Malipe",
-      "MC": "Monaco",
-      "MD": "ma Motowa",
-      "ME": "Montenegro",
-      "MF": "Saint Martin (French part)",
-      "MG": "Madagascar",
-      "MH": "Marshall Islands",
-      "MK": "ma Maketonija",
-      "ML": "ma Mali",
-      "MM": "ma Mijama",
-      "MN": "Mongolia",
-      "MO": "Macao",
-      "MP": "Northern Mariana Islands",
-      "MQ": "Martinique",
-      "MR": "ma Mulitanija",
-      "MS": "Montserrat",
-      "MT": "Malta",
-      "MU": "ma Mowisi",
-      "MV": "Maldives",
-      "MW": "Malawi",
-      "MX": "ma Mesiko",
-      "MY": "ma Malasija",
-      "MZ": "ma Mosanpi",
-      "NA": "ma Namipija",
-      "NC": "New Caledonia",
-      "NE": "ma Nise",
-      "NF": "Norfolk Island",
-      "NG": "ma Naselija",
-      "NI": "Nicaragua",
-      "NL": "ma Netelan",
-      "NO": "ma Nosiki",
-      "NP": "Nepal",
-      "NR": "Nauru",
-      "NU": "Niue",
-      "NZ": "ma Nusilan",
-      "OM": "ma Uman",
-      "PA": "ma Panama",
-      "PE": "ma Pelu",
-      "PF": "French Polynesia",
-      "PG": "ma Papuwanijukini",
-      "PH": "ma Pilipina",
-      "PK": "ma Pakisan",
-      "PL": " ma Posuka",
-      "PM": "Saint Pierre and Miquelon",
-      "PN": "Pitcairn",
-      "PR": "Puerto Rico",
-      "PS": "ma Pilisin",
-      "PT": "ma Potuke",
-      "PW": "Palau",
-      "PY": "ma Palakawi",
-      "QA": "Qatar",
-      "RE": "Réunion",
-      "RO": "ma Lomani",
-      "RS": "ma Sopisi",
-      "RU": "ma Losi",
-      "RW": "ma Luwanta",
-      "SA": "ma Sawusi",
-      "SB": "Solomon Islands",
-      "SC": "Seychelles",
-      "SD": "ma Sutan",
-      "SE": "ma Wensa",
-      "SG": "Singapore",
-      "SH": "Saint Helena, Ascension and Tristan da Cunha",
-      "SI": "ma Lowensina",
-      "SJ": "Svalbard and Jan Mayen",
-      "SK": "ma Lowenki",
-      "SL": "ma Sijelalijon",
-      "SM": "ma Samalino",
-      "SN": "ma Seneka",
-      "SO": "ma Somalija",
-      "SR": "Suriname",
-      "SS": "South Sudan",
-      "ST": "Sao Tome and Principe",
-      "SV": "El Salvador",
-      "SX": "Sint Maarten (Dutch part)",
-      "SY": "ma Sulija",
-      "SZ": "Eswatini",
-      "TC": "Turks and Caicos Islands",
-      "TD": "ma Sate",
-      "TF": "TAAF",
-      "TG": "ma Toko",
-      "TH": "ma Tawi",
-      "TJ": "Tajikistan",
-      "TK": "Tokelau",
-      "TL": "Timor-Leste",
-      "TM": "Turkmenistan",
-      "TN": "ma Tunisi",
-      "TO": " ma Tona",
-      "TR": "ma Tuki",
-      "TT": "ma Sinita",
-      "TV": "ma Tuwalu",
-      "TW": "ma Tawan",
-      "TZ": "ma Tansanija",
-      "UA": "ma Ukawina",
-      "UG": "ma Ukanta",
-      "UM": "United States Minor Outlying Islands",
-      "US": "ma Mewika",
-      "UY": "ma Ulukawi",
-      "UZ": "Uzbekistan",
-      "VA": "Holy See",
-      "VC": "ma SVG",
-      "VE": "ma Penesuwela",
-      "VG": "British Virgin Islands",
-      "VI": "U.S. Virgin Islands",
-      "VN": "ma Wije",
-      "VU": "ma Wanuwatu",
-      "WF": "Wallis and Futuna",
-      "WS": "ma Samowa",
-      "YE": "ma Jamanija",
-      "YT": "Mayotte",
-      "XK": "Kosovo",
-      "ZA": "ma Setapika",
-      "ZM": "ma Sanpija",
-      "ZW": "ma Sinpapuwe",
-      "EU": "ma kulupu Elopa"
-    },
-    "languages": {
-      "en-US": "toki Inli",
-      "fr": "toki Kanse",
-      "nl": "toki Netelan",
-      "pt_BR": "toki Potuke pi ma Pasila"
-    }
-  },
-  "KnownHosts": {
-    "label": "ilo lawa",
-    "add": "mi o ken e ilo lawa sin",
-    "toast": "Host successfully {mode, select, created {created} deleted {deleted} other {edited}}."
-  },
-  "InitializeContainer": {
-    "title": "sina sona ala sona e ni:",
-    "subtitle": "<1>jan li pali e ilo Cockatrice lon wile taso!</1> <1>musi lipu li pona tawa ona!</1>"
-  },
-  "LoginContainer": {
-    "header": {
-      "title": "mi o kama e sina lon kulupu",
-      "subtitle": "ilo Cockatrice li ken e musi lipu ale. nasin mute ilo li ken lon ona."
-    },
-    "footer": {
-      "registerPrompt": "sina jo ala jo e sijelo kulupu?",
-      "registerAction": "mi o pali e sijelo kulupu sina",
-      "credit": "insa pi ilo Cockatrice li len ala",
-      "version": "nanpa ante"
-    },
-    "content": {
-      "subtitle1": "Play multiplayer card games online.",
-      "subtitle2": "Cross-platform virtual tabletop for multiplayer card games. Forever free."
-    },
-    "toasts": {
-      "passwordResetSuccessToast": "Password Reset Successfully",
-      "accountActivationSuccess": "Account Activated Successfully"
-    }
-  },
-  "UnsupportedContainer": {
-    "title": "Unsupported Browser",
-    "subtitle1": "Please update your browser and/or check your permissions.",
-    "subtitle2": "Note: Private browsing causes some browsers to disable certain permissions or features."
-  },
-  "AccountActivationDialog": {
-    "title": "Account Activation",
-    "subtitle1": "Your account has not been activated yet.",
-    "subtitle2": "You need to provide the activation token received in the activation email."
-  },
-  "KnownHostDialog": {
-    "title": "{mode, select, edit {Edit} other {Add}} Known Host",
-    "subtitle": "Adding a new host allows you to connect to different servers. Enter the details below to your host list."
-  },
-  "RegistrationDialog": {
-    "title": "Create New Account"
-  },
-  "RequestPasswordResetDialog": {
-    "title": "Request Password Reset"
-  },
-  "ResetPasswordDialog": {
-    "title": "mi o sin e nimi ken"
-  },
-  "AccountActivationForm": {
-    "error": {
-      "failed": "Account activation failed"
-    },
-    "label": {
-      "activate": "Activate Account"
-    }
-  },
-  "KnownHostForm": {
-    "help": "Need help adding a new host?",
-    "label": {
-      "add": "Add Host",
-      "find": "Find Host"
-    }
-  },
-  "LoginForm": {
-    "label": {
-      "autoConnect": "Auto Connect",
-      "forgot": "nimi ken pi kama sina li weka tan sona",
-      "login": "mi o kama e sina lon kulupu",
-      "savePassword": "mi o awen e nimi ken",
-      "savedPassword": "mi awen e nimi ken"
-    }
-  },
-  "RegisterForm": {
-    "label": {
-      "register": "Register"
-    },
-    "toast": {
-      "registerSuccess": "Registration Successful!"
-    }
-  },
-  "RequestPasswordResetForm": {
-    "error": "wile ante pi nimi ken li pakala",
-    "mfaEnabled": "Server has multi-factor authentication enabled",
-    "request": "Request Reset Token",
-    "skipRequest": "I already have a reset token"
-  },
-  "ResetPasswordForm": {
-    "error": "ante pi nimi ken li pakala",
-    "label": {
-      "reset": "mi o sin e nimi ken"
-    }
-  }
-}
\ No newline at end of file
diff --git a/webclient/public/locales/yue/translation.json b/webclient/public/locales/yue/translation.json
deleted file mode 100644
index b14041496..000000000
--- a/webclient/public/locales/yue/translation.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
-  "Common": {
-    "language": "",
-    "disconnect": "斷開連線",
-    "label": {
-      "confirmPassword": "確認新密碼：",
-      "confirmSure": "你確定嗎？",
-      "country": "國家：",
-      "delete": "删除",
-      "email": "電郵：",
-      "hostName": "主機名稱",
-      "hostAddress": "主機地址",
-      "password": "密碼:",
-      "passwordAgain": "再次輸入密碼：",
-      "port": "端口：",
-      "realName": "實名：",
-      "saveChanges": "儲存變更",
-      "token": "令牌",
-      "username": "用戶名稱:"
-    },
-    "validation": {
-      "minChars": "最少需要{數目} {數目,眾數,單{字元}或其他{眾字元}}",
-      "passwordsMustMatch": "新舊密碼不一致.",
-      "required": "必須"
-    },
-    "countries": {
-      "AD": "安道爾",
-      "AE": "阿拉伯聯合大公國",
-      "AF": "阿富汗",
-      "AG": "安地卡及巴布達",
-      "AI": "安圭拉",
-      "AL": "阿爾巴尼亞",
-      "AM": "亞美尼亞",
-      "AO": "安哥拉",
-      "AQ": "南極洲",
-      "AR": "阿根廷",
-      "AS": "美屬薩摩亞",
-      "AT": "奧地利",
-      "AU": "澳洲",
-      "AW": "阿魯巴",
-      "AX": "奧蘭群島",
-      "AZ": "亞塞拜然",
-      "BA": "波士尼亞與赫塞哥維納",
-      "BB": "巴貝多",
-      "BD": "孟加拉",
-      "BE": "比利時",
-      "BF": "布吉納法索",
-      "BG": "保加利亞",
-      "BH": "巴林",
-      "BI": "蒲隆地",
-      "BJ": "貝南",
-      "BL": "聖巴泰勒米",
-      "BM": "百慕達",
-      "BN": "汶萊達魯薩蘭國",
-      "BO": "玻利維亞",
-      "BQ": "博內爾島、聖尤斯特歇斯島和薩巴島",
-      "BR": "巴西",
-      "BS": "巴哈馬",
-      "BT": "不丹",
-      "BV": "布韋島",
-      "BW": "波札那",
-      "BY": "白俄羅斯",
-      "BZ": "貝里斯",
-      "CA": "加拿大",
-      "CC": "科科斯（基林）群島",
-      "CD": "剛果民主共和國",
-      "CF": "中非共和國",
-      "CG": "剛果共和國",
-      "CH": "瑞士",
-      "CI": "科特迪瓦",
-      "CK": "庫克群島",
-      "CL": "智利",
-      "CM": "喀麥隆",
-      "CN": "中國",
-      "CO": "哥倫比亞",
-      "CR": "哥斯大黎加",
-      "CU": "古巴",
-      "CV": "維德角",
-      "CW": "庫拉索",
-      "CX": "聖誕島",
-      "CY": "賽普勒斯",
-      "CZ": "捷克",
-      "DE": "德國",
-      "DJ": "吉布地",
-      "DK": "丹麥",
-      "DM": "多明尼加",
-      "DO": "多明尼加共和國",
-      "DZ": "阿爾及利亞",
-      "EC": "厄瓜多",
-      "EE": "愛沙尼亞",
-      "EG": "埃及",
-      "EH": "西撒哈拉",
-      "ER": "厄利垂亞",
-      "ES": "西班牙",
-      "ET": "衣索比亞",
-      "FI": "芬蘭",
-      "FJ": "斐濟",
-      "FK": "福克蘭群島",
-      "FM": "密克羅尼西亞",
-      "FO": "法羅群島",
-      "FR": "法國",
-      "GA": "加彭",
-      "GB": "英國",
-      "GD": "格瑞那達",
-      "GE": "喬治亞",
-      "GF": "法屬圭亞那",
-      "GG": "根西島",
-      "GH": "迦納",
-      "GI": "直布羅陀",
-      "GL": "格陵蘭",
-      "GM": "Gambia",
-      "GN": "Guinea",
-      "GP": "Guadeloupe",
-      "GQ": "Equatorial Guinea",
-      "GR": "Greece",
-      "GS": "South Georgia and the South Sandwich Islands",
-      "GT": "Guatemala",
-      "GU": "Guam",
-      "GW": "Guinea-Bissau",
-      "GY": "Guyana",
-      "HK": "Hong Kong",
-      "HM": "Heard Island and McDonald Islands",
-      "HN": "Honduras",
-      "HR": "Croatia",
-      "HT": "Haiti",
-      "HU": "Hungary",
-      "ID": "Indonesia",
-      "IE": "Ireland",
-      "IL": "Israel",
-      "IM": "Isle of Man",
-      "IN": "India",
-      "IO": "British Indian Ocean Territory",
-      "IQ": "Iraq",
-      "IR": "Iran",
-      "IS": "Iceland",
-      "IT": "Italy",
-      "JE": "Jersey",
-      "JM": "Jamaica",
-      "JO": "Jordan",
-      "JP": "Japan",
-      "KE": "Kenya",
-      "KG": "Kyrgyzstan",
-      "KH": "Cambodia",
-      "KI": "Kiribati",
-      "KM": "Comoros",
-      "KN": "Saint Kitts and Nevis",
-      "KP": "North Korea",
-      "KR": "South Korea",
-      "KW": "Kuwait",
-      "KY": "Cayman Islands",
-      "KZ": "Kazakhstan",
-      "LA": "Laos",
-      "LB": "Lebanon",
-      "LC": "Saint Lucia",
-      "LI": "Liechtenstein",
-      "LK": "Sri Lanka",
-      "LR": "Liberia",
-      "LS": "Lesotho",
-      "LT": "Lithuania",
-      "LU": "Luxembourg",
-      "LV": "Latvia",
-      "LY": "Libya",
-      "MA": "Morocco",
-      "MC": "Monaco",
-      "MD": "Moldova",
-      "ME": "Montenegro",
-      "MF": "Saint Martin (French part)",
-      "MG": "Madagascar",
-      "MH": "Marshall Islands",
-      "MK": "North Macedonia",
-      "ML": "Mali",
-      "MM": "Myanmar",
-      "MN": "Mongolia",
-      "MO": "Macao",
-      "MP": "Northern Mariana Islands",
-      "MQ": "Martinique",
-      "MR": "Mauritania",
-      "MS": "Montserrat",
-      "MT": "Malta",
-      "MU": "Mauritius",
-      "MV": "Maldives",
-      "MW": "Malawi",
-      "MX": "Mexico",
-      "MY": "Malaysia",
-      "MZ": "Mozambique",
-      "NA": "Namibia",
-      "NC": "New Caledonia",
-      "NE": "Niger",
-      "NF": "Norfolk Island",
-      "NG": "Nigeria",
-      "NI": "Nicaragua",
-      "NL": "Netherlands",
-      "NO": "Norway",
-      "NP": "Nepal",
-      "NR": "Nauru",
-      "NU": "Niue",
-      "NZ": "New Zealand",
-      "OM": "Oman",
-      "PA": "Panama",
-      "PE": "Peru",
-      "PF": "French Polynesia",
-      "PG": "Papua New Guinea",
-      "PH": "Philippines",
-      "PK": "Pakistan",
-      "PL": "Poland",
-      "PM": "Saint Pierre and Miquelon",
-      "PN": "Pitcairn",
-      "PR": "Puerto Rico",
-      "PS": "Palestine",
-      "PT": "Portugal",
-      "PW": "Palau",
-      "PY": "Paraguay",
-      "QA": "Qatar",
-      "RE": "Réunion",
-      "RO": "Romania",
-      "RS": "Serbia",
-      "RU": "Russia",
-      "RW": "Rwanda",
-      "SA": "Saudi Arabia",
-      "SB": "Solomon Islands",
-      "SC": "Seychelles",
-      "SD": "Sudan",
-      "SE": "Sweden",
-      "SG": "Singapore",
-      "SH": "Saint Helena, Ascension and Tristan da Cunha",
-      "SI": "Slovenia",
-      "SJ": "Svalbard and Jan Mayen",
-      "SK": "Slovakia",
-      "SL": "Sierra Leone",
-      "SM": "San Marino",
-      "SN": "Senegal",
-      "SO": "Somalia",
-      "SR": "Suriname",
-      "SS": "South Sudan",
-      "ST": "Sao Tome and Principe",
-      "SV": "El Salvador",
-      "SX": "Sint Maarten (Dutch part)",
-      "SY": "Syria",
-      "SZ": "Eswatini",
-      "TC": "Turks and Caicos Islands",
-      "TD": "Chad",
-      "TF": "TAAF",
-      "TG": "Togo",
-      "TH": "Thailand",
-      "TJ": "Tajikistan",
-      "TK": "Tokelau",
-      "TL": "Timor-Leste",
-      "TM": "Turkmenistan",
-      "TN": "Tunisia",
-      "TO": "Tonga",
-      "TR": "Turkey",
-      "TT": "Trinidad and Tobago",
-      "TV": "Tuvalu",
-      "TW": "Taiwan",
-      "TZ": "Tanzania",
-      "UA": "Ukraine",
-      "UG": "Uganda",
-      "UM": "United States Minor Outlying Islands",
-      "US": "United States",
-      "UY": "Uruguay",
-      "UZ": "Uzbekistan",
-      "VA": "Holy See",
-      "VC": "Saint Vincent and the Grenadines",
-      "VE": "Venezuela",
-      "VG": "British Virgin Islands",
-      "VI": "U.S. Virgin Islands",
-      "VN": "Viet Nam",
-      "VU": "Vanuatu",
-      "WF": "Wallis and Futuna",
-      "WS": "Samoa",
-      "YE": "Yemen",
-      "YT": "Mayotte",
-      "XK": "Kosovo",
-      "ZA": "South Africa",
-      "ZM": "Zambia",
-      "ZW": "Zimbabwe",
-      "EU": "European Union"
-    },
-    "languages": {
-      "en-US": "English - US",
-      "fr": "French",
-      "nl": "Dutch",
-      "pt_BR": "Portuguese - Brazil"
-    }
-  },
-  "KnownHosts": {
-    "label": "Host",
-    "add": "Add new host",
-    "toast": "Host successfully {mode, select, created {created} deleted {deleted} other {edited}}."
-  },
-  "InitializeContainer": {
-    "title": "DID YOU KNOW",
-    "subtitle": "<1>Cockatrice is run by volunteers</1><1>that love card games!</1>"
-  },
-  "LoginContainer": {
-    "header": {
-      "title": "Login",
-      "subtitle": "A cross-platform virtual tabletop for multiplayer card games."
-    },
-    "footer": {
-      "registerPrompt": "Not registered yet?",
-      "registerAction": "Create an account",
-      "credit": "Cockatrice is an open source project",
-      "version": "Version"
-    },
-    "content": {
-      "subtitle1": "Play multiplayer card games online.",
-      "subtitle2": "Cross-platform virtual tabletop for multiplayer card games. Forever free."
-    },
-    "toasts": {
-      "passwordResetSuccessToast": "Password Reset Successfully",
-      "accountActivationSuccess": "Account Activated Successfully"
-    }
-  },
-  "UnsupportedContainer": {
-    "title": "Unsupported Browser",
-    "subtitle1": "Please update your browser and/or check your permissions.",
-    "subtitle2": "Note: Private browsing causes some browsers to disable certain permissions or features."
-  },
-  "AccountActivationDialog": {
-    "title": "Account Activation",
-    "subtitle1": "Your account has not been activated yet.",
-    "subtitle2": "You need to provide the activation token received in the activation email."
-  },
-  "KnownHostDialog": {
-    "title": "{mode, select, edit {Edit} other {Add}} Known Host",
-    "subtitle": "Adding a new host allows you to connect to different servers. Enter the details below to your host list."
-  },
-  "RegistrationDialog": {
-    "title": "Create New Account"
-  },
-  "RequestPasswordResetDialog": {
-    "title": "Request Password Reset"
-  },
-  "ResetPasswordDialog": {
-    "title": "Reset Password"
-  },
-  "AccountActivationForm": {
-    "error": {
-      "failed": "Account activation failed"
-    },
-    "label": {
-      "activate": "Activate Account"
-    }
-  },
-  "KnownHostForm": {
-    "help": "Need help adding a new host?",
-    "label": {
-      "add": "Add Host",
-      "find": "Find Host"
-    }
-  },
-  "LoginForm": {
-    "label": {
-      "autoConnect": "Auto Connect",
-      "forgot": "Forgot Password",
-      "login": "Login",
-      "savePassword": "Save Password",
-      "savedPassword": "Saved Password"
-    }
-  },
-  "RegisterForm": {
-    "label": {
-      "register": "Register"
-    },
-    "toast": {
-      "registerSuccess": "Registration Successful!"
-    }
-  },
-  "RequestPasswordResetForm": {
-    "error": "Request password reset failed",
-    "mfaEnabled": "Server has multi-factor authentication enabled",
-    "request": "Request Reset Token",
-    "skipRequest": "I already have a reset token"
-  },
-  "ResetPasswordForm": {
-    "error": "Password reset failed",
-    "label": {
-      "reset": "Reset Password"
-    }
-  }
-}
\ No newline at end of file
diff --git a/webclient/public/logo192.png b/webclient/public/logo192.png
deleted file mode 100644
index fa313abf5..000000000
Binary files a/webclient/public/logo192.png and /dev/null differ
diff --git a/webclient/public/logo512.png b/webclient/public/logo512.png
deleted file mode 100644
index bd5d4b5e2..000000000
Binary files a/webclient/public/logo512.png and /dev/null differ
diff --git a/webclient/public/manifest.json b/webclient/public/manifest.json
deleted file mode 100644
index 080d6c77a..000000000
--- a/webclient/public/manifest.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
diff --git a/webclient/public/pb/.gitignore b/webclient/public/pb/.gitignore
deleted file mode 100644
index 571442132..000000000
--- a/webclient/public/pb/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore all files
-* 
-# Except gitignore
-!.gitignore
\ No newline at end of file
diff --git a/webclient/public/reset.css b/webclient/public/reset.css
deleted file mode 100644
index af944401f..000000000
--- a/webclient/public/reset.css
+++ /dev/null
@@ -1,48 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/ 
-   v2.0 | 20110126
-   License: none (public domain)
-*/
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-size: 100%;
-	font: inherit;
-	vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure, 
-footer, header, hgroup, menu, nav, section {
-	display: block;
-}
-body {
-	line-height: 1;
-}
-ol, ul {
-	list-style: none;
-}
-blockquote, q {
-	quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: '';
-	content: none;
-}
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
\ No newline at end of file
diff --git a/webclient/public/robots.txt b/webclient/public/robots.txt
deleted file mode 100644
index 01b0f9a10..000000000
--- a/webclient/public/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
diff --git a/webclient/src/api/AdminService.tsx b/webclient/src/api/AdminService.tsx
deleted file mode 100644
index 623ad546a..000000000
--- a/webclient/src/api/AdminService.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { AdminCommands } from 'websocket';
-
-export class AdminService {
-  static adjustMod(userName: string, shouldBeMod?: boolean, shouldBeJudge?: boolean): void {
-    AdminCommands.adjustMod(userName, shouldBeMod, shouldBeJudge);
-  }
-
-  static reloadConfig(): void {
-    AdminCommands.reloadConfig();
-  }
-
-  static shutdownServer(reason: string, minutes: number): void {
-    AdminCommands.shutdownServer(reason, minutes);
-  }
-
-  static updateServerMessage(): void {
-    AdminCommands.updateServerMessage();
-  }
-}
diff --git a/webclient/src/api/AuthenticationService.tsx b/webclient/src/api/AuthenticationService.tsx
deleted file mode 100644
index 368390708..000000000
--- a/webclient/src/api/AuthenticationService.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { StatusEnum, User, WebSocketConnectReason, WebSocketConnectOptions } from 'types';
-import { SessionCommands, webClient } from 'websocket';
-
-export class AuthenticationService {
-  static login(options: WebSocketConnectOptions): void {
-    SessionCommands.connect(options, WebSocketConnectReason.LOGIN);
-  }
-
-  static testConnection(options: WebSocketConnectOptions): void {
-    SessionCommands.connect(options, WebSocketConnectReason.TEST_CONNECTION);
-  }
-
-  static register(options: WebSocketConnectOptions): void {
-    SessionCommands.connect(options, WebSocketConnectReason.REGISTER);
-  }
-
-  static activateAccount(options: WebSocketConnectOptions): void {
-    SessionCommands.connect(options, WebSocketConnectReason.ACTIVATE_ACCOUNT);
-  }
-
-  static resetPasswordRequest(options: WebSocketConnectOptions): void {
-    SessionCommands.connect(options, WebSocketConnectReason.PASSWORD_RESET_REQUEST);
-  }
-
-  static resetPasswordChallenge(options: WebSocketConnectOptions): void {
-    SessionCommands.connect(options, WebSocketConnectReason.PASSWORD_RESET_CHALLENGE);
-  }
-
-  static resetPassword(options: WebSocketConnectOptions): void {
-    SessionCommands.connect(options, WebSocketConnectReason.PASSWORD_RESET);
-  }
-
-  static disconnect(): void {
-    SessionCommands.disconnect();
-  }
-
-  static isConnected(state: number): boolean {
-    return state === StatusEnum.LOGGED_IN;
-  }
-
-  static isModerator(user: User): boolean {
-    const moderatorLevel = webClient.protobuf.controller.ServerInfo_User.UserLevelFlag.IsModerator;
-    // @TODO tell cockatrice not to do this so shittily
-    return (user.userLevel & moderatorLevel) === moderatorLevel;
-  }
-
-  static isAdmin() {
-
-  }
-
-  static connectionAttemptMade() {
-    return webClient.connectionAttemptMade;
-  }
-}
diff --git a/webclient/src/api/ModeratorService.tsx b/webclient/src/api/ModeratorService.tsx
deleted file mode 100644
index e7c8822e8..000000000
--- a/webclient/src/api/ModeratorService.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { ModeratorCommands } from 'websocket';
-import { LogFilters } from 'types';
-
-export class ModeratorService {
-  static banFromServer(minutes: number, userName?: string, address?: string, reason?: string,
-    visibleReason?: string, clientid?: string, removeMessages?: number): void {
-    ModeratorCommands.banFromServer(minutes, userName, address, reason, visibleReason, clientid, removeMessages);
-  }
-
-  static getBanHistory(userName: string): void {
-    ModeratorCommands.getBanHistory(userName);
-  }
-
-  static getWarnHistory(userName: string): void {
-    ModeratorCommands.getWarnHistory(userName);
-  }
-
-  static getWarnList(modName: string, userName: string, userClientid: string): void {
-    ModeratorCommands.getWarnList(modName, userName, userClientid);
-  }
-
-  static viewLogHistory(filters: LogFilters): void {
-    ModeratorCommands.viewLogHistory(filters);
-  }
-
-  static warnUser(userName: string, reason: string, clientid?: string, removeMessage?: boolean): void {
-    ModeratorCommands.warnUser(userName, reason, clientid, removeMessage);
-  }
-}
diff --git a/webclient/src/api/RoomsService.tsx b/webclient/src/api/RoomsService.tsx
deleted file mode 100644
index bfb63d92a..000000000
--- a/webclient/src/api/RoomsService.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { RoomCommands, SessionCommands } from 'websocket';
-
-export class RoomsService {
-  static joinRoom(roomId: number): void {
-    SessionCommands.joinRoom(roomId);
-  }
-
-  static leaveRoom(roomId: number): void {
-    RoomCommands.leaveRoom(roomId);
-  }
-
-  static roomSay(roomId: number, message: string): void {
-    RoomCommands.roomSay(roomId, message);
-  }
-}
diff --git a/webclient/src/api/SessionService.tsx b/webclient/src/api/SessionService.tsx
deleted file mode 100644
index 051954f93..000000000
--- a/webclient/src/api/SessionService.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import { SessionCommands } from 'websocket';
-import { common } from 'protobufjs';
-import IBytesValue = common.IBytesValue;
-
-export class SessionService {
-  static addToBuddyList(userName: string) {
-    SessionCommands.addToBuddyList(userName);
-  }
-
-  static removeFromBuddyList(userName: string) {
-    SessionCommands.removeFromBuddyList(userName);
-  }
-
-  static addToIgnoreList(userName: string) {
-    SessionCommands.addToIgnoreList(userName);
-  }
-
-  static removeFromIgnoreList(userName: string) {
-    SessionCommands.removeFromIgnoreList(userName);
-  }
-
-  static changeAccountPassword(oldPassword: string, newPassword: string, hashedNewPassword?: string): void {
-    SessionCommands.accountPassword(oldPassword, newPassword, hashedNewPassword);
-  }
-
-  static changeAccountDetails(passwordCheck: string, realName?: string, email?: string, country?: string): void {
-    SessionCommands.accountEdit(passwordCheck, realName, email, country);
-  }
-
-  static changeAccountImage(image: IBytesValue): void {
-    SessionCommands.accountImage(image);
-  }
-
-  static sendDirectMessage(userName: string, message: string): void {
-    SessionCommands.message(userName, message);
-  }
-
-  static getUserInfo(userName: string): void {
-    SessionCommands.getUserInfo(userName);
-  }
-
-  static getUserGames(userName: string): void {
-    SessionCommands.getGamesOfUser(userName);
-  }
-}
diff --git a/webclient/src/api/index.ts b/webclient/src/api/index.ts
deleted file mode 100644
index c4f67092e..000000000
--- a/webclient/src/api/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export { AdminService } from './AdminService';
-export { AuthenticationService } from './AuthenticationService';
-export { ModeratorService } from './ModeratorService';
-export { RoomsService } from './RoomsService';
-export { SessionService } from './SessionService';
diff --git a/webclient/src/common.i18n.json b/webclient/src/common.i18n.json
deleted file mode 100644
index 64a102c38..000000000
--- a/webclient/src/common.i18n.json
+++ /dev/null
@@ -1,286 +0,0 @@
-{
-  "Common": {
-    "language": "English",
-    "disconnect": "Disconnect",
-    "label": {
-      "confirmPassword": "Confirm Password",
-      "confirmSure": "Are you sure?",
-      "country": "Country",
-      "delete": "Delete",
-      "email": "Email",
-      "hostName": "Host Name",
-      "hostAddress": "Host Address",
-      "password": "Password",
-      "passwordAgain": "Password Again",
-      "port": "Port",
-      "realName": "Real Name",
-      "saveChanges": "Save Changes",
-      "token": "Token",
-      "username": "Username"
-    },
-    "validation": {
-      "minChars": "Minimum of {count} {count, plural, one {character} other {characters}} required",
-      "passwordsMustMatch": "Passwords don't match",
-      "required": "Required"
-    },
-    "countries": {
-      "AD": "Andorra",
-      "AE": "United Arab Emirates",
-      "AF": "Afghanistan",
-      "AG": "Antigua and Barbuda",
-      "AI": "Anguilla",
-      "AL": "Albania",
-      "AM": "Armenia",
-      "AO": "Angola",
-      "AQ": "Antarctica",
-      "AR": "Argentina",
-      "AS": "American Samoa",
-      "AT": "Austria",
-      "AU": "Australia",
-      "AW": "Aruba",
-      "AX": "Åland Islands",
-      "AZ": "Azerbaijan",
-      "BA": "Bosnia and Herzegovina",
-      "BB": "Barbados",
-      "BD": "Bangladesh",
-      "BE": "Belgium",
-      "BF": "Burkina Faso",
-      "BG": "Bulgaria",
-      "BH": "Bahrain",
-      "BI": "Burundi",
-      "BJ": "Benin",
-      "BL": "Saint Barthélemy",
-      "BM": "Bermuda",
-      "BN": "Brunei Darussalam",
-      "BO": "Bolivia",
-      "BQ": "Bonaire, Sint Eustatius and Saba",
-      "BR": "Brazil",
-      "BS": "Bahamas",
-      "BT": "Bhutan",
-      "BV": "Bouvet Island",
-      "BW": "Botswana",
-      "BY": "Belarus",
-      "BZ": "Belize",
-      "CA": "Canada",
-      "CC": "Cocos (Keeling) Islands",
-      "CD": "DR Congo",
-      "CF": "Central African Republic",
-      "CG": "Republic of the Congo",
-      "CH": "Switzerland",
-      "CI": "Ivory Coast",
-      "CK": "Cook Islands",
-      "CL": "Chile",
-      "CM": "Cameroon",
-      "CN": "China",
-      "CO": "Colombia",
-      "CR": "Costa Rica",
-      "CU": "Cuba",
-      "CV": "Cape Verde",
-      "CW": "Curaçao",
-      "CX": "Christmas Island",
-      "CY": "Cyprus",
-      "CZ": "Czechia",
-      "DE": "Germany",
-      "DJ": "Djibouti",
-      "DK": "Denmark",
-      "DM": "Dominica",
-      "DO": "Dominican Republic",
-      "DZ": "Algeria",
-      "EC": "Ecuador",
-      "EE": "Estonia",
-      "EG": "Egypt",
-      "EH": "Western Sahara",
-      "ER": "Eritrea",
-      "ES": "Spain",
-      "ET": "Ethiopia",
-      "FI": "Finland",
-      "FJ": "Fiji",
-      "FK": "Falkland Islands",
-      "FM": "Micronesia",
-      "FO": "Faroe Islands",
-      "FR": "France",
-      "GA": "Gabon",
-      "GB": "United Kingdom",
-      "GD": "Grenada",
-      "GE": "Georgia",
-      "GF": "French Guiana",
-      "GG": "Guernsey",
-      "GH": "Ghana",
-      "GI": "Gibraltar",
-      "GL": "Greenland",
-      "GM": "Gambia",
-      "GN": "Guinea",
-      "GP": "Guadeloupe",
-      "GQ": "Equatorial Guinea",
-      "GR": "Greece",
-      "GS": "South Georgia and the South Sandwich Islands",
-      "GT": "Guatemala",
-      "GU": "Guam",
-      "GW": "Guinea-Bissau",
-      "GY": "Guyana",
-      "HK": "Hong Kong",
-      "HM": "Heard Island and McDonald Islands",
-      "HN": "Honduras",
-      "HR": "Croatia",
-      "HT": "Haiti",
-      "HU": "Hungary",
-      "ID": "Indonesia",
-      "IE": "Ireland",
-      "IL": "Israel",
-      "IM": "Isle of Man",
-      "IN": "India",
-      "IO": "British Indian Ocean Territory",
-      "IQ": "Iraq",
-      "IR": "Iran",
-      "IS": "Iceland",
-      "IT": "Italy",
-      "JE": "Jersey",
-      "JM": "Jamaica",
-      "JO": "Jordan",
-      "JP": "Japan",
-      "KE": "Kenya",
-      "KG": "Kyrgyzstan",
-      "KH": "Cambodia",
-      "KI": "Kiribati",
-      "KM": "Comoros",
-      "KN": "Saint Kitts and Nevis",
-      "KP": "North Korea",
-      "KR": "South Korea",
-      "KW": "Kuwait",
-      "KY": "Cayman Islands",
-      "KZ": "Kazakhstan",
-      "LA": "Laos",
-      "LB": "Lebanon",
-      "LC": "Saint Lucia",
-      "LI": "Liechtenstein",
-      "LK": "Sri Lanka",
-      "LR": "Liberia",
-      "LS": "Lesotho",
-      "LT": "Lithuania",
-      "LU": "Luxembourg",
-      "LV": "Latvia",
-      "LY": "Libya",
-      "MA": "Morocco",
-      "MC": "Monaco",
-      "MD": "Moldova",
-      "ME": "Montenegro",
-      "MF": "Saint Martin (French part)",
-      "MG": "Madagascar",
-      "MH": "Marshall Islands",
-      "MK": "North Macedonia",
-      "ML": "Mali",
-      "MM": "Myanmar",
-      "MN": "Mongolia",
-      "MO": "Macao",
-      "MP": "Northern Mariana Islands",
-      "MQ": "Martinique",
-      "MR": "Mauritania",
-      "MS": "Montserrat",
-      "MT": "Malta",
-      "MU": "Mauritius",
-      "MV": "Maldives",
-      "MW": "Malawi",
-      "MX": "Mexico",
-      "MY": "Malaysia",
-      "MZ": "Mozambique",
-      "NA": "Namibia",
-      "NC": "New Caledonia",
-      "NE": "Niger",
-      "NF": "Norfolk Island",
-      "NG": "Nigeria",
-      "NI": "Nicaragua",
-      "NL": "Netherlands",
-      "NO": "Norway",
-      "NP": "Nepal",
-      "NR": "Nauru",
-      "NU": "Niue",
-      "NZ": "New Zealand",
-      "OM": "Oman",
-      "PA": "Panama",
-      "PE": "Peru",
-      "PF": "French Polynesia",
-      "PG": "Papua New Guinea",
-      "PH": "Philippines",
-      "PK": "Pakistan",
-      "PL": "Poland",
-      "PM": "Saint Pierre and Miquelon",
-      "PN": "Pitcairn",
-      "PR": "Puerto Rico",
-      "PS": "Palestine",
-      "PT": "Portugal",
-      "PW": "Palau",
-      "PY": "Paraguay",
-      "QA": "Qatar",
-      "RE": "Réunion",
-      "RO": "Romania",
-      "RS": "Serbia",
-      "RU": "Russia",
-      "RW": "Rwanda",
-      "SA": "Saudi Arabia",
-      "SB": "Solomon Islands",
-      "SC": "Seychelles",
-      "SD": "Sudan",
-      "SE": "Sweden",
-      "SG": "Singapore",
-      "SH": "Saint Helena, Ascension and Tristan da Cunha",
-      "SI": "Slovenia",
-      "SJ": "Svalbard and Jan Mayen",
-      "SK": "Slovakia",
-      "SL": "Sierra Leone",
-      "SM": "San Marino",
-      "SN": "Senegal",
-      "SO": "Somalia",
-      "SR": "Suriname",
-      "SS": "South Sudan",
-      "ST": "Sao Tome and Principe",
-      "SV": "El Salvador",
-      "SX": "Sint Maarten (Dutch part)",
-      "SY": "Syria",
-      "SZ": "Eswatini",
-      "TC": "Turks and Caicos Islands",
-      "TD": "Chad",
-      "TF": "TAAF",
-      "TG": "Togo",
-      "TH": "Thailand",
-      "TJ": "Tajikistan",
-      "TK": "Tokelau",
-      "TL": "Timor-Leste",
-      "TM": "Turkmenistan",
-      "TN": "Tunisia",
-      "TO": "Tonga",
-      "TR": "Turkey",
-      "TT": "Trinidad and Tobago",
-      "TV": "Tuvalu",
-      "TW": "Taiwan",
-      "TZ": "Tanzania",
-      "UA": "Ukraine",
-      "UG": "Uganda",
-      "UM": "United States Minor Outlying Islands",
-      "US": "United States",
-      "UY": "Uruguay",
-      "UZ": "Uzbekistan",
-      "VA": "Holy See",
-      "VC": "Saint Vincent and the Grenadines",
-      "VE": "Venezuela",
-      "VG": "British Virgin Islands",
-      "VI": "U.S. Virgin Islands",
-      "VN": "Viet Nam",
-      "VU": "Vanuatu",
-      "WF": "Wallis and Futuna",
-      "WS": "Samoa",
-      "YE": "Yemen",
-      "YT": "Mayotte",
-      "XK": "Kosovo",
-      "ZA": "South Africa",
-      "ZM": "Zambia",
-      "ZW": "Zimbabwe",
-      "EU": "European Union"
-    },
-    "languages": {
-      "en-US": "English - US",
-      "fr": "French",
-      "nl": "Dutch",
-      "pt_BR": "Portuguese - Brazil"
-    }
-  } 
-}
diff --git a/webclient/src/components/Card/Card.css b/webclient/src/components/Card/Card.css
deleted file mode 100644
index 976618634..000000000
--- a/webclient/src/components/Card/Card.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.card {
-	width: 100%;
-	height: 100%;
-}
diff --git a/webclient/src/components/Card/Card.tsx b/webclient/src/components/Card/Card.tsx
deleted file mode 100644
index f89622c3b..000000000
--- a/webclient/src/components/Card/Card.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-// eslint-disable-next-line
-import React, { useMemo, useState } from 'react';
-
-import { CardDTO } from 'services';
-
-import './Card.css';
-
-interface CardProps {
-  card: CardDTO;
-}
-
-const Card = ({ card }: CardProps) => {
-  const src = `https://api.scryfall.com/cards/${card?.identifiers?.scryfallId}?format=image`;
-
-  return card && (
-    <img className="card" src={src} alt={card?.name} />
-  );
-}
-
-export default Card;
diff --git a/webclient/src/components/CardDetails/CardDetails.css b/webclient/src/components/CardDetails/CardDetails.css
deleted file mode 100644
index 7009049d2..000000000
--- a/webclient/src/components/CardDetails/CardDetails.css
+++ /dev/null
@@ -1,45 +0,0 @@
-.cardDetails {
-  padding: 10px;
-  width: calc(400px * .716);
-  font-size: 10px;
-}
-
-.cardDetails-card {
-  height: 400px;
-  margin: 0 auto;
-}
-
-.cardDetails-attribute {
-  display: flex;
-  justify-content: space-between;
-  align-items: baseline;
-}
-
-.cardDetails-attributes {
-  margin: 10px 0;
-}
-
-.cardDetails-attribute__label {
-  text-transform: uppercase;
-  font-size: 10px;
-  margin-right: 10px;
-}
-
-.cardDetails-attribute__value {
-  text-align: right;
-}
-
-.cardDetails-text {
-  font-size: 12px;
-  padding: 5px;
-  background: rgba(0, 0, 0, .15);
-  white-space: pre-line;
-}
-
-.cardDetails-text__flavor {
-  font-style: italic;
-}
-
-.cardDetails-text__current:not(:empty) + .cardDetails-text__flavor {
-  margin-top: 10px;
-}
diff --git a/webclient/src/components/CardDetails/CardDetails.tsx b/webclient/src/components/CardDetails/CardDetails.tsx
deleted file mode 100644
index 84196fda6..000000000
--- a/webclient/src/components/CardDetails/CardDetails.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-// eslint-disable-next-line
-import React, { useMemo, useState } from 'react';
-
-import { CardDTO } from 'services';
-
-import Card from '../Card/Card';
-
-import './CardDetails.css';
-
-interface CardProps {
-  card: CardDTO;
-}
-
-// @TODO: add missing fields (loyalty, hand, etc)
-
-const CardDetails = ({ card }: CardProps) => {
-  return (
-    <div className='cardDetails'>
-      <div className='cardDetails-card'>
-        <Card card={card} />
-      </div>
-
-      {
-        card && (
-          <div>
-            <div className='cardDetails-attributes'>
-              <div className='cardDetails-attribute'>
-                <span className='cardDetails-attribute__label'>Name:</span>
-                <span className='cardDetails-attribute__value'>{card.name}</span>
-              </div>
-
-              {
-                (!card.power && !card.toughness) ? null : (
-                  <div className='cardDetails-attribute'>
-                    <span className='cardDetails-attribute__label'>P/T:</span>
-                    <span className='cardDetails-attribute__value'>{card.power || 0}/{card.toughness || 0}</span>
-                  </div>
-                )
-              }
-
-              {
-                !card.manaCost ? null : (
-                  <div className='cardDetails-attribute'>
-                    <span className='cardDetails-attribute__label'>Cost:</span>
-                    <span className='cardDetails-attribute__value'>{card.manaCost.replace(/\{|\}/g, '')}</span>
-                  </div>
-                )
-              }
-
-              {
-                !card.convertedManaCost ? null : (
-                  <div className='cardDetails-attribute'>
-                    <span className='cardDetails-attribute__label'>CMC:</span>
-                    <span className='cardDetails-attribute__value'>{card.convertedManaCost}</span>
-                  </div>
-                )
-              }
-
-              {
-                !card.colorIdentity?.length ? null : (
-                  <div className='cardDetails-attribute'>
-                    <span className='cardDetails-attribute__label'>Identity:</span>
-                    <span className='cardDetails-attribute__value'>{card.colorIdentity.join('')}</span>
-                  </div>
-                )
-              }
-
-              {
-                !card.colors?.length ? null : (
-                  <div className='cardDetails-attribute'>
-                    <span className='cardDetails-attribute__label'>Color(s):</span>
-                    <span className='cardDetails-attribute__value'>{card.colors.join('')}</span>
-                  </div>
-                )
-              }
-
-              {
-                !card.types?.length ? null : (
-                  <div className='cardDetails-attribute'>
-                    <span className='cardDetails-attribute__label'>Main Type:</span>
-                    <span className='cardDetails-attribute__value'>{card.types.join(', ')}</span>
-                  </div>
-                )
-              }
-
-              {
-                !card.type ? null : (
-                  <div className='cardDetails-attribute'>
-                    <span className='cardDetails-attribute__label'>Type:</span>
-                    <span className='cardDetails-attribute__value'>{card.type}</span>
-                  </div>
-                )
-              }
-
-              {
-                !card.side ? null : (
-                  <div className='cardDetails-attribute'>
-                    <span className='cardDetails-attribute__label'>Side:</span>
-                    <span className='cardDetails-attribute__value'>{card.side}</span>
-                  </div>
-                )
-              }
-
-              {
-                !card.layout ? null : (
-                  <div className='cardDetails-attribute'>
-                    <span className='cardDetails-attribute__label'>Layout:</span>
-                    <span className='cardDetails-attribute__value'>{card.layout}</span>
-                  </div>
-                )
-              }
-            </div>
-
-            <div className='cardDetails-text'>
-              <div className='cardDetails-text__current'>
-                {card.text?.trim()}
-              </div>
-
-              <div className='cardDetails-text__flavor'>
-                {card.flavorText?.trim()}
-              </div>
-            </div>
-          </div>
-        )
-      }
-    </div>
-  );
-}
-
-export default CardDetails;
diff --git a/webclient/src/components/CheckboxField/CheckboxField.css b/webclient/src/components/CheckboxField/CheckboxField.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/webclient/src/components/CheckboxField/CheckboxField.tsx b/webclient/src/components/CheckboxField/CheckboxField.tsx
deleted file mode 100644
index 562687489..000000000
--- a/webclient/src/components/CheckboxField/CheckboxField.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-import Checkbox from '@mui/material/Checkbox';
-import FormControlLabel from '@mui/material/FormControlLabel';
-
-const CheckboxField = (props) => {
-  const { input: { value, onChange }, label, ...args } = props;
-
-  // @TODO this isnt unchecking properly
-  return (
-    <FormControlLabel
-      className="checkbox-field"
-      label={label}
-      control={
-        <Checkbox
-          { ...args }
-          className="checkbox-field__box"
-          checked={!!value}
-          onChange={(e, checked) => onChange(checked)}
-          color="primary"
-        />
-      }
-    />
-  );
-};
-
-export default CheckboxField;
diff --git a/webclient/src/components/CountryDropdown/CountryDropdown.css b/webclient/src/components/CountryDropdown/CountryDropdown.css
deleted file mode 100644
index 9b1679516..000000000
--- a/webclient/src/components/CountryDropdown/CountryDropdown.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.CountryDropdown {
-  width: 100%;
-}
-
-.CountryDropdown-item {
-  display: flex;
-  align-items: center;
-}
-
-.CountryDropdown-item__image {
-  width: 1.5em;
-  margin-right: 1em;
-}
diff --git a/webclient/src/components/CountryDropdown/CountryDropdown.tsx b/webclient/src/components/CountryDropdown/CountryDropdown.tsx
deleted file mode 100644
index 09b1cf71e..000000000
--- a/webclient/src/components/CountryDropdown/CountryDropdown.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { useEffect, useState } from 'react';
-import { Select, MenuItem } from '@mui/material';
-import FormControl from '@mui/material/FormControl';
-import InputLabel from '@mui/material/InputLabel';
-import { useTranslation } from 'react-i18next';
-
-import { useLocaleSort } from 'hooks';
-import { Images } from 'images/Images';
-import { countryCodes } from 'types';
-
-
-import './CountryDropdown.css';
-
-const CountryDropdown = ({ input: { onChange } }) => {
-  const [value, setValue] = useState('');
-  const { t } = useTranslation();
-
-  useEffect(() => onChange(value), [value]);
-
-  const translateCountry = country => t(`Common.countries.${country}`);
-  const sortedCountries = useLocaleSort(countryCodes, translateCountry);
-
-  return (
-    <FormControl size='small' variant='outlined' className='CountryDropdown'>
-      <InputLabel id='CountryDropdown-select'>Country</InputLabel>
-      <Select
-        id='CountryDropdown-select'
-        labelId='CountryDropdown-label'
-        label='Country'
-        margin='dense'
-        value={value}
-        fullWidth={true}
-        onChange={e => setValue(e.target.value as string)}
-      >
-        <MenuItem value={''} key={-1}>
-          <div className="CountryDropdown-item">
-            <span className="CountryDropdown-item__label">None</span>
-          </div>
-        </MenuItem>
-
-        {
-          sortedCountries.map((country, index:number) => (
-            <MenuItem value={country} key={index}>
-              <div className="CountryDropdown-item">
-                <img className="CountryDropdown-item__image" src={Images.Countries[country.toLowerCase()]} />
-                <span className="CountryDropdown-item__label">{translateCountry(country)}</span>
-              </div>
-            </MenuItem>
-          ))
-        }
-      </Select>
-    </FormControl>
-  )
-};
-
-export default CountryDropdown;
diff --git a/webclient/src/components/Guard/AuthGuard.tsx b/webclient/src/components/Guard/AuthGuard.tsx
deleted file mode 100644
index eea42dc7b..000000000
--- a/webclient/src/components/Guard/AuthGuard.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import { Navigate } from 'react-router-dom';
-
-import { ServerSelectors } from 'store';
-import { RouteEnum } from 'types';
-
-import { AuthenticationService } from 'api';
-
-const AuthGuard = ({ state }: AuthGuardProps) => {
-  return !AuthenticationService.isConnected(state)
-    ? <Navigate to={RouteEnum.LOGIN} />
-    : <div></div>;
-};
-
-interface AuthGuardProps {
-  state: number;
-}
-
-const mapStateToProps = state => ({
-  state: ServerSelectors.getState(state),
-});
-
-export default connect(mapStateToProps)(AuthGuard);
diff --git a/webclient/src/components/Guard/ModGuard.tsx b/webclient/src/components/Guard/ModGuard.tsx
deleted file mode 100644
index c8bc6d663..000000000
--- a/webclient/src/components/Guard/ModGuard.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { Navigate } from 'react-router-dom';
-
-import { ServerSelectors } from 'store';
-import { User } from 'types';
-
-import { AuthenticationService } from 'api';
-import { RouteEnum } from 'types';
-
-class ModGuard extends Component<ModGuardProps> {
-  render() {
-    return !AuthenticationService.isModerator(this.props.user)
-      ? <Navigate to={RouteEnum.SERVER} />
-      : '';
-  }
-};
-
-interface ModGuardProps {
-  user: User;
-}
-
-const mapStateToProps = state => ({
-  user: ServerSelectors.getUser(state),
-});
-
-export default connect(mapStateToProps)(ModGuard);
diff --git a/webclient/src/components/InputAction/InputAction.css b/webclient/src/components/InputAction/InputAction.css
deleted file mode 100644
index 25e784a3a..000000000
--- a/webclient/src/components/InputAction/InputAction.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.input-action {
-  display: flex;
-  width: 100%;
-  align-items: center;
-}
-
-.input-action,
-.input-action__item,
-.input-action__submit {
-  padding: 5px;
-}
-
-.input-action__item {
-  width: 100%;
-  height: 100%; 
-}
-.input-action__item > div {
-  margin: 0;
-}
\ No newline at end of file
diff --git a/webclient/src/components/InputAction/InputAction.tsx b/webclient/src/components/InputAction/InputAction.tsx
deleted file mode 100644
index 459b89904..000000000
--- a/webclient/src/components/InputAction/InputAction.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react';
-import { Field } from 'react-final-form'
-import Button from '@mui/material/Button';
-
-import { InputField } from 'components';
-
-import './InputAction.css';
-
-const InputAction = ({ action, label, name, validate, disabled }) => (
-  <div className="input-action">
-    <div className="input-action__item">
-      <Field label={label} name={name} component={InputField} validate={validate} />
-    </div>
-    <div className="input-action__submit">
-      <Button color="primary" variant="contained" type="submit" disabled={disabled}>
-        {action}
-      </Button>
-    </div>
-  </div>
-);
-
-InputAction.defaultProps = {
-  disabled: false,
-  validate: () => false,
-}
-
-export default InputAction;
diff --git a/webclient/src/components/InputField/InputField.css b/webclient/src/components/InputField/InputField.css
deleted file mode 100644
index 819f7112a..000000000
--- a/webclient/src/components/InputField/InputField.css
+++ /dev/null
@@ -1,20 +0,0 @@
-.InputField {
-  position: relative;
-}
-
-.InputField-validation {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translateY(-50%);
-  font-weight: bold;
-}
-
-.InputField-error {
-  display: flex;
-  align-items: center;
-}
-
-.InputField-error svg {
-  margin-left: 4px;
-}
diff --git a/webclient/src/components/InputField/InputField.tsx b/webclient/src/components/InputField/InputField.tsx
deleted file mode 100644
index 3299ba383..000000000
--- a/webclient/src/components/InputField/InputField.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React from 'react';
-import { styled } from '@mui/material/styles';
-import TextField from '@mui/material/TextField';
-import ErrorOutlinedIcon from '@mui/icons-material/ErrorOutlined';
-
-import './InputField.css';
-
-const PREFIX = 'InputField';
-
-const classes = {
-  root: `${PREFIX}-root`
-};
-
-const Root = styled('div')(({ theme }) => ({
-  [`&.${classes.root}`]: {
-    '& .InputField-error': {
-      color: theme.palette.error.main
-    },
-
-    '& .InputField-warning': {
-      color: theme.palette.warning.main
-    },
-  },
-}));
-
-const InputField = ({ input, meta, ...args }) => {
-  const { touched, error, warning } = meta;
-
-  return (
-    <Root className={'InputField ' + classes.root}>
-      { touched && (
-        <div className="InputField-validation">
-          {
-            (error &&
-              <div className="InputField-error">
-                {error}
-                <ErrorOutlinedIcon style={{ fontSize: 'small', fontWeight: 'bold' }} />
-              </div>
-            ) ||
-
-            (warning && <div className="InputField-warning">{warning}</div>)
-          }
-        </div>
-      ) }
-
-      <TextField
-        autoComplete='off'
-        { ...input }
-        { ...args }
-        className="rounded"
-        variant="outlined"
-        margin="dense"
-        size="small"
-        fullWidth={true}
-      />
-    </Root>
-  );
-};
-
-export default InputField;
diff --git a/webclient/src/components/KnownHosts/KnownHosts.css b/webclient/src/components/KnownHosts/KnownHosts.css
deleted file mode 100644
index 32a3a9fcc..000000000
--- a/webclient/src/components/KnownHosts/KnownHosts.css
+++ /dev/null
@@ -1,70 +0,0 @@
-.KnownHosts {
-}
-
-.KnownHosts-form {
-  width: 100%;
-  position: relative;
-}
-
-.KnownHosts-item {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-}
-
-.KnownHosts-item__wrapper {
-  display: flex;
-  align-items: center;
-}
-
-.KnownHosts-item__label {
-  position: relative;
-}
-
-.KnownHosts-item__label svg {
-  display: none;
-  position: absolute;
-  left: -.1em;
-  top: 50%;
-  transform: translate(-100%, -50%);
-  font-size: .9em;
-}
-
-.KnownHosts-item__status {
-  display: none;
-}
-
-.KnownHosts-item__status svg {
-  margin-left: -5px;
-  margin-right: 5px;
-}
-
-.KnownHosts-validation {
-  position: absolute;
-  top: 0;
-  right: 0;
-  transform: translateY(-100%);
-  font-weight: bold;
-}
-
-.KnownHosts-error {
-  display: flex;
-  align-items: center;
-}
-
-.KnownHosts-error svg {
-  margin-left: 4px;
-}
-
-.KnownHosts .MuiSelect-select .KnownHosts-item__status {
-  display: flex;
-}
-
-.Mui-selected .KnownHosts-item__label svg {
-  display: block;
-}
-
-.MuiSelect-select .KnownHosts-item__edit {
-  display: none;
-}
diff --git a/webclient/src/components/KnownHosts/KnownHosts.i18n.json b/webclient/src/components/KnownHosts/KnownHosts.i18n.json
deleted file mode 100644
index 3de8fd887..000000000
--- a/webclient/src/components/KnownHosts/KnownHosts.i18n.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "KnownHosts": {
-    "label": "Host",
-    "add": "Add new host",
-    "toast": "Host successfully {mode, select, created {created} deleted {deleted} other {edited}}."
-  }
-}
diff --git a/webclient/src/components/KnownHosts/KnownHosts.tsx b/webclient/src/components/KnownHosts/KnownHosts.tsx
deleted file mode 100644
index f65a98c38..000000000
--- a/webclient/src/components/KnownHosts/KnownHosts.tsx
+++ /dev/null
@@ -1,285 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-import { styled } from '@mui/material/styles';
-import { useTranslation } from 'react-i18next';
-import { Select, MenuItem } from '@mui/material';
-import Button from '@mui/material/Button';
-import FormControl from '@mui/material/FormControl';
-import IconButton from '@mui/material/IconButton';
-import WifiTetheringIcon from '@mui/icons-material/WifiTethering';
-import PortableWifiOffIcon from '@mui/icons-material/PortableWifiOff';
-import InputLabel from '@mui/material/InputLabel';
-import Check from '@mui/icons-material/Check';
-import AddIcon from '@mui/icons-material/Add';
-import EditRoundedIcon from '@mui/icons-material/Edit';
-import ErrorOutlinedIcon from '@mui/icons-material/ErrorOutlined';
-
-import { AuthenticationService } from 'api';
-import { KnownHostDialog } from 'dialogs';
-import { useReduxEffect } from 'hooks';
-import { HostDTO } from 'services';
-import { ServerTypes } from 'store';
-import { DefaultHosts, Host, getHostPort } from 'types';
-import Toast from 'components/Toast/Toast';
-
-import './KnownHosts.css';
-
-enum TestConnection {
-  TESTING = 'testing',
-  FAILED = 'failed',
-  SUCCESS = 'success',
-}
-
-const PREFIX = 'KnownHosts';
-
-const classes = {
-  root: `${PREFIX}-root`
-};
-
-const Root = styled('div')(({ theme }) => ({
-  [`&.${classes.root}`]: {
-    '& .KnownHosts-error': {
-      color: theme.palette.error.main
-    },
-
-    '& .KnownHosts-warning': {
-      color: theme.palette.warning.main
-    },
-
-    '& .KnownHosts-item': {
-      [`& .${TestConnection.TESTING}`]: {
-        color: theme.palette.warning.main
-      },
-      [`& .${TestConnection.FAILED}`]: {
-        color: theme.palette.error.main
-      },
-      [`& .${TestConnection.SUCCESS}`]: {
-        color: theme.palette.success.main
-      }
-    }
-  }
-}));
-
-const KnownHosts = (props) => {
-  const { input: { onChange }, meta, disabled } = props;
-  const { touched, error, warning } = meta;
-
-  const { t } = useTranslation();
-
-  const [hostsState, setHostsState] = useState({
-    hosts: [],
-    selectedHost: {} as any,
-  });
-
-  const [dialogState, setDialogState] = useState({
-    open: false,
-    edit: null,
-  });
-
-  const [testingConnection, setTestingConnection] = useState<TestConnection>(null);
-
-  const [showCreateToast, setShowCreateToast] = useState(false);
-  const [showDeleteToast, setShowDeleteToast] = useState(false);
-  const [showEditToast, setShowEditToast] = useState(false);
-
-  const loadKnownHosts = useCallback(async () => {
-    const hosts = await HostDTO.getAll();
-
-    if (!hosts?.length) {
-      // @TODO: find a better pattern to seeding default data in indexedDB
-      await HostDTO.bulkAdd(DefaultHosts);
-      loadKnownHosts();
-    } else {
-      const selectedHost = hosts.find(({ lastSelected }) => lastSelected) || hosts[0];
-      setHostsState(s => ({ ...s, hosts, selectedHost }));
-    }
-  }, []);
-
-  useEffect(() => {
-    loadKnownHosts();
-  }, [loadKnownHosts]);
-
-  useEffect(() => {
-    const { hosts, selectedHost } = hostsState;
-
-    if (selectedHost?.id) {
-      updateLastSelectedHost(selectedHost.id).then(() => {
-        onChange(selectedHost);
-      });
-    }
-  }, [hostsState, onChange]);
-
-  useReduxEffect(() => {
-    setTestingConnection(TestConnection.SUCCESS);
-  }, ServerTypes.TEST_CONNECTION_SUCCESSFUL, []);
-
-  useReduxEffect(() => {
-    setTestingConnection(TestConnection.FAILED);
-  }, ServerTypes.TEST_CONNECTION_FAILED, []);
-
-  const selectHost = (selectedHost) => {
-    setHostsState(s => ({ ...s, selectedHost }));
-  };
-
-  const openAddKnownHostDialog = () => {
-    setDialogState(s => ({ ...s, open: true, edit: null }));
-  };
-
-  const openEditKnownHostDialog = (host: HostDTO) => {
-    setDialogState(s => ({ ...s, open: true, edit: host }));
-  };
-
-  const closeKnownHostDialog = () => {
-    setDialogState(s => ({ ...s, open: false }));
-  }
-
-  const handleDialogRemove = async ({ id }) => {
-    setHostsState(s => ({
-      ...s,
-      hosts: s.hosts.filter(host => host.id !== id),
-      selectedHost: s.selectedHost.id === id ? s.hosts[0] : s.selectedHost,
-    }));
-
-    closeKnownHostDialog();
-    HostDTO.delete(id);
-    setShowDeleteToast(true)
-  };
-
-  const handleDialogSubmit = async ({ id, name, host, port }) => {
-    if (id) {
-      const hostDTO = await HostDTO.get(id);
-      hostDTO.name = name;
-      hostDTO.host = host;
-      hostDTO.port = port;
-      await hostDTO.save();
-
-      setHostsState(s => ({
-        ...s,
-        hosts: s.hosts.map(h => h.id === id ? hostDTO : h),
-        selectedHost: hostDTO
-      }));
-      setShowEditToast(true)
-    } else {
-      const newHost: Host = { name, host, port, editable: true };
-      newHost.id = await HostDTO.add(newHost) as number;
-
-      setHostsState(s => ({
-        ...s,
-        hosts: [...s.hosts, newHost],
-        selectedHost: newHost,
-      }));
-      setShowCreateToast(true)
-    }
-
-    closeKnownHostDialog();
-  };
-
-  const updateLastSelectedHost = (hostId): Promise<any[]> => {
-    testConnection();
-
-    return HostDTO.getAll().then(hosts =>
-      hosts.map(async host => {
-        if (host.id === hostId) {
-          host.lastSelected = true;
-          return await host.save();
-        }
-
-        if (host.lastSelected) {
-          host.lastSelected = false;
-          return await host.save();
-        }
-
-        return host;
-      })
-    );
-  };
-
-  const testConnection = () => {
-    setTestingConnection(TestConnection.TESTING);
-
-    const options = { ...getHostPort(hostsState.selectedHost) };
-    AuthenticationService.testConnection(options);
-  }
-
-  return (
-    <Root className={'KnownHosts ' + classes.root}>
-      <FormControl className='KnownHosts-form' size='small' variant='outlined'>
-        { touched && (
-          <div className='KnownHosts-validation'>
-            {
-              (error &&
-                <div className='KnownHosts-error'>
-                  {error}
-                  <ErrorOutlinedIcon style={{ fontSize: 'small', fontWeight: 'bold' }} />
-                </div>
-              ) ||
-
-              (warning && <div className='KnownHosts-warning'>{warning}</div>)
-            }
-          </div>
-        ) }
-
-        <InputLabel id='KnownHosts-select'>{ t('KnownHosts.label') }</InputLabel>
-        <Select
-          id='KnownHosts-select'
-          labelId='KnownHosts-label'
-          label='Host'
-          margin='dense'
-          name='host'
-          value={hostsState.selectedHost}
-          fullWidth={true}
-          onChange={e => selectHost(e.target.value)}
-          disabled={disabled}
-        >
-          <Button value={hostsState.selectedHost} onClick={openAddKnownHostDialog}>
-            <span>{ t('KnownHosts.add') }</span>
-            <AddIcon fontSize='small' color='primary' />
-          </Button>
-
-          {
-            hostsState.hosts.map((host, index) => (
-              <MenuItem value={host} key={index}>
-                <div className='KnownHosts-item'>
-                  <div className='KnownHosts-item__wrapper'>
-                    <div className={'KnownHosts-item__status ' + testingConnection}>
-                      {
-                        testingConnection === TestConnection.FAILED
-                          ? <PortableWifiOffIcon fontSize="small" />
-                          : <WifiTetheringIcon fontSize="small" />
-                      }
-                    </div>
-
-                    <div className='KnownHosts-item__label'>
-                      <Check />
-                      <span>{host.name} ({ getHostPort(hostsState.hosts[index]).host }:{getHostPort(hostsState.hosts[index]).port})</span>
-                    </div>
-                  </div>
-
-                  { host.editable && (
-                    <IconButton className='KnownHosts-item__edit' size='small' color='primary' onClick={(e) => {
-                      openEditKnownHostDialog(hostsState.hosts[index]);
-                    }}>
-                      <EditRoundedIcon fontSize='small' />
-                    </IconButton>
-                  ) }
-                </div>
-              </MenuItem>
-            ))
-          }
-        </Select>
-      </FormControl>
-
-      <KnownHostDialog
-        isOpen={dialogState.open}
-        host={dialogState.edit}
-        onRemove={handleDialogRemove}
-        onSubmit={handleDialogSubmit}
-        handleClose={closeKnownHostDialog}
-      />
-      <Toast open={showCreateToast} onClose={() => setShowCreateToast(false)}>{ t('KnownHosts.toast', { mode: 'created' }) }</Toast>
-      <Toast open={showDeleteToast} onClose={() => setShowDeleteToast(false)}>{ t('KnownHosts.toast', { mode: 'deleted' }) }</Toast>
-      <Toast open={showEditToast} onClose={() => setShowEditToast(false)}>{ t('KnownHosts.toast', { mode: 'edited' }) }</Toast>
-    </Root>
-  );
-};
-
-export default KnownHosts;
diff --git a/webclient/src/components/LanguageDropdown/LanguageDropdown.css b/webclient/src/components/LanguageDropdown/LanguageDropdown.css
deleted file mode 100644
index c4db3d0d0..000000000
--- a/webclient/src/components/LanguageDropdown/LanguageDropdown.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.LanguageDropdown {
-}
-
-.LanguageDropdown-item {
-  display: flex;
-  align-items: center;
-}
-
-.LanguageDropdown-item__image {
-  width: 1.5em;
-}
-
-.MuiSelect-select .LanguageDropdown-item__label {
-  display: none;
-}
-
-.MuiList-root .LanguageDropdown-item__image {
-  margin-right: 1em;
-}
diff --git a/webclient/src/components/LanguageDropdown/LanguageDropdown.tsx b/webclient/src/components/LanguageDropdown/LanguageDropdown.tsx
deleted file mode 100644
index 8f63bd549..000000000
--- a/webclient/src/components/LanguageDropdown/LanguageDropdown.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-// eslint-disable-next-line
-import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Select, MenuItem } from '@mui/material';
-import FormControl from '@mui/material/FormControl';
-import InputLabel from '@mui/material/InputLabel';
-
-import { Images } from 'images/Images';
-import { Language, LanguageCountry, LanguageNative } from 'types';
-
-import './LanguageDropdown.css';
-
-const LanguageDropdown = () => {
-  const { t, i18n } = useTranslation();
-  const [language, setLanguage] = useState(i18n.resolvedLanguage);
-
-  useEffect(() => {
-    if (language !== i18n.resolvedLanguage) {
-      i18n.changeLanguage(language);
-    }
-  }, [language]);
-
-  return (
-    <FormControl size='small' variant='outlined' className='LanguageDropdown'>
-      <Select
-        id='LanguageDropdown-select'
-        margin='dense'
-        value={language}
-        fullWidth={true}
-        onChange={e => setLanguage(e.target.value as Language)}
-      >
-        {
-          Object.keys(Language).map((lang) => {
-            const country = LanguageCountry[lang];
-
-            return (
-              <MenuItem value={lang} key={lang}>
-                <div className="LanguageDropdown-item">
-                  <img className="LanguageDropdown-item__image" src={Images.Countries[country]} />
-                  <span className="LanguageDropdown-item__label">
-                    {LanguageNative[lang]} {
-                      LanguageNative[lang] !== t(`Common.languages.${lang}`) && (
-                        <>({ t(`Common.languages.${lang}`) })</>
-                      )
-                    }
-                  </span>
-                </div>
-              </MenuItem>
-            );
-          })
-        }
-      </Select>
-    </FormControl>
-  )
-};
-
-export default LanguageDropdown;
diff --git a/webclient/src/components/Message/CardCallout.css b/webclient/src/components/Message/CardCallout.css
deleted file mode 100644
index 0011b238a..000000000
--- a/webclient/src/components/Message/CardCallout.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.callout {
-  font-weight: bold;
-  color: green;
-}
diff --git a/webclient/src/components/Message/CardCallout.tsx b/webclient/src/components/Message/CardCallout.tsx
deleted file mode 100644
index d34316541..000000000
--- a/webclient/src/components/Message/CardCallout.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-// eslint-disable-next-line
-import React, { useMemo, useState } from 'react';
-import { styled } from '@mui/material/styles';
-import Popover from '@mui/material/Popover';
-
-import { CardDTO, TokenDTO } from 'services';
-
-import CardDetails from '../CardDetails/CardDetails';
-import TokenDetails from '../TokenDetails/TokenDetails';
-
-import './CardCallout.css';
-
-const PREFIX = 'CardCallout';
-
-const classes = {
-  popover: `${PREFIX}-popover`,
-  popoverContent: `${PREFIX}-popoverContent`
-};
-
-const Root = styled('span')(({ theme }) => ({
-  [`& .${classes.popover}`]: {
-    pointerEvents: 'none',
-  },
-
-  [`& .${classes.popoverContent}`]: {
-    pointerEvents: 'none',
-  }
-}));
-
-const CardCallout = ({ name }) => {
-  const [card, setCard] = useState<CardDTO>(null);
-  const [token, setToken] = useState<TokenDTO>(null);
-  const [anchorEl, setAnchorEl] = useState<Element>(null);
-
-  useMemo(async () => {
-    const card = await CardDTO.get(name);
-    if (card) {
-      return setCard(card)
-    }
-
-    const token = await TokenDTO.get(name);
-    if (token) {
-      return setToken(token);
-    }
-  }, [name]);
-
-  const handlePopoverOpen = (event) => {
-    setAnchorEl(event.currentTarget);
-  };
-
-  const handlePopoverClose = () => {
-    setAnchorEl(null);
-  };
-
-  const open = Boolean(anchorEl);
-
-  return (
-    <Root className='callout'>
-      <span
-        onMouseEnter={handlePopoverOpen}
-        onMouseLeave={handlePopoverClose}
-      >{card?.name || token?.name?.value || name}</span>
-
-      {
-        (card || token) && (
-          <Popover
-            open={open}
-            anchorEl={anchorEl}
-            onClose={handlePopoverClose}
-            className={classes.popover}
-            classes={{
-              paper: classes.popoverContent,
-            }}
-            anchorOrigin={{
-              vertical: 'top',
-              horizontal: 'right',
-            }}
-            transformOrigin={{
-              vertical: 'bottom',
-              horizontal: 'left',
-            }}
-          >
-            <div className="callout-card">
-              { card && (<CardDetails card={card} />) }
-              { token && (<TokenDetails token={token} />) }
-            </div>
-          </Popover>
-        )
-      }
-    </Root>
-  );
-};
-
-export default CardCallout;
diff --git a/webclient/src/components/Message/Message.css b/webclient/src/components/Message/Message.css
deleted file mode 100644
index cbb0df2a9..000000000
--- a/webclient/src/components/Message/Message.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.link {
-	color: blue;
-}
diff --git a/webclient/src/components/Message/Message.tsx b/webclient/src/components/Message/Message.tsx
deleted file mode 100644
index ec0b05507..000000000
--- a/webclient/src/components/Message/Message.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-// eslint-disable-next-line
-import React, { useEffect, useMemo, useState } from 'react';
-
-import { NavLink, generatePath } from 'react-router-dom';
-
-import {
-  RouteEnum,
-  URL_REGEX,
-  MESSAGE_SENDER_REGEX,
-  MENTION_REGEX,
-  CARD_CALLOUT_REGEX,
-  CALLOUT_BOUNDARY_REGEX,
-} from 'types';
-
-import CardCallout from './CardCallout';
-import './Message.css';
-
-const Message = ({ message: { message, messageType, timeOf, timeReceived } }) => (
-  <div className='message'>
-    <div className='message__detail'>
-      <ParsedMessage message={message} />
-    </div>
-  </div>
-);
-
-const ParsedMessage = ({ message }) => {
-  const [messageChunks, setMessageChunks] = useState(null);
-  const [name, setName] = useState(null);
-
-  useMemo(() => {
-    const name = message.match(MESSAGE_SENDER_REGEX);
-
-    if (name) {
-      setName(name[1]);
-    }
-
-    setMessageChunks(parseMessage(message));
-  }, [message]);
-
-  return (
-    <div>
-      { name && (<strong><PlayerLink name={name} />:</strong>) }
-      { messageChunks }
-    </div>
-  );
-};
-
-const PlayerLink = ({ name, label = name }) => (
-  <NavLink className="link" to={generatePath(RouteEnum.PLAYER, { name })}>
-    {label}
-  </NavLink>
-);
-
-function parseMessage(message) {
-  return message.replace(MESSAGE_SENDER_REGEX, '')
-    .split(CARD_CALLOUT_REGEX)
-    .filter(chunk => !!chunk)
-    .map(parseChunks);
-}
-
-function parseChunks(chunk, index) {
-  if (chunk.match(CARD_CALLOUT_REGEX)) {
-    const name = chunk.replace(CALLOUT_BOUNDARY_REGEX, '').trim();
-    return (<CardCallout name={name} key={index}></CardCallout>);
-  }
-
-  if (chunk.match(URL_REGEX)) {
-    return parseUrlChunk(chunk);
-  }
-
-  if (chunk.match(MENTION_REGEX)) {
-    return parseMentionChunk(chunk);
-  }
-
-  return chunk;
-}
-
-function parseUrlChunk(chunk) {
-  return chunk.split(URL_REGEX)
-    .filter(urlChunk => !!urlChunk)
-    .map((urlChunk, index) => {
-      if (urlChunk.match(URL_REGEX)) {
-        return (<a className='link' href={urlChunk} key={index} target='_blank' rel='noopener noreferrer'>{urlChunk}</a>);
-      }
-
-      return urlChunk;
-    });
-}
-
-function parseMentionChunk(chunk) {
-  return chunk.split(MENTION_REGEX)
-    .filter(mentionChunk => !!mentionChunk)
-    .map((mentionChunk, index) => {
-      const mention = mentionChunk.match(MENTION_REGEX);
-
-      if (mention) {
-        const name = mention[0].substr(1);
-        return (<PlayerLink name={name} label={mention} key={index} />);
-      }
-
-      return mentionChunk;
-    });
-}
-
-export default Message;
diff --git a/webclient/src/components/ScrollToBottomOnChanges/ScrollToBottomOnChanges.tsx b/webclient/src/components/ScrollToBottomOnChanges/ScrollToBottomOnChanges.tsx
deleted file mode 100644
index 939a7d753..000000000
--- a/webclient/src/components/ScrollToBottomOnChanges/ScrollToBottomOnChanges.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React, { useEffect, useRef } from 'react';
-
-const ScrollToBottomOnChanges = ({ content, changes }) => {
-  const messagesEndRef = useRef(null);
-
-  // @TODO (2)
-  const scrollToBottom = () => {
-    messagesEndRef.current.scrollIntoView({ behavior: 'smooth' })
-  }
-
-  useEffect(scrollToBottom, [changes]);
-
-  const styling = {
-    height: '100%'
-  };
-
-  return (
-    <div style={styling}>
-      {content}
-      <div ref={messagesEndRef} />
-    </div>
-  )
-}
-
-export default ScrollToBottomOnChanges;
diff --git a/webclient/src/components/SelectField/SelectField.css b/webclient/src/components/SelectField/SelectField.css
deleted file mode 100644
index c59e851ae..000000000
--- a/webclient/src/components/SelectField/SelectField.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.select-field label {
-  background: white;
-  padding: 0 5px;
-}
\ No newline at end of file
diff --git a/webclient/src/components/SelectField/SelectField.tsx b/webclient/src/components/SelectField/SelectField.tsx
deleted file mode 100644
index fdbef0e9c..000000000
--- a/webclient/src/components/SelectField/SelectField.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-import FormControl from '@mui/material/FormControl';
-import InputLabel from '@mui/material/InputLabel';
-import MenuItem from '@mui/material/MenuItem';
-import Select from '@mui/material/Select';
-
-import './SelectField.css';
-
-const SelectField = ({ input, label, options, value }) => {
-  const id = label + '-select-field';
-  const labelId = id + '-label';
-
-  return (
-    <FormControl variant="outlined" margin="dense" className="select-field">
-      <InputLabel id={labelId}>{label}</InputLabel>
-      <Select
-        labelId={labelId}
-        id={id}
-        value={value}
-        { ...input }
-      >{
-          options.map((option, index) => (
-            <MenuItem value={index} key={index}> { option } </MenuItem>
-          ))
-        }</Select>
-    </FormControl>
-  );
-};
-
-export default SelectField;
diff --git a/webclient/src/components/ThreePaneLayout/ThreePaneLayout.css b/webclient/src/components/ThreePaneLayout/ThreePaneLayout.css
deleted file mode 100644
index f439dee5c..000000000
--- a/webclient/src/components/ThreePaneLayout/ThreePaneLayout.css
+++ /dev/null
@@ -1,37 +0,0 @@
-.three-pane-layout,
-.three-pane-layout .grid {
-  width: 100%;
-  height: 100%;
-  margin: 0;
-}
-
-.three-pane-layout .grid-main,
-.three-pane-layout .grid-side {
-  height: 100%;
-}
-
-.three-pane-layout .grid-main {
-  display: flex;
-  flex-direction: column; 
-}
-
-.three-pane-layout .grid-main__top {
-  max-height: 50%;
-  width: 100%;
-  padding-bottom: 20px;
-  flex-shrink: 0;
-}
-
-.three-pane-layout .grid-main__bottom {
-  height: 100%;
-  width: 100%;
-  flex-shrink: 1;
-  overflow: hidden;
-}
-
-.three-pane-layout .grid-main__top.fixedHeight,
-.three-pane-layout .grid-main__bottom.fixedHeight {
-  height: 50%;
-  overflow: visible;
-  padding: 0 0 16px;
-}
diff --git a/webclient/src/components/ThreePaneLayout/ThreePaneLayout.tsx b/webclient/src/components/ThreePaneLayout/ThreePaneLayout.tsx
deleted file mode 100644
index 7919f9d35..000000000
--- a/webclient/src/components/ThreePaneLayout/ThreePaneLayout.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Component, CElement } from 'react';
-import { connect } from 'react-redux';
-import Grid from '@mui/material/Grid';
-import Hidden from '@mui/material/Hidden';
-
-import './ThreePaneLayout.css';
-
-// @DEPRECATED
-// This component sucks balls, dont use it. It will be removed sooner than later.
-class ThreePaneLayout extends Component<ThreePaneLayoutProps> {
-  render() {
-    return (
-      <div className="three-pane-layout">
-        <Grid container rowSpacing={0} columnSpacing={2} className="grid">
-          <Grid item xs={12} md={9} lg={10} className="grid-main">
-            <Grid item className={
-              'grid-main__top'
-              + (this.props.fixedHeight ? ' fixedHeight' : '')
-            }>
-              {this.props.top}
-            </Grid>
-            <Grid item className={
-              'grid-main__bottom'
-              + (this.props.fixedHeight ? ' fixedHeight' : '')
-            }>
-              {this.props.bottom}
-            </Grid>
-          </Grid>
-          <Hidden mdDown>
-            <Grid item md={3} lg={2} className="grid-side">
-              {this.props.side}
-            </Grid>
-          </Hidden>
-        </Grid>
-      </div>
-    );
-  }
-}
-
-interface ThreePaneLayoutProps {
-  top: CElement<any, any>,
-  bottom: CElement<any, any>,
-  side?: CElement<any, any>,
-  fixedHeight?: boolean,
-}
-
-const mapStateToProps = state => ({});
-
-export default connect(mapStateToProps)(ThreePaneLayout);
diff --git a/webclient/src/components/Toast/Toast.tsx b/webclient/src/components/Toast/Toast.tsx
deleted file mode 100644
index 4ef8a3cad..000000000
--- a/webclient/src/components/Toast/Toast.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import * as React from 'react'
-import ReactDOM from 'react-dom'
-
-import Alert, { AlertProps } from '@mui/material/Alert';
-import CheckCircleIcon from '@mui/icons-material/CheckCircle';
-import Slide, { SlideProps } from '@mui/material/Slide';
-import Snackbar from '@mui/material/Snackbar';
-
-const iconMapping = {
-  success: <CheckCircleIcon />
-}
-
-function Toast(props) {
-  const { open, onClose, severity, autoHideDuration, children } = props
-
-  const rootElemRef = React.useRef(document.createElement('div'));
-
-  React.useEffect(() => {
-    document.body.appendChild(rootElemRef.current)
-    return () => {
-      rootElemRef.current.remove();
-    }
-  }, [rootElemRef])
-
-  const handleClose = (event?: React.SyntheticEvent, reason?: string) => {
-    if (reason === 'clickaway') {
-      return;
-    }
-    onClose(event);
-  };
-
-  const node = (
-    <Snackbar
-      open={open}
-      autoHideDuration={autoHideDuration}
-      onClose={handleClose}
-      TransitionComponent={TransitionLeft}
-      anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
-    >
-      <Alert onClose={handleClose} severity={severity} iconMapping={iconMapping}>
-        {children}
-      </Alert>
-    </Snackbar>
-  )
-  if (!rootElemRef.current) {
-    return null
-  }
-
-  return ReactDOM.createPortal(
-    node,
-    rootElemRef.current
-  );
-}
-
-Toast.defaultProps = {
-  severity: 'success',
-  // 10s wait before automatically dismissing the Toast.
-  autoHideDuration: 10000,
-}
-
-function TransitionLeft(props) {
-  return <Slide {...props} direction="left" />;
-}
-
-export default Toast
diff --git a/webclient/src/components/Toast/ToastContext.tsx b/webclient/src/components/Toast/ToastContext.tsx
deleted file mode 100644
index 44753d87f..000000000
--- a/webclient/src/components/Toast/ToastContext.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { createContext, FC, PropsWithChildren, ReactChild, ReactNode, useContext, useEffect, useReducer, ContextType, Context } from 'react'
-
-import { ACTIONS, initialState, reducer } from './reducer';
-import Toast from './Toast'
-
-interface ToastEntry {
-  isOpen: boolean,
-  children: ReactChild,
-}
-
-interface ToastState {
-    toasts: Map<string, ToastEntry>,
-    addToast: (key, children) => void,
-    openToast: (key) => void,
-    closeToast: (key) => void,
-    removeToast: (key) => void,
-}
-
-const ToastContext: Context<any> = createContext<ToastState>({
-  toasts: new Map<string, ToastEntry>(),
-  addToast: (key, children) => {},
-  openToast: (key) => {},
-  closeToast: (key) => {},
-  removeToast: (key) => {},
-});
-
-export const ToastProvider: FC<PropsWithChildren> = (props) => {
-  const { children } = props
-  const [state, dispatch] = useReducer(reducer, initialState)
-  const providerState = {
-    toasts: state.toasts,
-    addToast: (key, children) => dispatch({ type: ACTIONS.ADD_TOAST, payload: { key, children } }),
-    openToast: key => dispatch({ type: ACTIONS.OPEN_TOAST, payload: { key } }),
-    closeToast: key => dispatch({ type: ACTIONS.CLOSE_TOAST, payload: { key } }),
-    removeToast: key => dispatch({ type: ACTIONS.REMOVE_TOAST, payload: { key } }),
-  }
-  return (
-    <ToastContext.Provider value={providerState}>
-      {children}
-      <div>
-        {Array.from(state.toasts).map(([key, value]) => {
-          const { isOpen, children } = value;
-          return (
-            <Toast key={key} open={isOpen} onClose={() => dispatch({ type: ACTIONS.CLOSE_TOAST, payload: { key } })}>
-              {children}
-            </Toast>
-          )
-        })}
-      </div>
-    </ToastContext.Provider>
-  )
-}
-
-export interface ToastHookOptions {
-  key: string,
-  children: ReactNode
-}
-
-export function useToast<ToastHookOptions>({ key, children }) {
-  const { addToast, openToast, closeToast, removeToast } = useContext(ToastContext)
-
-  useEffect(() => {
-    addToast(key, children)
-  }, [])
-
-  return {
-    openToast: () => openToast(key),
-    closeToast: () => closeToast(key),
-    removeToast: () => removeToast(key),
-  }
-}
diff --git a/webclient/src/components/Toast/index.ts b/webclient/src/components/Toast/index.ts
deleted file mode 100644
index 40e7c7368..000000000
--- a/webclient/src/components/Toast/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { useToast, ToastProvider } from './ToastContext';
-import Toast from './Toast';
-
-export {
-  Toast as default,
-  useToast,
-  ToastProvider,
-}
diff --git a/webclient/src/components/Toast/reducer.ts b/webclient/src/components/Toast/reducer.ts
deleted file mode 100644
index 3f600db52..000000000
--- a/webclient/src/components/Toast/reducer.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-export const ACTIONS = {
-  ADD_TOAST: 'ADD_TOAST',
-  OPEN_TOAST: 'OPEN_TOAST',
-  CLOSE_TOAST: 'CLOSE_TOAST',
-  REMOVE_TOAST: 'REMOVE_TOAST',
-}
-
-export const initialState = {
-  toasts: {}
-}
-
-export function reducer(state, { type, payload }) {
-  const { key, children } = payload;
-
-  switch (type) {
-    case ACTIONS.ADD_TOAST: {
-      return {
-        ...state,
-        toasts: {
-          ...state.toasts,
-          [key]: {
-            isOpen: false,
-            children,
-          },
-        },
-      };
-    }
-    case ACTIONS.OPEN_TOAST: {
-      return {
-        ...state,
-        toasts: {
-          ...state.toasts,
-          [key]: {
-            ...state.toasts[key],
-            isOpen: true,
-          },
-        },
-      };
-    }
-    case ACTIONS.CLOSE_TOAST: {
-      return {
-        ...state,
-        toasts: {
-          ...state.toasts,
-          [key]: {
-            ...state.toasts[key],
-            isOpen: false,
-          },
-        },
-      };
-    }
-    case ACTIONS.REMOVE_TOAST: {
-      const newState = { ...state };
-      delete newState.toasts[key];
-
-      return newState;
-    }
-    default:
-      throw Error('Please pick an available action')
-  }
-}
diff --git a/webclient/src/components/Token/Token.css b/webclient/src/components/Token/Token.css
deleted file mode 100644
index 08f18b872..000000000
--- a/webclient/src/components/Token/Token.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.token {
-	width: 100%;
-	height: 100%;
-}
diff --git a/webclient/src/components/Token/Token.tsx b/webclient/src/components/Token/Token.tsx
deleted file mode 100644
index 29b39ecc5..000000000
--- a/webclient/src/components/Token/Token.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-// eslint-disable-next-line
-import React, { useMemo, useState } from 'react';
-
-import { TokenDTO } from 'services';
-
-import './Token.css';
-
-interface TokenProps {
-  token: TokenDTO;
-}
-
-const Token = ({ token }: TokenProps) => {
-  const set = Array.isArray(token?.set) ? token?.set[0] : token?.set;
-  return token && (
-    <img className="token" src={set?.picURL} alt={token?.name?.value} />
-  );
-}
-
-export default Token;
diff --git a/webclient/src/components/TokenDetails/TokenDetails.css b/webclient/src/components/TokenDetails/TokenDetails.css
deleted file mode 100644
index 3c3267839..000000000
--- a/webclient/src/components/TokenDetails/TokenDetails.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.tokenDetails {
-  padding: 10px;
-  width: calc(400px * .716);
-  font-size: 10px;
-}
-
-.tokenDetails-token {
-  height: 400px;
-  margin: 0 auto;
-}
-
-.tokenDetails-attribute {
-  display: flex;
-  justify-content: space-between;
-  align-items: baseline;
-}
-
-.tokenDetails-attributes {
-  margin-top: 10px;
-}
-
-.tokenDetails-attribute__label {
-  text-transform: uppercase;
-  font-size: 10px;
-  margin-right: 10px;
-}
-
-.tokenDetails-attribute__value {
-  text-align: right;
-}
-
-.tokenDetails-text {
-  font-size: 12px;
-  margin-top: 10px;
-  padding: 5px;
-  background: rgba(0, 0, 0, .15);
-  white-space: pre-line;
-}
-
-.tokenDetails-text__flavor {
-  font-style: italic;
-}
-
-.tokenDetails-text__current:not(:empty) + .tokenDetails-text__flavor {
-  margin-top: 10px;
-}
diff --git a/webclient/src/components/TokenDetails/TokenDetails.tsx b/webclient/src/components/TokenDetails/TokenDetails.tsx
deleted file mode 100644
index f3d8aed96..000000000
--- a/webclient/src/components/TokenDetails/TokenDetails.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-// eslint-disable-next-line
-import React, { useMemo, useState } from 'react';
-
-import { TokenDTO } from 'services';
-
-import Token from '../Token/Token';
-
-import './TokenDetails.css';
-
-interface TokenProps {
-  token: TokenDTO;
-}
-
-const TokenDetails = ({ token }: TokenProps) => {
-  const props = token?.prop?.value;
-
-  return (
-    <div className='tokenDetails'>
-      <div className='tokenDetails-token'>
-        <Token token={token} />
-      </div>
-
-      {
-        token && (
-          <div>
-            <div className='tokenDetails-attributes'>
-              <div className='tokenDetails-attribute'>
-                <span className='tokenDetails-attribute__label'>Name:</span>
-                <span className='tokenDetails-attribute__value'>{token.name?.value}</span>
-              </div>
-
-              {
-                (!props.pt?.value) ? null : (
-                  <div className='tokenDetails-attribute'>
-                    <span className='tokenDetails-attribute__label'>P/T:</span>
-                    <span className='tokenDetails-attribute__value'>{props.pt.value}</span>
-                  </div>
-                )
-              }
-
-              {
-                !props.colors?.value ? null : (
-                  <div className='cardDetails-attribute'>
-                    <span className='cardDetails-attribute__label'>Color(s):</span>
-                    <span className='cardDetails-attribute__value'>{props.colors.value}</span>
-                  </div>
-                )
-              }
-
-              {
-                !props.maintype?.value ? null : (
-                  <div className='cardDetails-attribute'>
-                    <span className='cardDetails-attribute__label'>Main Type:</span>
-                    <span className='cardDetails-attribute__value'>{props.maintype.value}</span>
-                  </div>
-                )
-              }
-
-              {
-                !props.type?.value ? null : (
-                  <div className='cardDetails-attribute'>
-                    <span className='cardDetails-attribute__label'>Type:</span>
-                    <span className='cardDetails-attribute__value'>{props.type.value}</span>
-                  </div>
-                )
-              }
-            </div>
-
-            {
-              !token.text?.value ? null : (
-                <div className='tokenDetails-text'>
-                  <div className='tokenDetails-text__current'>
-                    {token.text.value}
-                  </div>
-                </div>
-              )
-            }
-          </div>
-        )
-      }
-
-    </div>
-  );
-}
-
-export default TokenDetails;
diff --git a/webclient/src/components/UserDisplay/UserDisplay.css b/webclient/src/components/UserDisplay/UserDisplay.css
deleted file mode 100644
index 0697c7f68..000000000
--- a/webclient/src/components/UserDisplay/UserDisplay.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.user-display,
-.user-display__link {
-  height: 100%;
-  width: 100%;
-}
-
-.user-display__details {
-  height: 100%;
-  display: flex;
-  align-items: center;
-}
-
-.user-display__country {
-  width: 1.1em;
-  margin-right: 0.4em;
-}
diff --git a/webclient/src/components/UserDisplay/UserDisplay.tsx b/webclient/src/components/UserDisplay/UserDisplay.tsx
deleted file mode 100644
index 9c45a0f51..000000000
--- a/webclient/src/components/UserDisplay/UserDisplay.tsx
+++ /dev/null
@@ -1,150 +0,0 @@
-// eslint-disable-next-line
-import React, { Component } from "react";
-import { connect } from 'react-redux';
-import { NavLink, generatePath } from 'react-router-dom';
-
-import Menu from '@mui/material/Menu';
-import MenuItem from '@mui/material/MenuItem';
-
-import { Images } from 'images/Images';
-import { SessionService } from 'api';
-import { ServerSelectors } from 'store';
-import { RouteEnum, User } from 'types';
-
-import './UserDisplay.css';
-
-
-class UserDisplay extends Component<UserDisplayProps, UserDisplayState> {
-  constructor(props) {
-    super(props);
-
-    this.handleClick = this.handleClick.bind(this);
-    this.handleClose = this.handleClose.bind(this);
-    this.navigateToUserProfile = this.navigateToUserProfile.bind(this);
-    this.addToBuddyList = this.addToBuddyList.bind(this);
-    this.removeFromBuddyList = this.removeFromBuddyList.bind(this);
-    this.addToIgnoreList = this.addToIgnoreList.bind(this);
-    this.removeFromIgnoreList = this.removeFromIgnoreList.bind(this);
-
-    this.isABuddy = this.isABuddy.bind(this);
-    this.isIgnored = this.isIgnored.bind(this);
-
-    this.state = {
-      position: null
-    };
-  }
-
-  handleClick(event) {
-    event.preventDefault();
-
-    this.setState({
-      position: {
-        x: event.clientX + 2,
-        y: event.clientY + 4,
-      }
-    });
-  }
-
-  handleClose() {
-    this.setState({
-      position: null
-    });
-  }
-
-  navigateToUserProfile() {
-    this.handleClose();
-  }
-
-  addToBuddyList() {
-    SessionService.addToBuddyList(this.props.user.name);
-    this.handleClose();
-  }
-
-  removeFromBuddyList() {
-    SessionService.removeFromBuddyList(this.props.user.name);
-    this.handleClose();
-  }
-
-  addToIgnoreList() {
-    SessionService.addToIgnoreList(this.props.user.name);
-    this.handleClose();
-  }
-
-  removeFromIgnoreList() {
-    SessionService.removeFromIgnoreList(this.props.user.name);
-    this.handleClose();
-  }
-
-  isABuddy() {
-    return this.props.buddyList.filter(user => user.name === this.props.user.name).length;
-  }
-
-  isIgnored() {
-    return this.props.ignoreList.filter(user => user.name === this.props.user.name).length;
-  }
-
-  render() {
-    const { user } = this.props;
-    const { position } = this.state;
-    const { name, country } = user;
-
-    const isABuddy = this.isABuddy();
-    const isIgnored = this.isIgnored();
-
-    // console.log('user', name, !!isABuddy, !!isIgnored);
-
-    return (
-      <div className="user-display">
-        <NavLink to={generatePath(RouteEnum.PLAYER, { name })} className="plain-link">
-          <div className="user-display__details" onContextMenu={this.handleClick}>
-            <img className="user-display__country" src={Images.Countries[country]} alt={country}></img>
-            <div className="user-display__name single-line-ellipsis">{name}</div>
-          </div>
-        </NavLink>
-        <div className="user-display__menu">
-          <Menu
-            open={Boolean(position)}
-            onClose={this.handleClose}
-            anchorReference='anchorPosition'
-            anchorPosition={
-              position !== null
-                ? { top: position.y, left: position.x }
-                : undefined
-            }
-          >
-            <NavLink to={generatePath(RouteEnum.PLAYER, { name })} className="user-display__link plain-link">
-              <MenuItem dense>Chat</MenuItem>
-            </NavLink>
-            {
-              !isABuddy
-                ? (<MenuItem dense onClick={this.addToBuddyList}>Add to Buddy List</MenuItem>)
-                : (<MenuItem dense onClick={this.removeFromBuddyList}>Remove From Buddy List</MenuItem>)
-            }
-            {
-              !isIgnored
-                ? (<MenuItem dense onClick={this.addToIgnoreList}>Add to Ignore List</MenuItem>)
-                : (<MenuItem dense onClick={this.removeFromIgnoreList}>Remove From Ignore List</MenuItem>)
-            }
-          </Menu>
-        </div>
-      </div>
-    );
-  }
-}
-
-interface UserDisplayProps {
-  user: User;
-  buddyList: User[];
-  ignoreList: User[];
-}
-
-interface UserDisplayState {
-  position: any;
-}
-
-const mapStateToProps = (state) => ({
-  buddyList: ServerSelectors.getBuddyList(state),
-  ignoreList: ServerSelectors.getIgnoreList(state)
-});
-
-export default connect(mapStateToProps)(UserDisplay);
diff --git a/webclient/src/components/VirtualList/VirtualList.css b/webclient/src/components/VirtualList/VirtualList.css
deleted file mode 100644
index 330cd5a90..000000000
--- a/webclient/src/components/VirtualList/VirtualList.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.virtual-list {
-  height: 100%;
-}
\ No newline at end of file
diff --git a/webclient/src/components/VirtualList/VirtualList.tsx b/webclient/src/components/VirtualList/VirtualList.tsx
deleted file mode 100644
index e40ef712c..000000000
--- a/webclient/src/components/VirtualList/VirtualList.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-// eslint-disable-next-line
-import React from "react";
-
-import { FixedSizeList as List } from 'react-window';
-import AutoSizer from 'react-virtualized-auto-sizer';
-
-import './VirtualList.css';
-
-const VirtualList = ({ items, itemKey, className = {}, size = 30 }) => (
-  <div className="virtual-list">
-    <AutoSizer>
-      {({ height, width }) => (
-        <List
-          className={`virtual-list__list ${className}`}
-          height={height}
-          width={width}
-          itemData={items}
-          itemCount={items.length}
-          itemSize={size}
-          itemKey={itemKey}
-        >
-          {Row}
-        </List>
-      )}
-    </AutoSizer>
-  </div>
-);
-
-const Row = ({ data, index, style }) => (
-  <div style={style}>
-    {data[index]}
-  </div>
-);
-
-export default VirtualList;
diff --git a/webclient/src/components/index.ts b/webclient/src/components/index.ts
deleted file mode 100644
index 2d67b3003..000000000
--- a/webclient/src/components/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Common components
-export { default as Card } from './Card/Card';
-export { default as CardDetails } from './CardDetails/CardDetails';
-export { default as CountryDropdown } from './CountryDropdown/CountryDropdown';
-export { default as InputField } from './InputField/InputField';
-export { default as InputAction } from './InputAction/InputAction';
-export { default as KnownHosts } from './KnownHosts/KnownHosts';
-export { default as LanguageDropdown } from './LanguageDropdown/LanguageDropdown';
-export { default as Message } from './Message/Message';
-export { default as VirtualList } from './VirtualList/VirtualList';
-export { default as UserDisplay } from './UserDisplay/UserDisplay';
-export { default as ThreePaneLayout } from './ThreePaneLayout/ThreePaneLayout';
-export { default as CheckboxField } from './CheckboxField/CheckboxField';
-export { default as SelectField } from './SelectField/SelectField';
-export { default as ScrollToBottomOnChanges } from './ScrollToBottomOnChanges/ScrollToBottomOnChanges';
-
-// Guards
-export { default as AuthGuard } from './Guard/AuthGuard';
-export { default as ModGuard } from './Guard/ModGuard';
diff --git a/webclient/src/containers/Account/Account.css b/webclient/src/containers/Account/Account.css
deleted file mode 100644
index 6b5c995a9..000000000
--- a/webclient/src/containers/Account/Account.css
+++ /dev/null
@@ -1,53 +0,0 @@
-.account {
-  display: flex;
-  justify-content: space-between;
-  height: 100%;
-  padding: 5px;
-}
-
-.account-column {
-  display: flex;
-  flex-direction: column;
-  width: 33%;
-}
-
-
-.account-list {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  padding: 20px;
-}
-
-.account-details {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  padding: 20px;
-}
-
-
-.account-details__actions {
-  display: flex;
-  align-items: stretch;
-  justify-content: space-around;
-  width: 100%;
-}
-
-.account-details p {
-  margin-bottom: 10px;
-}
-
-.account-details button {
-  margin-top: 10px;
-  font-size: 10px;
-}
-
-.account-details > img {
-  width: 100%;
-  margin-bottom: 20px;
-}
-
-.account-details__lang {
-  margin-top: 20px;
-}
diff --git a/webclient/src/containers/Account/Account.tsx b/webclient/src/containers/Account/Account.tsx
deleted file mode 100644
index 0c4e001a0..000000000
--- a/webclient/src/containers/Account/Account.tsx
+++ /dev/null
@@ -1,120 +0,0 @@
-// eslint-disable-next-line
-import React, { Component } from "react";
-import { useTranslation } from 'react-i18next';
-import { connect } from 'react-redux';
-
-import Button from '@mui/material/Button';
-import ListItem from '@mui/material/ListItem';
-import Paper from '@mui/material/Paper';
-
-import { UserDisplay, VirtualList, AuthGuard, LanguageDropdown } from 'components';
-import { AuthenticationService, SessionService } from 'api';
-import { ServerSelectors } from 'store';
-import { User } from 'types';
-import Layout from 'containers/Layout/Layout';
-
-import AddToBuddies from './AddToBuddies';
-import AddToIgnore from './AddToIgnore';
-
-import './Account.css';
-
-const Account = (props: AccountProps) => {
-  const { buddyList, ignoreList, serverName, serverVersion, user } = props;
-  const { country, realName, name, userLevel, accountageSecs, avatarBmp } = user || {};
-  let url = URL.createObjectURL(new Blob([avatarBmp], { 'type': 'image/png' }));
-
-  const { t } = useTranslation();
-
-  const handleAddToBuddies = ({ userName }) => {
-    SessionService.addToBuddyList(userName);
-  };
-
-  const handleAddToIgnore = ({ userName }) => {
-    SessionService.addToIgnoreList(userName);
-  };
-
-  return (
-    <Layout className="account">
-      <AuthGuard />
-      <div className="account-column">
-        <Paper className="account-list">
-          <div className="">
-            Buddies Online: ?/{buddyList.length}
-          </div>
-          <VirtualList
-            itemKey={(index, data) => buddyList[index].name }
-            items={ buddyList.map(user => (
-              <ListItem button dense>
-                <UserDisplay user={user} />
-              </ListItem>
-            )) }
-          />
-          <div className="" style={{ borderTop: '1px solid' }}>
-            <AddToBuddies onSubmit={handleAddToBuddies} />
-          </div>
-        </Paper>
-      </div>
-      <div className="account-column">
-        <Paper className="account-list overflow-scroll">
-          <div className="">
-            Ignored Users Online: ?/{ignoreList.length}
-          </div>
-          <VirtualList
-            itemKey={(index, data) => ignoreList[index].name }
-            items={ ignoreList.map(user => (
-              <ListItem button dense>
-                <UserDisplay user={user} />
-              </ListItem>
-            )) }
-          />
-          <div className="" style={{ borderTop: '1px solid' }}>
-            <AddToIgnore onSubmit={handleAddToIgnore} />
-          </div>
-        </Paper>
-      </div>
-      <div className="account-column overflow-scroll">
-        <Paper className="account-details" style={{ margin: '0 0 5px 0' }}>
-          <img src={url} alt={name} />
-          <p><strong>{name}</strong></p>
-          <p>Location: ({country?.toUpperCase()})</p>
-          <p>User Level: {userLevel}</p>
-          <p>Account Age: {accountageSecs}</p>
-          <p>Real Name: {realName}</p>
-          <div className="account-details__actions">
-            <Button size="small" color="primary" variant="contained">Edit</Button>
-            <Button size="small" color="primary" variant="contained">Change<br />Password</Button>
-            <Button size="small" color="primary" variant="contained">Change<br />Avatar</Button>
-          </div>
-
-        </Paper>
-        <Paper className="account-details">
-          <p>Server Name: {serverName}</p>
-          <p>Server Version: {serverVersion}</p>
-          <Button color="primary" variant="contained" onClick={() => AuthenticationService.disconnect()}>{ t('Common.disconnect') }</Button>
-
-          <div className="account-details__lang">
-            <LanguageDropdown />
-          </div>
-        </Paper>
-      </div>
-    </Layout>
-  )
-}
-
-interface AccountProps {
-  buddyList: User[];
-  ignoreList: User[];
-  serverName: string;
-  serverVersion: string;
-  user: User;
-}
-
-const mapStateToProps = state => ({
-  buddyList: ServerSelectors.getBuddyList(state),
-  ignoreList: ServerSelectors.getIgnoreList(state),
-  serverName: ServerSelectors.getName(state),
-  serverVersion: ServerSelectors.getVersion(state),
-  user: ServerSelectors.getUser(state),
-});
-
-export default connect(mapStateToProps)(Account);
diff --git a/webclient/src/containers/Account/AddToBuddies.tsx b/webclient/src/containers/Account/AddToBuddies.tsx
deleted file mode 100644
index 3aa5489ad..000000000
--- a/webclient/src/containers/Account/AddToBuddies.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import { Form } from 'react-final-form'
-
-import { InputAction } from 'components';
-
-const AddToBuddies = ({ onSubmit }) => (
-  <Form onSubmit={values => onSubmit(values)}>
-    {({ handleSubmit }) => (
-      <form onSubmit={handleSubmit}>
-        <InputAction action="Add" label="Add to Buddies" name="userName" />
-      </form>
-    )}
-  </Form>
-);
-
-export default AddToBuddies;
diff --git a/webclient/src/containers/Account/AddToIgnore.tsx b/webclient/src/containers/Account/AddToIgnore.tsx
deleted file mode 100644
index 270036946..000000000
--- a/webclient/src/containers/Account/AddToIgnore.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import { Form } from 'react-final-form'
-
-import { InputAction } from 'components';
-
-const AddToIgnore = ({ onSubmit }) => (
-  <Form onSubmit={values => onSubmit(values)}>
-    {({ handleSubmit }) => (
-      <form onSubmit={handleSubmit}>
-        <InputAction action="Add" label="Add to Ignore" name="userName" />
-      </form>
-    )}
-  </Form>
-);
-
-export default AddToIgnore;
diff --git a/webclient/src/containers/App/AppShell.css b/webclient/src/containers/App/AppShell.css
deleted file mode 100644
index 4492a6bcf..000000000
--- a/webclient/src/containers/App/AppShell.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.AppShell,
-.AppShell-routes {
-  height: 100%;
-}
-
-.AppShell {
-  display: flex;
-  flex-direction: column;
-   min-width: 768px;
-}
\ No newline at end of file
diff --git a/webclient/src/containers/App/AppShell.tsx b/webclient/src/containers/App/AppShell.tsx
deleted file mode 100644
index c28d20067..000000000
--- a/webclient/src/containers/App/AppShell.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Component, Suspense } from 'react';
-import { Provider } from 'react-redux';
-import { MemoryRouter as Router } from 'react-router-dom';
-import CssBaseline from '@mui/material/CssBaseline';
-import { store } from 'store';
-import Routes from './AppShellRoutes';
-import FeatureDetection from './FeatureDetection';
-
-import './AppShell.css';
-
-import { ToastProvider } from 'components/Toast'
-
-class AppShell extends Component {
-  componentDidMount() {
-    // @TODO (1)
-    window.onbeforeunload = () => true;
-  }
-
-  handleContextMenu(event) {
-    event.preventDefault();
-  }
-
-  render() {
-    return (
-      <Suspense fallback="loading">
-        <Provider store={store}>
-          <CssBaseline />
-          <ToastProvider>
-            <div className="AppShell" onContextMenu={this.handleContextMenu}>
-              <Router>
-                <FeatureDetection />
-                <Routes />
-              </Router>
-            </div>
-          </ToastProvider>
-        </Provider>
-      </Suspense>
-    );
-  }
-}
-
-export default AppShell;
diff --git a/webclient/src/containers/App/AppShellRoutes.tsx b/webclient/src/containers/App/AppShellRoutes.tsx
deleted file mode 100644
index c80f74c30..000000000
--- a/webclient/src/containers/App/AppShellRoutes.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-import { Navigate, Route, Routes } from 'react-router-dom';
-
-import { RouteEnum } from 'types';
-import {
-  Account,
-  Decks,
-  Game,
-  Player,
-  Room,
-  Server,
-  Login,
-  Logs,
-  Initialize,
-  Unsupported
-} from 'containers';
-
-const AppShellRoutes = () => (
-  <div className="AppShell-routes overflow-scroll">
-    <Routes>
-      <Route path='*' element={<Initialize />} />
-
-      <Route path={RouteEnum.ACCOUNT} element={<Account />} />
-      <Route path={RouteEnum.DECKS} element={<Decks />} />
-      <Route path={RouteEnum.GAME} element={<Game />} />
-      <Route path={RouteEnum.LOGS} element={<Logs />} />
-      <Route path={RouteEnum.PLAYER} element={<Player />} />
-      {<Route path={RouteEnum.ROOM} element={<Room />} />}
-      <Route path={RouteEnum.SERVER} element={<Server />} />
-      <Route path={RouteEnum.LOGIN} element={<Login />} />
-      <Route path={RouteEnum.UNSUPPORTED} element={<Unsupported />} />
-    </Routes>
-  </div>
-);
-
-export default AppShellRoutes;
diff --git a/webclient/src/containers/App/FeatureDetection.tsx b/webclient/src/containers/App/FeatureDetection.tsx
deleted file mode 100644
index ed9e1f241..000000000
--- a/webclient/src/containers/App/FeatureDetection.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { useEffect, useState } from 'react';
-import { Navigate } from 'react-router-dom';
-import { dexieService } from 'services';
-import { RouteEnum } from 'types';
-
-const FeatureDetection = () => {
-  const [unsupported, setUnsupported] = useState(false);
-
-  useEffect(() => {
-    const features: Promise<any>[] = [
-      detectIndexedDB(),
-    ];
-
-    Promise.all(features).catch((e) => setUnsupported(true));
-  }, []);
-
-  return unsupported
-    ? <Navigate to={RouteEnum.UNSUPPORTED} />
-    : <></>;
-
-  function detectIndexedDB() {
-    return dexieService.testConnection();
-  }
-};
-
-export default FeatureDetection;
diff --git a/webclient/src/containers/Decks/Decks.css b/webclient/src/containers/Decks/Decks.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/webclient/src/containers/Decks/Decks.tsx b/webclient/src/containers/Decks/Decks.tsx
deleted file mode 100644
index 190196dc9..000000000
--- a/webclient/src/containers/Decks/Decks.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-// eslint-disable-next-line
-import React, { Component } from "react";
-
-import { AuthGuard } from 'components/index';
-import Layout from 'containers/Layout/Layout';
-
-import './Decks.css';
-
-class Decks extends Component {
-  render() {
-    return (
-      <Layout>
-        <AuthGuard />
-        <span>"Decks"</span>
-      </Layout>
-    )
-  }
-}
-
-export default Decks;
diff --git a/webclient/src/containers/Game/Game.css b/webclient/src/containers/Game/Game.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/webclient/src/containers/Game/Game.tsx b/webclient/src/containers/Game/Game.tsx
deleted file mode 100644
index 694ffb46d..000000000
--- a/webclient/src/containers/Game/Game.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-// eslint-disable-next-line
-import React, { Component } from "react";
-
-import { AuthGuard } from 'components';
-import Layout from 'containers/Layout/Layout';
-
-import './Game.css';
-
-class Game extends Component {
-  render() {
-    return (
-      <Layout>
-        <AuthGuard />
-        <span>"Game"</span>
-      </Layout>
-    )
-  }
-}
-
-export default Game;
diff --git a/webclient/src/containers/Initialize/Initialize.css b/webclient/src/containers/Initialize/Initialize.css
deleted file mode 100644
index d52eafd5f..000000000
--- a/webclient/src/containers/Initialize/Initialize.css
+++ /dev/null
@@ -1,88 +0,0 @@
-.Initialize {
-  position: relative;
-  width: 100%;
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
-}
-
-.Initialize img {
-  width: 60px;
-}
-
-h6.subtitle {
-  margin: 20px 0 10px;
-}
-
-.Initialize-graphics {
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  overflow: hidden;
-}
-
-.Initialize-graphics__square {
-  position: absolute;
-  border: 2px solid;
-  opacity: .05;
-}
-
-.Initialize-graphics__bar {
-  position: absolute;
-  opacity: .05;
-  border-radius: 8px;
-}
-
-.Initialize-graphics__square.topLeft {
-  transform: rotate(27deg);
-  top: 38px;
-  left: 64px;
-  height: 134px;
-  width: 100px;
-  border-radius: 8px;
-}
-
-.Initialize-graphics__square.topRight {
-  transform: rotate(10deg);
-  top: 74px;
-  right: 62px;
-  height: 50px;
-  width: 66px;
-  border-radius: 20px;
-}
-
-.Initialize-graphics__square.bottomLeft {
-  transform: rotate(120deg);
-  bottom: 61px;
-  left: 66px;
-  height: 50px;
-  width: 66px;
-  border-radius: 20px;
-}
-
-.Initialize-graphics__square.bottomRight {
-  transform: rotate(-24deg);
-  bottom: 54px;
-  right: 0;
-  height: 88px;
-  width: 66px;
-  border-radius: 8px;
-}
-
-.Initialize-graphics__bar.bottomBar {
-  transform: rotate(30deg);
-  bottom: -4px;
-  left: -29px;
-  height: 50px;
-  width: 222px;
-}
-
-.Initialize-graphics__bar.topBar {
-  transform: rotate(-330deg);
-  top: 10px;
-  right: -49px;
-  height: 50px;
-  width: 222px;
-}
diff --git a/webclient/src/containers/Initialize/Initialize.i18n.json b/webclient/src/containers/Initialize/Initialize.i18n.json
deleted file mode 100644
index 77ca5e8cd..000000000
--- a/webclient/src/containers/Initialize/Initialize.i18n.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "InitializeContainer": {
-    "title": "DID YOU KNOW",
-    "subtitle": "<1>Cockatrice is run by volunteers</1><1>that love card games!</1>"
-  }
-}
diff --git a/webclient/src/containers/Initialize/Initialize.tsx b/webclient/src/containers/Initialize/Initialize.tsx
deleted file mode 100644
index bc777f065..000000000
--- a/webclient/src/containers/Initialize/Initialize.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { useState } from 'react';
-import { styled } from '@mui/material/styles';
-import { useTranslation, Trans } from 'react-i18next';
-import { connect } from 'react-redux';
-import { Navigate } from 'react-router-dom';
-import Typography from '@mui/material/Typography';
-
-import { Images } from 'images';
-import { ServerSelectors } from 'store';
-import { RouteEnum } from 'types';
-import Layout from 'containers/Layout/Layout';
-
-import './Initialize.css';
-
-const PREFIX = 'Initialize';
-
-const classes = {
-  root: `${PREFIX}-root`
-};
-
-const Root = styled('div')(({ theme }) => ({
-  [`&.${classes.root}`]: {
-    '& .Initialize-graphics': {
-      color: theme.palette.primary.contrastText,
-    },
-
-    '& .Initialize-graphics__bar': {
-      backgroundColor: theme.palette.primary.contrastText,
-    },
-  }
-}));
-
-const Initialize = ({ initialized }: InitializeProps) => {
-  const { t } = useTranslation();
-
-  return initialized
-    ? <Navigate to={RouteEnum.LOGIN} />
-    : (
-      <Layout>
-        <Root className={'Initialize ' + classes.root}>
-          <div className='Initialize-content'>
-            <img src={Images.Logo} alt="logo" />
-            <Typography variant="subtitle1" className='subtitle'>{ t('InitializeContainer.title') }</Typography>
-            <Trans i18nKey="InitializeContainer.subtitle">
-              <Typography variant="subtitle2"></Typography>
-              <Typography variant="subtitle2"></Typography>
-            </Trans>
-          </div>
-
-          <div className="Initialize-graphics">
-            <div className="topLeft Initialize-graphics__square" />
-            <div className="topRight Initialize-graphics__square" />
-            <div className="bottomRight Initialize-graphics__square" />
-            <div className="bottomLeft Initialize-graphics__square" />
-            <div className="topBar Initialize-graphics__bar" />
-            <div className="bottomBar Initialize-graphics__bar" />
-          </div>
-        </Root>
-      </Layout>
-    );
-}
-
-interface InitializeProps {
-  initialized: boolean;
-}
-
-const mapStateToProps = state => ({
-  initialized: ServerSelectors.getInitialized(state),
-});
-
-export default connect(mapStateToProps)(Initialize);
diff --git a/webclient/src/containers/Layout/Layout.css b/webclient/src/containers/Layout/Layout.css
deleted file mode 100644
index a98cba47c..000000000
--- a/webclient/src/containers/Layout/Layout.css
+++ /dev/null
@@ -1,31 +0,0 @@
-.layout {
-    height: 100%;
-    max-height: 100%;
-    width: 100%;
-    max-width: 100%;
-    display: flex;
-    flex-flow: row nowrap;
-    overflow: hidden;
-}
-
-.layout--no-height-limit {
-    height: initial;
-    max-height: initial;
-}
-
-.bottom-bar__container {
-    background: #555;
-    height: 50px;
-    width: 100%;
-}
-
-.page__body {
-    flex: 1;
-    max-height: calc(100% - 50px);
-}
-
-.page {
-    display: flex;
-    flex-flow: column;
-    width: 100%;
-}
diff --git a/webclient/src/containers/Layout/Layout.tsx b/webclient/src/containers/Layout/Layout.tsx
deleted file mode 100644
index 6d04172ba..000000000
--- a/webclient/src/containers/Layout/Layout.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import LeftNav from './LeftNav';
-
-import './Layout.css'
-
-function Layout(props:LayoutProps) {
-  const { children, className, showNav = true, noHeightLimit = false } = props;
-  const containerClasses = ['layout']
-  if (noHeightLimit === true) {
-    containerClasses.push('layout--no-height-limit')
-  }
-
-  return (
-    <div className={containerClasses.join(' ')}>
-      {showNav && <LeftNav />}
-      <section className="page">
-        <div className={`page__body ${className}`}>
-          {children}
-        </div>
-        {showNav && <BottomBar />}
-      </section>
-    </div>
-  )
-}
-
-function BottomBar(props) {
-  return (
-    <div className="bottom-bar__container">
-    </div>
-  )
-}
-
-interface LayoutProps {
-    showNav?: boolean;
-    children: any;
-    className?: string;
-    noHeightLimit?: boolean
-}
-
-export default Layout;
diff --git a/webclient/src/containers/Layout/LeftNav.css b/webclient/src/containers/Layout/LeftNav.css
deleted file mode 100644
index 85c851d2e..000000000
--- a/webclient/src/containers/Layout/LeftNav.css
+++ /dev/null
@@ -1,128 +0,0 @@
-.LeftNav__container {
-  background: #7033DB;
-  width: 100px;
-  min-width: 100px;
-  height: 100%;
-}
-
-.LeftNav__logo {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 16px 0;
-}
-
-.LeftNav__logo a {
-  line-height: 1;
-}
-
-.LeftNav__logo img {
-  height: 32px;
-}
-
-.LeftNav-content {
-  color: white;
-}
-
-.LeftNav-serverDetails {
-  font-size: 12px;
-}
-
-.LeftNav-server__indicator {
-  display: inline-block;
-  height: 12px;
-  width: 12px;
-  background: red;
-  border: 1px solid;
-  border-radius: 50%;
-  margin-left: 10px;
-}
-
-.LeftNav-nav {
-}
-
-.LeftNav-nav__links {
-  display: flex;
-  flex-flow: column;
-  align-items: center;
-  gap: 16px;
-}
-
-.LeftNav-nav__link {
-  position: relative;
-  height: 100%;
-}
-
-.LeftNav-nav__link:hover {
-  background: rgba(0, 0, 0, .125);
-}
-
-.LeftNav-nav__link:hover .LeftNav-nav__link-menu {
-  display: block;
-}
-
-.LeftNav-nav__link-btn {
-  display: flex;
-  height: 100%;
-  width: 100%;
-  align-items: center;
-  padding: 5px 20px;
-  font-weight: bold;
-}
-
-.LeftNav-nav__link-btn__icon {
-  margin-left: 5px;
-}
-
-.LeftNav-nav__link-menu {
-  display: none;
-  position: absolute;
-  bottom: 0;
-  transform: translateY(100%);
-  min-width: 150px;
-  background: #3f51b5;
-  box-shadow: 1px 1px 2px 0px black;
-  z-index: 1;
-}
-
-.LeftNav-nav__link-menu__item {
-  padding: 0 !important;
-}
-
-.LeftNav-nav__link-menu__btn {
-  padding: 6px 16px;
-  width: 100%;
-  color: white;
-  display: flex;
-  justify-content: space-between;
-}
-
-.LeftNav-nav__actions {
-  display: flex;
-  justify-content: center;
-}
-
-.LeftNav-nav__action {
-
-}
-
-.LeftNav-nav__action button {
-  color: white;
-}
-
-.temp-subnav__rooms {
-  display: flex;
-  align-items: center;
-  font-size: 10px;
-  padding: 5px;
-}
-
-.temp-chip {
-  margin-left: 5px;
-  text-decoration: none;
-}
-
-
-.temp-chip > div {
-  cursor: inherit;
-}
diff --git a/webclient/src/containers/Layout/LeftNav.tsx b/webclient/src/containers/Layout/LeftNav.tsx
deleted file mode 100644
index a81eb6ce2..000000000
--- a/webclient/src/containers/Layout/LeftNav.tsx
+++ /dev/null
@@ -1,195 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { connect } from 'react-redux';
-import { NavLink, useNavigate, generatePath } from 'react-router-dom';
-import IconButton from '@mui/material/IconButton';
-import Menu from '@mui/material/Menu';
-import MenuItem from '@mui/material/MenuItem';
-import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
-import CloseIcon from '@mui/icons-material/Close';
-import MailOutlineRoundedIcon from '@mui/icons-material/MailOutline';
-import MenuRoundedIcon from '@mui/icons-material/MenuRounded';
-import * as _ from 'lodash';
-
-import { AuthenticationService, RoomsService } from 'api';
-import { CardImportDialog } from 'dialogs';
-import { Images } from 'images';
-import { RoomsSelectors, ServerSelectors } from 'store';
-import { Room, RouteEnum, User } from 'types';
-
-import './LeftNav.css';
-
-const LeftNav = ({ joinedRooms, serverState, user }: LeftNavProps) => {
-  const navigate = useNavigate();
-  const [state, setState] = useState<LeftNavState>({
-    anchorEl: null,
-    showCardImportDialog: false,
-    options: [],
-  });
-
-  useEffect(() => {
-    let options: string[] = [
-      'Account',
-      'Replays',
-    ];
-
-    if (user && AuthenticationService.isModerator(user)) {
-      options = [
-        ...options,
-        'Administration',
-        'Logs'
-      ];
-    }
-
-    setState(s => ({ ...s, options }));
-  }, [user]);
-
-  const handleMenuOpen = (event) => {
-    setState(s => ({ ...s, anchorEl: event.target }));
-  }
-
-  const handleMenuItemClick = (option: string) => {
-    const route = RouteEnum[option.toUpperCase()];
-    navigate(generatePath(route));
-  }
-
-  const handleMenuClose = () => {
-    setState(s => ({ ...s, anchorEl: null }));
-  }
-
-  const leaveRoom = (event, roomId) => {
-    event.preventDefault();
-    RoomsService.leaveRoom(roomId);
-  };
-
-  const openImportCardWizard = () => {
-    setState(s => ({ ...s, showCardImportDialog: true }));
-    handleMenuClose();
-  }
-
-  const closeImportCardWizard = () => {
-    setState(s => ({ ...s, showCardImportDialog: false }));
-  }
-
-  return (
-    <div className="LeftNav__container">
-      <div>
-        <div className="LeftNav__logo">
-          <NavLink to={RouteEnum.SERVER}>
-            <img src={Images.Logo} alt="logo" />
-          </NavLink>
-          { AuthenticationService.isConnected(serverState) && (
-            <span className="LeftNav-server__indicator"></span>
-          ) }
-        </div>
-        { AuthenticationService.isConnected(serverState) && (
-          <div className="LeftNav-content">
-            <nav className="LeftNav-nav">
-              <nav className="LeftNav-nav__links">
-                <div className="LeftNav-nav__link">
-                  <NavLink
-                    className="LeftNav-nav__link-btn"
-                    to={
-                      joinedRooms.length
-                        ? generatePath(RouteEnum.ROOM, { roomId: joinedRooms[0].roomId.toString() })
-                        : RouteEnum.SERVER
-                    }
-                  >
-                    Rooms
-                    <ArrowDropDownIcon className="LeftNav-nav__link-btn__icon" fontSize="small" />
-                  </NavLink>
-                  <div className="LeftNav-nav__link-menu">
-                    {joinedRooms.map(({ name, roomId }) => (
-                      <div className="LeftNav-nav__link-menu__item" key={roomId}>
-                        <NavLink className="LeftNav-nav__link-menu__btn" to={ generatePath(RouteEnum.ROOM, { roomId: roomId.toString() }) }>
-                          {name}
-
-                          <IconButton size="small" edge="end" onClick={event => leaveRoom(event, roomId)}>
-                            <CloseIcon style={{ fontSize: 10, color: 'white' }} />
-                          </IconButton>
-                        </NavLink>
-                      </div>
-                    ))}
-                  </div>
-                </div>
-                <div className="LeftNav-nav__link">
-                  <NavLink className="LeftNav-nav__link-btn" to={ RouteEnum.GAME }>
-                    Games
-                    <ArrowDropDownIcon className="LeftNav-nav__link-btn__icon" fontSize="small" />
-                  </NavLink>
-                </div>
-                <div className="LeftNav-nav__link">
-                  <NavLink className="LeftNav-nav__link-btn" to={ RouteEnum.DECKS }>
-                    Decks
-                    <ArrowDropDownIcon className="LeftNav-nav__link-btn__icon" fontSize="small" />
-                  </NavLink>
-                </div>
-              </nav>
-              <div className="LeftNav-nav__actions">
-                <div className="LeftNav-nav__action">
-                  <IconButton size="large">
-                    <MailOutlineRoundedIcon style={{ color: 'inherit' }} />
-                  </IconButton>
-                </div>
-                <div className="LeftNav-nav__action">
-                  <IconButton onClick={handleMenuOpen} size="large">
-                    <MenuRoundedIcon style={{ color: 'inherit' }} />
-                  </IconButton>
-                  <Menu
-                    anchorEl={state.anchorEl}
-                    keepMounted
-                    open={!!state.anchorEl}
-                    onClose={() => handleMenuClose()}
-                    PaperProps={{
-                      style: {
-                        marginTop: '32px',
-                        width: '20ch',
-                      },
-                    }}
-                  >
-                    {state.options.map((option) => (
-                      <MenuItem key={option} onClick={(event) => handleMenuItemClick(option)}>
-                        {option}
-                      </MenuItem>
-                    ))}
-
-                    <MenuItem key='Import Cards' onClick={(event) => openImportCardWizard()}>
-                      Import Cards
-                    </MenuItem>
-                  </Menu>
-                </div>
-              </div>
-            </nav>
-          </div>
-        ) }
-      </div>
-
-      <CardImportDialog
-        isOpen={state.showCardImportDialog}
-        handleClose={closeImportCardWizard}
-      ></CardImportDialog>
-    </div>
-  );
-}
-
-interface LeftNavProps {
-  serverState: number;
-  server: string;
-  user: User;
-  joinedRooms: Room[];
-  showNav?: boolean;
-}
-
-interface LeftNavState {
-  anchorEl: Element;
-  showCardImportDialog: boolean;
-  options: string[];
-}
-
-const mapStateToProps = state => ({
-  serverState: ServerSelectors.getState(state),
-  server: ServerSelectors.getName(state),
-  user: ServerSelectors.getUser(state),
-  joinedRooms: RoomsSelectors.getJoinedRooms(state),
-});
-
-export default connect(mapStateToProps)(LeftNav);
diff --git a/webclient/src/containers/Layout/logo.png b/webclient/src/containers/Layout/logo.png
deleted file mode 100644
index 7ce83bd20..000000000
Binary files a/webclient/src/containers/Layout/logo.png and /dev/null differ
diff --git a/webclient/src/containers/Login/Login.css b/webclient/src/containers/Login/Login.css
deleted file mode 100644
index 7166187ad..000000000
--- a/webclient/src/containers/Login/Login.css
+++ /dev/null
@@ -1,202 +0,0 @@
-.login {
-  height: 100%;
-  padding: 50px;
-}
-
-.login__wrapper {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.login-content {
-  width: 100%;
-  max-width: 500px;
-  display: flex;
-  border-radius: 8px;
-  overflow: hidden;
-}
-
-.login-content__header {
-  font-family: 'Teko', sans-serif;
-  font-size: 34px;
-  font-weight: bold;
-  display: flex;
-  align-items: center;
-  margin-bottom: 20px;
-}
-
-.login-content__header img {
-  height: 60px;
-  margin-right: 15px;
-}
-
-.login-content__form {
-  width: 100%;
-  padding: 50px 50px 33px;
-}
-
-.login-content__form h1 {
-  margin-bottom: 20px;
-}
-
-.login-form {
-  margin-top: 30px;
-}
-
-.login-content__description {
-  display: none;
-  position: relative;
-  justify-content: center;
-  align-items: center;
-  text-align: center;
-  font-size: 24px;
-  overflow: hidden;
-}
-
-.login-content__description-wrapper { 
-  position: relative;
-  width: 70%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-
-.login-content__description-cards {
-  width: 100%;
-  position: relative;
-  display: flex;
-  justify-content: space-between;
-}
-
-.login-content__description-cards__card {
-  position: relative;
-  width: 34%;
-  padding-bottom: 46%;
-  border-radius: 8px;
-  box-shadow: 0 5px 10px 2px rgba(0,0,0,0.20);
-  font-weight: bold;
-  font-size: 16px;
-}
-
-.login-content__description-cards__card-wrapper {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-}
-
-.login-content__description-cards__card img {
-  width: 70%;
-  border-radius: 50%;
-  margin: 21% 0 9%;
-}
-
-.login-content__description-cards__card.leftCard {
-  transform: rotate(-12deg);
-}
-
-.login-content__description-cards__card.rightCard {
-  transform: rotate(12deg);
-}
-
-.login-content__description-cards__card.topCard {
-  width: 44%;
-  padding-bottom: 59%;
-  position: absolute;
-  top: 45%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-}
-
-.login-content__description-subtitle1 {
-  margin: 40px 0 20px;
-  font-size: 28px;
-  font-weight: bold;
-  
-}
-.login-content__description-subtitle2 {
-  font-size: 14px;
-}
-.login-content__description-square {
-  position: absolute;
-  border: 1px solid;
-  opacity: .1;
-}
-.login-content__description-bar {
-  position: absolute;
-  opacity: .1;
-  border-radius: 8px;
-}
-
-
-.login-content__description-square.topLeft {
-  transform: rotate(27deg);
-  top: 38px;
-  left: 64px;
-  height: 134px;
-  width: 100px;
-  border-radius: 8px;
-}
-
-.login-content__description-square.topRight {
-  transform: rotate(10deg);
-  top: 74px;
-  right: 62px;
-  height: 50px;
-  width: 66px;
-  border-radius: 20px;
-}
-
-.login-content__description-square.bottomLeft {
-  transform: rotate(120deg);
-  bottom: 61px;
-  left: 66px;
-  height: 50px;
-  width: 66px;
-  border-radius: 20px;
-}
-
-.login-content__description-square.bottomRight {
-  transform: rotate(-24deg);
-  bottom: 54px;
-  right: 0;
-  height: 88px;
-  width: 66px;
-  border-radius: 8px;
-}
-.login-content__description-bar.bottomBar {
-  transform: rotate(30deg);
-  bottom: -4px;
-  left: -29px;
-  height: 50px;
-  width: 222px;
-}
-.login-content__description-bar.topBar {
-  transform: rotate(-330deg);
-  top: 10px;
-  right: -49px;
-  height: 50px;
-  width: 222px;
-}
-.login-footer {
-  margin-top: 30px;
-}
-
-.login-footer__register {
-  margin-bottom: 10px;
-  font-weight: bold;
-}
-
-.login-footer__language {
-  margin-top: 20px;
-}
-
-.login-content__connectionStatus {
-  text-align: center;
-  margin: 20px 0;
-  padding: 20px;
-  font-weight: bold;
-}
diff --git a/webclient/src/containers/Login/Login.i18n.json b/webclient/src/containers/Login/Login.i18n.json
deleted file mode 100644
index 13d248bb1..000000000
--- a/webclient/src/containers/Login/Login.i18n.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "LoginContainer": {
-    "header": {
-      "title": "Login",
-      "subtitle": "A cross-platform virtual tabletop for multiplayer card games."
-    },
-    "footer": {
-      "registerPrompt": "Not registered yet?",
-      "registerAction": "Create an account",
-      "credit": "Cockatrice is an open source project",
-      "version": "Version"
-    },
-    "content": {
-      "subtitle1": "Play multiplayer card games online.",
-      "subtitle2": "Cross-platform virtual tabletop for multiplayer card games. Forever free."
-    },
-    "toasts": {
-      "passwordResetSuccessToast": "Password Reset Successfully",
-      "accountActivationSuccess": "Account Activated Successfully"
-    }
-  }
-}
diff --git a/webclient/src/containers/Login/Login.tsx b/webclient/src/containers/Login/Login.tsx
deleted file mode 100644
index fe008375c..000000000
--- a/webclient/src/containers/Login/Login.tsx
+++ /dev/null
@@ -1,360 +0,0 @@
-import { useState, useCallback } from 'react';
-import { styled } from '@mui/material/styles';
-import { useTranslation } from 'react-i18next';
-import { connect } from 'react-redux';
-import { Navigate } from 'react-router-dom';
-import Button from '@mui/material/Button';
-import Paper from '@mui/material/Paper';
-import Typography from '@mui/material/Typography';
-
-import { AuthenticationService } from 'api';
-import { RegistrationDialog, RequestPasswordResetDialog, ResetPasswordDialog, AccountActivationDialog } from 'dialogs';
-import { LanguageDropdown } from 'components';
-import { LoginForm } from 'forms';
-import { useReduxEffect, useFireOnce } from 'hooks';
-import { Images } from 'images';
-import { HostDTO, serverProps } from 'services';
-import { RouteEnum, WebSocketConnectOptions, getHostPort } from 'types';
-import { ServerSelectors, ServerTypes } from 'store';
-import Layout from 'containers/Layout/Layout';
-
-import './Login.css';
-import { useToast } from 'components/Toast';
-
-const PREFIX = 'Login';
-
-const classes = {
-  root: `${PREFIX}-root`
-};
-
-const Root = styled('div')(({ theme }) => ({
-  [`&.${classes.root}`]: {
-    '& .login-content__header': {
-      color: theme.palette.success.light
-    },
-
-    '& .login-content__description': {
-      backgroundColor: theme.palette.primary.main,
-      color: theme.palette.primary.contrastText,
-    },
-
-    '& .login-content__description-bar': {
-      backgroundColor: theme.palette.primary.dark,
-    },
-
-    '& .login-content__description-cards__card': {
-      backgroundColor: theme.palette.background.paper,
-      color: theme.palette.primary.main,
-    },
-
-    [theme.breakpoints.up('lg')]: {
-      '& .login-content': {
-        maxWidth: '1000px',
-      },
-
-      '& .login-content__form': {
-        width: '50%',
-      },
-
-      '& .login-content__description': {
-        width: '50%',
-        display: 'flex',
-      },
-    },
-  }
-}));
-
-const Login = ({ state, description, connectOptions }: LoginProps) => {
-  const { t } = useTranslation();
-
-  const isConnected = AuthenticationService.isConnected(state);
-
-  const [rememberLogin, setRememberLogin] = useState(null);
-  const [dialogState, setDialogState] = useState({
-    passwordResetRequestDialog: false,
-    resetPasswordDialog: false,
-    registrationDialog: false,
-    activationDialog: false,
-  });
-  const [userToResetPassword, setUserToResetPassword] = useState(null);
-
-  const passwordResetToast = useToast({ key: 'password-reset-success', children: t('LoginContainer.toasts.passwordResetSuccess') });
-  const accountActivatedToast = useToast({
-    key: 'account-activation-success',
-    children: t('LoginContainer.toasts.accountActivationSuccess')
-  });
-
-  useReduxEffect(() => {
-    closeRequestPasswordResetDialog();
-    openResetPasswordDialog();
-  }, ServerTypes.RESET_PASSWORD_REQUESTED, []);
-
-  useReduxEffect(() => {
-    passwordResetToast.openToast()
-    closeResetPasswordDialog();
-  }, ServerTypes.RESET_PASSWORD_SUCCESS, []);
-
-  useReduxEffect(() => {
-    accountActivatedToast.openToast()
-    closeActivateAccountDialog();
-  }, ServerTypes.ACCOUNT_ACTIVATION_SUCCESS, []);
-
-  useReduxEffect(() => {
-    closeRegistrationDialog();
-    openActivateAccountDialog();
-  }, ServerTypes.ACCOUNT_AWAITING_ACTIVATION, []);
-
-  useReduxEffect(() => {
-    resetSubmitButton();
-  }, [ServerTypes.CONNECTION_FAILED, ServerTypes.LOGIN_FAILED], []);
-
-  useReduxEffect(({ options: { hashedPassword } }) => {
-    updateHost(hashedPassword, rememberLogin);
-  }, ServerTypes.LOGIN_SUCCESSFUL, [rememberLogin]);
-
-  const showDescription = () => {
-    return !isConnected && description?.length;
-  };
-
-  const onSubmitLogin = useCallback((loginForm) => {
-    setRememberLogin(loginForm);
-    const { userName, password, selectedHost, remember } = loginForm;
-
-    const options: WebSocketConnectOptions = {
-      ...getHostPort(selectedHost),
-      userName,
-      password
-    };
-
-    if (remember && !password) {
-      options.hashedPassword = selectedHost.hashedPassword;
-    }
-
-    AuthenticationService.login(options as WebSocketConnectOptions);
-  }, []);
-
-  const [submitButtonDisabled, resetSubmitButton, handleLogin] = useFireOnce(onSubmitLogin);
-
-  const updateHost = (hashedPassword, { selectedHost, remember, userName }) => {
-    HostDTO.get(selectedHost.id).then(hostDTO => {
-      hostDTO.remember = remember;
-      hostDTO.userName = remember ? userName : null;
-      hostDTO.hashedPassword = remember ? hashedPassword : null;
-
-      hostDTO.save();
-    });
-  };
-
-  const handleRegistrationDialogSubmit = (registerForm) => {
-    setRememberLogin(registerForm);
-    const { userName, password, email, country, realName, selectedHost } = registerForm;
-
-    AuthenticationService.register({
-      ...getHostPort(selectedHost),
-      userName,
-      password,
-      email,
-      country,
-      realName,
-    });
-  };
-
-  const handleAccountActivationDialogSubmit = ({ token }) => {
-    AuthenticationService.activateAccount({
-      ...connectOptions,
-      token,
-    });
-  };
-
-  const handleRequestPasswordResetDialogSubmit = (form) => {
-    const { userName, email, selectedHost } = form;
-    const { host, port } = getHostPort(selectedHost);
-
-    if (email) {
-      AuthenticationService.resetPasswordChallenge({ userName, email, host, port });
-    } else {
-      setUserToResetPassword(userName);
-      AuthenticationService.resetPasswordRequest({ userName, host, port });
-    }
-  };
-
-  const handleResetPasswordDialogSubmit = ({ userName, token, newPassword, selectedHost }) => {
-    const { host, port } = getHostPort(selectedHost);
-
-    AuthenticationService.resetPassword({ userName, token, newPassword, host, port });
-  };
-
-  const skipTokenRequest = (userName) => {
-    setUserToResetPassword(userName);
-
-    setDialogState(s => ({ ...s,
-      passwordResetRequestDialog: false,
-      resetPasswordDialog: true,
-    }));
-  };
-
-  const closeRequestPasswordResetDialog = () => {
-    setDialogState(s => ({ ...s, passwordResetRequestDialog: false }));
-  }
-
-  const openRequestPasswordResetDialog = () => {
-    setDialogState(s => ({ ...s, passwordResetRequestDialog: true }));
-  }
-
-  const closeResetPasswordDialog = () => {
-    setDialogState(s => ({ ...s, resetPasswordDialog: false }));
-  }
-
-  const openResetPasswordDialog = () => {
-    setDialogState(s => ({ ...s, resetPasswordDialog: true }));
-  }
-
-  const closeRegistrationDialog = () => {
-    setDialogState(s => ({ ...s, registrationDialog: false }));
-  }
-
-  const openRegistrationDialog = () => {
-    setDialogState(s => ({ ...s, registrationDialog: true }));
-  }
-
-  const closeActivateAccountDialog = () => {
-    setDialogState(s => ({ ...s, activationDialog: false }));
-  };
-
-  const openActivateAccountDialog = () => {
-    setDialogState(s => ({ ...s, activationDialog: true }));
-  };
-
-  return (
-    <Layout showNav={false} noHeightLimit={true}>
-      <Root className={'login overflow-scroll ' + classes.root}>
-        { isConnected && <Navigate to={RouteEnum.SERVER} />}
-
-        <div className="login__wrapper">
-          <Paper className="login-content">
-            <div className="login-content__form">
-              <div className="login-content__header">
-                <img src={Images.Logo} alt="logo" />
-                <span>COCKATRICE</span>
-              </div>
-              <Typography variant="h1">{ t('LoginContainer.header.title') }</Typography>
-              <Typography variant="subtitle1">{ t('LoginContainer.header.subtitle') }</Typography>
-              <div className="login-form">
-                <LoginForm
-                  onSubmit={handleLogin}
-                  onResetPassword={openRequestPasswordResetDialog}
-                  disableSubmitButton={submitButtonDisabled}
-                />
-              </div>
-
-              {
-                showDescription() && (
-                  <Paper className="login-content__connectionStatus">
-                    {description}
-                  </Paper>
-                )
-              }
-
-              <div className="login-footer">
-                <div className="login-footer__register">
-                  <span>{ t('LoginContainer.footer.registerPrompt') }</span>
-                  <Button color="primary" onClick={openRegistrationDialog}>{ t('LoginContainer.footer.registerAction') }</Button>
-                </div>
-                <Typography variant="subtitle2">
-                  { t('LoginContainer.footer.credit') } - { new Date().getUTCFullYear() }
-                </Typography>
-
-                {
-                  serverProps.REACT_APP_VERSION && (
-                    <Typography variant="subtitle2">
-                      { t('LoginContainer.footer.version') }: { serverProps.REACT_APP_VERSION }
-                    </Typography>
-                  )
-                }
-
-                <div className="login-footer__language">
-                  <LanguageDropdown />
-                </div>
-              </div>
-            </div>
-            <div className="login-content__description">
-              <div className="login-content__description-graphics">
-                <div className="topLeft login-content__description-square" />
-                <div className="topRight login-content__description-square" />
-                <div className="bottomRight login-content__description-square" />
-                <div className="bottomLeft login-content__description-square" />
-                <div className="topBar login-content__description-bar" />
-                <div className="bottomBar login-content__description-bar" />
-              </div>
-              <div className="login-content__description-wrapper">
-                <div className="login-content__description-cards">
-                  <div className="login-content__description-cards__card leftCard">
-                    <div className="login-content__description-cards__card-wrapper">
-                      <img src={Images.Faces.face1} alt='Stock Player' />
-                      <span>1mrlee</span>
-                    </div>
-                  </div>
-                  <div className="login-content__description-cards__card rightCard">
-                    <div className="login-content__description-cards__card-wrapper">
-                      <img src={Images.Faces.face2} alt='Stock Player' />
-                      <span>CyberX</span>
-                    </div>
-                  </div>
-                  <div className="login-content__description-cards__card topCard">
-                    <div className="login-content__description-cards__card-wrapper">
-                      <img src={Images.Faces.face3} alt='Stock Player' />
-                      <span>Gamer69</span>
-                    </div>
-                  </div>
-                </div>
-                { /*<img src={loginGraphic} className="login-content__description-image"/>*/}
-                <p className="login-content__description-subtitle1">{ t('LoginContainer.content.subtitle1') }</p>
-                <p className="login-content__description-subtitle2">{ t('LoginContainer.content.subtitle2') }</p>
-              </div>
-            </div>
-          </Paper>
-        </div>
-
-        <RegistrationDialog
-          isOpen={dialogState.registrationDialog}
-          onSubmit={handleRegistrationDialogSubmit}
-          handleClose={closeRegistrationDialog}
-        />
-
-        <RequestPasswordResetDialog
-          isOpen={dialogState.passwordResetRequestDialog}
-          onSubmit={handleRequestPasswordResetDialogSubmit}
-          handleClose={closeRequestPasswordResetDialog}
-          skipTokenRequest={skipTokenRequest}
-        />
-
-        <ResetPasswordDialog
-          isOpen={dialogState.resetPasswordDialog}
-          onSubmit={handleResetPasswordDialogSubmit}
-          handleClose={closeResetPasswordDialog}
-          userName={userToResetPassword}
-        />
-
-        <AccountActivationDialog
-          isOpen={dialogState.activationDialog}
-          onSubmit={handleAccountActivationDialogSubmit}
-          handleClose={closeActivateAccountDialog}
-        />
-      </Root>
-    </Layout>
-  );
-}
-
-interface LoginProps {
-  state: number;
-  description: string;
-  connectOptions: WebSocketConnectOptions;
-}
-
-const mapStateToProps = state => ({
-  state: ServerSelectors.getState(state),
-  description: ServerSelectors.getDescription(state),
-  connectOptions: ServerSelectors.getConnectOptions(state),
-});
-
-export default connect(mapStateToProps)(Login);
diff --git a/webclient/src/containers/Logs/LogResults.css b/webclient/src/containers/Logs/LogResults.css
deleted file mode 100644
index 3a6cbd185..000000000
--- a/webclient/src/containers/Logs/LogResults.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.log-results {
-  margin-bottom: 20px;
-}
\ No newline at end of file
diff --git a/webclient/src/containers/Logs/LogResults.tsx b/webclient/src/containers/Logs/LogResults.tsx
deleted file mode 100644
index 06abdbce6..000000000
--- a/webclient/src/containers/Logs/LogResults.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import React from 'react';
-import * as _ from 'lodash';
-
-import AppBar from '@mui/material/AppBar';
-import Box from '@mui/material/Box';
-import Paper from '@mui/material/Paper';
-import Table from '@mui/material/Table';
-import TableBody from '@mui/material/TableBody';
-import TableCell from '@mui/material/TableCell';
-import TableHead from '@mui/material/TableHead';
-import TableRow from '@mui/material/TableRow';
-import Tab from '@mui/material/Tab';
-import Tabs from '@mui/material/Tabs';
-import Typography from '@mui/material/Typography';
-
-import './LogResults.css';
-
-const LogResults = (props) => {
-  const { logs } = props;
-
-  const hasRoomLogs = logs.room && logs.room.length;
-  const hasGameLogs = logs.game && logs.game.length;
-  const hasChatLogs = logs.chat && logs.chat.length;
-
-  const [value, setValue] = React.useState(0);
-
-  const handleChange = (event, newValue) => {
-    setValue(newValue);
-  };
-
-  const headerCells = [
-    {
-      label: 'Time'
-    },
-    {
-      label: 'Sender Name'
-    },
-    {
-      label: 'Sender IP'
-    },
-    {
-      label: 'Message'
-    },
-    {
-      label: 'Target ID'
-    },
-    {
-      label: 'Target Name'
-    }
-  ];
-
-  return (
-    <div>
-      <AppBar position="static">
-        <Tabs value={value} onChange={handleChange} aria-label="simple tabs example">
-          <Tab label={'Rooms' + (hasRoomLogs ? ` [${logs.room.length}]` : '')} {...a11yProps(0)} />
-          <Tab label={'Games' + (hasGameLogs ? ` [${logs.game.length}]` : '')} {...a11yProps(1)} />
-          <Tab label={'Chats' + (hasChatLogs ? ` [${logs.chat.length}]` : '')} {...a11yProps(2)} />
-        </Tabs>
-      </AppBar>
-      <TabPanel value={value} index={0}>
-        <Results logs={logs.room} headerCells={headerCells} />
-      </TabPanel>
-      <TabPanel value={value} index={1}>
-        <Results logs={logs.game} headerCells={headerCells} />
-      </TabPanel>
-      <TabPanel value={value} index={2}>
-        <Results logs={logs.chat} headerCells={headerCells} />
-      </TabPanel>
-    </div>
-  )
-};
-
-const a11yProps = index => {
-  return {
-    id: `simple-tab-${index}`,
-    'aria-controls': `simple-tabpanel-${index}`,
-  };
-};
-
-const TabPanel = ({ children, value, index, ...other }) => {
-  return (
-    <Typography
-      component="div"
-      role="tabpanel"
-      hidden={value !== index}
-      id={`simple-tabpanel-${index}`}
-      aria-labelledby={`simple-tab-${index}`}
-      {...other}
-    >
-      <Box>{children}</Box>
-    </Typography>
-  );
-};
-
-const Results = ({ headerCells, logs }) => (
-  <Paper className="log-results">
-    <Table size="small">
-      <TableHead>
-        <TableRow>
-          { _.map(headerCells, ({ label }) => (
-            <TableCell key={label}>{label}</TableCell>
-          ))}
-        </TableRow>
-      </TableHead>
-      <TableBody>
-        { _.map(logs, ({ time, senderName, senderIp, message, targetId, targetName }, index) => (
-          <TableRow key={index}>
-            <TableCell>{time}</TableCell>
-            <TableCell>{senderName}</TableCell>
-            <TableCell>{senderIp}</TableCell>
-            <TableCell>{message}</TableCell>
-            <TableCell>{targetId}</TableCell>
-            <TableCell>{targetName}</TableCell>
-          </TableRow>
-        ))}
-      </TableBody>
-    </Table>
-  </Paper>
-);
-
-export default LogResults;
diff --git a/webclient/src/containers/Logs/Logs.css b/webclient/src/containers/Logs/Logs.css
deleted file mode 100644
index 37ac8eb03..000000000
--- a/webclient/src/containers/Logs/Logs.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.moderator-logs {
-  height: 100%;
-  display: flex;
-  padding: 20px;
-}
-
-.moderator-logs__form {
-  width: 40%;
-  margin-right: 20px;
-}
-
-.moderator-logs__results {
-  width: 100%;
-}
\ No newline at end of file
diff --git a/webclient/src/containers/Logs/Logs.tsx b/webclient/src/containers/Logs/Logs.tsx
deleted file mode 100644
index a34a7b008..000000000
--- a/webclient/src/containers/Logs/Logs.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-// eslint-disable-next-line
-import React, { Component } from "react";
-import { connect } from 'react-redux';
-import * as _ from 'lodash';
-
-import { ModeratorService } from 'api';
-import { AuthGuard, ModGuard } from 'components';
-import { SearchForm } from 'forms';
-import { ServerDispatch, ServerSelectors, ServerStateLogs } from 'store';
-import { LogFilters } from 'types';
-
-import LogResults from './LogResults';
-import './Logs.css';
-
-class Logs extends Component<LogsTypes> {
-  MAXIMUM_RESULTS = 1000;
-
-  constructor(props) {
-    super(props);
-
-    this.onSubmit = this.onSubmit.bind(this);
-  }
-
-  componentWillUnmount() {
-    ServerDispatch.clearLogs();
-  }
-
-  onSubmit(fields: LogFilters) {
-    const trimmedFields: any = this.trimFields(fields);
-
-    const { userName, ipAddress, gameName, gameId, message, logLocation } = trimmedFields;
-
-    const required = _.filter({
-      userName, ipAddress, gameName, gameId, message
-    }, field => field);
-
-    if (logLocation) {
-      trimmedFields.logLocation = this.flattenLogLocations(logLocation);
-    }
-
-    trimmedFields.maximumResults = this.MAXIMUM_RESULTS;
-
-    if (_.size(required)) {
-      ModeratorService.viewLogHistory(trimmedFields);
-    } else {
-      // @TODO use yet-to-be-implemented banner/alert
-    }
-  }
-
-  private trimFields(fields) {
-    return _.reduce(fields, (obj, field, key) => {
-      if (typeof field === 'string') {
-        const trimmed = _.trim(field);
-
-        if (!!trimmed) {
-          obj[key] = trimmed;
-        }
-      } else {
-        obj[key] = field;
-      }
-
-      return obj;
-    }, {});
-  }
-
-  private flattenLogLocations(logLocations) {
-    return _.reduce(logLocations, (arr, loc, key) => {
-      arr.push(key);
-      return arr;
-    }, [])
-  }
-
-  render() {
-    return (
-      <div className="moderator-logs overflow-scroll">
-        <AuthGuard />
-        <ModGuard />
-
-        <div className="moderator-logs__form">
-          <SearchForm onSubmit={this.onSubmit} />
-        </div>
-
-        <div className="moderator-logs__results">
-          <LogResults logs={this.props.logs} />
-        </div>
-      </div>
-    )
-  }
-}
-
-interface LogsTypes {
-  logs: ServerStateLogs
-}
-
-const mapStateToProps = state => ({
-  logs: ServerSelectors.getLogs(state)
-});
-
-export default connect(mapStateToProps)(Logs);
-
-
-
-
-
-
-
-
-
-
diff --git a/webclient/src/containers/Player/Player.tsx b/webclient/src/containers/Player/Player.tsx
deleted file mode 100644
index 74feff8bd..000000000
--- a/webclient/src/containers/Player/Player.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-// eslint-disable-next-line
-import React, { Component } from "react";
-import Layout from 'containers/Layout/Layout';
-
-import { AuthGuard } from 'components';
-
-class Player extends Component {
-  render() {
-    return (
-      <Layout>
-        <AuthGuard />
-        <span>"Player"</span>
-      </Layout>
-    )
-  }
-}
-
-export default Player;
diff --git a/webclient/src/containers/Room/Games.css b/webclient/src/containers/Room/Games.css
deleted file mode 100644
index 623ab47f5..000000000
--- a/webclient/src/containers/Room/Games.css
+++ /dev/null
@@ -1,30 +0,0 @@
-.games {
-}
-
-.games-header,
-.game {
-  display: flex;
-  padding: 10px;
-  border-bottom: 1px solid black;
-}
-
-.games-header__cell {
-  max-width: 200px;
-}
-
-.games-header__label,
-.game__detail {
-  width: 10%;
-  flex-grow: 0;
-}
-
-.games-header__label.description,
-.game__detail.description {
-  width: 20%;
-  flex-grow: 1;
-}
-
-.games-header__label.creator,
-.game__detail.creator {
-  width: 20%;
-}
diff --git a/webclient/src/containers/Room/Games.tsx b/webclient/src/containers/Room/Games.tsx
deleted file mode 100644
index 67a9239d3..000000000
--- a/webclient/src/containers/Room/Games.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-// eslint-disable-next-line
-import React, { Component } from "react";
-import { connect } from 'react-redux';
-import * as _ from 'lodash';
-
-import Table from '@mui/material/Table';
-import TableBody from '@mui/material/TableBody';
-import TableCell from '@mui/material/TableCell';
-import TableHead from '@mui/material/TableHead';
-import TableRow from '@mui/material/TableRow';
-import TableSortLabel from '@mui/material/TableSortLabel';
-import Tooltip from '@mui/material/Tooltip';
-
-// import { RoomsService } from "AppShell/common/services";
-
-import { SortUtil, RoomsDispatch, RoomsSelectors } from 'store';
-import { UserDisplay } from 'components';
-
-import './Games.css';
-
-// @TODO run interval to update timeSinceCreated
-class Games extends Component<GamesProps> {
-  private headerCells = [
-    {
-      label: 'Age',
-      field: 'startTime'
-    },
-    {
-      label: 'Description',
-      field: 'description'
-    },
-    {
-      label: 'Creator',
-      field: 'creatorInfo.name'
-    },
-    {
-      label: 'Type',
-      field: 'gameType'
-    },
-    {
-      label: 'Restrictions',
-      // field: "?"
-    },
-    {
-      label: 'Players',
-      // field: ["maxPlayers", "playerCount"]
-    },
-    {
-      label: 'Spectators',
-      field: 'spectatorsCount'
-    },
-  ];
-
-  handleSort(sortByField) {
-    const { room: { roomId }, sortBy } = this.props;
-    const { field, order } = SortUtil.toggleSortBy(sortByField, sortBy);
-    RoomsDispatch.sortGames(roomId, field, order);
-  }
-
-  private isUnavailableGame({ started, maxPlayers, playerCount }) {
-    return !started && playerCount < maxPlayers;
-  }
-
-  private isPasswordProtectedGame({ withPassword }) {
-    return !withPassword;
-  }
-
-  private isBuddiesOnlyGame({ onlyBuddies }) {
-    return !onlyBuddies;
-  }
-
-  render() {
-    const { room, sortBy } = this.props;
-
-    const games = room.gameList.filter(game => (
-      this.isUnavailableGame(game) &&
-      this.isPasswordProtectedGame(game) &&
-      this.isBuddiesOnlyGame(game)
-    ));
-
-    return (
-      <div className="games">
-        <Table size="small">
-          <TableHead>
-            <TableRow>
-              { _.map(this.headerCells, ({ label, field }) => {
-                const active = field === sortBy.field;
-                const order = sortBy.order.toLowerCase();
-                const sortDirection = active ? order : false;
-
-                return (
-                  <TableCell sortDirection={sortDirection} key={label}>
-                    {!field ? label : (
-                      <TableSortLabel
-                        active={active}
-                        direction={order}
-                        onClick={() => this.handleSort(field)}
-                      >
-                        {label}
-                      </TableSortLabel>
-                    )}
-                  </TableCell>
-                );
-              })}
-            </TableRow>
-          </TableHead>
-          <TableBody>
-            { _.map(games, ({ description, gameId, gameType, creatorInfo, maxPlayers, playerCount, spectatorsCount, startTime }) => (
-              <TableRow key={gameId}>
-                <TableCell className="games-header__cell single-line-ellipsis">{startTime}</TableCell>
-                <TableCell className="games-header__cell">
-                  <Tooltip title={description} placement="bottom-start" enterDelay={500}>
-                    <div className="single-line-ellipsis">
-                      {description}
-                    </div>
-                  </Tooltip>
-                </TableCell>
-                <TableCell className="games-header__cell">
-                  <UserDisplay user={ creatorInfo } />
-                </TableCell>
-                <TableCell className="games-header__cell single-line-ellipsis">{gameType}</TableCell>
-                <TableCell className="games-header__cell single-line-ellipsis">?</TableCell>
-                <TableCell className="games-header__cell single-line-ellipsis">{`${playerCount}/${maxPlayers}`}</TableCell>
-                <TableCell className="games-header__cell single-line-ellipsis">{spectatorsCount}</TableCell>
-              </TableRow>
-            ))}
-          </TableBody>
-        </Table>
-      </div>
-    );
-  }
-}
-
-interface GamesProps {
-  room: any;
-  sortBy: any;
-}
-
-const mapStateToProps = state => ({
-  sortBy: RoomsSelectors.getSortGamesBy(state)
-});
-
-export default connect(mapStateToProps)(Games);
diff --git a/webclient/src/containers/Room/Messages.css b/webclient/src/containers/Room/Messages.css
deleted file mode 100644
index 731002cb8..000000000
--- a/webclient/src/containers/Room/Messages.css
+++ /dev/null
@@ -1,17 +0,0 @@
-.messages {
-  height: 100%;
-  width: 100%;
-  padding: 10px;
-  font-size: 12px;
-  line-height: 1.3;
-}
-
-.message-wrapper {
-  padding: 5px 0;
-  margin: 2px 0;
-  border-bottom: 1px dashed rgba(0, 0, 0, 0.25);
-}
-
-.message-wrapper:last-of-type {
-  border: 0;
-}
diff --git a/webclient/src/containers/Room/Messages.tsx b/webclient/src/containers/Room/Messages.tsx
deleted file mode 100644
index 24b576759..000000000
--- a/webclient/src/containers/Room/Messages.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-// eslint-disable-next-line
-import React from "react";
-
-import { Message } from 'components';
-
-import './Messages.css';
-
-const Messages = ({ messages }) => (
-  <div className="messages">
-    {
-      messages && messages.map((message, index) => (
-        <div className="message-wrapper" key={message.timeReceived}>
-          <Message message={message} />
-        </div>
-      ))
-    }
-  </div>
-);
-
-export default Messages;
diff --git a/webclient/src/containers/Room/OpenGames.css b/webclient/src/containers/Room/OpenGames.css
deleted file mode 100644
index 623ab47f5..000000000
--- a/webclient/src/containers/Room/OpenGames.css
+++ /dev/null
@@ -1,30 +0,0 @@
-.games {
-}
-
-.games-header,
-.game {
-  display: flex;
-  padding: 10px;
-  border-bottom: 1px solid black;
-}
-
-.games-header__cell {
-  max-width: 200px;
-}
-
-.games-header__label,
-.game__detail {
-  width: 10%;
-  flex-grow: 0;
-}
-
-.games-header__label.description,
-.game__detail.description {
-  width: 20%;
-  flex-grow: 1;
-}
-
-.games-header__label.creator,
-.game__detail.creator {
-  width: 20%;
-}
diff --git a/webclient/src/containers/Room/OpenGames.tsx b/webclient/src/containers/Room/OpenGames.tsx
deleted file mode 100644
index 49d4d2503..000000000
--- a/webclient/src/containers/Room/OpenGames.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-// eslint-disable-next-line
-import React, { Component } from "react";
-import { connect } from 'react-redux';
-import * as _ from 'lodash';
-
-import Table from '@mui/material/Table';
-import TableBody from '@mui/material/TableBody';
-import TableCell from '@mui/material/TableCell';
-import TableHead from '@mui/material/TableHead';
-import TableRow from '@mui/material/TableRow';
-import TableSortLabel from '@mui/material/TableSortLabel';
-import Tooltip from '@mui/material/Tooltip';
-
-// import { RoomsService } from "AppShell/common/services";
-
-import { SortUtil, RoomsDispatch, RoomsSelectors } from 'store';
-import { UserDisplay } from 'components';
-
-import './OpenGames.css';
-
-// @TODO run interval to update timeSinceCreated
-class OpenGames extends Component<OpenGamesProps> {
-  private headerCells = [
-    {
-      label: 'Age',
-      field: 'startTime'
-    },
-    {
-      label: 'Description',
-      field: 'description'
-    },
-    {
-      label: 'Creator',
-      field: 'creatorInfo.name'
-    },
-    {
-      label: 'Type',
-      field: 'gameType'
-    },
-    {
-      label: 'Restrictions',
-      // field: "?"
-    },
-    {
-      label: 'Players',
-      // field: ["maxPlayers", "playerCount"]
-    },
-    {
-      label: 'Spectators',
-      field: 'spectatorsCount'
-    },
-  ];
-
-  handleSort(sortByField) {
-    const { room: { roomId }, sortBy } = this.props;
-    const { field, order } = SortUtil.toggleSortBy(sortByField, sortBy);
-    RoomsDispatch.sortGames(roomId, field, order);
-  }
-
-  private isUnavailableGame({ started, maxPlayers, playerCount }) {
-    return !started && playerCount < maxPlayers;
-  }
-
-  private isPasswordProtectedGame({ withPassword }) {
-    return !withPassword;
-  }
-
-  private isBuddiesOnlyGame({ onlyBuddies }) {
-    return !onlyBuddies;
-  }
-
-  render() {
-    const { room, sortBy } = this.props;
-
-    const games = room.gameList.filter(game => (
-      this.isUnavailableGame(game) &&
-      this.isPasswordProtectedGame(game) &&
-      this.isBuddiesOnlyGame(game)
-    ));
-
-    return (
-      <div className="games">
-        <Table size="small">
-          <TableHead>
-            <TableRow>
-              { _.map(this.headerCells, ({ label, field }) => {
-                const active = field === sortBy.field;
-                const order = sortBy.order.toLowerCase();
-                const sortDirection = active ? order : false;
-
-                return (
-                  <TableCell sortDirection={sortDirection} key={label}>
-                    {!field ? label : (
-                      <TableSortLabel
-                        active={active}
-                        direction={order}
-                        onClick={() => this.handleSort(field)}
-                      >
-                        {label}
-                      </TableSortLabel>
-                    )}
-                  </TableCell>
-                );
-              })}
-            </TableRow>
-          </TableHead>
-          <TableBody>
-            { _.map(games, ({ description, gameId, gameType, creatorInfo, maxPlayers, playerCount, spectatorsCount, startTime }) => (
-              <TableRow key={gameId}>
-                <TableCell className="games-header__cell single-line-ellipsis">{startTime}</TableCell>
-                <TableCell className="games-header__cell">
-                  <Tooltip title={description} placement="bottom-start" enterDelay={500}>
-                    <div className="single-line-ellipsis">
-                      {description}
-                    </div>
-                  </Tooltip>
-                </TableCell>
-                <TableCell className="games-header__cell">
-                  <UserDisplay user={ creatorInfo } />
-                </TableCell>
-                <TableCell className="games-header__cell single-line-ellipsis">{gameType}</TableCell>
-                <TableCell className="games-header__cell single-line-ellipsis">?</TableCell>
-                <TableCell className="games-header__cell single-line-ellipsis">{`${playerCount}/${maxPlayers}`}</TableCell>
-                <TableCell className="games-header__cell single-line-ellipsis">{spectatorsCount}</TableCell>
-              </TableRow>
-            ))}
-          </TableBody>
-        </Table>
-      </div>
-    );
-  }
-}
-
-interface OpenGamesProps {
-  room: any;
-  sortBy: any;
-}
-
-const mapStateToProps = state => ({
-  sortBy: RoomsSelectors.getSortGamesBy(state)
-});
-
-export default connect(mapStateToProps)(OpenGames);
diff --git a/webclient/src/containers/Room/Room.css b/webclient/src/containers/Room/Room.css
deleted file mode 100644
index 4b6aaec93..000000000
--- a/webclient/src/containers/Room/Room.css
+++ /dev/null
@@ -1,45 +0,0 @@
-.room-view,
-.room-view__main,
-.room-view__games,
-.room-view__messages,
-.room-view__messages-content,
-.room-view__side {
-  height: 100%;
-}
-
-.room-view,
-.room-view__messages,
-.room-view__side {
-  display: flex;
-  flex-direction: column;
-}
-
-.room-view__main {
-  overflow: hidden;
-}
-
-.room-view__messages-sayMessage {
-  width: 100%;
-  margin: 10px auto 2px;
-}
-
-.room-view__side-label {
-  position: sticky;
-  top: 0;
-  padding: 10px;
-  background: white;
-  z-index: 1;
-}
-
-.room-view__side-list,
-.room-view__side-list .room-view__side-list__item  {
-  height: 100%;
-}
-
-.room-view__side-list .room-view__side-list__item {
-  padding: 0;
-}
-
-.room-view__side-list .room-view__side-list__item  .user-display__details {
-  padding: 0 10px;
-}
\ No newline at end of file
diff --git a/webclient/src/containers/Room/Room.tsx b/webclient/src/containers/Room/Room.tsx
deleted file mode 100644
index c73930d7f..000000000
--- a/webclient/src/containers/Room/Room.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import React, { useEffect } from 'react';
-import { connect } from 'react-redux';
-import { useNavigate, useParams, generatePath } from 'react-router-dom';
-
-import ListItem from '@mui/material/ListItem';
-import Paper from '@mui/material/Paper';
-
-import { RoomsService } from 'api';
-import { ScrollToBottomOnChanges, ThreePaneLayout, UserDisplay, VirtualList, AuthGuard } from 'components';
-import { RoomsStateMessages, RoomsStateRooms, JoinedRooms, RoomsSelectors, RoomsTypes } from 'store';
-import { RouteEnum } from 'types';
-import Layout from 'containers/Layout/Layout';
-
-import OpenGames from './OpenGames';
-import Messages from './Messages';
-import SayMessage from './SayMessage';
-
-import './Room.css';
-
-// @TODO (3)
-const Room = (props) => {
-  const { joined, rooms, messages } = props;
-  const navigate = useNavigate();
-  const params = useParams();
-
-  const roomId = parseInt(params.roomId, 0);
-  const room = rooms[roomId];
-  const roomMessages = messages[roomId];
-  const users = room.userList;
-
-  useEffect(() => {
-    if (!joined.find(({ roomId: id }) => id === roomId)) {
-      navigate(generatePath(RouteEnum.SERVER));
-    }
-  }, [joined]);
-
-  const handleRoomSay = ({ message }) => {
-    if (message) {
-      RoomsService.roomSay(roomId, message);
-    }
-  }
-
-  return (
-    <Layout className="room-view">
-      <AuthGuard />
-
-      <div className="room-view__main">
-        <ThreePaneLayout
-          fixedHeight
-
-          top={(
-            <Paper className="room-view__games overflow-scroll">
-              <OpenGames room={room} />
-            </Paper>
-          )}
-
-          bottom={(
-            <div className="room-view__messages">
-              <Paper className="room-view__messages-content overflow-scroll">
-                <ScrollToBottomOnChanges changes={roomMessages} content={(
-                  <Messages messages={roomMessages} />
-                )} />
-              </Paper>
-              <Paper className="room-view__messages-sayMessage">
-                <SayMessage onSubmit={handleRoomSay} />
-              </Paper>
-            </div>
-          )}
-
-          side={(
-            <Paper className="room-view__side overflow-scroll">
-              <div className="room-view__side-label">
-                  Users in this room: {users.length}
-              </div>
-              <VirtualList
-                className="room-view__side-list"
-                itemKey={(index, data) => users[index].name }
-                items={ users.map(user => (
-                  <ListItem button className="room-view__side-list__item">
-                    <UserDisplay user={user} />
-                  </ListItem>
-                )) }
-              />
-            </Paper>
-          )}
-        />
-      </div>
-    </Layout>
-  );
-}
-
-interface RoomProps {
-  messages: RoomsStateMessages;
-  rooms: RoomsStateRooms;
-  joined: JoinedRooms;
-}
-
-const mapStateToProps = state => ({
-  messages: RoomsSelectors.getMessages(state),
-  rooms: RoomsSelectors.getRooms(state),
-  joined: RoomsSelectors.getJoinedRooms(state),
-});
-
-export default connect(mapStateToProps)(Room);
diff --git a/webclient/src/containers/Room/SayMessage.tsx b/webclient/src/containers/Room/SayMessage.tsx
deleted file mode 100644
index 4dd62dfb4..000000000
--- a/webclient/src/containers/Room/SayMessage.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import { Form } from 'react-final-form'
-
-import { InputAction } from 'components';
-
-const SayMessage = ({ onSubmit }) => (
-  <Form onSubmit={onSubmit}>
-    {({ handleSubmit, form }) => (
-      <form onSubmit={e => {
-        handleSubmit(e)
-        form.restart()
-      }}>
-        <InputAction action="Send" label="Chat" name="message" />
-      </form>
-    )}
-  </Form>
-);
-
-export default SayMessage;
diff --git a/webclient/src/containers/Server/Rooms.css b/webclient/src/containers/Server/Rooms.css
deleted file mode 100644
index bfcdc82cf..000000000
--- a/webclient/src/containers/Server/Rooms.css
+++ /dev/null
@@ -1,26 +0,0 @@
-.rooms {
-}
-
-.rooms-header,
-.room {
-  display: flex;
-  padding: 10px;
-  border-bottom: 1px solid black;
-}
-
-.rooms-header__label,
-.room__detail {
-  width: 10%;
-  flex-grow: 0;
-}
-
-.rooms-header__label.name,
-.room__detail.name {
-  width: 20%;
-}
-
-.rooms-header__label.description,
-.room__detail.description {
-  width: 30%;
-  flex-grow: 1;
-}
\ No newline at end of file
diff --git a/webclient/src/containers/Server/Rooms.tsx b/webclient/src/containers/Server/Rooms.tsx
deleted file mode 100644
index 517f24380..000000000
--- a/webclient/src/containers/Server/Rooms.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-// eslint-disable-next-line
-import React from "react";
-import { generatePath, useNavigate } from 'react-router-dom';
-import * as _ from 'lodash';
-
-import Button from '@mui/material/Button';
-import Table from '@mui/material/Table';
-import TableBody from '@mui/material/TableBody';
-import TableCell from '@mui/material/TableCell';
-import TableHead from '@mui/material/TableHead';
-import TableRow from '@mui/material/TableRow';
-
-
-import { RoomsService } from 'api';
-import { RouteEnum } from 'types';
-
-import './Rooms.css';
-
-const Rooms = ({ rooms, joinedRooms }) => {
-  const navigate = useNavigate();
-
-  function onClick(roomId) {
-    if (_.find(joinedRooms, room => room.roomId === roomId)) {
-      navigate(generatePath(RouteEnum.ROOM, { roomId }));
-    } else {
-      RoomsService.joinRoom(roomId);
-    }
-  }
-
-  return (
-    <div className="rooms">
-      <Table size="small">
-        <TableHead>
-          <TableRow>
-            <TableCell>Name</TableCell>
-            <TableCell>Description</TableCell>
-            <TableCell>Permissions</TableCell>
-            <TableCell>Players</TableCell>
-            <TableCell>Games</TableCell>
-            <TableCell></TableCell>
-          </TableRow>
-        </TableHead>
-        <TableBody>
-          { _.map(rooms, ({ description, gameCount, name, permissionlevel, playerCount, roomId }) => (
-            <TableRow key={roomId}>
-              <TableCell>{name}</TableCell>
-              <TableCell>{description}</TableCell>
-              <TableCell>{permissionlevel}</TableCell>
-              <TableCell>{playerCount}</TableCell>
-              <TableCell>{gameCount}</TableCell>
-              <TableCell>
-                <Button size="small" color="primary" variant="contained" onClick={() => onClick(roomId)}>
-                  Join
-                </Button>
-              </TableCell>
-            </TableRow>
-          ))}
-        </TableBody>
-      </Table>
-    </div>
-  );
-};
-
-export default Rooms;
diff --git a/webclient/src/containers/Server/Server.css b/webclient/src/containers/Server/Server.css
deleted file mode 100644
index 8d4e2e8dd..000000000
--- a/webclient/src/containers/Server/Server.css
+++ /dev/null
@@ -1,34 +0,0 @@
-.server,
-.server-rooms,
-.server-rooms__side {
-  height: 100%;
-}
-
-.server {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-
-.serverRoomWrapper {
-  height: 100%;
-}
-
-.serverMessage {
-  height: 100%;
-  padding: 20px;
-  margin-bottom: 2px;
-}
-
-.server-rooms {
-  width: 100%;
-}
-
-.server-rooms__side-label {
-  position: sticky;
-  top: 0;
-  padding: 10px;
-  background: white;
-  z-index: 1;
-}
diff --git a/webclient/src/containers/Server/Server.tsx b/webclient/src/containers/Server/Server.tsx
deleted file mode 100644
index 7ed5e2464..000000000
--- a/webclient/src/containers/Server/Server.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-// eslint-disable-next-line
-import React, { Component } from "react";
-import { connect } from 'react-redux';
-import { generatePath, useNavigate } from 'react-router-dom';
-
-import ListItem from '@mui/material/ListItem';
-import Paper from '@mui/material/Paper';
-
-import { AuthGuard, ThreePaneLayout, UserDisplay, VirtualList } from 'components';
-import { useReduxEffect } from 'hooks';
-import { RoomsSelectors, RoomsTypes, ServerSelectors } from 'store';
-import { Room, RouteEnum, User } from 'types';
-import Rooms from './Rooms';
-import Layout from 'containers/Layout/Layout';
-
-import './Server.css';
-
-const Server = ({ message, rooms, joinedRooms, users }: ServerProps) => {
-  const navigate = useNavigate();
-
-  useReduxEffect((action: any) => {
-    const roomId = action.roomInfo.roomId.toString();
-    navigate(generatePath(RouteEnum.ROOM, { roomId }));
-  }, RoomsTypes.JOIN_ROOM, []);
-
-  return (
-    <Layout className="server-rooms">
-      <AuthGuard />
-
-      <ThreePaneLayout
-        top={(
-          <Paper className="serverRoomWrapper overflow-scroll">
-            <Rooms rooms={rooms} joinedRooms={joinedRooms} />
-          </Paper>
-        )}
-
-        bottom={(
-          <Paper className="serverMessage overflow-scroll">
-            <div className="serverMessage__content" dangerouslySetInnerHTML={{ __html: message }} />
-          </Paper>
-        )}
-
-        side={(
-          <Paper className="server-rooms__side overflow-scroll">
-            <div className="server-rooms__side-label">
-              Users connected to server: {users.length}
-            </div>
-            <VirtualList
-              itemKey={(index) => users[index].name }
-              items={ users.map(user => (
-                <ListItem button dense>
-                  <UserDisplay user={user} />
-                </ListItem>
-              )) }
-            />
-          </Paper>
-        )}
-      />
-    </Layout>
-  );
-}
-
-interface ServerProps {
-  message: string;
-  rooms: Room[];
-  joinedRooms: Room[];
-  users: User[];
-}
-
-const mapStateToProps = state => ({
-  message: ServerSelectors.getMessage(state),
-  rooms: RoomsSelectors.getRooms(state),
-  joinedRooms: RoomsSelectors.getJoinedRooms(state),
-  users: ServerSelectors.getUsers(state)
-});
-
-export default connect(mapStateToProps)(Server);
diff --git a/webclient/src/containers/Unsupported/Unsupported.css b/webclient/src/containers/Unsupported/Unsupported.css
deleted file mode 100644
index 46752e746..000000000
--- a/webclient/src/containers/Unsupported/Unsupported.css
+++ /dev/null
@@ -1,18 +0,0 @@
-.Unsupported {
-  height: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 20px;
-}
-
-.Unsupported-paper {
-  width: 600px;
-  max-width: 100%;
-  padding: 40px;
-  text-align: center;
-}
-
-.Unsupported-paper__header {
-  margin-bottom: 40px;
-}
diff --git a/webclient/src/containers/Unsupported/Unsupported.i18n.json b/webclient/src/containers/Unsupported/Unsupported.i18n.json
deleted file mode 100644
index 225a13a67..000000000
--- a/webclient/src/containers/Unsupported/Unsupported.i18n.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "UnsupportedContainer": {
-    "title": "Unsupported Browser",
-    "subtitle1": "Please update your browser and/or check your permissions.",
-    "subtitle2": "Note: Private browsing causes some browsers to disable certain permissions or features."
-  }
-}
diff --git a/webclient/src/containers/Unsupported/Unsupported.tsx b/webclient/src/containers/Unsupported/Unsupported.tsx
deleted file mode 100644
index b666da12e..000000000
--- a/webclient/src/containers/Unsupported/Unsupported.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { connect } from 'react-redux';
-import { useTranslation } from 'react-i18next';
-import Paper from '@mui/material/Paper';
-import Typography from '@mui/material/Typography';
-import Layout from 'containers/Layout/Layout';
-
-import './Unsupported.css';
-
-const Unsupported = () => {
-  const { t } = useTranslation();
-
-  return (
-    <Layout className='Unsupported'>
-      <Paper className='Unsupported-paper'>
-        <div className='Unsupported-paper__header'>
-          <Typography variant="h1">{ t('UnsupportedContainer.title') }</Typography>
-          <Typography variant="subtitle1">{ t('UnsupportedContainer.subtitle1') }</Typography>
-        </div>
-
-        <Typography variant="subtitle2">{ t('UnsupportedContainer.subtitle2') }</Typography>
-      </Paper>
-    </Layout>
-  );
-};
-
-const mapStateToProps = state => ({
-
-});
-
-export default connect(mapStateToProps)(Unsupported);
diff --git a/webclient/src/containers/index.ts b/webclient/src/containers/index.ts
deleted file mode 100644
index f43de1c8e..000000000
--- a/webclient/src/containers/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export { default as AppShell } from './App/AppShell';
-export { default as Account } from './Account/Account';
-export { default as Game } from './Game/Game';
-export { default as Decks } from './Decks/Decks';
-export { default as Room } from './Room/Room';
-export { default as Player } from './Player/Player';
-export { default as Server } from './Server/Server';
-export { default as Logs } from './Logs/Logs';
-export { default as Login } from './Login/Login';
-export { default as Initialize } from './Initialize/Initialize';
-export { default as Unsupported } from './Unsupported/Unsupported';
diff --git a/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.css b/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.css
deleted file mode 100644
index 5175ab845..000000000
--- a/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.dialog-title {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.MuiDialogTitle-root.dialog-title {
-  padding-bottom: 0;
-}
-
-.content {
-  margin-bottom: 20px;
-}
\ No newline at end of file
diff --git a/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.i18n.json b/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.i18n.json
deleted file mode 100644
index 9cfd876f5..000000000
--- a/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.i18n.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "AccountActivationDialog": {
-    "title": "Account Activation",
-    "subtitle1": "Your account has not been activated yet.",
-    "subtitle2": "You need to provide the activation token received in the activation email."
-  }
-}
diff --git a/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.tsx b/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.tsx
deleted file mode 100644
index cb5239619..000000000
--- a/webclient/src/dialogs/AccountActivationDialog/AccountActivationDialog.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from 'react';
-import Dialog from '@mui/material/Dialog';
-import DialogContent from '@mui/material/DialogContent';
-import DialogTitle from '@mui/material/DialogTitle';
-import IconButton from '@mui/material/IconButton';
-import CloseIcon from '@mui/icons-material/Close';
-import Typography from '@mui/material/Typography';
-import { useTranslation } from 'react-i18next';
-
-import { AccountActivationForm } from 'forms';
-
-import './AccountActivationDialog.css';
-
-const AccountActivationDialog = ({ classes, handleClose, isOpen, onSubmit }: any) => {
-  const { t } = useTranslation();
-
-  const handleOnClose = () => {
-    handleClose();
-  }
-
-  return (
-    <Dialog onClose={handleOnClose} open={isOpen}>
-      <DialogTitle className="dialog-title">
-        <Typography variant="h6">{ t('AccountActivationDialog.title') }</Typography>
-
-        {handleOnClose ? (
-          <IconButton onClick={handleOnClose} size="large">
-            <CloseIcon />
-          </IconButton>
-        ) : null}
-      </DialogTitle>
-      <DialogContent>
-        <div className="content">
-          <Typography variant='subtitle1'>{ t('AccountActivationDialog.subtitle1') }</Typography>
-          <Typography variant='subtitle1'>{ t('AccountActivationDialog.subtitle2') }</Typography>
-        </div>
-
-        <AccountActivationForm onSubmit={onSubmit}></AccountActivationForm>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export default AccountActivationDialog;
diff --git a/webclient/src/dialogs/CardImportDialog/CardImportDialog.css b/webclient/src/dialogs/CardImportDialog/CardImportDialog.css
deleted file mode 100644
index b089ed200..000000000
--- a/webclient/src/dialogs/CardImportDialog/CardImportDialog.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.dialog-title {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
diff --git a/webclient/src/dialogs/CardImportDialog/CardImportDialog.tsx b/webclient/src/dialogs/CardImportDialog/CardImportDialog.tsx
deleted file mode 100644
index 8011d317a..000000000
--- a/webclient/src/dialogs/CardImportDialog/CardImportDialog.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-import Dialog from '@mui/material/Dialog';
-import DialogContent from '@mui/material/DialogContent';
-import DialogTitle from '@mui/material/DialogTitle';
-import IconButton from '@mui/material/IconButton';
-import CloseIcon from '@mui/icons-material/Close';
-import Typography from '@mui/material/Typography';
-
-import { CardImportForm } from 'forms';
-
-import './CardImportDialog.css';
-
-const CardImportDialog = ({ classes, handleClose, isOpen }: any) => {
-  const handleOnClose = () => {
-    handleClose();
-  }
-
-  return (
-    <Dialog onClose={handleOnClose} open={isOpen}>
-      <DialogTitle className="dialog-title">
-        <Typography variant="h2">Import Cards</Typography>
-
-        {handleOnClose ? (
-          <IconButton onClick={handleOnClose} size="large">
-            <CloseIcon />
-          </IconButton>
-        ) : null}
-      </DialogTitle>
-      <DialogContent>
-        <CardImportForm onSubmit={handleOnClose}></CardImportForm>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export default CardImportDialog;
diff --git a/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.css b/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.css
deleted file mode 100644
index e8a350f0d..000000000
--- a/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.css
+++ /dev/null
@@ -1,26 +0,0 @@
-.KnownHostDialog {
-
-}
-
-.KnownHostDialog .MuiDialog-paper {
-  width: 100%;
-  max-width: 420px;
-}
-
-.dialog-title__wrapper {
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-bottom: 1px solid;
-  padding-bottom: 10px;
-}
-
-.dialog-title__label {
-  display: flex;
-  align-items: center;
-}
-
-.dialog-content__subtitle.MuiTypography-root {
-  margin-bottom: 20px;
-}
diff --git a/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.i18n.json b/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.i18n.json
deleted file mode 100644
index 4ae521050..000000000
--- a/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.i18n.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "KnownHostDialog": {
-    "title": "{mode, select, edit {Edit} other {Add}} Known Host",
-    "subtitle": "Adding a new host allows you to connect to different servers. Enter the details below to your host list."
-  }
-}
diff --git a/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.tsx b/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.tsx
deleted file mode 100644
index 5bde19d92..000000000
--- a/webclient/src/dialogs/KnownHostDialog/KnownHostDialog.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import React from 'react';
-import { styled } from '@mui/material/styles';
-import Dialog from '@mui/material/Dialog';
-import DialogContent from '@mui/material/DialogContent';
-import DialogTitle from '@mui/material/DialogTitle';
-import IconButton from '@mui/material/IconButton';
-import AddIcon from '@mui/icons-material/Add';
-import CloseIcon from '@mui/icons-material/Close';
-import Typography from '@mui/material/Typography';
-import { useTranslation } from 'react-i18next';
-
-import { KnownHostForm } from 'forms';
-
-import './KnownHostDialog.css';
-
-const PREFIX = 'KnownHostDialog';
-
-const classes = {
-  root: `${PREFIX}-root`
-};
-
-const StyledDialog = styled(Dialog)(({ theme }) => ({
-  [`&.${classes.root}`]: {
-    '& .dialog-title__wrapper': {
-      borderColor: theme.palette.grey[300]
-    }
-  }
-}));
-
-const KnownHostDialog = ({ handleClose, onRemove, onSubmit, isOpen, host }: any) => {
-  const { t } = useTranslation();
-
-  const mode = host ? 'edit' : 'add';
-
-  const handleOnClose = () => {
-    if (handleClose) {
-      handleClose();
-    }
-  };
-
-  return (
-    <StyledDialog className={'KnownHostDialog ' + classes.root} onClose={handleOnClose} open={isOpen}>
-      <DialogTitle className='dialog-title'>
-        <div className='dialog-title__wrapper'>
-          <Typography variant='h2'>{ t('KnownHostDialog.title', { mode }) }</Typography>
-
-          {handleClose ? (
-            <IconButton onClick={handleClose} size="large">
-              <CloseIcon fontSize='large' />
-            </IconButton>
-          ) : null}
-        </div>
-      </DialogTitle>
-      <DialogContent className='dialog-content'>
-        <Typography className='dialog-content__subtitle' variant='subtitle1'>
-          { t('KnownHostDialog.subtitle') }
-        </Typography>
-        <KnownHostForm onRemove={onRemove} onSubmit={onSubmit} host={host}></KnownHostForm>
-      </DialogContent>
-    </StyledDialog>
-  );
-};
-
-export default KnownHostDialog;
diff --git a/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.css b/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.css
deleted file mode 100644
index 73822f190..000000000
--- a/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.dialog-title {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.dialog-content {
-  width: 700px;
-  max-width: 100%;
-}
diff --git a/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.i18n.json b/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.i18n.json
deleted file mode 100644
index bc0aa646d..000000000
--- a/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.i18n.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "RegistrationDialog": {
-    "title": "Create New Account"
-  }
-}
diff --git a/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.tsx b/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.tsx
deleted file mode 100644
index 2388dddb3..000000000
--- a/webclient/src/dialogs/RegistrationDialog/RegistrationDialog.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import Dialog from '@mui/material/Dialog';
-import DialogContent from '@mui/material/DialogContent';
-import DialogTitle from '@mui/material/DialogTitle';
-import IconButton from '@mui/material/IconButton';
-import CloseIcon from '@mui/icons-material/Close';
-import Typography from '@mui/material/Typography';
-import { useTranslation } from 'react-i18next';
-
-import { RegisterForm } from 'forms';
-
-import './RegistrationDialog.css';
-
-const RegistrationDialog = ({ classes, handleClose, isOpen, onSubmit }: any) => {
-  const { t } = useTranslation();
-
-  const handleOnClose = () => {
-    handleClose();
-  }
-
-  return (
-    <Dialog className="RegistrationDialog" onClose={handleOnClose} open={isOpen} maxWidth='xl'>
-      <DialogTitle className="dialog-title">
-        <Typography variant="h6">{ t('RegistrationDialog.title') }</Typography>
-
-        {handleOnClose ? (
-          <IconButton onClick={handleOnClose} size="large">
-            <CloseIcon />
-          </IconButton>
-        ) : null}
-      </DialogTitle>
-      <DialogContent className="dialog-content">
-        <RegisterForm onSubmit={onSubmit}></RegisterForm>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export default RegistrationDialog;
diff --git a/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.css b/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.css
deleted file mode 100644
index 731927c13..000000000
--- a/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.dialog-title {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
diff --git a/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.i18n.json b/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.i18n.json
deleted file mode 100644
index c287b7a82..000000000
--- a/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.i18n.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "RequestPasswordResetDialog": {
-    "title": "Request Password Reset"
-  }
-}
diff --git a/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.tsx b/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.tsx
deleted file mode 100644
index be2032a08..000000000
--- a/webclient/src/dialogs/RequestPasswordResetDialog/RequestPasswordResetDialog.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import Dialog from '@mui/material/Dialog';
-import DialogContent from '@mui/material/DialogContent';
-import DialogTitle from '@mui/material/DialogTitle';
-import IconButton from '@mui/material/IconButton';
-import CloseIcon from '@mui/icons-material/Close';
-import Typography from '@mui/material/Typography';
-import { useTranslation } from 'react-i18next';
-
-import { RequestPasswordResetForm } from 'forms';
-
-import './RequestPasswordResetDialog.css';
-
-const RequestPasswordResetDialog = ({ classes, handleClose, isOpen, onSubmit, skipTokenRequest }: any) => {
-  const { t } = useTranslation();
-
-  const handleOnClose = () => {
-    handleClose();
-  }
-
-  return (
-    <Dialog onClose={handleOnClose} open={isOpen}>
-      <DialogTitle className="dialog-title">
-        <Typography variant="h6">{ t('RequestPasswordResetDialog.title') }</Typography>
-
-        {handleOnClose ? (
-          <IconButton onClick={handleOnClose} size="large">
-            <CloseIcon />
-          </IconButton>
-        ) : null}
-      </DialogTitle>
-      <DialogContent>
-        <RequestPasswordResetForm onSubmit={onSubmit} skipTokenRequest={skipTokenRequest}></RequestPasswordResetForm>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export default RequestPasswordResetDialog;
diff --git a/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.css b/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.css
deleted file mode 100644
index 731927c13..000000000
--- a/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.dialog-title {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
diff --git a/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.i18n.json b/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.i18n.json
deleted file mode 100644
index 8047dcae0..000000000
--- a/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.i18n.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "ResetPasswordDialog": {
-    "title": "Reset Password"
-  }
-}
diff --git a/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.tsx b/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.tsx
deleted file mode 100644
index 877c8729f..000000000
--- a/webclient/src/dialogs/ResetPasswordDialog/ResetPasswordDialog.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import Dialog from '@mui/material/Dialog';
-import DialogContent from '@mui/material/DialogContent';
-import DialogTitle from '@mui/material/DialogTitle';
-import IconButton from '@mui/material/IconButton';
-import CloseIcon from '@mui/icons-material/Close';
-import Typography from '@mui/material/Typography';
-import { useTranslation } from 'react-i18next';
-
-import { ResetPasswordForm } from 'forms';
-
-import './ResetPasswordDialog.css';
-
-const ResetPasswordDialog = ({ classes, handleClose, isOpen, onSubmit, userName }: any) => {
-  const { t } = useTranslation();
-
-  const handleOnClose = () => {
-    handleClose();
-  }
-
-  return (
-    <Dialog onClose={handleOnClose} open={isOpen}>
-      <DialogTitle className="dialog-title">
-        <Typography variant="h6">{t('ResetPasswordDialog.title')}</Typography>
-
-        {handleOnClose ? (
-          <IconButton onClick={handleOnClose} size="large">
-            <CloseIcon />
-          </IconButton>
-        ) : null}
-      </DialogTitle>
-      <DialogContent>
-        <ResetPasswordForm onSubmit={onSubmit} userName={userName}/>
-      </DialogContent>
-    </Dialog>
-  );
-};
-
-export default ResetPasswordDialog;
diff --git a/webclient/src/dialogs/index.ts b/webclient/src/dialogs/index.ts
deleted file mode 100644
index 5c5ace1c5..000000000
--- a/webclient/src/dialogs/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export { default as AccountActivationDialog } from './AccountActivationDialog/AccountActivationDialog';
-export { default as CardImportDialog } from './CardImportDialog/CardImportDialog';
-export { default as KnownHostDialog } from './KnownHostDialog/KnownHostDialog';
-export { default as RegistrationDialog } from './RegistrationDialog/RegistrationDialog';
-export { default as RequestPasswordResetDialog } from './RequestPasswordResetDialog/RequestPasswordResetDialog';
-export { default as ResetPasswordDialog } from './ResetPasswordDialog/ResetPasswordDialog';
diff --git a/webclient/src/forms/AccountActivationForm/AccountActivationForm.css b/webclient/src/forms/AccountActivationForm/AccountActivationForm.css
deleted file mode 100644
index ffb4ecc77..000000000
--- a/webclient/src/forms/AccountActivationForm/AccountActivationForm.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.AccountActivationForm {
-  width: 100%;
-  padding-bottom: 15px;
-}
-
-.AccountActivationForm-item {
-  margin-bottom: 20px;
-}
-
-.AccountActivationForm-submit {
-  width: 100%;
-}
diff --git a/webclient/src/forms/AccountActivationForm/AccountActivationForm.i18n.json b/webclient/src/forms/AccountActivationForm/AccountActivationForm.i18n.json
deleted file mode 100644
index 0b510fb83..000000000
--- a/webclient/src/forms/AccountActivationForm/AccountActivationForm.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "AccountActivationForm": {
-    "error": {
-      "failed": "Account activation failed"
-    },
-    "label": {
-      "activate": "Activate Account"
-    }
-  }
-}
diff --git a/webclient/src/forms/AccountActivationForm/AccountActivationForm.tsx b/webclient/src/forms/AccountActivationForm/AccountActivationForm.tsx
deleted file mode 100644
index 61b20f9a5..000000000
--- a/webclient/src/forms/AccountActivationForm/AccountActivationForm.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-// eslint-disable-next-line
-import React, { useState } from "react";
-import { connect } from 'react-redux';
-import { Form, Field } from 'react-final-form';
-import { OnChange } from 'react-final-form-listeners';
-import { useTranslation } from 'react-i18next';
-
-import Button from '@mui/material/Button';
-import Typography from '@mui/material/Typography';
-
-import { InputField, KnownHosts } from 'components';
-import { FormKey } from 'types';
-
-import './AccountActivationForm.css';
-import { useReduxEffect } from 'hooks';
-import { ServerTypes } from 'store';
-
-const AccountActivationForm = ({ onSubmit }) => {
-  const [errorMessage, setErrorMessage] = useState(false);
-  const { t } = useTranslation();
-
-  useReduxEffect(() => {
-    setErrorMessage(true);
-  }, ServerTypes.ACCOUNT_ACTIVATION_FAILED, []);
-
-  const handleOnSubmit = ({ token, ...values }) => {
-    setErrorMessage(false);
-
-    token = token?.trim();
-
-    onSubmit({ token, ...values });
-  }
-
-  const validate = values => {
-    const errors: any = {};
-
-    if (!values.token) {
-      errors.token = t('Common.validation.required');
-    }
-
-    return errors;
-  };
-
-  return (
-    <Form onSubmit={handleOnSubmit} validate={validate}>
-      {({ handleSubmit, form }) => {
-        return (
-          <form className="AccountActivationForm" onSubmit={handleSubmit}>
-            <div className="AccountActivationForm-item">
-              <Field label={t('Common.label.token')} name="token" component={InputField} />
-            </div>
-
-            {errorMessage && (
-              <div className="AccountActivationForm-error">
-                <Typography color="error">{ t('AccountActivationForm.error.failed') }</Typography>
-              </div>
-            )}
-
-            <Button className="AccountActivationForm-submit rounded tall" color="primary" variant="contained" type="submit">
-              { t('AccountActivationForm.label.activate') }
-            </Button>
-          </form>
-        );
-      }}
-    </Form>
-  );
-};
-
-export default AccountActivationForm;
diff --git a/webclient/src/forms/CardImportForm/CardImportForm.css b/webclient/src/forms/CardImportForm/CardImportForm.css
deleted file mode 100644
index 56ac3e16e..000000000
--- a/webclient/src/forms/CardImportForm/CardImportForm.css
+++ /dev/null
@@ -1,35 +0,0 @@
-.cardImportForm {
-  width: 550px;
-}
-
-.cardImportForm-content.done {
-  font-size: 32px;
-  height: 150px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.cardImportForm-actions {
-  display: flex;
-  justify-content: flex-end;
-  margin-top: 20px;
-}
-
-.cardImportForm-error {
-  color: red;
-}
-
-.card-import-list {
-  height: 300px;
-  line-height: 1;
-  border: 1px solid lightgrey;
-  padding: 10px;
-}
-
-.loading {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-}
diff --git a/webclient/src/forms/CardImportForm/CardImportForm.tsx b/webclient/src/forms/CardImportForm/CardImportForm.tsx
deleted file mode 100644
index b9745f31e..000000000
--- a/webclient/src/forms/CardImportForm/CardImportForm.tsx
+++ /dev/null
@@ -1,227 +0,0 @@
-// eslint-disable-next-line
-import React, { useEffect, useState } from 'react';
-import { connect } from 'react-redux';
-import { Form, Field, reduxForm } from 'redux-form'
-
-import Button from '@mui/material/Button';
-import Stepper from '@mui/material/Stepper';
-import Step from '@mui/material/Step';
-import StepLabel from '@mui/material/StepLabel';
-import CircularProgress from '@mui/material/CircularProgress';
-
-import { InputField, VirtualList } from 'components';
-import { cardImporterService, CardDTO, SetDTO, TokenDTO } from 'services';
-import { FormKey } from 'types';
-
-import './CardImportForm.css';
-
-const CardImportForm = (props) => {
-  const { handleSubmit, onSubmit: onClose } = props;
-
-  const [loading, setLoading] = useState(false);
-  const [activeStep, setActiveStep] = useState(0);
-  const [importedCards, setImportedCards] = useState([]);
-  const [importedSets, setImportedSets] = useState([]);
-  const [error, setError] = useState(null);
-
-  useEffect(() => {
-    if (loading) {
-      setError(null);
-    }
-  }, [loading])
-
-  const steps = ['Imports sets', 'Save sets', 'Import tokens', 'Finished'];
-
-  const handleNext = () => {
-    setActiveStep((prevActiveStep) => prevActiveStep + 1);
-  };
-
-  const handleBack = () => {
-    setActiveStep((prevActiveStep) => prevActiveStep - 1);
-  };
-
-  const handleCardDownload = ({ cardDownloadUrl }) => {
-    setLoading(true);
-
-    cardImporterService.importCards(cardDownloadUrl)
-      .then(({ cards, sets }) => {
-        setImportedCards(cards);
-        setImportedSets(sets);
-
-        handleNext();
-      })
-      .catch(({ message }) => setError(message))
-      .finally(() => setLoading(false));
-  };
-
-  const handleCardSave = async () => {
-    setLoading(true);
-
-    try {
-      await CardDTO.bulkAdd(importedCards);
-      await SetDTO.bulkAdd(importedSets);
-
-      handleNext();
-    } catch (e) {
-      console.error(e);
-      setError('Failed to save cards');
-    }
-
-    setLoading(false);
-  };
-
-  const handleTokenDownload = ({ tokenDownloadUrl }) => {
-    setLoading(true);
-
-    cardImporterService.importTokens(tokenDownloadUrl)
-      .then(async tokens => {
-        await TokenDTO.bulkAdd(tokens);
-        handleNext();
-      })
-      .catch(({ message }) => setError(message))
-      .finally(() => setLoading(false));
-  };
-
-  const getStepContent = (stepIndex) => {
-    switch (stepIndex) {
-      case 0: return (
-        <Form className='cardImportForm' onSubmit={handleSubmit(handleCardDownload)}>
-          <div className='cardImportForm-item'>
-            <Field label='Download URL' name='cardDownloadUrl' component={InputField} />
-          </div>
-
-          <div className='cardImportForm-actions'>
-            <Button color='primary' type='submit' disabled={loading}>
-              Import
-            </Button>
-          </div>
-
-          <div className='cardImportForm-error'>
-            <ErrorMessage error={error} />
-          </div>
-        </Form>
-      );
-
-      case 1: return (
-        <div className='cardImportForm'>
-          <div className='cardImportForm-content'>
-            <CardsImported cards={importedCards} sets={importedSets} />
-          </div>
-
-          <div className='cardImportForm-actions'>
-            <BackButton click={handleBack} disabled={loading} />
-            <Button color='primary' onClick={handleCardSave} disabled={loading}>
-              Save
-            </Button>
-          </div>
-
-          <div className='cardImportForm-error'>
-            <ErrorMessage error={error} />
-          </div>
-        </div>
-      );
-
-      case 2: return (
-        <Form className='cardImportForm' onSubmit={handleSubmit(handleTokenDownload)}>
-          <div className='cardImportForm-content'>
-            <Field label='Download URL' name='tokenDownloadUrl' component={InputField} />
-          </div>
-
-          <div className='cardImportForm-actions'>
-            <BackButton click={handleBack} disabled={loading} />
-            <Button color='primary' type='submit' disabled={loading}>
-              Import
-            </Button>
-          </div>
-
-          <div className='cardImportForm-error'>
-            <ErrorMessage error={error} />
-          </div>
-        </Form>
-      );
-
-      case 3: return (
-        <div className='cardImportForm'>
-          <div className='cardImportForm-content done'>Finished!</div>
-
-          <div className='cardImportForm-actions'>
-            <BackButton click={handleBack} disabled={loading} />
-            <Button color='primary' onClick={onClose}>Done</Button>
-          </div>
-        </div>
-      );
-    }
-  };
-
-  return (
-    <div>
-      <Stepper activeStep={activeStep} alternativeLabel>
-        {steps.map((label) => (
-          <Step key={label}>
-            <StepLabel>{label}</StepLabel>
-          </Step>
-        ))}
-      </Stepper>
-
-      <div>
-        { getStepContent(activeStep) }
-      </div>
-
-      { loading && (
-        <div className='loading'>
-          <CircularProgress size={60} />
-        </div>
-      ) }
-    </div>
-  );
-};
-
-const BackButton = ({ click, disabled }) => (
-  <Button onClick={click} disabled={disabled}>Go Back</Button>
-);
-
-const ErrorMessage = ({ error }) => {
-  return error && (
-    <div className='error'>{error}</div>
-  );
-};
-
-const CardsImported = ({ cards, sets }) => {
-  const items = [
-    (
-      <div>
-        <strong>Import finished: {cards.length} cards.</strong>
-      </div>
-    ),
-
-    (<div className='spacer' />),
-
-    ...sets.map(set => (
-      <div>{set.name}: {set.cards.length} cards imported</div>
-    ))
-  ];
-
-  return (
-    <div className='card-import-list'>
-      <VirtualList
-        itemKey={(index) => index }
-        items={items}
-        size={15}
-      />
-    </div>
-  );
-};
-
-const propsMap = {
-  form: FormKey.CARD_IMPORT,
-  onClose: Function
-};
-
-const mapStateToProps = () => ({
-  initialValues: {
-    cardDownloadUrl: 'https://www.mtgjson.com/api/v5/AllPrintings.json',
-    tokenDownloadUrl: 'https://raw.githubusercontent.com/Cockatrice/Magic-Token/master/tokens.xml'
-  },
-});
-
-export default connect(mapStateToProps)(reduxForm(propsMap)(CardImportForm));
diff --git a/webclient/src/forms/KnownHostForm/KnownHostForm.css b/webclient/src/forms/KnownHostForm/KnownHostForm.css
deleted file mode 100644
index 76e1722e0..000000000
--- a/webclient/src/forms/KnownHostForm/KnownHostForm.css
+++ /dev/null
@@ -1,21 +0,0 @@
-.KnownHostForm {
-  width: 100%;
-}
-
-.KnownHostForm-item {
-  display: flex;
-  flex-direction: column;
-  margin-bottom: 20px;
-}
-
-.KnownHostForm-submit {
-  width: 100%;
-}
-
-.KnownHostForm-actions {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin: 5px 0 10px;
-  color: red;
-}
diff --git a/webclient/src/forms/KnownHostForm/KnownHostForm.i18n.json b/webclient/src/forms/KnownHostForm/KnownHostForm.i18n.json
deleted file mode 100644
index fe614a126..000000000
--- a/webclient/src/forms/KnownHostForm/KnownHostForm.i18n.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "KnownHostForm": {
-    "help": "Need help adding a new host?",
-    "label": {
-      "add": "Add Host",
-      "find": "Find Host"
-    }
-  }
-}
diff --git a/webclient/src/forms/KnownHostForm/KnownHostForm.tsx b/webclient/src/forms/KnownHostForm/KnownHostForm.tsx
deleted file mode 100644
index 1241336f3..000000000
--- a/webclient/src/forms/KnownHostForm/KnownHostForm.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-// eslint-disable-next-line
-import React, { useState } from "react";
-import { connect } from 'react-redux';
-import { Form, Field } from 'react-final-form'
-import { useTranslation } from 'react-i18next';
-
-import Button from '@mui/material/Button';
-import AnchorLink from '@mui/material/Link';
-
-import { InputField } from 'components';
-
-import './KnownHostForm.css';
-
-const KnownHostForm = ({ host, onRemove, onSubmit }) => {
-  const [confirmDelete, setConfirmDelete] = useState(false);
-  const { t } = useTranslation();
-
-  const validate = values => {
-    const errors: any = {};
-
-    if (!values.name) {
-      errors.name = t('Common.validation.required');
-    }
-
-    if (!values.host) {
-      errors.host = t('Common.validation.required');
-    }
-
-    if (!values.port) {
-      errors.port = t('Common.validation.required');
-    }
-
-    if (Object.keys(errors).length) {
-      return errors;
-    }
-  };
-
-  const handleOnSubmit = ({ name, host, ...values }) => {
-    name = name?.trim();
-    host = host?.trim();
-
-    onSubmit({ name, host, ...values });
-  }
-
-  return (
-    <Form
-      initialValues={{
-        id: host?.id,
-        name: host?.name,
-        host: host?.host,
-        port: host?.port,
-      }}
-      onSubmit={handleOnSubmit}
-      validate={validate}
-    >
-      {({ handleSubmit }) => (
-        <form className="KnownHostForm" onSubmit={handleSubmit}>
-          <div className="KnownHostForm-item">
-            <Field label={t('Common.label.hostName')} name="name" component={InputField} />
-          </div>
-          <div className="KnownHostForm-item">
-            <Field label={t('Common.label.hostAddress')} name="host" component={InputField} />
-          </div>
-          <div className="KnownHostForm-item">
-            <Field label={t('Common.label.port')} name="port" type="number" component={InputField} />
-          </div>
-
-          <Button className="KnownHostForm-submit" color="primary" variant="contained" type="submit">
-            {host ? t('Common.label.saveChanges') : t('KnownHostForm.label.add') }
-          </Button>
-
-          <div className="KnownHostForm-actions">
-            <div className="KnownHostForm-actions__delete">
-              { host && (
-                <Button color="inherit" onClick={() => !confirmDelete ? setConfirmDelete(true) : onRemove(host)}>
-                  { !confirmDelete ? t('Common.label.delete') : t('Common.label.confirmSure') }
-                </Button>
-              ) }
-            </div>
-            <AnchorLink href='https://github.com/Cockatrice/Cockatrice/wiki/Public-Servers' target='_blank'>
-              { t('KnownHostForm.label.find') }
-            </AnchorLink>
-          </div>
-        </form>
-      ) }
-    </Form>
-  );
-};
-
-const mapStateToProps = () => ({
-
-});
-
-export default connect(mapStateToProps)(KnownHostForm);
diff --git a/webclient/src/forms/LoginForm/LoginForm.css b/webclient/src/forms/LoginForm/LoginForm.css
deleted file mode 100644
index 4b176476f..000000000
--- a/webclient/src/forms/LoginForm/LoginForm.css
+++ /dev/null
@@ -1,20 +0,0 @@
-.loginForm {
-  width: 100%;
-}
-
-.loginForm-item {
-  margin-bottom: 20px;
-}
-
-.loginForm-actions {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: -20px;
-  margin-bottom: 20px;
-  font-weight: bold;
-}
-
-.loginForm-submit {
-  width: 100%;
-}
diff --git a/webclient/src/forms/LoginForm/LoginForm.i18n.json b/webclient/src/forms/LoginForm/LoginForm.i18n.json
deleted file mode 100644
index 260b88b27..000000000
--- a/webclient/src/forms/LoginForm/LoginForm.i18n.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "LoginForm": {
-    "label": {
-      "autoConnect": "Auto Connect",
-      "forgot": "Forgot Password",
-      "login": "Login",
-      "savePassword": "Save Password",
-      "savedPassword": "Saved Password"
-    }
-  }
-}
diff --git a/webclient/src/forms/LoginForm/LoginForm.tsx b/webclient/src/forms/LoginForm/LoginForm.tsx
deleted file mode 100644
index 1e8f104fe..000000000
--- a/webclient/src/forms/LoginForm/LoginForm.tsx
+++ /dev/null
@@ -1,171 +0,0 @@
-import React, { useEffect, useState, useCallback } from 'react';
-import { Form, Field } from 'react-final-form';
-import { OnChange } from 'react-final-form-listeners';
-import { useTranslation } from 'react-i18next';
-
-import Button from '@mui/material/Button';
-
-import { AuthenticationService } from 'api';
-import { CheckboxField, InputField, KnownHosts } from 'components';
-import { useAutoConnect } from 'hooks';
-import { HostDTO, SettingDTO } from 'services';
-import { APP_USER } from 'types';
-
-import './LoginForm.css';
-
-const LoginForm = ({ onSubmit, disableSubmitButton, onResetPassword }: LoginFormProps) => {
-  const { t } = useTranslation();
-  const PASSWORD_LABEL = t('Common.label.password');
-  const STORED_PASSWORD_LABEL = `* ${t('LoginForm.label.savedPassword')} *`;
-
-  const [host, setHost] = useState(null);
-  const [useStoredPasswordLabel, setUseStoredPasswordLabel] = useState(false);
-  const [autoConnect, setAutoConnect] = useAutoConnect();
-
-  const validate = values => {
-    const errors: any = {};
-
-    if (!values.userName) {
-      errors.userName = t('Common.validation.required');
-    }
-    if (!values.selectedHost) {
-      errors.selectedHost = t('Common.validation.required');
-    }
-
-    return errors;
-  }
-
-  const useStoredPassword = (remember, password) => remember && host?.hashedPassword && !password;
-  const togglePasswordLabel = (useStoredLabel) => {
-    setUseStoredPasswordLabel(useStoredLabel);
-  };
-
-  const handleOnSubmit = ({ userName, ...values }) => {
-    userName = userName?.trim();
-    console.log(userName, values);
-
-    onSubmit({ userName, ...values });
-  }
-
-  return (
-    <Form onSubmit={handleOnSubmit} validate={validate}>
-      {({ handleSubmit, form }) => {
-        const { values } = form.getState();
-
-        useEffect(() => {
-          SettingDTO.get(APP_USER).then((userSetting: SettingDTO) => {
-            if (userSetting?.autoConnect && !AuthenticationService.connectionAttemptMade()) {
-              HostDTO.getAll().then(hosts => {
-                let lastSelectedHost = hosts.find(({ lastSelected }) => lastSelected);
-
-                if (lastSelectedHost?.remember && lastSelectedHost?.hashedPassword) {
-                  togglePasswordLabel(true);
-
-                  form.change('selectedHost', lastSelectedHost);
-                  form.change('userName', lastSelectedHost.userName);
-                  form.change('remember', true);
-                  form.submit();
-                }
-              });
-            }
-          });
-        }, []);
-
-        useEffect(() => {
-          if (!host) {
-            return;
-          }
-
-          form.change('userName', host.userName);
-          form.change('password', '');
-
-          onRememberChange(host.remember);
-          onAutoConnectChange(host.remember && autoConnect);
-          togglePasswordLabel(useStoredPassword(host.remember, values.password));
-        }, [host]);
-
-        const onUserNameChange = (userName) => {
-          const fieldChanged = host?.userName?.toLowerCase() !== values.userName?.toLowerCase();
-          if (useStoredPassword(values.remember, values.password) && fieldChanged) {
-            setHost(({ hashedPassword, ...s }) => ({ ...s, userName }));
-          }
-        }
-
-        const onRememberChange = (checked) => {
-          form.change('remember', checked);
-
-          if (!checked && values.autoConnect) {
-            onAutoConnectChange(false);
-          }
-
-          togglePasswordLabel(useStoredPassword(checked, values.password));
-        }
-
-        const onAutoConnectChange = (checked) => {
-          setAutoConnect(checked);
-
-          form.change('autoConnect', checked);
-
-          if (checked && !values.remember) {
-            form.change('remember', true);
-          }
-        }
-
-        return (
-          <form className='loginForm' onSubmit={handleSubmit}>
-            <div className='loginForm-items'>
-              <div className='loginForm-item'>
-                <Field label={t('Common.label.username')} name='userName' component={InputField} autoComplete='username' />
-                <OnChange name="userName">{onUserNameChange}</OnChange>
-              </div>
-              <div className='loginForm-item'>
-                <Field
-                  label={useStoredPasswordLabel ? STORED_PASSWORD_LABEL : PASSWORD_LABEL}
-                  onFocus={() => setUseStoredPasswordLabel(false)}
-                  onBlur={() => togglePasswordLabel(useStoredPassword(values.remember, values.password))}
-                  name='password'
-                  type='password'
-                  component={InputField}
-                  autoComplete='new-password'
-                />
-              </div>
-              <div className='loginForm-actions'>
-                <Field label={t('LoginForm.label.savePassword')} name='remember' component={CheckboxField} />
-                <OnChange name="remember">{onRememberChange}</OnChange>
-
-                <Button color='primary' onClick={onResetPassword}>
-                  { t('LoginForm.label.forgot') }
-                </Button>
-              </div>
-              <div className='loginForm-item'>
-                <Field name='selectedHost' component={KnownHosts} />
-                <OnChange name="selectedHost">{setHost}</OnChange>
-              </div>
-              <div className='loginForm-actions'>
-                <Field label={t('LoginForm.label.autoConnect')} name='autoConnect' component={CheckboxField} />
-                <OnChange name="autoConnect">{onAutoConnectChange}</OnChange>
-              </div>
-            </div>
-            <Button
-              className='loginForm-submit rounded tall'
-              color='primary'
-              variant='contained'
-              type='submit'
-              disabled={disableSubmitButton}
-            >
-              { t('LoginForm.label.login') }
-            </Button>
-          </form>
-        )
-      }}
-    </Form>
-  );
-};
-
-interface LoginFormProps {
-  onSubmit: any;
-  disableSubmitButton: boolean,
-  onResetPassword: any;
-}
-
-export default LoginForm;
diff --git a/webclient/src/forms/RegisterForm/RegisterForm.css b/webclient/src/forms/RegisterForm/RegisterForm.css
deleted file mode 100644
index 324aa7e63..000000000
--- a/webclient/src/forms/RegisterForm/RegisterForm.css
+++ /dev/null
@@ -1,18 +0,0 @@
-.RegisterForm {
-  width: 100%;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-}
-
-.RegisterForm-column {
-  width: 48%;
-}
-
-.RegisterForm-item {
-  margin-bottom: 20px;
-}
-
-.RegisterForm-submit {
-  width: 100%;
-}
diff --git a/webclient/src/forms/RegisterForm/RegisterForm.i18n.json b/webclient/src/forms/RegisterForm/RegisterForm.i18n.json
deleted file mode 100644
index 50e802ea5..000000000
--- a/webclient/src/forms/RegisterForm/RegisterForm.i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "RegisterForm": {
-    "label": {
-      "register": "Register"
-    },
-    "toast": {
-      "registerSuccess": "Registration Successful!"
-    }
-  }
-}
diff --git a/webclient/src/forms/RegisterForm/RegisterForm.tsx b/webclient/src/forms/RegisterForm/RegisterForm.tsx
deleted file mode 100644
index f5f4d9174..000000000
--- a/webclient/src/forms/RegisterForm/RegisterForm.tsx
+++ /dev/null
@@ -1,177 +0,0 @@
-import { useState } from 'react';
-import { Form, Field } from 'react-final-form';
-import { OnChange } from 'react-final-form-listeners';
-import setFieldTouched from 'final-form-set-field-touched';
-import { useTranslation } from 'react-i18next';
-
-import Button from '@mui/material/Button';
-import Typography from '@mui/material/Typography';
-
-import { CountryDropdown, InputField, KnownHosts } from 'components';
-import { useReduxEffect } from 'hooks';
-import { ServerTypes } from 'store';
-
-import './RegisterForm.css';
-import { useToast } from 'components/Toast';
-
-const RegisterForm = ({ onSubmit }: RegisterFormProps) => {
-  const { t } = useTranslation();
-  const [emailRequired, setEmailRequired] = useState(false);
-  const [error, setError] = useState(null);
-  const [emailError, setEmailError] = useState(null);
-  const [passwordError, setPasswordError] = useState(null);
-  const [userNameError, setUserNameError] = useState(null);
-  const { openToast } = useToast({ key: 'registration-success', children: t('RegisterForm.toast.registerSuccess') })
-
-  const onHostChange = (host) => setEmailRequired(false);
-  const onEmailChange = () => emailError && setEmailError(null);
-  const onPasswordChange = () => passwordError && setPasswordError(null);
-  const onUserNameChange = () => userNameError && setUserNameError(null);
-
-  useReduxEffect(() => {
-    setEmailRequired(true);
-  }, ServerTypes.REGISTRATION_REQUIRES_EMAIL);
-
-  useReduxEffect(({ error }) => {
-    setError(error);
-  }, ServerTypes.REGISTRATION_FAILED);
-
-  useReduxEffect(() => {
-    openToast()
-  }, ServerTypes.REGISTRATION_SUCCES);
-
-  useReduxEffect(({ error }) => {
-    setEmailError(error);
-  }, ServerTypes.REGISTRATION_EMAIL_ERROR);
-
-  useReduxEffect(({ error }) => {
-    setPasswordError(error);
-  }, ServerTypes.REGISTRATION_PASSWORD_ERROR);
-
-  useReduxEffect(({ error }) => {
-    setUserNameError(error);
-  }, ServerTypes.REGISTRATION_USERNAME_ERROR);
-
-  const handleOnSubmit = ({ userName, email, realName, ...values }) => {
-    setError(null);
-
-    userName = userName?.trim();
-    email = email?.trim();
-    realName = realName?.trim();
-
-    onSubmit({ userName, email, realName, ...values });
-  }
-
-  const validate = values => {
-    const errors: any = {};
-
-    if (!values.userName) {
-      errors.userName = t('Common.validation.required');
-    } else if (userNameError) {
-      errors.userName = userNameError;
-    }
-
-    if (!values.password) {
-      errors.password = t('Common.validation.required');
-    } else if (values.password.length < 8) {
-      errors.password = t('Common.validation.minChars', { count: 8 });
-    } else if (passwordError) {
-      errors.password = passwordError;
-    }
-
-    if (!values.passwordConfirm) {
-      errors.passwordConfirm = t('Common.validation.required');
-    } else if (values.password !== values.passwordConfirm) {
-      errors.passwordConfirm = t('Common.validation.passwordsMustMatch');
-    }
-
-    if (!values.selectedHost) {
-      errors.selectedHost = t('Common.validation.required');
-    }
-
-    if (emailRequired && !values.email) {
-      errors.email = t('Common.validation.required');
-    } else if (emailError) {
-      errors.email = emailError;
-    }
-
-    return errors;
-  }
-
-  return (
-    <Form onSubmit={handleOnSubmit} validate={validate} mutators={{ setFieldTouched }}>
-      {({ handleSubmit, form, ...args }) => {
-        const { values } = form.getState();
-
-        if (emailRequired) {
-          // Allow form render to complete
-          setTimeout(() => form.mutators.setFieldTouched('email', true))
-        }
-
-        return (
-          <>
-            <form className="RegisterForm" onSubmit={handleSubmit}>
-              <div className="RegisterForm-column">
-                <div className="RegisterForm-item">
-                  <Field label={t('Common.label.username')} name="userName" component={InputField} autoComplete="username" />
-                  <OnChange name="userName">{onUserNameChange}</OnChange>
-                </div>
-                <div className="RegisterForm-item">
-                  <Field
-                    label={t('Common.label.password')}
-                    name="password"
-                    type="password"
-                    component={InputField}
-                    autoComplete='new-password'
-                  />
-                  <OnChange name="password">{onPasswordChange}</OnChange>
-                </div>
-                <div className="RegisterForm-item">
-                  <Field
-                    label={t('Common.label.confirmPassword')}
-                    name="passwordConfirm"
-                    type="password"
-                    component={InputField}
-                    autoComplete='new-password'
-                  />
-                </div>
-                <div className="RegisterForm-item">
-                  <Field name="selectedHost" component={KnownHosts} />
-                  <OnChange name="selectedHost">{onHostChange}</OnChange>
-                </div>
-              </div>
-              <div className="RegisterForm-column" >
-                <div className="RegisterForm-item">
-                  <Field label={t('Common.label.realName')} name="realName" component={InputField} />
-                </div>
-                <div className="RegisterForm-item">
-                  <Field label={t('Common.label.email')} name="email" type="email" component={InputField} />
-                  <OnChange name="email">{onEmailChange}</OnChange>
-                </div>
-                <div className="RegisterForm-item">
-                  <Field label={t('Common.label.country')} name="country" component={CountryDropdown} />
-                </div>
-                <Button className="RegisterForm-submit tall" color="primary" variant="contained" type="submit">
-                  { t('RegisterForm.label.register') }
-                </Button>
-              </div>
-            </form>
-
-            { error && (
-              <div className="RegisterForm-item">
-                <Typography color="error">{error}</Typography>
-              </div>
-            )}
-          </>
-        );
-      }}
-
-    </Form >
-  );
-};
-
-interface RegisterFormProps {
-  onSubmit: any;
-}
-
-export default RegisterForm;
diff --git a/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.css b/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.css
deleted file mode 100644
index 83ed7420f..000000000
--- a/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.RequestPasswordResetForm {
-  width: 100%;
-  padding-bottom: 15px;
-}
-
-.RequestPasswordResetForm-item {
-  margin-bottom: 20px;
-}
-
-.RequestPasswordResetForm-actions {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: -20px;
-  margin-bottom: 20px;
-  font-weight: bold;
-}
-
-.RequestPasswordResetForm-submit {
-  width: 100%;
-}
-
-.selectedHost {
-  margin-top: 40px;
-}
diff --git a/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.i18n.json b/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.i18n.json
deleted file mode 100644
index c53f6d097..000000000
--- a/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "RequestPasswordResetForm": {
-    "error": "Request password reset failed",
-    "mfaEnabled": "Server has multi-factor authentication enabled",
-    "request": "Request Reset Token",
-    "skipRequest": "I already have a reset token"
-  }
-}
diff --git a/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.tsx b/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.tsx
deleted file mode 100644
index 01d4a2959..000000000
--- a/webclient/src/forms/RequestPasswordResetForm/RequestPasswordResetForm.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-// eslint-disable-next-line
-import React, { useState } from "react";
-import { connect } from 'react-redux';
-import { Form, Field } from 'react-final-form';
-import { OnChange } from 'react-final-form-listeners';
-import { useTranslation } from 'react-i18next';
-
-import Button from '@mui/material/Button';
-import Typography from '@mui/material/Typography';
-
-import { InputField, KnownHosts } from 'components';
-import { FormKey } from 'types';
-
-import './RequestPasswordResetForm.css';
-import { useReduxEffect } from 'hooks';
-import { ServerTypes } from 'store';
-
-const RequestPasswordResetForm = ({ onSubmit, skipTokenRequest }) => {
-  const [errorMessage, setErrorMessage] = useState(false);
-  const [isMFA, setIsMFA] = useState(false);
-  const { t } = useTranslation();
-
-  useReduxEffect(() => {
-    setErrorMessage(true);
-  }, ServerTypes.RESET_PASSWORD_FAILED, []);
-
-  useReduxEffect(() => {
-    setIsMFA(true);
-  }, ServerTypes.RESET_PASSWORD_CHALLENGE, []);
-
-  const handleOnSubmit = ({ userName, email, ...values }) => {
-    setErrorMessage(false);
-
-    userName = userName?.trim();
-    email = email?.trim();
-
-    onSubmit({ userName, email, ...values });
-  }
-
-  const validate = values => {
-    const errors: any = {};
-
-    if (!values.userName) {
-      errors.userName = t('Common.validation.required');
-    }
-    if (isMFA && !values.email) {
-      errors.email = t('Common.validation.required');
-    }
-    if (!values.selectedHost) {
-      errors.selectedHost = t('Common.validation.required');
-    }
-
-    return errors;
-  };
-
-  return (
-    <Form onSubmit={handleOnSubmit} validate={validate}>
-      {({ handleSubmit, form }) => {
-        const onHostChange: any = ({ userName }) => {
-          form.change('userName', userName);
-          setIsMFA(false);
-        }
-
-        return (
-          <form className="RequestPasswordResetForm" onSubmit={handleSubmit}>
-            <div className="RequestPasswordResetForm-items">
-              <div className="RequestPasswordResetForm-item">
-                <Field label={t('Common.label.username')} name="userName" component={InputField} autoComplete="username" disabled={isMFA} />
-              </div>
-              {isMFA ? (
-                <div className="RequestPasswordResetForm-item">
-                  <Field label={t('Common.label.email')} name="email" type="email" component={InputField} autoComplete="email" />
-                  <div>{ t('RequestPasswordResetForm.mfaEnabled') }</div>
-                </div>
-              ) : null}
-              <div className="RequestPasswordResetForm-item selectedHost">
-                <Field name='selectedHost' component={KnownHosts} disabled={isMFA} />
-                <OnChange name="selectedHost">{onHostChange}</OnChange>
-              </div>
-
-              {errorMessage && (
-                <div className="RequestPasswordResetForm-item">
-                  <Typography color="error">{ t('RequestPasswordResetForm.error') }</Typography>
-                </div>
-              )}
-            </div>
-
-            <Button className="RequestPasswordResetForm-submit rounded tall" color="primary" variant="contained" type="submit">
-              { t('RequestPasswordResetForm.request') }
-            </Button>
-
-            <div>
-              <Button color="primary" onClick={() => skipTokenRequest(form.getState().values.userName)}>
-                { t('RequestPasswordResetForm.skipRequest') }
-              </Button>
-            </div>
-          </form>
-        );
-      }}
-    </Form>
-  );
-};
-
-export default RequestPasswordResetForm;
diff --git a/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.css b/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.css
deleted file mode 100644
index ad82b7efd..000000000
--- a/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.css
+++ /dev/null
@@ -1,21 +0,0 @@
-.ResetPasswordForm {
-  width: 100%;
-  padding-bottom: 15px;
-}
-
-.ResetPasswordForm-item {
-  margin-bottom: 20px;
-}
-
-.ResetPasswordForm-actions {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: -20px;
-  margin-bottom: 20px;
-  font-weight: bold;
-}
-
-.ResetPasswordForm-submit {
-  width: 100%;
-}
diff --git a/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.i18n.json b/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.i18n.json
deleted file mode 100644
index 2835134c0..000000000
--- a/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.i18n.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "ResetPasswordForm": {
-    "error": "Password reset failed",
-    "label": {
-      "reset": "Reset Password"
-    }
-  }
-}
diff --git a/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx b/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
deleted file mode 100644
index 8b56f4b69..000000000
--- a/webclient/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-// eslint-disable-next-line
-import React, { useEffect, useState } from 'react';
-import { connect } from 'react-redux';
-import { Form, Field } from 'react-final-form'
-import { OnChange } from 'react-final-form-listeners';
-import { useTranslation } from 'react-i18next';
-
-import Button from '@mui/material/Button';
-import Typography from '@mui/material/Typography';
-
-import { InputField, KnownHosts } from 'components';
-import { FormKey } from 'types';
-
-import './ResetPasswordForm.css';
-import { useReduxEffect } from '../../hooks';
-import { ServerTypes } from '../../store';
-
-const ResetPasswordForm = ({ onSubmit, userName }) => {
-  const [errorMessage, setErrorMessage] = useState(false);
-  const { t } = useTranslation();
-
-  useReduxEffect(() => {
-    setErrorMessage(true);
-  }, ServerTypes.RESET_PASSWORD_FAILED, []);
-
-  const validate = values => {
-    const errors: any = {};
-
-    if (!values.userName) {
-      errors.userName = t('Common.validation.required');
-    }
-    if (!values.token) {
-      errors.token = t('Common.validation.required');
-    }
-
-    if (!values.newPassword) {
-      errors.newPassword = t('Common.validation.required');
-    } else if (values.newPassword.length < 8) {
-      errors.newPassword = t('Common.validation.minChars', { count: 8 });
-    }
-
-    if (!values.passwordAgain) {
-      errors.passwordAgain = t('Common.validation.required');
-    } else if (values.newPassword !== values.passwordAgain) {
-      errors.passwordAgain = t('Common.validation.passwordsMustMatch');
-    }
-    if (!values.selectedHost) {
-      errors.selectedHost = t('Common.validation.required');
-    }
-
-    return errors;
-  };
-
-  const handleOnSubmit = ({ userName, token, ...values }) => {
-    userName = userName?.trim();
-    token = token?.trim();
-
-    onSubmit({ userName, token, ...values });
-  }
-
-  return (
-    <Form onSubmit={handleOnSubmit} validate={validate} initialValues={{ userName }}>
-      {({ handleSubmit, form }) => (
-        <form className='ResetPasswordForm' onSubmit={handleSubmit}>
-          <div className='ResetPasswordForm-items'>
-            <div className='ResetPasswordForm-item'>
-              <Field
-                label={t('Common.label.username')}
-                name='userName'
-                component={InputField}
-                autoComplete='username'
-                disabled={!!userName}
-              />
-            </div>
-            <div className='ResetPasswordForm-item'>
-              <Field label={t('Common.label.token')} name='token' component={InputField} />
-            </div>
-            <div className='ResetPasswordForm-item'>
-              <Field
-                label={t('Common.label.password')}
-                name='newPassword'
-                type='password'
-                component={InputField}
-                autoComplete='new-password'
-              />
-            </div>
-            <div className='ResetPasswordForm-item'>
-              <Field
-                label={t('Common.label.passwordAgain')}
-                name='passwordAgain'
-                type='password'
-                component={InputField}
-                autoComplete='new-password'
-              />
-            </div>
-            <div className='ResetPasswordForm-item'>
-              <Field name='selectedHost' component={KnownHosts} disabled />
-            </div>
-
-            {errorMessage && (
-              <div className='ResetPasswordForm-item'>
-                <Typography color="error">{ t('ResetPasswordForm.error') }</Typography>
-              </div>
-            )}
-          </div>
-          <Button className='ResetPasswordForm-submit rounded tall' color='primary' variant='contained' type='submit'>
-            { t('ResetPasswordForm.label.reset') }
-          </Button>
-        </form>
-      )}
-    </Form>
-  );
-};
-
-export default ResetPasswordForm;
diff --git a/webclient/src/forms/SearchForm/SearchForm.css b/webclient/src/forms/SearchForm/SearchForm.css
deleted file mode 100644
index 9e3cd6cb8..000000000
--- a/webclient/src/forms/SearchForm/SearchForm.css
+++ /dev/null
@@ -1,35 +0,0 @@
-.log-search {
-  margin-bottom: 20px;
-}
-
-hr.MuiDivider-root {
-  margin: 20px 0;
-}
-
-.log-search__form {
-  width: 100%;
-  padding: 20px;
-}
-
-.log-search__form-item {
-  display: flex;
-}
-
-.log-search__form-item.log-location {
-  display: flex;
-  justify-content: space-around;
-}
-
-.log-search__form-item.log-location .checkbox-field {
-  display: flex;
-  flex-direction: column;
-}
-
-.log-search__form-item.log-location .checkbox-field__box {
-  order: 1;
-}
-
-.log-search__form-submit.MuiButton-root {
-  display: block;
-  margin: 0 auto;
-}
diff --git a/webclient/src/forms/SearchForm/SearchForm.tsx b/webclient/src/forms/SearchForm/SearchForm.tsx
deleted file mode 100644
index 793543086..000000000
--- a/webclient/src/forms/SearchForm/SearchForm.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-// eslint-disable-next-line
-import React, { Component } from "react";
-import { connect } from 'react-redux';
-import { Form, Field, reduxForm } from 'redux-form'
-
-import Button from '@mui/material/Button';
-import Divider from '@mui/material/Divider';
-import Paper from '@mui/material/Paper';
-
-import { InputField, CheckboxField } from 'components';
-import { FormKey } from 'types';
-
-import './SearchForm.css';
-
-const SearchForm = ({ handleSubmit }) => (
-  <Paper className="log-search">
-    <Form className="log-search__form" onSubmit={handleSubmit}>
-      <div className="log-search__form-item">
-        <Field label="Username" name="userName" component={InputField} />
-      </div>
-      <div className="log-search__form-item">
-        <Field label="IP Address" name="ipAddress" component={InputField} />
-      </div>
-      <div className="log-search__form-item">
-        <Field label="Game Name" name="gameName" component={InputField} />
-      </div>
-      <div className="log-search__form-item">
-        <Field label="GameID" name="gameId" component={InputField} />
-      </div>
-      <div className="log-search__form-item">
-        <Field label="Message" name="message" component={InputField} />
-      </div>
-      <Divider />
-      <div className="log-search__form-item log-location">
-        <Field label="Rooms" name="logLocation.room" component={CheckboxField} />
-        <Field label="Games" name="logLocation.game" component={CheckboxField} />
-        <Field label="Chats" name="logLocation.chat" component={CheckboxField} />
-      </div>
-      <Divider />
-      <div className="log-search__form-item">
-        <span>Date Range: Coming Soon</span>
-      </div>
-      <Divider />
-      <div className="log-search__form-item">
-        <span>Maximum Results: 1000</span>
-      </div>
-      <Divider />
-      <Button className="log-search__form-submit" color="primary" variant="contained" type="submit">
-        Search Logs
-      </Button>
-    </Form>
-  </Paper>
-);
-
-const propsMap = {
-  form: FormKey.SEARCH_LOGS,
-};
-
-const mapStateToProps = () => ({
-
-});
-
-export default connect(mapStateToProps)(reduxForm(propsMap)(SearchForm));
diff --git a/webclient/src/forms/index.ts b/webclient/src/forms/index.ts
deleted file mode 100644
index b922a9f40..000000000
--- a/webclient/src/forms/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export { default as AccountActivationForm } from './AccountActivationForm/AccountActivationForm';
-export { default as CardImportForm } from './CardImportForm/CardImportForm';
-export { default as LoginForm } from './LoginForm/LoginForm';
-export { default as KnownHostForm } from './KnownHostForm/KnownHostForm';
-export { default as RegisterForm } from './RegisterForm/RegisterForm';
-export { default as SearchForm } from './SearchForm/SearchForm';
-export { default as RequestPasswordResetForm } from './RequestPasswordResetForm/RequestPasswordResetForm';
-export { default as ResetPasswordForm } from './ResetPasswordForm/ResetPasswordForm';
diff --git a/webclient/src/hooks/index.ts b/webclient/src/hooks/index.ts
deleted file mode 100644
index b5e9cca55..000000000
--- a/webclient/src/hooks/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './useAutoConnect';
-export * from './useFireOnce';
-export * from './useDebounce';
-export * from './useLocaleSort';
-export * from './useReduxEffect';
diff --git a/webclient/src/hooks/useAutoConnect.ts b/webclient/src/hooks/useAutoConnect.ts
deleted file mode 100644
index 5258f58a7..000000000
--- a/webclient/src/hooks/useAutoConnect.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { useEffect, useState } from 'react';
-import { debounce, DebouncedFunc } from 'lodash';
-
-import { SettingDTO } from 'services';
-import { APP_USER } from 'types';
-
-type OnChange = () => void;
-
-export function useAutoConnect() {
-  const [setting, setSetting] = useState(undefined);
-  const [autoConnect, setAutoConnect] = useState(undefined);
-
-  useEffect(() => {
-    SettingDTO.get(APP_USER).then((setting: SettingDTO) => {
-      if (!setting) {
-        setting = new SettingDTO(APP_USER);
-        setting.save();
-      }
-
-      setSetting(setting);
-    });
-  }, []);
-
-  useEffect(() => {
-    if (setting) {
-      setAutoConnect(setting.autoConnect);
-    }
-  }, [setting]);
-
-  useEffect(() => {
-    if (setting) {
-      setting.autoConnect = autoConnect;
-      setting.save();
-    }
-  }, [setting, autoConnect]);
-
-  return [autoConnect, setAutoConnect];
-}
diff --git a/webclient/src/hooks/useDebounce.ts b/webclient/src/hooks/useDebounce.ts
deleted file mode 100644
index 65aee9982..000000000
--- a/webclient/src/hooks/useDebounce.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { useCallback } from 'react';
-import { debounce, DebouncedFunc } from 'lodash';
-
-type UseDebounceType = (...args: any) => any;
-const DEBOUNCE_DELAY = 250;
-
-export function useDebounce<T extends UseDebounceType>(
-  fn: T,
-  deps: any[] = [],
-  timeout: number = DEBOUNCE_DELAY
-): DebouncedFunc<T> {
-  return useCallback(debounce(fn, timeout), deps);
-}
diff --git a/webclient/src/hooks/useFireOnce/index.ts b/webclient/src/hooks/useFireOnce/index.ts
deleted file mode 100644
index 442da884f..000000000
--- a/webclient/src/hooks/useFireOnce/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './useFireOnce'
diff --git a/webclient/src/hooks/useFireOnce/useFireOnce.spec.tsx b/webclient/src/hooks/useFireOnce/useFireOnce.spec.tsx
deleted file mode 100644
index 2f6ed34e0..000000000
--- a/webclient/src/hooks/useFireOnce/useFireOnce.spec.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import {
-  render,
-  fireEvent,
-  getByRole,
-  waitFor,
-  act
-} from '@testing-library/react';
-import { useFireOnce } from './useFireOnce';
-
-describe('useFireOnce hook', () => {
-  test('it only fires once when button is clicked twice', async () => {
-    // Mock a promise with a delay
-    const onClickWithPromise = jest.fn((e) => {
-      e.preventDefault()
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          resolve(true);
-        }, 100);
-      });
-    });
-
-    function Button(props) {
-      const { children, onClick } = props
-      const [buttonIsDisabled, setButtonIsDisabled, handleClickOnce] = useFireOnce(onClick)
-      return <button onClick={handleClickOnce} disabled={buttonIsDisabled}>{children}</button>
-    }
-
-    // render the button
-    const { getByRole } = render(
-      <Button onClick={onClickWithPromise}>Click Me!</Button>
-    );
-
-    //Grab the button from the DOM and confirm it initialized in an enabled state
-    const button = getByRole('button', { name: 'Click Me!' });
-    expect(button).toBeEnabled();
-
-    // Simulate two click events in a row
-    fireEvent.click(button);
-    fireEvent.click(button);
-
-    // Confirm that it's disabled
-    await waitFor(() => {
-      expect(button).toBeDisabled();
-    });
-
-    // Confirm it became enabled after the timeout and that the click event was only fired once
-    await waitFor(
-      () => {
-        expect(onClickWithPromise).toHaveBeenCalledTimes(1);
-      },
-      { timeout: 100 }
-    );
-  });
-
-  test('it only fires once when form is submitted twice', async () => {
-    // Mock a promise with a delay
-    const onClickWithPromise = jest.fn((e) => {
-      e.preventDefault()
-      return new Promise((resolve) => {
-        setTimeout(() => {
-          resolve(true);
-        }, 100);
-      });
-    });
-
-    function Form(props) {
-      const { onSubmit } = props
-      const [buttonIsDisabled, setButtonIsDisabled, handleSubmitOnce] = useFireOnce(onSubmit)
-      return (
-        <form onSubmit={handleSubmitOnce}>
-          <input type="text" defaultValue="Hell World" name="thing-to-say" />
-          <button disabled={buttonIsDisabled}>Click Me!</button>
-        </form>
-      )
-    }
-
-    // render the form
-    const { getByRole } = render(
-      <Form onSubmit={onClickWithPromise} />
-    );
-
-    //Grab the button from the DOM and confirm it initialized in an enabled state
-    const button = getByRole('button', { name: 'Click Me!' });
-    expect(button).toBeEnabled();
-
-    // Simulate two click events in a row
-    fireEvent.click(button);
-    fireEvent.click(button);
-
-    // Confirm that it's disabled
-    await waitFor(() => {
-      expect(button).toBeDisabled();
-    });
-
-    // Confirm it became enabled after the timeout and that the click event was only fired once
-    await waitFor(
-      () => {
-        expect(onClickWithPromise).toHaveBeenCalledTimes(1);
-      },
-      { timeout: 100 }
-    );
-  });
-});
diff --git a/webclient/src/hooks/useFireOnce/useFireOnce.ts b/webclient/src/hooks/useFireOnce/useFireOnce.ts
deleted file mode 100644
index 0b042a907..000000000
--- a/webclient/src/hooks/useFireOnce/useFireOnce.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { useCallback, useState } from 'react';
-import { useReduxEffect } from 'hooks';
-import { ServerTypes } from 'store';
-
-type UseFireOnceType = (...args: any) => any;
-
-export function useFireOnce<T extends UseFireOnceType>(fn: T): [boolean, any, any] {
-  const [actionIsInFlight, setActionIsInFlight] = useState(false)
-  const handleFireOnce = useCallback((args) => {
-    setActionIsInFlight(true);
-    fn(args);
-  }, [])
-  function resetInFlightStatus() {
-    setActionIsInFlight(false);
-  }
-  return [actionIsInFlight, resetInFlightStatus, handleFireOnce]
-}
diff --git a/webclient/src/hooks/useLocaleSort.ts b/webclient/src/hooks/useLocaleSort.ts
deleted file mode 100644
index 219292ed7..000000000
--- a/webclient/src/hooks/useLocaleSort.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-
-export function useLocaleSort(arr: string[], valueGetter: (value: string) => string) {
-  const [state] = useState<string[]>(arr);
-  const [sorted, setSorted] = useState<string[]>([]);
-
-  const { i18n } = useTranslation();
-
-  useEffect(() => {
-    const collator = new Intl.Collator(i18n.language);
-    const sorter = (a, b) => collator.compare(valueGetter(a), valueGetter(b));
-
-    setSorted(state.sort(sorter));
-  }, [state, i18n.language]);
-
-  return sorted;
-}
diff --git a/webclient/src/hooks/useReduxEffect.tsx b/webclient/src/hooks/useReduxEffect.tsx
deleted file mode 100644
index 83273a6d3..000000000
--- a/webclient/src/hooks/useReduxEffect.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
-File is adapted from https://github.com/Qeepsake/use-redux-effect under MIT License
- * @author Aspect Apps Limited
- * @description
- */
-
-import { useRef, useEffect, DependencyList } from 'react'
-import { useStore } from 'react-redux'
-import { AnyAction } from 'redux'
-import { castArray } from 'lodash'
-
-export type ReduxEffect = (action: AnyAction) => void
-
-/**
-  * Subscribes to redux store events
-  *
-  * @param effect
-  * @param type
-  * @param deps
-  */
-export function useReduxEffect(
-  effect: ReduxEffect,
-  type: string | string[],
-  deps: DependencyList = [],
-): void {
-  const currentValue = useRef(null);
-  const store = useStore();
-
-  const handleChange = (): void => {
-    const state: any = store.getState();
-    const action = state.action;
-    const previousValue = currentValue.current;
-    currentValue.current = action.count;
-
-    if (
-      previousValue !== action.count &&
-      castArray(type).includes(action.type)
-    ) {
-      effect(action);
-    }
-  }
-
-  useEffect(() => {
-    const unsubscribe = store.subscribe(handleChange);
-    return (): void => unsubscribe();
-  }, deps)
-}
diff --git a/webclient/src/i18n-backend.ts b/webclient/src/i18n-backend.ts
deleted file mode 100644
index d270b3503..000000000
--- a/webclient/src/i18n-backend.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ModuleType } from 'i18next';
-
-import { Language } from 'types';
-
-class I18nBackend {
-  static type: ModuleType = 'backend';
-  static BASE_URL = `${process.env.PUBLIC_URL}/locales`;
-
-  read(language, namespace, callback) {
-    if (!Language[language]) {
-      callback(true, null);
-      return;
-    }
-
-    fetch(`${I18nBackend.BASE_URL}/${Language[language]}/${namespace}.json`)
-      .then(resp => resp.json().then(json => callback(null, json)))
-      .catch(error => callback(error, null));
-  }
-}
-
-export default I18nBackend;
diff --git a/webclient/src/i18n-default.json b/webclient/src/i18n-default.json
deleted file mode 100644
index 3c63e0abb..000000000
--- a/webclient/src/i18n-default.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
-  "Common": {
-    "language": "English",
-    "disconnect": "Disconnect",
-    "label": {
-      "confirmPassword": "Confirm Password",
-      "confirmSure": "Are you sure?",
-      "country": "Country",
-      "delete": "Delete",
-      "email": "Email",
-      "hostName": "Host Name",
-      "hostAddress": "Host Address",
-      "password": "Password",
-      "passwordAgain": "Password Again",
-      "port": "Port",
-      "realName": "Real Name",
-      "saveChanges": "Save Changes",
-      "token": "Token",
-      "username": "Username"
-    },
-    "validation": {
-      "minChars": "Minimum of {count} {count, plural, one {character} other {characters}} required",
-      "passwordsMustMatch": "Passwords don't match",
-      "required": "Required"
-    },
-    "countries": {
-      "AD": "Andorra",
-      "AE": "United Arab Emirates",
-      "AF": "Afghanistan",
-      "AG": "Antigua and Barbuda",
-      "AI": "Anguilla",
-      "AL": "Albania",
-      "AM": "Armenia",
-      "AO": "Angola",
-      "AQ": "Antarctica",
-      "AR": "Argentina",
-      "AS": "American Samoa",
-      "AT": "Austria",
-      "AU": "Australia",
-      "AW": "Aruba",
-      "AX": "Åland Islands",
-      "AZ": "Azerbaijan",
-      "BA": "Bosnia and Herzegovina",
-      "BB": "Barbados",
-      "BD": "Bangladesh",
-      "BE": "Belgium",
-      "BF": "Burkina Faso",
-      "BG": "Bulgaria",
-      "BH": "Bahrain",
-      "BI": "Burundi",
-      "BJ": "Benin",
-      "BL": "Saint Barthélemy",
-      "BM": "Bermuda",
-      "BN": "Brunei Darussalam",
-      "BO": "Bolivia",
-      "BQ": "Bonaire, Sint Eustatius and Saba",
-      "BR": "Brazil",
-      "BS": "Bahamas",
-      "BT": "Bhutan",
-      "BV": "Bouvet Island",
-      "BW": "Botswana",
-      "BY": "Belarus",
-      "BZ": "Belize",
-      "CA": "Canada",
-      "CC": "Cocos (Keeling) Islands",
-      "CD": "DR Congo",
-      "CF": "Central African Republic",
-      "CG": "Republic of the Congo",
-      "CH": "Switzerland",
-      "CI": "Ivory Coast",
-      "CK": "Cook Islands",
-      "CL": "Chile",
-      "CM": "Cameroon",
-      "CN": "China",
-      "CO": "Colombia",
-      "CR": "Costa Rica",
-      "CU": "Cuba",
-      "CV": "Cape Verde",
-      "CW": "Curaçao",
-      "CX": "Christmas Island",
-      "CY": "Cyprus",
-      "CZ": "Czechia",
-      "DE": "Germany",
-      "DJ": "Djibouti",
-      "DK": "Denmark",
-      "DM": "Dominica",
-      "DO": "Dominican Republic",
-      "DZ": "Algeria",
-      "EC": "Ecuador",
-      "EE": "Estonia",
-      "EG": "Egypt",
-      "EH": "Western Sahara",
-      "ER": "Eritrea",
-      "ES": "Spain",
-      "ET": "Ethiopia",
-      "FI": "Finland",
-      "FJ": "Fiji",
-      "FK": "Falkland Islands",
-      "FM": "Micronesia",
-      "FO": "Faroe Islands",
-      "FR": "France",
-      "GA": "Gabon",
-      "GB": "United Kingdom",
-      "GD": "Grenada",
-      "GE": "Georgia",
-      "GF": "French Guiana",
-      "GG": "Guernsey",
-      "GH": "Ghana",
-      "GI": "Gibraltar",
-      "GL": "Greenland",
-      "GM": "Gambia",
-      "GN": "Guinea",
-      "GP": "Guadeloupe",
-      "GQ": "Equatorial Guinea",
-      "GR": "Greece",
-      "GS": "South Georgia and the South Sandwich Islands",
-      "GT": "Guatemala",
-      "GU": "Guam",
-      "GW": "Guinea-Bissau",
-      "GY": "Guyana",
-      "HK": "Hong Kong",
-      "HM": "Heard Island and McDonald Islands",
-      "HN": "Honduras",
-      "HR": "Croatia",
-      "HT": "Haiti",
-      "HU": "Hungary",
-      "ID": "Indonesia",
-      "IE": "Ireland",
-      "IL": "Israel",
-      "IM": "Isle of Man",
-      "IN": "India",
-      "IO": "British Indian Ocean Territory",
-      "IQ": "Iraq",
-      "IR": "Iran",
-      "IS": "Iceland",
-      "IT": "Italy",
-      "JE": "Jersey",
-      "JM": "Jamaica",
-      "JO": "Jordan",
-      "JP": "Japan",
-      "KE": "Kenya",
-      "KG": "Kyrgyzstan",
-      "KH": "Cambodia",
-      "KI": "Kiribati",
-      "KM": "Comoros",
-      "KN": "Saint Kitts and Nevis",
-      "KP": "North Korea",
-      "KR": "South Korea",
-      "KW": "Kuwait",
-      "KY": "Cayman Islands",
-      "KZ": "Kazakhstan",
-      "LA": "Laos",
-      "LB": "Lebanon",
-      "LC": "Saint Lucia",
-      "LI": "Liechtenstein",
-      "LK": "Sri Lanka",
-      "LR": "Liberia",
-      "LS": "Lesotho",
-      "LT": "Lithuania",
-      "LU": "Luxembourg",
-      "LV": "Latvia",
-      "LY": "Libya",
-      "MA": "Morocco",
-      "MC": "Monaco",
-      "MD": "Moldova",
-      "ME": "Montenegro",
-      "MF": "Saint Martin (French part)",
-      "MG": "Madagascar",
-      "MH": "Marshall Islands",
-      "MK": "North Macedonia",
-      "ML": "Mali",
-      "MM": "Myanmar",
-      "MN": "Mongolia",
-      "MO": "Macao",
-      "MP": "Northern Mariana Islands",
-      "MQ": "Martinique",
-      "MR": "Mauritania",
-      "MS": "Montserrat",
-      "MT": "Malta",
-      "MU": "Mauritius",
-      "MV": "Maldives",
-      "MW": "Malawi",
-      "MX": "Mexico",
-      "MY": "Malaysia",
-      "MZ": "Mozambique",
-      "NA": "Namibia",
-      "NC": "New Caledonia",
-      "NE": "Niger",
-      "NF": "Norfolk Island",
-      "NG": "Nigeria",
-      "NI": "Nicaragua",
-      "NL": "Netherlands",
-      "NO": "Norway",
-      "NP": "Nepal",
-      "NR": "Nauru",
-      "NU": "Niue",
-      "NZ": "New Zealand",
-      "OM": "Oman",
-      "PA": "Panama",
-      "PE": "Peru",
-      "PF": "French Polynesia",
-      "PG": "Papua New Guinea",
-      "PH": "Philippines",
-      "PK": "Pakistan",
-      "PL": "Poland",
-      "PM": "Saint Pierre and Miquelon",
-      "PN": "Pitcairn",
-      "PR": "Puerto Rico",
-      "PS": "Palestine",
-      "PT": "Portugal",
-      "PW": "Palau",
-      "PY": "Paraguay",
-      "QA": "Qatar",
-      "RE": "Réunion",
-      "RO": "Romania",
-      "RS": "Serbia",
-      "RU": "Russia",
-      "RW": "Rwanda",
-      "SA": "Saudi Arabia",
-      "SB": "Solomon Islands",
-      "SC": "Seychelles",
-      "SD": "Sudan",
-      "SE": "Sweden",
-      "SG": "Singapore",
-      "SH": "Saint Helena, Ascension and Tristan da Cunha",
-      "SI": "Slovenia",
-      "SJ": "Svalbard and Jan Mayen",
-      "SK": "Slovakia",
-      "SL": "Sierra Leone",
-      "SM": "San Marino",
-      "SN": "Senegal",
-      "SO": "Somalia",
-      "SR": "Suriname",
-      "SS": "South Sudan",
-      "ST": "Sao Tome and Principe",
-      "SV": "El Salvador",
-      "SX": "Sint Maarten (Dutch part)",
-      "SY": "Syria",
-      "SZ": "Eswatini",
-      "TC": "Turks and Caicos Islands",
-      "TD": "Chad",
-      "TF": "TAAF",
-      "TG": "Togo",
-      "TH": "Thailand",
-      "TJ": "Tajikistan",
-      "TK": "Tokelau",
-      "TL": "Timor-Leste",
-      "TM": "Turkmenistan",
-      "TN": "Tunisia",
-      "TO": "Tonga",
-      "TR": "Turkey",
-      "TT": "Trinidad and Tobago",
-      "TV": "Tuvalu",
-      "TW": "Taiwan",
-      "TZ": "Tanzania",
-      "UA": "Ukraine",
-      "UG": "Uganda",
-      "UM": "United States Minor Outlying Islands",
-      "US": "United States",
-      "UY": "Uruguay",
-      "UZ": "Uzbekistan",
-      "VA": "Holy See",
-      "VC": "Saint Vincent and the Grenadines",
-      "VE": "Venezuela",
-      "VG": "British Virgin Islands",
-      "VI": "U.S. Virgin Islands",
-      "VN": "Viet Nam",
-      "VU": "Vanuatu",
-      "WF": "Wallis and Futuna",
-      "WS": "Samoa",
-      "YE": "Yemen",
-      "YT": "Mayotte",
-      "XK": "Kosovo",
-      "ZA": "South Africa",
-      "ZM": "Zambia",
-      "ZW": "Zimbabwe",
-      "EU": "European Union"
-    },
-    "languages": {
-      "en-US": "English - US",
-      "fr": "French",
-      "nl": "Dutch",
-      "pt_BR": "Portuguese - Brazil"
-    }
-  },
-  "KnownHosts": {
-    "label": "Host",
-    "add": "Add new host",
-    "toast": "Host successfully {mode, select, created {created} deleted {deleted} other {edited}}."
-  },
-  "InitializeContainer": {
-    "title": "DID YOU KNOW",
-    "subtitle": "<1>Cockatrice is run by volunteers</1><1>that love card games!</1>"
-  },
-  "LoginContainer": {
-    "header": {
-      "title": "Login",
-      "subtitle": "A cross-platform virtual tabletop for multiplayer card games."
-    },
-    "footer": {
-      "registerPrompt": "Not registered yet?",
-      "registerAction": "Create an account",
-      "credit": "Cockatrice is an open source project",
-      "version": "Version"
-    },
-    "content": {
-      "subtitle1": "Play multiplayer card games online.",
-      "subtitle2": "Cross-platform virtual tabletop for multiplayer card games. Forever free."
-    },
-    "toasts": {
-      "passwordResetSuccessToast": "Password Reset Successfully",
-      "accountActivationSuccess": "Account Activated Successfully"
-    }
-  },
-  "UnsupportedContainer": {
-    "title": "Unsupported Browser",
-    "subtitle1": "Please update your browser and/or check your permissions.",
-    "subtitle2": "Note: Private browsing causes some browsers to disable certain permissions or features."
-  },
-  "AccountActivationDialog": {
-    "title": "Account Activation",
-    "subtitle1": "Your account has not been activated yet.",
-    "subtitle2": "You need to provide the activation token received in the activation email."
-  },
-  "KnownHostDialog": {
-    "title": "{mode, select, edit {Edit} other {Add}} Known Host",
-    "subtitle": "Adding a new host allows you to connect to different servers. Enter the details below to your host list."
-  },
-  "RegistrationDialog": {
-    "title": "Create New Account"
-  },
-  "RequestPasswordResetDialog": {
-    "title": "Request Password Reset"
-  },
-  "ResetPasswordDialog": {
-    "title": "Reset Password"
-  },
-  "AccountActivationForm": {
-    "error": {
-      "failed": "Account activation failed"
-    },
-    "label": {
-      "activate": "Activate Account"
-    }
-  },
-  "KnownHostForm": {
-    "help": "Need help adding a new host?",
-    "label": {
-      "add": "Add Host",
-      "find": "Find Host"
-    }
-  },
-  "LoginForm": {
-    "label": {
-      "autoConnect": "Auto Connect",
-      "forgot": "Forgot Password",
-      "login": "Login",
-      "savePassword": "Save Password",
-      "savedPassword": "Saved Password"
-    }
-  },
-  "RegisterForm": {
-    "label": {
-      "register": "Register"
-    },
-    "toast": {
-      "registerSuccess": "Registration Successful!"
-    }
-  },
-  "RequestPasswordResetForm": {
-    "error": "Request password reset failed",
-    "mfaEnabled": "Server has multi-factor authentication enabled",
-    "request": "Request Reset Token",
-    "skipRequest": "I already have a reset token"
-  },
-  "ResetPasswordForm": {
-    "error": "Password reset failed",
-    "label": {
-      "reset": "Reset Password"
-    }
-  }
-}
\ No newline at end of file
diff --git a/webclient/src/i18n.ts b/webclient/src/i18n.ts
deleted file mode 100644
index ef1885965..000000000
--- a/webclient/src/i18n.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import i18n from 'i18next';
-import LanguageDetector from 'i18next-browser-languagedetector';
-import ICU from 'i18next-icu';
-import { initReactI18next } from 'react-i18next';
-
-import { Language } from 'types';
-
-import I18nBackend from './i18n-backend';
-
-// Bundle default translation with application
-import translation from './i18n-default.json';
-
-i18n
-  .use(ICU)
-  .use(I18nBackend)
-  .use(LanguageDetector)
-  .use(initReactI18next)
-  // for all options read: https://www.i18next.com/overview/configuration-options
-  .init({
-    fallbackLng: Language['en-US'],
-    resources: {
-      [Language['en-US']]: { translation },
-    },
-    partialBundledLanguages: true,
-
-    interpolation: {
-      // not needed for react as it escapes by default
-      escapeValue: false,
-    }
-  });
-
-export default i18n;
diff --git a/webclient/src/images/Images.ts b/webclient/src/images/Images.ts
deleted file mode 100644
index 9d08eb3ec..000000000
--- a/webclient/src/images/Images.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Countries } from './countries/_Countries';
-import { Faces } from './faces/_Faces';
-import Logo from './logo.png';
-
-export class Images {
-  static Countries = Countries;
-  static Faces = Faces;
-  static Logo = Logo;
-}
diff --git a/webclient/src/images/countries/.gitignore b/webclient/src/images/countries/.gitignore
deleted file mode 100644
index 1337edaa7..000000000
--- a/webclient/src/images/countries/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# Ignore all files
-* 
-# Except gitignore
-!.gitignore
-
-!_Countries.ts
diff --git a/webclient/src/images/countries/_Countries.ts b/webclient/src/images/countries/_Countries.ts
deleted file mode 100644
index a4867db46..000000000
--- a/webclient/src/images/countries/_Countries.ts
+++ /dev/null
@@ -1,507 +0,0 @@
-// Remove !file-loader! once the following is no longer an issue
-// https://github.com/facebook/create-react-app/issues/11770
-import ad from '!file-loader!./ad.svg';
-import ae from '!file-loader!./ae.svg';
-import af from '!file-loader!./af.svg';
-import ag from '!file-loader!./ag.svg';
-import ai from '!file-loader!./ai.svg';
-import al from '!file-loader!./al.svg';
-import am from '!file-loader!./am.svg';
-import ao from '!file-loader!./ao.svg';
-import aq from '!file-loader!./aq.svg';
-import ar from '!file-loader!./ar.svg';
-import as from '!file-loader!./as.svg';
-import at from '!file-loader!./at.svg';
-import au from '!file-loader!./au.svg';
-import aw from '!file-loader!./aw.svg';
-import ax from '!file-loader!./ax.svg';
-import az from '!file-loader!./az.svg';
-import ba from '!file-loader!./ba.svg';
-import bb from '!file-loader!./bb.svg';
-import bd from '!file-loader!./bd.svg';
-import be from '!file-loader!./be.svg';
-import bf from '!file-loader!./bf.svg';
-import bg from '!file-loader!./bg.svg';
-import bh from '!file-loader!./bh.svg';
-import bi from '!file-loader!./bi.svg';
-import bj from '!file-loader!./bj.svg';
-import bl from '!file-loader!./bl.svg';
-import bm from '!file-loader!./bm.svg';
-import bn from '!file-loader!./bn.svg';
-import bo from '!file-loader!./bo.svg';
-import bq from '!file-loader!./bq.svg';
-import br from '!file-loader!./br.svg';
-import bs from '!file-loader!./bs.svg';
-import bt from '!file-loader!./bt.svg';
-import bv from '!file-loader!./bv.svg';
-import bw from '!file-loader!./bw.svg';
-import by from '!file-loader!./by.svg';
-import bz from '!file-loader!./bz.svg';
-import ca from '!file-loader!./ca.svg';
-import cc from '!file-loader!./cc.svg';
-import cd from '!file-loader!./cd.svg';
-import cf from '!file-loader!./cf.svg';
-import cg from '!file-loader!./cg.svg';
-import ch from '!file-loader!./ch.svg';
-import ci from '!file-loader!./ci.svg';
-import ck from '!file-loader!./ck.svg';
-import cl from '!file-loader!./cl.svg';
-import cm from '!file-loader!./cm.svg';
-import cn from '!file-loader!./cn.svg';
-import co from '!file-loader!./co.svg';
-import cr from '!file-loader!./cr.svg';
-import cu from '!file-loader!./cu.svg';
-import cv from '!file-loader!./cv.svg';
-import cw from '!file-loader!./cw.svg';
-import cx from '!file-loader!./cx.svg';
-import cy from '!file-loader!./cy.svg';
-import cz from '!file-loader!./cz.svg';
-import de from '!file-loader!./de.svg';
-import dj from '!file-loader!./dj.svg';
-import dk from '!file-loader!./dk.svg';
-import dm from '!file-loader!./dm.svg';
-import _do from '!file-loader!./do.svg';
-import dz from '!file-loader!./dz.svg';
-import ec from '!file-loader!./ec.svg';
-import ee from '!file-loader!./ee.svg';
-import eg from '!file-loader!./eg.svg';
-import eh from '!file-loader!./eh.svg';
-import er from '!file-loader!./er.svg';
-import es from '!file-loader!./es.svg';
-import et from '!file-loader!./et.svg';
-import eu from '!file-loader!./eu.svg';
-import fi from '!file-loader!./fi.svg';
-import fj from '!file-loader!./fj.svg';
-import fk from '!file-loader!./fk.svg';
-import fm from '!file-loader!./fm.svg';
-import fo from '!file-loader!./fo.svg';
-import fr from '!file-loader!./fr.svg';
-import ga from '!file-loader!./ga.svg';
-import gb from '!file-loader!./gb.svg';
-import gd from '!file-loader!./gd.svg';
-import ge from '!file-loader!./ge.svg';
-import gf from '!file-loader!./gf.svg';
-import gg from '!file-loader!./gg.svg';
-import gh from '!file-loader!./gh.svg';
-import gi from '!file-loader!./gi.svg';
-import gl from '!file-loader!./gl.svg';
-import gm from '!file-loader!./gm.svg';
-import gn from '!file-loader!./gn.svg';
-import gp from '!file-loader!./gp.svg';
-import gq from '!file-loader!./gq.svg';
-import gr from '!file-loader!./gr.svg';
-import gs from '!file-loader!./gs.svg';
-import gt from '!file-loader!./gt.svg';
-import gu from '!file-loader!./gu.svg';
-import gw from '!file-loader!./gw.svg';
-import gy from '!file-loader!./gy.svg';
-import hk from '!file-loader!./hk.svg';
-import hm from '!file-loader!./hm.svg';
-import hn from '!file-loader!./hn.svg';
-import hr from '!file-loader!./hr.svg';
-import ht from '!file-loader!./ht.svg';
-import hu from '!file-loader!./hu.svg';
-import id from '!file-loader!./id.svg';
-import ie from '!file-loader!./ie.svg';
-import il from '!file-loader!./il.svg';
-import im from '!file-loader!./im.svg';
-import _in from '!file-loader!./in.svg';
-import io from '!file-loader!./io.svg';
-import iq from '!file-loader!./iq.svg';
-import ir from '!file-loader!./ir.svg';
-import is from '!file-loader!./is.svg';
-import it from '!file-loader!./it.svg';
-import je from '!file-loader!./je.svg';
-import jm from '!file-loader!./jm.svg';
-import jo from '!file-loader!./jo.svg';
-import jp from '!file-loader!./jp.svg';
-import ke from '!file-loader!./ke.svg';
-import kg from '!file-loader!./kg.svg';
-import kh from '!file-loader!./kh.svg';
-import ki from '!file-loader!./ki.svg';
-import km from '!file-loader!./km.svg';
-import kn from '!file-loader!./kn.svg';
-import kp from '!file-loader!./kp.svg';
-import kr from '!file-loader!./kr.svg';
-import kw from '!file-loader!./kw.svg';
-import ky from '!file-loader!./ky.svg';
-import kz from '!file-loader!./kz.svg';
-import la from '!file-loader!./la.svg';
-import lb from '!file-loader!./lb.svg';
-import lc from '!file-loader!./lc.svg';
-import li from '!file-loader!./li.svg';
-import lk from '!file-loader!./lk.svg';
-import lr from '!file-loader!./lr.svg';
-import ls from '!file-loader!./ls.svg';
-import lt from '!file-loader!./lt.svg';
-import lu from '!file-loader!./lu.svg';
-import lv from '!file-loader!./lv.svg';
-import ly from '!file-loader!./ly.svg';
-import ma from '!file-loader!./ma.svg';
-import mc from '!file-loader!./mc.svg';
-import md from '!file-loader!./md.svg';
-import me from '!file-loader!./me.svg';
-import mf from '!file-loader!./mf.svg';
-import mg from '!file-loader!./mg.svg';
-import mh from '!file-loader!./mh.svg';
-import mk from '!file-loader!./mk.svg';
-import ml from '!file-loader!./ml.svg';
-import mm from '!file-loader!./mm.svg';
-import mn from '!file-loader!./mn.svg';
-import mo from '!file-loader!./mo.svg';
-import mp from '!file-loader!./mp.svg';
-import mq from '!file-loader!./mq.svg';
-import mr from '!file-loader!./mr.svg';
-import ms from '!file-loader!./ms.svg';
-import mt from '!file-loader!./mt.svg';
-import mu from '!file-loader!./mu.svg';
-import mv from '!file-loader!./mv.svg';
-import mw from '!file-loader!./mw.svg';
-import mx from '!file-loader!./mx.svg';
-import my from '!file-loader!./my.svg';
-import mz from '!file-loader!./mz.svg';
-import na from '!file-loader!./na.svg';
-import nc from '!file-loader!./nc.svg';
-import ne from '!file-loader!./ne.svg';
-import nf from '!file-loader!./nf.svg';
-import ng from '!file-loader!./ng.svg';
-import ni from '!file-loader!./ni.svg';
-import nl from '!file-loader!./nl.svg';
-import no from '!file-loader!./no.svg';
-import np from '!file-loader!./np.svg';
-import nr from '!file-loader!./nr.svg';
-import nu from '!file-loader!./nu.svg';
-import nz from '!file-loader!./nz.svg';
-import om from '!file-loader!./om.svg';
-import pa from '!file-loader!./pa.svg';
-import pe from '!file-loader!./pe.svg';
-import pf from '!file-loader!./pf.svg';
-import pg from '!file-loader!./pg.svg';
-import ph from '!file-loader!./ph.svg';
-import pk from '!file-loader!./pk.svg';
-import pl from '!file-loader!./pl.svg';
-import pm from '!file-loader!./pm.svg';
-import pn from '!file-loader!./pn.svg';
-import pr from '!file-loader!./pr.svg';
-import ps from '!file-loader!./ps.svg';
-import pt from '!file-loader!./pt.svg';
-import pw from '!file-loader!./pw.svg';
-import py from '!file-loader!./py.svg';
-import qa from '!file-loader!./qa.svg';
-import re from '!file-loader!./re.svg';
-import ro from '!file-loader!./ro.svg';
-import rs from '!file-loader!./rs.svg';
-import ru from '!file-loader!./ru.svg';
-import rw from '!file-loader!./rw.svg';
-import sa from '!file-loader!./sa.svg';
-import sb from '!file-loader!./sb.svg';
-import sc from '!file-loader!./sc.svg';
-import sd from '!file-loader!./sd.svg';
-import se from '!file-loader!./se.svg';
-import sg from '!file-loader!./sg.svg';
-import sh from '!file-loader!./sh.svg';
-import si from '!file-loader!./si.svg';
-import sj from '!file-loader!./sj.svg';
-import sk from '!file-loader!./sk.svg';
-import sl from '!file-loader!./sl.svg';
-import sm from '!file-loader!./sm.svg';
-import sn from '!file-loader!./sn.svg';
-import so from '!file-loader!./so.svg';
-import sr from '!file-loader!./sr.svg';
-import ss from '!file-loader!./ss.svg';
-import st from '!file-loader!./st.svg';
-import sv from '!file-loader!./sv.svg';
-import sx from '!file-loader!./sx.svg';
-import sy from '!file-loader!./sy.svg';
-import sz from '!file-loader!./sz.svg';
-import tc from '!file-loader!./tc.svg';
-import td from '!file-loader!./td.svg';
-import tf from '!file-loader!./tf.svg';
-import tg from '!file-loader!./tg.svg';
-import th from '!file-loader!./th.svg';
-import tj from '!file-loader!./tj.svg';
-import tk from '!file-loader!./tk.svg';
-import tl from '!file-loader!./tl.svg';
-import tm from '!file-loader!./tm.svg';
-import tn from '!file-loader!./tn.svg';
-import to from '!file-loader!./to.svg';
-import tr from '!file-loader!./tr.svg';
-import tt from '!file-loader!./tt.svg';
-import tv from '!file-loader!./tv.svg';
-import tw from '!file-loader!./tw.svg';
-import tz from '!file-loader!./tz.svg';
-import ua from '!file-loader!./ua.svg';
-import ug from '!file-loader!./ug.svg';
-import um from '!file-loader!./um.svg';
-import us from '!file-loader!./us.svg';
-import uy from '!file-loader!./uy.svg';
-import uz from '!file-loader!./uz.svg';
-import va from '!file-loader!./va.svg';
-import vc from '!file-loader!./vc.svg';
-import ve from '!file-loader!./ve.svg';
-import vg from '!file-loader!./vg.svg';
-import vi from '!file-loader!./vi.svg';
-import vn from '!file-loader!./vn.svg';
-import vu from '!file-loader!./vu.svg';
-import wf from '!file-loader!./wf.svg';
-import ws from '!file-loader!./ws.svg';
-import xk from '!file-loader!./xk.svg';
-import ye from '!file-loader!./ye.svg';
-import yt from '!file-loader!./yt.svg';
-import za from '!file-loader!./za.svg';
-import zm from '!file-loader!./zm.svg';
-import zw from '!file-loader!./zw.svg';
-
-export const Countries = {
-  ad,
-  ae,
-  af,
-  ag,
-  ai,
-  al,
-  am,
-  ao,
-  aq,
-  ar,
-  as,
-  at,
-  au,
-  aw,
-  ax,
-  az,
-  ba,
-  bb,
-  bd,
-  be,
-  bf,
-  bg,
-  bh,
-  bi,
-  bj,
-  bl,
-  bm,
-  bn,
-  bo,
-  bq,
-  br,
-  bs,
-  bt,
-  bv,
-  bw,
-  by,
-  bz,
-  ca,
-  cc,
-  cd,
-  cf,
-  cg,
-  ch,
-  ci,
-  ck,
-  cl,
-  cm,
-  cn,
-  co,
-  cr,
-  cu,
-  cv,
-  cw,
-  cx,
-  cy,
-  cz,
-  de,
-  dj,
-  dk,
-  dm,
-  do: _do,
-  dz,
-  ec,
-  ee,
-  eg,
-  eh,
-  er,
-  es,
-  et,
-  eu,
-  fi,
-  fj,
-  fk,
-  fm,
-  fo,
-  fr,
-  ga,
-  gb,
-  gd,
-  ge,
-  gf,
-  gg,
-  gh,
-  gi,
-  gl,
-  gm,
-  gn,
-  gp,
-  gq,
-  gr,
-  gs,
-  gt,
-  gu,
-  gw,
-  gy,
-  hk,
-  hm,
-  hn,
-  hr,
-  ht,
-  hu,
-  id,
-  ie,
-  il,
-  im,
-  in: _in,
-  io,
-  iq,
-  ir,
-  is,
-  it,
-  je,
-  jm,
-  jo,
-  jp,
-  ke,
-  kg,
-  kh,
-  ki,
-  km,
-  kn,
-  kp,
-  kr,
-  kw,
-  ky,
-  kz,
-  la,
-  lb,
-  lc,
-  li,
-  lk,
-  lr,
-  ls,
-  lt,
-  lu,
-  lv,
-  ly,
-  ma,
-  mc,
-  md,
-  me,
-  mf,
-  mg,
-  mh,
-  mk,
-  ml,
-  mm,
-  mn,
-  mo,
-  mp,
-  mq,
-  mr,
-  ms,
-  mt,
-  mu,
-  mv,
-  mw,
-  mx,
-  my,
-  mz,
-  na,
-  nc,
-  ne,
-  nf,
-  ng,
-  ni,
-  nl,
-  no,
-  np,
-  nr,
-  nu,
-  nz,
-  om,
-  pa,
-  pe,
-  pf,
-  pg,
-  ph,
-  pk,
-  pl,
-  pm,
-  pn,
-  pr,
-  ps,
-  pt,
-  pw,
-  py,
-  qa,
-  re,
-  ro,
-  rs,
-  ru,
-  rw,
-  sa,
-  sb,
-  sc,
-  sd,
-  se,
-  sg,
-  sh,
-  si,
-  sj,
-  sk,
-  sl,
-  sm,
-  sn,
-  so,
-  sr,
-  ss,
-  st,
-  sv,
-  sx,
-  sy,
-  sz,
-  tc,
-  td,
-  tf,
-  tg,
-  th,
-  tj,
-  tk,
-  tl,
-  tm,
-  tn,
-  to,
-  tr,
-  tt,
-  tv,
-  tw,
-  tz,
-  ua,
-  ug,
-  um,
-  us,
-  uy,
-  uz,
-  va,
-  vc,
-  ve,
-  vg,
-  vi,
-  vn,
-  vu,
-  wf,
-  ws,
-  xk,
-  ye,
-  yt,
-  za,
-  zm,
-  zw,
-};
diff --git a/webclient/src/images/faces/_Faces.ts b/webclient/src/images/faces/_Faces.ts
deleted file mode 100644
index 73a8c361b..000000000
--- a/webclient/src/images/faces/_Faces.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import face1 from './face1.jpg';
-import face2 from './face2.jpg';
-import face3 from './face3.jpg';
-
-export const Faces = {
-  face1,
-  face2,
-  face3,
-}
diff --git a/webclient/src/images/faces/face1.jpg b/webclient/src/images/faces/face1.jpg
deleted file mode 100644
index 931c5822d..000000000
Binary files a/webclient/src/images/faces/face1.jpg and /dev/null differ
diff --git a/webclient/src/images/faces/face2.jpg b/webclient/src/images/faces/face2.jpg
deleted file mode 100644
index 8b5bea967..000000000
Binary files a/webclient/src/images/faces/face2.jpg and /dev/null differ
diff --git a/webclient/src/images/faces/face3.jpg b/webclient/src/images/faces/face3.jpg
deleted file mode 100644
index ace651dc0..000000000
Binary files a/webclient/src/images/faces/face3.jpg and /dev/null differ
diff --git a/webclient/src/images/index.ts b/webclient/src/images/index.ts
deleted file mode 100644
index e96072916..000000000
--- a/webclient/src/images/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './Images';
diff --git a/webclient/src/images/logo.png b/webclient/src/images/logo.png
deleted file mode 100644
index 7ce83bd20..000000000
Binary files a/webclient/src/images/logo.png and /dev/null differ
diff --git a/webclient/src/index.css b/webclient/src/index.css
deleted file mode 100644
index c5f9b9230..000000000
--- a/webclient/src/index.css
+++ /dev/null
@@ -1,70 +0,0 @@
-@import url('https://fonts.googleapis.com/css2?family=Teko&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;1,300;1,400;1,500;1,600;1,700;1,800&display=swap');
-
-:root {
-
-}
-
-* {
-  box-sizing: border-box;
-}
-
-html,
-body,
-#root {
-  height: 100%;
-}
-
-body {
-  margin: 0;
-  font-family:
-    -apple-system,
-    BlinkMacSystemFont,
-    "Open Sans",
-    "Segoe UI",
-    "Roboto",
-    "Oxygen",
-    "Ubuntu",
-    "Cantarell",
-    "Fira Sans",
-    "Droid Sans",
-    "Helvetica Neue",
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
-  monospace;
-}
-
-strong,
-b {
-  font-weight: bold;
-}
-
-a {
-  color: inherit;
-  text-decoration: none;
-}
-
-.overflow-scroll {
-  overflow-y: scroll; /* has to be scroll, not auto */
-  -webkit-overflow-scrolling: touch;
-}
-
-.plain-link {
-  color: inherit;
-  text-decoration: none;
-}
-
-.single-line-ellipsis {
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-}
-
-.disabled-link {
-  pointer-events: none;
-}
diff --git a/webclient/src/index.tsx b/webclient/src/index.tsx
deleted file mode 100644
index 97b5bb014..000000000
--- a/webclient/src/index.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { StrictMode } from 'react';
-import { createRoot } from 'react-dom/client';
-import { Theme, StyledEngineProvider } from '@mui/material';
-import { ThemeProvider } from '@mui/material/styles';
-
-import { AppShell } from './containers';
-import { materialTheme } from './material-theme';
-
-import './i18n';
-import './index.css';
-
-const AppWithMaterialTheme = () => (
-  <StrictMode>
-    <StyledEngineProvider injectFirst>
-      <ThemeProvider theme={materialTheme}>
-        <AppShell />
-      </ThemeProvider>
-    </StyledEngineProvider>
-  </StrictMode>
-);
-
-const container = document.getElementById('root');
-const root = createRoot(container!);
-
-root.render(<AppWithMaterialTheme />);
diff --git a/webclient/src/material-theme.ts b/webclient/src/material-theme.ts
deleted file mode 100644
index beee1146e..000000000
--- a/webclient/src/material-theme.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-import { PaletteMode } from '@mui/material';
-import { createTheme } from '@mui/material/styles';
-
-const mode: PaletteMode = 'light';
-
-const palette = {
-  mode,
-
-  background: {
-    default: 'rgb(35, 35, 35)',
-    paper: '#FFFFFF',
-  },
-  primary: {
-    main: '#7033DB',
-    light: 'rgba(112, 51, 219, .3)',
-    dark: '#401C7F',
-    contrastText: '#FFFFFF',
-  },
-  grey: {
-    50: '#fafafa',
-    100: '#f5f5f5',
-    200: '#eeeeee',
-    300: '#e0e0e0',
-    400: '#bdbdbd',
-    500: '#9e9e9e',
-    600: '#757575',
-    700: '#616161',
-    800: '#424242',
-    900: '#212121',
-    A100: '#d5d5d5',
-    A200: '#aaaaaa',
-    A400: '#303030',
-    A700: '#616161',
-  },
-  // secondary: {
-  //   main: '',
-  //   light: '',
-  //   dark: '',
-  //   contrastText: '',
-  // },
-  // error: {
-  //   main: '',
-  //   light: '',
-  //   dark: '',
-  //   contrastText: '',
-  // },
-  // warning: {
-  //   main: '',
-  //   light: '',
-  //   dark: '',
-  //   contrastText: '',
-  // },
-  // info: {
-  //   main: '',
-  //   light: '',
-  //   dark: '',
-  //   contrastText: '',
-  // },
-  success: {
-    main: '#6CDF39',
-    light: '#6CDF39',
-    // dark: '',
-    // contrastText: '',
-  },
-};
-
-export const materialTheme = createTheme({
-  palette,
-
-  components: {
-    MuiCssBaseline: {
-      styleOverrides: {
-        '@global': {
-          '@font-face': [],
-        },
-      },
-    },
-    MuiButton: {
-      styleOverrides: {
-        root: {
-          fontWeight: 'bold',
-          textTransform: 'none',
-
-          '&.rounded': {
-            // 'border-radius': '50px',
-          },
-
-          '&.tall': {
-            'height': '40px',
-          },
-        },
-      },
-    },
-
-    MuiCheckbox: {
-      styleOverrides: {
-        root: {
-          '& .MuiSvgIcon-root': {
-            width: '.75em',
-            height: '.75em',
-          },
-        },
-      },
-    },
-
-    MuiFormControlLabel: {
-      styleOverrides: {
-        label: {
-          fontSize: 12,
-          fontWeight: 'bold',
-          color: palette.primary.main,
-        },
-      },
-    },
-
-    MuiLink: {
-      styleOverrides: {
-        root: {
-          fontWeight: 'bold',
-        },
-      },
-    },
-
-    MuiList: {
-      styleOverrides: {
-        root: {
-          padding: '8px',
-
-          '&.MuiList-padding': {
-            paddingBottom: '4px',
-          },
-
-          '& .MuiButton-root': {
-            width: '100%',
-          },
-
-          '& > .MuiButtonBase-root': {
-            padding: '8px 16px',
-            marginBottom: '4px',
-            borderRadius: 0,
-            justifyContent: 'space-between',
-          },
-
-          '& .MuiButtonBase-root.Mui-selected, & .MuiButtonBase-root.Mui-selected:focus': {
-            background: 'none',
-            fontWeight: 'bold',
-          },
-
-          ['& .MuiButtonBase-root:hover, & .MuiButtonBase-root.Mui-selected:hover']: {
-            background: palette.primary.light
-          },
-        },
-      },
-    },
-
-    MuiListItem: {
-      styleOverrides: {
-        root: {
-        },
-      }
-    },
-
-    MuiInputBase: {
-      styleOverrides: {
-        formControl: {
-          '& .MuiSelect-root svg': {
-            display: 'none',
-          },
-        },
-      },
-    },
-
-    MuiOutlinedInput: {
-      styleOverrides: {
-        root: {
-          '&.Mui-focused .MuiOutlinedInput-notchedOutline': {
-            borderWidth: '1px',
-          },
-
-          '.rounded &': {
-            // 'border-radius': '50px',
-          },
-
-          '.tall &': {
-            height: '40px',
-          },
-        },
-      },
-    },
-  },
-
-  typography: {
-    fontSize: 12,
-    fontFamily: 'Open Sans, sans-serif',
-
-    h1: {
-      fontSize: 28,
-      fontWeight: 'bold',
-    },
-    h2: {
-      fontSize: 24,
-      fontWeight: 'bold',
-    },
-    // h3: {},
-    // h4: {},
-    // h5: {},
-    // h6: {},
-    subtitle1: {
-      fontSize: 14,
-      fontWeight: 'bold',
-      lineHeight: 1.4,
-      color: palette.grey[500],
-    },
-    subtitle2: {
-      lineHeight: 1.4,
-      color: palette.grey[500],
-    },
-    body1: {
-      fontSize: '.75rem',
-      lineHeight: 1.4,
-    },
-    // body2: {},
-    // button: {},
-    // caption: {},
-    // overline: {},
-  },
-
-  spacing: 8,
-
-  breakpoints: {
-    values: {
-      xs: 0,
-      sm: 640,
-      md: 768,
-      lg: 1024,
-      xl: 1280,
-    },
-  },
-});
diff --git a/webclient/src/react-app-env.d.ts b/webclient/src/react-app-env.d.ts
deleted file mode 100644
index 6431bc5fc..000000000
--- a/webclient/src/react-app-env.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference types="react-scripts" />
diff --git a/webclient/src/services/CardImporterService.ts b/webclient/src/services/CardImporterService.ts
deleted file mode 100644
index 691e86f0e..000000000
--- a/webclient/src/services/CardImporterService.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-// Fetch and parse card sets
-
-class CardImporterService {
-  importCards(url): Promise<any> {
-    const error = 'Card import must be in valid MTG JSON format';
-
-    return fetch(url)
-      .then(response => {
-        if (response.headers.get('Content-Type') !== 'application/json') {
-          throw new Error(error);
-        }
-
-        return response.json();
-      })
-      .then((json) => {
-        try {
-          const sortedSets = Object.keys(json.data)
-            .map(key => json.data[key])
-            .sort((a, b) => new Date(a.releaseDate).getTime() - new Date(b.releaseDate).getTime());
-
-          const sets = sortedSets.map(({ cards, tokens, ...set }) => ({
-            ...set,
-            cards: cards.map(({ name }) => name),
-            tokens: tokens.map(({ name }) => name),
-          }));
-
-          const unsortedCards = sortedSets.reduce((acc, set) => {
-            set.cards.forEach(card => acc[card.name] = card);
-            return acc;
-          }, {});
-
-          const cards = Object.keys(unsortedCards)
-            .sort((a, b) => a.localeCompare(b))
-            .map(key => unsortedCards[key]);
-
-          return { cards, sets };
-        } catch (e) {
-          throw new Error(error);
-        }
-      });
-  }
-
-  importTokens(url): Promise<any> {
-    const error = 'Token import must be in valid MTG XML format';
-
-    return fetch(url)
-      .then(response => {
-        if (!response.ok) {
-          throw new Error('Failed to fetch');
-        }
-
-        return response.text()
-      })
-      .then((xmlString) => {
-        try {
-          const parser = new DOMParser();
-          const dom = parser.parseFromString(xmlString, 'application/xml');
-
-          const tokens = Array.from(dom.querySelectorAll('card')).map(
-            (tokenElement) => this.parseXmlAttributes(tokenElement)
-          );
-
-          return tokens;
-        } catch (e) {
-          throw new Error(error);
-        }
-      })
-  }
-
-  private parseXmlAttributes(dom: Element) {
-    return Array.from(dom.children).reduce((attributes, child) => {
-      const value = child.children.length ? this.parseXmlAttributes(child) : child.innerHTML;
-
-      let parsedAttributes = { value };
-
-      if (child.attributes.length) {
-        const childAttributes = Array.from(child.attributes).reduce((acc, { name, value }) => {
-          acc[name] = value;
-          return acc;
-        }, {});
-
-        parsedAttributes = {
-          ...parsedAttributes,
-          ...childAttributes,
-        };
-      }
-
-      // @TODO: clean this up and normalize what i'm returning
-      if (attributes[child.tagName]) {
-        if (Array.isArray(attributes[child.tagName])) {
-          attributes[child.tagName].push(parsedAttributes)
-        } else {
-          attributes[child.tagName] = [parsedAttributes];
-        }
-      } else {
-        attributes[child.tagName] = parsedAttributes;
-      }
-
-      return attributes;
-    }, {});
-  }
-}
-
-export const cardImporterService = new CardImporterService();
diff --git a/webclient/src/services/ServerProps.ts b/webclient/src/services/ServerProps.ts
deleted file mode 100644
index 0d8c3d652..000000000
--- a/webclient/src/services/ServerProps.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import props from '../server-props.json';
-
-class ServerProps {
-  get REACT_APP_VERSION() {
-    return props?.REACT_APP_VERSION;
-  }
-}
-
-export const serverProps = new ServerProps();
diff --git a/webclient/src/services/dexie/DexieDTOs/CardDTO.ts b/webclient/src/services/dexie/DexieDTOs/CardDTO.ts
deleted file mode 100644
index a060aedb1..000000000
--- a/webclient/src/services/dexie/DexieDTOs/CardDTO.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Card } from 'types';
-
-import { dexieService } from '../DexieService';
-
-export class CardDTO extends Card {
-  save() {
-    return dexieService.cards.put(this);
-  }
-
-  static get(name) {
-    return dexieService.cards.where('name').equalsIgnoreCase(name).first();
-  }
-
-  static bulkAdd(cards: CardDTO[]): Promise<any> {
-    return dexieService.cards.bulkPut(cards);
-  }
-};
-
-dexieService.cards.mapToClass(CardDTO);
diff --git a/webclient/src/services/dexie/DexieDTOs/HostDTO.ts b/webclient/src/services/dexie/DexieDTOs/HostDTO.ts
deleted file mode 100644
index 17f600626..000000000
--- a/webclient/src/services/dexie/DexieDTOs/HostDTO.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { IndexableType } from 'dexie';
-import { Host } from 'types';
-
-import { dexieService } from '../DexieService';
-
-export class HostDTO extends Host {
-  save() {
-    return dexieService.hosts.put(this);
-  }
-
-  static add(host: Host): Promise<IndexableType> {
-    return dexieService.hosts.add(host);
-  }
-
-  static get(id: number): Promise<HostDTO> {
-    return dexieService.hosts.where('id').equals(id).first();
-  }
-
-  static getAll(): Promise<HostDTO[]> {
-    return dexieService.hosts.toArray();
-  }
-
-  static bulkAdd(hosts: Host[]): Promise<IndexableType> {
-    return dexieService.hosts.bulkAdd(hosts);
-  }
-
-  static delete(id: string): Promise<void> {
-    return dexieService.hosts.delete(id);
-  }
-};
-
-dexieService.hosts.mapToClass(HostDTO);
diff --git a/webclient/src/services/dexie/DexieDTOs/SetDTO.ts b/webclient/src/services/dexie/DexieDTOs/SetDTO.ts
deleted file mode 100644
index 6ae2dd20a..000000000
--- a/webclient/src/services/dexie/DexieDTOs/SetDTO.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Set } from 'types';
-
-import { dexieService } from '../DexieService';
-
-export class SetDTO extends Set {
-  save() {
-    return dexieService.sets.put(this);
-  }
-
-  static get(name) {
-    return dexieService.sets.where('name').equalsIgnoreCase(name).first();
-  }
-
-  static bulkAdd(sets: SetDTO[]): Promise<any> {
-    return dexieService.sets.bulkPut(sets);
-  }
-};
-
-dexieService.sets.mapToClass(SetDTO);
diff --git a/webclient/src/services/dexie/DexieDTOs/SettingDTO.ts b/webclient/src/services/dexie/DexieDTOs/SettingDTO.ts
deleted file mode 100644
index bbfa1680d..000000000
--- a/webclient/src/services/dexie/DexieDTOs/SettingDTO.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Setting } from 'types';
-
-import { dexieService } from '../DexieService';
-
-export class SettingDTO extends Setting {
-  constructor(user) {
-    super();
-
-    this.user = user;
-    this.autoConnect = false;
-  }
-
-  save() {
-    return dexieService.settings.put(this);
-  }
-
-  static get(user) {
-    return dexieService.settings.where('user').equalsIgnoreCase(user).first();
-  }
-};
-
-dexieService.settings.mapToClass(SettingDTO);
diff --git a/webclient/src/services/dexie/DexieDTOs/TokenDTO.ts b/webclient/src/services/dexie/DexieDTOs/TokenDTO.ts
deleted file mode 100644
index 35d537709..000000000
--- a/webclient/src/services/dexie/DexieDTOs/TokenDTO.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Token } from 'types';
-
-import { dexieService } from '../DexieService';
-
-export class TokenDTO extends Token {
-  save() {
-    return dexieService.tokens.put(this);
-  }
-
-  static get(name) {
-    return dexieService.tokens.where('name.value').equalsIgnoreCase(name).first();
-  }
-
-  static bulkAdd(tokens: TokenDTO[]): Promise<any> {
-    return dexieService.tokens.bulkPut(tokens);
-  }
-};
-
-dexieService.tokens.mapToClass(TokenDTO);
diff --git a/webclient/src/services/dexie/DexieDTOs/index.ts b/webclient/src/services/dexie/DexieDTOs/index.ts
deleted file mode 100644
index 9121f1f4b..000000000
--- a/webclient/src/services/dexie/DexieDTOs/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './CardDTO';
-export * from './SetDTO';
-export * from './SettingDTO';
-export * from './TokenDTO';
-export * from './HostDTO';
diff --git a/webclient/src/services/dexie/DexieSchemas/v1.schema.ts b/webclient/src/services/dexie/DexieSchemas/v1.schema.ts
deleted file mode 100644
index 18e7f35c4..000000000
--- a/webclient/src/services/dexie/DexieSchemas/v1.schema.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export enum Stores {
-  SETTINGS = 'settings',
-  CARDS = 'cards',
-  SETS = 'sets',
-  TOKENS = 'tokens',
-  HOSTS = 'hosts',
-}
-
-export const schemaV1 = (db) => {
-  db.version(1).stores({
-    [Stores.CARDS]: 'name',
-    [Stores.SETS]: 'code',
-    [Stores.SETTINGS]: 'user',
-    [Stores.TOKENS]: 'name.value',
-    [Stores.HOSTS]: '++id',
-  });
-}
diff --git a/webclient/src/services/dexie/DexieService.ts b/webclient/src/services/dexie/DexieService.ts
deleted file mode 100644
index 9dcd3b941..000000000
--- a/webclient/src/services/dexie/DexieService.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import Dexie from 'dexie';
-
-import { Stores, schemaV1 } from './DexieSchemas/v1.schema';
-
-class DexieService {
-  private db: Dexie = new Dexie('Webatrice');
-
-  constructor() {
-    schemaV1(this.db);
-  }
-
-  get settings() {
-    return this.db.table(Stores.SETTINGS);
-  }
-
-  get cards() {
-    return this.db.table(Stores.CARDS);
-  }
-
-  get sets() {
-    return this.db.table(Stores.SETS);
-  }
-
-  get tokens() {
-    return this.db.table(Stores.TOKENS);
-  }
-
-  get hosts() {
-    return this.db.table(Stores.HOSTS);
-  }
-
-  testConnection() {
-    return this.db.open();
-  }
-}
-
-export const dexieService = new DexieService();
diff --git a/webclient/src/services/dexie/index.ts b/webclient/src/services/dexie/index.ts
deleted file mode 100644
index 593f19397..000000000
--- a/webclient/src/services/dexie/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './DexieDTOs';
-export * from './DexieService';
diff --git a/webclient/src/services/index.ts b/webclient/src/services/index.ts
deleted file mode 100644
index ebebeb65e..000000000
--- a/webclient/src/services/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './CardImporterService';
-export * from './ServerProps';
-export * from './dexie';
diff --git a/webclient/src/setupTests.ts b/webclient/src/setupTests.ts
deleted file mode 100644
index c4e40e2ec..000000000
--- a/webclient/src/setupTests.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import protobuf from 'protobufjs';
-
-// ensure jest-dom is always available during testing to cut down on boilerplate
-import '@testing-library/jest-dom';
-
-class MockProtobufRoot {
-  load() {}
-}
-
-(protobuf as any).Root = MockProtobufRoot;
diff --git a/webclient/src/store/actions/actionReducer.ts b/webclient/src/store/actions/actionReducer.ts
deleted file mode 100644
index a01dba984..000000000
--- a/webclient/src/store/actions/actionReducer.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @author Luke Brandon Farrell
- * @description Application reducer.
- */
-
-import { AnyAction } from 'redux'
-
- interface InitialState {
-   type: string | null
-   payload: any
-   meta: any
-   error: boolean
-   count: number
- }
-
-/**
-  * Initial data.
-  */
-const initialState: InitialState = {
-  type: null,
-  payload: null,
-  meta: null,
-  error: false,
-  count: 0,
-}
-
-/**
-  * Calculates the application state.
-  *
-  * @param state
-  * @param action
-  * @return {*}
-  */
-export const actionReducer = (
-  state = initialState,
-  action: AnyAction,
-): InitialState => {
-  return {
-    ...state,
-    ...action,
-    count: state.count + 1,
-  }
-}
diff --git a/webclient/src/store/actions/index.ts b/webclient/src/store/actions/index.ts
deleted file mode 100644
index 4c5f9ef48..000000000
--- a/webclient/src/store/actions/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { actionReducer } from './actionReducer';
diff --git a/webclient/src/store/common/SortUtil.ts b/webclient/src/store/common/SortUtil.ts
deleted file mode 100644
index 56910259d..000000000
--- a/webclient/src/store/common/SortUtil.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import { SortBy, SortDirection, User } from 'types';
-
-export default class SortUtil {
-  static sortByField(arr: any[], sortBy: SortBy): void {
-    if (arr.length) {
-      const field = SortUtil.resolveFieldChain(arr[0], sortBy.field);
-      const fieldType = typeof field;
-
-      if (fieldType === 'string') {
-        SortUtil.sortByString(arr, sortBy);
-        return;
-      }
-
-      if (fieldType === 'number') {
-        SortUtil.sortByNumber(arr, sortBy);
-        return;
-      }
-
-      throw new Error('SortField must resolve to either a string or number');
-    }
-  }
-
-  static sortByFields(arr: any[], sorts: SortBy[]) {
-    if (arr.length) {
-      arr.sort((a, b) => {
-        for (let i = 0; i < sorts.length; i++) {
-          const sortBy = sorts[i];
-          const field = SortUtil.resolveFieldChain(arr[0], sortBy.field);
-
-          const fieldType = typeof field;
-
-          if (fieldType === 'string') {
-            const result = SortUtil.stringComparator(a, b, sortBy);
-
-            if (result) {
-              return result;
-            }
-          }
-
-          if (fieldType === 'number') {
-            const result = SortUtil.numberComparator(a, b, sortBy);
-
-            if (result) {
-              return result;
-            }
-          }
-
-          throw new Error('SortField must resolve to either a string or number');
-        }
-
-        return 0;
-      })
-    }
-  }
-
-  static sortUsersByField(users: User[], sortBy: SortBy) {
-    if (users.length) {
-      users.sort((a, b) => SortUtil.userComparator(a, b, sortBy))
-    }
-  }
-
-  static toggleSortBy(field: string, sortBy: SortBy) {
-    const sameField = field === sortBy.field;
-    const isASC = sortBy.order === SortDirection.ASC;
-
-    return {
-      field,
-      order: sameField && isASC ? SortDirection.DESC : SortDirection.ASC
-    }
-  }
-
-  private static sortByNumber(arr: any[], sortBy: SortBy): void {
-    arr.sort((a, b) => SortUtil.numberComparator(a, b, sortBy));
-  }
-
-  private static sortByString(arr: any[], sortBy: SortBy): void {
-    arr.sort((a, b) => SortUtil.stringComparator(a, b, sortBy));
-  }
-
-  private static userComparator(a, b, sortBy, sortByUserLevel = true) {
-    if (sortByUserLevel) {
-      const adminSortBy = {
-        field: 'userLevel',
-        order: SortDirection.DESC
-      };
-
-      const adminSorted = SortUtil.numberComparator(a, b, adminSortBy);
-
-      if (adminSorted) {
-        return adminSorted;
-      }
-    }
-
-    const sorted = SortUtil.stringComparator(a, b, sortBy);
-
-    if (sorted) {
-      return sorted;
-    }
-
-    return 0;
-  }
-
-  private static numberComparator(a, b, { field, order }: SortBy) {
-    const aResolved = SortUtil.resolveFieldChain(a, field);
-    const bResolved = SortUtil.resolveFieldChain(b, field);
-
-    if (order === SortDirection.ASC) {
-      return aResolved - bResolved;
-    } else {
-      return bResolved - aResolved;
-    }
-  }
-
-  private static stringComparator(a, b, { field, order }: SortBy) {
-    const aResolved = SortUtil.resolveFieldChain(a, field);
-    const bResolved = SortUtil.resolveFieldChain(b, field);
-
-    // Force empty strings to sort to bottom
-    if (!aResolved && !bResolved) {
-      return 0;
-    }
-    if (!aResolved) {
-      return 1;
-    }
-    if (!bResolved) {
-      return -1;
-    }
-
-    if (order === SortDirection.ASC) {
-      return aResolved.localeCompare(bResolved);
-    } else {
-      return bResolved.localeCompare(aResolved);
-    }
-  }
-
-  private static resolveFieldChain(obj: object, field: string) {
-    const links = field.split('.');
-
-    if (links.length > 1) {
-      return links.reduce((obj, link) => {
-        const parsed = parseInt(link, 10);
-
-        if (parsed.toLocaleString() === 'NaN') {
-          return obj[link];
-        } else {
-          return obj[parsed];
-        }
-      }, obj) || null;
-    } else {
-      return obj[field];
-    }
-  }
-}
diff --git a/webclient/src/store/common/index.ts b/webclient/src/store/common/index.ts
deleted file mode 100644
index 340676b6d..000000000
--- a/webclient/src/store/common/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as SortUtil } from './SortUtil';
diff --git a/webclient/src/store/index.ts b/webclient/src/store/index.ts
deleted file mode 100644
index b43f290c5..000000000
--- a/webclient/src/store/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export { store } from './store';
-
-// Common
-export { SortUtil } from './common';
-
-// Server
-
-export {
-  Types as ServerTypes,
-  Selectors as ServerSelectors,
-  Dispatch as ServerDispatch } from './server';
-
-export * from 'store/server/server.interfaces';
-
-export {
-  Types as RoomsTypes,
-  Selectors as RoomsSelectors,
-  Dispatch as RoomsDispatch } from 'store/rooms';
-
-export * from 'store/rooms/rooms.interfaces';
-
-
diff --git a/webclient/src/store/rooms/index.ts b/webclient/src/store/rooms/index.ts
deleted file mode 100644
index 3ebe3905a..000000000
--- a/webclient/src/store/rooms/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './rooms.actions';
-export * from './rooms.dispatch';
-export * from './rooms.reducer';
-export * from './rooms.selectors';
-export * from './rooms.types';
diff --git a/webclient/src/store/rooms/rooms.actions.tsx b/webclient/src/store/rooms/rooms.actions.tsx
deleted file mode 100644
index 98108fe8b..000000000
--- a/webclient/src/store/rooms/rooms.actions.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Types } from './rooms.types';
-
-export const Actions = {
-  clearStore: () => ({
-    type: Types.CLEAR_STORE
-  }),
-
-  updateRooms: rooms => ({
-    type: Types.UPDATE_ROOMS,
-    rooms
-  }),
-
-  joinRoom: roomInfo => ({
-    type: Types.JOIN_ROOM,
-    roomInfo
-  }),
-
-  leaveRoom: roomId => ({
-    type: Types.LEAVE_ROOM,
-    roomId
-  }),
-
-  addMessage: (roomId, message) => ({
-    type: Types.ADD_MESSAGE,
-    roomId,
-    message
-  }),
-
-  updateGames: (roomId, games) => ({
-    type: Types.UPDATE_GAMES,
-    roomId,
-    games
-  }),
-
-  userJoined: (roomId, user) => ({
-    type: Types.USER_JOINED,
-    roomId,
-    user
-  }),
-
-  userLeft: (roomId, name) => ({
-    type: Types.USER_LEFT,
-    roomId,
-    name
-  }),
-
-  sortGames: (roomId, field, order) => ({
-    type: Types.SORT_GAMES,
-    roomId,
-    field,
-    order
-  }),
-
-  removeMessages: (roomId, name, amount) => ({
-    type: Types.REMOVE_MESSAGES,
-    roomId,
-    name,
-    amount
-  }),
-
-  gameCreated: (roomId) => ({
-    type: Types.GAME_CREATED,
-    roomId
-  }),
-
-  joinedGame: (roomId, gameId) => ({
-    type: Types.JOINED_GAME,
-    roomId,
-    gameId
-  }),
-}
diff --git a/webclient/src/store/rooms/rooms.dispatch.tsx b/webclient/src/store/rooms/rooms.dispatch.tsx
deleted file mode 100644
index c89b5ebc4..000000000
--- a/webclient/src/store/rooms/rooms.dispatch.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { reset } from 'redux-form';
-import { Actions } from './rooms.actions';
-import { store } from 'store';
-
-export const Dispatch = {
-  clearStore: () => {
-    store.dispatch(Actions.clearStore());
-  },
-
-  updateRooms: rooms => {
-    store.dispatch(Actions.updateRooms(rooms));
-  },
-
-  joinRoom: roomInfo => {
-    store.dispatch(Actions.joinRoom(roomInfo));
-
-  },
-
-  leaveRoom: roomId => {
-    store.dispatch(Actions.leaveRoom(roomId));
-  },
-
-  addMessage: (roomId, message) => {
-    if (message.name) {
-      store.dispatch(reset('sayMessage'));
-    }
-
-    store.dispatch(Actions.addMessage(roomId, message));
-  },
-
-  updateGames: (roomId, games) => {
-    store.dispatch(Actions.updateGames(roomId, games));
-  },
-
-  userJoined: (roomId, user) => {
-    store.dispatch(Actions.userJoined(roomId, user));
-  },
-
-  userLeft: (roomId, name) => {
-    store.dispatch(Actions.userLeft(roomId, name));
-  },
-
-  sortGames: (roomId, field, order) => {
-    store.dispatch(Actions.sortGames(roomId, field, order));
-  },
-
-  removeMessages: (roomId, name, amount) => {
-    store.dispatch(Actions.removeMessages(roomId, name, amount));
-  },
-
-  gameCreated: (roomId) => {
-    store.dispatch(Actions.gameCreated(roomId));
-  },
-
-  joinedGame: (roomId, gameId) => {
-    store.dispatch(Actions.joinedGame(roomId, gameId));
-  }
-}
diff --git a/webclient/src/store/rooms/rooms.interfaces.tsx b/webclient/src/store/rooms/rooms.interfaces.tsx
deleted file mode 100644
index c7b90ac84..000000000
--- a/webclient/src/store/rooms/rooms.interfaces.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import { GameSortField, Room, Game, SortBy, UserSortField } from 'types';
-
-export interface RoomsState {
-  rooms: RoomsStateRooms;
-  games: RoomsStateGames;
-  joinedRoomIds: JoinedRooms;
-  joinedGameIds: JoinedGames;
-  messages: RoomsStateMessages;
-  sortGamesBy: RoomsStateSortGamesBy;
-  sortUsersBy: RoomsStateSortUsersBy;
-}
-
-export interface RoomsStateRooms {
-  [roomId: number]: Room;
-}
-
-export interface RoomsStateGames {
-  [roomId: number]: {
-    [gameId: number]: Game;
-  };
-}
-
-export interface JoinedRooms {
-  [roomId: number]: boolean;
-}
-
-export interface JoinedGames {
-  [roomId: number]: {
-    [gameId: number]: boolean;
-  };
-}
-
-export interface RoomsStateMessages {
-  [roomId: number]: Message[];
-}
-
-export interface RoomsStateSortGamesBy extends SortBy {
-  field: GameSortField
-}
-
-export interface RoomsStateSortUsersBy extends SortBy {
-  field: UserSortField
-}
-
-export interface Message {
-  message: string;
-  messageType: number;
-  timeReceived: number;
-  timeOf?: number;
-}
diff --git a/webclient/src/store/rooms/rooms.reducer.tsx b/webclient/src/store/rooms/rooms.reducer.tsx
deleted file mode 100644
index 5898c7150..000000000
--- a/webclient/src/store/rooms/rooms.reducer.tsx
+++ /dev/null
@@ -1,326 +0,0 @@
-import * as _ from 'lodash';
-
-import { GameSortField, UserSortField, SortDirection } from 'types';
-
-import { SortUtil } from '../common';
-
-import { RoomsState } from './rooms.interfaces'
-import { MAX_ROOM_MESSAGES, Types } from './rooms.types';
-
-const initialState: RoomsState = {
-  rooms: {},
-  games: {},
-  joinedRoomIds: {},
-  joinedGameIds: {},
-  messages: {},
-  sortGamesBy: {
-    field: GameSortField.START_TIME,
-    order: SortDirection.DESC
-  },
-  sortUsersBy: {
-    field: UserSortField.NAME,
-    order: SortDirection.ASC
-  }
-};
-
-export const roomsReducer = (state = initialState, action: any) => {
-  switch (action.type) {
-    case Types.CLEAR_STORE: {
-      return {
-        ...initialState
-      };
-    }
-
-    case Types.UPDATE_ROOMS: {
-      const rooms = {
-        ...state.rooms
-      };
-
-      // Server does not send everything on updates
-      _.each(action.rooms, (room, order) => {
-        const { roomId } = room;
-        const existing = rooms[roomId] || {};
-
-        const update = { ...room };
-        delete update.gameList;
-        delete update.gametypeList;
-        delete update.userList;
-
-        rooms[roomId] = {
-          ...existing,
-          ...update,
-          order
-        };
-      });
-
-      return { ...state, rooms };
-    }
-
-    case Types.JOIN_ROOM: {
-      const { roomInfo } = action;
-      const { joinedRoomIds, rooms, sortGamesBy, sortUsersBy } = state;
-
-      const { roomId } = roomInfo;
-
-      const gameList = [
-        ...roomInfo.gameList
-      ];
-
-      const userList = [
-        ...roomInfo.userList
-      ];
-
-      SortUtil.sortByField(gameList, sortGamesBy);
-      SortUtil.sortUsersByField(userList, sortUsersBy);
-
-      return {
-        ...state,
-
-        rooms: {
-          ...rooms,
-          [roomId]: {
-            ...roomInfo,
-            gameList,
-            userList
-          }
-        },
-
-        joinedRoomIds: {
-          ...joinedRoomIds,
-          [roomId]: true
-        },
-      }
-    }
-
-    case Types.LEAVE_ROOM: {
-      const { roomId } = action;
-      const { joinedRoomIds, messages } = state;
-
-      const _joined = {
-        ...joinedRoomIds
-      };
-
-      const _messages = {
-        ...messages
-      };
-
-      delete _joined[roomId];
-      delete _messages[roomId];
-
-      return {
-        ...state,
-
-        joinedRoomIds: _joined,
-        messages: _messages,
-      }
-    }
-
-    case Types.ADD_MESSAGE: {
-      const { roomId, message } = action;
-      const { messages } = state;
-
-      let roomMessages = [...(messages[roomId] || [])];
-
-      if (roomMessages.length === MAX_ROOM_MESSAGES) {
-        roomMessages.shift();
-      }
-
-      message.timeReceived = new Date().getTime();
-      roomMessages.push(message);
-
-      return {
-        ...state,
-        messages: {
-          ...messages,
-
-          [roomId]: [
-            ...roomMessages
-          ]
-        }
-      }
-    }
-    // @TODO improve this reducer, likely by improving the store model
-
-    case Types.UPDATE_GAMES: {
-      const { roomId, games } = action;
-      const { rooms, sortGamesBy } = state;
-      const room = rooms[roomId];
-
-      if (!room) {
-        return { ...state };
-      }
-
-      // Create map of games with update objects
-      const toUpdate = games.reduce((map, game) => {
-        map[game.gameId] = game;
-        return map;
-      }, {});
-
-      const gameUpdates = room.gameList
-      // filter out closed games and remove from update map
-        .filter(game => {
-          const gameUpdate = toUpdate[game.gameId];
-          const closedGame = gameUpdate && gameUpdate.closed;
-
-          if (closedGame) {
-            delete toUpdate[game.gameId];
-          }
-
-          return !closedGame;
-        })
-        .map(game => {
-          const gameUpdate = toUpdate[game.gameId];
-
-          if (gameUpdate) {
-            delete toUpdate[game.gameId];
-
-            return {
-              ...game,
-              ...gameUpdate
-            };
-          }
-
-          return game;
-        });
-
-      // Push new games to end of list
-      if (_.size(toUpdate)) {
-        _.each(toUpdate, game => gameUpdates.push(game));
-      }
-
-      const gameList = [...gameUpdates];
-
-      SortUtil.sortByField(gameList, sortGamesBy);
-
-      return {
-        ...state,
-        rooms: {
-          ...rooms,
-          [roomId]: {
-            ...room,
-            gameList
-          }
-        }
-      }
-    }
-
-    case Types.USER_JOINED: {
-      const { roomId, user } = action;
-      const { rooms, sortUsersBy } = state;
-
-      const room = { ...rooms[roomId] };
-
-      const userList = [
-        ...room.userList,
-        user
-      ];
-
-      SortUtil.sortUsersByField(userList, sortUsersBy);
-
-      return {
-        ...state,
-        rooms: {
-          ...rooms,
-          [roomId]: {
-            ...room,
-            userList
-          }
-        }
-      };
-    }
-
-    case Types.USER_LEFT: {
-      const { roomId, name } = action;
-      const { rooms } = state;
-
-      const room = { ...rooms[roomId] };
-      const userList = room.userList.filter(user => user.name !== name);
-
-      return {
-        ...state,
-        rooms: {
-          ...rooms,
-          [roomId]: {
-            ...room,
-            userList
-          }
-        }
-      };
-    }
-
-    case Types.SORT_GAMES: {
-      const { field, order, roomId } = action;
-      const { rooms } = state;
-
-      const gameList = [...rooms[roomId].gameList];
-
-      const sortGamesBy = {
-        field, order
-      };
-
-      SortUtil.sortByField(gameList, sortGamesBy);
-
-      return {
-        ...state,
-
-        rooms: {
-          ...rooms,
-          [roomId]: {
-            ...rooms[roomId],
-            gameList
-          }
-        },
-
-        sortGamesBy
-      }
-    }
-
-    case Types.REMOVE_MESSAGES: {
-      const { name, amount, roomId } = action;
-      const { messages } = state;
-      let amountRemoved = 0;
-
-      return {
-        ...state,
-        messages: {
-          ...messages,
-          [roomId]: messages[roomId]
-            .reverse()
-            .filter(({ message }) => {
-              if (amount === amountRemoved) {
-                return true;
-              }
-
-              const keep = message.indexOf(`${name}:`) !== 0;
-
-              if (!keep) {
-                amountRemoved++;
-              }
-
-              return keep;
-            })
-            .reverse()
-        }
-      }
-    }
-
-    case Types.JOINED_GAME: {
-      const { gameId, roomId } = action;
-      const { joinedGameIds } = state;
-
-      return {
-        ...state,
-        joinedGameIds: {
-          ...joinedGameIds,
-          [roomId]: {
-            ...joinedGameIds[roomId],
-            [gameId]: true,
-          }
-        }
-      }
-    }
-
-    default:
-      return state;
-  }
-}
diff --git a/webclient/src/store/rooms/rooms.selectors.tsx b/webclient/src/store/rooms/rooms.selectors.tsx
deleted file mode 100644
index e1e7ec818..000000000
--- a/webclient/src/store/rooms/rooms.selectors.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import * as _ from 'lodash';
-import { RoomsState } from './rooms.interfaces';
-
-interface State {
-  rooms: RoomsState
-}
-
-export const Selectors = {
-  getRooms: ({ rooms }: State) => rooms.rooms,
-  getGames: ({ rooms }: State) => rooms.games,
-  getRoom: ({ rooms }: State, id: number) =>
-    _.find(rooms.rooms, ({ roomId }) => roomId === id),
-  getJoinedRoomIds: ({ rooms }: State) => rooms.joinedRoomIds,
-  getJoinedGameIds: ({ rooms }: State) => rooms.joinedGameIds,
-  getMessages: ({ rooms }: State) => rooms.messages,
-  getSortGamesBy: ({ rooms: { sortGamesBy } }: State) => sortGamesBy,
-  getSortUsersBy: ({ rooms: { sortUsersBy } }: State) => sortUsersBy,
-
-  getJoinedRooms: (state: State) => {
-    const joined = Selectors.getJoinedRoomIds(state);
-    return _.filter(Selectors.getRooms(state), room => joined[room.roomId]);
-  },
-
-  getJoinedGames: (state: State, roomId: number) => {
-    const joined = Selectors.getJoinedGameIds(state)[roomId];
-    return _.filter(Selectors.getGames(state)[roomId], game => joined[game.gameId]);
-  },
-
-  getRoomMessages: (state: State, roomId: number) => Selectors.getMessages(state)[roomId],
-  getRoomGames: (state: State, roomId: number) => Selectors.getRooms(state)[roomId].gameList,
-  getRoomUsers: (state: State, roomId: number) => Selectors.getRooms(state)[roomId].userList
-
-}
-
diff --git a/webclient/src/store/rooms/rooms.types.tsx b/webclient/src/store/rooms/rooms.types.tsx
deleted file mode 100644
index 0b07eadd1..000000000
--- a/webclient/src/store/rooms/rooms.types.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-export const Types = {
-  CLEAR_STORE: '[Rooms] Clear Store',
-  UPDATE_ROOMS: '[Rooms] Update Rooms',
-  JOIN_ROOM: '[Rooms] Join Room',
-  LEAVE_ROOM: '[Rooms] Leave Room',
-  ADD_MESSAGE: '[Rooms] Add Message',
-  UPDATE_GAMES: '[Rooms] Update Games',
-  USER_JOINED: '[Rooms] User Joined',
-  USER_LEFT: '[Rooms] User Left',
-  SORT_GAMES: '[Rooms] Sort Games',
-  REMOVE_MESSAGES: '[Rooms] Remove Messages',
-  GAME_CREATED: '[Rooms] Game Created',
-  JOINED_GAME: '[Rooms] Joined Game',
-};
-
-export const MAX_ROOM_MESSAGES = 1000;
diff --git a/webclient/src/store/rootReducer.ts b/webclient/src/store/rootReducer.ts
deleted file mode 100644
index 0f39d7e37..000000000
--- a/webclient/src/store/rootReducer.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { combineReducers } from 'redux';
-
-import { roomsReducer } from './rooms';
-import { serverReducer } from './server';
-import { reducer as formReducer } from 'redux-form'
-import { actionReducer } from './actions'
-
-export default combineReducers({
-  rooms: roomsReducer,
-  server: serverReducer,
-
-  form: formReducer,
-  action: actionReducer
-});
diff --git a/webclient/src/store/server/index.ts b/webclient/src/store/server/index.ts
deleted file mode 100644
index f2a9c5dca..000000000
--- a/webclient/src/store/server/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export { Actions } from './server.actions';
-export { Dispatch } from './server.dispatch';
-export * from './server.reducer';
-export { Selectors } from './server.selectors';
-export * from './server.types';
diff --git a/webclient/src/store/server/server.actions.ts b/webclient/src/store/server/server.actions.ts
deleted file mode 100644
index ed1f06977..000000000
--- a/webclient/src/store/server/server.actions.ts
+++ /dev/null
@@ -1,213 +0,0 @@
-import { WebSocketConnectOptions } from 'types';
-import { Types } from './server.types';
-
-export const Actions = {
-  initialized: () => ({
-    type: Types.INITIALIZED
-  }),
-  clearStore: () => ({
-    type: Types.CLEAR_STORE
-  }),
-  loginSuccessful: (options: WebSocketConnectOptions) => ({
-    type: Types.LOGIN_SUCCESSFUL,
-    options
-  }),
-  loginFailed: () => ({
-    type: Types.LOGIN_FAILED,
-  }),
-  connectionClosed: reason => ({
-    type: Types.CONNECTION_CLOSED,
-    reason
-  }),
-  connectionFailed: () => ({
-    type: Types.CONNECTION_FAILED,
-  }),
-  testConnectionSuccessful: () => ({
-    type: Types.TEST_CONNECTION_SUCCESSFUL,
-  }),
-  testConnectionFailed: () => ({
-    type: Types.TEST_CONNECTION_FAILED,
-  }),
-  serverMessage: message => ({
-    type: Types.SERVER_MESSAGE,
-    message
-  }),
-  updateBuddyList: buddyList => ({
-    type: Types.UPDATE_BUDDY_LIST,
-    buddyList
-  }),
-  addToBuddyList: user => ({
-    type: Types.ADD_TO_BUDDY_LIST,
-    user
-  }),
-  removeFromBuddyList: userName => ({
-    type: Types.REMOVE_FROM_BUDDY_LIST,
-    userName
-  }),
-  updateIgnoreList: ignoreList => ({
-    type: Types.UPDATE_IGNORE_LIST,
-    ignoreList
-  }),
-  addToIgnoreList: user => ({
-    type: Types.ADD_TO_IGNORE_LIST,
-    user
-  }),
-  removeFromIgnoreList: userName => ({
-    type: Types.REMOVE_FROM_IGNORE_LIST,
-    userName
-  }),
-  updateInfo: info => ({
-    type: Types.UPDATE_INFO,
-    info
-  }),
-  updateStatus: status => ({
-    type: Types.UPDATE_STATUS,
-    status
-  }),
-  updateUser: user => ({
-    type: Types.UPDATE_USER,
-    user
-  }),
-  updateUsers: users => ({
-    type: Types.UPDATE_USERS,
-    users
-  }),
-  userJoined: user => ({
-    type: Types.USER_JOINED,
-    user
-  }),
-  userLeft: name => ({
-    type: Types.USER_LEFT,
-    name
-  }),
-  viewLogs: logs => ({
-    type: Types.VIEW_LOGS,
-    logs
-  }),
-  clearLogs: () => ({
-    type: Types.CLEAR_LOGS,
-  }),
-  registrationRequiresEmail: () => ({
-    type: Types.REGISTRATION_REQUIRES_EMAIL,
-  }),
-  registrationSuccess: () => ({
-    type: Types.REGISTRATION_SUCCES,
-  }),
-  registrationFailed: (error) => ({
-    type: Types.REGISTRATION_FAILED,
-    error
-  }),
-  registrationEmailError: (error) => ({
-    type: Types.REGISTRATION_EMAIL_ERROR,
-    error
-  }),
-  registrationPasswordError: (error) => ({
-    type: Types.REGISTRATION_PASSWORD_ERROR,
-    error
-  }),
-  registrationUserNameError: (error) => ({
-    type: Types.REGISTRATION_USERNAME_ERROR,
-    error
-  }),
-  accountAwaitingActivation: (options: WebSocketConnectOptions) => ({
-    type: Types.ACCOUNT_AWAITING_ACTIVATION,
-    options
-  }),
-  accountActivationSuccess: () => ({
-    type: Types.ACCOUNT_ACTIVATION_SUCCESS,
-  }),
-  accountActivationFailed: () => ({
-    type: Types.ACCOUNT_ACTIVATION_FAILED,
-  }),
-  resetPassword: () => ({
-    type: Types.RESET_PASSWORD_REQUESTED,
-  }),
-  resetPasswordFailed: () => ({
-    type: Types.RESET_PASSWORD_FAILED,
-  }),
-  resetPasswordChallenge: () => ({
-    type: Types.RESET_PASSWORD_CHALLENGE,
-  }),
-  resetPasswordSuccess: () => ({
-    type: Types.RESET_PASSWORD_SUCCESS,
-  }),
-  adjustMod: (userName, shouldBeMod, shouldBeJudge) => ({
-    type: Types.ADJUST_MOD,
-    userName,
-    shouldBeMod,
-    shouldBeJudge,
-  }),
-  reloadConfig: () => ({
-    type: Types.RELOAD_CONFIG,
-  }),
-  shutdownServer: () => ({
-    type: Types.SHUTDOWN_SERVER,
-  }),
-  updateServerMessage: () => ({
-    type: Types.UPDATE_SERVER_MESSAGE,
-  }),
-  accountPasswordChange: () => ({
-    type: Types.ACCOUNT_PASSWORD_CHANGE,
-  }),
-  accountEditChanged: (user) => ({
-    type: Types.ACCOUNT_EDIT_CHANGED,
-    user,
-  }),
-  accountImageChanged: (user) => ({
-    type: Types.ACCOUNT_IMAGE_CHANGED,
-    user,
-  }),
-  directMessageSent: (userName, message) => ({
-    type: Types.DIRECT_MESSAGE_SENT,
-    userName,
-    message,
-  }),
-  getUserInfo: (userInfo) => ({
-    type: Types.GET_USER_INFO,
-    userInfo,
-  }),
-  notifyUser: (notification) => ({
-    type: Types.NOTIFY_USER,
-    notification,
-  }),
-  serverShutdown: (data) => ({
-    type: Types.SERVER_SHUTDOWN,
-    data,
-  }),
-  userMessage: (messageData) => ({
-    type: Types.USER_MESSAGE,
-    messageData,
-  }),
-  addToList: (list, userName) => ({
-    type: Types.ADD_TO_LIST,
-    list,
-    userName,
-  }),
-  removeFromList: (list, userName) => ({
-    type: Types.REMOVE_FROM_LIST,
-    list,
-    userName,
-  }),
-  banFromServer: (userName) => ({
-    type: Types.BAN_FROM_SERVER,
-    userName,
-  }),
-  banHistory: (userName, banHistory) => ({
-    type: Types.BAN_HISTORY,
-    userName,
-    banHistory,
-  }),
-  warnHistory: (userName, warnHistory) => ({
-    type: Types.WARN_HISTORY,
-    userName,
-    warnHistory,
-  }),
-  warnListOptions: (warnList) => ({
-    type: Types.WARN_LIST_OPTIONS,
-    warnList,
-  }),
-  warnUser: (userName) => ({
-    type: Types.WARN_USER,
-    userName,
-  }),
-}
diff --git a/webclient/src/store/server/server.dispatch.ts b/webclient/src/store/server/server.dispatch.ts
deleted file mode 100644
index 3a958043a..000000000
--- a/webclient/src/store/server/server.dispatch.ts
+++ /dev/null
@@ -1,180 +0,0 @@
-import { reset } from 'redux-form';
-import { Actions } from './server.actions';
-import { store } from 'store';
-import { WebSocketConnectOptions } from 'types';
-
-export const Dispatch = {
-  initialized: () => {
-    store.dispatch(Actions.initialized());
-  },
-  clearStore: () => {
-    store.dispatch(Actions.clearStore());
-  },
-  loginSuccessful: options => {
-    store.dispatch(Actions.loginSuccessful(options));
-  },
-  loginFailed: () => {
-    store.dispatch(Actions.loginFailed());
-  },
-  connectionClosed: reason => {
-    store.dispatch(Actions.connectionClosed(reason));
-  },
-  connectionFailed: () => {
-    store.dispatch(Actions.connectionFailed());
-  },
-  testConnectionSuccessful: () => {
-    store.dispatch(Actions.testConnectionSuccessful());
-  },
-  testConnectionFailed: () => {
-    store.dispatch(Actions.testConnectionFailed());
-  },
-  updateBuddyList: buddyList => {
-    store.dispatch(Actions.updateBuddyList(buddyList));
-  },
-  addToBuddyList: user => {
-    store.dispatch(reset('addToBuddies'));
-    store.dispatch(Actions.addToBuddyList(user));
-  },
-  removeFromBuddyList: userName => {
-    store.dispatch(Actions.removeFromBuddyList(userName));
-  },
-  updateIgnoreList: ignoreList => {
-    store.dispatch(Actions.updateIgnoreList(ignoreList));
-  },
-  addToIgnoreList: user => {
-    store.dispatch(reset('addToIgnore'));
-    store.dispatch(Actions.addToIgnoreList(user));
-  },
-  removeFromIgnoreList: userName => {
-    store.dispatch(Actions.removeFromIgnoreList(userName));
-  },
-  updateInfo: (name, version) => {
-    store.dispatch(Actions.updateInfo({
-      name,
-      version
-    }));
-  },
-  updateStatus: (state, description) => {
-    store.dispatch(Actions.updateStatus({
-      state,
-      description
-    }));
-  },
-  updateUser: user => {
-    store.dispatch(Actions.updateUser(user));
-  },
-  updateUsers: users => {
-    store.dispatch(Actions.updateUsers(users));
-  },
-  userJoined: user => {
-    store.dispatch(Actions.userJoined(user));
-  },
-  userLeft: name => {
-    store.dispatch(Actions.userLeft(name));
-  },
-  viewLogs: name => {
-    store.dispatch(Actions.viewLogs(name));
-  },
-  clearLogs: () => {
-    store.dispatch(Actions.clearLogs());
-  },
-  serverMessage: message => {
-    store.dispatch(Actions.serverMessage(message));
-  },
-  registrationRequiresEmail: () => {
-    store.dispatch(Actions.registrationRequiresEmail());
-  },
-  registrationSuccess: () => {
-    store.dispatch(Actions.registrationSuccess())
-  },
-  registrationFailed: (error) => {
-    store.dispatch(Actions.registrationFailed(error));
-  },
-  registrationEmailError: (error) => {
-    store.dispatch(Actions.registrationEmailError(error));
-  },
-  registrationPasswordError: (error) => {
-    store.dispatch(Actions.registrationPasswordError(error));
-  },
-  registrationUserNameError: (error) => {
-    store.dispatch(Actions.registrationUserNameError(error));
-  },
-  accountAwaitingActivation: (options: WebSocketConnectOptions) => {
-    store.dispatch(Actions.accountAwaitingActivation(options));
-  },
-  accountActivationSuccess: () => {
-    store.dispatch(Actions.accountActivationSuccess());
-  },
-  accountActivationFailed: () => {
-    store.dispatch(Actions.accountActivationFailed());
-  },
-  resetPassword: () => {
-    store.dispatch(Actions.resetPassword());
-  },
-  resetPasswordFailed: () => {
-    store.dispatch(Actions.resetPasswordFailed());
-  },
-  resetPasswordChallenge: () => {
-    store.dispatch(Actions.resetPasswordChallenge());
-  },
-  resetPasswordSuccess: () => {
-    store.dispatch(Actions.resetPasswordSuccess());
-  },
-  adjustMod: (userName, shouldBeMod, shouldBeJudge) => {
-    store.dispatch(Actions.adjustMod(userName, shouldBeMod, shouldBeJudge));
-  },
-  reloadConfig: () => {
-    store.dispatch(Actions.reloadConfig());
-  },
-  shutdownServer: () => {
-    store.dispatch(Actions.shutdownServer());
-  },
-  updateServerMessage: () => {
-    store.dispatch(Actions.updateServerMessage());
-  },
-  accountPasswordChange: () => {
-    store.dispatch(Actions.accountPasswordChange());
-  },
-  accountEditChanged: (user) => {
-    store.dispatch(Actions.accountEditChanged(user));
-  },
-  accountImageChanged: (user) => {
-    store.dispatch(Actions.accountImageChanged(user));
-  },
-  directMessageSent: (userName, message) => {
-    store.dispatch(Actions.directMessageSent(userName, message));
-  },
-  getUserInfo: (userInfo) => {
-    store.dispatch(Actions.getUserInfo(userInfo));
-  },
-  notifyUser: (notification) => {
-    store.dispatch(Actions.notifyUser(notification))
-  },
-  serverShutdown: (data) => {
-    store.dispatch(Actions.serverShutdown(data))
-  },
-  userMessage: (messageData) => {
-    store.dispatch(Actions.userMessage(messageData))
-  },
-  addToList: (list, userName) => {
-    store.dispatch(Actions.addToList(list, userName))
-  },
-  removeFromList: (list, userName) => {
-    store.dispatch(Actions.removeFromList(list, userName))
-  },
-  banFromServer: (userName) => {
-    store.dispatch(Actions.banFromServer(userName));
-  },
-  banHistory: (userName, banHistory) => {
-    store.dispatch(Actions.banHistory(userName, banHistory))
-  },
-  warnHistory: (userName, warnHistory) => {
-    store.dispatch(Actions.warnHistory(userName, warnHistory))
-  },
-  warnListOptions: (warnList) => {
-    store.dispatch(Actions.warnListOptions(warnList))
-  },
-  warnUser: (userName) => {
-    store.dispatch(Actions.warnUser(userName))
-  },
-}
diff --git a/webclient/src/store/server/server.interfaces.ts b/webclient/src/store/server/server.interfaces.ts
deleted file mode 100644
index 499197852..000000000
--- a/webclient/src/store/server/server.interfaces.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { WarnHistoryItem, BanHistoryItem, LogItem, SortBy, User, UserSortField, WebSocketConnectOptions, WarnListItem } from 'types';
-import { NotifyUserData, ServerShutdownData, UserMessageData } from 'websocket/events/session/interfaces';
-
-export interface ServerConnectParams {
-  host: string;
-  port: string;
-  userName: string;
-  password: string;
-}
-
-export interface ServerRegisterParams {
-  host: string;
-  port: string;
-  userName: string;
-  password: string;
-  email: string;
-  country: string;
-  realName: string;
-}
-
-export interface RequestPasswordSaltParams {
-  userName: string;
-}
-
-export interface ForgotPasswordParams {
-  userName: string;
-}
-
-export interface ForgotPasswordChallengeParams extends ForgotPasswordParams {
-  email: string;
-}
-
-export interface ForgotPasswordResetParams extends ForgotPasswordParams {
-  token: string;
-  newPassword: string;
-}
-
-export interface AccountActivationParams extends ServerRegisterParams {
-  token: string;
-}
-
-export interface ServerState {
-  initialized: boolean;
-  buddyList: User[];
-  ignoreList: User[];
-  info: ServerStateInfo;
-  status: ServerStateStatus;
-  logs: ServerStateLogs;
-  user: User;
-  users: User[];
-  sortUsersBy: ServerStateSortUsersBy;
-  connectOptions: WebSocketConnectOptions;
-  messages: {
-    [userName: string]: UserMessageData[];
-  }
-  userInfo: {
-    [userName: string]: User;
-  }
-  notifications: NotifyUserData[];
-  serverShutdown: ServerShutdownData;
-  banUser: string;
-  banHistory: {
-    [userName: string]: BanHistoryItem[];
-  };
-  warnHistory: {
-    [userName: string]: WarnHistoryItem[];
-  };
-  warnListOptions: WarnListItem[];
-  warnUser: string;
-}
-
-export interface ServerStateStatus {
-  description: string;
-  state: number;
-}
-
-export interface ServerStateInfo {
-  message: string;
-  name: string;
-  version: string;
-}
-
-export interface ServerStateLogs {
-  room: LogItem[];
-  game: LogItem[];
-  chat: LogItem[];
-}
-
-export interface ServerStateSortUsersBy extends SortBy {
-  field: UserSortField
-}
diff --git a/webclient/src/store/server/server.reducer.ts b/webclient/src/store/server/server.reducer.ts
deleted file mode 100644
index 46daa4007..000000000
--- a/webclient/src/store/server/server.reducer.ts
+++ /dev/null
@@ -1,352 +0,0 @@
-import { SortDirection, StatusEnum, UserLevelFlag, UserSortField } from 'types';
-
-import { SortUtil } from '../common';
-
-import { ServerState } from './server.interfaces'
-import { Types } from './server.types';
-
-const initialState: ServerState = {
-  initialized: false,
-  buddyList: [],
-  ignoreList: [],
-
-  status: {
-    state: StatusEnum.DISCONNECTED,
-    description: null
-  },
-  info: {
-    message: null,
-    name: null,
-    version: null
-  },
-  logs: {
-    room: [],
-    game: [],
-    chat: []
-  },
-  user: null,
-  users: [],
-  sortUsersBy: {
-    field: UserSortField.NAME,
-    order: SortDirection.ASC
-  },
-  connectOptions: {},
-  messages: {},
-  userInfo: {},
-  notifications: [],
-  serverShutdown: null,
-  banUser: '',
-  banHistory: {},
-  warnHistory: {},
-  warnListOptions: [],
-  warnUser: '',
-};
-
-export const serverReducer = (state = initialState, action: any) => {
-  switch (action.type) {
-    case Types.INITIALIZED: {
-      return {
-        ...initialState,
-        initialized: true
-      }
-    }
-    case Types.ACCOUNT_AWAITING_ACTIVATION: {
-      return {
-        ...state,
-        connectOptions: {
-          ...action.options
-        }
-      }
-    }
-    case Types.ACCOUNT_ACTIVATION_FAILED:
-    case Types.ACCOUNT_ACTIVATION_SUCCESS: {
-      return {
-        ...state,
-        connectOptions: {}
-      }
-    }
-    case Types.CLEAR_STORE: {
-      return {
-        ...initialState,
-        status: {
-          ...state.status
-        }
-      }
-    }
-    case Types.SERVER_MESSAGE: {
-      const { message } = action;
-      const { info } = state;
-
-      return {
-        ...state,
-        info: { ...info, message }
-      }
-    }
-    case Types.UPDATE_BUDDY_LIST: {
-      const { buddyList } = action;
-      const { sortUsersBy } = state;
-
-      SortUtil.sortUsersByField(buddyList, sortUsersBy);
-
-      return {
-        ...state,
-        buddyList: [
-          ...buddyList
-        ]
-      };
-    }
-    case Types.ADD_TO_BUDDY_LIST: {
-      const { user } = action;
-      const { sortUsersBy } = state;
-
-      const buddyList = [...state.buddyList];
-
-      buddyList.push(user);
-      SortUtil.sortUsersByField(buddyList, sortUsersBy);
-
-      return {
-        ...state,
-        buddyList
-      };
-    }
-    case Types.REMOVE_FROM_BUDDY_LIST: {
-      const { userName } = action;
-      const buddyList = state.buddyList.filter(user => user.name !== userName);
-
-      return {
-        ...state,
-        buddyList
-      };
-    }
-    case Types.UPDATE_IGNORE_LIST: {
-      const { ignoreList } = action;
-      const { sortUsersBy } = state;
-
-      SortUtil.sortUsersByField(ignoreList, sortUsersBy);
-
-      return {
-        ...state,
-        ignoreList: [
-          ...ignoreList
-        ]
-      };
-    }
-    case Types.ADD_TO_IGNORE_LIST: {
-      const { user } = action;
-      const { sortUsersBy } = state;
-
-      const ignoreList = [...state.ignoreList];
-
-      ignoreList.push(user);
-      SortUtil.sortUsersByField(ignoreList, sortUsersBy);
-
-      return {
-        ...state,
-        ignoreList
-      };
-    }
-    case Types.REMOVE_FROM_IGNORE_LIST: {
-      const { userName } = action;
-      const ignoreList = state.ignoreList.filter(user => user.name !== userName);
-
-      return {
-        ...state,
-        ignoreList
-      };
-    }
-    case Types.UPDATE_INFO: {
-      const { name, version } = action.info;
-      const { info } = state;
-
-      return {
-        ...state,
-        info: { ...info, name, version }
-      }
-    }
-    case Types.UPDATE_STATUS: {
-      const { status } = action;
-
-      return {
-        ...state,
-        status: { ...status }
-      }
-    }
-    case Types.UPDATE_USER:
-    case Types.ACCOUNT_EDIT_CHANGED:
-    case Types.ACCOUNT_IMAGE_CHANGED: {
-      const { user } = action;
-
-      return {
-        ...state,
-        user: {
-          ...state.user,
-          ...user
-        }
-      }
-    }
-    case Types.UPDATE_USERS: {
-      const users = [...action.users];
-      const { sortUsersBy } = state;
-
-
-      SortUtil.sortUsersByField(users, sortUsersBy);
-
-      return {
-        ...state,
-        users
-      };
-    }
-    case Types.USER_JOINED: {
-      const { sortUsersBy } = state;
-
-      const users = [
-        ...state.users,
-        { ...action.user }
-      ];
-
-      SortUtil.sortUsersByField(users, sortUsersBy);
-
-      return {
-        ...state,
-        users
-      };
-    }
-    case Types.USER_LEFT: {
-      const { name } = action;
-      const users = state.users.filter(user => user.name !== name);
-
-      return {
-        ...state,
-        users
-      };
-    }
-    case Types.VIEW_LOGS: {
-      const { logs } = action;
-
-      return {
-        ...state,
-        logs: {
-          ...logs
-        }
-      };
-    }
-    case Types.CLEAR_LOGS: {
-      return {
-        ...state,
-        logs: {
-          ...initialState.logs
-        }
-      }
-    }
-    case Types.USER_MESSAGE: {
-      const { senderName, receiverName } = action.messageData;
-      const userName = state.user.name === senderName ? receiverName : senderName;
-
-      return {
-        ...state,
-        messages: {
-          ...state.messages,
-          [userName]: [
-            ...state.messages[userName],
-            action.messageData,
-          ],
-        }
-      };
-    }
-    case Types.GET_USER_INFO: {
-      const { userInfo } = action;
-
-      return {
-        ...state,
-        userInfo: {
-          ...state.userInfo,
-          [userInfo.name]: userInfo,
-        }
-      };
-    }
-    case Types.NOTIFY_USER: {
-      const { notification } = action;
-
-      return {
-        ...state,
-        notifications: [
-          ...state.notifications,
-          notification
-        ]
-      };
-    }
-    case Types.SERVER_SHUTDOWN: {
-      const { data } = action;
-
-      return {
-        ...state,
-        serverShutdown: data,
-      };
-    }
-    case Types.BAN_FROM_SERVER: {
-      const { userName } = action;
-
-      return {
-        ...state,
-        banUser: userName,
-      };
-    }
-    case Types.BAN_HISTORY: {
-      const { userName, banHistory } = action;
-
-      return {
-        ...state,
-        banHistory: {
-          ...state.banHistory,
-          [userName]: banHistory,
-        }
-      };
-    }
-    case Types.WARN_HISTORY: {
-      const { userName, warnHistory } = action;
-
-      return {
-        ...state,
-        warnHistory: {
-          ...state.warnHistory,
-          [userName]: warnHistory,
-        }
-      };
-    }
-    case Types.WARN_LIST_OPTIONS: {
-      const { warnList } = action;
-
-      return {
-        ...state,
-        warnListOptions: warnList,
-      };
-    }
-    case Types.WARN_USER: {
-      const { userName } = action;
-      return {
-        ...state,
-        warnUser: userName,
-      };
-    }
-    case Types.ADJUST_MOD: {
-      const { userName, shouldBeMod, shouldBeJudge } = action;
-
-      return {
-        ...state,
-        users: state.users.map((user) => {
-          if (user.name !== userName) {
-            return user;
-          }
-          const judgeFlag = shouldBeJudge ? UserLevelFlag.IsJudge : UserLevelFlag.IsNothing;
-          const modFlag = shouldBeMod ? UserLevelFlag.IsModerator : UserLevelFlag.IsNothing;
-          return {
-            ...user,
-            userLevel: user.userLevel & (judgeFlag | modFlag)
-          }
-        })
-      };
-    }
-    default:
-      return state;
-  }
-}
diff --git a/webclient/src/store/server/server.selectors.ts b/webclient/src/store/server/server.selectors.ts
deleted file mode 100644
index 263946425..000000000
--- a/webclient/src/store/server/server.selectors.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { ServerState } from './server.interfaces';
-
-interface State {
-  server: ServerState
-}
-
-export const Selectors = {
-  getInitialized: ({ server }: State) => server.initialized,
-  getConnectOptions: ({ server }: State) => server.connectOptions,
-  getMessage: ({ server }: State) => server.info.message,
-  getName: ({ server }: State) => server.info.name,
-  getVersion: ({ server }: State) => server.info.version,
-  getDescription: ({ server }: State) => server.status.description,
-  getState: ({ server }: State) => server.status.state,
-  getUser: ({ server }: State) => server.user,
-  getUsers: ({ server }: State) => server.users,
-  getLogs: ({ server }: State) => server.logs,
-  getBuddyList: ({ server }: State) => server.buddyList,
-  getIgnoreList: ({ server }: State) => server.ignoreList
-}
diff --git a/webclient/src/store/server/server.types.ts b/webclient/src/store/server/server.types.ts
deleted file mode 100644
index ab9307295..000000000
--- a/webclient/src/store/server/server.types.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-export const Types = {
-  INITIALIZED: '[Server] Initialized',
-  CLEAR_STORE: '[Server] Clear Store',
-  LOGIN_SUCCESSFUL: '[Server] Login Successful',
-  LOGIN_FAILED: '[Server] Login Failed',
-  CONNECTION_CLOSED: '[Server] Connection Closed',
-  CONNECTION_FAILED: '[Server] Connection Failed',
-  TEST_CONNECTION_SUCCESSFUL: '[Server] Test Connection Successful',
-  TEST_CONNECTION_FAILED: '[Server] Test Connection Failed',
-  SERVER_MESSAGE: '[Server] Server Message',
-  UPDATE_BUDDY_LIST: '[Server] Update Buddy List',
-  ADD_TO_BUDDY_LIST: '[Server] Add to Buddy List',
-  REMOVE_FROM_BUDDY_LIST: '[Server] Remove from Buddy List',
-  UPDATE_IGNORE_LIST: '[Server] Update Ignore List',
-  ADD_TO_IGNORE_LIST: '[Server] Add to Ignore List',
-  REMOVE_FROM_IGNORE_LIST: '[Server] Remove from Ignore List',
-  UPDATE_INFO: '[Server] Update Info',
-  UPDATE_STATUS: '[Server] Update Status',
-  UPDATE_USER: '[Server] Update User',
-  UPDATE_USERS: '[Server] Update Users',
-  USER_JOINED: '[Server] User Joined',
-  USER_LEFT: '[Server] User Left',
-  VIEW_LOGS: '[Server] View Logs',
-  CLEAR_LOGS: '[Server] Clear Logs',
-  REGISTRATION_REQUIRES_EMAIL: '[Server] Registration Requires Email',
-  REGISTRATION_SUCCES: '[Server] Registration Success',
-  REGISTRATION_FAILED: '[Server] Registration Failed',
-  REGISTRATION_EMAIL_ERROR: '[Server] Registration Email Error',
-  REGISTRATION_PASSWORD_ERROR: '[Server] Registration Password Error',
-  REGISTRATION_USERNAME_ERROR: '[Server] Registration Username Error',
-  ACCOUNT_AWAITING_ACTIVATION: '[Server] Account Awaiting Activation',
-  ACCOUNT_ACTIVATION_SUCCESS: '[Server] Account Activation Success',
-  ACCOUNT_ACTIVATION_FAILED: '[Server] Account Activation Failed',
-  RESET_PASSWORD_REQUESTED: '[Server] Reset Password Requested',
-  RESET_PASSWORD_FAILED: '[Server] Reset Password Failed',
-  RESET_PASSWORD_CHALLENGE: '[Server] Reset Password Challenge',
-  RESET_PASSWORD_SUCCESS: '[Server] Reset Password Success',
-  ADJUST_MOD: '[Server] Adjust Mod',
-  RELOAD_CONFIG: '[Server] Reload Config',
-  SHUTDOWN_SERVER: '[Server] Shutdown Server',
-  UPDATE_SERVER_MESSAGE: '[Server] Update Server Message',
-  ACCOUNT_PASSWORD_CHANGE: '[Server] Account Password Change',
-  ACCOUNT_EDIT_CHANGED: '[Server] Account Edit Changed',
-  ACCOUNT_IMAGE_CHANGED: '[Server] Account Image Changed',
-  DIRECT_MESSAGE_SENT: '[Server] Direct Message Sent',
-  GET_USER_INFO: '[Server] Get User Info',
-  NOTIFY_USER: '[Server] Notify User',
-  SERVER_SHUTDOWN: '[Server] Server Shutdown',
-  USER_MESSAGE: '[Server] User Message',
-  ADD_TO_LIST: '[Server] Add To List',
-  REMOVE_FROM_LIST: '[Server] Remove From List',
-  BAN_FROM_SERVER: '[Server] Ban From Server',
-  BAN_HISTORY: '[Server] Ban History',
-  WARN_HISTORY: '[Server] Warn History',
-  WARN_LIST_OPTIONS: '[Server] Warn List Options',
-  WARN_USER: '[Server] Warn User',
-};
diff --git a/webclient/src/store/store.ts b/webclient/src/store/store.ts
deleted file mode 100644
index e6ef5df3a..000000000
--- a/webclient/src/store/store.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { createStore, applyMiddleware } from 'redux';
-import thunk from 'redux-thunk';
-import rootReducer from './rootReducer';
-
-const initialState = {};
-
-const middleware: any = [thunk];
-
-export const store = createStore(rootReducer, initialState, applyMiddleware(...middleware));
diff --git a/webclient/src/types/cards.ts b/webclient/src/types/cards.ts
deleted file mode 100644
index b28bae203..000000000
--- a/webclient/src/types/cards.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-export class Card {
-  artist: string;
-  availability: string[];
-  borderColor: string;
-  colorIdentity: string[];
-  colors: string[];
-  convertedManaCost: number;
-  edhrecRank: number;
-  flavorText: string;
-  identifiers: {
-    cardKingdomId: string;
-    mcmId: string;
-    mcmMetaId: string;
-    mtgjsonV4Id: string;
-    multiverseId: string;
-    scryfallId: string;
-    scryfallIllustrationId: string;
-    scryfallOracleId: string;
-    tcgplayerProductId: string;
-  };
-  isOnlineOnly: boolean;
-  layout: string;
-  legalities: {
-    brawl: string;
-    commander: string;
-    duel: string;
-    future: string;
-    gladiator: string;
-    historic: string;
-    legacy: string;
-    modern: string;
-    pauper: string;
-    penny: string;
-    pioneer: string;
-    premodern: string;
-    standard: string;
-    vintage: string;
-  };
-  manaCost: string;
-  name: string;
-  originalText: string;
-  originalType: string;
-  power: string;
-  printings: string[];
-  rarity: string;
-  rulings: {
-    date: string;
-    text: string;
-  }[];
-  side: string;
-  setCode: string;
-  subtypes: string[];
-  supertypes: string[];
-  text: string;
-  toughness: string;
-  type: string;
-  types: string[];
-  uuid: string;
-  variations: string[];
-}
-
-export class Set {
-  baseSetSize: number;
-  block: string;
-  cards: string[];
-  code: string;
-  isOnlineOnly: boolean;
-  name: string;
-  releaseDate: string;
-  totalSetSize: number;
-  type: string;
-}
-
-export class Token {
-  name: { value: string };
-  prop: {
-    value: {
-      cmc: { value: string; };
-      colors: { value: string; };
-      maintype: { value: string; };
-      pt: { value: string; };
-      type: { value: string; };
-    };
-  };
-  related: { value: string; }[];
-  'reverse-related': { value: string; }[];
-  set: {
-    value: string;
-    picURL: string;
-  }[];
-  tablerow: { value: string; };
-  text: { value: string; };
-}
diff --git a/webclient/src/types/constants.spec.ts b/webclient/src/types/constants.spec.ts
deleted file mode 100644
index f95a16eaa..000000000
--- a/webclient/src/types/constants.spec.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import {
-  URL_REGEX,
-  MESSAGE_SENDER_REGEX,
-  MENTION_REGEX,
-  CARD_CALLOUT_REGEX,
-  CALLOUT_BOUNDARY_REGEX,
-} from './constants';
-
-describe('RegEx', () => {
-  describe('URL_REGEX', () => {
-    it('should match and capture whole url in main capture group', () => {
-      const test = [
-        'http://example.com',
-        'https://example.com',
-        'https://www.example.com',
-      ];
-
-      test.forEach(str => {
-        const match = str.match(URL_REGEX);
-
-        expect(match).toBeDefined();
-        expect(match[0]).toBe(str);
-      });
-    });
-
-    it('should not match bad urls', () => {
-      const test = [
-        'htt://example.com',
-        'https:/example.com',
-        'https//www.example.com',
-        'www.example.com',
-        'example.com',
-      ];
-
-      test.forEach(str =>
-        expect(str.match(URL_REGEX)).toBe(null)
-      );
-    });
-  });
-
-  describe('MESSAGE_SENDER_REGEX', () => {
-    it('should match and capture sender name in second capture group', () => {
-      const sender = 'sender';
-      const match = `${sender}: message`.match(MESSAGE_SENDER_REGEX);
-
-      expect(match).toBeDefined();
-      expect(match[1]).toBe(sender);
-    });
-
-    it('should not match if spaces before :', () => {
-      const test = [
-        ' sender: message',
-        'sender : message',
-        ' sender : message',
-      ];
-
-      test.forEach(str =>
-        expect(str.match(URL_REGEX)).toBe(null)
-      );
-    });
-  });
-
-  describe('MENTION_REGEX', () => {
-    it('should match and capture user mentions in second capture group', () => {
-      expect('@mention'.match(MENTION_REGEX)[0]).toBe('@mention');
-      expect('@mention '.match(MENTION_REGEX)[0]).toBe('@mention');
-      expect(' @mention'.match(MENTION_REGEX)[0]).toBe(' @mention');
-      expect(' @mention '.match(MENTION_REGEX)[0]).toBe(' @mention');
-      expect('leading @mention'.match(MENTION_REGEX)[0]).toBe(' @mention');
-      expect('leading @mention trailing'.match(MENTION_REGEX)[0]).toBe(' @mention');
-      expect('@mention trailing'.match(MENTION_REGEX)[0]).toBe('@mention');
-    });
-
-    it('should not match preceded by character', () => {
-      const test = [
-        'leading@mention',
-      ];
-
-      test.forEach(str =>
-        expect(str.match(MENTION_REGEX)).toBe(null)
-      );
-    });
-  });
-});
diff --git a/webclient/src/types/constants.ts b/webclient/src/types/constants.ts
deleted file mode 100644
index 7341a22b1..000000000
--- a/webclient/src/types/constants.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// eslint-disable-next-line
-export const URL_REGEX = /(https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b(?:[-a-zA-Z0-9@:%_\+.~#?&//=]*))/g;
-export const MESSAGE_SENDER_REGEX = /(^[^:\s]+):/;
-export const MENTION_REGEX = /(^|\s)(@\w+)/g;
-export const CARD_CALLOUT_REGEX = /(\[\[[^\]]+\]\])/g;
-export const CALLOUT_BOUNDARY_REGEX = /(\[\[|\]\])/g;
diff --git a/webclient/src/types/countries.ts b/webclient/src/types/countries.ts
deleted file mode 100644
index 0289b63ad..000000000
--- a/webclient/src/types/countries.ts
+++ /dev/null
@@ -1,253 +0,0 @@
-export const countryCodes = [
-  'AF',
-  'AX',
-  'AL',
-  'DZ',
-  'AS',
-  'AD',
-  'AO',
-  'AI',
-  'AQ',
-  'AG',
-  'AR',
-  'AM',
-  'AW',
-  'AU',
-  'AT',
-  'AZ',
-  'BH',
-  'BS',
-  'BD',
-  'BB',
-  'BY',
-  'BE',
-  'BZ',
-  'BJ',
-  'BM',
-  'BT',
-  'BO',
-  'BQ',
-  'BA',
-  'BW',
-  'BV',
-  'BR',
-  'IO',
-  'BN',
-  'BG',
-  'BF',
-  'BI',
-  'KH',
-  'CM',
-  'CA',
-  'CV',
-  'KY',
-  'CF',
-  'TD',
-  'CL',
-  'CN',
-  'CX',
-  'CC',
-  'CO',
-  'KM',
-  'CG',
-  'CD',
-  'CK',
-  'CR',
-  'CI',
-  'HR',
-  'CU',
-  'CW',
-  'CY',
-  'CZ',
-  'DK',
-  'DJ',
-  'DM',
-  'DO',
-  'EC',
-  'EG',
-  'SV',
-  'GQ',
-  'ER',
-  'EE',
-  'ET',
-  'EU',
-  'FK',
-  'FO',
-  'FJ',
-  'FI',
-  'FR',
-  'GF',
-  'PF',
-  'TF',
-  'GA',
-  'GM',
-  'GE',
-  'DE',
-  'GH',
-  'GI',
-  'GR',
-  'GL',
-  'GD',
-  'GP',
-  'GU',
-  'GT',
-  'GG',
-  'GN',
-  'GW',
-  'GY',
-  'HT',
-  'HM',
-  'VA',
-  'HN',
-  'HK',
-  'HU',
-  'IS',
-  'IN',
-  'ID',
-  'IR',
-  'IQ',
-  'IE',
-  'IM',
-  'IL',
-  'IT',
-  'JM',
-  'JP',
-  'JE',
-  'JO',
-  'KZ',
-  'KE',
-  'KI',
-  'KP',
-  'KR',
-  'KW',
-  'KG',
-  'LA',
-  'LV',
-  'LB',
-  'LS',
-  'LR',
-  'LY',
-  'LI',
-  'LT',
-  'LU',
-  'MO',
-  'MK',
-  'MG',
-  'MW',
-  'MY',
-  'MV',
-  'ML',
-  'MT',
-  'MH',
-  'MQ',
-  'MR',
-  'MU',
-  'YT',
-  'MX',
-  'FM',
-  'MD',
-  'MC',
-  'MN',
-  'ME',
-  'MS',
-  'MA',
-  'MZ',
-  'MM',
-  'NA',
-  'NR',
-  'NP',
-  'NL',
-  'NC',
-  'NZ',
-  'NI',
-  'NE',
-  'NG',
-  'NU',
-  'NF',
-  'MP',
-  'NO',
-  'OM',
-  'PK',
-  'PW',
-  'PS',
-  'PA',
-  'PG',
-  'PY',
-  'PE',
-  'PH',
-  'PN',
-  'PL',
-  'PT',
-  'PR',
-  'QA',
-  'RE',
-  'RO',
-  'RU',
-  'RW',
-  'BL',
-  'SH',
-  'KN',
-  'LC',
-  'MF',
-  'PM',
-  'VC',
-  'WS',
-  'SM',
-  'ST',
-  'SA',
-  'SN',
-  'RS',
-  'SC',
-  'SL',
-  'SG',
-  'SX',
-  'SK',
-  'SI',
-  'SB',
-  'SO',
-  'ZA',
-  'GS',
-  'SS',
-  'ES',
-  'LK',
-  'SD',
-  'SR',
-  'SJ',
-  'SZ',
-  'SE',
-  'CH',
-  'SY',
-  'TW',
-  'TJ',
-  'TZ',
-  'TH',
-  'TL',
-  'TG',
-  'TK',
-  'TO',
-  'TT',
-  'TN',
-  'TR',
-  'TM',
-  'TC',
-  'TV',
-  'UG',
-  'UA',
-  'AE',
-  'GB',
-  'US',
-  'UM',
-  'UY',
-  'UZ',
-  'VU',
-  'VE',
-  'VN',
-  'VG',
-  'VI',
-  'WF',
-  'EH',
-  'YE',
-  'XK',
-  'ZM',
-  'ZW',
-];
diff --git a/webclient/src/types/deckList.ts b/webclient/src/types/deckList.ts
deleted file mode 100644
index 18212079e..000000000
--- a/webclient/src/types/deckList.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export interface DeckList {
-    root: DeckStorageFolder;
-}
-
-export interface DeckStorageFolder {
-    items: DeckStorageTreeItem[];
-}
-
-export interface DeckStorageFile {
-    creationTime: number;
-}
-
-export interface DeckStorageTreeItem {
-    id: number;
-    name: string;
-    file: DeckStorageFile;
-    folder: DeckStorageFolder;
-}
diff --git a/webclient/src/types/forms.ts b/webclient/src/types/forms.ts
deleted file mode 100644
index 421bc2615..000000000
--- a/webclient/src/types/forms.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export enum FormKey {
-	ADD_TO_BUDDIES = 'ADD_TO_BUDDIES',
-	ADD_TO_IGNORE = 'ADD_TO_IGNORE',
-	CARD_IMPORT = 'CARD_IMPORT',
-	CONNECT = 'CONNECT',
-	LOGIN = 'LOGIN',
-	RESET_PASSWORD_REQUEST = 'RESET_PASSWORD_REQUEST',
-	RESET_PASSWORD = 'RESET_PASSWORD',
-	REGISTER = 'REGISTER',
-	SEARCH_LOGS = 'SEARCH_LOGS',
-}
diff --git a/webclient/src/types/game.ts b/webclient/src/types/game.ts
deleted file mode 100644
index b9fcc1dc2..000000000
--- a/webclient/src/types/game.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-export interface Game {
-  description: string;
-  gameId: number;
-  gameType: string;
-  gameTypes: string[];
-  roomId: number;
-  started: boolean;
-}
-
-export enum GameSortField {
-  START_TIME = 'startTime'
-}
-
-export interface GameConfig {
-  description: string;
-  password: string;
-  maxPlayer: number;
-  onlyBuddies: boolean;
-  onlyRegistered: boolean;
-  spectatorsAllowed: boolean;
-  spectatorsNeedPassword: boolean;
-  spectatorsCanTalk: boolean;
-  spectatorsSeeEverything: boolean;
-  gameTypeIds: number[];
-  joinAsJudge: boolean;
-  joinAsSpectator: boolean;
-}
-
-export interface JoinGameParams {
-  gameId: number;
-  password: string;
-  spectator: boolean;
-  overrideRestrictions: boolean;
-  joinAsJudge: boolean;
-}
-
-export enum LeaveGameReason {
-  OTHER = 1,
-  USER_KICKED = 2,
-  USER_LEFT = 3,
-  USER_DISCONNECTED = 4
-}
diff --git a/webclient/src/types/index.ts b/webclient/src/types/index.ts
deleted file mode 100644
index 00838a16d..000000000
--- a/webclient/src/types/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export * from './cards';
-export * from './constants';
-export * from './countries';
-export * from './game';
-export * from './room';
-export * from './server';
-export * from './sort';
-export * from './user';
-export * from './routes';
-export * from './sort';
-export * from './forms';
-export * from './message';
-export * from './settings';
-export * from './languages';
-export * from './logs';
-export * from './session';
-export * from './deckList';
-export * from './moderator';
diff --git a/webclient/src/types/languages.ts b/webclient/src/types/languages.ts
deleted file mode 100644
index 17699fd0e..000000000
--- a/webclient/src/types/languages.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-export enum Language {
-  'en-US' = 'en-US',
-  'fr' = 'fr',
-  'nl' = 'nl',
-  'pt_BR' = 'pt_BR',
-}
-
-export enum LanguageCountry {
-  'en-US' = 'us',
-  'fr' = 'fr',
-  'nl' = 'nl',
-  'pt_BR' = 'br'
-}
-
-export enum LanguageNative {
-  'en-US' = 'English - US',
-  'fr' = 'Français',
-  'nl' = 'Nederlands',
-  'pt_BR' = 'Portugues do Brasil',
-}
diff --git a/webclient/src/types/logs.ts b/webclient/src/types/logs.ts
deleted file mode 100644
index 4c2f0364e..000000000
--- a/webclient/src/types/logs.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export interface LogFilters {
-    userName: string;
-    ipAddress: string;
-    gameName: string;
-    gameId: string;
-    message: string;
-    logLocation: string;
-}
diff --git a/webclient/src/types/message.ts b/webclient/src/types/message.ts
deleted file mode 100644
index d7f256011..000000000
--- a/webclient/src/types/message.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface Message {
-  name: string;
-  message: string;
-  messageType: number;
-  timeOf: number;
-  timeReceived: number;
-}
diff --git a/webclient/src/types/moderator.ts b/webclient/src/types/moderator.ts
deleted file mode 100644
index 5991ec6c1..000000000
--- a/webclient/src/types/moderator.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export interface BanHistoryItem {
-    adminId: string;
-    adminName: string;
-    banTime: string;
-    banLength: string;
-    banReason: string;
-    visibleReason: string;
-}
-
-export interface WarnHistoryItem {
-    userName: string;
-    adminName: string;
-    reason: string;
-    timeOf: string;
-}
-
-export interface WarnListItem {
-    warning: string;
-    userName: string;
-    userClientid: string;
-}
diff --git a/webclient/src/types/room.ts b/webclient/src/types/room.ts
deleted file mode 100644
index e69b1a499..000000000
--- a/webclient/src/types/room.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { User } from './user';
-
-export interface Room {
-  autoJoin: boolean
-  description: string;
-  gameCount: number;
-  gameList: any[];
-  gametypeList: any[];
-  gametypeMap: GametypeMap;
-  name: string;
-  permissionlevel: RoomAccessLevel;
-  playerCount: number;
-  privilegelevel: RoomAccessLevel;
-  roomId: number;
-  userList: User[];
-  order: number;
-}
-
-export interface GametypeMap { [index: number]: string }
-
-export enum RoomAccessLevel {
-  'none'
-}
diff --git a/webclient/src/types/routes.ts b/webclient/src/types/routes.ts
deleted file mode 100644
index d91e8a7cb..000000000
--- a/webclient/src/types/routes.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export enum RouteEnum {
-  PLAYER = '/player/:name',
-  SERVER = '/server',
-  ROOM = '/room/:roomId',
-  LOGIN = '/login',
-  LOGS = '/logs',
-  GAME = '/game',
-  DECKS = '/decks',
-  DECK = '/deck',
-  ACCOUNT = '/account',
-  ADMINISTRATION = '/administration',
-  REPLAYS = '/replays',
-  INITIALIZE = '/initialize',
-  UNSUPPORTED = '/unsupported',
-}
diff --git a/webclient/src/types/server.ts b/webclient/src/types/server.ts
deleted file mode 100644
index 305a5a810..000000000
--- a/webclient/src/types/server.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-export interface ServerStatus {
-  status: StatusEnum;
-  description: string;
-}
-
-export enum StatusEnum {
-  DISCONNECTED,
-  CONNECTING,
-  CONNECTED,
-  LOGGING_IN,
-  LOGGED_IN,
-  DISCONNECTING = 99
-}
-
-export interface WebSocketConnectOptions {
-  host?: string;
-  port?: string;
-  userName?: string;
-  password?: string;
-  hashedPassword?: string;
-  newPassword?: string;
-  token?: string;
-  email?: string;
-  realName?: string;
-  country?: string;
-  autojoinrooms?: boolean;
-  keepalive?: number;
-  clientid?: string;
-  reason?: WebSocketConnectReason;
-}
-
-export enum WebSocketConnectReason {
-  LOGIN,
-  REGISTER,
-  ACTIVATE_ACCOUNT,
-  PASSWORD_RESET_REQUEST,
-  PASSWORD_RESET_CHALLENGE,
-  PASSWORD_RESET,
-  TEST_CONNECTION,
-}
-
-export class Host {
-  id?: number;
-  name: string;
-  host: string;
-  port: string;
-  localHost?: string;
-  localPort?: string;
-  editable: boolean;
-  lastSelected?: boolean;
-  userName?: string;
-  hashedPassword?: string;
-  remember?: boolean;
-}
-
-export const DefaultHosts: Host[] = [
-  {
-    name: 'Chickatrice',
-    host: 'mtg.chickatrice.net',
-    port: '443',
-    localPort: '4748',
-    editable: false,
-  },
-  {
-    name: 'Rooster',
-    host: 'server.cockatrice.us/servatrice',
-    port: '4748',
-    localHost: 'server.cockatrice.us',
-    editable: false,
-  },
-  {
-    name: 'Rooster Beta',
-    host: 'beta.cockatrice.us/servatrice',
-    port: '4748',
-    localHost: 'beta.cockatrice.us',
-    editable: false,
-  },
-  {
-    name: 'Tetrarch',
-    host: 'mtg.tetrarch.co/servatrice',
-    port: '443',
-    editable: false,
-  },
-];
-
-export const getHostPort = (host: Host): { host: string, port: string } => {
-  const isLocal = window.location.hostname === 'localhost';
-
-  if (!host) {
-    return {
-      host: '',
-      port: ''
-    };
-  }
-
-  return {
-    host: !isLocal ? host.host : host.localHost || host.host,
-    port: !isLocal ? host.port : host.localPort || host.port,
-  }
-};
-
-export enum KnownHost {
-  ROOSTER = 'Rooster',
-  TETRARCH = 'Tetrarch',
-}
-
-export const KnownHosts = {
-  [KnownHost.ROOSTER]: { port: 4748, host: 'server.cockatrice.us', },
-  [KnownHost.TETRARCH]: { port: 443, host: 'mtg.tetrarch.co/servatrice' },
-}
-
-export interface LogItem {
-  message: string;
-  senderId: string;
-  senderIp: string;
-  senderName: string;
-  targetId: string;
-  targetName: string;
-  targetType: string;
-  time: string;
-}
-
-export interface LogGroups {
-  room: LogItem[];
-  game: LogItem[];
-  chat: LogItem[];
-}
diff --git a/webclient/src/types/session.ts b/webclient/src/types/session.ts
deleted file mode 100644
index 1b49616c5..000000000
--- a/webclient/src/types/session.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export enum NotificationType {
-    UNKNOWN = 0,
-    PROMOTED = 1,
-    WARNING = 2,
-    IDLEWARNING = 3,
-    CUSTOM = 4,
-};
diff --git a/webclient/src/types/settings.ts b/webclient/src/types/settings.ts
deleted file mode 100644
index c91394331..000000000
--- a/webclient/src/types/settings.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export class Setting {
-  user: string;
-  autoConnect?: boolean;
-}
-
-export const APP_USER = '*app';
diff --git a/webclient/src/types/sort.ts b/webclient/src/types/sort.ts
deleted file mode 100644
index c3312732c..000000000
--- a/webclient/src/types/sort.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export enum SortDirection {
-  ASC = 'ASC',
-  DESC = 'DESC'
-}
-
-export interface SortBy {
-  field: string;
-  order: SortDirection;
-}
diff --git a/webclient/src/types/user.ts b/webclient/src/types/user.ts
deleted file mode 100644
index 2d0383eb7..000000000
--- a/webclient/src/types/user.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-export interface User {
-  accountageSecs: number;
-  name: string;
-  privlevel: UserPrivLevel;
-  userLevel: number;
-  realName?: string;
-  country?: string;
-  avatarBmp?: Uint8Array;
-}
-
-export enum UserLevelFlag {
-  IsNothing = 0,
-  IsUser = 1,
-  IsRegistered = 2,
-  IsModerator = 4,
-  IsAdmin = 8,
-  IsJudge = 16,
-}
-
-export enum UserPrivLevel {
-  NONE = 0,
-  VIP = 1,
-  DONOR = 2
-}
-
-export enum UserSortField {
-  NAME = 'name'
-}
diff --git a/webclient/src/websocket/WebClient.ts b/webclient/src/websocket/WebClient.ts
deleted file mode 100644
index 1dae24d0c..000000000
--- a/webclient/src/websocket/WebClient.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { StatusEnum, WebSocketConnectOptions } from 'types';
-
-import { ProtobufService } from './services/ProtobufService';
-import { WebSocketService } from './services/WebSocketService';
-
-import { RoomPersistence, SessionPersistence } from './persistence';
-
-export class WebClient {
-  public socket = new WebSocketService(this);
-  public protobuf = new ProtobufService(this);
-
-  public protocolVersion = 14;
-  public clientConfig = {
-    clientid: 'webatrice',
-    clientver: 'webclient-1.0 (2019-10-31)',
-    clientfeatures: [
-      'client_id',
-      'client_ver',
-      'feature_set',
-      'room_chat_history',
-      'client_warnings',
-      /* unimplemented features */
-      'forgot_password',
-      'idle_client',
-      'mod_log_lookup',
-      'user_ban_history',
-      // satisfy server reqs for POC
-      'websocket',
-      '2.7.0_min_version',
-      '2.8.0_min_version'
-    ]
-  };
-
-  public clientOptions = {
-    autojoinrooms: true,
-    keepalive: 5000
-  };
-
-  public options: WebSocketConnectOptions;
-  public status: StatusEnum;
-
-  public connectionAttemptMade = false;
-
-  constructor() {
-    this.socket.message$.subscribe((message: MessageEvent) => {
-      this.protobuf.handleMessageEvent(message);
-    });
-
-    if (process.env.NODE_ENV !== 'test') {
-      console.log(this);
-    }
-  }
-
-  public connect(options: WebSocketConnectOptions) {
-    this.connectionAttemptMade = true;
-    this.options = options;
-    this.socket.connect(options);
-  }
-
-  public testConnect(options: WebSocketConnectOptions) {
-    this.socket.testConnect(options);
-  }
-
-  public disconnect() {
-    this.socket.disconnect();
-  }
-
-  public updateStatus(status: StatusEnum) {
-    this.status = status;
-
-    if (status === StatusEnum.DISCONNECTED) {
-      this.protobuf.resetCommands();
-      this.clearStores();
-    }
-  }
-
-  public keepAlive(pingReceived: Function) {
-    this.protobuf.sendKeepAliveCommand(pingReceived);
-  }
-
-  private clearStores() {
-    RoomPersistence.clearStore();
-    SessionPersistence.clearStore();
-  }
-}
-
-const webClient = new WebClient();
-
-export default webClient;
diff --git a/webclient/src/websocket/commands/admin/adjustMod.ts b/webclient/src/websocket/commands/admin/adjustMod.ts
deleted file mode 100644
index 5e8a83153..000000000
--- a/webclient/src/websocket/commands/admin/adjustMod.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import webClient from '../../WebClient';
-import { AdminPersistence } from '../../persistence';
-
-export function adjustMod(userName: string, shouldBeMod?: boolean, shouldBeJudge?: boolean): void {
-  const command = webClient.protobuf.controller.Command_AdjustMod.create({ userName, shouldBeMod, shouldBeJudge });
-  const sc = webClient.protobuf.controller.AdminCommand.create({ '.Command_AdjustMod.ext': command });
-
-  webClient.protobuf.sendAdminCommand(sc, (raw) => {
-    const { responseCode } = raw;
-
-    let error: string;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        AdminPersistence.adjustMod(userName, shouldBeMod, shouldBeJudge);
-        return;
-      default:
-        error = 'Failed to reload config.';
-        break;
-    }
-
-    if (error) {
-      console.error(responseCode, error);
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/admin/index.ts b/webclient/src/websocket/commands/admin/index.ts
deleted file mode 100644
index 5d4ae21bf..000000000
--- a/webclient/src/websocket/commands/admin/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './adjustMod';
-export * from './reloadConfig';
-export * from './shutdownServer';
-export * from './updateServerMessage';
diff --git a/webclient/src/websocket/commands/admin/reloadConfig.ts b/webclient/src/websocket/commands/admin/reloadConfig.ts
deleted file mode 100644
index 16d2a574b..000000000
--- a/webclient/src/websocket/commands/admin/reloadConfig.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import webClient from '../../WebClient';
-import { AdminPersistence } from '../../persistence';
-
-export function reloadConfig(): void {
-  const command = webClient.protobuf.controller.Command_ReloadConfig.create();
-  const sc = webClient.protobuf.controller.AdminCommand.create({ '.Command_ReloadConfig.ext': command });
-
-  webClient.protobuf.sendAdminCommand(sc, (raw) => {
-    const { responseCode } = raw;
-
-    let error: string;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        AdminPersistence.reloadConfig();
-        return;
-      default:
-        error = 'Failed to reload config.';
-        break;
-    }
-
-    if (error) {
-      console.error(responseCode, error);
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/admin/shutdownServer.ts b/webclient/src/websocket/commands/admin/shutdownServer.ts
deleted file mode 100644
index 0624e823d..000000000
--- a/webclient/src/websocket/commands/admin/shutdownServer.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import webClient from '../../WebClient';
-import { AdminPersistence } from '../../persistence';
-
-export function shutdownServer(reason: string, minutes: number): void {
-  const command = webClient.protobuf.controller.Command_ShutdownServer.create({ reason, minutes });
-  const sc = webClient.protobuf.controller.AdminCommand.create({ '.Command_ShutdownServer.ext': command });
-
-  webClient.protobuf.sendAdminCommand(sc, (raw) => {
-    const { responseCode } = raw;
-
-    let error: string;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        AdminPersistence.shutdownServer();
-        return;
-      default:
-        error = 'Failed to update server message.';
-        break;
-    }
-
-    if (error) {
-      console.error(responseCode, error);
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/admin/updateServerMessage.ts b/webclient/src/websocket/commands/admin/updateServerMessage.ts
deleted file mode 100644
index cb025f5a9..000000000
--- a/webclient/src/websocket/commands/admin/updateServerMessage.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import webClient from '../../WebClient';
-import { AdminPersistence } from '../../persistence';
-
-export function updateServerMessage(): void {
-  const command = webClient.protobuf.controller.Command_UpdateServerMessage.create();
-  const sc = webClient.protobuf.controller.AdminCommand.create({ '.Command_UpdateServerMessage.ext': command });
-
-  webClient.protobuf.sendAdminCommand(sc, (raw) => {
-    const { responseCode } = raw;
-
-    let error: string;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        AdminPersistence.updateServerMessage();
-        return;
-      default:
-        error = 'Failed to update server message.';
-        break;
-    }
-
-    if (error) {
-      console.error(responseCode, error);
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/index.ts b/webclient/src/websocket/commands/index.ts
deleted file mode 100644
index 2c68fcfb9..000000000
--- a/webclient/src/websocket/commands/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * as AdminCommands from './admin';
-export * as ModeratorCommands from './moderator';
-export * as RoomCommands from './room';
-export * as SessionCommands from './session';
diff --git a/webclient/src/websocket/commands/moderator/banFromServer.ts b/webclient/src/websocket/commands/moderator/banFromServer.ts
deleted file mode 100644
index 028eb4606..000000000
--- a/webclient/src/websocket/commands/moderator/banFromServer.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import webClient from '../../WebClient';
-import { ModeratorPersistence } from '../../persistence';
-
-export function banFromServer(minutes: number, userName?: string, address?: string, reason?: string,
-  visibleReason?: string, clientid?: string, removeMessages?: number): void {
-  const command = webClient.protobuf.controller.Command_BanFromServer.create({
-    minutes, userName, address, reason, visibleReason, clientid, removeMessages
-  });
-  const sc = webClient.protobuf.controller.ModeratorCommand.create({ '.Command_BanFromServer.ext': command });
-
-  webClient.protobuf.sendModeratorCommand(sc, (raw) => {
-    const { responseCode } = raw;
-
-    let error: string;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        ModeratorPersistence.banFromServer(userName);
-        return;
-      default:
-        error = 'Failed to ban user.';
-        break;
-    }
-
-    if (error) {
-      console.error(responseCode, error);
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/moderator/getBanHistory.ts b/webclient/src/websocket/commands/moderator/getBanHistory.ts
deleted file mode 100644
index 3378f5842..000000000
--- a/webclient/src/websocket/commands/moderator/getBanHistory.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import webClient from '../../WebClient';
-import { ModeratorPersistence } from '../../persistence';
-
-export function getBanHistory(userName: string): void {
-  const command = webClient.protobuf.controller.Command_GetBanHistory.create({ userName });
-  const sc = webClient.protobuf.controller.ModeratorCommand.create({ '.Command_GetBanHistory.ext': command });
-
-  webClient.protobuf.sendModeratorCommand(sc, (raw) => {
-    const { responseCode } = raw;
-
-    let error: string;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        const { banList } = raw['.Response_BanHistory.ext'];
-        ModeratorPersistence.banHistory(userName, banList);
-        return;
-      default:
-        error = 'Failed to get ban history.';
-        break;
-    }
-
-    if (error) {
-      console.error(responseCode, error);
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/moderator/getWarnHistory.ts b/webclient/src/websocket/commands/moderator/getWarnHistory.ts
deleted file mode 100644
index fce008eec..000000000
--- a/webclient/src/websocket/commands/moderator/getWarnHistory.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import webClient from '../../WebClient';
-import { ModeratorPersistence } from '../../persistence';
-
-export function getWarnHistory(userName: string): void {
-  const command = webClient.protobuf.controller.Command_GetWarnHistory.create({ userName });
-  const sc = webClient.protobuf.controller.ModeratorCommand.create({ '.Command_GetWarnHistory.ext': command });
-
-  webClient.protobuf.sendModeratorCommand(sc, (raw) => {
-    const { responseCode } = raw;
-
-    let error: string;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        const { warnList } = raw['.Response_WarnHistory.ext'];
-        ModeratorPersistence.warnHistory(userName, warnList);
-        return;
-      default:
-        error = 'Failed to get warn history.';
-        break;
-    }
-
-    if (error) {
-      console.error(responseCode, error);
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/moderator/getWarnList.ts b/webclient/src/websocket/commands/moderator/getWarnList.ts
deleted file mode 100644
index f83e5eb1b..000000000
--- a/webclient/src/websocket/commands/moderator/getWarnList.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import webClient from '../../WebClient';
-import { ModeratorPersistence } from '../../persistence';
-
-export function getWarnList(modName: string, userName: string, userClientid: string): void {
-  const command = webClient.protobuf.controller.Command_GetWarnList.create({ modName, userName, userClientid });
-  const sc = webClient.protobuf.controller.ModeratorCommand.create({ '.Command_GetWarnList.ext': command });
-
-  webClient.protobuf.sendModeratorCommand(sc, (raw) => {
-    const { responseCode } = raw;
-
-    let error: string;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        const { warning } = raw['.Response_WarnList.ext'];
-        ModeratorPersistence.warnListOptions(warning);
-        return;
-      default:
-        error = 'Failed to get warn list.';
-        break;
-    }
-
-    if (error) {
-      console.error(responseCode, error);
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/moderator/index.ts b/webclient/src/websocket/commands/moderator/index.ts
deleted file mode 100644
index cb4f2455c..000000000
--- a/webclient/src/websocket/commands/moderator/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from './banFromServer';
-export * from './getBanHistory';
-export * from './getWarnHistory';
-export * from './getWarnList';
-export * from './viewLogHistory';
-export * from './warnUser';
diff --git a/webclient/src/websocket/commands/moderator/viewLogHistory.ts b/webclient/src/websocket/commands/moderator/viewLogHistory.ts
deleted file mode 100644
index 29e3c4bd6..000000000
--- a/webclient/src/websocket/commands/moderator/viewLogHistory.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import webClient from '../../WebClient';
-import { ModeratorPersistence } from '../../persistence';
-import { LogFilters } from 'types';
-
-export function viewLogHistory(filters: LogFilters): void {
-  const command = webClient.protobuf.controller.Command_ViewLogHistory.create(filters);
-  const sc = webClient.protobuf.controller.ModeratorCommand.create({ '.Command_ViewLogHistory.ext': command });
-
-  webClient.protobuf.sendModeratorCommand(sc, (raw) => {
-    const { responseCode } = raw;
-
-    let error: string;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        const { logMessage } = raw['.Response_ViewLogHistory.ext'];
-        ModeratorPersistence.viewLogs(logMessage)
-        return;
-      default:
-        error = 'Failed to retrieve log history.';
-        break;
-    }
-
-    if (error) {
-      console.error(responseCode, error);
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/moderator/warnUser.ts b/webclient/src/websocket/commands/moderator/warnUser.ts
deleted file mode 100644
index bef9ee003..000000000
--- a/webclient/src/websocket/commands/moderator/warnUser.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import webClient from '../../WebClient';
-import { ModeratorPersistence } from '../../persistence';
-
-export function warnUser(userName: string, reason: string, clientid?: string, removeMessage?: boolean): void {
-  const command = webClient.protobuf.controller.Command_WarnUser.create({ userName, reason, clientid, removeMessage });
-  const sc = webClient.protobuf.controller.ModeratorCommand.create({ '.Command_WarnUser.ext': command });
-
-  webClient.protobuf.sendModeratorCommand(sc, (raw) => {
-    const { responseCode } = raw;
-
-    let error: string;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        ModeratorPersistence.warnUser(userName);
-        return;
-      default:
-        error = 'Failed to warn user.';
-        break;
-    }
-
-    if (error) {
-      console.error(responseCode, error);
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/room/createGame.ts b/webclient/src/websocket/commands/room/createGame.ts
deleted file mode 100644
index e5fd66f80..000000000
--- a/webclient/src/websocket/commands/room/createGame.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { RoomPersistence } from '../../persistence';
-import webClient from '../../WebClient';
-import { GameConfig } from 'types';
-
-export function createGame(roomId: number, gameConfig: GameConfig): void {
-  const command = webClient.protobuf.controller.Command_CreateGame.create(gameConfig);
-  const rc = webClient.protobuf.controller.RoomCommand.create({ '.Command_CreateGame.ext': command });
-
-  webClient.protobuf.sendRoomCommand(roomId, rc, (raw) => {
-    const { responseCode } = raw;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        RoomPersistence.gameCreated(roomId);
-        break;
-      default:
-        console.log('Failed to do the thing');
-    }
-  });
-}
-
diff --git a/webclient/src/websocket/commands/room/index.ts b/webclient/src/websocket/commands/room/index.ts
deleted file mode 100644
index 18235618c..000000000
--- a/webclient/src/websocket/commands/room/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './createGame';
-export * from './joinGame';
-export * from './leaveRoom';
-export * from './roomSay';
diff --git a/webclient/src/websocket/commands/room/joinGame.ts b/webclient/src/websocket/commands/room/joinGame.ts
deleted file mode 100644
index 19a672924..000000000
--- a/webclient/src/websocket/commands/room/joinGame.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { RoomPersistence } from '../../persistence';
-import webClient from '../../WebClient';
-import { GameConfig, JoinGameParams } from 'types';
-
-export function joinGame(roomId: number, joinGameParams: JoinGameParams): void {
-  const command = webClient.protobuf.controller.Command_JoinGame.create(joinGameParams);
-  const rc = webClient.protobuf.controller.RoomCommand.create({ '.Command_JoinGame.ext': command });
-
-  webClient.protobuf.sendRoomCommand(roomId, rc, (raw) => {
-    const { responseCode } = raw;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        RoomPersistence.joinedGame(roomId, joinGameParams.gameId);
-        break;
-      default:
-        console.log('Failed to do the thing');
-    }
-  });
-}
-
diff --git a/webclient/src/websocket/commands/room/leaveRoom.ts b/webclient/src/websocket/commands/room/leaveRoom.ts
deleted file mode 100644
index 477ee39a0..000000000
--- a/webclient/src/websocket/commands/room/leaveRoom.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { RoomPersistence } from '../../persistence';
-import webClient from '../../WebClient';
-
-export function leaveRoom(roomId: number): void {
-  const command = webClient.protobuf.controller.Command_LeaveRoom.create();
-  const rc = webClient.protobuf.controller.RoomCommand.create({ '.Command_LeaveRoom.ext': command });
-
-  webClient.protobuf.sendRoomCommand(roomId, rc, (raw) => {
-    const { responseCode } = raw;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        RoomPersistence.leaveRoom(roomId);
-        break;
-      default:
-        console.log(`Failed to leave Room ${roomId} [${responseCode}] : `, raw);
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/room/roomSay.ts b/webclient/src/websocket/commands/room/roomSay.ts
deleted file mode 100644
index c06abd3ab..000000000
--- a/webclient/src/websocket/commands/room/roomSay.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import webClient from '../../WebClient';
-
-export function roomSay(roomId: number, message: string): void {
-  const trimmed = message.trim();
-
-  if (!trimmed) {
-    return;
-  }
-
-  const command = webClient.protobuf.controller.Command_RoomSay.create({ 'message': trimmed });
-  const rc = webClient.protobuf.controller.RoomCommand.create({ '.Command_RoomSay.ext': command });
-
-  webClient.protobuf.sendRoomCommand(roomId, rc);
-}
diff --git a/webclient/src/websocket/commands/session/accountEdit.ts b/webclient/src/websocket/commands/session/accountEdit.ts
deleted file mode 100644
index f9210cb9c..000000000
--- a/webclient/src/websocket/commands/session/accountEdit.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-export function accountEdit(passwordCheck: string, realName?: string, email?: string, country?: string): void {
-  const command = webClient.protobuf.controller.Command_AccountEdit.create({ passwordCheck, realName, email, country });
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_AccountEdit.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    const { responseCode } = raw;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        SessionPersistence.accountEditChanged(realName, email, country);
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespFunctionNotAllowed:
-        console.log('Not allowed');
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespWrongPassword:
-        console.log('Wrong password');
-        break;
-      default:
-        console.log('Failed to update information');
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/session/accountImage.ts b/webclient/src/websocket/commands/session/accountImage.ts
deleted file mode 100644
index b735696a9..000000000
--- a/webclient/src/websocket/commands/session/accountImage.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-import { common } from 'protobufjs';
-import IBytesValue = common.IBytesValue;
-
-export function accountImage(image: IBytesValue): void {
-  const command = webClient.protobuf.controller.Command_AccountImage.create({ image });
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_AccountImage.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    const { responseCode } = raw;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        SessionPersistence.accountImageChanged(image);
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespFunctionNotAllowed:
-        console.log('Not allowed');
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespWrongPassword:
-        console.log('Wrong password');
-        break;
-      default:
-        console.log('Failed to update information');
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/session/accountPassword.ts b/webclient/src/websocket/commands/session/accountPassword.ts
deleted file mode 100644
index 0b5ef0111..000000000
--- a/webclient/src/websocket/commands/session/accountPassword.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-export function accountPassword(oldPassword: string, newPassword: string, hashedNewPassword: string): void {
-  const command = webClient.protobuf.controller.Command_AccountPassword.create({ oldPassword, newPassword, hashedNewPassword });
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_AccountPassword.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    const { responseCode } = raw;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        SessionPersistence.accountPasswordChange();
-        break;
-      default:
-        console.log('Failed to change password');
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/session/activate.ts b/webclient/src/websocket/commands/session/activate.ts
deleted file mode 100644
index 74e41afeb..000000000
--- a/webclient/src/websocket/commands/session/activate.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { AccountActivationParams } from 'store';
-import { StatusEnum, WebSocketConnectOptions } from 'types';
-
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-import { disconnect, login, updateStatus } from './';
-
-export function activate(options: WebSocketConnectOptions, passwordSalt?: string): void {
-  const { userName, token } = options as unknown as AccountActivationParams;
-
-  const accountActivationConfig = {
-    ...webClient.clientConfig,
-    userName,
-    token,
-  };
-
-  const command = webClient.protobuf.controller.Command_Activate.create(accountActivationConfig);
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_Activate.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    if (raw.responseCode === webClient.protobuf.controller.Response.ResponseCode.RespActivationAccepted) {
-      SessionPersistence.accountActivationSuccess();
-      login(options, passwordSalt);
-    } else {
-      updateStatus(StatusEnum.DISCONNECTED, 'Account Activation Failed');
-      disconnect();
-      SessionPersistence.accountActivationFailed();
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/session/addToList.ts b/webclient/src/websocket/commands/session/addToList.ts
deleted file mode 100644
index 6696d39d4..000000000
--- a/webclient/src/websocket/commands/session/addToList.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-export function addToBuddyList(userName: string): void {
-  addToList('buddy', userName);
-}
-
-export function addToIgnoreList(userName: string): void {
-  addToList('ignore', userName);
-}
-
-export function addToList(list: string, userName: string): void {
-  const command = webClient.protobuf.controller.Command_AddToList.create({ list, userName });
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_AddToList.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, ({ responseCode }) => {
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        SessionPersistence.addToList(list, userName);
-        break;
-      default:
-        console.error('Failed to add to list', responseCode);
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/session/connect.ts b/webclient/src/websocket/commands/session/connect.ts
deleted file mode 100644
index 5b660fab1..000000000
--- a/webclient/src/websocket/commands/session/connect.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { StatusEnum, WebSocketConnectOptions, WebSocketConnectReason } from 'types';
-import webClient from '../../WebClient';
-import { updateStatus } from './';
-
-export function connect(options: WebSocketConnectOptions, reason: WebSocketConnectReason): void {
-  switch (reason) {
-    case WebSocketConnectReason.LOGIN:
-    case WebSocketConnectReason.REGISTER:
-    case WebSocketConnectReason.ACTIVATE_ACCOUNT:
-    case WebSocketConnectReason.PASSWORD_RESET_REQUEST:
-    case WebSocketConnectReason.PASSWORD_RESET_CHALLENGE:
-    case WebSocketConnectReason.PASSWORD_RESET:
-      updateStatus(StatusEnum.CONNECTING, 'Connecting...');
-      break;
-    case WebSocketConnectReason.TEST_CONNECTION:
-      webClient.testConnect({ ...options });
-      return;
-    default:
-      updateStatus(StatusEnum.DISCONNECTED, 'Unknown Connection Attempt: ' + reason);
-      return;
-  }
-
-  webClient.connect({ ...options, reason });
-}
diff --git a/webclient/src/websocket/commands/session/deckDel.ts b/webclient/src/websocket/commands/session/deckDel.ts
deleted file mode 100644
index c77d89aa3..000000000
--- a/webclient/src/websocket/commands/session/deckDel.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-export function deckDel(deckId: number): void {
-  const command = webClient.protobuf.controller.Command_DeckDel.create({ deckId });
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_DeckDel.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    const { responseCode } = raw;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        SessionPersistence.deckDelete(deckId);
-        break;
-      default:
-        console.log('Failed to do the thing');
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/session/deckDelDir.ts b/webclient/src/websocket/commands/session/deckDelDir.ts
deleted file mode 100644
index ff4b25ec3..000000000
--- a/webclient/src/websocket/commands/session/deckDelDir.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-export function deckDelDir(path: string): void {
-  const command = webClient.protobuf.controller.Command_DeckDelDir.create({ path });
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_DeckDelDir.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    const { responseCode } = raw;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        SessionPersistence.deckDeleteDir(path);
-        break;
-      default:
-        console.log('Failed to do the thing');
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/session/deckDownload.ts b/webclient/src/websocket/commands/session/deckDownload.ts
deleted file mode 100644
index a0c4bd461..000000000
--- a/webclient/src/websocket/commands/session/deckDownload.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-export function deckDownload(deckId: number): void {
-  const command = webClient.protobuf.controller.Command_DeckDownload.create({ deckId });
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_DeckDownload.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    const { responseCode } = raw;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        SessionPersistence.deckDownload(deckId);
-        break;
-      default:
-        console.log('Failed to do the thing');
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/session/deckList.ts b/webclient/src/websocket/commands/session/deckList.ts
deleted file mode 100644
index e84b8efb3..000000000
--- a/webclient/src/websocket/commands/session/deckList.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-export function deckList(): void {
-  const command = webClient.protobuf.controller.Command_DeckList.create();
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_DeckList.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    const { responseCode } = raw;
-    const response = raw['.Response_DeckList.ext'];
-
-    if (response) {
-      switch (responseCode) {
-        case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-          SessionPersistence.deckList(response);
-          break;
-        default:
-          console.log('Failed to do the thing');
-      }
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/session/deckNewDir.ts b/webclient/src/websocket/commands/session/deckNewDir.ts
deleted file mode 100644
index b9bca6208..000000000
--- a/webclient/src/websocket/commands/session/deckNewDir.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-export function deckNewDir(path: string, dirName: string): void {
-  const command = webClient.protobuf.controller.Command_DeckNewDir.create({ path, dirName });
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_DeckNewDir.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    const { responseCode } = raw;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        SessionPersistence.deckNewDir(path, dirName);
-        break;
-      default:
-        console.log('Failed to do the thing');
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/session/deckUpload.ts b/webclient/src/websocket/commands/session/deckUpload.ts
deleted file mode 100644
index af526c8fc..000000000
--- a/webclient/src/websocket/commands/session/deckUpload.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-export function deckUpload(path: string, deckId: number, deckList: string): void {
-  const command = webClient.protobuf.controller.Command_DeckUpload.create({ path, deckId, deckList });
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_DeckUpload.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    const { responseCode } = raw;
-    const response = raw['.Response_DeckUpload.ext'];
-
-    if (response) {
-      switch (responseCode) {
-        case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-          SessionPersistence.deckUpload(response);
-          break;
-        default:
-          console.log('Failed to do the thing');
-      }
-    }
-
-  });
-}
diff --git a/webclient/src/websocket/commands/session/disconnect.ts b/webclient/src/websocket/commands/session/disconnect.ts
deleted file mode 100644
index 9fe567677..000000000
--- a/webclient/src/websocket/commands/session/disconnect.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import webClient from '../../WebClient';
-
-export function disconnect(): void {
-  webClient.disconnect();
-}
diff --git a/webclient/src/websocket/commands/session/forgotPasswordChallenge.ts b/webclient/src/websocket/commands/session/forgotPasswordChallenge.ts
deleted file mode 100644
index f6399e6a7..000000000
--- a/webclient/src/websocket/commands/session/forgotPasswordChallenge.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { ForgotPasswordChallengeParams } from 'store';
-import { StatusEnum, WebSocketConnectOptions } from 'types';
-
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-import { disconnect, updateStatus } from './';
-
-export function forgotPasswordChallenge(options: WebSocketConnectOptions): void {
-  const { userName, email } = options as unknown as ForgotPasswordChallengeParams;
-
-  const forgotPasswordChallengeConfig = {
-    ...webClient.clientConfig,
-    userName,
-    email,
-  };
-
-  const command = webClient.protobuf.controller.Command_ForgotPasswordChallenge.create(forgotPasswordChallengeConfig);
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_ForgotPasswordChallenge.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    if (raw.responseCode === webClient.protobuf.controller.Response.ResponseCode.RespOk) {
-      updateStatus(StatusEnum.DISCONNECTED, null);
-      SessionPersistence.resetPassword();
-    } else {
-      updateStatus(StatusEnum.DISCONNECTED, null);
-      SessionPersistence.resetPasswordFailed();
-    }
-
-    disconnect();
-  });
-}
diff --git a/webclient/src/websocket/commands/session/forgotPasswordRequest.ts b/webclient/src/websocket/commands/session/forgotPasswordRequest.ts
deleted file mode 100644
index 5e5fe3bbd..000000000
--- a/webclient/src/websocket/commands/session/forgotPasswordRequest.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { ForgotPasswordParams } from 'store';
-import { StatusEnum, WebSocketConnectOptions } from 'types';
-
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-import { disconnect, updateStatus } from './';
-
-export function forgotPasswordRequest(options: WebSocketConnectOptions): void {
-  const { userName } = options as unknown as ForgotPasswordParams;
-
-  const forgotPasswordConfig = {
-    ...webClient.clientConfig,
-    userName,
-  };
-
-  const command = webClient.protobuf.controller.Command_ForgotPasswordRequest.create(forgotPasswordConfig);
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_ForgotPasswordRequest.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    if (raw.responseCode === webClient.protobuf.controller.Response.ResponseCode.RespOk) {
-      const resp = raw['.Response_ForgotPasswordRequest.ext'];
-
-      if (resp.challengeEmail) {
-        updateStatus(StatusEnum.DISCONNECTED, null);
-        SessionPersistence.resetPasswordChallenge();
-      } else {
-        updateStatus(StatusEnum.DISCONNECTED, null);
-        SessionPersistence.resetPassword();
-      }
-    } else {
-      updateStatus(StatusEnum.DISCONNECTED, null);
-      SessionPersistence.resetPasswordFailed();
-    }
-
-    disconnect();
-  });
-}
diff --git a/webclient/src/websocket/commands/session/forgotPasswordReset.ts b/webclient/src/websocket/commands/session/forgotPasswordReset.ts
deleted file mode 100644
index 9312b71af..000000000
--- a/webclient/src/websocket/commands/session/forgotPasswordReset.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { ForgotPasswordResetParams } from 'store';
-import { StatusEnum, WebSocketConnectOptions } from 'types';
-
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-import { hashPassword } from '../../utils';
-
-import { disconnect, updateStatus } from '.';
-
-export function forgotPasswordReset(options: WebSocketConnectOptions, passwordSalt?: string): void {
-  const { userName, token, newPassword } = options as unknown as ForgotPasswordResetParams;
-
-  const forgotPasswordResetConfig: any = {
-    ...webClient.clientConfig,
-    userName,
-    token,
-  };
-
-  if (passwordSalt) {
-    forgotPasswordResetConfig.hashedNewPassword = hashPassword(passwordSalt, newPassword);
-  } else {
-    forgotPasswordResetConfig.newPassword = newPassword;
-  }
-
-  const command = webClient.protobuf.controller.Command_ForgotPasswordReset.create(forgotPasswordResetConfig);
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_ForgotPasswordReset.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    if (raw.responseCode === webClient.protobuf.controller.Response.ResponseCode.RespOk) {
-      updateStatus(StatusEnum.DISCONNECTED, null);
-      SessionPersistence.resetPasswordSuccess();
-    } else {
-      updateStatus(StatusEnum.DISCONNECTED, null);
-      SessionPersistence.resetPasswordFailed();
-    }
-
-    disconnect();
-  });
-}
diff --git a/webclient/src/websocket/commands/session/getGamesOfUser.ts b/webclient/src/websocket/commands/session/getGamesOfUser.ts
deleted file mode 100644
index 507ba3e20..000000000
--- a/webclient/src/websocket/commands/session/getGamesOfUser.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-export function getGamesOfUser(userName: string): void {
-  const command = webClient.protobuf.controller.Command_GetGamesOfUser.create({ userName });
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_GetGamesOfUser.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    const { responseCode } = raw;
-    const response = raw['.Response_GetGamesOfUser.ext'];
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        SessionPersistence.getGamesOfUser(userName, response);
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespFunctionNotAllowed:
-        console.log('Not allowed');
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespWrongPassword:
-        console.log('Wrong password');
-        break;
-      default:
-        console.log('Failed to update information');
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/session/getUserInfo.ts b/webclient/src/websocket/commands/session/getUserInfo.ts
deleted file mode 100644
index 709cc0baa..000000000
--- a/webclient/src/websocket/commands/session/getUserInfo.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-export function getUserInfo(userName: string): void {
-  const command = webClient.protobuf.controller.Command_GetUserInfo.create({ userName });
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_GetUserInfo.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    const { responseCode } = raw;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        const { userInfo } = raw['.Response_GetUserInfo.ext'];
-        SessionPersistence.getUserInfo(userInfo);
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespFunctionNotAllowed:
-        console.log('Not allowed');
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespWrongPassword:
-        console.log('Wrong password');
-        break;
-      default:
-        console.log('Failed to update information');
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/session/index.ts b/webclient/src/websocket/commands/session/index.ts
deleted file mode 100644
index 829a74b71..000000000
--- a/webclient/src/websocket/commands/session/index.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-export * from './accountEdit';
-export * from './accountImage';
-export * from './accountPassword';
-export * from './activate';
-export * from './addToList';
-export * from './connect';
-export * from './deckDel';
-export * from './deckDelDir';
-export * from './deckDownload';
-export * from './deckList';
-export * from './deckNewDir';
-export * from './deckUpload';
-export * from './disconnect';
-export * from './forgotPasswordChallenge'
-export * from './forgotPasswordRequest';
-export * from './forgotPasswordReset';
-export * from './getGamesOfUser';
-export * from './getUserInfo';
-export * from './joinRoom';
-export * from './listRooms';
-export * from './listUsers';
-export * from './login';
-export * from './message';
-export * from './ping';
-export * from './register';
-export * from './removeFromList';
-export * from './requestPasswordSalt';
-export * from './updateStatus';
-
-/** TODO
- * REPLAY_DELETE_MATCH
- * REPLAY_DOWNLOAD
- * REPLAY_LIST
- * REPLAY_MODIFY_MATCH
- */
diff --git a/webclient/src/websocket/commands/session/joinRoom.ts b/webclient/src/websocket/commands/session/joinRoom.ts
deleted file mode 100644
index 9f4699708..000000000
--- a/webclient/src/websocket/commands/session/joinRoom.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import webClient from '../../WebClient';
-import { RoomPersistence } from '../../persistence';
-
-export function joinRoom(roomId: number): void {
-  const command = webClient.protobuf.controller.Command_JoinRoom.create({ roomId });
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_JoinRoom.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, (raw) => {
-    const { responseCode } = raw;
-
-    let error: string;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        const { roomInfo } = raw['.Response_JoinRoom.ext'];
-
-        RoomPersistence.joinRoom(roomInfo);
-        return;
-      case webClient.protobuf.controller.Response.ResponseCode.RespNameNotFound:
-        error = 'Failed to join the room: it doesn\'t exist on the server.';
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespContextError:
-        error = 'The server thinks you are in the room but Cockatrice is unable to display it. Try restarting Cockatrice.';
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespUserLevelTooLow:
-        error = 'You do not have the required permission to join this room.';
-        break;
-      default:
-        error = 'Failed to join the room due to an unknown error.';
-        break;
-    }
-
-    if (error) {
-      console.error(responseCode, error);
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/session/listRooms.ts b/webclient/src/websocket/commands/session/listRooms.ts
deleted file mode 100644
index b1e31621f..000000000
--- a/webclient/src/websocket/commands/session/listRooms.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import webClient from '../../WebClient';
-
-export function listRooms(): void {
-  const command = webClient.protobuf.controller.Command_ListRooms.create();
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_ListRooms.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc);
-}
diff --git a/webclient/src/websocket/commands/session/listUsers.ts b/webclient/src/websocket/commands/session/listUsers.ts
deleted file mode 100644
index 027a251d4..000000000
--- a/webclient/src/websocket/commands/session/listUsers.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-export function listUsers(): void {
-  const command = webClient.protobuf.controller.Command_ListUsers.create();
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_ListUsers.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    const { responseCode } = raw;
-    const response = raw['.Response_ListUsers.ext'];
-
-    if (response) {
-      switch (responseCode) {
-        case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-          SessionPersistence.updateUsers(response.userList);
-          break;
-        default:
-          console.log(`Failed to fetch Server Rooms [${responseCode}] : `, raw);
-      }
-    }
-
-  });
-}
diff --git a/webclient/src/websocket/commands/session/login.ts b/webclient/src/websocket/commands/session/login.ts
deleted file mode 100644
index db24b4f46..000000000
--- a/webclient/src/websocket/commands/session/login.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { StatusEnum, WebSocketConnectOptions } from 'types';
-import webClient from '../../WebClient';
-import { hashPassword } from '../../utils';
-import { SessionPersistence } from '../../persistence';
-
-import {
-  disconnect,
-  listUsers,
-  listRooms,
-  updateStatus,
-} from './';
-
-export function login(options: WebSocketConnectOptions, passwordSalt?: string): void {
-  const { userName, password, hashedPassword } = options;
-
-  const loginConfig: any = {
-    ...webClient.clientConfig,
-    clientid: 'webatrice',
-    userName,
-  };
-
-  if (passwordSalt) {
-    loginConfig.hashedPassword = hashedPassword || hashPassword(passwordSalt, password);
-  } else {
-    loginConfig.password = password;
-  }
-
-  const command = webClient.protobuf.controller.Command_Login.create(loginConfig);
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_Login.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    const resp = raw['.Response_Login.ext'];
-
-    if (raw.responseCode === webClient.protobuf.controller.Response.ResponseCode.RespOk) {
-      const { buddyList, ignoreList, userInfo } = resp;
-
-      SessionPersistence.updateBuddyList(buddyList);
-      SessionPersistence.updateIgnoreList(ignoreList);
-      SessionPersistence.updateUser(userInfo);
-      SessionPersistence.loginSuccessful(loginConfig);
-
-      listUsers();
-      listRooms();
-
-      updateStatus(StatusEnum.LOGGED_IN, 'Logged in.');
-
-      return;
-    }
-
-    switch (raw.responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespClientUpdateRequired:
-        updateStatus(StatusEnum.DISCONNECTED, 'Login failed: missing features');
-        break;
-
-      case webClient.protobuf.controller.Response.ResponseCode.RespWrongPassword:
-      case webClient.protobuf.controller.Response.ResponseCode.RespUsernameInvalid:
-        updateStatus(StatusEnum.DISCONNECTED, 'Login failed: incorrect username or password');
-        break;
-
-      case webClient.protobuf.controller.Response.ResponseCode.RespWouldOverwriteOldSession:
-        updateStatus(StatusEnum.DISCONNECTED, 'Login failed: duplicated user session');
-        break;
-
-      case webClient.protobuf.controller.Response.ResponseCode.RespUserIsBanned:
-        updateStatus(StatusEnum.DISCONNECTED, 'Login failed: banned user');
-        break;
-
-      case webClient.protobuf.controller.Response.ResponseCode.RespRegistrationRequired:
-        updateStatus(StatusEnum.DISCONNECTED, 'Login failed: registration required');
-        break;
-
-      case webClient.protobuf.controller.Response.ResponseCode.RespClientIdRequired:
-        updateStatus(StatusEnum.DISCONNECTED, 'Login failed: missing client ID');
-        break;
-
-      case webClient.protobuf.controller.Response.ResponseCode.RespContextError:
-        updateStatus(StatusEnum.DISCONNECTED, 'Login failed: server error');
-        break;
-
-      case webClient.protobuf.controller.Response.ResponseCode.RespAccountNotActivated:
-        updateStatus(StatusEnum.DISCONNECTED, 'Login failed: account not activated');
-        SessionPersistence.accountAwaitingActivation(options);
-        break;
-
-      default:
-        updateStatus(StatusEnum.DISCONNECTED, `Login failed: unknown error: ${raw.responseCode}`);
-    }
-
-    SessionPersistence.loginFailed();
-    disconnect();
-  });
-}
diff --git a/webclient/src/websocket/commands/session/message.ts b/webclient/src/websocket/commands/session/message.ts
deleted file mode 100644
index 99b615562..000000000
--- a/webclient/src/websocket/commands/session/message.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-export function message(userName: string, message: string): void {
-  const command = webClient.protobuf.controller.Command_Message.create({ userName, message });
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_Message.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    const { responseCode } = raw;
-
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        SessionPersistence.directMessageSent(userName, message);
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespNameNotFound:
-        console.log('Name not found');
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespInIgnoreList:
-        console.log('On ignore list');
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespChatFlood:
-        console.log('Flooding chat');
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespWrongPassword:
-        console.log('Wrong password');
-        break;
-      default:
-        console.log('Failed to send direct message');
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/session/ping.ts b/webclient/src/websocket/commands/session/ping.ts
deleted file mode 100644
index 795e0f71f..000000000
--- a/webclient/src/websocket/commands/session/ping.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import webClient from '../../WebClient';
-
-export function ping(pingReceived: Function): void {
-  const command = webClient.protobuf.controller.Command_Ping.create();
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_Ping.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, pingReceived);
-}
diff --git a/webclient/src/websocket/commands/session/register.ts b/webclient/src/websocket/commands/session/register.ts
deleted file mode 100644
index 45b2fa977..000000000
--- a/webclient/src/websocket/commands/session/register.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { ServerRegisterParams } from 'store';
-import { WebSocketConnectOptions } from 'types';
-
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-import { hashPassword } from '../../utils';
-import NormalizeService from '../../utils/NormalizeService';
-
-import { login, disconnect } from './';
-
-export function register(options: WebSocketConnectOptions, passwordSalt?: string): void {
-  const { userName, password, email, country, realName } = options as ServerRegisterParams;
-
-  const registerConfig: any = {
-    ...webClient.clientConfig,
-    userName,
-    email,
-    country,
-    realName,
-  };
-
-  if (passwordSalt) {
-    registerConfig.hashedPassword = hashPassword(passwordSalt, password);
-  } else {
-    registerConfig.password = password;
-  }
-
-  const command = webClient.protobuf.controller.Command_Register.create(registerConfig);
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_Register.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    if (raw.responseCode === webClient.protobuf.controller.Response.ResponseCode.RespRegistrationAccepted) {
-      login(options, passwordSalt);
-      SessionPersistence.registrationSuccess()
-      return;
-    }
-
-    switch (raw.responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespRegistrationAcceptedNeedsActivation:
-        SessionPersistence.accountAwaitingActivation(options);
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespUserAlreadyExists:
-        SessionPersistence.registrationUserNameError('Username is taken');
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespUsernameInvalid:
-        SessionPersistence.registrationUserNameError('Invalid username');
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespPasswordTooShort:
-        SessionPersistence.registrationPasswordError('Your password was too short');
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespEmailRequiredToRegister:
-        SessionPersistence.registrationRequiresEmail();
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespEmailBlackListed:
-        SessionPersistence.registrationEmailError('This email provider has been blocked');
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespTooManyRequests:
-        SessionPersistence.registrationEmailError('Max accounts reached for this email');
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespRegistrationDisabled:
-        SessionPersistence.registrationFailed('Registration is currently disabled');
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespUserIsBanned:
-        SessionPersistence.registrationFailed(raw.reasonStr, raw.endTime);
-        break;
-      case webClient.protobuf.controller.Response.ResponseCode.RespRegistrationFailed:
-      default:
-        SessionPersistence.registrationFailed('Registration failed due to a server issue');
-        break;
-    }
-
-    disconnect();
-  });
-}
diff --git a/webclient/src/websocket/commands/session/removeFromList.ts b/webclient/src/websocket/commands/session/removeFromList.ts
deleted file mode 100644
index 222d9c57d..000000000
--- a/webclient/src/websocket/commands/session/removeFromList.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-export function removeFromBuddyList(userName: string): void {
-  removeFromList('buddy', userName);
-}
-
-export function removeFromIgnoreList(userName: string): void {
-  removeFromList('ignore', userName);
-}
-
-export function removeFromList(list: string, userName: string): void {
-  const command = webClient.protobuf.controller.Command_RemoveFromList.create({ list, userName });
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_RemoveFromList.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, ({ responseCode }) => {
-    switch (responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk:
-        SessionPersistence.removeFromList(list, userName);
-        break;
-      default:
-        console.error('Failed to remove from list', responseCode);
-    }
-  });
-}
diff --git a/webclient/src/websocket/commands/session/requestPasswordSalt.ts b/webclient/src/websocket/commands/session/requestPasswordSalt.ts
deleted file mode 100644
index b7ab5ef92..000000000
--- a/webclient/src/websocket/commands/session/requestPasswordSalt.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { RequestPasswordSaltParams } from 'store';
-import { StatusEnum, WebSocketConnectOptions, WebSocketConnectReason } from 'types';
-
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-import {
-  activate,
-  disconnect,
-  login,
-  forgotPasswordReset,
-  updateStatus
-} from './';
-
-export function requestPasswordSalt(options: WebSocketConnectOptions): void {
-  const { userName } = options as RequestPasswordSaltParams;
-
-  const registerConfig = {
-    ...webClient.clientConfig,
-    userName,
-  };
-
-  const command = webClient.protobuf.controller.Command_RequestPasswordSalt.create(registerConfig);
-  const sc = webClient.protobuf.controller.SessionCommand.create({ '.Command_RequestPasswordSalt.ext': command });
-
-  webClient.protobuf.sendSessionCommand(sc, raw => {
-    switch (raw.responseCode) {
-      case webClient.protobuf.controller.Response.ResponseCode.RespOk: {
-        const passwordSalt = raw['.Response_PasswordSalt.ext']?.passwordSalt;
-
-        switch (options.reason) {
-          case WebSocketConnectReason.ACTIVATE_ACCOUNT: {
-            activate(options, passwordSalt);
-            break;
-          }
-
-          case WebSocketConnectReason.PASSWORD_RESET: {
-            forgotPasswordReset(options, passwordSalt);
-            break;
-          }
-
-          case WebSocketConnectReason.LOGIN:
-          default: {
-            login(options, passwordSalt);
-          }
-        }
-
-        return;
-      }
-      case webClient.protobuf.controller.Response.ResponseCode.RespRegistrationRequired: {
-        updateStatus(StatusEnum.DISCONNECTED, 'Login failed: registration required');
-        break;
-      }
-      default: {
-        updateStatus(StatusEnum.DISCONNECTED, 'Login failed: Unknown Reason');
-      }
-    }
-
-    switch (options.reason) {
-      case WebSocketConnectReason.ACTIVATE_ACCOUNT: {
-        SessionPersistence.accountActivationFailed();
-        break;
-      }
-
-      case WebSocketConnectReason.PASSWORD_RESET: {
-        SessionPersistence.resetPasswordFailed();
-        break;
-      }
-
-      case WebSocketConnectReason.LOGIN:
-      default: {
-        SessionPersistence.loginFailed();
-      }
-    }
-
-    disconnect();
-  });
-}
diff --git a/webclient/src/websocket/commands/session/updateStatus.ts b/webclient/src/websocket/commands/session/updateStatus.ts
deleted file mode 100644
index eddd774f8..000000000
--- a/webclient/src/websocket/commands/session/updateStatus.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { StatusEnum } from 'types';
-import webClient from '../../WebClient';
-import { SessionPersistence } from '../../persistence';
-
-export function updateStatus(status: StatusEnum, description: string): void {
-  SessionPersistence.updateStatus(status, description);
-
-  webClient.updateStatus(status);
-}
diff --git a/webclient/src/websocket/events/common/index.ts b/webclient/src/websocket/events/common/index.ts
deleted file mode 100644
index 77a325c1e..000000000
--- a/webclient/src/websocket/events/common/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { ProtobufEvents } from '../../services/ProtobufService';
-import { playerPropertiesChanged } from './playerPropertiesChanged';
-
-export const CommonEvents: ProtobufEvents = {
-  '.Event_PlayerPropertiesChanged.ext': playerPropertiesChanged,
-}
diff --git a/webclient/src/websocket/events/common/playerPropertiesChanged.ts b/webclient/src/websocket/events/common/playerPropertiesChanged.ts
deleted file mode 100644
index 557e57ac9..000000000
--- a/webclient/src/websocket/events/common/playerPropertiesChanged.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { PlayerGamePropertiesData } from '../session/interfaces';
-import { SessionPersistence } from '../../persistence';
-
-export function playerPropertiesChanged(payload: PlayerGamePropertiesData): void {
-  SessionPersistence.playerPropertiesChanged(payload);
-}
diff --git a/webclient/src/websocket/events/game/index.ts b/webclient/src/websocket/events/game/index.ts
deleted file mode 100644
index 895eadfef..000000000
--- a/webclient/src/websocket/events/game/index.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { ProtobufEvents } from '../../services/ProtobufService';
-import { joinGame } from './joinGame';
-import { leaveGame } from './leaveGame';
-
-
-export const GameEvents: ProtobufEvents = {
-  '.Event_Join.ext': () => joinGame,
-  '.Event_Leave.ext': () => leaveGame,
-  '.Event_GameClosed.ext': () => console.log('Event_GameClosed.ext'),
-  '.Event_GameHostChanged.ext': () => console.log('Event_GameHostChanged.ext'),
-  '.Event_Kicked.ext': () => console.log('Event_Kicked.ext'),
-  '.Event_GameStateChanged.ext': () => console.log('Event_GameStateChanged.ext'),
-  // '.Event_PlayerPropertiesChanged.ext': () => console.log("Event_PlayerProperties.ext"),
-  '.Event_GameSay.ext': () => console.log('Event_GameSay.ext'),
-  '.Event_CreateArrow.ext': () => console.log('Event_CreateArrow.ext'),
-  '.Event_DeleteArrow.ext': () => console.log('Event_DeleteArrow.ext'),
-  '.Event_CreateCounter.ext': () => console.log('Event_CreateCounter.ext'),
-  '.Event_SetCounter.ext': () => console.log('Event_SetCounter.ext'),
-  '.Event_DelCounter.ext': () => console.log('Event_DelCounter.ext'),
-  '.Event_DrawCards.ext': () => console.log('Event_DrawCards.ext'),
-  '.Event_RevealCards.ext': () => console.log('Event_RevealCards.ext'),
-  '.Event_Shuffle.ext': () => console.log('Event_Shuffle.ext'),
-  '.Event_RollDie.ext': () => console.log('Event_Roll.ext'),
-  '.Event_MoveCard.ext': () => console.log('Event_MoveCard.ext'),
-  '.Event_FlipCard.ext': () => console.log('Event_FlipCard.ext'),
-  '.Event_DestroyCard.ext': () => console.log('Event_DestroyCard.ext'),
-  '.Event_AttachCard.ext': () => console.log('Event_AttachCard.ext'),
-  '.Event_CreateToken.ext': () => console.log('Event_CreateToken.ext'),
-  '.Event_SetCardAttribute.ext': () => console.log('Event_SetCardAttribute.ext'),
-  '.Event_SetCardCounter.ext': () => console.log('Event_SetCardCounter.ext'),
-  '.Event_SetActivePlayer.ext': () => console.log('Event_SetActivePlayer.ext'),
-  '.Event_SetActivePhase.ext': () => console.log('Event_SetActivePhase.ext'),
-  '.Event_DumpZone.ext': () => console.log('Event_DumpZone.ext'),
-  '.Event_ChangeZoneProperties.ext': () => console.log('Event_ChangeZoneProperties.ext'),
-  '.Event_ReverseTurn.ext': () => console.log('Event_ReverseTurn.ext'),
-};
diff --git a/webclient/src/websocket/events/game/joinGame.ts b/webclient/src/websocket/events/game/joinGame.ts
deleted file mode 100644
index 30cef87dc..000000000
--- a/webclient/src/websocket/events/game/joinGame.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { GamePersistence } from '../../persistence';
-import { PlayerGamePropertiesData } from '../session/interfaces';
-
-export function joinGame(playerGamePropertiesData: PlayerGamePropertiesData): void {
-  GamePersistence.joinGame(playerGamePropertiesData);
-}
diff --git a/webclient/src/websocket/events/game/leaveGame.ts b/webclient/src/websocket/events/game/leaveGame.ts
deleted file mode 100644
index 74a4dc6c5..000000000
--- a/webclient/src/websocket/events/game/leaveGame.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { LeaveGameReason } from 'types';
-import { GamePersistence } from '../../persistence';
-
-
-export function leaveGame(reason: LeaveGameReason): void {
-  GamePersistence.leaveGame(reason);
-}
diff --git a/webclient/src/websocket/events/index.ts b/webclient/src/websocket/events/index.ts
deleted file mode 100644
index ed74f9b93..000000000
--- a/webclient/src/websocket/events/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './common';
-export * from './room';
-export * from './session';
-export * from './game';
diff --git a/webclient/src/websocket/events/room/index.ts b/webclient/src/websocket/events/room/index.ts
deleted file mode 100644
index 5b571d388..000000000
--- a/webclient/src/websocket/events/room/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { ProtobufEvents } from '../../services/ProtobufService';
-
-import { joinRoom } from './joinRoom';
-import { leaveRoom } from './leaveRoom';
-import { listGames } from './listGames';
-import { roomSay } from './roomSay';
-import { removeMessages } from './removeMessages';
-
-export const RoomEvents: ProtobufEvents = {
-  '.Event_JoinRoom.ext': joinRoom,
-  '.Event_LeaveRoom.ext': leaveRoom,
-  '.Event_ListGames.ext': listGames,
-  '.Event_RemoveMessages.ext': removeMessages,
-  '.Event_RoomSay.ext': roomSay,
-};
diff --git a/webclient/src/websocket/events/room/interfaces.ts b/webclient/src/websocket/events/room/interfaces.ts
deleted file mode 100644
index b3f922141..000000000
--- a/webclient/src/websocket/events/room/interfaces.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Game, User } from 'types';
-
-export interface JoinRoomData {
-  userInfo: User;
-}
-
-export interface LeaveRoomData {
-  name: string;
-}
-
-export interface ListGamesData {
-  gameList: Game[];
-}
-
-export interface RemoveMessagesData {
-  name: string;
-  amount: number;
-}
-
-export interface RoomEvent {
-  roomEvent: {
-    roomId: number;
-  }
-}
diff --git a/webclient/src/websocket/events/room/joinRoom.ts b/webclient/src/websocket/events/room/joinRoom.ts
deleted file mode 100644
index b1a5f6606..000000000
--- a/webclient/src/websocket/events/room/joinRoom.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { RoomPersistence } from '../../persistence';
-import { JoinRoomData, RoomEvent } from './interfaces';
-
-export function joinRoom({ userInfo }: JoinRoomData, { roomEvent: { roomId } }: RoomEvent): void {
-  RoomPersistence.userJoined(roomId, userInfo);
-}
diff --git a/webclient/src/websocket/events/room/leaveRoom.ts b/webclient/src/websocket/events/room/leaveRoom.ts
deleted file mode 100644
index 6d45197fc..000000000
--- a/webclient/src/websocket/events/room/leaveRoom.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { RoomPersistence } from '../../persistence';
-import { LeaveRoomData, RoomEvent } from './interfaces';
-
-export function leaveRoom({ name }: LeaveRoomData, { roomEvent: { roomId } }: RoomEvent): void {
-  RoomPersistence.userLeft(roomId, name);
-}
diff --git a/webclient/src/websocket/events/room/listGames.ts b/webclient/src/websocket/events/room/listGames.ts
deleted file mode 100644
index d460a5336..000000000
--- a/webclient/src/websocket/events/room/listGames.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { RoomPersistence } from '../../persistence';
-import { ListGamesData, RoomEvent } from './interfaces';
-
-export function listGames({ gameList }: ListGamesData, { roomEvent: { roomId } }: RoomEvent): void {
-  RoomPersistence.updateGames(roomId, gameList);
-}
diff --git a/webclient/src/websocket/events/room/removeMessages.ts b/webclient/src/websocket/events/room/removeMessages.ts
deleted file mode 100644
index 4fe01cb6f..000000000
--- a/webclient/src/websocket/events/room/removeMessages.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { RoomPersistence } from '../../persistence';
-import { RemoveMessagesData, RoomEvent } from './interfaces';
-
-export function removeMessages({ name, amount }: RemoveMessagesData, { roomEvent: { roomId } }: RoomEvent): void {
-  RoomPersistence.removeMessages(roomId, name, amount);
-}
diff --git a/webclient/src/websocket/events/room/roomSay.ts b/webclient/src/websocket/events/room/roomSay.ts
deleted file mode 100644
index 5a96198ea..000000000
--- a/webclient/src/websocket/events/room/roomSay.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Message } from 'types';
-
-import { RoomPersistence } from '../../persistence';
-import { RoomEvent } from './interfaces';
-
-export function roomSay(message: Message, { roomEvent: { roomId } }: RoomEvent): void {
-  RoomPersistence.addMessage(roomId, message);
-}
diff --git a/webclient/src/websocket/events/session/addToList.ts b/webclient/src/websocket/events/session/addToList.ts
deleted file mode 100644
index 08b19b45d..000000000
--- a/webclient/src/websocket/events/session/addToList.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { SessionPersistence } from '../../persistence';
-import { AddToListData } from './interfaces';
-
-export function addToList({ listName, userInfo }: AddToListData): void {
-  switch (listName) {
-    case 'buddy': {
-      SessionPersistence.addToBuddyList(userInfo);
-      break;
-    }
-    case 'ignore': {
-      SessionPersistence.addToIgnoreList(userInfo);
-      break;
-    }
-    default: {
-      console.log(`Attempted to add to unknown list: ${listName}`);
-    }
-  }
-}
diff --git a/webclient/src/websocket/events/session/connectionClosed.ts b/webclient/src/websocket/events/session/connectionClosed.ts
deleted file mode 100644
index 9c39db940..000000000
--- a/webclient/src/websocket/events/session/connectionClosed.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { StatusEnum } from 'types';
-import webClient from '../../WebClient';
-import { updateStatus } from '../../commands/session';
-import { ConnectionClosedData } from './interfaces';
-
-export function connectionClosed({ reason, reasonStr }: ConnectionClosedData): void {
-  let message: string;
-
-  // @TODO (5)
-  if (reasonStr) {
-    message = reasonStr;
-  } else {
-    switch (reason) {
-      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.USER_LIMIT_REACHED:
-        message = 'The server has reached its maximum user capacity';
-        break;
-      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.TOO_MANY_CONNECTIONS:
-        message = 'There are too many concurrent connections from your address';
-        break;
-      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.BANNED:
-        message = 'You are banned';
-        break;
-      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.DEMOTED:
-        message = 'You were demoted';
-        break;
-      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.SERVER_SHUTDOWN:
-        message = 'Scheduled server shutdown';
-        break;
-      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.USERNAMEINVALID:
-        message = 'Invalid username';
-        break;
-      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.LOGGEDINELSEWERE:
-        message = 'You have been logged out due to logging in at another location';
-        break;
-      case webClient.protobuf.controller.Event_ConnectionClosed.CloseReason.OTHER:
-      default:
-        message = 'Unknown reason';
-        break;
-    }
-  }
-
-  updateStatus(StatusEnum.DISCONNECTED, message);
-}
diff --git a/webclient/src/websocket/events/session/gameJoined.ts b/webclient/src/websocket/events/session/gameJoined.ts
deleted file mode 100644
index 8c0d49006..000000000
--- a/webclient/src/websocket/events/session/gameJoined.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { SessionPersistence } from '../../persistence';
-import { GameJoinedData } from './interfaces';
-
-export function gameJoined(gameJoined: GameJoinedData): void {
-  SessionPersistence.gameJoined(gameJoined);
-}
diff --git a/webclient/src/websocket/events/session/index.ts b/webclient/src/websocket/events/session/index.ts
deleted file mode 100644
index 9fe7bb1da..000000000
--- a/webclient/src/websocket/events/session/index.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { ProtobufEvents } from '../../services/ProtobufService';
-import { addToList } from './addToList';
-import { connectionClosed } from './connectionClosed';
-import { listRooms } from './listRooms';
-import { notifyUser } from './notifyUser';
-import { playerPropertiesChanged } from '../common/playerPropertiesChanged';
-import { removeFromList } from './removeFromList';
-import { serverIdentification } from './serverIdentification';
-import { serverMessage } from './serverMessage';
-import { serverShutdown } from './serverShutdown';
-import { userJoined } from './userJoined';
-import { userLeft } from './userLeft';
-import { userMessage } from './userMessage';
-import { gameJoined } from './gameJoined';
-
-export const SessionEvents: ProtobufEvents = {
-  '.Event_AddToList.ext': addToList,
-  '.Event_ConnectionClosed.ext': connectionClosed,
-  '.Event_GameJoined.ext': gameJoined,
-  '.Event_ListRooms.ext': listRooms,
-  '.Event_NotifyUser.ext': notifyUser,
-  '.Event_RemoveFromList.ext': removeFromList,
-  '.Event_ReplayAdded.ext': () => console.log('Event_ReplayAdded'),
-  '.Event_ServerCompleteList.ext': () => console.log('Event_ServerCompleteList'),
-  '.Event_ServerIdentification.ext': serverIdentification,
-  '.Event_ServerMessage.ext': serverMessage,
-  '.Event_ServerShutdown.ext': serverShutdown,
-  '.Event_UserJoined.ext': userJoined,
-  '.Event_UserLeft.ext': userLeft,
-  '.Event_UserMessage.ext': userMessage,
-}
diff --git a/webclient/src/websocket/events/session/interfaces.ts b/webclient/src/websocket/events/session/interfaces.ts
deleted file mode 100644
index 8a1827cbd..000000000
--- a/webclient/src/websocket/events/session/interfaces.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { Game, NotificationType, Room, User } from 'types';
-
-export interface AddToListData {
-  listName: string;
-  userInfo: User;
-}
-
-export interface ConnectionClosedData {
-  endTime: number;
-  reason: number;
-  reasonStr: string;
-}
-
-export interface GameJoinedData {
-  gameInfo: Game;
-  playerId: number;
-  spectator: boolean;
-  resuming: boolean;
-  judge: boolean;
-}
-
-export interface ListRoomsData {
-  roomList: Room[];
-}
-
-export interface NotifyUserData {
-  type: NotificationType;
-  warningReason: string;
-  customTitle: string;
-  customContent: string;
-}
-
-export interface PlayerGamePropertiesData {
-  playerId: number;
-  userInfo: User;
-  spectator: boolean;
-  conceded: boolean;
-  readyStart: boolean;
-  deckHash: string;
-  pingSeconds: number;
-  sideboardLocked: boolean;
-  judge: boolean;
-}
-
-export interface RemoveFromListData {
-  listName: string;
-  userName: string;
-}
-
-export interface ServerIdentificationData {
-  protocolVersion: number;
-  serverName: string;
-  serverVersion: string;
-  serverOptions: number;
-}
-
-export interface ServerMessageData {
-  message: string;
-}
-
-export interface ServerShutdownData {
-  reason: string;
-  minutes: number;
-}
-
-export interface UserJoinedData {
-  userInfo: User;
-}
-
-export interface UserLeftData {
-  name: string;
-}
-
-export interface UserMessageData {
-  senderName: string;
-  receiverName: string;
-  message: string;
-}
diff --git a/webclient/src/websocket/events/session/listRooms.ts b/webclient/src/websocket/events/session/listRooms.ts
deleted file mode 100644
index faba2968e..000000000
--- a/webclient/src/websocket/events/session/listRooms.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import webClient from '../../WebClient';
-import { joinRoom } from '../../commands/session';
-import { RoomPersistence } from '../../persistence';
-import { ListRoomsData } from './interfaces';
-
-export function listRooms({ roomList }: ListRoomsData): void {
-  RoomPersistence.updateRooms(roomList);
-
-  if (webClient.clientOptions.autojoinrooms) {
-    roomList.forEach(({ autoJoin, roomId }) => {
-      if (autoJoin) {
-        joinRoom(roomId);
-      }
-    });
-  }
-}
diff --git a/webclient/src/websocket/events/session/notifyUser.ts b/webclient/src/websocket/events/session/notifyUser.ts
deleted file mode 100644
index f5673fe3f..000000000
--- a/webclient/src/websocket/events/session/notifyUser.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { SessionPersistence } from '../../persistence';
-import { NotifyUserData } from './interfaces';
-
-
-export function notifyUser(payload: NotifyUserData): void {
-  SessionPersistence.notifyUser(payload);
-}
diff --git a/webclient/src/websocket/events/session/removeFromList.ts b/webclient/src/websocket/events/session/removeFromList.ts
deleted file mode 100644
index 20e2d7f54..000000000
--- a/webclient/src/websocket/events/session/removeFromList.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { SessionPersistence } from '../../persistence';
-import { RemoveFromListData } from './interfaces';
-
-export function removeFromList({ listName, userName }: RemoveFromListData): void {
-  switch (listName) {
-    case 'buddy': {
-      SessionPersistence.removeFromBuddyList(userName);
-      break;
-    }
-    case 'ignore': {
-      SessionPersistence.removeFromIgnoreList(userName);
-      break;
-    }
-    default: {
-      console.log(`Attempted to remove from unknown list: ${listName}`);
-    }
-  }
-}
diff --git a/webclient/src/websocket/events/session/serverIdentification.ts b/webclient/src/websocket/events/session/serverIdentification.ts
deleted file mode 100644
index ce89e1f3c..000000000
--- a/webclient/src/websocket/events/session/serverIdentification.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { StatusEnum, WebSocketConnectReason } from 'types';
-
-import webClient from '../../WebClient';
-import {
-  activate,
-  disconnect,
-  login,
-  register,
-  requestPasswordSalt,
-  forgotPasswordChallenge,
-  forgotPasswordRequest,
-  forgotPasswordReset,
-  updateStatus,
-} from '../../commands/session';
-import { generateSalt, passwordSaltSupported } from '../../utils';
-import { ServerIdentificationData } from './interfaces';
-import { SessionPersistence } from '../../persistence';
-
-export function serverIdentification(info: ServerIdentificationData): void {
-  const { serverName, serverVersion, protocolVersion, serverOptions } = info;
-  if (protocolVersion !== webClient.protocolVersion) {
-    updateStatus(StatusEnum.DISCONNECTED, `Protocol version mismatch: ${protocolVersion}`);
-    disconnect();
-    return;
-  }
-
-  const getPasswordSalt = passwordSaltSupported(serverOptions, webClient);
-  const { options } = webClient;
-
-  switch (options.reason) {
-    case WebSocketConnectReason.LOGIN:
-      updateStatus(StatusEnum.LOGGING_IN, 'Logging In...');
-      if (getPasswordSalt) {
-        requestPasswordSalt(options);
-      } else {
-        login(options);
-      }
-      break;
-    case WebSocketConnectReason.REGISTER:
-      const passwordSalt = getPasswordSalt ? generateSalt() : null;
-      register(options, passwordSalt);
-      break;
-    case WebSocketConnectReason.ACTIVATE_ACCOUNT:
-      if (getPasswordSalt) {
-        requestPasswordSalt(options);
-      } else {
-        activate(options);
-      }
-      break;
-    case WebSocketConnectReason.PASSWORD_RESET_REQUEST:
-      forgotPasswordRequest(options);
-      break;
-    case WebSocketConnectReason.PASSWORD_RESET_CHALLENGE:
-      forgotPasswordChallenge(options);
-      break;
-    case WebSocketConnectReason.PASSWORD_RESET:
-      if (getPasswordSalt) {
-        requestPasswordSalt(options);
-      } else {
-        forgotPasswordReset(options);
-      }
-      break;
-    default:
-      updateStatus(StatusEnum.DISCONNECTED, 'Unknown Connection Reason: ' + options.reason);
-      disconnect();
-      break;
-  }
-
-  webClient.options = {};
-  SessionPersistence.updateInfo(serverName, serverVersion);
-}
diff --git a/webclient/src/websocket/events/session/serverMessage.ts b/webclient/src/websocket/events/session/serverMessage.ts
deleted file mode 100644
index f9e52aa7a..000000000
--- a/webclient/src/websocket/events/session/serverMessage.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { SessionPersistence } from '../../persistence';
-import { ServerMessageData } from './interfaces';
-
-export function serverMessage({ message }: ServerMessageData): void {
-  SessionPersistence.serverMessage(message);
-}
diff --git a/webclient/src/websocket/events/session/serverShutdown.ts b/webclient/src/websocket/events/session/serverShutdown.ts
deleted file mode 100644
index cdda893a4..000000000
--- a/webclient/src/websocket/events/session/serverShutdown.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { SessionPersistence } from '../../persistence';
-import { ServerShutdownData } from './interfaces';
-
-
-export function serverShutdown(payload: ServerShutdownData): void {
-  SessionPersistence.serverShutdown(payload);
-}
diff --git a/webclient/src/websocket/events/session/userJoined.ts b/webclient/src/websocket/events/session/userJoined.ts
deleted file mode 100644
index cb512db60..000000000
--- a/webclient/src/websocket/events/session/userJoined.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { SessionPersistence } from '../../persistence';
-import { UserJoinedData } from './interfaces';
-
-export function userJoined({ userInfo }: UserJoinedData): void {
-  SessionPersistence.userJoined(userInfo);
-}
diff --git a/webclient/src/websocket/events/session/userLeft.ts b/webclient/src/websocket/events/session/userLeft.ts
deleted file mode 100644
index 9e00e59e1..000000000
--- a/webclient/src/websocket/events/session/userLeft.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { SessionPersistence } from '../../persistence';
-import { UserLeftData } from './interfaces';
-
-export function userLeft({ name }: UserLeftData): void {
-  SessionPersistence.userLeft(name);
-}
diff --git a/webclient/src/websocket/events/session/userMessage.ts b/webclient/src/websocket/events/session/userMessage.ts
deleted file mode 100644
index bff08460b..000000000
--- a/webclient/src/websocket/events/session/userMessage.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { SessionPersistence } from '../../persistence';
-import { UserMessageData } from './interfaces';
-
-
-
-export function userMessage(payload: UserMessageData): void {
-  SessionPersistence.userMessage(payload);
-}
diff --git a/webclient/src/websocket/index.ts b/webclient/src/websocket/index.ts
deleted file mode 100644
index b52c97168..000000000
--- a/webclient/src/websocket/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './commands';
-
-export { default as webClient } from './WebClient';
diff --git a/webclient/src/websocket/persistence/AdminPresistence.ts b/webclient/src/websocket/persistence/AdminPresistence.ts
deleted file mode 100644
index 9552d8abf..000000000
--- a/webclient/src/websocket/persistence/AdminPresistence.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ServerDispatch } from 'store';
-
-export class AdminPersistence {
-  static adjustMod(userName: string, shouldBeMod: boolean, shouldBeJudge: boolean) {
-    ServerDispatch.adjustMod(userName, shouldBeMod, shouldBeJudge)
-  }
-
-  static reloadConfig() {
-    ServerDispatch.reloadConfig();
-  }
-
-  static shutdownServer() {
-    ServerDispatch.shutdownServer();
-  }
-
-  static updateServerMessage() {
-    ServerDispatch.updateServerMessage();
-  }
-}
diff --git a/webclient/src/websocket/persistence/GamePersistence.ts b/webclient/src/websocket/persistence/GamePersistence.ts
deleted file mode 100644
index e39c1b5a9..000000000
--- a/webclient/src/websocket/persistence/GamePersistence.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { PlayerGamePropertiesData } from '../events/session/interfaces';
-import { LeaveGameReason } from '../../types';
-
-export class GamePersistence {
-  static joinGame(playerGamePropertiesData: PlayerGamePropertiesData) {
-    console.log('joinGame', playerGamePropertiesData);
-  }
-
-  static leaveGame(reason: LeaveGameReason) {
-    console.log('leaveGame', reason);
-  }
-}
diff --git a/webclient/src/websocket/persistence/ModeratorPresistence.ts b/webclient/src/websocket/persistence/ModeratorPresistence.ts
deleted file mode 100644
index e6a57f601..000000000
--- a/webclient/src/websocket/persistence/ModeratorPresistence.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { ServerDispatch } from 'store';
-import { BanHistoryItem, LogItem, WarnHistoryItem, WarnListItem } from 'types';
-
-import NormalizeService from '../utils/NormalizeService';
-
-export class ModeratorPersistence {
-  static banFromServer(userName: string): void {
-    ServerDispatch.banFromServer(userName);
-  }
-
-  static banHistory(userName: string, banHistory: BanHistoryItem[]): void {
-    ServerDispatch.banHistory(userName, banHistory);
-  }
-
-  static viewLogs(logs: LogItem[]): void {
-    ServerDispatch.viewLogs(NormalizeService.normalizeLogs(logs));
-  }
-
-  static warnHistory(userName: string, warnHistory: WarnHistoryItem[]): void {
-    ServerDispatch.warnHistory(userName, warnHistory);
-  }
-
-  static warnListOptions(warnList: WarnListItem[]): void {
-    ServerDispatch.warnListOptions(warnList);
-  }
-
-  static warnUser(userName: string): void {
-    ServerDispatch.warnUser(userName);
-  }
-}
diff --git a/webclient/src/websocket/persistence/RoomPersistence.ts b/webclient/src/websocket/persistence/RoomPersistence.ts
deleted file mode 100644
index a69e79338..000000000
--- a/webclient/src/websocket/persistence/RoomPersistence.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { store, RoomsDispatch, RoomsSelectors } from 'store';
-import { Game, Message, Room, User } from 'types';
-import NormalizeService from '../utils/NormalizeService';
-
-export class RoomPersistence {
-  static clearStore() {
-    RoomsDispatch.clearStore();
-  }
-
-  static joinRoom(roomInfo: Room) {
-    NormalizeService.normalizeRoomInfo(roomInfo);
-    RoomsDispatch.joinRoom(roomInfo);
-  }
-
-  static leaveRoom(roomId: number) {
-    RoomsDispatch.leaveRoom(roomId);
-  }
-
-  static updateRooms(rooms: Room[]) {
-    RoomsDispatch.updateRooms(rooms);
-  }
-
-  static updateGames(roomId: number, gameList: Game[]) {
-    const game = gameList[0];
-
-    if (!game.gameType) {
-      const room = RoomsSelectors.getRoom(store.getState(), roomId);
-
-      if (room) {
-        const { gametypeMap } = room;
-        NormalizeService.normalizeGameObject(game, gametypeMap);
-      }
-    }
-
-    RoomsDispatch.updateGames(roomId, gameList);
-  }
-
-  static addMessage(roomId: number, message: Message) {
-    NormalizeService.normalizeUserMessage(message);
-
-    RoomsDispatch.addMessage(roomId, message);
-  }
-
-  static userJoined(roomId: number, user: User) {
-    RoomsDispatch.userJoined(roomId, user);
-  }
-
-  static userLeft(roomId: number, name: string) {
-    RoomsDispatch.userLeft(roomId, name);
-  }
-
-  static removeMessages(roomId: number, name: string, amount: number): void {
-    RoomsDispatch.removeMessages(roomId, name, amount);
-  };
-
-  static gameCreated(roomId: number) {
-    RoomsDispatch.gameCreated(roomId);
-  }
-
-  static joinedGame(roomId: number, gameId: number) {
-    RoomsDispatch.joinedGame(roomId, gameId);
-  }
-}
diff --git a/webclient/src/websocket/persistence/SessionPersistence.ts b/webclient/src/websocket/persistence/SessionPersistence.ts
deleted file mode 100644
index c9248745c..000000000
--- a/webclient/src/websocket/persistence/SessionPersistence.ts
+++ /dev/null
@@ -1,237 +0,0 @@
-import { ServerDispatch } from 'store';
-import { DeckStorageTreeItem, StatusEnum, User, WebSocketConnectOptions } from 'types';
-
-import { sanitizeHtml } from 'websocket/utils';
-import {
-  GameJoinedData,
-  NotifyUserData,
-  PlayerGamePropertiesData,
-  ServerShutdownData,
-  UserMessageData
-} from '../events/session/interfaces';
-import NormalizeService from '../utils/NormalizeService';
-import { DeckList } from 'types';
-import { common } from 'protobufjs';
-import IBytesValue = common.IBytesValue;
-
-export class SessionPersistence {
-  static initialized() {
-    ServerDispatch.initialized();
-  }
-
-  static clearStore() {
-    ServerDispatch.clearStore();
-  }
-
-  static loginSuccessful(options: WebSocketConnectOptions) {
-    ServerDispatch.loginSuccessful(options);
-  }
-
-  static loginFailed() {
-    ServerDispatch.loginFailed();
-  }
-
-  static connectionClosed(reason: number) {
-    ServerDispatch.connectionClosed(reason);
-  }
-
-  static connectionFailed() {
-    ServerDispatch.connectionFailed();
-  }
-
-  static testConnectionSuccessful() {
-    ServerDispatch.testConnectionSuccessful();
-  }
-
-  static testConnectionFailed() {
-    ServerDispatch.testConnectionFailed();
-  }
-
-  static updateBuddyList(buddyList) {
-    ServerDispatch.updateBuddyList(buddyList);
-  }
-
-  static addToBuddyList(user: User) {
-    ServerDispatch.addToBuddyList(user);
-  }
-
-  static removeFromBuddyList(userName: string) {
-    ServerDispatch.removeFromBuddyList(userName);
-  }
-
-  static updateIgnoreList(ignoreList) {
-    ServerDispatch.updateIgnoreList(ignoreList);
-  }
-
-  static addToIgnoreList(user: User) {
-    ServerDispatch.addToIgnoreList(user);
-  }
-
-  static removeFromIgnoreList(userName: string) {
-    ServerDispatch.removeFromIgnoreList(userName);
-  }
-
-  static updateInfo(name: string, version: string) {
-    ServerDispatch.updateInfo(name, version);
-  }
-
-  static updateStatus(state: number, description: string) {
-    ServerDispatch.updateStatus(state, description);
-
-    if (state === StatusEnum.DISCONNECTED) {
-      this.connectionClosed(state);
-    }
-  }
-
-  static updateUser(user: User) {
-    ServerDispatch.updateUser(user);
-  }
-
-  static updateUsers(users: User[]) {
-    ServerDispatch.updateUsers(users);
-  }
-
-  static userJoined(user: User) {
-    ServerDispatch.userJoined(user);
-  }
-
-  static userLeft(userName: string) {
-    ServerDispatch.userLeft(userName);
-  }
-
-  static serverMessage(message: string) {
-    ServerDispatch.serverMessage(sanitizeHtml(message));
-  }
-
-  static accountAwaitingActivation(options: WebSocketConnectOptions) {
-    ServerDispatch.accountAwaitingActivation(options);
-  }
-
-  static accountActivationSuccess() {
-    ServerDispatch.accountActivationSuccess();
-  }
-
-  static accountActivationFailed() {
-    ServerDispatch.accountActivationFailed();
-  }
-
-  static registrationRequiresEmail() {
-    ServerDispatch.registrationRequiresEmail();
-  }
-
-  static registrationSuccess() {
-    ServerDispatch.registrationSuccess();
-  }
-
-  static registrationFailed(reason: string, endTime?: number) {
-    const reasonMsg = endTime ? NormalizeService.normalizeBannedUserError(reason, endTime) : reason;
-
-    ServerDispatch.registrationFailed(reasonMsg);
-  }
-
-  static registrationEmailError(error: string) {
-    ServerDispatch.registrationEmailError(error);
-  }
-
-  static registrationPasswordError(error: string) {
-    ServerDispatch.registrationPasswordError(error);
-  }
-
-  static registrationUserNameError(error: string) {
-    ServerDispatch.registrationUserNameError(error);
-  }
-
-  static resetPasswordChallenge() {
-    ServerDispatch.resetPasswordChallenge();
-  }
-
-  static resetPassword() {
-    ServerDispatch.resetPassword();
-  }
-
-  static resetPasswordSuccess() {
-    ServerDispatch.resetPasswordSuccess();
-  }
-
-  static resetPasswordFailed() {
-    ServerDispatch.resetPasswordFailed();
-  }
-
-  static accountPasswordChange(): void {
-    ServerDispatch.accountPasswordChange();
-  }
-
-  static accountEditChanged(realName?: string, email?: string, country?: string): void {
-    ServerDispatch.accountEditChanged({ realName, email, country });
-  }
-
-  static accountImageChanged(avatarBmp: IBytesValue): void {
-    ServerDispatch.accountImageChanged({ avatarBmp });
-  }
-
-  static directMessageSent(userName: string, message: string): void {
-    ServerDispatch.directMessageSent(userName, message);
-  }
-
-  static getUserInfo(userInfo: User) {
-    ServerDispatch.getUserInfo(userInfo);
-  }
-
-  static getGamesOfUser(userName: string, response: any): void {
-    console.log('getGamesOfUser');
-  }
-
-  static gameJoined(gameJoinedData: GameJoinedData): void {
-    console.log('gameJoined', gameJoinedData);
-  }
-
-  static notifyUser(notification: NotifyUserData): void {
-    ServerDispatch.notifyUser(notification);
-  }
-
-  static playerPropertiesChanged(payload: PlayerGamePropertiesData): void {
-    console.log('playerPropertiesChanged', payload);
-  }
-
-  static serverShutdown(data: ServerShutdownData): void {
-    ServerDispatch.serverShutdown(data);
-  }
-
-  static userMessage(messageData: UserMessageData): void {
-    ServerDispatch.userMessage(messageData);
-  }
-
-  static addToList(list: string, userName: string): void {
-    ServerDispatch.addToList(list, userName)
-  }
-
-  static removeFromList(list: string, userName: string): void {
-    ServerDispatch.removeFromList(list, userName);
-  }
-
-  static deckDelete(deckId: number): void {
-    console.log('deckDelete', deckId);
-  }
-
-  static deckDeleteDir(path: string): void {
-    console.log('deckDeleteDir', path);
-  }
-
-  static deckDownload(deckId: number): void {
-    console.log('deckDownload', deckId);
-  }
-
-  static deckList(deckList: DeckList): void {
-    console.log('deckList', deckList);
-  }
-
-  static deckNewDir(path: string, dirName: string): void {
-    console.log('deckNewDir', path, dirName);
-  }
-
-  static deckUpload(treeItem: DeckStorageTreeItem): void {
-    console.log('deckUpload', treeItem);
-  }
-}
-
-
diff --git a/webclient/src/websocket/persistence/index.ts b/webclient/src/websocket/persistence/index.ts
deleted file mode 100644
index f4df52645..000000000
--- a/webclient/src/websocket/persistence/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export { AdminPersistence } from './AdminPresistence';
-export { RoomPersistence } from './RoomPersistence';
-export { SessionPersistence } from './SessionPersistence';
-export { ModeratorPersistence } from './ModeratorPresistence';
-export { GamePersistence } from './GamePersistence';
diff --git a/webclient/src/websocket/services/KeepAliveService.spec.ts b/webclient/src/websocket/services/KeepAliveService.spec.ts
deleted file mode 100644
index df5169b4c..000000000
--- a/webclient/src/websocket/services/KeepAliveService.spec.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { KeepAliveService } from './KeepAliveService';
-
-import webClient from '../WebClient';
-
-describe('KeepAliveService', () => {
-  let service: KeepAliveService;
-
-  beforeEach(() => {
-    jest.useFakeTimers();
-
-    service = new KeepAliveService(webClient.socket);
-  });
-
-  it('should create', () => {
-    expect(service).toBeDefined();
-  });
-
-  describe('startPingLoop', () => {
-    let resolvePing;
-    let interval;
-    let promise;
-    let ping;
-    let checkReadyStateSpy;
-
-    beforeEach(() => {
-      interval = 100;
-      promise = new Promise(resolve => resolvePing = resolve);
-      ping = (done) => promise.then(done);
-
-      checkReadyStateSpy = jest.spyOn(webClient.socket, 'checkReadyState');
-      checkReadyStateSpy.mockImplementation(() => true);
-
-      service.startPingLoop(interval, ping);
-      jest.advanceTimersByTime(interval);
-    });
-
-    it('should start ping loop', () => {
-      expect((service as any).keepalivecb).toBeDefined();
-      expect((service as any).lastPingPending).toBeTruthy();
-    });
-
-    it('should call ping callback when done', (done: jest.DoneCallback) => {
-      resolvePing();
-
-      promise.then(() => {
-        expect((service as any).lastPingPending).toBeFalsy();
-        done();
-      });
-    });
-
-    it('should fire disconnected$ if lastPingPending is still true', () => {
-      jest.spyOn(service.disconnected$, 'next').mockImplementation(() => {});
-      jest.advanceTimersByTime(interval);
-
-      expect(service.disconnected$.next).toHaveBeenCalled();
-    });
-
-    it('should endPingLoop if socket is not open', () => {
-      jest.spyOn(service, 'endPingLoop').mockImplementation(() => {});
-      checkReadyStateSpy.mockImplementation(() => false);
-
-      resolvePing();
-      jest.advanceTimersByTime(interval);
-
-      expect(service.endPingLoop).toHaveBeenCalled();
-    });
-  });
-});
diff --git a/webclient/src/websocket/services/KeepAliveService.ts b/webclient/src/websocket/services/KeepAliveService.ts
deleted file mode 100644
index 070a532e6..000000000
--- a/webclient/src/websocket/services/KeepAliveService.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Subject } from 'rxjs';
-
-import { WebSocketService } from './WebSocketService';
-
-export class KeepAliveService {
-  private socket: WebSocketService;
-
-  private keepalivecb: NodeJS.Timeout;
-  private lastPingPending: boolean;
-
-  public disconnected$ = new Subject<void>();
-
-  constructor(socket: WebSocketService) {
-    this.socket = socket;
-  }
-
-  public startPingLoop(interval: number, ping: Function): void {
-    this.keepalivecb = setInterval(() => {
-      // check if the previous ping got no reply
-      if (this.lastPingPending) {
-        this.disconnected$.next();
-      }
-
-      // stop the ping loop if we"re disconnected
-      if (!this.socket.checkReadyState(WebSocket.OPEN)) {
-        this.endPingLoop();
-        return;
-      }
-
-      this.lastPingPending = true;
-      ping(() => this.lastPingPending = false);
-    }, interval);
-  }
-
-  public endPingLoop() {
-    clearInterval(this.keepalivecb);
-    this.keepalivecb = null;
-    this.lastPingPending = false;
-  }
-}
diff --git a/webclient/src/websocket/services/ProtobufService.ts b/webclient/src/websocket/services/ProtobufService.ts
deleted file mode 100644
index 341bbeae3..000000000
--- a/webclient/src/websocket/services/ProtobufService.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-import protobuf from 'protobufjs';
-
-import { CommonEvents, GameEvents, RoomEvents, SessionEvents } from '../events';
-import { SessionPersistence } from '../persistence';
-import { WebClient } from '../WebClient';
-import { SessionCommands } from 'websocket';
-import ProtoFiles from '../../proto-files.json';
-
-export interface ProtobufEvents {
-  [event: string]: Function;
-}
-
-export class ProtobufService {
-  static PB_FILE_DIR = `${process.env.PUBLIC_URL}/pb`;
-
-  public controller;
-  private cmdId = 0;
-  private pendingCommands: { [cmdId: string]: Function } = {};
-
-  private webClient: WebClient;
-
-  constructor(webClient: WebClient) {
-    this.webClient = webClient;
-
-    this.loadProtobufFiles();
-  }
-
-  public resetCommands() {
-    this.cmdId = 0;
-    this.pendingCommands = {};
-  }
-
-  public sendRoomCommand(roomId: number, roomCmd: number, callback?: Function) {
-    const cmd = this.controller.CommandContainer.create({
-      'roomId': roomId,
-      'roomCommand': [roomCmd]
-    });
-
-    this.sendCommand(cmd, raw => callback && callback(raw));
-  }
-
-  public sendSessionCommand(sesCmd: number, callback?: Function) {
-    const cmd = this.controller.CommandContainer.create({
-      'sessionCommand': [sesCmd]
-    });
-
-    this.sendCommand(cmd, (raw) => callback && callback(raw));
-  }
-
-  public sendModeratorCommand(modCmd: number, callback?: Function) {
-    const cmd = this.controller.CommandContainer.create({
-      'moderatorCommand': [modCmd]
-    });
-
-    this.sendCommand(cmd, (raw) => callback && callback(raw));
-  }
-
-  public sendAdminCommand(adminCmd: number, callback?: Function) {
-    const cmd = this.controller.CommandContainer.create({
-      'adminCommand': [adminCmd]
-    });
-
-    this.sendCommand(cmd, (raw) => callback && callback(raw));
-  }
-
-  public sendCommand(cmd: number, callback: Function) {
-    this.cmdId++;
-
-    cmd['cmdId'] = this.cmdId;
-    this.pendingCommands[this.cmdId] = callback;
-
-    if (this.webClient.socket.checkReadyState(WebSocket.OPEN)) {
-      this.webClient.socket.send(this.controller.CommandContainer.encode(cmd).finish());
-    }
-  }
-
-  public sendKeepAliveCommand(pingReceived: Function) {
-    SessionCommands.ping(pingReceived);
-  }
-
-  public handleMessageEvent({ data }: MessageEvent): void {
-    try {
-      const uint8msg = new Uint8Array(data);
-      const msg = this.controller.ServerMessage.decode(uint8msg);
-
-      if (msg) {
-        switch (msg.messageType) {
-          case this.controller.ServerMessage.MessageType.RESPONSE:
-            this.processServerResponse(msg.response);
-            break;
-          case this.controller.ServerMessage.MessageType.ROOM_EVENT:
-            this.processRoomEvent(msg.roomEvent, msg);
-            break;
-          case this.controller.ServerMessage.MessageType.SESSION_EVENT:
-            this.processSessionEvent(msg.sessionEvent, msg);
-            break;
-          case this.controller.ServerMessage.MessageType.GAME_EVENT_CONTAINER:
-            this.processGameEvent(msg.gameEvent, msg);
-            break;
-          default:
-            console.log(msg);
-            break;
-        }
-      }
-    } catch (err) {
-      console.error('Processing failed:', err);
-    }
-  }
-
-  private processServerResponse(response: any) {
-    const { cmdId } = response;
-
-    if (this.pendingCommands[cmdId]) {
-      this.pendingCommands[cmdId](response);
-      delete this.pendingCommands[cmdId];
-    }
-  }
-
-  private processCommonEvent(response: any, raw: any) {
-    this.processEvent(response, CommonEvents, raw);
-  }
-
-  private processRoomEvent(response: any, raw: any) {
-    this.processEvent(response, RoomEvents, raw);
-  }
-
-  private processSessionEvent(response: any, raw: any) {
-    this.processEvent(response, SessionEvents, raw);
-  }
-
-  private processGameEvent(response: any, raw: any): void {
-    this.processEvent(response, GameEvents, raw);
-  }
-
-  private processEvent(response: any, events: ProtobufEvents, raw: any) {
-    for (const event in events) {
-      const payload = response[event];
-
-      if (payload) {
-        events[event](payload, raw);
-        return;
-      }
-    }
-  }
-
-  private loadProtobufFiles() {
-    const files = ProtoFiles.map(file => `${ProtobufService.PB_FILE_DIR}/${file}`);
-
-    this.controller = new protobuf.Root();
-    this.controller.load(files, { keepCase: false }, (err, root) => {
-      if (err) {
-        throw err;
-      }
-
-      SessionPersistence.initialized();
-    });
-  }
-}
diff --git a/webclient/src/websocket/services/WebSocketService.ts b/webclient/src/websocket/services/WebSocketService.ts
deleted file mode 100644
index 95fa2d356..000000000
--- a/webclient/src/websocket/services/WebSocketService.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import { Subject } from 'rxjs';
-
-import { StatusEnum, WebSocketConnectOptions } from 'types';
-
-import { KeepAliveService } from './KeepAliveService';
-import { WebClient } from '../WebClient';
-import { SessionPersistence } from '../persistence';
-import { updateStatus } from '../commands/session';
-
-export class WebSocketService {
-  private socket: WebSocket;
-  private testSocket: WebSocket;
-
-  private webClient: WebClient;
-  private keepAliveService: KeepAliveService;
-
-  public message$: Subject<MessageEvent> = new Subject();
-
-  private keepalive: number;
-
-  constructor(webClient: WebClient) {
-    this.webClient = webClient;
-
-    this.keepAliveService = new KeepAliveService(this);
-    this.keepAliveService.disconnected$.subscribe(() => {
-      this.disconnect();
-      updateStatus(StatusEnum.DISCONNECTED, 'Connection timeout');
-    });
-  }
-
-  public connect(options: WebSocketConnectOptions, protocol: string = 'wss'): void {
-    if (window.location.hostname === 'localhost') {
-      protocol = 'ws';
-    }
-
-    const { host, port } = options;
-    this.keepalive = this.webClient.clientOptions.keepalive;
-
-    this.socket = this.createWebSocket(`${protocol}://${host}:${port}`);
-  }
-
-  public testConnect(options: WebSocketConnectOptions, protocol: string = 'wss'): void {
-    if (window.location.hostname === 'localhost') {
-      protocol = 'ws';
-    }
-
-    const { host, port } = options;
-
-    this.testWebSocket(`${protocol}://${host}:${port}`);
-  }
-
-  public disconnect(): void {
-    if (this.socket) {
-      this.socket.close();
-    }
-  }
-
-  public checkReadyState(state: number): boolean {
-    return this.socket?.readyState === state;
-  }
-
-  public send(message): void {
-    this.socket.send(message);
-  }
-
-  private createWebSocket(url: string): WebSocket {
-    const socket = new WebSocket(url);
-    socket.binaryType = 'arraybuffer';
-
-    const connectionTimer = setTimeout(() => socket.close(), this.keepalive);
-
-    socket.onopen = () => {
-      clearTimeout(connectionTimer);
-      updateStatus(StatusEnum.CONNECTED, 'Connected');
-
-      this.keepAliveService.startPingLoop(this.keepalive, (pingReceived: Function) => {
-        this.webClient.keepAlive(pingReceived);
-      });
-    };
-
-    socket.onclose = () => {
-      // dont overwrite failure messages
-      if (this.webClient.status !== StatusEnum.DISCONNECTED) {
-        updateStatus(StatusEnum.DISCONNECTED, 'Connection Closed');
-      }
-
-      this.keepAliveService.endPingLoop();
-    };
-
-    socket.onerror = () => {
-      updateStatus(StatusEnum.DISCONNECTED, 'Connection Failed');
-      SessionPersistence.connectionFailed();
-    };
-
-    socket.onmessage = (event: MessageEvent) => {
-      this.message$.next(event);
-    }
-
-    return socket;
-  }
-
-  private testWebSocket(url: string): void {
-    if (this.testSocket) {
-      this.testSocket.onerror = null;
-      this.testSocket.close();
-    }
-
-    const socket = new WebSocket(url);
-    socket.binaryType = 'arraybuffer';
-
-    const connectionTimer = setTimeout(() => socket.close(), this.webClient.clientOptions.keepalive);
-
-    socket.onopen = () => {
-      clearTimeout(connectionTimer);
-      SessionPersistence.testConnectionSuccessful();
-      socket.close();
-    };
-
-    socket.onerror = () => {
-      SessionPersistence.testConnectionFailed();
-    };
-
-    socket.onclose = () => {
-      this.testSocket = null;
-    }
-
-    this.testSocket = socket;
-  }
-}
diff --git a/webclient/src/websocket/utils/NormalizeService.ts b/webclient/src/websocket/utils/NormalizeService.ts
deleted file mode 100644
index 4d9d37ba6..000000000
--- a/webclient/src/websocket/utils/NormalizeService.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { Game, GametypeMap, LogItem, LogGroups, Message, Room } from 'types';
-
-export default class NormalizeService {
-  // Flatten room gameTypes into map object
-  static normalizeRoomInfo(roomInfo: Room): void {
-    roomInfo.gametypeMap = {};
-
-    const { gametypeList, gametypeMap, gameList } = roomInfo;
-
-    gametypeList.reduce((map, type) => {
-      map[type.gameTypeId] = type.description;
-      return map;
-    }, gametypeMap);
-
-    gameList.forEach((game) => NormalizeService.normalizeGameObject(game, gametypeMap));
-  }
-
-  // Flatten gameTypes[] into gameType field
-  // Default sortable values ("" || 0 || -1)
-  static normalizeGameObject(game: Game, gametypeMap: GametypeMap): void {
-    const { gameTypes, description } = game;
-    const hasType = gameTypes && gameTypes.length;
-    game.gameType = hasType ? gametypeMap[gameTypes[0]] : '';
-
-    game.description = description || '';
-  }
-
-  // Flatten logs[] into object mapped by targetType (room, game, chat)
-  static normalizeLogs(logs: LogItem[]): LogGroups {
-    return logs.reduce((obj, log) => {
-      const { targetType } = log;
-      obj[targetType] = obj[targetType] || [];
-      obj[targetType].push(log);
-      return obj;
-    }, {} as LogGroups);
-  }
-
-  // messages sent by current user dont have their username prepended
-  static normalizeUserMessage(message: Message): void {
-    const { name } = message;
-
-    if (name) {
-      message.message = `${name}: ${message.message}`;
-    }
-  }
-
-  // Banned reason string is not being exposed by the server
-  static normalizeBannedUserError(reasonStr: string, endTime: number): string {
-    let error;
-
-    if (endTime) {
-      error = 'You are banned until ' + new Date(endTime).toString();
-    } else {
-      error = 'You are permanently banned';
-    }
-
-    if (reasonStr) {
-      error += '\n\n' + reasonStr;
-    }
-
-    return error;
-  }
-}
diff --git a/webclient/src/websocket/utils/guid.util.ts b/webclient/src/websocket/utils/guid.util.ts
deleted file mode 100644
index 73b17d719..000000000
--- a/webclient/src/websocket/utils/guid.util.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-function s4(): string {
-  const s4 = Math.floor((1 + Math.random()) * 0x10000);
-  return s4.toString(16).substring(1);
-}
-
-export function guid(): string {
-  return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
-}
diff --git a/webclient/src/websocket/utils/index.ts b/webclient/src/websocket/utils/index.ts
deleted file mode 100644
index 4147f4af8..000000000
--- a/webclient/src/websocket/utils/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './guid.util';
-export * from './sanitizeHtml.util';
-export * from './passwordHasher';
diff --git a/webclient/src/websocket/utils/passwordHasher.ts b/webclient/src/websocket/utils/passwordHasher.ts
deleted file mode 100644
index 77645694f..000000000
--- a/webclient/src/websocket/utils/passwordHasher.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import sha512 from 'crypto-js/sha512';
-import Base64 from 'crypto-js/enc-base64';
-
-const HASH_ROUNDS = 1_000;
-const SALT_LENGTH = 16;
-
-export const hashPassword = (salt: string, password: string): string => {
-  let hashedPassword = salt + password;
-  for (let i = 0; i < HASH_ROUNDS; i++) {
-    // WHY DO WE DO IT THIS WAY?
-    hashedPassword = sha512(hashedPassword);
-  }
-
-  return salt + Base64.stringify(hashedPassword);
-};
-
-export const generateSalt = (): string => {
-  const characters = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
-
-  let salt = '';
-  for (let i = 0; i < SALT_LENGTH; i++) {
-    salt += characters.charAt(Math.floor(Math.random() * characters.length));
-  }
-
-  return salt;
-}
-
-export const passwordSaltSupported = (serverOptions, webClient): number => {
-  // Intentional use of Bitwise operator b/c of how Servatrice Enums work
-  return serverOptions & webClient.protobuf.controller.Event_ServerIdentification.ServerOptions.SupportsPasswordHash;
-}
diff --git a/webclient/src/websocket/utils/sanitizeHtml.util.ts b/webclient/src/websocket/utils/sanitizeHtml.util.ts
deleted file mode 100644
index e5321213b..000000000
--- a/webclient/src/websocket/utils/sanitizeHtml.util.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import sanitize from 'sanitize-html';
-
-export function sanitizeHtml(msg: string): string {
-  return sanitize(msg, {
-    allowedTags: ['br', 'a', 'img', 'center', 'b', 'font'],
-    allowedAttributes: {
-      '*': ['href', 'color', 'rel', 'target'],
-    },
-    allowedSchemes: ['http', 'https', 'ftp'],
-    transformTags: {
-      'a': sanitize.simpleTransform('a', {
-        target: '_blank',
-        rel: 'noopener noreferrer',
-      }),
-    }
-  });
-}
diff --git a/webclient/tsconfig.json b/webclient/tsconfig.json
deleted file mode 100644
index 0e35af354..000000000
--- a/webclient/tsconfig.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "compilerOptions": {
-    "baseUrl": "src",
-    "target": "es6",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "strict": false,
-    "forceConsistentCasingInFileNames": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react-jsx",
-    "noFallthroughCasesInSwitch": false
-  },
-  "include": [
-    "src"
-  ]
-}